Skip to content

Re-add Epick_without_intervals #4306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+28 −3
Open

Re-add Epick_without_intervals #4306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54b314c
Re-add Epick_without_intervals
lrineau Oct 21, 2019
661065e
Update branch from master after trailing whitespaces and tabs removal
sloriot Mar 26, 2020
092f31b
extra run of the script to remove tabs and trailing whitespaces
sloriot Mar 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Convex_hull_3/test/Convex_hull_3/test_extreme_points.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <iostream>


typedef CGAL::Exact_predicates_inexact_constructions_kernel K;
typedef CGAL::Epick_without_intervals K;
typedef CGAL::Polyhedron_3<K> Polyhedron_3;
typedef K::Point_3 Point_3;

Expand Down
2 changes: 2 additions & 0 deletions Convex_hull_3/test/Convex_hull_3/test_halfspace_intersections.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,6 @@ int main()
test<Epec,CGAL::Polyhedron_3<Epec> >();
test<Epic,CGAL::Surface_mesh<Epic::Point_3> >();
test<Epec,CGAL::Surface_mesh<Epec::Point_3> >();
test<CGAL::Epick_without_intervals,
CGAL::Surface_mesh<CGAL::Epick_without_intervals::Point_3> >();
}
24 changes: 23 additions & 1 deletion Kernel_23/include/CGAL/Exact_predicates_inexact_constructions_kernel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,29 @@ class Epick
#endif
{};

typedef Epick Exact_predicates_inexact_constructions_kernel;
template < typename CK >
struct Static_filters_without_intervals_base
: public internal::Static_filters< CK >
{
template < typename Kernel2 >
struct Base {
typedef typename CK::template Base<Kernel2>::Type CK2;
typedef Static_filters_without_intervals_base<CK2> Type;
};
};

class Epick_without_intervals
: public Static_filters_without_intervals_base<
Type_equality_wrapper< Simple_cartesian<double>::Base<Epick_without_intervals>::Type,
Epick_without_intervals > >
{};

template <>
struct Triangulation_structural_filtering_traits<Epick_without_intervals> {
typedef Tag_true Use_structural_filtering_tag;
};

typedef Epick_without_intervals Exact_predicates_inexact_constructions_kernel;

template <>
struct Triangulation_structural_filtering_traits<Epick> {
Expand Down
3 changes: 2 additions & 1 deletion Kernel_23/test/Kernel_23/Filtered_cartesian.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ main()
test<Cls>();
std::cout << "Testing with Epick:\n";
test<CGAL::Epick>();

std::cout << "Testing with Epick_without_intervals:\n";
test<CGAL::Epick_without_intervals>();
return 0;
}

Expand Down