Fixing some issues found by rabbit

Author: cvvergara

include/cpp_common/to_postgres.hpp

@@ -83,15 +83,15 @@ count_rows(
 template <class G>
 void get_vertexId(
             const G &graph,
-            const std::vector<typename G::V> data,
+            const std::vector<typename G::V> &data,
             size_t &result_count,
             int64_t **result_tuples) {
     result_count = data.size();
     *result_tuples = pgrouting::pgr_alloc(result_count, (*result_tuples));
 
     size_t seq = 0;
-    for (auto const e : data) {
-        (*result_tuples)[seq] = graph.graph[e].id;
+    for (auto const &v : data) {
+        (*result_tuples)[seq] = graph.graph[v].id;
         ++seq;
     }
 }

include/drivers/ordering_driver.hpp

@@ -39,9 +39,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <string>
 #include <cstdint>
 
+#include "c_common/enums.h"
 void
 do_ordering(
-        std::string, int,
+        std::string, Which,
         int64_t**,  size_t*,
         char **, char **, char **);
 

include/process/ordering_process.h

@@ -38,11 +38,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <stdint.h>
 #endif
 
+#include "c_common/enums.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-void pgr_process_ordering(const char*, int, int64_t**, size_t*);
+void pgr_process_ordering(const char*, enum Which, int64_t**, size_t*);
 
 #ifdef __cplusplus
 }

src/ordering/cuthillMckeeOrdering.c

@@ -54,7 +54,7 @@ _pgr_cuthillmckeeordering(PG_FUNCTION_ARGS) {
 
         pgr_process_ordering(
                 text_to_cstring(PG_GETARG_TEXT_P(0)),
-                1, /* Cuthill Mckee Ordering*/
+                CUTCHILL,
                 &result_tuples,
                 &result_count);
 

src/ordering/cuthillMckeeOrdering.cpp

@@ -27,6 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
  ********************************************************************PGR-GNU*/
 
+#include "ordering/cuthillMckeeOrdering.hpp"
+
 #include <vector>
 #include <cstdint>
 

src/ordering/kingOrdering.c

@@ -54,7 +54,7 @@ _pgr_kingordering(PG_FUNCTION_ARGS) {
 
         pgr_process_ordering(
                 text_to_cstring(PG_GETARG_TEXT_P(0)),
-                2, /*King Ordering*/
+                KING, /*King Ordering*/
                 &result_tuples,
                 &result_count);
 

src/ordering/ordering_driver.cpp

@@ -62,7 +62,7 @@ process(const std::vector<Edge_t> &edges, G &graph, Func ordering,
 void
 do_ordering(
     std::string edges_sql,
-    int which,
+    Which which,
 
     int64_t **return_tuples,
     size_t *return_count,
@@ -116,22 +116,22 @@ do_ordering(
 
 
         switch (which) {
-            case 0: {
-                        process(edges, undigraph, &sloanOrdering, *return_count, return_tuples);
-                        break;
-                    }
-            case 1: {
-                        process(edges, undigraph, &cuthillMckeeOrdering, *return_count, return_tuples);
-                        break;
-                    }
-            case 2: {
-                        process(edges, undigraph, &kingOrdering, *return_count, return_tuples);
-                        break;
-                    }
-            case 11: {
-                         process(edges, digraph, &topologicalSort, *return_count, return_tuples);
-                         break;
-                     }
+            case SLOAN: {
+                            process(edges, undigraph, &sloanOrdering, *return_count, return_tuples);
+                            break;
+                        }
+            case CUTCHILL: {
+                               process(edges, undigraph, &cuthillMckeeOrdering, *return_count, return_tuples);
+                               break;
+                           }
+            case KING: {
+                           process(edges, undigraph, &kingOrdering, *return_count, return_tuples);
+                           break;
+                       }
+            case TOPOSORT: {
+                               process(edges, digraph, &topologicalSort, *return_count, return_tuples);
+                               break;
+                           }
         }
 
         if ((*return_count) == 0) {

src/ordering/ordering_process.cpp

@@ -49,7 +49,7 @@ extern "C" {
  */
 void pgr_process_ordering(
         const char* edges_sql,
-        int which,
+        enum Which which,
         int64_t **result_tuples,
         size_t *result_count) {
     pgassert(edges_sql);
@@ -67,12 +67,19 @@ void pgr_process_ordering(
             result_tuples, result_count,
             &log_msg , &notice_msg, &err_msg);
 
-    if (which == 0) {
-        time_msg(std::string(" processing pgr_sloanOrdering").c_str(), start_t, clock());
-    } else if (which == 1) {
-        time_msg(std::string("processing pgr_cuthillMckeeOrdering").c_str(), start_t, clock());
-    } else if (which == 2) {
-        time_msg(std::string("processing pgr_kingOrdering").c_str(), start_t, clock());
+    switch (which) {
+        case SLOAN:
+            time_msg(std::string(" processing pgr_sloanOrdering").c_str(), start_t, clock());
+            break;
+        case CUTCHILL:
+            time_msg(std::string("processing pgr_cuthillMckeeOrdering").c_str(), start_t, clock());
+            break;
+        case KING:
+            time_msg(std::string("processing pgr_kingOrdering").c_str(), start_t, clock());
+            break;
+        case TOPOSORT:
+            time_msg(std::string("processing pgr_kingOrdering").c_str(), start_t, clock());
+            break;
     }
 
     if (err_msg && (*result_tuples)) {

src/ordering/sloanOrdering.c

@@ -54,7 +54,7 @@ _pgr_sloanordering(PG_FUNCTION_ARGS) {
 
         pgr_process_ordering(
                 text_to_cstring(PG_GETARG_TEXT_P(0)),
-                0, /* Sloan */
+                SLOAN, /* Sloan */
                 &result_tuples,
                 &result_count);
 

src/ordering/sloanOrdering.cpp

@@ -1,5 +1,5 @@
 /*PGR-GNU*****************************************************************
-File: sloanOrdering.hpp
+File: sloanOrdering.cpp
 
 Generated with Template by:
 Copyright (c) 2022 pgRouting developers