diff options
author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-03-22 11:06:52 +0100 |
---|---|---|
committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-03-22 11:06:52 +0100 |
commit | cd47fa8e718f6ede07aead032d524022bd68b608 (patch) | |
tree | 5c451ce83cff35c8962f2a06da5f950eb91ce1dc /src/Persistence_representations/utilities/persistence_landscapes/compute_distance_of_landscapes.cpp | |
parent | 6225d21fa6fd87edf10731df87cd3a7099049358 (diff) | |
parent | 49f9e5cc6bf933705500ad96d674df6a9df7f713 (diff) |
Merge master and resolve conflicts
Diffstat (limited to 'src/Persistence_representations/utilities/persistence_landscapes/compute_distance_of_landscapes.cpp')
-rw-r--r-- | src/Persistence_representations/utilities/persistence_landscapes/compute_distance_of_landscapes.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Persistence_representations/utilities/persistence_landscapes/compute_distance_of_landscapes.cpp b/src/Persistence_representations/utilities/persistence_landscapes/compute_distance_of_landscapes.cpp index 1093c1aa..2246a37d 100644 --- a/src/Persistence_representations/utilities/persistence_landscapes/compute_distance_of_landscapes.cpp +++ b/src/Persistence_representations/utilities/persistence_landscapes/compute_distance_of_landscapes.cpp @@ -18,14 +18,14 @@ using Persistence_landscape = Gudhi::Persistence_representations::Persistence_landscape; int main(int argc, char** argv) { - std::cout << "This program computes distance of persistence landscapes stored in files (the files needs to be " + std::clog << "This program computes distance of persistence landscapes stored in files (the files needs to be " << "created beforehand).\n" << "The first parameter of a program is an integer p. The program compute L^p distance of the two heat " << "maps. For L^infty distance choose p = -1. \n" << "The remaining parameters of this program are names of files with persistence landscapes.\n"; if (argc < 3) { - std::cout << "Wrong number of parameters, the program will now terminate \n"; + std::clog << "Wrong number of parameters, the program will now terminate \n"; return 1; } @@ -68,14 +68,14 @@ int main(int argc, char** argv) { out.open("distance.land"); for (size_t i = 0; i != distance.size(); ++i) { for (size_t j = 0; j != distance.size(); ++j) { - std::cout << distance[i][j] << " "; + std::clog << distance[i][j] << " "; out << distance[i][j] << " "; } - std::cout << std::endl; + std::clog << std::endl; out << std::endl; } out.close(); - std::cout << "Distance can be found in 'distance.land' file\n"; + std::clog << "Distance can be found in 'distance.land' file\n"; return 0; } |