From 12205e50480035a555ea68b71239fd83feef3226 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Fri, 2 Jun 2017 14:08:45 +0000 Subject: Fix cpplint issues git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/persistence_representation_integration@2503 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: f2c5ba756b7cd4115fb97eeb066216b312b4ae2f --- .../include/gudhi/Persistence_heat_maps.h | 6 ++++-- .../include/gudhi/Persistence_intervals.h | 3 ++- .../persistence_vectors/average_persistence_vectors.cpp | 13 +++++++------ .../compute_distance_of_persistence_vectors.cpp | 11 ++++++----- .../compute_scalar_product_of_persistence_vectors.cpp | 11 ++++++----- .../persistence_vectors/create_persistence_vectors.cpp | 9 +++++---- .../persistence_vectors/plot_persistence_vectors.cpp | 7 ++++--- 7 files changed, 34 insertions(+), 26 deletions(-) (limited to 'src/Persistence_representations') diff --git a/src/Persistence_representations/include/gudhi/Persistence_heat_maps.h b/src/Persistence_representations/include/gudhi/Persistence_heat_maps.h index 5ef5129d..04dd78ad 100644 --- a/src/Persistence_representations/include/gudhi/Persistence_heat_maps.h +++ b/src/Persistence_representations/include/gudhi/Persistence_heat_maps.h @@ -582,8 +582,10 @@ void Persistence_heat_maps::construct(const std::vector((intervals_[pt_nr].first - this->min_) / (this->max_ - this->min_) * number_of_pixels); - int y_grid = static_cast((intervals_[pt_nr].second - this->min_) / (this->max_ - this->min_) * number_of_pixels); + int x_grid = static_cast((intervals_[pt_nr].first - this->min_) / + (this->max_ - this->min_) * number_of_pixels); + int y_grid = static_cast((intervals_[pt_nr].second - this->min_) / + (this->max_ - this->min_) * number_of_pixels); if (dbg) { std::cerr << "point : " << intervals_[pt_nr].first << " , " << intervals_[pt_nr].second << std::endl; diff --git a/src/Persistence_representations/include/gudhi/Persistence_intervals.h b/src/Persistence_representations/include/gudhi/Persistence_intervals.h index 9e614efd..525d58a3 100644 --- a/src/Persistence_representations/include/gudhi/Persistence_intervals.h +++ b/src/Persistence_representations/include/gudhi/Persistence_intervals.h @@ -403,7 +403,8 @@ std::vector Persistence_intervals::characteristic_function_of_diagram(do for (size_t pos = beginIt; pos != endIt; ++pos) { result[pos] += - ((x_max - x_min) / static_cast(number_of_bins)) * (this->intervals[i].second - this->intervals[i].first); + ((x_max - x_min) / static_cast(number_of_bins)) * + (this->intervals[i].second - this->intervals[i].first); } if (dbg) { std::cerr << "Result at this stage \n"; diff --git a/src/Persistence_representations/utilities/persistence_vectors/average_persistence_vectors.cpp b/src/Persistence_representations/utilities/persistence_vectors/average_persistence_vectors.cpp index 585f2f61..366ee2bc 100644 --- a/src/Persistence_representations/utilities/persistence_vectors/average_persistence_vectors.cpp +++ b/src/Persistence_representations/utilities/persistence_vectors/average_persistence_vectors.cpp @@ -22,12 +22,13 @@ #include -using namespace Gudhi; -using namespace Gudhi::Persistence_representations; - #include #include +using Euclidean_distance = Gudhi::Euclidean_distance; +using Vector_distances_in_diagram = + Gudhi::Persistence_representations::Vector_distances_in_diagram; + int main(int argc, char** argv) { std::cout << "This program computes average persistence vector of persistence vectors created based on persistence " "diagrams provided as an input. \n"; @@ -44,14 +45,14 @@ int main(int argc, char** argv) { } std::cout << "Reading persistence vectors...\n"; - std::vector*> lands; + std::vector lands; for (size_t i = 0; i != filenames.size(); ++i) { - Vector_distances_in_diagram* l = new Vector_distances_in_diagram; + Vector_distances_in_diagram* l = new Vector_distances_in_diagram; l->load_from_file(filenames[i]); lands.push_back(l); } - Vector_distances_in_diagram av; + Vector_distances_in_diagram av; av.compute_average(lands); av.print_to_file("average.vect"); diff --git a/src/Persistence_representations/utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp b/src/Persistence_representations/utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp index 79906262..3aed297e 100644 --- a/src/Persistence_representations/utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp +++ b/src/Persistence_representations/utilities/persistence_vectors/compute_distance_of_persistence_vectors.cpp @@ -22,14 +22,15 @@ #include -using namespace Gudhi; -using namespace Gudhi::Persistence_representations; - #include #include #include #include +using Euclidean_distance = Gudhi::Euclidean_distance; +using Vector_distances_in_diagram = + Gudhi::Persistence_representations::Vector_distances_in_diagram; + int main(int argc, char** argv) { std::cout << "This program compute distance of persistence vectors stored in a file (the file needs to be created " "beforehand). \n"; @@ -52,10 +53,10 @@ int main(int argc, char** argv) { for (int i = 2; i < argc; ++i) { filenames.push_back(argv[i]); } - std::vector > vectors; + std::vector vectors; vectors.reserve(filenames.size()); for (size_t file_no = 0; file_no != filenames.size(); ++file_no) { - Vector_distances_in_diagram l; + Vector_distances_in_diagram l; l.load_from_file(filenames[file_no]); vectors.push_back(l); } diff --git a/src/Persistence_representations/utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp b/src/Persistence_representations/utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp index a5916ed8..d9ad4360 100644 --- a/src/Persistence_representations/utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp +++ b/src/Persistence_representations/utilities/persistence_vectors/compute_scalar_product_of_persistence_vectors.cpp @@ -22,14 +22,15 @@ #include -using namespace Gudhi; -using namespace Gudhi::Persistence_representations; - #include #include #include #include +using Euclidean_distance = Gudhi::Euclidean_distance; +using Vector_distances_in_diagram = + Gudhi::Persistence_representations::Vector_distances_in_diagram; + int main(int argc, char** argv) { std::cout << "This program compute scalar product of persistence vectors stored in a file (the file needs to be " "created beforehand). \n"; @@ -39,10 +40,10 @@ int main(int argc, char** argv) { for (int i = 1; i < argc; ++i) { filenames.push_back(argv[i]); } - std::vector > vectors; + std::vector vectors; vectors.reserve(filenames.size()); for (size_t file_no = 0; file_no != filenames.size(); ++file_no) { - Vector_distances_in_diagram l; + Vector_distances_in_diagram l; l.load_from_file(filenames[file_no]); vectors.push_back(l); } diff --git a/src/Persistence_representations/utilities/persistence_vectors/create_persistence_vectors.cpp b/src/Persistence_representations/utilities/persistence_vectors/create_persistence_vectors.cpp index 0941308f..b618ca67 100644 --- a/src/Persistence_representations/utilities/persistence_vectors/create_persistence_vectors.cpp +++ b/src/Persistence_representations/utilities/persistence_vectors/create_persistence_vectors.cpp @@ -22,14 +22,15 @@ #include -using namespace Gudhi; -using namespace Gudhi::Persistence_representations; - #include #include #include #include +using Euclidean_distance = Gudhi::Euclidean_distance; +using Vector_distances_in_diagram = + Gudhi::Persistence_representations::Vector_distances_in_diagram; + int main(int argc, char** argv) { std::cout << "This program creates persistence vectors of diagrams provided as an input. The first parameter of this " "program is a dimension of persistence "; @@ -52,7 +53,7 @@ int main(int argc, char** argv) { for (size_t i = 0; i != filenames.size(); ++i) { std::cerr << "Creating persistence vectors based on a file : " << filenames[i] << std::endl; - Vector_distances_in_diagram l(filenames[i], dimension); + Vector_distances_in_diagram l(filenames[i], dimension); std::stringstream ss; ss << filenames[i] << ".vect"; l.print_to_file(ss.str().c_str()); diff --git a/src/Persistence_representations/utilities/persistence_vectors/plot_persistence_vectors.cpp b/src/Persistence_representations/utilities/persistence_vectors/plot_persistence_vectors.cpp index d8846ed7..41589edc 100644 --- a/src/Persistence_representations/utilities/persistence_vectors/plot_persistence_vectors.cpp +++ b/src/Persistence_representations/utilities/persistence_vectors/plot_persistence_vectors.cpp @@ -22,12 +22,13 @@ #include -using namespace Gudhi; -using namespace Gudhi::Persistence_representations; - #include #include +using Euclidean_distance = Gudhi::Euclidean_distance; +using Vector_distances_in_diagram = + Gudhi::Persistence_representations::Vector_distances_in_diagram; + int main(int argc, char** argv) { std::cout << "This program create a Gnuplot script to plot persistence vector. Please call this program with the " "name of file with persistence vector. \n"; -- cgit v1.2.3