Merge branch 'master' into persistence_intervals_numpy_arrays_vincent

3 files changed, 86 insertions, 2 deletions

diff --git a/src/Persistence_representations/example/CMakeLists.txt b/src/Persistence_representations/example/CMakeLists.txt
index 33558df3..a7c6ef39 100644
--- a/src/Persistence_representations/example/CMakeLists.txt
+++ b/src/Persistence_representations/example/CMakeLists.txt
@@ -26,3 +26,7 @@ add_test(NAME Persistence_representations_example_heat_maps
     COMMAND $<TARGET_FILE:Persistence_representations_example_heat_maps>)
 install(TARGETS Persistence_representations_example_heat_maps DESTINATION bin)
 
+add_executable ( Sliced_Wasserstein sliced_wasserstein.cpp )
+add_test(NAME Sliced_Wasserstein
+    COMMAND $<TARGET_FILE:Sliced_Wasserstein>)
+install(TARGETS Sliced_Wasserstein DESTINATION bin)
diff --git a/src/Persistence_representations/example/persistence_heat_maps.cpp b/src/Persistence_representations/example/persistence_heat_maps.cpp
index 323b57e9..45208b68 100644
--- a/src/Persistence_representations/example/persistence_heat_maps.cpp
+++ b/src/Persistence_representations/example/persistence_heat_maps.cpp
@@ -2,9 +2,12 @@
  *    (Geometric Understanding in Higher Dimensions) is a generic C++
  *    library for computational topology.
  *
- *    Author(s):       Pawel Dlotko
+ *    Author(s):       Pawel Dlotko and Mathieu Carriere
  *
- *    Copyright (C) 2016 Inria
+ *    Copyright (C) 2019 Inria
+ *
+ *    Modifications:
+ *      - 2018/04 MC: Add persistence heat maps computation
  *
  *    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
@@ -21,10 +24,20 @@
  */
 
 #include <gudhi/Persistence_heat_maps.h>
+#include <gudhi/common_persistence_representations.h>
 
 #include <iostream>
 #include <vector>
 #include <utility>
+#include <functional>
+#include <cmath>
+
+std::function<double(std::pair<double, double>, std::pair<double, double>)> Gaussian_function(double sigma) {
+  return [=](std::pair<double, double> p, std::pair<double, double> q) {
+    return std::exp(-((p.first - q.first) * (p.first - q.first) + (p.second - q.second) * (p.second - q.second)) /
+                    (sigma));
+  };
+}
 
 using constant_scaling_function = Gudhi::Persistence_representations::constant_scaling_function;
 using Persistence_heat_maps = Gudhi::Persistence_representations::Persistence_heat_maps<constant_scaling_function>;
@@ -76,5 +89,13 @@ int main(int argc, char** argv) {
   // to compute scalar product of hm1 and hm2:
   std::cout << "Scalar product is : " << hm1.compute_scalar_product(hm2) << std::endl;
 
+  Persistence_heat_maps hm1k(persistence1, Gaussian_function(1.0));
+  Persistence_heat_maps hm2k(persistence2, Gaussian_function(1.0));
+  Persistence_heat_maps hm1i(persistence1, Gaussian_function(1.0), 20, 20, 0, 11, 0, 11);
+  Persistence_heat_maps hm2i(persistence2, Gaussian_function(1.0), 20, 20, 0, 11, 0, 11);
+  std::cout << "Scalar product computed with exact 2D kernel on grid is : " << hm1i.compute_scalar_product(hm2i)
+            << std::endl;
+  std::cout << "Scalar product computed with exact 2D kernel is : " << hm1k.compute_scalar_product(hm2k) << std::endl;
+
   return 0;
 }
diff --git a/src/Persistence_representations/example/sliced_wasserstein.cpp b/src/Persistence_representations/example/sliced_wasserstein.cpp
new file mode 100644
index 00000000..089172a0
--- /dev/null
+++ b/src/Persistence_representations/example/sliced_wasserstein.cpp
@@ -0,0 +1,59 @@
+/*    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/Sliced_Wasserstein.h>
+
+#include <iostream>
+#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) {
+
+  Persistence_diagram persistence1, persistence2;
+
+  persistence1.push_back(std::make_pair(1, 2));
+  persistence1.push_back(std::make_pair(6, 8));
+  persistence1.push_back(std::make_pair(0, 4));
+  persistence1.push_back(std::make_pair(3, 8));
+
+  persistence2.push_back(std::make_pair(2, 9));
+  persistence2.push_back(std::make_pair(1, 6));
+  persistence2.push_back(std::make_pair(3, 5));
+  persistence2.push_back(std::make_pair(6, 10));
+
+
+  SW sw1(persistence1, 1, 100);
+  SW sw2(persistence2, 1, 100);
+
+  SW swex1(persistence1, 1, -1);
+  SW swex2(persistence2, 1, -1);
+
+  std::cout << "Approx SW kernel: " << sw1.compute_scalar_product(sw2) << std::endl;
+  std::cout << "Exact  SW kernel: " << swex1.compute_scalar_product(swex2) << std::endl;
+  std::cout << "Distance induced by approx SW kernel: " << sw1.distance(sw2) << std::endl;
+  std::cout << "Distance induced by exact  SW kernel: " << swex1.distance(swex2) << std::endl;
+
+  return 0;
+}