diff options
author | MathieuCarriere <mathieu.carriere3@gmail.com> | 2020-04-28 10:31:12 -0400 |
---|---|---|
committer | MathieuCarriere <mathieu.carriere3@gmail.com> | 2020-04-28 10:31:12 -0400 |
commit | 51ca2370ae27bec052bb4fffafc8a718ac306264 (patch) | |
tree | 67e1ea14d4c290295b0298dba0d701303a53f3b6 /src/Contraction | |
parent | 910f29401e053f668e4d277af098295ab05e6022 (diff) | |
parent | 0fb22e4c499b665ad505e5d9d2c325f7561f69c4 (diff) |
fix conflict
Diffstat (limited to 'src/Contraction')
-rw-r--r-- | src/Contraction/example/Garland_heckbert.cpp | 6 | ||||
-rw-r--r-- | src/Contraction/example/Rips_contraction.cpp | 10 | ||||
-rw-r--r-- | src/Contraction/include/gudhi/Edge_contraction.h | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/Contraction/example/Garland_heckbert.cpp b/src/Contraction/example/Garland_heckbert.cpp index 9c0b5205..489ef5d0 100644 --- a/src/Contraction/example/Garland_heckbert.cpp +++ b/src/Contraction/example/Garland_heckbert.cpp @@ -147,7 +147,7 @@ int main(int argc, char *argv[]) { return EXIT_FAILURE; } - std::cout << "Load complex with " << complex.num_vertices() << " vertices" << std::endl; + std::clog << "Load complex with " << complex.num_vertices() << " vertices" << std::endl; int num_contractions = atoi(argv[3]); @@ -158,10 +158,10 @@ int main(int argc, char *argv[]) { Gudhi::contraction::make_link_valid_contraction<EdgeProfile>(), new GH_visitor(complex)); - std::cout << "Contract " << num_contractions << " edges" << std::endl; + std::clog << "Contract " << num_contractions << " edges" << std::endl; contractor.contract_edges(num_contractions); - std::cout << "Final complex has " << + std::clog << "Final complex has " << complex.num_vertices() << " vertices, " << complex.num_edges() << " edges and " << complex.num_triangles() << " triangles." << std::endl; diff --git a/src/Contraction/example/Rips_contraction.cpp b/src/Contraction/example/Rips_contraction.cpp index b5ce06c1..42dd0910 100644 --- a/src/Contraction/example/Rips_contraction.cpp +++ b/src/Contraction/example/Rips_contraction.cpp @@ -52,13 +52,13 @@ int main(int argc, char *argv[]) { return EXIT_FAILURE; } - std::cout << "Build the Rips complex with " << complex.num_vertices() << " vertices" << std::endl; + std::clog << "Build the Rips complex with " << complex.num_vertices() << " vertices" << std::endl; build_rips(complex, atof(argv[2])); Gudhi::Clock contraction_chrono("Time to simplify and enumerate simplices"); - std::cout << "Initial complex has " << + std::clog << "Initial complex has " << complex.num_vertices() << " vertices and " << complex.num_edges() << " edges" << std::endl; @@ -69,16 +69,16 @@ int main(int argc, char *argv[]) { Gudhi::contraction::make_remove_popable_blockers_visitor<Profile>()); contractor.contract_edges(); - std::cout << "Counting final number of simplices \n"; + std::clog << "Counting final number of simplices \n"; unsigned num_simplices = std::distance(complex.complex_simplex_range().begin(), complex.complex_simplex_range().end()); - std::cout << "Final complex has " << + std::clog << "Final complex has " << complex.num_vertices() << " vertices, " << complex.num_edges() << " edges, " << complex.num_blockers() << " blockers and " << num_simplices << " simplices" << std::endl; - std::cout << contraction_chrono; + std::clog << contraction_chrono; return EXIT_SUCCESS; } diff --git a/src/Contraction/include/gudhi/Edge_contraction.h b/src/Contraction/include/gudhi/Edge_contraction.h index 6058d64b..6c0f4c78 100644 --- a/src/Contraction/include/gudhi/Edge_contraction.h +++ b/src/Contraction/include/gudhi/Edge_contraction.h @@ -164,13 +164,13 @@ int main (int argc, char *argv[]) std::cerr << "Unable to read file:"<<argv[1]<<std::endl; return EXIT_FAILURE; } - std::cout << "Build the Rips complex"<<std::endl; + std::clog << "Build the Rips complex"<<std::endl; build_rips(complex,atof(argv[2])); boost::timer::auto_cpu_timer t; - std::cout << "Initial complex has "<< + std::clog << "Initial complex has "<< complex.num_vertices()<<" vertices and "<< complex.num_edges()<<" edges"<<std::endl; @@ -181,17 +181,17 @@ int main (int argc, char *argv[]) contraction::make_remove_popable_blockers_visitor<Profile>()); contractor.contract_edges(); - std::cout << "Counting final number of simplices \n"; + std::clog << "Counting final number of simplices \n"; unsigned num_simplices = std::distance(complex.star_simplex_range().begin(),complex.star_simplex_range().end()); - std::cout << "Final complex has "<< + std::clog << "Final complex has "<< complex.num_vertices()<<" vertices, "<< complex.num_edges()<<" edges, "<< complex.num_blockers()<<" blockers and "<< num_simplices<<" simplices"<<std::endl; - std::cout << "Time to simplify and enumerate simplices:\n"; + std::clog << "Time to simplify and enumerate simplices:\n"; return EXIT_SUCCESS; } |