From 4fdc721bbd19bc6389d611d252ff08f8fbbeee23 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 28 Apr 2020 08:33:51 +0200 Subject: Code and doc review fix --- src/Collapse/doc/intro_edge_collapse.h | 2 +- src/Collapse/include/gudhi/Flag_complex_sparse_matrix.h | 10 +++++----- .../distance_matrix_edge_collapse_rips_persistence.cpp | 4 +--- 3 files changed, 7 insertions(+), 9 deletions(-) (limited to 'src/Collapse') diff --git a/src/Collapse/doc/intro_edge_collapse.h b/src/Collapse/doc/intro_edge_collapse.h index 0691ccf6..5c126d29 100644 --- a/src/Collapse/doc/intro_edge_collapse.h +++ b/src/Collapse/doc/intro_edge_collapse.h @@ -2,7 +2,7 @@ * See file LICENSE or go to https://gudhi.inria.fr/licensing/ for full license details. * Author(s): Siddharth Pritam * - * Copyright (C) 2019 Inria + * Copyright (C) 2020 Inria * * Modification(s): * - YYYY/MM Author: Description of the modification diff --git a/src/Collapse/include/gudhi/Flag_complex_sparse_matrix.h b/src/Collapse/include/gudhi/Flag_complex_sparse_matrix.h index 49c28f63..6fa4438c 100644 --- a/src/Collapse/include/gudhi/Flag_complex_sparse_matrix.h +++ b/src/Collapse/include/gudhi/Flag_complex_sparse_matrix.h @@ -2,7 +2,7 @@ * See file LICENSE or go to https://gudhi.inria.fr/licensing/ for full license details. * Author(s): Siddharth Pritam * - * Copyright (C) 2018 Inria + * Copyright (C) 2020 Inria * * Modification(s): * - 2020/03 Vincent Rouvreau: integration to the gudhi library @@ -44,8 +44,8 @@ namespace collapse { * \ingroup collapse * * \details - * A class to store the vertices v/s MaxSimplices Sparse Matrix and to perform collapse operations using the N^2() - * Algorithm. + * This class stores a Flag complex + * in an Eigen sparse matrix. * * \tparam Vertex type must be a signed integer type. It admits a total order <. * \tparam Filtration type for the value of the filtration function. Must be comparable with <. @@ -73,7 +73,7 @@ class Flag_complex_sparse_matrix { using Row_indices_vector = std::vector; public: - /** \brief A Filtered_edge is a std::pair, `Filtration_value`>. */ + /** \brief Filtered_edge is a type to store an edge with its filtration value. */ using Filtered_edge = std::pair; /** \brief Proximity_graph is a type that can be used to construct easily a Flag_complex_sparse_matrix. */ using Proximity_graph = Gudhi::Proximity_graph; @@ -358,7 +358,7 @@ class Flag_complex_sparse_matrix { } } - /** \brief Performs edge collapse in a decreasing sequence of the filtration value. + /** \brief Performs edge collapse in a increasing sequence of the filtration value. * * \tparam FilteredEdgeInsertion is an output iterator that furnishes * `({Vertex_handle u, Vertex_handle v}, Filtration_value f)` that will fill the user defined data structure. diff --git a/src/Collapse/utilities/distance_matrix_edge_collapse_rips_persistence.cpp b/src/Collapse/utilities/distance_matrix_edge_collapse_rips_persistence.cpp index f4a460ab..f39e9764 100644 --- a/src/Collapse/utilities/distance_matrix_edge_collapse_rips_persistence.cpp +++ b/src/Collapse/utilities/distance_matrix_edge_collapse_rips_persistence.cpp @@ -79,9 +79,7 @@ int main(int argc, char* argv[]) { program_options(argc, argv, csv_matrix_file, filediag, threshold, dim_max, p, min_persistence); - Distance_matrix distances; - - distances = Gudhi::read_lower_triangular_matrix_from_csv_file(csv_matrix_file); + Distance_matrix distances = Gudhi::read_lower_triangular_matrix_from_csv_file(csv_matrix_file); std::cout << "Read the distance matrix succesfully, of size: " << distances.size() << std::endl; Proximity_graph proximity_graph = Gudhi::compute_proximity_graph(boost::irange((size_t)0, -- cgit v1.2.3