initial preparation to change the name of the package.

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

Former-commit-id: 3648a6470eca09c85b60802148cc1e2462b92f79

57 files changed, 132 insertions, 131 deletions

diff --git a/src/Gudhi_stat/doc/gudhi_stat_doc.h b/src/Gudhi_stat/doc/Persistence_representations_doc.h
index b2162c49..215616a0 100644
--- a/src/Gudhi_stat/doc/gudhi_stat_doc.h
+++ b/src/Gudhi_stat/doc/Persistence_representations_doc.h
@@ -26,9 +26,9 @@
 
 namespace Gudhi {
 
-namespace Gudhi_stat {
+namespace Persistence_representations {
 
-/**  \defgroup Gudhi_stat Gudhi_stat
+/**  \defgroup Persistence_representations Persistence_representations
  *
  * \author   Pawel Dlotko
  *
@@ -52,7 +52,7 @@ namespace Gudhi_stat {
  *
  *The permutation test reminded above can be performed for any type A which can be averaged, and which allows for computations of distances. 
  *
- *The Gudhi\_stat contains a collection of various representations of persistent homology that implements various concepts described below:
+ *The Persistence\_representations contains a collection of various representations of persistent homology that implements various concepts described below:
  *
  *\li Concept of a representation of persistence that allows averaging (so that the average object is of the same type).
  *\li Concept of representation of persistence that allows computations of distances.
@@ -78,10 +78,10 @@ namespace Gudhi_stat {
  * by concepts. That means that the statistical and ML methods will be able to operate on any representation that implement the required concept (including the ones that are not in the library at the moment). 
  * That gives provides a framework, that is very easy to extend, for topological statistics.
  *
- *Below we are discussing the representations which are currently implemented in Gudhi\_stat:
+ *Below we are discussing the representations which are currently implemented in Persistence\_representations package:
  *
  *\section sec_persistence_landscapes Persistence Landscapes
- * Reference manual: \ref Gudhi::Gudhi_stat::Persistence_landscape
+ * Reference manual: \ref Gudhi::Persistence_representations::Persistence_landscape
  *Persistence landscapes were originally proposed by Bubenik in \cite bubenik_landscapes_2015. Efficient algorithms to compute them rigorously were proposed by Bubenik and Dlotko in \cite bubenik_dlotko_landscapes_2016. The idea of 
  * persistence landscapes is shortly summarized in below.
  *
@@ -120,7 +120,7 @@ namespace Gudhi_stat {
  * 
  * 
  *\section sec_landscapes_on_grid Persistence Landscapes on a grid
- * Reference manual: \ref Gudhi::Gudhi_stat::Persistence_landscape_on_grid
+ * Reference manual: \ref Gudhi::Persistence_representations::Persistence_landscape_on_grid
  *This is an alternative, not--exact, representation of persistence landscapes defined in the Section \ref sec_persistence_landscapes. Unlike in the Section \ref sec_persistence_landscapes we build a 
  * representation of persistence landscape by sampling its values on a finite, equally distributed grid of points. 
  * Since, the persistence landscapes that originate from persistence diagrams have slope \f$1\f$ or \f$-1\f$, we have an estimate of a region between the grid points where the landscape cab be located. 
@@ -153,7 +153,7 @@ namespace Gudhi_stat {
  *Note that the same representation is used in TDA R-package \cite Fasy_Kim_Lecci_Maria_tda.
  *
  *\section sec_persistence_heat_maps Persistence heat maps
- * Reference manual: \ref Gudhi::Gudhi_stat::Persistence heat maps
+ * Reference manual: \ref Gudhi::Persistence_representations::Persistence heat maps
  *This is a general class of discrete structures which are based on idea of placing a kernel in the points of persistence diagrams. 
  *This idea appeared in work by many authors over the last 15 years. As far as we know this idea was firstly described in the work of Bologna group in \cite Ferri_Frosini_comparision_sheme_1 and \cite Ferri_Frosini_comparision_sheme_2. 
  *Later it has been described by Colorado State University group in \cite Persistence_Images_2017. The presented paper in the first time provide a discussion of stability of the representation. 
@@ -162,7 +162,7 @@ namespace Gudhi_stat {
  *way that the points close to diagonal got low weight and consequently do not have a big influence on the resulting distribution. In \cite Reininghaus_Huber_ALL_PSSK for every point \f$(b,d)\f$ two Gaussian kernels 
  *are added: first, with a weight 1 in a point \f$(b,d)\f$, and the second, with the weight -1 for a point \f$(b,d)\f$. In both cases, the representations are stable with respect to 1-Wasserstein distance.
  *
- *In Gudhi\_stat we currently implement a discretization of the distributions described above. The base of this implementation is 2-dimensional array of pixels. Each pixel have assigned a real value which 
+ *In Persistence\_representations package we currently implement a discretization of the distributions described above. The base of this implementation is 2-dimensional array of pixels. Each pixel have assigned a real value which 
  * is a sum of values of distributions induced by each point of the persistence diagram. At the moment we compute the sum of values on a center of a pixels. It can be easily extended to any other function 
  * (like for instance sum of integrals of the intermediate distribution on a pixel). 
  *
@@ -177,7 +177,7 @@ namespace Gudhi_stat {
  *
  *
  *\section sec_persistence_vectors Persistence vectors
- * Reference manual: \ref Gudhi::Gudhi_stat::Persistence vectors
+ * Reference manual: \ref Gudhi::Persistence_representations::Persistence vectors
  *This is a representation of persistent homology in a form of a vector which was designed for an application in 3d graphic in \cite Carriere_Oudot_Ovsjanikov_top_signatures_3d. Below we provide a short description of this representation.
  *
  *Given a persistence diagram \f$D = \{ (b_i,d_i) \}\f$, for every pair of birth--death points \f$(b_1,d_1)\f$ and \f$(b_2,d_2)\f$ we compute the following three distances:
@@ -194,9 +194,9 @@ namespace Gudhi_stat {
  *
  * \copyright GNU General Public License v3.
  */
-/** @} */  // end defgroup Gudhi_stat
+/** @} */  // end defgroup Persistence_representations
 
-}  // namespace cubical_complex
+}  // namespace Persistence_representations
 }  // namespace Gudhi
 
-#endif  // DOC_GUDHI_STAT_H_
+#endif  // Persistence_representations
diff --git a/src/Gudhi_stat/example/persistence_heat_maps.cpp b/src/Gudhi_stat/example/persistence_heat_maps.cpp
index 0e5f7b79..da87486d 100644
--- a/src/Gudhi_stat/example/persistence_heat_maps.cpp
+++ b/src/Gudhi_stat/example/persistence_heat_maps.cpp
@@ -23,7 +23,7 @@
 
 
 #include <gudhi/reader_utils.h>
-#include <gudhi/persistence_representations/Persistence_heat_maps.h>
+#include <gudhi/Persistence_heat_maps.h>
 
 #include <iostream>
 #include <vector>
@@ -31,7 +31,7 @@
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 
 double epsilon = 0.0000005;
diff --git a/src/Gudhi_stat/example/persistence_intervals.cpp b/src/Gudhi_stat/example/persistence_intervals.cpp
index 33d45485..ed5b4e34 100644
--- a/src/Gudhi_stat/example/persistence_intervals.cpp
+++ b/src/Gudhi_stat/example/persistence_intervals.cpp
@@ -23,14 +23,14 @@
 
 
 #include <gudhi/reader_utils.h>
-#include <gudhi/persistence_representations/Persistence_intervals.h>
+#include <gudhi/Persistence_intervals.h>
 
 #include <iostream>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 	
 int main( int argc , char** argv )
diff --git a/src/Gudhi_stat/example/persistence_landscape.cpp b/src/Gudhi_stat/example/persistence_landscape.cpp
index 9385c408..40fb7d32 100644
--- a/src/Gudhi_stat/example/persistence_landscape.cpp
+++ b/src/Gudhi_stat/example/persistence_landscape.cpp
@@ -22,12 +22,12 @@
 
 
 
-#include <gudhi/persistence_representations/Persistence_landscape.h>
+#include <gudhi/Persistence_landscape.h>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 #include <iostream>
 
diff --git a/src/Gudhi_stat/example/persistence_landscape_on_grid.cpp b/src/Gudhi_stat/example/persistence_landscape_on_grid.cpp
index d432d757..b38ac3d9 100644
--- a/src/Gudhi_stat/example/persistence_landscape_on_grid.cpp
+++ b/src/Gudhi_stat/example/persistence_landscape_on_grid.cpp
@@ -22,12 +22,12 @@
 
 
 
-#include <gudhi/persistence_representations/Persistence_landscape_on_grid.h>
+#include <gudhi/Persistence_landscape_on_grid.h>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 #include <iostream>
 
diff --git a/src/Gudhi_stat/example/persistence_vectors.cpp b/src/Gudhi_stat/example/persistence_vectors.cpp
index 9373dcf0..70163fec 100644
--- a/src/Gudhi_stat/example/persistence_vectors.cpp
+++ b/src/Gudhi_stat/example/persistence_vectors.cpp
@@ -22,7 +22,7 @@
 
 
 
-#include <gudhi/persistence_representations/persistence_vectors.h>
+#include <gudhi/persistence_vectors.h>
 #include <iostream>
 
 
@@ -32,7 +32,7 @@
 #include <iomanip>
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 
 
diff --git a/src/Gudhi_stat/include/gudhi/persistence_representations/PSSK.h b/src/Gudhi_stat/include/gudhi/PSSK.h
index d2fd3a86..bd142c02 100644
--- a/src/Gudhi_stat/include/gudhi/persistence_representations/PSSK.h
+++ b/src/Gudhi_stat/include/gudhi/PSSK.h
@@ -25,12 +25,12 @@
 #define PSSK_H
 
 //gudhi include
-#include <gudhi/persistence_representations/Persistence_heat_maps.h>
+#include <gudhi/Persistence_heat_maps.h>
 
 
 namespace Gudhi
 {
-namespace Gudhi_stat
+namespace Persistence_representations
 {
 
 /**
diff --git a/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_heat_maps.h b/src/Gudhi_stat/include/gudhi/Persistence_heat_maps.h
index 56890267..78cbed20 100644
--- a/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_heat_maps.h
+++ b/src/Gudhi_stat/include/gudhi/Persistence_heat_maps.h
@@ -34,14 +34,14 @@
 
 //gudhi include
 #include <gudhi/read_persistence_from_file.h>
-#include <gudhi/common_gudhi_stat.h>
+#include <gudhi/common_persistence_representations.h>
 
 
 
 
 namespace Gudhi
 {
-namespace Gudhi_stat
+namespace Persistence_representations
 {
 
 
diff --git a/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_intervals.h b/src/Gudhi_stat/include/gudhi/Persistence_intervals.h
index 64d8c502..95e6ae91 100644
--- a/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_intervals.h
+++ b/src/Gudhi_stat/include/gudhi/Persistence_intervals.h
@@ -37,7 +37,7 @@
 
 namespace Gudhi 
 {
-namespace Gudhi_stat 
+namespace Persistence_representations 
 {
 
 /**
diff --git a/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_intervals_with_distances.h b/src/Gudhi_stat/include/gudhi/Persistence_intervals_with_distances.h
index 3c1d8a45..60343dc1 100644
--- a/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_intervals_with_distances.h
+++ b/src/Gudhi_stat/include/gudhi/Persistence_intervals_with_distances.h
@@ -29,7 +29,7 @@
 
 namespace Gudhi 
 {
-namespace Gudhi_stat 
+namespace Persistence_representations 
 {
 
 class Persistence_intervals_with_distances : public Persistence_intervals
diff --git a/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_landscape.h b/src/Gudhi_stat/include/gudhi/Persistence_landscape.h
index e14771b3..9150e507 100644
--- a/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_landscape.h
+++ b/src/Gudhi_stat/include/gudhi/Persistence_landscape.h
@@ -36,14 +36,14 @@
 
 //gudhi include
 #include <gudhi/read_persistence_from_file.h>
-#include <gudhi/common_gudhi_stat.h>
+#include <gudhi/common_persistence_representations.h>
 
 
 
 
 namespace Gudhi
 {
-namespace Gudhi_stat
+namespace Persistence_representations
 {
 
 
diff --git a/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_landscape_on_grid.h b/src/Gudhi_stat/include/gudhi/Persistence_landscape_on_grid.h
index 2e1fb56d..de5c74ac 100644
--- a/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_landscape_on_grid.h
+++ b/src/Gudhi_stat/include/gudhi/Persistence_landscape_on_grid.h
@@ -40,13 +40,13 @@
 //gudhi include
 
 #include <gudhi/read_persistence_from_file.h>
-#include <gudhi/common_gudhi_stat.h>
+#include <gudhi/common_persistence_representations.h>
 
 
 
 namespace Gudhi
 {
-namespace Gudhi_stat
+namespace Persistence_representations
 {
 
 //predeclaration
diff --git a/src/Gudhi_stat/include/gudhi/common_gudhi_stat.h b/src/Gudhi_stat/include/gudhi/common_persistence_representations.h
index 22887021..f223079a 100644
--- a/src/Gudhi_stat/include/gudhi/common_gudhi_stat.h
+++ b/src/Gudhi_stat/include/gudhi/common_persistence_representations.h
@@ -26,7 +26,7 @@
 
 namespace Gudhi
 {
-namespace Gudhi_stat
+namespace Persistence_representations
 {
  //this file contain an implementation of some common procedures used in Gudhi_stat.
 
diff --git a/src/Gudhi_stat/include/gudhi/multiplicative_bootstrap.h b/src/Gudhi_stat/include/gudhi/multiplicative_bootstrap.h
index 7d1b04c9..a19e6d60 100644
--- a/src/Gudhi_stat/include/gudhi/multiplicative_bootstrap.h
+++ b/src/Gudhi_stat/include/gudhi/multiplicative_bootstrap.h
@@ -24,10 +24,10 @@
 #define BOOTSTRAP_H
 
 //concretizations
-#include <gudhi/persistence_representations/persistence_vectors.h>
-#include <gudhi/persistence_representations/Persistence_landscape.h>
-#include <gudhi/persistence_representations/Persistence_landscape_on_grid.h>
-#include <gudhi/persistence_representations/Persistence_heat_maps.h>
+#include <gudhi/persistence_vectors.h>
+#include <gudhi/Persistence_landscape.h>
+#include <gudhi/Persistence_landscape_on_grid.h>
+#include <gudhi/Persistence_heat_maps.h>
 
 #ifdef GUDHI_USE_TBB
 #include <tbb/parallel_sort.h>
diff --git a/src/Gudhi_stat/include/gudhi/persistence_representations/persistence_vectors.h b/src/Gudhi_stat/include/gudhi/persistence_vectors.h
index d56f92c4..9ed32fc1 100644
--- a/src/Gudhi_stat/include/gudhi/persistence_representations/persistence_vectors.h
+++ b/src/Gudhi_stat/include/gudhi/persistence_vectors.h
@@ -32,13 +32,13 @@
 
 //gudhi include
 #include <gudhi/read_persistence_from_file.h>
-#include <gudhi/common_gudhi_stat.h>
+#include <gudhi/common_persistence_representations.h>
 #include <gudhi/distance_functions.h>
 
 
 namespace Gudhi 
 {
-namespace Gudhi_stat 
+namespace Persistence_representations 
 {
 
 /*
diff --git a/src/Gudhi_stat/include/gudhi/read_persistence_from_file.h b/src/Gudhi_stat/include/gudhi/read_persistence_from_file.h
index 5042826c..39b3ca7b 100644
--- a/src/Gudhi_stat/include/gudhi/read_persistence_from_file.h
+++ b/src/Gudhi_stat/include/gudhi/read_persistence_from_file.h
@@ -34,7 +34,7 @@
 
 namespace Gudhi
 {
-namespace Gudhi_stat
+namespace Persistence_representations
 {
 			
 	
diff --git a/src/Gudhi_stat/include/gudhi/topological_process.h b/src/Gudhi_stat/include/gudhi/topological_process.h
index 03edbb85..ee8478ed 100644
--- a/src/Gudhi_stat/include/gudhi/topological_process.h
+++ b/src/Gudhi_stat/include/gudhi/topological_process.h
@@ -25,19 +25,19 @@
 
 
 //concretizations
-#include <gudhi/persistence_representations/Vector_distances_in_diagram.h>
-#include <gudhi/persistence_representations/Persistence_landscape.h>
-#include <gudhi/persistence_representations/Persistence_landscape_on_grid.h>
-#include <gudhi/persistence_representations/Persistence_heat_maps.h>
+#include <gudhi/Vector_distances_in_diagram.h>
+#include <gudhi/Persistence_landscape.h>
+#include <gudhi/Persistence_landscape_on_grid.h>
+#include <gudhi/Persistence_heat_maps.h>
 #include <vector>
 #include <limits>
 
 //extras
-#include <gudhi/common_gudhi_stat.h>
+#include <gudhi/common_persistence_representations.h>
 
 namespace Gudhi 
 {
-namespace Gudhi_stat 
+namespace Persistence_representations 
 {
 
 
diff --git a/src/Gudhi_stat/test/persistence_heat_maps_test.cpp b/src/Gudhi_stat/test/persistence_heat_maps_test.cpp
index fb094912..c7b36688 100644
--- a/src/Gudhi_stat/test/persistence_heat_maps_test.cpp
+++ b/src/Gudhi_stat/test/persistence_heat_maps_test.cpp
@@ -26,14 +26,14 @@
 #define BOOST_TEST_MODULE "gudhi_stat"
 #include <boost/test/unit_test.hpp>
 #include <gudhi/reader_utils.h>
-#include <gudhi/persistence_representations/Persistence_heat_maps.h>
+#include <gudhi/Persistence_heat_maps.h>
 
 #include <iostream>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 
 
diff --git a/src/Gudhi_stat/test/persistence_intervals_test.cpp b/src/Gudhi_stat/test/persistence_intervals_test.cpp
index 4fb73da1..dae270ed 100644
--- a/src/Gudhi_stat/test/persistence_intervals_test.cpp
+++ b/src/Gudhi_stat/test/persistence_intervals_test.cpp
@@ -26,14 +26,14 @@
 #define BOOST_TEST_MODULE "gudhi_stat"
 #include <boost/test/unit_test.hpp>
 #include <gudhi/reader_utils.h>
-#include "gudhi/persistence_representations/Persistence_intervals.h"
+#include "gudhi/Persistence_intervals.h"
 
 #include <iostream>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 
 double epsilon = 0.0000005;
diff --git a/src/Gudhi_stat/test/persistence_lanscapes_on_grid_test.cpp b/src/Gudhi_stat/test/persistence_lanscapes_on_grid_test.cpp
index 54fb2b84..e935cb97 100644
--- a/src/Gudhi_stat/test/persistence_lanscapes_on_grid_test.cpp
+++ b/src/Gudhi_stat/test/persistence_lanscapes_on_grid_test.cpp
@@ -26,14 +26,14 @@
 #define BOOST_TEST_MODULE "gudhi_stat"
 #include <boost/test/unit_test.hpp>
 #include <gudhi/reader_utils.h>
-#include <gudhi/persistence_representations/Persistence_landscape_on_grid.h>
+#include <gudhi/Persistence_landscape_on_grid.h>
 
 #include <iostream>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 
 double epsilon = 0.0000005;
diff --git a/src/Gudhi_stat/test/persistence_lanscapes_test.cpp b/src/Gudhi_stat/test/persistence_lanscapes_test.cpp
index 266be4de..684c50ff 100644
--- a/src/Gudhi_stat/test/persistence_lanscapes_test.cpp
+++ b/src/Gudhi_stat/test/persistence_lanscapes_test.cpp
@@ -26,14 +26,14 @@
 #define BOOST_TEST_MODULE "gudhi_stat"
 #include <boost/test/unit_test.hpp>
 #include <gudhi/reader_utils.h>
-#include <gudhi/persistence_representations/Persistence_landscape.h>
+#include <gudhi/Persistence_landscape.h>
 
 #include <iostream>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 
 double epsilon = 0.0000005;
diff --git a/src/Gudhi_stat/test/read_persistence_from_file_test.cpp b/src/Gudhi_stat/test/read_persistence_from_file_test.cpp
index c0e988bf..d4dc7f89 100644
--- a/src/Gudhi_stat/test/read_persistence_from_file_test.cpp
+++ b/src/Gudhi_stat/test/read_persistence_from_file_test.cpp
@@ -33,7 +33,7 @@
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 
 
diff --git a/src/Gudhi_stat/test/vector_representation_test.cpp b/src/Gudhi_stat/test/vector_representation_test.cpp
index c3b15d05..2c1ef1f8 100644
--- a/src/Gudhi_stat/test/vector_representation_test.cpp
+++ b/src/Gudhi_stat/test/vector_representation_test.cpp
@@ -21,8 +21,8 @@
  */
 
 
-#include <gudhi/persistence_representations/persistence_vectors.h>
-#include <gudhi/common_gudhi_stat.h>
+#include <gudhi/persistence_vectors.h>
+#include <gudhi/common_persistence_representations.h>
 #include <iostream>
 
 #define BOOST_TEST_DYN_LINK
@@ -35,7 +35,7 @@
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 
 
diff --git a/src/Gudhi_stat/utilities/Hausdorff_subsampling.cpp b/src/Gudhi_stat/utilities/Hausdorff_subsampling.cpp
index d716b3b8..44de1029 100644
--- a/src/Gudhi_stat/utilities/Hausdorff_subsampling.cpp
+++ b/src/Gudhi_stat/utilities/Hausdorff_subsampling.cpp
@@ -24,10 +24,11 @@
 #include <gudhi/Hausdorff_distances.h>
 #include <gudhi/bootstrap.h>
 #include <gudhi/read_persistence_from_file.h>
-#include <gudhi/persistence_representations/persistence_vectors.h>
+#include <gudhi/persistence_vectors.h>
 
 
 using namespace Gudhi;
+using namespace Gudhi::Persistence_representations;
 using namespace Gudhi::Gudhi_stat;
 
 
diff --git a/src/Gudhi_stat/utilities/Landscape_bootstrap.cpp b/src/Gudhi_stat/utilities/Landscape_bootstrap.cpp
index 9bd6c89e..a2ca93a9 100644
--- a/src/Gudhi_stat/utilities/Landscape_bootstrap.cpp
+++ b/src/Gudhi_stat/utilities/Landscape_bootstrap.cpp
@@ -23,9 +23,9 @@
 //stat part:
 #include <gudhi/Hausdorff_distances.h>
 #include <gudhi/bootstrap.h>
-#include <gudhi/persistence_representations/Persistence_landscape.h>
+#include <gudhi/Persistence_landscape.h>
 #include <gudhi/read_persistence_from_file.h>
-#include <gudhi/persistence_representations/persistence_vectors.h>
+#include <gudhi/persistence_vectors.h>
 //persistence part:
 #include <gudhi/reader_utils.h>
 #include <gudhi/Rips_complex.h>
@@ -34,8 +34,9 @@
 #include <gudhi/Persistent_cohomology.h>
 
 
-
-using Persistence_landscape = Gudhi::Gudhi_stat::Persistence_landscape;
+using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
+using Persistence_landscape = Gudhi::Persistence_representations::Persistence_landscape;
 
 typedef int Vertex_handle;
 //typedef double Filtration_value;
@@ -157,7 +158,7 @@ int main( int argc , char** argv )
 	
 	std::cout << "Now we will read points from the file : " << filename << " and then perform " << number_of_repetitions_of_bootstrap << " times the bootstrap on it by choosing subsample of a size " << size_of_subsample << std::endl;
 	
-  std::vector< std::vector< double > > points = Gudhi::Gudhi_stat::read_numbers_from_file_line_by_line( filename );
+  std::vector< std::vector< double > > points = Gudhi::Persistence_representations::read_numbers_from_file_line_by_line( filename );
 	
 	std::cout << "Read : " << points.size() << " points.\n";
 	
diff --git a/src/Gudhi_stat/utilities/Multiplicative_bootstrap.cpp b/src/Gudhi_stat/utilities/Multiplicative_bootstrap.cpp
index 7ee389f8..8949fba1 100644
--- a/src/Gudhi_stat/utilities/Multiplicative_bootstrap.cpp
+++ b/src/Gudhi_stat/utilities/Multiplicative_bootstrap.cpp
@@ -24,10 +24,11 @@
 #include <gudhi/Hausdorff_distances.h>
 #include <gudhi/multiplicative_bootstrap.h>
 #include <gudhi/read_persistence_from_file.h>
-#include <gudhi/persistence_representations/persistence_vectors.h>
+#include <gudhi/persistence_vectors.h>
 
 using namespace Gudhi;
 using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 
 
diff --git a/src/Gudhi_stat/utilities/permutation_test.cpp b/src/Gudhi_stat/utilities/permutation_test.cpp
index 62cd3f10..e974b311 100644
--- a/src/Gudhi_stat/utilities/permutation_test.cpp
+++ b/src/Gudhi_stat/utilities/permutation_test.cpp
@@ -22,12 +22,13 @@
 
 
 #include <gudhi/permutation_test.h>
-#include <gudhi/persistence_representations/Persistence_landscape.h>
+#include <gudhi/Persistence_landscape.h>
 #include <iostream>
 #include <cstring>
 
 using namespace Gudhi;
 using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 int main( int argc , char** argv )
 {	
diff --git a/src/Gudhi_stat/utilities/persistence_heat_maps/average_persistence_heat_maps.cpp b/src/Gudhi_stat/utilities/persistence_heat_maps/average_persistence_heat_maps.cpp
index 901f1a03..2d221d27 100644
--- a/src/Gudhi_stat/utilities/persistence_heat_maps/average_persistence_heat_maps.cpp
+++ b/src/Gudhi_stat/utilities/persistence_heat_maps/average_persistence_heat_maps.cpp
@@ -22,12 +22,12 @@
 
 
 
-#include <gudhi/persistence_representations/Persistence_heat_maps.h>
+#include <gudhi/Persistence_heat_maps.h>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 #include <iostream>
 
diff --git a/src/Gudhi_stat/utilities/persistence_heat_maps/compute_distance_of_persistence_heat_maps.cpp b/src/Gudhi_stat/utilities/persistence_heat_maps/compute_distance_of_persistence_heat_maps.cpp
index e4f5fca6..d3e6f322 100644
--- a/src/Gudhi_stat/utilities/persistence_heat_maps/compute_distance_of_persistence_heat_maps.cpp
+++ b/src/Gudhi_stat/utilities/persistence_heat_maps/compute_distance_of_persistence_heat_maps.cpp
@@ -21,12 +21,12 @@
  */
 
 
-#include <gudhi/persistence_representations/Persistence_heat_maps.h>
+#include <gudhi/Persistence_heat_maps.h>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 #include <iostream>
 #include <sstream>
diff --git a/src/Gudhi_stat/utilities/persistence_heat_maps/compute_scalar_product_of_persistence_heat_maps.cpp b/src/Gudhi_stat/utilities/persistence_heat_maps/compute_scalar_product_of_persistence_heat_maps.cpp
index cdeba692..edbf16c1 100644
--- a/src/Gudhi_stat/utilities/persistence_heat_maps/compute_scalar_product_of_persistence_heat_maps.cpp
+++ b/src/Gudhi_stat/utilities/persistence_heat_maps/compute_scalar_product_of_persistence_heat_maps.cpp
@@ -21,12 +21,12 @@
  */
 
 
-#include <gudhi/persistence_representations/Persistence_heat_maps.h>
+#include <gudhi/Persistence_heat_maps.h>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 #include <iostream>
 #include <sstream>
diff --git a/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps.cpp b/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps.cpp
index e99b829a..cac81495 100644
--- a/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps.cpp
+++ b/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps.cpp
@@ -22,12 +22,12 @@
 
 
 
-#include <gudhi/persistence_representations/Persistence_heat_maps.h>
+#include <gudhi/Persistence_heat_maps.h>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 #include <iostream>
 #include <sstream>
diff --git a/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_arctan_of_their_persistence.cpp b/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_arctan_of_their_persistence.cpp
index b98fc3f7..aa887c9c 100644
--- a/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_arctan_of_their_persistence.cpp
+++ b/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_arctan_of_their_persistence.cpp
@@ -22,12 +22,12 @@
 
 
 
-#include <gudhi/persistence_representations/Persistence_heat_maps.h>
+#include <gudhi/Persistence_heat_maps.h>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 #include <iostream>
 #include <sstream>
diff --git a/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_distance_from_diagonal.cpp b/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_distance_from_diagonal.cpp
index 351cfd6f..aa13d786 100644
--- a/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_distance_from_diagonal.cpp
+++ b/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_distance_from_diagonal.cpp
@@ -21,12 +21,12 @@
  */
 
 
-#include <gudhi/persistence_representations/Persistence_heat_maps.h>
+#include <gudhi/Persistence_heat_maps.h>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 #include <iostream>
 #include <sstream>
diff --git a/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal.cpp b/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal.cpp
index 59966855..46258329 100644
--- a/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal.cpp
+++ b/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal.cpp
@@ -21,12 +21,12 @@
  */
 
 
-#include <gudhi/persistence_representations/Persistence_heat_maps.h>
+#include <gudhi/Persistence_heat_maps.h>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 #include <iostream>
 #include <sstream>
diff --git a/src/Gudhi_stat/utilities/persistence_heat_maps/create_pssk.cpp b/src/Gudhi_stat/utilities/persistence_heat_maps/create_pssk.cpp
index dfab5cdb..6aab42f7 100644
--- a/src/Gudhi_stat/utilities/persistence_heat_maps/create_pssk.cpp
+++ b/src/Gudhi_stat/utilities/persistence_heat_maps/create_pssk.cpp
@@ -20,12 +20,12 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gudhi/persistence_representations/PSSK.h>
+#include <gudhi/PSSK.h>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 #include <iostream>
 #include <sstream>
diff --git a/src/Gudhi_stat/utilities/persistence_heat_maps/plot_persistence_heat_map.cpp b/src/Gudhi_stat/utilities/persistence_heat_maps/plot_persistence_heat_map.cpp
index 59b14fe8..5a4776ff 100644
--- a/src/Gudhi_stat/utilities/persistence_heat_maps/plot_persistence_heat_map.cpp
+++ b/src/Gudhi_stat/utilities/persistence_heat_maps/plot_persistence_heat_map.cpp
@@ -21,12 +21,12 @@
  */
 
 
-#include <gudhi/persistence_representations/Persistence_heat_maps.h>
+#include <gudhi/Persistence_heat_maps.h>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 #include <iostream>
 #include <sstream>
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 291bd557..2e0d680f 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
@@ -23,7 +23,7 @@
 
 
 #include <gudhi/reader_utils.h>
-#include <gudhi/persistence_representations/Persistence_intervals.h>
+#include <gudhi/Persistence_intervals.h>
 
 #include <iostream>
 #include <vector>
@@ -32,7 +32,7 @@
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 
 int main( int argc , char** argv )
diff --git a/src/Gudhi_stat/utilities/persistence_intervals/compute_bottleneck_distance.cpp b/src/Gudhi_stat/utilities/persistence_intervals/compute_bottleneck_distance.cpp
index 43929695..19e49bbb 100644
--- a/src/Gudhi_stat/utilities/persistence_intervals/compute_bottleneck_distance.cpp
+++ b/src/Gudhi_stat/utilities/persistence_intervals/compute_bottleneck_distance.cpp
@@ -20,13 +20,13 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gudhi/persistence_representations/Persistence_intervals_with_distances.h>
+#include <gudhi/Persistence_intervals_with_distances.h>
 #include <gudhi/read_persistence_from_file.h>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 #include <iostream>
 #include <sstream>
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 281902fe..c099befc 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
@@ -23,14 +23,14 @@
 
 
 #include <gudhi/reader_utils.h>
-#include <gudhi/persistence_representations/Persistence_intervals.h>
+#include <gudhi/Persistence_intervals.h>
 
 #include <iostream>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 
 int main( int argc , char** argv )
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 994c6913..b2cbac70 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
@@ -23,14 +23,14 @@
 
 
 #include <gudhi/reader_utils.h>
-#include <gudhi/persistence_representations/Persistence_intervals.h>
+#include <gudhi/Persistence_intervals.h>
 
 #include <iostream>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 
 int main( int argc , char** argv )
diff --git a/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_Betti_numbers.cpp b/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_Betti_numbers.cpp
index 21ba06f4..e20f85c0 100644
--- a/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_Betti_numbers.cpp
+++ b/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_Betti_numbers.cpp
@@ -23,14 +23,14 @@
 
 
 #include <gudhi/reader_utils.h>
-#include <gudhi/persistence_representations/Persistence_intervals.h>
+#include <gudhi/Persistence_intervals.h>
 
 #include <iostream>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 
 int main( int argc , char** argv )
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 95c0cf1f..ed03459b 100644
--- a/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_intervals.cpp
+++ b/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_intervals.cpp
@@ -23,7 +23,7 @@
 
 
 #include <gudhi/reader_utils.h>
-#include <gudhi/persistence_representations/Persistence_intervals.h>
+#include <gudhi/Persistence_intervals.h>
 #include <gudhi/read_persistence_from_file.h>
 
 #include <iostream>
@@ -31,7 +31,7 @@
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 
 double epsilon = 0.0000005;
@@ -39,7 +39,7 @@ double epsilon = 0.0000005;
 	
 int main( int argc , char** argv )
 {
-	if ( argc != 2 )
+	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";		
@@ -54,10 +54,7 @@ int main( int argc , char** argv )
 	if ( 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] );
diff --git a/src/Gudhi_stat/utilities/persistence_landscapes/average_landscapes.cpp b/src/Gudhi_stat/utilities/persistence_landscapes/average_landscapes.cpp
index 2a50acd8..1e0caa30 100644
--- a/src/Gudhi_stat/utilities/persistence_landscapes/average_landscapes.cpp
+++ b/src/Gudhi_stat/utilities/persistence_landscapes/average_landscapes.cpp
@@ -22,12 +22,12 @@
 
 
 
-#include <gudhi/persistence_representations/Persistence_landscape.h>
+#include <gudhi/Persistence_landscape.h>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 #include <iostream>
 
diff --git a/src/Gudhi_stat/utilities/persistence_landscapes/compute_distance_of_landscapes.cpp b/src/Gudhi_stat/utilities/persistence_landscapes/compute_distance_of_landscapes.cpp
index 0b16ac26..85954cb2 100644
--- a/src/Gudhi_stat/utilities/persistence_landscapes/compute_distance_of_landscapes.cpp
+++ b/src/Gudhi_stat/utilities/persistence_landscapes/compute_distance_of_landscapes.cpp
@@ -20,12 +20,12 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gudhi/persistence_representations/Persistence_landscape.h>
+#include <gudhi/Persistence_landscape.h>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 #include <iostream>
 #include <sstream>
diff --git a/src/Gudhi_stat/utilities/persistence_landscapes/compute_scalar_product_of_landscapes.cpp b/src/Gudhi_stat/utilities/persistence_landscapes/compute_scalar_product_of_landscapes.cpp
index 16a15174..02b729b2 100644
--- a/src/Gudhi_stat/utilities/persistence_landscapes/compute_scalar_product_of_landscapes.cpp
+++ b/src/Gudhi_stat/utilities/persistence_landscapes/compute_scalar_product_of_landscapes.cpp
@@ -20,12 +20,12 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gudhi/persistence_representations/Persistence_landscape.h>
+#include <gudhi/Persistence_landscape.h>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 #include <iostream>
 #include <sstream>
diff --git a/src/Gudhi_stat/utilities/persistence_landscapes/create_landscapes.cpp b/src/Gudhi_stat/utilities/persistence_landscapes/create_landscapes.cpp
index 040ccc95..b85c8644 100644
--- a/src/Gudhi_stat/utilities/persistence_landscapes/create_landscapes.cpp
+++ b/src/Gudhi_stat/utilities/persistence_landscapes/create_landscapes.cpp
@@ -20,11 +20,11 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gudhi/persistence_representations/Persistence_landscape.h>
+#include <gudhi/Persistence_landscape.h>
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 #include <iostream>
 #include <sstream>
diff --git a/src/Gudhi_stat/utilities/persistence_landscapes/plot_landscapes.cpp b/src/Gudhi_stat/utilities/persistence_landscapes/plot_landscapes.cpp
index aad8e147..b79a689d 100644
--- a/src/Gudhi_stat/utilities/persistence_landscapes/plot_landscapes.cpp
+++ b/src/Gudhi_stat/utilities/persistence_landscapes/plot_landscapes.cpp
@@ -20,12 +20,12 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gudhi/persistence_representations/Persistence_landscape.h>
+#include <gudhi/Persistence_landscape.h>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 #include <iostream>
 #include <sstream>
diff --git a/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/average_landscapes_on_grid.cpp b/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/average_landscapes_on_grid.cpp
index d3851734..10d9e7ac 100644
--- a/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/average_landscapes_on_grid.cpp
+++ b/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/average_landscapes_on_grid.cpp
@@ -20,12 +20,12 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gudhi/persistence_representations/Persistence_landscape_on_grid.h>
+#include <gudhi/Persistence_landscape_on_grid.h>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 #include <iostream>
 
diff --git a/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/compute_distance_of_landscapes_on_grid.cpp b/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/compute_distance_of_landscapes_on_grid.cpp
index 29c37159..4ecbd548 100644
--- a/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/compute_distance_of_landscapes_on_grid.cpp
+++ b/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/compute_distance_of_landscapes_on_grid.cpp
@@ -20,12 +20,12 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gudhi/persistence_representations/Persistence_landscape_on_grid.h>
+#include <gudhi/Persistence_landscape_on_grid.h>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 #include <iostream>
 #include <sstream>
diff --git a/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/compute_scalar_product_of_landscapes_on_grid.cpp b/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/compute_scalar_product_of_landscapes_on_grid.cpp
index 326e5587..342613b4 100644
--- a/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/compute_scalar_product_of_landscapes_on_grid.cpp
+++ b/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/compute_scalar_product_of_landscapes_on_grid.cpp
@@ -21,12 +21,12 @@
  */
 
 
-#include <gudhi/persistence_representations/Persistence_landscape_on_grid.h>
+#include <gudhi/Persistence_landscape_on_grid.h>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 #include <iostream>
 #include <sstream>
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 6dbb70c4..a033362c 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
@@ -20,12 +20,12 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gudhi/persistence_representations/Persistence_landscape_on_grid.h>
+#include <gudhi/Persistence_landscape_on_grid.h>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 #include <iostream>
 #include <sstream>
diff --git a/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/plot_landscapes_on_grid.cpp b/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/plot_landscapes_on_grid.cpp
index b5687ea2..700b2f1f 100644
--- a/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/plot_landscapes_on_grid.cpp
+++ b/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/plot_landscapes_on_grid.cpp
@@ -20,12 +20,12 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gudhi/persistence_representations/Persistence_landscape_on_grid.h>
+#include <gudhi/Persistence_landscape_on_grid.h>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 #include <iostream>
 #include <sstream>
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 245676cd..126a0bf7 100644
--- a/src/Gudhi_stat/utilities/persistence_vectors/average_persistence_vectors.cpp
+++ b/src/Gudhi_stat/utilities/persistence_vectors/average_persistence_vectors.cpp
@@ -21,12 +21,12 @@
  */
 
 
-#include <gudhi/persistence_representations/persistence_vectors.h>
+#include <gudhi/persistence_vectors.h>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 #include <iostream>
 
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 feba2429..3320defd 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,12 +20,12 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gudhi/persistence_representations/persistence_vectors.h>
+#include <gudhi/persistence_vectors.h>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 #include <iostream>
 #include <sstream>
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 775f4913..3f6e9c6c 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,12 +20,12 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gudhi/persistence_representations/persistence_vectors.h>
+#include <gudhi/persistence_vectors.h>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 #include <iostream>
 #include <sstream>
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 7f0492c6..fd8b544c 100644
--- a/src/Gudhi_stat/utilities/persistence_vectors/create_persistence_vectors.cpp
+++ b/src/Gudhi_stat/utilities/persistence_vectors/create_persistence_vectors.cpp
@@ -20,12 +20,12 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gudhi/persistence_representations/persistence_vectors.h>
+#include <gudhi/persistence_vectors.h>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 #include <iostream>
 #include <sstream>
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 c642d22d..f52e6044 100644
--- a/src/Gudhi_stat/utilities/persistence_vectors/plot_persistence_vectors.cpp
+++ b/src/Gudhi_stat/utilities/persistence_vectors/plot_persistence_vectors.cpp
@@ -20,12 +20,12 @@
  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gudhi/persistence_representations/persistence_vectors.h>
+#include <gudhi/persistence_vectors.h>
 
 
 
 using namespace Gudhi;
-using namespace Gudhi::Gudhi_stat;
+using namespace Gudhi::Persistence_representations;
 
 #include <iostream>
 #include <sstream>