Merge branch 'dfsg/latest' into debian/sid

1 files changed, 41 insertions, 0 deletions

diff --git a/src/python/include/Bottleneck_distance_interface.h b/src/python/include/Bottleneck_distance_interface.h
new file mode 100644
index 00000000..a4f3eaf1
--- /dev/null
+++ b/src/python/include/Bottleneck_distance_interface.h
@@ -0,0 +1,41 @@
+/*    This file is part of the Gudhi Library - https://gudhi.inria.fr/ - which is released under MIT.
+ *    See file LICENSE or go to https://gudhi.inria.fr/licensing/ for full license details.
+ *    Author(s):       Vincent Rouvreau
+ *
+ *    Copyright (C) 2016 Inria
+ *
+ *    Modification(s):
+ *      - YYYY/MM Author: Description of the modification
+ */
+
+#ifndef INCLUDE_BOTTLENECK_DISTANCE_INTERFACE_H_
+#define INCLUDE_BOTTLENECK_DISTANCE_INTERFACE_H_
+
+#include <gudhi/Bottleneck.h>
+
+#include <iostream>
+#include <vector>
+#include <utility>  // for std::pair
+
+namespace Gudhi {
+
+namespace persistence_diagram {
+
+  // bottleneck_distance function renamed for the python function can be called bottleneck_dstance
+  double bottleneck(const std::vector<std::pair<double, double>>& diag1,
+                    const std::vector<std::pair<double, double>>& diag2,
+                    double e) {
+    return bottleneck_distance(diag1, diag2, e);
+  }
+
+  double bottleneck(const std::vector<std::pair<double, double>>& diag1,
+                    const std::vector<std::pair<double, double>>& diag2) {
+    return bottleneck_distance(diag1, diag2);
+  }
+
+}  // namespace persistence_diagram
+
+}  // namespace Gudhi
+
+
+#endif  // INCLUDE_BOTTLENECK_DISTANCE_INTERFACE_H_