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

Cleaning, same as 1223f5f (forgot some predicates)

This commit is contained in:
Mael Rouxel-Labbé 2017-04-19 14:37:36 +02:00
parent 1223f5f5a0
commit 6c1c2fa27b
2 changed files with 138 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -649,7 +649,7 @@ compare_power_distanceC2(const FT& px, const FT& py, const FT& pwt,
template <class FT>
Oriented_side
power_side_of_oriented_power_circleC2( const FT &px, const FT &py, const FT &pwt,
power_side_of_oriented_power_circleC2(const FT &px, const FT &py, const FT &pwt,
const FT &qx, const FT &qy, const FT &qwt,
const FT &rx, const FT &ry, const FT &rwt,
const FT &tx, const FT &ty, const FT &twt)
@ -672,10 +672,9 @@ power_side_of_oriented_power_circleC2( const FT &px, const FT &py, const FT &pwt
drx, dry, drz);
}
template <class FT>
Oriented_side
power_side_of_oriented_power_circleC2( const FT &px, const FT &py, const FT &pwt,
power_side_of_oriented_power_circleC2(const FT &px, const FT &py, const FT &pwt,
const FT &qx, const FT &qy, const FT &qwt,
const FT &tx, const FT &ty, const FT &twt)
{

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

@ -561,7 +561,8 @@ has_smaller_signed_dist_to_planeC3(
template <class FT>
CGAL_KERNEL_MEDIUM_INLINE
typename Same_uncertainty_nt<Oriented_side, FT>::type
power_side_of_oriented_power_sphereC3( const FT &px, const FT &py, const FT &pz, const FT &pwt,
power_side_of_oriented_power_sphereC3(
const FT &px, const FT &py, const FT &pz, const FT &pwt,
const FT &qx, const FT &qy, const FT &qz, const FT &qwt,
const FT &rx, const FT &ry, const FT &rz, const FT &rwt,
const FT &sx, const FT &sy, const FT &sz, const FT &swt,
@ -595,11 +596,11 @@ power_side_of_oriented_power_sphereC3( const FT &px, const FT &py, const FT &pz,
dsx, dsy, dsz, dst);
}
template <class FT>
CGAL_KERNEL_MEDIUM_INLINE
typename Same_uncertainty_nt<Oriented_side, FT>::type
power_side_of_oriented_power_sphereC3(const FT &px, const FT &py, const FT &pz, const FT &pwt,
power_side_of_oriented_power_sphereC3(
const FT &px, const FT &py, const FT &pz, const FT &pwt,
const FT &qx, const FT &qy, const FT &qz, const FT &qwt,
const FT &rx, const FT &ry, const FT &rz, const FT &rwt,
const FT &tx, const FT &ty, const FT &tz, const FT &twt)
@ -646,11 +647,11 @@ power_side_of_oriented_power_sphereC3(const FT &px, const FT &py, const FT &pz,
qy-ry, qz-rz);
}
template <class FT>
CGAL_KERNEL_MEDIUM_INLINE
typename Same_uncertainty_nt<Oriented_side, FT>::type
power_side_of_oriented_power_sphereC3(const FT &px, const FT &py, const FT &pz, const FT &pwt,
power_side_of_oriented_power_sphereC3(
const FT &px, const FT &py, const FT &pz, const FT &pwt,
const FT &qx, const FT &qy, const FT &qz, const FT &qwt,
const FT &tx, const FT &ty, const FT &tz, const FT &twt)
{
@ -690,11 +691,9 @@ power_side_of_oriented_power_sphereC3(const FT &pwt, const FT &qwt)
return CGAL_NTS compare(qwt, pwt);
}
template < class FT >
Comparison_result
compare_power_distanceC3(
const FT &px, const FT &py, const FT &pz,
compare_power_distanceC3(const FT &px, const FT &py, const FT &pz,
const FT &qx, const FT &qy, const FT &qz, const FT &qw,
const FT &rx, const FT &ry, const FT &rz, const FT &rw)
{
@ -708,7 +707,6 @@ compare_power_distanceC3(
drx*drx + dry*dry + drz*drz - rw);
}
//return the sign of the power test of weighted point (sx,sy,sz,sw)
//with respect to the smallest sphere orthogonal to
//p,q,r
@ -761,7 +759,6 @@ power_side_of_bounded_power_sphereC3(
- CGAL_NTS sign( den*(ss - sw + pw)- detq*sq - detr*sr));
}
// return the sign of the power test of weighted point (rx,ry,rz,rw)
// with respect to the smallest sphere orthogoanal to
// p,q
@ -789,9 +786,6 @@ power_side_of_bounded_power_sphereC3(
- CGAL_NTS sign (dr2 - dp2/FT4 + dpr*dpw/dp2 - drw ));
}
} //namespace CGAL
} // namespace CGAL
#endif // CGAL_PREDICATES_KERNEL_FTC3_H