Fix: Matching C++ code to the dodgr style guide

Author: harrysroberts

src/dodgr.dll

@@ -195,48 +195,48 @@ size_t graph::identify_graph_components (vertex_map_t &v,
 
 void graph::strong_connect(vertex_id_t vt,
     vertex_map_t &v,
-    std::unordered_map<vertex_id_t, size_t> &com,
-    std::unordered_map<vertex_id_t, size_t> &index_map,
-    std::unordered_map<vertex_id_t, size_t> &lowlink_map,
-    std::unordered_set<vertex_id_t> &on_stack,
-    std::stack<vertex_id_t> &s,
+    std::unordered_map <vertex_id_t, size_t> &com,
+    std::unordered_map <vertex_id_t, size_t> &index_map,
+    std::unordered_map <vertex_id_t, size_t> &lowlink_map,
+    std::unordered_set <vertex_id_t> &on_stack,
+    std::stack <vertex_id_t> &s,
     size_t &index,
     size_t &compnum)
 {
 
-    Rcpp::checkUserInterrupt();
+    Rcpp::checkUserInterrupt ();
 
-    index_map[vt] = index;
-    lowlink_map[vt] = index;
+    index_map [vt] = index;
+    lowlink_map [vt] = index;
     index++;
-    s.push(vt);
-    on_stack.insert(vt);
+    s.push (vt);
+    on_stack.insert (vt);
 
-    vertex_t vtx = v.find(vt)->second;
-    std::unordered_set<vertex_id_t> nbs = vtx.get_out_neighbours(); // directed: outgoing only
+    vertex_t vtx = v.find (vt)->second;
+    std::unordered_set<vertex_id_t> nbs = vtx.get_out_neighbours ();
 
     for (auto nvtx : nbs)
     {
-        if (index_map.find(nvtx) == index_map.end())
+        if (index_map.find (nvtx) == index_map.end ())
         {
-            strong_connect(nvtx, v, com, index_map, lowlink_map, on_stack, s, index, compnum);
-            lowlink_map[vt] = std::min(lowlink_map[vt], lowlink_map[nvtx]);
+            strong_connect (nvtx, v, com, index_map, lowlink_map, on_stack, s, index, compnum);
+            lowlink_map [vt] = std::min (lowlink_map [vt], lowlink_map [nvtx]);
         }
-        else if (on_stack.find(nvtx) != on_stack.end())
+        else if (on_stack.find (nvtx) != on_stack.end ())
         {
-            lowlink_map[vt] = std::min(lowlink_map[vt], index_map[nvtx]);
+            lowlink_map [vt] = std::min (lowlink_map [vt], index_map [nvtx]);
         }
     }
 
-    if (lowlink_map[vt] == index_map[vt])
+    if (lowlink_map [vt] == index_map [vt])
     {
         vertex_id_t w;
         do
         {
-            w = s.top();
-            s.pop();
-            on_stack.erase(w);
-            com[w] = compnum;
+            w = s.top ();
+            s.pop ();
+            on_stack.erase (w);
+            com [w] = compnum;
         } while (w != vt);
         compnum++;
     }
@@ -254,22 +254,21 @@ void graph::strong_connect(vertex_id_t vt,
 size_t graph::identify_graph_strong_components (vertex_map_t &v,
         std::unordered_map <vertex_id_t, size_t> &com)
 {
-
     com.clear ();
 
     size_t index = 0;
     size_t compnum = 0;
 
-    std::unordered_map<vertex_id_t, size_t> index_map;
-    std::unordered_map<vertex_id_t, size_t> lowlink_map;
-    std::unordered_set<vertex_id_t> on_stack;
-    std::stack<vertex_id_t> s;
+    std::unordered_map <vertex_id_t, size_t> index_map;
+    std::unordered_map <vertex_id_t, size_t> lowlink_map;
+    std::unordered_set <vertex_id_t> on_stack;
+    std::stack <vertex_id_t> s;
 
     for (auto it : v)
     {
         vertex_id_t vt = it.first;
-        if (index_map.find(vt) == index_map.end())
-            strong_connect(vt, v, com, index_map, lowlink_map, on_stack, s, index, compnum);
+        if (index_map.find (vt) == index_map.end ())
+            strong_connect (vt, v, com, index_map, lowlink_map, on_stack, s, index, compnum);
     }
 
     long int largest_id = 0;
@@ -301,46 +300,46 @@ size_t graph::identify_graph_strong_components (vertex_map_t &v,
 //' @noRd
 // [[Rcpp::export]]
 
-Rcpp::List rcpp_get_component_vector(const Rcpp::DataFrame &graph, bool strong = false)
+Rcpp::List rcpp_get_component_vector (const Rcpp::DataFrame &graph, bool strong = false)
 {
     vertex_map_t vertices;
     edge_map_t edge_map;
     vert2edge_map_t vert2edge_map;
 
-    bool has_times = graph::graph_from_df(graph, vertices, edge_map, vert2edge_map);
+    bool has_times = graph::graph_from_df (graph, vertices, edge_map, vert2edge_map);
     has_times = false; // suppress unused variable warning
 
-    std::unordered_map<vertex_id_t, size_t> components;
+    std::unordered_map <vertex_id_t, size_t> components;
     size_t largest_component;
 
     if (strong)
-        largest_component = graph::identify_graph_strong_components(vertices, components);
+        largest_component = graph::identify_graph_strong_components (vertices, components);
     else
-        largest_component = graph::identify_graph_components(vertices, components);
+        largest_component = graph::identify_graph_components (vertices, components);
 
     largest_component++; // suppress unused variable warning
 
     // Map component numbers of vertices onto edges
-    std::unordered_map<edge_id_t, size_t> comp_nums;
+    std::unordered_map <edge_id_t, size_t> comp_nums;
     for (auto &e : edge_map)
     {
-        vertex_id_t vi = e.second.get_from_vertex();
-	comp_nums.emplace(e.first, components.find(vi)->second);
+        vertex_id_t vi = e.second.get_from_vertex ();
+        comp_nums.emplace (e.first, components.find(vi)->second);
     }
 
-    Rcpp::StringVector edge_id(comp_nums.size());
-    Rcpp::IntegerVector comp_num(comp_nums.size());
+    Rcpp::StringVector edge_id (comp_nums.size ());
+    Rcpp::IntegerVector comp_num (comp_nums.size ());
     size_t i = 0;
-    for (auto &cn : comp_nums)
+    for (auto &cn: comp_nums)
     {
-        edge_id(i) = cn.first;
-        comp_num(i) = static_cast<int>(cn.second) + 1L; // 1-indexed for R
-	i++;
+        edge_id (i) = cn.first;
+        comp_num (i) = static_cast <int> (cn.second) + 1L; // 1-indexed for R
+        i++;
     }
 
-    return Rcpp::List::create(
-        Rcpp::Named("edge_id") = edge_id,
-        Rcpp::Named("edge_component") = comp_num);
+    return Rcpp::List::create (
+            Rcpp::Named ("edge_id") = edge_id,
+            Rcpp::Named ("edge_component") = comp_num);
 }
 
 //' rcpp_unique_rownames

src/graph.cpp

@@ -150,13 +150,13 @@ size_t identify_graph_components (vertex_map_t &v,
 size_t identify_graph_strong_components (vertex_map_t &v,
         std::unordered_map <vertex_id_t, size_t> &com);
 
-void strong_connect(vertex_id_t vt,
+void strong_connect (vertex_id_t vt,
     vertex_map_t &v,
-    std::unordered_map<vertex_id_t, size_t> &com,
-    std::unordered_map<vertex_id_t, size_t> &index_map,
-    std::unordered_map<vertex_id_t, size_t> &lowlink_map,
-    std::unordered_set<vertex_id_t> &on_stack,
-    std::stack<vertex_id_t> &s,
+    std::unordered_map <vertex_id_t, size_t> &com,
+    std::unordered_map <vertex_id_t, size_t> &index_map,
+    std::unordered_map <vertex_id_t, size_t> &lowlink_map,
+    std::unordered_set <vertex_id_t> &on_stack,
+    std::stack <vertex_id_t> &s,
     size_t &index,
     size_t &compnum);