Subject: [Boost-commit] svn:boost r77991 - in trunk/libs/geometry/test/algorithms: . overlay
From: barend.gehrels_at_[hidden]
Date: 2012-04-15 08:14:58
Author: barendgehrels
Date: 2012-04-15 08:14:57 EDT (Sun, 15 Apr 2012)
New Revision: 77991
URL: http://svn.boost.org/trac/boost/changeset/77991
Log:
[geometry] fix in unit tests and avoid gcc warning
Text files modified:
trunk/libs/geometry/test/algorithms/intersection.cpp | 1 +
trunk/libs/geometry/test/algorithms/overlay/traverse.cpp | 14 ++------------
trunk/libs/geometry/test/algorithms/test_union.hpp | 2 +-
3 files changed, 4 insertions(+), 13 deletions(-)
Modified: trunk/libs/geometry/test/algorithms/intersection.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/intersection.cpp (original)
+++ trunk/libs/geometry/test/algorithms/intersection.cpp 2012-04-15 08:14:57 EDT (Sun, 15 Apr 2012)
@@ -15,6 +15,7 @@
#include <iostream>
#include <string>
+#define BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE
#define TEST_ISOVIST
//#define BOOST_GEOMETRY_DEBUG_SEGMENT_IDENTIFIER
Modified: trunk/libs/geometry/test/algorithms/overlay/traverse.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/traverse.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/traverse.cpp 2012-04-15 08:14:57 EDT (Sun, 15 Apr 2012)
@@ -826,21 +826,11 @@
}
{
- // Note: values are checked with SQL Server,
- /*
- select geometry::STGeomFromText('POLYGON((...))', 0)
- .STIntersection(geometry::STGeomFromText('...))', 0))
- .STArea()
-
- and STUnion
- */
-
- // For FP, they may deviate more.
test_traverse<polygon, polygon, operation_intersection>::apply("isov",
- 1, 88.2558788829, isovist[0], isovist[1],
+ 1, 88.1920, isovist[0], isovist[1],
float_might_deviate_more);
test_traverse<polygon, polygon, operation_union>::apply("isov",
- 1, 313.29652252, isovist[0], isovist[1],
+ 1, 313.3604, isovist[0], isovist[1],
float_might_deviate_more);
}
Modified: trunk/libs/geometry/test/algorithms/test_union.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_union.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_union.hpp 2012-04-15 08:14:57 EDT (Sun, 15 Apr 2012)
@@ -92,7 +92,7 @@
if (expected_point_count >= 0)
{
- BOOST_CHECK_MESSAGE(n == expected_point_count,
+ BOOST_CHECK_MESSAGE(n == std::size_t(expected_point_count),
"union: " << caseid
<< " #points expected: " << expected_point_count
<< " detected: " << n