Optimization of UT (needs to be short time)

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

Former-commit-id: 3e1561da87b9a46f8628a59c3862c0235eee01c5

3 files changed, 93 insertions, 50 deletions

diff --git a/src/Persistent_cohomology/test/persistent_cohomology_unit_test_multi_field.cpp b/src/Persistent_cohomology/test/persistent_cohomology_unit_test_multi_field.cpp
index 8802005c..18a4725e 100644
--- a/src/Persistent_cohomology/test/persistent_cohomology_unit_test_multi_field.cpp
+++ b/src/Persistent_cohomology/test/persistent_cohomology_unit_test_multi_field.cpp
@@ -37,9 +37,9 @@ std::string test_rips_persistence(int min_coefficient, int max_coefficient, int
       << " - filtration= " << st.filtration() << std::endl;
 
   // Check
-  BOOST_CHECK(st.num_simplices() == 6142604);
+  BOOST_CHECK(st.num_simplices() == 58);
   BOOST_CHECK(st.dimension() == 3);
-  BOOST_CHECK(st.filtration() == 0.249999);
+  BOOST_CHECK(st.filtration() == 0.4);
 
   // Sort the simplices in the order of the filtration
   st.initialize_filtration();
@@ -47,9 +47,9 @@ std::string test_rips_persistence(int min_coefficient, int max_coefficient, int
   // Compute the persistence diagram of the complex
   Persistent_cohomology<Simplex_tree<>, Multi_field> pcoh(st);
 
-  pcoh.init_coefficients(min_coefficient, max_coefficient);  // initializes the coefficient field for homology
+  pcoh.init_coefficients(min_coefficient, max_coefficient); // initializes the coefficient field for homology
   // Check infinite rips
-  pcoh.compute_persistent_cohomology(min_persistence);  // Minimal lifetime of homology feature to be recorded.
+  pcoh.compute_persistent_cohomology(min_persistence); // Minimal lifetime of homology feature to be recorded.
 
   std::ostringstream ossRips;
   pcoh.output_diagram(ossRips);
@@ -59,68 +59,54 @@ std::string test_rips_persistence(int min_coefficient, int max_coefficient, int
 }
 
 void test_rips_persistence_in_dimension(int min_dimension, int max_dimension) {
-  std::string value0("  0 0 inf");
-  std::string value1("  1 0.0702103 inf");
-  std::string value2("2  1 0.0702103 inf");
-  std::string value3("2  2 0.159992 inf");
+  // there are 2 discontinued ensembles 
+  std::string value0("  0 0.25 inf");
+  std::string value1("  1 0.4 inf");
+  // And a big hole - cut in 2 pieces after 0.3
+  std::string value2("  0 0.2 0.3");
+
+  // For dim <= 1 =>
+  std::string value3("  1 0.25 inf");
+  std::string value4("  2 0.25 inf");
+  std::string value5("  1 0.3 inf");
+  std::string value6("  2 0.3 inf");
+  std::string value7("  2 0.4 inf");
 
   std::cout << "********************************************************************" << std::endl;
   std::cout << "TEST OF RIPS_PERSISTENT_COHOMOLOGY_MULTI_FIELD MIN_DIM=" << min_dimension << " MAX_DIM=" << max_dimension << " MIN_PERS=0" << std::endl;
 
-  std::string str_rips_persistence = test_rips_persistence(min_dimension, max_dimension, 1);
-
-  BOOST_CHECK(str_rips_persistence.find(value0) != std::string::npos); // Check found
-  BOOST_CHECK(str_rips_persistence.find(value1) != std::string::npos); // Check found
-  BOOST_CHECK(str_rips_persistence.find(value2) != std::string::npos); // Check found
-  BOOST_CHECK(str_rips_persistence.find(value3) != std::string::npos); // Check found
-  std::cout << "str_rips_persistence=" << str_rips_persistence << std::endl;
-
-  std::cout << "********************************************************************" << std::endl;
-  std::cout << "TEST OF RIPS_PERSISTENT_COHOMOLOGY_MULTI_FIELD DIM=" << min_dimension << " MAX_DIM=" << max_dimension << " MIN_PERS=2" << std::endl;
-
-  str_rips_persistence = test_rips_persistence(min_dimension, max_dimension, 2);
-
-  BOOST_CHECK(str_rips_persistence.find(value0) != std::string::npos); // Check found
-  BOOST_CHECK(str_rips_persistence.find(value1) != std::string::npos); // Check found
-  BOOST_CHECK(str_rips_persistence.find(value2) != std::string::npos); // Check found
-  BOOST_CHECK(str_rips_persistence.find(value3) != std::string::npos); // Check found
+  std::string str_rips_persistence = test_rips_persistence(min_dimension, max_dimension, static_cast<Filtration_value> (0.0));
   std::cout << "str_rips_persistence=" << str_rips_persistence << std::endl;
 
-  std::cout << "********************************************************************" << std::endl;
-  std::cout << "TEST OF RIPS_PERSISTENT_COHOMOLOGY_MULTI_FIELD DIM=" << min_dimension << " MAX_DIM=" << max_dimension << " MIN_PERS=3" << std::endl;
-
-  str_rips_persistence = test_rips_persistence(min_dimension, max_dimension, 3);
-
   BOOST_CHECK(str_rips_persistence.find(value0) != std::string::npos); // Check found
   BOOST_CHECK(str_rips_persistence.find(value1) != std::string::npos); // Check found
   BOOST_CHECK(str_rips_persistence.find(value2) != std::string::npos); // Check found
-  BOOST_CHECK(str_rips_persistence.find(value3) != std::string::npos); // Check found
-  std::cout << "str_rips_persistence=" << str_rips_persistence << std::endl;
 
-  std::cout << "********************************************************************" << std::endl;
-  std::cout << "TEST OF RIPS_PERSISTENT_COHOMOLOGY_MULTI_FIELD DIM=" << min_dimension << " MAX_DIM=" << max_dimension << " MIN_PERS=Inf" << std::endl;
+  if ((min_dimension < 2) && (max_dimension < 2)) {
+    BOOST_CHECK(str_rips_persistence.find(value3) != std::string::npos); // Check found
+    BOOST_CHECK(str_rips_persistence.find(value4) != std::string::npos); // Check found
+    BOOST_CHECK(str_rips_persistence.find(value5) != std::string::npos); // Check found
+    BOOST_CHECK(str_rips_persistence.find(value6) != std::string::npos); // Check found
+    BOOST_CHECK(str_rips_persistence.find(value7) != std::string::npos); // Check found
+  } else {
+    BOOST_CHECK(str_rips_persistence.find(value3) == std::string::npos); // Check not found
+    BOOST_CHECK(str_rips_persistence.find(value4) == std::string::npos); // Check not found
+    BOOST_CHECK(str_rips_persistence.find(value5) == std::string::npos); // Check not found
+    BOOST_CHECK(str_rips_persistence.find(value6) == std::string::npos); // Check not found
+    BOOST_CHECK(str_rips_persistence.find(value7) == std::string::npos); // Check not found
+  }
 
-  str_rips_persistence = test_rips_persistence(min_dimension, max_dimension, std::numeric_limits<int>::max());
-
-  BOOST_CHECK(str_rips_persistence.find(value0) != std::string::npos); // Check found
-  BOOST_CHECK(str_rips_persistence.find(value1) != std::string::npos); // Check found
-  BOOST_CHECK(str_rips_persistence.find(value2) != std::string::npos); // Check found
-  BOOST_CHECK(str_rips_persistence.find(value3) != std::string::npos); // Check found
-  std::cout << "str_rips_persistence=" << str_rips_persistence << std::endl;
 }
 
-BOOST_AUTO_TEST_CASE( rips_persistent_cohomology_multi_field_dim_1_2 )
-{
-  test_rips_persistence_in_dimension(1, 2);
+BOOST_AUTO_TEST_CASE(rips_persistent_cohomology_multi_field_dim_1_2) {
+  test_rips_persistence_in_dimension(0, 1);
 }
 
-BOOST_AUTO_TEST_CASE( rips_persistent_cohomology_multi_field_dim_2_3 )
-{
-  test_rips_persistence_in_dimension(2, 3);
+BOOST_AUTO_TEST_CASE(rips_persistent_cohomology_multi_field_dim_2_3) {
+  test_rips_persistence_in_dimension(1, 3);
 }
 
-BOOST_AUTO_TEST_CASE( rips_persistent_cohomology_multi_field_dim_1_5 )
-{
+BOOST_AUTO_TEST_CASE(rips_persistent_cohomology_multi_field_dim_1_5) {
   test_rips_persistence_in_dimension(1, 5);
 }
 
diff --git a/src/Persistent_cohomology/test/simplex_tree_file_for_multi_field_unit_test.txt b/src/Persistent_cohomology/test/simplex_tree_file_for_multi_field_unit_test.txt
new file mode 100644
index 00000000..ed2c0c3d
--- /dev/null
+++ b/src/Persistent_cohomology/test/simplex_tree_file_for_multi_field_unit_test.txt
@@ -0,0 +1,58 @@
+0 0 0.2
+0 3 0.2
+1 3 0 0.2
+0 6 0.2
+0 11 0.2
+1 11 6 0.2
+0 13 0.25
+0 14 0.25
+1 14 13 0.25
+0 15 0.25
+1 15 13 0.25
+1 15 14 0.25
+2 15 14 13 0.25
+0 1 0.3
+1 1 0 0.3
+0 2 0.3
+1 2 0 0.3
+1 2 1 0.3
+2 2 1 0 0.3
+0 4 0.3
+1 4 3 0.3
+0 5 0.3
+1 5 3 0.3
+1 5 4 0.3
+2 5 4 3 0.3
+0 9 0.3
+0 10 0.3
+1 10 2 0.3
+1 10 9 0.3
+1 11 9 0.3
+1 11 10 0.3
+2 11 10 9 0.3
+0 12 0.3
+1 12 2 0.3
+1 12 10 0.3
+2 12 10 2 0.3
+1 6 0 0.4
+1 6 1 0.4
+2 6 1 0 0.4
+0 7 0.4
+1 7 0 0.4
+1 7 1 0.4
+2 7 1 0 0.4
+1 7 6 0.4
+2 7 6 0 0.4
+2 7 6 1 0.4
+3 7 6 1 0 0.4
+0 8 0.4
+1 8 4 0.4
+1 8 5 0.4
+2 8 5 4 0.4
+1 9 4 0.4
+1 9 5 0.4
+2 9 5 4 0.4
+1 9 8 0.4
+2 9 8 4 0.4
+2 9 8 5 0.4
+3 9 8 5 4 0.4
diff --git a/src/Persistent_cohomology/test/simplex_tree_file_for_multi_field_unit_test.txt.REMOVED.git-id b/src/Persistent_cohomology/test/simplex_tree_file_for_multi_field_unit_test.txt.REMOVED.git-id
deleted file mode 100644
index 2dd38515..00000000
--- a/src/Persistent_cohomology/test/simplex_tree_file_for_multi_field_unit_test.txt.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-ce87199d425b05f51c74cbf635870bfa5abbc7a1
\ No newline at end of file