Introduce CGAL_Kernel_pred_RT_or_FT
This commit introduces a new kind of predicate in
`<CGAL/Kernel/interface_macros.h>`. In addition to
- `CGAL_kernel_pred` for predicates,
- `CGAL_Kernel_pred_RT` for predicates that can be implemented using a
ring-type,
now there is also:
- `CGAL_Kernel_pred_RT_or_FT` for predicates with multiple overloads of
`operator()`, some needing a field type and other needing a ring type
(without the division operator).
The C++ code can discriminate between the two cases with a special wrapper
for the return type: `CGAL::Needs_FT<result_type` instead of `result_type`
(defined in `<CGAL/tags.h>`.
In `<CGAL/Filtered_predicate.h>`, in addition to the usual class template
`Filtered_predicate`, there is now also `Filtered_predicate_RT_FT` that
takes three predicates as template parameters instead of two:
- the exact predicate with an ring-type,
- the exact predicate with a field-type,
- the approximate predicate (with `Interval_nt` as number-type).
For the moment, only `Compare_distance_3` in
`<CGAL/Cartesian/function_objects.h>` is using the new
`Filtered_predicate_RT_FT`.
Before this commit, the file
`Kernel_23/test/Kernel_23/include/CGAL/_test_new_3.h` was testing
`Compare_distance_3` only with three points or for points. This commit adds:
- a test with `Point_3, Point_3, Segment_3`, and
- a test with `Line_3, Point_3, Point_3`, that actually needs a field type
with its current implementation.
In the test `Kernel_23/test/Kernel_23/Filtered_cartesian.cpp`, the macro
`CGAL_NO_MPZF_DIVISION_OPERATOR` is defined, to remove the division operator
from `CGAL::Mpzf`. `CGAL::Mpzf` is a ring-type, even with its `operator/`
(because that `operator/` can only compute exact divisions), but with
`CGAL_NO_MPZF_DIVISION_OPERATOR` defined, that is now checked by the compiler.
This commit is contained in:
@@ -17,6 +17,7 @@
|
||||
#ifndef CGAL_CARTESIAN_FUNCTION_OBJECTS_H
|
||||
#define CGAL_CARTESIAN_FUNCTION_OBJECTS_H
|
||||
|
||||
#include <CGAL/tags.h>
|
||||
#include <CGAL/Kernel/function_objects.h>
|
||||
#include <CGAL/predicates/kernel_ftC2.h>
|
||||
#include <CGAL/predicates/kernel_ftC3.h>
|
||||
@@ -591,14 +592,14 @@ namespace CartesianKernelFunctors {
|
||||
}
|
||||
|
||||
template <class T1, class T2, class T3>
|
||||
result_type
|
||||
Needs_FT<result_type>
|
||||
operator()(const T1& p, const T2& q, const T3& r) const
|
||||
{
|
||||
return CGAL::compare(squared_distance(p, q), squared_distance(p, r));
|
||||
}
|
||||
|
||||
template <class T1, class T2, class T3, class T4>
|
||||
result_type
|
||||
Needs_FT<result_type>
|
||||
operator()(const T1& p, const T2& q, const T3& r, const T4& s) const
|
||||
{
|
||||
return CGAL::compare(squared_distance(p, q), squared_distance(r, s));
|
||||
|
||||
Reference in New Issue
Block a user