Fix cpplint

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/distance_matrix_in_rips_module@1771 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 994e3bf769d236d230ac2f7e751aa310dabb74bb

5 files changed, 14 insertions, 15 deletions

diff --git a/src/Rips_complex/example/example_one_skeleton_rips_from_distance_matrix.cpp b/src/Rips_complex/example/example_one_skeleton_rips_from_distance_matrix.cpp
index 54fa3aa1..b1ba494e 100644
--- a/src/Rips_complex/example/example_one_skeleton_rips_from_distance_matrix.cpp
+++ b/src/Rips_complex/example/example_one_skeleton_rips_from_distance_matrix.cpp
@@ -5,6 +5,7 @@
 
 #include <iostream>
 #include <string>
+#include <vector>
 #include <limits>  // for std::numeric_limits
 
 void usage(int nbArgs, char * const progName) {
@@ -38,7 +39,7 @@ int main(int argc, char **argv) {
   distances.push_back({0.77, 0.26});
   distances.push_back({0.99, 0.99, 0.28});
   distances.push_back({0.11, 0.39, 0.97, 0.30});
-  
+
   // ----------------------------------------------------------------------------
   // Init of a rips complex from points
   // ----------------------------------------------------------------------------
diff --git a/src/Rips_complex/example/example_one_skeleton_rips_from_points.cpp b/src/Rips_complex/example/example_one_skeleton_rips_from_points.cpp
index 26517876..68fc3629 100644
--- a/src/Rips_complex/example/example_one_skeleton_rips_from_points.cpp
+++ b/src/Rips_complex/example/example_one_skeleton_rips_from_points.cpp
@@ -5,6 +5,7 @@
 
 #include <iostream>
 #include <string>
+#include <vector>
 #include <limits>  // for std::numeric_limits
 
 void usage(int nbArgs, char * const progName) {
@@ -33,7 +34,7 @@ int main(int argc, char **argv) {
   points.push_back({0.0, 14.0});
   points.push_back({2.0, 19.0});
   points.push_back({9.0, 17.0});
-  
+
   // ----------------------------------------------------------------------------
   // Init of a rips complex from points
   // ----------------------------------------------------------------------------
diff --git a/src/Rips_complex/example/example_rips_complex_from_csv_distance_matrix_file.cpp b/src/Rips_complex/example/example_rips_complex_from_csv_distance_matrix_file.cpp
index cfada84a..730bfc7c 100644
--- a/src/Rips_complex/example/example_rips_complex_from_csv_distance_matrix_file.cpp
+++ b/src/Rips_complex/example/example_rips_complex_from_csv_distance_matrix_file.cpp
@@ -7,6 +7,7 @@
 
 #include <iostream>
 #include <string>
+#include <vector>
 
 void usage(int nbArgs, char * const progName) {
   std::cerr << "Error: Number of arguments (" << nbArgs << ") is not correct\n";
diff --git a/src/Rips_complex/example/example_rips_complex_from_off_file.cpp b/src/Rips_complex/example/example_rips_complex_from_off_file.cpp
index 60050cea..469de403 100644
--- a/src/Rips_complex/example/example_rips_complex_from_off_file.cpp
+++ b/src/Rips_complex/example/example_rips_complex_from_off_file.cpp
@@ -7,6 +7,7 @@
 
 #include <iostream>
 #include <string>
+#include <vector>
 
 void usage(int nbArgs, char * const progName) {
   std::cerr << "Error: Number of arguments (" << nbArgs << ") is not correct\n";
diff --git a/src/Rips_complex/include/gudhi/Rips_complex.h b/src/Rips_complex/include/gudhi/Rips_complex.h
index 63207892..f98a6993 100644
--- a/src/Rips_complex/include/gudhi/Rips_complex.h
+++ b/src/Rips_complex/include/gudhi/Rips_complex.h
@@ -64,7 +64,6 @@ class Rips_complex {
   typedef int Vertex_handle;
 
  public:
-
   /** \brief Rips_complex constructor from a list of points.
    *
    * @param[in] points Range of points.
@@ -87,7 +86,7 @@ class Rips_complex {
    */
   template<typename InputDistanceRange>
   Rips_complex(const InputDistanceRange& distance_matrix, Filtration_value threshold) {
-    compute_proximity_graph(boost::irange((size_t)0,distance_matrix.size()), threshold,
+    compute_proximity_graph(boost::irange((size_t)0, distance_matrix.size()), threshold,
                             [&](size_t i, size_t j){return distance_matrix[j][i];});
   }
 
@@ -106,7 +105,7 @@ class Rips_complex {
   bool create_complex(SimplicialComplexForRips& complex, int dim_max) {
     if (complex.num_vertices() > 0) {
       std::cerr << "Rips_complex create_complex - complex is not empty\n";
-      return false; // ----- >>
+      return false;  // ----- >>
     }
 
     // insert the proximity graph in the simplicial complex
@@ -118,7 +117,7 @@ class Rips_complex {
     return true;
   }
 
- public:
+ private:
   /** \brief Output the proximity graph of the points.
    *
    * If points contains n elements, the proximity graph is the graph 
@@ -133,20 +132,17 @@ class Rips_complex {
                Distance distance) {
     std::vector< std::pair< Vertex_handle, Vertex_handle > > edges;
     std::vector< Filtration_value > edges_fil;
-    std::map< Vertex_handle, Filtration_value > vertices;
 
     // Compute the proximity graph of the points.
     // If points contains n elements, the proximity graph is the graph with n vertices, and an edge [u,v] iff the
     // distance function between points u and v is smaller than threshold.
     // --------------------------------------------------------------------------------------------
     // Creates the vector of edges and its filtration values (returned by distance function)
-    Vertex_handle idx_u, idx_v;
-    Filtration_value fil;
-    idx_u = 0;
+    Vertex_handle idx_u = 0;
     for (auto it_u = std::begin(points); it_u != std::end(points); ++it_u) {
-      idx_v = idx_u + 1;
+      Vertex_handle idx_v = idx_u + 1;
       for (auto it_v = it_u + 1; it_v != std::end(points); ++it_v, ++idx_v) {
-        fil = distance(*it_u, *it_v);
+        Filtration_value fil = distance(*it_u, *it_v);
         if (fil <= threshold) {
           edges.emplace_back(idx_u, idx_v);
           edges_fil.push_back(fil);
@@ -172,11 +168,10 @@ class Rips_complex {
 
  private:
   Graph_t rips_skeleton_graph_;
-
 };
 
-} // namespace rips_complex
+}  // namespace rips_complex
 
-} // namespace Gudhi
+}  // namespace Gudhi
 
 #endif  // RIPS_COMPLEX_H_