From d11533c9e454ad442d94da9e5f3dcf3dffd2823a Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Fri, 28 May 2021 11:58:33 +0200 Subject: [PATCH] Removal of non-existing code in benchark (without testing what remains) --- .../benchmarks_arrangement.cpp | 132 --------- .../benchmark/README_benchmark_CK2.txt | 6 - .../benchmarks_arrangement.cpp | 269 ------------------ Circular_kernel_2/benchmark/benchmark_CK2.cpp | 40 --- .../benchmark/benchmarks_arrangement.cpp | 225 --------------- .../benchmark/bff_reader/Breader.cpp | 5 - .../benchmarks_arrangement.cpp | 205 ------------- 7 files changed, 882 deletions(-) diff --git a/Circular_kernel_2/benchmark/DxfArrayBenchmarks/benchmarks_arrangement.cpp b/Circular_kernel_2/benchmark/DxfArrayBenchmarks/benchmarks_arrangement.cpp index 8d34709288f..674e5a0ea53 100644 --- a/Circular_kernel_2/benchmark/DxfArrayBenchmarks/benchmarks_arrangement.cpp +++ b/Circular_kernel_2/benchmark/DxfArrayBenchmarks/benchmarks_arrangement.cpp @@ -1,11 +1,7 @@ #define CGAL_CAST_INT #define CIRCULAR_KERNEL_2 -#define LAZY_CURVED_KERNEL_2 -//#define CIRCULAR_KERNEL_2_FILTERED_HEXAGON -//#define LAZY_CURVED_KERNEL_2_FILTERED_HEXAGON // #define CIRCULAR_KERNEL_2_FILTERED_BBOX -//#define LAZY_CURVED_KERNEL_2_FILTERED_BBOX #define CGAL_CAST_INT #include @@ -22,9 +18,7 @@ #include #include -#include -#include #include @@ -88,80 +82,7 @@ for(i=1;i<6;i++){ //bench.Compute_dxf(Dxffilename[i]); #endif -/*------------------------------------------------------------------------------------------------------------------------- - !!!!!!!!!!!Lazy_curved_Kernel!!!!!!!!!!!!!!!!!! - -------------------------------------------------------------------------------------------------------------------------*/ - #ifdef LAZY_CURVED_KERNEL_2 -// typedef CGAL::Quotient NT2; - typedef CGAL::Gmpq NT2; - typedef CGAL::Cartesian Linear_k2; - typedef CGAL::Algebraic_kernel_for_circles_2_2 Algebraic_k2; - typedef CGAL::Circular_kernel_2 CK2_; - - - typedef CGAL::Interval_nt_advanced NT3; - typedef CGAL::Cartesian Linear_k3; - typedef CGAL::Algebraic_kernel_for_circles_2_2 Algebraic_k3; - typedef CGAL::Circular_kernel_2 CK3_; - - - typedef CGAL::Lazy_circular_kernel_2 LazyCurvedK; - - - - typedef LazyCurvedK::Circular_arc_2 Circular_arc_3; - typedef LazyCurvedK::Line_arc_2 Line_arc_3; - typedef boost::variant LazyVarArc; - typedef std::vector LazyVarContainer; - typedef CGAL::Variant_traits LazyCurvedK_Variant_Traits; - - bench.kernel("LazyK. VarTraits"); - - bench.ComputeArrayDxf(dxffilenames); - //bench.Compute_dxf(Dxffilename[i]); - - #endif - /*------------------------------------------------------------------------------------------------------------------------- - !!!!!!!!!!!Filtered_hexagone_Circular_kernel!!!!!!!!!!!!!!!!!! - - -------------------------------------------------------------------------------------------------------------------------*/ - #ifdef CIRCULAR_KERNEL_2_FILTERED_HEXAGON - - typedef CGAL::Filtered_hexagon_circular_kernel_2 CircularKernelHexagon; - - typedef CircularKernelHexagon::Circular_arc_2 Circular_arc_4; - typedef CircularKernelHexagon::Line_arc_2 Line_arc_4; - typedef boost::variant< Circular_arc_4, Line_arc_4 > CircularKernHexVarArc; - typedef std::vector CircularKernHexVarArcContainer; - typedef CGAL::Variant_traits CircularKernHex_Variant_Traits; - - bench.kernel("CK Hex VarTraits"); - - // bench.Compute(Dxffilename[i]); - bench.Compute_no_dxf(); - - - #endif - /*------------------------------------------------------------------------------------------------------------------------- - !!!!!!!!!!!Filtered_hexagone_Lazy_Circular_kernel!!!!!!!!!!!!!!!!!! - - -------------------------------------------------------------------------------------------------------------------------*/ - #ifdef LAZY_CURVED_KERNEL_2_FILTERED_HEXAGON - - typedef CGAL::Filtered_hexagon_curved_kernel LazyKernelHexagon; - - typedef LazyKernelHexagon::Circular_arc_2 Circular_arc_5; - typedef LazyKernelHexagon::Line_arc_2 Line_arc_5; - typedef boost::variant HxLazyVarArc; - typedef std::vector HxLazyVarContainer; - typedef CGAL::Variant_traits HxLazyVariantTraits; - - bench.kernel("LazyK Hex VarTraits") ; - - //bench.Compute(Dxffilename[i]); -bench.Compute_no_dxf(); - #endif /*------------------------------------------------------------------------------------------------------------------------- !!!!!!!!!!!bbox_filtered_Circular_kernel!!!!!!!!!!!!!!!!!! @@ -182,58 +103,7 @@ bench.Compute_no_dxf() // bench.Compute_no_dxf(); #endif - /*------------------------------------------------------------------------------------------------------------------------- - !!!!!!!!!!!bbox_hexagone_Lazy_Circular_kernel!!!!!!!!!!!!!!!!!! - -------------------------------------------------------------------------------------------------------------------------*/ - #ifdef LAZY_CURVED_KERNEL_2_FILTERED_BBOX - - typedef CGAL::Filtered_bbox_curved_kernel BBLazyCurvedK; - - typedef BBLazyCurvedK::Circular_arc_2 Circular_arc_7; - typedef BBLazyCurvedK::Line_arc_2 Line_arc_7; - typedef boost::variant BBLazyVarArc; - typedef std::vector< BBLazyVarArc> BBLazyVarContainer; - typedef CGAL::Variant_traits BBLazyVariantTraits; - - bench.kernel("LLazyK BBox VarTraits") ; - - bench.Compute(Dxffilename[i]); - //bench.Compute_no_dxf(); - - - #endif - /*------------------------------------------------------------------------------------------------------------------------- - !!!!!!!!!!!bbox_filtered_Filtered_hexagone_Circular_kernel!!!!!!!!!!!!!!!!!! - - -------------------------------------------------------------------------------------------------------------------------*/ - /* - typedef CGAL::Filtered_bbox_curved_kernel BBCircKHexagon ; - - #ifndef CGAL_CURVED_KERNEL_DEBUG - typedef CGAL::Circular_arc_traits BBCircKHexagonCATraits; - #else - typedef CGAL::Circular_arc_traits Traits0_7; - typedef CGAL::Circular_arc_traits_tracer BBCircKHexagonCATraits; - #endif - typedef BBCircKHexagon::Circular_arc_2 BBCircKHexagonArc; - typedef std::vector BBCircKHexagonArcCont; - bench.kernel("BBox Circular kernel filtered Hexagon CircArcTraits"); - - bench.Compute_no_dxf(); - - typedef BBCircularKernelHexagon::Circular_arc_2 Circular_arc_8; - typedef BBCircularKernelHexagon::Line_arc_2 Line_arc_8; - typedef boost::variant BBCircularKernelHexagonVarArc; - typedef std::vector BBCircularKernelHexagonVarContainer; - typedef CGAL::Variant_traits BBCircularKernelHexagonVariantTraits; - - bench.kernel("BBox Circular kernel filtered Hexagon VarTraits") ; - - //bench.Compute(Dxffilename[i]); - bench.Compute_no_dxf();*/ - /*-------------------------------------------------------------------------------------------------------------------------- - -----------------------------------------------------------------------------------------------------------------------------*/ dxffilenames.erase(dxffilenames.begin(),dxffilenames.end()); if (i<5){ for(int n = 3*(i+1)-3; n < 3*(i+1); n++){ @@ -245,5 +115,3 @@ for(int n = 3*(i+1)-3; n < 3*(i+1); n++){ return 0; }; - - diff --git a/Circular_kernel_2/benchmark/README_benchmark_CK2.txt b/Circular_kernel_2/benchmark/README_benchmark_CK2.txt index a60be41c135..16dbab068e1 100644 --- a/Circular_kernel_2/benchmark/README_benchmark_CK2.txt +++ b/Circular_kernel_2/benchmark/README_benchmark_CK2.txt @@ -3,13 +3,9 @@ The usage is: where alpha: 1: means to bench the BBox(CK) with Vartraits -2: means to bench the Lazy(CK) with Vartraits 3: means to bench the CK with Vartraits -4: means to bench the Bbox(Lazy(CK)) with Vartraits 5: means to bench the BBox(CK) with Circulartraits -6: means to bench the Lazy(CK) with Circulartraits 7: means to bench the CK(CK) with Circulartraits -8: means to bench the Bbox(Lazy(CK)) Circulartraits (le 0 est interne) beta: @@ -74,5 +70,3 @@ with 5 <= a <= 8 and 0 <= b <= 8, we cannot use the Circulartraits to handle th Compile with -DCGAL_INTERSECTION_MAP_FOR_SUPPORTING_CIRCLES if you want to benchmark with the same kernel, but with an additional map for supporting circles. - - diff --git a/Circular_kernel_2/benchmark/arrangement_traits/benchmarks_arrangement.cpp b/Circular_kernel_2/benchmark/arrangement_traits/benchmarks_arrangement.cpp index 22bba806cbc..5ebf26838bc 100644 --- a/Circular_kernel_2/benchmark/arrangement_traits/benchmarks_arrangement.cpp +++ b/Circular_kernel_2/benchmark/arrangement_traits/benchmarks_arrangement.cpp @@ -15,10 +15,6 @@ #include #include -#include - -#include - #include #include @@ -141,75 +137,13 @@ Bench bench(Htmlfilename,Texfilename,Dxffilename[i]); } fin.close(); -/*------------------------------------------------------------------------------------------------------------------------- - !!!!!!!!!!!Place for tests!!!!!!!!!!!!!!!!!! - -------------------------------------------------------------------------------------------------------------------------*/ -// typedef CGAL::Lazy_exact_nt > NT4; -// typedef CGAL::Cartesian Linear_k4; -// typedef CGAL::Algebraic_kernel_2_2 Algebraic_k4; -// typedef CGAL::Curved_kernel CK4; -// -// #ifndef CGAL_CURVED_KERNEL_DEBUG -// typedef CGAL::Circular_arc_traits CircularK_CA_Traits; -// #else -// typedef CGAL::Circular_arc_traits Traits0; -// typedef CGAL::Circular_arc_traits_tracer CircularK_CA_Traits; -// #endif -// -// typedef CK4::Circular_arc_2 CircularKArc; -// typedef std::vector CircularKArcContainer; -// bench.kernel("Circular kernel Circular arc traits"); -// -// typedef CircularK_CA_Traits::Curve_2 Conic_arc_2; -// typedef CGAL::Arrangement_2 Pmwx; -// typedef CGAL::Arr_naive_point_location Point_location; -// -// typedef CircularK_CA_Traits::X_monotone_curve_2 X_monotone_curve_2; -// typedef CK4::Point_2 Point_2; -// typedef CK4::Circle_2 Circle_2; -// typedef CK4::Circular_arc_2 Circular_arc_2; -// -// -// CGAL::Random generatorOfgenerator; -// int random_seed = generatorOfgenerator.get_int(0, 123456); -// std::cout << "random_seed = " << random_seed << std::endl; -// CGAL::Random theRandom(random_seed); -// int random_max = 128; -// int random_min = -128; -// CircularKArcContainer ac; -// int x; -// int y; -// int r; -// for(int i = 0; i < 20; i++){ -// x = theRandom.get_int(random_min,random_max); -// y = theRandom.get_int(random_min,random_max); -// r = theRandom.get_int(1,random_max); -// ac.push_back( Circle_2( Point_2(x,y), r*r)); -// } -// -// // Pmwx _pm; -// // Point_location _pl(_pm); -// // try{ -// // bench.start(); -// // for (typename ArcContainer::const_iterator it=ac.begin(); -// // it != ac.end(); ++it) { -// // //insert(_pm,_pl,*it); -// // insert(_pm,*it,_pl); -// // }; -// // bench.stop(); -// // bench.summarize(_pm.number_of_vertices(),_pm.number_of_halfedges()); -// // } -// // catch (...) { -// // bench.fail(); -// // } /*------------------------------------------------------------------------------------------------------------------------- !!!!!!!!!!!Circular_Kernel!!!!!!!!!!!!!!!!!! -------------------------------------------------------------------------------------------------------------------------*/ typedef CGAL::Quotient NT1; - //typedef CGAL::Lazy_exact_nt > NT1; typedef CGAL::Cartesian Linear_k1; typedef CGAL::Algebraic_kernel_for_circles_2_2 Algebraic_k1; typedef CGAL::Circular_kernel_2 CircularKernel; @@ -240,208 +174,6 @@ Bench bench(Htmlfilename,Texfilename,Dxffilename[i]); bench.Compute(Dxffilename[i]); // bench.Compute_dxf(Dxffilename[i]); -/*------------------------------------------------------------------------------------------------------------------------- - !!!!!!!!!!!Lazy_curved_Kernel!!!!!!!!!!!!!!!!!! - - -------------------------------------------------------------------------------------------------------------------------*/ - /* - typedef CGAL::Quotient NT2; - // typedef CGAL::Lazy_exact_nt > NT2; - typedef CGAL::Cartesian Linear_k2; - typedef CGAL::Algebraic_kernel_2_2 Algebraic_k2; - typedef CGAL::Curved_kernel CK2_; - - //typedef CGAL::Interval_nt<> NT2; - typedef CGAL::Interval_nt_advanced NT3; - typedef CGAL::Cartesian Linear_k3; - typedef CGAL::Algebraic_kernel_2_2 Algebraic_k3; - typedef CGAL::Curved_kernel CK3_; - - - typedef CGAL::Lazy_curved_kernel LazyCurvedK; - - #ifndef CGAL_CURVED_KERNEL_DEBUG - typedef CGAL::Circular_arc_traits LazyCurvedK_CA_Traits; - #else - typedef CGAL::Circular_arc_traits Traits0_2; - typedef CGAL::Circular_arc_traits_tracer LazyCurved_kTraits; - #endif - - typedef LazyCurvedK::Circular_arc_2 LazyArc; - typedef std::vector LazyArcContainer; - - bench.kernel("Lazy curved kernel Circular arc traits") ; - - bench.Compute_no_dxf(); - - - typedef LazyCurvedK::Circular_arc_2 Circular_arc_3; - typedef LazyCurvedK::Line_arc_2 Line_arc_3; - typedef boost::variant LazyVarArc; - typedef std::vector LazyVarContainer; - typedef CGAL::Variant_traits LazyCurvedK_Variant_Traits; - - bench.kernel("Lazy curved kernel Variant traits"); - - bench.Compute(Dxffilename[i]); - //bench.Compute_dxf(Dxffilename[i]); - /*------------------------------------------------------------------------------------------------------------------------- - !!!!!!!!!!!Filtered_hexagone_Circular_kernel!!!!!!!!!!!!!!!!!! - - -------------------------------------------------------------------------------------------------------------------------*/ - -/* - typedef CGAL::Filtered_hexagon_curved_kernel CircularKernelHexagon; - - #ifndef CGAL_CURVED_KERNEL_DEBUG - typedef CGAL::Circular_arc_traits CircularKernHex_CA_Traits; - #else - typedef CGAL::Circular_arc_traits Traits0_3; - typedef CGAL::Circular_arc_traits_tracer CircularKernHex_CA_Traits; - #endif - - typedef CircularKernelHexagon::Circular_arc_2 CircularKernHexArc; - typedef std::vector CircularKernHexArcContainer; - bench.kernel("Circular kernel filtered hexagon Circular arc traits"); - - bench.Compute_no_dxf(); - - - typedef CircularKernelHexagon::Circular_arc_2 Circular_arc_4; - typedef CircularKernelHexagon::Line_arc_2 Line_arc_4; - typedef boost::variant< Circular_arc_4, Line_arc_4 > CircularKernHexVarArc; - typedef std::vector CircularKernHexVarArcContainer; - typedef CGAL::Variant_traits CircularKernHex_Variant_Traits; - - bench.kernel("Circular kernel filtered hexagon Variants traits"); - - //bench.Compute(Dxffilename[i]); - bench.Compute_no_dxf(); - - - - /*------------------------------------------------------------------------------------------------------------------------- - !!!!!!!!!!!Filtered_hexagone_Lazy_Circular_kernel!!!!!!!!!!!!!!!!!! - - -------------------------------------------------------------------------------------------------------------------------*/ - /* - typedef CGAL::Filtered_hexagon_curved_kernel LazyKernelHexagon; - - #ifndef CGAL_CURVED_KERNEL_DEBUG - typedef CGAL::Circular_arc_traits LazyKernelHexagon_CA_Traits; - #else - typedef CGAL::Circular_arc_traits Traits0_4; - typedef CGAL::Circular_arc_traits_tracer LazyKernelHexagon_CA_Traits; - #endif - typedef LazyKernelHexagon::Circular_arc_2 LazyKernelHexagonArc; - typedef std::vector LazyKernelHexagonArcContainer; - bench.kernel("Lazy curved kernel filtered hexagon Circular arc traits"); - - bench.Compute_no_dxf(); - - typedef LazyKernelHexagon::Circular_arc_2 Circular_arc_5; - typedef LazyKernelHexagon::Line_arc_2 Line_arc_5; - typedef boost::variant HxLazyVarArc; - typedef std::vector HxLazyVarContainer; - typedef CGAL::Variant_traits HxLazyVariantTraits; - - bench.kernel("Lazy curved kernel filtered hexagon Variants traits") ; - - //bench.Compute(Dxffilename[i]); -bench.Compute_no_dxf(); - - /*------------------------------------------------------------------------------------------------------------------------- - !!!!!!!!!!!bbox_filtered_Circular_kernel!!!!!!!!!!!!!!!!!! - - -------------------------------------------------------------------------------------------------------------------------*/ - /* - typedef CGAL::Filtered_bbox_curved_kernel BBCircularKernel ; - - #ifndef CGAL_CURVED_KERNEL_DEBUG - typedef CGAL::Circular_arc_traits BBCircularKernel_CA_Traits; - #else - typedef CGAL::Circular_arc_traits Traits0_5; - typedef CGAL::Circular_arc_traits_tracer BBCircularKernel_CA_Traits; - #endif - typedef BBCircularKernel::Circular_arc_2 BBCircularKernelArc; - typedef std::vector BBCircularKernelArcContainer; - bench.kernel("Circular kernel filtered bbox Circular arc traits"); - - bench.Compute_no_dxf(); - - typedef BBCircularKernel::Circular_arc_2 Circular_arc_6; - typedef BBCircularKernel::Line_arc_2 Line_arc_6; - typedef boost::variant BBCircVarArc; - typedef std::vector BBCircVarContainer; - typedef CGAL::Variant_traits BBCircVariantTraits; - - bench.kernel("Circular kernel filtered bbox Variants traits") ; - - // bench.Compute(Dxffilename[i]); - bench.Compute_no_dxf(); - - /*------------------------------------------------------------------------------------------------------------------------- - !!!!!!!!!!!bbox_hexagone_Lazy_Circular_kernel!!!!!!!!!!!!!!!!!! - - -------------------------------------------------------------------------------------------------------------------------*/ - /* - typedef CGAL::Filtered_bbox_curved_kernel BBLazyCurvedK; - - #ifndef CGAL_CURVED_KERNEL_DEBUG - typedef CGAL::Circular_arc_traits BBLazyCurvedK_CA_Traits; - #else - typedef CGAL::Circular_arc_traits Traits0_6; - typedef CGAL::Circular_arc_traits_tracer BBLazyCurvedK_CA_Traits; - #endif - typedef BBLazyCurvedK::Circular_arc_2 BBLazyCurvedKArc; - typedef std::vector BBLazyCurvedKArcContainer; - bench.kernel("Lazy curved kernel filtered bbox Circular arc traits"); - - bench.Compute_no_dxf(); - - - typedef BBLazyCurvedK::Circular_arc_2 Circular_arc_7; - typedef BBLazyCurvedK::Line_arc_2 Line_arc_7; - typedef boost::variant BBLazyVarArc; - typedef std::vector< BBLazyVarArc> BBLazyVarContainer; - typedef CGAL::Variant_traits BBLazyVariantTraits; - - bench.kernel("Lazy curved kernel filtered bbox Variants traits") ; - - //bench.Compute(Dxffilename[i]); - bench.Compute_no_dxf(); - - /*------------------------------------------------------------------------------------------------------------------------- - !!!!!!!!!!!bbox_filtered_Filtered_hexagone_Circular_kernel!!!!!!!!!!!!!!!!!! - - -------------------------------------------------------------------------------------------------------------------------*/ - /* - typedef CGAL::Filtered_bbox_curved_kernel BBCircKHexagon ; - - #ifndef CGAL_CURVED_KERNEL_DEBUG - typedef CGAL::Circular_arc_traits BBCircKHexagonCATraits; - #else - typedef CGAL::Circular_arc_traits Traits0_7; - typedef CGAL::Circular_arc_traits_tracer BBCircKHexagonCATraits; - #endif - typedef BBCircKHexagon::Circular_arc_2 BBCircKHexagonArc; - typedef std::vector BBCircKHexagonArcCont; - bench.kernel("BBox Circular kernel filtered bbox Circular arc traits"); - - bench.Compute_no_dxf(); - - typedef BBCircularKernelHexagon::Circular_arc_2 Circular_arc_8; - typedef BBCircularKernelHexagon::Line_arc_2 Line_arc_8; - typedef boost::variant BBCircularKernelHexagonVarArc; - typedef std::vector BBCircularKernelHexagonVarContainer; - typedef CGAL::Variant_traits BBCircularKernelHexagonVariantTraits; - - bench.kernel("BBox Circular kernel filtered bbox Variants traits") ; - - //bench.Compute(Dxffilename[i]); - bench.Compute_no_dxf();*/ - /*-------------------------------------------------------------------------------------------------------------------------- - -----------------------------------------------------------------------------------------------------------------------------*/ if (i+1<15) { if (strcmp(Dxffilename[i+1],"")) @@ -460,4 +192,3 @@ bench.infotable(); return 0; } - diff --git a/Circular_kernel_2/benchmark/benchmark_CK2.cpp b/Circular_kernel_2/benchmark/benchmark_CK2.cpp index cbec320b58f..54a4137e4ce 100644 --- a/Circular_kernel_2/benchmark/benchmark_CK2.cpp +++ b/Circular_kernel_2/benchmark/benchmark_CK2.cpp @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include @@ -42,21 +41,6 @@ typedef CGAL::Arr_circular_line_arc_traits_2 CircularK_Variant typedef boost::variant< Circular_arc_2, Line_arc_2 > CircularKVarArc; typedef std::vector CircularKVarArcContainer; -// LAZY KERNEL TYPEDEFS -typedef CGAL::Interval_nt_advanced NT3; -typedef CGAL::Cartesian Linear_k3; -typedef CGAL::Algebraic_kernel_for_circles_2_2 Algebraic_k3; -typedef CGAL::Circular_kernel_2 CK3_; -typedef CGAL::Lazy_circular_kernel_2 LazyCurvedK; -typedef CGAL::Arr_circular_arc_traits_2 LazyCurvedK_CA_Traits; -typedef LazyCurvedK::Circular_arc_2 LazyArc; -typedef std::vector LazyArcContainer; -typedef LazyCurvedK::Circular_arc_2 Circular_arc_3; -typedef LazyCurvedK::Line_arc_2 Line_arc_3; -typedef boost::variant LazyVarArc; -typedef std::vector LazyVarContainer; -//~ typedef CGAL::Arr_circular_line_arc_traits_2 LazyCurvedK_Variant_Traits; -typedef CGAL::Arr_circular_line_arc_traits_2 LazyCurvedK_Variant_Traits; // BBOX TYPEDEFS typedef CGAL::Filtered_bbox_circular_kernel_2 @@ -77,24 +61,6 @@ typedef std::vector BBCircVarContainer; typedef CGAL::Arr_circular_line_arc_traits_2 BBCircVariantTraits; -// BBOX(LAZY) -typedef CGAL::Filtered_bbox_circular_kernel_2 - BBLazyKernel ; -typedef CGAL::Arr_circular_arc_traits_2 - BBLazyKernel_CA_Traits; -typedef BBLazyKernel::Circular_arc_2 - BBLazyKernelArc; -typedef std::vector - BBLazyKernelArcContainer; -typedef BBLazyKernel::Circular_arc_2 - Circular_arc_lazybb; -typedef BBLazyKernel::Line_arc_2 - Line_arc_lazybb; -typedef boost::variant - BBLazyVarArc; -typedef std::vector - BBLazyVarContainer; -typedef CGAL::Arr_circular_line_arc_traits_2 BBLazyVariantTraits; template void do_main(const char *s) { @@ -243,9 +209,7 @@ int main(int argc, char* argv[]){ int j = argv[2][0]-'0'; if((j >= 0 && j < 9)) { if(i == 1) do_main(dxf_filename[j]); - if(i == 2) do_main(dxf_filename[j]); if(i == 3) do_main(dxf_filename[j]); - if(i == 4) do_main(dxf_filename[j]); if((i >= 5) || (i <= 0)) std::cout << "INVALID PARAMETERS" << std::endl; } else { int k = -1; @@ -255,13 +219,9 @@ int main(int argc, char* argv[]){ if(j == ('c'-'0')) k = 3; if(j == ('d'-'0')) k = 4; if(i == 1) do_main(k); - if(i == 2) do_main(k); if(i == 3) do_main(k); - if(i == 4) do_main(k); if(i == 5) do_main(k); - if(i == 6) do_main(k); if(i == 7) do_main(k); - if(i == 8) do_main(k); } } else std::cout << "INVALID PARAMETERS" << std::endl; diff --git a/Circular_kernel_2/benchmark/benchmarks_arrangement.cpp b/Circular_kernel_2/benchmark/benchmarks_arrangement.cpp index 728f8c18040..c0c627086a4 100644 --- a/Circular_kernel_2/benchmark/benchmarks_arrangement.cpp +++ b/Circular_kernel_2/benchmark/benchmarks_arrangement.cpp @@ -1,18 +1,13 @@ #define CGAL_CAST_INT #define CIRCULAR_KERNEL_2 -#define LAZY_CURVED_KERNEL_2 #define CIRCULAR_KERNEL_2_FILTERED_HEXAGON -#define LAZY_CURVED_KERNEL_2_FILTERED_HEXAGON #define CIRCULAR_KERNEL_2_FILTERED_BBOX -#define LAZY_CURVED_KERNEL_2_FILTERED_BBOX #include #include #include -#include - #include #include @@ -21,11 +16,6 @@ #include //#include -#include - -#ifdef CIRCULAR_KERNEL_2_FILTERED_HEXAGON -#include -#endif #include @@ -184,123 +174,7 @@ Bench bench; //If you want create table with all datasets bench.Compute_no_dxf(); #endif -/*------------------------------------------------------------------------------------------------------------------------- - !!!!!!!!!!!Lazy_curved_Kernel!!!!!!!!!!!!!!!!!! - -------------------------------------------------------------------------------------------------------------------------*/ - #ifdef LAZY_CURVED_KERNEL_2 - - typedef CGAL::Quotient NT2; - typedef CGAL::Cartesian Linear_k2; - typedef CGAL::Algebraic_kernel_for_circles_2_2 Algebraic_k2; - typedef CGAL::Circular_kernel_2 CK2_; - - - typedef CGAL::Interval_nt_advanced NT3; - typedef CGAL::Cartesian Linear_k3; - typedef CGAL::Algebraic_kernel_for_circles_2_2 Algebraic_k3; - typedef CGAL::Circular_kernel_2 CK3_; - - - typedef CGAL::Lazy_circular_kernel_2 LazyCurvedK; - -// #ifndef CGAL_CURVED_KERNEL_DEBUG - typedef CGAL::Arr_circular_arc_traits_2 LazyCurvedK_CA_Traits; -// #else -// typedef CGAL::Circular_arc_traits Traits0_2; -// typedef CGAL::Circular_arc_traits_tracer LazyCurved_kTraits; -// #endif - - typedef LazyCurvedK::Circular_arc_2 LazyArc; - typedef std::vector LazyArcContainer; - - bench.kernel("LazyCircArc") ; - - bench.Compute_no_dxf(); - - - typedef LazyCurvedK::Circular_arc_2 Circular_arc_3; - typedef LazyCurvedK::Line_arc_2 Line_arc_3; - typedef boost::variant LazyVarArc; - typedef std::vector LazyVarContainer; - typedef CGAL::Arr_circular_line_arc_traits_2 LazyCurvedK_Variant_Traits; - - bench.kernel("LazyKVar"); - - //bench.Compute(Dxffilename[i]); - //bench.Compute_dxf(Dxffilename[i]); - bench.Compute_no_dxf(); - - #endif - /*------------------------------------------------------------------------------------------------------------------------- - !!!!!!!!!!!Filtered_hexagone_Circular_kernel!!!!!!!!!!!!!!!!!! - - -------------------------------------------------------------------------------------------------------------------------*/ - #ifdef CIRCULAR_KERNEL_2_FILTERED_HEXAGON - - typedef CGAL::Filtered_hexagon_circular_kernel_2 CircularKernelHexagon; - -// #ifndef CGAL_CURVED_KERNEL_DEBUG - typedef CGAL::Arr_circular_arc_traits_2 CircularKernHex_CA_Traits; -// #else -// typedef CGAL::Circular_arc_traits Traits0_3; -// typedef CGAL::Circular_arc_traits_tracer CircularKernHex_CA_Traits; -// #endif - - typedef CircularKernelHexagon::Circular_arc_2 CircularKernHexArc; - typedef std::vector CircularKernHexArcContainer; - bench.kernel("CK Hex CircArcTraits"); - - bench.Compute_no_dxf(); - - - typedef CircularKernelHexagon::Circular_arc_2 Circular_arc_4; - typedef CircularKernelHexagon::Line_arc_2 Line_arc_4; - typedef boost::variant< Circular_arc_4, Line_arc_4 > CircularKernHexVarArc; - typedef std::vector CircularKernHexVarArcContainer; - typedef CGAL::Arr_circular_line_arc_traits_2 CircularKernHex_Variant_Traits; - - bench.kernel("CK Hex VarTraits"); - - // bench.Compute(Dxffilename[i]); - bench.Compute_no_dxf(); - - - #endif - /*------------------------------------------------------------------------------------------------------------------------- - !!!!!!!!!!!Filtered_hexagone_Lazy_Circular_kernel!!!!!!!!!!!!!!!!!! - - -------------------------------------------------------------------------------------------------------------------------*/ - #ifdef LAZY_CURVED_KERNEL_2_FILTERED_HEXAGON - - - typedef CGAL::Filtered_hexagon_circular_kernel_2 LazyKernelHexagon; - -// #ifndef CGAL_CURVED_KERNEL_DEBUG - typedef CGAL::Arr_circular_arc_traits_2 LazyKernelHexagon_CA_Traits; -// #else -// typedef CGAL::Circular_arc_traits Traits0_4; -// typedef CGAL::Circular_arc_traits_tracer LazyKernelHexagon_CA_Traits; -// #endif - - typedef LazyKernelHexagon::Circular_arc_2 LazyKernelHexagonArc; - typedef std::vector LazyKernelHexagonArcContainer; - bench.kernel("LazyK Hex CircArcTraits"); - - bench.Compute_no_dxf(); - - typedef LazyKernelHexagon::Circular_arc_2 Circular_arc_5; - typedef LazyKernelHexagon::Line_arc_2 Line_arc_5; - typedef boost::variant HxLazyVarArc; - typedef std::vector HxLazyVarContainer; - typedef CGAL::Arr_circular_line_arc_traits_2 HxLazyVariantTraits; - - bench.kernel("LazyK Hex VarTraits") ; - - //bench.Compute(Dxffilename[i]); -bench.Compute_no_dxf(); - - #endif /*------------------------------------------------------------------------------------------------------------------------- !!!!!!!!!!!bbox_filtered_Circular_kernel!!!!!!!!!!!!!!!!!! @@ -333,105 +207,6 @@ bench.Compute_no_dxf() bench.Compute_no_dxf(); #endif - /*------------------------------------------------------------------------------------------------------------------------- - !!!!!!!!!!!bbox_hexagone_Lazy_Circular_kernel!!!!!!!!!!!!!!!!!! - - -------------------------------------------------------------------------------------------------------------------------*/ - #ifdef LAZY_CURVED_KERNEL_2_FILTERED_BBOX - - typedef CGAL::Filtered_bbox_circular_kernel_2 BBLazyCurvedK; - -// #ifndef CGAL_CURVED_KERNEL_DEBUG - typedef CGAL::Arr_circular_arc_traits_2 BBLazyCurvedK_CA_Traits; -// #else -// typedef CGAL::Circular_arc_traits Traits0_6; -// typedef CGAL::Circular_arc_traits_tracer BBLazyCurvedK_CA_Traits; -// #endif - - typedef BBLazyCurvedK::Circular_arc_2 BBLazyCurvedKArc; - typedef std::vector BBLazyCurvedKArcContainer; - bench.kernel("LLazyK BBox CircArcTraits"); - - bench.Compute_no_dxf(); - - - typedef BBLazyCurvedK::Circular_arc_2 Circular_arc_7; - typedef BBLazyCurvedK::Line_arc_2 Line_arc_7; - typedef boost::variant BBLazyVarArc; - typedef std::vector< BBLazyVarArc> BBLazyVarContainer; - typedef CGAL::Arr_circular_line_arc_traits_2 BBLazyVariantTraits; - - bench.kernel("LLazyK BBox VarTraits") ; - - //bench.Compute(Dxffilename[i]); - bench.Compute_no_dxf(); - - #endif - /*------------------------------------------------------------------------------------------------------------------------- - !!!!!!!!!!!bbox_filtered_Filtered_hexagone_Circular_kernel!!!!!!!!!!!!!!!!!! - - -------------------------------------------------------------------------------------------------------------------------*/ - /* - typedef CGAL::Filtered_bbox_curved_kernel BBCircKHexagon ; - - #ifndef CGAL_CURVED_KERNEL_DEBUG - typedef CGAL::Circular_arc_traits BBCircKHexagonCATraits; - #else - typedef CGAL::Circular_arc_traits Traits0_7; - typedef CGAL::Circular_arc_traits_tracer BBCircKHexagonCATraits; - #endif - typedef BBCircKHexagon::Circular_arc_2 BBCircKHexagonArc; - typedef std::vector BBCircKHexagonArcCont; - bench.kernel("BBox Circular kernel filtered Hexagon CircArcTraits"); - - bench.Compute_no_dxf(); - - typedef BBCircularKernelHexagon::Circular_arc_2 Circular_arc_8; - typedef BBCircularKernelHexagon::Line_arc_2 Line_arc_8; - typedef boost::variant BBCircularKernelHexagonVarArc; - typedef std::vector BBCircularKernelHexagonVarContainer; - typedef CGAL::Variant_traits BBCircularKernelHexagonVariantTraits; - - bench.kernel("BBox Circular kernel filtered Hexagon VarTraits") ; - - //bench.Compute(Dxffilename[i]); - bench.Compute_no_dxf();*/ - /*-------------------------------------------------------------------------------------------------------------------------- - -----------------------------------------------------------------------------------------------------------------------------*/ -// if (i+1<2) -// { -// try{ -// if (strcmp(Dxffilename[i+1],"")) -// { -// try{ -// fin.open (Dxffilename[i]); -// } -// catch(...){ -// std::cout<<"error"< #include -#include - -#include - #include #include @@ -225,4 +221,3 @@ int exit_status = 0; return exit_status; } - diff --git a/Circular_kernel_2/benchmark/incremental_insertion/benchmarks_arrangement.cpp b/Circular_kernel_2/benchmark/incremental_insertion/benchmarks_arrangement.cpp index 61527c6040f..8895b11f372 100644 --- a/Circular_kernel_2/benchmark/incremental_insertion/benchmarks_arrangement.cpp +++ b/Circular_kernel_2/benchmark/incremental_insertion/benchmarks_arrangement.cpp @@ -13,10 +13,6 @@ #include #include -#include - -#include - #include #include @@ -169,207 +165,7 @@ Bench bench(Htmlfilename,Texfilename,Dxffilename[i],true); // bench.Compute(Dxffilename[i]); bench.Compute_dxf(Dxffilename[i]); -/*------------------------------------------------------------------------------------------------------------------------- - !!!!!!!!!!!Lazy_curved_Kernel!!!!!!!!!!!!!!!!!! - -------------------------------------------------------------------------------------------------------------------------*/ - - typedef CGAL::Quotient NT2; - typedef CGAL::Cartesian Linear_k2; - typedef CGAL::Algebraic_kernel_for_circles_2_2 Algebraic_k2; - typedef CGAL::Circular_kernel_2 CK2_; - - //typedef CGAL::Interval_nt<> NT2; - typedef CGAL::Interval_nt_advanced NT3; - typedef CGAL::Cartesian Linear_k3; - typedef CGAL::Algebraic_kernel_2_2 Algebraic_k3; - typedef CGAL::Curved_kernel CK3_; - - - typedef CGAL::Lazy_circular_kernel_2 LazyCurvedK; - -// #ifndef CGAL_CURVED_KERNEL_DEBUG -// typedef CGAL::Circular_arc_traits LazyCurvedK_CA_Traits; -// #else -// typedef CGAL::Circular_arc_traits Traits0_2; -// typedef CGAL::Circular_arc_traits_tracer LazyCurved_kTraits; -// #endif -// -// typedef LazyCurvedK::Circular_arc_2 LazyArc; -// typedef std::vector LazyArcContainer; -// -// bench.kernel("Lazy curved kernel Circular arc traits") ; -// -// bench.Compute_no_dxf(); - - - typedef LazyCurvedK::Circular_arc_2 Circular_arc_3; - typedef LazyCurvedK::Line_arc_2 Line_arc_3; - typedef boost::variant LazyVarArc; - typedef std::vector LazyVarContainer; - typedef CGAL::Variant_traits LazyCurvedK_Variant_Traits; - - bench.kernel("Lazy curved kernel Variant traits"); - - // bench.Compute(Dxffilename[i]); - // bench.Compute_dxf(Dxffilename[i]); - /*------------------------------------------------------------------------------------------------------------------------- - !!!!!!!!!!!Filtered_hexagone_Circular_kernel!!!!!!!!!!!!!!!!!! - - -------------------------------------------------------------------------------------------------------------------------*/ - /* -asdashhhhhhhhhhhhfhjhdghdf - typedef CGAL::Filtered_hexagon_curved_kernel CircularKernelHexagon; - - #ifndef CGAL_CURVED_KERNEL_DEBUG - typedef CGAL::Circular_arc_traits CircularKernHex_CA_Traits; - #else - typedef CGAL::Circular_arc_traits Traits0_3; - typedef CGAL::Circular_arc_traits_tracer CircularKernHex_CA_Traits; - #endif - - typedef CircularKernelHexagon::Circular_arc_2 CircularKernHexArc; - typedef std::vector CircularKernHexArcContainer; - bench.kernel("Circular kernel filtered hexagon Circular arc traits"); - - bench.Compute_no_dxf(); - - - typedef CircularKernelHexagon::Circular_arc_2 Circular_arc_4; - typedef CircularKernelHexagon::Line_arc_2 Line_arc_4; - typedef boost::variant< Circular_arc_4, Line_arc_4 > CircularKernHexVarArc; - typedef std::vector CircularKernHexVarArcContainer; - typedef CGAL::Variant_traits CircularKernHex_Variant_Traits; - - bench.kernel("Circular kernel filtered hexagon Variants traits"); - - bench.Compute(Dxffilename[i]); - // bench.Compute_no_dxf(); - - - */ - /*------------------------------------------------------------------------------------------------------------------------- - !!!!!!!!!!!Filtered_hexagone_Lazy_Circular_kernel!!!!!!!!!!!!!!!!!! - - -------------------------------------------------------------------------------------------------------------------------*/ - /* - typedef CGAL::Filtered_hexagon_curved_kernel LazyKernelHexagon; - - #ifndef CGAL_CURVED_KERNEL_DEBUG - typedef CGAL::Circular_arc_traits LazyKernelHexagon_CA_Traits; - #else - typedef CGAL::Circular_arc_traits Traits0_4; - typedef CGAL::Circular_arc_traits_tracer LazyKernelHexagon_CA_Traits; - #endif - typedef LazyKernelHexagon::Circular_arc_2 LazyKernelHexagonArc; - typedef std::vector LazyKernelHexagonArcContainer; - bench.kernel("Lazy curved kernel filtered hexagon Circular arc traits"); - - bench.Compute_no_dxf(); - - typedef LazyKernelHexagon::Circular_arc_2 Circular_arc_5; - typedef LazyKernelHexagon::Line_arc_2 Line_arc_5; - typedef boost::variant HxLazyVarArc; - typedef std::vector HxLazyVarContainer; - typedef CGAL::Variant_traits HxLazyVariantTraits; - - bench.kernel("Lazy curved kernel filtered hexagon Variants traits") ; - - bench.Compute(Dxffilename[i]); -//bench.Compute_no_dxf(); -*/ - /*------------------------------------------------------------------------------------------------------------------------- - !!!!!!!!!!!bbox_filtered_Circular_kernel!!!!!!!!!!!!!!!!!! - - -------------------------------------------------------------------------------------------------------------------------*/ - /* - typedef CGAL::Filtered_bbox_curved_kernel BBCircularKernel ; - - #ifndef CGAL_CURVED_KERNEL_DEBUG - typedef CGAL::Circular_arc_traits BBCircularKernel_CA_Traits; - #else - typedef CGAL::Circular_arc_traits Traits0_5; - typedef CGAL::Circular_arc_traits_tracer BBCircularKernel_CA_Traits; - #endif - typedef BBCircularKernel::Circular_arc_2 BBCircularKernelArc; - typedef std::vector BBCircularKernelArcContainer; - bench.kernel("Circular kernel filtered bbox Circular arc traits"); - - bench.Compute_no_dxf(); - - typedef BBCircularKernel::Circular_arc_2 Circular_arc_6; - typedef BBCircularKernel::Line_arc_2 Line_arc_6; - typedef boost::variant BBCircVarArc; - typedef std::vector BBCircVarContainer; - typedef CGAL::Variant_traits BBCircVariantTraits; - - bench.kernel("Circular kernel filtered bbox Variants traits") ; - - bench.Compute(Dxffilename[i]); - // bench.Compute_no_dxf(); - */ - /*------------------------------------------------------------------------------------------------------------------------- - !!!!!!!!!!!bbox_hexagone_Lazy_Circular_kernel!!!!!!!!!!!!!!!!!! - - -------------------------------------------------------------------------------------------------------------------------*/ - /* - typedef CGAL::Filtered_bbox_curved_kernel BBLazyCurvedK; - - #ifndef CGAL_CURVED_KERNEL_DEBUG - typedef CGAL::Circular_arc_traits BBLazyCurvedK_CA_Traits; - #else - typedef CGAL::Circular_arc_traits Traits0_6; - typedef CGAL::Circular_arc_traits_tracer BBLazyCurvedK_CA_Traits; - #endif - typedef BBLazyCurvedK::Circular_arc_2 BBLazyCurvedKArc; - typedef std::vector BBLazyCurvedKArcContainer; - bench.kernel("Lazy curved kernel filtered bbox Circular arc traits"); - - bench.Compute_no_dxf(); - - - typedef BBLazyCurvedK::Circular_arc_2 Circular_arc_7; - typedef BBLazyCurvedK::Line_arc_2 Line_arc_7; - typedef boost::variant BBLazyVarArc; - typedef std::vector< BBLazyVarArc> BBLazyVarContainer; - typedef CGAL::Variant_traits BBLazyVariantTraits; - - bench.kernel("Lazy curved kernel filtered bbox Variants traits") ; - - bench.Compute(Dxffilename[i]); - //bench.Compute_no_dxf(); - */ - /*------------------------------------------------------------------------------------------------------------------------- - !!!!!!!!!!!bbox_filtered_Filtered_hexagone_Circular_kernel!!!!!!!!!!!!!!!!!! - - -------------------------------------------------------------------------------------------------------------------------*/ - /* - typedef CGAL::Filtered_bbox_curved_kernel BBCircKHexagon ; - - #ifndef CGAL_CURVED_KERNEL_DEBUG - typedef CGAL::Circular_arc_traits BBCircKHexagonCATraits; - #else - typedef CGAL::Circular_arc_traits Traits0_7; - typedef CGAL::Circular_arc_traits_tracer BBCircKHexagonCATraits; - #endif - typedef BBCircKHexagon::Circular_arc_2 BBCircKHexagonArc; - typedef std::vector BBCircKHexagonArcCont; - bench.kernel("BBox Circular kernel filtered bbox Circular arc traits"); - - bench.Compute_no_dxf(); - - typedef BBCircularKernelHexagon::Circular_arc_2 Circular_arc_8; - typedef BBCircularKernelHexagon::Line_arc_2 Line_arc_8; - typedef boost::variant BBCircularKernelHexagonVarArc; - typedef std::vector BBCircularKernelHexagonVarContainer; - typedef CGAL::Variant_traits BBCircularKernelHexagonVariantTraits; - - bench.kernel("BBox Circular kernel filtered bbox Variants traits") ; - - //bench.Compute(Dxffilename[i]); - bench.Compute_no_dxf();*/ - /*-------------------------------------------------------------------------------------------------------------------------- - -----------------------------------------------------------------------------------------------------------------------------*/ if (i+1<15) { if (strcmp(Dxffilename[i+1],"")) @@ -388,4 +184,3 @@ bench.infotable(); return 0; } -