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, 20 insertions, 20 deletions

diff --git a/src/Gudhi_stat/example/persistence_heat_maps.cpp b/src/Gudhi_stat/example/persistence_heat_maps.cpp
index 7f5580da..645f63f7 100644
--- a/src/Gudhi_stat/example/persistence_heat_maps.cpp
+++ b/src/Gudhi_stat/example/persistence_heat_maps.cpp
@@ -75,17 +75,17 @@ int main( int argc , char** argv )
 	median.compute_median( vector_of_maps );
 	
 	//to compute L^1 disance between hm1 and hm2:
-	std::cout << "The L^1 distance is : " << hm1.distance( (Abs_Topological_data_with_distances*)(&hm2) , 1 ) << std::endl;
+	std::cout << "The L^1 distance is : " << hm1.distance( hm2 , 1 ) << std::endl;
 	
 	//to average of hm1 and hm2:
-	std::vector< Abs_Topological_data_with_averages* > to_average;
-	to_average.push_back( (Abs_Topological_data_with_averages*)(&hm1) );
-	to_average.push_back( (Abs_Topological_data_with_averages*)(&hm2) );
+	std::vector< Persistence_heat_maps* > to_average;
+	to_average.push_back( &hm1 );
+	to_average.push_back( &hm2 );
 	Persistence_heat_maps av;	
 	av.compute_average( to_average );	
 	
 	//to compute scalar product of hm1 and hm2:
-	std::cout << "Scalar product is : " << hm1.compute_scalar_product( (Abs_Topological_data_with_scalar_product*)(&hm2) ) << std::endl;
+	std::cout << "Scalar product is : " << hm1.compute_scalar_product( hm2 ) << std::endl;
 	
 	return 0;
 }
diff --git a/src/Gudhi_stat/example/persistence_landscape.cpp b/src/Gudhi_stat/example/persistence_landscape.cpp
index f5110153..106864c0 100644
--- a/src/Gudhi_stat/example/persistence_landscape.cpp
+++ b/src/Gudhi_stat/example/persistence_landscape.cpp
@@ -76,17 +76,17 @@ int main( int argc , char** argv )
 	
 	//here is the average of landscapes:
 	Persistence_landscape average;
-	std::vector< Abs_Topological_data_with_averages* > to_average;
-	to_average.push_back( (Abs_Topological_data_with_averages*)(&l1) );
-	to_average.push_back( (Abs_Topological_data_with_averages*)(&l2) );
+	std::vector< Persistence_landscape* > to_average;
+	to_average.push_back( &l1 );
+	to_average.push_back( &l2 );
 	average.compute_average( to_average );
 	std::cout << "average : " << average << std::endl;
 	
 	//here is the distance of landscapes:
-	std::cout << "Distance : " << l1.distance( (Abs_Topological_data_with_distances*)(&l2) ) << std::endl;
+	std::cout << "Distance : " << l1.distance( l2 ) << std::endl;
 	
 	//here is the scalar product of landscapes:
-	std::cout << "Scalar product : " << l1.compute_scalar_product( (Abs_Topological_data_with_scalar_product*)(&l2) ) << std::endl;
+	std::cout << "Scalar product : " << l1.compute_scalar_product( l2 ) << std::endl;
 	
 	//here is how to create a file which is suitable for vizualization via gnuplot:
 	average.plot( "average_landscape" );
diff --git a/src/Gudhi_stat/example/persistence_landscape_on_grid.cpp b/src/Gudhi_stat/example/persistence_landscape_on_grid.cpp
index ddda78d2..223c9d50 100644
--- a/src/Gudhi_stat/example/persistence_landscape_on_grid.cpp
+++ b/src/Gudhi_stat/example/persistence_landscape_on_grid.cpp
@@ -72,17 +72,17 @@ int main( int argc , char** argv )
 	
 	//here is the average of landscapes:
 	Persistence_landscape_on_grid average;
-	std::vector< Abs_Topological_data_with_averages* > to_average;
-	to_average.push_back( (Abs_Topological_data_with_averages*)(&l1) );
-	to_average.push_back( (Abs_Topological_data_with_averages*)(&l2) );
+	std::vector< Persistence_landscape_on_grid* > to_average;
+	to_average.push_back( &l1 );
+	to_average.push_back( &l2 );
 	average.compute_average( to_average );
 	std::cout << "average : " << average << std::endl;
 	
 	//here is the distance of landscapes:
-	std::cout << "Distance : " << l1.distance( (Abs_Topological_data_with_distances*)(&l2) ) << std::endl;
+	std::cout << "Distance : " << l1.distance( l2 ) << std::endl;
 	
 	//here is the scalar product of landscapes:
-	std::cout << "Scalar product : " << l1.compute_scalar_product( (Abs_Topological_data_with_scalar_product*)(&l2) ) << std::endl;
+	std::cout << "Scalar product : " << l1.compute_scalar_product( l2 ) << std::endl;
 	
 	//here is how to create a file which is suitable for vizualization via gnuplot:
 	average.plot( "average_landscape" );
diff --git a/src/Gudhi_stat/example/vector_representation.cpp b/src/Gudhi_stat/example/vector_representation.cpp
index 773c60fa..835b52f9 100644
--- a/src/Gudhi_stat/example/vector_representation.cpp
+++ b/src/Gudhi_stat/example/vector_representation.cpp
@@ -66,17 +66,17 @@ int main( int argc , char** argv )
 	
 	//averages:
 	Vector_distances_in_diagram<euclidean_distance<double> > average;
-	std::vector< Abs_Topological_data_with_averages* > to_average;
-	to_average.push_back( (Abs_Topological_data_with_averages*)(&v1) );
-	to_average.push_back( (Abs_Topological_data_with_averages*)(&v2) );
+	std::vector< Vector_distances_in_diagram<euclidean_distance<double> >* > to_average;
+	to_average.push_back( &v1 );
+	to_average.push_back( &v2 );
 	average.compute_average( to_average );
 	std::cout << "Average : " << average << std::endl;
 	
 	//computations of distances:
-	std::cout << "l^1 distance : " << v1.distance( (Abs_Topological_data_with_distances*)(&v2) ) << std::endl;
+	std::cout << "l^1 distance : " << v1.distance( v2 ) << std::endl;
     
    //computations of scalar product:
-    std::cout << "Scalar product of l1 and l2 : " << v1.compute_scalar_product( (Abs_Topological_data_with_scalar_product*)(&v2) ) << std::endl;
+    std::cout << "Scalar product of l1 and l2 : " << v1.compute_scalar_product( v2 ) << std::endl;
     
     //create a file with a gnuplot script:
     v1.plot( "plot_of_vector_representation" );