Skip to content

Commit 83b8d30

Browse files
cvvergaracvvergara
committed
updating NEWS VERSION, script & queries with current results
fixing release notes
1 parent c6cd732 commit 83b8d30

File tree

8 files changed

+137
-90
lines changed

8 files changed

+137
-90
lines changed

‎NEWS‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,38 @@ To see the issues closed by this release see the [Git closed milestone for 2.5.4
66

77
*Bug fixes*
88

9-
* Fix server crash on several functions.
9+
* Fixes server crash on several functions.
10+
11+
* pgr_floydWarshall
12+
* pgr_johnson
13+
* pgr_astar
14+
* pgr_bdAstar
15+
* pgr_bdDijstra
16+
* pgr_alphashape
17+
* pgr_dijkstraCostMatrix
18+
* pgr_dijkstra
19+
* pgr_dijkstraCost
20+
* pgr_drivingDistance
21+
* pgr_KSP
22+
* pgr_dijkstraVia (proposed)
23+
* pgr_boykovKolmogorov (proposed)
24+
* pgr_edgeDisjointPaths (proposed)
25+
* pgr_edmondsKarp (proposed)
26+
* pgr_maxCardinalityMatch (proposed)
27+
* pgr_maxFlow (proposed)
28+
* pgr_withPoints (proposed)
29+
* pgr_withPointsCost (proposed)
30+
* pgr_withPointsKSP (proposed)
31+
* pgr_withPointsDD (proposed)
32+
* pgr_withPointsCostMatrix (proposed)
33+
* pgr_contractGraph (experimental)
34+
* pgr_pushRelabel (experimental)
35+
* pgr_vrpOneDepot (experimental)
36+
* pgr_gsoc_vrppdtw (experimental)
37+
* Fixes for deprecated functions where also applied but not tested
38+
39+
* Removed compilation warning for g++8
40+
* Fixed a fallthrugh on Astar and bdAstar.
1041

1142

1243
pgRouting 2.5.3 Release Notes

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6318-d53cb3a release/3.0
1+
6320-5176673 release/2.5

‎doc/queries/doc-astar.queries‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ SELECT * FROM pgr_astar(
2222
directed := false, heuristic := 2);
2323
seq | path_seq | node | edge | cost | agg_cost
2424
-----+----------+------+------+------+----------
25-
1 | 1 | 2 | 2 | 1 | 0
26-
2 | 2 | 3 | 3 | 1 | 1
27-
3 | 3 | 4 | 16 | 1 | 2
28-
4 | 4 | 9 | 15 | 1 | 3
25+
1 | 1 | 2 | 4 | 1 | 0
26+
2 | 2 | 5 | 8 | 1 | 1
27+
3 | 3 | 6 | 11 | 1 | 2
28+
4 | 4 | 11 | 13 | 1 | 3
2929
5 | 5 | 12 | -1 | 0 | 4
3030
(5 rows)
3131

@@ -42,8 +42,8 @@ SELECT * FROM pgr_astar(
4242
5 | 5 | 3 | 4 | 3 | 1 | 4
4343
6 | 6 | 3 | 3 | -1 | 0 | 5
4444
7 | 1 | 12 | 2 | 4 | 1 | 0
45-
8 | 2 | 12 | 5 | 10 | 1 | 1
46-
9 | 3 | 12 | 10 | 12 | 1 | 2
45+
8 | 2 | 12 | 5 | 8 | 1 | 1
46+
9 | 3 | 12 | 6 | 11 | 1 | 2
4747
10 | 4 | 12 | 11 | 13 | 1 | 3
4848
11 | 5 | 12 | 12 | -1 | 0 | 4
4949
(11 rows)

‎doc/queries/doc-pgr_bdAstar.queries‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ SELECT * FROM pgr_bdAstar(
1111
seq | path_seq | node | edge | cost | agg_cost
1212
-----+----------+------+------+------+----------
1313
1 | 1 | 2 | 4 | 1 | 0
14-
2 | 2 | 5 | 8 | 1 | 1
15-
3 | 3 | 6 | 9 | 1 | 2
16-
4 | 4 | 9 | 16 | 1 | 3
17-
5 | 5 | 4 | 3 | 1 | 4
18-
6 | 6 | 3 | -1 | 0 | 5
14+
2 | 2 | 5 | 8 | 1 | 3
15+
3 | 3 | 6 | 9 | 1 | 5
16+
4 | 4 | 9 | 16 | 1 | 8
17+
5 | 5 | 4 | 3 | 1 | 9
18+
6 | 6 | 3 | -1 | 0 | 10
1919
(6 rows)
2020

2121
-- q2
@@ -28,11 +28,11 @@ SELECT * FROM pgr_bdAstar(
2828
seq | path_seq | node | edge | cost | agg_cost
2929
-----+----------+------+------+------+----------
3030
1 | 1 | 2 | 4 | 1 | 0
31-
2 | 2 | 5 | 8 | 1 | 1
32-
3 | 3 | 6 | 9 | 1 | 2
33-
4 | 4 | 9 | 16 | 1 | 3
34-
5 | 5 | 4 | 3 | 1 | 4
35-
6 | 6 | 3 | -1 | 0 | 5
31+
2 | 2 | 5 | 8 | 1 | 2
32+
3 | 3 | 6 | 9 | 1 | 3
33+
4 | 4 | 9 | 16 | 1 | 4
34+
5 | 5 | 4 | 3 | 1 | 5
35+
6 | 6 | 3 | -1 | 0 | 6
3636
(6 rows)
3737

3838
-- q3
@@ -45,11 +45,11 @@ SELECT * FROM pgr_bdAstar(
4545
seq | path_seq | end_vid | node | edge | cost | agg_cost
4646
-----+----------+---------+------+------+------+----------
4747
1 | 1 | 3 | 2 | 4 | 1 | 0
48-
2 | 2 | 3 | 5 | 8 | 1 | 1
49-
3 | 3 | 3 | 6 | 9 | 1 | 2
50-
4 | 4 | 3 | 9 | 16 | 1 | 3
51-
5 | 5 | 3 | 4 | 3 | 1 | 4
52-
6 | 6 | 3 | 3 | -1 | 0 | 5
48+
2 | 2 | 3 | 5 | 8 | 1 | 25.5
49+
3 | 3 | 3 | 6 | 9 | 1 | 38.75
50+
4 | 4 | 3 | 9 | 16 | 1 | 64.25
51+
5 | 5 | 3 | 4 | 3 | 1 | 65.25
52+
6 | 6 | 3 | 3 | -1 | 0 | 66.25
5353
7 | 1 | 11 | 2 | 4 | 1 | 0
5454
8 | 2 | 11 | 5 | 8 | 1 | 1
5555
9 | 3 | 11 | 6 | 11 | 1 | 2
@@ -63,15 +63,15 @@ SELECT * FROM pgr_bdAstar(
6363
ARRAY[2, 7], 3,
6464
false, heuristic := 4
6565
);
66-
seq | path_seq | start_vid | node | edge | cost | agg_cost
67-
-----+----------+-----------+------+------+------+----------
68-
1 | 1 | 2 | 2 | 2 | 1 | 0
69-
2 | 2 | 2 | 3 | -1 | 0 | 1
70-
3 | 1 | 7 | 7 | 6 | 1 | 0
71-
4 | 2 | 7 | 8 | 7 | 1 | 1
72-
5 | 3 | 7 | 5 | 4 | 1 | 2
73-
6 | 4 | 7 | 2 | 2 | 1 | 3
74-
7 | 5 | 7 | 3 | -1 | 0 | 4
66+
seq | path_seq | start_vid | node | edge | cost | agg_cost
67+
-----+----------+-----------+------+------+------+------------------
68+
1 | 1 | 2 | 2 | 2 | 1 | 0
69+
2 | 2 | 2 | 3 | -1 | 0 | 1
70+
3 | 1 | 7 | 7 | 6 | 1 | 0
71+
4 | 2 | 7 | 8 | 7 | 1 | 3.23606797749979
72+
5 | 3 | 7 | 5 | 8 | 1 | 5.65028153987288
73+
6 | 4 | 7 | 6 | 5 | 1 | 6.65028153987288
74+
7 | 5 | 7 | 3 | -1 | 0 | 7.65028153987288
7575
(7 rows)
7676

7777
-- q5
@@ -84,26 +84,26 @@ SELECT * FROM pgr_bdAstar(
8484
seq | path_seq | start_vid | end_vid | node | edge | cost | agg_cost
8585
-----+----------+-----------+---------+------+------+------+----------
8686
1 | 1 | 2 | 3 | 2 | 4 | 1 | 0
87-
2 | 2 | 2 | 3 | 5 | 8 | 1 | 1
88-
3 | 3 | 2 | 3 | 6 | 9 | 1 | 2
89-
4 | 4 | 2 | 3 | 9 | 16 | 1 | 3
90-
5 | 5 | 2 | 3 | 4 | 3 | 1 | 4
91-
6 | 6 | 2 | 3 | 3 | -1 | 0 | 5
87+
2 | 2 | 2 | 3 | 5 | 8 | 1 | 2
88+
3 | 3 | 2 | 3 | 6 | 9 | 1 | 3.5
89+
4 | 4 | 2 | 3 | 9 | 16 | 1 | 4.5
90+
5 | 5 | 2 | 3 | 4 | 3 | 1 | 5.5
91+
6 | 6 | 2 | 3 | 3 | -1 | 0 | 6.5
9292
7 | 1 | 2 | 11 | 2 | 4 | 1 | 0
9393
8 | 2 | 2 | 11 | 5 | 8 | 1 | 1
9494
9 | 3 | 2 | 11 | 6 | 11 | 1 | 2
9595
10 | 4 | 2 | 11 | 11 | -1 | 0 | 3
9696
11 | 1 | 7 | 3 | 7 | 6 | 1 | 0
97-
12 | 2 | 7 | 3 | 8 | 7 | 1 | 1
98-
13 | 3 | 7 | 3 | 5 | 8 | 1 | 2
99-
14 | 4 | 7 | 3 | 6 | 9 | 1 | 3
100-
15 | 5 | 7 | 3 | 9 | 16 | 1 | 4
101-
16 | 6 | 7 | 3 | 4 | 3 | 1 | 5
102-
17 | 7 | 7 | 3 | 3 | -1 | 0 | 6
97+
12 | 2 | 7 | 3 | 8 | 7 | 1 | 2.5
98+
13 | 3 | 7 | 3 | 5 | 8 | 1 | 4.5
99+
14 | 4 | 7 | 3 | 6 | 9 | 1 | 6
100+
15 | 5 | 7 | 3 | 9 | 16 | 1 | 7
101+
16 | 6 | 7 | 3 | 4 | 3 | 1 | 8
102+
17 | 7 | 7 | 3 | 3 | -1 | 0 | 9
103103
18 | 1 | 7 | 11 | 7 | 6 | 1 | 0
104104
19 | 2 | 7 | 11 | 8 | 7 | 1 | 1
105-
20 | 3 | 7 | 11 | 5 | 10 | 1 | 2
106-
21 | 4 | 7 | 11 | 10 | 12 | 1 | 3
105+
20 | 3 | 7 | 11 | 5 | 8 | 1 | 2
106+
21 | 4 | 7 | 11 | 6 | 11 | 1 | 3
107107
22 | 5 | 7 | 11 | 11 | -1 | 0 | 4
108108
(22 rows)
109109

‎doc/queries/doc-pgr_bdAstarCost.queries‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ SELECT * FROM pgr_bdAstarCost(
1010
);
1111
start_vid | end_vid | agg_cost
1212
-----------+---------+----------
13-
2 | 3 | 5
13+
2 | 3 | 10
1414
(1 row)
1515

1616
-- q2
@@ -22,7 +22,7 @@ SELECT * FROM pgr_bdAstarCost(
2222
);
2323
start_vid | end_vid | agg_cost
2424
-----------+---------+----------
25-
2 | 3 | 5
25+
2 | 3 | 6
2626
(1 row)
2727

2828
-- q3
@@ -34,8 +34,8 @@ SELECT * FROM pgr_bdAstarCost(
3434
);
3535
start_vid | end_vid | agg_cost
3636
-----------+---------+----------
37-
2 | 3 | 5
38-
2 | 11 | 3
37+
2 | 3 | 66.25
38+
2 | 11 | 27.5
3939
(2 rows)
4040

4141
-- q4
@@ -45,10 +45,10 @@ SELECT * FROM pgr_bdAstarCost(
4545
ARRAY[2, 7], 3,
4646
false, heuristic := 4
4747
);
48-
start_vid | end_vid | agg_cost
49-
-----------+---------+----------
50-
2 | 3 | 1
51-
7 | 3 | 4
48+
start_vid | end_vid | agg_cost
49+
-----------+---------+------------------
50+
2 | 3 | 1
51+
7 | 3 | 7.65028153987288
5252
(2 rows)
5353

5454
-- q5
@@ -60,10 +60,10 @@ SELECT * FROM pgr_bdAstarCost(
6060
);
6161
start_vid | end_vid | agg_cost
6262
-----------+---------+----------
63-
2 | 3 | 5
64-
2 | 11 | 3
65-
7 | 3 | 6
66-
7 | 11 | 4
63+
2 | 3 | 7.5
64+
2 | 11 | 4
65+
7 | 3 | 11.5
66+
7 | 11 | 6.5
6767
(4 rows)
6868

6969
-- q6

‎doc/queries/doc-pgr_fooDmatrix.queries‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -264,15 +264,15 @@ SELECT * FROM pgr_bdAstarCostMatrix(
264264
start_vid | end_vid | agg_cost
265265
-----------+---------+----------
266266
1 | 2 | 1
267-
1 | 3 | 6
268-
1 | 4 | 5
267+
1 | 3 | 12
268+
1 | 4 | 12
269269
2 | 1 | 1
270-
2 | 3 | 5
271-
2 | 4 | 4
270+
2 | 3 | 10
271+
2 | 4 | 9
272272
3 | 1 | 2
273273
3 | 2 | 1
274-
3 | 4 | 3
275-
4 | 1 | 3
274+
3 | 4 | 5
275+
4 | 1 | 5
276276
4 | 2 | 2
277277
4 | 3 | 1
278278
(12 rows)
@@ -287,14 +287,14 @@ SELECT * FROM pgr_bdAstarCostMatrix(
287287
-----------+---------+----------
288288
1 | 2 | 1
289289
1 | 3 | 2
290-
1 | 4 | 3
290+
1 | 4 | 5
291291
2 | 1 | 1
292292
2 | 3 | 1
293293
2 | 4 | 2
294294
3 | 1 | 2
295295
3 | 2 | 1
296296
3 | 4 | 1
297-
4 | 1 | 3
297+
4 | 1 | 5
298298
4 | 2 | 2
299299
4 | 3 | 1
300300
(12 rows)
@@ -312,10 +312,10 @@ SELECT * FROM pgr_TSP(
312312
);
313313
seq | node | cost | agg_cost
314314
-----+------+------+----------
315-
1 | 1 | 1 | 0
316-
2 | 2 | 1 | 1
317-
3 | 3 | 1 | 2
318-
4 | 4 | 3 | 3
315+
1 | 1 | 2 | 0
316+
2 | 3 | 1 | 2
317+
3 | 4 | 2 | 3
318+
4 | 2 | 1 | 5
319319
5 | 1 | 0 | 6
320320
(5 rows)
321321

‎doc/src/release_notes.rst‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,38 @@ To see the issues closed by this release see the `Git closed milestone for 2.5.4
5050

5151
.. rubric:: Bug fixes
5252

53-
* Fix server crash on several functions.
53+
* Fixes server crash on several functions.
54+
55+
* pgr_floydWarshall
56+
* pgr_johnson
57+
* pgr_astar
58+
* pgr_bdAstar
59+
* pgr_bdDijstra
60+
* pgr_alphashape
61+
* pgr_dijkstraCostMatrix
62+
* pgr_dijkstra
63+
* pgr_dijkstraCost
64+
* pgr_drivingDistance
65+
* pgr_KSP
66+
* pgr_dijkstraVia (proposed)
67+
* pgr_boykovKolmogorov (proposed)
68+
* pgr_edgeDisjointPaths (proposed)
69+
* pgr_edmondsKarp (proposed)
70+
* pgr_maxCardinalityMatch (proposed)
71+
* pgr_maxFlow (proposed)
72+
* pgr_withPoints (proposed)
73+
* pgr_withPointsCost (proposed)
74+
* pgr_withPointsKSP (proposed)
75+
* pgr_withPointsDD (proposed)
76+
* pgr_withPointsCostMatrix (proposed)
77+
* pgr_contractGraph (experimental)
78+
* pgr_pushRelabel (experimental)
79+
* pgr_vrpOneDepot (experimental)
80+
* pgr_gsoc_vrppdtw (experimental)
81+
* Fixes for deprecated functions where also applied but not tested
82+
83+
* Removed compilation warning for g++8
84+
* Fixed a fallthrugh on Astar and bdAstar.
5485

5586
.. _changelog_2_5_3:
5687

‎tools/release-scripts/check-release.sh‎

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -264,16 +264,9 @@ if [[ -n $DEBUG ]]; then
264264
echo "\`\`\`"
265265
fi
266266

267-
if [[ "$BRANCH" != "master" && "$BRANCH" != "release/$MAYOR.$MINOR" ]]; then
268-
if [[ $(cat VERSION | grep "release/$MAYOR.$MINOR") != *"release/$MAYOR.$MINOR" ]]; then
269-
error_msg "VERSION should have release/$MAYOR.$MINOR"
270-
exit 1
271-
fi
272-
else
273-
if [[ $(cat VERSION | grep "master") != *"master" ]]; then
274-
error_msg "VERSION should have master"
275-
exit 1
276-
fi
267+
if [[ $(cat VERSION | grep "release/$MAYOR.$MINOR") != *"release/$MAYOR.$MINOR" ]]; then
268+
error_msg "VERSION should have release/$MAYOR.$MINOR"
269+
exit 1
277270
fi
278271
echo " -[x] VERSION file branch: OK"
279272

@@ -310,21 +303,13 @@ echo
310303
#---------------------------------------------------------------------
311304
if [[ -n $DEBUG ]]; then
312305
echo "\`\`\`"
313-
echo "bash tools/release-scripts/compile-release.sh 5 $MAYOR.$MINOR $MICRO"
314-
echo "bash tools/release-scripts/compile-release.sh 4.9 $MAYOR.$MINOR $MICRO"
315-
echo "bash tools/release-scripts/compile-release.sh 4.6 $MAYOR.$MINOR $MICRO"
306+
echo "bash tools/release-scripts/compile-release.sh 8 $MAYOR.$MINOR $MICRO"
316307
echo "bash tools/release-scripts/compile-release.sh 4.8 $MAYOR.$MINOR $MICRO"
317308
echo "\`\`\`"
318309
fi
319310

320311

321-
if [[ "$BRANCH" == "develop" || $BRANCH == "master" || $BRANCH == "release/$MAYOR.$MINOR" ]]; then
322-
if [[ -z "$DEBUG" ]]; then
323-
bash tools/release-scripts/compile-release.sh 4.9 $MAYOR.$MINOR $MICRO
324-
bash tools/release-scripts/compile-release.sh 4.6 $MAYOR.$MINOR $MICRO
325-
bash tools/release-scripts/compile-release.sh 5 $MAYOR.$MINOR $MICRO
326-
fi
327-
fi
312+
bash tools/release-scripts/compile-release.sh 8 $MAYOR.$MINOR $MICRO
328313
bash tools/release-scripts/compile-release.sh 4.8 $MAYOR.$MINOR $MICRO
329314

330315
echo - [x] completed local builds

0 commit comments

Comments
 (0)