From b2f3d32845b9e3dac752311fbd3b750d8b6ba030 Mon Sep 17 00:00:00 2001
From: mcarrier <mcarrier@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Thu, 3 May 2018 15:54:01 +0000
Subject: git-svn-id:
 svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/kernels@3412
 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 612ea7ce6d4d5d743e606f9d7b443e21b25d8034
---
 .../example/persistence_heat_maps_exact.cpp              |  3 ++-
 .../example/persistence_landscape_on_grid_exact.cpp      |  3 ++-
 .../example/persistence_weighted_gaussian.cpp            |  1 +
 .../example/sliced_wasserstein.cpp                       |  1 +
 .../include/gudhi/common_persistence_representations.h   | 16 +++++++++-------
 5 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'src/Persistence_representations')

diff --git a/src/Persistence_representations/example/persistence_heat_maps_exact.cpp b/src/Persistence_representations/example/persistence_heat_maps_exact.cpp
index 30346d78..f15b710d 100644
--- a/src/Persistence_representations/example/persistence_heat_maps_exact.cpp
+++ b/src/Persistence_representations/example/persistence_heat_maps_exact.cpp
@@ -28,12 +28,13 @@
 #include <utility>
 #include <string>
 
+using Persistence_diagram = Gudhi::Persistence_representations::Persistence_diagram;
 using PI = Gudhi::Persistence_representations::Persistence_heat_maps_exact;
 using Weight = std::function<double (std::pair<double,double>) >;
 
 int main(int argc, char** argv) {
 
-  std::vector<std::pair<double, double> > persistence;
+  Persistence_diagram persistence;
 
   persistence.push_back(std::make_pair(1, 2));
   persistence.push_back(std::make_pair(6, 8));
diff --git a/src/Persistence_representations/example/persistence_landscape_on_grid_exact.cpp b/src/Persistence_representations/example/persistence_landscape_on_grid_exact.cpp
index 29416693..da27bc5a 100644
--- a/src/Persistence_representations/example/persistence_landscape_on_grid_exact.cpp
+++ b/src/Persistence_representations/example/persistence_landscape_on_grid_exact.cpp
@@ -26,11 +26,12 @@
 #include <vector>
 #include <utility>
 
+using Persistence_diagram = Gudhi::Persistence_representations::Persistence_diagram;
 using LS = Gudhi::Persistence_representations::Persistence_landscape_on_grid_exact;
 
 int main(int argc, char** argv) {
 
-  std::vector<std::pair<double, double> > persistence;
+  Persistence_diagram persistence;
 
   persistence.push_back(std::make_pair(1, 2));
   persistence.push_back(std::make_pair(6, 8));
diff --git a/src/Persistence_representations/example/persistence_weighted_gaussian.cpp b/src/Persistence_representations/example/persistence_weighted_gaussian.cpp
index db60755f..7945e4f1 100644
--- a/src/Persistence_representations/example/persistence_weighted_gaussian.cpp
+++ b/src/Persistence_representations/example/persistence_weighted_gaussian.cpp
@@ -26,6 +26,7 @@
 #include <vector>
 #include <utility>
 
+using Persistence_diagram = Gudhi::Persistence_representations::Persistence_diagram;
 using PWG = Gudhi::Persistence_representations::Persistence_weighted_gaussian;
 
 int main(int argc, char** argv) {
diff --git a/src/Persistence_representations/example/sliced_wasserstein.cpp b/src/Persistence_representations/example/sliced_wasserstein.cpp
index d37cb23c..2104e2b2 100644
--- a/src/Persistence_representations/example/sliced_wasserstein.cpp
+++ b/src/Persistence_representations/example/sliced_wasserstein.cpp
@@ -26,6 +26,7 @@
 #include <vector>
 #include <utility>
 
+using Persistence_diagram = Gudhi::Persistence_representations::Persistence_diagram;
 using SW = Gudhi::Persistence_representations::Sliced_Wasserstein;
 
 int main(int argc, char** argv) {
diff --git a/src/Persistence_representations/include/gudhi/common_persistence_representations.h b/src/Persistence_representations/include/gudhi/common_persistence_representations.h
index 884fce58..1960e370 100644
--- a/src/Persistence_representations/include/gudhi/common_persistence_representations.h
+++ b/src/Persistence_representations/include/gudhi/common_persistence_representations.h
@@ -28,6 +28,15 @@
 #include <cmath>
 #include <boost/math/constants/constants.hpp>
 
+
+
+namespace Gudhi {
+namespace Persistence_representations {
+// this file contain an implementation of some common procedures used in Persistence_representations.
+
+static constexpr double pi = boost::math::constants::pi<double>();
+
+
 /**
  * In this module, we use the name Persistence_diagram for the representation of a diagram in a vector of pairs of two double.
  */
@@ -37,13 +46,6 @@ using Persistence_diagram = std::vector<std::pair<double,double> >;
  * In this module, we use the name Weight for the representation of a function taking a pair of two double and returning a double.
  */
 using Weight = std::function<double (std::pair<double,double>) >;
-
-namespace Gudhi {
-namespace Persistence_representations {
-// this file contain an implementation of some common procedures used in Persistence_representations.
-
-static constexpr double pi = boost::math::constants::pi<double>();
-
 // double epsi = std::numeric_limits<double>::epsilon();
 double epsi = 0.000005;
 
-- 
cgit v1.2.3