A few more modifications to the Gudhi stat. Now all the utilities are tested, and some corrections to the tests are added.

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

Former-commit-id: 5032a8c66a13764ee929a76ac301667f4d67de45

4 files changed, 16 insertions, 13 deletions

diff --git a/src/Gudhi_stat/example/utilities/persistence_vectors/average_persistence_vectors.cpp b/src/Gudhi_stat/example/utilities/persistence_vectors/average_persistence_vectors.cpp
index f0c0ba61..1b269e9c 100644
--- a/src/Gudhi_stat/example/utilities/persistence_vectors/average_persistence_vectors.cpp
+++ b/src/Gudhi_stat/example/utilities/persistence_vectors/average_persistence_vectors.cpp
@@ -35,7 +35,8 @@ using namespace Gudhi::Gudhi_stat;
 
 int main( int argc , char** argv )
 {
-	std::cout << "This program computes average persistence landscape of persistence landscapes created based on persistence diagrams provided as an input. Please call this program with the names of files with persistence diagrams \n";
+	std::cout << "This program computes average persistence vector of persistence vectors created based on persistence diagrams provided as an input. \n";
+	std::cout << "Please call this program with the names of files with persistence diagrams \n";
 	std::vector< const char* > filenames;
 	
 	if ( argc == 1 )
@@ -49,10 +50,10 @@ int main( int argc , char** argv )
 		filenames.push_back( argv[i] );
 	}
 	
-	std::cout << "Creating persistence landscapes...\n";
+	std::cout << "Reading persistence vectors...\n";
 	std::vector< Abs_Topological_data_with_averages* > 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 );
@@ -61,7 +62,7 @@ int main( int argc , char** argv )
 	Vector_distances_in_diagram< euclidean_distance<double> > av;
 	av.compute_average( lands );
 	
-	av.print_to_file( "average" );
+	av.print_to_file( "average.vect" );
 	
 	for ( size_t i = 0 ; i != filenames.size() ; ++i )
 	{
diff --git a/src/Gudhi_stat/example/utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp b/src/Gudhi_stat/example/utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp
index f93c910a..72026497 100644
--- a/src/Gudhi_stat/example/utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp
+++ b/src/Gudhi_stat/example/utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp
@@ -36,9 +36,9 @@ using namespace Gudhi::Gudhi_stat;
 
 int main( int argc , char** argv )
 {
-	std::cout << "This program compute dsitance of persistence vectors stored in a file (the file needs to be created beforehand). \n";	
-	std::cout << "The first parameter of a program is an interger p. The program compute l^p distance of the vectors. For L^infty distance choose p = -1. \n";
-	std::cout << "The remaining parameters of this programs are names of files with persistence vectors.";
+	std::cout << "This program compute distance of persistence vectors stored in a file (the file needs to be created beforehand). \n";	
+	std::cout << "The first parameter of a program is an interger p. The program compute l^p distance of the vectors. For l^infty distance choose p = -1. \n";
+	std::cout << "The remaining parameters of this programs are names of files with persistence vectors.\n";
 	
 	if ( argc < 3 )
 	{
@@ -46,7 +46,7 @@ int main( int argc , char** argv )
 		return 1;
 	}
 	
-	int p = atoi( argv[3] );
+	int p = atoi( argv[1] );
 
 	std::vector< const char* > filenames;
 	for ( int i = 2 ; i < argc ; ++i )
@@ -57,6 +57,7 @@ int main( int argc , char** argv )
 	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] );
 		vectors.push_back( l );
@@ -71,11 +72,11 @@ int main( int argc , char** argv )
 		std::vector< double > v( filenames.size() , 0 );
 		distance[i] = v;
 	}
-	
+		
 	//and now we can compute the distances:
 	for ( size_t i = 0 ; i != vectors.size() ; ++i )
 	{
-		for ( size_t j = i ; j != vectors.size() ; ++j )
+		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 ) ;
 		}
diff --git a/src/Gudhi_stat/example/utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp b/src/Gudhi_stat/example/utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp
index c886d076..16192d52 100644
--- a/src/Gudhi_stat/example/utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp
+++ b/src/Gudhi_stat/example/utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp
@@ -37,7 +37,7 @@ using namespace Gudhi::Gudhi_stat;
 int main( int argc , char** argv )
 {
 	std::cout << "This program compute scalar product of persistence vectors stored in a file (the file needs to be created beforehand). \n";	
-	std::cout << "The parameters of this programs are names of files with persistence vectors.";
+	std::cout << "The parameters of this programs are names of files with persistence vectors.\n";
 
 	std::vector< const char* > filenames;
 	for ( int i = 1 ; i < argc ; ++i )
diff --git a/src/Gudhi_stat/example/utilities/persistence_vectors/create_persistence_vectors.cpp b/src/Gudhi_stat/example/utilities/persistence_vectors/create_persistence_vectors.cpp
index b800c872..99015e41 100644
--- a/src/Gudhi_stat/example/utilities/persistence_vectors/create_persistence_vectors.cpp
+++ b/src/Gudhi_stat/example/utilities/persistence_vectors/create_persistence_vectors.cpp
@@ -43,10 +43,10 @@ int main( int argc , char** argv )
 		filenames.push_back( argv[i] );
 	}
 	
-	std::cout << "Creating persistence vectors...\n";	
 	for ( size_t i = 0 ; i != filenames.size() ; ++i )
 	{
-		Vector_distances_in_diagram< euclidean_distance<double> > l( filenames[i] , -1 );
+		std::cerr << "Creatign persistence vectors based on a file : " << filenames[i] << std::endl;
+		Vector_distances_in_diagram< euclidean_distance<double> > l( filenames[i] , -1 );				
 		std::stringstream ss;
 		ss << filenames[i] << ".vect";
 		l.print_to_file( ss.str().c_str() );
@@ -54,3 +54,4 @@ int main( int argc , char** argv )
 	std::cout << "Done \n";
 	return 0;
 }
+