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

5 files changed, 11 insertions, 32 deletions

diff --git a/src/Gudhi_stat/utilities/persistence_vectors/average_persistence_vectors.cpp b/src/Gudhi_stat/utilities/persistence_vectors/average_persistence_vectors.cpp
index 3262b157..cb3ea03d 100644
--- a/src/Gudhi_stat/utilities/persistence_vectors/average_persistence_vectors.cpp
+++ b/src/Gudhi_stat/utilities/persistence_vectors/average_persistence_vectors.cpp
@@ -21,8 +21,6 @@
  */
 
 
-
-#include <gudhi/abstract_classes/Abs_Topological_data.h>
 #include <gudhi/concretizations/Vector_distances_in_diagram.h>
 
 
@@ -51,12 +49,12 @@ int main( int argc , char** argv )
 	}
 	
 	std::cout << "Reading persistence vectors...\n";
-	std::vector< Abs_Topological_data_with_averages* > lands;
+	std::vector< Vector_distances_in_diagram< euclidean_distance<double> >* > lands;
 	for ( size_t i = 0 ; i != filenames.size() ; ++i )
 	{		
 		Vector_distances_in_diagram< euclidean_distance<double> >* l = new Vector_distances_in_diagram< euclidean_distance<double> >;
 		l->load_from_file( filenames[i] );
-		lands.push_back( (Abs_Topological_data_with_averages*)l );
+		lands.push_back(l );
 	}
 	
 	Vector_distances_in_diagram< euclidean_distance<double> > av;
diff --git a/src/Gudhi_stat/utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp b/src/Gudhi_stat/utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp
index 33d92a72..5f8c6b52 100644
--- a/src/Gudhi_stat/utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp
+++ b/src/Gudhi_stat/utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp
@@ -20,9 +20,6 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-
-#include <gudhi/abstract_classes/Abs_Topological_data.h>
 #include <gudhi/concretizations/Vector_distances_in_diagram.h>
 
 
@@ -53,13 +50,13 @@ int main( int argc , char** argv )
 	{
 		filenames.push_back( argv[i] );
 	}
-	std::vector< Vector_distances_in_diagram< euclidean_distance<double> >* > vectors;
+	std::vector< Vector_distances_in_diagram< euclidean_distance<double> > > vectors;
 	vectors.reserve( filenames.size() );
 	for ( size_t file_no = 0 ; file_no != filenames.size() ; ++file_no )
 	{
 		//cerr << filenames[file_no] << endl;
-		Vector_distances_in_diagram< euclidean_distance<double> >* l = new Vector_distances_in_diagram< euclidean_distance<double> >;
-		l->load_from_file( filenames[file_no] );
+		Vector_distances_in_diagram< euclidean_distance<double> > l;
+		l.load_from_file( filenames[file_no] );
 		vectors.push_back( l );
 	}
 		
@@ -78,7 +75,7 @@ int main( int argc , char** argv )
 	{
 		for ( size_t j = i+1 ; j != vectors.size() ; ++j )
 		{
-			distance[i][j] = distance[j][i] = ((Vector_distances_in_diagram< euclidean_distance<double> >*)vectors[i])->distance( vectors[j] , p ) ;
+			distance[i][j] = distance[j][i] = vectors[i].distance( vectors[j] , p ) ;
 		}
 	}
 	
diff --git a/src/Gudhi_stat/utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp b/src/Gudhi_stat/utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp
index 5bea2765..a02cd078 100644
--- a/src/Gudhi_stat/utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp
+++ b/src/Gudhi_stat/utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp
@@ -20,9 +20,6 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-
-#include <gudhi/abstract_classes/Abs_Topological_data.h>
 #include <gudhi/concretizations/Vector_distances_in_diagram.h>
 
 
@@ -44,12 +41,12 @@ int main( int argc , char** argv )
 	{
 		filenames.push_back( argv[i] );
 	}
-	std::vector< Vector_distances_in_diagram< euclidean_distance<double> >* > vectors;
+	std::vector< Vector_distances_in_diagram< euclidean_distance<double> > > vectors;
 	vectors.reserve( filenames.size() );
 	for ( size_t file_no = 0 ; file_no != filenames.size() ; ++file_no )
 	{
-		Vector_distances_in_diagram< euclidean_distance<double> >* l = new Vector_distances_in_diagram< euclidean_distance<double> >;
-		l->load_from_file( filenames[file_no] );
+		Vector_distances_in_diagram< euclidean_distance<double> > l;
+		l.load_from_file( filenames[file_no] );
 		vectors.push_back( l );
 	}
 		
@@ -68,7 +65,7 @@ int main( int argc , char** argv )
 	{
 		for ( size_t j = i ; j != vectors.size() ; ++j )
 		{
-			scalar_product[i][j] = scalar_product[j][i] = ((Vector_distances_in_diagram< euclidean_distance<double> >*)vectors[i])->compute_scalar_product( vectors[j] ) ;
+			scalar_product[i][j] = scalar_product[j][i] = vectors[i].compute_scalar_product( vectors[j] ) ;
 		}
 	}
 	
@@ -85,13 +82,6 @@ int main( int argc , char** argv )
 		cout << endl;
 		out << endl;
 	}
-	out.close();
-	
-	//cleaning up
-	for ( size_t i = 0 ; i != vectors.size() ; ++i )
-	{
-		delete vectors[i];
-	}
-		
+	out.close();	
 	return 0;
 }
diff --git a/src/Gudhi_stat/utilities/persistence_vectors/create_persistence_vectors.cpp b/src/Gudhi_stat/utilities/persistence_vectors/create_persistence_vectors.cpp
index 657dd2d4..9f6b79cb 100644
--- a/src/Gudhi_stat/utilities/persistence_vectors/create_persistence_vectors.cpp
+++ b/src/Gudhi_stat/utilities/persistence_vectors/create_persistence_vectors.cpp
@@ -20,9 +20,6 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-
-#include <gudhi/abstract_classes/Abs_Topological_data.h>
 #include <gudhi/concretizations/Vector_distances_in_diagram.h>
 
 
diff --git a/src/Gudhi_stat/utilities/persistence_vectors/plot_persistence_vectors.cpp b/src/Gudhi_stat/utilities/persistence_vectors/plot_persistence_vectors.cpp
index 53f53654..de19a66d 100644
--- a/src/Gudhi_stat/utilities/persistence_vectors/plot_persistence_vectors.cpp
+++ b/src/Gudhi_stat/utilities/persistence_vectors/plot_persistence_vectors.cpp
@@ -20,9 +20,6 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-
-#include <gudhi/abstract_classes/Abs_Topological_data.h>
 #include <gudhi/concretizations/Vector_distances_in_diagram.h>