[set ops] modify way of calling multilinestring_equals (due to changes in multilinestring_equals)

This commit is contained in:
Menelaos Karavelas 2014-04-03 00:08:11 +03:00
parent a806cd0419
commit df33e8a92a
4 changed files with 22 additions and 45 deletions

View File

@ -55,11 +55,7 @@ private:
bg::reverse(mls_output); bg::reverse(mls_output);
} }
BOOST_CHECK((multilinestring_equals BOOST_CHECK( equals::apply(mls_diff, mls_output) );
<
MultiLineString, MultiLineString
>::apply(mls_diff, mls_output)
));
set_operation_output("difference", case_id, set_operation_output("difference", case_id,
geometry1, geometry2, mls_output); geometry1, geometry2, mls_output);
@ -75,17 +71,12 @@ private:
bg::difference(geometry1, geometry2, ls_vector_output); bg::difference(geometry1, geometry2, ls_vector_output);
bg::difference(geometry1, geometry2, ls_deque_output); bg::difference(geometry1, geometry2, ls_deque_output);
BOOST_CHECK((multilinestring_equals BOOST_CHECK(multilinestring_equals<false>::apply(mls_diff,
< ls_vector_output));
MultiLineString, linestring_vector
>::apply(mls_diff, ls_vector_output) BOOST_CHECK(multilinestring_equals<false>::apply(mls_diff,
)); ls_deque_output));
BOOST_CHECK((multilinestring_equals
<
MultiLineString, linestring_deque
>::apply(mls_diff, ls_deque_output)
));
#ifdef GEOMETRY_TEST_DEBUG #ifdef GEOMETRY_TEST_DEBUG
std::cout << "Done!" << std::endl << std::endl; std::cout << "Done!" << std::endl << std::endl;
#endif #endif
@ -95,6 +86,7 @@ private:
std::cout << "Geometry #1: " << bg::wkt(geometry1) << std::endl; std::cout << "Geometry #1: " << bg::wkt(geometry1) << std::endl;
std::cout << "Geometry #2: " << bg::wkt(geometry2) << std::endl; std::cout << "Geometry #2: " << bg::wkt(geometry2) << std::endl;
std::cout << "difference : " << bg::wkt(mls_output) << std::endl; std::cout << "difference : " << bg::wkt(mls_output) << std::endl;
std::cout << "expected difference : " << bg::wkt(mls_diff) << std::endl;
std::cout << std::endl; std::cout << std::endl;
std::cout << "************************************" << std::endl; std::cout << "************************************" << std::endl;
std::cout << std::endl; std::cout << std::endl;

View File

@ -79,17 +79,12 @@ private:
bg::intersection(geometry1, geometry2, ls_vector_output); bg::intersection(geometry1, geometry2, ls_vector_output);
bg::intersection(geometry1, geometry2, ls_deque_output); bg::intersection(geometry1, geometry2, ls_deque_output);
BOOST_CHECK((multilinestring_equals BOOST_CHECK(multilinestring_equals<false>::apply(mls_int1,
< ls_vector_output));
MultiLineString, linestring_vector
>::apply(mls_int1, ls_vector_output) BOOST_CHECK(multilinestring_equals<false>::apply(mls_int1,
)); ls_deque_output));
BOOST_CHECK((multilinestring_equals
<
MultiLineString, linestring_deque
>::apply(mls_int1, ls_deque_output)
));
#ifdef GEOMETRY_TEST_DEBUG #ifdef GEOMETRY_TEST_DEBUG
std::cout << "Done!" << std::endl << std::endl; std::cout << "Done!" << std::endl << std::endl;
#endif #endif

View File

@ -77,17 +77,12 @@ private:
bg::sym_difference(geometry1, geometry2, ls_vector_output); bg::sym_difference(geometry1, geometry2, ls_vector_output);
bg::sym_difference(geometry1, geometry2, ls_deque_output); bg::sym_difference(geometry1, geometry2, ls_deque_output);
BOOST_CHECK((multilinestring_equals BOOST_CHECK(multilinestring_equals<false>::apply(mls_sym_diff,
< ls_vector_output));
MultiLineString, linestring_vector
>::apply(mls_sym_diff, ls_vector_output) BOOST_CHECK(multilinestring_equals<false>::apply(mls_sym_diff,
)); ls_deque_output));
BOOST_CHECK((multilinestring_equals
<
MultiLineString, linestring_deque
>::apply(mls_sym_diff, ls_deque_output)
));
#ifdef GEOMETRY_TEST_DEBUG #ifdef GEOMETRY_TEST_DEBUG
std::cout << "Done!" << std::endl << std::endl; std::cout << "Done!" << std::endl << std::endl;
#endif #endif

View File

@ -78,17 +78,12 @@ private:
bg::union_(geometry1, geometry2, ls_vector_output); bg::union_(geometry1, geometry2, ls_vector_output);
bg::union_(geometry1, geometry2, ls_deque_output); bg::union_(geometry1, geometry2, ls_deque_output);
BOOST_CHECK((multilinestring_equals BOOST_CHECK(multilinestring_equals<false>::apply(mls_union1,
< ls_vector_output));
MultiLineString, linestring_vector
>::apply(mls_union1, ls_vector_output) BOOST_CHECK(multilinestring_equals<false>::apply(mls_union1,
)); ls_deque_output));
BOOST_CHECK((multilinestring_equals
<
MultiLineString, linestring_deque
>::apply(mls_union1, ls_deque_output)
));
#ifdef GEOMETRY_TEST_DEBUG #ifdef GEOMETRY_TEST_DEBUG
std::cout << "Done!" << std::endl << std::endl; std::cout << "Done!" << std::endl << std::endl;
#endif #endif