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

reverse signs returned by Power_side_of_bounded_power_sphere_3 

the previously used In_smallest_orthogonal_sphere predicate
was returning the opposite of what
Power_side_of_bounded_power_sphere_3 returns
This commit is contained in:
Jane Tournois 2016-11-24 17:09:41 +01:00
parent a8fc1db9f4
commit d23aa50cb0
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Skin_surface_3/include/CGAL/Compute_anchor_3.h
View File

@ -144,18 +144,18 @@ private:
// Test whether the anchor of edge (wp1,wp2) and wp2 are equal // Test whether the anchor of edge (wp1,wp2) and wp2 are equal
Sign test_anchor(Weighted_point &wp1, Weighted_point &wp2) { Sign test_anchor(Weighted_point &wp1, Weighted_point &wp2) {
return return enum_cast<Sign>(
enum_cast<Sign>(reg.geom_traits().power_side_of_bounded_power_sphere_3_object()(wp1, wp2)); -reg.geom_traits().power_side_of_bounded_power_sphere_3_object()(wp1, wp2));
} }
Sign test_anchor(Weighted_point const& wp1, Weighted_point const& wp2, Sign test_anchor(Weighted_point const& wp1, Weighted_point const& wp2,
Weighted_point const& wp3) { Weighted_point const& wp3) {
return return enum_cast<Sign>(
enum_cast<Sign>(reg.geom_traits().power_side_of_bounded_power_sphere_3_object()(wp1, wp2, wp3)); -reg.geom_traits().power_side_of_bounded_power_sphere_3_object()(wp1, wp2, wp3));
} }
Sign test_anchor(Weighted_point const& wp1, Weighted_point const& wp2, Sign test_anchor(Weighted_point const& wp1, Weighted_point const& wp2,
Weighted_point const& wp3, Weighted_point const& wp4) { Weighted_point const& wp3, Weighted_point const& wp4) {
return return enum_cast<Sign>(
enum_cast<Sign>(reg.geom_traits().power_side_of_bounded_power_sphere_3_object()(wp1, wp2, wp3, wp4)); -reg.geom_traits().power_side_of_bounded_power_sphere_3_object()(wp1, wp2, wp3, wp4));
} }
// Test whether the anchor of e and anchor of e.first->vertex(i) are equal // Test whether the anchor of e and anchor of e.first->vertex(i) are equal
Sign test_anchor(Edge e, int i) { Sign test_anchor(Edge e, int i) {
@ -194,9 +194,8 @@ private:
default: default:
CGAL_error(); CGAL_error();
} }
return enum_cast<Sign>(
return -reg.geom_traits().power_side_of_bounded_power_sphere_3_object()(wp1, wp2, wp3));
enum_cast<Sign>(reg.geom_traits().power_side_of_bounded_power_sphere_3_object()(wp1, wp2, wp3));
} }
@ -204,11 +203,12 @@ private:
Sign test_anchor(Cell_handle ch, int i) { Sign test_anchor(Cell_handle ch, int i) {
CGAL_assertion(!reg.is_infinite(ch)); CGAL_assertion(!reg.is_infinite(ch));
return enum_cast<Sign>(reg.geom_traits().power_side_of_bounded_power_sphere_3_object()( return enum_cast<Sign>(
- reg.geom_traits().power_side_of_bounded_power_sphere_3_object()(
ch->vertex((i+1)&3)->point(), ch->vertex((i+1)&3)->point(),
ch->vertex((i+2)&3)->point(), ch->vertex((i+2)&3)->point(),
ch->vertex((i+3)&3)->point(), ch->vertex((i+3)&3)->point(),
ch->vertex(i)->point())); ch->vertex(i)->point()));
} }
Sign test_anchor(Cell_handle ch, Cell_handle ch2) { Sign test_anchor(Cell_handle ch, Cell_handle ch2) {
CGAL_assertion(!reg.is_infinite(ch)); CGAL_assertion(!reg.is_infinite(ch));
@ -216,7 +216,7 @@ private:
int index = ch2->index(ch); int index = ch2->index(ch);
return enum_cast<Sign>( return enum_cast<Sign>(
reg.geom_traits().power_side_of_bounded_power_sphere_3_object()( -reg.geom_traits().power_side_of_bounded_power_sphere_3_object()(
ch->vertex(0)->point(), ch->vertex(0)->point(),
ch->vertex(1)->point(), ch->vertex(1)->point(),
ch->vertex(2)->point(), ch->vertex(2)->point(),
@ -228,7 +228,7 @@ private:
Weighted_point const& wp3, Weighted_point const& wp4, Weighted_point const& wp3, Weighted_point const& wp4,
Weighted_point const& wp5) { Weighted_point const& wp5) {
return enum_cast<Sign>( return enum_cast<Sign>(
reg.geom_traits().power_side_of_bounded_power_sphere_3_object()(wp1, wp2, wp3, wp4, wp5)); -reg.geom_traits().power_side_of_bounded_power_sphere_3_object()(wp1, wp2, wp3, wp4, wp5));
} }
const Regular_triangulation &reg; const Regular_triangulation &reg;