diff --git a/test/algorithms/set_operations/difference/difference.cpp b/test/algorithms/set_operations/difference/difference.cpp index 64a119c9c..a02ba7cfc 100644 --- a/test/algorithms/set_operations/difference/difference.cpp +++ b/test/algorithms/set_operations/difference/difference.cpp @@ -427,19 +427,6 @@ void test_all() // Multi/box (should be moved to multi) { - /* Tested with SQL Geometry: - with viewy as (select geometry::STGeomFromText( - 'MULTIPOLYGON(((0 1,2 5,5 3,0 1)),((1 1,5 2,5 0,1 1)))',0) as p, - geometry::STGeomFromText( - 'POLYGON((2 2,2 4,4 4,4 2,2 2))',0) as q) - - select - p.STDifference(q).STArea(),p.STDifference(q).STNumGeometries(),p.STDifference(q) as p_min_q, - q.STDifference(p).STArea(),q.STDifference(p).STNumGeometries(),q.STDifference(p) as q_min_p, - p.STSymDifference(q).STArea(),q.STSymDifference(p) as p_xor_q - from viewy - - */ typedef bg::model::multi_polygon mp; static std::string const clip = "POLYGON((2 2,4 4))"; diff --git a/test/algorithms/set_operations/difference/difference_multi.cpp b/test/algorithms/set_operations/difference/difference_multi.cpp index 5462908c5..8a295a0e6 100644 --- a/test/algorithms/set_operations/difference/difference_multi.cpp +++ b/test/algorithms/set_operations/difference/difference_multi.cpp @@ -105,23 +105,6 @@ void test_areal() ggl_list_20111025_vd[2], ggl_list_20111025_vd[3], 1, 4, 8.0, 1, 4, 12.5); - // Second case - // This can be tested with this SQL for SQL-Server - /* - with viewy as (select geometry::STGeomFromText( - 'POLYGON((5 0,5 4,8 4,8 0,5 0))',0) as p, - geometry::STGeomFromText( - 'MULTIPOLYGON(((0 0,0 2,2 2,2 0,0 0)),((4 0,4 2,6 2,6 0,4 0)))',0) as q) - select - p.STDifference(q).STArea(),p.STDifference(q).STNumGeometries(),p.STDifference(q) as p_min_q, - q.STDifference(p).STArea(),q.STDifference(p).STNumGeometries(),q.STDifference(p) as q_min_p, - p.STSymDifference(q).STArea(),q.STSymDifference(p) as p_xor_q - from viewy - - Outputting: - 10, 1, , 6, 2, , 16, - */ - test_one("ggl_list_20111025_vd_2", ggl_list_20111025_vd_2[0], ggl_list_20111025_vd_2[1], 1, 7, 10.0, 2, 10, 6.0); diff --git a/test/algorithms/set_operations/difference/test_difference.hpp b/test/algorithms/set_operations/difference/test_difference.hpp index f3189a5e3..d71911a57 100644 --- a/test/algorithms/set_operations/difference/test_difference.hpp +++ b/test/algorithms/set_operations/difference/test_difference.hpp @@ -237,19 +237,6 @@ void test_one(std::string const& caseid, double expected_area_s, ut_settings const& settings = ut_settings()) { -#ifdef BOOST_GEOMETRY_CHECK_WITH_SQLSERVER - std::cout - << "-- " << caseid << std::endl - << "with qu as (" << std::endl - << "select geometry::STGeomFromText('" << wkt1 << "',0) as p," << std::endl - << "geometry::STGeomFromText('" << wkt2 << "',0) as q)" << std::endl - << "select " << std::endl - << " p.STDifference(q).STNumGeometries() as cnt1,p.STDifference(q).STNumPoints() as pcnt1,p.STDifference(q).STArea() as area1," << std::endl - << " q.STDifference(p).STNumGeometries() as cnt2,q.STDifference(p).STNumPoints() as pcnt2,q.STDifference(p).STArea() as area2," << std::endl - << " p.STDifference(q) as d1,q.STDifference(p) as d2 from qu" << std::endl << std::endl; -#endif - - G1 g1; bg::read_wkt(wkt1, g1); @@ -279,40 +266,6 @@ void test_one(std::string const& caseid, expected_area_s, true, settings); } - - -#ifdef BOOST_GEOMETRY_CHECK_WITH_POSTGIS - std::cout - << (counter > 0 ? "union " : "") - << "select " << counter++ - << ", '" << caseid << "' as caseid" - << ", ST_NumPoints(ST_Difference(ST_GeomFromText('" << wkt1 << "'), " - << " ST_GeomFromText('" << wkt2 << "'))) " - << ", ST_NumGeometries(ST_Difference(ST_GeomFromText('" << wkt1 << "'), " - << " ST_GeomFromText('" << wkt2 << "'))) " - << ", ST_Area(ST_Difference(ST_GeomFromText('" << wkt1 << "'), " - << " ST_GeomFromText('" << wkt2 << "'))) " - //<< ", " << expected_area1 << " as expected_area_a" - //<< ", " << expected_count1 << " as expected_count_a" - << ", ST_NumPoints(ST_Difference(ST_GeomFromText('" << wkt2 << "'), " - << " ST_GeomFromText('" << wkt1 << "'))) " - << ", ST_NumGeometries(ST_Difference(ST_GeomFromText('" << wkt2 << "'), " - << " ST_GeomFromText('" << wkt1 << "'))) " - << ", ST_Area(ST_Difference(ST_GeomFromText('" << wkt2 << "'), " - << " ST_GeomFromText('" << wkt1 << "'))) " - //<< ", " << expected_area2 << " as expected_area_b" - //<< ", " << expected_count2 << " as expected_count_b" - << ", ST_NumPoints(ST_SymDifference(ST_GeomFromText('" << wkt1 << "'), " - << " ST_GeomFromText('" << wkt2 << "'))) " - << ", ST_NumGeometries(ST_SymDifference(ST_GeomFromText('" << wkt1 << "'), " - << " ST_GeomFromText('" << wkt2 << "'))) " - << ", ST_Area(ST_SymDifference(ST_GeomFromText('" << wkt1 << "'), " - << " ST_GeomFromText('" << wkt2 << "'))) " - //<< ", " << expected_area1 + expected_area2 << " as expected_area_s" - //<< ", " << expected_count1 + expected_count2 << " as expected_count_s" - << std::endl; -#endif - } template