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

curve -> polyline

This commit is contained in:
Andreas Fabri 2024-06-18 10:40:22 +01:00
parent 06d132ba82
commit cbcc8754f8
3 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Frechet_distance/doc/Frechet_distance/Frechet_distance.txt
View File

@ -47,7 +47,7 @@ The following example shows ...
\cgalExample{Frechet_distance/Frechet_distance_2.cpp} \cgalExample{Frechet_distance/Frechet_distance_2.cpp}
subsection subsecFrechetDistanceSecondExample Distance Computation for 3D Polylines \subsection subsecFrechetDistanceSecondExample Distance Computation for 3D Polylines
The following example shows ... The following example shows ...

2
Frechet_distance/examples/Frechet_distance/Frechet_distance_3.cpp
View File

@ -12,6 +12,6 @@ int main(int argc, char* argv[])
{ {
std::vector<Point> A, B; std::vector<Point> A, B;
std::pair<double> res = CGAL::continuous_Frechet_distance<Traits>(A, B, 0.000001); std::pair<double> res = CGAL::continuous_Frechet_distance<Traits>(A, B, 0.000001);
std::cout << "The Frechet distance between the curves is between " << res.first << " and " << res.second << std::endl; std::cout << "The Frechet distance between the polylines is between " << res.first << " and " << res.second << std::endl;
return 0; return 0;
} }

39
Frechet_distance/include/CGAL/Frechet_distance.h
View File

@ -27,27 +27,26 @@ namespace CGAL
/** /**
* \ingroup PkgFrechetDistanceFunctions * \ingroup PkgFrechetDistanceFunctions
* decides if the Frechet distance between two polylines given as a range of * decides if the Frechet distance between two polylines is less than a given distance.
* points is less than a given distance. *
* \param curve1 the first curve defined * \param polyline1 the first polyline defined by the sequence of consecutive points
* by the sequence of consecutive points along the polyline * \param polyline2 the second polyline defined by the sequence of consecutive points
* \param curve2 the
* second curve defined by the sequence of consecutive points along the polyline
* \param distance the decision distance * \param distance the decision distance
* \param traits the geometric traits object * \param traits the geometric traits object
*
* \tparam Traits a model of `FrechetDistanceTraits` * \tparam Traits a model of `FrechetDistanceTraits`
* \tparam PointRange a model of the concept `RandomAccessContainer` * \tparam PointRange a model of the concept `RandomAccessContainer`
* with `Traits::Point` as value type. * with `Traits::Point` as value type.
*/ */
template < class Traits, class PointRange> template < class Traits, class PointRange>
bool continuous_Frechet_distance_less_than(const PointRange& curve1, bool continuous_Frechet_distance_less_than(const PointRange& polyline1,
const PointRange& curve2, const PointRange& polyline2,
const double distance, const double distance,
const Traits& traits = Traits()) const Traits& traits = Traits())
{ {
Protect_FPU_rounding<true> p; Protect_FPU_rounding<true> p;
auto icurve1 = Frechet_distance::internal::toCurve(curve1, traits); auto icurve1 = Frechet_distance::internal::toCurve(polyline1, traits);
auto icurve2 = Frechet_distance::internal::toCurve(curve2, traits); auto icurve2 = Frechet_distance::internal::toCurve(polyline2, traits);
auto idistance = Frechet_distance::internal::toDistance(distance); auto idistance = Frechet_distance::internal::toDistance(distance);
return Frechet_distance::internal::lessThan(icurve1, icurve2, idistance, traits); return Frechet_distance::internal::lessThan(icurve1, icurve2, idistance, traits);
@ -55,14 +54,12 @@ bool continuous_Frechet_distance_less_than(const PointRange& curve1,
/** /**
* \ingroup PkgFrechetDistanceFunctions * \ingroup PkgFrechetDistanceFunctions
* approximates the Fréchet distance between `curve1` and `curve2` up to an additive error * approximates the Fréchet distance between two polylines up to an additive error
* of `precision` between two polylines given as a range of points. * of `precision`.
* *
* \param curve1 the first curve defined by the sequence of consecutive * \param polyline1 the first polyline defined by the sequence of consecutive points
* points along the polyline * \param polyline2 the second polyline defined by the sequence of consecutive points
* \param curve2 the second curve defined by the * \param precision the precision of the approximation
* sequence of consecutive points along the polyline
* \param precision
* \param traits the geometric traits object * \param traits the geometric traits object
* *
* \tparam Traits a model of `FrechetDistanceTraits` * \tparam Traits a model of `FrechetDistanceTraits`
@ -70,14 +67,14 @@ bool continuous_Frechet_distance_less_than(const PointRange& curve1,
* with `Traits::Point` as value type. * with `Traits::Point` as value type.
*/ */
template <class Traits,class PointRange> template <class Traits,class PointRange>
std::pair<double,double> continuous_Frechet_distance(const PointRange& curve1, std::pair<double,double> continuous_Frechet_distance(const PointRange& polyline1,
const PointRange& curve2, const PointRange& polyline2,
const double precision, const double precision,
const Traits& traits = Traits()) const Traits& traits = Traits())
{ {
Protect_FPU_rounding<true> p; Protect_FPU_rounding<true> p;
auto icurve1 = Frechet_distance::internal::toCurve(curve1, traits); auto icurve1 = Frechet_distance::internal::toCurve(polyline1, traits);
auto icurve2 = Frechet_distance::internal::toCurve(curve2, traits); auto icurve2 = Frechet_distance::internal::toCurve(polyline2, traits);
return Frechet_distance::internal::calcDistance(icurve1, icurve2, traits, precision); return Frechet_distance::internal::calcDistance(icurve1, icurve2, traits, precision);
} }