Skip to content

use std min/max in topology.hpp #669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andreacassioli wants to merge 1 commit into
base: develop
Choose a base branch
from
+18 −34
Open

use std min/max in topology.hpp #669

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 18 additions & 34 deletions include/boost/graph/topology.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

#include <algorithm>
#include <boost/config.hpp> // For BOOST_STATIC_CONSTANT
#include <boost/config/no_tr1/cmath.hpp>
#include <cmath>

@Becheler Becheler Oct 27, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i know it's not your changes, but would we use this PR to remove the duplicated cmath include ? 😄
fine either way !

#include <boost/random/uniform_01.hpp>
#include <boost/random/linear_congruential.hpp>
Expand Down Expand Up @@ -188,19 +187,17 @@ template < std::size_t Dims > class convex_topology

point pointwise_min(point a, point b) const
{
BOOST_USING_STD_MIN();
point result;
for (std::size_t i = 0; i < Dims; ++i)
result[i] = min BOOST_PREVENT_MACRO_SUBSTITUTION(a[i], b[i]);
result[i] = (std::min)(a[i], b[i]);
return result;
}

point pointwise_max(point a, point b) const
{
BOOST_USING_STD_MAX();
point result;
for (std::size_t i = 0; i < Dims; ++i)
result[i] = max BOOST_PREVENT_MACRO_SUBSTITUTION(a[i], b[i]);
result[i] = (std::max)(a[i], b[i]);
return result;
}

Expand Down Expand Up @@ -253,27 +250,22 @@ class hypercube_topology : public convex_topology< Dims >

point_type bound(point_type a) const
{
BOOST_USING_STD_MIN();
BOOST_USING_STD_MAX();
point_type p;
for (std::size_t i = 0; i < Dims; ++i)
p[i] = min BOOST_PREVENT_MACRO_SUBSTITUTION(
scaling, max BOOST_PREVENT_MACRO_SUBSTITUTION(-scaling, a[i]));
p[i] = (std::min)(
scaling, (std::max)(-scaling, a[i]));
return p;
}

double distance_from_boundary(point_type a) const
{
BOOST_USING_STD_MIN();
BOOST_USING_STD_MAX();
#ifndef BOOST_NO_STDC_NAMESPACE
using std::abs;
#endif
BOOST_STATIC_ASSERT(Dims >= 1);
double dist = abs(scaling - a[0]);
for (std::size_t i = 1; i < Dims; ++i)
dist = min BOOST_PREVENT_MACRO_SUBSTITUTION(
dist, abs(scaling - a[i]));
dist = (std::min)(dist, abs(scaling - a[i]));
return dist;
}

Expand Down Expand Up @@ -330,21 +322,21 @@ class rectangle_topology : public convex_topology< 2 >
rectangle_topology(double left, double top, double right, double bottom)
: gen_ptr(new RandomNumberGenerator)
, rand(new rand_t(*gen_ptr))
, left(std::min BOOST_PREVENT_MACRO_SUBSTITUTION(left, right))
, top(std::min BOOST_PREVENT_MACRO_SUBSTITUTION(top, bottom))
, right(std::max BOOST_PREVENT_MACRO_SUBSTITUTION(left, right))
, bottom(std::max BOOST_PREVENT_MACRO_SUBSTITUTION(top, bottom))
, left((std::min)(left, right))
, top((std::min)(top, bottom))
, right((std::max)(left, right))
, bottom((std::max)(top, bottom))
{
}

rectangle_topology(RandomNumberGenerator& gen, double left, double top,
double right, double bottom)
: gen_ptr()
, rand(new rand_t(gen))
, left(std::min BOOST_PREVENT_MACRO_SUBSTITUTION(left, right))
, top(std::min BOOST_PREVENT_MACRO_SUBSTITUTION(top, bottom))
, right(std::max BOOST_PREVENT_MACRO_SUBSTITUTION(left, right))
, bottom(std::max BOOST_PREVENT_MACRO_SUBSTITUTION(top, bottom))
, left((std::min)(left, right))
, top((std::min)(top, bottom))
, right((std::max)(left, right))
, bottom((std::max)(top, bottom))
{
}

Expand All @@ -362,27 +354,21 @@ class rectangle_topology : public convex_topology< 2 >

point_type bound(point_type a) const
{
BOOST_USING_STD_MIN();
BOOST_USING_STD_MAX();
point_type p;
p[0] = min BOOST_PREVENT_MACRO_SUBSTITUTION(
right, max BOOST_PREVENT_MACRO_SUBSTITUTION(left, a[0]));
p[1] = min BOOST_PREVENT_MACRO_SUBSTITUTION(
bottom, max BOOST_PREVENT_MACRO_SUBSTITUTION(top, a[1]));
p[0] = (std::min)(right, (std::max)(left, a[0]));
p[1] = (std::min)(bottom, (std::max)(top, a[1]));
return p;
}

double distance_from_boundary(point_type a) const
{
BOOST_USING_STD_MIN();
BOOST_USING_STD_MAX();
#ifndef BOOST_NO_STDC_NAMESPACE
using std::abs;
#endif
double dist = abs(left - a[0]);
dist = min BOOST_PREVENT_MACRO_SUBSTITUTION(dist, abs(right - a[0]));
dist = min BOOST_PREVENT_MACRO_SUBSTITUTION(dist, abs(top - a[1]));
dist = min BOOST_PREVENT_MACRO_SUBSTITUTION(dist, abs(bottom - a[1]));
dist = (std::min)(dist, abs(right - a[0]));
dist = (std::min)(dist, abs(top - a[1]));
dist = (std::min)(dist, abs(bottom - a[1]));
return dist;
}

Expand Down Expand Up @@ -471,8 +457,6 @@ class ball_topology : public convex_topology< Dims >

point_type bound(point_type a) const
{
BOOST_USING_STD_MIN();
BOOST_USING_STD_MAX();
double r = 0.;
for (std::size_t i = 0; i < Dims; ++i)
r = std::hypot(r, a[i]);
Expand Down
Loading