From c848823b084ed2cc996a01f2f83a8437568d17ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20M=C3=B6ller?= Date: Thu, 16 Aug 2012 15:56:16 +0000 Subject: [PATCH] Merge Width_3 and parts of Matrix_search into Polytope_distance_d. --- .../Polytope_distance_d_ref/WidthTraits_3.tex | 0 .../doc_tex/Polytope_distance_d_ref/Width_3.tex | 2 +- .../Width_default_traits_3.tex | 0 .../main_All_furthest_neighbors.tex | 0 .../Polytope_distance_d_ref/main_Width_3.tex | 0 .../spec_all_furthest_neighbors.tex | 2 +- .../all_furthest_neighbors_2.cpp | 0 .../Polytope_distance_d}/width_simplex.cpp | 0 .../include/CGAL/Width_3.h | 0 .../include/CGAL/Width_default_traits_3.h | 0 .../include/CGAL/Width_polyhedron_3.h | 0 .../include/CGAL/all_furthest_neighbors_2.h | 0 .../include/CGAL/width_assertions.h | 0 .../Polytope_distance_d/description.txt | 6 ++++-- .../package_info/Polytope_distance_d/maintainer | 5 +++++ .../all_furthest_neighbors_2_test.cpp | 0 .../Polytope_distance_d}/test_width_cube.cpp | 0 .../Polytope_distance_d}/test_width_simplex.cpp | 0 Width_3/package_info/Width_3/copyright | 1 - Width_3/package_info/Width_3/description.txt | 2 -- Width_3/package_info/Width_3/license.txt | 1 - .../package_info/Width_3/long_description.txt | 16 ---------------- Width_3/package_info/Width_3/maintainer | 2 -- 23 files changed, 11 insertions(+), 26 deletions(-) rename {Width_3 => Polytope_distance_d}/doc_tex/Polytope_distance_d_ref/WidthTraits_3.tex (100%) rename {Width_3 => Polytope_distance_d}/doc_tex/Polytope_distance_d_ref/Width_3.tex (99%) rename {Width_3 => Polytope_distance_d}/doc_tex/Polytope_distance_d_ref/Width_default_traits_3.tex (100%) rename {Matrix_search => Polytope_distance_d}/doc_tex/Polytope_distance_d_ref/main_All_furthest_neighbors.tex (100%) rename {Width_3 => Polytope_distance_d}/doc_tex/Polytope_distance_d_ref/main_Width_3.tex (100%) rename {Matrix_search => Polytope_distance_d}/doc_tex/Polytope_distance_d_ref/spec_all_furthest_neighbors.tex (98%) rename {Matrix_search/examples/Matrix_search => Polytope_distance_d/examples/Polytope_distance_d}/all_furthest_neighbors_2.cpp (100%) rename {Width_3/examples/Width_3 => Polytope_distance_d/examples/Polytope_distance_d}/width_simplex.cpp (100%) rename {Width_3 => Polytope_distance_d}/include/CGAL/Width_3.h (100%) rename {Width_3 => Polytope_distance_d}/include/CGAL/Width_default_traits_3.h (100%) rename {Width_3 => Polytope_distance_d}/include/CGAL/Width_polyhedron_3.h (100%) rename {Matrix_search => Polytope_distance_d}/include/CGAL/all_furthest_neighbors_2.h (100%) rename {Width_3 => Polytope_distance_d}/include/CGAL/width_assertions.h (100%) rename {Matrix_search/test/Matrix_search => Polytope_distance_d/test/Polytope_distance_d}/all_furthest_neighbors_2_test.cpp (100%) rename {Width_3/test/Width_3 => Polytope_distance_d/test/Polytope_distance_d}/test_width_cube.cpp (100%) rename {Width_3/test/Width_3 => Polytope_distance_d/test/Polytope_distance_d}/test_width_simplex.cpp (100%) delete mode 100644 Width_3/package_info/Width_3/copyright delete mode 100644 Width_3/package_info/Width_3/description.txt delete mode 100644 Width_3/package_info/Width_3/license.txt delete mode 100644 Width_3/package_info/Width_3/long_description.txt delete mode 100644 Width_3/package_info/Width_3/maintainer diff --git a/Width_3/doc_tex/Polytope_distance_d_ref/WidthTraits_3.tex b/Polytope_distance_d/doc_tex/Polytope_distance_d_ref/WidthTraits_3.tex similarity index 100% rename from Width_3/doc_tex/Polytope_distance_d_ref/WidthTraits_3.tex rename to Polytope_distance_d/doc_tex/Polytope_distance_d_ref/WidthTraits_3.tex diff --git a/Width_3/doc_tex/Polytope_distance_d_ref/Width_3.tex b/Polytope_distance_d/doc_tex/Polytope_distance_d_ref/Width_3.tex similarity index 99% rename from Width_3/doc_tex/Polytope_distance_d_ref/Width_3.tex rename to Polytope_distance_d/doc_tex/Polytope_distance_d_ref/Width_3.tex index bb2913c9abd..afc51b4a784 100644 --- a/Width_3/doc_tex/Polytope_distance_d_ref/Width_3.tex +++ b/Polytope_distance_d/doc_tex/Polytope_distance_d_ref/Width_3.tex @@ -209,7 +209,7 @@ that the $<\!<$-operator has to been overloaded for \ccc{Point_3}, \ccExample \ccIndexSubitem[C]{Width_3}{example} -\ccIncludeExampleCode{Width_3/width_simplex.cpp} +\ccIncludeExampleCode{Polytope_distance_d/width_simplex.cpp} % ----------------------------------------------------------------------------- diff --git a/Width_3/doc_tex/Polytope_distance_d_ref/Width_default_traits_3.tex b/Polytope_distance_d/doc_tex/Polytope_distance_d_ref/Width_default_traits_3.tex similarity index 100% rename from Width_3/doc_tex/Polytope_distance_d_ref/Width_default_traits_3.tex rename to Polytope_distance_d/doc_tex/Polytope_distance_d_ref/Width_default_traits_3.tex diff --git a/Matrix_search/doc_tex/Polytope_distance_d_ref/main_All_furthest_neighbors.tex b/Polytope_distance_d/doc_tex/Polytope_distance_d_ref/main_All_furthest_neighbors.tex similarity index 100% rename from Matrix_search/doc_tex/Polytope_distance_d_ref/main_All_furthest_neighbors.tex rename to Polytope_distance_d/doc_tex/Polytope_distance_d_ref/main_All_furthest_neighbors.tex diff --git a/Width_3/doc_tex/Polytope_distance_d_ref/main_Width_3.tex b/Polytope_distance_d/doc_tex/Polytope_distance_d_ref/main_Width_3.tex similarity index 100% rename from Width_3/doc_tex/Polytope_distance_d_ref/main_Width_3.tex rename to Polytope_distance_d/doc_tex/Polytope_distance_d_ref/main_Width_3.tex diff --git a/Matrix_search/doc_tex/Polytope_distance_d_ref/spec_all_furthest_neighbors.tex b/Polytope_distance_d/doc_tex/Polytope_distance_d_ref/spec_all_furthest_neighbors.tex similarity index 98% rename from Matrix_search/doc_tex/Polytope_distance_d_ref/spec_all_furthest_neighbors.tex rename to Polytope_distance_d/doc_tex/Polytope_distance_d_ref/spec_all_furthest_neighbors.tex index 48c4b69614b..d31ab342cb3 100644 --- a/Matrix_search/doc_tex/Polytope_distance_d_ref/spec_all_furthest_neighbors.tex +++ b/Polytope_distance_d/doc_tex/Polytope_distance_d_ref/spec_all_furthest_neighbors.tex @@ -72,7 +72,7 @@ \ccc{points_begin[0]} is \ccc{points_begin[4]}, the furthest neighbor of \ccc{points_begin[1]} is \ccc{points_begin[7]} etc.). - \ccIncludeExampleCode{Matrix_search/all_furthest_neighbors_2.cpp} + \ccIncludeExampleCode{Polytope_distance_d/all_furthest_neighbors_2.cpp} \end{ccRefFunction} \begin{ccRefConcept}{AllFurthestNeighborsTraits_2} diff --git a/Matrix_search/examples/Matrix_search/all_furthest_neighbors_2.cpp b/Polytope_distance_d/examples/Polytope_distance_d/all_furthest_neighbors_2.cpp similarity index 100% rename from Matrix_search/examples/Matrix_search/all_furthest_neighbors_2.cpp rename to Polytope_distance_d/examples/Polytope_distance_d/all_furthest_neighbors_2.cpp diff --git a/Width_3/examples/Width_3/width_simplex.cpp b/Polytope_distance_d/examples/Polytope_distance_d/width_simplex.cpp similarity index 100% rename from Width_3/examples/Width_3/width_simplex.cpp rename to Polytope_distance_d/examples/Polytope_distance_d/width_simplex.cpp diff --git a/Width_3/include/CGAL/Width_3.h b/Polytope_distance_d/include/CGAL/Width_3.h similarity index 100% rename from Width_3/include/CGAL/Width_3.h rename to Polytope_distance_d/include/CGAL/Width_3.h diff --git a/Width_3/include/CGAL/Width_default_traits_3.h b/Polytope_distance_d/include/CGAL/Width_default_traits_3.h similarity index 100% rename from Width_3/include/CGAL/Width_default_traits_3.h rename to Polytope_distance_d/include/CGAL/Width_default_traits_3.h diff --git a/Width_3/include/CGAL/Width_polyhedron_3.h b/Polytope_distance_d/include/CGAL/Width_polyhedron_3.h similarity index 100% rename from Width_3/include/CGAL/Width_polyhedron_3.h rename to Polytope_distance_d/include/CGAL/Width_polyhedron_3.h diff --git a/Matrix_search/include/CGAL/all_furthest_neighbors_2.h b/Polytope_distance_d/include/CGAL/all_furthest_neighbors_2.h similarity index 100% rename from Matrix_search/include/CGAL/all_furthest_neighbors_2.h rename to Polytope_distance_d/include/CGAL/all_furthest_neighbors_2.h diff --git a/Width_3/include/CGAL/width_assertions.h b/Polytope_distance_d/include/CGAL/width_assertions.h similarity index 100% rename from Width_3/include/CGAL/width_assertions.h rename to Polytope_distance_d/include/CGAL/width_assertions.h diff --git a/Polytope_distance_d/package_info/Polytope_distance_d/description.txt b/Polytope_distance_d/package_info/Polytope_distance_d/description.txt index a479876f86c..0e396d27c3b 100644 --- a/Polytope_distance_d/package_info/Polytope_distance_d/description.txt +++ b/Polytope_distance_d/package_info/Polytope_distance_d/description.txt @@ -1,2 +1,4 @@ -Algorithm for computing the (squared) distance between two convex polytopes -in arbitrary dimension +Algorithm for computing the (squared) distance between two convex +polytopes in arbitrary dimension and algorithm to determine the width +of a three dimensional point set, that is two parallel supporting +planes are computed having minimum distance. diff --git a/Polytope_distance_d/package_info/Polytope_distance_d/maintainer b/Polytope_distance_d/package_info/Polytope_distance_d/maintainer index 6fe36bffe91..cde17f52611 100644 --- a/Polytope_distance_d/package_info/Polytope_distance_d/maintainer +++ b/Polytope_distance_d/package_info/Polytope_distance_d/maintainer @@ -1 +1,6 @@ Michael Hoffmann + +Width_3 +------- +Thomas Herrmann +Michael Hoffmann diff --git a/Matrix_search/test/Matrix_search/all_furthest_neighbors_2_test.cpp b/Polytope_distance_d/test/Polytope_distance_d/all_furthest_neighbors_2_test.cpp similarity index 100% rename from Matrix_search/test/Matrix_search/all_furthest_neighbors_2_test.cpp rename to Polytope_distance_d/test/Polytope_distance_d/all_furthest_neighbors_2_test.cpp diff --git a/Width_3/test/Width_3/test_width_cube.cpp b/Polytope_distance_d/test/Polytope_distance_d/test_width_cube.cpp similarity index 100% rename from Width_3/test/Width_3/test_width_cube.cpp rename to Polytope_distance_d/test/Polytope_distance_d/test_width_cube.cpp diff --git a/Width_3/test/Width_3/test_width_simplex.cpp b/Polytope_distance_d/test/Polytope_distance_d/test_width_simplex.cpp similarity index 100% rename from Width_3/test/Width_3/test_width_simplex.cpp rename to Polytope_distance_d/test/Polytope_distance_d/test_width_simplex.cpp diff --git a/Width_3/package_info/Width_3/copyright b/Width_3/package_info/Width_3/copyright deleted file mode 100644 index 28daf2dfbb7..00000000000 --- a/Width_3/package_info/Width_3/copyright +++ /dev/null @@ -1 +0,0 @@ - ETH Zurich (Switzerland). diff --git a/Width_3/package_info/Width_3/description.txt b/Width_3/package_info/Width_3/description.txt deleted file mode 100644 index 6eccba1caf1..00000000000 --- a/Width_3/package_info/Width_3/description.txt +++ /dev/null @@ -1,2 +0,0 @@ -This package determines the width of a three dimensional point set, -that is two parallel supporting planes are computed having minimum distance. diff --git a/Width_3/package_info/Width_3/license.txt b/Width_3/package_info/Width_3/license.txt deleted file mode 100644 index 0d3d7e59728..00000000000 --- a/Width_3/package_info/Width_3/license.txt +++ /dev/null @@ -1 +0,0 @@ -GPL (v3 or later) diff --git a/Width_3/package_info/Width_3/long_description.txt b/Width_3/package_info/Width_3/long_description.txt deleted file mode 100644 index 86f91e60cbf..00000000000 --- a/Width_3/package_info/Width_3/long_description.txt +++ /dev/null @@ -1,16 +0,0 @@ -The width of a three dimensional point set is defined as the minimum -distance between two parallel planes of support of the point set. The -convex hull is computed to simplify the search for such two -planes. Note that these width-planes are not unique; there might exist more -than one pair of parallel supporting planes, all having the same -distance. - -For the convex hull computation the three dimensional convex hull -algorithm of CGAL itself have been used. But this calculation requires -LEDA, so LEDA is required for the width computation of a set of points -too. But if the convex hull has been determined elsewhere and if this -hull is represented by an halfedge data structure then the width can -be computed without any use of LEDA. But the STL has been used instead -for some data structures. - - diff --git a/Width_3/package_info/Width_3/maintainer b/Width_3/package_info/Width_3/maintainer deleted file mode 100644 index 43cb004849d..00000000000 --- a/Width_3/package_info/Width_3/maintainer +++ /dev/null @@ -1,2 +0,0 @@ -Thomas Herrmann -Michael Hoffmann