Skip to content

Commit

Permalink
Filtered_ -> Approximate_
Browse files Browse the repository at this point in the history
  • Loading branch information
afabri committed Oct 22, 2024
1 parent 88d50eb commit 5b48a3c
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 34 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,16 @@ using Point = unspecified_type;

/*! The number type of the filtered kernel.
*/
using distance_t = Filtered_kernel::FT;
using distance_t = Approximate_kernel::FT;

/*! The filtered kernel
*/
using Filtered_kernel = unspecified_type;
using Approximate_kernel = unspecified_type;


/*! The point type of the filtered kernel corresponding to `dimension`.
*/
using Filtered_point = unspecified_type;
using Approximate_point = unspecified_type;

/*! A functor of the filtered kernel for filtered points
*/
Expand Down Expand Up @@ -82,12 +82,12 @@ The point type must have `operator[]` returning a number type which can be used
*/
using Exact_point = unspecified_type;

/*! A converter for points from `Kernel` to `Filtered_kernel`
/*! A converter for points from `Kernel` to `Approximate_kernel`
*/
using K2F = unspecified_type;


/*! A converter for points from `Filtered_kernel` to `Exact_kernel`
/*! A converter for points from `Approximate_kernel` to `Exact_kernel`
*/
using F2E = unspecified_type;
/// @}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ class Curve

using distance_t = typename Traits::distance_t;

using iKernel = typename Traits::Filtered_kernel;
using iKernel = typename Traits::Approximate_kernel;

using Point = typename Traits::Filtered_point;
using Point = typename Traits::Approximate_point;

using Bbox = typename Traits::Bbox;

Expand Down
18 changes: 9 additions & 9 deletions Frechet_distance/include/CGAL/Frechet_distance_traits_2.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,22 +49,22 @@ class Frechet_distance_traits_2
static constexpr bool is_floating_point = CGAL::Frechet_distance_::internal::Get_exact_kernel<Kernel>::is_floating_point;

using distance_t = CGAL::Interval_nt<false>;
using Filtered_kernel = CGAL::Simple_cartesian<distance_t>;
using Filtered_point = typename Filtered_kernel::Point_2;
using Construct_bbox = typename Filtered_kernel::Construct_bbox_2;
using Squared_distance = typename Filtered_kernel::Compute_squared_distance_2;
using Difference_of_points = typename Filtered_kernel::Construct_vector_2;
using Scaled_vector = typename Filtered_kernel::Construct_scaled_vector_2;
using Translated_point = typename Filtered_kernel::Construct_translated_point_2;
using Approximate_kernel = CGAL::Simple_cartesian<distance_t>;
using Approximate_point = typename Approximate_kernel::Point_2;
using Construct_bbox = typename Approximate_kernel::Construct_bbox_2;
using Squared_distance = typename Approximate_kernel::Compute_squared_distance_2;
using Difference_of_points = typename Approximate_kernel::Construct_vector_2;
using Scaled_vector = typename Approximate_kernel::Construct_scaled_vector_2;
using Translated_point = typename Approximate_kernel::Construct_translated_point_2;

using Exact_kernel = typename CGAL::Frechet_distance_::internal::Get_exact_kernel<Kernel>::type;
using Exact_point = typename Exact_kernel::Point_2;

using D2D = NT_converter<distance_t,double>;
using F2E = Cartesian_converter<Filtered_kernel, Exact_kernel, D2D>;
using F2E = Cartesian_converter<Approximate_kernel, Exact_kernel, D2D>;

using FT2I = NT_converter<typename Kernel::FT,distance_t>;
using K2F = Cartesian_converter<Kernel, Filtered_kernel, FT2I>;
using K2F = Cartesian_converter<Kernel, Approximate_kernel, FT2I>;

/// @todo remove?
using Polyline = std::vector<Point>;
Expand Down
18 changes: 9 additions & 9 deletions Frechet_distance/include/CGAL/Frechet_distance_traits_3.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,22 +49,22 @@ class Frechet_distance_traits_3
static constexpr bool is_floating_point = CGAL::Frechet_distance_::internal::Get_exact_kernel<Kernel>::is_floating_point;

using distance_t = CGAL::Interval_nt<false>;
using Filtered_kernel = CGAL::Simple_cartesian<distance_t>;
using Filtered_point = typename Filtered_kernel::Point_3;
using Construct_bbox = typename Filtered_kernel::Construct_bbox_3;
using Squared_distance = typename Filtered_kernel::Compute_squared_distance_3;
using Difference_of_points = typename Filtered_kernel::Construct_vector_3;
using Scaled_vector = typename Filtered_kernel::Construct_scaled_vector_3;
using Translated_point = typename Filtered_kernel::Construct_translated_point_3;
using Approximate_kernel = CGAL::Simple_cartesian<distance_t>;
using Approximate_point = typename Approximate_kernel::Point_3;
using Construct_bbox = typename Approximate_kernel::Construct_bbox_3;
using Squared_distance = typename Approximate_kernel::Compute_squared_distance_3;
using Difference_of_points = typename Approximate_kernel::Construct_vector_3;
using Scaled_vector = typename Approximate_kernel::Construct_scaled_vector_3;
using Translated_point = typename Approximate_kernel::Construct_translated_point_3;

using Exact_kernel = typename CGAL::Frechet_distance_::internal::Get_exact_kernel<Kernel>::type;
using Exact_point = typename Exact_kernel::Point_3;

using D2D = NT_converter<distance_t,double>;
using F2E = Cartesian_converter<Filtered_kernel, Exact_kernel, D2D>;
using F2E = Cartesian_converter<Approximate_kernel, Exact_kernel, D2D>;

using FT2I = NT_converter<typename Kernel::FT,distance_t>;
using K2F = Cartesian_converter<Kernel, Filtered_kernel, FT2I>;
using K2F = Cartesian_converter<Kernel, Approximate_kernel, FT2I>;


/// @todo remove?
Expand Down
18 changes: 9 additions & 9 deletions Frechet_distance/include/CGAL/Frechet_distance_traits_d.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,22 +50,22 @@ class Frechet_distance_traits_d
static constexpr bool is_floating_point = CGAL::Frechet_distance_::internal::Get_exact_kernel<Kernel>::is_floating_point;

using distance_t = Interval_nt<false>;
using Filtered_kernel = Kernel_d_interface<Cartesian_base_d<distance_t,Dimension_tag<dimension>>>;
using Filtered_point = typename Filtered_kernel::Point_d;
using Construct_bbox = typename Filtered_kernel::Construct_bbox_d;
using Squared_distance = typename Filtered_kernel::Squared_distance_d;
using Difference_of_points = typename Filtered_kernel::Construct_vector_d;
using Scaled_vector = typename Filtered_kernel::Scaled_vector_d;
using Translated_point = typename Filtered_kernel::Translated_point_d;
using Approximate_kernel = Kernel_d_interface<Cartesian_base_d<distance_t,Dimension_tag<dimension>>>;
using Approximate_point = typename Approximate_kernel::Point_d;
using Construct_bbox = typename Approximate_kernel::Construct_bbox_d;
using Squared_distance = typename Approximate_kernel::Squared_distance_d;
using Difference_of_points = typename Approximate_kernel::Construct_vector_d;
using Scaled_vector = typename Approximate_kernel::Scaled_vector_d;
using Translated_point = typename Approximate_kernel::Translated_point_d;

using Exact_kernel = typename CGAL::Frechet_distance_::internal::Get_exact_kernel<Kernel>::type;
using Exact_point = typename Exact_kernel::Point_d;

using D2D = NT_converter<distance_t,double>;
using F2E = KernelD_converter<Filtered_kernel, Exact_kernel, Default, D2D>;
using F2E = KernelD_converter<Approximate_kernel, Exact_kernel, Default, D2D>;

using FT2I = NT_converter<typename Kernel::FT,distance_t>;
using K2F = KernelD_converter<Kernel, Filtered_kernel, Default, FT2I>;
using K2F = KernelD_converter<Kernel, Approximate_kernel, Default, FT2I>;


/// @todo remove?
Expand Down

0 comments on commit 5b48a3c

Please sign in to comment.