Merge remote-tracking branch 'origin/master' into tomato2

6 files changed, 21 insertions, 21 deletions

diff --git a/src/Rips_complex/example/example_one_skeleton_rips_from_correlation_matrix.cpp b/src/Rips_complex/example/example_one_skeleton_rips_from_correlation_matrix.cpp
index 05bacb9f..3d2ba54f 100644
--- a/src/Rips_complex/example/example_one_skeleton_rips_from_correlation_matrix.cpp
+++ b/src/Rips_complex/example/example_one_skeleton_rips_from_correlation_matrix.cpp
@@ -63,18 +63,18 @@ int main() {
   // have a reverse filtration (i.e. filtration of boundary of each simplex S
   // is greater or equal to the filtration of S).
   // ----------------------------------------------------------------------------
-  std::cout << "Rips complex is of dimension " << stree.dimension() << " - " << stree.num_simplices() << " simplices - "
+  std::clog << "Rips complex is of dimension " << stree.dimension() << " - " << stree.num_simplices() << " simplices - "
             << stree.num_vertices() << " vertices." << std::endl;
 
-  std::cout << "Iterator on Rips complex simplices in the filtration order, with [filtration value]:" << std::endl;
+  std::clog << "Iterator on Rips complex simplices in the filtration order, with [filtration value]:" << std::endl;
   for (auto f_simplex : stree.filtration_simplex_range()) {
-    std::cout << "   ( ";
+    std::clog << "   ( ";
     for (auto vertex : stree.simplex_vertex_range(f_simplex)) {
-      std::cout << vertex << " ";
+      std::clog << vertex << " ";
     }
-    std::cout << ") -> "
+    std::clog << ") -> "
               << "[" << stree.filtration(f_simplex) << "] ";
-    std::cout << std::endl;
+    std::clog << std::endl;
   }
 
   return 0;
diff --git a/src/Rips_complex/example/example_one_skeleton_rips_from_distance_matrix.cpp b/src/Rips_complex/example/example_one_skeleton_rips_from_distance_matrix.cpp
index bbc3c755..25f93b03 100644
--- a/src/Rips_complex/example/example_one_skeleton_rips_from_distance_matrix.cpp
+++ b/src/Rips_complex/example/example_one_skeleton_rips_from_distance_matrix.cpp
@@ -39,19 +39,19 @@ int main() {
   // ----------------------------------------------------------------------------
   // Display information about the one skeleton Rips complex
   // ----------------------------------------------------------------------------
-  std::cout << "Rips complex is of dimension " << stree.dimension() <<
+  std::clog << "Rips complex is of dimension " << stree.dimension() <<
                " - " << stree.num_simplices() << " simplices - " <<
                stree.num_vertices() << " vertices." << std::endl;
 
-  std::cout << "Iterator on Rips complex simplices in the filtration order, with [filtration value]:" <<
+  std::clog << "Iterator on Rips complex simplices in the filtration order, with [filtration value]:" <<
                std::endl;
   for (auto f_simplex : stree.filtration_simplex_range()) {
-    std::cout << "   ( ";
+    std::clog << "   ( ";
     for (auto vertex : stree.simplex_vertex_range(f_simplex)) {
-      std::cout << vertex << " ";
+      std::clog << vertex << " ";
     }
-    std::cout << ") -> " << "[" << stree.filtration(f_simplex) << "] ";
-    std::cout << std::endl;
+    std::clog << ") -> " << "[" << stree.filtration(f_simplex) << "] ";
+    std::clog << std::endl;
   }
 
   return 0;
diff --git a/src/Rips_complex/example/example_one_skeleton_rips_from_points.cpp b/src/Rips_complex/example/example_one_skeleton_rips_from_points.cpp
index a1db8910..d9df245b 100644
--- a/src/Rips_complex/example/example_one_skeleton_rips_from_points.cpp
+++ b/src/Rips_complex/example/example_one_skeleton_rips_from_points.cpp
@@ -34,19 +34,19 @@ int main() {
   // ----------------------------------------------------------------------------
   // Display information about the one skeleton Rips complex
   // ----------------------------------------------------------------------------
-  std::cout << "Rips complex is of dimension " << stree.dimension() <<
+  std::clog << "Rips complex is of dimension " << stree.dimension() <<
                " - " << stree.num_simplices() << " simplices - " <<
                stree.num_vertices() << " vertices." << std::endl;
 
-  std::cout << "Iterator on Rips complex simplices in the filtration order, with [filtration value]:" <<
+  std::clog << "Iterator on Rips complex simplices in the filtration order, with [filtration value]:" <<
                std::endl;
   for (auto f_simplex : stree.filtration_simplex_range()) {
-    std::cout << "   ( ";
+    std::clog << "   ( ";
     for (auto vertex : stree.simplex_vertex_range(f_simplex)) {
-      std::cout << vertex << " ";
+      std::clog << vertex << " ";
     }
-    std::cout << ") -> " << "[" << stree.filtration(f_simplex) << "] ";
-    std::cout << std::endl;
+    std::clog << ") -> " << "[" << stree.filtration(f_simplex) << "] ";
+    std::clog << std::endl;
   }
   return 0;
 }
diff --git a/src/Rips_complex/example/example_rips_complex_from_csv_distance_matrix_file.cpp b/src/Rips_complex/example/example_rips_complex_from_csv_distance_matrix_file.cpp
index b7040453..c0c57e7b 100644
--- a/src/Rips_complex/example/example_rips_complex_from_csv_distance_matrix_file.cpp
+++ b/src/Rips_complex/example/example_rips_complex_from_csv_distance_matrix_file.cpp
@@ -42,7 +42,7 @@ int main(int argc, char **argv) {
     ouput_file_stream.open(std::string(argv[4]));
     streambuffer = ouput_file_stream.rdbuf();
   } else {
-    streambuffer = std::cout.rdbuf();
+    streambuffer = std::clog.rdbuf();
   }
 
   Simplex_tree stree;
diff --git a/src/Rips_complex/example/example_rips_complex_from_off_file.cpp b/src/Rips_complex/example/example_rips_complex_from_off_file.cpp
index 36b468a7..9aa7a657 100644
--- a/src/Rips_complex/example/example_rips_complex_from_off_file.cpp
+++ b/src/Rips_complex/example/example_rips_complex_from_off_file.cpp
@@ -41,7 +41,7 @@ int main(int argc, char **argv) {
     ouput_file_stream.open(std::string(argv[4]));
     streambuffer = ouput_file_stream.rdbuf();
   } else {
-    streambuffer = std::cout.rdbuf();
+    streambuffer = std::clog.rdbuf();
   }
 
   Simplex_tree stree;
diff --git a/src/Rips_complex/example/example_sparse_rips.cpp b/src/Rips_complex/example/example_sparse_rips.cpp
index 1c95b48c..4bd31103 100644
--- a/src/Rips_complex/example/example_sparse_rips.cpp
+++ b/src/Rips_complex/example/example_sparse_rips.cpp
@@ -25,6 +25,6 @@ int main() {
   // ----------------------------------------------------------------------------
   // Display information about the complex
   // ----------------------------------------------------------------------------
-  std::cout << "Sparse Rips complex is of dimension " << stree.dimension() << " - " << stree.num_simplices()
+  std::clog << "Sparse Rips complex is of dimension " << stree.dimension() << " - " << stree.num_simplices()
             << " simplices - " << stree.num_vertices() << " vertices." << std::endl;
 }