diff options
author | pdlotko <pdlotko@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-09-24 19:44:54 +0000 |
---|---|---|
committer | pdlotko <pdlotko@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-09-24 19:44:54 +0000 |
commit | 0b325e9a9cfdfd543b9c5c823116d7b58ca5d8b7 (patch) | |
tree | a1c2c185f8d418a35fcf226d367683a3abbcc54a /src | |
parent | 48a10aa15e5ccde24f39837b2a0f0776b6ac21b7 (diff) |
the same check done for diagrams...
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/gudhi_stat@1557 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 9ea9034edfd88bc1ca910963f321ad943e196464
Diffstat (limited to 'src')
6 files changed, 35 insertions, 14 deletions
diff --git a/src/Gudhi_stat/example/utilities/persistence_intervals/compute_birth_death_range_in_persistence_diagram b/src/Gudhi_stat/example/utilities/persistence_intervals/compute_birth_death_range_in_persistence_diagram Binary files differindex 8c0ac6f0..c4955d0e 100755 --- a/src/Gudhi_stat/example/utilities/persistence_intervals/compute_birth_death_range_in_persistence_diagram +++ b/src/Gudhi_stat/example/utilities/persistence_intervals/compute_birth_death_range_in_persistence_diagram diff --git a/src/Gudhi_stat/example/utilities/persistence_intervals/compute_birth_death_range_in_persistence_diagram.cpp b/src/Gudhi_stat/example/utilities/persistence_intervals/compute_birth_death_range_in_persistence_diagram.cpp index 6ae605d2..dba0984a 100644 --- a/src/Gudhi_stat/example/utilities/persistence_intervals/compute_birth_death_range_in_persistence_diagram.cpp +++ b/src/Gudhi_stat/example/utilities/persistence_intervals/compute_birth_death_range_in_persistence_diagram.cpp @@ -27,6 +27,8 @@ #include <gudhi/concretizations/Persistence_intervals.h> #include <iostream> +#include <vector> +#include <limits> @@ -38,14 +40,33 @@ using namespace std; int main( int argc , char** argv ) { - std::cout << "This program compute minimum birth and the maximum death time for a collection of persistence intervals \n"; - if ( argc != 2 ) + //std::cout << "This program compute minimum birth and the maximum death time for a collection of persistence intervals \n"; + //if ( argc != 2 ) + //{ + // cout << "To run this program, please provide the name of a file with persistence diagram \n"; + // return 1; + //} + //Persistence_intervals p( argv[1] ); + //std::pair<double,double> min_max_ = p.min_max(); + //cout << "Birth-death range : min: " << min_max_.first << ", max: " << min_max_.second << endl; + + std::vector< const char* > filenames; + for ( int i = 1 ; i < argc ; ++i ) { - cout << "To run this program, please provide the name of a file with persistence diagram \n"; - return 1; + filenames.push_back( argv[i] ); } - - Persistence_intervals p( argv[1] ); - std::pair<double,double> min_max_ = p.min_max(); - cout << "Birth-death range : min: " << min_max_.first << ", max: " << min_max_.second << endl; + + double min_ = std::numeric_limits<double>::max(); + double max_ = -std::numeric_limits<double>::max(); + + for ( size_t file_no = 0 ; file_no != filenames.size() ; ++file_no ) + { + std::cout << "Creating diagram based on a file : " << filenames[file_no] << std::endl; + Persistence_intervals p( filenames[file_no] ); + std::pair<double,double> min_max_ = p.min_max(); + if ( min_max_.first < min_ )min_ = min_max_.first; + if ( min_max_.second > max_ )max_ = min_max_.second; + } + cout << "Birth-death range : min: " << min_ << ", max: " << max_ << endl; + return 0; } diff --git a/src/Gudhi_stat/example/utilities/persistence_intervals/plot_histogram_of_intervals_lengths b/src/Gudhi_stat/example/utilities/persistence_intervals/plot_histogram_of_intervals_lengths Binary files differindex d1e6d1a4..5d063bc1 100755 --- a/src/Gudhi_stat/example/utilities/persistence_intervals/plot_histogram_of_intervals_lengths +++ b/src/Gudhi_stat/example/utilities/persistence_intervals/plot_histogram_of_intervals_lengths diff --git a/src/Gudhi_stat/example/utilities/persistence_intervals/plot_histogram_of_intervals_lengths.cpp b/src/Gudhi_stat/example/utilities/persistence_intervals/plot_histogram_of_intervals_lengths.cpp index 88c916d8..dd2f3f99 100644 --- a/src/Gudhi_stat/example/utilities/persistence_intervals/plot_histogram_of_intervals_lengths.cpp +++ b/src/Gudhi_stat/example/utilities/persistence_intervals/plot_histogram_of_intervals_lengths.cpp @@ -63,7 +63,7 @@ int main( int argc , char** argv ) out << histogram[i] << std::endl; } out << endl; - std::cout << "To vizualize, open gnuplot and type: \'load " << gnuplot_script.str().c_str() << "\'" << std::endl; + std::cout << "To vizualize, open gnuplot and type: load \'" << gnuplot_script.str().c_str() << "\'" << std::endl; out.close(); return 0; } diff --git a/src/Gudhi_stat/example/utilities/persistence_intervals/plot_persistence_Betti_numebrs b/src/Gudhi_stat/example/utilities/persistence_intervals/plot_persistence_Betti_numebrs Binary files differindex 1cf0465f..664ac49f 100755 --- a/src/Gudhi_stat/example/utilities/persistence_intervals/plot_persistence_Betti_numebrs +++ b/src/Gudhi_stat/example/utilities/persistence_intervals/plot_persistence_Betti_numebrs diff --git a/src/Gudhi_stat/example/utilities/persistence_intervals/plot_persistence_Betti_numebrs.cpp b/src/Gudhi_stat/example/utilities/persistence_intervals/plot_persistence_Betti_numebrs.cpp index 49c0f601..33ff7bce 100644 --- a/src/Gudhi_stat/example/utilities/persistence_intervals/plot_persistence_Betti_numebrs.cpp +++ b/src/Gudhi_stat/example/utilities/persistence_intervals/plot_persistence_Betti_numebrs.cpp @@ -82,12 +82,12 @@ int main( int argc , char** argv ) out << endl; out.close(); - for ( size_t i = 0 ; i != pbns.size() ; ++i ) - { - cout << pbns[i].first << " " << pbns[i].second << std::endl; - } + //for ( size_t i = 0 ; i != pbns.size() ; ++i ) + //{ + // cout << pbns[i].first << " " << pbns[i].second << std::endl; + //} - std::cout << "To vizualize, open gnuplot and type: \'load " << gnuplot_script.str().c_str() << "\'" << std::endl; + std::cout << "To vizualize, open gnuplot and type: load \'" << gnuplot_script.str().c_str() << "\'" << std::endl; return 0; } |