diff --git a/Packages/Arrangement/examples/Arrangement_2/example10.C b/Packages/Arrangement/examples/Arrangement_2/example10.C index 25e898c1040..7978adcb440 100644 --- a/Packages/Arrangement/examples/Arrangement_2/example10.C +++ b/Packages/Arrangement/examples/Arrangement_2/example10.C @@ -7,47 +7,43 @@ #define Arr_polyline_traits APT #include +#include +#include #include #include #include #include -//#include -//typedef leda_real NT; - -// We use here double instead of leda_real to enable compilation without LEDA. -// This is not recommended generally. -// Read more in the README file or in the manual. -typedef double NT; -typedef CGAL::Cartesian Rep; -typedef CGAL::Arr_polyline_traits Traits; +typedef CGAL::Quotient NT; +typedef CGAL::Cartesian Kernel; +typedef CGAL::Arr_polyline_traits Traits; typedef Traits::Point Point; -typedef Traits::X_curve X_curve; typedef Traits::Curve Curve; typedef CGAL::Arr_base_node Base_node; typedef CGAL::Arr_2_default_dcel Dcel; typedef CGAL::Arrangement_2 Arr_2; -int main() { +int main() +{ Arr_2 arr; Curve in_curve; - // curve #1, not x monotone + // Curve #1, not x monotone in_curve.push_back(Point( 0, 0)); in_curve.push_back(Point( 10, 10)); in_curve.push_back(Point( 0, 20)); arr.insert(in_curve); - // curve #2, x monotone + // Curve #2, x monotone in_curve.clear(); in_curve.push_back(Point(100, 0)); in_curve.push_back(Point(150, 50)); in_curve.push_back(Point(200, 0)); arr.insert(in_curve); - // curve #1 is broken into two edges. Point (10,10) turns into a vertex. + // Curve #1 is broken into two edges. Point (10,10) turns into a vertex. Arr_2::Locate_type lt; arr.locate(Point(10, 10), lt); CGAL_assertion(lt == Arr_2::VERTEX); diff --git a/Packages/Arrangement/examples/Arrangement_2/example11.C b/Packages/Arrangement/examples/Arrangement_2/example11.C index 47cb01034a8..fb5a913e43e 100644 --- a/Packages/Arrangement/examples/Arrangement_2/example11.C +++ b/Packages/Arrangement/examples/Arrangement_2/example11.C @@ -1,15 +1,13 @@ // examples/Arrangement_2/example11 -#include - #include - +#include +#include #include #include #include #include - #include #include @@ -17,12 +15,10 @@ #include #endif -typedef CGAL::Quotient NT; -typedef CGAL::Cartesian R; -typedef CGAL::Arr_segment_exact_traits Traits; +typedef CGAL::Quotient NT; +typedef CGAL::Cartesian Kernel; +typedef CGAL::Arr_segment_exact_traits Traits; -typedef Traits::Point Point; -typedef Traits::X_curve X_curve; typedef Traits::Curve Curve; typedef CGAL::Arr_2_default_dcel Dcel; @@ -48,10 +44,10 @@ int main() // printing to Postscript file. #ifdef CGAL_USE_LEDA - CGAL::Postscript_file_stream LPF(500, 500 ,"arr.ps"); - LPF.init(-3,3,-3); - LPF.set_line_width( 1); - LPF << arr; + // CGAL::Postscript_file_stream LPF(500, 500 ,"arr.ps"); + // LPF.init(-3,3,-3); +// LPF.set_line_width( 1); +// LPF << arr; #endif return 0; diff --git a/Packages/Arrangement/examples/Arrangement_2/example12.C b/Packages/Arrangement/examples/Arrangement_2/example12.C index 4f96f1f5844..32728cd1242 100644 --- a/Packages/Arrangement/examples/Arrangement_2/example12.C +++ b/Packages/Arrangement/examples/Arrangement_2/example12.C @@ -1,23 +1,21 @@ //examples/Arrangement_2/example12 #include +#include #include - #include #include #include - #include #include #include -typedef CGAL::Quotient NT; -typedef CGAL::Cartesian R; -typedef CGAL::Arr_polyline_traits Traits; +typedef CGAL::Quotient NT; +typedef CGAL::Cartesian Kernel; +typedef CGAL::Arr_polyline_traits Traits; typedef Traits::Point Point; -typedef Traits::X_curve X_curve; typedef Traits::Curve Curve; typedef CGAL::Arr_2_default_dcel Dcel; diff --git a/Packages/Arrangement/examples/Arrangement_2/example7.C b/Packages/Arrangement/examples/Arrangement_2/example7.C index 421196025e0..00ecdeda9a0 100644 --- a/Packages/Arrangement/examples/Arrangement_2/example7.C +++ b/Packages/Arrangement/examples/Arrangement_2/example7.C @@ -12,7 +12,6 @@ typedef CGAL::Cartesian Kernel; typedef CGAL::Arr_segment_exact_traits Traits; typedef Traits::Point Point; -typedef Traits::X_curve X_curve; typedef Traits::Curve Curve; // A global variable to keep track of when we inserted the edges. diff --git a/Packages/Arrangement/examples/Arrangement_2/example8.C b/Packages/Arrangement/examples/Arrangement_2/example8.C index 41db5b9ce2f..48077a0c90c 100644 --- a/Packages/Arrangement/examples/Arrangement_2/example8.C +++ b/Packages/Arrangement/examples/Arrangement_2/example8.C @@ -7,18 +7,14 @@ #define Arr_segment_exact_traits ASET #include +#include #include #include -//#include - #include -//typedef leda_integer NT; -typedef long NT; - -typedef CGAL::Homogeneous R; - -typedef CGAL::Arr_segment_exact_traits Traits; +typedef CGAL::MP_Float NT; +typedef CGAL::Homogeneous Kernel; +typedef CGAL::Arr_segment_exact_traits Traits; typedef Traits::Point Point; typedef Traits::X_curve X_curve; @@ -31,11 +27,14 @@ int main(int argc, char* argv[]) { Arr_2 arr; + // Read the segments + int num_curves; int x,y; std::cout << "Enter number of segments: " ; std::cin >> num_curves; - while (num_curves--) { + while (num_curves--) + { std::cout << "Enter source coordinates (2 integers): " ; std::cin >> x >> y; Point s(x,y); @@ -48,6 +47,8 @@ int main(int argc, char* argv[]) arr.insert(seg); } + // Do the ray shooting + std::cout << "Enter point for ray shooting (2 integers): " ; std::cin >> x >> y; Point p(x,y); @@ -56,12 +57,15 @@ int main(int argc, char* argv[]) Arr_2::Locate_type lt; e = arr.vertical_ray_shoot(p,lt,true); - if (lt==Arr_2::UNBOUNDED_FACE) { + // Check the location type + if (lt == Arr_2::UNBOUNDED_FACE) + { std::cout << "UNBOUNDED_FACE" << std::endl; } - else { - std::cout << "The halfedge shot is :" << std::endl; - std::cout << "(Using homogeneous coordinates , "; + else + { + std::cout << "The half-edge shot is :" << std::endl; + std::cout << "(Using homogeneous coordinates "; std::cout << "where =)" << std::endl; std::cout << e->source()->point() << " -> " << e->target()->point(); std::cout << std::endl; diff --git a/Packages/Arrangement/examples/Arrangement_2/example9.C b/Packages/Arrangement/examples/Arrangement_2/example9.C index 5eaf321934a..e179a8ccbf2 100644 --- a/Packages/Arrangement/examples/Arrangement_2/example9.C +++ b/Packages/Arrangement/examples/Arrangement_2/example9.C @@ -7,62 +7,56 @@ #define Arr_polyline_traits APT #include - +#include +#include #include #include #include #include -//#include -//typedef leda_real NT; - -// We use here double instead of leda_real to enable compilation without LEDA. -// This is not recommended generally. -// Read more in the README file or in the manual. -typedef double NT; - -typedef CGAL::Cartesian Rep; -typedef CGAL::Arr_polyline_traits Traits; +typedef CGAL::Quotient NT; +typedef CGAL::Cartesian Kernel; +typedef CGAL::Arr_polyline_traits Traits; typedef Traits::Point Point; -typedef Traits::X_curve X_curve; typedef Traits::Curve Curve; typedef CGAL::Arr_base_node Base_node; typedef CGAL::Arr_2_default_dcel Dcel; typedef CGAL::Arrangement_2 Arr_2; -int main() { +int main() +{ Arr_2 arr; Curve in_curve; - // we insert two intersecting squares - in_curve.push_back(Point( 0, 50)); - in_curve.push_back(Point( 50, 50)); - in_curve.push_back(Point( 50, 0)); - in_curve.push_back(Point( 0, 0)); - in_curve.push_back(Point( 0, 50)); - arr.insert(in_curve); - - in_curve.clear(); - in_curve.push_back(Point( 25, 75)); - in_curve.push_back(Point( 75, 75)); - in_curve.push_back(Point( 75, 25)); - in_curve.push_back(Point( 25, 25)); - in_curve.push_back(Point( 25, 75)); - arr.insert(in_curve); - - // upward vertical ray shooting - // the edge <25,50>-<50,50> is supposed to be have been created - Arr_2::Locate_type lt; - Arr_2::Halfedge_handle e=arr.vertical_ray_shoot(Point(30,30),lt,true); - - CGAL_assertion(e->source()->point()==Point(50,50)); - CGAL_assertion(e->target()->point()==Point(25,50)); - - // we expect <50,25> to be an intersection (of the polylines) - e = arr.locate(Point(50,25), lt); - CGAL_assertion(lt == Arr_2::VERTEX); - - return 0; + // We insert two intersecting squares + in_curve.push_back(Point( 0, 50)); + in_curve.push_back(Point( 50, 50)); + in_curve.push_back(Point( 50, 0)); + in_curve.push_back(Point( 0, 0)); + in_curve.push_back(Point( 0, 50)); + arr.insert(in_curve); + + in_curve.clear(); + in_curve.push_back(Point( 25, 75)); + in_curve.push_back(Point( 75, 75)); + in_curve.push_back(Point( 75, 25)); + in_curve.push_back(Point( 25, 25)); + in_curve.push_back(Point( 25, 75)); + arr.insert(in_curve); + + // Upward vertical ray shooting + // the edge <25,50>-<50,50> is supposed to be have been created + Arr_2::Locate_type lt; + Arr_2::Halfedge_handle e=arr.vertical_ray_shoot(Point(30,30),lt,true); + + CGAL_assertion(e->source()->point()==Point(50,50)); + CGAL_assertion(e->target()->point()==Point(25,50)); + + // We expect <50,25> to be an intersection (of the polylines) + e = arr.locate(Point(50,25), lt); + CGAL_assertion(lt == Arr_2::VERTEX); + + return 0; }