do not use interval for SC<double>

sloriot · Nov 7, 2024 · aa009bc · aa009bc
1 parent 107ed0f
commit aa009bc
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 10 deletions.
diff --git a/Frechet_distance/include/CGAL/Frechet_distance/internal/curve.h b/Frechet_distance/include/CGAL/Frechet_distance/internal/curve.h
@@ -156,7 +156,7 @@ class Curve<T, false>
 
 //////
     using FT = typename Traits::FT;
-    using IFT = CGAL::Interval_nt<false>; //TODO: if not filter + double --> should be double
+    using IFT = std::conditional_t<std::is_floating_point_v<FT>, FT, CGAL::Interval_nt<false>>;
     using distance_t = FT;
 
     using Point = typename Traits::Point_d;
@@ -237,9 +237,7 @@ class Curve<T, false>
 
       for (int d=0;d<Traits::Dimension::value; ++d)
       {
-        std::pair<double,double> ip = to_interval(*itp);
-        std::pair<double,double> iq = to_interval(*itq);
-        res+=square(IFT(ip)-IFT(iq));
+        res+=square(to_ift(*itp)-to_ift(*itq));
         ++itp; ++itq;
       }
       return res;
@@ -248,6 +246,30 @@ class Curve<T, false>
     {
       return sqrt(squared_distance(p,q));
     }
+    static IFT to_ift(const FT& n)
+    {
+      if constexpr(std::is_floating_point_v<FT>)
+      {
+        return n;
+      }
+      else
+      {
+        return IFT(to_interval(n));
+      }
+    }
+    static FT inf(const IFT& n)
+    {
+      if constexpr(std::is_floating_point_v<FT>)
+      {
+        return n;
+      }
+      else
+      {
+        return n.inf();
+      }
+    }
+
+
     template <class P>
     Point interpolate_at(P const& pt) const
     {

diff --git a/Frechet_distance/include/CGAL/Frechet_distance/internal/frechet_light.h b/Frechet_distance/include/CGAL/Frechet_distance/internal/frechet_light.h
@@ -1137,7 +1137,7 @@ bool FrechetLight<C>::lessThan(distance_t const& d, Curve const& curve1,
 {
     this->curve_pair[0] = &curve1;
     this->curve_pair[1] = &curve2;
-    this->distance = to_interval(d);
+    this->distance = C::to_ift(d);
 
     // curves empty or start or end are already far
     if (curve1.empty() || curve2.empty()) {
@@ -1181,7 +1181,7 @@ bool FrechetLight<C>::lessThanWithFilters(distance_t const& d, Curve const& curv
 {
     this->curve_pair[0] = &curve1;
     this->curve_pair[1] = &curve2;
-    this->distance = typename Curve::IFT(to_interval(d));
+    this->distance = Curve::to_ift(d);
 
     assert(curve1.size());
     assert(curve2.size());

diff --git a/Frechet_distance/include/CGAL/Frechet_distance/internal/geometry_basics.h b/Frechet_distance/include/CGAL/Frechet_distance/internal/geometry_basics.h
@@ -236,7 +236,8 @@ struct Lambda<Curve<T,false>>
     {
       if constexpr (!std::is_same_v<RO2, FT>)
       {
-        approx = v.a0()+v.a1()*approximate_sqrt(v.root());
+        std::pair<double, double> iv = to_interval(v);
+        approx = FT((iv.first+iv.second)/2.);
       }
       else
         approx=v;

diff --git a/Frechet_distance/include/CGAL/Frechet_distance/internal/high_level_predicates.h b/Frechet_distance/include/CGAL/Frechet_distance/internal/high_level_predicates.h
@@ -101,7 +101,7 @@ intersection_interval(Curve<T, true> const& curve1,
     // if not empty
     if (fill_lambda<typename T::first_type>(
         curve1[center_id], curve2[seg_start_id], curve2[seg_start_id + 1],
-        radius.inf(), II, curve1, center_id, curve2,  seg_start_id))
+        C::inf(radius), II, curve1, center_id, curve2,  seg_start_id))
     {
       I = Interval<C>(II.first, II.second);
     }
@@ -111,7 +111,7 @@ intersection_interval(Curve<T, true> const& curve1,
       // if not empty
     if (fill_lambda<typename T::second_type>(
           curve1.rpoint(center_id), curve2.rpoint(seg_start_id), curve2.rpoint(seg_start_id + 1),
-          radius.inf(), II, curve1, center_id, curve2,  seg_start_id))
+          C::inf(radius), II, curve1, center_id, curve2,  seg_start_id))
     {
       I = Interval<C>(II.first, II.second);
     }
@@ -137,7 +137,7 @@ intersection_interval(Curve<T, false> const& curve1,
     // if not empty
     if (fill_lambda<T>(
         curve1[center_id], curve2[seg_start_id], curve2[seg_start_id + 1],
-        radius.inf(), II, curve1, center_id, curve2,  seg_start_id))
+        C::inf(radius), II, curve1, center_id, curve2,  seg_start_id))
     {
       I = Interval<C>(II.first, II.second);
     }