Merge last trunk modifications in qt5 branch

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/qt5@1976 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 7f8c5b9443bf0996347fe459fe21c42a2fed0cca

1 files changed, 50 insertions, 0 deletions

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..d0ca4e20
--- /dev/null
+++ b/src/Bottleneck_distance/example/bottleneck_basic_example.cpp
@@ -0,0 +1,50 @@
+/*    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
+ *
+ *    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>
+#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);
+  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::persistence_diagram::bottleneck_distance(v1, v2);
+
+  std::cout << "Bottleneck distance = " << b << std::endl;
+
+  b = Gudhi::persistence_diagram::bottleneck_distance(v1, v2, 0.1);
+
+  std::cout << "Approx bottleneck distance = " << b << std::endl;
+}