Merge from nextwq

2011-06-15 09:20:39 +00:00
parent 9f9e8046c3 075cfbc3f9
commit fbc101fbb8
256 changed files with 19536 additions and 317 deletions
@@ -1281,6 +1281,131 @@ Circular_kernel_3/test/Circular_kernel_3/test_Lazy_spherical_kernel_basics.cpp -
 Circular_kernel_3/test/Circular_kernel_3/test_Spherical_kernel_basics.cpp -text
 Circular_kernel_3/test/Circular_kernel_3/test_Spherical_kernel_with_core.cpp -text
 Circulator/doc_tex/Circulator/circulator.png -text
+Combinatorial_map/doc_tex/Combinatorial_map/Combinatorial_map.tex -text
+Combinatorial_map/doc_tex/Combinatorial_map/PkgDescription.tex -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/Diagramme_class.fig -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/exemple-carte-3d-sew.fig -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/exemple-carte-3d-sew2.fig -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/exemple-carte2-3d.fig -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/insert-edge.fig -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/insert-facet.fig -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/insert-vertex.fig -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/intuitif-example-map.fig -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/intuitif-example-map2d.fig -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/intuitif-example-zoom.fig -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/intuitif-example-zoom2.fig -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/intuitif-example.fig -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/map2d-with-attrib.fig -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/object2d-nonmanifold.fig -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/object2d.fig -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/object3d-nonmanifold.fig -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/object3d-nonmanifold2.fig -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/object3d.fig -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/ope1.fig -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/ope2.fig -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/ope3.fig -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/pb-carte3D.fig -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/pb2-carte3D.fig -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/pdf/Diagramme_class.pdf -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/pdf/exemple-carte-3d-sew.pdf -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/pdf/exemple-carte-3d-sew2.pdf -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/pdf/exemple-carte2-3d.pdf -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/pdf/insert-edge.pdf -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/pdf/insert-facet.pdf -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/pdf/insert-vertex.pdf -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/pdf/intuitif-example-map.pdf -text svneol=unset#unset
+Combinatorial_map/doc_tex/Combinatorial_map/fig/pdf/intuitif-example-map2d.pdf -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/pdf/intuitif-example-zoom.pdf -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/pdf/intuitif-example-zoom2.pdf -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/pdf/intuitif-example.pdf -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/pdf/map2d-with-attrib.pdf -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/pdf/object2d-nonmanifold.pdf -text svneol=unset#unset
+Combinatorial_map/doc_tex/Combinatorial_map/fig/pdf/object2d.pdf -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/pdf/object3d-nonmanifold.pdf -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/pdf/object3d-nonmanifold2.pdf -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/pdf/object3d.pdf -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/pdf/ope1.pdf -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/pdf/ope2.pdf -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/pdf/ope3.pdf -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/pdf/pb-carte3D.pdf -text svneol=unset#unset
+Combinatorial_map/doc_tex/Combinatorial_map/fig/pdf/pb2-carte3D.pdf -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/pdf/quasivariete.pdf -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/pdf/quasivarietea.pdf -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/pdf/triangulation.pdf -text svneol=unset#unset
+Combinatorial_map/doc_tex/Combinatorial_map/fig/png/Diagramme_class.png -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/png/exemple-carte-3d-sew.png -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/png/exemple-carte-3d-sew2.png -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/png/exemple-carte2-3d.png -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/png/insert-edge.png -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/png/insert-facet.png -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/png/insert-vertex.png -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/png/intuitif-example-map.png -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/png/intuitif-example-map2d.png -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/png/intuitif-example-zoom.png -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/png/intuitif-example-zoom2.png -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/png/intuitif-example.png -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/png/map2d-with-attrib.png -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/png/object2d-nonmanifold.png -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/png/object2d.png -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/png/object3d-nonmanifold.png -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/png/object3d-nonmanifold2.png -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/png/object3d.png -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/png/ope1.png -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/png/ope2.png -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/png/ope3.png -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/png/pb-carte3D.png -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/png/pb2-carte3D.png -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/png/quasivariete.png -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/png/quasivarietea.png -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/png/triangulation.png -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/quasivariete.fig -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/quasivarietea.fig -text
+Combinatorial_map/doc_tex/Combinatorial_map/fig/triangulation.fig -text
+Combinatorial_map/doc_tex/Combinatorial_map/main.tex -text
+Combinatorial_map/doc_tex/Combinatorial_map_ref/CellAttribute.tex -text
+Combinatorial_map/doc_tex/Combinatorial_map_ref/Cell_attribute.tex -text
+Combinatorial_map/doc_tex/Combinatorial_map_ref/CombinatorialMap.tex -text
+Combinatorial_map/doc_tex/Combinatorial_map_ref/CombinatorialMapItems.tex -text
+Combinatorial_map/doc_tex/Combinatorial_map_ref/Combinatorial_map.tex -text
+Combinatorial_map/doc_tex/Combinatorial_map_ref/Combinatorial_map_constructors.tex -text
+Combinatorial_map/doc_tex/Combinatorial_map_ref/Combinatorial_map_min_items.tex -text
+Combinatorial_map/doc_tex/Combinatorial_map_ref/Combinatorial_map_operations.tex -text
+Combinatorial_map/doc_tex/Combinatorial_map_ref/Dart.tex -text
+Combinatorial_map/doc_tex/Combinatorial_map_ref/Dart_base.tex -text
+Combinatorial_map/doc_tex/Combinatorial_map_ref/intro.tex -text
+Combinatorial_map/doc_tex/Combinatorial_map_ref/main.tex -text
+Combinatorial_map/doc_tex/wrapper.tex -text
+Combinatorial_map/dont_submit -text
+Combinatorial_map/examples/Combinatorial_map/CMakeLists.txt -text
+Combinatorial_map/examples/Combinatorial_map/map_3_marks.cpp -text
+Combinatorial_map/examples/Combinatorial_map/map_3_operations.cpp -text
+Combinatorial_map/examples/Combinatorial_map/map_3_simple_example.cpp -text
+Combinatorial_map/examples/Combinatorial_map/map_3_with_colored_facets.cpp -text
+Combinatorial_map/examples/Combinatorial_map/map_4_simple_example.cpp -text
+Combinatorial_map/include/CGAL/Cell_attribute.h -text
+Combinatorial_map/include/CGAL/Cell_const_iterators.h -text
+Combinatorial_map/include/CGAL/Cell_iterators.h -text
+Combinatorial_map/include/CGAL/Combinatorial_map.h -text
+Combinatorial_map/include/CGAL/Combinatorial_map_basic_operations.h -text
+Combinatorial_map/include/CGAL/Combinatorial_map_constructors.h -text
+Combinatorial_map/include/CGAL/Combinatorial_map_min_items.h -text
+Combinatorial_map/include/CGAL/Combinatorial_map_operations.h -text
+Combinatorial_map/include/CGAL/Dart.h -text
+Combinatorial_map/include/CGAL/Dart_const_iterators.h -text
+Combinatorial_map/include/CGAL/Dart_iterators.h -text
+Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h -text
+Combinatorial_map/include/CGAL/internal/Combinatorial_map_utility.h -text
+Combinatorial_map/package_info/Combinatorial_map/description.txt -text
+Combinatorial_map/package_info/Combinatorial_map/long_description.txt -text
+Combinatorial_map/package_info/Combinatorial_map/maintainer -text
+Combinatorial_map/test/Combinatorial_map/CMakeLists.txt -text
+Combinatorial_map/test/Combinatorial_map/Combinatorial_map_2_test.h -text
+Combinatorial_map/test/Combinatorial_map/Combinatorial_map_3_test.h -text
+Combinatorial_map/test/Combinatorial_map/Combinatorial_map_test.cpp -text
+Combinatorial_map/test/Combinatorial_map/data/aircraft.off -text
+Combinatorial_map/test/Combinatorial_map/data/points -text
+Combinatorial_map/test/Combinatorial_map/data/small_points -text
+Combinatorial_map/test/Combinatorial_map/data/small_points2 -text
 Convex_decomposition_3/demo/Convex_decomposition_3/star.nef3 -text
 Convex_decomposition_3/doc_tex/Convex_decomposition_3/PkgDescription.tex -text
 Convex_decomposition_3/doc_tex/Convex_decomposition_3/fig/teaser.png -text
@@ -56,7 +56,7 @@ isolator<Polynomial<Gmpz> >::operator()(const Polynomial<Gmpz> &p,
        mpz_t *coeffs=(mpz_t*)malloc((degree+1)*sizeof(mpz_t));
        mpfi_ptr *intervals_mpfi=(mpfi_ptr*)malloc(degree*sizeof(mpfi_ptr));
        std::vector<Gmpfi> intervals;
-        for(int i=0;i<=degree;++i)
+        for(unsigned int i=0;i<=degree;++i)
                coeffs[i][0]=*(p[i].mpz());
        init_solver();
        create_rs_upoly(coeffs,degree,rs_get_default_up());
@@ -41,15 +41,19 @@ if ( CGAL_FOUND )
  create_single_source_cgal_program( "Algebraic_kernel_d_1_CORE.cpp" )
  create_single_source_cgal_program( "Algebraic_kernel_d_1_GMP.cpp" )
  create_single_source_cgal_program( "Algebraic_kernel_d_2.cpp" )
-  create_single_source_cgal_program( "Algebraic_kernel_rs_gmpq_d_1.cpp" )
-  create_single_source_cgal_program( "Algebraic_kernel_rs_gmpz_d_1.cpp" )
  create_single_source_cgal_program( "Algebraic_real_d_1.cpp" )
  create_single_source_cgal_program( "Bitstream_descartes.cpp" )
  create_single_source_cgal_program( "Curve_analysis_2.cpp" )
  create_single_source_cgal_program( "Curve_pair_analysis_2.cpp" )
  create_single_source_cgal_program( "Descartes.cpp" )
  create_single_source_cgal_program( "Real_embeddable_traits_extension.cpp" )
-  create_single_source_cgal_program( "rs_isolator.cpp" )
+  if(RS_FOUND)
+    create_single_source_cgal_program( "Algebraic_kernel_rs_gmpq_d_1.cpp" )
+    create_single_source_cgal_program( "Algebraic_kernel_rs_gmpz_d_1.cpp" )
+    create_single_source_cgal_program( "rs_isolator.cpp" )
+  else()
+    message(STATUS "NOTICE: Some tests require the RS library, and will not be compiled.")
+  endif()

 else()

@@ -1406,6 +1406,8 @@ Alpha_shape_2<Dt>::find_alpha_solid() const
  // starting point for searching 
  // takes O(#alpha_shape) time
  Coord_type alpha_solid = 0;
+  
+  if (number_of_vertices()<3) return alpha_solid;

  Finite_vertices_iterator vertex_it;
  // only finite vertices
@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>


 #ifndef CGAL_APOLLONIUS_GRAPH_2_IMPL_H
@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>

 #ifndef CGAL_APOLLONIUS_GRAPH_HIERARCHY_2_IMPL_H
 #define CGAL_APOLLONIUS_GRAPH_HIERARCHY_2_IMPL_H
@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@tem.uoc.gr>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>
 //                 Christophe Delage
 //                 David Millman

@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@tem.uoc.gr>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>
 //                 Christophe Delage
 //                 David Millman

@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@tem.uoc.gr>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>
 //                 Christophe Delage <Christophe.Delage@sophia.inria.fr>
 //                 David Millman <dlm336@cs.nyu.edu>

@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@tem.uoc.gr>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>
 //                 Christophe Delage <Christophe.Delage@sophia.inria.fr>
 //                 David Millman <dlm336@cs.nyu.edu>

@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@tem.uoc.gr>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>
 //                 Christophe Delage <Christophe.Delage@sophia.inria.fr>
 //                 David Millman <dlm336@cs.nyu.edu>

@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@tem.uoc.gr>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>
 //                 Christophe Delage <Christophe.Delage@sophia.inria.fr>
 //                 David Millman <dlm336@cs.nyu.edu>

@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@tem.uoc.gr>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@tem.uoc.gr>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>
 //                 Christophe Delage <Christophe.Delage@sophia.inria.fr>
 //                 David Millman <dlm336@cs.nyu.edu>

@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@tem.uoc.gr>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>
 //                 Christophe Delage <Christophe.Delage@sophia.inria.fr>
 //                 David Millman <dlm336@cs.nyu.edu>

@@ -1,4 +1,4 @@
-// Copyright (c) 2007 Foundation for Research and Technology-Hellas (Greece).
+// Copyright (c) 2007 INRIA Sophia-Antipolis (France).
 // All rights reserved.
 //
 // This file is part of CGAL (www.cgal.org); you may redistribute it under
@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -1,4 +1,4 @@
-// Copyright (c) 2007 Foundation for Research and Technology-Hellas (Greece).
+// Copyright (c) 2007 INRIA Sophia-Antipolis (France).
 // All rights reserved.
 //
 // This file is part of CGAL (www.cgal.org); you may redistribute it under
@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -1,4 +1,4 @@
-// Copyright (c) 2007 Foundation for Research and Technology-Hellas (Greece).
+// Copyright (c) 2007 INRIA Sophia-Antipolis (France).
 // All rights reserved.
 //
 // This file is part of CGAL (www.cgal.org); you may redistribute it under
@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>

 #ifndef CGAL_APOLLONIUS_GRAPH_2_BASIC_H
 #define CGAL_APOLLONIUS_GRAPH_2_BASIC_H 1
@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@tem.uoc.gr>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>
 //                 Christophe Delage <Christophe.Delage@sophia.inria.fr>
 //                 David Millman <dlm336@cs.nyu.edu>

@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>

 #ifndef CGAL_APOLLONIUS_GRAPH_HIERARCHY_2_H
 #define CGAL_APOLLONIUS_GRAPH_HIERARCHY_2_H
@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>

 #ifndef CGAL_APOLLONIUS_GRAPH_HIERARCHY_VERTEX_BASE_2_H
 #define CGAL_APOLLONIUS_GRAPH_HIERARCHY_VERTEX_BASE_2_H
@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>

 #ifndef CGAL_APOLLONIUS_GRAPH_TRAITS_2_H
 #define CGAL_APOLLONIUS_GRAPH_TRAITS_2_H
@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>

 #ifndef CGAL_APOLLONIUS_GRAPH_VERTEX_BASE_2_H
 #define CGAL_APOLLONIUS_GRAPH_VERTEX_BASE_2_H
@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>

 #ifndef CGAL_APOLLONIUS_SITE_2_H
 #define CGAL_APOLLONIUS_SITE_2_H
@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>


 #ifndef CGAL_QT_WIDGET_APOLLONIUS_SITE_2_H
@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>

 #ifndef CGAL_QT_WIDGET_HYPERBOLA_2_H
 #define CGAL_QT_WIDGET_HYPERBOLA_2_H
@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -15,7 +15,7 @@
 // $Id$
 // 
 //
-// Author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+// Author(s)     : Menelaos Karavelas <mkaravel@iacm.forth.gr>



@@ -30,7 +30,7 @@ for the vertices and edges such that the ordered edges do not intersect.


 \ccRefines
-\ccAnchor{http://www.boost.org/libs/graph/doc/IncidenceGraph.html}{IncidenceGraph}\\
+\ccAnchor{http://www.boost.org/libs/graph/doc/BidirectionalGraph.html}{BidirectionalGraph}\\
 \ccAnchor{http://www.boost.org/libs/graph/doc/PropertyGraph.html}{PropertyGraph}

 A model of \ccRefName\ must have the {\em interior properties} 
@@ -96,21 +96,21 @@ opposite_edge( typename boost::graph_traits< Polyhedron_3<Gt,I,HDS,A> const>::ed

 template<class Gt, class I, CGAL_HDS_PARAM_, class A>
 typename boost::graph_traits< Polyhedron_3<Gt,I,HDS,A> const>::edge_descriptor
-next_edge_ccw( typename boost::graph_traits< Polyhedron_3<Gt,I,HDS,A> const>::edge_descriptor outedge
+next_edge_ccw( typename boost::graph_traits< Polyhedron_3<Gt,I,HDS,A> const>::edge_descriptor inedge
             , Polyhedron_3<Gt,I,HDS,A> const& 
             )
 {
  HalfedgeDS_items_decorator< Polyhedron_3<Gt,I,HDS,A> > D ;
-  return D.get_prev(outedge)->opposite();
+  return D.get_prev(inedge->opposite());
 }

 template<class Gt, class I, CGAL_HDS_PARAM_, class A>
 typename boost::graph_traits< Polyhedron_3<Gt,I,HDS,A> const>::edge_descriptor
-next_edge_cw( typename boost::graph_traits< Polyhedron_3<Gt,I,HDS,A> const>::edge_descriptor outedge
+next_edge_cw( typename boost::graph_traits< Polyhedron_3<Gt,I,HDS,A> const>::edge_descriptor inedge
            , Polyhedron_3<Gt,I,HDS,A> const& 
            )
 {
-  return outedge->opposite()->next();
+  return inedge->next()->opposite();
 }


@@ -22,9 +22,25 @@ if ( ${CGAL_SCM_NAME} STREQUAL "svn" )

  find_program(SVN_EXECUTABLE svn DOC "subversion command line client")

-  # TODO detect name
-  set ( CGAL_SCM_BRANCH_NAME "n/a" )
+  function(Subversion_GET_URL dir variable)
+    # use svnversion
+    execute_process(COMMAND "${SVN_EXECUTABLE}" info --xml "${dir}"
+      OUTPUT_VARIABLE ${variable}
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+    string(REGEX REPLACE ".*<url>([^<]+)</url>.*" "\\1" ${variable} "${${variable}}")
+    if(NOT variable)
+      message("Warning: can not get the Subversion URL of directory ${dir}")
+    endif()
+    set(${variable} ${${variable}} PARENT_SCOPE)
+  endfunction(Subversion_GET_URL)

+  Subversion_GET_URL("${CGAL_INSTALLATION_PACKAGE_DIR}" CGAL_INSTALLATION_SVN_URL)
+  # Remove the "/Installation" suffix.
+  string(REGEX REPLACE "(.*)/Installation" "\\1" CGAL_TMP_SVN_BRANCH_NAME "${CGAL_INSTALLATION_SVN_URL}")
+  # Remove the prefix of the URL "https://scm.gforge.inria.fr/".
+  string(REGEX REPLACE "[a-z+]+://[a-z0-9.]+" "" CGAL_TMP_SVN_BRANCH_NAME "${CGAL_TMP_SVN_BRANCH_NAME}")
+
+  set ( CGAL_SCM_BRANCH_NAME "${CGAL_TMP_SVN_BRANCH_NAME}" )
 endif()

 if ( ${CGAL_SCM_NAME} STREQUAL "git" )
@@ -0,0 +1,17 @@
+
+\begin{ccPkgDescription}{Combinatorial Maps\label{Pkg:CombinatorialMaps}}
+  \ccPkgHowToCiteCgal{cgal:d-cm-09} \ccPkgSummary{This package
+    implements Combinatorial Maps in $d$-dimension. A combinatorial
+    map is a mathematical model allowing to represent an object in any
+    dimension by describing the subdivision of the object in vertices,
+    edges, faces, volumes, ... and the incidence and adjacency
+    relationships on them.
+
+    In 2D, a combinatorial map is equivalent to a halfedge data
+    structure.}
+
+\ccPkgIntroducedInCGAL{3.8}
+\ccPkgLicense{\ccLicenseLGPL}
+% \ccPkgDemo{2D Combinatorial Map}{combinatorial_map_2.zip}
+% \ccPkgDemo{3D Combinatorial Map}{combinatorial_map_3.zip}
+\end{ccPkgDescription}
--- a/Show More
+++ b/Show More