From b7b23c26b855b83d03870cfd90b001fa2dedfd86 Mon Sep 17 00:00:00 2001 From: pdlotko Date: Fri, 9 Dec 2016 14:55:03 +0000 Subject: Fix to Marc's comments. git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/gudhi_stat@1841 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: c5be190621dcbb43433c027c78e782916cc6ae93 --- src/Gudhi_stat/test/persistence_heat_maps_test.cpp | 8 ++------ .../test/persistence_lanscapes_on_grid_test.cpp | 21 +++++++++------------ src/Gudhi_stat/test/persistence_lanscapes_test.cpp | 13 +++++-------- src/Gudhi_stat/test/vector_representation_test.cpp | 11 +++-------- 4 files changed, 19 insertions(+), 34 deletions(-) (limited to 'src/Gudhi_stat/test') diff --git a/src/Gudhi_stat/test/persistence_heat_maps_test.cpp b/src/Gudhi_stat/test/persistence_heat_maps_test.cpp index d1f4da76..ccfc208b 100644 --- a/src/Gudhi_stat/test/persistence_heat_maps_test.cpp +++ b/src/Gudhi_stat/test/persistence_heat_maps_test.cpp @@ -59,13 +59,9 @@ BOOST_AUTO_TEST_CASE(check_averages_of_heat_maps) Persistence_heat_maps p( "data/file_with_diagram" , filter , false , 1000 , 0 , 10 ); Persistence_heat_maps q( "data/file_with_diagram_1" , filter , false , 1000 , 0 , 10 ); Persistence_heat_maps r( "data/file_with_diagram_2" , filter , false , 1000 , 0 , 10 ); - - std::vector< Persistence_heat_maps* > to_average; - to_average.push_back( &p ); - to_average.push_back( &q ); - to_average.push_back( &r ); + Persistence_heat_maps av; - av.compute_average( to_average ); + av.compute_average( {&p,&q,&r} ); Persistence_heat_maps template_average; template_average.load_from_file( "data/template_average_of_heat_maps" ); diff --git a/src/Gudhi_stat/test/persistence_lanscapes_on_grid_test.cpp b/src/Gudhi_stat/test/persistence_lanscapes_on_grid_test.cpp index 87ed0241..2e24f932 100644 --- a/src/Gudhi_stat/test/persistence_lanscapes_on_grid_test.cpp +++ b/src/Gudhi_stat/test/persistence_lanscapes_on_grid_test.cpp @@ -198,17 +198,17 @@ BOOST_AUTO_TEST_CASE(check_computations_of_maxima_and_norms) //cerr << p.compute_norm_of_landscape(1) << endl; //cerr << p.compute_norm_of_landscape(2) << endl; //cerr << p.compute_norm_of_landscape(3) << endl; - //cerr << compute_discance_of_landscapes_on_grid(p,sum,1) << endl; - //cerr << compute_discance_of_landscapes_on_grid(p,sum,2) << endl; - //cerr << compute_discance_of_landscapes_on_grid(p,sum,-1) << endl; + //cerr << compute_distance_of_landscapes_on_grid(p,sum,1) << endl; + //cerr << compute_distance_of_landscapes_on_grid(p,sum,2) << endl; + //cerr << compute_distance_of_landscapes_on_grid(p,sum,std::numeric_limits::max()) << endl; BOOST_CHECK( fabs( p.compute_maximum() - 0.46 ) <= 0.00001 ); BOOST_CHECK( fabs( p.compute_norm_of_landscape(1) - 27.3373 ) <= 0.00001 ); BOOST_CHECK( fabs( p.compute_norm_of_landscape(2) - 1.84143 ) <= 0.00001 ); BOOST_CHECK( fabs( p.compute_norm_of_landscape(3) - 0.927067 ) <= 0.00001 ); - BOOST_CHECK( fabs( compute_discance_of_landscapes_on_grid(p,sum,1) - 16.8519 ) <= 0.00005 ); - BOOST_CHECK( fabs( compute_discance_of_landscapes_on_grid(p,sum,2) - 1.44542 ) <= 0.00001 ); - BOOST_CHECK( fabs(compute_discance_of_landscapes_on_grid(p,sum,-1) - 0.45 ) <= 0.00001 ); + BOOST_CHECK( fabs( compute_distance_of_landscapes_on_grid(p,sum,1) - 16.8519 ) <= 0.00005 ); + BOOST_CHECK( fabs( compute_distance_of_landscapes_on_grid(p,sum,2) - 1.44542 ) <= 0.00001 ); + BOOST_CHECK( fabs(compute_distance_of_landscapes_on_grid(p,sum,std::numeric_limits::max()) - 0.45 ) <= 0.00001 ); } @@ -217,12 +217,9 @@ BOOST_AUTO_TEST_CASE(check_computations_of_maxima_and_norms) BOOST_AUTO_TEST_CASE(check_computations_of_averages) { Persistence_landscape_on_grid p( "data/file_with_diagram", 0,1,100 ); - Persistence_landscape_on_grid q( "data/file_with_diagram_1", 0,1,100 ); - std::vector< Persistence_landscape_on_grid* > to_average; - to_average.push_back( &p ); - to_average.push_back( &q ); + Persistence_landscape_on_grid q( "data/file_with_diagram_1", 0,1,100 ); Persistence_landscape_on_grid av; - av.compute_average( to_average ); + av.compute_average( {&p,&q} ); Persistence_landscape_on_grid template_average; template_average.load_landscape_from_file( "data/average_on_a_grid" ); @@ -238,7 +235,7 @@ BOOST_AUTO_TEST_CASE(check_computations_of_distances) Persistence_landscape_on_grid q( "data/file_with_diagram_1", 0,1,10000 ); BOOST_CHECK( fabs( p.distance( q )- 25.5779) <= 0.00005 ); BOOST_CHECK( fabs( p.distance( q , 2) - 2.04891) <= 0.00001 ); - BOOST_CHECK( fabs( p.distance( q , -1 )-0.359 ) <= 0.00001 ); + BOOST_CHECK( fabs( p.distance( q , std::numeric_limits::max() )-0.359 ) <= 0.00001 ); } diff --git a/src/Gudhi_stat/test/persistence_lanscapes_test.cpp b/src/Gudhi_stat/test/persistence_lanscapes_test.cpp index eb00a718..d0a29588 100644 --- a/src/Gudhi_stat/test/persistence_lanscapes_test.cpp +++ b/src/Gudhi_stat/test/persistence_lanscapes_test.cpp @@ -181,20 +181,17 @@ BOOST_AUTO_TEST_CASE(check_computations_of_maxima_and_norms) BOOST_CHECK( fabs( p.compute_norm_of_landscape(1) - 2.34992 ) <= 0.00001 ); BOOST_CHECK( fabs( p.compute_norm_of_landscape(2) - 0.706095 ) <= 0.00001 ); BOOST_CHECK( fabs( p.compute_norm_of_landscape(3) - 0.501867 ) <= 0.00001 ); - BOOST_CHECK( fabs( compute_discance_of_landscapes(p,sum,1) - 27.9323 ) <= 0.00005 ); - BOOST_CHECK( fabs( compute_discance_of_landscapes(p,sum,2) - 2.35199 ) <= 0.00001 ); - BOOST_CHECK( fabs(compute_discance_of_landscapes(p,sum,-1) - 0.464478 ) <= 0.00001 ); + BOOST_CHECK( fabs( compute_distance_of_landscapes(p,sum,1) - 27.9323 ) <= 0.00005 ); + BOOST_CHECK( fabs( compute_distance_of_landscapes(p,sum,2) - 2.35199 ) <= 0.00001 ); + BOOST_CHECK( fabs(compute_distance_of_landscapes( p , sum , std::numeric_limits::max() ) - 0.464478 ) <= 0.00001 ); } BOOST_AUTO_TEST_CASE(check_computations_of_averages) { Persistence_landscape p( "data/file_with_diagram" ); Persistence_landscape q( "data/file_with_diagram_1" ); - std::vector< Persistence_landscape* > to_average; - to_average.push_back( &p ); - to_average.push_back( &q ); Persistence_landscape av; - av.compute_average( to_average ); + av.compute_average( {&p,&q} ); Persistence_landscape template_average; template_average.load_landscape_from_file( "data/average" ); @@ -210,7 +207,7 @@ BOOST_AUTO_TEST_CASE(check_computations_of_distances) Persistence_landscape q( "data/file_with_diagram_1" ); BOOST_CHECK( fabs( p.distance( q )- 25.5824) <= 0.00005 ); BOOST_CHECK( fabs( p.distance( q , 2) - 2.12636 ) <= 0.00001 ); - BOOST_CHECK( fabs( p.distance( q , -1 )-0.359068 ) <= 0.00001 ); + BOOST_CHECK( fabs( p.distance( q , std::numeric_limits::max() )-0.359068 ) <= 0.00001 ); } diff --git a/src/Gudhi_stat/test/vector_representation_test.cpp b/src/Gudhi_stat/test/vector_representation_test.cpp index 40409205..b38c5147 100644 --- a/src/Gudhi_stat/test/vector_representation_test.cpp +++ b/src/Gudhi_stat/test/vector_representation_test.cpp @@ -336,13 +336,9 @@ BOOST_AUTO_TEST_CASE(check_compute_average) Vector_distances_in_diagram< Euclidean_distance > A( i1 , -1 ); Vector_distances_in_diagram< Euclidean_distance > B( i1 , -1 ); - - std::vector< Vector_distances_in_diagram< Euclidean_distance >* > to_average; - to_average.push_back( &A ); - to_average.push_back( &B ); - + Vector_distances_in_diagram< Euclidean_distance > average; - average.compute_average( to_average ); + average.compute_average( {&A,&B} ); Vector_distances_in_diagram< Euclidean_distance > template_average; template_average.load_from_file( "data/average_of_persistence_vectors" ); @@ -354,8 +350,7 @@ BOOST_AUTO_TEST_CASE(check_compute_average) BOOST_AUTO_TEST_CASE(check_arythmetic_operations) -{ - //compute average +{ std::vector< std::pair > i1(3); i1[0] = std::pair( 1,2 ); i1[1] = std::pair( 3,8 ); -- cgit v1.2.3