Subject: [Boost-commit] svn:boost r86538 - in trunk: boost/geometry/extensions/algorithms boost/geometry/extensions/strategies/cartesian libs/geometry/extensions/test/algorithms
From: barend.gehrels_at_[hidden]
Date: 2013-11-01 15:49:06
Author: barendgehrels
Date: 2013-11-01 15:49:06 EDT (Fri, 01 Nov 2013)
New Revision: 86538
URL: http://svn.boost.org/trac/boost/changeset/86538
Log:
[geometry] added the (not yet finished) distance_info to extensions
Added:
trunk/boost/geometry/extensions/algorithms/distance_info.hpp (contents, props changed)
trunk/boost/geometry/extensions/strategies/cartesian/
trunk/boost/geometry/extensions/strategies/cartesian/distance_info.hpp (contents, props changed)
trunk/libs/geometry/extensions/test/algorithms/distance_info.cpp (contents, props changed)
Text files modified:
trunk/boost/geometry/extensions/algorithms/distance_info.hpp | 232 ++++++++++++++++++++++++++++++++++++++++
trunk/boost/geometry/extensions/strategies/cartesian/distance_info.hpp | 180 +++++++++++++++++++++++++++++++
trunk/libs/geometry/extensions/test/algorithms/Jamfile.v2 | 1
trunk/libs/geometry/extensions/test/algorithms/distance_info.cpp | 132 ++++++++++++++++++++++
4 files changed, 545 insertions(+), 0 deletions(-)
Added: trunk/boost/geometry/extensions/algorithms/distance_info.hpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/boost/geometry/extensions/algorithms/distance_info.hpp 2013-11-01 15:49:06 EDT (Fri, 01 Nov 2013) (r86538)
@@ -0,0 +1,232 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2013 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2013 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2013 Mateusz Loskot, London, UK.
+// Copyright (c) 2013 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_ALGORITHMS_DISTANCE_INFO_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DISTANCE_INFO_HPP
+
+#include <boost/mpl/if.hpp>
+#include <boost/range/functions.hpp>
+#include <boost/range/metafunctions.hpp>
+#include <boost/static_assert.hpp>
+
+#include <boost/geometry/core/access.hpp>
+#include <boost/geometry/core/coordinate_dimension.hpp>
+#include <boost/geometry/core/reverse_dispatch.hpp>
+
+#include <boost/geometry/algorithms/not_implemented.hpp>
+#include <boost/geometry/algorithms/detail/throw_on_empty_input.hpp>
+
+#include <boost/geometry/geometries/concepts/check.hpp>
+
+#include <boost/geometry/strategies/distance.hpp>
+#include <boost/geometry/strategies/default_distance_result.hpp>
+
+#include <boost/geometry/strategies/cartesian/distance_pythagoras.hpp>
+#include <boost/geometry/extensions/strategies/cartesian/distance_info.hpp>
+
+#include <boost/geometry/util/math.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace distance_info {
+
+
+template <typename Point1, typename Point2>
+struct point_point
+{
+ template <typename Strategy, typename Result>
+ static inline void apply(Point1 const& point1, Point2 const& point2, Strategy const& strategy, Result& result)
+ {
+ result.real_distance
+ = result.projected_distance1
+ = result.projected_distance2
+ = strategy.apply_point_point(point1, point2);
+ // The projected point makes not really sense in point-point.
+ // We just assign one on the other
+ geometry::convert(point1, result.projected_point2);
+ geometry::convert(point2, result.projected_point1);
+ }
+};
+
+template <typename Point, typename Range>
+struct point_range
+{
+ template <typename Strategy, typename Result>
+ static inline void apply(Point const& point, Range const& range, Strategy const& strategy, Result& result)
+ {
+ // This should not occur (see exception on empty input below)
+ if (boost::begin(range) == boost::end(range))
+ {
+ return;
+ }
+
+ // line of one point: same case as point-point
+ typedef typename boost::range_const_iterator<Range>::type iterator_type;
+ iterator_type it = boost::begin(range);
+ iterator_type prev = it++;
+ if (it == boost::end(range))
+ {
+ point_point<Point, typename boost::range_value<Range const>::type>::apply(point, *prev, strategy, result);
+ return;
+ }
+
+ // Initialize with first segment
+ strategy.apply(point, *prev, *it, result);
+
+ // Check other segments
+ for(prev = it++; it != boost::end(range); prev = it++)
+ {
+ Result other;
+ strategy.apply(point, *prev, *it, other);
+ if (other.real_distance < result.real_distance)
+ {
+ result = other;
+ }
+ }
+ }
+};
+
+
+
+
+}} // namespace detail::distance_info
+#endif // DOXYGEN_NO_DETAIL
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+template
+<
+ typename Geometry1, typename Geometry2,
+ typename Tag1 = typename tag<Geometry1>::type,
+ typename Tag2 = typename tag<Geometry2>::type,
+ bool Reverse = reverse_dispatch<Geometry1, Geometry2>::type::value
+>
+struct distance_info : not_implemented<Tag1, Tag2>
+{
+};
+
+
+template
+<
+ typename Geometry1, typename Geometry2,
+ typename Tag1, typename Tag2
+>
+struct distance_info<Geometry1, Geometry2, Tag1, Tag2, true>
+{
+ template <typename Strategy, typename Result>
+ static inline void apply(Geometry1 const& geometry1, Geometry2 const& geometry2,
+ Strategy const& strategy, Result& result)
+ {
+ // Reversed version just calls dispatch with reversed arguments
+ distance_info
+ <
+ Geometry2, Geometry1, Tag2, Tag1, false
+ >::apply(geometry2, geometry1, strategy, result);
+ }
+
+};
+
+
+template<typename Point1, typename Point2>
+struct distance_info
+ <
+ Point1, Point2,
+ point_tag, point_tag, false
+ > : public detail::distance_info::point_point<Point1, Point2>
+{};
+
+
+template<typename Point, typename Segment>
+struct distance_info
+ <
+ Point, Segment,
+ point_tag, segment_tag,
+ false
+ >
+{
+ template <typename Strategy, typename Result>
+ static inline void apply(Point const& point, Segment const& segment,
+ Strategy const& strategy, Result& result)
+ {
+
+ typename point_type<Segment>::type p[2];
+ geometry::detail::assign_point_from_index<0>(segment, p[0]);
+ geometry::detail::assign_point_from_index<1>(segment, p[1]);
+
+ strategy.apply(point, p[0], p[1], result);
+ }
+};
+
+
+//template
+//<
+// typename Point, typename Ring,
+// typename Point
+//>
+//struct distance_info
+// <
+// point_tag, ring_tag,
+// Point, Ring,
+// Point
+// >
+// : detail::distance_info::point_range<Point, Ring, Point>
+//{};
+//
+//
+template<typename Point, typename Linestring>
+struct distance_info
+ <
+ Point, Linestring,
+ point_tag, linestring_tag,
+ false
+ >
+ : detail::distance_info::point_range<Point, Linestring>
+{};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+
+template <typename Geometry1, typename Geometry2, typename Result>
+inline void distance_info(Geometry1 const& geometry1, Geometry2 const& geometry2, Result& result)
+{
+ concept::check<Geometry1 const>();
+ concept::check<Geometry2 const>();
+ concept::check<typename Result::point_type>();
+
+ assert_dimension_equal<Geometry1, Geometry2>();
+ assert_dimension_equal<Geometry1, typename Result::point_type>();
+
+ detail::throw_on_empty_input(geometry1);
+ detail::throw_on_empty_input(geometry2);
+
+ strategy::distance::calculate_distance_info<> info_strategy;
+
+
+ dispatch::distance_info
+ <
+ Geometry1,
+ Geometry2
+ >::apply(geometry1, geometry2, info_strategy, result);
+}
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DISTANCE_INFO_HPP
Added: trunk/boost/geometry/extensions/strategies/cartesian/distance_info.hpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/boost/geometry/extensions/strategies/cartesian/distance_info.hpp 2013-11-01 15:49:06 EDT (Fri, 01 Nov 2013) (r86538)
@@ -0,0 +1,180 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2013 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2013 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2013 Mateusz Loskot, London, UK.
+// Copyright (c) 2013 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_STRATEGY_CARTESIAN_DISTANCE_INFO_HPP
+#define BOOST_GEOMETRY_STRATEGY_CARTESIAN_DISTANCE_INFO_HPP
+
+#include <boost/type_traits/remove_const.hpp>
+
+#include <boost/geometry/core/access.hpp>
+#include <boost/geometry/core/point_type.hpp>
+
+#include <boost/geometry/algorithms/convert.hpp>
+#include <boost/geometry/arithmetic/arithmetic.hpp>
+#include <boost/geometry/arithmetic/dot_product.hpp>
+
+#include <boost/geometry/strategies/tags.hpp>
+#include <boost/geometry/strategies/distance.hpp>
+#include <boost/geometry/strategies/default_distance_result.hpp>
+#include <boost/geometry/strategies/cartesian/distance_pythagoras.hpp>
+
+#include <boost/geometry/util/select_coordinate_type.hpp>
+
+#include <boost/geometry/algorithms/detail/overlay/segment_identifier.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+template <typename Point>
+struct distance_info_result
+{
+ typedef Point point_type;
+ typedef typename default_distance_result<Point>::type distance_type;
+
+ bool on_segment;
+ bool within_geometry;
+ distance_type real_distance;
+ Point projected_point1; // A on B
+ Point projected_point2; // B on A
+ distance_type projected_distance1;
+ distance_type projected_distance2;
+ distance_type fraction1;
+ distance_type fraction2;
+ segment_identifier seg_id1;
+ segment_identifier seg_id2;
+
+ inline distance_info_result()
+ : on_segment(false)
+ , within_geometry(false)
+ , fraction1(distance_type())
+ , fraction2(distance_type())
+ , real_distance(distance_type())
+ , projected_distance1(distance_type())
+ , projected_distance2(distance_type())
+ {}
+};
+
+
+namespace strategy { namespace distance
+{
+
+template
+<
+ typename CalculationType = void,
+ typename Strategy = pythagoras<CalculationType>
+>
+struct calculate_distance_info
+{
+public :
+ // The three typedefs below are necessary to calculate distances
+ // from segments defined in integer coordinates.
+
+ // Integer coordinates can still result in FP distances.
+ // There is a division, which must be represented in FP.
+ // So promote.
+ template <typename Point, typename PointOfSegment>
+ struct calculation_type
+ : promote_floating_point
+ <
+ typename strategy::distance::services::return_type
+ <
+ Strategy,
+ Point,
+ PointOfSegment
+ >::type
+ >
+ {};
+
+
+public :
+
+ // Helper function
+ template <typename Point1, typename Point2>
+ inline typename calculation_type<Point1, Point2>::type
+ apply_point_point(Point1 const& p1, Point2 const& p2) const
+ {
+ Strategy point_point_strategy;
+ boost::ignore_unused_variable_warning(point_point_strategy);
+ return point_point_strategy.apply(p1, p2);
+ }
+
+ template <typename Point, typename PointOfSegment, typename Result>
+ inline void apply(Point const& p,
+ PointOfSegment const& p1, PointOfSegment const& p2,
+ Result& result) const
+ {
+ assert_dimension_equal<Point, PointOfSegment>();
+
+ typedef typename calculation_type<Point, PointOfSegment>::type calculation_type;
+
+ //// A projected point of points in Integer coordinates must be able to be
+ //// represented in FP.
+ typedef model::point
+ <
+ calculation_type,
+ dimension<PointOfSegment>::value,
+ typename coordinate_system<PointOfSegment>::type
+ > fp_point_type;
+
+ // For convenience
+ typedef fp_point_type fp_vector_type;
+
+
+
+ // For source-code-comments, see "cartesian/distance_distance_info.hpp"
+ fp_vector_type v, w;
+
+ geometry::convert(p2, v);
+ geometry::convert(p, w);
+ subtract_point(v, p1);
+ subtract_point(w, p1);
+
+ calculation_type const zero = calculation_type();
+
+ calculation_type const c1 = dot_product(w, v);
+ calculation_type const c2 = dot_product(v, v);
+
+ result.on_segment = c1 >= zero && c1 <= c2;
+
+ Strategy point_point_strategy;
+ boost::ignore_unused_variable_warning(point_point_strategy);
+
+ if (geometry::math::equals(c2, zero))
+ {
+ geometry::convert(p1, result.projected_point1);
+ result.fraction1 = 0.0;
+ result.on_segment = false;
+ result.projected_distance1 = result.real_distance = apply_point_point(p, p1);
+ return;
+ }
+
+ calculation_type const b = c1 / c2;
+ result.fraction1 = b;
+
+ geometry::convert(p1, result.projected_point1);
+ multiply_value(v, b);
+ add_point(result.projected_point1, v);
+ result.projected_distance1 = apply_point_point(p, result.projected_point1);
+ result.real_distance
+ = c1 < zero ? apply_point_point(p, p1)
+ : c1 > c2 ? apply_point_point(p, p2)
+ : result.projected_distance1;
+ }
+};
+
+}} // namespace strategy::distance
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_STRATEGY_CARTESIAN_DISTANCE_INFO_HPP
Modified: trunk/libs/geometry/extensions/test/algorithms/Jamfile.v2
==============================================================================
--- trunk/libs/geometry/extensions/test/algorithms/Jamfile.v2 Fri Nov 1 11:29:16 2013 (r86537)
+++ trunk/libs/geometry/extensions/test/algorithms/Jamfile.v2 2013-11-01 15:49:06 EDT (Fri, 01 Nov 2013) (r86538)
@@ -11,6 +11,7 @@
test-suite boost-geometry-extensions-algorithms
:
[ run dissolve.cpp ]
+ [ run distance_info.cpp ]
[ run connect.cpp ]
[ run offset.cpp ]
[ run midpoints.cpp ]
Added: trunk/libs/geometry/extensions/test/algorithms/distance_info.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/libs/geometry/extensions/test/algorithms/distance_info.cpp 2013-11-01 15:49:06 EDT (Fri, 01 Nov 2013) (r86538)
@@ -0,0 +1,132 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2013 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2013 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2013 Mateusz Loskot, London, UK.
+// Copyright (c) 2013 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)
+
+#include <string>
+
+#include <geometry_test_common.hpp>
+
+#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/algorithms/equals.hpp>
+#include <boost/geometry/algorithms/make.hpp>
+#include <boost/geometry/extensions/algorithms/distance_info.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>
+
+
+template <typename Result>
+void check_distance_info(Result const& result,
+ std::string const& expected_pp,
+ bool expected_on_segment,
+ double expected_projected_distance,
+ double expected_real_distance,
+ double expected_fraction)
+{
+ if (! expected_pp.empty())
+ {
+ std::ostringstream out;
+ out << bg::wkt(result.projected_point1);
+ std::string wkt_projected = out.str();
+
+ BOOST_CHECK_EQUAL(wkt_projected, expected_pp);
+ }
+ BOOST_CHECK_EQUAL(result.on_segment, expected_on_segment);
+ BOOST_CHECK_CLOSE(result.fraction1, expected_fraction, 0.001);
+ BOOST_CHECK_CLOSE(result.projected_distance1, expected_projected_distance, 0.001);
+ BOOST_CHECK_CLOSE(result.real_distance, expected_real_distance, 0.001);
+}
+
+template <typename Geometry1, typename Geometry2>
+void test_distance_info(Geometry1 const& geometry1, Geometry2 const& geometry2,
+ std::string const& expected_pp,
+ bool expected_on_segment,
+ double expected_projected_distance,
+ double expected_real_distance,
+ double expected_fraction)
+{
+ typename bg::distance_info_result<typename bg::point_type<Geometry1>::type> result, reversed_result;
+ bg::distance_info(geometry1, geometry2, result);
+ check_distance_info(result,
+ expected_pp, expected_on_segment,
+ expected_projected_distance, expected_real_distance,
+ expected_fraction);
+
+ // Check reversed version too.
+ std::string reversed_expected_pp = expected_pp;
+ if (boost::is_same<typename bg::tag<Geometry1>::type, bg::point_tag>::value
+ && boost::is_same<typename bg::tag<Geometry2>::type, bg::point_tag>::value
+ )
+ {
+ // For point-point, we cannot check projected-point again, it is also the other one.
+ reversed_expected_pp.clear();
+ }
+ bg::distance_info(geometry2, geometry1, reversed_result);
+ check_distance_info(reversed_result,
+ reversed_expected_pp,
+ expected_on_segment,
+ expected_projected_distance, expected_real_distance,
+ expected_fraction);
+}
+
+template <typename Geometry1>
+void test_distance_info(std::string const& wkt, std::string const& wkt_point,
+ std::string const& expected_pp,
+ bool expected_on_segment,
+ double expected_projected_distance,
+ double expected_real_distance,
+ double expected_fraction)
+{
+ Geometry1 geometry1;
+ typename bg::point_type<Geometry1>::type point;
+ bg::read_wkt(wkt, geometry1);
+ bg::read_wkt(wkt_point, point);
+
+ test_distance_info(geometry1, point, expected_pp, expected_on_segment,
+ expected_projected_distance, expected_real_distance,
+ expected_fraction);
+}
+
+template <typename P>
+void test_2d()
+{
+ test_distance_info<bg::model::segment<P> >("LINESTRING(2 0,4 0)", "POINT(3 2)", "POINT(3 0)", true, 2.0, 2.0, 0.5);
+ test_distance_info<bg::model::segment<P> >("LINESTRING(2 0,4 0)", "POINT(2 0)", "POINT(2 0)", true, 0.0, 0.0, 0.0);
+ test_distance_info<bg::model::segment<P> >("LINESTRING(2 0,4 0)", "POINT(4 0)", "POINT(4 0)", true, 0.0, 0.0, 1.0);
+ test_distance_info<bg::model::segment<P> >("LINESTRING(2 0,4 0)", "POINT(5 2)", "POINT(5 0)", false, 2.0, sqrt(5.0), 1.5);
+ test_distance_info<bg::model::segment<P> >("LINESTRING(2 0,4 0)", "POINT(0 2)", "POINT(0 0)", false, 2.0, sqrt(8.0), -1.0);
+
+ // Degenerated segment
+ test_distance_info<bg::model::segment<P> >("LINESTRING(2 0,2 0)", "POINT(4 0)", "POINT(2 0)", false, 2.0, 2.0, 0.0);
+
+ // Linestring
+ test_distance_info<bg::model::linestring<P> >("LINESTRING(2 0,4 0)", "POINT(3 2)", "POINT(3 0)", true, 2.0, 2.0, 0.5);
+
+
+ // Point-point
+ test_distance_info<P>("Point(1 1)", "POINT(2 2)", "POINT(2 2)", false, sqrt(2.0), sqrt(2.0), 0.0);
+}
+
+template <typename P>
+void test_3d()
+{
+ test_distance_info<bg::model::segment<P> >("LINESTRING(0 0 0,5 5 5)", "POINT(2 3 4)", "POINT(3 3 3)", true, sqrt(2.0), sqrt(2.0), 0.6);
+}
+
+int test_main(int, char* [])
+{
+ test_2d<bg::model::d2::point_xy<int> >();
+ test_2d<bg::model::d2::point_xy<float> >();
+ test_2d<bg::model::d2::point_xy<double> >();
+
+ test_3d<bg::model::point<double, 3, bg::cs::cartesian> >();
+
+ return 0;
+}