diff --git a/Packages/Largest_empty_rect_2/doc_tex/Largest_empty_iso_rectangle_2/Largest_empty_iso_rectangle_2_ref/LargestEmptyIsoRectangleTraits_2.tex b/Packages/Largest_empty_rect_2/doc_tex/Largest_empty_iso_rectangle_2/Largest_empty_iso_rectangle_2_ref/LargestEmptyIsoRectangleTraits_2.tex index 50fa8e735af..6810945ec86 100644 --- a/Packages/Largest_empty_rect_2/doc_tex/Largest_empty_iso_rectangle_2/Largest_empty_iso_rectangle_2_ref/LargestEmptyIsoRectangleTraits_2.tex +++ b/Packages/Largest_empty_rect_2/doc_tex/Largest_empty_iso_rectangle_2/Largest_empty_iso_rectangle_2_ref/LargestEmptyIsoRectangleTraits_2.tex @@ -20,7 +20,7 @@ The concept \ccRefName\ describes the set of requirements to be fulfilled by any class used to instantiate the template parameter of -the class \ccc{Largest_empty_iso_rectangle_2}. +the class \ccc{Largest_empty_iso_rectangle_2}. This concept provides the types of the geometric primitives used in this class and some function object types for the required predicates on those primitives. diff --git a/Packages/Largest_empty_rect_2/doc_tex/Largest_empty_iso_rectangle_2/Largest_empty_iso_rectangle_2_ref/Largest_empty_iso_rectangle_2.tex b/Packages/Largest_empty_rect_2/doc_tex/Largest_empty_iso_rectangle_2/Largest_empty_iso_rectangle_2_ref/Largest_empty_iso_rectangle_2.tex index a796fecffdc..bfa63139f20 100644 --- a/Packages/Largest_empty_rect_2/doc_tex/Largest_empty_iso_rectangle_2/Largest_empty_iso_rectangle_2_ref/Largest_empty_iso_rectangle_2.tex +++ b/Packages/Largest_empty_rect_2/doc_tex/Largest_empty_iso_rectangle_2/Largest_empty_iso_rectangle_2_ref/Largest_empty_iso_rectangle_2.tex @@ -114,7 +114,7 @@ the point set.} insert(InputIterator first, InputIterator last);} {Inserts the points in the range $\left[\right.$\ccc{first}, \ccc{last}$\left.\right)$. Returns the number of inserted points. -{\em Requirement:} The \ccc{value_type} of \ccc{first} and \ccc{last} is +\ccRequirement The \ccc{value_type} of \ccc{first} and \ccc{last} is \ccc{Point}.} \ccHeading{Removal} diff --git a/Packages/Largest_empty_rect_2/doc_tex/basic/Largest_empty_iso_rectangle_2/Largest_empty_iso_rectangle_2_ref/LargestEmptyIsoRectangleTraits_2.tex b/Packages/Largest_empty_rect_2/doc_tex/basic/Largest_empty_iso_rectangle_2/Largest_empty_iso_rectangle_2_ref/LargestEmptyIsoRectangleTraits_2.tex index 50fa8e735af..6810945ec86 100644 --- a/Packages/Largest_empty_rect_2/doc_tex/basic/Largest_empty_iso_rectangle_2/Largest_empty_iso_rectangle_2_ref/LargestEmptyIsoRectangleTraits_2.tex +++ b/Packages/Largest_empty_rect_2/doc_tex/basic/Largest_empty_iso_rectangle_2/Largest_empty_iso_rectangle_2_ref/LargestEmptyIsoRectangleTraits_2.tex @@ -20,7 +20,7 @@ The concept \ccRefName\ describes the set of requirements to be fulfilled by any class used to instantiate the template parameter of -the class \ccc{Largest_empty_iso_rectangle_2}. +the class \ccc{Largest_empty_iso_rectangle_2}. This concept provides the types of the geometric primitives used in this class and some function object types for the required predicates on those primitives. diff --git a/Packages/Largest_empty_rect_2/doc_tex/basic/Largest_empty_iso_rectangle_2/Largest_empty_iso_rectangle_2_ref/Largest_empty_iso_rectangle_2.tex b/Packages/Largest_empty_rect_2/doc_tex/basic/Largest_empty_iso_rectangle_2/Largest_empty_iso_rectangle_2_ref/Largest_empty_iso_rectangle_2.tex index a796fecffdc..bfa63139f20 100644 --- a/Packages/Largest_empty_rect_2/doc_tex/basic/Largest_empty_iso_rectangle_2/Largest_empty_iso_rectangle_2_ref/Largest_empty_iso_rectangle_2.tex +++ b/Packages/Largest_empty_rect_2/doc_tex/basic/Largest_empty_iso_rectangle_2/Largest_empty_iso_rectangle_2_ref/Largest_empty_iso_rectangle_2.tex @@ -114,7 +114,7 @@ the point set.} insert(InputIterator first, InputIterator last);} {Inserts the points in the range $\left[\right.$\ccc{first}, \ccc{last}$\left.\right)$. Returns the number of inserted points. -{\em Requirement:} The \ccc{value_type} of \ccc{first} and \ccc{last} is +\ccRequirement The \ccc{value_type} of \ccc{first} and \ccc{last} is \ccc{Point}.} \ccHeading{Removal} diff --git a/Packages/Largest_empty_rect_2/test/Largest_empty_rect_2/EmptyRect.C b/Packages/Largest_empty_rect_2/test/Largest_empty_rect_2/EmptyRect.C index d6e489d1401..56dbbae0b0d 100644 --- a/Packages/Largest_empty_rect_2/test/Largest_empty_rect_2/EmptyRect.C +++ b/Packages/Largest_empty_rect_2/test/Largest_empty_rect_2/EmptyRect.C @@ -6,9 +6,8 @@ #include #include -typedef double Number_Type; - -typedef CGAL::Cartesian K; +typedef double NT; +typedef CGAL::Cartesian K; typedef K::Point_2 Point; typedef K::Iso_rectangle_2 Iso_rectangle_2; typedef CGAL::Largest_empty_iso_rectangle_2 Largest_empty_rect; @@ -24,7 +23,7 @@ int main(int /*argc*/,char */*argv[]*/) Iso_rectangle_2 b(bl, tr); // missing default constructor - // Largest_empty_rect dc; // af: does not compile + Largest_empty_rect dc; // by the way what is the bounding box ((0,0),(1,1)) ?? Largest_empty_rect empty_rectangle(b); assert(b == empty_rectangle.get_largest_empty_iso_rectangle()); @@ -42,13 +41,13 @@ int main(int /*argc*/,char */*argv[]*/) bool b1 = empty_rectangle.insert(V[0]); assert(b1 == true); bool b2 = empty_rectangle.insert(V[0]); - //assert(b2 == false); // af: assertion fails + assert(b2 == false); std::cout << empty_rectangle.get_largest_empty_iso_rectangle() << std::endl; int n = empty_rectangle.insert(V.begin(), V.end()); std::cout << "n = " << n << std::endl; - // assert(n == 1); // af: assertion fails + assert(n == 1); for(Largest_empty_rect::const_iterator it = empty_rectangle.begin(); it != empty_rectangle.end(); ++it){ @@ -64,7 +63,7 @@ int main(int /*argc*/,char */*argv[]*/) assert(empty_rectangle.begin() == empty_rectangle.end()); Point pp(6,6); assert(empty_rectangle.insert(pp)); - // assert(empty_rectangle.remove(pp)); // af does not compile + assert(empty_rectangle.remove(pp)); assert(empty_rectangle.begin() == empty_rectangle.end()); return(0);