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_heat_maps/compute_scalar_product_of_persistence_heat_maps.cpp | |
parent | 6225d21fa6fd87edf10731df87cd3a7099049358 (diff) | |
parent | 49f9e5cc6bf933705500ad96d674df6a9df7f713 (diff) |
Merge master and resolve conflicts
Diffstat (limited to 'src/Persistence_representations/utilities/persistence_heat_maps/compute_scalar_product_of_persistence_heat_maps.cpp')
-rw-r--r-- | src/Persistence_representations/utilities/persistence_heat_maps/compute_scalar_product_of_persistence_heat_maps.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Persistence_representations/utilities/persistence_heat_maps/compute_scalar_product_of_persistence_heat_maps.cpp b/src/Persistence_representations/utilities/persistence_heat_maps/compute_scalar_product_of_persistence_heat_maps.cpp index 8a96f1b0..e7f18ce1 100644 --- a/src/Persistence_representations/utilities/persistence_heat_maps/compute_scalar_product_of_persistence_heat_maps.cpp +++ b/src/Persistence_representations/utilities/persistence_heat_maps/compute_scalar_product_of_persistence_heat_maps.cpp @@ -18,12 +18,12 @@ using constant_scaling_function = Gudhi::Persistence_representations::constant_s using Persistence_heat_maps = Gudhi::Persistence_representations::Persistence_heat_maps<constant_scaling_function>; int main(int argc, char** argv) { - std::cout << "This program computes scalar product of persistence heat maps stored in a file (the file needs to be " + std::clog << "This program computes scalar product of persistence heat maps stored in a file (the file needs to be " << "created beforehand). \n" << "The parameters of this programs are names of files with persistence heat maps.\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; } @@ -60,14 +60,14 @@ int main(int argc, char** argv) { out.open("scalar_product.mps"); for (size_t i = 0; i != scalar_product.size(); ++i) { for (size_t j = 0; j != scalar_product.size(); ++j) { - std::cout << scalar_product[i][j] << " "; + std::clog << scalar_product[i][j] << " "; out << scalar_product[i][j] << " "; } - std::cout << std::endl; + std::clog << std::endl; out << std::endl; } out.close(); - std::cout << "Distance can be found in 'scalar_product.mps' file\n"; + std::clog << "Distance can be found in 'scalar_product.mps' file\n"; return 0; } |