Separate and improve simplex tree iostream operators to test automatic dimension set on iostream operators

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

Former-commit-id: dafd077f3ed20eafaccdb27d56e02b3d9e5c44a7

5 files changed, 93 insertions, 44 deletions

diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree.h b/src/Simplex_tree/include/gudhi/Simplex_tree.h
index 478ed80f..76e594d3 100644
--- a/src/Simplex_tree/include/gudhi/Simplex_tree.h
+++ b/src/Simplex_tree/include/gudhi/Simplex_tree.h
@@ -763,7 +763,8 @@ class Simplex_tree {
 
   /** Set an upper bound for the filtration values. */
   void set_filtration(Filtration_value fil) {
-    threshold_ = fil;
+    if (Options::store_filtration)
+      threshold_ = fil;
   }
 
   /** Set a dimension for the simplicial complex. */
@@ -1288,14 +1289,8 @@ std::istream& operator>>(std::istream & is, Simplex_tree<T...> & st) {
   std::vector<typename ST::Vertex_handle> simplex;
   typename ST::Filtration_value fil;
   typename ST::Filtration_value max_fil = 0;
-  int max_dim = -1;
   while (read_simplex(is, simplex, fil)) {
     // read all simplices in the file as a list of vertices
-    // Warning : simplex_size needs to be casted in int - Can be 0
-    int dim = static_cast<int> (simplex.size() - 1);
-    if (max_dim < dim) {
-      max_dim = dim;
-    }
     if (max_fil < fil) {
       max_fil = fil;
     }
@@ -1303,7 +1298,6 @@ std::istream& operator>>(std::istream & is, Simplex_tree<T...> & st) {
     st.insert_simplex(simplex, fil);
     simplex.clear();
   }
-  st.set_dimension(max_dim);
   st.set_filtration(max_fil);
 
   return is;
diff --git a/src/Simplex_tree/test/CMakeLists.txt b/src/Simplex_tree/test/CMakeLists.txt
index 1c169ff7..8684ad2a 100644
--- a/src/Simplex_tree/test/CMakeLists.txt
+++ b/src/Simplex_tree/test/CMakeLists.txt
@@ -21,3 +21,11 @@ if (TBB_FOUND)
 endif()
 
 gudhi_add_coverage_test(Simplex_tree_remove_test_unit)
+
+add_executable ( Simplex_tree_iostream_operator_test_unit simplex_tree_iostream_operator_unit_test.cpp )
+target_link_libraries(Simplex_tree_iostream_operator_test_unit ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+if (TBB_FOUND)
+  target_link_libraries(Simplex_tree_iostream_operator_test_unit ${TBB_LIBRARIES})
+endif()
+
+gudhi_add_coverage_test(Simplex_tree_iostream_operator_test_unit)
diff --git a/src/Simplex_tree/test/simplex_tree_iostream_operator_unit_test.cpp b/src/Simplex_tree/test/simplex_tree_iostream_operator_unit_test.cpp
new file mode 100644
index 00000000..402c31e2
--- /dev/null
+++ b/src/Simplex_tree/test/simplex_tree_iostream_operator_unit_test.cpp
@@ -0,0 +1,83 @@
+#include <iostream>
+
+#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE "simplex_tree_iostream_operator"
+#include <boost/test/unit_test.hpp>
+#include <boost/mpl/list.hpp>
+
+//  ^
+// /!\ Nothing else from Simplex_tree shall be included to test includes are well defined.
+#include "gudhi/Simplex_tree.h"
+
+using namespace Gudhi;
+
+struct MyOptions : Simplex_tree_options_full_featured {
+  // Not doing persistence, so we don't need those
+  static const bool store_key = false;
+  static const bool store_filtration = false;
+  // I have few vertices
+  typedef short Vertex_handle;
+};
+
+typedef boost::mpl::list<Simplex_tree<>,
+                         Simplex_tree<Simplex_tree_options_fast_persistence>,
+                         Simplex_tree<MyOptions>
+                        > list_of_tested_variants;
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(iostream_operator, Stree_type, list_of_tested_variants) {
+  std::cout << "********************************************************************" << std::endl;
+  std::cout << "SIMPLEX TREE IOSTREAM OPERATOR" << std::endl;
+
+  Stree_type st;
+
+  st.insert_simplex_and_subfaces({0, 1, 6, 7}, 4.0);
+  st.insert_simplex_and_subfaces({3, 4, 5}, 3.0);
+  st.insert_simplex_and_subfaces({3, 0}, 2.0);
+  st.insert_simplex_and_subfaces({2, 1, 0}, 3.0);
+  // FIXME
+  st.set_filtration(4.0);
+
+  st.initialize_filtration();
+  // Display the Simplex_tree
+  std::cout << "The ORIGINAL complex contains " << st.num_simplices() << " simplices" << std::endl;
+  std::cout << "   - dimension " << st.dimension() << "   - filtration " << st.filtration() << std::endl;
+  std::cout << std::endl << std::endl << "Iterator on Simplices in the filtration, with [filtration value]:" << std::endl;
+  for (auto f_simplex : st.filtration_simplex_range()) {
+    std::cout << "   " << "[" << st.filtration(f_simplex) << "] ";
+    for (auto vertex : st.simplex_vertex_range(f_simplex)) {
+      std::cout << (int) vertex << " ";
+    }
+    std::cout << std::endl;
+  }
+
+  // st:
+  //    1   6
+  //    o---o
+  //   /X\7/
+  //  o---o---o---o
+  //  2   0   3\X/4
+  //            o
+  //            5
+  std::string iostream_file("simplex_tree_for_iostream_operator_unit_test.txt");
+  std::ofstream simplex_tree_ostream(iostream_file.c_str());
+  simplex_tree_ostream << st;
+  simplex_tree_ostream.close();
+
+  Stree_type read_st;
+  std::ifstream simplex_tree_istream(iostream_file.c_str());
+  simplex_tree_istream >> read_st;
+
+  // Display the Simplex_tree
+  std::cout << "The READ complex contains " << read_st.num_simplices() << " simplices" << std::endl;
+  std::cout << "   - dimension " << read_st.dimension() << "   - filtration " << read_st.filtration() << std::endl;
+  std::cout << std::endl << std::endl << "Iterator on Simplices in the filtration, with [filtration value]:" << std::endl;
+  for (auto f_simplex : read_st.filtration_simplex_range()) {
+    std::cout << "   " << "[" << read_st.filtration(f_simplex) << "] ";
+    for (auto vertex : read_st.simplex_vertex_range(f_simplex)) {
+      std::cout << (int) vertex << " ";
+    }
+    std::cout << std::endl;
+  }
+
+  BOOST_CHECK(st == read_st);
+}
diff --git a/src/Simplex_tree/test/simplex_tree_remove_unit_test.cpp b/src/Simplex_tree/test/simplex_tree_remove_unit_test.cpp
index df89008e..1e6cea52 100644
--- a/src/Simplex_tree/test/simplex_tree_remove_unit_test.cpp
+++ b/src/Simplex_tree/test/simplex_tree_remove_unit_test.cpp
@@ -3,7 +3,6 @@
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE "simplex_tree_remove"
 #include <boost/test/unit_test.hpp>
-#include <boost/mpl/list.hpp>
 
 //  ^
 // /!\ Nothing else from Simplex_tree shall be included to test includes are well defined.
diff --git a/src/Simplex_tree/test/simplex_tree_unit_test.cpp b/src/Simplex_tree/test/simplex_tree_unit_test.cpp
index 7323aa6c..f67ff010 100644
--- a/src/Simplex_tree/test/simplex_tree_unit_test.cpp
+++ b/src/Simplex_tree/test/simplex_tree_unit_test.cpp
@@ -86,41 +86,6 @@ bool AreAlmostTheSame(float a, float b) {
   return std::fabs(a - b) < std::numeric_limits<float>::epsilon();
 }
 
-BOOST_AUTO_TEST_CASE_TEMPLATE(simplex_tree_from_file, typeST, list_of_tested_variants) {
-  // TEST OF INSERTION
-  std::cout << "********************************************************************" << std::endl;
-  std::cout << "TEST OF SIMPLEX TREE FROM A FILE" << std::endl;
-  typeST st;
-
-  std::string inputFile("simplex_tree_for_unit_test.txt");
-  std::ifstream simplex_tree_stream(inputFile.c_str());
-  simplex_tree_stream >> st;
-
-  // Display the Simplex_tree
-  std::cout << "The complex contains " << st.num_simplices() << " simplices" << std::endl;
-  std::cout << "   - dimension " << st.dimension() << "   - filtration " << st.filtration() << std::endl;
-
-  // Check
-  BOOST_CHECK(st.num_simplices() == 143353);
-  BOOST_CHECK(st.dimension() == 3);
-  BOOST_CHECK(AreAlmostTheSame(st.filtration(), 0.4));
-
-  int previous_size = 0;
-  for (auto f_simplex : st.filtration_simplex_range()) {
-    // Size of simplex
-    int size = 0;
-    for (auto vertex : st.simplex_vertex_range(f_simplex)) {
-      // Remove warning
-      (void) vertex;
-      size++;
-    }
-    BOOST_CHECK(AreAlmostTheSame(st.filtration(f_simplex), (0.1 * size))); // Specific test: filtration = 0.1 * simplex_size
-    BOOST_CHECK(previous_size <= size); // Check list is sorted (because of sorted filtrations in simplex_tree.txt)
-    previous_size = size;
-  }
-  simplex_tree_stream.close();
-}
-
 template<class typeST, class typeSimplex>
 void test_simplex_tree_contains(typeST& simplexTree, typeSimplex& simplex, int pos) {
   auto f_simplex = simplexTree.filtration_simplex_range().begin() + pos;