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

Former-commit-id: 2a83e62e132ce406986efa1456b5f1bca6b93691

4 files changed, 118 insertions, 4 deletions

diff --git a/src/Persistence_representations/example/CMakeLists.txt b/src/Persistence_representations/example/CMakeLists.txt
index 79d39c4d..89284e38 100644
--- a/src/Persistence_representations/example/CMakeLists.txt
+++ b/src/Persistence_representations/example/CMakeLists.txt
@@ -37,3 +37,12 @@ add_test(NAME Persistence_weighted_gaussian
     COMMAND $<TARGET_FILE:Persistence_weighted_gaussian>)
 install(TARGETS Persistence_weighted_gaussian DESTINATION bin)
 
+add_executable ( Persistence_image persistence_image.cpp )
+add_test(NAME Persistence_image
+    COMMAND $<TARGET_FILE:Persistence_image>)
+install(TARGETS Persistence_image DESTINATION bin)
+
+add_executable ( Landscape landscape.cpp )
+add_test(NAME Landscape
+    COMMAND $<TARGET_FILE:Landscape>)
+install(TARGETS Landscape DESTINATION bin)
diff --git a/src/Persistence_representations/example/landscape.cpp b/src/Persistence_representations/example/landscape.cpp
new file mode 100644
index 00000000..5fa84a7c
--- /dev/null
+++ b/src/Persistence_representations/example/landscape.cpp
@@ -0,0 +1,51 @@
+/*    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):       Mathieu Carriere
+ *
+ *    Copyright (C) 2018  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/Landscape.h>
+
+#include <iostream>
+#include <vector>
+#include <utility>
+
+using LS = Gudhi::Persistence_representations::Landscape;
+
+int main(int argc, char** argv) {
+
+  std::vector<std::pair<double, double> > persistence;
+
+  persistence.push_back(std::make_pair(1, 2));
+  persistence.push_back(std::make_pair(6, 8));
+  persistence.push_back(std::make_pair(0, 4));
+  persistence.push_back(std::make_pair(3, 8));
+
+  int nb_ls = 3; double min_x = 0.0; double max_x = 10.0; int res_x = 100;
+
+  LS ls(persistence, nb_ls, min_x, max_x, res_x);
+  std::vector<std::vector<double> > L = ls.vectorize();
+
+  for(int i = 0; i < nb_ls; i++){
+    for(int j = 0; j < res_x; j++) std::cout << L[i][j] << " ";
+    std::cout << std::endl;
+  }
+
+  return 0;
+}
diff --git a/src/Persistence_representations/example/persistence_image.cpp b/src/Persistence_representations/example/persistence_image.cpp
new file mode 100644
index 00000000..dfa469d4
--- /dev/null
+++ b/src/Persistence_representations/example/persistence_image.cpp
@@ -0,0 +1,54 @@
+/*    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):       Mathieu Carriere
+ *
+ *    Copyright (C) 2018  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_image.h>
+#include <gudhi/Persistence_weighted_gaussian.h>
+
+#include <iostream>
+#include <vector>
+#include <utility>
+#include <string>
+
+using PI = Gudhi::Persistence_representations::Persistence_image;
+using Weight = std::function<double (std::pair<double,double>) >;
+
+int main(int argc, char** argv) {
+
+  std::vector<std::pair<double, double> > persistence;
+
+  persistence.push_back(std::make_pair(1, 2));
+  persistence.push_back(std::make_pair(6, 8));
+  persistence.push_back(std::make_pair(0, 4));
+  persistence.push_back(std::make_pair(3, 8));
+
+  double min_x = 0.0; double max_x = 10.0; int res_x = 100; double min_y = 0.0; double max_y = 10.0; int res_y = 100; double sigma = 1.0; Weight weight = Gudhi::Persistence_representations::Persistence_weighted_gaussian::linear_weight;
+
+  PI pim(persistence, min_x, max_x, res_x, min_y, max_y, res_y, weight, sigma);
+  std::vector<std::vector<double> > P = pim.vectorize();
+
+  for(int i = 0; i < res_y; i++){
+    for(int j = 0; j < res_x; j++) std::cout << P[i][j] << " ";
+    std::cout << std::endl;
+  }
+
+  return 0;
+}
diff --git a/src/Persistence_representations/example/persistence_weighted_gaussian.cpp b/src/Persistence_representations/example/persistence_weighted_gaussian.cpp
index dea5dab6..234f6323 100644
--- a/src/Persistence_representations/example/persistence_weighted_gaussian.cpp
+++ b/src/Persistence_representations/example/persistence_weighted_gaussian.cpp
@@ -48,11 +48,11 @@ int main(int argc, char** argv) {
   double tau = 1;
   int m = 10000;
 
-  PWG PWG1(persistence1, sigma, m, PWG::arctan_weight);
-  PWG PWG2(persistence2, sigma, m, PWG::arctan_weight);
+  PWG PWG1(persistence1, sigma, m, PWG::arctan_weight(1,1));
+  PWG PWG2(persistence2, sigma, m, PWG::arctan_weight(1,1));
 
-  PWG PWGex1(persistence1, sigma, -1, PWG::arctan_weight);
-  PWG PWGex2(persistence2, sigma, -1, PWG::arctan_weight);
+  PWG PWGex1(persistence1, sigma, -1, PWG::arctan_weight(1,1));
+  PWG PWGex2(persistence2, sigma, -1, PWG::arctan_weight(1,1));
 
 
   // Linear PWG