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

7 files changed, 188 insertions, 26 deletions

diff --git a/src/Gudhi_stat/utilities/persistence_intervals/CMakeLists.txt b/src/Gudhi_stat/utilities/persistence_intervals/CMakeLists.txt
index 96cb1a5e..9420a8ea 100644
--- a/src/Gudhi_stat/utilities/persistence_intervals/CMakeLists.txt
+++ b/src/Gudhi_stat/utilities/persistence_intervals/CMakeLists.txt
@@ -1,8 +1,6 @@
 cmake_minimum_required(VERSION 2.6)
 project(GUDHI_STAT)
 
-
-
 #persitence diagrams
 add_executable ( plot_persistence_intervals plot_persistence_intervals.cpp )
 target_link_libraries( plot_persistence_intervals ${Boost_SYSTEM_LIBRARY})
@@ -16,7 +14,14 @@ target_link_libraries( compute_number_of_dominant_intervals ${Boost_SYSTEM_LIBRA
 add_executable ( plot_histogram_of_intervals_lengths plot_histogram_of_intervals_lengths.cpp )
 target_link_libraries( plot_histogram_of_intervals_lengths ${Boost_SYSTEM_LIBRARY})
 
-add_executable ( plot_persistence_Betti_numebrs plot_persistence_Betti_numebrs.cpp )
-target_link_libraries( plot_persistence_Betti_numebrs ${Boost_SYSTEM_LIBRARY})
+add_executable ( plot_persistence_Betti_numbers plot_persistence_Betti_numbers.cpp )
+target_link_libraries( plot_persistence_Betti_numbers ${Boost_SYSTEM_LIBRARY})
+
+if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
+add_executable ( compute_bottleneck_distance compute_bottleneck_distance.cpp )
+target_link_libraries( compute_bottleneck_distance ${Boost_SYSTEM_LIBRARY})
+if (TBB_FOUND)
+target_link_libraries(compute_bottleneck_distance ${TBB_LIBRARIES})
+endif(TBB_FOUND)
 
-#when we have bottleneck and wasserstein distance computations, add suitable programs here.
+endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
diff --git a/src/Gudhi_stat/utilities/persistence_intervals/compute_birth_death_range_in_persistence_diagram.cpp b/src/Gudhi_stat/utilities/persistence_intervals/compute_birth_death_range_in_persistence_diagram.cpp
index 145040fe..426a9b7b 100644
--- a/src/Gudhi_stat/utilities/persistence_intervals/compute_birth_death_range_in_persistence_diagram.cpp
+++ b/src/Gudhi_stat/utilities/persistence_intervals/compute_birth_death_range_in_persistence_diagram.cpp
@@ -37,18 +37,20 @@ using namespace Gudhi::Gudhi_stat;
 
 int main( int argc , char** argv )
 {
-	//std::cout << "This program compute minimum birth and the maximum death time for a collection of persistence intervals \n";
-	//if ( argc != 2 )
-	//{
-	//	std::cout << "To run this program, please provide the name of a file with persistence diagram \n";
-	//	return 1;
-	//}
-	//Persistence_intervals p( argv[1] );
-	//std::pair<double,double> min_max_ = p.min_max();
-	//std::cout << "Birth-death range : min: " <<  min_max_.first << ", max: " << min_max_.second << endl;
+	std::cout << "This program compute the range of birth and death times of persistence pairs in diagrams provided as an input. \n";
+	std::cout << "The first parameter of the program is the dimension of persistence to be used. If your file contains ";
+	std::cout << "the information about dimension of persistence pairs, please provide here the dimension of persistence pairs you want to use. If your input files consist only ";
+	std::cout << "of birth-death pairs, please set this first parameter to -1 \n";	
+	std::cout << "The remaining parameters of the program are the names of files with persistence diagrams. \n";
 	
+	int dim = atoi( argv[1] );
+	unsigned dimension = std::numeric_limits<unsigned>::max();
+	if ( (dim != -1) && (dim >= 0) )
+	{
+		dimension = (unsigned)dim;
+	}
 	std::vector< const char* > filenames;
-	for ( int i = 1 ; i < argc ; ++i )
+	for ( int i = 2 ; i < argc ; ++i )
 	{
 		filenames.push_back( argv[i] );
 	}
@@ -59,7 +61,7 @@ int main( int argc , char** argv )
 	for ( size_t file_no = 0 ; file_no != filenames.size() ; ++file_no )
 	{
 		std::cout << "Creating diagram based on a file : " << filenames[file_no] << std::endl;
-		Persistence_intervals p( filenames[file_no] );
+		Persistence_intervals p( filenames[file_no] , dimension );
 		std::pair<double,double> min_max_ = p.min_max();
 		if ( min_max_.first < min_ )min_ = min_max_.first;
 		if ( min_max_.second > max_ )max_ = min_max_.second;
diff --git a/src/Gudhi_stat/utilities/persistence_intervals/compute_bottleneck_distance.cpp b/src/Gudhi_stat/utilities/persistence_intervals/compute_bottleneck_distance.cpp
new file mode 100644
index 00000000..6f0ba635
--- /dev/null
+++ b/src/Gudhi_stat/utilities/persistence_intervals/compute_bottleneck_distance.cpp
@@ -0,0 +1,115 @@
+/*    This file is part of the Gudhi Library. The Gudhi library
+ *    (Geometric Understanding in Higher Dimensions) is a generic C++
+ *    library for computational topology.
+ *
+ *    Author(s):       Pawel Dlotko
+ *
+ *    Copyright (C) 2015  INRIA (France)
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <gudhi/persistence_representations/Persistence_intervals_with_distances.h>
+#include <gudhi/read_persistence_from_file.h>
+
+
+
+using namespace Gudhi;
+using namespace Gudhi::Gudhi_stat;
+
+#include <iostream>
+#include <sstream>
+
+
+int main( int argc , char** argv )
+{
+	std::cout << "This program compute the bottleneck distance of persistence diarams stored in a files. \n";
+	std::cout << "The first parameter of the program is the dimension of persistence to be used to construct persistence landscapes. If your file contains ";
+	std::cout << "the information about dimension of persistence pairs, please provide here the dimension of persistence pairs you want to use. If your input files consist only ";
+	std::cout << "of birth-death pairs, please set this first parameter to -1 \n";	
+	std::cout << "The remaining parameters of this programs are names of files with persistence diagrams.\n";
+
+	if ( argc < 3 )
+	{
+		std::cout << "Wrong number of parameters, the program will now terminate \n";
+		return 1;
+	}
+
+	int dim = atoi(argv[1]);
+	unsigned dimension = std::numeric_limits<unsigned>::max();
+	if ( (dim != -1) && (dim >= 0) )
+	{
+		dimension = (unsigned)dim;
+	}
+
+
+	std::vector< const char* > filenames;
+	for ( int i = 2 ; i < argc ; ++i )
+	{
+		filenames.push_back( argv[i] );
+	}
+	
+	//reading the persistence intervals:
+	std::vector< Persistence_intervals_with_distances > persistence_intervals;
+	for ( size_t i = 0 ; i != filenames.size() ; ++i )
+	{
+		Persistence_intervals_with_distances pers(filenames[i] , dimension );
+		std::cerr << "perss : " << pers << std::endl;
+		getchar();	
+		persistence_intervals.push_back( pers );
+	}
+	
+	//and now we will compute the scalar product of landscapes.
+
+	//first we prepare an array:
+	std::vector< std::vector< double > > distance( filenames.size() );
+	for ( size_t i = 0 ; i != filenames.size() ; ++i )
+	{
+		std::vector< double > v( filenames.size() , 0 );
+		distance[i] = v;
+	}
+
+	//and now we can compute the distances:
+	for ( size_t i = 0 ; i != persistence_intervals.size() ; ++i )
+	{
+		for ( size_t j = i+1 ; j != persistence_intervals.size() ; ++j )
+		{
+			distance[i][j] = distance[j][i] = persistence_intervals[i].distance( persistence_intervals[j] );
+		}
+	}
+
+	//and now output the result to the screen and a file:
+	std::ofstream out;
+	out.open( "distance" );
+	for ( size_t i = 0 ; i != distance.size() ; ++i )
+	{
+		for ( size_t j = 0 ; j != distance.size() ; ++j )
+		{
+			std::cout << distance[i][j] << " ";
+			out << distance[i][j] << " ";
+		}
+		std::cout << std::endl;
+		out << std::endl;
+	}
+	out.close();
+
+	return 0;
+}
+
+
+
+
+
+
+
diff --git a/src/Gudhi_stat/utilities/persistence_intervals/compute_number_of_dominant_intervals.cpp b/src/Gudhi_stat/utilities/persistence_intervals/compute_number_of_dominant_intervals.cpp
index eeda703a..0a7f7c2b 100644
--- a/src/Gudhi_stat/utilities/persistence_intervals/compute_number_of_dominant_intervals.cpp
+++ b/src/Gudhi_stat/utilities/persistence_intervals/compute_number_of_dominant_intervals.cpp
@@ -36,14 +36,19 @@ using namespace Gudhi::Gudhi_stat;
 int main( int argc , char** argv )
 {
 	std::cout << "This program compute the dominant intervals. A number of intervals to be displayed is a parameter of this program. \n";
-	if ( argc != 3 )
+	if ( argc != 4 )
 	{
-		std::cout << "To run this program, please provide the name of a file with persistence diagram and number of dominant intervals you would like to get \n";
+		std::cout << "To run this program, please provide the name of a file with persistence diagram, dimension of intervals that should be taken into account (if your file contains only persistence pairs in a single dimension, set it up to -1) and number of dominant intervals you would like to get \n";
 		return 1;
 	}
-
-	Persistence_intervals p( argv[1] );
-	std::vector< std::pair<double,double> > dominant_intervals = p.dominant_intervals( atoi( argv[2] ) );
+	int dim = atoi( argv[2] );
+	unsigned dimension = std::numeric_limits<unsigned>::max();
+	if ( (dim != -1) && (dim >= 0) )
+	{
+		dimension = (unsigned)dim;
+	}
+	Persistence_intervals p( argv[1] , dimension );
+	std::vector< std::pair<double,double> > dominant_intervals = p.dominant_intervals( atoi( argv[3] ) );
 	std::cout << "Here are the dominant intervals : " << std::endl;
 	for ( size_t i = 0 ; i != dominant_intervals.size() ; ++i )
 	{
diff --git a/src/Gudhi_stat/utilities/persistence_intervals/plot_histogram_of_intervals_lengths.cpp b/src/Gudhi_stat/utilities/persistence_intervals/plot_histogram_of_intervals_lengths.cpp
index db9c3f98..11876a0d 100644
--- a/src/Gudhi_stat/utilities/persistence_intervals/plot_histogram_of_intervals_lengths.cpp
+++ b/src/Gudhi_stat/utilities/persistence_intervals/plot_histogram_of_intervals_lengths.cpp
@@ -39,10 +39,21 @@ int main( int argc , char** argv )
 	if ( argc != 3 )
 	{
 		std::cout << "To run this program, please provide the name of a file with persistence diagram and number of dominant intervals you would like to get \n";
+		std::cout << "The second parameter of a program is the dimension of the persistence that is to be used. If your file contains only birth-death pairs, you can skip this parameter\n";
 		return 1;
 	}
+	unsigned dimension = std::numeric_limits<unsigned>::max();
+	int dim = -1;
+	if ( argc > 2 )
+	{
+		dim = atoi( argv[2] );
+	} 
+	if ( (dim != -1) && (dim >= 0) )
+	{
+		dimension = (unsigned)dim;
+	}
 
-	Persistence_intervals p( argv[1] );
+	Persistence_intervals p( argv[1] , dimension );
 	std::vector< std::pair<double,double> > dominant_intervals = p.dominant_intervals( atoi( argv[2] ) );
 	std::vector< size_t > histogram = p.histogram_of_lengths( 10  );
 	
diff --git a/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_Betti_numebrs.cpp b/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_Betti_numbers.cpp
index cb89f6b9..09c6cc22 100644
--- a/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_Betti_numebrs.cpp
+++ b/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_Betti_numbers.cpp
@@ -36,12 +36,22 @@ using namespace Gudhi::Gudhi_stat;
 int main( int argc , char** argv )
 {
 	std::cout << "This program compute a plot of persistence Betti numbers. The input parameter is a file with persistence intervals. \n";
-	if ( argc != 2 )
+	std::cout << "The second optional parameter of a program is the dimension of the persistence that is to be used. If your file contains only birth-death pairs, you can skip this parameter\n";
+	if ( argc < 2 )
 	{
 		std::cout << "To run this program, please provide the name of a file with persistence diagram and number of dominant intervals you would like to get \n";
 		return 1;
 	}
-	
+	unsigned dimension = std::numeric_limits<unsigned>::max();
+	int dim = -1;
+	if ( argc > 2 )
+	{
+		dim = atoi( argv[2] );
+	} 
+	if ( (dim != -1) && (dim >= 0) )
+	{
+		dimension = (unsigned)dim;
+	}
 	
 	
 	std::stringstream gnuplot_script;
@@ -49,7 +59,7 @@ int main( int argc , char** argv )
 	std::ofstream out;
 	out.open( gnuplot_script.str().c_str() );
 	
-	Persistence_intervals p( argv[1] );
+	Persistence_intervals p( argv[1] , dimension );
 	std::vector< std::pair< double , size_t > > pbns = p.compute_persistent_betti_numbers();	
 	
 	//set up the ranges so that we see the image well.
diff --git a/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_intervals.cpp b/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_intervals.cpp
index bc466bd3..4315abb9 100644
--- a/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_intervals.cpp
+++ b/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_intervals.cpp
@@ -42,9 +42,23 @@ int main( int argc , char** argv )
 	if ( argc != 2 )
 	{
 		std::cout << "To run this program, please provide the name of a file with persistence diagram \n";
+		std::cout << "The second optional parameter of a program is the dimension of the persistence that is to be used. If your file contains only birth-death pairs, you can skip this parameter\n";		
 		return 1;
 	}
-	std::vector< std::pair< double , double > > intervals = read_gudhi_persistence_file_in_one_dimension( argv[1] , 2 );
+	unsigned dimension = std::numeric_limits<unsigned>::max();
+	int dim = -1;
+	if ( argc > 2 )
+	{
+		dim = atoi( argv[2] );
+	} 
+	if ( (dim != -1) && (dim >= 0) )
+	{
+		dimension = (unsigned)dim;
+	}
+	
+	
+	
+	std::vector< std::pair< double , double > > intervals = read_persistence_intervals_in_one_dimension_from_file( argv[1] , dimension );
 	Persistence_intervals b( intervals );
 	b.plot( argv[1] );
 	return 0;