diff options
| author | pdlotko <pdlotko@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-10-11 07:43:50 +0000 |
|---|---|---|
| committer | pdlotko <pdlotko@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-10-11 07:43:50 +0000 |
| commit | 7a6ebbd6c26306bca806bbc8c08f74a13c63fca6 (patch) | |
| tree | 63e331cd19aa72f81808c61c44f3f8add99e8bcb | |
| parent | 28b6b1eb52920b495a73f4713d9a6ae78a997f6e (diff) | |
adding answert to Vincent's comments
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/gudhi_stat@1688 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 3e90519425010bfedae7af946238188fee6cf420
57 files changed, 288 insertions, 515 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d7078489..488f1d62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -145,6 +145,7 @@ else() add_subdirectory(src/Alpha_complex/test) add_subdirectory(src/Gudhi_stat/test) add_subdirectory(src/Gudhi_stat/example) + add_subdirectory(src/Gudhi_stat/utilities) # data points generator add_subdirectory(data/points/generator) diff --git a/src/Gudhi_stat/example/CMakeLists.txt b/src/Gudhi_stat/example/CMakeLists.txt index 613e4d26..5ae6cd6a 100644 --- a/src/Gudhi_stat/example/CMakeLists.txt +++ b/src/Gudhi_stat/example/CMakeLists.txt @@ -17,103 +17,5 @@ add_executable ( persistence_heat_maps persistence_heat_maps.cpp ) target_link_libraries(persistence_heat_maps ${Boost_SYSTEM_LIBRARY}) -##UTILITIES: - -#persitence diagrams -add_executable ( plot_persistence_intervals utilities/persistence_intervals/plot_persistence_intervals.cpp ) -target_link_libraries( plot_persistence_intervals ${Boost_SYSTEM_LIBRARY}) - -add_executable ( compute_birth_death_range_in_persistence_diagram utilities/persistence_intervals/compute_birth_death_range_in_persistence_diagram.cpp ) -target_link_libraries( compute_birth_death_range_in_persistence_diagram ${Boost_SYSTEM_LIBRARY}) - -add_executable ( compute_number_of_dominant_intervals utilities/persistence_intervals/compute_number_of_dominant_intervals.cpp ) -target_link_libraries( compute_number_of_dominant_intervals ${Boost_SYSTEM_LIBRARY}) - -add_executable ( plot_histogram_of_intervals_lengths utilities/persistence_intervals/plot_histogram_of_intervals_lengths.cpp ) -target_link_libraries( plot_histogram_of_intervals_lengths ${Boost_SYSTEM_LIBRARY}) - -add_executable ( plot_persistence_Betti_numebrs utilities/persistence_intervals/plot_persistence_Betti_numebrs.cpp ) -target_link_libraries( plot_persistence_Betti_numebrs ${Boost_SYSTEM_LIBRARY}) - -#when we have bottleneck and wasserstein distance computations, add suitable programs here. - - -#persitence landscapes -add_executable ( average_landscapes utilities/persistence_landscapes/average_landscapes.cpp ) -target_link_libraries(average_landscapes ${Boost_SYSTEM_LIBRARY}) - -add_executable ( create_landscapes utilities/persistence_landscapes/create_landscapes.cpp ) -target_link_libraries(create_landscapes ${Boost_SYSTEM_LIBRARY}) - -add_executable ( plot_landscapes utilities/persistence_landscapes/plot_landscapes.cpp ) -target_link_libraries(plot_landscapes ${Boost_SYSTEM_LIBRARY}) - -add_executable ( compute_distance_of_landscapes utilities/persistence_landscapes/compute_distance_of_landscapes.cpp ) -target_link_libraries(compute_distance_of_landscapes ${Boost_SYSTEM_LIBRARY}) - -add_executable ( compute_scalar_product_of_landscapes utilities/persistence_landscapes/compute_scalar_product_of_landscapes.cpp ) -target_link_libraries(compute_scalar_product_of_landscapes ${Boost_SYSTEM_LIBRARY}) - -#persitence landscapes on a grid -add_executable ( average_landscapes_on_grid utilities/persistence_landscapes_on_grid/average_landscapes_on_grid.cpp ) -target_link_libraries(average_landscapes_on_grid ${Boost_SYSTEM_LIBRARY}) - -add_executable ( create_landscapes_on_grid utilities/persistence_landscapes_on_grid/create_landscapes_on_grid.cpp ) -target_link_libraries(create_landscapes_on_grid ${Boost_SYSTEM_LIBRARY}) - -add_executable ( plot_landscapes_on_grid utilities/persistence_landscapes_on_grid/plot_landscapes_on_grid.cpp ) -target_link_libraries(plot_landscapes_on_grid ${Boost_SYSTEM_LIBRARY}) - -add_executable ( compute_distance_of_landscapes_on_grid utilities/persistence_landscapes_on_grid/compute_distance_of_landscapes_on_grid.cpp ) -target_link_libraries(compute_distance_of_landscapes_on_grid ${Boost_SYSTEM_LIBRARY}) - -add_executable ( compute_scalar_product_of_landscapes_on_grid utilities/persistence_landscapes_on_grid/compute_scalar_product_of_landscapes_on_grid.cpp ) -target_link_libraries(compute_scalar_product_of_landscapes_on_grid ${Boost_SYSTEM_LIBRARY}) - -#persitence heat maps -add_executable ( average_persistence_heat_maps utilities/persistence_heat_maps/average_persistence_heat_maps.cpp ) -target_link_libraries(average_persistence_heat_maps ${Boost_SYSTEM_LIBRARY}) - -add_executable ( create_persistence_heat_maps utilities/persistence_heat_maps/create_persistence_heat_maps.cpp ) -target_link_libraries(create_persistence_heat_maps ${Boost_SYSTEM_LIBRARY}) - -add_executable ( plot_persistence_heat_map utilities/persistence_heat_maps/plot_persistence_heat_map.cpp ) -target_link_libraries(plot_persistence_heat_map ${Boost_SYSTEM_LIBRARY}) - -add_executable ( compute_distance_of_persistence_heat_maps utilities/persistence_heat_maps/compute_distance_of_persistence_heat_maps.cpp ) -target_link_libraries(compute_distance_of_persistence_heat_maps ${Boost_SYSTEM_LIBRARY}) - -add_executable ( compute_scalar_product_of_persistence_heat_maps utilities/persistence_heat_maps/compute_scalar_product_of_persistence_heat_maps.cpp ) -target_link_libraries(compute_scalar_product_of_persistence_heat_maps ${Boost_SYSTEM_LIBRARY}) - -add_executable ( create_pssk utilities/persistence_heat_maps/create_pssk.cpp ) -target_link_libraries(create_pssk ${Boost_SYSTEM_LIBRARY}) - -add_executable ( create_persistence_heat_maps_weighted_by_distance_from_diagonal utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_distance_from_diagonal.cpp ) -target_link_libraries(create_persistence_heat_maps_weighted_by_distance_from_diagonal ${Boost_SYSTEM_LIBRARY}) - -add_executable ( create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal.cpp ) -target_link_libraries(create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal ${Boost_SYSTEM_LIBRARY}) - -add_executable ( create_persistence_heat_maps_weighted_by_arctan_of_their_persistence utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_arctan_of_their_persistence.cpp ) -target_link_libraries(create_persistence_heat_maps_weighted_by_arctan_of_their_persistence ${Boost_SYSTEM_LIBRARY}) - - -#persitence vectors -add_executable ( average_persistence_vectors utilities/persistence_vectors/average_persistence_vectors.cpp ) -target_link_libraries(average_persistence_vectors ${Boost_SYSTEM_LIBRARY}) - -add_executable ( create_persistence_vectors utilities/persistence_vectors/create_persistence_vectors.cpp ) -target_link_libraries(create_persistence_vectors ${Boost_SYSTEM_LIBRARY}) - -add_executable ( compute_distance_of_persistence_vectors utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp ) -target_link_libraries(compute_distance_of_persistence_vectors ${Boost_SYSTEM_LIBRARY}) - -add_executable ( compute_scalar_product_of_persistence_vectors utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp ) -target_link_libraries(compute_scalar_product_of_persistence_vectors ${Boost_SYSTEM_LIBRARY}) - -add_executable ( plot_persistence_vectors utilities/persistence_vectors/plot_persistence_vectors.cpp ) -target_link_libraries(plot_persistence_vectors ${Boost_SYSTEM_LIBRARY}) - diff --git a/src/Gudhi_stat/example/persistence_heat_maps.cpp b/src/Gudhi_stat/example/persistence_heat_maps.cpp index cd0c4113..e336ab44 100644 --- a/src/Gudhi_stat/example/persistence_heat_maps.cpp +++ b/src/Gudhi_stat/example/persistence_heat_maps.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/persistence_intervals.cpp b/src/Gudhi_stat/example/persistence_intervals.cpp index cbd4020d..5357def7 100644 --- a/src/Gudhi_stat/example/persistence_intervals.cpp +++ b/src/Gudhi_stat/example/persistence_intervals.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/persistence_landscape.cpp b/src/Gudhi_stat/example/persistence_landscape.cpp index a5b726c7..3204148b 100644 --- a/src/Gudhi_stat/example/persistence_landscape.cpp +++ b/src/Gudhi_stat/example/persistence_landscape.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/persistence_landscape_on_grid.cpp b/src/Gudhi_stat/example/persistence_landscape_on_grid.cpp index 2807d76f..e1a0ba5d 100644 --- a/src/Gudhi_stat/example/persistence_landscape_on_grid.cpp +++ b/src/Gudhi_stat/example/persistence_landscape_on_grid.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/utilities/persistence_intervals/aaa b/src/Gudhi_stat/example/utilities/persistence_intervals/aaa deleted file mode 100644 index 5aed2ec0..00000000 --- a/src/Gudhi_stat/example/utilities/persistence_intervals/aaa +++ /dev/null @@ -1,51 +0,0 @@ -0.254583 0.837489 -0.25491 0.410985 -0.262238 0.405964 -0.233498 0.338685 -0.253282 0.344571 -0.249923 0.339748 -0.179532 0.263873 -0.247402 0.323782 -0.181315 0.249492 -0.160746 0.22547 -0.170367 0.232149 -0.192048 0.253065 -0.27298 0.333994 -0.202383 0.260308 -0.278325 0.329157 -0.176624 0.226215 -0.200184 0.249281 -0.275607 0.323516 -0.178408 0.224032 -0.319435 0.362706 -0.184347 0.226301 -0.19342 0.23356 -0.143554 0.180648 -0.313975 0.34917 -0.260887 0.29465 -0.206395 0.23344 -0.272846 0.298156 -0.222294 0.246925 -0.272951 0.295696 -0.235421 0.257957 -0.277907 0.29913 -0.16591 0.186925 -0.223042 0.243167 -0.435025 0.454885 -0.151992 0.169807 -0.138011 0.155776 -0.218083 0.235837 -0.219364 0.237079 -0.297063 0.313899 -0.282666 0.298727 -0.24199 0.256381 -0.302722 0.316677 -0.160453 0.174076 -0.157689 0.169984 -0.192957 0.204705 -0.153738 0.165306 -0.226448 0.237898 -0.243627 0.252613 -0.210126 0.21907 -0.172082 0.177708 -0.232291 0.234521 diff --git a/src/Gudhi_stat/example/utilities/persistence_intervals/aaa_Gnuplot_script b/src/Gudhi_stat/example/utilities/persistence_intervals/aaa_Gnuplot_script deleted file mode 100644 index 3ff83e9c..00000000 --- a/src/Gudhi_stat/example/utilities/persistence_intervals/aaa_Gnuplot_script +++ /dev/null @@ -1,208 +0,0 @@ -set xrange [0.131016 : 0.844554] -set yrange [0 : 16.16] -plot '-' using 1:2 notitle with lp -0.138011 0 -0.138011 1 -0.143554 1 -0.143554 2 -0.151992 2 -0.151992 3 -0.153738 3 -0.153738 4 -0.155776 4 -0.155776 3 -0.157689 3 -0.157689 4 -0.160453 4 -0.160453 5 -0.160746 5 -0.160746 6 -0.165306 6 -0.165306 5 -0.16591 5 -0.16591 6 -0.169807 6 -0.169807 5 -0.169984 5 -0.169984 4 -0.170367 4 -0.170367 5 -0.172082 5 -0.172082 6 -0.174076 6 -0.174076 5 -0.176624 5 -0.176624 6 -0.177708 6 -0.177708 5 -0.178408 5 -0.178408 6 -0.179532 6 -0.179532 7 -0.180648 7 -0.180648 6 -0.181315 6 -0.181315 7 -0.184347 7 -0.184347 8 -0.186925 8 -0.186925 7 -0.192048 7 -0.192048 8 -0.192957 8 -0.192957 9 -0.19342 9 -0.19342 10 -0.200184 10 -0.200184 11 -0.202383 11 -0.202383 12 -0.204705 12 -0.204705 11 -0.206395 11 -0.206395 12 -0.210126 12 -0.210126 13 -0.218083 13 -0.218083 14 -0.21907 14 -0.21907 13 -0.219364 13 -0.219364 14 -0.222294 14 -0.222294 15 -0.223042 15 -0.223042 16 -0.224032 16 -0.224032 15 -0.22547 15 -0.22547 14 -0.226215 14 -0.226215 13 -0.226301 13 -0.226301 12 -0.226448 12 -0.226448 13 -0.232149 13 -0.232149 12 -0.232291 12 -0.232291 13 -0.23344 13 -0.23344 12 -0.233498 12 -0.233498 13 -0.23356 13 -0.23356 12 -0.234521 12 -0.234521 11 -0.235421 11 -0.235421 12 -0.235837 12 -0.235837 11 -0.237079 11 -0.237079 10 -0.237898 10 -0.237898 9 -0.24199 9 -0.24199 10 -0.243167 10 -0.243167 9 -0.243627 9 -0.243627 10 -0.246925 10 -0.246925 9 -0.247402 9 -0.247402 10 -0.249281 10 -0.249281 9 -0.249492 9 -0.249492 8 -0.249923 8 -0.249923 9 -0.252613 9 -0.252613 8 -0.253065 8 -0.253065 7 -0.253282 7 -0.253282 8 -0.254583 8 -0.254583 9 -0.25491 9 -0.25491 10 -0.256381 10 -0.256381 9 -0.257957 9 -0.257957 8 -0.260308 8 -0.260308 7 -0.260887 7 -0.260887 8 -0.262238 8 -0.262238 9 -0.263873 9 -0.263873 8 -0.272846 8 -0.272846 9 -0.272951 9 -0.272951 10 -0.27298 10 -0.27298 11 -0.275607 11 -0.275607 12 -0.277907 12 -0.277907 13 -0.278325 13 -0.278325 14 -0.282666 14 -0.282666 15 -0.29465 15 -0.29465 14 -0.295696 14 -0.295696 13 -0.297063 13 -0.297063 14 -0.298156 14 -0.298156 13 -0.298727 13 -0.298727 12 -0.29913 12 -0.29913 11 -0.302722 11 -0.302722 12 -0.313899 12 -0.313899 11 -0.313975 11 -0.313975 12 -0.316677 12 -0.316677 11 -0.319435 11 -0.319435 12 -0.323516 12 -0.323516 11 -0.323782 11 -0.323782 10 -0.329157 10 -0.329157 9 -0.333994 9 -0.333994 8 -0.338685 8 -0.338685 7 -0.339748 7 -0.339748 6 -0.344571 6 -0.344571 5 -0.34917 5 -0.34917 4 -0.362706 4 -0.362706 3 -0.405964 3 -0.405964 2 -0.410985 2 -0.410985 1 -0.435025 1 -0.435025 2 -0.454885 2 -0.454885 1 -0.837489 1 -0.837489 0 - diff --git a/src/Gudhi_stat/example/vector_representation.cpp b/src/Gudhi_stat/example/vector_representation.cpp index 358de1b0..0581baf4 100644 --- a/src/Gudhi_stat/example/vector_representation.cpp +++ b/src/Gudhi_stat/example/vector_representation.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Real_valued_topological_data.h b/src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Real_valued_topological_data.h index 9b313e62..09c2cf85 100644 --- a/src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Real_valued_topological_data.h +++ b/src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Real_valued_topological_data.h @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data.h b/src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data.h index 0e3db722..e38ae2df 100644 --- a/src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data.h +++ b/src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data.h @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 @@ -20,10 +20,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -//#ifndef ABS_Topological_data_H_ -//#define ABS_Topological_data_H_ +#ifndef ABS_Topological_data_H_ +#define ABS_Topological_data_H_ + -#pragma once namespace Gudhi { @@ -44,4 +44,4 @@ class Abs_Topological_data }//namespace Gudhi_stat }//namespace Gudhi -//#endif +#endif diff --git a/src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data_with_averages.h b/src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data_with_averages.h index 88220e73..8585a62c 100644 --- a/src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data_with_averages.h +++ b/src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data_with_averages.h @@ -5,7 +5,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 @@ -23,14 +23,13 @@ #ifndef Abs_Topological_data_with_averages_H_ #define Abs_Topological_data_with_averages_H_ +#include <gudhi/abstract_classes/Abs_Topological_data.h> + namespace Gudhi { namespace Gudhi_stat { - -#include <gudhi/abstract_classes/Abs_Topological_data.h> - /** * This is an abstract container to store topological information. Most typically, this information will be some representation of persistent homology. @@ -46,7 +45,7 @@ public: //2) Function returns Abs_Topological_data*, and compute the average of all the objects in the vector, plus (*this). //virtual Abs_Topological_data* compute_average( std::vector< Abs_Topological_data_with_averages* > to_average ) = 0; //At the moment I will try to implement option (1). - virtual void compute_average( std::vector< Abs_Topological_data_with_averages* > to_average ) = 0; + virtual void compute_average( const std::vector< Abs_Topological_data_with_averages* >& to_average ) = 0; virtual ~Abs_Topological_data_with_averages(){} protected: }; diff --git a/src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data_with_distances.h b/src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data_with_distances.h index 2725c2c6..5b683268 100644 --- a/src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data_with_distances.h +++ b/src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data_with_distances.h @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 @@ -23,14 +23,15 @@ #ifndef Abs_Topological_data_with_distances_H_ #define Abs_Topological_data_with_distances_H_ +//#include "Abs_Topological_data.h" +#include <gudhi/abstract_classes/Abs_Topological_data.h> + + namespace Gudhi { namespace Gudhi_stat { -//with this path it do not find the files -//#include <gudhi/abstract_classes/Abs_Topological_data.h> -#include "Abs_Topological_data.h" /** * This is an abstract container to store topological information. Most typically, this information will be some representation of persistent homology. diff --git a/src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data_with_scalar_product.h b/src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data_with_scalar_product.h index b5e5b175..819b1376 100644 --- a/src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data_with_scalar_product.h +++ b/src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data_with_scalar_product.h @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 @@ -23,13 +23,14 @@ #ifndef Abs_Topological_data_with_scalar_product_H #define Abs_Topological_data_with_scalar_product_H_ +#include <gudhi/abstract_classes/Abs_Topological_data.h> + + namespace Gudhi { namespace Gudhi_stat { -#include <gudhi/abstract_classes/Abs_Topological_data.h> - /** * This is an abstract container to store topological information. Most typically, this information will be some representation of persistent homology. **/ diff --git a/src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Vectorized_topological_data.h b/src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Vectorized_topological_data.h index df423688..2f352428 100644 --- a/src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Vectorized_topological_data.h +++ b/src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Vectorized_topological_data.h @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 @@ -24,17 +24,13 @@ #define Abs_Vectorized_topological_data_H_ #include <gudhi/abstract_classes/Abs_Topological_data.h> +#include "Abs_Topological_data.h" +#include <vector> namespace Gudhi { namespace Gudhi_stat { - -//with this path it do not find the files -//#include <gudhi/abstract_classes/Abs_Topological_data.h> -#include "Abs_Topological_data.h" -#include <vector> - using namespace std; /** diff --git a/src/Gudhi_stat/include/gudhi/concretizations/PSSK.h b/src/Gudhi_stat/include/gudhi/concretizations/PSSK.h index 61597ee2..8168b7a7 100644 --- a/src/Gudhi_stat/include/gudhi/concretizations/PSSK.h +++ b/src/Gudhi_stat/include/gudhi/concretizations/PSSK.h @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/include/gudhi/concretizations/Persistence_heat_maps.h b/src/Gudhi_stat/include/gudhi/concretizations/Persistence_heat_maps.h index afb0da87..89254f16 100644 --- a/src/Gudhi_stat/include/gudhi/concretizations/Persistence_heat_maps.h +++ b/src/Gudhi_stat/include/gudhi/concretizations/Persistence_heat_maps.h @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 @@ -19,6 +19,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#ifndef Persistence_heat_maps_H +#define Persistence_heat_maps_H //standard include #include <vector> @@ -36,7 +39,7 @@ #include <gudhi/abstract_classes/Abs_Real_valued_topological_data.h> #include <gudhi/abstract_classes/Abs_Topological_data_with_scalar_product.h> #include <gudhi/concretizations/read_persitence_from_file.h> -#include <gudhi/common.h> +#include <gudhi/common_gudhi_stat.h> @@ -311,7 +314,7 @@ public: std::vector<double> vectorize( int number_of_function ); double distance( const Abs_Topological_data_with_distances* second_ , double power = 1); double project_to_R( int number_of_function ); - void compute_average( std::vector< Abs_Topological_data_with_averages* > to_average ); + void compute_average( const std::vector< Abs_Topological_data_with_averages* >& to_average ); double compute_scalar_product( const Abs_Topological_data_with_scalar_product* second_ ); protected: @@ -740,7 +743,7 @@ double Persistence_heat_maps::project_to_R( int number_of_function ) return result; } -void Persistence_heat_maps::compute_average( std::vector< Abs_Topological_data_with_averages* > to_average ) +void Persistence_heat_maps::compute_average( const std::vector< Abs_Topological_data_with_averages* >& to_average ) { std::vector<Persistence_heat_maps*> maps; maps.reserve( to_average.size() ); @@ -779,3 +782,6 @@ double Persistence_heat_maps::compute_scalar_product( const Abs_Topological_data }//namespace Gudhi_stat }//namespace Gudhi + + +#endif diff --git a/src/Gudhi_stat/include/gudhi/concretizations/Persistence_intervals.h b/src/Gudhi_stat/include/gudhi/concretizations/Persistence_intervals.h index e0db0070..f694541b 100644 --- a/src/Gudhi_stat/include/gudhi/concretizations/Persistence_intervals.h +++ b/src/Gudhi_stat/include/gudhi/concretizations/Persistence_intervals.h @@ -4,7 +4,7 @@ *
* Author(s): Pawel Dlotko
*
- * Copyright (C) 2015 INRIA Sophia-Saclay (France)
+ * Copyright (C) 2015 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
@@ -517,7 +517,8 @@ std::vector< double > Persistence_intervals::k_n_n( size_t k , size_t where_to_c }
std::vector< double > distances_from_diagonal( this->intervals.size() );
std::fill( distances_from_diagonal.begin() , distances_from_diagonal.end() , 0 );
-
for ( size_t i = 0 ; i != this->intervals.size() ; ++i )
+
+ for ( size_t i = 0 ; i != this->intervals.size() ; ++i )
{
std::vector< double > distancesFromI;
for ( size_t j = i+1 ; j != this->intervals.size() ; ++j )
@@ -602,7 +603,7 @@ std::vector< double > Persistence_intervals::k_n_n( size_t k , size_t where_to_c std::sort( result.begin() , result.end() , std::greater<double>() );
result.resize( std::min( result.size() , where_to_cut ) );
- return result; + return result;
}
diff --git a/src/Gudhi_stat/include/gudhi/concretizations/Persistence_landscape.h b/src/Gudhi_stat/include/gudhi/concretizations/Persistence_landscape.h index 82ee5878..f5f96d34 100644 --- a/src/Gudhi_stat/include/gudhi/concretizations/Persistence_landscape.h +++ b/src/Gudhi_stat/include/gudhi/concretizations/Persistence_landscape.h @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 @@ -42,7 +42,7 @@ #include <gudhi/abstract_classes/Abs_Real_valued_topological_data.h> #include <gudhi/abstract_classes/Abs_Topological_data_with_scalar_product.h> #include <gudhi/concretizations/read_persitence_from_file.h> -#include <gudhi/common.h> +#include <gudhi/common_gudhi_stat.h> using namespace std; @@ -446,7 +446,7 @@ public: } return v; } - void compute_average( std::vector< Abs_Topological_data_with_averages* > to_average ) + void compute_average( const std::vector< Abs_Topological_data_with_averages* >& to_average ) { bool dbg = false; diff --git a/src/Gudhi_stat/include/gudhi/concretizations/Persistence_landscape_on_grid.h b/src/Gudhi_stat/include/gudhi/concretizations/Persistence_landscape_on_grid.h index 7afd515d..8afab347 100644 --- a/src/Gudhi_stat/include/gudhi/concretizations/Persistence_landscape_on_grid.h +++ b/src/Gudhi_stat/include/gudhi/concretizations/Persistence_landscape_on_grid.h @@ -1,3 +1,25 @@ +/* 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): Pawel Dlotko + * + * Copyright (C) 2015 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 <http://www.gnu.org/licenses/>. + */ + #ifndef Persistence_landscape_on_grid_H_ #define Persistence_landscape_on_grid_H_ @@ -20,6 +42,7 @@ #include <gudhi/abstract_classes/Abs_Real_valued_topological_data.h> #include <gudhi/abstract_classes/Abs_Topological_data_with_scalar_product.h> #include <gudhi/concretizations/read_persitence_from_file.h> +#include <gudhi/common_gudhi_stat.h> @@ -47,23 +70,6 @@ struct greater bool operator()(T const &a, T const &b) const { return a > b; } }; -//double epsi = std::numeric_limits<double>::epsilon(); -double epsi = 0.000005; - - -/** - * A procedure used to compare doubles. Typically gien two doubles A and B, comparing A == B is not good idea. In this case, we use the procedure almostEqual with the epsi defined at - * the top of the file. Setting up the epsi give the user a tolerance on what should be consider equal. -**/ -inline bool almost_equal( double a , double b ) -{ - if ( fabs(a-b) < epsi ) - return true; - return false; -} - - - class Persistence_landscape_on_grid : public Abs_Vectorized_topological_data , @@ -739,7 +745,7 @@ public: /** * A function to compute averaged persistence landscape on a grid, based on vector of persistence landscapes on grid (projected to Abs_Topological_data_with_averages*, since this is a concretization of a virtual method. **/ - void compute_average( std::vector< Abs_Topological_data_with_averages* > to_average ) + void compute_average( const std::vector< Abs_Topological_data_with_averages* >& to_average ) { bool dbg = false; diff --git a/src/Gudhi_stat/include/gudhi/concretizations/Vector_distances_in_diagram.h b/src/Gudhi_stat/include/gudhi/concretizations/Vector_distances_in_diagram.h index 5870c652..951d8717 100644 --- a/src/Gudhi_stat/include/gudhi/concretizations/Vector_distances_in_diagram.h +++ b/src/Gudhi_stat/include/gudhi/concretizations/Vector_distances_in_diagram.h @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#pragma once + #ifndef Vector_distances_in_diagram_H #define Vector_distances_in_diagram_H @@ -38,7 +38,7 @@ #include <gudhi/abstract_classes/Abs_Real_valued_topological_data.h> #include <gudhi/abstract_classes/Abs_Topological_data_with_scalar_product.h> #include <gudhi/concretizations/read_persitence_from_file.h> -#include <gudhi/common.h> +#include <gudhi/common_gudhi_stat.h> using namespace std; namespace Gudhi @@ -88,7 +88,7 @@ public: /** * The constructor that takes as an input a multiset of persistence intervals (given as vector of birth-death pairs). The second parameter is the desiered length of the output vectors. **/ - Vector_distances_in_diagram( std::vector< std::pair< double , double > > intervals , size_t where_to_cut ); + Vector_distances_in_diagram( const std::vector< std::pair< double , double > >& intervals , size_t where_to_cut ); /** * The constructor taking as an input a file with birth-death pairs. The second parameter is the desiered length of the output vectors. @@ -112,9 +112,9 @@ public: template <typename K> friend ostream& operator << ( ostream& out , const Vector_distances_in_diagram<K>& d ) { - for ( size_t i = 0 ; i != std::min( d.sorted_vector_of_distnaces.size() , d.where_to_cut) ; ++i ) + for ( size_t i = 0 ; i != std::min( d.sorted_vector_of_distances.size() , d.where_to_cut) ; ++i ) { - out << d.sorted_vector_of_distnaces[i] << " "; + out << d.sorted_vector_of_distances[i] << " "; } return out; } @@ -124,14 +124,14 @@ public: **/ inline double vector_in_position( size_t position ) { - if ( position >= this->sorted_vector_of_distnaces.size() )throw("Wrong position in accessing Vector_distances_in_diagram::sorted_vector_of_distnaces\n"); - return this->sorted_vector_of_distnaces[position]; + if ( position >= this->sorted_vector_of_distances.size() )throw("Wrong position in accessing Vector_distances_in_diagram::sorted_vector_of_distances\n"); + return this->sorted_vector_of_distances[position]; } /** * Return a size of a vector. **/ - inline size_t size()const{return this->sorted_vector_of_distnaces.size();} + inline size_t size()const{return this->sorted_vector_of_distances.size();} /** * Write a vector to a file. @@ -156,10 +156,10 @@ public: **/ bool operator == ( const Vector_distances_in_diagram& second ) { - if ( this->sorted_vector_of_distnaces.size() != second.sorted_vector_of_distnaces.size() )return false; - for ( size_t i = 0 ; i != this->sorted_vector_of_distnaces.size() ; ++i ) + if ( this->sorted_vector_of_distances.size() != second.sorted_vector_of_distances.size() )return false; + for ( size_t i = 0 ; i != this->sorted_vector_of_distances.size() ; ++i ) { - if ( !almost_equal(this->sorted_vector_of_distnaces[i] , second.sorted_vector_of_distnaces[i]) )return false; + if ( !almost_equal(this->sorted_vector_of_distances[i] , second.sorted_vector_of_distances[i]) )return false; } return true; } @@ -183,7 +183,7 @@ public: /** * Compute a average of two persistent vectors. **/ - void compute_average( std::vector< Abs_Topological_data_with_averages* > to_average ); + void compute_average( const std::vector< Abs_Topological_data_with_averages* >& to_average ); /** * Compute a distance of two persistent vectors. @@ -200,7 +200,7 @@ public: **/ std::vector< double > output_for_visualization() { - return this->sorted_vector_of_distnaces; + return this->sorted_vector_of_distances; } /** @@ -216,9 +216,9 @@ public: out << "set style histogram cluster gap 1" << std::endl; out << "set style fill solid border -1" << std::endl; out << "plot '-' notitle" << std::endl; - for ( size_t i = 0 ; i != this->sorted_vector_of_distnaces.size() ; ++i ) + for ( size_t i = 0 ; i != this->sorted_vector_of_distances.size() ; ++i ) { - out << this->sorted_vector_of_distnaces[i] << std::endl; + out << this->sorted_vector_of_distances[i] << std::endl; } out << endl; out.close(); @@ -228,12 +228,12 @@ public: private: std::vector< std::pair< double , double > > intervals; - std::vector< double > sorted_vector_of_distnaces; + std::vector< double > sorted_vector_of_distances; - void compute_sorted_vector_of_distnaces_via_heap( size_t where_to_cut ); - void compute_sorted_vector_of_distnaces_via_vector_sorting( size_t where_to_cut ); + void compute_sorted_vector_of_distances_via_heap( size_t where_to_cut ); + void compute_sorted_vector_of_distances_via_vector_sorting( size_t where_to_cut ); - Vector_distances_in_diagram( const std::vector< double >& sorted_vector_of_distnaces_ ):sorted_vector_of_distnaces(sorted_vector_of_distnaces_) + Vector_distances_in_diagram( const std::vector< double >& sorted_vector_of_distances_ ):sorted_vector_of_distances(sorted_vector_of_distances_) { this->set_up_numbers_of_functions_for_vectorization_and_projections_to_reals(); } @@ -241,19 +241,19 @@ private: void set_up_numbers_of_functions_for_vectorization_and_projections_to_reals() { //warning, this function can be only called after filling in the intervals vector. - this->number_of_functions_for_vectorization = this->sorted_vector_of_distnaces.size(); - this->number_of_functions_for_projections_to_reals = this->sorted_vector_of_distnaces.size(); + this->number_of_functions_for_vectorization = this->sorted_vector_of_distances.size(); + this->number_of_functions_for_projections_to_reals = this->sorted_vector_of_distances.size(); } }; template <typename F> -Vector_distances_in_diagram<F>::Vector_distances_in_diagram( std::vector< std::pair< double,double > > intervals_ , size_t where_to_cut ):Abs_Vectorized_topological_data(where_to_cut) +Vector_distances_in_diagram<F>::Vector_distances_in_diagram( const std::vector< std::pair< double,double > >& intervals_ , size_t where_to_cut ):Abs_Vectorized_topological_data(where_to_cut) { std::vector< std::pair< double,double > > i( intervals_ ); this->intervals = i; - //this->compute_sorted_vector_of_distnaces_via_heap( where_to_cut ); - this->compute_sorted_vector_of_distnaces_via_vector_sorting(where_to_cut); + //this->compute_sorted_vector_of_distances_via_heap( where_to_cut ); + this->compute_sorted_vector_of_distances_via_vector_sorting(where_to_cut); this->set_up_numbers_of_functions_for_vectorization_and_projections_to_reals(); } @@ -262,8 +262,8 @@ Vector_distances_in_diagram<F>::Vector_distances_in_diagram( const Vector_distan { std::vector< std::pair< double,double > > inter( org.intervals ); this->intervals = inter; - std::vector< double > sorted_vector_of_distnaces( org.sorted_vector_of_distnaces ); - this->sorted_vector_of_distnaces = sorted_vector_of_distnaces; + std::vector< double > sorted_vector_of_distances( org.sorted_vector_of_distances ); + this->sorted_vector_of_distances = sorted_vector_of_distances; set_up_numbers_of_functions_for_vectorization_and_projections_to_reals(); } @@ -273,8 +273,8 @@ Vector_distances_in_diagram<F>& Vector_distances_in_diagram<F>::operator =( cons { std::vector< std::pair< double , double > > inter( org.intervals ); this->intervals = inter; - std::vector< double > sorted_vector_of_distnaces( org.sorted_vector_of_distnaces ); - this->sorted_vector_of_distnaces = sorted_vector_of_distnaces; + std::vector< double > sorted_vector_of_distances( org.sorted_vector_of_distances ); + this->sorted_vector_of_distances = sorted_vector_of_distances; return *this; } @@ -288,13 +288,13 @@ Vector_distances_in_diagram<F>::Vector_distances_in_diagram( const char* filenam //std::vector< std::pair< double , double > > intervals = read_gudhi_file( filename , dimension ); this->intervals = intervals; - this->compute_sorted_vector_of_distnaces_via_heap( where_to_cut ); - //this->compute_sorted_vector_of_distnaces_via_vector_sorting( where_to_cut ); + this->compute_sorted_vector_of_distances_via_heap( where_to_cut ); + //this->compute_sorted_vector_of_distances_via_vector_sorting( where_to_cut ); set_up_numbers_of_functions_for_vectorization_and_projections_to_reals(); } template < typename F> -void Vector_distances_in_diagram<F>::compute_sorted_vector_of_distnaces_via_heap( size_t where_to_cut ) +void Vector_distances_in_diagram<F>::compute_sorted_vector_of_distances_via_heap( size_t where_to_cut ) { bool dbg = false; @@ -387,14 +387,14 @@ void Vector_distances_in_diagram<F>::compute_sorted_vector_of_distnaces_via_heap std::cout << endl; } - this->sorted_vector_of_distnaces = heap; + this->sorted_vector_of_distances = heap; } template < typename F> -void Vector_distances_in_diagram<F>::compute_sorted_vector_of_distnaces_via_vector_sorting( size_t where_to_cut ) +void Vector_distances_in_diagram<F>::compute_sorted_vector_of_distances_via_vector_sorting( size_t where_to_cut ) { std::vector< double > distances; distances.reserve( (size_t)(0.5 * this->intervals.size() * ( this->intervals.size() - 1 ) + this->intervals.size()) ); @@ -421,7 +421,7 @@ void Vector_distances_in_diagram<F>::compute_sorted_vector_of_distnaces_via_vect std::sort( distances.begin() , distances.end() , std::greater<double>() ); if ( distances.size() > where_to_cut )distances.resize( where_to_cut ); - this->sorted_vector_of_distnaces = distances; + this->sorted_vector_of_distances = distances; } @@ -436,13 +436,13 @@ double Vector_distances_in_diagram<F>::project_to_R( int number_of_function ) double result = 0; for ( size_t i = 0 ; i != number_of_function ; ++i ) { - result += sorted_vector_of_distnaces[i]; + result += sorted_vector_of_distances[i]; } return result; } template <typename F> -void Vector_distances_in_diagram<F>::compute_average( std::vector< Abs_Topological_data_with_averages* > to_average ) +void Vector_distances_in_diagram<F>::compute_average( const std::vector< Abs_Topological_data_with_averages* >& to_average ) { if ( to_average.size() == 0 ) @@ -455,9 +455,9 @@ void Vector_distances_in_diagram<F>::compute_average( std::vector< Abs_Topologic for ( size_t i = 0 ; i != to_average.size() ; ++i ) { Vector_distances_in_diagram<F>* current = (Vector_distances_in_diagram<F>*)to_average[i]; - if ( current->sorted_vector_of_distnaces.size() > maximal_length_of_vector ) + if ( current->sorted_vector_of_distances.size() > maximal_length_of_vector ) { - maximal_length_of_vector = current->sorted_vector_of_distnaces.size(); + maximal_length_of_vector = current->sorted_vector_of_distances.size(); } } @@ -467,9 +467,9 @@ void Vector_distances_in_diagram<F>::compute_average( std::vector< Abs_Topologic for ( size_t i = 0 ; i != to_average.size() ; ++i ) { Vector_distances_in_diagram<F>* current = (Vector_distances_in_diagram<F>*)to_average[i]; - for ( size_t j = 0 ; j != current->sorted_vector_of_distnaces.size() ; ++j ) + for ( size_t j = 0 ; j != current->sorted_vector_of_distances.size() ; ++j ) { - av[j] += current->sorted_vector_of_distnaces[j]; + av[j] += current->sorted_vector_of_distances[j]; } } @@ -477,7 +477,7 @@ void Vector_distances_in_diagram<F>::compute_average( std::vector< Abs_Topologic { av[i] /= (double)to_average.size(); } - this->sorted_vector_of_distnaces = av; + this->sorted_vector_of_distances = av; this->where_to_cut = av.size(); } @@ -498,40 +498,40 @@ double Vector_distances_in_diagram<F>::distance( const Abs_Topological_data_with double result = 0; - for ( size_t i = 0 ; i != std::min(this->sorted_vector_of_distnaces.size(), second_->sorted_vector_of_distnaces.size()) ; ++i ) + for ( size_t i = 0 ; i != std::min(this->sorted_vector_of_distances.size(), second_->sorted_vector_of_distances.size()) ; ++i ) { if ( power == 1 ) { if ( dbg ) { - cerr << "|" << this->sorted_vector_of_distnaces[i] << " - " << second_->sorted_vector_of_distnaces[i] << " | : " << fabs( this->sorted_vector_of_distnaces[i] - second_->sorted_vector_of_distnaces[i] ) << endl; + cerr << "|" << this->sorted_vector_of_distances[i] << " - " << second_->sorted_vector_of_distances[i] << " | : " << fabs( this->sorted_vector_of_distances[i] - second_->sorted_vector_of_distances[i] ) << endl; } - result += fabs( this->sorted_vector_of_distnaces[i] - second_->sorted_vector_of_distnaces[i] ); + result += fabs( this->sorted_vector_of_distances[i] - second_->sorted_vector_of_distances[i] ); } else { - result += std::pow( fabs( this->sorted_vector_of_distnaces[i] - second_->sorted_vector_of_distnaces[i] ) , power ); + result += std::pow( fabs( this->sorted_vector_of_distances[i] - second_->sorted_vector_of_distances[i] ) , power ); if ( dbg ) { - cerr << "| " << this->sorted_vector_of_distnaces[i] << " - " << second_->sorted_vector_of_distnaces[i] << " : " << fabs( this->sorted_vector_of_distnaces[i] - second_->sorted_vector_of_distnaces[i] ) << endl; + cerr << "| " << this->sorted_vector_of_distances[i] << " - " << second_->sorted_vector_of_distances[i] << " : " << fabs( this->sorted_vector_of_distances[i] - second_->sorted_vector_of_distances[i] ) << endl; } } } - if ( this->sorted_vector_of_distnaces.size() != second_->sorted_vector_of_distnaces.size() ) + if ( this->sorted_vector_of_distances.size() != second_->sorted_vector_of_distances.size() ) { - if ( this->sorted_vector_of_distnaces.size() > second_->sorted_vector_of_distnaces.size() ) + if ( this->sorted_vector_of_distances.size() > second_->sorted_vector_of_distances.size() ) { - for ( size_t i = second_->sorted_vector_of_distnaces.size() ; i != this->sorted_vector_of_distnaces.size() ; ++i ) + for ( size_t i = second_->sorted_vector_of_distances.size() ; i != this->sorted_vector_of_distances.size() ; ++i ) { - result += fabs( this->sorted_vector_of_distnaces[i] ); + result += fabs( this->sorted_vector_of_distances[i] ); } } else { - //this->sorted_vector_of_distnaces.size() < second_->sorted_vector_of_distnaces.size() - for ( size_t i = this->sorted_vector_of_distnaces.size() ; i != second_->sorted_vector_of_distnaces.size() ; ++i ) + //this->sorted_vector_of_distances.size() < second_->sorted_vector_of_distances.size() + for ( size_t i = this->sorted_vector_of_distances.size() ; i != second_->sorted_vector_of_distances.size() ; ++i ) { - result += fabs( second_->sorted_vector_of_distnaces[i] ); + result += fabs( second_->sorted_vector_of_distances[i] ); } } } @@ -550,10 +550,10 @@ std::vector<double> Vector_distances_in_diagram<F>::vectorize( int number_of_fun if ( number_of_function > this->number_of_functions_for_vectorization )throw "Wrong index of a function in a method Vector_distances_in_diagram<F>::vectorize"; if ( number_of_function < 0 )throw "Wrong index of a function in a method Vector_distances_in_diagram<F>::vectorize"; - std::vector< double > result( std::min( (size_t)number_of_function , this->sorted_vector_of_distnaces.size() ) ); - for ( size_t i = 0 ; i != std::min( (size_t)number_of_function , this->sorted_vector_of_distnaces.size() ) ; ++i ) + std::vector< double > result( std::min( (size_t)number_of_function , this->sorted_vector_of_distances.size() ) ); + for ( size_t i = 0 ; i != std::min( (size_t)number_of_function , this->sorted_vector_of_distances.size() ) ; ++i ) { - result[i] = this->sorted_vector_of_distnaces[i]; + result[i] = this->sorted_vector_of_distances[i]; } return result; } @@ -565,9 +565,9 @@ void Vector_distances_in_diagram<F>::write_to_file( const char* filename ) std::ofstream out; out.open( filename ); - for ( size_t i = 0 ; i != this->sorted_vector_of_distnaces.size() ; ++i ) + for ( size_t i = 0 ; i != this->sorted_vector_of_distances.size() ; ++i ) { - out << this->sorted_vector_of_distnaces[i] << " "; + out << this->sorted_vector_of_distances[i] << " "; } out.close(); @@ -590,7 +590,7 @@ void Vector_distances_in_diagram<F>::load_from_file( const char* filename ) { in >> number; if ( in.eof() )break; - this->sorted_vector_of_distnaces.push_back(number); + this->sorted_vector_of_distances.push_back(number); } in.close(); } @@ -601,9 +601,9 @@ double Vector_distances_in_diagram<F>::compute_scalar_product( const Abs_Topolog Vector_distances_in_diagram<F>* second_vector = (Vector_distances_in_diagram<F>*)second; double result = 0; - for ( size_t i = 0 ; i != std::min(this->sorted_vector_of_distnaces.size(),second_vector->sorted_vector_of_distnaces.size()) ; ++i ) + for ( size_t i = 0 ; i != std::min(this->sorted_vector_of_distances.size(),second_vector->sorted_vector_of_distances.size()) ; ++i ) { - result += this->sorted_vector_of_distnaces[i] * second_vector->sorted_vector_of_distnaces[i]; + result += this->sorted_vector_of_distances[i] * second_vector->sorted_vector_of_distances[i]; } return result; } diff --git a/src/Gudhi_stat/include/gudhi/concretizations/read_persitence_from_file.h b/src/Gudhi_stat/include/gudhi/concretizations/read_persitence_from_file.h index d2e6ec3c..03446289 100644 --- a/src/Gudhi_stat/include/gudhi/concretizations/read_persitence_from_file.h +++ b/src/Gudhi_stat/include/gudhi/concretizations/read_persitence_from_file.h @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 @@ -35,7 +35,12 @@ namespace Gudhi namespace Gudhi_stat { - +/** + * This method reads persistence from standalone file. The format of the file is as follows: + * In every line there are two numbers which denotes birth and death of a persistence interval. The file is not supposed to contains any nonwhite characters excet from digits. In particular symbols + * like 'inf' are not allowed. + * If begin of the interval is greater than the end of the interval, those two numbers are swapped. +**/ std::vector< std::pair< double , double > > read_standard_file( const char* filename ) { bool dbg = false; @@ -78,6 +83,17 @@ std::vector< std::pair< double , double > > read_standard_file( const char* file return barcode; }//read_standard_file + + +/** + * This procedure reads Gudhi style file. The format of a Gudhi style file is as follows: + * Each line consist of the following information: + * A prime number p indicating that the class is nontrivial over Z_p field. + * A positive numebr, being a dimension of a persistence class + * A birth and a death time of a class. + * Death time may be infitnity, in which case a string 'inf' is used. + * If begin of the interval is greater than the end of the interval, those two numbers are swapped. +**/ std::vector< std::pair< double , double > > read_gudhi_file( const char* filename , size_t dimension = 0 ) { bool dbg = false; diff --git a/src/Gudhi_stat/test/persistence_heat_maps_test.cpp b/src/Gudhi_stat/test/persistence_heat_maps_test.cpp index 505b1912..c4c97d72 100644 --- a/src/Gudhi_stat/test/persistence_heat_maps_test.cpp +++ b/src/Gudhi_stat/test/persistence_heat_maps_test.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/test/persistence_intervals_test.cpp b/src/Gudhi_stat/test/persistence_intervals_test.cpp index 70e20ed0..f86300fa 100644 --- a/src/Gudhi_stat/test/persistence_intervals_test.cpp +++ b/src/Gudhi_stat/test/persistence_intervals_test.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/test/persistence_lanscapes_on_grid_test.cpp b/src/Gudhi_stat/test/persistence_lanscapes_on_grid_test.cpp index 7d0b58a5..d7d72d6b 100644 --- a/src/Gudhi_stat/test/persistence_lanscapes_on_grid_test.cpp +++ b/src/Gudhi_stat/test/persistence_lanscapes_on_grid_test.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/test/persistence_lanscapes_test.cpp b/src/Gudhi_stat/test/persistence_lanscapes_test.cpp index 8a7d0ce1..9506410a 100644 --- a/src/Gudhi_stat/test/persistence_lanscapes_test.cpp +++ b/src/Gudhi_stat/test/persistence_lanscapes_test.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/test/vector_representation_test.cpp b/src/Gudhi_stat/test/vector_representation_test.cpp index e87d1b23..44801ad9 100644 --- a/src/Gudhi_stat/test/vector_representation_test.cpp +++ b/src/Gudhi_stat/test/vector_representation_test.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 @@ -22,7 +22,7 @@ #include <gudhi/concretizations/Vector_distances_in_diagram.h> -#include <gudhi/common.h> +#include <gudhi/common_gudhi_stat.h> #include <iostream> #define BOOST_TEST_DYN_LINK diff --git a/src/Gudhi_stat/utilities/CMakeLists.txt b/src/Gudhi_stat/utilities/CMakeLists.txt new file mode 100644 index 00000000..d75acc43 --- /dev/null +++ b/src/Gudhi_stat/utilities/CMakeLists.txt @@ -0,0 +1,103 @@ +cmake_minimum_required(VERSION 2.6) +project(GUDHI_STAT) + + + +#persitence diagrams +add_executable ( persistence_intervals/plot_persistence_intervals persistence_intervals/plot_persistence_intervals.cpp ) +target_link_libraries( persistence_intervals/plot_persistence_intervals ${Boost_SYSTEM_LIBRARY}) + +add_executable ( persistence_intervals/compute_birth_death_range_in_persistence_diagram persistence_intervals/compute_birth_death_range_in_persistence_diagram.cpp ) +target_link_libraries( persistence_intervals/compute_birth_death_range_in_persistence_diagram ${Boost_SYSTEM_LIBRARY}) + +add_executable ( persistence_intervals/compute_number_of_dominant_intervals persistence_intervals/compute_number_of_dominant_intervals.cpp ) +target_link_libraries( persistence_intervals/compute_number_of_dominant_intervals ${Boost_SYSTEM_LIBRARY}) + +add_executable ( persistence_intervals/plot_histogram_of_intervals_lengths persistence_intervals/plot_histogram_of_intervals_lengths.cpp ) +target_link_libraries( persistence_intervals/plot_histogram_of_intervals_lengths ${Boost_SYSTEM_LIBRARY}) + +add_executable ( persistence_intervals/plot_persistence_Betti_numebrs persistence_intervals/plot_persistence_Betti_numebrs.cpp ) +target_link_libraries( persistence_intervals/plot_persistence_Betti_numebrs ${Boost_SYSTEM_LIBRARY}) + +#when we have bottleneck and wasserstein distance computations, add suitable programs here. + + +#persitence landscapes +add_executable ( persistence_landscapes/average_landscapes persistence_landscapes/average_landscapes.cpp ) +target_link_libraries(persistence_landscapes/average_landscapes ${Boost_SYSTEM_LIBRARY}) + +add_executable ( persistence_landscapes/create_landscapes persistence_landscapes/create_landscapes.cpp ) +target_link_libraries(persistence_landscapes/create_landscapes ${Boost_SYSTEM_LIBRARY}) + +add_executable ( persistence_landscapes/plot_landscapes persistence_landscapes/plot_landscapes.cpp ) +target_link_libraries(persistence_landscapes/plot_landscapes ${Boost_SYSTEM_LIBRARY}) + +add_executable ( persistence_landscapes/compute_distance_of_landscapes persistence_landscapes/compute_distance_of_landscapes.cpp ) +target_link_libraries(persistence_landscapes/compute_distance_of_landscapes ${Boost_SYSTEM_LIBRARY}) + +add_executable ( persistence_landscapes/compute_scalar_product_of_landscapes persistence_landscapes/compute_scalar_product_of_landscapes.cpp ) +target_link_libraries(persistence_landscapes/compute_scalar_product_of_landscapes ${Boost_SYSTEM_LIBRARY}) + +#persitence landscapes on a grid +add_executable ( persistence_landscapes_on_grid/average_landscapes_on_grid persistence_landscapes_on_grid/average_landscapes_on_grid.cpp ) +target_link_libraries(persistence_landscapes_on_grid/average_landscapes_on_grid ${Boost_SYSTEM_LIBRARY}) + +add_executable ( persistence_landscapes_on_grid/create_landscapes_on_grid persistence_landscapes_on_grid/create_landscapes_on_grid.cpp ) +target_link_libraries(persistence_landscapes_on_grid/create_landscapes_on_grid ${Boost_SYSTEM_LIBRARY}) + +add_executable ( persistence_landscapes_on_grid/plot_landscapes_on_grid persistence_landscapes_on_grid/plot_landscapes_on_grid.cpp ) +target_link_libraries(persistence_landscapes_on_grid/plot_landscapes_on_grid ${Boost_SYSTEM_LIBRARY}) + +add_executable ( persistence_landscapes_on_grid/compute_distance_of_landscapes_on_grid persistence_landscapes_on_grid/compute_distance_of_landscapes_on_grid.cpp ) +target_link_libraries(persistence_landscapes_on_grid/compute_distance_of_landscapes_on_grid ${Boost_SYSTEM_LIBRARY}) + +add_executable ( persistence_landscapes_on_grid/compute_scalar_product_of_landscapes_on_grid persistence_landscapes_on_grid/compute_scalar_product_of_landscapes_on_grid.cpp ) +target_link_libraries(persistence_landscapes_on_grid/compute_scalar_product_of_landscapes_on_grid ${Boost_SYSTEM_LIBRARY}) + +#persitence heat maps +add_executable ( persistence_heat_maps/average_persistence_heat_maps persistence_heat_maps/average_persistence_heat_maps.cpp ) +target_link_libraries(persistence_heat_maps/average_persistence_heat_maps ${Boost_SYSTEM_LIBRARY}) + +add_executable ( persistence_heat_maps/create_persistence_heat_maps persistence_heat_maps/create_persistence_heat_maps.cpp ) +target_link_libraries(persistence_heat_maps/create_persistence_heat_maps ${Boost_SYSTEM_LIBRARY}) + +add_executable ( persistence_heat_maps/plot_persistence_heat_map persistence_heat_maps/plot_persistence_heat_map.cpp ) +target_link_libraries(persistence_heat_maps/plot_persistence_heat_map ${Boost_SYSTEM_LIBRARY}) + +add_executable ( persistence_heat_maps/compute_distance_of_persistence_heat_maps persistence_heat_maps/compute_distance_of_persistence_heat_maps.cpp ) +target_link_libraries(persistence_heat_maps/compute_distance_of_persistence_heat_maps ${Boost_SYSTEM_LIBRARY}) + +add_executable ( persistence_heat_maps/compute_scalar_product_of_persistence_heat_maps persistence_heat_maps/compute_scalar_product_of_persistence_heat_maps.cpp ) +target_link_libraries(persistence_heat_maps/compute_scalar_product_of_persistence_heat_maps ${Boost_SYSTEM_LIBRARY}) + +add_executable ( persistence_heat_maps/create_pssk persistence_heat_maps/create_pssk.cpp ) +target_link_libraries(persistence_heat_maps/create_pssk ${Boost_SYSTEM_LIBRARY}) + +add_executable ( persistence_heat_maps/create_persistence_heat_maps_weighted_by_distance_from_diagonal persistence_heat_maps/create_persistence_heat_maps_weighted_by_distance_from_diagonal.cpp ) +target_link_libraries(persistence_heat_maps/create_persistence_heat_maps_weighted_by_distance_from_diagonal ${Boost_SYSTEM_LIBRARY}) + +add_executable ( persistence_heat_maps/create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal persistence_heat_maps/create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal.cpp ) +target_link_libraries(persistence_heat_maps/create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal ${Boost_SYSTEM_LIBRARY}) + +add_executable ( persistence_heat_maps/create_persistence_heat_maps_weighted_by_arctan_of_their_persistence persistence_heat_maps/create_persistence_heat_maps_weighted_by_arctan_of_their_persistence.cpp ) +target_link_libraries(persistence_heat_maps/create_persistence_heat_maps_weighted_by_arctan_of_their_persistence ${Boost_SYSTEM_LIBRARY}) + + +#persitence vectors +add_executable ( persistence_vectors/average_persistence_vectors persistence_vectors/average_persistence_vectors.cpp ) +target_link_libraries(persistence_vectors/average_persistence_vectors ${Boost_SYSTEM_LIBRARY}) + +add_executable ( persistence_vectors/create_persistence_vectors persistence_vectors/create_persistence_vectors.cpp ) +target_link_libraries(persistence_vectors/create_persistence_vectors ${Boost_SYSTEM_LIBRARY}) + +add_executable ( persistence_vectors/compute_distance_of_persistence_vectors persistence_vectors/compute_distance_of_persistence_vectors.cpp ) +target_link_libraries(persistence_vectors/compute_distance_of_persistence_vectors ${Boost_SYSTEM_LIBRARY}) + +add_executable ( persistence_vectors/compute_scalar_product_of_persistence_vectors persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp ) +target_link_libraries(persistence_vectors/compute_scalar_product_of_persistence_vectors ${Boost_SYSTEM_LIBRARY}) + +add_executable ( persistence_vectors/plot_persistence_vectors persistence_vectors/plot_persistence_vectors.cpp ) +target_link_libraries(persistence_vectors/plot_persistence_vectors ${Boost_SYSTEM_LIBRARY}) + + + diff --git a/src/Gudhi_stat/example/utilities/persistence_heat_maps/average_persistence_heat_maps.cpp b/src/Gudhi_stat/utilities/persistence_heat_maps/average_persistence_heat_maps.cpp index d90e78e1..811e4557 100644 --- a/src/Gudhi_stat/example/utilities/persistence_heat_maps/average_persistence_heat_maps.cpp +++ b/src/Gudhi_stat/utilities/persistence_heat_maps/average_persistence_heat_maps.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/utilities/persistence_heat_maps/compute_distance_of_persistence_heat_maps.cpp b/src/Gudhi_stat/utilities/persistence_heat_maps/compute_distance_of_persistence_heat_maps.cpp index 10d6f04c..e462f009 100644 --- a/src/Gudhi_stat/example/utilities/persistence_heat_maps/compute_distance_of_persistence_heat_maps.cpp +++ b/src/Gudhi_stat/utilities/persistence_heat_maps/compute_distance_of_persistence_heat_maps.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/utilities/persistence_heat_maps/compute_scalar_product_of_persistence_heat_maps.cpp b/src/Gudhi_stat/utilities/persistence_heat_maps/compute_scalar_product_of_persistence_heat_maps.cpp index cd529f10..c9ffa22e 100644 --- a/src/Gudhi_stat/example/utilities/persistence_heat_maps/compute_scalar_product_of_persistence_heat_maps.cpp +++ b/src/Gudhi_stat/utilities/persistence_heat_maps/compute_scalar_product_of_persistence_heat_maps.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/utilities/persistence_heat_maps/create_persistence_heat_maps.cpp b/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps.cpp index 3d8dc2e8..2cc00b87 100644 --- a/src/Gudhi_stat/example/utilities/persistence_heat_maps/create_persistence_heat_maps.cpp +++ b/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_arctan_of_their_persistence.cpp b/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_arctan_of_their_persistence.cpp index 253320ff..ae579329 100644 --- a/src/Gudhi_stat/example/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_arctan_of_their_persistence.cpp +++ b/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_arctan_of_their_persistence.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_distance_from_diagonal.cpp b/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_distance_from_diagonal.cpp index d7f4fbdd..7877d699 100644 --- a/src/Gudhi_stat/example/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_distance_from_diagonal.cpp +++ b/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_distance_from_diagonal.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal.cpp b/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal.cpp index eac0d067..67972afe 100644 --- a/src/Gudhi_stat/example/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal.cpp +++ b/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps_weighted_by_squared_distance_from_diagonal.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/utilities/persistence_heat_maps/create_pssk.cpp b/src/Gudhi_stat/utilities/persistence_heat_maps/create_pssk.cpp index ccd884ec..1fc9d263 100644 --- a/src/Gudhi_stat/example/utilities/persistence_heat_maps/create_pssk.cpp +++ b/src/Gudhi_stat/utilities/persistence_heat_maps/create_pssk.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/utilities/persistence_heat_maps/plot_persistence_heat_map.cpp b/src/Gudhi_stat/utilities/persistence_heat_maps/plot_persistence_heat_map.cpp index b85a502b..6b67ea57 100644 --- a/src/Gudhi_stat/example/utilities/persistence_heat_maps/plot_persistence_heat_map.cpp +++ b/src/Gudhi_stat/utilities/persistence_heat_maps/plot_persistence_heat_map.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/utilities/persistence_intervals/compute_birth_death_range_in_persistence_diagram.cpp b/src/Gudhi_stat/utilities/persistence_intervals/compute_birth_death_range_in_persistence_diagram.cpp index dba0984a..2c55a806 100644 --- a/src/Gudhi_stat/example/utilities/persistence_intervals/compute_birth_death_range_in_persistence_diagram.cpp +++ b/src/Gudhi_stat/utilities/persistence_intervals/compute_birth_death_range_in_persistence_diagram.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/utilities/persistence_intervals/compute_number_of_dominant_intervals.cpp b/src/Gudhi_stat/utilities/persistence_intervals/compute_number_of_dominant_intervals.cpp index 6e6a9c88..b29aea3a 100644 --- a/src/Gudhi_stat/example/utilities/persistence_intervals/compute_number_of_dominant_intervals.cpp +++ b/src/Gudhi_stat/utilities/persistence_intervals/compute_number_of_dominant_intervals.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/utilities/persistence_intervals/plot_histogram_of_intervals_lengths.cpp b/src/Gudhi_stat/utilities/persistence_intervals/plot_histogram_of_intervals_lengths.cpp index dd2f3f99..99f7e640 100644 --- a/src/Gudhi_stat/example/utilities/persistence_intervals/plot_histogram_of_intervals_lengths.cpp +++ b/src/Gudhi_stat/utilities/persistence_intervals/plot_histogram_of_intervals_lengths.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/utilities/persistence_intervals/plot_persistence_Betti_numebrs.cpp b/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_Betti_numebrs.cpp index 33ff7bce..e23a4f20 100644 --- a/src/Gudhi_stat/example/utilities/persistence_intervals/plot_persistence_Betti_numebrs.cpp +++ b/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_Betti_numebrs.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/utilities/persistence_intervals/plot_persistence_intervals.cpp b/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_intervals.cpp index c4dd7284..5950240e 100644 --- a/src/Gudhi_stat/example/utilities/persistence_intervals/plot_persistence_intervals.cpp +++ b/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_intervals.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/utilities/persistence_landscapes/average_landscapes.cpp b/src/Gudhi_stat/utilities/persistence_landscapes/average_landscapes.cpp index 418244d2..895146f5 100644 --- a/src/Gudhi_stat/example/utilities/persistence_landscapes/average_landscapes.cpp +++ b/src/Gudhi_stat/utilities/persistence_landscapes/average_landscapes.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/utilities/persistence_landscapes/compute_distance_of_landscapes.cpp b/src/Gudhi_stat/utilities/persistence_landscapes/compute_distance_of_landscapes.cpp index 12a4b3bd..34ec0bfa 100644 --- a/src/Gudhi_stat/example/utilities/persistence_landscapes/compute_distance_of_landscapes.cpp +++ b/src/Gudhi_stat/utilities/persistence_landscapes/compute_distance_of_landscapes.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/utilities/persistence_landscapes/compute_scalar_product_of_landscapes.cpp b/src/Gudhi_stat/utilities/persistence_landscapes/compute_scalar_product_of_landscapes.cpp index ac64a798..443240ff 100644 --- a/src/Gudhi_stat/example/utilities/persistence_landscapes/compute_scalar_product_of_landscapes.cpp +++ b/src/Gudhi_stat/utilities/persistence_landscapes/compute_scalar_product_of_landscapes.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/utilities/persistence_landscapes/create_landscapes.cpp b/src/Gudhi_stat/utilities/persistence_landscapes/create_landscapes.cpp index 5152a033..fe96a067 100644 --- a/src/Gudhi_stat/example/utilities/persistence_landscapes/create_landscapes.cpp +++ b/src/Gudhi_stat/utilities/persistence_landscapes/create_landscapes.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/utilities/persistence_landscapes/plot_landscapes.cpp b/src/Gudhi_stat/utilities/persistence_landscapes/plot_landscapes.cpp index 559fc096..e035e4aa 100644 --- a/src/Gudhi_stat/example/utilities/persistence_landscapes/plot_landscapes.cpp +++ b/src/Gudhi_stat/utilities/persistence_landscapes/plot_landscapes.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/utilities/persistence_landscapes_on_grid/average_landscapes_on_grid.cpp b/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/average_landscapes_on_grid.cpp index 7c3b8db2..3b580181 100644 --- a/src/Gudhi_stat/example/utilities/persistence_landscapes_on_grid/average_landscapes_on_grid.cpp +++ b/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/average_landscapes_on_grid.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/utilities/persistence_landscapes_on_grid/compute_distance_of_landscapes_on_grid.cpp b/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/compute_distance_of_landscapes_on_grid.cpp index 20cb52c9..1813e297 100644 --- a/src/Gudhi_stat/example/utilities/persistence_landscapes_on_grid/compute_distance_of_landscapes_on_grid.cpp +++ b/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/compute_distance_of_landscapes_on_grid.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/utilities/persistence_landscapes_on_grid/compute_scalar_product_of_landscapes_on_grid.cpp b/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/compute_scalar_product_of_landscapes_on_grid.cpp index 056710ff..33e111d5 100644 --- a/src/Gudhi_stat/example/utilities/persistence_landscapes_on_grid/compute_scalar_product_of_landscapes_on_grid.cpp +++ b/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/compute_scalar_product_of_landscapes_on_grid.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/utilities/persistence_landscapes_on_grid/create_landscapes_on_grid.cpp b/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/create_landscapes_on_grid.cpp index 2ac74eb3..f6545e44 100644 --- a/src/Gudhi_stat/example/utilities/persistence_landscapes_on_grid/create_landscapes_on_grid.cpp +++ b/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/create_landscapes_on_grid.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/utilities/persistence_landscapes_on_grid/plot_landscapes_on_grid.cpp b/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/plot_landscapes_on_grid.cpp index 54b8367b..c12c3862 100644 --- a/src/Gudhi_stat/example/utilities/persistence_landscapes_on_grid/plot_landscapes_on_grid.cpp +++ b/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/plot_landscapes_on_grid.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/utilities/persistence_vectors/average_persistence_vectors.cpp b/src/Gudhi_stat/utilities/persistence_vectors/average_persistence_vectors.cpp index 1b269e9c..3262b157 100644 --- a/src/Gudhi_stat/example/utilities/persistence_vectors/average_persistence_vectors.cpp +++ b/src/Gudhi_stat/utilities/persistence_vectors/average_persistence_vectors.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp b/src/Gudhi_stat/utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp index 72026497..33d92a72 100644 --- a/src/Gudhi_stat/example/utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp +++ b/src/Gudhi_stat/utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp b/src/Gudhi_stat/utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp index 16192d52..5bea2765 100644 --- a/src/Gudhi_stat/example/utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp +++ b/src/Gudhi_stat/utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/utilities/persistence_vectors/create_persistence_vectors.cpp b/src/Gudhi_stat/utilities/persistence_vectors/create_persistence_vectors.cpp index 99015e41..8e309b11 100644 --- a/src/Gudhi_stat/example/utilities/persistence_vectors/create_persistence_vectors.cpp +++ b/src/Gudhi_stat/utilities/persistence_vectors/create_persistence_vectors.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 diff --git a/src/Gudhi_stat/example/utilities/persistence_vectors/plot_persistence_vectors.cpp b/src/Gudhi_stat/utilities/persistence_vectors/plot_persistence_vectors.cpp index ad6c06e2..53f53654 100644 --- a/src/Gudhi_stat/example/utilities/persistence_vectors/plot_persistence_vectors.cpp +++ b/src/Gudhi_stat/utilities/persistence_vectors/plot_persistence_vectors.cpp @@ -4,7 +4,7 @@ * * Author(s): Pawel Dlotko * - * Copyright (C) 2015 INRIA Sophia-Saclay (France) + * Copyright (C) 2015 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 |