From e2bb4a9ecc41619c48e808792bf33558f7fd5e53 Mon Sep 17 00:00:00 2001 From: pdlotko Date: Sun, 11 Dec 2016 15:05:34 +0000 Subject: Answer to Marc's comment from Sunday. git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/gudhi_stat@1845 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: cb4c277633d435bfe9111150f40de46d2fa598c2 --- src/Gudhi_stat/test/persistence_intervals_test.cpp | 203 ++++++++++----------- 1 file changed, 101 insertions(+), 102 deletions(-) (limited to 'src/Gudhi_stat/test/persistence_intervals_test.cpp') diff --git a/src/Gudhi_stat/test/persistence_intervals_test.cpp b/src/Gudhi_stat/test/persistence_intervals_test.cpp index 02af8347..7f18750a 100644 --- a/src/Gudhi_stat/test/persistence_intervals_test.cpp +++ b/src/Gudhi_stat/test/persistence_intervals_test.cpp @@ -38,19 +38,18 @@ using namespace Gudhi::Gudhi_stat; double epsilon = 0.0000005; -using namespace std; -//cout << "Left most end of the interval : " << min_max_.first << endl; -//cout << "Right most end of the interval : " << min_max_.second << endl; +//cout << "Left most end of the interval : " << min_max_.first << std::endl; +//cout << "Right most end of the interval : " << min_max_.second << std::endl; BOOST_AUTO_TEST_CASE(check_min_max_function) { Persistence_intervals p( "data/file_with_diagram" ); std::pair min_max_ = p.min_max(); - //cout << min_max_.first << " " << min_max_.second << endl;getchar(); + //cout << min_max_.first << " " << min_max_.second << std::endl;getchar(); BOOST_CHECK( fabs ( min_max_.first - 0.0290362 ) <= epsilon ); BOOST_CHECK( fabs ( min_max_.second - 0.994537 ) <= epsilon ); @@ -167,13 +166,13 @@ BOOST_AUTO_TEST_CASE(check_characteristic_function_of_diagram) for ( size_t i = 0 ; i != char_funct_diag.size() ; ++i ) { - //cout << char_funct_diag[i] << endl; + //cout << char_funct_diag[i] << std::endl; if ( fabs ( char_funct_diag[i] - template_char_funct_diag[i] ) >= 0.0001 ) { - cout << "Boost test fail check_characteristic_function_of_diagram : " << endl; - cerr << char_funct_diag[i] << " " << template_char_funct_diag[i] << endl; - cerr << fabs ( char_funct_diag[i] - template_char_funct_diag[i] ) << endl; - cerr << 0.0001 << endl; + std::cout << "Boost test fail check_characteristic_function_of_diagram : " << std::endl; + std::cerr << char_funct_diag[i] << " " << template_char_funct_diag[i] << std::endl; + std::cerr << fabs ( char_funct_diag[i] - template_char_funct_diag[i] ) << std::endl; + std::cerr << 0.0001 << std::endl; getchar(); } BOOST_CHECK( fabs ( char_funct_diag[i] - template_char_funct_diag[i] ) <= 0.0001 ); @@ -201,7 +200,7 @@ BOOST_AUTO_TEST_CASE(check_cumulative_characteristic_function_of_diagram) for ( size_t i = 0 ; i != cumul_char_funct_diag.size() ; ++i ) { - //cout << cumul_char_funct_diag[i] << endl; + //cout << cumul_char_funct_diag[i] << std::endl; BOOST_CHECK( fabs (cumul_char_funct_diag[i] - template_char_funct_diag_cumul[i] ) <= 0.0001 ); } } @@ -211,96 +210,96 @@ BOOST_AUTO_TEST_CASE(check_compute_persistent_betti_numbers) { Persistence_intervals p( "data/file_with_diagram" ); std::vector< std::pair< double , double > > pbns; - pbns.push_back(make_pair( 0.0290362,1 )); - pbns.push_back(make_pair( 0.0307676,2 )); - pbns.push_back(make_pair( 0.0366312,3 )); - pbns.push_back(make_pair( 0.0544614,4 )); - pbns.push_back(make_pair( 0.0920033,5 )); - pbns.push_back(make_pair( 0.104599,6 )); - pbns.push_back(make_pair( 0.114718,7 )); - pbns.push_back(make_pair( 0.117379,8 )); - pbns.push_back(make_pair( 0.123493,9 )); - pbns.push_back(make_pair( 0.133638,10 )); - pbns.push_back(make_pair( 0.137798,9 )); - pbns.push_back(make_pair( 0.149798,10 )); - pbns.push_back(make_pair( 0.155421,11 )); - pbns.push_back(make_pair( 0.158443,12 )); - pbns.push_back(make_pair( 0.176956,13 )); - pbns.push_back(make_pair( 0.183234,12 )); - pbns.push_back(make_pair( 0.191069,13 )); - pbns.push_back(make_pair( 0.191333,14 )); - pbns.push_back(make_pair( 0.191836,15 )); - pbns.push_back(make_pair( 0.192675,16 )); - pbns.push_back(make_pair( 0.208564,17 )); - pbns.push_back(make_pair( 0.218425,18 )); - pbns.push_back(make_pair( 0.219902,17 )); - pbns.push_back(make_pair( 0.23233,16 )); - pbns.push_back(make_pair( 0.234558,17 )); - pbns.push_back(make_pair( 0.237166,16 )); - pbns.push_back(make_pair( 0.247352,17 )); - pbns.push_back(make_pair( 0.267421,18 )); - pbns.push_back(make_pair( 0.268093,19 )); - pbns.push_back(make_pair( 0.278734,18 )); - pbns.push_back(make_pair( 0.284722,19 )); - pbns.push_back(make_pair( 0.284998,20 )); - pbns.push_back(make_pair( 0.294069,21 )); - pbns.push_back(make_pair( 0.306293,22 )); - pbns.push_back(make_pair( 0.322361,21 )); - pbns.push_back(make_pair( 0.323152,22 )); - pbns.push_back(make_pair( 0.371021,23 )); - pbns.push_back(make_pair( 0.372395,24 )); - pbns.push_back(make_pair( 0.387744,25 )); - pbns.push_back(make_pair( 0.435537,26 )); - pbns.push_back(make_pair( 0.462911,25 )); - pbns.push_back(make_pair( 0.483569,26 )); - pbns.push_back(make_pair( 0.489209,25 )); - pbns.push_back(make_pair( 0.517115,24 )); - pbns.push_back(make_pair( 0.522197,23 )); - pbns.push_back(make_pair( 0.532665,22 )); - pbns.push_back(make_pair( 0.545262,23 )); - pbns.push_back(make_pair( 0.587227,22 )); - pbns.push_back(make_pair( 0.593036,23 )); - pbns.push_back(make_pair( 0.602647,24 )); - pbns.push_back(make_pair( 0.605044,25 )); - pbns.push_back(make_pair( 0.621962,24 )); - pbns.push_back(make_pair( 0.629449,23 )); - pbns.push_back(make_pair( 0.636719,22 )); - pbns.push_back(make_pair( 0.64957,21 )); - pbns.push_back(make_pair( 0.650781,22 )); - pbns.push_back(make_pair( 0.654951,23 )); - pbns.push_back(make_pair( 0.683489,24 )); - pbns.push_back(make_pair( 0.687172,23 )); - pbns.push_back(make_pair( 0.69703,22 )); - pbns.push_back(make_pair( 0.701174,21 )); - pbns.push_back(make_pair( 0.717623,22 )); - pbns.push_back(make_pair( 0.722023,21 )); - pbns.push_back(make_pair( 0.722298,20 )); - pbns.push_back(make_pair( 0.725347,19 )); - pbns.push_back(make_pair( 0.73071,18 )); - pbns.push_back(make_pair( 0.758355,17 )); - pbns.push_back(make_pair( 0.770913,18 )); - pbns.push_back(make_pair( 0.790833,17 )); - pbns.push_back(make_pair( 0.821211,16 )); - pbns.push_back(make_pair( 0.849305,17 )); - pbns.push_back(make_pair( 0.853669,16 )); - pbns.push_back(make_pair( 0.866659,15 )); - pbns.push_back(make_pair( 0.872896,16 )); - pbns.push_back(make_pair( 0.889597,15 )); - pbns.push_back(make_pair( 0.900231,14 )); - pbns.push_back(make_pair( 0.903847,13 )); - pbns.push_back(make_pair( 0.906299,12 )); - pbns.push_back(make_pair( 0.910852,11 )); - pbns.push_back(make_pair( 0.93453,10 )); - pbns.push_back(make_pair( 0.944757,9 )); - pbns.push_back(make_pair( 0.947812,8 )); - pbns.push_back(make_pair( 0.959154,7 )); - pbns.push_back(make_pair( 0.975654,6 )); - pbns.push_back(make_pair( 0.976719,5 )); - pbns.push_back(make_pair( 0.977343,4 )); - pbns.push_back(make_pair( 0.980129,3 )); - pbns.push_back(make_pair( 0.987842,2 )); - pbns.push_back(make_pair( 0.990127,1 )); - pbns.push_back(make_pair( 0.994537,0 )); + pbns.push_back(std::make_pair( 0.0290362,1 )); + pbns.push_back(std::make_pair( 0.0307676,2 )); + pbns.push_back(std::make_pair( 0.0366312,3 )); + pbns.push_back(std::make_pair( 0.0544614,4 )); + pbns.push_back(std::make_pair( 0.0920033,5 )); + pbns.push_back(std::make_pair( 0.104599,6 )); + pbns.push_back(std::make_pair( 0.114718,7 )); + pbns.push_back(std::make_pair( 0.117379,8 )); + pbns.push_back(std::make_pair( 0.123493,9 )); + pbns.push_back(std::make_pair( 0.133638,10 )); + pbns.push_back(std::make_pair( 0.137798,9 )); + pbns.push_back(std::make_pair( 0.149798,10 )); + pbns.push_back(std::make_pair( 0.155421,11 )); + pbns.push_back(std::make_pair( 0.158443,12 )); + pbns.push_back(std::make_pair( 0.176956,13 )); + pbns.push_back(std::make_pair( 0.183234,12 )); + pbns.push_back(std::make_pair( 0.191069,13 )); + pbns.push_back(std::make_pair( 0.191333,14 )); + pbns.push_back(std::make_pair( 0.191836,15 )); + pbns.push_back(std::make_pair( 0.192675,16 )); + pbns.push_back(std::make_pair( 0.208564,17 )); + pbns.push_back(std::make_pair( 0.218425,18 )); + pbns.push_back(std::make_pair( 0.219902,17 )); + pbns.push_back(std::make_pair( 0.23233,16 )); + pbns.push_back(std::make_pair( 0.234558,17 )); + pbns.push_back(std::make_pair( 0.237166,16 )); + pbns.push_back(std::make_pair( 0.247352,17 )); + pbns.push_back(std::make_pair( 0.267421,18 )); + pbns.push_back(std::make_pair( 0.268093,19 )); + pbns.push_back(std::make_pair( 0.278734,18 )); + pbns.push_back(std::make_pair( 0.284722,19 )); + pbns.push_back(std::make_pair( 0.284998,20 )); + pbns.push_back(std::make_pair( 0.294069,21 )); + pbns.push_back(std::make_pair( 0.306293,22 )); + pbns.push_back(std::make_pair( 0.322361,21 )); + pbns.push_back(std::make_pair( 0.323152,22 )); + pbns.push_back(std::make_pair( 0.371021,23 )); + pbns.push_back(std::make_pair( 0.372395,24 )); + pbns.push_back(std::make_pair( 0.387744,25 )); + pbns.push_back(std::make_pair( 0.435537,26 )); + pbns.push_back(std::make_pair( 0.462911,25 )); + pbns.push_back(std::make_pair( 0.483569,26 )); + pbns.push_back(std::make_pair( 0.489209,25 )); + pbns.push_back(std::make_pair( 0.517115,24 )); + pbns.push_back(std::make_pair( 0.522197,23 )); + pbns.push_back(std::make_pair( 0.532665,22 )); + pbns.push_back(std::make_pair( 0.545262,23 )); + pbns.push_back(std::make_pair( 0.587227,22 )); + pbns.push_back(std::make_pair( 0.593036,23 )); + pbns.push_back(std::make_pair( 0.602647,24 )); + pbns.push_back(std::make_pair( 0.605044,25 )); + pbns.push_back(std::make_pair( 0.621962,24 )); + pbns.push_back(std::make_pair( 0.629449,23 )); + pbns.push_back(std::make_pair( 0.636719,22 )); + pbns.push_back(std::make_pair( 0.64957,21 )); + pbns.push_back(std::make_pair( 0.650781,22 )); + pbns.push_back(std::make_pair( 0.654951,23 )); + pbns.push_back(std::make_pair( 0.683489,24 )); + pbns.push_back(std::make_pair( 0.687172,23 )); + pbns.push_back(std::make_pair( 0.69703,22 )); + pbns.push_back(std::make_pair( 0.701174,21 )); + pbns.push_back(std::make_pair( 0.717623,22 )); + pbns.push_back(std::make_pair( 0.722023,21 )); + pbns.push_back(std::make_pair( 0.722298,20 )); + pbns.push_back(std::make_pair( 0.725347,19 )); + pbns.push_back(std::make_pair( 0.73071,18 )); + pbns.push_back(std::make_pair( 0.758355,17 )); + pbns.push_back(std::make_pair( 0.770913,18 )); + pbns.push_back(std::make_pair( 0.790833,17 )); + pbns.push_back(std::make_pair( 0.821211,16 )); + pbns.push_back(std::make_pair( 0.849305,17 )); + pbns.push_back(std::make_pair( 0.853669,16 )); + pbns.push_back(std::make_pair( 0.866659,15 )); + pbns.push_back(std::make_pair( 0.872896,16 )); + pbns.push_back(std::make_pair( 0.889597,15 )); + pbns.push_back(std::make_pair( 0.900231,14 )); + pbns.push_back(std::make_pair( 0.903847,13 )); + pbns.push_back(std::make_pair( 0.906299,12 )); + pbns.push_back(std::make_pair( 0.910852,11 )); + pbns.push_back(std::make_pair( 0.93453,10 )); + pbns.push_back(std::make_pair( 0.944757,9 )); + pbns.push_back(std::make_pair( 0.947812,8 )); + pbns.push_back(std::make_pair( 0.959154,7 )); + pbns.push_back(std::make_pair( 0.975654,6 )); + pbns.push_back(std::make_pair( 0.976719,5 )); + pbns.push_back(std::make_pair( 0.977343,4 )); + pbns.push_back(std::make_pair( 0.980129,3 )); + pbns.push_back(std::make_pair( 0.987842,2 )); + pbns.push_back(std::make_pair( 0.990127,1 )); + pbns.push_back(std::make_pair( 0.994537,0 )); @@ -308,7 +307,7 @@ BOOST_AUTO_TEST_CASE(check_compute_persistent_betti_numbers) std::vector< std::pair< double , size_t > > pbns_new = p.compute_persistent_betti_numbers(); for ( size_t i = 0 ; i != pbns.size() ; ++i ) { - //cout << pbns_new[i].first << "," << pbns_new[i].second << endl; + //cout << pbns_new[i].first << "," << pbns_new[i].second << std::endl; BOOST_CHECK( fabs ( pbns[i].first - pbns_new[i].first ) <= epsilon ); BOOST_CHECK( fabs ( pbns[i].second - pbns_new[i].second ) <= epsilon ); } @@ -334,7 +333,7 @@ BOOST_AUTO_TEST_CASE(check_k_n_n) for ( size_t i = 0 ; i != knn.size() ; ++i ) { - //cout << knn[i] << endl; + //cout << knn[i] << std::endl; BOOST_CHECK( fabs ( knn[i] - knn_template[i] ) <= 0.000005 ); } } -- cgit v1.2.3