cpplint/cppcheck fixes

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

Former-commit-id: 4dc15b3ab0eecb8d4f5bbb1ac1cb9dabf95233e4

2 files changed, 5 insertions, 7 deletions

diff --git a/src/Witness_complex/include/gudhi/Landmark_choice_by_random_point.h b/src/Witness_complex/include/gudhi/Landmark_choice_by_random_point.h
index 215c9e65..4747dd73 100644
--- a/src/Witness_complex/include/gudhi/Landmark_choice_by_random_point.h
+++ b/src/Witness_complex/include/gudhi/Landmark_choice_by_random_point.h
@@ -76,7 +76,7 @@ class Landmark_choice_by_random_point {
       std::set<int>::iterator landmarks_it;
       int landmarks_i = 0;
       for (landmarks_it = landmarks.begin(), landmarks_i = 0; landmarks_it != landmarks.end();
-           landmarks_it++, landmarks_i++) {
+           ++landmarks_it, landmarks_i++) {
         dist_i dist = std::make_pair(euclidean_distance(points[points_i], points[*landmarks_it]), landmarks_i);
         l_heap.push(dist);
       }
diff --git a/src/Witness_complex/include/gudhi/Witness_complex.h b/src/Witness_complex/include/gudhi/Witness_complex.h
index 27f7a9c0..34cbc882 100644
--- a/src/Witness_complex/include/gudhi/Witness_complex.h
+++ b/src/Witness_complex/include/gudhi/Witness_complex.h
@@ -82,7 +82,6 @@ class Witness_complex {
 
  private:
   int nbL;  // Number of landmarks
-  double density;  // Desired density
   Simplicial_complex& sc;  // Simplicial complex
 
  public:
@@ -116,8 +115,6 @@ class Witness_complex {
     // Construction of the active witness list
     int nbW = knn.size();
     typeVectorVertex vv;
-    typeSimplex simplex;
-    typePairSimplexBool returnValue;
     int counter = 0;
     /* The list of still useful witnesses
      * it will diminuish in the course of iterations
@@ -128,7 +125,7 @@ class Witness_complex {
       // by doing it we don't assume that landmarks are necessarily witnesses themselves anymore
       counter++;
       vv = {i};
-      returnValue = sc.insert_simplex(vv);
+      sc.insert_simplex(vv);
       // TODO(SK) Error if not inserted : normally no need here though
     }
     int k = 1; /* current dimension in iterative construction */
@@ -145,7 +142,8 @@ class Witness_complex {
         if (ok) {
           for (int i = 0; i != k + 1; ++i)
             simplex_vector.push_back(knn[*it][i]);
-          returnValue = sc.insert_simplex(simplex_vector, 0.0);
+          sc.insert_simplex(simplex_vector, 0.0);
+          // TODO(SK) Error if not inserted : normally no need here though
           it++;
         } else {
           active_w.erase(it++);  // First increase the iterator and then erase the previous element
@@ -183,7 +181,7 @@ class Witness_complex {
   }
 
   template <typename T>
-  void print_vector(const std::vector<T> v) {
+  static void print_vector(const std::vector<T>& v) {
     std::cout << "[";
     if (!v.empty()) {
       std::cout << *(v.begin());