diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-10-20 10:04:05 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-10-20 10:04:05 +0000 |
commit | 8d656e33138ef8b3a7d86a7375c92646efc29511 (patch) | |
tree | 3711227c4c1b2a6e9f25dda1db8dafb8365063a0 /src/cython/include/Simplex_tree_interface.h | |
parent | 355dc2a0ae73f243fc0aa8d7c797509d8ba5e6b4 (diff) | |
parent | 30e538a98919004e36b3b382017884486919cb6e (diff) |
Merge last trunk modification
Fix doc issue
Still doc issue
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@1739 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 0a99345f06e93a3525691699a6fe1505979e8e8e
Diffstat (limited to 'src/cython/include/Simplex_tree_interface.h')
-rw-r--r-- | src/cython/include/Simplex_tree_interface.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/cython/include/Simplex_tree_interface.h b/src/cython/include/Simplex_tree_interface.h index 9aee630b..ad7be1a8 100644 --- a/src/cython/include/Simplex_tree_interface.h +++ b/src/cython/include/Simplex_tree_interface.h @@ -26,6 +26,7 @@ #include <gudhi/graph_simplicial_complex.h> #include <gudhi/distance_functions.h> #include <gudhi/Simplex_tree.h> +#include <gudhi/Points_off_io.h> #include <vector> #include <utility> // std::pair @@ -116,6 +117,21 @@ class Simplex_tree_interface : public Simplex_tree<SimplexTreeOptions> { Simplex_tree<SimplexTreeOptions>::initialize_filtration(); } + void graph_expansion(std::string& off_file_name, int max_dimension, double max_edge_length, bool from_file=true) { + Gudhi::Points_off_reader<std::vector <double>> off_reader(off_file_name); + // Check the read operation was correct + if (!off_reader.is_valid()) { + std::cerr << "Unable to read file " << off_file_name << std::endl; + } else { + std::vector<std::vector <double>> points = off_reader.get_point_cloud(); + Graph_t prox_graph = compute_proximity_graph(points, max_edge_length, + euclidean_distance<std::vector<double>>); + Simplex_tree<SimplexTreeOptions>::insert_graph(prox_graph); + Simplex_tree<SimplexTreeOptions>::expansion(max_dimension); + Simplex_tree<SimplexTreeOptions>::initialize_filtration(); + } + } + }; struct Simplex_tree_options_mini : Simplex_tree_options_full_featured { |