summaryrefslogtreecommitdiff
path: root/src/Persistence_representations
diff options
context:
space:
mode:
authormcarrier <mcarrier@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2018-03-30 18:09:57 +0000
committermcarrier <mcarrier@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2018-03-30 18:09:57 +0000
commit860fa7d916cb591cb0b016b046077d5333570731 (patch)
tree8648db5a4e2bd7ca163cb4b3a5c150d3355e7307 /src/Persistence_representations
parent4e80b66cf5d4e6121149a12f3137e372e04d8588 (diff)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/kernels@3323 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 550a4c3f9050b542203ab53ea7ef5ae1c8032f38
Diffstat (limited to 'src/Persistence_representations')
-rw-r--r--src/Persistence_representations/include/gudhi/Persistence_weighted_gaussian.h3
-rw-r--r--src/Persistence_representations/include/gudhi/Sliced_Wasserstein.h6
2 files changed, 5 insertions, 4 deletions
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 <functional>
#include <boost/math/constants/constants.hpp>
-double pi = boost::math::constants::pi<double>();
using PD = std::vector<std::pair<double,double> >;
using Weight = std::function<double (std::pair<double,double>) >;
@@ -88,6 +87,8 @@ class Persistence_weighted_gaussian{
int approx;
public:
+
+ double pi = boost::math::constants::pi<double>();
/** \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 <functional>
#include <boost/math/constants/constants.hpp>
-double pi = boost::math::constants::pi<double>();
using PD = std::vector<std::pair<double,double> >;
namespace Gudhi {
@@ -77,13 +76,14 @@ class Sliced_Wasserstein {
double sigma;
std::vector<std::vector<double> > projections, projections_diagonal;
-
public:
+ double pi = boost::math::constants::pi<double>();
+
void build_rep(){
if(approx > 0){
-
+
double step = pi/this->approx;
int n = diagram.size();