diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-04-03 09:11:12 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-04-03 09:11:12 +0000 |
commit | 77d03dba655f8c19c413d70b929c6426f332dc34 (patch) | |
tree | 1e8aad7fbfd7df74796553ceeaf1234e3ac85c7d /src/cython/include | |
parent | 8447fa7575ae4db0db6daa8e03a0c2f9a374df7c (diff) | |
parent | 3e1cf01b055718ead2433ef852dcfccce502cdb8 (diff) |
Merge rips_complex_from_correlation_matrix branch
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@3328 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: a0d98d884fc06a6528e3362d6ed627cd964f527a
Diffstat (limited to 'src/cython/include')
-rw-r--r-- | src/cython/include/Rips_complex_interface.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/cython/include/Rips_complex_interface.h b/src/cython/include/Rips_complex_interface.h index 02985727..f26befbc 100644 --- a/src/cython/include/Rips_complex_interface.h +++ b/src/cython/include/Rips_complex_interface.h @@ -25,9 +25,7 @@ #include <gudhi/Simplex_tree.h> #include <gudhi/Rips_complex.h> -#include <gudhi/Points_off_io.h> #include <gudhi/distance_functions.h> -#include <gudhi/reader_utils.h> #include "Simplex_tree_interface.h" @@ -56,21 +54,6 @@ class Rips_complex_interface { } } - Rips_complex_interface(const std::string& file_name, double threshold, bool euclidean, bool from_file = true) { - if (euclidean) { - // Rips construction where file_name is an OFF file - Gudhi::Points_off_reader<Point_d> off_reader(file_name); - rips_complex_ = new Rips_complex<Simplex_tree_interface<>::Filtration_value>(off_reader.get_point_cloud(), - threshold, - Gudhi::Euclidean_distance()); - } else { - // Rips construction where values is a distance matrix - Distance_matrix distances = - Gudhi::read_lower_triangular_matrix_from_csv_file<Simplex_tree_interface<>::Filtration_value>(file_name); - rips_complex_ = new Rips_complex<Simplex_tree_interface<>::Filtration_value>(distances, threshold); - } - } - ~Rips_complex_interface() { delete rips_complex_; } |