cpplint fixes before merge

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

Former-commit-id: de9fc0770d273730de876a6ed54646847362bc7d

4 files changed, 53 insertions, 53 deletions

diff --git a/src/Contraction/example/Garland_heckbert.cpp b/src/Contraction/example/Garland_heckbert.cpp
index 681426e0..3ba9501b 100644
--- a/src/Contraction/example/Garland_heckbert.cpp
+++ b/src/Contraction/example/Garland_heckbert.cpp
@@ -145,13 +145,14 @@ class GH_visitor : public Gudhi::contraction::Contraction_visitor<EdgeProfile> {
 
 int main(int argc, char *argv[]) {
   if (argc != 4) {
-    std::cerr << "Usage " << argv[0] << " input.off output.off N to load the file input.off, contract N edges and save the result to output.off.\n";
+    std::cerr << "Usage " << argv[0] <<
+        " input.off output.off N to load the file input.off, contract N edges and save the result to output.off.\n";
     return EXIT_FAILURE;
   }
 
   Complex complex;
   typedef typename Complex::Vertex_handle Vertex_handle;
-  
+
   // load the points
   Skeleton_blocker_off_reader<Complex> off_reader(argv[1], complex);
   if (!off_reader.is_valid()) {
@@ -159,9 +160,9 @@ int main(int argc, char *argv[]) {
     return EXIT_FAILURE;
   }
 
-  if(!complex.empty() && !complex.point(Vertex_handle(0)).dimension()==3) {
+  if (!complex.empty() && !(complex.point(Vertex_handle(0)).dimension() == 3)) {
     std::cerr << "Only points of dimension 3 are supported." << std::endl;
-    return EXIT_FAILURE; 
+    return EXIT_FAILURE;
   }
 
   std::cout << "Load complex with " << complex.num_vertices() << " vertices" << std::endl;
@@ -175,8 +176,7 @@ int main(int argc, char *argv[]) {
                                 new GH_cost(complex),
                                 new GH_placement(complex),
                                 contraction::make_link_valid_contraction<EdgeProfile>(),
-                                new GH_visitor(complex)
-                                );
+                                new GH_visitor(complex));
 
   std::cout << "Contract " << num_contractions << " edges" << std::endl;
   contractor.contract_edges(num_contractions);
@@ -186,7 +186,7 @@ int main(int argc, char *argv[]) {
       complex.num_edges() << " edges and " <<
       complex.num_triangles() << " triangles." << std::endl;
 
-  //write simplified complex
+  // write simplified complex
   Skeleton_blocker_off_writer<Complex> off_writer(argv[2], complex);
 
   return EXIT_SUCCESS;
diff --git a/src/Skeleton_blocker/example/Skeleton_blocker_link.cpp b/src/Skeleton_blocker/example/Skeleton_blocker_link.cpp
index 5e429728..698a8106 100644
--- a/src/Skeleton_blocker/example/Skeleton_blocker_link.cpp
+++ b/src/Skeleton_blocker/example/Skeleton_blocker_link.cpp
@@ -39,7 +39,7 @@ typedef Complex::Simplex Simplex;
 
 int main(int argc, char *argv[]) {
   // build a full complex with 4 vertices and 2^4-1 simplices
-  
+
   // Create a complex with four vertices (0,1,2,3)
   Complex complex;
 
@@ -64,7 +64,8 @@ int main(int argc, char *argv[]) {
   // To access to the initial vertices eg (0,1,2,3,4),  Root_vertex_handle must be used.
   // For instance, to test if the link contains the vertex that was labeled i:
   for (int i = 0; i < 5; ++i)
-    cout << "link.contains_vertex(Root_vertex_handle(" << i << ")):" << link.contains_vertex(Root_vertex_handle(i)) << endl;
+    cout << "link.contains_vertex(Root_vertex_handle(" << i << ")):" <<
+        link.contains_vertex(Root_vertex_handle(i)) << endl;
 
   return EXIT_SUCCESS;
 }
diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_complex.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_complex.h
index cf156a58..6612722e 100644
--- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_complex.h
+++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_complex.h
@@ -23,18 +23,6 @@
 #ifndef SKELETON_BLOCKER_COMPLEX_H_
 #define SKELETON_BLOCKER_COMPLEX_H_
 
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include <memory>
-#include <map>
-#include <list>
-#include <set>
-#include <vector>
-#include <string>
-#include <algorithm>
-#include <utility>
-
 #include <gudhi/Skeleton_blocker/iterators/Skeleton_blockers_iterators.h>
 #include <gudhi/Skeleton_blocker_link_complex.h>
 #include <gudhi/Skeleton_blocker/Skeleton_blocker_link_superior.h>
@@ -50,6 +38,18 @@
 #include <boost/iterator/transform_iterator.hpp>
 #include <boost/range/adaptor/map.hpp>
 
+#include <iostream>
+#include <fstream>
+#include <sstream>
+#include <memory>
+#include <map>
+#include <list>
+#include <set>
+#include <vector>
+#include <string>
+#include <algorithm>
+#include <utility>
+
 namespace Gudhi {
 
 namespace skbl {
@@ -550,13 +550,13 @@ class Skeleton_blocker_complex {
    * the edges 01, 12, 20 but not the triangle 012 (and hence this complex
    * will contains a blocker 012).
    */
-  Edge_handle add_edge(Vertex_handle a, Vertex_handle b) {    
-    //if the edge is already there we musnt go further
-    //as we may add blockers that should not be here
-    if(contains_edge(a,b)) 
-      return *((*this)[std::make_pair(a,b)]);
-    auto res = add_edge_without_blockers(a,b);
-    add_blockers_after_simplex_insertion(Simplex(a,b));
+  Edge_handle add_edge(Vertex_handle a, Vertex_handle b) {
+    // if the edge is already there we musnt go further
+    // as we may add blockers that should not be here
+    if (contains_edge(a, b))
+      return *((*this)[std::make_pair(a, b)]);
+    auto res = add_edge_without_blockers(a, b);
+    add_blockers_after_simplex_insertion(Simplex(a, b));
     return res;
   }
 
@@ -564,9 +564,9 @@ class Skeleton_blocker_complex {
    * @brief Adds all edges of s in the complex.
    */
   void add_edge(const Simplex& s) {
-    for(auto i = s.begin(); i != s.end(); ++i)
-      for(auto j = i; ++j != s.end(); /**/)
-        add_edge(*i,*j);
+    for (auto i = s.begin(); i != s.end(); ++i)
+      for (auto j = i; ++j != s.end(); /**/)
+        add_edge(*i, *j);
   }
 
   /**
@@ -596,9 +596,9 @@ class Skeleton_blocker_complex {
    * @brief Adds all edges of s in the complex without adding blockers.
    */
   void add_edge_without_blockers(Simplex s) {
-    for(auto i = s.begin(); i != s.end(); ++i){
-      for(auto j = i; ++j != s.end(); /**/)
-        add_edge_without_blockers(*i,*j);
+    for (auto i = s.begin(); i != s.end(); ++i) {
+      for (auto j = i; ++j != s.end(); /**/)
+        add_edge_without_blockers(*i, *j);
     }
   }
 
@@ -1014,10 +1014,10 @@ class Skeleton_blocker_complex {
    * @brief returns the number of simplices of a given dimension in the complex.
    */  
   size_t num_simplices(unsigned dimension) const {
-    //todo iterator on k-simplices
+    // TODO(DS): iterator on k-simplices
     size_t res = 0;
-    for(const auto& s: complex_simplex_range()) 
-      if(s.dimension() == dimension) 
+    for (const auto& s : complex_simplex_range())
+      if (s.dimension() == dimension)
         ++res;
     return res;
   }
@@ -1585,7 +1585,7 @@ class Skeleton_blocker_complex {
 template<typename Complex, typename SimplexHandleIterator>
 Complex make_complex_from_top_faces(SimplexHandleIterator simplices_begin, SimplexHandleIterator simplices_end,
                                     bool is_flag_complex = false) {
-  //todo use add_simplex instead! should be more efficient and more elegant :)
+  // TODO(DS): use add_simplex instead! should be more efficient and more elegant :)
   typedef typename Complex::Simplex Simplex;
   std::vector<Simplex> simplices;
   for (auto top_face = simplices_begin; top_face != simplices_end; ++top_face) {
diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h
index 1b7d58ff..94a125c1 100644
--- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h
+++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h
@@ -218,7 +218,7 @@ void Skeleton_blocker_complex<SkeletonBlockerDS>::add_simplex(const Simplex& sig
       this->add_vertex();
   }
   assert(contains_vertices(sigma));
-  if(!contains_edges(sigma))
+  if (!contains_edges(sigma))
     add_edge(sigma);
   remove_blocker_include_in_simplex(sigma);
   add_blockers_after_simplex_insertion(sigma);
@@ -227,10 +227,10 @@ void Skeleton_blocker_complex<SkeletonBlockerDS>::add_simplex(const Simplex& sig
 
 
 template<typename SkeletonBlockerDS>
-void Skeleton_blocker_complex<SkeletonBlockerDS>::add_blockers_after_simplex_insertion(Simplex sigma){
-  if(sigma.dimension() < 1) return;
+void Skeleton_blocker_complex<SkeletonBlockerDS>::add_blockers_after_simplex_insertion(Simplex sigma) {
+  if (sigma.dimension() < 1) return;
 
-  for(auto s : coboundary_range(sigma)) {
+  for (auto s : coboundary_range(sigma)) {
     this->add_blocker(s);
   }
 }
@@ -254,10 +254,10 @@ void Skeleton_blocker_complex<SkeletonBlockerDS>::remove_blocker_containing_simp
  */
 template<typename SkeletonBlockerDS>
 void Skeleton_blocker_complex<SkeletonBlockerDS>::remove_blocker_include_in_simplex(const Simplex& sigma) {
-  //todo write efficiently by using only superior blockers
-  //eg for all s, check blockers whose vertices are all greater than s
+  // TODO(DS): write efficiently by using only superior blockers
+  // eg for all s, check blockers whose vertices are all greater than s
   std::set <Blocker_handle> blockers_to_remove;
-  for(auto s : sigma) {
+  for (auto s : sigma) {
     for (auto blocker : this->blocker_range(s)) {
       if (sigma.contains(*blocker))
         blockers_to_remove.insert(blocker);
@@ -266,11 +266,11 @@ void Skeleton_blocker_complex<SkeletonBlockerDS>::remove_blocker_include_in_simp
   for (auto blocker_to_update : blockers_to_remove) {
     auto s = *blocker_to_update;
     this->delete_blocker(blocker_to_update);
-    //now if there is a vertex v in the link of s 
-    //and v is not included in sigma then v.s is a blocker
-    //(all faces of v.s are there since v belongs to the link of s)
-    for(const auto& b : coboundary_range(s))
-      if(!sigma.contains(b)) 
+    // now if there is a vertex v in the link of s
+    // and v is not included in sigma then v.s is a blocker
+    // (all faces of v.s are there since v belongs to the link of s)
+    for (const auto& b : coboundary_range(s))
+      if (!sigma.contains(b))
         this->add_blocker(b);
   }
 }
@@ -384,9 +384,8 @@ Skeleton_blocker_complex<SkeletonBlockerDS>::contract_edge(Vertex_handle a, Vert
 }
 
 template<typename SkeletonBlockerDS>
-void
-Skeleton_blocker_complex<SkeletonBlockerDS>::get_blockers_to_be_added_after_contraction(Vertex_handle a, Vertex_handle b, 
-    std::set<Simplex>& blockers_to_add) {
+void Skeleton_blocker_complex<SkeletonBlockerDS>::get_blockers_to_be_added_after_contraction(Vertex_handle a,
+    Vertex_handle b, std::set<Simplex>& blockers_to_add) {
   blockers_to_add.clear();
 
   typedef Skeleton_blocker_link_complex<Skeleton_blocker_complex<SkeletonBlockerDS> > LinkComplexType;