diff options
| author | mcarrier <mcarrier@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-04-12 07:50:07 +0000 |
|---|---|---|
| committer | mcarrier <mcarrier@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-04-12 07:50:07 +0000 |
| commit | 9a8649a45f61a9e152f26cb3fcbbdeabec5e0f37 (patch) | |
| tree | 7a16c67262070914c5351f38bed9941824b1f053 /src/cython/include/Rips_complex_interface.h | |
| parent | 9a4ad421d6faf66c7fa3091340e07e8e61adaae8 (diff) | |
| parent | 387a5af3ee1b664346eb9686f00c986e9f7a1e3e (diff) | |
Merged latest trunk changes to Nerve_GIC
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/Nerve_GIC@2336 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 45e06633204b8da3a91751fd510f1639225beb2d
Diffstat (limited to 'src/cython/include/Rips_complex_interface.h')
| -rw-r--r-- | src/cython/include/Rips_complex_interface.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/cython/include/Rips_complex_interface.h b/src/cython/include/Rips_complex_interface.h index 1879bd74..6d813f4a 100644 --- a/src/cython/include/Rips_complex_interface.h +++ b/src/cython/include/Rips_complex_interface.h @@ -49,7 +49,7 @@ class Rips_complex_interface { if (euclidean) { // Rips construction where values is a vector of points rips_complex_ = new Rips_complex<Simplex_tree_interface<>::Filtration_value>(values, threshold, - Euclidean_distance()); + Gudhi::Euclidean_distance()); } else { // Rips construction where values is a distance matrix rips_complex_ = new Rips_complex<Simplex_tree_interface<>::Filtration_value>(values, threshold); @@ -61,7 +61,8 @@ class Rips_complex_interface { // 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, Euclidean_distance()); + threshold, + Gudhi::Euclidean_distance()); } else { // Rips construction where values is a distance matrix Distance_matrix distances = |