From 7a701f8a2326268b2aadb369fbc0848b227078a1 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Tue, 27 Sep 2016 08:53:57 +0000 Subject: Fix naming conventions and cpplint Add Bottleneck_distance to GUDHI_MODULES in GUDHI_user_version_target.txt git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bottleneck_integration@1569 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: b96a2be25477ddf227e43d9941989f93a0f626bb --- src/Bottleneck_distance/include/gudhi/CGAL/Miscellaneous.h | 2 +- src/Bottleneck_distance/include/gudhi/Graph_matching.h | 10 +++++----- src/Bottleneck_distance/include/gudhi/Internal_point.h | 10 +++++----- src/Bottleneck_distance/include/gudhi/Neighbors_finder.h | 10 +++++----- .../include/gudhi/Persistence_diagrams_graph.h | 10 +++++----- .../include/gudhi/Planar_neighbors_finder.h | 10 +++++----- 6 files changed, 26 insertions(+), 26 deletions(-) (limited to 'src/Bottleneck_distance/include') diff --git a/src/Bottleneck_distance/include/gudhi/CGAL/Miscellaneous.h b/src/Bottleneck_distance/include/gudhi/CGAL/Miscellaneous.h index 21be0bc7..91632149 100644 --- a/src/Bottleneck_distance/include/gudhi/CGAL/Miscellaneous.h +++ b/src/Bottleneck_distance/include/gudhi/CGAL/Miscellaneous.h @@ -27,7 +27,7 @@ namespace CGAL { -typedef Gudhi::Bottleneck_distance::Internal_point Internal_point; +typedef Gudhi::bottleneck_distance::Internal_point Internal_point; template <> struct Kernel_traits { diff --git a/src/Bottleneck_distance/include/gudhi/Graph_matching.h b/src/Bottleneck_distance/include/gudhi/Graph_matching.h index 7a8c8ee0..5f579a0c 100644 --- a/src/Bottleneck_distance/include/gudhi/Graph_matching.h +++ b/src/Bottleneck_distance/include/gudhi/Graph_matching.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef SRC_BOTTLENECK_INCLUDE_GUDHI_GRAPH_MATCHING_H_ -#define SRC_BOTTLENECK_INCLUDE_GUDHI_GRAPH_MATCHING_H_ +#ifndef GRAPH_MATCHING_H_ +#define GRAPH_MATCHING_H_ #include @@ -29,7 +29,7 @@ namespace Gudhi { -namespace Bottleneck_distance { +namespace bottleneck_distance { /** \brief Function to use in order to compute the Bottleneck distance between two persistence diagrams. You get an additive e-approximation. * @@ -238,11 +238,11 @@ double compute(const Persistence_diagram1 &diag1, const Persistence_diagram2 &di -} // namespace Bottleneck_distance +} // namespace bottleneck_distance } // namespace Gudhi -#endif // SRC_BOTTLENECK_INCLUDE_GUDHI_GRAPH_MATCHING_H_ +#endif // GRAPH_MATCHING_H_ /* Dichotomic version template diff --git a/src/Bottleneck_distance/include/gudhi/Internal_point.h b/src/Bottleneck_distance/include/gudhi/Internal_point.h index 2080900d..f05d5fc9 100644 --- a/src/Bottleneck_distance/include/gudhi/Internal_point.h +++ b/src/Bottleneck_distance/include/gudhi/Internal_point.h @@ -20,12 +20,12 @@ * along with this program. If not, see . */ -#ifndef SRC_BOTTLENECK_INCLUDE_GUDHI_INTERNAL_POINT_H_ -#define SRC_BOTTLENECK_INCLUDE_GUDHI_INTERNAL_POINT_H_ +#ifndef INTERNAL_POINT_H_ +#define INTERNAL_POINT_H_ namespace Gudhi { -namespace Bottleneck_distance { +namespace bottleneck_distance { /** \internal \brief Returns the used index for encoding none of the points */ int null_point_index(); @@ -67,8 +67,8 @@ inline int null_point_index() { return -1; } -} // namespace Bottleneck_distance +} // namespace bottleneck_distance } // namespace Gudhi -#endif // SRC_BOTTLENECK_INCLUDE_GUDHI_INTERNAL_POINT_H_ +#endif // INTERNAL_POINT_H_ diff --git a/src/Bottleneck_distance/include/gudhi/Neighbors_finder.h b/src/Bottleneck_distance/include/gudhi/Neighbors_finder.h index 7ad79126..1bd5879c 100644 --- a/src/Bottleneck_distance/include/gudhi/Neighbors_finder.h +++ b/src/Bottleneck_distance/include/gudhi/Neighbors_finder.h @@ -20,15 +20,15 @@ * along with this program. If not, see . */ -#ifndef SRC_BOTTLENECK_INCLUDE_GUDHI_NEIGHBORS_FINDER_H_ -#define SRC_BOTTLENECK_INCLUDE_GUDHI_NEIGHBORS_FINDER_H_ +#ifndef NEIGHBORS_FINDER_H_ +#define NEIGHBORS_FINDER_H_ #include #include namespace Gudhi { -namespace Bottleneck_distance { +namespace bottleneck_distance { /** \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). @@ -147,8 +147,8 @@ inline int Layered_neighbors_finder::vlayers_number() const { return static_cast(neighbors_finder.size()); } -} // namespace Bottleneck_distance +} // namespace bottleneck_distance } // namespace Gudhi -#endif // SRC_BOTTLENECK_INCLUDE_GUDHI_NEIGHBORS_FINDER_H_ +#endif // NEIGHBORS_FINDER_H_ diff --git a/src/Bottleneck_distance/include/gudhi/Persistence_diagrams_graph.h b/src/Bottleneck_distance/include/gudhi/Persistence_diagrams_graph.h index e31b2dae..1f6d6683 100644 --- a/src/Bottleneck_distance/include/gudhi/Persistence_diagrams_graph.h +++ b/src/Bottleneck_distance/include/gudhi/Persistence_diagrams_graph.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef SRC_BOTTLENECK_INCLUDE_GUDHI_PERSISTENCE_DIAGRAMS_GRAPH_H_ -#define SRC_BOTTLENECK_INCLUDE_GUDHI_PERSISTENCE_DIAGRAMS_GRAPH_H_ +#ifndef PERSISTENCE_DIAGRAMS_GRAPH_H_ +#define PERSISTENCE_DIAGRAMS_GRAPH_H_ #include #include @@ -34,7 +34,7 @@ namespace Gudhi { -namespace Bottleneck_distance { +namespace bottleneck_distance { /** \internal \brief Structure representing an euclidean bipartite graph containing @@ -162,8 +162,8 @@ inline double G::diameter() { return max; } -} // namespace Bottleneck_distance +} // namespace bottleneck_distance } // namespace Gudhi -#endif // SRC_BOTTLENECK_INCLUDE_GUDHI_PERSISTENCE_DIAGRAMS_GRAPH_H_ +#endif // PERSISTENCE_DIAGRAMS_GRAPH_H_ diff --git a/src/Bottleneck_distance/include/gudhi/Planar_neighbors_finder.h b/src/Bottleneck_distance/include/gudhi/Planar_neighbors_finder.h index 30f7dc3c..bf70ed0b 100644 --- a/src/Bottleneck_distance/include/gudhi/Planar_neighbors_finder.h +++ b/src/Bottleneck_distance/include/gudhi/Planar_neighbors_finder.h @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#ifndef SRC_BOTTLENECK_INCLUDE_GUDHI_PLANAR_NEIGHBORS_FINDER_H_ -#define SRC_BOTTLENECK_INCLUDE_GUDHI_PLANAR_NEIGHBORS_FINDER_H_ +#ifndef PLANAR_NEIGHBORS_FINDER_H_ +#define PLANAR_NEIGHBORS_FINDER_H_ #include #include @@ -40,7 +40,7 @@ namespace Gudhi { -namespace Bottleneck_distance { +namespace bottleneck_distance { /** \internal \brief Structure used to find any point in V near (according to the planar distance) to a query point from U. * @@ -217,8 +217,8 @@ inline std::shared_ptr< std::list > Cgal_pnf::pull_all_near(int u_point_ind } -} // namespace Bottleneck_distance +} // namespace bottleneck_distance } // namespace Gudhi -#endif // SRC_BOTTLENECK_INCLUDE_GUDHI_PLANAR_NEIGHBORS_FINDER_H_ +#endif // PLANAR_NEIGHBORS_FINDER_H_ -- cgit v1.2.3