added doc + cython

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

Former-commit-id: cffc2e28ebf6fae46246c5abaac52b7328adf490

1 files changed, 65 insertions, 0 deletions

diff --git a/src/cython/include/Kernels_interface.h b/src/cython/include/Kernels_interface.h
index ef136731..17bb5d8b 100644
--- a/src/cython/include/Kernels_interface.h
+++ b/src/cython/include/Kernels_interface.h
@@ -41,6 +41,38 @@ namespace persistence_diagram {
     return sw1.compute_scalar_product(sw2);
   }
 
+  double pwg(const std::vector<std::pair<double, double>>& diag1,
+             const std::vector<std::pair<double, double>>& diag2,
+             double sigma, int N) {
+    Gudhi::Persistence_representations::Persistence_weighted_gaussian pwg1(diag1, sigma, N, Gudhi::Persistence_representations::arctan_weight);
+    Gudhi::Persistence_representations::Persistence_weighted_gaussian pwg2(diag2, sigma, N, Gudhi::Persistence_representations::arctan_weight);
+    return pwg1.compute_scalar_product(pwg2);
+  }
+
+  double pss(const std::vector<std::pair<double, double>>& diag1,
+             const std::vector<std::pair<double, double>>& diag2,
+             double sigma, int N) {
+
+    std::vector<std::pair<double, double>> pd1 = diag1; int numpts = diag1.size();    for(int i = 0; i < numpts; i++)  pd1.emplace_back(diag1[i].second,diag1[i].first);
+    std::vector<std::pair<double, double>> pd2 = diag2;     numpts = diag2.size();    for(int i = 0; i < numpts; i++)  pd2.emplace_back(diag2[i].second,diag2[i].first);
+
+    Gudhi::Persistence_representations::Persistence_weighted_gaussian pwg1(pd1, 2*std::sqrt(sigma), N, Gudhi::Persistence_representations::pss_weight);
+    Gudhi::Persistence_representations::Persistence_weighted_gaussian pwg2(pd2, 2*std::sqrt(sigma), N, Gudhi::Persistence_representations::pss_weight);
+
+    return pwg1.compute_scalar_product  (pwg2) / (16*pi*sigma);
+  }
+
+  double pss_sym(const std::vector<std::pair<double, double>>& diag1,
+             const std::vector<std::pair<double, double>>& diag2,
+             double sigma, int N) {
+
+    Gudhi::Persistence_representations::Persistence_weighted_gaussian pwg1(pd1, 2*std::sqrt(sigma), N, Gudhi::Persistence_representations::pss_weight);
+    Gudhi::Persistence_representations::Persistence_weighted_gaussian pwg2(pd2, 2*std::sqrt(sigma), N, Gudhi::Persistence_representations::pss_weight);
+
+    return pwg1.compute_scalar_product  (pwg2) / (16*pi*sigma);
+  }
+
+
   std::vector<std::vector<double> > sw_matrix(const std::vector<std::vector<std::pair<double, double> > >& s1,
                                               const std::vector<std::vector<std::pair<double, double> > >& s2,
                                               double sigma, int N){
@@ -56,6 +88,39 @@ namespace persistence_diagram {
     return matrix;
   }
 
+  std::vector<std::vector<double> > pwg_matrix(const std::vector<std::vector<std::pair<double, double> > >& s1,
+                                               const std::vector<std::vector<std::pair<double, double> > >& s2,
+                                               double sigma, int N){
+    std::vector<std::vector<double> > matrix; int num_diag_1 = s1.size(); int num_diag_2 = s2.size();
+    for(int i = 0; i < num_diag_1; i++){
+      std::cout << 100.0*i/num_diag_1 << " %" << std::endl;
+      std::vector<double> ps; for(int j = 0; j < num_diag_2; j++) ps.push_back(pwg(s1[i], s2[j], sigma, N)); matrix.push_back(ps);
+    }
+    return matrix;
+  }
+
+  std::vector<std::vector<double> > pss_matrix(const std::vector<std::vector<std::pair<double, double> > >& s1,
+                                               const std::vector<std::vector<std::pair<double, double> > >& s2,
+                                               double sigma, int N){
+    std::vector<std::vector<std::pair<double, double> > > ss1, ss2;
+    std::vector<std::vector<double> > matrix; int num_diag_1 = s1.size(); int num_diag_2 = s2.size();
+    for(int i = 0; i < num_diag_1; i++){
+      std::vector<std::pair<double, double>> pd1 = s1[i]; int numpts = s1[i].size();    
+      for(int j = 0; j < numpts; j++)  pd1.emplace_back(s1[i][j].second,s1[i][j].first);
+      ss1.push_back(pd1);
+    
+    for(int i = 0; i < num_diag_2; i++){
+      std::vector<std::pair<double, double>> pd2 = s2[i]; int numpts = s2[i].size();    
+      for(int j = 0; j < numpts; j++)  pd2.emplace_back(s2[i][j].second,s2[i][j].first);
+      ss2.push_back(pd2);
+
+    for(int i = 0; i < num_diag_1; i++){
+      std::cout << 100.0*i/num_diag_1 << " %" << std::endl;
+      std::vector<double> ps; for(int j = 0; j < num_diag_2; j++) ps.push_back(pss_sym(ss1[i], ss2[j], sigma, N)); matrix.push_back(ps);
+    }
+    return matrix;
+  }
+
 }  // namespace persistence_diagram
 
 }  // namespace Gudhi