(bdastar) using the process and driver

Author: cvvergara

sql/bdAstar/bdAstarCostMatrix.sql

@@ -46,7 +46,7 @@ CREATE FUNCTION pgr_bdAstarCostMatrix(
 RETURNS SETOF RECORD AS
 $BODY$
     SELECT a.start_vid, a.end_vid, a.agg_cost
-    FROM _pgr_bdAstar(_pgr_get_statement($1), $2::BIGINT[], $2::BIGINT[], $3, $4, $5::FLOAT, $6::FLOAT, true) a;
+    FROM _pgr_bdAstar(_pgr_get_statement($1), $2::BIGINT[], '{}'::BIGINT[], $3, $4, $5::FLOAT, $6::FLOAT, true) a;
 $BODY$
 LANGUAGE SQL VOLATILE STRICT
 COST ${COST_HIGH} ROWS ${ROWS_HIGH};

src/astar/astar.c

@@ -48,6 +48,7 @@ PGDLLEXPORT Datum _pgr_astar(PG_FUNCTION_ARGS) {
         MemoryContext   oldcontext;
         funcctx = SRF_FIRSTCALL_INIT();
         oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
+
         if (PG_NARGS() == 9) {
             /*
              * many to many

src/astar/astar_driver.cpp

@@ -41,6 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include "cpp_common/to_postgres.hpp"
 
 #include "astar/astar.hpp"
+#include "bdAstar/bdAstar.hpp"
 
 namespace pgrouting {
 namespace drivers {
@@ -97,6 +98,7 @@ void do_astar(
         using pgrouting::xyDirectedGraph;
 
         using pgrouting::algorithms::astar;
+        using pgrouting::algorithms::bdastar;
 
         hint = combinations_sql;
         auto combinations = get_combinations(combinations_sql, starts, ends, normal, is_matrix);
@@ -126,6 +128,9 @@ void do_astar(
         if (directed) {
             digraph.insert_edges(edges);
             switch (which) {
+                case BDASTAR:
+                    paths = bdastar(digraph, combinations, heuristic, factor, epsilon, only_cost);
+                    break;
                 case ASTAR:
                     paths = astar(digraph, combinations, heuristic, factor, epsilon, only_cost);
                     break;
@@ -136,6 +141,9 @@ void do_astar(
         } else {
             undigraph.insert_edges(edges);
             switch (which) {
+                case BDASTAR:
+                    paths = bdastar(undigraph, combinations, heuristic, factor, epsilon, only_cost);
+                    break;
                 case ASTAR:
                     paths = astar(undigraph, combinations, heuristic, factor, epsilon, only_cost);
                     break;

src/bdAstar/CMakeLists.txt

@@ -1,7 +1,7 @@
 # This file is part of the pgRouting project.
 # Copyright (c) 2016-2026 pgRouting developers
 # License: GPL-2 See https://github.com/pgRouting/pgrouting/blob/main/LICENSE
+
 ADD_LIBRARY(bdAstar OBJECT
     bdAstar.c
-    bdAstar_driver.cpp
-    )
+)

src/bdAstar/bdAstar.c

@@ -31,73 +31,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #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 "c_common/check_parameters.h"
-#include "drivers/bdAstar/bdAstar_driver.h"
+#include "process/astar_process.h"
 
 PGDLLEXPORT Datum _pgr_bdastar(PG_FUNCTION_ARGS);
 PG_FUNCTION_INFO_V1(_pgr_bdastar);
 
 
-static
-void
-process(char* edges_sql,
-        char* combinations_sql,
-        ArrayType *starts,
-        ArrayType *ends,
-        bool directed,
-        int heuristic,
-        double factor,
-        double epsilon,
-        bool only_cost,
-        Path_rt **result_tuples,
-        size_t *result_count) {
-    check_parameters(heuristic, factor, epsilon);
-
-    pgr_SPI_connect();
-    char* log_msg = NULL;
-    char* notice_msg = NULL;
-    char* err_msg = NULL;
-
-    clock_t start_t = clock();
-    pgr_do_bdAstar(
-            edges_sql,
-            combinations_sql,
-            starts, ends,
-
-            directed,
-            heuristic,
-            factor,
-            epsilon,
-            only_cost,
-            result_tuples, result_count,
-            &log_msg,
-            &notice_msg,
-            &err_msg);
-
-    if (only_cost) {
-        time_msg("pgr_bdAstarCost", start_t, clock());
-    } else {
-        time_msg("pgr_bdAstar", start_t, clock());
-    }
-
-    if (err_msg && (*result_tuples)) {
-        pfree(*result_tuples);
-        (*result_tuples) = NULL;
-        (*result_count) = 0;
-    }
-
-    pgr_global_report(&log_msg, &notice_msg, &err_msg);
-
-    pgr_SPI_finish();
-}
-
 PGDLLEXPORT Datum
 _pgr_bdastar(PG_FUNCTION_ARGS) {
     FuncCallContext     *funcctx;
-    TupleDesc           tuple_desc;
+    TupleDesc            tuple_desc;
 
     Path_rt  *result_tuples = NULL;
     size_t result_count = 0;
@@ -107,50 +50,59 @@ _pgr_bdastar(PG_FUNCTION_ARGS) {
         funcctx = SRF_FIRSTCALL_INIT();
         oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
 
-
         if (PG_NARGS() == 8) {
             /*
              * many to many
              */
-            process(
+            pgr_process_astar(
                 text_to_cstring(PG_GETARG_TEXT_P(0)),
                 NULL,
                 PG_GETARG_ARRAYTYPE_P(1),
                 PG_GETARG_ARRAYTYPE_P(2),
+
                 PG_GETARG_BOOL(3),
+                PG_GETARG_BOOL(7),
+                true,
+
                 PG_GETARG_INT32(4),
                 PG_GETARG_FLOAT8(5),
                 PG_GETARG_FLOAT8(6),
-                PG_GETARG_BOOL(7),
+
+                BDASTAR,
                 &result_tuples,
                 &result_count);
         } else if (PG_NARGS() == 7) {
             /*
-             * combinations
+             * Combinations
              */
-            process(
+            pgr_process_astar(
                 text_to_cstring(PG_GETARG_TEXT_P(0)),
                 text_to_cstring(PG_GETARG_TEXT_P(1)),
-                NULL,
-                NULL,
+
+                NULL, NULL,
+
                 PG_GETARG_BOOL(2),
+                PG_GETARG_BOOL(6),
+                true,
+
                 PG_GETARG_INT32(3),
                 PG_GETARG_FLOAT8(4),
                 PG_GETARG_FLOAT8(5),
-                PG_GETARG_BOOL(6),
+
+                BDASTAR,
                 &result_tuples,
                 &result_count);
         }
 
-
         funcctx->max_calls = result_count;
         funcctx->user_fctx = result_tuples;
         if (get_call_result_type(fcinfo, NULL, &tuple_desc)
-                != TYPEFUNC_COMPOSITE)
+                != TYPEFUNC_COMPOSITE) {
             ereport(ERROR,
                     (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
                      errmsg("function returning record called in context "
                          "that cannot accept type record")));
+        }
 
         funcctx->tuple_desc = tuple_desc;
         MemoryContextSwitchTo(oldcontext);
@@ -167,7 +119,6 @@ _pgr_bdastar(PG_FUNCTION_ARGS) {
         bool*        nulls;
         size_t       call_cntr = funcctx->call_cntr;
 
-
         size_t numb = 8;
         values = palloc(numb * sizeof(Datum));
         nulls = palloc(numb * sizeof(bool));

src/cpp_common/utilities.cpp

@@ -69,7 +69,9 @@ get_name(Which which, bool is_only_cost, bool is_near, bool is_matrix) {
     switch  (which) {
         case DIJKSTRA :
             base = "pgr_dijkstra";
-            suffix = std::string(is_near? "Near" : "") + (is_only_cost? "Cost" : "") + (is_only_cost && is_matrix? "Matrix" : "");
+            suffix = std::string(is_near? "Near" : "")
+                + (is_only_cost? "Cost" : "")
+                + (is_only_cost && is_matrix? "Matrix" : "");
             break;
         case BDDIJKSTRA :
             base = "pgr_bdDijkstra";