diff options
author | pdlotko <pdlotko@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-04-12 13:07:58 +0000 |
---|---|---|
committer | pdlotko <pdlotko@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-04-12 13:07:58 +0000 |
commit | 8f4c961a93fe928d06c7776a9e8f5ecd00fab9ca (patch) | |
tree | 0222aa7a5db950b15e7b1adf9f75cec2204c55fa /src/Gudhi_stat/utilities/persistence_vectors/create_persistence_vectors.cpp | |
parent | e729d07cc53e4b6a189ebbfbfe4eb5db5449fbe0 (diff) |
a few more correction. First of all, bottleneck distance is added (although there is something strange in the results, FG has been pinged about this). Second of all, all the programs in utylites should now read general files (and dimension of persistence to be read is one of the parameteds of files). This still need to be tested and will be tested soon.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/gudhi_stat@2339 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: e60d14f07db223646597230d7f0bd78dd090bc0b
Diffstat (limited to 'src/Gudhi_stat/utilities/persistence_vectors/create_persistence_vectors.cpp')
-rw-r--r-- | src/Gudhi_stat/utilities/persistence_vectors/create_persistence_vectors.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/Gudhi_stat/utilities/persistence_vectors/create_persistence_vectors.cpp b/src/Gudhi_stat/utilities/persistence_vectors/create_persistence_vectors.cpp index fc434ba8..40f5e81f 100644 --- a/src/Gudhi_stat/utilities/persistence_vectors/create_persistence_vectors.cpp +++ b/src/Gudhi_stat/utilities/persistence_vectors/create_persistence_vectors.cpp @@ -33,9 +33,19 @@ using namespace Gudhi::Gudhi_stat; int main( int argc , char** argv ) { - std::cout << "This program creates persistence vectors of diagrams provided as an input. Please call this program with the names of files with persistence diagrams \n"; + std::cout << "This program creates persistence vectors of diagrams provided as an input. The first parameter of this program is a dimension of persistence "; + std::cout << " that will be used in creation of the persistence vectors. If our input files contain persistence pairs of various dimension, as a second parameter of the "; + std::cout << " procedure please provide the dimension of persistence you want to use. If in your file there are only birth-death pairs of the same dimension, set the first parameter to -1." << std::endl; + std::cout << "The remaining parameters are the names of files with persistence diagrams. \n"; + int dim = atoi( argv[1] ); + unsigned dimension = std::numeric_limits<unsigned>::max(); + if ( (dim != -1) && (dim >= 0) ) + { + dimension = (unsigned)dim; + } + std::vector< const char* > filenames; - for ( int i = 1 ; i < argc ; ++i ) + for ( int i = 2 ; i < argc ; ++i ) { filenames.push_back( argv[i] ); } @@ -44,7 +54,7 @@ int main( int argc , char** argv ) { std::cerr << "Creatign persistence vectors based on a file : " << filenames[i] << std::endl; //std::vector< std::pair< double , double > > persistence_pairs = read_gudhi_persistence_file_in_one_dimension( filenames[i] , size_t dimension = 0 ) - Vector_distances_in_diagram< Euclidean_distance > l( filenames[i] , -1 ); + Vector_distances_in_diagram< Euclidean_distance > l( filenames[i] , dimension ); std::stringstream ss; ss << filenames[i] << ".vect"; l.print_to_file( ss.str().c_str() ); |