Merge tag 'tags/gudhi-release-3.2.0' into dfsg/latest

3 files changed, 33 insertions, 33 deletions

diff --git a/src/Persistent_cohomology/test/betti_numbers_unit_test.cpp b/src/Persistent_cohomology/test/betti_numbers_unit_test.cpp
index b9f11607..7a2feeff 100644
--- a/src/Persistent_cohomology/test/betti_numbers_unit_test.cpp
+++ b/src/Persistent_cohomology/test/betti_numbers_unit_test.cpp
@@ -82,7 +82,7 @@ BOOST_AUTO_TEST_CASE( plain_homology_betti_numbers )
   // 2  1 0 inf 
   // means that in Z/2Z-homology, the Betti numbers are b0=2 and b1=1.
   
-  std::cout << "BETTI NUMBERS" << std::endl;
+  std::clog << "BETTI NUMBERS" << std::endl;
 
   BOOST_CHECK(pcoh.betti_number(0) == 2);
   BOOST_CHECK(pcoh.betti_number(1) == 1);
@@ -94,7 +94,7 @@ BOOST_AUTO_TEST_CASE( plain_homology_betti_numbers )
   BOOST_CHECK(bns[1] == 1);
   BOOST_CHECK(bns[2] == 0);
 
-  std::cout << "GET PERSISTENT PAIRS" << std::endl;
+  std::clog << "GET PERSISTENT PAIRS" << std::endl;
   
   // Custom sort and output persistence
   cmp_intervals_by_dim_then_length<Mini_simplex_tree> cmp(&st);
@@ -118,12 +118,12 @@ BOOST_AUTO_TEST_CASE( plain_homology_betti_numbers )
   BOOST_CHECK(st.filtration(get<0>(persistent_pairs[2])) == 0);
   BOOST_CHECK(get<1>(persistent_pairs[2]) == st.null_simplex());
 
-  std::cout << "INTERVALS IN DIMENSION" << std::endl;
+  std::clog << "INTERVALS IN DIMENSION" << std::endl;
 
   auto intervals_in_dimension_0 = pcoh.intervals_in_dimension(0);
-  std::cout << "intervals_in_dimension_0.size() = " << intervals_in_dimension_0.size() << std::endl;
+  std::clog << "intervals_in_dimension_0.size() = " << intervals_in_dimension_0.size() << std::endl;
   for (std::size_t i = 0; i < intervals_in_dimension_0.size(); i++)
-    std::cout << "intervals_in_dimension_0[" << i << "] = [" << intervals_in_dimension_0[i].first << "," <<
+    std::clog << "intervals_in_dimension_0[" << i << "] = [" << intervals_in_dimension_0[i].first << "," <<
                  intervals_in_dimension_0[i].second << "]" << std::endl;
   BOOST_CHECK(intervals_in_dimension_0.size() == 2);
   BOOST_CHECK(intervals_in_dimension_0[0].first == 0);
@@ -133,16 +133,16 @@ BOOST_AUTO_TEST_CASE( plain_homology_betti_numbers )
 
 
   auto intervals_in_dimension_1 = pcoh.intervals_in_dimension(1);
-  std::cout << "intervals_in_dimension_1.size() = " << intervals_in_dimension_1.size() << std::endl;
+  std::clog << "intervals_in_dimension_1.size() = " << intervals_in_dimension_1.size() << std::endl;
   for (std::size_t i = 0; i < intervals_in_dimension_1.size(); i++)
-    std::cout << "intervals_in_dimension_1[" << i << "] = [" << intervals_in_dimension_1[i].first << "," <<
+    std::clog << "intervals_in_dimension_1[" << i << "] = [" << intervals_in_dimension_1[i].first << "," <<
                  intervals_in_dimension_1[i].second << "]" << std::endl;
   BOOST_CHECK(intervals_in_dimension_1.size() == 1);
   BOOST_CHECK(intervals_in_dimension_1[0].first == 0);
   BOOST_CHECK(intervals_in_dimension_1[0].second == std::numeric_limits<Mini_simplex_tree::Filtration_value>::infinity());
 
   auto intervals_in_dimension_2 = pcoh.intervals_in_dimension(2);
-  std::cout << "intervals_in_dimension_2.size() = " << intervals_in_dimension_2.size() << std::endl;
+  std::clog << "intervals_in_dimension_2.size() = " << intervals_in_dimension_2.size() << std::endl;
   BOOST_CHECK(intervals_in_dimension_2.size() == 0);
 }
 
@@ -259,12 +259,12 @@ BOOST_AUTO_TEST_CASE( betti_numbers )
   BOOST_CHECK(st.filtration(get<0>(persistent_pairs[2])) == 1);
   BOOST_CHECK(get<1>(persistent_pairs[2]) == st.null_simplex());
 
-  std::cout << "INTERVALS IN DIMENSION" << std::endl;
+  std::clog << "INTERVALS IN DIMENSION" << std::endl;
 
   auto intervals_in_dimension_0 = pcoh.intervals_in_dimension(0);
-  std::cout << "intervals_in_dimension_0.size() = " << intervals_in_dimension_0.size() << std::endl;
+  std::clog << "intervals_in_dimension_0.size() = " << intervals_in_dimension_0.size() << std::endl;
   for (std::size_t i = 0; i < intervals_in_dimension_0.size(); i++)
-    std::cout << "intervals_in_dimension_0[" << i << "] = [" << intervals_in_dimension_0[i].first << "," <<
+    std::clog << "intervals_in_dimension_0[" << i << "] = [" << intervals_in_dimension_0[i].first << "," <<
                  intervals_in_dimension_0[i].second << "]" << std::endl;
   BOOST_CHECK(intervals_in_dimension_0.size() == 2);
   BOOST_CHECK(intervals_in_dimension_0[0].first == 2);
@@ -273,19 +273,19 @@ BOOST_AUTO_TEST_CASE( betti_numbers )
   BOOST_CHECK(intervals_in_dimension_0[1].second == std::numeric_limits<Mini_simplex_tree::Filtration_value>::infinity());
 
   auto intervals_in_dimension_1 = pcoh.intervals_in_dimension(1);
-  std::cout << "intervals_in_dimension_1.size() = " << intervals_in_dimension_1.size() << std::endl;
+  std::clog << "intervals_in_dimension_1.size() = " << intervals_in_dimension_1.size() << std::endl;
   for (std::size_t i = 0; i < intervals_in_dimension_1.size(); i++)
-    std::cout << "intervals_in_dimension_1[" << i << "] = [" << intervals_in_dimension_1[i].first << "," <<
+    std::clog << "intervals_in_dimension_1[" << i << "] = [" << intervals_in_dimension_1[i].first << "," <<
                  intervals_in_dimension_1[i].second << "]" << std::endl;
   BOOST_CHECK(intervals_in_dimension_1.size() == 1);
   BOOST_CHECK(intervals_in_dimension_1[0].first == 4);
   BOOST_CHECK(intervals_in_dimension_1[0].second == std::numeric_limits<Mini_simplex_tree::Filtration_value>::infinity());
 
   auto intervals_in_dimension_2 = pcoh.intervals_in_dimension(2);
-  std::cout << "intervals_in_dimension_2.size() = " << intervals_in_dimension_2.size() << std::endl;
+  std::clog << "intervals_in_dimension_2.size() = " << intervals_in_dimension_2.size() << std::endl;
   BOOST_CHECK(intervals_in_dimension_2.size() == 0);
 
-  std::cout << "EMPTY COMPLEX" << std::endl;
+  std::clog << "EMPTY COMPLEX" << std::endl;
   Simplex_tree empty;
   empty.initialize_filtration();
   St_persistence pcoh_empty(empty, false);
diff --git a/src/Persistent_cohomology/test/persistent_cohomology_unit_test.cpp b/src/Persistent_cohomology/test/persistent_cohomology_unit_test.cpp
index a1c106d5..fe3f8517 100644
--- a/src/Persistent_cohomology/test/persistent_cohomology_unit_test.cpp
+++ b/src/Persistent_cohomology/test/persistent_cohomology_unit_test.cpp
@@ -30,7 +30,7 @@ std::string test_rips_persistence(int coefficient, int min_persistence) {
   simplex_tree_stream.close();
 
   // Display the Simplex_tree
-  std::cout << "The complex contains " << st.num_simplices() << " simplices" << " - dimension= " << st.dimension()
+  std::clog << "The complex contains " << st.num_simplices() << " simplices" << " - dimension= " << st.dimension()
       << std::endl;
 
   // Check
@@ -76,11 +76,11 @@ void test_rips_persistence_in_dimension(int dimension) {
   value8.insert(0,std::to_string(dimension));
   value9.insert(0,std::to_string(dimension));
 
-  std::cout << "********************************************************************" << std::endl;
-  std::cout << "TEST OF RIPS_PERSISTENT_COHOMOLOGY_SINGLE_FIELD DIM=" << dimension << " MIN_PERS=0" << std::endl;
+  std::clog << "********************************************************************" << std::endl;
+  std::clog << "TEST OF RIPS_PERSISTENT_COHOMOLOGY_SINGLE_FIELD DIM=" << dimension << " MIN_PERS=0" << std::endl;
 
   std::string str_rips_persistence = test_rips_persistence(dimension, 0);
-  std::cout << str_rips_persistence << std::endl;
+  std::clog << str_rips_persistence << std::endl;
   
   BOOST_CHECK(str_rips_persistence.find(value0) != std::string::npos); // Check found
   BOOST_CHECK(str_rips_persistence.find(value1) != std::string::npos); // Check found
@@ -92,10 +92,10 @@ void test_rips_persistence_in_dimension(int dimension) {
   BOOST_CHECK(str_rips_persistence.find(value7) != std::string::npos); // Check found
   BOOST_CHECK(str_rips_persistence.find(value8) != std::string::npos); // Check found
   BOOST_CHECK(str_rips_persistence.find(value9) != std::string::npos); // Check found
-  std::cout << "str_rips_persistence=" << str_rips_persistence << std::endl;
+  std::clog << "str_rips_persistence=" << str_rips_persistence << std::endl;
 
-  std::cout << "********************************************************************" << std::endl;
-  std::cout << "TEST OF RIPS_PERSISTENT_COHOMOLOGY_SINGLE_FIELD DIM=" << dimension << " MIN_PERS=1" << std::endl;
+  std::clog << "********************************************************************" << std::endl;
+  std::clog << "TEST OF RIPS_PERSISTENT_COHOMOLOGY_SINGLE_FIELD DIM=" << dimension << " MIN_PERS=1" << std::endl;
 
   str_rips_persistence = test_rips_persistence(dimension, 1);
 
@@ -109,10 +109,10 @@ void test_rips_persistence_in_dimension(int dimension) {
   BOOST_CHECK(str_rips_persistence.find(value7) != std::string::npos); // Check found
   BOOST_CHECK(str_rips_persistence.find(value8) != std::string::npos); // Check found
   BOOST_CHECK(str_rips_persistence.find(value9) != std::string::npos); // Check found
-  std::cout << "str_rips_persistence=" << str_rips_persistence << std::endl;
+  std::clog << "str_rips_persistence=" << str_rips_persistence << std::endl;
 
-  std::cout << "********************************************************************" << std::endl;
-  std::cout << "TEST OF RIPS_PERSISTENT_COHOMOLOGY_SINGLE_FIELD DIM=" << dimension << " MIN_PERS=2" << std::endl;
+  std::clog << "********************************************************************" << std::endl;
+  std::clog << "TEST OF RIPS_PERSISTENT_COHOMOLOGY_SINGLE_FIELD DIM=" << dimension << " MIN_PERS=2" << std::endl;
 
   str_rips_persistence = test_rips_persistence(dimension, 2);
 
@@ -126,10 +126,10 @@ void test_rips_persistence_in_dimension(int dimension) {
   BOOST_CHECK(str_rips_persistence.find(value7) == std::string::npos); // Check not found
   BOOST_CHECK(str_rips_persistence.find(value8) != std::string::npos); // Check found
   BOOST_CHECK(str_rips_persistence.find(value9) != std::string::npos); // Check found
-  std::cout << "str_rips_persistence=" << str_rips_persistence << std::endl;
+  std::clog << "str_rips_persistence=" << str_rips_persistence << std::endl;
 
-  std::cout << "********************************************************************" << std::endl;
-  std::cout << "TEST OF RIPS_PERSISTENT_COHOMOLOGY_SINGLE_FIELD DIM=" << dimension << " MIN_PERS=Inf" << std::endl;
+  std::clog << "********************************************************************" << std::endl;
+  std::clog << "TEST OF RIPS_PERSISTENT_COHOMOLOGY_SINGLE_FIELD DIM=" << dimension << " MIN_PERS=Inf" << std::endl;
 
   str_rips_persistence = test_rips_persistence(dimension, (std::numeric_limits<int>::max)());
 
@@ -143,7 +143,7 @@ void test_rips_persistence_in_dimension(int dimension) {
   BOOST_CHECK(str_rips_persistence.find(value7) == std::string::npos); // Check not found
   BOOST_CHECK(str_rips_persistence.find(value8) != std::string::npos); // Check found
   BOOST_CHECK(str_rips_persistence.find(value9) != std::string::npos); // Check found
-  std::cout << "str_rips_persistence=" << str_rips_persistence << std::endl;
+  std::clog << "str_rips_persistence=" << str_rips_persistence << std::endl;
 }
 
 BOOST_AUTO_TEST_CASE( rips_persistent_cohomology_single_field_dim_1 )
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 9e767943..3602aa09 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
@@ -30,7 +30,7 @@ std::string test_rips_persistence(int min_coefficient, int max_coefficient, doub
   simplex_tree_stream.close();
 
   // Display the Simplex_tree
-  std::cout << "The complex contains " << st.num_simplices() << " simplices" << " - dimension= " << st.dimension()
+  std::clog << "The complex contains " << st.num_simplices() << " simplices" << " - dimension= " << st.dimension()
       << std::endl;
 
   // Check
@@ -68,11 +68,11 @@ void test_rips_persistence_in_dimension(int min_dimension, int max_dimension) {
   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::clog << "********************************************************************" << std::endl;
+  std::clog << "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, 0.0);
-  std::cout << "str_rips_persistence=" << str_rips_persistence << std::endl;
+  std::clog << "str_rips_persistence=" << str_rips_persistence << std::endl;
 
   BOOST_CHECK(str_rips_persistence.find(value0) != std::string::npos); // Check found
   BOOST_CHECK(str_rips_persistence.find(value1) != std::string::npos); // Check found