(dagShortestPath) using the shortestPath process & driver

Author: cvvergara

include/c_common/enums.h

@@ -32,6 +32,7 @@ enum Which {
     TOPOSORT = 11,
     /** shortest_paths */
     DIJKSTRA = 21, WITHPOINTS, OLD_WITHPOINTS, BDDIJKSTRA, EDWARDMOORE,
+    DAGSP,
     /** allpairs **/
     FLOYD = 31, JOHNSON,
     /** metrics **/

include/dagShortestPath/dagShortestPath.hpp

@@ -218,6 +218,20 @@ class Pgr_dag {
      };
 };
 
+namespace algorithms {
+
+template <class G>
+std::deque<pgrouting::Path>
+dagShortestPath(
+        G &graph,
+        std::map<int64_t, std::set<int64_t>> &combinations,
+        bool only_cost = false) {
+    pgrouting::Pgr_dag<G> fn_dag;
+    auto paths = fn_dag.dag(graph, combinations, only_cost);
+    return paths;
+}
+
+}  // namespace algorithms
 }  // namespace pgrouting
 
 #endif  // INCLUDE_DAGSHORTESTPATH_DAGSHORTESTPATH_HPP_

pgtap/others/dagShortestPath/no_crash_test.pg

@@ -6,7 +6,7 @@
 BEGIN;
 
 UPDATE edges SET cost = sign(cost), reverse_cost = -sign(cost);
-SELECT CASE WHEN min_version('4.0.0') THEN plan(81) ELSE plan(1) END;
+SELECT CASE WHEN min_version('4.0.0') THEN plan(82) ELSE plan(1) END;
 
 CREATE OR REPLACE FUNCTION no_crash()
 RETURNS SETOF TEXT AS
@@ -135,6 +135,7 @@ BEGIN
   'NULL::TEXT'
   ]::TEXT[];
   RETURN query SELECT * FROM no_crash_test('pgr_dagShortestPath', params, subs);
+  RETURN query SELECT throw_on_empty_edges_sql('pgr_dagShortestPath', ',1,5');
 
 END
 $BODY$

src/cpp_common/utilities.cpp

@@ -78,6 +78,9 @@ get_name(Which which, bool is_only_cost, bool is_near, bool is_matrix) {
         case EDWARDMOORE:
             base = "pgr_edwardMoore";
             break;
+        case DAGSP :
+            base = "pgr_dagShortestPath";
+            break;
         case OLD_WITHPOINTS:
         case WITHPOINTS:
             base = "pgr_withPoints";
@@ -96,26 +99,21 @@ estimate_drivingSide(char driving_side, Which which) {
         d_side = ' ';
     }
     switch (which) {
+        case DAGSP :
         case EDWARDMOORE:
         case BDDIJKSTRA:
         case DIJKSTRA:
-            {
                 return ' ';
                 break;
-            }
         case WITHPOINTS:
-            {
                 if (d_side == ' ') {
                     throw std::make_pair(std::string("Invalid value of 'driving side'"),
                             std::string("Valid value are 'r', 'l', 'b'"));
                 }
                 break;
-            }
         default:
-            {
                 /* For the moment its old signature of pgr_withPoints */
                 if (!((d_side == 'r') || (d_side == 'l'))) d_side = 'b';
-            }
     }
     return d_side;
 }

src/dagShortestPath/CMakeLists.txt

@@ -3,5 +3,4 @@
 # License: GPL-2 See https://github.com/pgRouting/pgrouting/blob/main/LICENSE
 ADD_LIBRARY(dagShortestPath OBJECT
     dagShortestPath.c
-    dagShortestPath_driver.cpp
-    )
+)

src/dagShortestPath/dagShortestPath.c

@@ -30,59 +30,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include <stdbool.h>
 #include "c_common/postgres_connection.h"
-
 #include "c_types/path_rt.h"
-#include "c_common/debug_macro.h"
-#include "c_common/e_report.h"
-#include "c_common/time_msg.h"
-#include "drivers/dagShortestPath/dagShortestPath_driver.h"
+#include "process/shortestPath_process.h"
 
 PGDLLEXPORT Datum _pgr_dagshortestpath_v4(PG_FUNCTION_ARGS);
 PG_FUNCTION_INFO_V1(_pgr_dagshortestpath_v4);
 
-
-static
-void
-process(
-        char* edges_sql,
-        char* combinations_sql,
-        ArrayType *starts,
-        ArrayType *ends,
-        bool only_cost,
-        bool normal,
-        Path_rt **result_tuples,
-        size_t *result_count) {
-    pgr_SPI_connect();
-    char* log_msg = NULL;
-    char* notice_msg = NULL;
-    char* err_msg = NULL;
-    (*result_tuples) = NULL;
-    (*result_count) = 0;
-
-    clock_t start_t = clock();
-    pgr_do_dagShortestPath(
-            edges_sql,
-            combinations_sql,
-            starts, ends,
-
-            only_cost,
-            normal,
-
-            result_tuples,
-            result_count,
-            &log_msg,
-            &notice_msg,
-            &err_msg);
-    time_msg(" processing pgr_dagShortestPath", start_t, clock());
-
-    if (err_msg) {
-        if (*result_tuples) pfree(*result_tuples);
-    }
-    pgr_global_report(&log_msg, &notice_msg, &err_msg);
-
-    pgr_SPI_finish();
-}
-
 PGDLLEXPORT Datum _pgr_dagshortestpath_v4(PG_FUNCTION_ARGS) {
     FuncCallContext     *funcctx;
     TupleDesc            tuple_desc;
@@ -99,26 +52,48 @@ PGDLLEXPORT Datum _pgr_dagshortestpath_v4(PG_FUNCTION_ARGS) {
             /*
              * many to many
              */
-            process(
+            pgr_process_shortestPath(
                 text_to_cstring(PG_GETARG_TEXT_P(0)),
                 NULL,
+                NULL,
+
                 PG_GETARG_ARRAYTYPE_P(1),
                 PG_GETARG_ARRAYTYPE_P(2),
+
+                true,
                 PG_GETARG_BOOL(3),
                 PG_GETARG_BOOL(4),
+
+                0,
+                true,
+                ' ',
+                true,
+
+                DAGSP,
                 &result_tuples,
                 &result_count);
 
         } else if (PG_NARGS() == 3) {
             /*
              * combinations
              */
-            process(
+            pgr_process_shortestPath(
                 text_to_cstring(PG_GETARG_TEXT_P(0)),
+                NULL,
                 text_to_cstring(PG_GETARG_TEXT_P(1)),
+
                 NULL, NULL,
+
+                true,
                 PG_GETARG_BOOL(2),
                 true,
+
+                0,
+                true,
+                ' ',
+                true,
+
+                DAGSP,
                 &result_tuples,
                 &result_count);
         }
@@ -129,7 +104,8 @@ PGDLLEXPORT Datum _pgr_dagshortestpath_v4(PG_FUNCTION_ARGS) {
                 != TYPEFUNC_COMPOSITE) {
             ereport(ERROR,
                     (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                     errmsg("function returning record called in context that cannot accept type record")));
+                     errmsg("function returning record called in context "
+                         "that cannot accept type record")));
         }
 
         funcctx->tuple_desc = tuple_desc;

src/dijkstra/shortestPath_driver.cpp

@@ -54,6 +54,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include "bellman_ford/edwardMoore.hpp"
 #include "bdDijkstra/bdDijkstra.hpp"
 #include "withPoints/withPoints.hpp"
+#include "dagShortestPath/dagShortestPath.hpp"
 
 namespace {
 
@@ -153,6 +154,7 @@ do_shortestPath(
         using pgrouting::algorithms::dijkstra;
         using pgrouting::algorithms::bdDijkstra;
         using pgrouting::algorithms::edwardMoore;
+        using pgrouting::algorithms::dagShortestPath;
 
         hint = combinations_sql;
         auto combinations = get_combinations(combinations_sql, starts, ends, normal, is_matrix);
@@ -238,6 +240,9 @@ do_shortestPath(
                 case EDWARDMOORE:
                         paths =  edwardMoore(digraph, combinations);
                         break;
+                case DAGSP:
+                        paths = dagShortestPath(digraph, combinations, only_cost);
+                        break;
                 default:
                     err << "INTERNAL: wrong function call: " << which;
                     return;
@@ -255,8 +260,8 @@ do_shortestPath(
                     paths =  bdDijkstra(undigraph, combinations, only_cost);
                     break;
                 case EDWARDMOORE:
-                        paths =  edwardMoore(undigraph, combinations);
-                        break;
+                    paths =  edwardMoore(undigraph, combinations);
+                    break;
                 default:
                     err << "INTERNAL: wrong function call: " << which;
                     return;