diff options
author | fgodi <fgodi@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-11-29 09:00:07 +0000 |
---|---|---|
committer | fgodi <fgodi@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-11-29 09:00:07 +0000 |
commit | 759b53891e1572df0ea0562828fcd88d8f8f3031 (patch) | |
tree | 5d408c097c79cd82e9942e0f24c33e81cf0f3109 /src/Bottleneck_distance/example | |
parent | 0cf9b8901ed858cba7ac16fcd5a65e631dc22782 (diff) |
basic example, infinity
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bottleneck_integration@1797 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 23432677e7f1628dda596e9ba31138fc5063a608
Diffstat (limited to 'src/Bottleneck_distance/example')
-rw-r--r-- | src/Bottleneck_distance/example/CMakeLists.txt | 3 | ||||
-rw-r--r-- | src/Bottleneck_distance/example/bottleneck_basic_example.cpp | 48 | ||||
-rw-r--r-- | src/Bottleneck_distance/example/bottleneck_read_file_example.cpp (renamed from src/Bottleneck_distance/example/bottleneck_example.cpp) | 2 |
3 files changed, 51 insertions, 2 deletions
diff --git a/src/Bottleneck_distance/example/CMakeLists.txt b/src/Bottleneck_distance/example/CMakeLists.txt index 6f3204f6..cd53ccfc 100644 --- a/src/Bottleneck_distance/example/CMakeLists.txt +++ b/src/Bottleneck_distance/example/CMakeLists.txt @@ -6,7 +6,8 @@ project(Bottleneck_distance_examples) if(CGAL_FOUND) if (NOT CGAL_VERSION VERSION_LESS 4.8.0) if (EIGEN3_FOUND) - add_executable (bottleneck_example bottleneck_example.cpp) + add_executable (bottleneck_read_file_example bottleneck_read_file_example.cpp) + add_executable (bottleneck_basic_example bottleneck_basic_example.cpp) endif() endif () endif() diff --git a/src/Bottleneck_distance/example/bottleneck_basic_example.cpp b/src/Bottleneck_distance/example/bottleneck_basic_example.cpp new file mode 100644 index 00000000..95548579 --- /dev/null +++ b/src/Bottleneck_distance/example/bottleneck_basic_example.cpp @@ -0,0 +1,48 @@ +/* This file is part of the Gudhi Library. The Gudhi library + * (Geometric Understanding in Higher Dimensions) is a generic C++ + * library for computational topology. + * + * Authors: Francois Godi, small modifications by Pawel Dlotko + * + * Copyright (C) 2015 INRIA (France) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include <gudhi/Bottleneck.h> +#include <iostream> + +int main() { + + std::vector< std::pair<double, double> > v1, v2; + + v1.emplace_back(2.7, 3.7); + v1.emplace_back(9.6, 14.); + v1.emplace_back(34.2, 34.974); + v1.emplace_back(3., std::numeric_limits<double>::infinity()); + + v2.emplace_back(2.8, 4.45); + v2.emplace_back(9.5, 14.1); + v2.emplace_back(3.2, std::numeric_limits<double>::infinity()); + + + double b = Gudhi::bottleneck_distance::compute(v1, v2); + + std::cout << "Bottleneck distance = " << b << std::endl; + + b = Gudhi::bottleneck_distance::compute(v1, v2, 0.1); + + std::cout << "Approx bottleneck distance = " << b << std::endl; + +} diff --git a/src/Bottleneck_distance/example/bottleneck_example.cpp b/src/Bottleneck_distance/example/bottleneck_read_file_example.cpp index 28e458a5..4a503e4c 100644 --- a/src/Bottleneck_distance/example/bottleneck_example.cpp +++ b/src/Bottleneck_distance/example/bottleneck_read_file_example.cpp @@ -67,7 +67,7 @@ int main( int argc , char** argv ) } std::vector< std::pair< double , double > > diag1 = read_diagram_from_file( argv[1] ); std::vector< std::pair< double , double > > diag2 = read_diagram_from_file( argv[2] ); - double tolerance = 0; + double tolerance = 0.; if ( argc == 4 ) { tolerance = atof( argv[3] ); |