Merge master and resolve conflicts

1 files changed, 4 insertions, 4 deletions

diff --git a/src/Witness_complex/example/example_witness_complex_off.cpp b/src/Witness_complex/example/example_witness_complex_off.cpp
index be11c955..3635da78 100644
--- a/src/Witness_complex/example/example_witness_complex_off.cpp
+++ b/src/Witness_complex/example/example_witness_complex_off.cpp
@@ -42,8 +42,8 @@ int main(int argc, char * const argv[]) {
     }
   point_vector = Point_vector(off_reader.get_point_cloud());
 
-  std::cout << "Successfully read " << point_vector.size() << " points.\n";
-  std::cout << "Ambient dimension is " << point_vector[0].dimension() << ".\n";
+  std::clog << "Successfully read " << point_vector.size() << " points.\n";
+  std::clog << "Ambient dimension is " << point_vector[0].dimension() << ".\n";
 
   // Choose landmarks (decomment one of the following two lines)
   // Gudhi::subsampling::pick_n_random_points(point_vector, nbL, std::back_inserter(landmarks));
@@ -56,7 +56,7 @@ int main(int argc, char * const argv[]) {
 
   witness_complex.create_complex(simplex_tree, alpha2, lim_dim);
   end = clock();
-  std::cout << "Witness complex took "
+  std::clog << "Witness complex took "
       << static_cast<double>(end - start) / CLOCKS_PER_SEC << " s. \n";
-  std::cout << "Number of simplices is: " << simplex_tree.num_simplices() << "\n";
+  std::clog << "Number of simplices is: " << simplex_tree.num_simplices() << "\n";
 }