Merge last trunk modifications

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

Former-commit-id: 22158e5d4aae2b6c0e5502c585cb6c513c08ac63

8 files changed, 0 insertions, 13 deletions

diff --git a/src/Persistent_cohomology/example/alpha_complex_3d_persistence.cpp b/src/Persistent_cohomology/example/alpha_complex_3d_persistence.cpp
index de9b8cdf..26196a6f 100644
--- a/src/Persistent_cohomology/example/alpha_complex_3d_persistence.cpp
+++ b/src/Persistent_cohomology/example/alpha_complex_3d_persistence.cpp
@@ -198,7 +198,6 @@ int main(int argc, char* const argv[]) {
     else
       std::cout << "This shall not happen" << std::endl;
   }
-  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 5f078251..2e2bfd2f 100644
--- a/src/Persistent_cohomology/example/exact_alpha_complex_3d_persistence.cpp
+++ b/src/Persistent_cohomology/example/exact_alpha_complex_3d_persistence.cpp
@@ -200,7 +200,6 @@ int main(int argc, char* const argv[]) {
     else
       std::cout << "This shall not happen" << std::endl;
   }
-  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 e6355e6b..c6d3e236 100644
--- a/src/Persistent_cohomology/example/periodic_alpha_complex_3d_persistence.cpp
+++ b/src/Persistent_cohomology/example/periodic_alpha_complex_3d_persistence.cpp
@@ -220,7 +220,6 @@ int main(int argc, char* const argv[]) {
     else
       std::cout << "This shall not happen" << std::endl;
   }
-  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 8214d66a..8ef479d4 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);
 
   std::cout << "The complex contains " << st.num_simplices() << " simplices - " << st.num_vertices() << " vertices "
       << std::endl;
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/weighted_alpha_complex_3d_persistence.cpp b/src/Persistent_cohomology/example/weighted_alpha_complex_3d_persistence.cpp
index 4bddbe82..249a7ece 100644
--- a/src/Persistent_cohomology/example/weighted_alpha_complex_3d_persistence.cpp
+++ b/src/Persistent_cohomology/example/weighted_alpha_complex_3d_persistence.cpp
@@ -245,7 +245,6 @@ int main(int argc, char* const argv[]) {
     else
       std::cout << "This shall not happen" << std::endl;
   }
-  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 f53987b6..a1c106d5 100644
--- a/src/Persistent_cohomology/test/persistent_cohomology_unit_test.cpp
+++ b/src/Persistent_cohomology/test/persistent_cohomology_unit_test.cpp
@@ -196,8 +196,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();