Merge Width_3 and parts of Matrix_search into Polytope_distance_d.

2012-08-16 15:56:16 +00:00 · 2012-08-16 15:56:16 +00:00 · c848823b08
parent beb70a3fad
commit c848823b08
23 changed files with 11 additions and 26 deletions
--- a/Polytope_distance_d/doc_tex/Polytope_distance_d_ref/WidthTraits_3.tex
+++ b/Polytope_distance_d/doc_tex/Polytope_distance_d_ref/WidthTraits_3.tex
--- a/Polytope_distance_d/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}

 % -----------------------------------------------------------------------------

--- a/Polytope_distance_d/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
--- a/Polytope_distance_d/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
--- a/Polytope_distance_d/doc_tex/Polytope_distance_d_ref/main_Width_3.tex
+++ b/Polytope_distance_d/doc_tex/Polytope_distance_d_ref/main_Width_3.tex
--- a/Polytope_distance_d/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}
--- a/Polytope_distance_d/examples/Polytope_distance_d/all_furthest_neighbors_2.cpp
+++ b/Polytope_distance_d/examples/Polytope_distance_d/all_furthest_neighbors_2.cpp
--- a/Polytope_distance_d/examples/Polytope_distance_d/width_simplex.cpp
+++ b/Polytope_distance_d/examples/Polytope_distance_d/width_simplex.cpp
--- a/Polytope_distance_d/include/CGAL/Width_3.h
+++ b/Polytope_distance_d/include/CGAL/Width_3.h
--- a/Polytope_distance_d/include/CGAL/Width_default_traits_3.h
+++ b/Polytope_distance_d/include/CGAL/Width_default_traits_3.h
--- a/Polytope_distance_d/include/CGAL/Width_polyhedron_3.h
+++ b/Polytope_distance_d/include/CGAL/Width_polyhedron_3.h
--- a/Polytope_distance_d/include/CGAL/all_furthest_neighbors_2.h
+++ b/Polytope_distance_d/include/CGAL/all_furthest_neighbors_2.h
--- a/Polytope_distance_d/include/CGAL/width_assertions.h
+++ b/Polytope_distance_d/include/CGAL/width_assertions.h
--- 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.
--- 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 <hoffmann@inf.ethz.ch>
+
+Width_3
+-------
+Thomas Herrmann <herrmann@ifor.math.ethz.ch>
+Michael Hoffmann <hoffmann@inf.ethz.ch>
--- a/Polytope_distance_d/test/Polytope_distance_d/all_furthest_neighbors_2_test.cpp
+++ b/Polytope_distance_d/test/Polytope_distance_d/all_furthest_neighbors_2_test.cpp
--- a/Polytope_distance_d/test/Polytope_distance_d/test_width_cube.cpp
+++ b/Polytope_distance_d/test/Polytope_distance_d/test_width_cube.cpp
--- a/Polytope_distance_d/test/Polytope_distance_d/test_width_simplex.cpp
+++ b/Polytope_distance_d/test/Polytope_distance_d/test_width_simplex.cpp
--- a/Width_3/package_info/Width_3/copyright
+++ b/Width_3/package_info/Width_3/copyright
@ -1 +0,0 @@
- ETH Zurich (Switzerland).
--- a/Width_3/package_info/Width_3/description.txt
+++ b/Width_3/package_info/Width_3/description.txt
@ -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.
--- a/Width_3/package_info/Width_3/license.txt
+++ b/Width_3/package_info/Width_3/license.txt
@ -1 +0,0 @@
-GPL (v3 or later) 
--- a/Width_3/package_info/Width_3/long_description.txt
+++ b/Width_3/package_info/Width_3/long_description.txt
@ -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.
-
- 
--- a/Width_3/package_info/Width_3/maintainer
+++ b/Width_3/package_info/Width_3/maintainer
@ -1,2 +0,0 @@
-Thomas Herrmann <herrmann@ifor.math.ethz.ch>
-Michael Hoffmann <hoffmann@inf.ethz.ch>