From c6c91153dde643af2c5b9c78a1b1b9b65349c292 Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Mon, 16 Nov 2015 10:09:38 +0000
Subject: 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
---
 .../include/gudhi/Skeleton_blocker_complex.h       | 58 +++++++++++-----------
 1 file changed, 29 insertions(+), 29 deletions(-)

(limited to 'src/Skeleton_blocker/include/gudhi/Skeleton_blocker_complex.h')

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) {
-- 
cgit v1.2.3