diff options
Diffstat (limited to 'src/Gudhi_stat')
17 files changed, 21 insertions, 21 deletions
diff --git a/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_landscape.h b/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_landscape.h index 681f5d8d..925d784f 100644 --- a/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_landscape.h +++ b/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_landscape.h @@ -270,7 +270,7 @@ public: } /** - *\private Computations of a L^i norm of landscape, where i is the input parameter. + *\private Computations of a \f$L^i\f$ norm of landscape, where i is the input parameter. **/ double compute_norm_of_landscape( double i ) { @@ -291,14 +291,14 @@ public: double operator()(unsigned level,double x)const{return this->compute_value_at_a_given_point(level,x);} /** - *\private Computations of L^{\infty} distance between two landscapes. + *\private Computations of \f$L^{\infty}\f$ distance between two landscapes. **/ friend double compute_max_norm_distance_of_landscapes( const Persistence_landscape& first, const Persistence_landscape& second ); //friend double compute_max_norm_distance_of_landscapes( const Persistence_landscape& first, const Persistence_landscape& second , unsigned& nrOfLand , double&x , double& y1, double& y2 ); /** - *\private Computations of L^{p} distance between two landscapes. p is the parameter of the procedure. + *\private Computations of \f$L^{p}\f$ distance between two landscapes. p is the parameter of the procedure. **/ friend double compute_distance_of_landscapes( const Persistence_landscape& first, const Persistence_landscape& second , double p ); diff --git a/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_landscape_on_grid.h b/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_landscape_on_grid.h index 1f4cb3ff..3103172d 100644 --- a/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_landscape_on_grid.h +++ b/src/Gudhi_stat/include/gudhi/persistence_representations/Persistence_landscape_on_grid.h @@ -595,7 +595,7 @@ public: } /** - * Computations of a L^i norm of landscape, where i is the input parameter. + * Computations of a \f$L^i\f$ norm of landscape, where i is the input parameter. **/ double compute_norm_of_landscape( double i )const { @@ -618,7 +618,7 @@ public: double operator()(unsigned level,double x)const{return this->compute_value_at_a_given_point(level,x);} /** - * Computations of L^{\infty} distance between two landscapes. + * Computations of \f$L^{\infty}\f$ distance between two landscapes. **/ friend double compute_max_norm_distance_of_landscapes( const Persistence_landscape_on_grid& first, const Persistence_landscape_on_grid& second ); //friend double compute_max_norm_distance_of_landscapes( const Persistence_landscape_on_grid& first, const Persistence_landscape_on_grid& second , unsigned& nrOfLand , double&x , double& y1, double& y2 ); @@ -765,7 +765,7 @@ public: /** - * Computations of L^{p} distance between two landscapes on a grid. p is the parameter of the procedure. + * Computations of \f$L^{p}\f$ distance between two landscapes on a grid. p is the parameter of the procedure. * FIXME: Note that, due to the grid representation, the method below may give non--accurate results in case when the landscape P and Q the difference of which we want to compute * are interxsecting. This is a consequence of a general way they are computed. In the future, an integral of absolute value of a difference of P and Q will be given as a separated * function to fix that inaccuracy. diff --git a/src/Gudhi_stat/utilities/Landscape_bootstrap.cpp b/src/Gudhi_stat/utilities/Landscape_bootstrap.cpp index d67bb820..9bd6c89e 100644 --- a/src/Gudhi_stat/utilities/Landscape_bootstrap.cpp +++ b/src/Gudhi_stat/utilities/Landscape_bootstrap.cpp @@ -38,7 +38,7 @@ using Persistence_landscape = Gudhi::Gudhi_stat::Persistence_landscape; typedef int Vertex_handle; -typedef double Filtration_value; +//typedef double Filtration_value; //if this variable is -1, then the infinite interals are ignored. If not, they infinite values are replaced with what_to_replace_infinite_intervals_with: 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 d9c7aded..e99b829a 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 @@ -57,7 +57,7 @@ int main( int argc , char** argv ) unsigned dimension = std::numeric_limits<unsigned>::max(); int dim = atoi( argv[5] ); - if ( (dim != -1) && (dim >= 0) ) + if ( dim >= 0 ) { dimension = (unsigned)dim; } 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 7cb7eeb7..b98fc3f7 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 @@ -58,7 +58,7 @@ int main( int argc , char** argv ) unsigned dimension = std::numeric_limits<unsigned>::max(); int dim = atoi( argv[5] ); - if ( (dim != -1) && (dim >= 0) ) + if ( dim >= 0 ) { dimension = (unsigned)dim; } 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 3242e106..ecef449a 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 @@ -57,7 +57,7 @@ int main( int argc , char** argv ) unsigned dimension = std::numeric_limits<unsigned>::max(); int dim = atoi( argv[5] ); - if ( (dim != -1) && (dim >= 0) ) + if ( dim >= 0 ) { dimension = (unsigned)dim; } 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 27846a99..59966855 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 @@ -57,7 +57,7 @@ int main( int argc , char** argv ) unsigned dimension = std::numeric_limits<unsigned>::max(); int dim = atoi( argv[5] ); - if ( (dim != -1) && (dim >= 0) ) + if ( dim >= 0 ) { dimension = (unsigned)dim; } 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 404a4be3..78989ccc 100644 --- a/src/Gudhi_stat/utilities/persistence_heat_maps/create_pssk.cpp +++ b/src/Gudhi_stat/utilities/persistence_heat_maps/create_pssk.cpp @@ -57,7 +57,7 @@ int main( int argc , char** argv ) unsigned dimension = std::numeric_limits<unsigned>::max(); int dim = atoi( argv[5] ); - if ( (dim != -1) && (dim >= 0) ) + if ( dim >= 0 ) { dimension = (unsigned)dim; } 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 426a9b7b..a3e19400 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 @@ -45,7 +45,7 @@ int main( int argc , char** argv ) int dim = atoi( argv[1] ); unsigned dimension = std::numeric_limits<unsigned>::max(); - if ( (dim != -1) && (dim >= 0) ) + if ( dim >= 0 ) { dimension = (unsigned)dim; } diff --git a/src/Gudhi_stat/utilities/persistence_intervals/compute_bottleneck_distance.cpp b/src/Gudhi_stat/utilities/persistence_intervals/compute_bottleneck_distance.cpp index 6f0ba635..d8b533cf 100644 --- a/src/Gudhi_stat/utilities/persistence_intervals/compute_bottleneck_distance.cpp +++ b/src/Gudhi_stat/utilities/persistence_intervals/compute_bottleneck_distance.cpp @@ -48,7 +48,7 @@ int main( int argc , char** argv ) int dim = atoi(argv[1]); unsigned dimension = std::numeric_limits<unsigned>::max(); - if ( (dim != -1) && (dim >= 0) ) + if ( dim >= 0 ) { dimension = (unsigned)dim; } 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 0a7f7c2b..281902fe 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 @@ -43,7 +43,7 @@ int main( int argc , char** argv ) } int dim = atoi( argv[2] ); unsigned dimension = std::numeric_limits<unsigned>::max(); - if ( (dim != -1) && (dim >= 0) ) + if ( dim >= 0 ) { dimension = (unsigned)dim; } 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 11876a0d..acfb0eed 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 @@ -48,7 +48,7 @@ int main( int argc , char** argv ) { dim = atoi( argv[2] ); } - if ( (dim != -1) && (dim >= 0) ) + if ( dim >= 0 ) { dimension = (unsigned)dim; } diff --git a/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_Betti_numbers.cpp b/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_Betti_numbers.cpp index 09c6cc22..21ba06f4 100644 --- a/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_Betti_numbers.cpp +++ b/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_Betti_numbers.cpp @@ -48,7 +48,7 @@ int main( int argc , char** argv ) { dim = atoi( argv[2] ); } - if ( (dim != -1) && (dim >= 0) ) + if ( dim >= 0 ) { dimension = (unsigned)dim; } 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 4315abb9..95c0cf1f 100644 --- a/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_intervals.cpp +++ b/src/Gudhi_stat/utilities/persistence_intervals/plot_persistence_intervals.cpp @@ -51,7 +51,7 @@ int main( int argc , char** argv ) { dim = atoi( argv[2] ); } - if ( (dim != -1) && (dim >= 0) ) + if ( dim >= 0 ) { dimension = (unsigned)dim; } diff --git a/src/Gudhi_stat/utilities/persistence_landscapes/create_landscapes.cpp b/src/Gudhi_stat/utilities/persistence_landscapes/create_landscapes.cpp index f36e313a..040ccc95 100644 --- a/src/Gudhi_stat/utilities/persistence_landscapes/create_landscapes.cpp +++ b/src/Gudhi_stat/utilities/persistence_landscapes/create_landscapes.cpp @@ -40,7 +40,7 @@ int main( int argc , char** argv ) std::vector< const char* > filenames; int dim = atoi(argv[1]); unsigned dimension = std::numeric_limits<unsigned>::max(); - if ( (dim != -1) && (dim >= 0) ) + if ( dim >= 0 ) { dimension = (unsigned)dim; } 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 eb534bf1..6dbb70c4 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 @@ -52,7 +52,7 @@ int main( int argc , char** argv ) double max_ = atof( argv[3] ); int dim = atoi( argv[4] ); unsigned dimension = std::numeric_limits<unsigned>::max(); - if ( (dim != -1) && (dim >= 0) ) + if ( dim >= 0 ) { dimension = (unsigned)dim; } 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 40f5e81f..7f0492c6 100644 --- a/src/Gudhi_stat/utilities/persistence_vectors/create_persistence_vectors.cpp +++ b/src/Gudhi_stat/utilities/persistence_vectors/create_persistence_vectors.cpp @@ -39,7 +39,7 @@ int main( int argc , char** argv ) std::cout << "The remaining parameters are the names of files with persistence diagrams. \n"; int dim = atoi( argv[1] ); unsigned dimension = std::numeric_limits<unsigned>::max(); - if ( (dim != -1) && (dim >= 0) ) + if ( dim >= 0 ) { dimension = (unsigned)dim; } |