boost/geometry
2
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2026-02-11 11:52:11 +00:00
Code Issues Projects Releases Wiki Activity

front() and back() helper functions moved to separate file, updated copyright info

Browse Source
This commit is contained in:
Adam Wulkiewicz
2014-02-03 18:38:04 +01:00
parent 30f06fede7
commit b7054cffc2
3 changed files with 74 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
include/boost/geometry/algorithms/detail/range_helpers.hpp Normal file
View File

@@ -0,0 +1,62 @@
// Boost.Geometry (aka GGL, Generic Geometry Library)
// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
// This file was modified by Oracle on 2013, 2014.
// Modifications copyright (c) 2013-2014 Oracle and/or its affiliates.
// 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)
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_RANGE_HELPERS_HPP
#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_RANGE_HELPERS_HPP
#include <boost/range.hpp>
namespace boost { namespace geometry
{
#ifndef DOXYGEN_NO_DETAIL
namespace detail { namespace range {
template <typename Range>
inline typename boost::range_value<Range>::type const&
front(Range const& rng)
{
BOOST_ASSERT(!boost::empty(rng));
return *boost::begin(rng);
}
template <typename Range>
inline typename boost::range_value<Range>::type &
front(Range & rng)
{
BOOST_ASSERT(!boost::empty(rng));
return *boost::begin(rng);
}
template <typename Range>
inline typename boost::range_value<Range>::type const&
back(Range const& rng)
{
BOOST_ASSERT(!boost::empty(rng));
return *(--boost::end(rng));
}
template <typename Range>
inline typename boost::range_value<Range>::type &
back(Range & rng)
{
BOOST_ASSERT(!boost::empty(rng));
return *(--boost::end(rng));
}
}} // namespace detail::range
#endif // DOXYGEN_NO_DETAIL
}} // namespace boost::geometry
#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_RANGE_HELPERS_HPP

48
include/boost/geometry/algorithms/detail/relate/linear_linear.hpp
View File

@@ -2,8 +2,8 @@
// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
// This file was modified by Oracle on 2013.
// Modifications copyright (c) 2013, Oracle and/or its affiliates.
// This file was modified by Oracle on 2013, 2014.
// Modifications copyright (c) 2013-2014 Oracle and/or its affiliates.
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -17,7 +17,7 @@
#include <boost/geometry/algorithms/detail/relate/turns.hpp>
#include <boost/geometry/algorithms/detail/sub_geometry.hpp>
#include <boost/range.hpp>
#include <boost/geometry/algorithms/detail/range_helpers.hpp>
namespace boost { namespace geometry
{
@@ -25,38 +25,6 @@ namespace boost { namespace geometry
#ifndef DOXYGEN_NO_DETAIL
namespace detail { namespace relate {
template <typename Range>
inline typename boost::range_value<Range>::type const&
front(Range const& rng)
{
BOOST_ASSERT(!boost::empty(rng));
return *boost::begin(rng);
}
template <typename Range>
inline typename boost::range_value<Range>::type &
front(Range & rng)
{
BOOST_ASSERT(!boost::empty(rng));
return *boost::begin(rng);
}
template <typename Range>
inline typename boost::range_value<Range>::type const&
back(Range const& rng)
{
BOOST_ASSERT(!boost::empty(rng));
return *(--boost::end(rng));
}
template <typename Range>
inline typename boost::range_value<Range>::type &
back(Range & rng)
{
BOOST_ASSERT(!boost::empty(rng));
return *(--boost::end(rng));
}
// currently works only for linestrings
template <typename Geometry1, typename Geometry2>
struct linear_linear
@@ -76,15 +44,15 @@ struct linear_linear
}
else if ( s1 == 1 && s2 == 1 )
{
return point_point<point1_type, point2_type>::apply(front(geometry1), front(geometry2));
return point_point<point1_type, point2_type>::apply(range::front(geometry1), range::front(geometry2));
}
else if ( s1 == 1 /*&& s2 > 1*/ )
{
return point_geometry<point1_type, Geometry2>::apply(front(geometry1), geometry2);
return point_geometry<point1_type, Geometry2>::apply(range::front(geometry1), geometry2);
}
else if ( s2 == 1 /*&& s1 > 1*/ )
{
return geometry_point<Geometry2, point2_type>::apply(geometry1, front(geometry2));
return geometry_point<Geometry2, point2_type>::apply(geometry1, range::front(geometry2));
}
// TODO: handle also linestrings with points_num == 2 and equals(front, back) - treat like point?
@@ -95,8 +63,8 @@ struct linear_linear
res.template set<exterior, exterior, '0' + dimension>();
// TODO: implement generic function working also for multilinestrings, also use it in point_in_geometry
bool has_boundary1 = ! detail::equals::equals_point_point(front(geometry1), back(geometry1));
bool has_boundary2 = ! detail::equals::equals_point_point(front(geometry2), back(geometry2));
bool has_boundary1 = ! detail::equals::equals_point_point(range::front(geometry1), range::back(geometry1));
bool has_boundary2 = ! detail::equals::equals_point_point(range::front(geometry2), range::back(geometry2));
handle_boundaries(res, geometry1, geometry2, has_boundary1, has_boundary2);

6
include/boost/geometry/algorithms/detail/relate/relate.hpp
View File

@@ -2,13 +2,15 @@
// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
// This file was modified by Oracle on 2013.
// Modifications copyright (c) 2013, Oracle and/or its affiliates.
// This file was modified by Oracle on 2013, 2014.
// Modifications copyright (c) 2013-2014 Oracle and/or its affiliates.
// 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)
// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_RELATE_HPP
#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_RELATE_HPP