diff options
author | pdlotko <pdlotko@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-04-07 09:10:52 +0000 |
---|---|---|
committer | pdlotko <pdlotko@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-04-07 09:10:52 +0000 |
commit | ca2ad986b9925ab7006597f0f7045f7be47a42b2 (patch) | |
tree | 83ac514bafc26903ab8d677c1221edfc72a0d991 /src | |
parent | 00c36cb49bc55d93edadad6b865ffc42118ea148 (diff) |
Answers to Marc's comments
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/gudhi_stat@2317 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: f941a6b20210282408d0ef95b84daa973add2513
Diffstat (limited to 'src')
-rw-r--r-- | src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_landscape_on_grid.h | 8 | ||||
-rw-r--r-- | src/cmake/modules/GUDHI_user_version_target.txt | 2 | ||||
-rw-r--r-- | src/common/doc/main_page.h | 17 | ||||
-rw-r--r-- | src/cython/doc/img/average_landscape.png | bin | 0 -> 14917 bytes |
4 files changed, 23 insertions, 4 deletions
diff --git a/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_landscape_on_grid.h b/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_landscape_on_grid.h index 422699ef..b70ef1d9 100644 --- a/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_landscape_on_grid.h +++ b/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_landscape_on_grid.h @@ -313,8 +313,11 @@ public: //compute the value of the linear function parametrized by line on a point x: return line.first*x+line.second; } + + protected: + template < typename oper > friend Persistence_landscape_on_grid operation_on_pair_of_landscapes_on_grid( const Persistence_landscape_on_grid& land1 , const Persistence_landscape_on_grid& land2 ); - + public: /** *\private A function that compute sum of two landscapes. **/ @@ -1024,8 +1027,7 @@ protected: this->number_of_functions_for_projections_to_reals = this->values_of_landscapes.size(); } - void set_up_values_of_landscapes( const std::vector< std::pair< double , double > >& p , double grid_min_ , double grid_max_ , size_t number_of_points_ ); - template < typename oper > friend Persistence_landscape_on_grid operation_on_pair_of_landscapes_on_grid( const Persistence_landscape_on_grid& land1 , const Persistence_landscape_on_grid& land2 ); + void set_up_values_of_landscapes( const std::vector< std::pair< double , double > >& p , double grid_min_ , double grid_max_ , size_t number_of_points_ ); Persistence_landscape_on_grid multiply_lanscape_by_real_number_not_overwrite( double x )const; }; diff --git a/src/cmake/modules/GUDHI_user_version_target.txt b/src/cmake/modules/GUDHI_user_version_target.txt index b6a60dd1..a971f1d9 100644 --- a/src/cmake/modules/GUDHI_user_version_target.txt +++ b/src/cmake/modules/GUDHI_user_version_target.txt @@ -50,7 +50,7 @@ if (NOT CMAKE_VERSION VERSION_LESS 2.8.11) copy_directory ${CMAKE_SOURCE_DIR}/src/GudhUI ${GUDHI_USER_VERSION_DIR}/GudhUI) set(GUDHI_MODULES "common;Alpha_complex;Bitmap_cubical_complex;Bottleneck_distance;Contraction;Gudhi_stat;Hasse_complex;Persistent_cohomology;Rips_complex;Simplex_tree;Skeleton_blocker;Spatial_searching;Subsampling;Tangential_complex;Witness_complex") - set(GUDHI_DIRECTORIES "doc;example;concept") + set(GUDHI_DIRECTORIES "doc;example;concept;utilities") set(GUDHI_INCLUDE_DIRECTORIES "include/gudhi;include/gudhi_patches") foreach(GUDHI_MODULE ${GUDHI_MODULES}) diff --git a/src/common/doc/main_page.h b/src/common/doc/main_page.h index e6f29fa8..55673f60 100644 --- a/src/common/doc/main_page.h +++ b/src/common/doc/main_page.h @@ -151,6 +151,23 @@ </td> </tr> </table> +</table> + \subsection Gudhi_stat Gudhi statistical sublibrary + \image html "average_landscape.png" "Gudhi statistical sublibrary" +<table border="0"> + <tr> + <td width="25%"> + <b>Author:</b> Pawel Dlotko<br> + <b>Introduced in:</b> GUDHI 2.0.0<br> + <b>Copyright:</b> GPL v3<br> + </td> + <td width="75%"> + This is a statistical library for gudhi. It contain implementation of various representations of persistence diagrams; diagrams themselves, persistence landscapes (rigorous and grid version), + persistence heath maps, vectors and others. It implements basic functionalities which are neccessary to use persistence in statistics and machine learning. + <b>User manual:</b> \ref gudhi_stat - <b>Reference manual:</b> Gudhi::Gudhi_stat + </td> + </tr> +</table> \section Toolbox Toolbox \subsection BottleneckDistanceToolbox Bottleneck distance diff --git a/src/cython/doc/img/average_landscape.png b/src/cython/doc/img/average_landscape.png Binary files differnew file mode 100644 index 00000000..ea59926b --- /dev/null +++ b/src/cython/doc/img/average_landscape.png |