Skip to content

Commit 32e669f

Browse files
authored
Merge pull request #2986 from pgRouting/develop
Version 4.0.0-beta1 of pgRouting
2 parents 91edd82 + cedb39a commit 32e669f

Some content is hidden

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

41 files changed

+11000
-8703
lines changed

.github/scripts/update_locale.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ perl -ne '/\/en\// && print' build/doc/locale_changes_po.txt | \
3939

4040
# Remove obsolete entries #~ from .po files
4141
find locale -type f -name '*.po' -exec sh -c '
42-
msgattrib --no-obsolete -o "$f" "$f"
42+
msgattrib --no-obsolete -o "$1" "$1"
4343
' sh {} \;
4444

4545
while read -r f; do git add "$f"; done < build/doc/locale_changes_po_pot.txt

.github/workflows/check-queries.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,8 @@ jobs:
111111
run: |
112112
sudo -u postgres createdb -p ${PGPORT} pgr_test__db__test
113113
# queries that might change
114-
# version: will catch the current version
115114
# mincut: results change depending on boost
116-
TESTDIRS="version mincut"
115+
TESTDIRS="mincut"
117116
for d in ${TESTDIRS}
118117
do
119118
./tools/testers/doc_queries_generator.pl -pgver "${PGVER}" -pguser runner -documentation -alg "docqueries/${d}"

.github/workflows/update-locale.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ jobs:
6666
python3-sphinx \
6767
python3-sphinx-bootstrap-theme \
6868
sphinx-intl \
69+
gettext \
6970
postgresql-${PGVER} \
7071
postgresql-server-dev-${PGVER} \
7172
graphviz

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ include(pgr/BuildType)
3232

3333
project(PGROUTING VERSION 4.0.0
3434
LANGUAGES C CXX )
35-
set(PROJECT_VERSION_DEV "-alpha1")
35+
set(PROJECT_VERSION_DEV "-beta1")
3636
string(TOLOWER "${PROJECT_NAME}" PROJECT_NAME_LOWER)
3737

3838
include(pgr/GitInfo)

NEWS.md

Lines changed: 44 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,13 +131,26 @@ Summary of changes by function
131131

132132
* Combinations signature promoted to official.
133133

134+
* pgr_dijkstraNear
135+
136+
* Function promoted to official.
137+
138+
* pgr_dijkstraNearCost
139+
140+
* Function promoted to official.
141+
142+
* pgr_dijkstraVia
143+
144+
* Function promoted to official.
145+
134146
* pgr_edgeColoring
135147

136148
* Output columns standardized to ``(edge, color)``
137149

138150
* pgr_edgeDisjointPaths
139151

140152
* Output columns standardized to ``(seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)``
153+
* Combinations signature promoted to official.
141154

142155
* pgr_edmondsKarp
143156

@@ -160,6 +173,12 @@ Summary of changes by function
160173

161174
* All signatures promoted to official.
162175

176+
* pgr_maxCardinalityMatch
177+
178+
.. Breaking change
179+
* Breaking change, signatures no longer available:
180+
* pgr_maxCardinalityMatch(text,boolean)
181+
163182
* pgr_maxFlow
164183

165184
* Combinations signature promoted to official.
@@ -168,14 +187,14 @@ Summary of changes by function
168187

169188
* Combinations signature promoted to official.
170189

171-
* pgr_sloanOrdering
172-
173-
* New experimental function.
174-
175190
* pgr_sequentialVertexColoring
176191

177192
* Output columns standardized to ``(node, color)``
178193

194+
* pgr_sloanOrdering
195+
196+
* New experimental function.
197+
179198
* pgr_topologicalSort
180199

181200
* Standardize output to ``(seq, node)``
@@ -220,6 +239,23 @@ Summary of changes by function
220239
* pgr_trsp_withpoints(text,text,text,bigint,bigint,boolean,character,boolean)
221240
* pgr_trsp_withpoints(text,text,text,text,boolean,character,boolean)
222241

242+
* pgr_TSP
243+
244+
* Results change depending on input order
245+
* Only for undirected graphs
246+
.. Breaking change
247+
* Breaking change, signatures no longer available:
248+
* pgr_tsp(text,bigint,bigint,double precision,integer,integer,integer,double
249+
precision,double precision,double precision,boolean)
250+
251+
* pgr_TSPeuclidean
252+
253+
* Results change depending on input order
254+
.. Breaking change
255+
* Breaking change, signatures no longer available:
256+
* pgr_tspeuclidean(text,bigint,bigint,double precision,integer,integer,
257+
integer,double precision,double precision,double precision,boolean)
258+
223259
* pgr_turnRestrictedPath
224260

225261
* Output columns standardized to ``(seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)``
@@ -286,6 +322,7 @@ Summary of changes by function
286322

287323
Functions promoted to official
288324

325+
* [#2701](https://github.com/pgRouting/pgrouting/issues/2701): pgr_trsp
289326
* [#2701](https://github.com/pgRouting/pgrouting/issues/2701): pgr_trsp
290327
* [#2701](https://github.com/pgRouting/pgrouting/issues/2701): pgr_trspVia
291328
* [#2701](https://github.com/pgRouting/pgrouting/issues/2701): pgr_trspVia_withPoints
@@ -296,6 +333,9 @@ Functions promoted to official
296333
* [#2700](https://github.com/pgRouting/pgrouting/issues/2700): pgr_withPointsDD
297334
* [#2700](https://github.com/pgRouting/pgrouting/issues/2700): pgr_withPointsKSP
298335
* [#2700](https://github.com/pgRouting/pgrouting/issues/2700): pgr_withPointsVia
336+
* [#2983](https://github.com/pgRouting/pgrouting/issues/2983): pgr_dijkstraNear
337+
* [#2983](https://github.com/pgRouting/pgrouting/issues/2983): pgr_dijkstraNearCost
338+
* [#2983](https://github.com/pgRouting/pgrouting/issues/2983): pgr_dijkstraVia
299339

300340
Signatures promoted to official
301341

doc/bdAstar/bdAstar-family.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ The main Characteristics are:
5353
* For large graphs where there is a path between the starting vertex and ending
5454
vertex:
5555

56-
* It is expected to terminate faster than doc:`pgr_aStar`
56+
* It is expected to terminate faster than :doc:`pgr_aStar`
5757

5858
See :ref:`heuristics <astar_heuristics>` available and :ref:`factor
5959
<astar_factor>` handling.

doc/bdDijkstra/bdDijkstra-family.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ The main Characteristics are:
7777
- For large graphs where there is a path bewtween the starting vertex and ending
7878
vertex:
7979

80-
- It is expected to terminate faster than pgr_dijkstra
80+
- It is expected to terminate faster than :doc:`pgr_dijkstra`
8181

8282
.. description end
8383

doc/categories/cost-category.rst

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,12 @@ Cost - Category
2121
* :doc:`pgr_aStarCost`
2222
* :doc:`pgr_bdAstarCost`
2323
* :doc:`pgr_dijkstraCost`
24+
* :doc:`pgr_dijkstraNearCost`
2425
* :doc:`pgr_bdDijkstraCost`
2526
* :doc:`pgr_withPointsCost`
2627

2728
.. official-end
2829
29-
.. include:: proposed.rst
30-
:start-after: warning-begin
31-
:end-before: end-warning
32-
33-
.. proposed-start
34-
35-
* :doc:`pgr_dijkstraNearCost`
36-
37-
.. proposed-end
38-
39-
4030
General Information
4131
-------------------------------------------------------------------------------
4232

doc/chinese/chinesePostmanProblem-family.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,26 @@
99

1010
|
1111
12-
Chinese Postman Problem - Family of functions (Experimental)
12+
Chinese Postman Problem - Family of functions
1313
===============================================================================
1414

15-
.. official-start
15+
.. include:: experimental.rst
16+
:start-after: warning-begin
17+
:end-before: end-warning
18+
19+
.. experimental-start
1620
1721
* :doc:`pgr_chinesePostman`
1822
* :doc:`pgr_chinesePostmanCost`
1923

20-
.. official-end
24+
.. experimental-end
2125
2226
.. toctree::
2327
:hidden:
2428

2529
pgr_chinesePostman
2630
pgr_chinesePostmanCost
2731

28-
.. include:: experimental.rst
29-
:start-after: warning-begin
30-
:end-before: end-warning
31-
3232
Description
3333
-------------------------------------------------------------------------------
3434

doc/coloring/coloring-family.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ Coloring - Family of functions
2929
:start-after: warning-begin
3030
:end-before: end-warning
3131

32-
.. official-start
32+
.. experimental-start
3333
3434
* :doc:`pgr_bipartite` - Bipartite graph algorithm using a DFS-based coloring
3535
approach.
3636
* :doc:`pgr_edgeColoring` - Edge Coloring algorithm using Vizing's theorem.
3737

38-
.. official-end
38+
.. experimental-end
3939
4040
4141
.. toctree::

0 commit comments

Comments
 (0)