a few more changes...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/gudhi_stat@1846 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: adc13cd41fd36c3e0107b32c7e0431dbf217955e

4 files changed, 97 insertions, 97 deletions

diff --git a/src/Gudhi_stat/example/persistence_landscape.cpp b/src/Gudhi_stat/example/persistence_landscape.cpp
index 14cb1a51..bb1cecea 100644
--- a/src/Gudhi_stat/example/persistence_landscape.cpp
+++ b/src/Gudhi_stat/example/persistence_landscape.cpp
@@ -182,9 +182,9 @@ if ( argc != 2 )
 	cout << "L^3 norm : " << p.compute_norm_of_landscape(3) << endl;	
 	
 	
-	cout << "L^1 distance : " << compute_discance_of_landscapes(p,sum,1) << endl;
-	cout << "L^2 distance : " << compute_discance_of_landscapes(p,sum,2) << endl;
-	cout << "L^infty distance : " << compute_discance_of_landscapes(p,sum,std::numeric_limits<double>::max() ) << endl;
+	cout << "L^1 distance : " << compute_distance_of_landscapes(p,sum,1) << endl;
+	cout << "L^2 distance : " << compute_distance_of_landscapes(p,sum,2) << endl;
+	cout << "L^infty distance : " << compute_distance_of_landscapes(p,sum,std::numeric_limits<double>::max() ) << endl;
 	
 	{
 		Persistence_landscape p( "../test/data/file_with_diagram" );
diff --git a/src/Gudhi_stat/example/persistence_landscape_on_grid.cpp b/src/Gudhi_stat/example/persistence_landscape_on_grid.cpp
index 282acb2d..9133944d 100644
--- a/src/Gudhi_stat/example/persistence_landscape_on_grid.cpp
+++ b/src/Gudhi_stat/example/persistence_landscape_on_grid.cpp
@@ -156,9 +156,9 @@ int main( int argc , char** argv )
 	cerr << "2-norm : " << p.compute_norm_of_landscape(2) << endl;
 	cerr << "3-norm : " << 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,-1)  << endl;
 	*/
 	
 	/*
diff --git a/src/Gudhi_stat/include/gudhi/concretizations/Persistence_landscape_on_grid.h b/src/Gudhi_stat/include/gudhi/concretizations/Persistence_landscape_on_grid.h
index d91b7431..369d4a64 100644
--- a/src/Gudhi_stat/include/gudhi/concretizations/Persistence_landscape_on_grid.h
+++ b/src/Gudhi_stat/include/gudhi/concretizations/Persistence_landscape_on_grid.h
@@ -726,7 +726,7 @@ public:
 			previous_y_l1 = current_y_l1;
 			previous_y_l2 = current_y_l2;
 			
-		}		
+			}		
 		return result;
 	}
 	
diff --git a/src/Gudhi_stat/test/persistence_intervals_test.cpp b/src/Gudhi_stat/test/persistence_intervals_test.cpp
index 7f18750a..96d913e0 100644
--- a/src/Gudhi_stat/test/persistence_intervals_test.cpp
+++ b/src/Gudhi_stat/test/persistence_intervals_test.cpp
@@ -210,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(std::make_pair<double,double>(	0.0290362,1	));
-	pbns.push_back(std::make_pair<double,double>(	0.0307676,2	));
-	pbns.push_back(std::make_pair<double,double>(	0.0366312,3	));
-	pbns.push_back(std::make_pair<double,double>(	0.0544614,4	));
-	pbns.push_back(std::make_pair<double,double>(	0.0920033,5	));
-	pbns.push_back(std::make_pair<double,double>(	0.104599,6	));
-	pbns.push_back(std::make_pair<double,double>(	0.114718,7	));
-	pbns.push_back(std::make_pair<double,double>(	0.117379,8	));
-	pbns.push_back(std::make_pair<double,double>(	0.123493,9	));
-	pbns.push_back(std::make_pair<double,double>(	0.133638,10	));
-	pbns.push_back(std::make_pair<double,double>(	0.137798,9	));
-	pbns.push_back(std::make_pair<double,double>(	0.149798,10	));
-	pbns.push_back(std::make_pair<double,double>(	0.155421,11	));
-	pbns.push_back(std::make_pair<double,double>(	0.158443,12	));
-	pbns.push_back(std::make_pair<double,double>(	0.176956,13	));
-	pbns.push_back(std::make_pair<double,double>(	0.183234,12	));
-	pbns.push_back(std::make_pair<double,double>(	0.191069,13	));
-	pbns.push_back(std::make_pair<double,double>(	0.191333,14	));
-	pbns.push_back(std::make_pair<double,double>(	0.191836,15	));
-	pbns.push_back(std::make_pair<double,double>(	0.192675,16	));
-	pbns.push_back(std::make_pair<double,double>(	0.208564,17	));
-	pbns.push_back(std::make_pair<double,double>(	0.218425,18	));
-	pbns.push_back(std::make_pair<double,double>(	0.219902,17	));
-	pbns.push_back(std::make_pair<double,double>(	0.23233,16	));
-	pbns.push_back(std::make_pair<double,double>(	0.234558,17	));
-	pbns.push_back(std::make_pair<double,double>(	0.237166,16	));
-	pbns.push_back(std::make_pair<double,double>(	0.247352,17	));
-	pbns.push_back(std::make_pair<double,double>(	0.267421,18	));
-	pbns.push_back(std::make_pair<double,double>(	0.268093,19	));
-	pbns.push_back(std::make_pair<double,double>(	0.278734,18	));
-	pbns.push_back(std::make_pair<double,double>(	0.284722,19	));
-	pbns.push_back(std::make_pair<double,double>(	0.284998,20	));
-	pbns.push_back(std::make_pair<double,double>(	0.294069,21	));
-	pbns.push_back(std::make_pair<double,double>(	0.306293,22	));
-	pbns.push_back(std::make_pair<double,double>(	0.322361,21	));
-	pbns.push_back(std::make_pair<double,double>(	0.323152,22	));
-	pbns.push_back(std::make_pair<double,double>(	0.371021,23	));
-	pbns.push_back(std::make_pair<double,double>(	0.372395,24	));
-	pbns.push_back(std::make_pair<double,double>(	0.387744,25	));
-	pbns.push_back(std::make_pair<double,double>(	0.435537,26	));
-	pbns.push_back(std::make_pair<double,double>(	0.462911,25	));
-	pbns.push_back(std::make_pair<double,double>(	0.483569,26	));
-	pbns.push_back(std::make_pair<double,double>(	0.489209,25	));
-	pbns.push_back(std::make_pair<double,double>(	0.517115,24	));
-	pbns.push_back(std::make_pair<double,double>(	0.522197,23	));
-	pbns.push_back(std::make_pair<double,double>(	0.532665,22	));
-	pbns.push_back(std::make_pair<double,double>(	0.545262,23	));
-	pbns.push_back(std::make_pair<double,double>(	0.587227,22	));
-	pbns.push_back(std::make_pair<double,double>(	0.593036,23	));
-	pbns.push_back(std::make_pair<double,double>(	0.602647,24	));
-	pbns.push_back(std::make_pair<double,double>(	0.605044,25	));
-	pbns.push_back(std::make_pair<double,double>(	0.621962,24	));
-	pbns.push_back(std::make_pair<double,double>(	0.629449,23	));
-	pbns.push_back(std::make_pair<double,double>(	0.636719,22	));
-	pbns.push_back(std::make_pair<double,double>(	0.64957,21	));
-	pbns.push_back(std::make_pair<double,double>(	0.650781,22	));
-	pbns.push_back(std::make_pair<double,double>(	0.654951,23	));
-	pbns.push_back(std::make_pair<double,double>(	0.683489,24	));
-	pbns.push_back(std::make_pair<double,double>(	0.687172,23	));
-	pbns.push_back(std::make_pair<double,double>(	0.69703,22	));
-	pbns.push_back(std::make_pair<double,double>(	0.701174,21	));
-	pbns.push_back(std::make_pair<double,double>(	0.717623,22	));
-	pbns.push_back(std::make_pair<double,double>(	0.722023,21	));
-	pbns.push_back(std::make_pair<double,double>(	0.722298,20	));
-	pbns.push_back(std::make_pair<double,double>(	0.725347,19	));
-	pbns.push_back(std::make_pair<double,double>(	0.73071,18	));
-	pbns.push_back(std::make_pair<double,double>(	0.758355,17	));
-	pbns.push_back(std::make_pair<double,double>(	0.770913,18	));
-	pbns.push_back(std::make_pair<double,double>(	0.790833,17	));
-	pbns.push_back(std::make_pair<double,double>(	0.821211,16	));
-	pbns.push_back(std::make_pair<double,double>(	0.849305,17	));
-	pbns.push_back(std::make_pair<double,double>(	0.853669,16	));
-	pbns.push_back(std::make_pair<double,double>(	0.866659,15	));
-	pbns.push_back(std::make_pair<double,double>(	0.872896,16	));
-	pbns.push_back(std::make_pair<double,double>(	0.889597,15	));
-	pbns.push_back(std::make_pair<double,double>(	0.900231,14	));
-	pbns.push_back(std::make_pair<double,double>(	0.903847,13	));
-	pbns.push_back(std::make_pair<double,double>(	0.906299,12	));
-	pbns.push_back(std::make_pair<double,double>(	0.910852,11	));
-	pbns.push_back(std::make_pair<double,double>(	0.93453,10	));
-	pbns.push_back(std::make_pair<double,double>(	0.944757,9	));
-	pbns.push_back(std::make_pair<double,double>(	0.947812,8	));
-	pbns.push_back(std::make_pair<double,double>(	0.959154,7	));
-	pbns.push_back(std::make_pair<double,double>(	0.975654,6	));
-	pbns.push_back(std::make_pair<double,double>(	0.976719,5	));
-	pbns.push_back(std::make_pair<double,double>(	0.977343,4	));
-	pbns.push_back(std::make_pair<double,double>(	0.980129,3	));
-	pbns.push_back(std::make_pair<double,double>(	0.987842,2	));
-	pbns.push_back(std::make_pair<double,double>(	0.990127,1	));
-	pbns.push_back(std::make_pair<double,double>(	0.994537,0	));
+	pbns.push_back(std::pair<double,double>(	0.0290362,1	));
+	pbns.push_back(std::pair<double,double>(	0.0307676,2	));
+	pbns.push_back(std::pair<double,double>(	0.0366312,3	));
+	pbns.push_back(std::pair<double,double>(	0.0544614,4	));
+	pbns.push_back(std::pair<double,double>(	0.0920033,5	));
+	pbns.push_back(std::pair<double,double>(	0.104599,6	));
+	pbns.push_back(std::pair<double,double>(	0.114718,7	));
+	pbns.push_back(std::pair<double,double>(	0.117379,8	));
+	pbns.push_back(std::pair<double,double>(	0.123493,9	));
+	pbns.push_back(std::pair<double,double>(	0.133638,10	));
+	pbns.push_back(std::pair<double,double>(	0.137798,9	));
+	pbns.push_back(std::pair<double,double>(	0.149798,10	));
+	pbns.push_back(std::pair<double,double>(	0.155421,11	));
+	pbns.push_back(std::pair<double,double>(	0.158443,12	));
+	pbns.push_back(std::pair<double,double>(	0.176956,13	));
+	pbns.push_back(std::pair<double,double>(	0.183234,12	));
+	pbns.push_back(std::pair<double,double>(	0.191069,13	));
+	pbns.push_back(std::pair<double,double>(	0.191333,14	));
+	pbns.push_back(std::pair<double,double>(	0.191836,15	));
+	pbns.push_back(std::pair<double,double>(	0.192675,16	));
+	pbns.push_back(std::pair<double,double>(	0.208564,17	));
+	pbns.push_back(std::pair<double,double>(	0.218425,18	));
+	pbns.push_back(std::pair<double,double>(	0.219902,17	));
+	pbns.push_back(std::pair<double,double>(	0.23233,16	));
+	pbns.push_back(std::pair<double,double>(	0.234558,17	));
+	pbns.push_back(std::pair<double,double>(	0.237166,16	));
+	pbns.push_back(std::pair<double,double>(	0.247352,17	));
+	pbns.push_back(std::pair<double,double>(	0.267421,18	));
+	pbns.push_back(std::pair<double,double>(	0.268093,19	));
+	pbns.push_back(std::pair<double,double>(	0.278734,18	));
+	pbns.push_back(std::pair<double,double>(	0.284722,19	));
+	pbns.push_back(std::pair<double,double>(	0.284998,20	));
+	pbns.push_back(std::pair<double,double>(	0.294069,21	));
+	pbns.push_back(std::pair<double,double>(	0.306293,22	));
+	pbns.push_back(std::pair<double,double>(	0.322361,21	));
+	pbns.push_back(std::pair<double,double>(	0.323152,22	));
+	pbns.push_back(std::pair<double,double>(	0.371021,23	));
+	pbns.push_back(std::pair<double,double>(	0.372395,24	));
+	pbns.push_back(std::pair<double,double>(	0.387744,25	));
+	pbns.push_back(std::pair<double,double>(	0.435537,26	));
+	pbns.push_back(std::pair<double,double>(	0.462911,25	));
+	pbns.push_back(std::pair<double,double>(	0.483569,26	));
+	pbns.push_back(std::pair<double,double>(	0.489209,25	));
+	pbns.push_back(std::pair<double,double>(	0.517115,24	));
+	pbns.push_back(std::pair<double,double>(	0.522197,23	));
+	pbns.push_back(std::pair<double,double>(	0.532665,22	));
+	pbns.push_back(std::pair<double,double>(	0.545262,23	));
+	pbns.push_back(std::pair<double,double>(	0.587227,22	));
+	pbns.push_back(std::pair<double,double>(	0.593036,23	));
+	pbns.push_back(std::pair<double,double>(	0.602647,24	));
+	pbns.push_back(std::pair<double,double>(	0.605044,25	));
+	pbns.push_back(std::pair<double,double>(	0.621962,24	));
+	pbns.push_back(std::pair<double,double>(	0.629449,23	));
+	pbns.push_back(std::pair<double,double>(	0.636719,22	));
+	pbns.push_back(std::pair<double,double>(	0.64957,21	));
+	pbns.push_back(std::pair<double,double>(	0.650781,22	));
+	pbns.push_back(std::pair<double,double>(	0.654951,23	));
+	pbns.push_back(std::pair<double,double>(	0.683489,24	));
+	pbns.push_back(std::pair<double,double>(	0.687172,23	));
+	pbns.push_back(std::pair<double,double>(	0.69703,22	));
+	pbns.push_back(std::pair<double,double>(	0.701174,21	));
+	pbns.push_back(std::pair<double,double>(	0.717623,22	));
+	pbns.push_back(std::pair<double,double>(	0.722023,21	));
+	pbns.push_back(std::pair<double,double>(	0.722298,20	));
+	pbns.push_back(std::pair<double,double>(	0.725347,19	));
+	pbns.push_back(std::pair<double,double>(	0.73071,18	));
+	pbns.push_back(std::pair<double,double>(	0.758355,17	));
+	pbns.push_back(std::pair<double,double>(	0.770913,18	));
+	pbns.push_back(std::pair<double,double>(	0.790833,17	));
+	pbns.push_back(std::pair<double,double>(	0.821211,16	));
+	pbns.push_back(std::pair<double,double>(	0.849305,17	));
+	pbns.push_back(std::pair<double,double>(	0.853669,16	));
+	pbns.push_back(std::pair<double,double>(	0.866659,15	));
+	pbns.push_back(std::pair<double,double>(	0.872896,16	));
+	pbns.push_back(std::pair<double,double>(	0.889597,15	));
+	pbns.push_back(std::pair<double,double>(	0.900231,14	));
+	pbns.push_back(std::pair<double,double>(	0.903847,13	));
+	pbns.push_back(std::pair<double,double>(	0.906299,12	));
+	pbns.push_back(std::pair<double,double>(	0.910852,11	));
+	pbns.push_back(std::pair<double,double>(	0.93453,10	));
+	pbns.push_back(std::pair<double,double>(	0.944757,9	));
+	pbns.push_back(std::pair<double,double>(	0.947812,8	));
+	pbns.push_back(std::pair<double,double>(	0.959154,7	));
+	pbns.push_back(std::pair<double,double>(	0.975654,6	));
+	pbns.push_back(std::pair<double,double>(	0.976719,5	));
+	pbns.push_back(std::pair<double,double>(	0.977343,4	));
+	pbns.push_back(std::pair<double,double>(	0.980129,3	));
+	pbns.push_back(std::pair<double,double>(	0.987842,2	));
+	pbns.push_back(std::pair<double,double>(	0.990127,1	));
+	pbns.push_back(std::pair<double,double>(	0.994537,0	));