From 67d72675fe81653385d6d9c84ed89a863b4bb5e1 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Mon, 17 Aug 2015 23:46:59 +0200 Subject: [PATCH 1/8] split packages --- .../doc/Sweep_line_2/examples.txt | 3 - Documentation/doc/Documentation/Doxyfile.in | 10 +-- Documentation/doc/Documentation/packages.txt | 10 +-- .../doc/Kinetic_data_structures/Doxyfile.in | 2 +- .../doc/Kinetic_data_structures/examples.txt | 2 - .../CGAL/Kinetic/Active_objects_vector.h | 0 .../CGAL/Kinetic/Cartesian.h | 0 .../Kinetic/Default_instantaneous_kernel.h | 0 .../CGAL/Kinetic/Default_simulator.h | 0 .../Kinetic_framework/CGAL/Kinetic/Listener.h | 0 .../CGAL/Kinetic/Multi_listener.h | 0 .../CGAL/Kinetic/Ref_counted.h | 0 .../CGAL/Kinetic/Simulator_objects_listener.h | 0 .../CGAL/Kinetic/listeners.h | 0 .../Concepts/ActiveObjectsTable.h | 0 .../Concepts/CertificateGenerator.h | 0 .../Kinetic_framework/Concepts/EvenQueue.h | 0 .../Concepts/FunctionKernel.h | 0 .../Concepts/InstantaneousKernel.h | 0 .../doc/Kinetic_framework/Concepts/Key.h | 0 .../Concepts/Kinetic--Certificate.h | 0 .../Concepts/KineticKernel.h | 0 .../Kinetic_framework/Concepts/RootStack.h | 0 .../Concepts/SimulationTraits.h | 0 .../Kinetic_framework/Concepts/Simulator.h | 0 .../doc/Kinetic_framework/Doxyfile.in | 2 +- .../Kinetic_framework/Kinetic_framework.txt | 0 .../Kinetic_framework/PackageDescription.txt | 0 .../doc/Kinetic_framework/dependencies | 0 .../doc/Kinetic_framework/fig/delaunay_0.png | Bin .../doc/Kinetic_framework/fig/delaunay_1.png | Bin .../doc/Kinetic_framework/fig/delaunay_2.png | Bin .../doc/Kinetic_framework/fig/delaunay_3.png | Bin .../doc/Kinetic_framework/fig/delaunay_4.png | Bin .../doc/Kinetic_framework/fig/delaunay_5.png | Bin .../doc/Kinetic_framework/fig/delaunay_6.png | Bin .../doc/Kinetic_framework/fig/delaunay_7.png | Bin .../doc/Kinetic_framework/fig/delaunay_8.png | Bin .../doc/Kinetic_framework/fig/kds.jpg | Bin .../doc/Kinetic_framework/fig/kdsDetail.png | Bin .../Kinetic_framework/fig/kdsFramework.png | Bin .../fig/qt_widget_marked_pct.png | Bin .../Kinetic_framework/fig/sort_usage_pct.png | Bin .../adding_a_certificate.cpp | 0 .../examples/Kinetic_framework/data/points_2 | 0 .../data/points_with_color_2 | 0 .../defining_a_simulation_traits.cpp | 0 .../examples/Kinetic_framework/listener.cpp | 0 .../Kinetic_framework/pointer_queue.cpp | 0 .../Kinetic_framework/ref_counted.cpp | 0 .../Kinetic_framework/trivial_kds.cpp | 0 .../Kinetic_framework/description.txt | 3 + .../Kinetic_framework/license.txt | 1 + .../Kinetic_framework/long_description.txt | 0 .../package_info/Kinetic_framework/maintainer | 1 + .../doc/Property_map/Doxyfile.in | 6 -- Property_map/doc/Property_map/Doxyfile.in | 6 ++ .../doc/Property_map/PackageDescription.txt | 0 .../doc/Property_map/Property_map.txt | 0 .../doc/Property_map/dependencies | 0 .../doc/Property_map/examples.txt | 1 - .../doc/Property_map/fig/property_map.png | Bin .../include/CGAL/Index_property_map.h | 0 .../include/CGAL/property_map.h | 0 .../package_info/Property_map/copyright | 2 + .../package_info/Property_map/description.txt | 3 + .../package_info/Property_map/license.txt | 1 + .../Property_map/long_description.txt | 6 ++ .../package_info/Property_map/maintainer | 1 + .../package_info/Property_map/workflow.txt | 35 ++++++++++ .../CGAL/Sweep_line_2_algorithms.h | 0 .../doc/Sweep_line_2/Doxyfile.in | 2 +- .../doc/Sweep_line_2/PackageDescription.txt | 0 .../doc/Sweep_line_2/Sweep_line_2.txt | 2 +- .../doc/Sweep_line_2/dependencies | 0 Sweep_line_2/doc/Sweep_line_2/examples.txt | 3 + .../fig/Curve_intersections_2.png | Bin .../doc/Sweep_line_2/fig/sl_simple.png | Bin .../examples/Sweep_line_2/CMakeLists.txt | 65 ++++++++++++++++++ .../examples/Sweep_line_2}/sweep_line.cpp | 0 .../include/CGAL/Sweep_line_2.h | 0 .../Arr_basic_insertion_sl_visitor.h | 0 .../Arr_basic_insertion_traits_2.h | 0 .../Sweep_line_2/Arr_batched_pl_sl_visitor.h | 0 .../Sweep_line_2/Arr_construction_event.h | 0 .../Arr_construction_sl_visitor.h | 0 .../Sweep_line_2/Arr_construction_subcurve.h | 0 .../Arr_default_overlay_traits_base.h | 0 .../Sweep_line_2/Arr_insertion_sl_visitor.h | 0 .../Sweep_line_2/Arr_insertion_traits_2.h | 0 .../Sweep_line_2/Arr_overlay_sl_visitor.h | 0 .../CGAL/Sweep_line_2/Arr_overlay_subcurve.h | 0 .../CGAL/Sweep_line_2/Arr_overlay_traits_2.h | 0 .../Sweep_line_2/Arr_vert_decomp_sl_visitor.h | 0 .../Sweep_line_2/Basic_sweep_line_2_impl.h | 0 .../CGAL/Sweep_line_2/Sweep_line_2_debug.h | 0 .../CGAL/Sweep_line_2/Sweep_line_2_impl.h | 0 .../CGAL/Sweep_line_2/Sweep_line_2_utils.h | 0 .../CGAL/Sweep_line_2/Sweep_line_2_visitors.h | 0 .../CGAL/Sweep_line_2/Sweep_line_curve_pair.h | 0 .../CGAL/Sweep_line_2/Sweep_line_event.h | 0 .../CGAL/Sweep_line_2/Sweep_line_functors.h | 0 .../CGAL/Sweep_line_2/Sweep_line_subcurve.h | 0 .../include/CGAL/Sweep_line_2_algorithms.h | 0 .../include/CGAL/Sweep_line_empty_visitor.h | 0 .../package_info/Sweep_line_2/copyright | 1 + .../package_info/Sweep_line_2/description.txt | 1 + .../package_info/Sweep_line_2/license.txt | 1 + .../Sweep_line_2/long_description.txt | 42 +++++++++++ .../package_info/Sweep_line_2/maintainer | 5 ++ .../CGAL/Triangulation_data_structure_2.h | 0 .../TDS_2/CGAL/Triangulation_ds_face_base_2.h | 0 .../CGAL/Triangulation_ds_vertex_base_2.h | 0 .../Concepts/TriangulationDSFaceBase_2.h | 0 .../Concepts/TriangulationDSVertexBase_2.h | 0 .../Concepts/TriangulationDataStructure_2.h | 0 .../doc/TDS_2/Doxyfile.in | 2 +- .../doc/TDS_2/PackageDescription.txt | 0 .../doc/TDS_2/TDS_2.txt | 0 .../doc/TDS_2/dependencies | 0 .../doc/TDS_2/fig/Three.png | Bin .../doc/TDS_2/fig/join_split.png | Bin .../doc/TDS_2/fig/rep_bis.png | Bin .../doc/TDS_2/fig/tds-insert_degree_2.png | Bin .../doc/TDS_2/fig/threelevels2.png | Bin .../doc/TDS_2/fig_src/Flip.gif | Bin .../doc/TDS_2/fig_src/Three.gif | Bin .../doc/TDS_2/fig_src/rep_bis.eps | 0 .../doc/TDS_2/fig_src/rep_bis.gif | Bin .../doc/TDS_2/fig_src/rep_bis.pdf | Bin .../doc/TDS_2/fig_src/threelevels2.eps | 0 .../doc/TDS_2/fig_src/threelevels2.gif | Bin .../doc/TDS_2/fig_src/threelevels2.pdf | Bin TDS_2/package_info/TDS_2/copyright | 2 + TDS_2/package_info/TDS_2/description.txt | 1 + TDS_2/package_info/TDS_2/license.txt | 1 + TDS_2/package_info/TDS_2/maintainer | 1 + .../CGAL/Triangulation_data_structure_3.h | 0 .../TDS_3/CGAL/Triangulation_ds_cell_base_3.h | 0 .../CGAL/Triangulation_ds_vertex_base_3.h | 0 .../doc/TDS_3/CGAL/Triangulation_utils_3.h | 0 .../Concepts/TriangulationDSCellBase_3.h | 0 .../Concepts/TriangulationDSVertexBase_3.h | 0 .../Concepts/TriangulationDataStructure_3.h | 0 .../doc/TDS_3/Doxyfile.in | 2 +- .../doc/TDS_3/PackageDescription.txt | 0 .../doc/TDS_3/TriangulationDS_3.txt | 4 +- .../doc/TDS_3/dependencies | 0 TDS_3/doc/TDS_3/examples.txt | 4 ++ .../doc/TDS_3/fig/comborient.png | Bin .../doc/TDS_3/fig/design_tds.png | Bin .../doc/TDS_3/fig/flips.png | Bin .../doc/TDS_3/fig/tds-dim_down.png | Bin .../fig/topo-insert_outside_affine_hull.png | Bin .../doc/TDS_3/fig/topo-simplex2.png | Bin .../doc/TDS_3/fig/topo-simplex3.png | Bin .../doc/TDS_3/fig/topo-simplex4.png | Bin .../doc/TDS_3/fig/utils-next-around-edge.png | Bin .../doc/TDS_3/fig/utils.png | Bin .../doc/TDS_3/fig_src/comborient.eps | 0 .../doc/TDS_3/fig_src/comborient.pdf | Bin .../doc/TDS_3/fig_src/comborient.xml | 0 .../doc/TDS_3/fig_src/design_tds.eps | 0 .../doc/TDS_3/fig_src/design_tds.fig | 0 .../doc/TDS_3/fig_src/design_tds.pdf | Bin .../doc/TDS_3/fig_src/flips.eps | 0 .../doc/TDS_3/fig_src/flips.pdf | Bin .../doc/TDS_3/fig_src/flips.xml | 0 .../doc/TDS_3/fig_src/repres.eps | 0 .../doc/TDS_3/fig_src/repres.pdf | Bin .../doc/TDS_3/fig_src/repres.xml | 0 .../topo-insert_outside_affine_hull.eps | 0 .../topo-insert_outside_affine_hull.pdf | Bin .../doc/TDS_3/fig_src/topo-simplex2.eps | 0 .../doc/TDS_3/fig_src/topo-simplex2.pdf | Bin .../doc/TDS_3/fig_src/topo-simplex2.xml | 0 .../doc/TDS_3/fig_src/topo-simplex3.eps | 0 .../doc/TDS_3/fig_src/topo-simplex3.pdf | Bin .../doc/TDS_3/fig_src/topo-simplex3.xml | 0 .../doc/TDS_3/fig_src/topo-simplex4.eps | 0 .../doc/TDS_3/fig_src/topo-simplex4.pdf | Bin .../doc/TDS_3/fig_src/topo-simplex4.xml | 0 .../doc/TDS_3/fig_src/utils-ipe7.xml | 0 .../TDS_3/fig_src/utils-next-around-edge.xml | 0 .../doc/TDS_3/fig_src/utils.eps | 0 .../doc/TDS_3/fig_src/utils.ipe | 0 .../doc/TDS_3/fig_src/utils.pdf | Bin .../doc/TDS_3/fig_src/utils.xml | 0 .../examples/TDS_3}/linking_2d_and_3d.cpp | 0 .../examples/TDS_3}/tds.cpp | 0 TDS_3/package_info/TDS_3/copyright | 2 + TDS_3/package_info/TDS_3/description.txt | 2 + TDS_3/package_info/TDS_3/license.txt | 1 + TDS_3/package_info/TDS_3/maintainer | 1 + Triangulation_3/doc/TDS_3/examples.txt | 4 -- 195 files changed, 210 insertions(+), 34 deletions(-) delete mode 100644 Arrangement_on_surface_2/doc/Sweep_line_2/examples.txt rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/CGAL/Kinetic/Active_objects_vector.h (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/CGAL/Kinetic/Cartesian.h (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/CGAL/Kinetic/Default_instantaneous_kernel.h (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/CGAL/Kinetic/Default_simulator.h (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/CGAL/Kinetic/Listener.h (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/CGAL/Kinetic/Multi_listener.h (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/CGAL/Kinetic/Ref_counted.h (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/CGAL/Kinetic/Simulator_objects_listener.h (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/CGAL/Kinetic/listeners.h (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/Concepts/ActiveObjectsTable.h (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/Concepts/CertificateGenerator.h (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/Concepts/EvenQueue.h (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/Concepts/FunctionKernel.h (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/Concepts/InstantaneousKernel.h (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/Concepts/Key.h (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/Concepts/Kinetic--Certificate.h (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/Concepts/KineticKernel.h (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/Concepts/RootStack.h (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/Concepts/SimulationTraits.h (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/Concepts/Simulator.h (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/Doxyfile.in (58%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/Kinetic_framework.txt (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/PackageDescription.txt (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/dependencies (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/fig/delaunay_0.png (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/fig/delaunay_1.png (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/fig/delaunay_2.png (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/fig/delaunay_3.png (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/fig/delaunay_4.png (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/fig/delaunay_5.png (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/fig/delaunay_6.png (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/fig/delaunay_7.png (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/fig/delaunay_8.png (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/fig/kds.jpg (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/fig/kdsDetail.png (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/fig/kdsFramework.png (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/fig/qt_widget_marked_pct.png (100%) rename {Kinetic_data_structures => Kinetic_framework}/doc/Kinetic_framework/fig/sort_usage_pct.png (100%) rename {Kinetic_data_structures => Kinetic_framework}/examples/Kinetic_framework/adding_a_certificate.cpp (100%) rename {Kinetic_data_structures => Kinetic_framework}/examples/Kinetic_framework/data/points_2 (100%) rename {Kinetic_data_structures => Kinetic_framework}/examples/Kinetic_framework/data/points_with_color_2 (100%) rename {Kinetic_data_structures => Kinetic_framework}/examples/Kinetic_framework/defining_a_simulation_traits.cpp (100%) rename {Kinetic_data_structures => Kinetic_framework}/examples/Kinetic_framework/listener.cpp (100%) rename {Kinetic_data_structures => Kinetic_framework}/examples/Kinetic_framework/pointer_queue.cpp (100%) rename {Kinetic_data_structures => Kinetic_framework}/examples/Kinetic_framework/ref_counted.cpp (100%) rename {Kinetic_data_structures => Kinetic_framework}/examples/Kinetic_framework/trivial_kds.cpp (100%) create mode 100644 Kinetic_framework/package_info/Kinetic_framework/description.txt create mode 100644 Kinetic_framework/package_info/Kinetic_framework/license.txt create mode 100644 Kinetic_framework/package_info/Kinetic_framework/long_description.txt create mode 100644 Kinetic_framework/package_info/Kinetic_framework/maintainer delete mode 100644 Point_set_processing_3/doc/Property_map/Doxyfile.in create mode 100644 Property_map/doc/Property_map/Doxyfile.in rename {Point_set_processing_3 => Property_map}/doc/Property_map/PackageDescription.txt (100%) rename {Point_set_processing_3 => Property_map}/doc/Property_map/Property_map.txt (100%) rename {Point_set_processing_3 => Property_map}/doc/Property_map/dependencies (100%) rename {Point_set_processing_3 => Property_map}/doc/Property_map/examples.txt (80%) rename {Point_set_processing_3 => Property_map}/doc/Property_map/fig/property_map.png (100%) rename {Point_set_processing_3 => Property_map}/include/CGAL/Index_property_map.h (100%) rename {Point_set_processing_3 => Property_map}/include/CGAL/property_map.h (100%) create mode 100644 Property_map/package_info/Property_map/copyright create mode 100644 Property_map/package_info/Property_map/description.txt create mode 100644 Property_map/package_info/Property_map/license.txt create mode 100644 Property_map/package_info/Property_map/long_description.txt create mode 100644 Property_map/package_info/Property_map/maintainer create mode 100644 Property_map/package_info/Property_map/workflow.txt rename {Arrangement_on_surface_2 => Sweep_line_2}/doc/Sweep_line_2/CGAL/Sweep_line_2_algorithms.h (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/doc/Sweep_line_2/Doxyfile.in (61%) rename {Arrangement_on_surface_2 => Sweep_line_2}/doc/Sweep_line_2/PackageDescription.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/doc/Sweep_line_2/Sweep_line_2.txt (97%) rename {Arrangement_on_surface_2 => Sweep_line_2}/doc/Sweep_line_2/dependencies (100%) create mode 100644 Sweep_line_2/doc/Sweep_line_2/examples.txt rename {Arrangement_on_surface_2 => Sweep_line_2}/doc/Sweep_line_2/fig/Curve_intersections_2.png (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/doc/Sweep_line_2/fig/sl_simple.png (100%) create mode 100644 Sweep_line_2/examples/Sweep_line_2/CMakeLists.txt rename {Arrangement_on_surface_2/examples/Arrangement_on_surface_2 => Sweep_line_2/examples/Sweep_line_2}/sweep_line.cpp (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/include/CGAL/Sweep_line_2.h (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/include/CGAL/Sweep_line_2/Arr_basic_insertion_sl_visitor.h (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/include/CGAL/Sweep_line_2/Arr_basic_insertion_traits_2.h (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/include/CGAL/Sweep_line_2/Arr_batched_pl_sl_visitor.h (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/include/CGAL/Sweep_line_2/Arr_construction_event.h (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/include/CGAL/Sweep_line_2/Arr_construction_sl_visitor.h (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/include/CGAL/Sweep_line_2/Arr_construction_subcurve.h (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/include/CGAL/Sweep_line_2/Arr_default_overlay_traits_base.h (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/include/CGAL/Sweep_line_2/Arr_insertion_sl_visitor.h (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/include/CGAL/Sweep_line_2/Arr_insertion_traits_2.h (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/include/CGAL/Sweep_line_2/Arr_overlay_sl_visitor.h (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/include/CGAL/Sweep_line_2/Arr_overlay_subcurve.h (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/include/CGAL/Sweep_line_2/Arr_overlay_traits_2.h (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/include/CGAL/Sweep_line_2/Arr_vert_decomp_sl_visitor.h (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/include/CGAL/Sweep_line_2/Basic_sweep_line_2_impl.h (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/include/CGAL/Sweep_line_2/Sweep_line_2_debug.h (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/include/CGAL/Sweep_line_2/Sweep_line_2_impl.h (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/include/CGAL/Sweep_line_2/Sweep_line_2_utils.h (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/include/CGAL/Sweep_line_2/Sweep_line_2_visitors.h (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/include/CGAL/Sweep_line_2/Sweep_line_curve_pair.h (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/include/CGAL/Sweep_line_2/Sweep_line_event.h (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/include/CGAL/Sweep_line_2/Sweep_line_functors.h (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/include/CGAL/Sweep_line_2/Sweep_line_subcurve.h (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/include/CGAL/Sweep_line_2_algorithms.h (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/include/CGAL/Sweep_line_empty_visitor.h (100%) create mode 100644 Sweep_line_2/package_info/Sweep_line_2/copyright create mode 100644 Sweep_line_2/package_info/Sweep_line_2/description.txt create mode 100644 Sweep_line_2/package_info/Sweep_line_2/license.txt create mode 100644 Sweep_line_2/package_info/Sweep_line_2/long_description.txt create mode 100644 Sweep_line_2/package_info/Sweep_line_2/maintainer rename {Triangulation_2 => TDS_2}/doc/TDS_2/CGAL/Triangulation_data_structure_2.h (100%) rename {Triangulation_2 => TDS_2}/doc/TDS_2/CGAL/Triangulation_ds_face_base_2.h (100%) rename {Triangulation_2 => TDS_2}/doc/TDS_2/CGAL/Triangulation_ds_vertex_base_2.h (100%) rename {Triangulation_2 => TDS_2}/doc/TDS_2/Concepts/TriangulationDSFaceBase_2.h (100%) rename {Triangulation_2 => TDS_2}/doc/TDS_2/Concepts/TriangulationDSVertexBase_2.h (100%) rename {Triangulation_2 => TDS_2}/doc/TDS_2/Concepts/TriangulationDataStructure_2.h (100%) rename {Triangulation_2 => TDS_2}/doc/TDS_2/Doxyfile.in (76%) rename {Triangulation_2 => TDS_2}/doc/TDS_2/PackageDescription.txt (100%) rename {Triangulation_2 => TDS_2}/doc/TDS_2/TDS_2.txt (100%) rename {Triangulation_2 => TDS_2}/doc/TDS_2/dependencies (100%) rename {Triangulation_2 => TDS_2}/doc/TDS_2/fig/Three.png (100%) rename {Triangulation_2 => TDS_2}/doc/TDS_2/fig/join_split.png (100%) rename {Triangulation_2 => TDS_2}/doc/TDS_2/fig/rep_bis.png (100%) rename {Triangulation_2 => TDS_2}/doc/TDS_2/fig/tds-insert_degree_2.png (100%) rename {Triangulation_2 => TDS_2}/doc/TDS_2/fig/threelevels2.png (100%) rename {Triangulation_2 => TDS_2}/doc/TDS_2/fig_src/Flip.gif (100%) rename {Triangulation_2 => TDS_2}/doc/TDS_2/fig_src/Three.gif (100%) rename {Triangulation_2 => TDS_2}/doc/TDS_2/fig_src/rep_bis.eps (100%) rename {Triangulation_2 => TDS_2}/doc/TDS_2/fig_src/rep_bis.gif (100%) rename {Triangulation_2 => TDS_2}/doc/TDS_2/fig_src/rep_bis.pdf (100%) rename {Triangulation_2 => TDS_2}/doc/TDS_2/fig_src/threelevels2.eps (100%) rename {Triangulation_2 => TDS_2}/doc/TDS_2/fig_src/threelevels2.gif (100%) rename {Triangulation_2 => TDS_2}/doc/TDS_2/fig_src/threelevels2.pdf (100%) create mode 100644 TDS_2/package_info/TDS_2/copyright create mode 100644 TDS_2/package_info/TDS_2/description.txt create mode 100644 TDS_2/package_info/TDS_2/license.txt create mode 100644 TDS_2/package_info/TDS_2/maintainer rename {Triangulation_3 => TDS_3}/doc/TDS_3/CGAL/Triangulation_data_structure_3.h (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/CGAL/Triangulation_ds_cell_base_3.h (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/CGAL/Triangulation_ds_vertex_base_3.h (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/CGAL/Triangulation_utils_3.h (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/Concepts/TriangulationDSCellBase_3.h (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/Concepts/TriangulationDSVertexBase_3.h (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/Concepts/TriangulationDataStructure_3.h (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/Doxyfile.in (76%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/PackageDescription.txt (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/TriangulationDS_3.txt (99%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/dependencies (100%) create mode 100644 TDS_3/doc/TDS_3/examples.txt rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig/comborient.png (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig/design_tds.png (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig/flips.png (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig/tds-dim_down.png (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig/topo-insert_outside_affine_hull.png (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig/topo-simplex2.png (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig/topo-simplex3.png (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig/topo-simplex4.png (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig/utils-next-around-edge.png (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig/utils.png (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig_src/comborient.eps (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig_src/comborient.pdf (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig_src/comborient.xml (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig_src/design_tds.eps (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig_src/design_tds.fig (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig_src/design_tds.pdf (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig_src/flips.eps (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig_src/flips.pdf (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig_src/flips.xml (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig_src/repres.eps (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig_src/repres.pdf (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig_src/repres.xml (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig_src/topo-insert_outside_affine_hull.eps (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig_src/topo-insert_outside_affine_hull.pdf (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig_src/topo-simplex2.eps (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig_src/topo-simplex2.pdf (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig_src/topo-simplex2.xml (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig_src/topo-simplex3.eps (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig_src/topo-simplex3.pdf (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig_src/topo-simplex3.xml (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig_src/topo-simplex4.eps (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig_src/topo-simplex4.pdf (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig_src/topo-simplex4.xml (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig_src/utils-ipe7.xml (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig_src/utils-next-around-edge.xml (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig_src/utils.eps (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig_src/utils.ipe (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig_src/utils.pdf (100%) rename {Triangulation_3 => TDS_3}/doc/TDS_3/fig_src/utils.xml (100%) rename {Triangulation_3/examples/Triangulation_3 => TDS_3/examples/TDS_3}/linking_2d_and_3d.cpp (100%) rename {Triangulation_3/examples/Triangulation_3 => TDS_3/examples/TDS_3}/tds.cpp (100%) create mode 100644 TDS_3/package_info/TDS_3/copyright create mode 100644 TDS_3/package_info/TDS_3/description.txt create mode 100644 TDS_3/package_info/TDS_3/license.txt create mode 100644 TDS_3/package_info/TDS_3/maintainer delete mode 100644 Triangulation_3/doc/TDS_3/examples.txt diff --git a/Arrangement_on_surface_2/doc/Sweep_line_2/examples.txt b/Arrangement_on_surface_2/doc/Sweep_line_2/examples.txt deleted file mode 100644 index da1ed449b00..00000000000 --- a/Arrangement_on_surface_2/doc/Sweep_line_2/examples.txt +++ /dev/null @@ -1,3 +0,0 @@ -/*! -\example Arrangement_on_surface_2/sweep_line.cpp -*/ \ No newline at end of file diff --git a/Documentation/doc/Documentation/Doxyfile.in b/Documentation/doc/Documentation/Doxyfile.in index d0fab13cedd..e1f217ed196 100644 --- a/Documentation/doc/Documentation/Doxyfile.in +++ b/Documentation/doc/Documentation/Doxyfile.in @@ -91,19 +91,19 @@ IMAGE_PATH = ${CMAKE_SOURCE_DIR}/Documentation/doc/Documentation/fig \ ${CMAKE_SOURCE_DIR}/STL_Extension/doc/STL_Extension/fig \ ${CMAKE_SOURCE_DIR}/Skin_surface_3/doc/Skin_surface_3/fig \ ${CMAKE_SOURCE_DIR}/Snap_rounding_2/doc/Snap_rounding_2/fig \ - ${CMAKE_SOURCE_DIR}/Arrangement_on_surface_2/doc/Sweep_line_2/fig \ + ${CMAKE_SOURCE_DIR}/Sweep_line_2/doc/Sweep_line_2/fig \ ${CMAKE_SOURCE_DIR}/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig \ ${CMAKE_SOURCE_DIR}/Boolean_set_operations_2/doc/Boolean_set_operations_2/fig \ - ${CMAKE_SOURCE_DIR}/Triangulation_2/doc/TDS_2/fig \ + ${CMAKE_SOURCE_DIR}/TDS_2/doc/TDS_2/fig \ ${CMAKE_SOURCE_DIR}/Triangulation_2/doc/Triangulation_2/fig \ - ${CMAKE_SOURCE_DIR}/Triangulation_3/doc/TDS_3/fig \ + ${CMAKE_SOURCE_DIR}/TDS_3/doc/TDS_3/fig \ ${CMAKE_SOURCE_DIR}/Triangulation_3/doc/Triangulation_3/fig \ ${CMAKE_SOURCE_DIR}/Triangulation/doc/Triangulation/fig \ ${CMAKE_SOURCE_DIR}/Ridges_3/doc/Ridges_3/fig \ ${CMAKE_SOURCE_DIR}/Point_set_processing_3/doc/Point_set_processing_3/fig \ - ${CMAKE_SOURCE_DIR}/Point_set_processing_3/doc/Property_map/fig \ + ${CMAKE_SOURCE_DIR}/Property_map/doc/Property_map/fig \ ${CMAKE_SOURCE_DIR}/Point_set_shape_detection_3/doc/Point_set_shape_detection_3/fig \ - ${CMAKE_SOURCE_DIR}/Kinetic_data_structures/doc/Kinetic_framework/fig \ + ${CMAKE_SOURCE_DIR}/Kinetic_framework/doc/Kinetic_framework/fig \ ${CMAKE_SOURCE_DIR}/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/fig \ ${CMAKE_SOURCE_DIR}/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/fig \ ${CMAKE_SOURCE_DIR}/Scale_space_reconstruction_3/doc/Scale_space_reconstruction_3/fig \ diff --git a/Documentation/doc/Documentation/packages.txt b/Documentation/doc/Documentation/packages.txt index 96a7f4eb2aa..b3189779ef0 100644 --- a/Documentation/doc/Documentation/packages.txt +++ b/Documentation/doc/Documentation/packages.txt @@ -64,7 +64,7 @@ h1 { \section PartArrangements Arrangements \package_listing{Arrangement_on_surface_2} -\package_listing{Arrangement_on_surface_2/Sweep_line_2} +\package_listing{Sweep_line_2} \package_listing{Snap_rounding_2} \package_listing{Envelope_2} \package_listing{Envelope_3} @@ -73,10 +73,10 @@ h1 { \section PartTriangulationsAndDelaunayTriangulations Triangulations and Delaunay Triangulations \package_listing{Triangulation_2} -\package_listing{Triangulation_2/TDS_2} +\package_listing{TDS_2} \package_listing{Periodic_2_triangulation_2} \package_listing{Triangulation_3} -\package_listing{Triangulation_3/TDS_3} +\package_listing{TDS_3} \package_listing{Periodic_3_triangulation_3} \package_listing{Triangulation} \package_listing{Alpha_shapes_2} @@ -141,13 +141,13 @@ h1 { \section PartKineticDataStructures Kinetic Data Structures \package_listing{Kinetic_data_structures} -\package_listing{Kinetic_data_structures/Kinetic_framework} +\package_listing{Kinetic_framework} \section PartSupportLibrary Support Library \package_listing{STL_Extension} \package_listing{BGL} -\package_listing{Point_set_processing_3/Property_map} +\package_listing{Property_map} \package_listing{Circulator} \package_listing{Generator} \package_listing{Miscellany} diff --git a/Kinetic_data_structures/doc/Kinetic_data_structures/Doxyfile.in b/Kinetic_data_structures/doc/Kinetic_data_structures/Doxyfile.in index 2a313bd95e2..31f6a065f8c 100644 --- a/Kinetic_data_structures/doc/Kinetic_data_structures/Doxyfile.in +++ b/Kinetic_data_structures/doc/Kinetic_data_structures/Doxyfile.in @@ -5,4 +5,4 @@ PROJECT_NAME = "CGAL ${CGAL_CREATED_VERSION_NUM} - Kineti INPUT = ${CMAKE_SOURCE_DIR}/Kinetic_data_structures/doc/Kinetic_data_structures/ -IMAGE_PATH = ${CMAKE_SOURCE_DIR}/Kinetic_data_structures/doc/Kinetic_framework/fig +IMAGE_PATH = ${CMAKE_SOURCE_DIR}/Kinetic_framework/doc/Kinetic_framework/fig diff --git a/Kinetic_data_structures/doc/Kinetic_data_structures/examples.txt b/Kinetic_data_structures/doc/Kinetic_data_structures/examples.txt index 418cac2796b..a4976040400 100644 --- a/Kinetic_data_structures/doc/Kinetic_data_structures/examples.txt +++ b/Kinetic_data_structures/doc/Kinetic_data_structures/examples.txt @@ -1,4 +1,2 @@ /// \example Kinetic_data_structures/Kinetic_regular_triangulation_3.cpp /// \example Kinetic_data_structures/Kinetic_sort.cpp -/// \example Kinetic_framework/defining_a_simulation_traits.cpp -/// \example Kinetic_framework/trivial_kds.cpp \ No newline at end of file diff --git a/Kinetic_data_structures/doc/Kinetic_framework/CGAL/Kinetic/Active_objects_vector.h b/Kinetic_framework/doc/Kinetic_framework/CGAL/Kinetic/Active_objects_vector.h similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/CGAL/Kinetic/Active_objects_vector.h rename to Kinetic_framework/doc/Kinetic_framework/CGAL/Kinetic/Active_objects_vector.h diff --git a/Kinetic_data_structures/doc/Kinetic_framework/CGAL/Kinetic/Cartesian.h b/Kinetic_framework/doc/Kinetic_framework/CGAL/Kinetic/Cartesian.h similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/CGAL/Kinetic/Cartesian.h rename to Kinetic_framework/doc/Kinetic_framework/CGAL/Kinetic/Cartesian.h diff --git a/Kinetic_data_structures/doc/Kinetic_framework/CGAL/Kinetic/Default_instantaneous_kernel.h b/Kinetic_framework/doc/Kinetic_framework/CGAL/Kinetic/Default_instantaneous_kernel.h similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/CGAL/Kinetic/Default_instantaneous_kernel.h rename to Kinetic_framework/doc/Kinetic_framework/CGAL/Kinetic/Default_instantaneous_kernel.h diff --git a/Kinetic_data_structures/doc/Kinetic_framework/CGAL/Kinetic/Default_simulator.h b/Kinetic_framework/doc/Kinetic_framework/CGAL/Kinetic/Default_simulator.h similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/CGAL/Kinetic/Default_simulator.h rename to Kinetic_framework/doc/Kinetic_framework/CGAL/Kinetic/Default_simulator.h diff --git a/Kinetic_data_structures/doc/Kinetic_framework/CGAL/Kinetic/Listener.h b/Kinetic_framework/doc/Kinetic_framework/CGAL/Kinetic/Listener.h similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/CGAL/Kinetic/Listener.h rename to Kinetic_framework/doc/Kinetic_framework/CGAL/Kinetic/Listener.h diff --git a/Kinetic_data_structures/doc/Kinetic_framework/CGAL/Kinetic/Multi_listener.h b/Kinetic_framework/doc/Kinetic_framework/CGAL/Kinetic/Multi_listener.h similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/CGAL/Kinetic/Multi_listener.h rename to Kinetic_framework/doc/Kinetic_framework/CGAL/Kinetic/Multi_listener.h diff --git a/Kinetic_data_structures/doc/Kinetic_framework/CGAL/Kinetic/Ref_counted.h b/Kinetic_framework/doc/Kinetic_framework/CGAL/Kinetic/Ref_counted.h similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/CGAL/Kinetic/Ref_counted.h rename to Kinetic_framework/doc/Kinetic_framework/CGAL/Kinetic/Ref_counted.h diff --git a/Kinetic_data_structures/doc/Kinetic_framework/CGAL/Kinetic/Simulator_objects_listener.h b/Kinetic_framework/doc/Kinetic_framework/CGAL/Kinetic/Simulator_objects_listener.h similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/CGAL/Kinetic/Simulator_objects_listener.h rename to Kinetic_framework/doc/Kinetic_framework/CGAL/Kinetic/Simulator_objects_listener.h diff --git a/Kinetic_data_structures/doc/Kinetic_framework/CGAL/Kinetic/listeners.h b/Kinetic_framework/doc/Kinetic_framework/CGAL/Kinetic/listeners.h similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/CGAL/Kinetic/listeners.h rename to Kinetic_framework/doc/Kinetic_framework/CGAL/Kinetic/listeners.h diff --git a/Kinetic_data_structures/doc/Kinetic_framework/Concepts/ActiveObjectsTable.h b/Kinetic_framework/doc/Kinetic_framework/Concepts/ActiveObjectsTable.h similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/Concepts/ActiveObjectsTable.h rename to Kinetic_framework/doc/Kinetic_framework/Concepts/ActiveObjectsTable.h diff --git a/Kinetic_data_structures/doc/Kinetic_framework/Concepts/CertificateGenerator.h b/Kinetic_framework/doc/Kinetic_framework/Concepts/CertificateGenerator.h similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/Concepts/CertificateGenerator.h rename to Kinetic_framework/doc/Kinetic_framework/Concepts/CertificateGenerator.h diff --git a/Kinetic_data_structures/doc/Kinetic_framework/Concepts/EvenQueue.h b/Kinetic_framework/doc/Kinetic_framework/Concepts/EvenQueue.h similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/Concepts/EvenQueue.h rename to Kinetic_framework/doc/Kinetic_framework/Concepts/EvenQueue.h diff --git a/Kinetic_data_structures/doc/Kinetic_framework/Concepts/FunctionKernel.h b/Kinetic_framework/doc/Kinetic_framework/Concepts/FunctionKernel.h similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/Concepts/FunctionKernel.h rename to Kinetic_framework/doc/Kinetic_framework/Concepts/FunctionKernel.h diff --git a/Kinetic_data_structures/doc/Kinetic_framework/Concepts/InstantaneousKernel.h b/Kinetic_framework/doc/Kinetic_framework/Concepts/InstantaneousKernel.h similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/Concepts/InstantaneousKernel.h rename to Kinetic_framework/doc/Kinetic_framework/Concepts/InstantaneousKernel.h diff --git a/Kinetic_data_structures/doc/Kinetic_framework/Concepts/Key.h b/Kinetic_framework/doc/Kinetic_framework/Concepts/Key.h similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/Concepts/Key.h rename to Kinetic_framework/doc/Kinetic_framework/Concepts/Key.h diff --git a/Kinetic_data_structures/doc/Kinetic_framework/Concepts/Kinetic--Certificate.h b/Kinetic_framework/doc/Kinetic_framework/Concepts/Kinetic--Certificate.h similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/Concepts/Kinetic--Certificate.h rename to Kinetic_framework/doc/Kinetic_framework/Concepts/Kinetic--Certificate.h diff --git a/Kinetic_data_structures/doc/Kinetic_framework/Concepts/KineticKernel.h b/Kinetic_framework/doc/Kinetic_framework/Concepts/KineticKernel.h similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/Concepts/KineticKernel.h rename to Kinetic_framework/doc/Kinetic_framework/Concepts/KineticKernel.h diff --git a/Kinetic_data_structures/doc/Kinetic_framework/Concepts/RootStack.h b/Kinetic_framework/doc/Kinetic_framework/Concepts/RootStack.h similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/Concepts/RootStack.h rename to Kinetic_framework/doc/Kinetic_framework/Concepts/RootStack.h diff --git a/Kinetic_data_structures/doc/Kinetic_framework/Concepts/SimulationTraits.h b/Kinetic_framework/doc/Kinetic_framework/Concepts/SimulationTraits.h similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/Concepts/SimulationTraits.h rename to Kinetic_framework/doc/Kinetic_framework/Concepts/SimulationTraits.h diff --git a/Kinetic_data_structures/doc/Kinetic_framework/Concepts/Simulator.h b/Kinetic_framework/doc/Kinetic_framework/Concepts/Simulator.h similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/Concepts/Simulator.h rename to Kinetic_framework/doc/Kinetic_framework/Concepts/Simulator.h diff --git a/Kinetic_data_structures/doc/Kinetic_framework/Doxyfile.in b/Kinetic_framework/doc/Kinetic_framework/Doxyfile.in similarity index 58% rename from Kinetic_data_structures/doc/Kinetic_framework/Doxyfile.in rename to Kinetic_framework/doc/Kinetic_framework/Doxyfile.in index 2f4b7506e1d..8b53fa773a5 100644 --- a/Kinetic_data_structures/doc/Kinetic_framework/Doxyfile.in +++ b/Kinetic_framework/doc/Kinetic_framework/Doxyfile.in @@ -3,7 +3,7 @@ PROJECT_NAME = "CGAL ${CGAL_CREATED_VERSION_NUM} - Kinetic Framework" -INPUT = ${CMAKE_SOURCE_DIR}/Kinetic_data_structures/doc/Kinetic_framework/ +INPUT = ${CMAKE_SOURCE_DIR}/Kinetic_framework/doc/Kinetic_framework/ diff --git a/Kinetic_data_structures/doc/Kinetic_framework/Kinetic_framework.txt b/Kinetic_framework/doc/Kinetic_framework/Kinetic_framework.txt similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/Kinetic_framework.txt rename to Kinetic_framework/doc/Kinetic_framework/Kinetic_framework.txt diff --git a/Kinetic_data_structures/doc/Kinetic_framework/PackageDescription.txt b/Kinetic_framework/doc/Kinetic_framework/PackageDescription.txt similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/PackageDescription.txt rename to Kinetic_framework/doc/Kinetic_framework/PackageDescription.txt diff --git a/Kinetic_data_structures/doc/Kinetic_framework/dependencies b/Kinetic_framework/doc/Kinetic_framework/dependencies similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/dependencies rename to Kinetic_framework/doc/Kinetic_framework/dependencies diff --git a/Kinetic_data_structures/doc/Kinetic_framework/fig/delaunay_0.png b/Kinetic_framework/doc/Kinetic_framework/fig/delaunay_0.png similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/fig/delaunay_0.png rename to Kinetic_framework/doc/Kinetic_framework/fig/delaunay_0.png diff --git a/Kinetic_data_structures/doc/Kinetic_framework/fig/delaunay_1.png b/Kinetic_framework/doc/Kinetic_framework/fig/delaunay_1.png similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/fig/delaunay_1.png rename to Kinetic_framework/doc/Kinetic_framework/fig/delaunay_1.png diff --git a/Kinetic_data_structures/doc/Kinetic_framework/fig/delaunay_2.png b/Kinetic_framework/doc/Kinetic_framework/fig/delaunay_2.png similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/fig/delaunay_2.png rename to Kinetic_framework/doc/Kinetic_framework/fig/delaunay_2.png diff --git a/Kinetic_data_structures/doc/Kinetic_framework/fig/delaunay_3.png b/Kinetic_framework/doc/Kinetic_framework/fig/delaunay_3.png similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/fig/delaunay_3.png rename to Kinetic_framework/doc/Kinetic_framework/fig/delaunay_3.png diff --git a/Kinetic_data_structures/doc/Kinetic_framework/fig/delaunay_4.png b/Kinetic_framework/doc/Kinetic_framework/fig/delaunay_4.png similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/fig/delaunay_4.png rename to Kinetic_framework/doc/Kinetic_framework/fig/delaunay_4.png diff --git a/Kinetic_data_structures/doc/Kinetic_framework/fig/delaunay_5.png b/Kinetic_framework/doc/Kinetic_framework/fig/delaunay_5.png similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/fig/delaunay_5.png rename to Kinetic_framework/doc/Kinetic_framework/fig/delaunay_5.png diff --git a/Kinetic_data_structures/doc/Kinetic_framework/fig/delaunay_6.png b/Kinetic_framework/doc/Kinetic_framework/fig/delaunay_6.png similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/fig/delaunay_6.png rename to Kinetic_framework/doc/Kinetic_framework/fig/delaunay_6.png diff --git a/Kinetic_data_structures/doc/Kinetic_framework/fig/delaunay_7.png b/Kinetic_framework/doc/Kinetic_framework/fig/delaunay_7.png similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/fig/delaunay_7.png rename to Kinetic_framework/doc/Kinetic_framework/fig/delaunay_7.png diff --git a/Kinetic_data_structures/doc/Kinetic_framework/fig/delaunay_8.png b/Kinetic_framework/doc/Kinetic_framework/fig/delaunay_8.png similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/fig/delaunay_8.png rename to Kinetic_framework/doc/Kinetic_framework/fig/delaunay_8.png diff --git a/Kinetic_data_structures/doc/Kinetic_framework/fig/kds.jpg b/Kinetic_framework/doc/Kinetic_framework/fig/kds.jpg similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/fig/kds.jpg rename to Kinetic_framework/doc/Kinetic_framework/fig/kds.jpg diff --git a/Kinetic_data_structures/doc/Kinetic_framework/fig/kdsDetail.png b/Kinetic_framework/doc/Kinetic_framework/fig/kdsDetail.png similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/fig/kdsDetail.png rename to Kinetic_framework/doc/Kinetic_framework/fig/kdsDetail.png diff --git a/Kinetic_data_structures/doc/Kinetic_framework/fig/kdsFramework.png b/Kinetic_framework/doc/Kinetic_framework/fig/kdsFramework.png similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/fig/kdsFramework.png rename to Kinetic_framework/doc/Kinetic_framework/fig/kdsFramework.png diff --git a/Kinetic_data_structures/doc/Kinetic_framework/fig/qt_widget_marked_pct.png b/Kinetic_framework/doc/Kinetic_framework/fig/qt_widget_marked_pct.png similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/fig/qt_widget_marked_pct.png rename to Kinetic_framework/doc/Kinetic_framework/fig/qt_widget_marked_pct.png diff --git a/Kinetic_data_structures/doc/Kinetic_framework/fig/sort_usage_pct.png b/Kinetic_framework/doc/Kinetic_framework/fig/sort_usage_pct.png similarity index 100% rename from Kinetic_data_structures/doc/Kinetic_framework/fig/sort_usage_pct.png rename to Kinetic_framework/doc/Kinetic_framework/fig/sort_usage_pct.png diff --git a/Kinetic_data_structures/examples/Kinetic_framework/adding_a_certificate.cpp b/Kinetic_framework/examples/Kinetic_framework/adding_a_certificate.cpp similarity index 100% rename from Kinetic_data_structures/examples/Kinetic_framework/adding_a_certificate.cpp rename to Kinetic_framework/examples/Kinetic_framework/adding_a_certificate.cpp diff --git a/Kinetic_data_structures/examples/Kinetic_framework/data/points_2 b/Kinetic_framework/examples/Kinetic_framework/data/points_2 similarity index 100% rename from Kinetic_data_structures/examples/Kinetic_framework/data/points_2 rename to Kinetic_framework/examples/Kinetic_framework/data/points_2 diff --git a/Kinetic_data_structures/examples/Kinetic_framework/data/points_with_color_2 b/Kinetic_framework/examples/Kinetic_framework/data/points_with_color_2 similarity index 100% rename from Kinetic_data_structures/examples/Kinetic_framework/data/points_with_color_2 rename to Kinetic_framework/examples/Kinetic_framework/data/points_with_color_2 diff --git a/Kinetic_data_structures/examples/Kinetic_framework/defining_a_simulation_traits.cpp b/Kinetic_framework/examples/Kinetic_framework/defining_a_simulation_traits.cpp similarity index 100% rename from Kinetic_data_structures/examples/Kinetic_framework/defining_a_simulation_traits.cpp rename to Kinetic_framework/examples/Kinetic_framework/defining_a_simulation_traits.cpp diff --git a/Kinetic_data_structures/examples/Kinetic_framework/listener.cpp b/Kinetic_framework/examples/Kinetic_framework/listener.cpp similarity index 100% rename from Kinetic_data_structures/examples/Kinetic_framework/listener.cpp rename to Kinetic_framework/examples/Kinetic_framework/listener.cpp diff --git a/Kinetic_data_structures/examples/Kinetic_framework/pointer_queue.cpp b/Kinetic_framework/examples/Kinetic_framework/pointer_queue.cpp similarity index 100% rename from Kinetic_data_structures/examples/Kinetic_framework/pointer_queue.cpp rename to Kinetic_framework/examples/Kinetic_framework/pointer_queue.cpp diff --git a/Kinetic_data_structures/examples/Kinetic_framework/ref_counted.cpp b/Kinetic_framework/examples/Kinetic_framework/ref_counted.cpp similarity index 100% rename from Kinetic_data_structures/examples/Kinetic_framework/ref_counted.cpp rename to Kinetic_framework/examples/Kinetic_framework/ref_counted.cpp diff --git a/Kinetic_data_structures/examples/Kinetic_framework/trivial_kds.cpp b/Kinetic_framework/examples/Kinetic_framework/trivial_kds.cpp similarity index 100% rename from Kinetic_data_structures/examples/Kinetic_framework/trivial_kds.cpp rename to Kinetic_framework/examples/Kinetic_framework/trivial_kds.cpp diff --git a/Kinetic_framework/package_info/Kinetic_framework/description.txt b/Kinetic_framework/package_info/Kinetic_framework/description.txt new file mode 100644 index 00000000000..0acfc444ffb --- /dev/null +++ b/Kinetic_framework/package_info/Kinetic_framework/description.txt @@ -0,0 +1,3 @@ +This is a framework for implementing kinetic data structures and sweepline +algorithms as well as a number of kinetic data structures. The framework is +called Kinetic_framework and the algorithms are in Kinetic_data_structures. diff --git a/Kinetic_framework/package_info/Kinetic_framework/license.txt b/Kinetic_framework/package_info/Kinetic_framework/license.txt new file mode 100644 index 00000000000..5c1c5d8436f --- /dev/null +++ b/Kinetic_framework/package_info/Kinetic_framework/license.txt @@ -0,0 +1 @@ +LGPL (v3 or later) diff --git a/Kinetic_framework/package_info/Kinetic_framework/long_description.txt b/Kinetic_framework/package_info/Kinetic_framework/long_description.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Kinetic_framework/package_info/Kinetic_framework/maintainer b/Kinetic_framework/package_info/Kinetic_framework/maintainer new file mode 100644 index 00000000000..5d3f0b5b0e0 --- /dev/null +++ b/Kinetic_framework/package_info/Kinetic_framework/maintainer @@ -0,0 +1 @@ +Daniel Russel diff --git a/Point_set_processing_3/doc/Property_map/Doxyfile.in b/Point_set_processing_3/doc/Property_map/Doxyfile.in deleted file mode 100644 index 8e093ae1f43..00000000000 --- a/Point_set_processing_3/doc/Property_map/Doxyfile.in +++ /dev/null @@ -1,6 +0,0 @@ -@INCLUDE = ${CGAL_DOC_PACKAGE_DEFAULTS} - -PROJECT_NAME = "CGAL ${CGAL_CREATED_VERSION_NUM} - CGAL and Boost Property Maps" - -INPUT = ${CMAKE_SOURCE_DIR}/Point_set_processing_3/doc/Property_map/ \ - ${CMAKE_SOURCE_DIR}/Point_set_processing_3/include/CGAL/property_map.h diff --git a/Property_map/doc/Property_map/Doxyfile.in b/Property_map/doc/Property_map/Doxyfile.in new file mode 100644 index 00000000000..cbdf461ed9f --- /dev/null +++ b/Property_map/doc/Property_map/Doxyfile.in @@ -0,0 +1,6 @@ +@INCLUDE = ${CGAL_DOC_PACKAGE_DEFAULTS} + +PROJECT_NAME = "CGAL ${CGAL_CREATED_VERSION_NUM} - CGAL and Boost Property Maps" + +INPUT = ${CMAKE_SOURCE_DIR}/Property_map/doc/Property_map/ \ + ${CMAKE_SOURCE_DIR}/Property_map/include/CGAL/property_map.h diff --git a/Point_set_processing_3/doc/Property_map/PackageDescription.txt b/Property_map/doc/Property_map/PackageDescription.txt similarity index 100% rename from Point_set_processing_3/doc/Property_map/PackageDescription.txt rename to Property_map/doc/Property_map/PackageDescription.txt diff --git a/Point_set_processing_3/doc/Property_map/Property_map.txt b/Property_map/doc/Property_map/Property_map.txt similarity index 100% rename from Point_set_processing_3/doc/Property_map/Property_map.txt rename to Property_map/doc/Property_map/Property_map.txt diff --git a/Point_set_processing_3/doc/Property_map/dependencies b/Property_map/doc/Property_map/dependencies similarity index 100% rename from Point_set_processing_3/doc/Property_map/dependencies rename to Property_map/doc/Property_map/dependencies diff --git a/Point_set_processing_3/doc/Property_map/examples.txt b/Property_map/doc/Property_map/examples.txt similarity index 80% rename from Point_set_processing_3/doc/Property_map/examples.txt rename to Property_map/doc/Property_map/examples.txt index 82573d75230..fe5b9e2f71c 100644 --- a/Point_set_processing_3/doc/Property_map/examples.txt +++ b/Property_map/doc/Property_map/examples.txt @@ -2,5 +2,4 @@ \example Point_set_processing_3/remove_outliers_example.cpp \example Point_set_processing_3/read_write_xyz_point_set_example.cpp \example Point_set_processing_3/average_spacing_example.cpp -\example Point_set_processing_3/property_map.cpp */ diff --git a/Point_set_processing_3/doc/Property_map/fig/property_map.png b/Property_map/doc/Property_map/fig/property_map.png similarity index 100% rename from Point_set_processing_3/doc/Property_map/fig/property_map.png rename to Property_map/doc/Property_map/fig/property_map.png diff --git a/Point_set_processing_3/include/CGAL/Index_property_map.h b/Property_map/include/CGAL/Index_property_map.h similarity index 100% rename from Point_set_processing_3/include/CGAL/Index_property_map.h rename to Property_map/include/CGAL/Index_property_map.h diff --git a/Point_set_processing_3/include/CGAL/property_map.h b/Property_map/include/CGAL/property_map.h similarity index 100% rename from Point_set_processing_3/include/CGAL/property_map.h rename to Property_map/include/CGAL/property_map.h diff --git a/Property_map/package_info/Property_map/copyright b/Property_map/package_info/Property_map/copyright new file mode 100644 index 00000000000..8932b3233d2 --- /dev/null +++ b/Property_map/package_info/Property_map/copyright @@ -0,0 +1,2 @@ +INRIA Sophia-Antipolis (France) + diff --git a/Property_map/package_info/Property_map/description.txt b/Property_map/package_info/Property_map/description.txt new file mode 100644 index 00000000000..0f35b92d664 --- /dev/null +++ b/Property_map/package_info/Property_map/description.txt @@ -0,0 +1,3 @@ +Property Map + +This package provides a framework for interfacing CGAL data structures with algorithms expecting Boost Property Maps. diff --git a/Property_map/package_info/Property_map/license.txt b/Property_map/package_info/Property_map/license.txt new file mode 100644 index 00000000000..8bb8efcb72b --- /dev/null +++ b/Property_map/package_info/Property_map/license.txt @@ -0,0 +1 @@ +GPL (v3 or later) diff --git a/Property_map/package_info/Property_map/long_description.txt b/Property_map/package_info/Property_map/long_description.txt new file mode 100644 index 00000000000..d76c9481191 --- /dev/null +++ b/Property_map/package_info/Property_map/long_description.txt @@ -0,0 +1,6 @@ +Point Set Processing + +Pierre Alliez, Laurent Saboret, Nader Salman + +This CGAL package implements methods to analyze and process unorganized point sets. The input is an unorganized point set, possibly with attributes. This point set can be analyzed to measure its average spacing. We can furthermore process the point set with functions devoted to simplification, outlier removal, smoothing, normal estimation and normal orientation. + diff --git a/Property_map/package_info/Property_map/maintainer b/Property_map/package_info/Property_map/maintainer new file mode 100644 index 00000000000..5e9c7235461 --- /dev/null +++ b/Property_map/package_info/Property_map/maintainer @@ -0,0 +1 @@ +Pierre Alliez diff --git a/Property_map/package_info/Property_map/workflow.txt b/Property_map/package_info/Property_map/workflow.txt new file mode 100644 index 00000000000..4ae51205094 --- /dev/null +++ b/Property_map/package_info/Property_map/workflow.txt @@ -0,0 +1,35 @@ +Analysis +- barycenter, len diag of bbox, etc., see centroid() and bounding_box() in PCA component (done) +- average spacing (KNN) (done) +- lfs estimate (pole approach + arbitrary query points using KNN) (pierre) + +Processing +- smoothing (via jet-fitting + reprojection) (done) +- outlier removal (to check which one is easy with CGAL components) (done) +- simplify point sets: clustering, random simplification (done) + +Normal estimation +- KNN + point-based PCA (done) +- KNN + jet fitting (done) +- Voronoi diagram + poles [Amenta98] (pierre) +- Voronoi diagram + tetrahedral-based PCA [Alliez07] (pierre) + +Normal orientation +- MST [Hope92] (done) +- pole-based (frederic?) + + +In addition: + +Concepts +- Algorithms are independent global functions (no concepts) +- Output formats concept to be defined (laurent?) + +Demos, examples and tests +- Command line tests (pierre + laurent) + + + + + + diff --git a/Arrangement_on_surface_2/doc/Sweep_line_2/CGAL/Sweep_line_2_algorithms.h b/Sweep_line_2/doc/Sweep_line_2/CGAL/Sweep_line_2_algorithms.h similarity index 100% rename from Arrangement_on_surface_2/doc/Sweep_line_2/CGAL/Sweep_line_2_algorithms.h rename to Sweep_line_2/doc/Sweep_line_2/CGAL/Sweep_line_2_algorithms.h diff --git a/Arrangement_on_surface_2/doc/Sweep_line_2/Doxyfile.in b/Sweep_line_2/doc/Sweep_line_2/Doxyfile.in similarity index 61% rename from Arrangement_on_surface_2/doc/Sweep_line_2/Doxyfile.in rename to Sweep_line_2/doc/Sweep_line_2/Doxyfile.in index 5e7b875a0ce..469502b2987 100644 --- a/Arrangement_on_surface_2/doc/Sweep_line_2/Doxyfile.in +++ b/Sweep_line_2/doc/Sweep_line_2/Doxyfile.in @@ -3,7 +3,7 @@ PROJECT_NAME = "CGAL ${CGAL_CREATED_VERSION_NUM} - 2D Intersection of Curves" -INPUT = ${CMAKE_SOURCE_DIR}/Arrangement_on_surface_2/doc/Sweep_line_2/ +INPUT = ${CMAKE_SOURCE_DIR}/Sweep_line_2/doc/Sweep_line_2/ diff --git a/Arrangement_on_surface_2/doc/Sweep_line_2/PackageDescription.txt b/Sweep_line_2/doc/Sweep_line_2/PackageDescription.txt similarity index 100% rename from Arrangement_on_surface_2/doc/Sweep_line_2/PackageDescription.txt rename to Sweep_line_2/doc/Sweep_line_2/PackageDescription.txt diff --git a/Arrangement_on_surface_2/doc/Sweep_line_2/Sweep_line_2.txt b/Sweep_line_2/doc/Sweep_line_2/Sweep_line_2.txt similarity index 97% rename from Arrangement_on_surface_2/doc/Sweep_line_2/Sweep_line_2.txt rename to Sweep_line_2/doc/Sweep_line_2/Sweep_line_2.txt index b13e8e527c6..086bf757cff 100644 --- a/Arrangement_on_surface_2/doc/Sweep_line_2/Sweep_line_2.txt +++ b/Sweep_line_2/doc/Sweep_line_2/Sweep_line_2.txt @@ -47,7 +47,7 @@ a set of four input segments illustrated in \cgalFigureRef{SL_secsimple}. Four input segments \cgalFigureEnd -\cgalExample{Arrangement_on_surface_2/sweep_line.cpp} +\cgalExample{Sweep_line_2/sweep_line.cpp} \section Sweep_line_2Design Design and Implementation History diff --git a/Arrangement_on_surface_2/doc/Sweep_line_2/dependencies b/Sweep_line_2/doc/Sweep_line_2/dependencies similarity index 100% rename from Arrangement_on_surface_2/doc/Sweep_line_2/dependencies rename to Sweep_line_2/doc/Sweep_line_2/dependencies diff --git a/Sweep_line_2/doc/Sweep_line_2/examples.txt b/Sweep_line_2/doc/Sweep_line_2/examples.txt new file mode 100644 index 00000000000..ccafc547dab --- /dev/null +++ b/Sweep_line_2/doc/Sweep_line_2/examples.txt @@ -0,0 +1,3 @@ +/*! +\example Sweep_line_2/sweep_line.cpp +*/ diff --git a/Arrangement_on_surface_2/doc/Sweep_line_2/fig/Curve_intersections_2.png b/Sweep_line_2/doc/Sweep_line_2/fig/Curve_intersections_2.png similarity index 100% rename from Arrangement_on_surface_2/doc/Sweep_line_2/fig/Curve_intersections_2.png rename to Sweep_line_2/doc/Sweep_line_2/fig/Curve_intersections_2.png diff --git a/Arrangement_on_surface_2/doc/Sweep_line_2/fig/sl_simple.png b/Sweep_line_2/doc/Sweep_line_2/fig/sl_simple.png similarity index 100% rename from Arrangement_on_surface_2/doc/Sweep_line_2/fig/sl_simple.png rename to Sweep_line_2/doc/Sweep_line_2/fig/sl_simple.png diff --git a/Sweep_line_2/examples/Sweep_line_2/CMakeLists.txt b/Sweep_line_2/examples/Sweep_line_2/CMakeLists.txt new file mode 100644 index 00000000000..fe1215533fa --- /dev/null +++ b/Sweep_line_2/examples/Sweep_line_2/CMakeLists.txt @@ -0,0 +1,65 @@ +# Created by the script cgal_create_CMakeLists +# This is the CMake script for compiling a set of CGAL applications. + +project( Sweep_line_2 ) + + +cmake_minimum_required(VERSION 2.6.2) +if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6) + if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3) + cmake_policy(VERSION 2.8.4) + else() + cmake_policy(VERSION 2.6) + endif() +endif() + +set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true ) + +if ( COMMAND cmake_policy ) + + cmake_policy( SET CMP0003 NEW ) + +endif() + +# CGAL and its components +find_package( CGAL QUIET COMPONENTS ) + +if ( NOT CGAL_FOUND ) + + message(STATUS "This project requires the CGAL library, and will not be compiled.") + return() + +endif() + +# include helper file +include( ${CGAL_USE_FILE} ) + + +# Boost and its components +find_package( Boost REQUIRED ) + +if ( NOT Boost_FOUND ) + + message(STATUS "This project requires the Boost library, and will not be compiled.") + + return() + +endif() + +# include for local directory + +# include for local package +include_directories( BEFORE ../../include ) + + +# Creating entries for all .cpp/.C files with "main" routine +# ########################################################## + +include( CGAL_CreateSingleSourceCGALProgram ) + + +create_single_source_cgal_program( "sweep_line.cpp" ) + + + + diff --git a/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/sweep_line.cpp b/Sweep_line_2/examples/Sweep_line_2/sweep_line.cpp similarity index 100% rename from Arrangement_on_surface_2/examples/Arrangement_on_surface_2/sweep_line.cpp rename to Sweep_line_2/examples/Sweep_line_2/sweep_line.cpp diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2.h b/Sweep_line_2/include/CGAL/Sweep_line_2.h similarity index 100% rename from Arrangement_on_surface_2/include/CGAL/Sweep_line_2.h rename to Sweep_line_2/include/CGAL/Sweep_line_2.h diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_basic_insertion_sl_visitor.h b/Sweep_line_2/include/CGAL/Sweep_line_2/Arr_basic_insertion_sl_visitor.h similarity index 100% rename from Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_basic_insertion_sl_visitor.h rename to Sweep_line_2/include/CGAL/Sweep_line_2/Arr_basic_insertion_sl_visitor.h diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_basic_insertion_traits_2.h b/Sweep_line_2/include/CGAL/Sweep_line_2/Arr_basic_insertion_traits_2.h similarity index 100% rename from Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_basic_insertion_traits_2.h rename to Sweep_line_2/include/CGAL/Sweep_line_2/Arr_basic_insertion_traits_2.h diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_batched_pl_sl_visitor.h b/Sweep_line_2/include/CGAL/Sweep_line_2/Arr_batched_pl_sl_visitor.h similarity index 100% rename from Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_batched_pl_sl_visitor.h rename to Sweep_line_2/include/CGAL/Sweep_line_2/Arr_batched_pl_sl_visitor.h diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_construction_event.h b/Sweep_line_2/include/CGAL/Sweep_line_2/Arr_construction_event.h similarity index 100% rename from Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_construction_event.h rename to Sweep_line_2/include/CGAL/Sweep_line_2/Arr_construction_event.h diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_construction_sl_visitor.h b/Sweep_line_2/include/CGAL/Sweep_line_2/Arr_construction_sl_visitor.h similarity index 100% rename from Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_construction_sl_visitor.h rename to Sweep_line_2/include/CGAL/Sweep_line_2/Arr_construction_sl_visitor.h diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_construction_subcurve.h b/Sweep_line_2/include/CGAL/Sweep_line_2/Arr_construction_subcurve.h similarity index 100% rename from Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_construction_subcurve.h rename to Sweep_line_2/include/CGAL/Sweep_line_2/Arr_construction_subcurve.h diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_default_overlay_traits_base.h b/Sweep_line_2/include/CGAL/Sweep_line_2/Arr_default_overlay_traits_base.h similarity index 100% rename from Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_default_overlay_traits_base.h rename to Sweep_line_2/include/CGAL/Sweep_line_2/Arr_default_overlay_traits_base.h diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_insertion_sl_visitor.h b/Sweep_line_2/include/CGAL/Sweep_line_2/Arr_insertion_sl_visitor.h similarity index 100% rename from Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_insertion_sl_visitor.h rename to Sweep_line_2/include/CGAL/Sweep_line_2/Arr_insertion_sl_visitor.h diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_insertion_traits_2.h b/Sweep_line_2/include/CGAL/Sweep_line_2/Arr_insertion_traits_2.h similarity index 100% rename from Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_insertion_traits_2.h rename to Sweep_line_2/include/CGAL/Sweep_line_2/Arr_insertion_traits_2.h diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_overlay_sl_visitor.h b/Sweep_line_2/include/CGAL/Sweep_line_2/Arr_overlay_sl_visitor.h similarity index 100% rename from Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_overlay_sl_visitor.h rename to Sweep_line_2/include/CGAL/Sweep_line_2/Arr_overlay_sl_visitor.h diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_overlay_subcurve.h b/Sweep_line_2/include/CGAL/Sweep_line_2/Arr_overlay_subcurve.h similarity index 100% rename from Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_overlay_subcurve.h rename to Sweep_line_2/include/CGAL/Sweep_line_2/Arr_overlay_subcurve.h diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_overlay_traits_2.h b/Sweep_line_2/include/CGAL/Sweep_line_2/Arr_overlay_traits_2.h similarity index 100% rename from Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_overlay_traits_2.h rename to Sweep_line_2/include/CGAL/Sweep_line_2/Arr_overlay_traits_2.h diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_vert_decomp_sl_visitor.h b/Sweep_line_2/include/CGAL/Sweep_line_2/Arr_vert_decomp_sl_visitor.h similarity index 100% rename from Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Arr_vert_decomp_sl_visitor.h rename to Sweep_line_2/include/CGAL/Sweep_line_2/Arr_vert_decomp_sl_visitor.h diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Basic_sweep_line_2_impl.h b/Sweep_line_2/include/CGAL/Sweep_line_2/Basic_sweep_line_2_impl.h similarity index 100% rename from Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Basic_sweep_line_2_impl.h rename to Sweep_line_2/include/CGAL/Sweep_line_2/Basic_sweep_line_2_impl.h diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_2_debug.h b/Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_2_debug.h similarity index 100% rename from Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_2_debug.h rename to Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_2_debug.h diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_2_impl.h b/Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_2_impl.h similarity index 100% rename from Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_2_impl.h rename to Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_2_impl.h diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_2_utils.h b/Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_2_utils.h similarity index 100% rename from Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_2_utils.h rename to Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_2_utils.h diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_2_visitors.h b/Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_2_visitors.h similarity index 100% rename from Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_2_visitors.h rename to Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_2_visitors.h diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_curve_pair.h b/Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_curve_pair.h similarity index 100% rename from Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_curve_pair.h rename to Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_curve_pair.h diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_event.h b/Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_event.h similarity index 100% rename from Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_event.h rename to Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_event.h diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_functors.h b/Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_functors.h similarity index 100% rename from Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_functors.h rename to Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_functors.h diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_subcurve.h b/Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_subcurve.h similarity index 100% rename from Arrangement_on_surface_2/include/CGAL/Sweep_line_2/Sweep_line_subcurve.h rename to Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_subcurve.h diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2_algorithms.h b/Sweep_line_2/include/CGAL/Sweep_line_2_algorithms.h similarity index 100% rename from Arrangement_on_surface_2/include/CGAL/Sweep_line_2_algorithms.h rename to Sweep_line_2/include/CGAL/Sweep_line_2_algorithms.h diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_empty_visitor.h b/Sweep_line_2/include/CGAL/Sweep_line_empty_visitor.h similarity index 100% rename from Arrangement_on_surface_2/include/CGAL/Sweep_line_empty_visitor.h rename to Sweep_line_2/include/CGAL/Sweep_line_empty_visitor.h diff --git a/Sweep_line_2/package_info/Sweep_line_2/copyright b/Sweep_line_2/package_info/Sweep_line_2/copyright new file mode 100644 index 00000000000..930771b9d2c --- /dev/null +++ b/Sweep_line_2/package_info/Sweep_line_2/copyright @@ -0,0 +1 @@ +Tel-Aviv University (Israel). diff --git a/Sweep_line_2/package_info/Sweep_line_2/description.txt b/Sweep_line_2/package_info/Sweep_line_2/description.txt new file mode 100644 index 00000000000..4b9b8e917fd --- /dev/null +++ b/Sweep_line_2/package_info/Sweep_line_2/description.txt @@ -0,0 +1 @@ +2D sweepline over a planar arrangement diff --git a/Sweep_line_2/package_info/Sweep_line_2/license.txt b/Sweep_line_2/package_info/Sweep_line_2/license.txt new file mode 100644 index 00000000000..8bb8efcb72b --- /dev/null +++ b/Sweep_line_2/package_info/Sweep_line_2/license.txt @@ -0,0 +1 @@ +GPL (v3 or later) diff --git a/Sweep_line_2/package_info/Sweep_line_2/long_description.txt b/Sweep_line_2/package_info/Sweep_line_2/long_description.txt new file mode 100644 index 00000000000..e906f7b29d5 --- /dev/null +++ b/Sweep_line_2/package_info/Sweep_line_2/long_description.txt @@ -0,0 +1,42 @@ +Given a set C of planar curves, the arrangement A(C) is the +subdivision of the plane into zero-dimensional, one-dimensional and +two-dimensional cells, called vertices, edges and faces, respectively, +induced by the curves in C. Arrangements are ubiquitous in the +computational-geometry literature and have many applications +in fields like motion planning, computer-aided design, geographical +information systems, etc. + +The curves in C can intersect each other (a single curve may also +be self-intersecting or may be comprised of several disconnected +branches) and are not necessarily x-monotone. We construct a +collection C'' of x-monotone subcurves that are pairwise disjoint in +their interiors. We do it in two steps as follows. First, we decompose +each curve in C into maximal x-monotone subcurves (and possibly +isolated points), obtaining the collection C'. Note that an x-monotone +curve cannot be self-intersecting. Then, we decompose each curve in +C' into maximal connected subcurves not intersecting any other curve +(or point) in C'. The collection C'' may also contain isolated points, +if the curves of C contain such points. The arrangement induced by the +collection C'' can be conveniently embedded as a planar graph, whose +vertices are associated with curve endpoints or with isolated points, +and whose edges are associated with subcurves. It is easy to see that +A(C) = A(C''). This graph can be represented using a doubly-connected +edge list data-structure (DCEL for short), which consists of +containers of vertices, edges, and faces and maintains the incidence +relations among these objects. + +This package can be used to construct, maintain, alter, and display +arrangements in the plane. Once an arrangement is constructed, the +package can be used to obtain results of various queries on the +arrangement, such as point location. The package also includes generic +implementations of two algorithmic frameworks, that are, computing the +zone of an arrangement, and line-sweeping the plane, the arrangements +is embedded on. These frameworks are used in turn in the +implementations of other operations on arrangements. Computing the +overlay of two arrangements, for example, is based on the sweep-line +framework. + +Arrangements and arrangement components can also be extended to store +additional data. An important extension stores the construction +history of the arrangement, such that it is possible to obtain the +originating curve of an arrangement subcurve. diff --git a/Sweep_line_2/package_info/Sweep_line_2/maintainer b/Sweep_line_2/package_info/Sweep_line_2/maintainer new file mode 100644 index 00000000000..601acf213d8 --- /dev/null +++ b/Sweep_line_2/package_info/Sweep_line_2/maintainer @@ -0,0 +1,5 @@ +Ron Wein +Efi Fogel +Ophir Setter +Guy Zucker +Eric Berberich diff --git a/Triangulation_2/doc/TDS_2/CGAL/Triangulation_data_structure_2.h b/TDS_2/doc/TDS_2/CGAL/Triangulation_data_structure_2.h similarity index 100% rename from Triangulation_2/doc/TDS_2/CGAL/Triangulation_data_structure_2.h rename to TDS_2/doc/TDS_2/CGAL/Triangulation_data_structure_2.h diff --git a/Triangulation_2/doc/TDS_2/CGAL/Triangulation_ds_face_base_2.h b/TDS_2/doc/TDS_2/CGAL/Triangulation_ds_face_base_2.h similarity index 100% rename from Triangulation_2/doc/TDS_2/CGAL/Triangulation_ds_face_base_2.h rename to TDS_2/doc/TDS_2/CGAL/Triangulation_ds_face_base_2.h diff --git a/Triangulation_2/doc/TDS_2/CGAL/Triangulation_ds_vertex_base_2.h b/TDS_2/doc/TDS_2/CGAL/Triangulation_ds_vertex_base_2.h similarity index 100% rename from Triangulation_2/doc/TDS_2/CGAL/Triangulation_ds_vertex_base_2.h rename to TDS_2/doc/TDS_2/CGAL/Triangulation_ds_vertex_base_2.h diff --git a/Triangulation_2/doc/TDS_2/Concepts/TriangulationDSFaceBase_2.h b/TDS_2/doc/TDS_2/Concepts/TriangulationDSFaceBase_2.h similarity index 100% rename from Triangulation_2/doc/TDS_2/Concepts/TriangulationDSFaceBase_2.h rename to TDS_2/doc/TDS_2/Concepts/TriangulationDSFaceBase_2.h diff --git a/Triangulation_2/doc/TDS_2/Concepts/TriangulationDSVertexBase_2.h b/TDS_2/doc/TDS_2/Concepts/TriangulationDSVertexBase_2.h similarity index 100% rename from Triangulation_2/doc/TDS_2/Concepts/TriangulationDSVertexBase_2.h rename to TDS_2/doc/TDS_2/Concepts/TriangulationDSVertexBase_2.h diff --git a/Triangulation_2/doc/TDS_2/Concepts/TriangulationDataStructure_2.h b/TDS_2/doc/TDS_2/Concepts/TriangulationDataStructure_2.h similarity index 100% rename from Triangulation_2/doc/TDS_2/Concepts/TriangulationDataStructure_2.h rename to TDS_2/doc/TDS_2/Concepts/TriangulationDataStructure_2.h diff --git a/Triangulation_2/doc/TDS_2/Doxyfile.in b/TDS_2/doc/TDS_2/Doxyfile.in similarity index 76% rename from Triangulation_2/doc/TDS_2/Doxyfile.in rename to TDS_2/doc/TDS_2/Doxyfile.in index 41f41e2d236..19b3120c3de 100644 --- a/Triangulation_2/doc/TDS_2/Doxyfile.in +++ b/TDS_2/doc/TDS_2/Doxyfile.in @@ -1,5 +1,5 @@ @INCLUDE = ${CGAL_DOC_PACKAGE_DEFAULTS} PROJECT_NAME = "CGAL ${CGAL_CREATED_VERSION_NUM} - 2D Triangulation Data Structure" -INPUT = ${CMAKE_SOURCE_DIR}/Triangulation_2/doc/TDS_2/ +INPUT = ${CMAKE_SOURCE_DIR}/TDS_2/doc/TDS_2/ IMAGE_PATH += ${CMAKE_SOURCE_DIR}/Triangulation_2/doc/Triangulation_2/fig diff --git a/Triangulation_2/doc/TDS_2/PackageDescription.txt b/TDS_2/doc/TDS_2/PackageDescription.txt similarity index 100% rename from Triangulation_2/doc/TDS_2/PackageDescription.txt rename to TDS_2/doc/TDS_2/PackageDescription.txt diff --git a/Triangulation_2/doc/TDS_2/TDS_2.txt b/TDS_2/doc/TDS_2/TDS_2.txt similarity index 100% rename from Triangulation_2/doc/TDS_2/TDS_2.txt rename to TDS_2/doc/TDS_2/TDS_2.txt diff --git a/Triangulation_2/doc/TDS_2/dependencies b/TDS_2/doc/TDS_2/dependencies similarity index 100% rename from Triangulation_2/doc/TDS_2/dependencies rename to TDS_2/doc/TDS_2/dependencies diff --git a/Triangulation_2/doc/TDS_2/fig/Three.png b/TDS_2/doc/TDS_2/fig/Three.png similarity index 100% rename from Triangulation_2/doc/TDS_2/fig/Three.png rename to TDS_2/doc/TDS_2/fig/Three.png diff --git a/Triangulation_2/doc/TDS_2/fig/join_split.png b/TDS_2/doc/TDS_2/fig/join_split.png similarity index 100% rename from Triangulation_2/doc/TDS_2/fig/join_split.png rename to TDS_2/doc/TDS_2/fig/join_split.png diff --git a/Triangulation_2/doc/TDS_2/fig/rep_bis.png b/TDS_2/doc/TDS_2/fig/rep_bis.png similarity index 100% rename from Triangulation_2/doc/TDS_2/fig/rep_bis.png rename to TDS_2/doc/TDS_2/fig/rep_bis.png diff --git a/Triangulation_2/doc/TDS_2/fig/tds-insert_degree_2.png b/TDS_2/doc/TDS_2/fig/tds-insert_degree_2.png similarity index 100% rename from Triangulation_2/doc/TDS_2/fig/tds-insert_degree_2.png rename to TDS_2/doc/TDS_2/fig/tds-insert_degree_2.png diff --git a/Triangulation_2/doc/TDS_2/fig/threelevels2.png b/TDS_2/doc/TDS_2/fig/threelevels2.png similarity index 100% rename from Triangulation_2/doc/TDS_2/fig/threelevels2.png rename to TDS_2/doc/TDS_2/fig/threelevels2.png diff --git a/Triangulation_2/doc/TDS_2/fig_src/Flip.gif b/TDS_2/doc/TDS_2/fig_src/Flip.gif similarity index 100% rename from Triangulation_2/doc/TDS_2/fig_src/Flip.gif rename to TDS_2/doc/TDS_2/fig_src/Flip.gif diff --git a/Triangulation_2/doc/TDS_2/fig_src/Three.gif b/TDS_2/doc/TDS_2/fig_src/Three.gif similarity index 100% rename from Triangulation_2/doc/TDS_2/fig_src/Three.gif rename to TDS_2/doc/TDS_2/fig_src/Three.gif diff --git a/Triangulation_2/doc/TDS_2/fig_src/rep_bis.eps b/TDS_2/doc/TDS_2/fig_src/rep_bis.eps similarity index 100% rename from Triangulation_2/doc/TDS_2/fig_src/rep_bis.eps rename to TDS_2/doc/TDS_2/fig_src/rep_bis.eps diff --git a/Triangulation_2/doc/TDS_2/fig_src/rep_bis.gif b/TDS_2/doc/TDS_2/fig_src/rep_bis.gif similarity index 100% rename from Triangulation_2/doc/TDS_2/fig_src/rep_bis.gif rename to TDS_2/doc/TDS_2/fig_src/rep_bis.gif diff --git a/Triangulation_2/doc/TDS_2/fig_src/rep_bis.pdf b/TDS_2/doc/TDS_2/fig_src/rep_bis.pdf similarity index 100% rename from Triangulation_2/doc/TDS_2/fig_src/rep_bis.pdf rename to TDS_2/doc/TDS_2/fig_src/rep_bis.pdf diff --git a/Triangulation_2/doc/TDS_2/fig_src/threelevels2.eps b/TDS_2/doc/TDS_2/fig_src/threelevels2.eps similarity index 100% rename from Triangulation_2/doc/TDS_2/fig_src/threelevels2.eps rename to TDS_2/doc/TDS_2/fig_src/threelevels2.eps diff --git a/Triangulation_2/doc/TDS_2/fig_src/threelevels2.gif b/TDS_2/doc/TDS_2/fig_src/threelevels2.gif similarity index 100% rename from Triangulation_2/doc/TDS_2/fig_src/threelevels2.gif rename to TDS_2/doc/TDS_2/fig_src/threelevels2.gif diff --git a/Triangulation_2/doc/TDS_2/fig_src/threelevels2.pdf b/TDS_2/doc/TDS_2/fig_src/threelevels2.pdf similarity index 100% rename from Triangulation_2/doc/TDS_2/fig_src/threelevels2.pdf rename to TDS_2/doc/TDS_2/fig_src/threelevels2.pdf diff --git a/TDS_2/package_info/TDS_2/copyright b/TDS_2/package_info/TDS_2/copyright new file mode 100644 index 00000000000..8932b3233d2 --- /dev/null +++ b/TDS_2/package_info/TDS_2/copyright @@ -0,0 +1,2 @@ +INRIA Sophia-Antipolis (France) + diff --git a/TDS_2/package_info/TDS_2/description.txt b/TDS_2/package_info/TDS_2/description.txt new file mode 100644 index 00000000000..eb0662841a3 --- /dev/null +++ b/TDS_2/package_info/TDS_2/description.txt @@ -0,0 +1 @@ +Package 2D Triangulation Data Structure diff --git a/TDS_2/package_info/TDS_2/license.txt b/TDS_2/package_info/TDS_2/license.txt new file mode 100644 index 00000000000..8bb8efcb72b --- /dev/null +++ b/TDS_2/package_info/TDS_2/license.txt @@ -0,0 +1 @@ +GPL (v3 or later) diff --git a/TDS_2/package_info/TDS_2/maintainer b/TDS_2/package_info/TDS_2/maintainer new file mode 100644 index 00000000000..4c6f274916a --- /dev/null +++ b/TDS_2/package_info/TDS_2/maintainer @@ -0,0 +1 @@ +Mariette Yvinec diff --git a/Triangulation_3/doc/TDS_3/CGAL/Triangulation_data_structure_3.h b/TDS_3/doc/TDS_3/CGAL/Triangulation_data_structure_3.h similarity index 100% rename from Triangulation_3/doc/TDS_3/CGAL/Triangulation_data_structure_3.h rename to TDS_3/doc/TDS_3/CGAL/Triangulation_data_structure_3.h diff --git a/Triangulation_3/doc/TDS_3/CGAL/Triangulation_ds_cell_base_3.h b/TDS_3/doc/TDS_3/CGAL/Triangulation_ds_cell_base_3.h similarity index 100% rename from Triangulation_3/doc/TDS_3/CGAL/Triangulation_ds_cell_base_3.h rename to TDS_3/doc/TDS_3/CGAL/Triangulation_ds_cell_base_3.h diff --git a/Triangulation_3/doc/TDS_3/CGAL/Triangulation_ds_vertex_base_3.h b/TDS_3/doc/TDS_3/CGAL/Triangulation_ds_vertex_base_3.h similarity index 100% rename from Triangulation_3/doc/TDS_3/CGAL/Triangulation_ds_vertex_base_3.h rename to TDS_3/doc/TDS_3/CGAL/Triangulation_ds_vertex_base_3.h diff --git a/Triangulation_3/doc/TDS_3/CGAL/Triangulation_utils_3.h b/TDS_3/doc/TDS_3/CGAL/Triangulation_utils_3.h similarity index 100% rename from Triangulation_3/doc/TDS_3/CGAL/Triangulation_utils_3.h rename to TDS_3/doc/TDS_3/CGAL/Triangulation_utils_3.h diff --git a/Triangulation_3/doc/TDS_3/Concepts/TriangulationDSCellBase_3.h b/TDS_3/doc/TDS_3/Concepts/TriangulationDSCellBase_3.h similarity index 100% rename from Triangulation_3/doc/TDS_3/Concepts/TriangulationDSCellBase_3.h rename to TDS_3/doc/TDS_3/Concepts/TriangulationDSCellBase_3.h diff --git a/Triangulation_3/doc/TDS_3/Concepts/TriangulationDSVertexBase_3.h b/TDS_3/doc/TDS_3/Concepts/TriangulationDSVertexBase_3.h similarity index 100% rename from Triangulation_3/doc/TDS_3/Concepts/TriangulationDSVertexBase_3.h rename to TDS_3/doc/TDS_3/Concepts/TriangulationDSVertexBase_3.h diff --git a/Triangulation_3/doc/TDS_3/Concepts/TriangulationDataStructure_3.h b/TDS_3/doc/TDS_3/Concepts/TriangulationDataStructure_3.h similarity index 100% rename from Triangulation_3/doc/TDS_3/Concepts/TriangulationDataStructure_3.h rename to TDS_3/doc/TDS_3/Concepts/TriangulationDataStructure_3.h diff --git a/Triangulation_3/doc/TDS_3/Doxyfile.in b/TDS_3/doc/TDS_3/Doxyfile.in similarity index 76% rename from Triangulation_3/doc/TDS_3/Doxyfile.in rename to TDS_3/doc/TDS_3/Doxyfile.in index 311033d719a..90ded378b27 100644 --- a/Triangulation_3/doc/TDS_3/Doxyfile.in +++ b/TDS_3/doc/TDS_3/Doxyfile.in @@ -3,7 +3,7 @@ PROJECT_NAME = "CGAL ${CGAL_CREATED_VERSION_NUM} - 3D Triangulation Data Structure" -INPUT = ${CMAKE_SOURCE_DIR}/Triangulation_3/doc/TDS_3/ +INPUT = ${CMAKE_SOURCE_DIR}/TDS_3/doc/TDS_3/ diff --git a/Triangulation_3/doc/TDS_3/PackageDescription.txt b/TDS_3/doc/TDS_3/PackageDescription.txt similarity index 100% rename from Triangulation_3/doc/TDS_3/PackageDescription.txt rename to TDS_3/doc/TDS_3/PackageDescription.txt diff --git a/Triangulation_3/doc/TDS_3/TriangulationDS_3.txt b/TDS_3/doc/TDS_3/TriangulationDS_3.txt similarity index 99% rename from Triangulation_3/doc/TDS_3/TriangulationDS_3.txt rename to TDS_3/doc/TDS_3/TriangulationDS_3.txt index 0446c9b2573..0c3ab60bfab 100644 --- a/Triangulation_3/doc/TDS_3/TriangulationDS_3.txt +++ b/TDS_3/doc/TDS_3/TriangulationDS_3.txt @@ -316,14 +316,14 @@ and `delete_cell` can be called concurrently. The following example shows how to construct a 3D triangulation data structure by inserting vertices. -\cgalExample{Triangulation_3/tds.cpp} +\cgalExample{TDS_3/tds.cpp} \subsection TDS_3CrossLinkingBetweena2Danda3DDataStructures Cross-Linking Between a 2D and a 3D Data Structures This example program illustrates how to setup a 2D and a 3D triangulation data structures whose vertices respectively store vertex handles of the other one. -\cgalExample{Triangulation_3/linking_2d_and_3d.cpp} +\cgalExample{TDS_3/linking_2d_and_3d.cpp} \section TDS_3Design Design and Implementation History diff --git a/Triangulation_3/doc/TDS_3/dependencies b/TDS_3/doc/TDS_3/dependencies similarity index 100% rename from Triangulation_3/doc/TDS_3/dependencies rename to TDS_3/doc/TDS_3/dependencies diff --git a/TDS_3/doc/TDS_3/examples.txt b/TDS_3/doc/TDS_3/examples.txt new file mode 100644 index 00000000000..43da4be8442 --- /dev/null +++ b/TDS_3/doc/TDS_3/examples.txt @@ -0,0 +1,4 @@ +/*! +\example TDS_3/tds.cpp +\example TDS_3/linking_2d_and_3d.cpp +*/ diff --git a/Triangulation_3/doc/TDS_3/fig/comborient.png b/TDS_3/doc/TDS_3/fig/comborient.png similarity index 100% rename from Triangulation_3/doc/TDS_3/fig/comborient.png rename to TDS_3/doc/TDS_3/fig/comborient.png diff --git a/Triangulation_3/doc/TDS_3/fig/design_tds.png b/TDS_3/doc/TDS_3/fig/design_tds.png similarity index 100% rename from Triangulation_3/doc/TDS_3/fig/design_tds.png rename to TDS_3/doc/TDS_3/fig/design_tds.png diff --git a/Triangulation_3/doc/TDS_3/fig/flips.png b/TDS_3/doc/TDS_3/fig/flips.png similarity index 100% rename from Triangulation_3/doc/TDS_3/fig/flips.png rename to TDS_3/doc/TDS_3/fig/flips.png diff --git a/Triangulation_3/doc/TDS_3/fig/tds-dim_down.png b/TDS_3/doc/TDS_3/fig/tds-dim_down.png similarity index 100% rename from Triangulation_3/doc/TDS_3/fig/tds-dim_down.png rename to TDS_3/doc/TDS_3/fig/tds-dim_down.png diff --git a/Triangulation_3/doc/TDS_3/fig/topo-insert_outside_affine_hull.png b/TDS_3/doc/TDS_3/fig/topo-insert_outside_affine_hull.png similarity index 100% rename from Triangulation_3/doc/TDS_3/fig/topo-insert_outside_affine_hull.png rename to TDS_3/doc/TDS_3/fig/topo-insert_outside_affine_hull.png diff --git a/Triangulation_3/doc/TDS_3/fig/topo-simplex2.png b/TDS_3/doc/TDS_3/fig/topo-simplex2.png similarity index 100% rename from Triangulation_3/doc/TDS_3/fig/topo-simplex2.png rename to TDS_3/doc/TDS_3/fig/topo-simplex2.png diff --git a/Triangulation_3/doc/TDS_3/fig/topo-simplex3.png b/TDS_3/doc/TDS_3/fig/topo-simplex3.png similarity index 100% rename from Triangulation_3/doc/TDS_3/fig/topo-simplex3.png rename to TDS_3/doc/TDS_3/fig/topo-simplex3.png diff --git a/Triangulation_3/doc/TDS_3/fig/topo-simplex4.png b/TDS_3/doc/TDS_3/fig/topo-simplex4.png similarity index 100% rename from Triangulation_3/doc/TDS_3/fig/topo-simplex4.png rename to TDS_3/doc/TDS_3/fig/topo-simplex4.png diff --git a/Triangulation_3/doc/TDS_3/fig/utils-next-around-edge.png b/TDS_3/doc/TDS_3/fig/utils-next-around-edge.png similarity index 100% rename from Triangulation_3/doc/TDS_3/fig/utils-next-around-edge.png rename to TDS_3/doc/TDS_3/fig/utils-next-around-edge.png diff --git a/Triangulation_3/doc/TDS_3/fig/utils.png b/TDS_3/doc/TDS_3/fig/utils.png similarity index 100% rename from Triangulation_3/doc/TDS_3/fig/utils.png rename to TDS_3/doc/TDS_3/fig/utils.png diff --git a/Triangulation_3/doc/TDS_3/fig_src/comborient.eps b/TDS_3/doc/TDS_3/fig_src/comborient.eps similarity index 100% rename from Triangulation_3/doc/TDS_3/fig_src/comborient.eps rename to TDS_3/doc/TDS_3/fig_src/comborient.eps diff --git a/Triangulation_3/doc/TDS_3/fig_src/comborient.pdf b/TDS_3/doc/TDS_3/fig_src/comborient.pdf similarity index 100% rename from Triangulation_3/doc/TDS_3/fig_src/comborient.pdf rename to TDS_3/doc/TDS_3/fig_src/comborient.pdf diff --git a/Triangulation_3/doc/TDS_3/fig_src/comborient.xml b/TDS_3/doc/TDS_3/fig_src/comborient.xml similarity index 100% rename from Triangulation_3/doc/TDS_3/fig_src/comborient.xml rename to TDS_3/doc/TDS_3/fig_src/comborient.xml diff --git a/Triangulation_3/doc/TDS_3/fig_src/design_tds.eps b/TDS_3/doc/TDS_3/fig_src/design_tds.eps similarity index 100% rename from Triangulation_3/doc/TDS_3/fig_src/design_tds.eps rename to TDS_3/doc/TDS_3/fig_src/design_tds.eps diff --git a/Triangulation_3/doc/TDS_3/fig_src/design_tds.fig b/TDS_3/doc/TDS_3/fig_src/design_tds.fig similarity index 100% rename from Triangulation_3/doc/TDS_3/fig_src/design_tds.fig rename to TDS_3/doc/TDS_3/fig_src/design_tds.fig diff --git a/Triangulation_3/doc/TDS_3/fig_src/design_tds.pdf b/TDS_3/doc/TDS_3/fig_src/design_tds.pdf similarity index 100% rename from Triangulation_3/doc/TDS_3/fig_src/design_tds.pdf rename to TDS_3/doc/TDS_3/fig_src/design_tds.pdf diff --git a/Triangulation_3/doc/TDS_3/fig_src/flips.eps b/TDS_3/doc/TDS_3/fig_src/flips.eps similarity index 100% rename from Triangulation_3/doc/TDS_3/fig_src/flips.eps rename to TDS_3/doc/TDS_3/fig_src/flips.eps diff --git a/Triangulation_3/doc/TDS_3/fig_src/flips.pdf b/TDS_3/doc/TDS_3/fig_src/flips.pdf similarity index 100% rename from Triangulation_3/doc/TDS_3/fig_src/flips.pdf rename to TDS_3/doc/TDS_3/fig_src/flips.pdf diff --git a/Triangulation_3/doc/TDS_3/fig_src/flips.xml b/TDS_3/doc/TDS_3/fig_src/flips.xml similarity index 100% rename from Triangulation_3/doc/TDS_3/fig_src/flips.xml rename to TDS_3/doc/TDS_3/fig_src/flips.xml diff --git a/Triangulation_3/doc/TDS_3/fig_src/repres.eps b/TDS_3/doc/TDS_3/fig_src/repres.eps similarity index 100% rename from Triangulation_3/doc/TDS_3/fig_src/repres.eps rename to TDS_3/doc/TDS_3/fig_src/repres.eps diff --git a/Triangulation_3/doc/TDS_3/fig_src/repres.pdf b/TDS_3/doc/TDS_3/fig_src/repres.pdf similarity index 100% rename from Triangulation_3/doc/TDS_3/fig_src/repres.pdf rename to TDS_3/doc/TDS_3/fig_src/repres.pdf diff --git a/Triangulation_3/doc/TDS_3/fig_src/repres.xml b/TDS_3/doc/TDS_3/fig_src/repres.xml similarity index 100% rename from Triangulation_3/doc/TDS_3/fig_src/repres.xml rename to TDS_3/doc/TDS_3/fig_src/repres.xml diff --git a/Triangulation_3/doc/TDS_3/fig_src/topo-insert_outside_affine_hull.eps b/TDS_3/doc/TDS_3/fig_src/topo-insert_outside_affine_hull.eps similarity index 100% rename from Triangulation_3/doc/TDS_3/fig_src/topo-insert_outside_affine_hull.eps rename to TDS_3/doc/TDS_3/fig_src/topo-insert_outside_affine_hull.eps diff --git a/Triangulation_3/doc/TDS_3/fig_src/topo-insert_outside_affine_hull.pdf b/TDS_3/doc/TDS_3/fig_src/topo-insert_outside_affine_hull.pdf similarity index 100% rename from Triangulation_3/doc/TDS_3/fig_src/topo-insert_outside_affine_hull.pdf rename to TDS_3/doc/TDS_3/fig_src/topo-insert_outside_affine_hull.pdf diff --git a/Triangulation_3/doc/TDS_3/fig_src/topo-simplex2.eps b/TDS_3/doc/TDS_3/fig_src/topo-simplex2.eps similarity index 100% rename from Triangulation_3/doc/TDS_3/fig_src/topo-simplex2.eps rename to TDS_3/doc/TDS_3/fig_src/topo-simplex2.eps diff --git a/Triangulation_3/doc/TDS_3/fig_src/topo-simplex2.pdf b/TDS_3/doc/TDS_3/fig_src/topo-simplex2.pdf similarity index 100% rename from Triangulation_3/doc/TDS_3/fig_src/topo-simplex2.pdf rename to TDS_3/doc/TDS_3/fig_src/topo-simplex2.pdf diff --git a/Triangulation_3/doc/TDS_3/fig_src/topo-simplex2.xml b/TDS_3/doc/TDS_3/fig_src/topo-simplex2.xml similarity index 100% rename from Triangulation_3/doc/TDS_3/fig_src/topo-simplex2.xml rename to TDS_3/doc/TDS_3/fig_src/topo-simplex2.xml diff --git a/Triangulation_3/doc/TDS_3/fig_src/topo-simplex3.eps b/TDS_3/doc/TDS_3/fig_src/topo-simplex3.eps similarity index 100% rename from Triangulation_3/doc/TDS_3/fig_src/topo-simplex3.eps rename to TDS_3/doc/TDS_3/fig_src/topo-simplex3.eps diff --git a/Triangulation_3/doc/TDS_3/fig_src/topo-simplex3.pdf b/TDS_3/doc/TDS_3/fig_src/topo-simplex3.pdf similarity index 100% rename from Triangulation_3/doc/TDS_3/fig_src/topo-simplex3.pdf rename to TDS_3/doc/TDS_3/fig_src/topo-simplex3.pdf diff --git a/Triangulation_3/doc/TDS_3/fig_src/topo-simplex3.xml b/TDS_3/doc/TDS_3/fig_src/topo-simplex3.xml similarity index 100% rename from Triangulation_3/doc/TDS_3/fig_src/topo-simplex3.xml rename to TDS_3/doc/TDS_3/fig_src/topo-simplex3.xml diff --git a/Triangulation_3/doc/TDS_3/fig_src/topo-simplex4.eps b/TDS_3/doc/TDS_3/fig_src/topo-simplex4.eps similarity index 100% rename from Triangulation_3/doc/TDS_3/fig_src/topo-simplex4.eps rename to TDS_3/doc/TDS_3/fig_src/topo-simplex4.eps diff --git a/Triangulation_3/doc/TDS_3/fig_src/topo-simplex4.pdf b/TDS_3/doc/TDS_3/fig_src/topo-simplex4.pdf similarity index 100% rename from Triangulation_3/doc/TDS_3/fig_src/topo-simplex4.pdf rename to TDS_3/doc/TDS_3/fig_src/topo-simplex4.pdf diff --git a/Triangulation_3/doc/TDS_3/fig_src/topo-simplex4.xml b/TDS_3/doc/TDS_3/fig_src/topo-simplex4.xml similarity index 100% rename from Triangulation_3/doc/TDS_3/fig_src/topo-simplex4.xml rename to TDS_3/doc/TDS_3/fig_src/topo-simplex4.xml diff --git a/Triangulation_3/doc/TDS_3/fig_src/utils-ipe7.xml b/TDS_3/doc/TDS_3/fig_src/utils-ipe7.xml similarity index 100% rename from Triangulation_3/doc/TDS_3/fig_src/utils-ipe7.xml rename to TDS_3/doc/TDS_3/fig_src/utils-ipe7.xml diff --git a/Triangulation_3/doc/TDS_3/fig_src/utils-next-around-edge.xml b/TDS_3/doc/TDS_3/fig_src/utils-next-around-edge.xml similarity index 100% rename from Triangulation_3/doc/TDS_3/fig_src/utils-next-around-edge.xml rename to TDS_3/doc/TDS_3/fig_src/utils-next-around-edge.xml diff --git a/Triangulation_3/doc/TDS_3/fig_src/utils.eps b/TDS_3/doc/TDS_3/fig_src/utils.eps similarity index 100% rename from Triangulation_3/doc/TDS_3/fig_src/utils.eps rename to TDS_3/doc/TDS_3/fig_src/utils.eps diff --git a/Triangulation_3/doc/TDS_3/fig_src/utils.ipe b/TDS_3/doc/TDS_3/fig_src/utils.ipe similarity index 100% rename from Triangulation_3/doc/TDS_3/fig_src/utils.ipe rename to TDS_3/doc/TDS_3/fig_src/utils.ipe diff --git a/Triangulation_3/doc/TDS_3/fig_src/utils.pdf b/TDS_3/doc/TDS_3/fig_src/utils.pdf similarity index 100% rename from Triangulation_3/doc/TDS_3/fig_src/utils.pdf rename to TDS_3/doc/TDS_3/fig_src/utils.pdf diff --git a/Triangulation_3/doc/TDS_3/fig_src/utils.xml b/TDS_3/doc/TDS_3/fig_src/utils.xml similarity index 100% rename from Triangulation_3/doc/TDS_3/fig_src/utils.xml rename to TDS_3/doc/TDS_3/fig_src/utils.xml diff --git a/Triangulation_3/examples/Triangulation_3/linking_2d_and_3d.cpp b/TDS_3/examples/TDS_3/linking_2d_and_3d.cpp similarity index 100% rename from Triangulation_3/examples/Triangulation_3/linking_2d_and_3d.cpp rename to TDS_3/examples/TDS_3/linking_2d_and_3d.cpp diff --git a/Triangulation_3/examples/Triangulation_3/tds.cpp b/TDS_3/examples/TDS_3/tds.cpp similarity index 100% rename from Triangulation_3/examples/Triangulation_3/tds.cpp rename to TDS_3/examples/TDS_3/tds.cpp diff --git a/TDS_3/package_info/TDS_3/copyright b/TDS_3/package_info/TDS_3/copyright new file mode 100644 index 00000000000..8932b3233d2 --- /dev/null +++ b/TDS_3/package_info/TDS_3/copyright @@ -0,0 +1,2 @@ +INRIA Sophia-Antipolis (France) + diff --git a/TDS_3/package_info/TDS_3/description.txt b/TDS_3/package_info/TDS_3/description.txt new file mode 100644 index 00000000000..f74282f2773 --- /dev/null +++ b/TDS_3/package_info/TDS_3/description.txt @@ -0,0 +1,2 @@ +Package TDS_3 : +triangulation data structure for dimension <= 3 diff --git a/TDS_3/package_info/TDS_3/license.txt b/TDS_3/package_info/TDS_3/license.txt new file mode 100644 index 00000000000..8bb8efcb72b --- /dev/null +++ b/TDS_3/package_info/TDS_3/license.txt @@ -0,0 +1 @@ +GPL (v3 or later) diff --git a/TDS_3/package_info/TDS_3/maintainer b/TDS_3/package_info/TDS_3/maintainer new file mode 100644 index 00000000000..fec7225a53c --- /dev/null +++ b/TDS_3/package_info/TDS_3/maintainer @@ -0,0 +1 @@ +Monique Teillaud diff --git a/Triangulation_3/doc/TDS_3/examples.txt b/Triangulation_3/doc/TDS_3/examples.txt deleted file mode 100644 index 8a8c3a26027..00000000000 --- a/Triangulation_3/doc/TDS_3/examples.txt +++ /dev/null @@ -1,4 +0,0 @@ -/*! -\example Triangulation_3/tds.cpp -\example Triangulation_3/linking_2d_and_3d.cpp -*/ From 91543fd3826b99e7fa3a2cbd7ee73f4eaaf0b57d Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Sun, 23 Aug 2015 15:36:12 +0200 Subject: [PATCH 2/8] move header files to TDS_2 and TDS_3 --- {Triangulation_2 => TDS_2}/include/CGAL/Dummy_tds_2.h | 0 .../include/CGAL/Triangulation_data_structure_2.h | 0 .../include/CGAL/Triangulation_ds_circulators_2.h | 0 {Triangulation_2 => TDS_2}/include/CGAL/Triangulation_ds_face_2.h | 0 .../include/CGAL/Triangulation_ds_face_base_2.h | 0 .../include/CGAL/Triangulation_ds_iterators_2.h | 0 .../include/CGAL/Triangulation_ds_vertex_2.h | 0 .../include/CGAL/Triangulation_ds_vertex_base_2.h | 0 .../include/CGAL/Triangulation_data_structure_3.h | 0 .../include/CGAL/Triangulation_ds_cell_base_3.h | 0 .../include/CGAL/Triangulation_ds_vertex_base_3.h | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename {Triangulation_2 => TDS_2}/include/CGAL/Dummy_tds_2.h (100%) rename {Triangulation_2 => TDS_2}/include/CGAL/Triangulation_data_structure_2.h (100%) rename {Triangulation_2 => TDS_2}/include/CGAL/Triangulation_ds_circulators_2.h (100%) rename {Triangulation_2 => TDS_2}/include/CGAL/Triangulation_ds_face_2.h (100%) rename {Triangulation_2 => TDS_2}/include/CGAL/Triangulation_ds_face_base_2.h (100%) rename {Triangulation_2 => TDS_2}/include/CGAL/Triangulation_ds_iterators_2.h (100%) rename {Triangulation_2 => TDS_2}/include/CGAL/Triangulation_ds_vertex_2.h (100%) rename {Triangulation_2 => TDS_2}/include/CGAL/Triangulation_ds_vertex_base_2.h (100%) rename {Triangulation_3 => TDS_3}/include/CGAL/Triangulation_data_structure_3.h (100%) rename {Triangulation_3 => TDS_3}/include/CGAL/Triangulation_ds_cell_base_3.h (100%) rename {Triangulation_3 => TDS_3}/include/CGAL/Triangulation_ds_vertex_base_3.h (100%) diff --git a/Triangulation_2/include/CGAL/Dummy_tds_2.h b/TDS_2/include/CGAL/Dummy_tds_2.h similarity index 100% rename from Triangulation_2/include/CGAL/Dummy_tds_2.h rename to TDS_2/include/CGAL/Dummy_tds_2.h diff --git a/Triangulation_2/include/CGAL/Triangulation_data_structure_2.h b/TDS_2/include/CGAL/Triangulation_data_structure_2.h similarity index 100% rename from Triangulation_2/include/CGAL/Triangulation_data_structure_2.h rename to TDS_2/include/CGAL/Triangulation_data_structure_2.h diff --git a/Triangulation_2/include/CGAL/Triangulation_ds_circulators_2.h b/TDS_2/include/CGAL/Triangulation_ds_circulators_2.h similarity index 100% rename from Triangulation_2/include/CGAL/Triangulation_ds_circulators_2.h rename to TDS_2/include/CGAL/Triangulation_ds_circulators_2.h diff --git a/Triangulation_2/include/CGAL/Triangulation_ds_face_2.h b/TDS_2/include/CGAL/Triangulation_ds_face_2.h similarity index 100% rename from Triangulation_2/include/CGAL/Triangulation_ds_face_2.h rename to TDS_2/include/CGAL/Triangulation_ds_face_2.h diff --git a/Triangulation_2/include/CGAL/Triangulation_ds_face_base_2.h b/TDS_2/include/CGAL/Triangulation_ds_face_base_2.h similarity index 100% rename from Triangulation_2/include/CGAL/Triangulation_ds_face_base_2.h rename to TDS_2/include/CGAL/Triangulation_ds_face_base_2.h diff --git a/Triangulation_2/include/CGAL/Triangulation_ds_iterators_2.h b/TDS_2/include/CGAL/Triangulation_ds_iterators_2.h similarity index 100% rename from Triangulation_2/include/CGAL/Triangulation_ds_iterators_2.h rename to TDS_2/include/CGAL/Triangulation_ds_iterators_2.h diff --git a/Triangulation_2/include/CGAL/Triangulation_ds_vertex_2.h b/TDS_2/include/CGAL/Triangulation_ds_vertex_2.h similarity index 100% rename from Triangulation_2/include/CGAL/Triangulation_ds_vertex_2.h rename to TDS_2/include/CGAL/Triangulation_ds_vertex_2.h diff --git a/Triangulation_2/include/CGAL/Triangulation_ds_vertex_base_2.h b/TDS_2/include/CGAL/Triangulation_ds_vertex_base_2.h similarity index 100% rename from Triangulation_2/include/CGAL/Triangulation_ds_vertex_base_2.h rename to TDS_2/include/CGAL/Triangulation_ds_vertex_base_2.h diff --git a/Triangulation_3/include/CGAL/Triangulation_data_structure_3.h b/TDS_3/include/CGAL/Triangulation_data_structure_3.h similarity index 100% rename from Triangulation_3/include/CGAL/Triangulation_data_structure_3.h rename to TDS_3/include/CGAL/Triangulation_data_structure_3.h diff --git a/Triangulation_3/include/CGAL/Triangulation_ds_cell_base_3.h b/TDS_3/include/CGAL/Triangulation_ds_cell_base_3.h similarity index 100% rename from Triangulation_3/include/CGAL/Triangulation_ds_cell_base_3.h rename to TDS_3/include/CGAL/Triangulation_ds_cell_base_3.h diff --git a/Triangulation_3/include/CGAL/Triangulation_ds_vertex_base_3.h b/TDS_3/include/CGAL/Triangulation_ds_vertex_base_3.h similarity index 100% rename from Triangulation_3/include/CGAL/Triangulation_ds_vertex_base_3.h rename to TDS_3/include/CGAL/Triangulation_ds_vertex_base_3.h From c5547a7406ecbcc84a42ca0070f6895415f8441c Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Sun, 23 Aug 2015 15:42:12 +0200 Subject: [PATCH 3/8] move tests of Sweep_line_2 --- .../test/Sweep_line_2/CompareCurveList.h | 0 .../test/Sweep_line_2/DATA/conics/con01.txt | 0 .../test/Sweep_line_2/DATA/conics/con02.txt | 0 .../test/Sweep_line_2/DATA/conics/con03.txt | 0 .../test/Sweep_line_2/DATA/conics/con04.txt | 0 .../test/Sweep_line_2/DATA/conics/con05.txt | 0 .../test/Sweep_line_2/DATA/conics/con06.txt | 0 .../test/Sweep_line_2/DATA/conics/con07.txt | 0 .../test/Sweep_line_2/DATA/conics/con08.txt | 0 .../test/Sweep_line_2/DATA/conics/con09.txt | 0 .../test/Sweep_line_2/DATA/conics/con10.txt | 0 .../test/Sweep_line_2/DATA/polylines/big_overlap | 0 .../test/Sweep_line_2/DATA/polylines/big_overlap2 | 0 .../test/Sweep_line_2/DATA/polylines/closed_polyline | 0 .../test/Sweep_line_2/DATA/polylines/collinears | 0 .../test/Sweep_line_2/DATA/polylines/edge_vertex_intersection | 0 .../test/Sweep_line_2/DATA/polylines/endpoint_intersection | 0 .../test/Sweep_line_2/DATA/polylines/partial_overlap | 0 .../test/Sweep_line_2/DATA/polylines/partial_overlap2 | 0 .../test/Sweep_line_2/DATA/polylines/segment_overlap | 0 .../test/Sweep_line_2/DATA/polylines/self_cut | 0 .../test/Sweep_line_2/DATA/polylines/simple_intersection | 0 .../test/Sweep_line_2/DATA/polylines/total_overlap | 0 .../test/Sweep_line_2/DATA/polylines/triangle | 0 .../test/Sweep_line_2/DATA/polylines/two_segments | 0 .../test/Sweep_line_2/DATA/polylines/vertex_intersection | 0 .../test/Sweep_line_2/DATA/polylines/vertical_segment | 0 .../Sweep_line_2/DATA/segment_circles/edge_vertex_intersection | 0 .../test/Sweep_line_2/DATA/segment_circles/segs_and_circles | 0 .../test/Sweep_line_2/DATA/segment_circles/simple_intersection | 0 .../test/Sweep_line_2/DATA/segment_circles/triangle | 0 .../test/Sweep_line_2/DATA/segment_circles/two_segments | 0 .../test/Sweep_line_2/DATA/segment_circles/vertex_intersection | 0 .../test/Sweep_line_2/DATA/segment_circles/vertical_segment | 0 .../test/Sweep_line_2/DATA/segments/H_degeneracy | 0 .../test/Sweep_line_2/DATA/segments/edge_vertex_intersection | 0 .../test/Sweep_line_2/DATA/segments/simple_intersection | 0 .../test/Sweep_line_2/DATA/segments/star_4 | 0 .../test/Sweep_line_2/DATA/segments/triangle | 0 .../test/Sweep_line_2/DATA/segments/two_segments | 0 .../test/Sweep_line_2/DATA/segments/vertex_intersection | 0 .../test/Sweep_line_2/DATA/segments/vertical_segment | 0 .../test/Sweep_line_2/DATA/segments_tight/test00.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test01.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test02.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test03.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test04.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test05.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test06.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test07.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test08.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test09.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test10.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test11.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test12.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test13.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test14.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test15.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test16.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test17.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test18.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test19.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test20.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test21.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test22.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test23.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test24.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test25.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test26.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test27.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test28.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test29.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test30.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test31.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test32.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test33.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test34.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test35.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test36.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test37.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test40.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test41.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test42.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test43.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test44.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test45.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test46.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test47.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test48.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test49.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test50.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test51.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test52.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test53.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test54.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test55.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test56.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test60.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test61.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test62.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test63.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test64.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test65.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test66.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test67.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test68.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test69.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test70.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test71.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test72.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test73.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test74.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test75.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test76.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test77.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test78.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test79.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test80.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test81.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test82.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test83.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test84.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test85.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test86.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test87.txt | 0 .../test/Sweep_line_2/DATA/segments_tight/test88.txt | 0 .../test/Sweep_line_2/cgal_test | 0 .../test/Sweep_line_2/cgal_test_base | 0 .../test/Sweep_line_2/cgal_test_with_cmake | 0 .../test/Sweep_line_2/test_sweep.cpp | 0 .../test/Sweep_line_2/test_sweep_conic.cpp | 0 131 files changed, 0 insertions(+), 0 deletions(-) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/CompareCurveList.h (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/conics/con01.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/conics/con02.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/conics/con03.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/conics/con04.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/conics/con05.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/conics/con06.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/conics/con07.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/conics/con08.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/conics/con09.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/conics/con10.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/polylines/big_overlap (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/polylines/big_overlap2 (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/polylines/closed_polyline (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/polylines/collinears (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/polylines/edge_vertex_intersection (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/polylines/endpoint_intersection (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/polylines/partial_overlap (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/polylines/partial_overlap2 (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/polylines/segment_overlap (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/polylines/self_cut (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/polylines/simple_intersection (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/polylines/total_overlap (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/polylines/triangle (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/polylines/two_segments (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/polylines/vertex_intersection (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/polylines/vertical_segment (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segment_circles/edge_vertex_intersection (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segment_circles/segs_and_circles (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segment_circles/simple_intersection (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segment_circles/triangle (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segment_circles/two_segments (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segment_circles/vertex_intersection (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segment_circles/vertical_segment (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments/H_degeneracy (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments/edge_vertex_intersection (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments/simple_intersection (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments/star_4 (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments/triangle (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments/two_segments (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments/vertex_intersection (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments/vertical_segment (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test00.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test01.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test02.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test03.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test04.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test05.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test06.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test07.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test08.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test09.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test10.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test11.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test12.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test13.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test14.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test15.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test16.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test17.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test18.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test19.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test20.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test21.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test22.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test23.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test24.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test25.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test26.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test27.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test28.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test29.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test30.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test31.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test32.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test33.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test34.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test35.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test36.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test37.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test40.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test41.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test42.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test43.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test44.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test45.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test46.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test47.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test48.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test49.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test50.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test51.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test52.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test53.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test54.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test55.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test56.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test60.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test61.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test62.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test63.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test64.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test65.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test66.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test67.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test68.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test69.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test70.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test71.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test72.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test73.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test74.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test75.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test76.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test77.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test78.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test79.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test80.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test81.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test82.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test83.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test84.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test85.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test86.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test87.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/DATA/segments_tight/test88.txt (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/cgal_test (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/cgal_test_base (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/cgal_test_with_cmake (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/test_sweep.cpp (100%) rename {Arrangement_on_surface_2 => Sweep_line_2}/test/Sweep_line_2/test_sweep_conic.cpp (100%) diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/CompareCurveList.h b/Sweep_line_2/test/Sweep_line_2/CompareCurveList.h similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/CompareCurveList.h rename to Sweep_line_2/test/Sweep_line_2/CompareCurveList.h diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/conics/con01.txt b/Sweep_line_2/test/Sweep_line_2/DATA/conics/con01.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/conics/con01.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/conics/con01.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/conics/con02.txt b/Sweep_line_2/test/Sweep_line_2/DATA/conics/con02.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/conics/con02.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/conics/con02.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/conics/con03.txt b/Sweep_line_2/test/Sweep_line_2/DATA/conics/con03.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/conics/con03.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/conics/con03.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/conics/con04.txt b/Sweep_line_2/test/Sweep_line_2/DATA/conics/con04.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/conics/con04.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/conics/con04.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/conics/con05.txt b/Sweep_line_2/test/Sweep_line_2/DATA/conics/con05.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/conics/con05.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/conics/con05.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/conics/con06.txt b/Sweep_line_2/test/Sweep_line_2/DATA/conics/con06.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/conics/con06.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/conics/con06.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/conics/con07.txt b/Sweep_line_2/test/Sweep_line_2/DATA/conics/con07.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/conics/con07.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/conics/con07.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/conics/con08.txt b/Sweep_line_2/test/Sweep_line_2/DATA/conics/con08.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/conics/con08.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/conics/con08.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/conics/con09.txt b/Sweep_line_2/test/Sweep_line_2/DATA/conics/con09.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/conics/con09.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/conics/con09.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/conics/con10.txt b/Sweep_line_2/test/Sweep_line_2/DATA/conics/con10.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/conics/con10.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/conics/con10.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/big_overlap b/Sweep_line_2/test/Sweep_line_2/DATA/polylines/big_overlap similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/big_overlap rename to Sweep_line_2/test/Sweep_line_2/DATA/polylines/big_overlap diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/big_overlap2 b/Sweep_line_2/test/Sweep_line_2/DATA/polylines/big_overlap2 similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/big_overlap2 rename to Sweep_line_2/test/Sweep_line_2/DATA/polylines/big_overlap2 diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/closed_polyline b/Sweep_line_2/test/Sweep_line_2/DATA/polylines/closed_polyline similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/closed_polyline rename to Sweep_line_2/test/Sweep_line_2/DATA/polylines/closed_polyline diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/collinears b/Sweep_line_2/test/Sweep_line_2/DATA/polylines/collinears similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/collinears rename to Sweep_line_2/test/Sweep_line_2/DATA/polylines/collinears diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/edge_vertex_intersection b/Sweep_line_2/test/Sweep_line_2/DATA/polylines/edge_vertex_intersection similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/edge_vertex_intersection rename to Sweep_line_2/test/Sweep_line_2/DATA/polylines/edge_vertex_intersection diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/endpoint_intersection b/Sweep_line_2/test/Sweep_line_2/DATA/polylines/endpoint_intersection similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/endpoint_intersection rename to Sweep_line_2/test/Sweep_line_2/DATA/polylines/endpoint_intersection diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/partial_overlap b/Sweep_line_2/test/Sweep_line_2/DATA/polylines/partial_overlap similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/partial_overlap rename to Sweep_line_2/test/Sweep_line_2/DATA/polylines/partial_overlap diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/partial_overlap2 b/Sweep_line_2/test/Sweep_line_2/DATA/polylines/partial_overlap2 similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/partial_overlap2 rename to Sweep_line_2/test/Sweep_line_2/DATA/polylines/partial_overlap2 diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/segment_overlap b/Sweep_line_2/test/Sweep_line_2/DATA/polylines/segment_overlap similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/segment_overlap rename to Sweep_line_2/test/Sweep_line_2/DATA/polylines/segment_overlap diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/self_cut b/Sweep_line_2/test/Sweep_line_2/DATA/polylines/self_cut similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/self_cut rename to Sweep_line_2/test/Sweep_line_2/DATA/polylines/self_cut diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/simple_intersection b/Sweep_line_2/test/Sweep_line_2/DATA/polylines/simple_intersection similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/simple_intersection rename to Sweep_line_2/test/Sweep_line_2/DATA/polylines/simple_intersection diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/total_overlap b/Sweep_line_2/test/Sweep_line_2/DATA/polylines/total_overlap similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/total_overlap rename to Sweep_line_2/test/Sweep_line_2/DATA/polylines/total_overlap diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/triangle b/Sweep_line_2/test/Sweep_line_2/DATA/polylines/triangle similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/triangle rename to Sweep_line_2/test/Sweep_line_2/DATA/polylines/triangle diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/two_segments b/Sweep_line_2/test/Sweep_line_2/DATA/polylines/two_segments similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/two_segments rename to Sweep_line_2/test/Sweep_line_2/DATA/polylines/two_segments diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/vertex_intersection b/Sweep_line_2/test/Sweep_line_2/DATA/polylines/vertex_intersection similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/vertex_intersection rename to Sweep_line_2/test/Sweep_line_2/DATA/polylines/vertex_intersection diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/vertical_segment b/Sweep_line_2/test/Sweep_line_2/DATA/polylines/vertical_segment similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/polylines/vertical_segment rename to Sweep_line_2/test/Sweep_line_2/DATA/polylines/vertical_segment diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segment_circles/edge_vertex_intersection b/Sweep_line_2/test/Sweep_line_2/DATA/segment_circles/edge_vertex_intersection similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segment_circles/edge_vertex_intersection rename to Sweep_line_2/test/Sweep_line_2/DATA/segment_circles/edge_vertex_intersection diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segment_circles/segs_and_circles b/Sweep_line_2/test/Sweep_line_2/DATA/segment_circles/segs_and_circles similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segment_circles/segs_and_circles rename to Sweep_line_2/test/Sweep_line_2/DATA/segment_circles/segs_and_circles diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segment_circles/simple_intersection b/Sweep_line_2/test/Sweep_line_2/DATA/segment_circles/simple_intersection similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segment_circles/simple_intersection rename to Sweep_line_2/test/Sweep_line_2/DATA/segment_circles/simple_intersection diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segment_circles/triangle b/Sweep_line_2/test/Sweep_line_2/DATA/segment_circles/triangle similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segment_circles/triangle rename to Sweep_line_2/test/Sweep_line_2/DATA/segment_circles/triangle diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segment_circles/two_segments b/Sweep_line_2/test/Sweep_line_2/DATA/segment_circles/two_segments similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segment_circles/two_segments rename to Sweep_line_2/test/Sweep_line_2/DATA/segment_circles/two_segments diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segment_circles/vertex_intersection b/Sweep_line_2/test/Sweep_line_2/DATA/segment_circles/vertex_intersection similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segment_circles/vertex_intersection rename to Sweep_line_2/test/Sweep_line_2/DATA/segment_circles/vertex_intersection diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segment_circles/vertical_segment b/Sweep_line_2/test/Sweep_line_2/DATA/segment_circles/vertical_segment similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segment_circles/vertical_segment rename to Sweep_line_2/test/Sweep_line_2/DATA/segment_circles/vertical_segment diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments/H_degeneracy b/Sweep_line_2/test/Sweep_line_2/DATA/segments/H_degeneracy similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments/H_degeneracy rename to Sweep_line_2/test/Sweep_line_2/DATA/segments/H_degeneracy diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments/edge_vertex_intersection b/Sweep_line_2/test/Sweep_line_2/DATA/segments/edge_vertex_intersection similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments/edge_vertex_intersection rename to Sweep_line_2/test/Sweep_line_2/DATA/segments/edge_vertex_intersection diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments/simple_intersection b/Sweep_line_2/test/Sweep_line_2/DATA/segments/simple_intersection similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments/simple_intersection rename to Sweep_line_2/test/Sweep_line_2/DATA/segments/simple_intersection diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments/star_4 b/Sweep_line_2/test/Sweep_line_2/DATA/segments/star_4 similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments/star_4 rename to Sweep_line_2/test/Sweep_line_2/DATA/segments/star_4 diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments/triangle b/Sweep_line_2/test/Sweep_line_2/DATA/segments/triangle similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments/triangle rename to Sweep_line_2/test/Sweep_line_2/DATA/segments/triangle diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments/two_segments b/Sweep_line_2/test/Sweep_line_2/DATA/segments/two_segments similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments/two_segments rename to Sweep_line_2/test/Sweep_line_2/DATA/segments/two_segments diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments/vertex_intersection b/Sweep_line_2/test/Sweep_line_2/DATA/segments/vertex_intersection similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments/vertex_intersection rename to Sweep_line_2/test/Sweep_line_2/DATA/segments/vertex_intersection diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments/vertical_segment b/Sweep_line_2/test/Sweep_line_2/DATA/segments/vertical_segment similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments/vertical_segment rename to Sweep_line_2/test/Sweep_line_2/DATA/segments/vertical_segment diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test00.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test00.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test00.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test00.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test01.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test01.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test01.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test01.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test02.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test02.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test02.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test02.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test03.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test03.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test03.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test03.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test04.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test04.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test04.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test04.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test05.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test05.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test05.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test05.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test06.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test06.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test06.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test06.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test07.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test07.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test07.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test07.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test08.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test08.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test08.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test08.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test09.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test09.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test09.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test09.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test10.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test10.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test10.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test10.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test11.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test11.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test11.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test11.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test12.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test12.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test12.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test12.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test13.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test13.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test13.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test13.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test14.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test14.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test14.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test14.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test15.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test15.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test15.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test15.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test16.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test16.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test16.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test16.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test17.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test17.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test17.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test17.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test18.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test18.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test18.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test18.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test19.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test19.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test19.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test19.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test20.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test20.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test20.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test20.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test21.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test21.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test21.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test21.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test22.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test22.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test22.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test22.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test23.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test23.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test23.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test23.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test24.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test24.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test24.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test24.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test25.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test25.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test25.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test25.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test26.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test26.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test26.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test26.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test27.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test27.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test27.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test27.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test28.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test28.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test28.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test28.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test29.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test29.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test29.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test29.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test30.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test30.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test30.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test30.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test31.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test31.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test31.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test31.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test32.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test32.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test32.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test32.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test33.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test33.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test33.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test33.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test34.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test34.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test34.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test34.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test35.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test35.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test35.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test35.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test36.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test36.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test36.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test36.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test37.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test37.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test37.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test37.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test40.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test40.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test40.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test40.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test41.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test41.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test41.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test41.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test42.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test42.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test42.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test42.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test43.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test43.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test43.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test43.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test44.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test44.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test44.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test44.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test45.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test45.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test45.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test45.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test46.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test46.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test46.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test46.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test47.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test47.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test47.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test47.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test48.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test48.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test48.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test48.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test49.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test49.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test49.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test49.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test50.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test50.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test50.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test50.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test51.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test51.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test51.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test51.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test52.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test52.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test52.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test52.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test53.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test53.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test53.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test53.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test54.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test54.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test54.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test54.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test55.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test55.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test55.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test55.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test56.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test56.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test56.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test56.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test60.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test60.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test60.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test60.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test61.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test61.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test61.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test61.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test62.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test62.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test62.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test62.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test63.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test63.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test63.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test63.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test64.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test64.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test64.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test64.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test65.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test65.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test65.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test65.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test66.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test66.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test66.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test66.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test67.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test67.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test67.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test67.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test68.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test68.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test68.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test68.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test69.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test69.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test69.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test69.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test70.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test70.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test70.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test70.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test71.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test71.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test71.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test71.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test72.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test72.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test72.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test72.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test73.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test73.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test73.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test73.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test74.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test74.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test74.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test74.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test75.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test75.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test75.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test75.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test76.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test76.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test76.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test76.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test77.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test77.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test77.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test77.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test78.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test78.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test78.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test78.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test79.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test79.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test79.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test79.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test80.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test80.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test80.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test80.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test81.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test81.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test81.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test81.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test82.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test82.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test82.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test82.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test83.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test83.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test83.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test83.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test84.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test84.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test84.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test84.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test85.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test85.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test85.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test85.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test86.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test86.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test86.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test86.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test87.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test87.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test87.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test87.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test88.txt b/Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test88.txt similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/DATA/segments_tight/test88.txt rename to Sweep_line_2/test/Sweep_line_2/DATA/segments_tight/test88.txt diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/cgal_test b/Sweep_line_2/test/Sweep_line_2/cgal_test similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/cgal_test rename to Sweep_line_2/test/Sweep_line_2/cgal_test diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/cgal_test_base b/Sweep_line_2/test/Sweep_line_2/cgal_test_base similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/cgal_test_base rename to Sweep_line_2/test/Sweep_line_2/cgal_test_base diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/cgal_test_with_cmake b/Sweep_line_2/test/Sweep_line_2/cgal_test_with_cmake similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/cgal_test_with_cmake rename to Sweep_line_2/test/Sweep_line_2/cgal_test_with_cmake diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/test_sweep.cpp b/Sweep_line_2/test/Sweep_line_2/test_sweep.cpp similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/test_sweep.cpp rename to Sweep_line_2/test/Sweep_line_2/test_sweep.cpp diff --git a/Arrangement_on_surface_2/test/Sweep_line_2/test_sweep_conic.cpp b/Sweep_line_2/test/Sweep_line_2/test_sweep_conic.cpp similarity index 100% rename from Arrangement_on_surface_2/test/Sweep_line_2/test_sweep_conic.cpp rename to Sweep_line_2/test/Sweep_line_2/test_sweep_conic.cpp From f592fb7e89757fa635d228db3f50c808043854f0 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Sun, 23 Aug 2015 16:12:02 +0200 Subject: [PATCH 4/8] move test files to TDS_2 and TDS_3 --- TDS_2/test/TDS_2/CMakeLists.txt | 63 +++++++++++++++++++ .../TDS_2}/include/CGAL/_test_cls_tds_2.h | 0 .../TDS_2}/include/CGAL/_test_cls_tds_face.h | 0 .../include/CGAL/_test_cls_tds_vertex.h | 0 .../test/TDS_2}/test_triangulation_tds.cpp | 0 TDS_3/test/TDS_3/CMakeLists.txt | 36 +++++++++++ .../TDS_3}/include/CGAL/_test_cls_tds_3.h | 0 .../TDS_3}/include/CGAL/_test_cls_tds_cell.h | 0 .../include/CGAL/_test_cls_tds_vertex.h | 0 .../test/TDS_3}/test_triangulation_tds_3.cpp | 0 .../test/Triangulation_3/CMakeLists.txt | 1 - 11 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 TDS_2/test/TDS_2/CMakeLists.txt rename {Triangulation_2/test/Triangulation_2 => TDS_2/test/TDS_2}/include/CGAL/_test_cls_tds_2.h (100%) rename {Triangulation_2/test/Triangulation_2 => TDS_2/test/TDS_2}/include/CGAL/_test_cls_tds_face.h (100%) rename {Triangulation_2/test/Triangulation_2 => TDS_2/test/TDS_2}/include/CGAL/_test_cls_tds_vertex.h (100%) rename {Triangulation_2/test/Triangulation_2 => TDS_2/test/TDS_2}/test_triangulation_tds.cpp (100%) create mode 100644 TDS_3/test/TDS_3/CMakeLists.txt rename {Triangulation_3/test/Triangulation_3 => TDS_3/test/TDS_3}/include/CGAL/_test_cls_tds_3.h (100%) rename {Triangulation_3/test/Triangulation_3 => TDS_3/test/TDS_3}/include/CGAL/_test_cls_tds_cell.h (100%) rename {Triangulation_3/test/Triangulation_3 => TDS_3/test/TDS_3}/include/CGAL/_test_cls_tds_vertex.h (100%) rename {Triangulation_3/test/Triangulation_3 => TDS_3/test/TDS_3}/test_triangulation_tds_3.cpp (100%) diff --git a/TDS_2/test/TDS_2/CMakeLists.txt b/TDS_2/test/TDS_2/CMakeLists.txt new file mode 100644 index 00000000000..96141c46d72 --- /dev/null +++ b/TDS_2/test/TDS_2/CMakeLists.txt @@ -0,0 +1,63 @@ +# Created by the script cgal_create_CMakeLists +# This is the CMake script for compiling a set of CGAL applications. + +project( Triangulation_2 ) + + +cmake_minimum_required(VERSION 2.6.2) +if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6) + if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3) + cmake_policy(VERSION 2.8.4) + else() + cmake_policy(VERSION 2.6) + endif() +endif() + +set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true ) + +if ( COMMAND cmake_policy ) + + cmake_policy( SET CMP0003 NEW ) + +endif() + +# CGAL and its components +find_package( CGAL QUIET COMPONENTS ) + +if ( NOT CGAL_FOUND ) + + message(STATUS "This project requires the CGAL library, and will not be compiled.") + return() + +endif() + +# include helper file +include( ${CGAL_USE_FILE} ) + + +# Boost and its components +find_package( Boost REQUIRED ) + +if ( NOT Boost_FOUND ) + + message(STATUS "This project requires the Boost library, and will not be compiled.") + + return() + +endif() + +# include for local directory +include_directories( BEFORE include ) + +# include for local package +include_directories( BEFORE ../../include ) + + +# Creating entries for all .cpp/.C files with "main" routine +# ########################################################## + +include( CGAL_CreateSingleSourceCGALProgram ) + +create_single_source_cgal_program( "test_triangulation_tds.cpp" ) + + diff --git a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_tds_2.h b/TDS_2/test/TDS_2/include/CGAL/_test_cls_tds_2.h similarity index 100% rename from Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_tds_2.h rename to TDS_2/test/TDS_2/include/CGAL/_test_cls_tds_2.h diff --git a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_tds_face.h b/TDS_2/test/TDS_2/include/CGAL/_test_cls_tds_face.h similarity index 100% rename from Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_tds_face.h rename to TDS_2/test/TDS_2/include/CGAL/_test_cls_tds_face.h diff --git a/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_tds_vertex.h b/TDS_2/test/TDS_2/include/CGAL/_test_cls_tds_vertex.h similarity index 100% rename from Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_tds_vertex.h rename to TDS_2/test/TDS_2/include/CGAL/_test_cls_tds_vertex.h diff --git a/Triangulation_2/test/Triangulation_2/test_triangulation_tds.cpp b/TDS_2/test/TDS_2/test_triangulation_tds.cpp similarity index 100% rename from Triangulation_2/test/Triangulation_2/test_triangulation_tds.cpp rename to TDS_2/test/TDS_2/test_triangulation_tds.cpp diff --git a/TDS_3/test/TDS_3/CMakeLists.txt b/TDS_3/test/TDS_3/CMakeLists.txt new file mode 100644 index 00000000000..bf2d21dfda4 --- /dev/null +++ b/TDS_3/test/TDS_3/CMakeLists.txt @@ -0,0 +1,36 @@ +# Created by the script cgal_create_cmake_script +# This is the CMake script for compiling a CGAL application. + + +project( TDS_3_test ) + +cmake_minimum_required(VERSION 2.8.11) + + +find_package(CGAL QUIET COMPONENTS Core ) + +if ( CGAL_FOUND ) + + include( ${CGAL_USE_FILE} ) + + find_package( TBB QUIET ) + + if( TBB_FOUND ) + include(${TBB_USE_FILE}) + list(APPEND CGAL_3RD_PARTY_LIBRARIES ${TBB_LIBRARIES}) + endif() + + include( CGAL_CreateSingleSourceCGALProgram ) + + include_directories (BEFORE "../../include") + + include_directories (BEFORE "include") + + create_single_source_cgal_program( "test_triangulation_tds_3.cpp" ) + +else() + + message(STATUS "This program requires the CGAL library, and will not be compiled.") + +endif() + diff --git a/Triangulation_3/test/Triangulation_3/include/CGAL/_test_cls_tds_3.h b/TDS_3/test/TDS_3/include/CGAL/_test_cls_tds_3.h similarity index 100% rename from Triangulation_3/test/Triangulation_3/include/CGAL/_test_cls_tds_3.h rename to TDS_3/test/TDS_3/include/CGAL/_test_cls_tds_3.h diff --git a/Triangulation_3/test/Triangulation_3/include/CGAL/_test_cls_tds_cell.h b/TDS_3/test/TDS_3/include/CGAL/_test_cls_tds_cell.h similarity index 100% rename from Triangulation_3/test/Triangulation_3/include/CGAL/_test_cls_tds_cell.h rename to TDS_3/test/TDS_3/include/CGAL/_test_cls_tds_cell.h diff --git a/Triangulation_3/test/Triangulation_3/include/CGAL/_test_cls_tds_vertex.h b/TDS_3/test/TDS_3/include/CGAL/_test_cls_tds_vertex.h similarity index 100% rename from Triangulation_3/test/Triangulation_3/include/CGAL/_test_cls_tds_vertex.h rename to TDS_3/test/TDS_3/include/CGAL/_test_cls_tds_vertex.h diff --git a/Triangulation_3/test/Triangulation_3/test_triangulation_tds_3.cpp b/TDS_3/test/TDS_3/test_triangulation_tds_3.cpp similarity index 100% rename from Triangulation_3/test/Triangulation_3/test_triangulation_tds_3.cpp rename to TDS_3/test/TDS_3/test_triangulation_tds_3.cpp diff --git a/Triangulation_3/test/Triangulation_3/CMakeLists.txt b/Triangulation_3/test/Triangulation_3/CMakeLists.txt index a045e1a5600..55362600cdc 100644 --- a/Triangulation_3/test/Triangulation_3/CMakeLists.txt +++ b/Triangulation_3/test/Triangulation_3/CMakeLists.txt @@ -37,7 +37,6 @@ if ( CGAL_FOUND ) create_single_source_cgal_program( "test_simplex_3.cpp" ) create_single_source_cgal_program( "test_static_filters.cpp" ) create_single_source_cgal_program( "test_triangulation_3.cpp" ) - create_single_source_cgal_program( "test_triangulation_tds_3.cpp" ) else() From e342ca9d65d7dad74cc9800e2a563102032d968d Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Wed, 26 Aug 2015 10:46:38 +0200 Subject: [PATCH 5/8] cleanup of PackageDescription --- TDS_3/doc/TDS_3/PackageDescription.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/TDS_3/doc/TDS_3/PackageDescription.txt b/TDS_3/doc/TDS_3/PackageDescription.txt index 6c220ea61e0..9167af3f17a 100644 --- a/TDS_3/doc/TDS_3/PackageDescription.txt +++ b/TDS_3/doc/TDS_3/PackageDescription.txt @@ -62,9 +62,6 @@ Section \ref TDS3secintro.) - `CGAL::Triangulation_ds_cell_base_3` - `CGAL::Triangulation_ds_vertex_base_3` -- `CGAL::Triangulation_cell_base_3` -- `CGAL::Triangulation_vertex_base_3` -- `CGAL::Triangulation_cell_base_with_circumcenter_3` ## Helper Classes ## From baf91459d1f989f34e3fd0cd80fa8594843f59cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Wed, 26 Aug 2015 17:25:03 +0200 Subject: [PATCH 6/8] Add an example PATH only if there are examples --- Documentation/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/CMakeLists.txt b/Documentation/CMakeLists.txt index 6a7f67a9639..db9f66ef8ef 100644 --- a/Documentation/CMakeLists.txt +++ b/Documentation/CMakeLists.txt @@ -36,7 +36,9 @@ function(configure_doxygen_package CGAL_PACKAGE_NAME) endif() file(APPEND ${CGAL_DOC_PACKAGE_DEFAULTS} "IMAGE_PATH = ${CGAL_PACKAGE_DIR}/doc/${CGAL_PACKAGE_NAME}/fig\n") - file(APPEND ${CGAL_DOC_PACKAGE_DEFAULTS} "EXAMPLE_PATH = ${CGAL_PACKAGE_DIR}/examples\n") + if(EXISTS "${CGAL_PACKAGE_DIR}/examples") + file(APPEND ${CGAL_DOC_PACKAGE_DEFAULTS} "EXAMPLE_PATH = ${CGAL_PACKAGE_DIR}/examples\n") + endif() file(APPEND ${CGAL_DOC_PACKAGE_DEFAULTS} "GENERATE_TAGFILE = ${CGAL_DOC_TAG_GEN_DIR}/${CGAL_PACKAGE_NAME}.tag\n") file(APPEND ${CGAL_DOC_PACKAGE_DEFAULTS} "STRIP_FROM_PATH = ${CGAL_PACKAGE_DIR}/doc/${CGAL_PACKAGE_NAME}/\n") file(APPEND ${CGAL_DOC_PACKAGE_DEFAULTS} "STRIP_FROM_PATH += ${CGAL_PACKAGE_DIR}/include/\n") From 8601e5ef0f35478185e3f64017a7d55c0866ecce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Wed, 26 Aug 2015 17:27:09 +0200 Subject: [PATCH 7/8] move Kinetic examples --- .../doc/Kinetic_data_structures/Kinetic_data_structures.txt | 4 ++-- .../doc/Kinetic_data_structures/examples.txt | 2 ++ .../Kinetic_data_structures}/defining_a_simulation_traits.cpp | 0 .../examples/Kinetic_data_structures}/trivial_kds.cpp | 0 4 files changed, 4 insertions(+), 2 deletions(-) rename {Kinetic_framework/examples/Kinetic_framework => Kinetic_data_structures/examples/Kinetic_data_structures}/defining_a_simulation_traits.cpp (100%) rename {Kinetic_framework/examples/Kinetic_framework => Kinetic_data_structures/examples/Kinetic_data_structures}/trivial_kds.cpp (100%) diff --git a/Kinetic_data_structures/doc/Kinetic_data_structures/Kinetic_data_structures.txt b/Kinetic_data_structures/doc/Kinetic_data_structures/Kinetic_data_structures.txt index dcc272604aa..f455be3ac9a 100644 --- a/Kinetic_data_structures/doc/Kinetic_data_structures/Kinetic_data_structures.txt +++ b/Kinetic_data_structures/doc/Kinetic_data_structures/Kinetic_data_structures.txt @@ -44,14 +44,14 @@ It presumes knowledge of kinetic data structures and this framework. \subsection Kinetic_data_structuresHowdoIstoreextrainformation How do I store extra information allow with, for example, a kinetic Point_2? See the example -\ref Kinetic_framework/defining_a_simulation_traits.cpp to see how +\ref Kinetic_data_structures/defining_a_simulation_traits.cpp to see how to define a new `SimulationTraits` class where the `Active-Objects-Table` contains extra data along with the point. \subsection Kinetic_data_structuresWhereisthebestplace Where is the best place to look if I want to write my own kinetic data structure? We provide two simple kinetic data structures, first most trivial is -\ref Kinetic_framework/trivial_kds.cpp and a slightly more +\ref Kinetic_data_structures/trivial_kds.cpp and a slightly more complicated one is: Defined in `CGAL/Kinetic/Sort.h` diff --git a/Kinetic_data_structures/doc/Kinetic_data_structures/examples.txt b/Kinetic_data_structures/doc/Kinetic_data_structures/examples.txt index a4976040400..1ad2f89a5d1 100644 --- a/Kinetic_data_structures/doc/Kinetic_data_structures/examples.txt +++ b/Kinetic_data_structures/doc/Kinetic_data_structures/examples.txt @@ -1,2 +1,4 @@ /// \example Kinetic_data_structures/Kinetic_regular_triangulation_3.cpp /// \example Kinetic_data_structures/Kinetic_sort.cpp +/// \example Kinetic_data_structures/trivial_kds.cpp +/// \example Kinetic_data_structures/defining_a_simulation_traits.cpp diff --git a/Kinetic_framework/examples/Kinetic_framework/defining_a_simulation_traits.cpp b/Kinetic_data_structures/examples/Kinetic_data_structures/defining_a_simulation_traits.cpp similarity index 100% rename from Kinetic_framework/examples/Kinetic_framework/defining_a_simulation_traits.cpp rename to Kinetic_data_structures/examples/Kinetic_data_structures/defining_a_simulation_traits.cpp diff --git a/Kinetic_framework/examples/Kinetic_framework/trivial_kds.cpp b/Kinetic_data_structures/examples/Kinetic_data_structures/trivial_kds.cpp similarity index 100% rename from Kinetic_framework/examples/Kinetic_framework/trivial_kds.cpp rename to Kinetic_data_structures/examples/Kinetic_data_structures/trivial_kds.cpp From 04aafa27814719bb1c0fde99e4588d03ea9819ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Wed, 26 Aug 2015 17:27:43 +0200 Subject: [PATCH 8/8] duplicate examples that are also used in the user manual of Property_map --- .../doc/Property_map/Property_map.txt | 6 +- Property_map/doc/Property_map/examples.txt | 6 +- .../Property_map/average_spacing_example.cpp | 59 +++++++++++++++++++ .../read_write_xyz_point_set_example.cpp | 52 ++++++++++++++++ .../Property_map/remove_outliers_example.cpp | 41 +++++++++++++ 5 files changed, 158 insertions(+), 6 deletions(-) create mode 100644 Property_map/examples/Property_map/average_spacing_example.cpp create mode 100644 Property_map/examples/Property_map/read_write_xyz_point_set_example.cpp create mode 100644 Property_map/examples/Property_map/remove_outliers_example.cpp diff --git a/Property_map/doc/Property_map/Property_map.txt b/Property_map/doc/Property_map/Property_map.txt index 63d8b6e89cd..67b823a6e3d 100644 --- a/Property_map/doc/Property_map/Property_map.txt +++ b/Property_map/doc/Property_map/Property_map.txt @@ -43,17 +43,17 @@ This component provides property maps to support these cases: \subsection Property_mapExamplewithIdentity Example with Identity_property_map The following example reads a point set and removes 5% of the points. It uses `Identity_property_map` as position property map. -\cgalExample{Point_set_processing_3/remove_outliers_example.cpp} +\cgalExample{Property_map/remove_outliers_example.cpp} \subsection Property_mapExamplewithPairs Example with Pairs The following example reads a point set from an input file and writes it to a file, both in the xyz format. Position and normal are stored in pairs and accessed through property maps. -\cgalExample{Point_set_processing_3/read_write_xyz_point_set_example.cpp} +\cgalExample{Property_map/read_write_xyz_point_set_example.cpp} \subsection Property_mapExamplewithTuples Example with Tuples The following example reads a point set in the `xyz` format and computes the average spacing. %Index, position and color are stored in a tuple and accessed through property maps. -\cgalExample{Point_set_processing_3/average_spacing_example.cpp} +\cgalExample{Property_map/average_spacing_example.cpp} */ } /* namespace CGAL */ diff --git a/Property_map/doc/Property_map/examples.txt b/Property_map/doc/Property_map/examples.txt index fe5b9e2f71c..0e447e8facc 100644 --- a/Property_map/doc/Property_map/examples.txt +++ b/Property_map/doc/Property_map/examples.txt @@ -1,5 +1,5 @@ /*! -\example Point_set_processing_3/remove_outliers_example.cpp -\example Point_set_processing_3/read_write_xyz_point_set_example.cpp -\example Point_set_processing_3/average_spacing_example.cpp +\example Property_map/remove_outliers_example.cpp +\example Property_map/read_write_xyz_point_set_example.cpp +\example Property_map/average_spacing_example.cpp */ diff --git a/Property_map/examples/Property_map/average_spacing_example.cpp b/Property_map/examples/Property_map/average_spacing_example.cpp new file mode 100644 index 00000000000..b3d6e1368bc --- /dev/null +++ b/Property_map/examples/Property_map/average_spacing_example.cpp @@ -0,0 +1,59 @@ +#include +#include +#include + +#include +#include +#include + +// Types +typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; +typedef Kernel::FT FT; +typedef Kernel::Point_3 Point; + +// Data type := index, followed by the point, followed by three integers that +// define the Red Green Blue color of the point. +typedef boost::tuple IndexedPointWithColorTuple; + +int main(int argc, char*argv[]) +{ + const char* fname = (argc>1)?argv[1]:"data/sphere_20k.xyz"; + // Reads a .xyz point set file in points. + // As the point is the second element of the tuple (that is with index 1) + // we use a property map that accesses the 1st element of the tuple. + + std::vector points; + std::ifstream stream(fname); + if (!stream || + !CGAL::read_xyz_points( + stream, std::back_inserter(points), + CGAL::Nth_of_tuple_property_map<1,IndexedPointWithColorTuple>())) + { + std::cerr << "Error: cannot read file " << fname << std::endl; + return EXIT_FAILURE; + } + + // Initialize index and RGB color fields in tuple. + // As the index and RGB color are respectively the first and third-fifth elements + // of the tuple we use a get function from the property map that accesses the 0 + // and 2-4th elements of the tuple. + for(unsigned int i = 0; i < points.size(); i++) + { + points[i].get<0>() = i; // set index value of tuple to i + + points[i].get<2>() = 0; // set RGB color to black + points[i].get<3>() = 0; + points[i].get<4>() = 0; + } + + // Computes average spacing. + const unsigned int nb_neighbors = 6; // 1 ring + FT average_spacing = CGAL::compute_average_spacing( + points.begin(), points.end(), + CGAL::Nth_of_tuple_property_map<1,IndexedPointWithColorTuple>(), + nb_neighbors); + std::cout << "Average spacing: " << average_spacing << std::endl; + + return EXIT_SUCCESS; +} + diff --git a/Property_map/examples/Property_map/read_write_xyz_point_set_example.cpp b/Property_map/examples/Property_map/read_write_xyz_point_set_example.cpp new file mode 100644 index 00000000000..a23e00cbe4d --- /dev/null +++ b/Property_map/examples/Property_map/read_write_xyz_point_set_example.cpp @@ -0,0 +1,52 @@ +#include +#include +#include +#include + +#include // defines std::pair +#include +#include + +// types +typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; +typedef Kernel::Point_3 Point; +typedef Kernel::Vector_3 Vector; + +// Point with normal vector stored as a std::pair. +typedef std::pair Pwn; + +int main(int argc, char*argv[]) +{ + const char* fname = (argc>1)?argv[1]:"data/oni.xyz"; + // Reads a .xyz point set file in points[]. + // Note: read_xyz_points_and_normals() requires an output iterator + // over points and as well as property maps to access each + // point position and normal. + std::vector points; + std::ifstream in(fname); + if (!in || + !CGAL::read_xyz_points_and_normals( + in,std::back_inserter(points), + CGAL::First_of_pair_property_map(), + CGAL::Second_of_pair_property_map())) + { + std::cerr << "Error: cannot read file " << fname << std::endl; + return EXIT_FAILURE; + } + + // Saves point set. + // Note: write_xyz_points_and_normals() requires an output iterator + // over points as well as property maps to access each + // point position and normal. + std::ofstream out("oni_copy.xyz"); + if (!out || + !CGAL::write_xyz_points_and_normals( + out, points.begin(), points.end(), + CGAL::First_of_pair_property_map(), + CGAL::Second_of_pair_property_map())) + { + return EXIT_FAILURE; + } + + return EXIT_SUCCESS; +} diff --git a/Property_map/examples/Property_map/remove_outliers_example.cpp b/Property_map/examples/Property_map/remove_outliers_example.cpp new file mode 100644 index 00000000000..fb25df68902 --- /dev/null +++ b/Property_map/examples/Property_map/remove_outliers_example.cpp @@ -0,0 +1,41 @@ +#include +#include +#include +#include + +#include +#include + +// types +typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; +typedef Kernel::Point_3 Point; + +int main(int argc, char*argv[]) +{ + const char* fname = (argc>1)?argv[1]:"data/oni.xyz"; + // Reads a .xyz point set file in points[]. + // The Identity_property_map property map can be omitted here as it is the default value. + std::vector points; + std::ifstream stream(fname); + if (!stream || + !CGAL::read_xyz_points(stream, std::back_inserter(points), + CGAL::Identity_property_map())) + { + std::cerr << "Error: cannot read file " << fname << std::endl; + return EXIT_FAILURE; + } + + // Removes outliers using erase-remove idiom. + // The Identity_property_map property map can be omitted here as it is the default value. + const double removed_percentage = 5.0; // percentage of points to remove + const int nb_neighbors = 24; // considers 24 nearest neighbor points + points.erase(CGAL::remove_outliers(points.begin(), points.end(), + CGAL::Identity_property_map(), + nb_neighbors, removed_percentage), + points.end()); + + // Optional: after erase(), use Scott Meyer's "swap trick" to trim excess capacity + std::vector(points).swap(points); + + return EXIT_SUCCESS; +}