summaryrefslogtreecommitdiff
path: root/src/Collapse
diff options
context:
space:
mode:
authorROUVREAU Vincent <vincent.rouvreau@inria.fr>2020-04-28 08:33:51 +0200
committerROUVREAU Vincent <vincent.rouvreau@inria.fr>2020-04-28 08:33:51 +0200
commit4fdc721bbd19bc6389d611d252ff08f8fbbeee23 (patch)
treec0f57417b3bbc5d38f54189de7d0405ef1afee17 /src/Collapse
parent1508cef62980fb59ac7e1b0b30f560083ec3988a (diff)
Code and doc review fix
Diffstat (limited to 'src/Collapse')
-rw-r--r--src/Collapse/doc/intro_edge_collapse.h2
-rw-r--r--src/Collapse/include/gudhi/Flag_complex_sparse_matrix.h10
-rw-r--r--src/Collapse/utilities/distance_matrix_edge_collapse_rips_persistence.cpp4
3 files changed, 7 insertions, 9 deletions
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 <a target="_blank" href="https://en.wikipedia.org/wiki/Clique_complex">Flag complex</a>
+ * in an <a target="_blank" href="https://eigen.tuxfamily.org/dox/group__TutorialSparse.html">Eigen sparse matrix</a>.
*
* \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<Row_index>;
public:
- /** \brief A Filtered_edge is a std::pair<std::pair<`Vertex_handle`, `Vertex_handle`>, `Filtration_value`>. */
+ /** \brief Filtered_edge is a type to store an edge with its filtration value. */
using Filtered_edge = std::pair<Edge, Filtration_value>;
/** \brief Proximity_graph is a type that can be used to construct easily a Flag_complex_sparse_matrix. */
using Proximity_graph = Gudhi::Proximity_graph<Flag_complex_sparse_matrix>;
@@ -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<Filtration_value>(csv_matrix_file);
+ Distance_matrix distances = Gudhi::read_lower_triangular_matrix_from_csv_file<Filtration_value>(csv_matrix_file);
std::cout << "Read the distance matrix succesfully, of size: " << distances.size() << std::endl;
Proximity_graph proximity_graph = Gudhi::compute_proximity_graph<Simplex_tree>(boost::irange((size_t)0,