diff options
| author | mcarrier <mcarrier@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-03-06 17:50:39 +0000 |
|---|---|---|
| committer | mcarrier <mcarrier@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-03-06 17:50:39 +0000 |
| commit | 784697ab263e30c062e92aacfce36d1ed4070c6f (patch) | |
| tree | d1a744bac07b68b449d086591c17e917da034697 /src/cython | |
| parent | d574f7f65acdd6dde92150879c06db5e6e0b75a9 (diff) | |
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/kernels@3269 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 17860628d3250f689152cdf65432c5a61d76f4d2
Diffstat (limited to 'src/cython')
| -rw-r--r-- | src/cython/cython/kernels.pyx | 17 | ||||
| -rw-r--r-- | src/cython/include/Kernels_interface.h | 15 |
2 files changed, 31 insertions, 1 deletions
diff --git a/src/cython/cython/kernels.pyx b/src/cython/cython/kernels.pyx index 220fc6ce..f8798aab 100644 --- a/src/cython/cython/kernels.pyx +++ b/src/cython/cython/kernels.pyx @@ -30,7 +30,8 @@ __copyright__ = "Copyright (C) 2018 INRIA" __license__ = "GPL v3" cdef extern from "Kernels_interface.h" namespace "Gudhi::persistence_diagram": - double sw(vector[pair[double, double]], vector[pair[double, double]], double, int) + double sw (vector[pair[double, double]], vector[pair[double, double]], double, int) + vector[vector[double]] sw_matrix (vector[vector[pair[double, double]]], vector[vector[pair[double, double]]], double, int) def sliced_wasserstein(diagram_1, diagram_2, sigma = 1, N = 100): """ @@ -45,3 +46,17 @@ def sliced_wasserstein(diagram_1, diagram_2, sigma = 1, N = 100): :returns: the sliced wasserstein kernel. """ return sw(diagram_1, diagram_2, sigma, N) + +def sliced_wasserstein_matrix(diagrams_1, diagrams_2, sigma = 1, N = 100): + """ + + :param diagram_1: The first set of diagrams. + :type diagram_1: vector[vector[pair[double, double]]] + :param diagram_2: The second set of diagrams. + :type diagram_2: vector[vector[pair[double, double]]] + :param sigma: bandwidth of Gaussian + :param N: number of directions + + :returns: the sliced wasserstein kernel matrix. + """ + return sw_matrix(diagrams_1, diagrams_2, sigma, N) diff --git a/src/cython/include/Kernels_interface.h b/src/cython/include/Kernels_interface.h index 9eb610b0..ef136731 100644 --- a/src/cython/include/Kernels_interface.h +++ b/src/cython/include/Kernels_interface.h @@ -41,6 +41,21 @@ namespace persistence_diagram { return sw1.compute_scalar_product(sw2); } + 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){ + std::vector<std::vector<double> > matrix; + std::vector<Gudhi::Persistence_representations::Sliced_Wasserstein> ss1; + int num_diag_1 = s1.size(); for(int i = 0; i < num_diag_1; i++){Gudhi::Persistence_representations::Sliced_Wasserstein sw1(s1[i], sigma, N); ss1.push_back(sw1);} + std::vector<Gudhi::Persistence_representations::Sliced_Wasserstein> ss2; + int num_diag_2 = s2.size(); for(int i = 0; i < num_diag_2; i++){Gudhi::Persistence_representations::Sliced_Wasserstein sw2(s2[i], sigma, N); ss2.push_back(sw2);} + 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(ss1[i].compute_scalar_product(ss2[j])); matrix.push_back(ps); + } + return matrix; + } + } // namespace persistence_diagram } // namespace Gudhi |