diff options
author | fgodi <fgodi@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-06-03 09:32:46 +0000 |
---|---|---|
committer | fgodi <fgodi@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-06-03 09:32:46 +0000 |
commit | 714a97d8b9c64a0a5ccc837184def8122ec8b4cd (patch) | |
tree | 8434545761fcf2eba7c7cbbea6110f8257990040 /src/Bottleneck_distance/include | |
parent | ab8c111e6a9abc4ba718083266c3dbb238ab94e3 (diff) |
compile
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bottleneckDistance@1245 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: a26ddc43a1f71052b594d5e0d65d28d952a0917e
Diffstat (limited to 'src/Bottleneck_distance/include')
3 files changed, 6 insertions, 3 deletions
diff --git a/src/Bottleneck_distance/include/CGAL/Miscellaneous.h b/src/Bottleneck_distance/include/CGAL/Miscellaneous.h index 4de787fb..21be0bc7 100644 --- a/src/Bottleneck_distance/include/CGAL/Miscellaneous.h +++ b/src/Bottleneck_distance/include/CGAL/Miscellaneous.h @@ -27,7 +27,7 @@ namespace CGAL { -typedef Gudhi::bipartite_graph_matching::Internal_point Internal_point; +typedef Gudhi::Bottleneck_distance::Internal_point Internal_point; template <> struct Kernel_traits<Internal_point> { diff --git a/src/Bottleneck_distance/include/gudhi/Graph_matching.h b/src/Bottleneck_distance/include/gudhi/Graph_matching.h index d8860841..f0ce633f 100644 --- a/src/Bottleneck_distance/include/gudhi/Graph_matching.h +++ b/src/Bottleneck_distance/include/gudhi/Graph_matching.h @@ -40,6 +40,9 @@ namespace Bottleneck_distance { template<typename Persistence_diagram1, typename Persistence_diagram2> double compute(const Persistence_diagram1& diag1, const Persistence_diagram2& diag2, double e = 0.); +template<typename Persistence_diagram1, typename Persistence_diagram2> +double compute_exactly(const Persistence_diagram1& diag1, const Persistence_diagram2& diag2); + /** \internal \brief Structure representing a graph matching. The graph is a Persistence_diagrams_graph. * * \ingroup bottleneck_distance diff --git a/src/Bottleneck_distance/include/gudhi/Persistence_diagrams_graph.h b/src/Bottleneck_distance/include/gudhi/Persistence_diagrams_graph.h index e8a46f1c..52e7c583 100644 --- a/src/Bottleneck_distance/include/gudhi/Persistence_diagrams_graph.h +++ b/src/Bottleneck_distance/include/gudhi/Persistence_diagrams_graph.h @@ -154,9 +154,9 @@ inline Internal_point G::get_v_point(int v_point_index) { inline double G::diameter() { double max = 0.; - for(it = u.cbegin(); it != u.cend(); it++) + for(auto it = u.cbegin(); it != u.cend(); it++) max = std::max(max,it->y()); - for(it = v.cbegin(); it != v.cend(); it++) + for(auto it = v.cbegin(); it != v.cend(); it++) max = std::max(max,it->y()); return max; } |