diff options
author | mcarrier <mcarrier@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-04-25 16:47:55 +0000 |
---|---|---|
committer | mcarrier <mcarrier@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-04-25 16:47:55 +0000 |
commit | df5a7d97392469239e1f00ea50da5eb2b378b7e7 (patch) | |
tree | 40c21e4fdd783896198425a11cb0576934bc9378 /src/cython/include/Vectors_interface.h | |
parent | c11a8596bc7ee8705f99258886714da7757f2334 (diff) |
renamed landscape and image code to make them fit in Pawel's denomination
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/kernels@3396 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 5269a65810a1164cb61bcb34d23046e6a48ec355
Diffstat (limited to 'src/cython/include/Vectors_interface.h')
-rw-r--r-- | src/cython/include/Vectors_interface.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cython/include/Vectors_interface.h b/src/cython/include/Vectors_interface.h index 7e191f2a..902ccc10 100644 --- a/src/cython/include/Vectors_interface.h +++ b/src/cython/include/Vectors_interface.h @@ -23,9 +23,9 @@ #ifndef INCLUDE_VECTORS_INTERFACE_H_ #define INCLUDE_VECTORS_INTERFACE_H_ -#include <gudhi/Landscape.h> -#include <gudhi/Persistence_image.h> -#include <gudhi/Persistence_weighted_gaussian.h> +#include <gudhi/Persistence_landscape_on_grid_exact.h> +#include <gudhi/Persistence_heat_maps_exact.h> +#include <gudhi/Weight_functions.h> #include <iostream> #include <vector> @@ -38,7 +38,7 @@ namespace Gudhi { namespace persistence_diagram { std::vector<std::vector<double> > compute_ls(const std::vector<std::pair<double, double> >& diag, int nb_ls, double min_x, double max_x, int res_x) { - Gudhi::Persistence_representations::Landscape L(diag, nb_ls, min_x, max_x, res_x); + Gudhi::Persistence_representations::Persistence_landscape_on_grid_exact L(diag, nb_ls, min_x, max_x, res_x); return L.vectorize(); } @@ -47,7 +47,7 @@ namespace persistence_diagram { 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); + Gudhi::Persistence_representations::Persistence_heat_maps_exact P(diag, min_x, max_x, res_x, min_y, max_y, res_y, weight_fn, sigma); return P.vectorize(); } |