diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-20 14:12:04 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-20 14:12:04 +0000 |
| commit | cbf1a50068a2c5dea6d732d40dfc66d34460d863 (patch) | |
| tree | ac9b7fe3d89c1f98582c4355e9cdc53da893aea2 /src/Bottleneck_distance/example | |
| parent | aa06a8774e45500718dd6bf0259b328a720fedd1 (diff) | |
| parent | a5326d01abe8968a23c42084ce75da88fad58f59 (diff) | |
Merge bottleneck_misc_fixes branch to fix bottleneck cpplint issue and doxygen warning
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@1974 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: a8704c1ff42c8e0f78ba2e70d83b71c91b3274a0
Diffstat (limited to 'src/Bottleneck_distance/example')
| -rw-r--r-- | src/Bottleneck_distance/example/bottleneck_basic_example.cpp | 6 | ||||
| -rw-r--r-- | src/Bottleneck_distance/example/bottleneck_read_file_example.cpp | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/Bottleneck_distance/example/bottleneck_basic_example.cpp b/src/Bottleneck_distance/example/bottleneck_basic_example.cpp index 91a7302f..d0ca4e20 100644 --- a/src/Bottleneck_distance/example/bottleneck_basic_example.cpp +++ b/src/Bottleneck_distance/example/bottleneck_basic_example.cpp @@ -21,10 +21,13 @@ */ #include <gudhi/Bottleneck.h> + #include <iostream> +#include <vector> +#include <utility> // for pair +#include <limits> // for numeric_limits int main() { - std::vector< std::pair<double, double> > v1, v2; v1.emplace_back(2.7, 3.7); @@ -44,5 +47,4 @@ int main() { b = Gudhi::persistence_diagram::bottleneck_distance(v1, v2, 0.1); std::cout << "Approx bottleneck distance = " << b << std::endl; - } diff --git a/src/Bottleneck_distance/example/bottleneck_read_file_example.cpp b/src/Bottleneck_distance/example/bottleneck_read_file_example.cpp index 4c74b66e..bde05825 100644 --- a/src/Bottleneck_distance/example/bottleneck_read_file_example.cpp +++ b/src/Bottleneck_distance/example/bottleneck_read_file_example.cpp @@ -24,6 +24,8 @@ #include <gudhi/Bottleneck.h> #include <iostream> +#include <vector> +#include <utility> // for pair #include <fstream> #include <sstream> #include <string> |