Skip to content

Commit

Permalink
updating NEWS VERSION, script & queries with current results
Browse files Browse the repository at this point in the history 
fixing release notes
  • Loading branch information
@cvvergara
cvvergara committed Sep 20, 2018
1 parent c6cd732 commit 83b8d30
Show file tree
Hide file tree
Showing 8 changed files with 137 additions and 90 deletions.
33 changes: 32 additions & 1 deletion NEWS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,38 @@ To see the issues closed by this release see the [Git closed milestone for 2.5.4

*Bug fixes*

* Fix server crash on several functions.
* Fixes server crash on several functions.

* pgr_floydWarshall
* pgr_johnson
* pgr_astar
* pgr_bdAstar
* pgr_bdDijstra
* pgr_alphashape
* pgr_dijkstraCostMatrix
* pgr_dijkstra
* pgr_dijkstraCost
* pgr_drivingDistance
* pgr_KSP
* pgr_dijkstraVia (proposed)
* pgr_boykovKolmogorov (proposed)
* pgr_edgeDisjointPaths (proposed)
* pgr_edmondsKarp (proposed)
* pgr_maxCardinalityMatch (proposed)
* pgr_maxFlow (proposed)
* pgr_withPoints (proposed)
* pgr_withPointsCost (proposed)
* pgr_withPointsKSP (proposed)
* pgr_withPointsDD (proposed)
* pgr_withPointsCostMatrix (proposed)
* pgr_contractGraph (experimental)
* pgr_pushRelabel (experimental)
* pgr_vrpOneDepot (experimental)
* pgr_gsoc_vrppdtw (experimental)
* Fixes for deprecated functions where also applied but not tested

* Removed compilation warning for g++8
* Fixed a fallthrugh on Astar and bdAstar.


pgRouting 2.5.3 Release Notes
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6318-d53cb3a release/3.0
6320-5176673 release/2.5
12 changes: 6 additions & 6 deletions doc/queries/doc-astar.queries
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ SELECT * FROM pgr_astar(
directed := false, heuristic := 2);
seq | path_seq | node | edge | cost | agg_cost
-----+----------+------+------+------+----------
1 | 1 | 2 | 2 | 1 | 0
2 | 2 | 3 | 3 | 1 | 1
3 | 3 | 4 | 16 | 1 | 2
4 | 4 | 9 | 15 | 1 | 3
1 | 1 | 2 | 4 | 1 | 0
2 | 2 | 5 | 8 | 1 | 1
3 | 3 | 6 | 11 | 1 | 2
4 | 4 | 11 | 13 | 1 | 3
5 | 5 | 12 | -1 | 0 | 4
(5 rows)

Expand All @@ -42,8 +42,8 @@ SELECT * FROM pgr_astar(
5 | 5 | 3 | 4 | 3 | 1 | 4
6 | 6 | 3 | 3 | -1 | 0 | 5
7 | 1 | 12 | 2 | 4 | 1 | 0
8 | 2 | 12 | 5 | 10 | 1 | 1
9 | 3 | 12 | 10 | 12 | 1 | 2
8 | 2 | 12 | 5 | 8 | 1 | 1
9 | 3 | 12 | 6 | 11 | 1 | 2
10 | 4 | 12 | 11 | 13 | 1 | 3
11 | 5 | 12 | 12 | -1 | 0 | 4
(11 rows)
Expand Down
74 changes: 37 additions & 37 deletions doc/queries/doc-pgr_bdAstar.queries
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ SELECT * FROM pgr_bdAstar(
seq | path_seq | node | edge | cost | agg_cost
-----+----------+------+------+------+----------
1 | 1 | 2 | 4 | 1 | 0
2 | 2 | 5 | 8 | 1 | 1
3 | 3 | 6 | 9 | 1 | 2
4 | 4 | 9 | 16 | 1 | 3
5 | 5 | 4 | 3 | 1 | 4
6 | 6 | 3 | -1 | 0 | 5
2 | 2 | 5 | 8 | 1 | 3
3 | 3 | 6 | 9 | 1 | 5
4 | 4 | 9 | 16 | 1 | 8
5 | 5 | 4 | 3 | 1 | 9
6 | 6 | 3 | -1 | 0 | 10
(6 rows)

-- q2
Expand All @@ -28,11 +28,11 @@ SELECT * FROM pgr_bdAstar(
seq | path_seq | node | edge | cost | agg_cost
-----+----------+------+------+------+----------
1 | 1 | 2 | 4 | 1 | 0
2 | 2 | 5 | 8 | 1 | 1
3 | 3 | 6 | 9 | 1 | 2
4 | 4 | 9 | 16 | 1 | 3
5 | 5 | 4 | 3 | 1 | 4
6 | 6 | 3 | -1 | 0 | 5
2 | 2 | 5 | 8 | 1 | 2
3 | 3 | 6 | 9 | 1 | 3
4 | 4 | 9 | 16 | 1 | 4
5 | 5 | 4 | 3 | 1 | 5
6 | 6 | 3 | -1 | 0 | 6
(6 rows)

-- q3
Expand All @@ -45,11 +45,11 @@ SELECT * FROM pgr_bdAstar(
seq | path_seq | end_vid | node | edge | cost | agg_cost
-----+----------+---------+------+------+------+----------
1 | 1 | 3 | 2 | 4 | 1 | 0
2 | 2 | 3 | 5 | 8 | 1 | 1
3 | 3 | 3 | 6 | 9 | 1 | 2
4 | 4 | 3 | 9 | 16 | 1 | 3
5 | 5 | 3 | 4 | 3 | 1 | 4
6 | 6 | 3 | 3 | -1 | 0 | 5
2 | 2 | 3 | 5 | 8 | 1 | 25.5
3 | 3 | 3 | 6 | 9 | 1 | 38.75
4 | 4 | 3 | 9 | 16 | 1 | 64.25
5 | 5 | 3 | 4 | 3 | 1 | 65.25
6 | 6 | 3 | 3 | -1 | 0 | 66.25
7 | 1 | 11 | 2 | 4 | 1 | 0
8 | 2 | 11 | 5 | 8 | 1 | 1
9 | 3 | 11 | 6 | 11 | 1 | 2
Expand All @@ -63,15 +63,15 @@ SELECT * FROM pgr_bdAstar(
ARRAY[2, 7], 3,
false, heuristic := 4
);
seq | path_seq | start_vid | node | edge | cost | agg_cost
-----+----------+-----------+------+------+------+----------
1 | 1 | 2 | 2 | 2 | 1 | 0
2 | 2 | 2 | 3 | -1 | 0 | 1
3 | 1 | 7 | 7 | 6 | 1 | 0
4 | 2 | 7 | 8 | 7 | 1 | 1
5 | 3 | 7 | 5 | 4 | 1 | 2
6 | 4 | 7 | 2 | 2 | 1 | 3
7 | 5 | 7 | 3 | -1 | 0 | 4
seq | path_seq | start_vid | node | edge | cost | agg_cost
-----+----------+-----------+------+------+------+------------------
1 | 1 | 2 | 2 | 2 | 1 | 0
2 | 2 | 2 | 3 | -1 | 0 | 1
3 | 1 | 7 | 7 | 6 | 1 | 0
4 | 2 | 7 | 8 | 7 | 1 | 3.23606797749979
5 | 3 | 7 | 5 | 8 | 1 | 5.65028153987288
6 | 4 | 7 | 6 | 5 | 1 | 6.65028153987288
7 | 5 | 7 | 3 | -1 | 0 | 7.65028153987288
(7 rows)

-- q5
Expand All @@ -84,26 +84,26 @@ SELECT * FROM pgr_bdAstar(
seq | path_seq | start_vid | end_vid | node | edge | cost | agg_cost
-----+----------+-----------+---------+------+------+------+----------
1 | 1 | 2 | 3 | 2 | 4 | 1 | 0
2 | 2 | 2 | 3 | 5 | 8 | 1 | 1
3 | 3 | 2 | 3 | 6 | 9 | 1 | 2
4 | 4 | 2 | 3 | 9 | 16 | 1 | 3
5 | 5 | 2 | 3 | 4 | 3 | 1 | 4
6 | 6 | 2 | 3 | 3 | -1 | 0 | 5
2 | 2 | 2 | 3 | 5 | 8 | 1 | 2
3 | 3 | 2 | 3 | 6 | 9 | 1 | 3.5
4 | 4 | 2 | 3 | 9 | 16 | 1 | 4.5
5 | 5 | 2 | 3 | 4 | 3 | 1 | 5.5
6 | 6 | 2 | 3 | 3 | -1 | 0 | 6.5
7 | 1 | 2 | 11 | 2 | 4 | 1 | 0
8 | 2 | 2 | 11 | 5 | 8 | 1 | 1
9 | 3 | 2 | 11 | 6 | 11 | 1 | 2
10 | 4 | 2 | 11 | 11 | -1 | 0 | 3
11 | 1 | 7 | 3 | 7 | 6 | 1 | 0
12 | 2 | 7 | 3 | 8 | 7 | 1 | 1
13 | 3 | 7 | 3 | 5 | 8 | 1 | 2
14 | 4 | 7 | 3 | 6 | 9 | 1 | 3
15 | 5 | 7 | 3 | 9 | 16 | 1 | 4
16 | 6 | 7 | 3 | 4 | 3 | 1 | 5
17 | 7 | 7 | 3 | 3 | -1 | 0 | 6
12 | 2 | 7 | 3 | 8 | 7 | 1 | 2.5
13 | 3 | 7 | 3 | 5 | 8 | 1 | 4.5
14 | 4 | 7 | 3 | 6 | 9 | 1 | 6
15 | 5 | 7 | 3 | 9 | 16 | 1 | 7
16 | 6 | 7 | 3 | 4 | 3 | 1 | 8
17 | 7 | 7 | 3 | 3 | -1 | 0 | 9
18 | 1 | 7 | 11 | 7 | 6 | 1 | 0
19 | 2 | 7 | 11 | 8 | 7 | 1 | 1
20 | 3 | 7 | 11 | 5 | 10 | 1 | 2
21 | 4 | 7 | 11 | 10 | 12 | 1 | 3
20 | 3 | 7 | 11 | 5 | 8 | 1 | 2
21 | 4 | 7 | 11 | 6 | 11 | 1 | 3
22 | 5 | 7 | 11 | 11 | -1 | 0 | 4
(22 rows)

Expand Down
24 changes: 12 additions & 12 deletions doc/queries/doc-pgr_bdAstarCost.queries
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ SELECT * FROM pgr_bdAstarCost(
);
start_vid | end_vid | agg_cost
-----------+---------+----------
2 | 3 | 5
2 | 3 | 10
(1 row)

-- q2
Expand All @@ -22,7 +22,7 @@ SELECT * FROM pgr_bdAstarCost(
);
start_vid | end_vid | agg_cost
-----------+---------+----------
2 | 3 | 5
2 | 3 | 6
(1 row)

-- q3
Expand All @@ -34,8 +34,8 @@ SELECT * FROM pgr_bdAstarCost(
);
start_vid | end_vid | agg_cost
-----------+---------+----------
2 | 3 | 5
2 | 11 | 3
2 | 3 | 66.25
2 | 11 | 27.5
(2 rows)

-- q4
Expand All @@ -45,10 +45,10 @@ SELECT * FROM pgr_bdAstarCost(
ARRAY[2, 7], 3,
false, heuristic := 4
);
start_vid | end_vid | agg_cost
-----------+---------+----------
2 | 3 | 1
7 | 3 | 4
start_vid | end_vid | agg_cost
-----------+---------+------------------
2 | 3 | 1
7 | 3 | 7.65028153987288
(2 rows)

-- q5
Expand All @@ -60,10 +60,10 @@ SELECT * FROM pgr_bdAstarCost(
);
start_vid | end_vid | agg_cost
-----------+---------+----------
2 | 3 | 5
2 | 11 | 3
7 | 3 | 6
7 | 11 | 4
2 | 3 | 7.5
2 | 11 | 4
7 | 3 | 11.5
7 | 11 | 6.5
(4 rows)

-- q6
Expand Down
24 changes: 12 additions & 12 deletions doc/queries/doc-pgr_fooDmatrix.queries
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,15 +264,15 @@ SELECT * FROM pgr_bdAstarCostMatrix(
start_vid | end_vid | agg_cost
-----------+---------+----------
1 | 2 | 1
1 | 3 | 6
1 | 4 | 5
1 | 3 | 12
1 | 4 | 12
2 | 1 | 1
2 | 3 | 5
2 | 4 | 4
2 | 3 | 10
2 | 4 | 9
3 | 1 | 2
3 | 2 | 1
3 | 4 | 3
4 | 1 | 3
3 | 4 | 5
4 | 1 | 5
4 | 2 | 2
4 | 3 | 1
(12 rows)
Expand All @@ -287,14 +287,14 @@ SELECT * FROM pgr_bdAstarCostMatrix(
-----------+---------+----------
1 | 2 | 1
1 | 3 | 2
1 | 4 | 3
1 | 4 | 5
2 | 1 | 1
2 | 3 | 1
2 | 4 | 2
3 | 1 | 2
3 | 2 | 1
3 | 4 | 1
4 | 1 | 3
4 | 1 | 5
4 | 2 | 2
4 | 3 | 1
(12 rows)
Expand All @@ -312,10 +312,10 @@ SELECT * FROM pgr_TSP(
);
seq | node | cost | agg_cost
-----+------+------+----------
1 | 1 | 1 | 0
2 | 2 | 1 | 1
3 | 3 | 1 | 2
4 | 4 | 3 | 3
1 | 1 | 2 | 0
2 | 3 | 1 | 2
3 | 4 | 2 | 3
4 | 2 | 1 | 5
5 | 1 | 0 | 6
(5 rows)

Expand Down
33 changes: 32 additions & 1 deletion doc/src/release_notes.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,38 @@ To see the issues closed by this release see the `Git closed milestone for 2.5.4

.. rubric:: Bug fixes

* Fix server crash on several functions.
* Fixes server crash on several functions.

* pgr_floydWarshall
* pgr_johnson
* pgr_astar
* pgr_bdAstar
* pgr_bdDijstra
* pgr_alphashape
* pgr_dijkstraCostMatrix
* pgr_dijkstra
* pgr_dijkstraCost
* pgr_drivingDistance
* pgr_KSP
* pgr_dijkstraVia (proposed)
* pgr_boykovKolmogorov (proposed)
* pgr_edgeDisjointPaths (proposed)
* pgr_edmondsKarp (proposed)
* pgr_maxCardinalityMatch (proposed)
* pgr_maxFlow (proposed)
* pgr_withPoints (proposed)
* pgr_withPointsCost (proposed)
* pgr_withPointsKSP (proposed)
* pgr_withPointsDD (proposed)
* pgr_withPointsCostMatrix (proposed)
* pgr_contractGraph (experimental)
* pgr_pushRelabel (experimental)
* pgr_vrpOneDepot (experimental)
* pgr_gsoc_vrppdtw (experimental)
* Fixes for deprecated functions where also applied but not tested

* Removed compilation warning for g++8
* Fixed a fallthrugh on Astar and bdAstar.

.. _changelog_2_5_3:

Expand Down
25 changes: 5 additions & 20 deletions tools/release-scripts/check-release.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,16 +264,9 @@ if [[ -n $DEBUG ]]; then
echo "\`\`\`"
fi

if [[ "$BRANCH" != "master" && "$BRANCH" != "release/$MAYOR.$MINOR" ]]; then
if [[ $(cat VERSION | grep "release/$MAYOR.$MINOR") != *"release/$MAYOR.$MINOR" ]]; then
error_msg "VERSION should have release/$MAYOR.$MINOR"
exit 1
fi
else
if [[ $(cat VERSION | grep "master") != *"master" ]]; then
error_msg "VERSION should have master"
exit 1
fi
if [[ $(cat VERSION | grep "release/$MAYOR.$MINOR") != *"release/$MAYOR.$MINOR" ]]; then
error_msg "VERSION should have release/$MAYOR.$MINOR"
exit 1
fi
echo " -[x] VERSION file branch: OK"

Expand Down Expand Up @@ -310,21 +303,13 @@ echo
#---------------------------------------------------------------------
if [[ -n $DEBUG ]]; then
echo "\`\`\`"
echo "bash tools/release-scripts/compile-release.sh 5 $MAYOR.$MINOR $MICRO"
echo "bash tools/release-scripts/compile-release.sh 4.9 $MAYOR.$MINOR $MICRO"
echo "bash tools/release-scripts/compile-release.sh 4.6 $MAYOR.$MINOR $MICRO"
echo "bash tools/release-scripts/compile-release.sh 8 $MAYOR.$MINOR $MICRO"
echo "bash tools/release-scripts/compile-release.sh 4.8 $MAYOR.$MINOR $MICRO"
echo "\`\`\`"
fi


if [[ "$BRANCH" == "develop" || $BRANCH == "master" || $BRANCH == "release/$MAYOR.$MINOR" ]]; then
if [[ -z "$DEBUG" ]]; then
bash tools/release-scripts/compile-release.sh 4.9 $MAYOR.$MINOR $MICRO
bash tools/release-scripts/compile-release.sh 4.6 $MAYOR.$MINOR $MICRO
bash tools/release-scripts/compile-release.sh 5 $MAYOR.$MINOR $MICRO
fi
fi
bash tools/release-scripts/compile-release.sh 8 $MAYOR.$MINOR $MICRO
bash tools/release-scripts/compile-release.sh 4.8 $MAYOR.$MINOR $MICRO

echo - [x] completed local builds
Expand Down

0 comments on commit 83b8d30

Please sign in to comment.