diff options
Diffstat (limited to 'src/Bottleneck_distance/include/gudhi')
5 files changed, 11 insertions, 11 deletions
diff --git a/src/Bottleneck_distance/include/gudhi/Bottleneck.h b/src/Bottleneck_distance/include/gudhi/Bottleneck.h index 4a69fb96..0c9e5ea8 100644 --- a/src/Bottleneck_distance/include/gudhi/Bottleneck.h +++ b/src/Bottleneck_distance/include/gudhi/Bottleneck.h @@ -28,7 +28,7 @@ namespace Gudhi { -namespace bottleneck_distance { +namespace persistence_diagram { /** \brief Function to use in order to compute the Bottleneck distance between two persistence diagrams (see Concepts). * If the last parameter e is not 0 (default value if not explicited), you get an additive e-approximation. @@ -36,7 +36,7 @@ namespace bottleneck_distance { * \ingroup bottleneck_distance */ template<typename Persistence_diagram1, typename Persistence_diagram2> -double compute(const Persistence_diagram1 &diag1, const Persistence_diagram2 &diag2, double e=0.) { +double bottleneck_distance(const Persistence_diagram1 &diag1, const Persistence_diagram2 &diag2, double e=0.) { Persistence_graph g(diag1, diag2, e); double b = g.bottleneck_alive(); if(b == std::numeric_limits<double>::infinity()) @@ -69,7 +69,7 @@ double compute(const Persistence_diagram1 &diag1, const Persistence_diagram2 &di -} // namespace bottleneck_distance +} // namespace persistence_diagram } // namespace Gudhi diff --git a/src/Bottleneck_distance/include/gudhi/Graph_matching.h b/src/Bottleneck_distance/include/gudhi/Graph_matching.h index 10b7073a..e9f455d7 100644 --- a/src/Bottleneck_distance/include/gudhi/Graph_matching.h +++ b/src/Bottleneck_distance/include/gudhi/Graph_matching.h @@ -27,7 +27,7 @@ namespace Gudhi { -namespace bottleneck_distance { +namespace persistence_diagram { /** \internal \brief Structure representing a graph matching. The graph is a Persistence_diagrams_graph. * @@ -172,7 +172,7 @@ inline void Graph_matching::update(std::vector<int>& path) { } -} // namespace bottleneck_distance +} // namespace persistence_diagram } // namespace Gudhi diff --git a/src/Bottleneck_distance/include/gudhi/Internal_point.h b/src/Bottleneck_distance/include/gudhi/Internal_point.h index 27a59d3f..70342d0c 100644 --- a/src/Bottleneck_distance/include/gudhi/Internal_point.h +++ b/src/Bottleneck_distance/include/gudhi/Internal_point.h @@ -25,7 +25,7 @@ namespace Gudhi { -namespace bottleneck_distance { +namespace persistence_diagram { /** \internal \brief Returns the used index for encoding none of the points */ int null_point_index(); @@ -59,7 +59,7 @@ struct Construct_coord_iterator { { return p.vec+2; } }; -} // namespace bottleneck_distance +} // namespace persistence_diagram } // namespace Gudhi diff --git a/src/Bottleneck_distance/include/gudhi/Neighbors_finder.h b/src/Bottleneck_distance/include/gudhi/Neighbors_finder.h index e6acafc6..792925b7 100644 --- a/src/Bottleneck_distance/include/gudhi/Neighbors_finder.h +++ b/src/Bottleneck_distance/include/gudhi/Neighbors_finder.h @@ -38,7 +38,7 @@ namespace Gudhi { -namespace bottleneck_distance { +namespace persistence_diagram { /** \internal \brief data structure used to find any point (including projections) in V near to a query point from U * (which can be a projection). @@ -162,7 +162,7 @@ inline int Layered_neighbors_finder::vlayers_number() const { return static_cast<int>(neighbors_finder.size()); } -} // namespace bottleneck_distance +} // namespace persistence_diagram } // namespace Gudhi diff --git a/src/Bottleneck_distance/include/gudhi/Persistence_graph.h b/src/Bottleneck_distance/include/gudhi/Persistence_graph.h index f16a6c95..2ee55995 100644 --- a/src/Bottleneck_distance/include/gudhi/Persistence_graph.h +++ b/src/Bottleneck_distance/include/gudhi/Persistence_graph.h @@ -29,7 +29,7 @@ namespace Gudhi { -namespace bottleneck_distance { +namespace persistence_diagram { /** \internal \brief Structure representing an euclidean bipartite graph containing @@ -172,7 +172,7 @@ inline double Persistence_graph::diameter_bound() const { } -} // namespace bottleneck_distance +} // namespace persistence_diagram } // namespace Gudhi |