diff options
author | pdlotko <pdlotko@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-10-21 12:26:22 +0000 |
---|---|---|
committer | pdlotko <pdlotko@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-10-21 12:26:22 +0000 |
commit | 19451e20b6d47b6a84d5ad89d99497e0e60cd377 (patch) | |
tree | d10ab5934dd78ae943070ec131ad0241e360b892 /src/Gudhi_stat/utilities | |
parent | 60ded8e74aaec4fa519162dd15276c072f2acb2e (diff) |
The library changed from inherritance to templates.
Are the files from include/abstract removed?
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/gudhi_stat@1741 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 6f768b08a7a900a56278adcf371a31840916d3ba
Diffstat (limited to 'src/Gudhi_stat/utilities')
31 files changed, 112 insertions, 97 deletions
diff --git a/src/Gudhi_stat/utilities/CMakeLists.txt b/src/Gudhi_stat/utilities/CMakeLists.txt index 4fc11b57..e97c5708 100644 --- a/src/Gudhi_stat/utilities/CMakeLists.txt +++ b/src/Gudhi_stat/utilities/CMakeLists.txt @@ -101,6 +101,6 @@ target_link_libraries(persistence_vectors/plot_persistence_vectors ${Boost_SYSTE #some stat libraries: -#add_executable ( permutation_test permutation_test.cpp ) -#target_link_libraries(permutation_test ${Boost_SYSTEM_LIBRARY}) +add_executable ( permutation_test permutation_test.cpp ) +target_link_libraries(permutation_test ${Boost_SYSTEM_LIBRARY}) diff --git a/src/Gudhi_stat/utilities/permutation_test.cpp b/src/Gudhi_stat/utilities/permutation_test.cpp new file mode 100644 index 00000000..809802d7 --- /dev/null +++ b/src/Gudhi_stat/utilities/permutation_test.cpp @@ -0,0 +1,84 @@ +/* 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/>. + */ + + +#include <gudhi/permutation_test.h> +#include <gudhi/concretizations/Persistence_landscape.h> +#include <iostream> +#include <cstring> + +using namespace std; +using namespace Gudhi; +using namespace Gudhi::Gudhi_stat; + +int main( int argc , char** argv ) +{ + + std::cout << "This program require the following parameters: \n"; + std::cout << "(1-2) Names of files each of them contains the names of files with persistence diagrams. The diagrams from a single file are assumed to be in the same group \n"; + std::cout << "Third parameter is an integer being the number of permutations to be made \n"; + std::cout << "The last parameter is a double, the power of a distance \n"; + if ( argc != 5 ) + { + std::cout << "Wrong number of parameters, the program will now terminat \n"; + return 1; + } + std::cout << "We will now read the data from files : " << argv[1] << " and " << argv[2] << std::endl; + size_t number_of_permutations = (size_t)(atoi(argv[3])); + size_t exponent = (double)atof( argv[4] ); + + std::vector< std::string > first_group = readFileNames( argv[1] ); + std::vector< std::string > second_group =readFileNames( argv[2] ); + + std::cout << "Here are the filenames in the first group :\n"; + for ( size_t i = 0 ; i != first_group.size() ; ++i ) + { + std::cout << first_group[i] << std::endl; + } + std::cout << "Here are the filenames in the second group :\n"; + for ( size_t i = 0 ; i != second_group.size() ; ++i ) + { + std::cout << second_group[i] << std::endl; + } + + std::vector< Persistence_landscape* > first_collection( first_group.size() ); + for ( size_t i = 0 ; i != first_group.size() ; ++i ) + { + std::vector< std::pair< double , double > > diag = read_standard_file( first_group[i].c_str() ); + Persistence_landscape* l = new Persistence_landscape( diag ); + first_collection[i] = l; + } + + std::vector< Persistence_landscape* > second_collection( second_group.size() ); + for ( size_t i = 0 ; i != second_group.size() ; ++i ) + { + std::vector< std::pair< double , double > > diag = read_standard_file( second_group[i].c_str() ); + Persistence_landscape* l = new Persistence_landscape( diag ); + second_collection[i] = l; + } + + std::cout << "The p-value form a permutation test is : " << permutation_test<Persistence_landscape>( first_collection , second_collection , number_of_permutations , exponent ) << std::endl; + + + + return 0; +} diff --git a/src/Gudhi_stat/utilities/persistence_heat_maps/average_persistence_heat_maps.cpp b/src/Gudhi_stat/utilities/persistence_heat_maps/average_persistence_heat_maps.cpp index 811e4557..a3094e07 100644 --- a/src/Gudhi_stat/utilities/persistence_heat_maps/average_persistence_heat_maps.cpp +++ b/src/Gudhi_stat/utilities/persistence_heat_maps/average_persistence_heat_maps.cpp @@ -22,7 +22,6 @@ -#include <gudhi/abstract_classes/Abs_Topological_data.h> #include <gudhi/concretizations/Persistence_heat_maps.h> @@ -50,12 +49,12 @@ int main( int argc , char** argv ) } std::cout << "Creating persistence landscapes...\n"; - std::vector< Abs_Topological_data_with_averages* > maps; + std::vector< Persistence_heat_maps* > maps; for ( size_t i = 0 ; i != filenames.size() ; ++i ) { Persistence_heat_maps* l = new Persistence_heat_maps; l->load_from_file( filenames[i] ); - maps.push_back( (Abs_Topological_data_with_averages*)l ); + maps.push_back( l ); } Persistence_heat_maps av; diff --git a/src/Gudhi_stat/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 e462f009..bfe2a7ab 100644 --- a/src/Gudhi_stat/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 @@ -21,8 +21,6 @@ */ - -#include <gudhi/abstract_classes/Abs_Topological_data.h> #include <gudhi/concretizations/Persistence_heat_maps.h> @@ -53,13 +51,13 @@ int main( int argc , char** argv ) { filenames.push_back( argv[i] ); } - std::vector< Abs_Topological_data_with_distances* > maps; + std::vector< Persistence_heat_maps > maps; maps.reserve( filenames.size() ); for ( size_t file_no = 0 ; file_no != filenames.size() ; ++file_no ) { - Persistence_heat_maps* l = new Persistence_heat_maps; - l->load_from_file( filenames[file_no] ); - maps.push_back( (Abs_Topological_data_with_distances*)l ); + Persistence_heat_maps l; + l.load_from_file( filenames[file_no] ); + maps.push_back( l ); } //and now we will compute the scalar product of landscapes. @@ -77,7 +75,7 @@ int main( int argc , char** argv ) { for ( size_t j = i ; j != filenames.size() ; ++j ) { - distance[i][j] = distance[j][i] = ((Persistence_heat_maps*)maps[i])->distance( maps[j] , p ) ; + distance[i][j] = distance[j][i] = maps[i].distance( maps[j] , p ) ; } } diff --git a/src/Gudhi_stat/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 c9ffa22e..d6899d1e 100644 --- a/src/Gudhi_stat/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 @@ -21,8 +21,6 @@ */ - -#include <gudhi/abstract_classes/Abs_Topological_data.h> #include <gudhi/concretizations/Persistence_heat_maps.h> @@ -44,12 +42,12 @@ int main( int argc , char** argv ) { filenames.push_back( argv[i] ); } - std::vector< Persistence_heat_maps* > maps; + std::vector< Persistence_heat_maps > maps; maps.reserve( filenames.size() ); for ( size_t file_no = 0 ; file_no != filenames.size() ; ++file_no ) { - Persistence_heat_maps* l = new Persistence_heat_maps; - l->load_from_file( filenames[file_no] ); + Persistence_heat_maps l; + l.load_from_file( filenames[file_no] ); maps.push_back( l ); } @@ -68,7 +66,7 @@ int main( int argc , char** argv ) { for ( size_t j = i ; j != maps.size() ; ++j ) { - scalar_product[i][j] = scalar_product[j][i] = ((Persistence_heat_maps*)maps[i])->compute_scalar_product( maps[j] ) ; + scalar_product[i][j] = scalar_product[j][i] = maps[i].compute_scalar_product( maps[j] ) ; } } diff --git a/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps.cpp b/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps.cpp index 2cc00b87..b300d350 100644 --- a/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps.cpp +++ b/src/Gudhi_stat/utilities/persistence_heat_maps/create_persistence_heat_maps.cpp @@ -22,7 +22,6 @@ -#include <gudhi/abstract_classes/Abs_Topological_data.h> #include <gudhi/concretizations/Persistence_heat_maps.h> diff --git a/src/Gudhi_stat/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 ae579329..3ce0fcec 100644 --- a/src/Gudhi_stat/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 @@ -22,7 +22,6 @@ -#include <gudhi/abstract_classes/Abs_Topological_data.h> #include <gudhi/concretizations/Persistence_heat_maps.h> diff --git a/src/Gudhi_stat/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 7877d699..4738d946 100644 --- a/src/Gudhi_stat/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 @@ -21,8 +21,6 @@ */ - -#include <gudhi/abstract_classes/Abs_Topological_data.h> #include <gudhi/concretizations/Persistence_heat_maps.h> diff --git a/src/Gudhi_stat/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 67972afe..8dab998a 100644 --- a/src/Gudhi_stat/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 @@ -21,8 +21,6 @@ */ - -#include <gudhi/abstract_classes/Abs_Topological_data.h> #include <gudhi/concretizations/Persistence_heat_maps.h> diff --git a/src/Gudhi_stat/utilities/persistence_heat_maps/create_pssk.cpp b/src/Gudhi_stat/utilities/persistence_heat_maps/create_pssk.cpp index 1fc9d263..ec35f81c 100644 --- a/src/Gudhi_stat/utilities/persistence_heat_maps/create_pssk.cpp +++ b/src/Gudhi_stat/utilities/persistence_heat_maps/create_pssk.cpp @@ -20,9 +20,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - - -#include <gudhi/abstract_classes/Abs_Topological_data.h> #include <gudhi/concretizations/PSSK.h> diff --git a/src/Gudhi_stat/utilities/persistence_heat_maps/plot_persistence_heat_map.cpp b/src/Gudhi_stat/utilities/persistence_heat_maps/plot_persistence_heat_map.cpp index 6b67ea57..c4eed502 100644 --- a/src/Gudhi_stat/utilities/persistence_heat_maps/plot_persistence_heat_map.cpp +++ b/src/Gudhi_stat/utilities/persistence_heat_maps/plot_persistence_heat_map.cpp @@ -21,8 +21,6 @@ */ - -#include <gudhi/abstract_classes/Abs_Topological_data.h> #include <gudhi/concretizations/Persistence_heat_maps.h> diff --git a/src/Gudhi_stat/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 2c55a806..d73165b7 100644 --- a/src/Gudhi_stat/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 @@ -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/utilities/persistence_intervals/compute_number_of_dominant_intervals.cpp b/src/Gudhi_stat/utilities/persistence_intervals/compute_number_of_dominant_intervals.cpp index b29aea3a..d4949932 100644 --- a/src/Gudhi_stat/utilities/persistence_intervals/compute_number_of_dominant_intervals.cpp +++ b/src/Gudhi_stat/utilities/persistence_intervals/compute_number_of_dominant_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/utilities/persistence_intervals/plot_histogram_of_intervals_lengths.cpp b/src/Gudhi_stat/utilities/persistence_intervals/plot_histogram_of_intervals_lengths.cpp index 99f7e640..96e6fa47 100644 --- a/src/Gudhi_stat/utilities/persistence_intervals/plot_histogram_of_intervals_lengths.cpp +++ b/src/Gudhi_stat/utilities/persistence_intervals/plot_histogram_of_intervals_lengths.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/utilities/persistence_intervals/plot_persistence_Betti_numebrs.cpp b/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_Betti_numebrs.cpp index e23a4f20..e4efdf79 100644 --- a/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_Betti_numebrs.cpp +++ b/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_Betti_numebrs.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/utilities/persistence_intervals/plot_persistence_intervals.cpp b/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_intervals.cpp index 5950240e..6830a58b 100644 --- a/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_intervals.cpp +++ b/src/Gudhi_stat/utilities/persistence_intervals/plot_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/utilities/persistence_landscapes/average_landscapes.cpp b/src/Gudhi_stat/utilities/persistence_landscapes/average_landscapes.cpp index 895146f5..35aec203 100644 --- a/src/Gudhi_stat/utilities/persistence_landscapes/average_landscapes.cpp +++ b/src/Gudhi_stat/utilities/persistence_landscapes/average_landscapes.cpp @@ -22,7 +22,6 @@ -#include <gudhi/abstract_classes/Abs_Topological_data.h> #include <gudhi/concretizations/Persistence_landscape.h> @@ -51,12 +50,12 @@ int main( int argc , char** argv ) } std::cout << "Creating persistence landscapes...\n"; - std::vector< Abs_Topological_data_with_averages* > lands; + std::vector< Persistence_landscape* > lands; for ( size_t i = 0 ; i != filenames.size() ; ++i ) { Persistence_landscape* l = new Persistence_landscape; l->load_landscape_from_file( filenames[i] ); - lands.push_back( (Abs_Topological_data_with_averages*)l ); + lands.push_back( l ); } Persistence_landscape av; diff --git a/src/Gudhi_stat/utilities/persistence_landscapes/compute_distance_of_landscapes.cpp b/src/Gudhi_stat/utilities/persistence_landscapes/compute_distance_of_landscapes.cpp index 34ec0bfa..e3c3a33e 100644 --- a/src/Gudhi_stat/utilities/persistence_landscapes/compute_distance_of_landscapes.cpp +++ b/src/Gudhi_stat/utilities/persistence_landscapes/compute_distance_of_landscapes.cpp @@ -20,9 +20,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - - -#include <gudhi/abstract_classes/Abs_Topological_data.h> #include <gudhi/concretizations/Persistence_landscape.h> diff --git a/src/Gudhi_stat/utilities/persistence_landscapes/compute_scalar_product_of_landscapes.cpp b/src/Gudhi_stat/utilities/persistence_landscapes/compute_scalar_product_of_landscapes.cpp index 443240ff..ef9de9c7 100644 --- a/src/Gudhi_stat/utilities/persistence_landscapes/compute_scalar_product_of_landscapes.cpp +++ b/src/Gudhi_stat/utilities/persistence_landscapes/compute_scalar_product_of_landscapes.cpp @@ -20,9 +20,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - - -#include <gudhi/abstract_classes/Abs_Topological_data.h> #include <gudhi/concretizations/Persistence_landscape.h> diff --git a/src/Gudhi_stat/utilities/persistence_landscapes/create_landscapes.cpp b/src/Gudhi_stat/utilities/persistence_landscapes/create_landscapes.cpp index fe96a067..212e6b16 100644 --- a/src/Gudhi_stat/utilities/persistence_landscapes/create_landscapes.cpp +++ b/src/Gudhi_stat/utilities/persistence_landscapes/create_landscapes.cpp @@ -20,9 +20,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - - -#include <gudhi/abstract_classes/Abs_Topological_data.h> #include <gudhi/concretizations/Persistence_landscape.h> diff --git a/src/Gudhi_stat/utilities/persistence_landscapes/plot_landscapes.cpp b/src/Gudhi_stat/utilities/persistence_landscapes/plot_landscapes.cpp index e035e4aa..0d72a17c 100644 --- a/src/Gudhi_stat/utilities/persistence_landscapes/plot_landscapes.cpp +++ b/src/Gudhi_stat/utilities/persistence_landscapes/plot_landscapes.cpp @@ -20,9 +20,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - - -#include <gudhi/abstract_classes/Abs_Topological_data.h> #include <gudhi/concretizations/Persistence_landscape.h> diff --git a/src/Gudhi_stat/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 3b580181..2f6875b2 100644 --- a/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/average_landscapes_on_grid.cpp +++ b/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/average_landscapes_on_grid.cpp @@ -20,9 +20,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - - -#include <gudhi/abstract_classes/Abs_Topological_data.h> #include <gudhi/concretizations/Persistence_landscape_on_grid.h> @@ -50,12 +47,12 @@ int main( int argc , char** argv ) } std::cout << "Creating persistence landscapes...\n"; - std::vector< Abs_Topological_data_with_averages* > lands; + std::vector< Persistence_landscape_on_grid* > lands; for ( size_t i = 0 ; i != filenames.size() ; ++i ) { Persistence_landscape_on_grid* l = new Persistence_landscape_on_grid; l->load_landscape_from_file( filenames[i] ); - lands.push_back( (Abs_Topological_data_with_averages*)l ); + lands.push_back( l ); } Persistence_landscape_on_grid av; diff --git a/src/Gudhi_stat/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 1813e297..ace5066a 100644 --- a/src/Gudhi_stat/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 @@ -20,9 +20,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - - -#include <gudhi/abstract_classes/Abs_Topological_data.h> #include <gudhi/concretizations/Persistence_landscape_on_grid.h> diff --git a/src/Gudhi_stat/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 33e111d5..a039a97a 100644 --- a/src/Gudhi_stat/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 @@ -21,8 +21,6 @@ */ - -#include <gudhi/abstract_classes/Abs_Topological_data.h> #include <gudhi/concretizations/Persistence_landscape_on_grid.h> diff --git a/src/Gudhi_stat/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 f6545e44..2b205513 100644 --- a/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/create_landscapes_on_grid.cpp +++ b/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/create_landscapes_on_grid.cpp @@ -20,9 +20,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - - -#include <gudhi/abstract_classes/Abs_Topological_data.h> #include <gudhi/concretizations/Persistence_landscape_on_grid.h> diff --git a/src/Gudhi_stat/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 c12c3862..27946075 100644 --- a/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/plot_landscapes_on_grid.cpp +++ b/src/Gudhi_stat/utilities/persistence_landscapes_on_grid/plot_landscapes_on_grid.cpp @@ -20,9 +20,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - - -#include <gudhi/abstract_classes/Abs_Topological_data.h> #include <gudhi/concretizations/Persistence_landscape_on_grid.h> diff --git a/src/Gudhi_stat/utilities/persistence_vectors/average_persistence_vectors.cpp b/src/Gudhi_stat/utilities/persistence_vectors/average_persistence_vectors.cpp index 3262b157..cb3ea03d 100644 --- a/src/Gudhi_stat/utilities/persistence_vectors/average_persistence_vectors.cpp +++ b/src/Gudhi_stat/utilities/persistence_vectors/average_persistence_vectors.cpp @@ -21,8 +21,6 @@ */ - -#include <gudhi/abstract_classes/Abs_Topological_data.h> #include <gudhi/concretizations/Vector_distances_in_diagram.h> @@ -51,12 +49,12 @@ int main( int argc , char** argv ) } std::cout << "Reading persistence vectors...\n"; - std::vector< Abs_Topological_data_with_averages* > lands; + std::vector< Vector_distances_in_diagram< euclidean_distance<double> >* > lands; for ( size_t i = 0 ; i != filenames.size() ; ++i ) { Vector_distances_in_diagram< euclidean_distance<double> >* l = new Vector_distances_in_diagram< euclidean_distance<double> >; l->load_from_file( filenames[i] ); - lands.push_back( (Abs_Topological_data_with_averages*)l ); + lands.push_back(l ); } Vector_distances_in_diagram< euclidean_distance<double> > av; diff --git a/src/Gudhi_stat/utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp b/src/Gudhi_stat/utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp index 33d92a72..5f8c6b52 100644 --- a/src/Gudhi_stat/utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp +++ b/src/Gudhi_stat/utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp @@ -20,9 +20,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - - -#include <gudhi/abstract_classes/Abs_Topological_data.h> #include <gudhi/concretizations/Vector_distances_in_diagram.h> @@ -53,13 +50,13 @@ int main( int argc , char** argv ) { filenames.push_back( argv[i] ); } - std::vector< Vector_distances_in_diagram< euclidean_distance<double> >* > vectors; + std::vector< Vector_distances_in_diagram< euclidean_distance<double> > > vectors; vectors.reserve( filenames.size() ); for ( size_t file_no = 0 ; file_no != filenames.size() ; ++file_no ) { //cerr << filenames[file_no] << endl; - Vector_distances_in_diagram< euclidean_distance<double> >* l = new Vector_distances_in_diagram< euclidean_distance<double> >; - l->load_from_file( filenames[file_no] ); + Vector_distances_in_diagram< euclidean_distance<double> > l; + l.load_from_file( filenames[file_no] ); vectors.push_back( l ); } @@ -78,7 +75,7 @@ int main( int argc , char** argv ) { for ( size_t j = i+1 ; j != vectors.size() ; ++j ) { - distance[i][j] = distance[j][i] = ((Vector_distances_in_diagram< euclidean_distance<double> >*)vectors[i])->distance( vectors[j] , p ) ; + distance[i][j] = distance[j][i] = vectors[i].distance( vectors[j] , p ) ; } } diff --git a/src/Gudhi_stat/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 5bea2765..a02cd078 100644 --- a/src/Gudhi_stat/utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp +++ b/src/Gudhi_stat/utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp @@ -20,9 +20,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - - -#include <gudhi/abstract_classes/Abs_Topological_data.h> #include <gudhi/concretizations/Vector_distances_in_diagram.h> @@ -44,12 +41,12 @@ int main( int argc , char** argv ) { filenames.push_back( argv[i] ); } - std::vector< Vector_distances_in_diagram< euclidean_distance<double> >* > vectors; + std::vector< Vector_distances_in_diagram< euclidean_distance<double> > > vectors; vectors.reserve( filenames.size() ); for ( size_t file_no = 0 ; file_no != filenames.size() ; ++file_no ) { - Vector_distances_in_diagram< euclidean_distance<double> >* l = new Vector_distances_in_diagram< euclidean_distance<double> >; - l->load_from_file( filenames[file_no] ); + Vector_distances_in_diagram< euclidean_distance<double> > l; + l.load_from_file( filenames[file_no] ); vectors.push_back( l ); } @@ -68,7 +65,7 @@ int main( int argc , char** argv ) { for ( size_t j = i ; j != vectors.size() ; ++j ) { - scalar_product[i][j] = scalar_product[j][i] = ((Vector_distances_in_diagram< euclidean_distance<double> >*)vectors[i])->compute_scalar_product( vectors[j] ) ; + scalar_product[i][j] = scalar_product[j][i] = vectors[i].compute_scalar_product( vectors[j] ) ; } } @@ -85,13 +82,6 @@ int main( int argc , char** argv ) cout << endl; out << endl; } - out.close(); - - //cleaning up - for ( size_t i = 0 ; i != vectors.size() ; ++i ) - { - delete vectors[i]; - } - + out.close(); return 0; } diff --git a/src/Gudhi_stat/utilities/persistence_vectors/create_persistence_vectors.cpp b/src/Gudhi_stat/utilities/persistence_vectors/create_persistence_vectors.cpp index 657dd2d4..9f6b79cb 100644 --- a/src/Gudhi_stat/utilities/persistence_vectors/create_persistence_vectors.cpp +++ b/src/Gudhi_stat/utilities/persistence_vectors/create_persistence_vectors.cpp @@ -20,9 +20,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - - -#include <gudhi/abstract_classes/Abs_Topological_data.h> #include <gudhi/concretizations/Vector_distances_in_diagram.h> diff --git a/src/Gudhi_stat/utilities/persistence_vectors/plot_persistence_vectors.cpp b/src/Gudhi_stat/utilities/persistence_vectors/plot_persistence_vectors.cpp index 53f53654..de19a66d 100644 --- a/src/Gudhi_stat/utilities/persistence_vectors/plot_persistence_vectors.cpp +++ b/src/Gudhi_stat/utilities/persistence_vectors/plot_persistence_vectors.cpp @@ -20,9 +20,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - - -#include <gudhi/abstract_classes/Abs_Topological_data.h> #include <gudhi/concretizations/Vector_distances_in_diagram.h> |