diff options
Diffstat (limited to 'src/Gudhi_stat/test/vector_representation_test.cpp')
| -rw-r--r-- | src/Gudhi_stat/test/vector_representation_test.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
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) ); |