songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'cgal/6.1.x-branch' into 'cgal/main'

This commit is contained in:
Sébastien Loriot 2025-10-30 20:24:05 +01:00
parent c882eab5b5 b66ebf958b
commit 20ae7dfc0d
8 changed files with 865 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Frechet_distance/include/CGAL/Frechet_distance/internal/Frechet_light.h
View File

@ -514,6 +514,7 @@ inline void FrechetLight<C>::continueQSimpleSearch(QSimpleInterval& qsimple,
// TODO: uncritical for correctness or speed but unelegant coding style: stripping down information added by getInterval // TODO: uncritical for correctness or speed but unelegant coding style: stripping down information added by getInterval
CInterval temp_interval = FrechetLight::getInterval<IndexType>( CInterval temp_interval = FrechetLight::getInterval<IndexType>(
fixed_curve, fixed, curve, cur); fixed_curve, fixed, curve, cur);
Interval interval = Interval(temp_interval.begin.getPoint() == cur Interval interval = Interval(temp_interval.begin.getPoint() == cur
? temp_interval.begin.getFraction() ? temp_interval.begin.getFraction()
: 1, : 1,

10
Frechet_distance/include/CGAL/Frechet_distance/internal/geometry_basics.h
View File

@ -114,6 +114,9 @@ struct Lambda<Curve<FilteredTraits,true>>
bool update_exact() const bool update_exact() const
{ {
if (is_exact){ if (is_exact){
if (!exact.has_value()){
exact = (is_one) ? std::make_optional(Exact(1)) : std::make_optional(Exact(0));
}
return true; return true;
} }
@ -198,7 +201,9 @@ struct Lambda<Curve<FilteredTraits,true>>
{ {
if ((is_zero && other.is_zero) || (is_one && other.is_one)) if ((is_zero && other.is_zero) || (is_one && other.is_one))
return false; return false;
if ((is_zero && (!other.is_zero)) || (!is_one && other.is_one)) // AF this may be wrong if approx is [0.9,1.1] and other.is_one:
// if ((is_zero && (!other.is_zero)) || (!is_one && other.is_one))
if(is_zero && other.is_one)
return true; return true;
CGAL::Uncertain<bool> res = approx < other.approx; CGAL::Uncertain<bool> res = approx < other.approx;
if (CGAL::is_certain(res)) { if (CGAL::is_certain(res)) {
@ -206,7 +211,8 @@ struct Lambda<Curve<FilteredTraits,true>>
} }
update_exact(); update_exact();
other.update_exact(); other.update_exact();
return exact < other.exact; bool eres = exact.value() < other.exact.value();
return eres;
} }
}; };

3
Frechet_distance/test/Frechet_distance/CMakeLists.txt
View File

@ -6,6 +6,9 @@ project( Frechet_distance_Tests )
find_package(CGAL REQUIRED) find_package(CGAL REQUIRED)
create_single_source_cgal_program( "Frechet-IssueOct25.cpp" )
find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater) find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater)
include(CGAL_Eigen3_support) include(CGAL_Eigen3_support)
if(TARGET CGAL::Eigen3_support) if(TARGET CGAL::Eigen3_support)

40
Frechet_distance/test/Frechet_distance/Frechet-IssueOct25.cpp Normal file
View File

@ -0,0 +1,40 @@
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Frechet_distance.h>
#include <fstream>
using Kernel = CGAL::Exact_predicates_inexact_constructions_kernel;
using Point = Kernel::Point_2;
using Segment = Kernel::Segment_2;
bool load_polyline(const std::string &filename, std::vector<Point> &polyline) {
polyline.clear();
std::ifstream ifs(filename);
if (!ifs)
return false;
while (ifs.good()) {
Point p;
ifs >> p;
if (ifs.good())
polyline.push_back(p);
}
return true;
}
int main() {
std::vector<Point> poly1, poly2;
if (!load_polyline("poly1.txt", poly1) || !load_polyline("poly2.txt", poly2)) {
std::cout << "input files could not be loaded" << std::endl;
return -1;
}
std::pair<double, double> res = CGAL::bounded_error_Frechet_distance(poly1, poly2, 0.000001);
std::cout << "Frechet distance: [" << res.first << ", " << res.second << "]" << std::endl;
return 0;
}

185
Frechet_distance/test/Frechet_distance/poly1.txt Normal file
View File

@ -0,0 +1,185 @@
-126 70
-138 58
-39 -18
-39 -18
-39 -18
-39 -18
-39 -18
-39 -18
-39 -18
-39 -18
-39 -18
-39 -18
-39 -18
-39 -18
-39 -18
-39 -18
-39 -18
-39 -18
-39 -18
-39 -18
-39 -18
-39 -18
-39 -18
-42.6 -14
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70

625
Frechet_distance/test/Frechet_distance/poly2.txt Normal file
View File

@ -0,0 +1,625 @@
-126 70
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
70 -138
61.4 -118.4
61.4 -118
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70
-126 70

2
Stream_lines_2/include/CGAL/Regular_grid_2.h
View File

@ -93,7 +93,7 @@ public:
template <class StreamLinesTraits_2> template <class StreamLinesTraits_2>
inline inline
typename Regular_grid_2<StreamLinesTraits_2>::Geom_traits::Iso_rectangle_2 typename StreamLinesTraits_2::Iso_rectangle_2
Regular_grid_2<StreamLinesTraits_2>::bbox() const Regular_grid_2<StreamLinesTraits_2>::bbox() const
{ {
return typename Geom_traits::Iso_rectangle_2(0.0, 0.0, return typename Geom_traits::Iso_rectangle_2(0.0, 0.0,

2
Stream_lines_2/include/CGAL/Triangular_field_2.h
View File

@ -134,7 +134,7 @@ protected:
template <class StreamLinesTraits_2> template <class StreamLinesTraits_2>
inline inline
typename Triangular_field_2<StreamLinesTraits_2>::Geom_traits::Iso_rectangle_2 typename StreamLinesTraits_2::Iso_rectangle_2
Triangular_field_2<StreamLinesTraits_2>::bbox() const Triangular_field_2<StreamLinesTraits_2>::bbox() const
{ {
return typename Geom_traits::Iso_rectangle_2(minx, miny, maxx, return typename Geom_traits::Iso_rectangle_2(minx, miny, maxx,