summaryrefslogtreecommitdiff
path: root/src/Bottleneck_distance/include/gudhi/Graph_matching.h
diff options
context:
space:
mode:
authorvrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2016-09-27 08:53:57 +0000
committervrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2016-09-27 08:53:57 +0000
commit7a701f8a2326268b2aadb369fbc0848b227078a1 (patch)
treef5d17d492a5e5e1a61c6eae785beee08506e0637 /src/Bottleneck_distance/include/gudhi/Graph_matching.h
parent2f0d4a7a06f8fde904b75b27c3836e362f549707 (diff)
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
Diffstat (limited to 'src/Bottleneck_distance/include/gudhi/Graph_matching.h')
-rw-r--r--src/Bottleneck_distance/include/gudhi/Graph_matching.h10
1 files changed, 5 insertions, 5 deletions
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 <http://www.gnu.org/licenses/>.
*/
-#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 <deque>
@@ -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<typename Persistence_diagram1, typename Persistence_diagram2>