diff --git a/Frechet_distance/examples/Frechet_distance/Frechet_distance_2.cpp b/Frechet_distance/examples/Frechet_distance/Frechet_distance_2.cpp index 068c4da9918..353e46354a8 100644 --- a/Frechet_distance/examples/Frechet_distance/Frechet_distance_2.cpp +++ b/Frechet_distance/examples/Frechet_distance/Frechet_distance_2.cpp @@ -14,11 +14,11 @@ int main(int argc, char* argv[]) { std::vector A, B; { - std::ifstream in(CGAL::data_file_path("wkt/LetterA.wkt")); + std::ifstream in((argc > 1) ? argv[1] : CGAL::data_file_path("wkt/LetterA.wkt")); CGAL::IO::read_linestring_WKT(in, A); } { - std::ifstream in(CGAL::data_file_path("wkt/LetterAbis.wkt")); + std::ifstream in((argc > 1) ? argv[1] : CGAL::data_file_path("wkt/LetterAbis.wkt")); CGAL::IO::read_linestring_WKT(in, B); } bool res = CGAL::is_Frechet_distance_larger(A, B, 0.001); diff --git a/Frechet_distance/examples/Frechet_distance/Frechet_distance_3.cpp b/Frechet_distance/examples/Frechet_distance/Frechet_distance_3.cpp index c73ce7fa11f..372f3913bd5 100644 --- a/Frechet_distance/examples/Frechet_distance/Frechet_distance_3.cpp +++ b/Frechet_distance/examples/Frechet_distance/Frechet_distance_3.cpp @@ -1,36 +1,26 @@ #include #include #include -#include #include #include #include -using Kernel = CGAL::Exact_predicates_inexact_constructions_kernel; -//using Kernel = CGAL::Simple_cartesian; +using Kernel = CGAL::Simple_cartesian; using Traits = CGAL::Frechet_distance_traits_3; using Point = Traits::Point_d; int main(int argc, char* argv[]) { -#if 0 std::vector A, B; { - std::ifstream in(CGAL::data_file_path("wkt/moebius.wkt")); + std::ifstream in((argc > 1) ? argv[1] : CGAL::data_file_path("wkt/moebius.wkt")); CGAL::IO::read_linestring_WKT(in, A); } { - std::ifstream in(CGAL::data_file_path("wkt/moebius2.wkt")); + std::ifstream in((argc > 2) ? argv[1] : CGAL::data_file_path("wkt/moebius2.wkt")); CGAL::IO::read_linestring_WKT(in, B); } - #else - - // two identical points fails - std::array A = { Point(0,0,0), Point(0,0,0), Point(1,0,1), Point(1,1,0)}; - std::array B = { Point(0,0,0), Point(0,0,0), Point(1,0,0), Point(1,1,0)}; - -#endif std::pair res = CGAL::approximate_Frechet_distance(A, B, 0.000001); std::cout << "The Frechet distance between the polylines is between " << res.first << " and " << res.second << std::endl; diff --git a/Frechet_distance/examples/Frechet_distance/Frechet_distance_d.cpp b/Frechet_distance/examples/Frechet_distance/Frechet_distance_d.cpp index 07558b7f60e..d3d4982c862 100644 --- a/Frechet_distance/examples/Frechet_distance/Frechet_distance_d.cpp +++ b/Frechet_distance/examples/Frechet_distance/Frechet_distance_d.cpp @@ -2,7 +2,6 @@ #include #include - #include #include