From 0213b55ef43f11c15a8e56117da822e3a2731f18 Mon Sep 17 00:00:00 2001 From: mcarrier Date: Wed, 25 Apr 2018 16:50:30 +0000 Subject: 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@3398 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: c57a2eb71d848df7bd677a8f3fc803b0c87d2d8d --- .../include/gudhi/Landscape.h | 108 ------------------ .../include/gudhi/Persistence_image.h | 126 --------------------- 2 files changed, 234 deletions(-) delete mode 100644 src/Persistence_representations/include/gudhi/Landscape.h delete mode 100644 src/Persistence_representations/include/gudhi/Persistence_image.h (limited to 'src/Persistence_representations/include') diff --git a/src/Persistence_representations/include/gudhi/Landscape.h b/src/Persistence_representations/include/gudhi/Landscape.h deleted file mode 100644 index bbbca36b..00000000 --- a/src/Persistence_representations/include/gudhi/Landscape.h +++ /dev/null @@ -1,108 +0,0 @@ -/* This file is part of the Gudhi Library. The Gudhi library - * (Geometric Understanding in Higher Dimensions) is a generic C++ - * library for computational topology. - * - * Author(s): Mathieu Carriere - * - * Copyright (C) 2018 INRIA (France) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef LANDSCAPE_H_ -#define LANDSCAPE_H_ - -// gudhi include -#include -#include -#include - -// standard include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace Gudhi { -namespace Persistence_representations { - -/** - * \class Landscape gudhi/Landscape.h - * \brief A class implementing landscapes. - * - * \ingroup Persistence_representations - * - * \details - * - * The landscape is a way to turn a persistence diagram into \f$L^2\f$ functions. Roughly, the idea is to see the boundaries of the rank functions as scalar functions taking values on the diagonal. - * See \cite bubenik_landscapes_2015 for more details. Here we provide a way to approximate such functions by computing their values on a set of samples. - * -**/ - -class Landscape { - - protected: - Persistence_diagram diagram; - int res_x, nb_ls; - double min_x, max_x; - - public: - - /** \brief Landscape constructor. - * \ingroup Landscape - * - * @param[in] _diagram persistence diagram. - * @param[in] _nb_ls number of landscape functions. - * @param[in] _min_x minimum value of samples. - * @param[in] _max_x maximum value of samples. - * @param[in] _res_x number of samples. - * - */ - Landscape(const Persistence_diagram & _diagram, int _nb_ls = 5, double _min_x = 0.0, double _max_x = 1.0, int _res_x = 10){diagram = _diagram; nb_ls = _nb_ls; min_x = _min_x; max_x = _max_x; res_x = _res_x;} - - /** \brief Computes the landscape of a diagram. - * \ingroup Landscape - * - */ - std::vector > vectorize() const { - std::vector > ls; for(int i = 0; i < nb_ls; i++) ls.emplace_back(); - int num_pts = diagram.size(); double step = (max_x - min_x)/res_x; - - for(int i = 0; i < res_x; i++){ - double x = min_x + i*step; double t = x / std::sqrt(2); std::vector events; - for(int j = 0; j < num_pts; j++){ - double px = diagram[j].first; double py = diagram[j].second; - if(t >= px && t <= py){ if(t >= (px+py)/2) events.push_back(std::sqrt(2)*(py-t)); else events.push_back(std::sqrt(2)*(t-px)); } - } - - std::sort(events.begin(), events.end(), [](const double & a, const double & b){return a > b;}); int nb_events = events.size(); - for (int j = 0; j < nb_ls; j++){ if(j < nb_events) ls[j].push_back(events[j]); else ls[j].push_back(0); } - } - return ls; - } - - - - -}; // class Landscape -} // namespace Persistence_representations -} // namespace Gudhi - -#endif // LANDSCAPE_H_ diff --git a/src/Persistence_representations/include/gudhi/Persistence_image.h b/src/Persistence_representations/include/gudhi/Persistence_image.h deleted file mode 100644 index 76b34d8d..00000000 --- a/src/Persistence_representations/include/gudhi/Persistence_image.h +++ /dev/null @@ -1,126 +0,0 @@ -/* This file is part of the Gudhi Library. The Gudhi library - * (Geometric Understanding in Higher Dimensions) is a generic C++ - * library for computational topology. - * - * Author(s): Mathieu Carriere - * - * Copyright (C) 2018 INRIA (France) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef PERSISTENCE_IMAGE_H_ -#define PERSISTENCE_IMAGE_H_ - -// gudhi include -#include -#include -#include -#include - -// standard include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace Gudhi { -namespace Persistence_representations { - -/** - * \class Persistence_image gudhi/Persistence_image.h - * \brief A class implementing the persistence images. - * - * \ingroup Persistence_representations - * - * \details - * - * Persistence images are a way to build images from persistence diagrams. Roughly, the idea is to center Gaussians on each diagram point, with a weight that usually depends on - * the distance to the diagonal, so that the diagram is turned into a function, and then to discretize the plane into pixels, and integrate this function on each pixel. - * See \cite Persistence_Images_2017 for more details. - * -**/ - -class Persistence_image { - - protected: - Persistence_diagram diagram; - int res_x, res_y; - double min_x, max_x, min_y, max_y; - Weight weight; - double sigma; - - public: - - /** \brief Persistence Image constructor. - * \ingroup Persistence_image - * - * @param[in] _diagram persistence diagram. - * @param[in] _min_x minimum value of pixel abscissa. - * @param[in] _max_x maximum value of pixel abscissa. - * @param[in] _res_x number of pixels for the x-direction. - * @param[in] _min_y minimum value of pixel ordinate. - * @param[in] _max_y maximum value of pixel ordinate. - * @param[in] _res_y number of pixels for the y-direction. - * @param[in] _weight weight function for the Gaussians. - * @param[in] _sigma bandwidth parameter for the Gaussians. - * - */ - Persistence_image(const Persistence_diagram & _diagram, double _min_x = 0.0, double _max_x = 1.0, int _res_x = 10, double _min_y = 0.0, double _max_y = 1.0, int _res_y = 10, const Weight & _weight = arctan_weight(1,1), double _sigma = 1.0){ - diagram = _diagram; min_x = _min_x; max_x = _max_x; res_x = _res_x; min_y = _min_y; max_y = _max_y; res_y = _res_y, weight = _weight; sigma = _sigma; - } - - /** \brief Computes the persistence image of a diagram. - * \ingroup Persistence_image - * - */ - std::vector > vectorize() const { - std::vector > im; for(int i = 0; i < res_y; i++) im.emplace_back(); - double step_x = (max_x - min_x)/res_x; double step_y = (max_y - min_y)/res_y; - - int num_pts = diagram.size(); - - for(int i = 0; i < res_y; i++){ - double y = min_y + i*step_y; - for(int j = 0; j < res_x; j++){ - double x = min_x + j*step_x; - - double pixel_value = 0; - for(int k = 0; k < num_pts; k++){ - double px = diagram[k].first; double py = diagram[k].second; - pixel_value += weight(std::pair(px,py)) * std::exp( -((x-px)*(x-px) + (y-(py-px))*(y-(py-px))) / (2*sigma*sigma) ) / (sigma*std::sqrt(2*pi)); - } - im[i].push_back(pixel_value); - - } - } - - return im; - - } - - - - -}; // class Persistence_image -} // namespace Persistence_representations -} // namespace Gudhi - -#endif // PERSISTENCE_IMAGE_H_ -- cgit v1.2.3