Merge ST_cythonize branch into the trunk

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

Former-commit-id: 013d700aaa4b255cc91ff79020b40b7e6c4e7d05

1 files changed, 53 insertions, 0 deletions

diff --git a/src/cython/include/Bottleneck_distance_interface.h b/src/cython/include/Bottleneck_distance_interface.h
new file mode 100644
index 00000000..6819734b
--- /dev/null
+++ b/src/cython/include/Bottleneck_distance_interface.h
@@ -0,0 +1,53 @@
+/*    This file is part of the Gudhi Library. The Gudhi library
+ *    (Geometric Understanding in Higher Dimensions) is a generic C++
+ *    library for computational topology.
+ *
+ *    Author(s):       Vincent Rouvreau
+ *
+ *    Copyright (C) 2016 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/>.
+ */
+
+#ifndef BOTTLENECK_DISTANCE_INTERFACE_H
+#define	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 alpha_complex
+
+}  // namespace Gudhi
+
+
+#endif  // BOTTLENECK_DISTANCE_INTERFACE_H