(C/C++) Reorganizing code: removing duplicated get_route code

Author: cvvergara

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
 

src/common/ch_vertex.cpp

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

src/cpp_common/CMakeLists.txt

@@ -6,6 +6,7 @@ ADD_LIBRARY(cpp_common OBJECT
     messages.cpp
     combinations.cpp
 
+    to_postgres.cpp
     get_check_data.cpp
     pgdata_fetchers.cpp
     pgdata_getters.cpp

src/cpp_common/compPaths.cpp

@@ -44,15 +44,14 @@ bool compPathsLess::operator()(const Path &p1, const Path &p2) const {
     if (!(std::fabs(p2.tot_cost() - p1.tot_cost())
                 <
                 std::numeric_limits<double>::epsilon())) {
-    if (p1.tot_cost() > p2.tot_cost()) return  false;
-    if (p1.tot_cost() < p2.tot_cost()) return  true;
+    if (p1.tot_cost() > p2.tot_cost()) return false;
+    if (p1.tot_cost() < p2.tot_cost()) return true;
     }
 
     // paths costs are equal now check by length
     if (p1.size() > p2.size()) return false;
     if (p1.size() < p2.size()) return true;
 
-//    pgassert(p1.tot_cost() == p2.tot_cost());
     pgassert(p1.size() == p2.size());
 
     // paths weights & lengths are equal now check by node ID
@@ -62,7 +61,6 @@ bool compPathsLess::operator()(const Path &p1, const Path &p2) const {
         if (p1[i].node <  p2[i].node) return true;
     }
 
-//    pgassert(p1.tot_cost() == p2.tot_cost());
     pgassert(p1.size() == p2.size());
 #ifdef NDEBUG
     for (i = 0; i < p1.size(); i++) {

src/cpp_common/to_postgres.cpp

@@ -0,0 +1,113 @@
+/*PGR-GNU*****************************************************************
+File: to_postgres.cpp
+
+Copyright (c) 2025 pgRouting developers
+Mail: [email protected]
+
+------
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+********************************************************************PGR-GNU*/
+
+#include "cpp_common/to_postgres.hpp"
+
+#include <cstddef>
+#include <deque>
+
+#include "c_types/routes_t.h"
+
+#include "cpp_common/path.hpp"
+#include "cpp_common/alloc.hpp"
+#include "cpp_common/assert.hpp"
+
+namespace {
+
+void
+get_path(
+        int route_id,
+        int path_id,
+        const pgrouting::Path &path,
+        Routes_t **postgres_data,
+        double &route_agg_cost,
+        size_t &sequence) {
+    int path_seq = 0;
+    for (const auto e : path) {
+        (*postgres_data)[sequence] = {
+            route_id,
+            path_id,
+            path_seq,
+            path.start_id(),
+            path.end_id(),
+            e.node,
+            e.edge,
+            e.cost,
+            e.agg_cost,
+            route_agg_cost};
+        route_agg_cost += path[path_seq].cost;
+        path_seq++;
+        ++sequence;
+    }
+}
+
+}  // namespace
+
+namespace pgrouting {
+namespace to_postgres {
+
+/**
+ * @param[in] paths  The set of Paths
+ * @param[out] tuples The C array of Route_t
+ * @returns number of tuples on the C array
+ *
+ * Currently works for
+ * - pgr_dijkstraVia
+ * - pgr_trspVia
+ * - pgr_trspVia_withPoints
+ * - pgr_withPointsVia
+ */
+size_t
+get_viaRoute(
+        std::deque<pgrouting::Path> &paths,
+        Routes_t **tuples) {
+    pgassert(!(*tuples));
+
+    auto count = count_tuples(paths);
+    if (count == 0) return 0;
+
+    (*tuples) = pgr_alloc(count, (*tuples));
+
+    size_t sequence = 0;
+    int path_id = 1;
+    int route_id = 1;
+    double route_agg_cost = 0;
+    for (auto &p : paths) {
+        p.recalculate_agg_cost();
+    }
+    for (const auto &path : paths) {
+        if (path.size() > 0) {
+            ::get_path(route_id, path_id, path, tuples, route_agg_cost, sequence);
+        }
+        ++path_id;
+    }
+    (*tuples)[count - 1].edge = -2;
+
+    pgassert(count == sequence);
+
+    return sequence;
+}
+
+}  // namespace to_postgres
+}  // namespace pgrouting

src/dijkstra/dijkstraVia_driver.cpp

@@ -34,61 +34,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include "c_types/routes_t.h"
 #include "cpp_common/pgdata_getters.hpp"
-#include "cpp_common/alloc.hpp"
+#include "cpp_common/to_postgres.hpp"
 #include "cpp_common/assert.hpp"
 #include "dijkstra/dijkstraVia.hpp"
 
 
-namespace  {
-void
-get_path(
-        int route_id,
-        int path_id,
-        const pgrouting::Path &path,
-        Routes_t **postgres_data,
-        double &route_cost,
-        size_t &sequence) {
-    size_t i = 0;
-    for (const auto e : path) {
-        (*postgres_data)[sequence] = {
-            route_id,
-            path_id,
-            static_cast<int>(i),
-            path.start_id(),
-            path.end_id(),
-            e.node,
-            e.edge,
-            e.cost,
-            e.agg_cost,
-            route_cost};
-        route_cost += path[i].cost;
-        ++i;
-        ++sequence;
-    }
-}
-
-
-size_t
-get_route(
-        Routes_t **ret_path,
-        std::deque<pgrouting::Path> &paths) {
-    size_t sequence = 0;
-    int path_id = 1;
-    int route_id = 1;
-    double route_cost = 0;  // routes_agg_cost
-    for (auto &p : paths) {
-        p.recalculate_agg_cost();
-    }
-    for (const auto &path : paths) {
-        if (path.size() > 0) {
-            get_path(route_id, path_id, path, ret_path, route_cost, sequence);
-        }
-        ++path_id;
-    }
-    return sequence;
-}
-}  // namespace
-
 void
 pgr_do_dijkstraVia(
         const char *edges_sql,
@@ -97,7 +47,7 @@ pgr_do_dijkstraVia(
         bool directed,
         bool strict,
         bool U_turn_on_edge,
-        Routes_t** return_tuples,   size_t* return_count,
+        Routes_t** return_tuples, size_t* return_count,
 
         char** log_msg,
         char** notice_msg,
@@ -108,10 +58,11 @@ pgr_do_dijkstraVia(
     using pgrouting::pgr_free;
     using pgrouting::pgget::get_intArray;
     using pgrouting::pgget::get_edges;
+    using pgrouting::to_postgres::get_viaRoute;
 
     std::ostringstream log;
-    std::ostringstream err;
     std::ostringstream notice;
+    std::ostringstream err;
     const char *hint = nullptr;
 
     try {
@@ -121,21 +72,19 @@ pgr_do_dijkstraVia(
         pgassert(!(*return_tuples));
         pgassert(*return_count == 0);
 
-
-
         auto via = get_intArray(viaArr, false);
 
         hint = edges_sql;
         auto edges = get_edges(std::string(edges_sql), true, false);
 
         if (edges.empty()) {
             *notice_msg = to_pg_msg("No edges found");
-            *log_msg = hint? to_pg_msg(hint) : to_pg_msg(log);
+            *log_msg = to_pg_msg(edges_sql);
             return;
         }
         hint = nullptr;
 
-        std::deque<Path>paths;
+        std::deque<Path> paths;
         if (directed) {
             pgrouting::DirectedGraph digraph;
             digraph.insert_edges(edges);
@@ -158,23 +107,13 @@ pgr_do_dijkstraVia(
                     log);
         }
 
-        size_t count(count_tuples(paths));
+        (*return_count) = get_viaRoute(paths, return_tuples);
 
-        if (count == 0) {
-            (*return_tuples) = NULL;
-            (*return_count) = 0;
-            notice <<
-                "No paths found";
-            *log_msg = to_pg_msg(notice);
+        if ((*return_count) == 0) {
+            *log_msg = to_pg_msg("No paths found");
             return;
         }
 
-        // get the space required to store all the paths
-        (*return_tuples) = pgr_alloc(count, (*return_tuples));
-        log << "\nConverting a set of paths into the tuples";
-        (*return_count) = (get_route(return_tuples, paths));
-        (*return_tuples)[count - 1].edge = -2;
-
         *log_msg = to_pg_msg(log);
         *notice_msg = to_pg_msg(notice);
     } catch (AssertFailedException &except) {