summaryrefslogtreecommitdiff
path: root/src/Rips_complex
diff options
context:
space:
mode:
Diffstat (limited to 'src/Rips_complex')
-rw-r--r--src/Rips_complex/example/CMakeLists.txt1
-rw-r--r--src/Rips_complex/example/example_one_skeleton_rips_from_correlation_matrix.cpp10
-rw-r--r--src/Rips_complex/include/gudhi/Sparse_rips_complex.h4
-rw-r--r--src/Rips_complex/test/CMakeLists.txt1
-rw-r--r--src/Rips_complex/utilities/CMakeLists.txt1
-rw-r--r--src/Rips_complex/utilities/rips_correlation_matrix_persistence.cpp1
6 files changed, 8 insertions, 10 deletions
diff --git a/src/Rips_complex/example/CMakeLists.txt b/src/Rips_complex/example/CMakeLists.txt
index af86636b..e7772bdb 100644
--- a/src/Rips_complex/example/CMakeLists.txt
+++ b/src/Rips_complex/example/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 2.6)
project(Rips_complex_examples)
# Point cloud
diff --git a/src/Rips_complex/example/example_one_skeleton_rips_from_correlation_matrix.cpp b/src/Rips_complex/example/example_one_skeleton_rips_from_correlation_matrix.cpp
index 1343f24d..05bacb9f 100644
--- a/src/Rips_complex/example/example_one_skeleton_rips_from_correlation_matrix.cpp
+++ b/src/Rips_complex/example/example_one_skeleton_rips_from_correlation_matrix.cpp
@@ -15,11 +15,11 @@ int main() {
using Distance_matrix = std::vector<std::vector<Filtration_value>>;
// User defined correlation matrix is:
- // |1 0.06 0.23 0.01 0.89|
- // |0.06 1 0.74 0.01 0.61|
- // |0.23 0.74 1 0.72 0.03|
- // |0.01 0.01 0.72 1 0.7 |
- // |0.89 0.61 0.03 0.7 1 |
+ // |1 0.06 0.23 0.01 0.89|
+ // |0.06 1 0.74 0.01 0.61|
+ // |0.23 0.74 1 0.72 0.03|
+ // |0.01 0.01 0.72 1 0.7 |
+ // |0.89 0.61 0.03 0.7 1 |
Distance_matrix correlations;
correlations.push_back({});
diff --git a/src/Rips_complex/include/gudhi/Sparse_rips_complex.h b/src/Rips_complex/include/gudhi/Sparse_rips_complex.h
index 19a44b28..4dcc08ed 100644
--- a/src/Rips_complex/include/gudhi/Sparse_rips_complex.h
+++ b/src/Rips_complex/include/gudhi/Sparse_rips_complex.h
@@ -54,7 +54,7 @@ namespace rips_complex {
template <typename Filtration_value>
class Sparse_rips_complex {
private:
- // TODO: use a different graph where we know we can safely insert in parallel.
+ // TODO(MG): use a different graph where we know we can safely insert in parallel.
typedef typename boost::adjacency_list<boost::vecS, boost::vecS, boost::undirectedS,
boost::property<vertex_filtration_t, Filtration_value>,
boost::property<edge_filtration_t, Filtration_value>>
@@ -140,7 +140,7 @@ class Sparse_rips_complex {
put(vertex_filtration_t(), graph_, v, 0);
}
- // TODO:
+ // TODO(MG):
// - make it parallel
// - only test near-enough neighbors
for (int i = 0; i < n; ++i)
diff --git a/src/Rips_complex/test/CMakeLists.txt b/src/Rips_complex/test/CMakeLists.txt
index 3da9c90d..745d953c 100644
--- a/src/Rips_complex/test/CMakeLists.txt
+++ b/src/Rips_complex/test/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 2.6)
project(Rips_complex_tests)
include(GUDHI_test_coverage)
diff --git a/src/Rips_complex/utilities/CMakeLists.txt b/src/Rips_complex/utilities/CMakeLists.txt
index deb73ff0..4b565628 100644
--- a/src/Rips_complex/utilities/CMakeLists.txt
+++ b/src/Rips_complex/utilities/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 2.6)
project(Rips_complex_utilities)
add_executable(rips_distance_matrix_persistence rips_distance_matrix_persistence.cpp)
diff --git a/src/Rips_complex/utilities/rips_correlation_matrix_persistence.cpp b/src/Rips_complex/utilities/rips_correlation_matrix_persistence.cpp
index d4671b45..c78677d2 100644
--- a/src/Rips_complex/utilities/rips_correlation_matrix_persistence.cpp
+++ b/src/Rips_complex/utilities/rips_correlation_matrix_persistence.cpp
@@ -31,6 +31,7 @@
#include <string>
#include <vector>
#include <limits> // infinity
+#include <algorithm> // for sort
// Types definition
using Simplex_tree = Gudhi::Simplex_tree<Gudhi::Simplex_tree_options_fast_persistence>;