Skip to content

Commit 20cc7f9

Browse files
cvvergaracvvergara
committed
Merge remote-tracking branch 'upstream/develop' into bipashabg-2025
2 parents 5dfcbe4 + bd2cff4 commit 20cc7f9

31 files changed

+734
-711
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ notUsed
1212

1313
.vscode
1414
taptest.sh
15+
run.sh

‎NEWS.md‎

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ Functions promoted to official
5454

5555
**Signatures promoted to official**
5656

57+
[#2718](https://github.com/pgRouting/pgrouting/issues/2918)
58+
Make official the Combinations signature on the official functions
59+
5760
* pgr_aStar(Combinations)
5861
* pgr_aStarCost(Combinations)
5962
* pgr_bdAstar(Combinations)
@@ -68,14 +71,45 @@ Functions promoted to official
6871
* pgr_maxFlow(Combinations)
6972
* pgr_pushRelabel(Combinations)
7073

71-
SQL signatures modification on functions
74+
SQL signatures and output standardization
7275
...............................................................................
7376

77+
[#2904](https://github.com/pgRouting/pgrouting/issues/2904)
78+
Standardize output columns of functions with different output columns within overloads
79+
80+
**Official functions**
81+
82+
* [#2905](https://github.com/pgRouting/pgrouting/issues/2905)
83+
pgr_withPoints
84+
85+
* Output columns standardized to ``(seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)``
86+
* Function promoted to official.
87+
* Signature change: ``driving_side`` parameter changed from named optional to
88+
unnamed positional.
89+
- Directed graph valid values: ``l`` or ``L`` and ``r``, ``R``
90+
- Undirected graph valid values: ``b`` or ``B``
91+
7492
* [#2906](https://github.com/pgRouting/pgrouting/issues/2906) pgr_bdDijkstra
7593

7694
* Output columns standardized to ``(seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)``
7795
* Combinations signature promoted to official.
7896

97+
**Experimental functions**
98+
99+
* [#2907](https://github.com/pgRouting/pgrouting/issues/2907)
100+
pgr_bellmanFord
101+
102+
* Output columns standardized to ``(seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)``
103+
104+
* [#2910](https://github.com/pgRouting/pgrouting/issues/2910)
105+
pgr_edwardMoore
106+
107+
* Output columns standardized to ``(seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)``
108+
109+
* [#2913](https://github.com/pgRouting/pgrouting/issues/2913)
110+
pgr_DAGshortestPath
111+
112+
* Output columns standardized to ``(seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)``
79113

80114
Removal of SQL deprecated signatures
81115
...............................................................................
@@ -170,6 +204,10 @@ Related issues: [#2897](https://github.com/pgRouting/pgrouting/issues/2897)
170204
* _v4trsp(text,text,text,boolean)
171205
* _pgr_tspeuclidean(text,bigint,bigint,double precision,integer,integer,integer,double precision,double precision,double precision,boolean)
172206
* _pgr_tsp(text,bigint,bigint,double precision,integer,integer,integer,double precision,double precision,double precision,boolean)
207+
* [#2913](https://github.com/pgRouting/pgrouting/issues/2913)
208+
_pgr_dagshortestpath(text,text,boolean,boolean)
209+
* [#2913](https://github.com/pgRouting/pgrouting/issues/2913)
210+
_pgr_dagshortestpath(text,anyarray,anyarray,boolean,boolean)
173211

174212

175213
* [#2861](https://github.com/pgRouting/pgrouting/issues/2861):
@@ -216,5 +254,7 @@ Code enhancements
216254
* _v4trsp(text,text,anyarray,anyarray,boolean)
217255
* _v4trsp(text,text,text,boolean)
218256
* _pgr_withpointsdd(text,text,anyarray,double precision,boolean,character,boolean,boolean)
257+
* [#2913](https://github.com/pgRouting/pgrouting/issues/2913)
258+
_pgr_dagshortestpath
219259

220260
</details>

‎doc/bellman_ford/pgr_bellmanFord.rst‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424

2525
.. rubric:: Availability:
2626

27+
.. rubric:: Version 4.0.0
28+
29+
* Output columns standardized to |short-generic-result|
30+
2731
.. rubric:: Version 3.2.0
2832

2933
* New experimental signature:
@@ -87,7 +91,7 @@ Signatures
8791
| pgr_bellmanFord(`Edges SQL`_, **start vids**, **end vids**, [``directed``])
8892
| pgr_bellmanFord(`Edges SQL`_, `Combinations SQL`_, [``directed``])
8993
90-
| Returns set of |old-generic-result|
94+
| Returns set of |short-generic-result|
9195
| OR EMPTY SET
9296
9397
.. index::
@@ -101,7 +105,7 @@ One to One
101105

102106
| pgr_bellmanFord(`Edges SQL`_, **start vid**, **end vid**, [``directed``])
103107
104-
| Returns set of |result-1-1|
108+
| Returns set of |short-generic-result|
105109
| OR EMPTY SET
106110
107111
:Example: From vertex :math:`6` to vertex :math:`10` on a **directed** graph
@@ -121,7 +125,7 @@ One to Many
121125

122126
| pgr_bellmanFord(`Edges SQL`_, **start vid**, **end vids**, [``directed``])
123127
124-
| Returns set of |result-1-m|
128+
| Returns set of |short-generic-result|
125129
| OR EMPTY SET
126130
127131
:Example: From vertex :math:`6` to vertices :math:`\{10, 17\}` on a **directed**
@@ -142,7 +146,7 @@ Many to One
142146

143147
| pgr_bellmanFord(`Edges SQL`_, **start vids**, **end vid**, [``directed``])
144148
145-
| Returns set of |result-m-1|
149+
| Returns set of |short-generic-result|
146150
| OR EMPTY SET
147151
148152
:Example: From vertices :math:`\{6, 1\}` to vertex :math:`17` on a **directed**
@@ -187,7 +191,7 @@ Combinations
187191
| Returns set of |short-generic-result|
188192
| OR EMPTY SET
189193
190-
:Example: Using a combinations table on an **undirected** graph.
194+
:Example: Using a combinations table on an **undirected** graph
191195

192196
The combinations table:
193197

@@ -236,8 +240,8 @@ Result columns
236240
-------------------------------------------------------------------------------
237241

238242
.. include:: pgRouting-concepts.rst
239-
:start-after: return_path_short_start
240-
:end-before: return_path_short_end
243+
:start-after: return_path_complete_start
244+
:end-before: return_path_complete_end
241245

242246
Additional Examples
243247
-------------------------------------------------------------------------------

‎doc/bellman_ford/pgr_edwardMoore.rst‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Copyright(c) pgRouting Contributors
55
66
This documentation is licensed under a Creative Commons Attribution-Share
7-
Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/
7+
Alike 3.0 License: https://creativecommons.org/licenses/by-sa/3.0/
88
****************************************************************************
99

1010
.. index::
@@ -25,6 +25,10 @@
2525

2626
.. rubric:: Availability
2727

28+
.. rubric:: Version 4.0.0
29+
30+
* Output columns standardized to |short-generic-result|
31+
2832
.. rubric:: Version 3.2.0
2933

3034
* New experimental signature:
@@ -95,7 +99,7 @@ Signatures
9599
| pgr_edwardMoore(`Edges SQL`_, **start vids**, **end vids**, [``directed``])
96100
| pgr_edwardMoore(`Edges SQL`_, `Combinations SQL`_, [``directed``])
97101
98-
| Returns set of |old-generic-result|
102+
| Returns set of |short-generic-result|
99103
| OR EMPTY SET
100104
101105
.. index::
@@ -109,7 +113,7 @@ One to One
109113

110114
| pgr_edwardMoore(`Edges SQL`_, **start vid**, **end vid**, [``directed``])
111115
112-
| Returns set of |result-1-1|
116+
| Returns set of |short-generic-result|
113117
| OR EMPTY SET
114118
115119
:Example: From vertex :math:`6` to vertex :math:`10` on a **directed** graph
@@ -129,11 +133,11 @@ One to Many
129133

130134
| pgr_edwardMoore(`Edges SQL`_, **start vid**, **end vids**, [``directed``])
131135
132-
| Returns set of |result-1-m|
136+
| Returns set of |short-generic-result|
133137
| OR EMPTY SET
134138
135-
:Example: From vertex :math:`6` to vertices :math:`\{ 10, 17\}` on a
136-
**directed** graph
139+
:Example: From vertex :math:`6` to vertices :math:`\{10, 17\}` on a **directed**
140+
graph
137141

138142
.. literalinclude:: edwardMoore.queries
139143
:start-after: -- q3
@@ -150,7 +154,7 @@ Many to One
150154

151155
| pgr_edwardMoore(`Edges SQL`_, **start vids**, **end vid**, [``directed``])
152156
153-
| Returns set of |result-m-1|
157+
| Returns set of |short-generic-result|
154158
| OR EMPTY SET
155159
156160
:Example: From vertices :math:`\{6, 1\}` to vertex :math:`17` on a **directed**
@@ -244,8 +248,8 @@ Result columns
244248
-------------------------------------------------------------------------------
245249

246250
.. include:: pgRouting-concepts.rst
247-
:start-after: return_path_short_start
248-
:end-before: return_path_short_end
251+
:start-after: return_path_complete_start
252+
:end-before: return_path_complete_end
249253

250254
Additional Examples
251255
-------------------------------------------------------------------------------

‎doc/dagShortestPath/pgr_dagShortestPath.rst‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,19 @@ In particular, the DAG shortest paths algorithm implemented by Boost.Graph.
2727

2828
.. rubric:: Availability
2929

30-
* Version 3.2.0
30+
.. rubric:: Version 4.0.0
3131

32-
* New experimental function.
32+
* Output columns standardized to |short-generic-result|
3333

34-
* pgr_dagShortestPath(Combinations)
34+
.. rubric:: Version 3.2.0
3535

36-
* Version 3.0.0
36+
* New experimental function.
3737

38-
* New experimental function.
38+
* pgr_dagShortestPath(Combinations)
39+
40+
..rubric:: Version 3.0.0
41+
42+
* New experimental function.
3943

4044

4145
Description
@@ -93,7 +97,7 @@ Signatures
9397
| pgr_dagShortestPath(`Edges SQL`_, **start vids**, **end vids**)
9498
| pgr_dagShortestPath(`Edges SQL`_, `Combinations SQL`_)
9599
96-
| Returns set of |result-1-1|
100+
| Returns set of |short-generic-result|
97101
| OR EMPTY SET
98102
99103

@@ -108,7 +112,7 @@ One to One
108112

109113
| pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vid**)
110114
111-
| Returns set of |result-1-1|
115+
| Returns set of |short-generic-result|
112116
| OR EMPTY SET
113117
114118
:Example: From vertex :math:`5` to vertex :math:`11` on a **directed** graph
@@ -128,7 +132,7 @@ One to Many
128132

129133
| pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vids**)
130134
131-
| Returns set of |result-1-1|
135+
| Returns set of |short-generic-result|
132136
| OR EMPTY SET
133137
134138
:Example: From vertex :math:`5` to vertices :math:`\{7, 11\}`
@@ -148,7 +152,7 @@ Many to One
148152

149153
| pgr_dagShortestPath(`Edges SQL`_, **start vids**, **end vid**)
150154
151-
| Returns set of |result-1-1|
155+
| Returns set of |short-generic-result|
152156
| OR EMPTY SET
153157
154158
:Example: From vertices :math:`\{5, 10\}` to vertex :math:`11`
@@ -168,7 +172,7 @@ Many to Many
168172

169173
| pgr_dagShortestPath(`Edges SQL`_, **start vids**, **end vids**)
170174
171-
| Returns set of |result-1-1|
175+
| Returns set of |short-generic-result|
172176
| OR EMPTY SET
173177
174178
:Example: From vertices :math:`\{5, 15\}` to vertices :math:`\{11, 17\}` on an
@@ -189,7 +193,7 @@ Combinations
189193

190194
| pgr_dagShortestPath(`Edges SQL`_, `Combinations SQL`_)
191195
192-
| Returns set of |result-1-1|
196+
| Returns set of |short-generic-result|
193197
| OR EMPTY SET
194198
195199
:Example: Using a combinations table on an **undirected** graph
@@ -234,8 +238,8 @@ Return columns
234238
-------------------------------------------------------------------------------
235239

236240
.. include:: pgRouting-concepts.rst
237-
:start-after: return_path_short_start
238-
:end-before: return_path_short_end
241+
:start-after: return_path_complete_start
242+
:end-before: return_path_complete_end
239243

240244
Additional Examples
241245
-------------------------------------------------------------------------------

0 commit comments

Comments
 (0)