|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r68370 - in trunk: boost/geometry/algorithms boost/geometry/extensions/algorithms boost/geometry/geometries boost/geometry/strategies boost/geometry/strategies/cartesian boost/geometry/strategies/spherical libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk libs/geometry/test/algorithms
From: barend.gehrels_at_[hidden]
Date: 2011-01-22 13:51:50
Author: barendgehrels
Date: 2011-01-22 13:51:45 EST (Sat, 22 Jan 2011)
New Revision: 68370
URL: http://svn.boost.org/trac/boost/changeset/68370
Log:
Doc update
Renamed area_by_triangles.hpp to area_surveyor.hpp because most files are named to their inventor or formula
Added:
trunk/boost/geometry/strategies/cartesian/area_surveyor.hpp
- copied, changed from r68231, /trunk/boost/geometry/strategies/cartesian/area_by_triangles.hpp
Removed:
trunk/boost/geometry/strategies/cartesian/area_by_triangles.hpp
Text files modified:
trunk/boost/geometry/algorithms/area.hpp | 16 ++++++++++++++--
trunk/boost/geometry/algorithms/distance.hpp | 17 ++++++++++-------
trunk/boost/geometry/extensions/algorithms/mark_spikes.hpp | 18 +++++++++---------
trunk/boost/geometry/geometries/point_xy.hpp | 14 ++++++++------
trunk/boost/geometry/strategies/cartesian/area_surveyor.hpp | 26 +++++++++++++++++---------
trunk/boost/geometry/strategies/cartesian/distance_projected_point.hpp | 13 ++++++++++---
trunk/boost/geometry/strategies/cartesian/distance_pythagoras.hpp | 26 ++++++++++++++++++++------
trunk/boost/geometry/strategies/spherical/area_huiller.hpp | 15 ++++++++++++++-
trunk/boost/geometry/strategies/spherical/distance_cross_track.hpp | 13 ++++++++++---
trunk/boost/geometry/strategies/spherical/distance_haversine.hpp | 29 +++++++++++++++++++++++++----
trunk/boost/geometry/strategies/strategies.hpp | 2 +-
trunk/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml_parser.hpp | 4 ++--
trunk/libs/geometry/test/algorithms/test_area.hpp | 4 ++--
13 files changed, 142 insertions(+), 55 deletions(-)
Modified: trunk/boost/geometry/algorithms/area.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/area.hpp (original)
+++ trunk/boost/geometry/algorithms/area.hpp 2011-01-22 13:51:45 EST (Sat, 22 Jan 2011)
@@ -214,6 +214,7 @@
\return \return_calc{area}
\qbk{[include ref/algorithms/area.qbk]}
+\qbk{[heading Examples]}
\qbk{[area] [area_output]}
*/
template <typename Geometry>
@@ -247,8 +248,19 @@
\return \return_calc{area}
\qbk{distinguish,with strategy}
-\qbk{[include ref/algorithms/area.qbk]}
-\qbk{[area_with_strategy] [area_with_strategy_output]}
+
+\qbk_begin
+[include ref/algorithms/area.qbk]
+
+[heading Example]
+[area_with_strategy]
+[area_with_strategy_output]
+
+[heading Available strategies]
+\* [link geometry.reference.strategies.strategy_area_surveyor Surveyor (cartesian)]
+\* [link geometry.reference.strategies.strategy_area_huiller Huiller (spherical)]
+
+\qbk_end
*/
template <typename Geometry, typename Strategy>
inline typename Strategy::return_type area(
Modified: trunk/boost/geometry/algorithms/distance.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/distance.hpp (original)
+++ trunk/boost/geometry/algorithms/distance.hpp 2011-01-22 13:51:45 EST (Sat, 22 Jan 2011)
@@ -466,7 +466,7 @@
\tparam Geometry1 \tparam_geometry
\tparam Geometry2 \tparam_geometry
-\tparam Strategy \tparam_strategy{distance}
+\tparam Strategy \tparam_strategy{Distance}
\param geometry1 \param_geometry
\param geometry2 \param_geometry
\param strategy \param_strategy{distance}
@@ -476,12 +476,15 @@
\qbk{distinguish,with strategy}
-\par Example:
-Example showing distance calculation of two lat long points, using the accurate Vincenty approximation
-\dontinclude doxygen_1.cpp
-\skip example_distance_point_point_strategy
-\line {
-\until }
+\qbk_begin
+
+[heading Available strategies]
+\* [link geometry.reference.strategies.strategy_distance_pythagoras Pythagoras (cartesian)]
+\* [link geometry.reference.strategies.strategy_distance_haversine Haversine (spherical)]
+\* [link geometry.reference.strategies.strategy_distance_cross_track Cross track (spherical, point-to-segment)]
+\* [link geometry.reference.strategies.strategy_distance_projected_point Projected point (cartesian, point-to-segment)]
+\qbk_end
+
*/
/*
Modified: trunk/boost/geometry/extensions/algorithms/mark_spikes.hpp
==============================================================================
--- trunk/boost/geometry/extensions/algorithms/mark_spikes.hpp (original)
+++ trunk/boost/geometry/extensions/algorithms/mark_spikes.hpp 2011-01-22 13:51:45 EST (Sat, 22 Jan 2011)
@@ -20,7 +20,7 @@
#include <boost/geometry/core/interior_rings.hpp>
#include <boost/geometry/geometries/concepts/check.hpp>
#include <boost/geometry/strategies/cartesian/distance_pythagoras.hpp>
-#include <boost/geometry/strategies/cartesian/area_by_triangles.hpp>
+#include <boost/geometry/strategies/cartesian/area_surveyor.hpp>
#include <boost/geometry/util/math.hpp>
#include <boost/geometry/algorithms/detail/sections/sectionalize.hpp>
@@ -174,7 +174,7 @@
point_type
>::type distance_strategy_type;
- static inline void apply(Range const& range, ring_identifier id,
+ static inline void apply(Range const& range, ring_identifier id,
MarkMap& mark_map, Policy const& policy)
{
std::size_t const n = boost::size(range);
@@ -337,7 +337,7 @@
{
if (i != it->index1 && i != it->index2)
{
- bits[i] = true;
+ bits[i] = true;
}
pit = circular_next(range, pit);
i = circular_next_i(i, n);
@@ -350,7 +350,7 @@
template <typename Polygon, typename MarkMap, typename Policy>
struct polygon_mark_spikes
{
- static inline void apply(Polygon const& polygon, ring_identifier id,
+ static inline void apply(Polygon const& polygon, ring_identifier id,
MarkMap& mark_map, Policy const& policy)
{
typedef typename geometry::ring_type<Polygon>::type ring_type;
@@ -376,7 +376,7 @@
template <typename MultiGeometry, typename MarkMap, typename Policy, typename SinglePolicy>
struct multi_mark_spikes
{
- static inline void apply(MultiGeometry const& multi, ring_identifier id,
+ static inline void apply(MultiGeometry const& multi, ring_identifier id,
MarkMap& mark_map, Policy const& policy)
{
id.multi_index = 0;
@@ -457,8 +457,8 @@
\param geometry the geometry to make mark_spikes
*/
template <typename Geometry, typename MarkMap, typename Policy>
-inline bool mark_spikes(Geometry const& geometry,
- MarkMap& mark_map,
+inline bool mark_spikes(Geometry const& geometry,
+ MarkMap& mark_map,
Policy const& policy)
{
concept::check<Geometry const>();
@@ -490,11 +490,11 @@
return m_gap_width;
}
- inline bool apply(T const gap_distance, T const whole_area,
+ inline bool apply(T const gap_distance, T const whole_area,
int count, T const area, T const perimeter) const
{
T const ratio = perimeter == 0 ? 0 : area / perimeter;
- return
+ return
perimeter > gap_distance
&& area < whole_area / 10.0
&& ratio < m_ratio;
Modified: trunk/boost/geometry/geometries/point_xy.hpp
==============================================================================
--- trunk/boost/geometry/geometries/point_xy.hpp (original)
+++ trunk/boost/geometry/geometries/point_xy.hpp 2011-01-22 13:51:45 EST (Sat, 22 Jan 2011)
@@ -23,9 +23,9 @@
{
/*!
- \brief 2D point in Cartesian coordinate system
- \ingroup geometries
- \tparam T numeric type, arguments can be, for example, double, float, int
+\brief 2D point in Cartesian coordinate system
+\tparam CoordinateType numeric type, for example, double, float, int
+\tparam CoordinateSystem coordinate system, defaults to cs::cartesian
*/
template<typename CoordinateType, typename CoordinateSystem = cs::cartesian>
class point_xy : public model::point<CoordinateType, 2, CoordinateSystem>
@@ -34,11 +34,13 @@
/// Default constructor, does not initialize anything
inline point_xy()
- : model::point<CoordinateType, 2, CoordinateSystem>() {}
+ : model::point<CoordinateType, 2, CoordinateSystem>()
+ {}
/// Constructor with x/y values
inline point_xy(CoordinateType const& x, CoordinateType const& y)
- : model::point<CoordinateType, 2, CoordinateSystem>(x, y) {}
+ : model::point<CoordinateType, 2, CoordinateSystem>(x, y)
+ {}
/// Get x-value
inline CoordinateType const& x() const
@@ -58,7 +60,7 @@
};
-}} // namespace model::xy
+}} // namespace model::d2
// Adapt the point_xy to the concept
Deleted: trunk/boost/geometry/strategies/cartesian/area_by_triangles.hpp
==============================================================================
--- trunk/boost/geometry/strategies/cartesian/area_by_triangles.hpp 2011-01-22 13:51:45 EST (Sat, 22 Jan 2011)
+++ (empty file)
@@ -1,118 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands.
-// Copyright Bruno Lalande 2008, 2009
-// 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_STRATEGIES_CARTESIAN_AREA_BY_TRIANGLES_HPP
-#define BOOST_GEOMETRY_STRATEGIES_CARTESIAN_AREA_BY_TRIANGLES_HPP
-
-
-#include <boost/mpl/if.hpp>
-#include <boost/type_traits.hpp>
-
-#include <boost/geometry/geometries/point_xy.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-namespace strategy { namespace area
-{
-
-/*!
-\brief Strategy functor for area calculation on point_xy points
-\ingroup strategies
-\details Calculates area using well-known triangulation algorithm
-\tparam PointOfSegment point type of segments
-*/
-template
-<
- typename PointOfSegment,
- typename CalculationType = void
->
-class by_triangles
-{
-public :
- // If user specified a calculation type, use that type,
- // whatever it is and whatever the point-type is.
- // Else, use the pointtype, but at least double
- typedef typename
- boost::mpl::if_c
- <
- boost::is_void<CalculationType>::type::value,
- typename select_most_precise
- <
- typename coordinate_type<PointOfSegment>::type,
- double
- >::type,
- CalculationType
- >::type return_type;
-
-
-private :
-
- class summation
- {
- friend class by_triangles;
-
- return_type sum;
- public :
-
- inline summation() : sum(return_type())
- {
- // Strategy supports only 2D areas
- assert_dimension<PointOfSegment, 2>();
- }
- inline return_type area() const
- {
- return_type result = sum;
- result *= 0.5;
- return result;
- }
- };
-
-public :
- typedef summation state_type;
- typedef PointOfSegment segment_point_type;
-
- static inline void apply(PointOfSegment const& p1,
- PointOfSegment const& p2,
- summation& state)
- {
- // SUM += x2 * y1 - x1 * y2;
- state.sum += get<0>(p2) * get<1>(p1) - get<0>(p1) * get<1>(p2);
- }
-
- static inline return_type result(summation const& state)
- {
- return state.area();
- }
-
-};
-
-#ifndef DOXYGEN_NO_STRATEGY_SPECIALIZATIONS
-
-namespace services
-{
- template <typename Point>
- struct default_strategy<cartesian_tag, Point>
- {
- typedef strategy::area::by_triangles<Point> type;
- };
-
-} // namespace services
-
-#endif // DOXYGEN_NO_STRATEGY_SPECIALIZATIONS
-
-
-}} // namespace strategy::area
-
-
-
-}} // namespace boost::geometry
-
-
-#endif // BOOST_GEOMETRY_STRATEGIES_CARTESIAN_AREA_BY_TRIANGLES_HPP
Copied: trunk/boost/geometry/strategies/cartesian/area_surveyor.hpp (from r68231, /trunk/boost/geometry/strategies/cartesian/area_by_triangles.hpp)
==============================================================================
--- /trunk/boost/geometry/strategies/cartesian/area_by_triangles.hpp (original)
+++ trunk/boost/geometry/strategies/cartesian/area_surveyor.hpp 2011-01-22 13:51:45 EST (Sat, 22 Jan 2011)
@@ -6,8 +6,8 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_GEOMETRY_STRATEGIES_CARTESIAN_AREA_BY_TRIANGLES_HPP
-#define BOOST_GEOMETRY_STRATEGIES_CARTESIAN_AREA_BY_TRIANGLES_HPP
+#ifndef BOOST_GEOMETRY_STRATEGIES_CARTESIAN_AREA_SURVEYOR_HPP
+#define BOOST_GEOMETRY_STRATEGIES_CARTESIAN_AREA_SURVEYOR_HPP
#include <boost/mpl/if.hpp>
@@ -23,17 +23,25 @@
{
/*!
-\brief Strategy functor for area calculation on point_xy points
+\brief Area calculation for cartesian points
\ingroup strategies
-\details Calculates area using well-known triangulation algorithm
-\tparam PointOfSegment point type of segments
+\details Calculates area using the Surveyor's formula, a well-known
+ triangulation algorithm
+\tparam PointOfSegment point type of segments of rings/polygons
+\tparam CalculationType \tparam_calculation
+
+\qbk_begin
+[heading See also]
+[link geometry.reference.algorithms.area.area_2_with_strategy area]
+\qbk_end
+
*/
template
<
typename PointOfSegment,
typename CalculationType = void
>
-class by_triangles
+class surveyor
{
public :
// If user specified a calculation type, use that type,
@@ -56,7 +64,7 @@
class summation
{
- friend class by_triangles;
+ friend class surveyor;
return_type sum;
public :
@@ -100,7 +108,7 @@
template <typename Point>
struct default_strategy<cartesian_tag, Point>
{
- typedef strategy::area::by_triangles<Point> type;
+ typedef strategy::area::surveyor<Point> type;
};
} // namespace services
@@ -115,4 +123,4 @@
}} // namespace boost::geometry
-#endif // BOOST_GEOMETRY_STRATEGIES_CARTESIAN_AREA_BY_TRIANGLES_HPP
+#endif // BOOST_GEOMETRY_STRATEGIES_CARTESIAN_AREA_SURVEYOR_HPP
Modified: trunk/boost/geometry/strategies/cartesian/distance_projected_point.hpp
==============================================================================
--- trunk/boost/geometry/strategies/cartesian/distance_projected_point.hpp (original)
+++ trunk/boost/geometry/strategies/cartesian/distance_projected_point.hpp 2011-01-22 13:51:45 EST (Sat, 22 Jan 2011)
@@ -47,13 +47,20 @@
\ingroup strategies
\details Calculates distance using projected-point method, and (optionally) Pythagoras
\author Adapted from: http://geometryalgorithms.com/Archive/algorithm_0102/algorithm_0102.htm
-\tparam P point type
-\tparam PointOfSegment segment type
-\tparam Strategy strategy, optional, defaults to pythagoras
+\tparam Point point type
+\tparam PointOfSegment \tparam_optional_segment_point
+\tparam CalculationType \tparam_calculation
+\tparam Strategy strategy, optional, underlying point-point distance strategy, defaults to pythagoras
\par Concepts for Strategy:
- cartesian_distance operator(Point,Point)
\note If the Strategy is a "comparable::pythagoras", this strategy
automatically is a comparable projected_point strategy (so without sqrt)
+
+\qbk_begin
+[heading See also]
+[link geometry.reference.algorithms.distance.distance_3_with_strategy distance]
+\qbk_end
+
*/
template
<
Modified: trunk/boost/geometry/strategies/cartesian/distance_pythagoras.hpp
==============================================================================
--- trunk/boost/geometry/strategies/cartesian/distance_pythagoras.hpp (original)
+++ trunk/boost/geometry/strategies/cartesian/distance_pythagoras.hpp 2011-01-22 13:51:45 EST (Sat, 22 Jan 2011)
@@ -64,11 +64,11 @@
{
/*!
-\brief Strategy for comparable distance point to point: comparable_pythagoras
+\brief Strategy to calculate comparable distance between two points
\ingroup strategies
\tparam Point1 first point type
-\tparam Point2 optional, second point type, defaults to first point type
-\tparam CalculationType optional, specify type of calculation
+\tparam Point2 \tparam_optional_second_point
+\tparam CalculationType \tparam_calculation
*/
template
<
@@ -109,11 +109,19 @@
/*!
-\brief Strategy for distance point to point: pythagoras
+\brief Strategy to calculate the distance between two points
\ingroup strategies
\tparam Point1 first point type
-\tparam Point2 optional, second point type, defaults to first point type
-\tparam CalculationType optional, specify type of calculation
+\tparam Point2 \tparam_optional_second_point
+\tparam CalculationType \tparam_calculation
+
+\qbk_begin
+[heading Notes]
+[note Can be used for points with two, three or more dimensions]
+[heading See also]
+[link geometry.reference.algorithms.distance.distance_3_with_strategy distance]
+\qbk_end
+
*/
template
<
@@ -130,6 +138,12 @@
typename services::return_type<comparable_type>::type
>::type calculation_type;
+ /*!
+ \brief applies the distance calculation using pythagoras
+ \return the calculated distance (including taking the square root)
+ \param p1 first point
+ \param p2 second point
+ */
static inline calculation_type apply(Point1 const& p1, Point2 const& p2)
{
calculation_type const t = comparable_type::apply(p1, p2);
Modified: trunk/boost/geometry/strategies/spherical/area_huiller.hpp
==============================================================================
--- trunk/boost/geometry/strategies/spherical/area_huiller.hpp (original)
+++ trunk/boost/geometry/strategies/spherical/area_huiller.hpp 2011-01-22 13:51:45 EST (Sat, 22 Jan 2011)
@@ -29,7 +29,8 @@
/*!
\brief Area calculation by spherical excess / Huiller's formula
\ingroup strategies
-\tparam P type of points of rings/polygons
+\tparam PointOfSegment point type of segments of rings/polygons
+\tparam CalculationType \tparam_calculation
\author Barend Gehrels. Adapted from:
- http://www.soe.ucsc.edu/~pang/160/f98/Gems/GemsIV/sph_poly.c
- http://williams.best.vwh.net/avform.htm
@@ -43,6 +44,18 @@
http://trs-new.jpl.nasa.gov/dspace/bitstream/2014/40409/1/07-03.pdf, is simple
and works well in most cases but not in 180 meridian crossing cases. This probably
could be solved.
+
+\qbk_begin
+
+[heading Example]
+[area_with_strategy]
+[area_with_strategy_output]
+
+
+[heading See also]
+[link geometry.reference.algorithms.area.area_2_with_strategy area]
+\qbk_end
+
*/
template
<
Modified: trunk/boost/geometry/strategies/spherical/distance_cross_track.hpp
==============================================================================
--- trunk/boost/geometry/strategies/spherical/distance_cross_track.hpp (original)
+++ trunk/boost/geometry/strategies/spherical/distance_cross_track.hpp 2011-01-22 13:51:45 EST (Sat, 22 Jan 2011)
@@ -25,7 +25,6 @@
#include <boost/geometry/util/promote_floating_point.hpp>
#include <boost/geometry/util/math.hpp>
-//#define BOOST_GEOMETRY_DEBUG_CROSS_TRACK
#ifdef BOOST_GEOMETRY_DEBUG_CROSS_TRACK
# include <boost/geometry/util/write_dsv.hpp>
#endif
@@ -44,7 +43,15 @@
\details Class which calculates the distance of a point to a segment, using latlong points
\see http://williams.best.vwh.net/avform.htm
\tparam Point point type
-\tparam PointOfSegment type of point-of-segment
+\tparam PointOfSegment \tparam_optional_segment_point
+\tparam CalculationType \tparam_calculation
+\tparam Strategy strategy, optional, underlying point-point distance strategy, defaults to haversine
+
+\qbk_begin
+[heading See also]
+[link geometry.reference.algorithms.distance.distance_3_with_strategy distance]
+\qbk_end
+
*/
template
<
@@ -181,7 +188,7 @@
<
typename Point,
typename PointOfSegment,
- typename CalculationType,
+ typename CalculationType,
typename Strategy,
typename P,
typename PS
Modified: trunk/boost/geometry/strategies/spherical/distance_haversine.hpp
==============================================================================
--- trunk/boost/geometry/strategies/spherical/distance_haversine.hpp (original)
+++ trunk/boost/geometry/strategies/spherical/distance_haversine.hpp 2011-01-22 13:51:45 EST (Sat, 22 Jan 2011)
@@ -96,8 +96,9 @@
\brief Distance calculation for spherical coordinates
on a perfect sphere using haversine
\ingroup strategies
-\tparam P1 first point type
-\tparam P2 optional second point type
+\tparam Point1 first point type
+\tparam Point2 \tparam_optional_second_point
+\tparam CalculationType \tparam_calculation
\author Adapted from: http://williams.best.vwh.net/avform.htm
\see http://en.wikipedia.org/wiki/Great-circle_distance
\note It says: <em>The great circle distance d between two
@@ -108,6 +109,12 @@
d=2*asin(sqrt((sin((lat1-lat2)/2))^2
+ cos(lat1)*cos(lat2)*(sin((lon1-lon2)/2))^2))
</em>
+
+\qbk_begin
+[heading See also]
+[link geometry.reference.algorithms.distance.distance_3_with_strategy distance]
+\qbk_end
+
*/
template
<
@@ -123,10 +130,20 @@
typedef typename services::return_type<comparable_type>::type calculation_type;
- inline haversine(calculation_type const& r = 1.0)
- : m_radius(r)
+ /*!
+ \brief Constructor
+ \param radius radius of the sphere, defaults to 1.0 for the unit sphere
+ */
+ inline haversine(calculation_type const& radius = 1.0)
+ : m_radius(radius)
{}
+ /*!
+ \brief applies the distance calculation
+ \return the calculated distance (including multiplying with radius)
+ \param p1 first point
+ \param p2 second point
+ */
inline calculation_type apply(Point1 const& p1, Point2 const& p2) const
{
calculation_type const a = comparable_type::apply(p1, p2);
@@ -134,6 +151,10 @@
return m_radius * c;
}
+ /*!
+ \brief access to radius value
+ \return the radius
+ */
inline calculation_type radius() const
{
return m_radius;
Modified: trunk/boost/geometry/strategies/strategies.hpp
==============================================================================
--- trunk/boost/geometry/strategies/strategies.hpp (original)
+++ trunk/boost/geometry/strategies/strategies.hpp 2011-01-22 13:51:45 EST (Sat, 22 Jan 2011)
@@ -23,7 +23,7 @@
#include <boost/geometry/strategies/transform.hpp>
#include <boost/geometry/strategies/within.hpp>
-#include <boost/geometry/strategies/cartesian/area_by_triangles.hpp>
+#include <boost/geometry/strategies/cartesian/area_surveyor.hpp>
#include <boost/geometry/strategies/cartesian/centroid_bashein_detmer.hpp>
#include <boost/geometry/strategies/cartesian/distance_pythagoras.hpp>
#include <boost/geometry/strategies/cartesian/distance_projected_point.hpp>
Modified: trunk/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml_parser.hpp
==============================================================================
--- trunk/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml_parser.hpp (original)
+++ trunk/libs/geometry/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml_parser.hpp 2011-01-22 13:51:45 EST (Sat, 22 Jan 2011)
@@ -215,11 +215,11 @@
}
else if (full == ".detaileddescription.para.qbk")
{
- el.qbk_markup.push_back(markup(0, boost::trim_copy(std::string(node->value()))));
+ el.qbk_markup.push_back(markup(0, node->value()));
}
else if (full == ".detaileddescription.para.qbk.include")
{
- el.qbk_markup.push_back(markup(1, boost::trim_copy(std::string(node->value()))));
+ el.qbk_markup.push_back(markup(1, node->value()));
}
else if (full == ".detaileddescription.para.qbk.distinguish")
{
Modified: trunk/libs/geometry/test/algorithms/test_area.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_area.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_area.hpp 2011-01-22 13:51:45 EST (Sat, 22 Jan 2011)
@@ -36,14 +36,14 @@
BOOST_CHECK_CLOSE(area, expected_area, 0.0001);
// Test with explicitly defined strategies
- bg::strategy::area::by_triangles
+ bg::strategy::area::surveyor
<
typename bg::point_type<Geometry>::type
> strategy1;
area = bg::area(geometry, strategy1);
- bg::strategy::area::by_triangles
+ bg::strategy::area::surveyor
<
typename bg::point_type<Geometry>::type,
long double
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk