diff options
author | pdlotko <pdlotko@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-04-06 15:36:53 +0000 |
---|---|---|
committer | pdlotko <pdlotko@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-04-06 15:36:53 +0000 |
commit | 8252d6eb78c9fe355a2167ad68e9106fcaa8fcdb (patch) | |
tree | f925ae2c44c5c84d7f3d1d9ba6821cc5953d7e36 /src/Gudhi_stat/test | |
parent | 39cd1e8ab33bd069236649edc10459925cea83f4 (diff) |
Answering MG3 comments.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/gudhi_stat@2313 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 3bae7a55d05831af55a5b1c3e0d2695383af325f
Diffstat (limited to 'src/Gudhi_stat/test')
-rw-r--r-- | src/Gudhi_stat/test/persistence_lanscapes_test.cpp | 26 | ||||
-rw-r--r-- | src/Gudhi_stat/test/vector_representation_test.cpp | 36 |
2 files changed, 31 insertions, 31 deletions
diff --git a/src/Gudhi_stat/test/persistence_lanscapes_test.cpp b/src/Gudhi_stat/test/persistence_lanscapes_test.cpp index 957ddbfb..266be4de 100644 --- a/src/Gudhi_stat/test/persistence_lanscapes_test.cpp +++ b/src/Gudhi_stat/test/persistence_lanscapes_test.cpp @@ -43,7 +43,7 @@ double epsilon = 0.0000005; BOOST_AUTO_TEST_CASE(check_construction_of_landscape) { - std::vector< std::pair< double , double > > diag = read_standard_file( "data/file_with_diagram" ); + std::vector< std::pair< double , double > > diag = read_standard_persistence_file( "data/file_with_diagram" ); Persistence_landscape p( diag ); Persistence_landscape q; q.load_landscape_from_file( "data/file_with_landscape_from_file_with_diagram" ); @@ -53,7 +53,7 @@ BOOST_AUTO_TEST_CASE(check_construction_of_landscape) BOOST_AUTO_TEST_CASE(check_computations_of_integrals) { - std::vector< std::pair< double , double > > diag = read_standard_file( "data/file_with_diagram" ); + std::vector< std::pair< double , double > > diag = read_standard_persistence_file( "data/file_with_diagram" ); Persistence_landscape p( diag ); double integral = p.compute_integral_of_landscape(); //cerr << integral << " " << 2.34992 << endl; @@ -63,7 +63,7 @@ BOOST_AUTO_TEST_CASE(check_computations_of_integrals) BOOST_AUTO_TEST_CASE(check_computations_of_integrals_for_each_level_separatelly) { - std::vector< std::pair< double , double > > diag = read_standard_file( "data/file_with_diagram" ); + std::vector< std::pair< double , double > > diag = read_standard_persistence_file( "data/file_with_diagram" ); Persistence_landscape p( diag ); std::vector< double > integrals_fir_different_levels; @@ -107,7 +107,7 @@ BOOST_AUTO_TEST_CASE(check_computations_of_integrals_for_each_level_separatelly) BOOST_AUTO_TEST_CASE(check_computations_of_integrals_of_powers_of_landscape) { - std::vector< std::pair< double , double > > diag = read_standard_file( "data/file_with_diagram" ); + std::vector< std::pair< double , double > > diag = read_standard_persistence_file( "data/file_with_diagram" ); Persistence_landscape p( diag ); std::vector<double> integrals_fir_different_powers; @@ -126,7 +126,7 @@ BOOST_AUTO_TEST_CASE(check_computations_of_integrals_of_powers_of_landscape) BOOST_AUTO_TEST_CASE(check_computations_of_values_on_different_points) { - std::vector< std::pair< double , double > > diag = read_standard_file( "data/file_with_diagram" ); + std::vector< std::pair< double , double > > diag = read_standard_persistence_file( "data/file_with_diagram" ); Persistence_landscape p( diag ); @@ -147,7 +147,7 @@ BOOST_AUTO_TEST_CASE(check_computations_of_values_on_different_points) BOOST_AUTO_TEST_CASE(check_computations_sum_differences_and_multiplications) { - std::vector< std::pair< double , double > > diag = read_standard_file( "data/file_with_diagram" ); + std::vector< std::pair< double , double > > diag = read_standard_persistence_file( "data/file_with_diagram" ); Persistence_landscape p( diag ); Persistence_landscape second; second.load_landscape_from_file("data/file_with_landscape_from_file_with_diagram_1" ); @@ -175,7 +175,7 @@ BOOST_AUTO_TEST_CASE(check_computations_sum_differences_and_multiplications) BOOST_AUTO_TEST_CASE(check_computations_of_maxima_and_norms) { - std::vector< std::pair< double , double > > diag = read_standard_file( "data/file_with_diagram" ); + std::vector< std::pair< double , double > > diag = read_standard_persistence_file( "data/file_with_diagram" ); Persistence_landscape p( diag ); Persistence_landscape second; second.load_landscape_from_file("data/file_with_landscape_from_file_with_diagram_1" ); @@ -192,9 +192,9 @@ BOOST_AUTO_TEST_CASE(check_computations_of_maxima_and_norms) BOOST_AUTO_TEST_CASE(check_computations_of_averages) { - std::vector< std::pair< double , double > > diag = read_standard_file( "data/file_with_diagram" ); + std::vector< std::pair< double , double > > diag = read_standard_persistence_file( "data/file_with_diagram" ); Persistence_landscape p( diag ); - std::vector< std::pair< double , double > > diag2 = read_standard_file( "data/file_with_diagram_1" ); + std::vector< std::pair< double , double > > diag2 = read_standard_persistence_file( "data/file_with_diagram_1" ); Persistence_landscape q( diag2 ); Persistence_landscape av; av.compute_average( {&p,&q} ); @@ -209,9 +209,9 @@ BOOST_AUTO_TEST_CASE(check_computations_of_averages) BOOST_AUTO_TEST_CASE(check_computations_of_distances) { - std::vector< std::pair< double , double > > diag = read_standard_file( "data/file_with_diagram" ); + std::vector< std::pair< double , double > > diag = read_standard_persistence_file( "data/file_with_diagram" ); Persistence_landscape p( diag ); - std::vector< std::pair< double , double > > diag2 = read_standard_file( "data/file_with_diagram_1" ); + std::vector< std::pair< double , double > > diag2 = read_standard_persistence_file( "data/file_with_diagram_1" ); Persistence_landscape q( diag2 ); BOOST_CHECK( fabs( p.distance( q )- 25.5824) <= 0.00005 ); BOOST_CHECK( fabs( p.distance( q , 2) - 2.12636 ) <= 0.00001 ); @@ -221,9 +221,9 @@ BOOST_AUTO_TEST_CASE(check_computations_of_distances) BOOST_AUTO_TEST_CASE(check_computations_of_scalar_product) { - std::vector< std::pair< double , double > > diag = read_standard_file( "data/file_with_diagram" ); + std::vector< std::pair< double , double > > diag = read_standard_persistence_file( "data/file_with_diagram" ); Persistence_landscape p( diag ); - std::vector< std::pair< double , double > > diag2 = read_standard_file( "data/file_with_diagram_1" ); + std::vector< std::pair< double , double > > diag2 = read_standard_persistence_file( "data/file_with_diagram_1" ); Persistence_landscape q( diag2 ); BOOST_CHECK( fabs( p.compute_scalar_product( q ) - 0.754498 ) <= 0.00001 ); } diff --git a/src/Gudhi_stat/test/vector_representation_test.cpp b/src/Gudhi_stat/test/vector_representation_test.cpp index f69673dd..fd512a8c 100644 --- a/src/Gudhi_stat/test/vector_representation_test.cpp +++ b/src/Gudhi_stat/test/vector_representation_test.cpp @@ -50,10 +50,10 @@ BOOST_AUTO_TEST_CASE(check_read_write_to_files) intervals.push_back( std::make_pair(4,7) ); intervals.push_back( std::make_pair(9,10) ); intervals.push_back( std::make_pair(3,11) ); - Vector_distances_in_diagram< Euclidean_distance<double> > p( intervals , -1 ); + Vector_distances_in_diagram< Euclidean_distance > p( intervals , -1 ); p.write_to_file( "test_vector_representation_write_read" ); - Vector_distances_in_diagram< Euclidean_distance<double> > q; + Vector_distances_in_diagram< Euclidean_distance > q; q.load_from_file( "test_vector_representation_write_read" ); BOOST_CHECK( p == q ); @@ -63,7 +63,7 @@ BOOST_AUTO_TEST_CASE(check_read_write_to_files) BOOST_AUTO_TEST_CASE(check_sortev_vector_distances_template) { - Vector_distances_in_diagram< Euclidean_distance<double> > p( "data/file_with_diagram" , 100 ); + Vector_distances_in_diagram< Euclidean_distance > p( "data/file_with_diagram" , 100 ); std::vector< double > sortev_vector_distances_template; sortev_vector_distances_template.push_back( 0.609968 ); @@ -183,7 +183,7 @@ BOOST_AUTO_TEST_CASE(check_sortev_vector_distances_template) BOOST_AUTO_TEST_CASE(check_projections_to_R) { - Vector_distances_in_diagram< Euclidean_distance<double> > p( "data/file_with_diagram" , 100 ); + Vector_distances_in_diagram< Euclidean_distance > p( "data/file_with_diagram" , 100 ); std::vector< double > proj; proj.push_back( 0 ); proj.push_back( 0.6099679993 ); @@ -299,8 +299,8 @@ BOOST_AUTO_TEST_CASE(check_projections_to_R) BOOST_AUTO_TEST_CASE(check_distance_computations) { - Vector_distances_in_diagram< Euclidean_distance<double> > p( "data/file_with_diagram" , 100 ); - Vector_distances_in_diagram< Euclidean_distance<double> > p_prime( "data/file_with_diagram" , 10 ); + Vector_distances_in_diagram< Euclidean_distance > p( "data/file_with_diagram" , 100 ); + Vector_distances_in_diagram< Euclidean_distance > p_prime( "data/file_with_diagram" , 10 ); std::vector< std::pair<double,double> > intervals(10); intervals[0] = std::pair<double,double>( 1,2 ); intervals[1] = std::pair<double,double>( 3,4 ); @@ -312,7 +312,7 @@ BOOST_AUTO_TEST_CASE(check_distance_computations) intervals[7] = std::pair<double,double>( 15,16 ); intervals[8] = std::pair<double,double>( 17,18 ); intervals[9] = std::pair<double,double>( 19,20 ); - Vector_distances_in_diagram< Euclidean_distance<double> > p_bis( intervals , 10 ); + Vector_distances_in_diagram< Euclidean_distance > p_bis( intervals , 10 ); //cerr << "p_prime.distance( (Abs_Topological_data_with_distances*)(&p_bis) , 1 ) : " << p_prime.distance( (Abs_Topological_data_with_distances*)(&p_bis) , 1 ) << endl; BOOST_CHECK( almost_equal ( p_prime.distance( p_bis , 1 ) , 1.86428 ) ); } @@ -321,7 +321,7 @@ BOOST_AUTO_TEST_CASE(check_distance_computations) BOOST_AUTO_TEST_CASE(check_compute_average) { - Vector_distances_in_diagram< Euclidean_distance<double> > p( "data/file_with_diagram" , 100 ); + Vector_distances_in_diagram< Euclidean_distance > p( "data/file_with_diagram" , 100 ); //compute average std::vector< std::pair<double,double> > i1(3); i1[0] = std::pair<double,double>( 1,2 ); @@ -333,13 +333,13 @@ BOOST_AUTO_TEST_CASE(check_compute_average) i2[1] = std::pair<double,double>( 2,15); i2[2] = std::pair<double,double>( 6,17 ); - Vector_distances_in_diagram< Euclidean_distance<double> > A( i1 , -1 ); - Vector_distances_in_diagram< Euclidean_distance<double> > B( i1 , -1 ); + Vector_distances_in_diagram< Euclidean_distance > A( i1 , -1 ); + Vector_distances_in_diagram< Euclidean_distance > B( i1 , -1 ); - Vector_distances_in_diagram< Euclidean_distance<double> > average; + Vector_distances_in_diagram< Euclidean_distance > average; average.compute_average( {&A,&B} ); - Vector_distances_in_diagram< Euclidean_distance<double> > template_average; + Vector_distances_in_diagram< Euclidean_distance > template_average; template_average.load_from_file( "data/average_of_persistence_vectors" ); BOOST_CHECK( template_average == average ); @@ -360,11 +360,11 @@ BOOST_AUTO_TEST_CASE(check_arythmetic_operations) i2[1] = std::pair<double,double>( 2,15); i2[2] = std::pair<double,double>( 6,17 ); - Vector_distances_in_diagram< Euclidean_distance<double> > A( i1 , -1 ); - Vector_distances_in_diagram< Euclidean_distance<double> > B( i1 , -1 ); + Vector_distances_in_diagram< Euclidean_distance > A( i1 , -1 ); + Vector_distances_in_diagram< Euclidean_distance > B( i1 , -1 ); - Vector_distances_in_diagram< Euclidean_distance<double> > sum = A+B; - Vector_distances_in_diagram< Euclidean_distance<double> > difference = A-B; + Vector_distances_in_diagram< Euclidean_distance > sum = A+B; + Vector_distances_in_diagram< Euclidean_distance > difference = A-B; BOOST_CHECK( almost_equal( sum.vector_in_position(0) , 7.07107) ); BOOST_CHECK( almost_equal( sum.vector_in_position(1) , 7.07107) ); @@ -380,7 +380,7 @@ BOOST_AUTO_TEST_CASE(check_arythmetic_operations) BOOST_CHECK( almost_equal( difference.vector_in_position(4) , 0) ); BOOST_CHECK( almost_equal( difference.vector_in_position(5) , 0) ); - Vector_distances_in_diagram< Euclidean_distance<double> > prod = 2.*A; + Vector_distances_in_diagram< Euclidean_distance > prod = 2.*A; BOOST_CHECK( almost_equal( prod.vector_in_position(0) , 7.07107) ); BOOST_CHECK( almost_equal( prod.vector_in_position(1) , 7.07107) ); BOOST_CHECK( almost_equal( prod.vector_in_position(2) , 5.65685) ); @@ -388,7 +388,7 @@ BOOST_AUTO_TEST_CASE(check_arythmetic_operations) BOOST_CHECK( almost_equal( prod.vector_in_position(4) , 1.41421) ); BOOST_CHECK( almost_equal( prod.vector_in_position(5) , 1.41421) ); - Vector_distances_in_diagram< Euclidean_distance<double> > prod1 = A*2; + Vector_distances_in_diagram< Euclidean_distance > prod1 = A*2; BOOST_CHECK( almost_equal( prod1.vector_in_position(0) , 7.07107) ); BOOST_CHECK( almost_equal( prod1.vector_in_position(1) , 7.07107) ); BOOST_CHECK( almost_equal( prod1.vector_in_position(2) , 5.65685) ); |