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/Skeleton_blocker/include | |
| parent | 910f29401e053f668e4d277af098295ab05e6022 (diff) | |
| parent | 0fb22e4c499b665ad505e5d9d2c325f7561f69c4 (diff) | |
fix conflict
Diffstat (limited to 'src/Skeleton_blocker/include')
| -rw-r--r-- | src/Skeleton_blocker/include/gudhi/Skeleton_blocker.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker.h index bcca851f..653a63fd 100644 --- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker.h +++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker.h @@ -154,8 +154,8 @@ of a simplicial complex. else euler -= 1; } - std::cout << "Saw "<<num_vertices<<" vertices, "<<num_edges<<" edges and "<<num_simplices<<" simplices"<<std::endl; - std::cout << "The Euler Characteristic is "<<euler<<std::endl; + std::clog << "Saw "<<num_vertices<<" vertices, "<<num_edges<<" edges and "<<num_simplices<<" simplices"<<std::endl; + std::clog << "The Euler Characteristic is "<<euler<<std::endl; \endcode @@ -182,13 +182,13 @@ The Euler Characteristic is 1 //get complex from top faces make_complex_from_top_faces(complex,simplices.begin(),simplices.end()); - std::cout << "Simplices:"<<std::endl; + std::clog << "Simplices:"<<std::endl; for(const Simplex & s : complex.star_simplex_range()) - std::cout << s << " "; - std::cout << std::endl; + std::clog << s << " "; + std::clog << std::endl; //One blocker as simplex 0123 is not in the complex but all its proper faces are. - std::cout << "Blockers: "<<complex.blockers_to_string()<<std::endl; + std::clog << "Blockers: "<<complex.blockers_to_string()<<std::endl; //now build a complex from its full list of simplices simplices.clear(); @@ -200,13 +200,13 @@ The Euler Characteristic is 1 simplices.push_back(Simplex(Vertex_handle(2),Vertex_handle(0))); complex = Complex(simplices.begin(),simplices.end()); - std::cout << "Simplices:"<<std::endl; + std::clog << "Simplices:"<<std::endl; for(const Simplex & s : complex.star_simplex_range()) - std::cout << s << " "; - std::cout << std::endl; + std::clog << s << " "; + std::clog << std::endl; //One blocker as simplex 012 is not in the complex but all its proper faces are. - std::cout << "Blockers: "<<complex.blockers_to_string()<<std::endl; + std::clog << "Blockers: "<<complex.blockers_to_string()<<std::endl; \endcode \verbatim ./SkeletonBlockerFromSimplices |