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

Remove obsolete /*CGAL_NO_FILTER*/ markers (they were used by Filtered_exact).

This commit is contained in:
Sylvain Pion 2006-07-30 13:02:57 +00:00
parent a1b1c9ce54
commit 29ae445a5b
5 changed files with 0 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Apollonius_graph_2/include/CGAL/Apollonius_graph_2/compare_quadratic.h
View File

@ -38,7 +38,6 @@ CGAL_APOLLONIUS_GRAPH_2_BEGIN_NAMESPACE
// help functions for the compulation of various quantites
template < class FT >
/*CGAL_NO_FILTER*/
inline FT
value_of_D(const FT& a, const FT& b, const FT& c)
{
@ -46,7 +45,6 @@ value_of_D(const FT& a, const FT& b, const FT& c)
}
template < class FT >
/*CGAL_NO_FILTER*/
inline FT
value_of_J(const FT& a1, const FT& b1, const FT& a2, const FT& b2)
{
@ -54,7 +52,6 @@ value_of_J(const FT& a1, const FT& b1, const FT& a2, const FT& b2)
}
template < class FT >
/*CGAL_NO_FILTER*/
inline FT
value_of_Jp(const FT& b1, const FT& c1, const FT& b2, const FT& c2)
{
@ -62,7 +59,6 @@ value_of_Jp(const FT& b1, const FT& c1, const FT& b2, const FT& c2)
}
template < class FT >
/*CGAL_NO_FILTER*/
inline FT
value_of_G(const FT& a1, const FT& c1, const FT& a2, const FT& c2)
{
@ -70,7 +66,6 @@ value_of_G(const FT& a1, const FT& c1, const FT& a2, const FT& c2)
}
template < class FT >
/*CGAL_NO_FILTER*/
inline FT
value_of_K(const FT& a1c2, const FT& a2c1, const FT& b1b2)
{
@ -78,7 +73,6 @@ value_of_K(const FT& a1c2, const FT& a2c1, const FT& b1b2)
}
template < class FT >
/*CGAL_NO_FILTER*/
inline FT
value_of_K(const FT& a1, const FT& b1, const FT& c1,
const FT& a2, const FT& b2, const FT& c2)
@ -87,7 +81,6 @@ value_of_K(const FT& a1, const FT& b1, const FT& c1,
}
template < class FT >
/*CGAL_NO_FILTER*/
inline FT
value_of_R0(const FT& J, const FT& Jp,
const FT& a1, const FT& c1,
@ -97,7 +90,6 @@ value_of_R0(const FT& J, const FT& Jp,
}
template < class FT >
/*CGAL_NO_FILTER*/
inline FT
value_of_R0(const FT& D1, const FT& D2, const FT& K)
{
@ -105,7 +97,6 @@ value_of_R0(const FT& D1, const FT& D2, const FT& K)
}
template < class FT >
/*CGAL_NO_FILTER*/
inline FT
value_of_P4(const FT& D1, const FT& D2, const FT& K)
{
@ -113,7 +104,6 @@ value_of_P4(const FT& D1, const FT& D2, const FT& K)
}
template < class FT >
/*CGAL_NO_FILTER*/
inline FT
value_of_D(const FT& a1, const FT& D1, const FT& a2, const FT& D2)
{
@ -121,7 +111,6 @@ value_of_D(const FT& a1, const FT& D1, const FT& a2, const FT& D2)
}
template < class FT >
/*CGAL_NO_FILTER*/
inline FT
value_of_P3inf(const FT& a1, const FT& b1, const FT& J, const FT& G)
{
@ -129,7 +118,6 @@ value_of_P3inf(const FT& a1, const FT& b1, const FT& J, const FT& G)
}
template < class FT >
/*CGAL_NO_FILTER*/
inline FT
value_of_P3inf_bis(const FT& a1, const FT& K, const FT& a2, const FT& D1)
{
@ -137,7 +125,6 @@ value_of_P3inf_bis(const FT& a1, const FT& K, const FT& a2, const FT& D1)
}
template < class FT >
/*CGAL_NO_FILTER*/
inline FT
value_of_P3pinf(const FT& c1, const FT& J, const FT& a1, const FT& Jp)
{
@ -145,7 +132,6 @@ value_of_P3pinf(const FT& c1, const FT& J, const FT& a1, const FT& Jp)
}
template < class FT >
/*CGAL_NO_FILTER*/
inline FT
value_of_L(const FT& a1, const FT& c2, const FT& b1, const FT& b2)
{
@ -153,7 +139,6 @@ value_of_L(const FT& a1, const FT& c2, const FT& b1, const FT& b2)
}
template < class FT >
/*CGAL_NO_FILTER*/
inline FT
value_of_Lp(const FT& a2, const FT& c1, const FT& b1, const FT& b2)
{
@ -161,7 +146,6 @@ value_of_Lp(const FT& a2, const FT& c1, const FT& b1, const FT& b2)
}
template < class FT >
/*CGAL_NO_FILTER*/
inline FT
value_of_A(const FT& b1, const FT& J, const FT& a1, const FT& L)
{
@ -169,7 +153,6 @@ value_of_A(const FT& b1, const FT& J, const FT& a1, const FT& L)
}
template < class FT >
/*CGAL_NO_FILTER*/
inline FT
value_of_Q3(const FT& b2, const FT& a2, const FT& J, const FT& L)
{
@ -177,7 +160,6 @@ value_of_Q3(const FT& b2, const FT& a2, const FT& J, const FT& L)
}
template < class FT >
/*CGAL_NO_FILTER*/
inline FT
value_of_Q3(const FT& a2, const FT& b2, const FT& J, const FT& G,
const FT& K)
@ -186,7 +168,6 @@ value_of_Q3(const FT& a2, const FT& b2, const FT& J, const FT& G,
}
template < class FT >
/*CGAL_NO_FILTER*/
inline FT
value_of_Q3p(const FT& a1, const FT& b1, const FT& J, const FT& G,
const FT& K)
@ -732,7 +713,6 @@ ke_compare_r1_r2(const FT& a1, const FT& b1, const FT& c1,
// using C++ exceptions
template < class CT, class ET >
/*CGAL_NO_FILTER*/
inline
Comparison_result
sqrt_compare_r1_r2_filtered(const CT& a1, const CT& b1, const CT& c1,
@ -764,7 +744,6 @@ sqrt_compare_r1_r2_filtered(const CT& a1, const CT& b1, const CT& c1,
//--------------------------------------------------------------------
template < class CT, class ET >
/*CGAL_NO_FILTER*/
inline
Comparison_result
dfmt_compare_r1_r2_filtered(const CT& a1, const CT& b1, const CT& c1,
@ -884,7 +863,6 @@ dfmt_compare_r1_r2_filtered(const CT& a1, const CT& b1, const CT& c1,
//--------------------------------------------------------------------
template < class CT, class ET >
/*CGAL_NO_FILTER*/
inline
Comparison_result
ke_compare_r1_r2_filtered(const CT& a1, const CT& b1, const CT& c1,

19
Cartesian_kernel/TODO
View File

@ -50,11 +50,6 @@ Backward
- Write a Checker for full kernels, like Pm_traits_checker.h ?
- Advanced kernel, Cd.
- Filtered_exact kernel :
- we can attack the problem by having the .x() and co return a
Lazy_exact_nt(), then implement the necessary higher level
constructions/predicates on top of that.
- Handles :
- http://www.uni-giessen.de/faq/archiv/c++-faq.part1-9/msg00005.html
[16.22] How do I provide reference counting with copy-on-write
@ -90,20 +85,6 @@ Backward
{
return Bbox_2(CGAL::to_interval(x()), CGAL::to_interval(y()));
}
- Put the predicates that are marked /*CGAL_NO_FILTER*/ in a separate file,
say <predicates/no_filter_kernel_ftC2.h> ? This will simplify the script
somehow, but how will it work for those damn static filters ?
They have to be filtered for the filtered constructions kernel though.
And they do not depend on the other predicates... yes some do !
[ why compare_angle_with_x_axisC2() is not filtered,
while orientationC2() is ???!!!??? ]
Currently, there are 10/27 like that for C2, and 10/21 for C3.
This definitely must be cleaned up. Maybe after some work on the filtered
kernel ?
- There are still a few predicates and constructions that are not FT-based,
but mainly they are the simple ones, just needing to compute an opposite or
something. I need to think about what to do with these, it's painful to have
a 3-stage calling sequence for not that much...
- Merge Intersection package ? What about Conic ?
- Cd must come back to life somehow... Currently, I've disabled it ~totally
in Cartesian.h. Same thing for Conics...

11
Cartesian_kernel/include/CGAL/predicates/kernel_ftC2.h
View File

@ -192,7 +192,6 @@ compare_y_at_xC2(const FT &l1a, const FT &l1b, const FT &l1c,
}
template < class FT >
/*CGAL_NO_FILTER*/
CGAL_KERNEL_LARGE_INLINE
typename Compare<FT>::result_type
compare_y_at_xC2(const FT &px, const FT &py,
@ -277,7 +276,6 @@ equal_directionC2(const FT &dx1, const FT &dy1,
}
template < class FT >
/*CGAL_NO_FILTER*/
CGAL_KERNEL_MEDIUM_INLINE
typename Compare<FT>::result_type
compare_angle_with_x_axisC2(const FT &dx1, const FT &dy1,
@ -392,7 +390,6 @@ compare_deltax_deltayC2(const FT &px, const FT &qx,
}
template < class FT >
/*CGAL_NO_FILTER*/
inline
typename Compare<FT>::result_type
compare_lexicographically_xyC2(const FT &px, const FT &py,
@ -432,7 +429,6 @@ angleC2(const FT &px, const FT &py,
}
template < class FT >
/*CGAL_NO_FILTER*/
CGAL_KERNEL_MEDIUM_INLINE
typename Equal_to<FT>::result_type
collinear_are_ordered_along_lineC2(const FT &px, const FT &py,
@ -447,7 +443,6 @@ collinear_are_ordered_along_lineC2(const FT &px, const FT &py,
}
template < class FT >
/*CGAL_NO_FILTER*/
CGAL_KERNEL_MEDIUM_INLINE
typename Equal_to<FT>::result_type
collinear_are_strictly_ordered_along_lineC2(const FT &px, const FT &py,
@ -526,7 +521,6 @@ cmp_dist_to_pointC2(const FT &px, const FT &py,
}
template < class FT >
/*CGAL_NO_FILTER*/
inline
typename Equal_to<FT>::result_type
has_larger_dist_to_pointC2(const FT &px, const FT &py,
@ -537,7 +531,6 @@ has_larger_dist_to_pointC2(const FT &px, const FT &py,
}
template < class FT >
/*CGAL_NO_FILTER*/
inline
typename Equal_to<FT>::result_type
has_smaller_dist_to_pointC2(const FT &px, const FT &py,
@ -559,7 +552,6 @@ cmp_signed_dist_to_directionC2(const FT &la, const FT &lb,
}
template < class FT >
/*CGAL_NO_FILTER*/
inline
typename Equal_to<FT>::result_type
has_larger_signed_dist_to_directionC2(const FT &la, const FT &lb,
@ -570,7 +562,6 @@ has_larger_signed_dist_to_directionC2(const FT &la, const FT &lb,
}
template < class FT >
/*CGAL_NO_FILTER*/
inline
typename Equal_to<FT>::result_type
has_smaller_signed_dist_to_directionC2(const FT &la, const FT &lb,
@ -593,7 +584,6 @@ cmp_signed_dist_to_lineC2(const FT &px, const FT &py,
}
template <class FT>
/*CGAL_NO_FILTER*/
inline
typename Equal_to<FT>::result_type
has_larger_signed_dist_to_lineC2(const FT &px, const FT &py,
@ -605,7 +595,6 @@ has_larger_signed_dist_to_lineC2(const FT &px, const FT &py,
}
template <class FT>
/*CGAL_NO_FILTER*/
inline
typename Equal_to<FT>::result_type
has_smaller_signed_dist_to_lineC2(const FT &px, const FT &py,

11
Cartesian_kernel/include/CGAL/predicates/kernel_ftC3.h
View File

@ -60,7 +60,6 @@ parallelC3(const FT &s1sx, const FT &s1sy, const FT &s1sz,
}
template < class FT >
/*CGAL_NO_FILTER*/
CGAL_KERNEL_MEDIUM_INLINE
typename Compare<FT>::result_type
compare_lexicographically_xyzC3(const FT &px, const FT &py, const FT &pz,
@ -153,7 +152,6 @@ angleC3(const FT &px, const FT &py, const FT &pz,
}
template < class FT >
/*CGAL_NO_FILTER*/
CGAL_KERNEL_MEDIUM_INLINE
typename Same_uncertainty_nt<Orientation, FT>::type
coplanar_orientationC3(const FT &px, const FT &py, const FT &pz,
@ -176,7 +174,6 @@ coplanar_orientationC3(const FT &px, const FT &py, const FT &pz,
}
template < class FT >
/*CGAL_NO_FILTER*/
CGAL_KERNEL_MEDIUM_INLINE
typename Same_uncertainty_nt<Orientation, FT>::type
coplanar_orientationC3(const FT &px, const FT &py, const FT &pz,
@ -236,7 +233,6 @@ coplanar_side_of_bounded_circleC3(const FT &px, const FT &py, const FT &pz,
}
template < class FT >
/*CGAL_NO_FILTER*/
CGAL_KERNEL_MEDIUM_INLINE
typename Equal_to<FT>::result_type
collinear_are_ordered_along_lineC3(
@ -254,7 +250,6 @@ collinear_are_ordered_along_lineC3(
}
template < class FT >
/*CGAL_NO_FILTER*/
CGAL_KERNEL_MEDIUM_INLINE
typename Equal_to<FT>::result_type
collinear_are_strictly_ordered_along_lineC3(
@ -441,7 +436,6 @@ side_of_bounded_sphereC3(const FT &px, const FT &py, const FT &pz,
}
template < class FT >
/*CGAL_NO_FILTER*/
CGAL_KERNEL_MEDIUM_INLINE
typename Equal_to<FT>::result_type
has_larger_dist_to_pointC3(const FT &px, const FT &py, const FT &pz,
@ -452,7 +446,6 @@ has_larger_dist_to_pointC3(const FT &px, const FT &py, const FT &pz,
}
template < class FT >
/*CGAL_NO_FILTER*/
CGAL_KERNEL_MEDIUM_INLINE
typename Equal_to<FT>::result_type
has_smaller_dist_to_pointC3(const FT &px, const FT &py, const FT &pz,
@ -474,7 +467,6 @@ cmp_signed_dist_to_directionC3( const FT &pa, const FT &pb, const FT &pc,
}
template < class FT >
/*CGAL_NO_FILTER*/
CGAL_KERNEL_MEDIUM_INLINE
typename Equal_to<FT>::result_type
has_larger_signed_dist_to_directionC3(
@ -486,7 +478,6 @@ has_larger_signed_dist_to_directionC3(
}
template < class FT >
/*CGAL_NO_FILTER*/
CGAL_KERNEL_MEDIUM_INLINE
typename Equal_to<FT>::result_type
has_smaller_signed_dist_to_directionC3(
@ -514,7 +505,6 @@ cmp_signed_dist_to_planeC3(
}
template < class FT >
/*CGAL_NO_FILTER*/
CGAL_KERNEL_MEDIUM_INLINE
typename Equal_to<FT>::result_type
has_larger_signed_dist_to_planeC3(
@ -529,7 +519,6 @@ has_larger_signed_dist_to_planeC3(
}
template < class FT >
/*CGAL_NO_FILTER*/
CGAL_KERNEL_MEDIUM_INLINE
typename Equal_to<FT>::result_type
has_smaller_signed_dist_to_planeC3(

7
Number_types/include/CGAL/Number_types/internal_functions_comparison_root_of_2.h
View File

@ -188,40 +188,33 @@ compare_22_22( const FT& A1, const FT& B1, const FT& C1,
}
template <class FT>
/*CGAL_NO_FILTER*/
inline FT calcI(const FT& A, const FT& B, const FT& C)
{ return CGAL::square(B)-A*C; }
template <class FT>
/*CGAL_NO_FILTER*/
inline FT calcJ(const FT& A1, const FT& B1, const FT& A2, const FT& B2)
{ return A1*B2-A2*B1; }
template <class FT>
/*CGAL_NO_FILTER*/
inline FT calcK(const FT& A1, const FT& B1, const FT& C1,
const FT& A2, const FT& B2, const FT& C2)
{ return C1*A2+A1*C2-2*B1*B2; }
template <class FT>
/*CGAL_NO_FILTER*/
inline FT calcJp(const FT& B1, const FT& C1, const FT& B2, const FT& C2)
{ return B1*C2-C1*B2; }
template <class FT>
/*CGAL_NO_FILTER*/
inline FT calcP4(const FT& J, const FT& Jp,
const FT& A1, const FT& C1,
const FT& A2, const FT& C2)
{ return CGAL::square(A1*C2-C1*A2)-4*J*Jp;}
template <class FT>
/*CGAL_NO_FILTER*/
inline FT calcP4(const FT& I1, const FT& I2, const FT& K)
{ return CGAL::square(K)-4*I1*I2;}
template <class FT>
/*CGAL_NO_FILTER*/
inline FT calcD(const FT& A1, const FT& I1, const FT& A2, const FT& I2)
{ return I1*CGAL::square(A2) - I2*CGAL::square(A1);}