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, 10 insertions, 2 deletions

diff --git a/src/Gudhi_stat/include/gudhi/persistence_representations/PSSK.h b/src/Gudhi_stat/include/gudhi/persistence_representations/PSSK.h
index 7a299a86..d2fd3a86 100644
--- a/src/Gudhi_stat/include/gudhi/persistence_representations/PSSK.h
+++ b/src/Gudhi_stat/include/gudhi/persistence_representations/PSSK.h
@@ -53,10 +53,18 @@ public:
 	}
 	
 	 
-	 PSSK( const char* filename , std::vector< std::vector<double> > filter = create_Gaussian_filter(5,1) , size_t number_of_pixels = 1000 , double min_ = -1 , double max_ = -1  ):
+	 PSSK( const char* filename , std::vector< std::vector<double> > filter = create_Gaussian_filter(5,1) , size_t number_of_pixels = 1000 , double min_ = -1 , double max_ = -1  , unsigned dimension = std::numeric_limits<unsigned>::max() ):
 	    Persistence_heat_maps()
 	    {
-			std::vector< std::pair< double , double > > intervals_ = read_standard_persistence_file( filename );         
+			std::vector< std::pair< double , double > > intervals_;
+                        if ( dimension == std::numeric_limits<unsigned>::max() )
+                        {
+                           intervals_ = read_persistence_intervals_in_one_dimension_from_file( filename );
+                        }
+                        else
+                        {
+                           intervals_ = read_persistence_intervals_in_one_dimension_from_file( filename , dimension );
+                        }
 			this->construct( intervals_ , filter , number_of_pixels , min_ , max_ );
 		}