Make fast/safe/exact, weighted/non-weighted, periodic/non-periodic more orthogonal choices

Only examples work for the moment. Periodic to be tested.
Add Alpha_complex_3d_from_points.cpp example. Maybe to be removed.


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

Former-commit-id: f5621df603bdb149c52400a6095271ea0f54b84c

3 files changed, 67 insertions, 10 deletions

diff --git a/src/Alpha_complex/example/Alpha_complex_3d_from_points.cpp b/src/Alpha_complex/example/Alpha_complex_3d_from_points.cpp
new file mode 100644
index 00000000..e96385c0
--- /dev/null
+++ b/src/Alpha_complex/example/Alpha_complex_3d_from_points.cpp
@@ -0,0 +1,56 @@
+#include <gudhi/Alpha_complex_3d.h>
+// to construct a simplex_tree from alpha complex
+#include <gudhi/Simplex_tree.h>
+
+#include <iostream>
+#include <string>
+#include <vector>
+#include <limits>  // for numeric limits
+
+using Alpha_complex_3d = Gudhi::alpha_complex::Alpha_complex_3d<Gudhi::alpha_complex::complexity::exact, false, false>;
+using Point = Alpha_complex_3d::Point_3 ;
+using Vector_of_points = std::vector<Point>;
+
+int main(int argc, char **argv) {
+  if (argc != 1) {
+    std::cerr << "Error: Number of arguments (" << argc << ") is not correct\n";
+    std::cerr << "Usage: " << (argv[0] - 1) << " \n";
+    exit(-1);  // ----- >>
+  }
+
+  // ----------------------------------------------------------------------------
+  // Init of a list of points from a small molecule
+  // ----------------------------------------------------------------------------
+  Vector_of_points points;
+  points.push_back(Point(1, -1, -1));
+  points.push_back(Point(-1, 1, -1));
+  points.push_back(Point(-1, -1, 1));
+  points.push_back(Point(1, 1, 1));
+  points.push_back(Point(2, 2, 2));
+
+  // ----------------------------------------------------------------------------
+  // Init of an alpha complex from the list of points
+  // ----------------------------------------------------------------------------
+  Alpha_complex_3d alpha_complex_from_points(points);
+
+  Gudhi::Simplex_tree<> simplex;
+  if (alpha_complex_from_points.create_complex(simplex)) {
+    // ----------------------------------------------------------------------------
+    // Display information about the alpha complex
+    // ----------------------------------------------------------------------------
+    std::cout << "Alpha complex is of dimension " << simplex.dimension() <<
+        " - " << simplex.num_simplices() << " simplices - " <<
+        simplex.num_vertices() << " vertices." << std::endl;
+
+    std::cout << "Iterator on alpha complex simplices in the filtration order, with [filtration value]:" << std::endl;
+    for (auto f_simplex : simplex.filtration_simplex_range()) {
+      std::cout << "   ( ";
+      for (auto vertex : simplex.simplex_vertex_range(f_simplex)) {
+        std::cout << vertex << " ";
+      }
+      std::cout << ") -> " << "[" << simplex.filtration(f_simplex) << "] ";
+      std::cout << std::endl;
+    }
+  }
+  return 0;
+}
diff --git a/src/Alpha_complex/example/CMakeLists.txt b/src/Alpha_complex/example/CMakeLists.txt
index 4a1cd26d..1f127972 100644
--- a/src/Alpha_complex/example/CMakeLists.txt
+++ b/src/Alpha_complex/example/CMakeLists.txt
@@ -39,5 +39,13 @@ if(CGAL_FOUND)
     add_test(NAME Alpha_complex_example_weighted_3d_from_points
             COMMAND $<TARGET_FILE:Alpha_complex_example_weighted_3d_from_points>)
 
+    add_executable ( Alpha_complex_example_3d_from_points Alpha_complex_3d_from_points.cpp )
+    target_link_libraries(Alpha_complex_example_3d_from_points  ${CGAL_LIBRARY})
+    if (TBB_FOUND)
+      target_link_libraries(Alpha_complex_example_3d_from_points ${TBB_LIBRARIES})
+    endif()
+    add_test(NAME Alpha_complex_example_3d_from_points
+            COMMAND $<TARGET_FILE:Alpha_complex_example_3d_from_points>)
+
   endif(NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.11.0)
 endif()
\ No newline at end of file
diff --git a/src/Alpha_complex/example/Weighted_alpha_complex_3d_from_points.cpp b/src/Alpha_complex/example/Weighted_alpha_complex_3d_from_points.cpp
index abb73427..1b60ccd8 100644
--- a/src/Alpha_complex/example/Weighted_alpha_complex_3d_from_points.cpp
+++ b/src/Alpha_complex/example/Weighted_alpha_complex_3d_from_points.cpp
@@ -8,17 +8,10 @@
 #include <vector>
 #include <limits>  // for numeric limits
 
-using Weighted_alpha_shapes_3d = Gudhi::alpha_complex::Weighted_alpha_shapes_3d;
-using Weighted_alpha_complex_3d = Gudhi::alpha_complex::Alpha_complex_3d<Weighted_alpha_shapes_3d>;
-using Point = Gudhi::alpha_complex::Weighted_alpha_shapes_3d::Point_3 ;
+using Weighted_alpha_complex_3d = Gudhi::alpha_complex::Alpha_complex_3d<Gudhi::alpha_complex::complexity::exact, true, false>;
+using Point = Weighted_alpha_complex_3d::Point_3 ;
 using Vector_of_points = std::vector<Point>;
-using Vector_of_weights = std::vector<Gudhi::alpha_complex::Weighted_alpha_shapes_3d::Alpha_shape_3::FT>;
-
-void usage(int nbArgs, char * const progName) {
-  std::cerr << "Error: Number of arguments (" << nbArgs << ") is not correct\n";
-  std::cerr << "Usage: " << progName << " \n";
-  exit(-1);  // ----- >>
-}
+using Vector_of_weights = std::vector<Weighted_alpha_complex_3d::Alpha_shape_3::FT>;
 
 int main(int argc, char **argv) {
   if (argc != 1) {