Skip to content

Commit 394b8de

Browse files
Philipp MöllerPhilipp Möller
authored andcommitted
Merge the Bounding_volumes package from its parts
Merge Min_circle_2, Min_ellipse_2, Min_sphere_d, Min_annulus_d, Min_sphere_of_spheres_d, Min_quadrilateral_2 and Approximate_min_ellipsoid_d. The documentation from the part that is in Matrix_search has also been moved here, but not the code. Add a new don't submit that covers the old ones, combine the package_info files. Examples and tests are still in separate folders. Merge them in a separate step.
1 parent bc10906 commit 394b8de

File tree

792 files changed

+114
-240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

792 files changed

+114
-240
lines changed

.gitattributes

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,6 @@ Apollonius_graph_2/doc_tex/Apollonius_graph_2/fig/CircleVoronoiLarge.png -text
263263
Apollonius_graph_2/doc_tex/Apollonius_graph_2_ref/insert_degree_2.fig -text svneol=unset#application/octet-stream
264264
Apollonius_graph_2/doc_tex/Apollonius_graph_2_ref/insert_degree_2.gif -text svneol=unset#image/gif
265265
Apollonius_graph_2/doc_tex/Apollonius_graph_2_ref/insert_degree_2.png -text svneol=unset#image/png
266-
Approximate_min_ellipsoid_d/documentation/boundingbox.mw -text svneol=native#application/octet-stream
267266
Arithmetic_kernel/include/CGAL/CORE_arithmetic_kernel.h -text
268267
Arithmetic_kernel/include/CGAL/GMP_arithmetic_kernel.h -text
269268
Arithmetic_kernel/include/CGAL/LEDA_arithmetic_kernel.h -text
@@ -1220,6 +1219,29 @@ Boolean_set_operations_2/test/Boolean_set_operations_2/test_agg_op.cmd eol=lf
12201219
Boolean_set_operations_2/test/Boolean_set_operations_2/test_bop.cmd eol=lf
12211220
Boolean_set_operations_2/test/Boolean_set_operations_2/test_connect_holes.cpp -text
12221221
Boolean_set_operations_2/test/Boolean_set_operations_2/test_polygon_validation.cpp -text
1222+
Bounding_volumes/demo/Min_circle_2/help/index.html svneol=native#text/html
1223+
Bounding_volumes/demo/Min_ellipse_2/help/index.html svneol=native#text/html
1224+
Bounding_volumes/demo/Min_quadrilateral_2/Min_quadrilateral_2/help/index.html svneol=native#text/html
1225+
Bounding_volumes/doc_tex/Bounding_volumes/annulus.gif -text svneol=unset#image/gif
1226+
Bounding_volumes/doc_tex/Bounding_volumes/annulus.pdf -text svneol=unset#application/pdf
1227+
Bounding_volumes/doc_tex/Bounding_volumes/ball.gif -text svneol=unset#image/gif
1228+
Bounding_volumes/doc_tex/Bounding_volumes/ball.pdf -text svneol=unset#application/pdf
1229+
Bounding_volumes/doc_tex/Bounding_volumes/minCircle.png -text
1230+
Bounding_volumes/doc_tex/Bounding_volumes/pcenter.gif -text svneol=unset#image/gif
1231+
Bounding_volumes/doc_tex/Bounding_volumes/pcenter.pdf -text svneol=unset#application/pdf
1232+
Bounding_volumes/dont_submit -text
1233+
Bounding_volumes/package_info/Bounding_volumes/copyright -text
1234+
Bounding_volumes/package_info/Bounding_volumes/description.txt -text
1235+
Bounding_volumes/package_info/Bounding_volumes/license.txt -text
1236+
Bounding_volumes/package_info/Bounding_volumes/maintainer -text
1237+
Bounding_volumes/test/Min_circle_2/test_Min_circle.cmd eol=lf
1238+
Bounding_volumes/test/Min_ellipse_2/test_Min_ellipse_2.cmd eol=lf
1239+
Bounding_volumes/test_extensive/stability/maple/balls-on-boundary-2.mws -text svneol=unset#application/octet-stream
1240+
Bounding_volumes/test_extensive/stability/maple/balls-on-boundary-3.mws -text svneol=unset#application/octet-stream
1241+
Bounding_volumes/web/Approximate_min_ellipsoid_d/boundingbox.mw -text svneol=native#application/octet-stream
1242+
Bounding_volumes/web/Min_sphere_of_spheres_d/figs/heuristic/excess.xfig -text svneol=unset#application/octet-stream
1243+
Bounding_volumes/web/Min_sphere_of_spheres_d/figs/mbex/mbex.xfig -text svneol=unset#application/octet-stream
1244+
Bounding_volumes/web/Min_sphere_of_spheres_d/figs/pivot/cex.xfig -text svneol=unset#application/octet-stream
12231245
Box_intersection_d/doc_tex/Box_intersection_d/fig/benchmark.gif -text svneol=unset#image/gif
12241246
Box_intersection_d/doc_tex/Box_intersection_d/fig/benchmark.pdf -text svneol=unset#application/pdf
12251247
Box_intersection_d/doc_tex/Box_intersection_d/fig/box_inters-small.gif -text svneol=unset#image/gif
@@ -2747,16 +2769,6 @@ Mesh_3/stylesheet.css svneol=native#text/css
27472769
Mesh_3/test/Mesh_3/data/cube.off -text svneol=unset#application/octet-stream
27482770
Mesh_3/test/Mesh_3/data/liver.inr.gz -text
27492771
Mesh_3/test/Mesh_3/data/sphere.off -text svneol=unset#application/octet-stream
2750-
Min_circle_2/demo/Min_circle_2/help/index.html svneol=native#text/html
2751-
Min_circle_2/test/Min_circle_2/test_Min_circle.cmd eol=lf
2752-
Min_ellipse_2/demo/Min_ellipse_2/help/index.html svneol=native#text/html
2753-
Min_ellipse_2/test/Min_ellipse_2/test_Min_ellipse_2.cmd eol=lf
2754-
Min_quadrilateral_2/demo/Min_quadrilateral_2/help/index.html svneol=native#text/html
2755-
Min_sphere_of_spheres_d/test_extensive/stability/maple/balls-on-boundary-2.mws -text svneol=unset#application/octet-stream
2756-
Min_sphere_of_spheres_d/test_extensive/stability/maple/balls-on-boundary-3.mws -text svneol=unset#application/octet-stream
2757-
Min_sphere_of_spheres_d/web/figs/heuristic/excess.xfig -text svneol=unset#application/octet-stream
2758-
Min_sphere_of_spheres_d/web/figs/mbex/mbex.xfig -text svneol=unset#application/octet-stream
2759-
Min_sphere_of_spheres_d/web/figs/pivot/cex.xfig -text svneol=unset#application/octet-stream
27602772
Minkowski_sum_2/benchmark/Minkowski_sum_2/print_utils.h -text
27612773
Minkowski_sum_2/benchmark/Minkowski_sum_2/sum_by_decomposition.cpp -text
27622774
Minkowski_sum_2/doc_tex/Minkowski_sum_2/fig/Minkowski_sum_2.png -text
@@ -3019,13 +3031,6 @@ Number_types/test/Number_types/Gmpfr.cpp -text
30193031
Number_types/test/Number_types/Gmpfr_bug.cpp -text
30203032
Number_types/test/Number_types/include/CGAL/Test/test_root_of_2_traits.h -text
30213033
Number_types/test/Number_types/include/CGAL/_test_io.h -text
3022-
Optimisation_doc/doc_tex/Bounding_volumes/annulus.gif -text svneol=unset#image/gif
3023-
Optimisation_doc/doc_tex/Bounding_volumes/annulus.pdf -text svneol=unset#application/pdf
3024-
Optimisation_doc/doc_tex/Bounding_volumes/ball.gif -text svneol=unset#image/gif
3025-
Optimisation_doc/doc_tex/Bounding_volumes/ball.pdf -text svneol=unset#application/pdf
3026-
Optimisation_doc/doc_tex/Bounding_volumes/minCircle.png -text
3027-
Optimisation_doc/doc_tex/Bounding_volumes/pcenter.gif -text svneol=unset#image/gif
3028-
Optimisation_doc/doc_tex/Bounding_volumes/pcenter.pdf -text svneol=unset#application/pdf
30293034
Optimisation_doc/doc_tex/Inscribed_areas/largestEmptyRect.gif -text svneol=unset#image/gif
30303035
Optimisation_doc/doc_tex/Inscribed_areas/largestEmptyRect.pdf -text svneol=unset#application/pdf
30313036
Optimisation_doc/doc_tex/Inscribed_areas/max_triangle.gif -text svneol=unset#image/gif

.gitignore

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -681,54 +681,6 @@ Mesh_3/test/Mesh_3/test_meshing_polyhedron
681681
Mesh_3/test/Mesh_3/test_meshing_polyhedron_with_features
682682
Mesh_3/test/Mesh_3/test_off
683683
Mesh_3/test/Mesh_3/test_robust_weighted_circumcenter
684-
Min_annulus_d/*.aux
685-
Min_annulus_d/*.bbl
686-
Min_annulus_d/*.blg
687-
Min_annulus_d/*.dvi
688-
Min_annulus_d/*.idx
689-
Min_annulus_d/*.ilg
690-
Min_annulus_d/*.ind
691-
Min_annulus_d/*.log
692-
Min_annulus_d/*.mxp
693-
Min_annulus_d/*.toc
694-
Min_annulus_d/.dep
695-
Min_annulus_d/.obj
696-
Min_annulus_d/.tmp
697-
Min_annulus_d/Makefile
698-
Min_annulus_d/bin
699-
Min_annulus_d/doc_ps
700-
Min_circle_2/*.aux
701-
Min_circle_2/*.bbl
702-
Min_circle_2/*.blg
703-
Min_circle_2/*.dvi
704-
Min_circle_2/*.idx
705-
Min_circle_2/*.ilg
706-
Min_circle_2/*.ind
707-
Min_circle_2/*.log
708-
Min_circle_2/*.mxp
709-
Min_circle_2/*.toc
710-
Min_circle_2/.dep
711-
Min_circle_2/.obj
712-
Min_circle_2/.tmp
713-
Min_circle_2/Makefile
714-
Min_circle_2/bin
715-
Min_circle_2/doc_ps
716-
Min_ellipse_2/*.aux
717-
Min_ellipse_2/*.bbl
718-
Min_ellipse_2/*.blg
719-
Min_ellipse_2/*.dvi
720-
Min_ellipse_2/*.idx
721-
Min_ellipse_2/*.ilg
722-
Min_ellipse_2/*.ind
723-
Min_ellipse_2/*.log
724-
Min_ellipse_2/*.mxp
725-
Min_ellipse_2/*.toc
726-
Min_ellipse_2/.dep
727-
Min_ellipse_2/.obj
728-
Min_ellipse_2/.tmp
729-
Min_ellipse_2/Makefile
730-
Min_ellipse_2/bin
731-
Min_ellipse_2/doc_ps
732684
Minkowski_sum_3/test/Minkowski_sum_3/CMakeLists.txt
733685
Minkowski_sum_3/test/Minkowski_sum_3/cgal_test_with_cmake
734686
Modular_arithmetic/doc_html

Approximate_min_ellipsoid_d/dont_submit

Lines changed: 0 additions & 1 deletion
This file was deleted.

Approximate_min_ellipsoid_d/package_info/Approximate_min_ellipsoid_d/copyright

Lines changed: 0 additions & 1 deletion
This file was deleted.

Approximate_min_ellipsoid_d/package_info/Approximate_min_ellipsoid_d/description.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

Approximate_min_ellipsoid_d/package_info/Approximate_min_ellipsoid_d/maintainer

Lines changed: 0 additions & 1 deletion
This file was deleted.
File renamed without changes.

Min_circle_2/demo/Min_circle_2/Qt_widget_move_list_point.cpp renamed to Bounding_volumes/demo/Min_circle_2/Qt_widget_move_list_point.cpp

File renamed without changes.

Min_circle_2/demo/Min_circle_2/Qt_widget_move_list_point.h renamed to Bounding_volumes/demo/Min_circle_2/Qt_widget_move_list_point.h

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)