boost_mirror/geometry
1
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2025-05-10 07:34:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add if constexpr macro and replace condition macro.

Browse Source
This commit is contained in:
Adam Wulkiewicz 2023-07-01 20:51:46 +02:00
parent b6a7349125
commit 96845810c9
8 changed files with 99 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/boost/geometry/algorithms/densify.hpp
View File

@ -1,7 +1,8 @@
// Boost.Geometry // Boost.Geometry
// Copyright (c) 2017-2021, Oracle and/or its affiliates. // Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
// Copyright (c) 2017-2021, Oracle and/or its affiliates.
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
// Licensed under the Boost Software License version 1.0. // Licensed under the Boost Software License version 1.0.
@ -33,7 +34,7 @@
#include <boost/geometry/strategies/densify/geographic.hpp> #include <boost/geometry/strategies/densify/geographic.hpp>
#include <boost/geometry/strategies/densify/spherical.hpp> #include <boost/geometry/strategies/densify/spherical.hpp>
#include <boost/geometry/strategies/detail.hpp> #include <boost/geometry/strategies/detail.hpp>
#include <boost/geometry/util/condition.hpp> #include <boost/geometry/util/constexpr.hpp>
#include <boost/geometry/util/range.hpp> #include <boost/geometry/util/range.hpp>
@ -102,7 +103,7 @@ struct densify_range
strategy.apply(p0, p1, policy, len); strategy.apply(p0, p1, policy, len);
} }
if (BOOST_GEOMETRY_CONDITION(AppendLastPoint)) if BOOST_GEOMETRY_CONSTEXPR (AppendLastPoint)
{ {
convert_and_push_back(rng_out, *prev); // back(rng) convert_and_push_back(rng_out, *prev); // back(rng)
} }
@ -130,7 +131,7 @@ struct densify_ring
strategy.apply(p0, p1, policy, len); strategy.apply(p0, p1, policy, len);
if (BOOST_GEOMETRY_CONDITION(IsClosed2)) if BOOST_GEOMETRY_CONSTEXPR (IsClosed2)
{ {
convert_and_push_back(ring_out, p1); convert_and_push_back(ring_out, p1);
} }

22
include/boost/geometry/algorithms/detail/buffer/buffer_inserter.hpp
View File

@ -1,7 +1,7 @@
// Boost.Geometry (aka GGL, Generic Geometry Library) // Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2012-2020 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2012-2020 Barend Gehrels, Amsterdam, the Netherlands.
// Copyright (c) 2022 Adam Wulkiewicz, Lodz, Poland. // Copyright (c) 2022-2023 Adam Wulkiewicz, Lodz, Poland.
// This file was modified by Oracle on 2017-2022. // This file was modified by Oracle on 2017-2022.
// Modifications copyright (c) 2017-2022 Oracle and/or its affiliates. // Modifications copyright (c) 2017-2022 Oracle and/or its affiliates.
@ -44,7 +44,7 @@
#include <boost/geometry/strategies/buffer.hpp> #include <boost/geometry/strategies/buffer.hpp>
#include <boost/geometry/strategies/side.hpp> #include <boost/geometry/strategies/side.hpp>
#include <boost/geometry/util/condition.hpp> #include <boost/geometry/util/constexpr.hpp>
#include <boost/geometry/util/math.hpp> #include <boost/geometry/util/math.hpp>
#include <boost/geometry/util/type_traits.hpp> #include <boost/geometry/util/type_traits.hpp>
@ -942,17 +942,17 @@ inline void buffer_inserter(GeometryInput const& geometry_input, OutputIterator
{ {
boost::ignore_unused(visit_pieces_policy); boost::ignore_unused(visit_pieces_policy);
typedef detail::buffer::buffered_piece_collection using collection_type = detail::buffer::buffered_piece_collection
< <
typename geometry::ring_type<GeometryOutput>::type, typename geometry::ring_type<GeometryOutput>::type,
Strategies, Strategies,
DistanceStrategy, DistanceStrategy,
RobustPolicy RobustPolicy
> collection_type; >;
collection_type collection(strategies, distance_strategy, robust_policy); collection_type collection(strategies, distance_strategy, robust_policy);
collection_type const& const_collection = collection; collection_type const& const_collection = collection;
bool const areal = util::is_areal<GeometryInput>::value; static constexpr bool areal = util::is_areal<GeometryInput>::value;
dispatch::buffer_inserter dispatch::buffer_inserter
< <
@ -969,7 +969,7 @@ inline void buffer_inserter(GeometryInput const& geometry_input, OutputIterator
robust_policy, strategies); robust_policy, strategies);
collection.get_turns(); collection.get_turns();
if (BOOST_GEOMETRY_CONDITION(areal)) if BOOST_GEOMETRY_CONSTEXPR (areal)
{ {
collection.check_turn_in_original(); collection.check_turn_in_original();
} }
@ -989,7 +989,7 @@ inline void buffer_inserter(GeometryInput const& geometry_input, OutputIterator
// phase 1: turns (after enrichment/clustering) // phase 1: turns (after enrichment/clustering)
visit_pieces_policy.apply(const_collection, 1); visit_pieces_policy.apply(const_collection, 1);
if (BOOST_GEOMETRY_CONDITION(areal)) if BOOST_GEOMETRY_CONSTEXPR (areal)
{ {
collection.deflate_check_turns(); collection.deflate_check_turns();
} }
@ -1001,8 +1001,7 @@ inline void buffer_inserter(GeometryInput const& geometry_input, OutputIterator
// - the output is counter clockwise // - the output is counter clockwise
// and avoid reversing twice // and avoid reversing twice
bool reverse = distance_strategy.negative() && areal; bool reverse = distance_strategy.negative() && areal;
if (BOOST_GEOMETRY_CONDITION( if BOOST_GEOMETRY_CONSTEXPR (geometry::point_order<GeometryOutput>::value == counterclockwise)
geometry::point_order<GeometryOutput>::value == counterclockwise))
{ {
reverse = ! reverse; reverse = ! reverse;
} }
@ -1011,10 +1010,13 @@ inline void buffer_inserter(GeometryInput const& geometry_input, OutputIterator
collection.reverse(); collection.reverse();
} }
if (BOOST_GEOMETRY_CONDITION(distance_strategy.negative() && areal)) if BOOST_GEOMETRY_CONSTEXPR (areal)
{
if (distance_strategy.negative())
{ {
collection.discard_nonintersecting_deflated_rings(); collection.discard_nonintersecting_deflated_rings();
} }
}
collection.template assign<GeometryOutput>(out); collection.template assign<GeometryOutput>(out);

11
include/boost/geometry/algorithms/detail/is_valid/linear.hpp
View File

@ -1,7 +1,8 @@
// Boost.Geometry (aka GGL, Generic Geometry Library) // Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2014-2021, Oracle and/or its affiliates. // Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
// Copyright (c) 2014-2021, Oracle and/or its affiliates.
// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
@ -31,7 +32,7 @@
#include <boost/geometry/core/point_type.hpp> #include <boost/geometry/core/point_type.hpp>
#include <boost/geometry/core/tags.hpp> #include <boost/geometry/core/tags.hpp>
#include <boost/geometry/util/condition.hpp> #include <boost/geometry/util/constexpr.hpp>
namespace boost { namespace geometry namespace boost { namespace geometry
@ -158,11 +159,13 @@ public:
VisitPolicy& visitor, VisitPolicy& visitor,
Strategy const& strategy) Strategy const& strategy)
{ {
if (BOOST_GEOMETRY_CONDITION( if BOOST_GEOMETRY_CONSTEXPR (AllowEmptyMultiGeometries)
AllowEmptyMultiGeometries && boost::empty(multilinestring))) {
if (boost::empty(multilinestring))
{ {
return visitor.template apply<no_failure>(); return visitor.template apply<no_failure>();
} }
}
using per_ls = per_linestring<VisitPolicy, Strategy>; using per_ls = per_linestring<VisitPolicy, Strategy>;

11
include/boost/geometry/algorithms/detail/is_valid/multipolygon.hpp
View File

@ -1,7 +1,8 @@
// Boost.Geometry (aka GGL, Generic Geometry Library) // Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2014-2021, Oracle and/or its affiliates. // Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
// Copyright (c) 2014-2021, Oracle and/or its affiliates.
// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
@ -27,7 +28,7 @@
#include <boost/geometry/core/ring_type.hpp> #include <boost/geometry/core/ring_type.hpp>
#include <boost/geometry/core/tags.hpp> #include <boost/geometry/core/tags.hpp>
#include <boost/geometry/util/condition.hpp> #include <boost/geometry/util/constexpr.hpp>
#include <boost/geometry/util/range.hpp> #include <boost/geometry/util/range.hpp>
#include <boost/geometry/geometries/box.hpp> #include <boost/geometry/geometries/box.hpp>
@ -282,11 +283,13 @@ public:
{ {
using debug_phase = debug_validity_phase<MultiPolygon>; using debug_phase = debug_validity_phase<MultiPolygon>;
if (BOOST_GEOMETRY_CONDITION(AllowEmptyMultiGeometries) if BOOST_GEOMETRY_CONSTEXPR (AllowEmptyMultiGeometries)
&& boost::empty(multipolygon)) {
if (boost::empty(multipolygon))
{ {
return visitor.template apply<no_failure>(); return visitor.template apply<no_failure>();
} }
}
// check validity of all polygons ring // check validity of all polygons ring
debug_phase::apply(1); debug_phase::apply(1);

7
include/boost/geometry/algorithms/detail/is_valid/polygon.hpp
View File

@ -1,9 +1,8 @@
// Boost.Geometry (aka GGL, Generic Geometry Library) // Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland. // Copyright (c) 2017-2023 Adam Wulkiewicz, Lodz, Poland.
// Copyright (c) 2014-2021, Oracle and/or its affiliates. // Copyright (c) 2014-2021, Oracle and/or its affiliates.
// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
@ -35,7 +34,7 @@
#include <boost/geometry/core/ring_type.hpp> #include <boost/geometry/core/ring_type.hpp>
#include <boost/geometry/core/tags.hpp> #include <boost/geometry/core/tags.hpp>
#include <boost/geometry/util/condition.hpp> #include <boost/geometry/util/constexpr.hpp>
#include <boost/geometry/util/range.hpp> #include <boost/geometry/util/range.hpp>
#include <boost/geometry/util/sequence.hpp> #include <boost/geometry/util/sequence.hpp>
@ -447,7 +446,7 @@ public:
return false; return false;
} }
if (BOOST_GEOMETRY_CONDITION(CheckRingValidityOnly)) if BOOST_GEOMETRY_CONSTEXPR (CheckRingValidityOnly)
{ {
return true; return true;
} }

12
include/boost/geometry/io/wkt/write.hpp
View File

@ -50,7 +50,7 @@
#include <boost/geometry/strategies/io/geographic.hpp> #include <boost/geometry/strategies/io/geographic.hpp>
#include <boost/geometry/strategies/io/spherical.hpp> #include <boost/geometry/strategies/io/spherical.hpp>
#include <boost/geometry/util/condition.hpp> #include <boost/geometry/util/constexpr.hpp>
#include <boost/geometry/util/type_traits.hpp> #include <boost/geometry/util/type_traits.hpp>
@ -129,7 +129,7 @@ struct wkt_range
if (boost::size(range) > 0) if (boost::size(range) > 0)
{ {
if (WriteDoubleBrackets) if BOOST_GEOMETRY_CONSTEXPR (WriteDoubleBrackets)
{ {
os << "("; os << "(";
} }
@ -143,15 +143,17 @@ struct wkt_range
} }
// optionally, close range to ring by repeating the first point // optionally, close range to ring by repeating the first point
if (BOOST_GEOMETRY_CONDITION(ForceClosurePossible) if BOOST_GEOMETRY_CONSTEXPR (ForceClosurePossible)
&& force_closure {
if (force_closure
&& boost::size(range) > 1 && boost::size(range) > 1
&& wkt_range::disjoint(*begin, *(end - 1))) && wkt_range::disjoint(*begin, *(end - 1)))
{ {
os << ","; os << ",";
stream_type::apply(os, *begin); stream_type::apply(os, *begin);
} }
if (WriteDoubleBrackets) }
if BOOST_GEOMETRY_CONSTEXPR (WriteDoubleBrackets)
{ {
os << ")"; os << ")";
} }

24
include/boost/geometry/policies/is_valid/failing_reason_policy.hpp
View File

@ -1,7 +1,8 @@
// Boost.Geometry (aka GGL, Generic Geometry Library) // Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2015, Oracle and/or its affiliates. // Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
// Copyright (c) 2015, Oracle and/or its affiliates.
// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
@ -14,7 +15,7 @@
#include <sstream> #include <sstream>
#include <boost/geometry/io/dsv/write.hpp> #include <boost/geometry/io/dsv/write.hpp>
#include <boost/geometry/util/condition.hpp> #include <boost/geometry/util/constexpr.hpp>
#include <boost/geometry/util/range.hpp> #include <boost/geometry/util/range.hpp>
#include <boost/geometry/algorithms/validity_failure_type.hpp> #include <boost/geometry/algorithms/validity_failure_type.hpp>
#include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp> #include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
@ -69,11 +70,13 @@ private:
static inline static inline
validity_failure_type transform_failure_type(validity_failure_type failure) validity_failure_type transform_failure_type(validity_failure_type failure)
{ {
if (BOOST_GEOMETRY_CONDITION( if BOOST_GEOMETRY_CONSTEXPR (AllowDuplicates)
AllowDuplicates && failure == failure_duplicate_points)) {
if (failure == failure_duplicate_points)
{ {
return no_failure; return no_failure;
} }
}
return failure; return failure;
} }
@ -81,11 +84,13 @@ private:
validity_failure_type transform_failure_type(validity_failure_type failure, validity_failure_type transform_failure_type(validity_failure_type failure,
bool is_linear) bool is_linear)
{ {
if (BOOST_GEOMETRY_CONDITION( if BOOST_GEOMETRY_CONSTEXPR (AllowSpikes)
is_linear && AllowSpikes && failure == failure_spikes)) {
if (is_linear && failure == failure_spikes)
{ {
return no_failure; return no_failure;
} }
}
return transform_failure_type(failure); return transform_failure_type(failure);
} }
@ -123,10 +128,13 @@ private:
bool is_linear, bool is_linear,
SpikePoint const& spike_point) SpikePoint const& spike_point)
{ {
if (BOOST_GEOMETRY_CONDITION(is_linear && AllowSpikes)) if BOOST_GEOMETRY_CONSTEXPR (AllowSpikes)
{
if (is_linear)
{ {
return; return;
} }
}
oss << ". A spike point was found with apex at " oss << ". A spike point was found with apex at "
<< geometry::dsv(spike_point); << geometry::dsv(spike_point);
@ -173,7 +181,7 @@ private:
static inline void apply(std::ostringstream& oss, static inline void apply(std::ostringstream& oss,
Point const& point) Point const& point)
{ {
if (BOOST_GEOMETRY_CONDITION(AllowDuplicates)) if BOOST_GEOMETRY_CONSTEXPR (AllowDuplicates)
{ {
return; return;
} }

27
include/boost/geometry/util/constexpr.hpp Normal file
View File

@ -0,0 +1,27 @@
// Boost.Geometry
// Copyright (c) 2023 Adam Wulkiewicz, Lodz, Poland.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_UTIL_CONSTEXPR_HPP
#define BOOST_GEOMETRY_UTIL_CONSTEXPR_HPP
#include <boost/geometry/util/condition.hpp>
#ifndef BOOST_NO_CXX17_IF_CONSTEXPR
#define BOOST_GEOMETRY_CONSTEXPR(CONDITION) constexpr (CONDITION)
#else
#define BOOST_GEOMETRY_CONSTEXPR(CONDITION) (BOOST_GEOMETRY_CONDITION(CONDITION))
#endif
#endif // BOOST_GEOMETRY_UTIL_CONSTEXPR_HPP