diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_dh_deprecated_api.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_dh_deprecated_api.cpp index c88fec47b6c..3fd258ac652 100644 --- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_dh_deprecated_api.cpp +++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_dh_deprecated_api.cpp @@ -5,6 +5,7 @@ #include #include #include +#include typedef CGAL::Exact_predicates_exact_constructions_kernel Kernel; @@ -38,7 +39,8 @@ int main() Discrete_harmonic_coordinates discrete_harmonic_coordinates(vertices.begin(), vertices.end()); Coordinate_vector tri_coordinates; - Coordinate_vector dh_coordinates; + Coordinate_vector old_coordinates; + Coordinate_vector new_coordinates; const Scalar step = Scalar(1) / Scalar(100); const Scalar scale = Scalar(50); @@ -51,17 +53,24 @@ int main() const Point point(x, y); const Output_type tri_result = triangle_coordinates(point, tri_coordinates); - const Output_type dh_result = discrete_harmonic_coordinates(point, dh_coordinates); + const Output_type dh_result = discrete_harmonic_coordinates(point, old_coordinates); + CGAL::Barycentric_coordinates::discrete_harmonic_coordinates_2( + vertices, point, std::back_inserter(new_coordinates)); assert( - tri_coordinates[count + 0] - dh_coordinates[count + 0] == Scalar(0) && - tri_coordinates[count + 1] - dh_coordinates[count + 1] == Scalar(0) && - tri_coordinates[count + 2] - dh_coordinates[count + 2] == Scalar(0) ); + tri_coordinates[count + 0] - old_coordinates[count + 0] == Scalar(0) && + tri_coordinates[count + 1] - old_coordinates[count + 1] == Scalar(0) && + tri_coordinates[count + 2] - old_coordinates[count + 2] == Scalar(0) ); + + assert( + old_coordinates[count + 0] - new_coordinates[count + 0] == Scalar(0) && + old_coordinates[count + 1] - new_coordinates[count + 1] == Scalar(0) && + old_coordinates[count + 2] - new_coordinates[count + 2] == Scalar(0) ); if ( - tri_coordinates[count + 0] - dh_coordinates[count + 0] != Scalar(0) || - tri_coordinates[count + 1] - dh_coordinates[count + 1] != Scalar(0) || - tri_coordinates[count + 2] - dh_coordinates[count + 2] != Scalar(0) ) + tri_coordinates[count + 0] - old_coordinates[count + 0] != Scalar(0) || + tri_coordinates[count + 1] - old_coordinates[count + 1] != Scalar(0) || + tri_coordinates[count + 2] - old_coordinates[count + 2] != Scalar(0) ) { cout << endl << "DH_deprecated_api_test: FAILED." << endl << endl; exit(EXIT_FAILURE); diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_deprecated_api.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_deprecated_api.cpp index ceb5032a11d..60e0763b8c6 100644 --- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_deprecated_api.cpp +++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_deprecated_api.cpp @@ -5,6 +5,7 @@ #include #include #include +#include typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; @@ -39,10 +40,12 @@ int main() Mean_value_coordinates mean_value_coordinates(vertices.begin(), vertices.end()); Coordinate_vector tri_coordinates; - Coordinate_vector mv_coordinates; + Coordinate_vector old_coordinates; + Coordinate_vector new_coordinates; const Scalar step = Scalar(1) / Scalar(100); const Scalar scale = Scalar(50); + const Scalar tol = Scalar(1) / Scalar(10000000000); int count = 0; const Scalar limit = scale * step; @@ -53,17 +56,24 @@ int main() const Point point(x, y); const Output_type tri_result = triangle_coordinates(point, tri_coordinates); - const Output_type mv_result = mean_value_coordinates(point, mv_coordinates); + const Output_type mv_result = mean_value_coordinates(point, old_coordinates); + CGAL::Barycentric_coordinates::mean_value_coordinates_2( + vertices, point, std::back_inserter(new_coordinates)); assert( - (tri_coordinates[count + 0] - mv_coordinates[count + 0]) < epsilon && - (tri_coordinates[count + 1] - mv_coordinates[count + 1]) < epsilon && - (tri_coordinates[count + 2] - mv_coordinates[count + 2]) < epsilon ); + (tri_coordinates[count + 0] - old_coordinates[count + 0]) < epsilon && + (tri_coordinates[count + 1] - old_coordinates[count + 1]) < epsilon && + (tri_coordinates[count + 2] - old_coordinates[count + 2]) < epsilon ); + + assert( + CGAL::abs(old_coordinates[count + 0] - new_coordinates[count + 0]) < tol && + CGAL::abs(old_coordinates[count + 1] - new_coordinates[count + 1]) < tol && + CGAL::abs(old_coordinates[count + 2] - new_coordinates[count + 2]) < tol ); if ( - (tri_coordinates[count + 0] - mv_coordinates[count + 0]) > epsilon || - (tri_coordinates[count + 1] - mv_coordinates[count + 1]) > epsilon || - (tri_coordinates[count + 2] - mv_coordinates[count + 2]) > epsilon ) + (tri_coordinates[count + 0] - old_coordinates[count + 0]) > epsilon || + (tri_coordinates[count + 1] - old_coordinates[count + 1]) > epsilon || + (tri_coordinates[count + 2] - old_coordinates[count + 2]) > epsilon ) { cout << endl << "MV_deprecated_api_test: FAILED." << endl << endl; exit(EXIT_FAILURE); diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_special_points.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_special_points.cpp index 8d67bba42bf..f47e49745e7 100644 --- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_special_points.cpp +++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_special_points.cpp @@ -1,5 +1,4 @@ #include -#include #include #include #include diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_triangle.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_triangle.cpp index 0ac8151c814..024071b2c83 100644 --- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_triangle.cpp +++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_triangle.cpp @@ -1,5 +1,4 @@ #include -#include #include #include #include @@ -55,7 +54,6 @@ void test_mv_triangle() { int main() { test_mv_triangle< CGAL::Simple_cartesian >(); - test_mv_triangle< CGAL::Exact_predicates_exact_constructions_kernel >(); test_mv_triangle< CGAL::Exact_predicates_inexact_constructions_kernel >(); std::cout << "test_mv_triangle: PASSED" << std::endl; diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_weakly_convex_polygon.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_weakly_convex_polygon.cpp index 088f35f4051..836cb3a15bb 100644 --- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_weakly_convex_polygon.cpp +++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_weakly_convex_polygon.cpp @@ -1,5 +1,4 @@ #include -#include #include #include @@ -59,7 +58,6 @@ void test_mv_weakly_convex_polygon() { int main() { test_mv_weakly_convex_polygon< CGAL::Simple_cartesian >(); - test_mv_weakly_convex_polygon< CGAL::Exact_predicates_exact_constructions_kernel >(); test_mv_weakly_convex_polygon< CGAL::Exact_predicates_inexact_constructions_kernel >(); std::cout << "test_mv_weakly_convex_polygon: PASSED" << std::endl; diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_weights.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_weights.cpp index 857211fbf22..f2b2d4248dc 100644 --- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_weights.cpp +++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_mv_weights.cpp @@ -1,7 +1,7 @@ -#include +#include #include -using Kernel = CGAL::Exact_predicates_exact_constructions_kernel; +using Kernel = CGAL::Exact_predicates_inexact_constructions_kernel; using FT = typename Kernel::FT; using Point_2 = typename Kernel::Point_2; diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_sc_deprecated_api.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_sc_deprecated_api.cpp index 58c5d90d9a9..2964125f2be 100644 --- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_sc_deprecated_api.cpp +++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_sc_deprecated_api.cpp @@ -41,26 +41,33 @@ int main() Scalar(-1)/Scalar(5) , Scalar(6) /Scalar(5) , 1 , 0 }; - Coordinate_vector coordinates; + Coordinate_vector old_coordinates; + Coordinate_vector new_coordinates; int count = 0; for (int i = 0; i < 6; ++i) { - const Output_type result = segment_coordinates(query_points[i], std::back_inserter(coordinates)); + const Output_type result = segment_coordinates(query_points[i], std::back_inserter(old_coordinates)); + CGAL::Barycentric_coordinates::segment_coordinates_2( + first_vertex, second_vertex, query_points[i], std::back_inserter(new_coordinates)); assert( - coordinates[count + 0] - expected_coordinates[count + 0] == Scalar(0) && - coordinates[count + 1] - expected_coordinates[count + 1] == Scalar(0) ); + old_coordinates[count + 0] - expected_coordinates[count + 0] == Scalar(0) && + old_coordinates[count + 1] - expected_coordinates[count + 1] == Scalar(0) ); + + assert( + old_coordinates[count + 0] - new_coordinates[count + 0] == Scalar(0) && + old_coordinates[count + 1] - new_coordinates[count + 1] == Scalar(0) ); if ( - coordinates[count + 0] - expected_coordinates[count + 0] != Scalar(0) || - coordinates[count + 1] - expected_coordinates[count + 1] != Scalar(0) ) + old_coordinates[count + 0] - expected_coordinates[count + 0] != Scalar(0) || + old_coordinates[count + 1] - expected_coordinates[count + 1] != Scalar(0) ) { cout << endl << "Segment_coordinates_deprecated_api_test: FAILED." << endl << endl; exit(EXIT_FAILURE); } count += 2; } - coordinates.clear(); + old_coordinates.clear(); count = 0; for (int i = 0; i < 6; ++i) { diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_tc_deprecated_api.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_tc_deprecated_api.cpp index 96cc0ca9d63..022b2a1cf83 100644 --- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_tc_deprecated_api.cpp +++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_tc_deprecated_api.cpp @@ -40,28 +40,36 @@ int main() Scalar(-1)/Scalar(4), Scalar(3) /Scalar(4), Scalar(1)/Scalar(2), Scalar(3) /Scalar(4), Scalar(-1)/Scalar(4), Scalar(1)/Scalar(2) }; - Coordinate_vector coordinates; + Coordinate_vector old_coordinates; + Coordinate_vector new_coordinates; int count = 0; for (int i = 0; i < 5; ++i) { - const Output_type result = triangle_coordinates(query_points[i], std::back_inserter(coordinates)); + const Output_type result = triangle_coordinates(query_points[i], std::back_inserter(old_coordinates)); + CGAL::Barycentric_coordinates::triangle_coordinates_2( + first_vertex, second_vertex, third_vertex, query_points[i], std::back_inserter(new_coordinates)); assert( - coordinates[count + 0] - expected_coordinates[count + 0] == Scalar(0) && - coordinates[count + 1] - expected_coordinates[count + 1] == Scalar(0) && - coordinates[count + 2] - expected_coordinates[count + 2] == Scalar(0) ); + old_coordinates[count + 0] - expected_coordinates[count + 0] == Scalar(0) && + old_coordinates[count + 1] - expected_coordinates[count + 1] == Scalar(0) && + old_coordinates[count + 2] - expected_coordinates[count + 2] == Scalar(0) ); + + assert( + old_coordinates[count + 0] - new_coordinates[count + 0] == Scalar(0) && + old_coordinates[count + 1] - new_coordinates[count + 1] == Scalar(0) && + old_coordinates[count + 2] - new_coordinates[count + 2] == Scalar(0) ); if ( - coordinates[count + 0] - expected_coordinates[count + 0] != Scalar(0) || - coordinates[count + 1] - expected_coordinates[count + 1] != Scalar(0) || - coordinates[count + 2] - expected_coordinates[count + 2] != Scalar(0) ) + old_coordinates[count + 0] - expected_coordinates[count + 0] != Scalar(0) || + old_coordinates[count + 1] - expected_coordinates[count + 1] != Scalar(0) || + old_coordinates[count + 2] - expected_coordinates[count + 2] != Scalar(0) ) { cout << endl << "Triangle_coordinates_deprecated_api_test: FAILED." << endl << endl; exit(EXIT_FAILURE); } count += 3; } - coordinates.clear(); + old_coordinates.clear(); count = 0; for (int i = 0; i < 5; ++i) { diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_wp_deprecated_api.cpp b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_wp_deprecated_api.cpp index 7cec0a43668..443810d3c2e 100644 --- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_wp_deprecated_api.cpp +++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/test_wp_deprecated_api.cpp @@ -5,6 +5,7 @@ #include #include #include +#include typedef CGAL::Exact_predicates_exact_constructions_kernel Kernel; @@ -39,7 +40,8 @@ int main() Wachspress_coordinates wachspress_coordinates(vertices.begin(), vertices.end()); Coordinate_vector tri_coordinates; - Coordinate_vector wp_coordinates; + Coordinate_vector old_coordinates; + Coordinate_vector new_coordinates; const Scalar step = Scalar(1) / Scalar(100); const Scalar scale = Scalar(50); @@ -52,17 +54,24 @@ int main() const Point point(x, y); const Output_type tri_result = triangle_coordinates(point, tri_coordinates); - const Output_type wp_result = wachspress_coordinates(point, wp_coordinates); + const Output_type wp_result = wachspress_coordinates(point, old_coordinates); + CGAL::Barycentric_coordinates::wachspress_coordinates_2( + vertices, point, std::back_inserter(new_coordinates)); assert( - tri_coordinates[count + 0] - wp_coordinates[count + 0] == Scalar(0) && - tri_coordinates[count + 1] - wp_coordinates[count + 1] == Scalar(0) && - tri_coordinates[count + 2] - wp_coordinates[count + 2] == Scalar(0) ); + tri_coordinates[count + 0] - old_coordinates[count + 0] == Scalar(0) && + tri_coordinates[count + 1] - old_coordinates[count + 1] == Scalar(0) && + tri_coordinates[count + 2] - old_coordinates[count + 2] == Scalar(0) ); + + assert( + old_coordinates[count + 0] - new_coordinates[count + 0] == Scalar(0) && + old_coordinates[count + 1] - new_coordinates[count + 1] == Scalar(0) && + old_coordinates[count + 2] - new_coordinates[count + 2] == Scalar(0) ); if ( - tri_coordinates[count + 0] - wp_coordinates[count + 0] != Scalar(0) || - tri_coordinates[count + 1] - wp_coordinates[count + 1] != Scalar(0) || - tri_coordinates[count + 2] - wp_coordinates[count + 2] != Scalar(0) ) + tri_coordinates[count + 0] - old_coordinates[count + 0] != Scalar(0) || + tri_coordinates[count + 1] - old_coordinates[count + 1] != Scalar(0) || + tri_coordinates[count + 2] - old_coordinates[count + 2] != Scalar(0) ) { cout << endl << "WP_deprecated_api_test: FAILED." << endl << endl; exit(EXIT_FAILURE);