enhancements on dijkstra

NEWS.md

@@ -41,15 +41,36 @@ milestone for 4.0.0
 * pgr_maxFlow(Combinations)
 * pgr_pushRelabel(Combinations)
 
+**code enhancements:**
 
-**Removal of deprecated functions and signatures**
+* Simplify C/C++ code for all overloads of
 
-* ``pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)``
-* ``pgr_trspviavertices(text,anyarray,boolean,boolean,text)``
-* ``pgr_trsp(text,integer,double precision,integer,double precision,boolean,boolean,text)``
-* ``pgr_trsp(text,integer,integer,boolean,boolean,text)``
+  * pgr_dijkstra
+
+**Removal of SQL deprecated functions and signatures**
+
+* pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)
+* pgr_trspviavertices(text,anyarray,boolean,boolean,text)
+* pgr_trsp(text,integer,double precision,integer,double precision,boolean,boolean,text)
+* pgr_trsp(text,integer,integer,boolean,boolean,text)
+* _pgr_dijkstranear(text,anyarray,anyarray,bigint,boolean)
+* _pgr_dijkstranear(text,anyarray,bigint,bigint,boolean)
+* _pgr_dijkstranear(text,bigint,anyarray,bigint,boolean)
+* _pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean,bigint)
+* _pgr_dijkstra(text,text,boolean,boolean,boolean)
+
+**Deprecation of internal C/C++ functions**
+
+* _pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean,bigint)``
+* _pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean,bigint,boolean)``
+* _pgr_dijkstra(text,text,boolean,boolean,bigint,boolean)``
+* _pgr_dijkstra(text,text,boolean,boolean,boolean)``
 
+**Internal C/C++ functions in legacy**
 
+* _trsp(text,text,anyarray,anyarray,boolean)``
+* _v4trsp(text,text,anyarray,anyarray,boolean)``
+* _v4trsp(text,text,text,boolean)``
 
 # pgRouting 3
 

doc/src/release_notes.rst

@@ -72,15 +72,36 @@ milestone for 4.0.0
 * pgr_maxFlow(Combinations)
 * pgr_pushRelabel(Combinations)
 
+.. rubric:: code enhancements:
 
-.. rubric:: Removal of deprecated functions and signatures
+* Simplify C/C++ code for all overloads of
 
-* ``pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)``
-* ``pgr_trspviavertices(text,anyarray,boolean,boolean,text)``
-* ``pgr_trsp(text,integer,double precision,integer,double precision,boolean,boolean,text)``
-* ``pgr_trsp(text,integer,integer,boolean,boolean,text)``
+  * pgr_dijkstra
+
+.. rubric:: Removal of SQL deprecated functions and signatures
+
+* pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)
+* pgr_trspviavertices(text,anyarray,boolean,boolean,text)
+* pgr_trsp(text,integer,double precision,integer,double precision,boolean,boolean,text)
+* pgr_trsp(text,integer,integer,boolean,boolean,text)
+* _pgr_dijkstranear(text,anyarray,anyarray,bigint,boolean)
+* _pgr_dijkstranear(text,anyarray,bigint,bigint,boolean)
+* _pgr_dijkstranear(text,bigint,anyarray,bigint,boolean)
+* _pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean,bigint)
+* _pgr_dijkstra(text,text,boolean,boolean,boolean)
+
+.. rubric:: Deprecation of internal C/C++ functions
+
+* _pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean,bigint)``
+* _pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean,bigint,boolean)``
+* _pgr_dijkstra(text,text,boolean,boolean,bigint,boolean)``
+* _pgr_dijkstra(text,text,boolean,boolean,boolean)``
 
+.. rubric:: Internal C/C++ functions in legacy
 
+* _trsp(text,text,anyarray,anyarray,boolean)``
+* _v4trsp(text,text,anyarray,anyarray,boolean)``
+* _v4trsp(text,text,text,boolean)``
 
 pgRouting 3
 *******************************************************************************

include/cpp_common/combinations.hpp

@@ -49,13 +49,6 @@ class Path;
 
 namespace utilities {
 
-#if 1
-std::map<int64_t, std::set<int64_t>>
-get_combinations(const II_t_rt *, size_t);
-
-std::map<int64_t, std::set<int64_t>>
-get_combinations(int64_t*, size_t, int64_t*, size_t);
-#endif
 
 std::map<int64_t, std::set<int64_t>>
 get_combinations(

include/dijkstra/dijkstraVia.hpp

@@ -44,10 +44,10 @@ namespace pgrouting {
 
 template <class G>
 void
-pgr_dijkstraVia(
+dijkstraVia(
         G &graph,
-        const std::vector< int64_t > &via_vertices,
-        std::deque< Path > &paths,
+        const std::vector<int64_t> &via_vertices,
+        std::deque<Path> &paths,
         bool strict,
         bool U_turn_on_edge,
         std::ostringstream &log) {

sql/dijkstra/CMakeLists.txt

@@ -6,7 +6,6 @@ SET(LOCAL_FILES
     dijkstraCostMatrix.sql
     _dijkstraVia.sql
     dijkstraVia.sql
-    _dijkstraNear.sql
     dijkstraNear.sql
     dijkstraNearCost.sql
     )

sql/dijkstra/_dijkstra.sql

@@ -28,15 +28,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
  ********************************************************************PGR-GNU*/
 
----------------
----------------
--- dijkstra
----------------
----------------
-
---v3.2
-CREATE FUNCTION _pgr_dijkstra(
+--v4.0
+CREATE FUNCTION _pgr_dijkstrav4(
     edges_sql TEXT,
+    combinations_sql TEXT,
     start_vids ANYARRAY,
     end_vids ANYARRAY,
     directed BOOLEAN,
@@ -55,87 +50,6 @@ CREATE FUNCTION _pgr_dijkstra(
     OUT agg_cost FLOAT)
 RETURNS SETOF RECORD AS
 'MODULE_PATHNAME'
-LANGUAGE C VOLATILE STRICT;
-
-
---v3.2
-CREATE FUNCTION _pgr_dijkstra(
-    edges_sql TEXT,
-    combinations_sql TEXT,
-    directed BOOLEAN,
-    only_cost BOOLEAN,
-    n_goals BIGINT,
-    global BOOLEAN,
-
-    OUT seq INTEGER,
-    OUT path_seq INTEGER,
-    OUT start_vid BIGINT,
-    OUT end_vid BIGINT,
-    OUT node BIGINT,
-    OUT edge BIGINT,
-    OUT cost FLOAT,
-    OUT agg_cost FLOAT)
-RETURNS SETOF RECORD AS
-'MODULE_PATHNAME'
-LANGUAGE C VOLATILE STRICT;
-
--- COMMENTS
-
-COMMENT ON FUNCTION _pgr_dijkstra(TEXT, ANYARRAY, ANYARRAY, BOOLEAN, BOOLEAN, BOOLEAN, BIGINT, BOOLEAN)
-IS 'pgRouting internal function';
-
-COMMENT ON FUNCTION _pgr_dijkstra(TEXT, TEXT, BOOLEAN, BOOLEAN, BIGINT, BOOLEAN)
-IS 'pgRouting internal function';
-
-
-/** The following are kept for backward compatibility on signatures **/
---v3.0
-CREATE FUNCTION _pgr_dijkstra(
-    edges_sql TEXT,
-    start_vids ANYARRAY,
-    end_vids ANYARRAY,
-    directed BOOLEAN DEFAULT true,
-    only_cost BOOLEAN DEFAULT false,
-    normal BOOLEAN DEFAULT true,
-    n_goals BIGINT DEFAULT 0,
-
-    OUT seq INTEGER,
-    OUT path_seq INTEGER,
-    OUT start_vid BIGINT,
-    OUT end_vid BIGINT,
-    OUT node BIGINT,
-    OUT edge BIGINT,
-    OUT cost FLOAT,
-    OUT agg_cost FLOAT)
-RETURNS SETOF RECORD AS
-'MODULE_PATHNAME'
-LANGUAGE C VOLATILE STRICT;
-
-
---v3.1
-CREATE FUNCTION _pgr_dijkstra(
-    edges_sql TEXT,
-    combinations_sql TEXT,
-    directed BOOLEAN DEFAULT true,
-    only_cost BOOLEAN DEFAULT false,
-    normal BOOLEAN DEFAULT true,
-
-    OUT seq INTEGER,
-    OUT path_seq INTEGER,
-    OUT start_vid BIGINT,
-    OUT end_vid BIGINT,
-    OUT node BIGINT,
-    OUT edge BIGINT,
-    OUT cost FLOAT,
-    OUT agg_cost FLOAT)
-RETURNS SETOF RECORD AS
-'MODULE_PATHNAME'
-LANGUAGE C VOLATILE STRICT;
-
--- COMMENTS
+LANGUAGE C VOLATILE;
 
-COMMENT ON FUNCTION _pgr_dijkstra(TEXT, ANYARRAY, ANYARRAY, BOOLEAN, BOOLEAN, BOOLEAN, BIGINT)
-IS 'pgRouting internal function';
 
-COMMENT ON FUNCTION _pgr_dijkstra(TEXT, TEXT, BOOLEAN, BOOLEAN, BOOLEAN)
-IS 'pgRouting internal function';

sql/dijkstra/dijkstra.sql

@@ -53,7 +53,7 @@ CREATE FUNCTION pgr_dijkstra(
 RETURNS SETOF RECORD AS
 $BODY$
     SELECT seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
-    FROM _pgr_dijkstra(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], ARRAY[$3]::BIGINT[], $4, false, true);
+    FROM _pgr_dijkstrav4(_pgr_get_statement($1), NULL::TEXT, ARRAY[$2]::BIGINT[], ARRAY[$3]::BIGINT[], $4, false, true, 0, false);
 $BODY$
 LANGUAGE sql VOLATILE STRICT
 COST 100
@@ -79,7 +79,7 @@ CREATE FUNCTION pgr_dijkstra(
 RETURNS SETOF RECORD AS
 $BODY$
     SELECT seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
-    FROM _pgr_dijkstra(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], $3::BIGINT[], $4, false, true);
+    FROM _pgr_dijkstrav4(_pgr_get_statement($1), NULL::TEXT, ARRAY[$2]::BIGINT[], $3::BIGINT[], $4, false, true, 0, false);
 $BODY$
 LANGUAGE sql VOLATILE STRICT
 COST 100
@@ -105,7 +105,7 @@ CREATE FUNCTION pgr_dijkstra(
 RETURNS SETOF RECORD AS
 $BODY$
     SELECT seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
-    FROM _pgr_dijkstra(_pgr_get_statement($1), $2::BIGINT[], ARRAY[$3]::BIGINT[], $4, false, false);
+    FROM _pgr_dijkstrav4(_pgr_get_statement($1), NULL::TEXT, $2::BIGINT[], ARRAY[$3]::BIGINT[], $4, false, false, 0, false);
 $BODY$
 LANGUAGE sql VOLATILE STRICT
 COST 100
@@ -131,7 +131,7 @@ CREATE FUNCTION pgr_dijkstra(
 RETURNS SETOF RECORD AS
 $BODY$
     SELECT seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
-    FROM _pgr_dijkstra(_pgr_get_statement($1), $2::BIGINT[], $3::BIGINT[], $4, false, true);
+    FROM _pgr_dijkstrav4(_pgr_get_statement($1), NULL::TEXT, $2::BIGINT[], $3::BIGINT[], $4, false, true, 0, false);
 $BODY$
 LANGUAGE sql VOLATILE STRICT
 COST 100
@@ -156,7 +156,7 @@ CREATE FUNCTION pgr_dijkstra(
 RETURNS SETOF RECORD AS
 $BODY$
     SELECT seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
-    FROM _pgr_dijkstra(_pgr_get_statement($1), _pgr_get_statement($2), $3, false, true);
+    FROM _pgr_dijkstrav4(_pgr_get_statement($1), _pgr_get_statement($2), NULL::BIGINT[], NULL::BIGINT[], $3, false, true, 0, false);
 $BODY$
 LANGUAGE sql VOLATILE STRICT
 COST 100