boost_mirror/geometry
1
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2025-05-10 07:34:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

[test] correct closure if necessary, and add define to be able to test faster

Browse Source
This commit is contained in:
Barend Gehrels 2018-01-31 09:52:47 +01:00
parent 945fc9bb94
commit 1fc11a3319
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/algorithms/simplify.cpp
View File

@ -249,9 +249,12 @@ int test_main(int, char* [])
// Integer compiles, but simplify-process fails (due to distances) // Integer compiles, but simplify-process fails (due to distances)
//test_all<bg::model::d2::point_xy<int> >(); //test_all<bg::model::d2::point_xy<int> >();
test_all<bg::model::d2::point_xy<float> >();
test_all<bg::model::d2::point_xy<double> >(); test_all<bg::model::d2::point_xy<double> >();
#if ! defined(BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE)
test_all<bg::model::d2::point_xy<float> >();
test_3d<bg::model::point<double, 3, bg::cs::cartesian> >(); test_3d<bg::model::point<double, 3, bg::cs::cartesian> >();
test_spherical<bg::model::point<double, 2, bg::cs::spherical_equatorial<bg::degree> > >(); test_spherical<bg::model::point<double, 2, bg::cs::spherical_equatorial<bg::degree> > >();
@ -262,7 +265,7 @@ int test_main(int, char* [])
test_all<bg::model::d2::point_xy<ttmath_big> >(); test_all<bg::model::d2::point_xy<ttmath_big> >();
test_spherical<bg::model::point<ttmath_big, 2, bg::cs::spherical_equatorial<bg::degree> > >(); test_spherical<bg::model::point<ttmath_big, 2, bg::cs::spherical_equatorial<bg::degree> > >();
#endif #endif
#endif
return 0; return 0;

2
test/algorithms/test_simplify.hpp
View File

@ -14,6 +14,7 @@
#include <iomanip> #include <iomanip>
#include <sstream> #include <sstream>
#include <geometry_test_common.hpp> #include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/correct_closure.hpp>
#include <boost/geometry/algorithms/simplify.hpp> #include <boost/geometry/algorithms/simplify.hpp>
#include <boost/geometry/algorithms/distance.hpp> #include <boost/geometry/algorithms/distance.hpp>
#include <boost/geometry/strategies/strategies.hpp> #include <boost/geometry/strategies/strategies.hpp>
@ -170,6 +171,7 @@ void test_geometry(std::string const& wkt,
{ {
Geometry geometry; Geometry geometry;
bg::read_wkt(wkt, geometry); bg::read_wkt(wkt, geometry);
bg::correct_closure(geometry);
boost::variant<Geometry> v(geometry); boost::variant<Geometry> v(geometry);
BOOST_CONCEPT_ASSERT( (bg::concepts::SimplifyStrategy<Strategy, BOOST_CONCEPT_ASSERT( (bg::concepts::SimplifyStrategy<Strategy,