From 8252d6eb78c9fe355a2167ad68e9106fcaa8fcdb Mon Sep 17 00:00:00 2001 From: pdlotko Date: Thu, 6 Apr 2017 15:36:53 +0000 Subject: 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 --- src/Gudhi_stat/test/persistence_lanscapes_test.cpp | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/Gudhi_stat/test/persistence_lanscapes_test.cpp') 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 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 ); } -- cgit v1.2.3