Alpha_complex renamed.

Compilation and tests are OK.
bimap is stored in class.
bimap is now on CGAL Vertex_iterator - instead of points.
is_gabriel not computed when simplex dimension is 1.
is_gabriel not computed when filt(Tau) is not NaN.
Delaunay_triangulation is a pointer constructed in Delaunay_triangulation_off_io.h


git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@617 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 4fa4a26ce47066efe22aed99734ff1dd821ad70b

3 files changed, 13 insertions, 10 deletions

diff --git a/src/Alpha_complex/example/CMakeLists.txt b/src/Alpha_complex/example/CMakeLists.txt
index 582a9322..258def49 100644
--- a/src/Alpha_complex/example/CMakeLists.txt
+++ b/src/Alpha_complex/example/CMakeLists.txt
@@ -22,6 +22,9 @@ if(CGAL_FOUND)
 
       add_executable ( stfromdt Simplex_tree_from_delaunay_triangulation.cpp )
       target_link_libraries(stfromdt  ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY})
+
+      add_executable ( template_off template_off.cpp )
+      target_link_libraries(template_off  ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY})
     else()
       message(WARNING "Eigen3 not found. Version 3.1.0 is required for Alpha shapes feature.")
     endif()
diff --git a/src/Alpha_complex/example/Delaunay_triangulation_off_rw.cpp b/src/Alpha_complex/example/Delaunay_triangulation_off_rw.cpp
index fe889ec0..405b3cb9 100644
--- a/src/Alpha_complex/example/Delaunay_triangulation_off_rw.cpp
+++ b/src/Alpha_complex/example/Delaunay_triangulation_off_rw.cpp
@@ -63,7 +63,7 @@ int main(int argc, char **argv) {
 
   T dt(dimension);
   std::string offFileName(argv[1]);
-  Gudhi::alphashapes::Delaunay_triangulation_off_reader<T> off_reader(offFileName, dt);
+  Gudhi::alphacomplex::Delaunay_triangulation_off_reader<T> off_reader(offFileName, dt);
   if (!off_reader.is_valid()) {
     std::cerr << "Unable to read file " << offFileName << std::endl;
     exit(-1); // ----- >>
@@ -73,7 +73,7 @@ int main(int argc, char **argv) {
 
   std::string outFileName(argv[3]);
   std::string offOutputFile(outFileName);
-  Gudhi::alphashapes::Delaunay_triangulation_off_writer<T> off_writer(offOutputFile, dt);
+  Gudhi::alphacomplex::Delaunay_triangulation_off_writer<T> off_writer(offOutputFile, dt);
 
   return 0;
 }
\ No newline at end of file
diff --git a/src/Alpha_complex/example/Simplex_tree_from_delaunay_triangulation.cpp b/src/Alpha_complex/example/Simplex_tree_from_delaunay_triangulation.cpp
index 0a24fb56..f09e6121 100644
--- a/src/Alpha_complex/example/Simplex_tree_from_delaunay_triangulation.cpp
+++ b/src/Alpha_complex/example/Simplex_tree_from_delaunay_triangulation.cpp
@@ -22,7 +22,7 @@
 
 // to construct a Delaunay_triangulation from a OFF file
 #include "gudhi/Alpha_shapes/Delaunay_triangulation_off_io.h"
-#include "gudhi/Alpha_shapes.h"
+#include "gudhi/Alpha_complex.h"
 
 // to construct a simplex_tree from Delaunay_triangulation
 #include "gudhi/graph_simplicial_complex.h"
@@ -62,16 +62,16 @@ int main(int argc, char **argv) {
 
   // ----------------------------------------------------------------------------
   //
-  // Init of an alpha-shape from a OFF file
+  // Init of an alpha-complex from a OFF file
   //
   // ----------------------------------------------------------------------------
-  Gudhi::alphashapes::Alpha_shapes alpha_shapes_from_file(off_file_name);
+  Gudhi::alphacomplex::Alpha_complex alpha_complex_from_file(off_file_name);
   
-  std::cout << "alpha_shapes_from_file.dimension()=" << alpha_shapes_from_file.dimension() << std::endl;
-  std::cout << "alpha_shapes_from_file.filtration()=" << alpha_shapes_from_file.filtration() << std::endl;
-  std::cout << "alpha_shapes_from_file.num_simplices()=" << alpha_shapes_from_file.num_simplices() << std::endl;
-  std::cout << "alpha_shapes_from_file.num_vertices()=" << alpha_shapes_from_file.num_vertices() << std::endl;
-  //std::cout << alpha_shapes_from_file << std::endl;
+  std::cout << "alpha_complex_from_file.dimension()=" << alpha_complex_from_file.dimension() << std::endl;
+  std::cout << "alpha_complex_from_file.filtration()=" << alpha_complex_from_file.filtration() << std::endl;
+  std::cout << "alpha_complex_from_file.num_simplices()=" << alpha_complex_from_file.num_simplices() << std::endl;
+  std::cout << "alpha_complex_from_file.num_vertices()=" << alpha_complex_from_file.num_vertices() << std::endl;
+  std::cout << alpha_complex_from_file << std::endl;
 
   return 0;
 }
\ No newline at end of file