include <..>

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

Former-commit-id: 4f3e5c3b334b854cb81a8945f27874babd874e98

7 files changed, 61 insertions, 9 deletions

diff --git a/src/Bipartite_graphs_matching/example/basic.cpp b/src/Bipartite_graphs_matching/example/basic.cpp
index f8585fe6..ad299225 100644
--- a/src/Bipartite_graphs_matching/example/basic.cpp
+++ b/src/Bipartite_graphs_matching/example/basic.cpp
@@ -28,7 +28,7 @@
 
 using namespace Gudhi::bipartite_graph_matching;
 
-
+/*
 double upper_bound = 400.; // any real >0
 
 int main(){
@@ -63,8 +63,9 @@ int main(){
     }
     objetfichier.close();
 }
+*/
+
 
-/*
 int main() {
     std::vector< std::pair<double,double> > v1, v2;
 
@@ -80,4 +81,4 @@ int main() {
 
     std::cout << "Bottleneck distance = " << b << std::endl;
 
-}*/
+}
diff --git a/src/Bipartite_graphs_matching/include/CGAL/Miscellaneous.h b/src/Bipartite_graphs_matching/include/CGAL/Miscellaneous.h
new file mode 100644
index 00000000..4de787fb
--- /dev/null
+++ b/src/Bipartite_graphs_matching/include/CGAL/Miscellaneous.h
@@ -0,0 +1,51 @@
+/*    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):       Francois Godi
+ *
+ *    Copyright (C) 2015  INRIA Sophia-Antipolis (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/>.
+ */
+
+#ifndef SRC_BOTTLENECK_INCLUDE_CGAL_MISCELLANEOUS_H_
+#define SRC_BOTTLENECK_INCLUDE_CGAL_MISCELLANEOUS_H_
+
+#include <gudhi/Internal_point.h>
+
+namespace CGAL {
+
+typedef Gudhi::bipartite_graph_matching::Internal_point Internal_point;
+
+template <>
+struct Kernel_traits<Internal_point> {
+    struct Kernel {
+        typedef double FT;
+        typedef double RT;
+    };
+};
+
+
+struct Construct_coord_iterator {
+    typedef  const double* result_type;
+    const double* operator()(const Internal_point& p) const
+    { return static_cast<const double*>(p.vec); }
+    const double* operator()(const Internal_point& p, int)  const
+    { return static_cast<const double*>(p.vec+2); }
+};
+
+} //namespace CGAL
+
+#endif  // SRC_BOTTLENECK_INCLUDE_CGAL_MISCELLANEOUS_H_
diff --git a/src/Bipartite_graphs_matching/include/gudhi/Graph_matching.h b/src/Bipartite_graphs_matching/include/gudhi/Graph_matching.h
index 228de584..fa05aa7c 100644
--- a/src/Bipartite_graphs_matching/include/gudhi/Graph_matching.h
+++ b/src/Bipartite_graphs_matching/include/gudhi/Graph_matching.h
@@ -25,7 +25,7 @@
 
 #include <deque>
 
-#include "Neighbors_finder.h"
+#include <gudhi/Neighbors_finder.h>
 
 namespace Gudhi {
 
diff --git a/src/Bipartite_graphs_matching/include/gudhi/Neighbors_finder.h b/src/Bipartite_graphs_matching/include/gudhi/Neighbors_finder.h
index bb6f5ea0..7fa9453d 100644
--- a/src/Bipartite_graphs_matching/include/gudhi/Neighbors_finder.h
+++ b/src/Bipartite_graphs_matching/include/gudhi/Neighbors_finder.h
@@ -24,7 +24,7 @@
 #define SRC_BOTTLENECK_INCLUDE_GUDHI_NEIGHBORS_FINDER_H_
 
 #include <unordered_set>
-#include "Planar_neighbors_finder.h"
+#include <gudhi/Planar_neighbors_finder.h>
 
 namespace Gudhi {
 
diff --git a/src/Bipartite_graphs_matching/include/gudhi/Persistence_diagrams_graph.h b/src/Bipartite_graphs_matching/include/gudhi/Persistence_diagrams_graph.h
index a460d814..139caa8c 100644
--- a/src/Bipartite_graphs_matching/include/gudhi/Persistence_diagrams_graph.h
+++ b/src/Bipartite_graphs_matching/include/gudhi/Persistence_diagrams_graph.h
@@ -30,7 +30,7 @@
 #include <algorithm>
 #include <math.h>
 #include <memory>
-#include "Internal_point.h"
+#include <gudhi/Internal_point.h>
 
 namespace Gudhi {
 
diff --git a/src/Bipartite_graphs_matching/include/gudhi/Planar_neighbors_finder.h b/src/Bipartite_graphs_matching/include/gudhi/Planar_neighbors_finder.h
index 8231409c..ec5c6f91 100644
--- a/src/Bipartite_graphs_matching/include/gudhi/Planar_neighbors_finder.h
+++ b/src/Bipartite_graphs_matching/include/gudhi/Planar_neighbors_finder.h
@@ -28,8 +28,8 @@
 #include <CGAL/Search_traits.h>
 #include <CGAL/Orthogonal_incremental_neighbor_search.h>
 #include <CGAL/Weighted_Minkowski_distance.h>
-#include "../CGAL/Miscellaneous.h"
-#include "Persistence_diagrams_graph.h"
+#include <CGAL/Miscellaneous.h>
+#include <gudhi/Persistence_diagrams_graph.h>
 
 
 namespace Gudhi {
diff --git a/src/Bipartite_graphs_matching/test/bottleneck_unit_test.cpp b/src/Bipartite_graphs_matching/test/bottleneck_unit_test.cpp
index 7c1d5614..ffe05614 100644
--- a/src/Bipartite_graphs_matching/test/bottleneck_unit_test.cpp
+++ b/src/Bipartite_graphs_matching/test/bottleneck_unit_test.cpp
@@ -2,7 +2,7 @@
 
 #include <boost/test/included/unit_test.hpp>
 #include <random>
-#include "../include/gudhi/Graph_matching.h"
+#include <gudhi/Graph_matching.h>
 
 using namespace Gudhi::bipartite_graph_matching;