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

Rename tests following Olivier's recommendations

This commit is contained in:
Andreas Fabri 2016-07-07 18:34:49 +02:00 committed by Jane Tournois
parent d78735364b
commit ad9d2c369c
16 changed files with 63 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cartesian_kernel/include/CGAL/Cartesian/function_objects.h
View File

@ -4079,7 +4079,7 @@ namespace CartesianKernelFunctors {
};
template < typename K >
class Power_side_of_power_sphere_3
class Power_side_of_oriented_power_sphere_3
{
public:
typedef typename K::Weighted_point_3 Weighted_point_3;
@ -4128,7 +4128,7 @@ public:
template < typename K >
class Power_side_of_power_circle_2
class Power_side_of_oriented_power_circle_2
{
public:
typedef typename K::Weighted_point_2 Weighted_point_2;
@ -4142,7 +4142,7 @@ public:
const Weighted_point_2 & t) const
{
//CGAL_kernel_precondition( ! collinear(p, q, r) );
return power_side_of_power_circleC2(p.x(), p.y(), p.weight(),
return power_side_of_oriented_power_circleC2(p.x(), p.y(), p.weight(),
q.x(), q.y(), q.weight(),
r.x(), r.y(), r.weight(),
t.x(), t.y(), t.weight());
@ -4154,7 +4154,7 @@ public:
{
//CGAL_kernel_precondition( collinear(p, q, r) );
//CGAL_kernel_precondition( p.point() != q.point() );
return power_side_of_power_circleC2(p.point().x(), p.y(), p.weight(),
return power_side_of_oriented_power_circleC2(p.point().x(), p.y(), p.weight(),
q.x(), q.y(), q.weight(),
t.x(), t.y(), t.weight());
}

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

@ -651,10 +651,10 @@ compare_power_distanceC2(const FT& px, const FT& py, const FT& pwt,
template <class FT>
Oriented_side
power_side_of_power_sphereC2( 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)
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)
{
// Note: maybe this can be further optimized like the usual in_circle() ?
@ -677,9 +677,9 @@ power_side_of_power_sphereC2( const FT &px, const FT &py, const FT &pwt,
template <class FT>
Oriented_side
power_side_of_power_sphereC2( 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)
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)
{
// Same translation as above.
FT dpx = px - tx;

10
Filtered_kernel/include/CGAL/internal/Static_filters/Power_side_of_power_sphere_3.h
View File

@ -33,12 +33,12 @@
namespace CGAL { namespace internal { namespace Static_filters_predicates {
template <typename K_base>
class Power_side_of_power_sphere_3:
public K_base::Power_side_of_power_sphere_3
class Power_side_of_oriented_power_sphere_3:
public K_base::Power_side_of_oriented_power_sphere_3
{
typedef typename K_base::Weighted_point_3 Weighted_point_3;
typedef typename K_base::FT FT;
typedef typename K_base::Power_side_of_power_sphere_3 Base;
typedef typename K_base::Power_side_of_oriented_power_sphere_3 Base;
public:
typedef typename Base::result_type result_type;
@ -278,7 +278,7 @@ namespace CGAL { namespace internal { namespace Static_filters_predicates {
const Weighted_point_3 & t) const
{
CGAL_BRANCH_PROFILER_3("semi-static failures/attempts/calls to : Power_side_of_power_sphere_3 with 3+1 wpoints", tmp);
CGAL_BRANCH_PROFILER_3("semi-static failures/attempts/calls to : Power_side_of_oriented_power_sphere_3 with 3+1 wpoints", tmp);
double px, py, pz, pwt, qx, qy, qz, qwt, rx, ry, rz, rwt, tx, ty, tz, twt;
init_double(px, py, pz, pwt, qx, qy, qz, qwt, (FT*)(0));
@ -611,7 +611,7 @@ namespace CGAL { namespace internal { namespace Static_filters_predicates {
const Weighted_point_3 & t) const
{
CGAL_BRANCH_PROFILER_3("semi-static failures/attempts/calls to : Power_side_of_power_sphere_3 with 2+1 wpoints", tmp);
CGAL_BRANCH_PROFILER_3("semi-static failures/attempts/calls to : Power_side_of_oriented_power_sphere_3 with 2+1 wpoints", tmp);
double px, py, pz, pwt, qx, qy, qz, qwt, tx, ty, tz, twt;
init_double(px, py, pz, pwt, qx, qy, qz, qwt, tx, ty, tz, twt, (FT*)(0));

6
Filtered_kernel/include/CGAL/internal/Static_filters/Static_filters.h
View File

@ -143,7 +143,7 @@ public:
typedef Static_filters_predicates::Compare_squared_radius_3<K_base> Compare_squared_radius_3;
typedef Static_filters_predicates::Compare_weighted_squared_radius_3<K_base> Compare_weighted_squared_radius_3;
typedef Static_filters_predicates::Power_side_of_power_sphere_3<K_base> Power_side_of_power_sphere_3;
typedef Static_filters_predicates::Power_side_of_oriented_power_sphere_3<K_base> Power_side_of_oriented_power_sphere_3;
Orientation_2
orientation_2_object() const
@ -203,8 +203,8 @@ Compare_y_2
compare_squared_radius_3_object() const
{ return Compare_squared_radius_3(); }
Power_side_of_power_sphere_3 power_side_of_power_sphere_3_object() const
{ return Power_side_of_power_sphere_3();}
Power_side_of_oriented_power_sphere_3 power_side_of_oriented_power_sphere_3_object() const
{ return Power_side_of_oriented_power_sphere_3();}
Compare_weighted_squared_radius_3
compare_weighted_squared_radius_3_object() const

4
Homogeneous_kernel/include/CGAL/Homogeneous/function_objects.h
View File

@ -4378,7 +4378,7 @@ namespace HomogeneousKernelFunctors {
template < typename K >
class Power_side_of_power_sphere_3
class Power_side_of_oriented_power_sphere_3
{
public:
typedef typename K::RT RT;
@ -4429,7 +4429,7 @@ public:
template < typename K >
class Power_side_of_power_circle_2
class Power_side_of_oriented_power_circle_2
{
public:
typedef typename K::Weighted_point_2 Weighted_point_2;

10
Kernel_23/doc/Kernel_23/Concepts/FunctionObjectConcepts.h
View File

@ -7958,7 +7958,7 @@ public:
\sa `CGAL::Weighted_point_3<Kernel>`
\sa `ComputePowerProduct_3` for the definition of orthogonal.
*/
class InSmallestOrthogonalSphere_3 {
class PowerSideOfBoundedPowerSphere_3 {
public:
/// \name Operations
@ -8701,7 +8701,7 @@ public:
\sa `ComputePowerProduct_3` for the definition of power distance.
*/
class PowerSideOfPowerCircle_2 {
class PowerSideOfOrientedPowerCircle_2 {
public:
/// \name Operations
@ -8745,7 +8745,7 @@ Oriented_side operator() ( Wconst Kernel::eighted_point_2& p,
\sa `ComputePowerProduct_3` for the definition of power distance.
*/
class PowerSideOfPowerSphere_3 {
class PowerSideOfOrientedPowerSphere_3 {
public:
/// \name Operations
/// A model of this concept must provide:
@ -8767,7 +8767,7 @@ Let \f$ {z(p,q,r,s)}^{(w)}\f$ be the power sphere of the weighted points
\pre `p, q, r, s` are not coplanar.
If all the points have a weight equal to 0, then
`power_side_of_power_sphere_3(p,q,r,s,t)` = `side_of_oriented_sphere(p,q,r,s,t)`.
`power_side_of_oriented_power_sphere_3(p,q,r,s,t)` = `side_of_oriented_sphere(p,q,r,s,t)`.
*/
Oriented_side operator()( const Kernel::Weighted_point_3& p,
@ -8796,7 +8796,7 @@ If all the points have a weight equal to 0, then
\pre `p` and `q` have different bare points.
If all points have a weight equal to 0, then
`power_side_of_power_sphere_3(p,q,t)` gives the same answer as the kernel predicate
`power_side_of_oriented_power_sphere_3(p,q,t)` gives the same answer as the kernel predicate
`s(p,q).has_on(t)` would give, where `s(p,q)` denotes the
segment with endpoints `p` and `q`.
*/

5
Kernel_23/doc/Kernel_23/PackageDescription.txt
View File

@ -473,8 +473,9 @@
- `Kernel::Orientation_3`
- `Kernel::OrientedSide_2`
- `Kernel::OrientedSide_3`
- `Kernel::PowerSideOfPowerCircle_2`
- `Kernel::PowerSideOfPowerSphere_3`
- `Kernel::PowerSideOfBoundedPowerSphere_3`
- `Kernel::PowerSideOfOrientedPowerSphere_3`
- `Kernel::PowerSideOfOrientedPowerCircle_2`
- `Kernel::SideOfBoundedCircle_2`
- `Kernel::SideOfBoundedSphere_3`
- `Kernel::SideOfOrientedCircle_2`

6
Kernel_23/include/CGAL/Kernel/function_objects.h
View File

@ -377,7 +377,7 @@ public:
// return the sign of the power test of last weighted point
// with respect to the smallest sphere orthogonal to the others
template< typename K >
class In_smallest_orthogonal_sphere_3
class Power_side_of_bounded_power_sphere_3
{
public:
typedef typename K::Weighted_point_3 Weighted_point_3;
@ -393,7 +393,7 @@ public:
{
K traits;
typename K::Orientation_3 orientation = traits.orientation_3_object();
typename K::Power_side_of_power_sphere_3 power_test = traits.power_side_of_power_sphere_3_object();
typename K::Power_side_of_oriented_power_sphere_3 power_test = traits.power_side_of_oriented_power_sphere_3_object();
typename K::Orientation o = orientation(p,q,r,s);
typename K::Oriented_side os = power_test(p,q,r,s,t);
CGAL_assertion( o != COPLANAR);
@ -440,7 +440,7 @@ class Side_of_bounded_orthogonal_sphere_3
{
public :
typedef typename K::Weighted_point_3 Weighted_point_3;
typedef typename K::In_smallest_orthogonal_sphere_3 In_sphere;
typedef typename K::Power_side_of_bounded_power_sphere_3 In_sphere;
typedef typename K::Bounded_side Bounded_side;
typedef Bounded_side result_type;

12
Kernel_23/include/CGAL/Kernel/interface_macros.h
View File

@ -566,20 +566,20 @@ CGAL_Kernel_pred(Less_z_3,
less_z_3_object)
CGAL_Kernel_pred_RT(Orientation_2,
orientation_2_object)
CGAL_Kernel_pred_RT(Power_side_of_power_circle_2,
power_side_of_power_circle_2_object)
CGAL_Kernel_pred_RT(Power_side_of_oriented_power_circle_2,
power_side_of_oriented_power_circle_2_object)
CGAL_Kernel_pred_RT(Orientation_3,
orientation_3_object)
CGAL_Kernel_pred_RT(Power_side_of_power_sphere_3,
power_side_of_power_sphere_3_object)
CGAL_Kernel_pred_RT(Power_side_of_oriented_power_sphere_3,
power_side_of_oriented_power_sphere_3_object)
CGAL_Kernel_pred_RT(Compare_power_distance_2,
compare_power_distance_2_object)
CGAL_Kernel_pred_RT(Compare_power_distance_3,
compare_power_distance_3_object)
CGAL_Kernel_pred(Compare_weighted_squared_radius_3,
compare_weighted_squared_radius_3_object)
CGAL_Kernel_pred(In_smallest_orthogonal_sphere_3,
in_smallest_orthogonal_sphere_3_object)
CGAL_Kernel_pred(Power_side_of_bounded_power_sphere_3,
power_side_of_bounded_power_sphere_3_object)
CGAL_Kernel_pred(Side_of_bounded_orthogonal_sphere_3,
side_of_bounded_orthogonal_sphere_3_object)
CGAL_Kernel_pred(Oriented_side_2,

4
Mesh_3/include/CGAL/Mesh_3/Robust_weighted_circumcenter_filtered_traits_3.h
View File

@ -172,7 +172,7 @@ public:
// We use power_side_of_power_sphere_3: it is static filtered and
// we know that p,q,r,s are positive oriented
typename Rt::Power_side_of_power_sphere_3 power_side_of_power_sphere = Rt().power_side_of_power_sphere_3_object();
typename Rt::Power_side_of_oriented_power_sphere_3 power_side_of_oriented_power_sphere = Rt().power_side_of_oriented_power_sphere_3_object();
// Compute denominator to swith to exact if it is 0
FT num_x, num_y, num_z, den;
@ -202,7 +202,7 @@ public:
return res;
} else {
// Fast output
if ( power_side_of_power_sphere(p,q,r,s,res) == CGAL::ON_POSITIVE_SIDE )
if ( power_side_of_oriented_power_sphere(p,q,r,s,res) == CGAL::ON_POSITIVE_SIDE )
return res;
}
}

2
Triangulation_2/doc/Triangulation_2/Concepts/RegularTriangulationTraits_2.h
View File

@ -62,7 +62,7 @@ which is the degenerated power test for weighted points
\pre the bare points corresponding to `p` and `q` are identical.
*/
typedef unspecified_type Power_side_of_power_circle_2;
typedef unspecified_type Power_side_of_oriented_power_circle_2;
/// @}

6
Triangulation_2/include/CGAL/Regular_triangulation_2.h
View File

@ -795,7 +795,7 @@ power_test(const Weighted_point &p0,
using namespace boost;
Oriented_side os = geom_traits().power_side_of_power_circle_2_object()(p0, p1, p2, p);
Oriented_side os = geom_traits().power_side_of_oriented_power_circle_2_object()(p0, p1, p2, p);
if ( (os != ON_ORIENTED_BOUNDARY) || (! perturb))
return os;
@ -841,7 +841,7 @@ power_test(const Weighted_point &p,
const Weighted_point &q,
const Weighted_point &r) const
{
return geom_traits().power_side_of_power_circle_2_object()(p,q,r);
return geom_traits().power_side_of_oriented_power_circle_2_object()(p,q,r);
}
template < class Gt, class Tds >
@ -851,7 +851,7 @@ Regular_triangulation_2<Gt,Tds>::
power_test(const Weighted_point &p,
const Weighted_point &r) const
{
return geom_traits().power_side_of_power_circle_2_object()(p,r);
return geom_traits().power_side_of_oriented_power_circle_2_object()(p,r);
}
template < class Gt, class Tds >

8
Triangulation_2/include/CGAL/Regular_triangulation_euclidean_traits_2.h
View File

@ -49,7 +49,7 @@ public:
typedef Regular_triangulation_euclidean_traits_2<R, W> Self;
typedef typename R::Power_side_of_power_circle_2 Power_side_of_power_circle_2;
typedef typename R::Power_side_of_oriented_power_circle_2 Power_side_of_oriented_power_circle_2;
typedef typename R::Compare_power_distance_2 Compare_power_distance_2;
// construction objects
@ -57,9 +57,9 @@ public:
Construct_weighted_circumcenter_2;
typedef typename R::Construct_radical_axis_2 Construct_radical_axis_2;
Power_side_of_power_circle_2
power_side_of_power_circle_2_object() const
{ return Power_side_of_power_circle_2();}
Power_side_of_oriented_power_circle_2
power_side_of_power_oriented_circle_2_object() const
{ return Power_side_of_oriented_power_circle_2();}
Compare_power_distance_2
compare_power_distance_2_object() const {

8
Triangulation_3/doc/Triangulation_3/Concepts/RegularTriangulationTraits_3.h
View File

@ -88,7 +88,7 @@ Let \f$ {z(p,q,r,s)}^{(w)}\f$ be the power sphere of the weighted points
\pre `p, q, r, s` are not coplanar.
Note that with this definition, if all the points have a weight equal
to 0, then
`power_side_of_power_sphere_3(p,q,r,s,t)` = `side_of_oriented_sphere(p,q,r,s,t)`.
`power_side_of_oriented_power_sphere_3(p,q,r,s,t)` = `side_of_oriented_sphere(p,q,r,s,t)`.
<HR WIDTH=50%>
@ -99,7 +99,7 @@ definition analogous to the previous method, for coplanar points,
with the power circle \f$ {z(p,q,r)}^{(w)}\f$.
\pre `p, q, r` are not collinear and `p, q, r, t` are coplanar.
If all the points have a weight equal to 0, then
`power_side_of_power_sphere_3(p,q,r,t)` = `side_of_oriented_circle(p,q,r,t)`.
`power_side_of_oriented_power_sphere_3(p,q,r,t)` = `side_of_oriented_circle(p,q,r,t)`.
<HR WIDTH=50%>
@ -109,7 +109,7 @@ which is the same for collinear points, where \f$ {z(p,q)}^{(w)}\f$ is the
power segment of `p` and `q`.
\pre `p` and `q` have different bare points, and `p, q, t` are collinear.
If all points have a weight equal to 0, then
`power_side_of_power_sphere_3(p,q,t)` gives the same answer as the kernel predicate
`power_side_of_oriented_power_sphere_3(p,q,t)` gives the same answer as the kernel predicate
`s(p,q).has_on(t)` would give, where `s(p,q)` denotes the
segment with endpoints `p` and `q`.
@ -122,7 +122,7 @@ which is the same for equal bare points, then it returns the comparison of the w
\pre `p` and `q` have equal bare points.
*/
typedef unspecified_type Power_side_of_power_sphere_3;
typedef unspecified_type Power_side_of_oriented_power_sphere_3;
/*!

8
Triangulation_3/include/CGAL/Regular_triangulation_3.h
View File

@ -943,7 +943,7 @@ namespace CGAL {
power_test(const Weighted_point &p, const Weighted_point &q) const
{
CGAL_triangulation_precondition(this->equal(p, q));
return geom_traits().power_side_of_power_sphere_3_object()(p, q);
return geom_traits().power_side_of_oriented_power_sphere_3_object()(p, q);
}
Oriented_side
@ -951,7 +951,7 @@ namespace CGAL {
const Weighted_point &r) const
{
CGAL_triangulation_precondition(this->collinear(p, q, r));
return geom_traits().power_side_of_power_sphere_3_object()(p, q, r);
return geom_traits().power_side_of_oriented_power_sphere_3_object()(p, q, r);
}
Oriented_side
@ -959,7 +959,7 @@ namespace CGAL {
const Weighted_point &r, const Weighted_point &s) const
{
CGAL_triangulation_precondition(this->coplanar(p, q, r, s));
return geom_traits().power_side_of_power_sphere_3_object()(p, q, r, s);
return geom_traits().power_side_of_oriented_power_sphere_3_object()(p, q, r, s);
}
Oriented_side
@ -967,7 +967,7 @@ namespace CGAL {
const Weighted_point &r, const Weighted_point &s,
const Weighted_point &t) const
{
return geom_traits().power_side_of_power_sphere_3_object()(p, q, r, s, t);
return geom_traits().power_side_of_oriented_power_sphere_3_object()(p, q, r, s, t);
}
bool in_conflict_3(const Weighted_point &p, const Cell_handle c) const

14
Triangulation_3/include/CGAL/Regular_triangulation_euclidean_traits_3.h
View File

@ -47,13 +47,13 @@ public:
// Before this type was Point
typedef Point_3 Point;
typedef typename K::Power_side_of_power_sphere_3 Power_side_of_power_sphere_3;
typedef typename K::Power_side_of_oriented_power_sphere_3 Power_side_of_oriented_power_sphere_3;
typedef typename K::Compare_power_distance_3 Compare_power_distance_3;
typedef typename K::Construct_weighted_circumcenter_3 Construct_weighted_circumcenter_3;
typedef typename K::In_smallest_orthogonal_sphere_3
In_smallest_orthogonal_sphere_3;
typedef typename K::Power_side_of_bounded_power_sphere_3
Power_side_of_bounded_power_sphere_3;
typedef typename K::Side_of_bounded_orthogonal_sphere_3
Side_of_bounded_orthogonal_sphere_3;
typedef typename K::Compute_squared_radius_smallest_orthogonal_sphere_3
@ -65,8 +65,8 @@ public:
Compare_weighted_squared_radius_3;
Power_side_of_power_sphere_3 power_side_of_power_sphere_3_object() const
{ return K().power_side_of_power_sphere_3_object(); }
Power_side_of_oriented_power_sphere_3 power_side_of_oriented_power_sphere_3_object() const
{ return K().power_side_of_oriented_power_sphere_3_object(); }
Compare_power_distance_3 compare_power_distance_3_object() const
{ return K().compare_power_distance_3_object(); }
@ -76,8 +76,8 @@ public:
{ return K().construct_weighted_circumcenter_3_object(); }
In_smallest_orthogonal_sphere_3
in_smallest_orthogonal_sphere_3_object() const
Power_side_of_bounded_power_sphere_3
power_side_of_bounded_power_sphere_3_object() const
{ return K().in_smallest_orthogonal_sphere_3_object(); }
Side_of_bounded_orthogonal_sphere_3