a few more correction. First of all, bottleneck distance is added (although there is something strange in the results, FG has been pinged about this). Second of all, all the programs in utylites should now read general files (and dimension of persistence to be read is one of the parameteds of files). This still need to be tested and will be tested soon.

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

Former-commit-id: e60d14f07db223646597230d7f0bd78dd090bc0b

1 files changed, 13 insertions, 4 deletions

diff --git a/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/create_landscapes_on_grid.cpp b/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/create_landscapes_on_grid.cpp
index 4f36f02d..eb534bf1 100644
--- a/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/create_landscapes_on_grid.cpp
+++ b/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/create_landscapes_on_grid.cpp
@@ -36,9 +36,12 @@ int main( int argc , char** argv )
 	std::cout << "This program creates persistence landscape on grid of diagrams provided as an input.\n";
 	std::cout << "The first parameter of a program is an integer, a size of a grid.\n";
 	std::cout << "The second and third parameters are min and max of the grid. If you want those numbers to be computed based on the data, set them both to -1 \n";
+	std::cout << "The fourth parameter of the program is the dimension of persistence to be used to construct persistence landscape on a grid. If your file contains ";
+	std::cout << "the information about dimension of birth-death pairs, please provide here the dimension of intervals you want to use. If your input files consist only ";
+	std::cout << "of birth-death pairs, please set the fourth parameter to -1 \n";
 	std::cout << "The remaining parameters are the names of files with persistence diagrams. \n";
 	
-	if ( argc < 4 )
+	if ( argc < 5 )
 	{
 		std::cout << "Wrong parameter list, the program will now terminate \n";
 		return 1;
@@ -47,9 +50,15 @@ int main( int argc , char** argv )
 	size_t size_of_grid = (size_t)atoi( argv[1] );
 	double min_ = atof( argv[2] );
 	double max_ = atof( argv[3] );
+	int dim = atoi( argv[4] );
+	unsigned dimension = std::numeric_limits<unsigned>::max();
+	if ( (dim != -1) && (dim >= 0) )
+	{
+		dimension = (unsigned)dim;
+	}
 	
 	std::vector< const char* > filenames;
-	for ( int i = 4 ; i < argc ; ++i )
+	for ( int i = 5 ; i < argc ; ++i )
 	{
 		filenames.push_back( argv[i] );
 	}
@@ -61,12 +70,12 @@ int main( int argc , char** argv )
 		Persistence_landscape_on_grid l;
 		if ( (min_ != -1) || (max_ != -1) )
 		{
-			l = Persistence_landscape_on_grid( filenames[i] , min_ , max_ , size_of_grid );
+			l = Persistence_landscape_on_grid( filenames[i] , min_ , max_ , size_of_grid , dimension );
 		}
 		else
 		{
 			//(min_ == -1) && (max_ == -1), in this case the program will find min_ and max_ based on the data.
-			l = Persistence_landscape_on_grid( filenames[i] , size_of_grid );
+			l = Persistence_landscape_on_grid( filenames[i] , size_of_grid , dimension );
 		}		
 		std::stringstream ss;
 		ss << filenames[i] << ".g_land";