Subject: [Boost-commit] svn:boost r72858 - in trunk/libs/geometry/test/algorithms: . overlay
From: barend.gehrels_at_[hidden]
Date: 2011-07-02 11:36:38
Author: barendgehrels
Date: 2011-07-02 11:36:37 EDT (Sat, 02 Jul 2011)
New Revision: 72858
URL: http://svn.boost.org/trac/boost/changeset/72858
Log:
Fixed two issues related to last commit
Text files modified:
trunk/libs/geometry/test/algorithms/difference.cpp | 12 ++++++------
trunk/libs/geometry/test/algorithms/overlay/select_rings.cpp | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
Modified: trunk/libs/geometry/test/algorithms/difference.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/difference.cpp (original)
+++ trunk/libs/geometry/test/algorithms/difference.cpp 2011-07-02 11:36:37 EDT (Sat, 02 Jul 2011)
@@ -218,23 +218,23 @@
1, 0, 3200.4,
0.01);
+#ifdef _MSC_VER
// 2011-07-02
// Interesting FP-precision case.
// sql server gives: 6.62295817619452E-05
// PostGIS gives: 0.0 (no output)
// Boost.Geometry gives results depending on FP-type, and compiler, and operating system.
+ // For double, it is zero (skipped). On gcc/Linux, for float either.
+ // Because we cannot predict this, we only test for MSVC
test_one<polygon, polygon, polygon>("ggl_list_20110627_phillip",
ggl_list_20110627_phillip[0], ggl_list_20110627_phillip[1],
if_typed<ct, double>(0, 1), 0,
if_typed<ct, double>(0.0, if_typed<ct, float>(0.000383878,
0.0000000000001105367)),
- 1, 0, 3577.40960816756
-#ifdef _MSC_VER
- , 0.01
-#else
- , if_typed<ct, float>(50.0, 0.01)
-#endif
+ 1, 0, 3577.40960816756,
+ 0.01
);
+#endif
// Other combi's
{
Modified: trunk/libs/geometry/test/algorithms/overlay/select_rings.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/select_rings.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/select_rings.cpp 2011-07-02 11:36:37 EDT (Sat, 02 Jul 2011)
@@ -50,7 +50,7 @@
map_type selected;
std::map<bg::ring_identifier, int> empty;
- bg::detail::overlay::select_rings<OverlayType>(geometry1, geometry2, empty, selected);
+ bg::detail::overlay::select_rings<OverlayType>(geometry1, geometry2, empty, selected, true);
BOOST_CHECK_EQUAL(selected.size(), expected_ids.size());
BOOST_CHECK_EQUAL(selected.size(), expected_withins.size());