summaryrefslogtreecommitdiff
path: root/src/Bottleneck_distance
diff options
context:
space:
mode:
authorcjamin <cjamin@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2017-05-29 16:22:49 +0000
committercjamin <cjamin@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2017-05-29 16:22:49 +0000
commit71527e6ff81a7ac657f8a797a050bbcf7a131cb9 (patch)
tree6f41a7a5cdbfb67c1b284313229958b889806dc4 /src/Bottleneck_distance
parent269fa842c2eaeb7ddf8040abfd6c18d23ac767e9 (diff)
Add 2 new variants of read_persistence_diagram_from_file
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/read_persistence_from_file@2463 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: bd0dd2c981856c8e1a51b2b97ac10d9edd59f694
Diffstat (limited to 'src/Bottleneck_distance')
-rw-r--r--src/Bottleneck_distance/example/bottleneck_read_file_example.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/Bottleneck_distance/example/bottleneck_read_file_example.cpp b/src/Bottleneck_distance/example/bottleneck_read_file_example.cpp
index 74c8d1ab..e26edd26 100644
--- a/src/Bottleneck_distance/example/bottleneck_read_file_example.cpp
+++ b/src/Bottleneck_distance/example/bottleneck_read_file_example.cpp
@@ -45,10 +45,8 @@ int main(int argc, char** argv) {
"should contain a birth-death pair per line. Third, optional parameter is an error bound on a bottleneck" <<
" distance (set by default to zero). The program will now terminate \n";
}
- std::vector<Persistence_interval> diag1;
- std::vector<Persistence_interval> diag2;
- read_persistence_diagram_from_file(argv[1], std::back_inserter(diag1));
- read_persistence_diagram_from_file(argv[2], std::back_inserter(diag2));
+ std::vector<std::pair<double, double>> diag1 = read_persistence_diagram_from_file(argv[1], -1);
+ std::vector<std::pair<double, double>> diag2 = read_persistence_diagram_from_file(argv[2], -1);
double tolerance = 0.;
if (argc == 4) {