From 9f854fb94eac60071bf4f63e78946ee6367765fb Mon Sep 17 00:00:00 2001 From: Menelaos Karavelas Date: Mon, 14 Apr 2003 09:20:21 +0000 Subject: [PATCH] made line length smaller --- .../Apollonius_graph_predicates_C2.h | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/Packages/Apollonius_graph_2/include/CGAL/predicates/Apollonius_graph_predicates_C2.h b/Packages/Apollonius_graph_2/include/CGAL/predicates/Apollonius_graph_predicates_C2.h index 42003e4acb6..b5709b5b388 100644 --- a/Packages/Apollonius_graph_2/include/CGAL/predicates/Apollonius_graph_predicates_C2.h +++ b/Packages/Apollonius_graph_2/include/CGAL/predicates/Apollonius_graph_predicates_C2.h @@ -11,7 +11,8 @@ // release : // release_date : // -// file : include/CGAL/predicates/Apollonius_graph_predicates_C2.h +// file : include/CGAL/predicates/ +// Apollonius_graph_predicates_C2.h // package : Apollonius_graph_2 // source : $RCSfile$ // revision : $Revision$ @@ -869,19 +870,25 @@ public: // (a1,b1) to (a2, b2) to define the arc. - Orientation o = chi2(l1, l2, tag);//sign_of_determinant2x2(a1, b1, a2, b2); + Orientation o = chi2(l1, l2, tag); + //sign_of_determinant2x2(a1, b1, a2, b2); - // std::cout << "orientation(l1, l2): " << int(o) << std::endl; if ( o == COLLINEAR ) { Bitangent_line l2_rot = l2.get_rot90(); - Sign dot = chi2(l1, l2_rot, tag);//sign_of_determinant2x2(a1, b1, -b2, a2); + Sign dot = chi2(l1, l2_rot, tag); + //sign_of_determinant2x2(a1, b1, -b2, a2); + CGAL_assertion( dot != ZERO ); - Orientation o1 = chi2(l1, l3, tag);//sign_of_determinant2x2(a1, b1, a3, b3); + Orientation o1 = chi2(l1, l3, tag); + //sign_of_determinant2x2(a1, b1, a3, b3); + if ( dot == POSITIVE ) { if ( o1 != COLLINEAR ) { return ON_UNBOUNDED_SIDE; } Bitangent_line l3_rot = l3.get_rot90(); - Sign dot1 = chi2(l1, l3_rot, tag);//sign_of_determinant2x2(a1, b1, -b3, a3); + Sign dot1 = chi2(l1, l3_rot, tag); + //sign_of_determinant2x2(a1, b1, -b3, a3); + CGAL_assertion( dot1 != ZERO ); return ( dot1 == POSITIVE ) ? ON_BOUNDARY : ON_UNBOUNDED_SIDE; } @@ -889,8 +896,10 @@ public: if ( o1 == LEFT_TURN ) { return ON_BOUNDED_SIDE; } return ( o1 == COLLINEAR ) ? ON_BOUNDARY : ON_UNBOUNDED_SIDE; } else if ( o == LEFT_TURN ) { - Orientation o1 = chi2(l1, l3, tag);//sign_of_determinant2x2(a1, b1, a3, b3); - Orientation o2 = chi2(l2, l3, tag);//sign_of_determinant2x2(a2, b2, a3, b3); + Orientation o1 = chi2(l1, l3, tag); + //sign_of_determinant2x2(a1, b1, a3, b3); + Orientation o2 = chi2(l2, l3, tag); + //sign_of_determinant2x2(a2, b2, a3, b3); // std::cout << "orientation(l1, l3): " << int(o1) << std::endl; // std::cout << "orientation(l2, l3): " << int(o2) << std::endl; @@ -904,8 +913,10 @@ public: } return ON_UNBOUNDED_SIDE; } - Orientation o1 = chi2(l1, l3, tag);//sign_of_determinant2x2(a1, b1, a3, b3); - Orientation o2 = chi2(l2, l3, tag);//sign_of_determinant2x2(a2, b2, a3, b3); + Orientation o1 = chi2(l1, l3, tag); + //sign_of_determinant2x2(a1, b1, a3, b3); + Orientation o2 = chi2(l2, l3, tag); + //sign_of_determinant2x2(a2, b2, a3, b3); // std::cout << "orientation(l1, l3): " << int(o1) << std::endl; // std::cout << "orientation(l2, l3): " << int(o2) << std::endl;