Clang-tidy google-readability-braces-around-statements and other enhancements

.clang-tidy

@@ -1,6 +1,5 @@
 Checks: >
     google-*,
-    -google-readability-braces-around-statements,
     -google-readability-casting,
     clang-analyzer-*,
     clang-diagnostic-*,

include/astar/astar.hpp

@@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <boost/graph/astar_search.hpp>
 
 #include "visitors/astar_visitors.hpp"
-#include "cpp_common/basePath_SSEC.hpp"
+#include "cpp_common/path.hpp"
 #include "cpp_common/base_graph.hpp"
 #include "cpp_common/interruption.hpp"
 #include "c_types/ii_t_rt.h"

include/bdAstar/bdAstar.hpp

@@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <cstdint>
 
 #include "cpp_common/bidirectional.hpp"
-#include "cpp_common/basePath_SSEC.hpp"
+#include "cpp_common/path.hpp"
 
 namespace pgrouting {
 

include/bdDijkstra/bdDijkstra.hpp

@@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
 #include "cpp_common/bidirectional.hpp"
-#include "cpp_common/basePath_SSEC.hpp"
+#include "cpp_common/path.hpp"
 
 
 namespace pgrouting {

include/bellman_ford/bellman_ford.hpp

@@ -44,7 +44,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/bellman_ford_shortest_paths.hpp>
 #include "cpp_common/messages.hpp"
-#include "cpp_common/basePath_SSEC.hpp"
+#include "cpp_common/path.hpp"
 #include "cpp_common/base_graph.hpp"
 #include "cpp_common/interruption.hpp"
 #include "c_types/ii_t_rt.h"

include/bellman_ford/edwardMoore.hpp

@@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <map>
 #include <cstdint>
 
-#include "cpp_common/basePath_SSEC.hpp"
+#include "cpp_common/path.hpp"
 #include "cpp_common/base_graph.hpp"
 #include "cpp_common/interruption.hpp"
 

include/breadthFirstSearch/binaryBreadthFirstSearch.hpp

@@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <map>
 #include <cstdint>
 
-#include "cpp_common/basePath_SSEC.hpp"
+#include "cpp_common/path.hpp"
 #include "cpp_common/base_graph.hpp"
 #include "cpp_common/assert.hpp"
 

include/chinese/chinesePostman.hpp

@@ -187,10 +187,12 @@ PgrDirectedChPPGraph::PgrDirectedChPPGraph(const std::vector<Edge_t> &dataEdges)
         edge.cost = 0.0;
         edge.capacity = std::abs(d);
         edge.edge_id = 0;
-        if (d > 0)
+        if (d > 0) {
             edge.source = p, edge.target = superTarget;
-        if (d < 0)
+        }
+        if (d < 0) {
             edge.source = superSource, edge.target = p;
+        }
         edges.push_back(edge);
     }
 

include/circuits/hawickcircuits.hpp

@@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/hawick_circuits.hpp>
 
-#include "cpp_common/basePath_SSEC.hpp"
+#include "cpp_common/path.hpp"
 #include "cpp_common/base_graph.hpp"
 #include "cpp_common/interruption.hpp"
 #include "cpp_common/assert.hpp"

include/cpp_common/bidirectional.hpp

@@ -49,7 +49,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include "cpp_common/assert.hpp"
 
-#include "cpp_common/basePath_SSEC.hpp"
+#include "cpp_common/path.hpp"
 #include "cpp_common/base_graph.hpp"
 
 

include/cpp_common/combinations.hpp

@@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
 #include "c_types/ii_t_rt.h"
-#include "cpp_common/basePath_SSEC.hpp"
+#include "cpp_common/path.hpp"
 #include "cpp_common/rule.hpp"
 
 

include/cpp_common/compPaths.hpp

@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #define INCLUDE_CPP_COMMON_COMPPATHS_HPP_
 #pragma once
 
-#include "cpp_common/basePath_SSEC.hpp"
+#include "cpp_common/path.hpp"
 
 namespace pgrouting {
 

include/cpp_common/basePath_SSEC.hpp → include/cpp_common/path.hpp

@@ -1,5 +1,5 @@
 /*PGR-GNU*****************************************************************
-File: basePath_SSEC.hpp
+File: path.hpp
 
 Copyright (c) 2015 pgRouting developers
 Mail: [email protected]

include/cpp_common/to_postgres.hpp

@@ -31,13 +31,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include "c_types/contractionHierarchies_rt.h"
 #include "c_types/iid_t_rt.h"
+#include "c_types/routes_t.h"
 
+#include "cpp_common/path.hpp"
 #include "cpp_common/base_graph.hpp"
 #include "cpp_common/alloc.hpp"
 #include "cpp_common/identifiers.hpp"
 
 
 namespace pgrouting {
+namespace to_postgres {
 namespace detail {
 
 /** @brief Count results that are going to be passed to postgres
@@ -68,8 +71,6 @@ count_rows(
 
 }  // namespace detail
 
-namespace to_postgres {
-
 /** @brief Stored results on a vector are saved on a C array
  *
  * @param[in] graph Created graph with the base Graph
@@ -203,6 +204,11 @@ void graph_to_tuple(
     }
 }
 
+/*
+ * @brief Via Routes save on a C array
+ */
+size_t get_viaRoute(std::deque<pgrouting::Path>&, Routes_t**);
+
 }  // namespace to_postgres
 }  // namespace pgrouting
 

include/dagShortestPath/dagShortestPath.hpp

@@ -44,7 +44,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/dag_shortest_paths.hpp>
 
-#include "cpp_common/basePath_SSEC.hpp"
+#include "cpp_common/path.hpp"
 #include "cpp_common/base_graph.hpp"
 #include "cpp_common/interruption.hpp"
 

include/dijkstra/dijkstra.hpp

@@ -51,7 +51,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <boost/graph/dijkstra_shortest_paths.hpp>
 
 #include "c_types/ii_t_rt.h"
-#include "cpp_common/basePath_SSEC.hpp"
+#include "cpp_common/path.hpp"
 #include "cpp_common/base_graph.hpp"
 #include "cpp_common/interruption.hpp"
 #include "visitors/dijkstra_visitors.hpp"

include/dijkstra/drivingDist.hpp

@@ -51,7 +51,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/dijkstra_shortest_paths.hpp>
 
-#include "cpp_common/basePath_SSEC.hpp"
+#include "cpp_common/path.hpp"
 #include "cpp_common/base_graph.hpp"
 #include "cpp_common/interruption.hpp"
 #include "visitors/dijkstra_visitors.hpp"
@@ -405,8 +405,9 @@ std::deque<pgrouting::Path> drivingDistance_with_equicost(
      */
     for (const auto &root : roots) {
         for (auto &p : pred) {
-            if (!p.empty() && graph.has_vertex(root))
+            if (!p.empty() && graph.has_vertex(root)) {
                 p[graph.get_V(root)] = graph.get_V(root);
+            }
         }
     }
 

include/max_flow/minCostMaxFlow.hpp

@@ -88,9 +88,7 @@ class PgrCostFlowGraph {
      }
 
      int64_t GetEdgeId(E e) const {
-         if (eToId.find(e) == eToId.end())
-             return -1;
-         return eToId.at(e);
+         return eToId.find(e) == eToId.end()? -1 : eToId.at(e);
      }
 
      void SetSupersource(

include/mincut/stoerWagner.hpp

@@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <functional>
 #include <limits>
 
-#include "cpp_common/basePath_SSEC.hpp"
+#include "cpp_common/path.hpp"
 #include <boost/config.hpp>
 #include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/graph_traits.hpp>

include/spanningTree/mst.hpp

@@ -362,8 +362,9 @@ class Pgr_mst {
 
      bool no_neg_costs(const G &graph) {
          E_i  ei, ei_end;
-         for (boost::tie(ei, ei_end) = edges(graph.graph); ei != ei_end; ++ei)
+         for (boost::tie(ei, ei_end) = edges(graph.graph); ei != ei_end; ++ei) {
              pgassert(graph[*ei].cost > 0);
+         }
          return true;
      }
 };

include/spanningTree/pgr_randomSpanningTree.hpp

@@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <boost/random/random_number_generator.hpp>
 #include <boost/graph/graph_traits.hpp>
 
-#include "cpp_common/basePath_SSEC.hpp"
+#include "cpp_common/path.hpp"
 #include "cpp_common/pgr_base_graph.hpp"
 #include "cpp_common/interruption.hpp"
 

include/topologicalSort/topologicalSort.hpp

@@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <boost/typeof/typeof.hpp>
 #include <boost/graph/topological_sort.hpp>
 
-#include "cpp_common/basePath_SSEC.hpp"
+#include "cpp_common/path.hpp"
 #include "cpp_common/base_graph.hpp"
 #include "cpp_common/interruption.hpp"
 #include "c_types//i_rt.h"

include/trsp/trspHandler.hpp

@@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <cstdint>
 
 
-#include "cpp_common/basePath_SSEC.hpp"
+#include "cpp_common/path.hpp"
 #include "trsp/edgeInfo.hpp"
 #include "cpp_common/rule.hpp"
 #include "cpp_common/messages.hpp"

include/visitors/dfs_visitor.hpp

@@ -68,8 +68,9 @@ class Dfs_visitor : public boost::default_dfs_visitor {
          void examine_edge(E e, const B_G&) {
              auto source = m_graph.source(e), target = m_graph.target(e);
              // If the target has not been visited before
-             if (m_depth[target] == 0 && target != m_roots)
+             if (m_depth[target] == 0 && target != m_roots) {
                  m_depth[target] = m_depth[source] + 1;
+             }
 
              // If the max_depth is reached, mark the target as visited, and push the corresponding edge
              if (m_depth[target] == m_max_depth && m_colors[target] != 4) {

include/withPoints/withPoints.hpp

@@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include "cpp_common/point_on_edge_t.hpp"
 #include "cpp_common/messages.hpp"
-#include "cpp_common/basePath_SSEC.hpp"
+#include "cpp_common/path.hpp"
 
 namespace pgrouting {
 

include/yen/ksp.hpp

@@ -47,7 +47,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include "cpp_common/assert.hpp"
 #include "cpp_common/compPaths.hpp"
 #include "cpp_common/messages.hpp"
-#include "cpp_common/basePath_SSEC.hpp"
+#include "cpp_common/path.hpp"
 
 namespace pgrouting {
 namespace yen {

include/yen/turnRestrictedPath.hpp

@@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include "yen/ksp.hpp"
 #include "cpp_common/assert.hpp"
-#include "cpp_common/basePath_SSEC.hpp"
+#include "cpp_common/path.hpp"
 #include "cpp_common/compPaths.hpp"
 #include "cpp_common/messages.hpp"
 #include "cpp_common/rule.hpp"

pgtap/traversal/binaryBreadthFirstSearch/edge_cases/edge_cases.pg

@@ -80,10 +80,18 @@ FROM pgr_binaryBreadthFirstSearch(
 );
 
 
-SELECT throws_ok('errorTestManyWeights',
+SELECT
+  CASE WHEN min_lib_version('4.0.0') THEN
+    throws_ok('errorTestManyWeights',
     'XX000',
     'Graph Condition Failed: Graph should have at most two distinct non-negative edge costs! If there are exactly two distinct edge costs, one of them must equal zero!',
-    '17: Graph has more than 2 distinct weights');
+      '17: Graph has more than 2 distinct weights')
+  ELSE
+  throws_ok('errorTestManyWeights',
+    'XX000',
+    'Graph Condition Failed: Graph should have atmost two distinct non-negative edge costs! If there are exactly two distinct edge costs, one of them must equal zero!',
+      '17: Graph has more than 2 distinct weights')
+  END;
 
 SELECT * INTO edges_invalid_2 FROM edges;
 UPDATE edges_invalid_2 SET cost = 2 WHERE cost = 0;
@@ -98,10 +106,18 @@ FROM pgr_binaryBreadthFirstSearch(
 );
 
 
-SELECT throws_ok('errorTestNoZeroWeight',
+SELECT
+  CASE WHEN min_lib_version('4.0.0') THEN
+     throws_ok('errorTestNoZeroWeight',
     'XX000',
     'Graph Condition Failed: Graph should have at most two distinct non-negative edge costs! If there are exactly two distinct edge costs, one of them must equal zero!',
-    '17: If graph has 2 distinct weights, one must be zero');
+    '17: If graph has 2 distinct weights, one must be zero')
+  ELSE
+     throws_ok('errorTestNoZeroWeight',
+    'XX000',
+    'Graph Condition Failed: Graph should have atmost two distinct non-negative edge costs! If there are exactly two distinct edge costs, one of them must equal zero!',
+    '17: If graph has 2 distinct weights, one must be zero')
+  END;
 
 
 SELECT * FROM finish();

src/bellman_ford/edwardMoore_driver.cpp

@@ -42,7 +42,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include "cpp_common/combinations.hpp"
 #include "cpp_common/pgdata_getters.hpp"
-#include "cpp_common/basePath_SSEC.hpp"
+#include "cpp_common/path.hpp"
 #include "cpp_common/base_graph.hpp"
 #include "cpp_common/alloc.hpp"
 #include "cpp_common/assert.hpp"

src/coloring/bipartite_driver.cpp

@@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include "c_types/ii_t_rt.h"
 #include "cpp_common/identifiers.hpp"
 #include "cpp_common/alloc.hpp"
-#include "cpp_common/basePath_SSEC.hpp"
+#include "cpp_common/path.hpp"
 #include "cpp_common/base_graph.hpp"
 #include "drivers/coloring/bipartite_driver.h"
 #include "coloring/bipartite_driver.hpp"

src/common/CMakeLists.txt

@@ -1,7 +1,7 @@
 ADD_LIBRARY(common OBJECT
     postgres_connection.c
     e_report.c
-    basePath_SSEC.cpp
+    path.cpp
 
     check_parameters.c
 

src/common/ch_edge.cpp

@@ -70,8 +70,9 @@ CH_edge::add_contracted_vertex(CH_vertex& v) {
 
 void
 CH_edge::add_contracted_edge_vertices(CH_edge &e) {
-    if (e.has_contracted_vertices())
+    if (e.has_contracted_vertices()) {
         m_contracted_vertices += e.contracted_vertices();
+    }
 }
 
 void CH_edge::add_contracted_vertices(Identifiers<int64_t>& ids) {

src/common/ch_vertex.cpp

@@ -55,9 +55,7 @@ Identifiers<int64_t>&
 
 
 bool CH_vertex::has_contracted_vertices() const {
-    if (m_contracted_vertices.size() == 0)
-        return false;
-    return true;
+    return !m_contracted_vertices.empty();
 }
 
 void CH_vertex::add_contracted_vertex(CH_vertex& v) {