Merge modifications for simplex_tree automatic dimension set

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

Former-commit-id: c18c6316d51f476a795b59c8b870db1aaf0b4591

9 files changed, 4 insertions, 14 deletions

diff --git a/src/Persistent_cohomology/example/alpha_complex_3d_persistence.cpp b/src/Persistent_cohomology/example/alpha_complex_3d_persistence.cpp
index fd227b82..40eb3576 100644
--- a/src/Persistent_cohomology/example/alpha_complex_3d_persistence.cpp
+++ b/src/Persistent_cohomology/example/alpha_complex_3d_persistence.cpp
@@ -203,7 +203,6 @@ int main(int argc, char * const argv[]) {
       std::cout << "This shall not happen" << std::endl;
   }
   simplex_tree.set_filtration(filtration_max);
-  simplex_tree.set_dimension(dim_max);
 
 #ifdef DEBUG_TRACES
   std::cout << "vertices \t\t" << count_vertices << std::endl;
diff --git a/src/Persistent_cohomology/example/exact_alpha_complex_3d_persistence.cpp b/src/Persistent_cohomology/example/exact_alpha_complex_3d_persistence.cpp
index 8a335075..9881debf 100644
--- a/src/Persistent_cohomology/example/exact_alpha_complex_3d_persistence.cpp
+++ b/src/Persistent_cohomology/example/exact_alpha_complex_3d_persistence.cpp
@@ -205,7 +205,6 @@ int main(int argc, char * const argv[]) {
       std::cout << "This shall not happen" << std::endl;
   }
   simplex_tree.set_filtration(filtration_max);
-  simplex_tree.set_dimension(dim_max);
 
 #ifdef DEBUG_TRACES
   std::cout << "vertices \t\t" << count_vertices << std::endl;
diff --git a/src/Persistent_cohomology/example/periodic_alpha_complex_3d_persistence.cpp b/src/Persistent_cohomology/example/periodic_alpha_complex_3d_persistence.cpp
index 8928cfc2..71faebd7 100644
--- a/src/Persistent_cohomology/example/periodic_alpha_complex_3d_persistence.cpp
+++ b/src/Persistent_cohomology/example/periodic_alpha_complex_3d_persistence.cpp
@@ -222,7 +222,6 @@ int main(int argc, char * const argv[]) {
       std::cout << "This shall not happen" << std::endl;
   }
   simplex_tree.set_filtration(filtration_max);
-  simplex_tree.set_dimension(dim_max);
 
 #ifdef DEBUG_TRACES
   std::cout << "vertices \t\t" << count_vertices << std::endl;
diff --git a/src/Persistent_cohomology/example/persistence_from_simple_simplex_tree.cpp b/src/Persistent_cohomology/example/persistence_from_simple_simplex_tree.cpp
index 7ca9410a..7809d5ff 100644
--- a/src/Persistent_cohomology/example/persistence_from_simple_simplex_tree.cpp
+++ b/src/Persistent_cohomology/example/persistence_from_simple_simplex_tree.cpp
@@ -142,7 +142,6 @@ int main(int argc, char * const argv[]) {
   /*   An edge [11,6]         */
   /*   An edge [10,12,2]      */
 
-  st.set_dimension(2);
   st.set_filtration(0.4);
 
   std::cout << "The complex contains " << st.num_simplices() << " simplices - " << st.num_vertices() << " vertices "
diff --git a/src/Persistent_cohomology/example/plain_homology.cpp b/src/Persistent_cohomology/example/plain_homology.cpp
index 50f692f2..a5ae09c8 100644
--- a/src/Persistent_cohomology/example/plain_homology.cpp
+++ b/src/Persistent_cohomology/example/plain_homology.cpp
@@ -64,8 +64,6 @@ int main() {
   st.insert_simplex_and_subfaces(edge03);
   st.insert_simplex(edge13);
   st.insert_simplex(vertex4);
-  // FIXME: Remove this line
-  st.set_dimension(2);
 
   // Sort the simplices in the order of the filtration
   st.initialize_filtration();
diff --git a/src/Persistent_cohomology/example/rips_persistence_step_by_step.cpp b/src/Persistent_cohomology/example/rips_persistence_step_by_step.cpp
index 554eeba6..75580aac 100644
--- a/src/Persistent_cohomology/example/rips_persistence_step_by_step.cpp
+++ b/src/Persistent_cohomology/example/rips_persistence_step_by_step.cpp
@@ -88,6 +88,9 @@ int main(int argc, char * argv[]) {
   Simplex_tree st;
   // insert the proximity graph in the simplex tree
   st.insert_graph(prox_graph);
+  std::cout << "The complex contains " << st.num_simplices() << " simplices \n";
+  std::cout << "   and has dimension " << st.dimension() << " \n";
+/*
   // expand the graph until dimension dim_max
   st.expansion(dim_max);
 
@@ -112,7 +115,7 @@ int main(int argc, char * argv[]) {
     pcoh.output_diagram(out);
     out.close();
   }
-
+*/
   return 0;
 }
 
diff --git a/src/Persistent_cohomology/example/weighted_alpha_complex_3d_persistence.cpp b/src/Persistent_cohomology/example/weighted_alpha_complex_3d_persistence.cpp
index 34b90933..968db753 100644
--- a/src/Persistent_cohomology/example/weighted_alpha_complex_3d_persistence.cpp
+++ b/src/Persistent_cohomology/example/weighted_alpha_complex_3d_persistence.cpp
@@ -223,7 +223,6 @@ int main(int argc, char * const argv[]) {
       std::cout << "This shall not happen" << std::endl;
   }
   simplex_tree.set_filtration(filtration_max);
-  simplex_tree.set_dimension(dim_max);
 
 #ifdef DEBUG_TRACES
   std::cout << "vertices \t\t" << count_vertices << std::endl;
diff --git a/src/Persistent_cohomology/test/betti_numbers_unit_test.cpp b/src/Persistent_cohomology/test/betti_numbers_unit_test.cpp
index da418034..0a08d200 100644
--- a/src/Persistent_cohomology/test/betti_numbers_unit_test.cpp
+++ b/src/Persistent_cohomology/test/betti_numbers_unit_test.cpp
@@ -62,8 +62,6 @@ BOOST_AUTO_TEST_CASE( plain_homology_betti_numbers )
   st.insert_simplex_and_subfaces(edge04);
   st.insert_simplex(edge14);
   st.insert_simplex(vertex5);
-  // FIXME: Remove this line
-  st.set_dimension(3);
 
   // Sort the simplices in the order of the filtration
   st.initialize_filtration();
@@ -170,8 +168,6 @@ BOOST_AUTO_TEST_CASE( betti_numbers )
   st.insert_simplex_and_subfaces(edge04, 2.0);
   st.insert_simplex(edge14, 2.0);
   st.insert_simplex(vertex5, 1.0);
-  // FIXME: Remove this line
-  st.set_dimension(3);
 
   // Sort the simplices in the order of the filtration
   st.initialize_filtration();
diff --git a/src/Persistent_cohomology/test/persistent_cohomology_unit_test.cpp b/src/Persistent_cohomology/test/persistent_cohomology_unit_test.cpp
index f8174020..887aa25f 100644
--- a/src/Persistent_cohomology/test/persistent_cohomology_unit_test.cpp
+++ b/src/Persistent_cohomology/test/persistent_cohomology_unit_test.cpp
@@ -197,8 +197,6 @@ BOOST_AUTO_TEST_CASE( persistence_constructor_exception )
   // To make number of simplices = 255
   const short simplex_0[] = {0, 1, 2, 3, 4, 5, 6, 7};
   st.insert_simplex_and_subfaces(simplex_0);
-  // FIXME: Remove this line
-  st.set_dimension(8);
 
   // Sort the simplices in the order of the filtration
   st.initialize_filtration();