From 860fa7d916cb591cb0b016b046077d5333570731 Mon Sep 17 00:00:00 2001 From: mcarrier Date: Fri, 30 Mar 2018 18:09:57 +0000 Subject: git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/kernels@3323 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 550a4c3f9050b542203ab53ea7ef5ae1c8032f38 --- .../include/gudhi/Persistence_weighted_gaussian.h | 3 ++- src/Persistence_representations/include/gudhi/Sliced_Wasserstein.h | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/Persistence_representations/include') diff --git a/src/Persistence_representations/include/gudhi/Persistence_weighted_gaussian.h b/src/Persistence_representations/include/gudhi/Persistence_weighted_gaussian.h index f824225a..d5c8e6d7 100644 --- a/src/Persistence_representations/include/gudhi/Persistence_weighted_gaussian.h +++ b/src/Persistence_representations/include/gudhi/Persistence_weighted_gaussian.h @@ -39,7 +39,6 @@ #include #include -double pi = boost::math::constants::pi(); using PD = std::vector >; using Weight = std::function) >; @@ -88,6 +87,8 @@ class Persistence_weighted_gaussian{ int approx; public: + + double pi = boost::math::constants::pi(); /** \brief Persistence Weighted Gaussian Kernel constructor. * \ingroup Persistence_weighted_gaussian diff --git a/src/Persistence_representations/include/gudhi/Sliced_Wasserstein.h b/src/Persistence_representations/include/gudhi/Sliced_Wasserstein.h index bfb77384..fc3cd142 100644 --- a/src/Persistence_representations/include/gudhi/Sliced_Wasserstein.h +++ b/src/Persistence_representations/include/gudhi/Sliced_Wasserstein.h @@ -39,7 +39,6 @@ #include #include -double pi = boost::math::constants::pi(); using PD = std::vector >; namespace Gudhi { @@ -77,13 +76,14 @@ class Sliced_Wasserstein { double sigma; std::vector > projections, projections_diagonal; - public: + double pi = boost::math::constants::pi(); + void build_rep(){ if(approx > 0){ - + double step = pi/this->approx; int n = diagram.size(); -- cgit v1.2.3