Skip to content

Commit 17ffdea

Browse files
bipashabgbipashabg
authored
Merge branch 'bipashabg-2025' into week-0-sloan-ordering
2 parents 2673c48 + 7d62acb commit 17ffdea

File tree

234 files changed

+6190
-7624
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

234 files changed

+6190
-7624
lines changed

‎.github/workflows/ubuntu.yml‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,28 +29,28 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131
matrix:
32-
psql: [13,14,15,16,17]
32+
psql: [13,14,15,16,17,18]
3333
postgis: [3]
34-
os: [ubuntu-latest, ubuntu-22.04, ubuntu-20.04]
34+
os: [ubuntu-latest, ubuntu-22.04]
3535

3636
steps:
3737
- uses: actions/checkout@v4
3838

39-
- name: get postgres version
39+
- name: 'Raise Priority for apt.postgresql.org'
4040
run: |
41-
sudo service postgresql start
42-
pgver=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d+ \()')
43-
echo "PGVER=${pgver}" >> $GITHUB_ENV
44-
PGP=5433
45-
if [ "${{ matrix.psql }}" == "${pgver}" ]; then PGP=5432; fi
46-
echo "PGPORT=${PGP}" >> $GITHUB_ENV
47-
41+
cat << EOF >> ./pgdg.pref
42+
Package: *
43+
Pin: release o=apt.postgresql.org
44+
Pin-Priority: 600
45+
EOF
46+
sudo mv ./pgdg.pref /etc/apt/preferences.d/
47+
sudo apt update
48+
4849
- name: Add PostgreSQL APT repository
4950
run: |
50-
sudo apt-get install curl ca-certificates gnupg
51-
curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
52-
sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ \
53-
$(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
51+
sudo apt-get purge postgresql-*
52+
sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg-testing main ${{ matrix.psql }}" > /etc/apt/sources.list.d/pgdg.list'
53+
curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg >/dev/null
5454
5555
- name: Install dependencies
5656
run: |
@@ -81,6 +81,7 @@ jobs:
8181
run: |
8282
sudo service postgresql start
8383
export PG_RUNNER_USER=`whoami`
84+
export PGPORT=5432
8485
sudo -u postgres psql -p ${PGPORT} -c "DROP DATABASE IF EXISTS ___pgr___test___;"
8586
sudo -u postgres psql -p ${PGPORT} -c "DROP DATABASE IF EXISTS \"${PG_RUNNER_USER}\";"
8687
sudo -u postgres psql -p ${PGPORT} -c "DROP ROLE IF EXISTS \"${PG_RUNNER_USER}\";"

‎NEWS.md‎

Lines changed: 76 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,23 @@ To see all issues & pull requests closed by this release see the [Git closed
1313
milestone for 4.0.0
1414
](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%204.0.0%22)
1515

16-
**Functions promoted to official**
16+
Functions promoted to official
17+
...............................................................................
1718

1819
* pgr_trsp
1920
* pgr_trspVia
2021
* pgr_trspVia_withPoints
2122
* pgr_trsp_withPoints
22-
* pgr_withPoints
23-
* pgr_withPointsCost
23+
* [#2905](https://github.com/pgRouting/pgrouting/issues/2905) pgr_withPoints
24+
25+
* Output columns standardized to ``(seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)``
26+
* Function promoted to official.
27+
28+
* [#2905](https://github.com/pgRouting/pgrouting/issues/2905) pgr_withPointsCost
29+
30+
* Output columns standardized to ``(start_vid, end_vid, agg_cost)``
31+
* Function promoted to official.
32+
2433
* pgr_withPointsCostMatrix
2534
* pgr_withPointsDD
2635
* pgr_withPointsKSP
@@ -42,11 +51,17 @@ milestone for 4.0.0
4251
* pgr_maxFlow(Combinations)
4352
* pgr_pushRelabel(Combinations)
4453

45-
**code enhancements:**
54+
SQL signatures modification on functions
55+
...............................................................................
4656

47-
* Removal of unused C/C++ code
57+
* [#2906](https://github.com/pgRouting/pgrouting/issues/2906) pgr_bdDijkstra
58+
59+
* Output columns standardized to ``(seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)``
60+
* Combinations signature promoted to official.
4861

49-
**Removal of SQL deprecated signatures**
62+
63+
Removal of SQL deprecated signatures
64+
...............................................................................
5065

5166
* [#2798](https://github.com/pgRouting/pgrouting/issues/2798):
5267
pgr_contraction
@@ -58,7 +73,35 @@ milestone for 4.0.0
5873
* pgr_trsp(text,integer,integer,boolean,boolean,text)
5974
* pgr_trsp(text,integer,double precision,integer,double precision,boolean,boolean,text)
6075

61-
**Removal of SQL deprecated functions**
76+
* [#2888](https://github.com/pgRouting/pgrouting/issues/2888):
77+
pgr_findCloseEdges
78+
79+
* pgr_findcloseedges(text,geometry,double precision,integer,boolean,boolean)
80+
* pgr_findcloseedges(text,geometry[],double precision,integer,boolean,boolean)
81+
82+
* [#2890](https://github.com/pgRouting/pgrouting/issues/2890):
83+
pgr_withPointsDD
84+
85+
* pgr_withpointsdd(text,text,anyarray,double precision,boolean,character,boolean,boolean)
86+
* pgr_withpointsdd(text,text,bigint,double precision,boolean,character,boolean)
87+
88+
* [#2895](https://github.com/pgRouting/pgrouting/issues/2895):
89+
pgr_withPointsKSP
90+
91+
* pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,character,boolean)
92+
93+
* [#2899](https://github.com/pgRouting/pgrouting/issues/2899):
94+
pgr_maxCardinalityMatch
95+
96+
* pgr_maxcardinalitymatch(text,boolean)
97+
98+
* [#2901](https://github.com/pgRouting/pgrouting/issues/2901): TSP family
99+
100+
* pgr_tsp(text,bigint,bigint,double precision,integer,integer,integer,double precision,double precision,double precision,boolean)
101+
* pgr_tspeuclidean(text,bigint,bigint,double precision,integer,integer,integer,double precision,double precision,double precision,boolean)
102+
103+
Removal of SQL deprecated functions
104+
...............................................................................
62105

63106
* [#2681](https://github.com/pgRouting/pgrouting/issues/2681):
64107
pgr_trspviaedges
@@ -74,27 +117,42 @@ milestone for 4.0.0
74117
pgr_analyzeOneWay
75118
* [#2827](https://github.com/pgRouting/pgrouting/issues/2827):
76119
pgr_createVerticesTable
120+
* [#2886](https://github.com/pgRouting/pgrouting/issues/2886):
121+
pgr_nodeNetwork
122+
123+
rubric:: Removal of SQL deprecated internal functions
124+
...............................................................................
77125

78-
**Removal of SQL deprecated internal functions**
126+
Related issues: [#2897](https://github.com/pgRouting/pgrouting/issues/2897)
79127

80128
* _pgr_dijkstranear(text,anyarray,anyarray,bigint,boolean)
81129
* _pgr_dijkstranear(text,anyarray,bigint,bigint,boolean)
82130
* _pgr_dijkstranear(text,bigint,anyarray,bigint,boolean)
83131
* _pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean,bigint)
84132
* _pgr_dijkstra(text,text,boolean,boolean,boolean)
85133
* _pgr_drivingdistance(text,anyarray,double precision,boolean,boolean)
134+
* _pgr_ksp(text,anyarray,anyarray,integer,boolean,boolean,boolean)
135+
* _pgr_ksp(text,bigint,bigint,integer,boolean,boolean)
136+
* _pgr_ksp(text,text,integer,boolean,boolean)
86137
* _pgr_kruskal(text,anyarray,text,bigint,double precision)
138+
* _pgr_maxcardinalitymatch(text,boolean)
87139
* _pgr_prim(text,anyarray,text,bigint,double precision)
88140
* _pgr_trsp(text,integer,double precision,integer,double precision,boolean,boolean,text)
89141
* _pgr_trsp(text,text,anyarray,anyarray,boolean)
90142
* _pgr_trsp(text,text,anyarray,bigint,boolean)
91143
* _pgr_trsp(text,text,bigint,anyarray,boolean)
92144
* _pgr_trsp(text,text,bigint,bigint,boolean)
93145
* _pgr_trspviavertices(text,integer[],boolean,boolean,text)
146+
* _pgr_withpointsdd(text,text,anyarray,double precision,boolean,character,boolean,boolean)
147+
* _pgr_withpointsksp(text,text,anyarray,anyarray,integer,character,boolean,boolean,boolean,boolean)
148+
* _pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,character,boolean)
149+
* _pgr_withpointsksp(text,text,text,integer,character,boolean,boolean,boolean)
94150
* _pgr_withpointsvia(text,bigint[],double precision[],boolean)
95151
* _trsp(text,text,anyarray,anyarray,boolean)
96152
* _v4trsp(text,text,anyarray,anyarray,boolean)
97153
* _v4trsp(text,text,text,boolean)
154+
* _pgr_tspeuclidean(text,bigint,bigint,double precision,integer,integer,integer,double precision,double precision,double precision,boolean)
155+
* _pgr_tsp(text,bigint,bigint,double precision,integer,integer,integer,double precision,double precision,double precision,boolean)
98156

99157

100158
* [#2861](https://github.com/pgRouting/pgrouting/issues/2861):
@@ -119,6 +177,15 @@ milestone for 4.0.0
119177
- _pgr_startpoint(geometry)
120178
- _pgr_versionless(text,text)
121179

180+
Code enhancements
181+
...............................................................................
182+
183+
* Removal of unused C/C++ code
184+
* Refactor the Script to build the update PostgreSQL file.
185+
* One driver for:
186+
187+
* allpairs: johnson and Flowy-Warshall
188+
* Shortest path: Dijkstra and withPoints using Dijkstra
122189

123190
**Deprecation of internal C/C++ functions**
124191

@@ -131,5 +198,6 @@ milestone for 4.0.0
131198
* _trsp(text,text,anyarray,anyarray,boolean)
132199
* _v4trsp(text,text,anyarray,anyarray,boolean)
133200
* _v4trsp(text,text,text,boolean)
201+
* _pgr_withpointsdd(text,text,anyarray,double precision,boolean,character,boolean,boolean)
134202

135203
</details>

‎configuration.conf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,4 @@ categories | N | N | Y
5252
#----------------------
5353
# SQL only directories
5454
#----------------------
55-
topology | N | Y | Y
5655
utilities | N | Y | Y

‎doc/_static/page_history.js‎

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -207,29 +207,10 @@ var filesArr = [
207207
{ v: '2.1', n: 'src/apsp_johnson/doc/index'},
208208
{ v: '2.3', n: 'src/allpairs/doc/pgr_johnson'}
209209
]),
210-
new createInfo('pgr_nodeNetwork', '2.0', [
211-
{ v: '2.1', n: 'src/common/doc/functions/node_network'},
212-
{ v: '2.3', n: 'src/topology/doc/pgr_nodeNetwork'},
213-
]),
214-
new createInfo('topology-functions', '2.0', [
210+
new createInfo('utilities-family', '2.0', [
215211
{ v: '2.1', n: 'src/common/doc/functions/index'},
216212
{ v: '2.3', n: 'src/topology/doc/topology'},
217-
]),
218-
new createInfo('pgr_createVerticesTable', '2.0', [
219-
{ v: '2.1', n: 'src/common/doc/functions/create_vert_table'},
220-
{ v: '2.3', n: 'src/topology/doc/pgr_createVerticesTable'}, 3.8
221-
]),
222-
new createInfo('pgr_createTopology', '2.0', [
223-
{ v: '2.1', n: 'src/common/doc/functions/create_topology'},
224-
{ v: '2.3', n: 'src/topology/doc/pgr_createTopology'}, 3.8
225-
]),
226-
new createInfo('pgr_analyzeOneWay', '2.0', [
227-
{ v: '2.1', n: 'src/common/doc/functions/analyze_oneway'},
228-
{ v: '2.3', n: 'src/topology/doc/pgr_analyzeOneWay'}, 3.8
229-
]),
230-
new createInfo('pgr_analyzeGraph', '2.0', [
231-
{ v: '2.1', n: 'src/common/doc/functions/analyze_graph'},
232-
{ v: '2.3', n: 'src/topology/doc/pgr_analyzeGraph'},
213+
{ v: '3.8', n: 'topology-functions'},
233214
]),
234215
new createInfo('pgRouting-concepts', '2.0', [
235216
{ v: '2.3', n: 'doc/src/tutorial/tutorial'},
@@ -260,6 +241,27 @@ var filesArr = [
260241
{ v: '2.1', n: 'src/driving_distance/doc/dd_driving_distance_v3'},
261242
{ v: '2.3', n: 'src/driving_distance/doc/pgr_drivingDistance'}
262243
]),
244+
245+
new createInfo('pgr_nodeNetwork', '2.0', [
246+
{ v: '2.1', n: 'src/common/doc/functions/node_network'},
247+
{ v: '2.3', n: 'src/topology/doc/pgr_nodeNetwork'}, 3.8
248+
]),
249+
new createInfo('pgr_createVerticesTable', '2.0', [
250+
{ v: '2.1', n: 'src/common/doc/functions/create_vert_table'},
251+
{ v: '2.3', n: 'src/topology/doc/pgr_createVerticesTable'}, 3.8
252+
]),
253+
new createInfo('pgr_createTopology', '2.0', [
254+
{ v: '2.1', n: 'src/common/doc/functions/create_topology'},
255+
{ v: '2.3', n: 'src/topology/doc/pgr_createTopology'}, 3.8
256+
]),
257+
new createInfo('pgr_analyzeOneWay', '2.0', [
258+
{ v: '2.1', n: 'src/common/doc/functions/analyze_oneway'},
259+
{ v: '2.3', n: 'src/topology/doc/pgr_analyzeOneWay'}, 3.8
260+
]),
261+
new createInfo('pgr_analyzeGraph', '2.0', [
262+
{ v: '2.1', n: 'src/common/doc/functions/analyze_graph'},
263+
{ v: '2.3', n: 'src/topology/doc/pgr_analyzeGraph'}, 3.8
264+
]),
263265
new createInfo('pgr_alphaShape', '2.0', [
264266
{ v: '2.1', n: 'src/driving_distance/doc/dd_alphashape'},
265267
{ v: '2.3', n: 'src/alpha_shape/doc/pgr_alphaShape'}, 3.8

‎doc/bdDijkstra/pgr_bdDijkstra.rst‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,37 +21,38 @@ algorithm.
2121

2222
.. rubric:: Availability:
2323

24-
* Version 4.0.0
24+
.. rubric:: Version 4.0.0
2525

26-
* Combinations signature promoted to official.
26+
* Output columns standardized to |short-generic-result|
27+
* Combinations signature promoted to official.
2728

28-
* Version 3.2.0
29+
.. rubric:: Version 3.2.0
2930

30-
* New proposed signature:
31+
* New proposed signature:
3132

32-
* pgr_bdDijkstra(Combinations)
33+
* pgr_bdDijkstra(Combinations)
3334

34-
* Version 3.0.0
35+
.. rubric:: Version 3.0.0
3536

36-
* Function promoted to official.
37+
* Function promoted to official.
3738

38-
* Version 2.5.0
39+
.. rubric:: Version 2.5.0
3940

40-
* New proposed signatures:
41+
* New proposed signatures:
4142

42-
* pgr_bdDijkstra(One to Many)
43-
* pgr_bdDijkstra(Many to One)
44-
* pgr_bdDijkstra(Many to Many)
43+
* pgr_bdDijkstra(One to Many)
44+
* pgr_bdDijkstra(Many to One)
45+
* pgr_bdDijkstra(Many to Many)
4546

46-
* Version 2.4.0
47+
.. rubric:: Version 2.4.0
4748

48-
* Signature change on pgr_bdDijsktra(One to One)
49+
* Signature change on pgr_bdDijsktra(One to One)
4950

50-
* Old signature no longer supported
51+
* Old signature no longer supported
5152

52-
* Version 2.0.0
53+
.. rubric:: Version 2.0.0
5354

54-
* New official function.
55+
* New official function.
5556

5657

5758
Description
@@ -79,7 +80,7 @@ Signatures
7980
| pgr_bdDijkstra(`Edges SQL`_, **start vids**, **end vids**, [``directed``])
8081
| pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_, [``directed``])
8182
82-
| Returns set of |old-generic-result|
83+
| Returns set of |short-generic-result|
8384
| OR EMPTY SET
8485
8586
.. index::
@@ -93,7 +94,7 @@ One to One
9394

9495
| pgr_bdDijkstra(`Edges SQL`_, **start vid**, **end vid**, [``directed``])
9596
96-
| Returns set of |result-1-1|
97+
| Returns set of |short-generic-result|
9798
| OR EMPTY SET
9899
99100
:Example: From vertex :math:`6` to vertex :math:`10` on a **directed** graph
@@ -113,7 +114,7 @@ One to Many
113114

114115
| pgr_bdDijkstra(`Edges SQL`_, **start vid**, **end vids**, [``directed``])
115116
116-
| Returns set of |result-1-m|
117+
| Returns set of |short-generic-result|
117118
| OR EMPTY SET
118119
119120
:Example: From vertex :math:`6` to vertices :math:`\{10, 17\}` on a **directed**
@@ -134,7 +135,7 @@ Many to One
134135

135136
| pgr_bdDijkstra(`Edges SQL`_, **start vids**, **end vid**, [``directed``])
136137
137-
| Returns set of |result-m-1|
138+
| Returns set of |short-generic-result|
138139
| OR EMPTY SET
139140
140141
:Example: From vertices :math:`\{6, 1\}` to vertex :math:`17` on a **directed**

‎doc/conf.py.in‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,11 @@ linkcheck_ignore = [
333333
r'https://github.com/pgRouting/pgrouting/issues/*', # limit only pgrouting
334334
r'https://github.com/pgRouting/pgrouting/archive/*',
335335
r'https://docs.pgrouting.org/3.8/*',
336-
r'https://www.overpass-api.de/*'
336+
# Currently has a problem
337+
'https://www.boost.org/doc/libs/1_78_0/libs/graph/doc/hawick_circuits.html',
338+
r'https://www.overpass-api.de/*',
339+
# 403 Client error
340+
'https://gis.stackexchange.com/questions/tagged/pgrouting'
337341
]
338342

339343
linkcheck_timeout = 20
@@ -347,15 +351,10 @@ rst_epilog="""
347351
.. |short-generic-result| replace:: ``(seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)``
348352
.. |via-result| replace:: ``(seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost, route_agg_cost)``
349353
.. |matrix-result| replace:: ``(start_vid, end_vid, agg_cost)``
350-
.. |matrix-pid| replace:: ``(start_pid, end_pid, agg_cost)``
351354
.. |ksp-result| replace:: ``(seq, path_id, path_seq, node, edge, cost, agg_cost)``
352355
.. |tsp-result| replace:: ``(seq, node, cost, agg_cost)``
353356
.. |nksp-result| replace:: ``(seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)``
354357
.. |old-generic-result| replace:: ``(seq, path_seq, [start_vid], [end_vid], node, edge, cost, agg_cost)``
355-
.. |old-pid-result| replace:: ``(seq, path_seq, [start_pid], [end_pid], node, edge, cost, agg_cost)``
356-
.. |pid-1-m| replace:: ``(seq, path_seq, end_pid, node, edge, cost, agg_cost)``
357-
.. |pid-m-1| replace:: ``(seq, path_seq, start_pid, node, edge, cost, agg_cost)``
358-
.. |pid-m-m| replace:: ``(seq, path_seq, start_pid, end_pid, node, edge, cost, agg_cost)``
359358
.. |result-1-1| replace:: ``(seq, path_seq, node, edge, cost, agg_cost)``
360359
.. |result-1-m| replace:: ``(seq, path_seq, end_vid, node, edge, cost, agg_cost)``
361360
.. |result-m-1| replace:: ``(seq, path_seq, start_vid, node, edge, cost, agg_cost)``

0 commit comments

Comments
 (0)