diff options
Diffstat (limited to 'src/Gudhi_stat/utilities')
9 files changed, 41 insertions, 16 deletions
diff --git a/src/Gudhi_stat/utilities/Hausdorff_subsampling.cpp b/src/Gudhi_stat/utilities/Hausdorff_subsampling.cpp index 5c3be0cc..b05a7adb 100644 --- a/src/Gudhi_stat/utilities/Hausdorff_subsampling.cpp +++ b/src/Gudhi_stat/utilities/Hausdorff_subsampling.cpp @@ -73,17 +73,42 @@ int main( int argc , char** argv ) points.push_back( point4 ); size_of_subsample = 2; */ -// std::vector< std::vector<double> > all_to_all_distance_matrix_between_points = compute_all_to_all_distance_matrix_between_points< std::vector<double> , Euclidean_distance<double> >( points ); +// std::vector< std::vector<double> > all_to_all_distance_matrix_between_points = compute_all_to_all_distance_matrix_between_points< std::vector<double> , Euclidean_distance >( points ); // Hausdorff_distance_between_subspace_and_the_whole_metric_space distance( all_to_all_distance_matrix_between_points ); std::cout << "Read : " << points.size() << " points.\n"; //comute all-to-all distance matrix: - std::vector< std::vector<double> > all_to_all_distance_matrix_between_points = compute_all_to_all_distance_matrix_between_points< std::vector<double> , Euclidean_distance<double> >( points ); + std::vector< std::vector<double> > all_to_all_distance_matrix_between_points = compute_all_to_all_distance_matrix_between_points< std::vector<double> , Euclidean_distance >( points ); Hausdorff_distance_between_subspace_and_the_whole_metric_space distance( all_to_all_distance_matrix_between_points ); identity< std::vector<size_t> > identity_char; + + double max = -1; + for ( size_t i = 0 ; i != all_to_all_distance_matrix_between_points.size() ; ++i ) + { + double min = 10000000; + for ( size_t j = 0 ; j != all_to_all_distance_matrix_between_points.size() ; ++j ) + { + double distance = 0; + if ( i > j ) + { + distance = all_to_all_distance_matrix_between_points[i][j]; + } + else + { + if ( i < j )distance = all_to_all_distance_matrix_between_points[j][i]; + } + if ( (distance < min)&&(distance != 0) )min = distance; + } + std::cerr << "min : " << min << std::endl; + //getchar(); + if ( min > max )max = min; + } + std::cerr << "Max element in distance matrix : " << max << std::endl; + getchar(); + // std::vector<size_t> characteristic_of_all_points = {0,1,2,3}; // std::vector<size_t> characteristic_of_subsampled_points = {2,3}; // std::cerr << "DISTANCE BETWEEN SAMPLE AND SUBSAMPLE: " << distance( characteristic_of_subsampled_points , characteristic_of_all_points ) << std::endl; diff --git a/src/Gudhi_stat/utilities/Multiplicative_bootstrap.cpp b/src/Gudhi_stat/utilities/Multiplicative_bootstrap.cpp index 9a607251..33b6c9dc 100644 --- a/src/Gudhi_stat/utilities/Multiplicative_bootstrap.cpp +++ b/src/Gudhi_stat/utilities/Multiplicative_bootstrap.cpp @@ -51,7 +51,7 @@ int main( int argc , char** argv ) std::vector< Persistence_landscape* > collection_of_landscapes( filenames.size() ); for ( size_t i = 0 ; i != filenames.size() ; ++i ) { - std::vector< std::pair< double , double > > diag = read_gudhi_file( filenames[i].c_str() , 1 );//read_standard_file( filenames[i].c_str() ); + std::vector< std::pair< double , double > > diag = read_gudhi_persistence_file_in_one_dimension( filenames[i].c_str() , 1 );//read_standard_persistence_file( filenames[i].c_str() ); collection_of_landscapes[i] = new Persistence_landscape( diag ); } diff --git a/src/Gudhi_stat/utilities/permutation_test.cpp b/src/Gudhi_stat/utilities/permutation_test.cpp index 94f92d29..e431026f 100644 --- a/src/Gudhi_stat/utilities/permutation_test.cpp +++ b/src/Gudhi_stat/utilities/permutation_test.cpp @@ -62,7 +62,7 @@ int main( int argc , char** argv ) std::vector< Persistence_landscape* > first_collection( first_group.size() ); for ( size_t i = 0 ; i != first_group.size() ; ++i ) { - std::vector< std::pair< double , double > > diag = read_standard_file( first_group[i].c_str() ); + std::vector< std::pair< double , double > > diag = read_standard_persistence_file( first_group[i].c_str() ); Persistence_landscape* l = new Persistence_landscape( diag ); first_collection[i] = l; } @@ -70,7 +70,7 @@ int main( int argc , char** argv ) std::vector< Persistence_landscape* > second_collection( second_group.size() ); for ( size_t i = 0 ; i != second_group.size() ; ++i ) { - std::vector< std::pair< double , double > > diag = read_standard_file( second_group[i].c_str() ); + std::vector< std::pair< double , double > > diag = read_standard_persistence_file( second_group[i].c_str() ); Persistence_landscape* l = new Persistence_landscape( diag ); second_collection[i] = l; } diff --git a/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_intervals.cpp b/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_intervals.cpp index 04a05caa..6df31a6f 100644 --- a/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_intervals.cpp +++ b/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_intervals.cpp @@ -44,7 +44,7 @@ int main( int argc , char** argv ) std::cout << "To run this program, please provide the name of a file with persistence diagram \n"; return 1; } - std::vector< std::pair< double , double > > intervals = read_gudhi_file( argv[1] , 2 ); + std::vector< std::pair< double , double > > intervals = read_gudhi_persistence_file_in_one_dimension( argv[1] , 2 ); Persistence_intervals b( intervals ); b.plot( argv[1] ); return 0; diff --git a/src/Gudhi_stat/utilities/persistence_vectors/average_persistence_vectors.cpp b/src/Gudhi_stat/utilities/persistence_vectors/average_persistence_vectors.cpp index 822d0e2a..b6b11211 100644 --- a/src/Gudhi_stat/utilities/persistence_vectors/average_persistence_vectors.cpp +++ b/src/Gudhi_stat/utilities/persistence_vectors/average_persistence_vectors.cpp @@ -49,15 +49,15 @@ int main( int argc , char** argv ) } std::cout << "Reading persistence vectors...\n"; - std::vector< Vector_distances_in_diagram< Euclidean_distance<double> >* > lands; + std::vector< Vector_distances_in_diagram< Euclidean_distance >* > lands; for ( size_t i = 0 ; i != filenames.size() ; ++i ) { - Vector_distances_in_diagram< Euclidean_distance<double> >* l = new Vector_distances_in_diagram< Euclidean_distance<double> >; + Vector_distances_in_diagram< Euclidean_distance >* l = new Vector_distances_in_diagram< Euclidean_distance >; l->load_from_file( filenames[i] ); lands.push_back(l ); } - Vector_distances_in_diagram< Euclidean_distance<double> > av; + Vector_distances_in_diagram< Euclidean_distance > av; av.compute_average( lands ); av.print_to_file( "average.vect" ); diff --git a/src/Gudhi_stat/utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp b/src/Gudhi_stat/utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp index 6d242cd1..d61c6753 100644 --- a/src/Gudhi_stat/utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp +++ b/src/Gudhi_stat/utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp @@ -56,12 +56,12 @@ int main( int argc , char** argv ) { filenames.push_back( argv[i] ); } - std::vector< Vector_distances_in_diagram< Euclidean_distance<double> > > vectors; + std::vector< Vector_distances_in_diagram< Euclidean_distance > > vectors; vectors.reserve( filenames.size() ); for ( size_t file_no = 0 ; file_no != filenames.size() ; ++file_no ) { //cerr << filenames[file_no] << endl; - Vector_distances_in_diagram< Euclidean_distance<double> > l; + Vector_distances_in_diagram< Euclidean_distance > l; l.load_from_file( filenames[file_no] ); vectors.push_back( l ); } diff --git a/src/Gudhi_stat/utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp b/src/Gudhi_stat/utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp index e4c62194..7607c518 100644 --- a/src/Gudhi_stat/utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp +++ b/src/Gudhi_stat/utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp @@ -41,11 +41,11 @@ int main( int argc , char** argv ) { filenames.push_back( argv[i] ); } - std::vector< Vector_distances_in_diagram< Euclidean_distance<double> > > vectors; + std::vector< Vector_distances_in_diagram< Euclidean_distance > > vectors; vectors.reserve( filenames.size() ); for ( size_t file_no = 0 ; file_no != filenames.size() ; ++file_no ) { - Vector_distances_in_diagram< Euclidean_distance<double> > l; + Vector_distances_in_diagram< Euclidean_distance > l; l.load_from_file( filenames[file_no] ); vectors.push_back( l ); } 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 926e46fd..b016f2e2 100644 --- a/src/Gudhi_stat/utilities/persistence_vectors/create_persistence_vectors.cpp +++ b/src/Gudhi_stat/utilities/persistence_vectors/create_persistence_vectors.cpp @@ -43,8 +43,8 @@ int main( int argc , char** argv ) for ( size_t i = 0 ; i != filenames.size() ; ++i ) { std::cerr << "Creatign persistence vectors based on a file : " << filenames[i] << std::endl; - //std::vector< std::pair< double , double > > persistence_pairs = read_gudhi_file( filenames[i] , size_t dimension = 0 ) - Vector_distances_in_diagram< Euclidean_distance<double> > l( filenames[i] , -1 ); + //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 ); std::stringstream ss; ss << filenames[i] << ".vect"; l.print_to_file( ss.str().c_str() ); diff --git a/src/Gudhi_stat/utilities/persistence_vectors/plot_persistence_vectors.cpp b/src/Gudhi_stat/utilities/persistence_vectors/plot_persistence_vectors.cpp index 0ef30be8..4f19877c 100644 --- a/src/Gudhi_stat/utilities/persistence_vectors/plot_persistence_vectors.cpp +++ b/src/Gudhi_stat/utilities/persistence_vectors/plot_persistence_vectors.cpp @@ -39,7 +39,7 @@ int main( int argc , char** argv ) std::cout << "Wrong number of parameters, the program will now terminate. \n"; return 1; } - Vector_distances_in_diagram< Euclidean_distance<double> > l; + Vector_distances_in_diagram< Euclidean_distance > l; l.load_from_file( argv[1] ); l.plot( argv[1] ); |