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

Former-commit-id: 1569e7e9d47af54fe85e736583e53c99f1178439

2 files changed, 9 insertions, 9 deletions

diff --git a/src/cython/include/Kernels_interface.h b/src/cython/include/Kernels_interface.h
index 0da28245..03050408 100644
--- a/src/cython/include/Kernels_interface.h
+++ b/src/cython/include/Kernels_interface.h
@@ -46,8 +46,8 @@ namespace persistence_diagram {
   }
 
   double pwg(const std::vector<std::pair<double, double>>& diag1, const std::vector<std::pair<double, double>>& diag2, double sigma, int N, double C, double p) {
-    Gudhi::Persistence_representations::Persistence_weighted_gaussian pwg1(diag1, sigma, N, Gudhi::Persistence_representations::Persistence_weighted_gaussian::arctan_weight(C,p));
-    Gudhi::Persistence_representations::Persistence_weighted_gaussian pwg2(diag2, sigma, N, Gudhi::Persistence_representations::Persistence_weighted_gaussian::arctan_weight(C,p));
+    Gudhi::Persistence_representations::Persistence_weighted_gaussian pwg1(diag1, sigma, N, Gudhi::Persistence_representations::arctan_weight(C,p));
+    Gudhi::Persistence_representations::Persistence_weighted_gaussian pwg2(diag2, sigma, N, Gudhi::Persistence_representations::arctan_weight(C,p));
     return pwg1.compute_scalar_product(pwg2);
   }
 
@@ -55,15 +55,15 @@ namespace persistence_diagram {
     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::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);
+    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*Gudhi::Persistence_representations::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(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);
+    Gudhi::Persistence_representations::Persistence_weighted_gaussian pwg1(diag1, 2*std::sqrt(sigma), N, Gudhi::Persistence_representations::pss_weight);
+    Gudhi::Persistence_representations::Persistence_weighted_gaussian pwg2(diag2, 2*std::sqrt(sigma), N, Gudhi::Persistence_representations::pss_weight);
 
     return pwg1.compute_scalar_product  (pwg2) / (16*Gudhi::Persistence_representations::pi*sigma);
   }
diff --git a/src/cython/include/Vectors_interface.h b/src/cython/include/Vectors_interface.h
index 49d28e7c..7e191f2a 100644
--- a/src/cython/include/Vectors_interface.h
+++ b/src/cython/include/Vectors_interface.h
@@ -44,9 +44,9 @@ namespace persistence_diagram {
 
   std::vector<std::vector<double> > compute_pim(const std::vector<std::pair<double, double> >& diag, double min_x, double max_x, int res_x, double min_y, double max_y, int res_y, std::string weight, double sigma, double C, double p) {
     Weight weight_fn;
-    if(weight.compare("linear") == 0)  weight_fn = Gudhi::Persistence_representations::Persistence_weighted_gaussian::linear_weight;
-    if(weight.compare("arctan") == 0)  weight_fn = Gudhi::Persistence_representations::Persistence_weighted_gaussian::arctan_weight(C,p);
-    if(weight.compare("const")  == 0)  weight_fn = Gudhi::Persistence_representations::Persistence_weighted_gaussian::const_weight;
+    if(weight.compare("linear") == 0)  weight_fn = Gudhi::Persistence_representations::linear_weight;
+    if(weight.compare("arctan") == 0)  weight_fn = Gudhi::Persistence_representations::arctan_weight(C,p);
+    if(weight.compare("const")  == 0)  weight_fn = Gudhi::Persistence_representations::const_weight;
     Gudhi::Persistence_representations::Persistence_image P(diag, min_x, max_x, res_x, min_y, max_y, res_y, weight_fn, sigma);
     return P.vectorize();
   }