diff options
author | pdlotko <pdlotko@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-10-21 20:10:53 +0000 |
---|---|---|
committer | pdlotko <pdlotko@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-10-21 20:10:53 +0000 |
commit | 754d26e6545b92f84017a618ac3813434f222bca (patch) | |
tree | f227e3303d156fa90e19fa9cf2b1f7a1868351af /src/Gudhi_stat/example | |
parent | 19451e20b6d47b6a84d5ad89d99497e0e60cd377 (diff) |
adding a few corrections. Moreover I right now persisgence_heat_map is a template class. A template parameter is a class that gives the scaling of kernel with repsect to diagonal.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/gudhi_stat@1742 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 37e4c01a95f5682f4acb3bba3145014671f95188
Diffstat (limited to 'src/Gudhi_stat/example')
4 files changed, 7 insertions, 11 deletions
diff --git a/src/Gudhi_stat/example/persistence_heat_maps.cpp b/src/Gudhi_stat/example/persistence_heat_maps.cpp index 645f63f7..1d7a131a 100644 --- a/src/Gudhi_stat/example/persistence_heat_maps.cpp +++ b/src/Gudhi_stat/example/persistence_heat_maps.cpp @@ -23,7 +23,6 @@ #include <gudhi/reader_utils.h> -#include <gudhi/abstract_classes/Abs_Topological_data.h> #include <gudhi/concretizations/Persistence_heat_maps.h> #include <iostream> @@ -61,27 +60,27 @@ int main( int argc , char** argv ) std::vector< std::vector<double> > filter = create_Gaussian_filter(5,1); //creating two heat maps. - Persistence_heat_maps hm1( persistence1 , filter , constant_function, false , 20 , 0 , 11 ); - Persistence_heat_maps hm2( persistence2 , filter , constant_function, false , 20 , 0 , 11 ); + Persistence_heat_maps<constant_scaling_function> hm1( persistence1 , filter , false , 20 , 0 , 11 ); + Persistence_heat_maps<constant_scaling_function> hm2( persistence2 , filter , false , 20 , 0 , 11 ); - std::vector<Persistence_heat_maps*> vector_of_maps; + std::vector<Persistence_heat_maps<constant_scaling_function>*> vector_of_maps; vector_of_maps.push_back( &hm1 ); vector_of_maps.push_back( &hm2 ); //compute median/mean of a vector of heat maps: - Persistence_heat_maps mean; + Persistence_heat_maps<constant_scaling_function> mean; mean.compute_mean( vector_of_maps ); - Persistence_heat_maps median; + Persistence_heat_maps<constant_scaling_function> median; median.compute_median( vector_of_maps ); //to compute L^1 disance between hm1 and hm2: std::cout << "The L^1 distance is : " << hm1.distance( hm2 , 1 ) << std::endl; //to average of hm1 and hm2: - std::vector< Persistence_heat_maps* > to_average; + std::vector< Persistence_heat_maps<constant_scaling_function>* > to_average; to_average.push_back( &hm1 ); to_average.push_back( &hm2 ); - Persistence_heat_maps av; + Persistence_heat_maps<constant_scaling_function> av; av.compute_average( to_average ); //to compute scalar product of hm1 and hm2: diff --git a/src/Gudhi_stat/example/persistence_intervals.cpp b/src/Gudhi_stat/example/persistence_intervals.cpp index 5357def7..6e2b0ddb 100644 --- a/src/Gudhi_stat/example/persistence_intervals.cpp +++ b/src/Gudhi_stat/example/persistence_intervals.cpp @@ -23,7 +23,6 @@ #include <gudhi/reader_utils.h> -#include <gudhi/abstract_classes/Abs_Topological_data.h> #include <gudhi/concretizations/Persistence_intervals.h> #include <iostream> diff --git a/src/Gudhi_stat/example/persistence_landscape.cpp b/src/Gudhi_stat/example/persistence_landscape.cpp index 106864c0..7ba9387d 100644 --- a/src/Gudhi_stat/example/persistence_landscape.cpp +++ b/src/Gudhi_stat/example/persistence_landscape.cpp @@ -22,7 +22,6 @@ -#include <gudhi/abstract_classes/Abs_Topological_data.h> #include <gudhi/concretizations/Persistence_landscape.h> diff --git a/src/Gudhi_stat/example/persistence_landscape_on_grid.cpp b/src/Gudhi_stat/example/persistence_landscape_on_grid.cpp index 223c9d50..331ae4ae 100644 --- a/src/Gudhi_stat/example/persistence_landscape_on_grid.cpp +++ b/src/Gudhi_stat/example/persistence_landscape_on_grid.cpp @@ -22,7 +22,6 @@ -#include <gudhi/abstract_classes/Abs_Topological_data.h> #include <gudhi/concretizations/Persistence_landscape_on_grid.h> |