cmakelists

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

Former-commit-id: 83c6616972403884967c825f20155cecf124c39e

4 files changed, 16 insertions, 3 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbb359e1..f872b5df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,6 +47,7 @@ add_gudhi_module(Skeleton_blocker)
 add_gudhi_module(Spatial_searching)
 add_gudhi_module(Subsampling)
 add_gudhi_module(Tangential_complex)
+add_gudhi_module(Toplex_map)
 add_gudhi_module(Witness_complex)
 
 message("++ GUDHI_MODULES list is:\"${GUDHI_MODULES}\"")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 795005b1..e1ae774a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,6 +23,7 @@ add_gudhi_module(Skeleton_blocker)
 add_gudhi_module(Spatial_searching)
 add_gudhi_module(Subsampling)
 add_gudhi_module(Tangential_complex)
+add_gudhi_module(Toplex_map)
 add_gudhi_module(Witness_complex)
 
 message("++ GUDHI_MODULES list is:\"${GUDHI_MODULES}\"")
diff --git a/src/Toplex_map/include/gudhi/Fake_simplex_tree.h b/src/Toplex_map/include/gudhi/Fake_simplex_tree.h
index 60f8981a..10ef39d7 100644
--- a/src/Toplex_map/include/gudhi/Fake_simplex_tree.h
+++ b/src/Toplex_map/include/gudhi/Fake_simplex_tree.h
@@ -26,7 +26,7 @@ public:
     void expansion(int max_dim);
 
     /** \brief Returns the number of vertices in the simplicial complex. */
-    std::size_t num_vertices();
+    std::size_t num_vertices() const;
 
     Simplex_ptr_set candidates() const;
 
@@ -34,7 +34,7 @@ public:
 
     std::size_t num_simplices() const;
 
-    std::size_t num_vertices() const;
+    void set_dimension(int d);
 
     Simplex simplex_vertex_range(Simplex_ptr &sptr) const;
 
@@ -59,6 +59,10 @@ protected:
 
 };
 
+void Fake_simplex_tree::set_dimension(int d){
+
+}
+
 template<class OneSkeletonGraph>
 void Fake_simplex_tree::insert_graph(const OneSkeletonGraph& skel_graph){
     typename boost::graph_traits<OneSkeletonGraph>::edge_iterator e_it,
@@ -149,6 +153,11 @@ Simplex Fake_simplex_tree::simplex_vertex_range(Simplex_ptr& sptr) const {
 
 std::unordered_set<Simplex_ptr> Fake_simplex_tree::filtration_simplex_range() const{
     std::vector<Simplex_ptr> m = max_simplices();
+    std::cout << m.size()<< std::endl;
+    std::cout << m.size()<< std::endl;
+
+    std::cout << m.size()<< std::endl;
+
     std::unordered_set<Simplex_ptr> seen;
     while(m.begin()!=m.end()){
         Simplex_ptr& sptr = m.back();
diff --git a/src/Witness_complex/example/example_strong_witness_complex_off.cpp b/src/Witness_complex/example/example_strong_witness_complex_off.cpp
index 0ee9ee90..4a232481 100644
--- a/src/Witness_complex/example/example_strong_witness_complex_off.cpp
+++ b/src/Witness_complex/example/example_strong_witness_complex_off.cpp
@@ -21,6 +21,7 @@
  */
 
 #include <gudhi/Simplex_tree.h>
+#include <gudhi/Fake_simplex_tree.h>
 #include <gudhi/Euclidean_strong_witness_complex.h>
 #include <gudhi/pick_n_random_points.h>
 #include <gudhi/Points_off_io.h>
@@ -49,7 +50,8 @@ int main(int argc, char * const argv[]) {
   int nbL = atoi(argv[2]), lim_dim = atoi(argv[4]);
   double alpha2 = atof(argv[3]);
   clock_t start, end;
-  Gudhi::Simplex_tree<> simplex_tree;
+  //Gudhi::Simplex_tree<> simplex_tree;
+  Gudhi::Fake_simplex_tree simplex_tree;
 
   // Read the point file
   Point_vector point_vector, landmarks;