From 905be209a0e62121c125c37e01f4d2eae5aa606d Mon Sep 17 00:00:00 2001 From: mcarrier Date: Thu, 12 Apr 2018 15:22:45 +0000 Subject: git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/kernels@3378 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 7cd9f2ae7c9da5d525bdb76a00ffac1359a47da7 --- src/cython/include/Kernels_interface.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/cython/include') diff --git a/src/cython/include/Kernels_interface.h b/src/cython/include/Kernels_interface.h index 33cd6e35..1742d016 100644 --- a/src/cython/include/Kernels_interface.h +++ b/src/cython/include/Kernels_interface.h @@ -53,24 +53,22 @@ namespace persistence_diagram { double pss(const std::vector>& diag1, const std::vector>& diag2, double sigma, int N) { - double pi = boost::math::constants::pi(); std::vector> pd1 = diag1; int numpts = diag1.size(); for(int i = 0; i < numpts; i++) pd1.emplace_back(diag1[i].second,diag1[i].first); std::vector> 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::Persistence_weighted_gaussian::pss_weight); Gudhi::Persistence_representations::Persistence_weighted_gaussian pwg2(pd2, 2*std::sqrt(sigma), N, Gudhi::Persistence_representations::Persistence_weighted_gaussian::pss_weight); - return pwg1.compute_scalar_product (pwg2) / (16*pi*sigma); + return pwg1.compute_scalar_product (pwg2) / (16*Gudhi::Persistence_representations::pi*sigma); } double pss_sym(const std::vector>& diag1, const std::vector>& diag2, double sigma, int N) { - double pi = boost::math::constants::pi(); Gudhi::Persistence_representations::Persistence_weighted_gaussian pwg1(diag1, 2*std::sqrt(sigma), N, Gudhi::Persistence_representations::Persistence_weighted_gaussian::pss_weight); Gudhi::Persistence_representations::Persistence_weighted_gaussian pwg2(diag2, 2*std::sqrt(sigma), N, Gudhi::Persistence_representations::Persistence_weighted_gaussian::pss_weight); - return pwg1.compute_scalar_product (pwg2) / (16*pi*sigma); + return pwg1.compute_scalar_product (pwg2) / (16*Gudhi::Persistence_representations::pi*sigma); } -- cgit v1.2.3