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

1 files changed, 32 insertions, 5 deletions

diff --git a/src/Bottleneck_distance/concept/Persistence_diagram.h b/src/Bottleneck_distance/concept/Persistence_diagram.h
index bd90cc11..4c69343c 100644
--- a/src/Bottleneck_distance/concept/Persistence_diagram.h
+++ b/src/Bottleneck_distance/concept/Persistence_diagram.h
@@ -1,6 +1,31 @@
+/*    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):       François Godi
+ *
+ *    Copyright (C) 2016  INRIA
+ *
+ *    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 CONCEPT_BOTTLENECK_DISTANCE_PERSISTENCE_DIAGRAM_H_
+#define CONCEPT_BOTTLENECK_DISTANCE_PERSISTENCE_DIAGRAM_H_
+
 namespace Gudhi {
-namespace Bottleneck_distance {
-namespace Concept {
+
+namespace bottleneck_distance {
 
 /** \brief Concept of persistence diagram point. The double first is the birth of the component and the double second is the death of the component.
  *
@@ -21,6 +46,8 @@ struct Persistence_Diagram
     const_iterator<Diagram_point> cend() const;
 };
 
-} //namespace Concept
-} //namespace Bottleneck_distance
-} //namespace Gudhi
+}  // namespace bottleneck_distance
+
+}  // namespace Gudhi
+
+#endif  // CONCEPT_BOTTLENECK_DISTANCE_PERSISTENCE_DIAGRAM_H_