The library changed from inherritance to templates.

Are the files from include/abstract removed? 



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

Former-commit-id: 6f768b08a7a900a56278adcf371a31840916d3ba

4 files changed, 57 insertions, 57 deletions

diff --git a/src/Gudhi_stat/test/persistence_heat_maps_test.cpp b/src/Gudhi_stat/test/persistence_heat_maps_test.cpp
index c4c97d72..d9cba466 100644
--- a/src/Gudhi_stat/test/persistence_heat_maps_test.cpp
+++ b/src/Gudhi_stat/test/persistence_heat_maps_test.cpp
@@ -61,10 +61,10 @@ BOOST_AUTO_TEST_CASE(check_averages_of_heat_maps)
 	Persistence_heat_maps q( "data/file_with_diagram_1" , filter ,  constant_function, false , 1000 , 0 , 10 );
 	Persistence_heat_maps r( "data/file_with_diagram_2" , filter ,  constant_function, false , 1000 , 0 , 10 );
 	
-	std::vector< Abs_Topological_data_with_averages* > to_average;
-	to_average.push_back( (Abs_Topological_data_with_averages*)(&p) );
-	to_average.push_back( (Abs_Topological_data_with_averages*)(&q) );
-	to_average.push_back( (Abs_Topological_data_with_averages*)(&r) );
+	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 );
 	
@@ -164,28 +164,28 @@ BOOST_AUTO_TEST_CASE(check_distance_for_heat_maps)
 	Persistence_heat_maps q( "data/file_with_diagram_1" , filter ,  constant_function, false , 1000 , 0 , 1 );
 	Persistence_heat_maps r( "data/file_with_diagram_2" , filter ,  constant_function, false , 1000 , 0 , 1 );
 
-	//cerr << p.distance( (Abs_Topological_data_with_distances*)&p ) << endl;
-	//cerr << p.distance( (Abs_Topological_data_with_distances*)&q ) << endl;
-	//cerr << p.distance( (Abs_Topological_data_with_distances*)&r ) << endl;	
-	//cerr << q.distance( (Abs_Topological_data_with_distances*)&p ) << endl;
-	//cerr << q.distance( (Abs_Topological_data_with_distances*)&q ) << endl;
-	//cerr << q.distance( (Abs_Topological_data_with_distances*)&r ) << endl;	
-	//cerr << r.distance( (Abs_Topological_data_with_distances*)&p ) << endl;
-	//cerr << r.distance( (Abs_Topological_data_with_distances*)&q ) << endl;
-	//cerr << r.distance( (Abs_Topological_data_with_distances*)&r ) << endl;	
+	//cerr << p.distance( p ) << endl;
+	//cerr << p.distance( q ) << endl;
+	//cerr << p.distance( r ) << endl;	
+	//cerr << q.distance( p ) << endl;
+	//cerr << q.distance( q ) << endl;
+	//cerr << q.distance( r ) << endl;	
+	//cerr << r.distance( p ) << endl;
+	//cerr << r.distance( q ) << endl;
+	//cerr << r.distance( r ) << endl;	
 	//0         624.183   415.815
 	//624.183   0         528.06Z
 	//415.815   528.066   0
 
-	BOOST_CHECK( fabs( p.distance( (Abs_Topological_data_with_distances*)&p ) - 0) < 0.0005);
-	BOOST_CHECK( fabs( p.distance( (Abs_Topological_data_with_distances*)&q ) - 624.183)< 0.0005);
-	BOOST_CHECK( fabs( p.distance( (Abs_Topological_data_with_distances*)&r ) - 415.815)< 0.0005);
-	BOOST_CHECK( fabs( q.distance( (Abs_Topological_data_with_distances*)&p ) - 624.183)< 0.0005);
-	BOOST_CHECK( fabs( q.distance( (Abs_Topological_data_with_distances*)&q ) - 0)< 0.0005);
-	BOOST_CHECK( fabs( q.distance( (Abs_Topological_data_with_distances*)&r ) - 528.066)< 0.0005);
-	BOOST_CHECK( fabs( r.distance( (Abs_Topological_data_with_distances*)&p ) - 415.815)< 0.0005);
-	BOOST_CHECK( fabs( r.distance( (Abs_Topological_data_with_distances*)&q ) - 528.066)< 0.0005);
-	BOOST_CHECK( fabs( r.distance( (Abs_Topological_data_with_distances*)&r ) - 0)< 0.0005);
+	BOOST_CHECK( fabs( p.distance( p ) - 0) < 0.0005);
+	BOOST_CHECK( fabs( p.distance( q ) - 624.183)< 0.0005);
+	BOOST_CHECK( fabs( p.distance( r ) - 415.815)< 0.0005);
+	BOOST_CHECK( fabs( q.distance( p ) - 624.183)< 0.0005);
+	BOOST_CHECK( fabs( q.distance( q ) - 0)< 0.0005);
+	BOOST_CHECK( fabs( q.distance( r ) - 528.066)< 0.0005);
+	BOOST_CHECK( fabs( r.distance( p ) - 415.815)< 0.0005);
+	BOOST_CHECK( fabs( r.distance( q ) - 528.066)< 0.0005);
+	BOOST_CHECK( fabs( r.distance( r ) - 0)< 0.0005);
 }
 
 
@@ -214,25 +214,25 @@ BOOST_AUTO_TEST_CASE(check_scalar_products_for_heat_maps)
 	Persistence_heat_maps q( "data/file_with_diagram_1" , filter ,  constant_function, false , 1000 , 0 , 1 );
 	Persistence_heat_maps r( "data/file_with_diagram_2" , filter ,  constant_function, false , 1000 , 0 , 1 );
 
-	//cerr << p.compute_scalar_product( (Abs_Topological_data_with_scalar_product*)&p ) << endl;
-	//cerr << p.compute_scalar_product( (Abs_Topological_data_with_scalar_product*)&q ) << endl;
-	//cerr << p.compute_scalar_product( (Abs_Topological_data_with_scalar_product*)&r ) << endl;
-	//cerr << q.compute_scalar_product( (Abs_Topological_data_with_scalar_product*)&p ) << endl;
-	//cerr << q.compute_scalar_product( (Abs_Topological_data_with_scalar_product*)&q ) << endl;
-	//cerr << q.compute_scalar_product( (Abs_Topological_data_with_scalar_product*)&r ) << endl;	
-	//cerr << r.compute_scalar_product( (Abs_Topological_data_with_scalar_product*)&p ) << endl;
-	//cerr << r.compute_scalar_product( (Abs_Topological_data_with_scalar_product*)&q ) << endl;
-	//cerr << r.compute_scalar_product( (Abs_Topological_data_with_scalar_product*)&r ) << endl;
-	
-
-	BOOST_CHECK( fabs( p.compute_scalar_product( (Abs_Topological_data_with_scalar_product*)&p ) - 0.0345687 )< 0.0005);
-	BOOST_CHECK( fabs( p.compute_scalar_product( (Abs_Topological_data_with_scalar_product*)&q ) - 0.0509357 )< 0.0005);
-	BOOST_CHECK( fabs( p.compute_scalar_product( (Abs_Topological_data_with_scalar_product*)&r ) - 0.0375608 )< 0.0005);
-	BOOST_CHECK( fabs( q.compute_scalar_product( (Abs_Topological_data_with_scalar_product*)&p ) - 0.0509357 )< 0.0005);
-	BOOST_CHECK( fabs( q.compute_scalar_product( (Abs_Topological_data_with_scalar_product*)&q ) - 1.31293 )< 0.0005);
-	BOOST_CHECK( fabs( q.compute_scalar_product( (Abs_Topological_data_with_scalar_product*)&r ) - 0.536799)< 0.0005);
-	BOOST_CHECK( fabs( r.compute_scalar_product( (Abs_Topological_data_with_scalar_product*)&p ) - 0.0375608)< 0.0005);
-	BOOST_CHECK( fabs( r.compute_scalar_product( (Abs_Topological_data_with_scalar_product*)&q ) - 0.536799)< 0.0005);
-	BOOST_CHECK( fabs( r.compute_scalar_product( (Abs_Topological_data_with_scalar_product*)&r ) - 0.672907)< 0.0005);
+	//cerr << p.compute_scalar_product( p ) << endl;
+	//cerr << p.compute_scalar_product( q ) << endl;
+	//cerr << p.compute_scalar_product( r ) << endl;
+	//cerr << q.compute_scalar_product( p ) << endl;
+	//cerr << q.compute_scalar_product( q ) << endl;
+	//cerr << q.compute_scalar_product( r ) << endl;	
+	//cerr << r.compute_scalar_product( p ) << endl;
+	//cerr << r.compute_scalar_product( q ) << endl;
+	//cerr << r.compute_scalar_product( r ) << endl;
+	
+
+	BOOST_CHECK( fabs( p.compute_scalar_product( p ) - 0.0345687 )< 0.0005);
+	BOOST_CHECK( fabs( p.compute_scalar_product( q ) - 0.0509357 )< 0.0005);
+	BOOST_CHECK( fabs( p.compute_scalar_product( r ) - 0.0375608 )< 0.0005);
+	BOOST_CHECK( fabs( q.compute_scalar_product( p ) - 0.0509357 )< 0.0005);
+	BOOST_CHECK( fabs( q.compute_scalar_product( q ) - 1.31293 )< 0.0005);
+	BOOST_CHECK( fabs( q.compute_scalar_product( r ) - 0.536799)< 0.0005);
+	BOOST_CHECK( fabs( r.compute_scalar_product( p ) - 0.0375608)< 0.0005);
+	BOOST_CHECK( fabs( r.compute_scalar_product( q ) - 0.536799)< 0.0005);
+	BOOST_CHECK( fabs( r.compute_scalar_product( r ) - 0.672907)< 0.0005);
 	
 }
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 d7d72d6b..17ed9fde 100644
--- a/src/Gudhi_stat/test/persistence_lanscapes_on_grid_test.cpp
+++ b/src/Gudhi_stat/test/persistence_lanscapes_on_grid_test.cpp
@@ -219,7 +219,7 @@ 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< Abs_Topological_data_with_averages* > to_average;
+	std::vector< Persistence_landscape_on_grid* > to_average;
 	to_average.push_back( &p );
 	to_average.push_back( &q );
 	Persistence_landscape_on_grid av;	
@@ -237,9 +237,9 @@ BOOST_AUTO_TEST_CASE(check_computations_of_distances)
 {
 	Persistence_landscape_on_grid p( "data/file_with_diagram", 0,1,10000 );
 	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 )- 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 );
 }
 	
 
@@ -247,8 +247,8 @@ BOOST_AUTO_TEST_CASE(check_computations_of_scalar_product)
 {
 	Persistence_landscape_on_grid p( "data/file_with_diagram" , 0,1,10000);
 	Persistence_landscape_on_grid q( "data/file_with_diagram_1", 0,1,10000 );
-	//std::cerr << p.compute_scalar_product( &q ) << std::endl;
-	BOOST_CHECK( almost_equal(  p.compute_scalar_product( &q ) , p.compute_scalar_product( &q ) ) );	
+	//std::cerr << p.compute_scalar_product( q ) << std::endl;
+	BOOST_CHECK( almost_equal(  p.compute_scalar_product( q ) , 0.754367 ) );	
 }
 
 
diff --git a/src/Gudhi_stat/test/persistence_lanscapes_test.cpp b/src/Gudhi_stat/test/persistence_lanscapes_test.cpp
index 9506410a..9ec7f880 100644
--- a/src/Gudhi_stat/test/persistence_lanscapes_test.cpp
+++ b/src/Gudhi_stat/test/persistence_lanscapes_test.cpp
@@ -191,7 +191,7 @@ 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< Abs_Topological_data_with_averages* > to_average;
+	std::vector< Persistence_landscape* > to_average;
 	to_average.push_back( &p );
 	to_average.push_back( &q );
 	Persistence_landscape av;
@@ -209,9 +209,9 @@ BOOST_AUTO_TEST_CASE(check_computations_of_distances)
 {
 	Persistence_landscape p( "data/file_with_diagram" );
 	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 )- 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 );	
 }
 	
 
@@ -219,6 +219,6 @@ BOOST_AUTO_TEST_CASE(check_computations_of_scalar_product)
 {
 	Persistence_landscape p( "data/file_with_diagram" );
 	Persistence_landscape q( "data/file_with_diagram_1" );
-	BOOST_CHECK( fabs(  p.compute_scalar_product( &q ) - 0.754498 ) <= 0.00001 );	
+	BOOST_CHECK( fabs(  p.compute_scalar_product( q ) - 0.754498 ) <= 0.00001 );	
 }
 
diff --git a/src/Gudhi_stat/test/vector_representation_test.cpp b/src/Gudhi_stat/test/vector_representation_test.cpp
index 44801ad9..3e14bd59 100644
--- a/src/Gudhi_stat/test/vector_representation_test.cpp
+++ b/src/Gudhi_stat/test/vector_representation_test.cpp
@@ -315,7 +315,7 @@ BOOST_AUTO_TEST_CASE(check_distance_computations)
 	intervals[9] = std::pair<double,double>( 19,20 );		
 	Vector_distances_in_diagram< euclidean_distance<double> > 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( (Abs_Topological_data_with_distances*)(&p_bis) , 1 ) , 1.86428 ) );		
+	BOOST_CHECK( almost_equal ( p_prime.distance( p_bis , 1 ) , 1.86428 ) );		
 }
 
 
@@ -337,9 +337,9 @@ BOOST_AUTO_TEST_CASE(check_compute_average)
 	Vector_distances_in_diagram< euclidean_distance<double> > A( i1 , -1 );
 	Vector_distances_in_diagram< euclidean_distance<double> > B( i1 , -1 );
 	
-	std::vector< Abs_Topological_data_with_averages* > to_average;
-	to_average.push_back( (Abs_Topological_data_with_averages*)(&A) );
-	to_average.push_back( (Abs_Topological_data_with_averages*)(&B) );
+	std::vector< Vector_distances_in_diagram< euclidean_distance<double> >* > to_average;
+	to_average.push_back( &A );
+	to_average.push_back( &B );
 	
 	Vector_distances_in_diagram< euclidean_distance<double> > average; 
 	average.compute_average( to_average );