Skip to content

Commit 7dc92b5

Browse files
bipashabgbipashabg
committed
Merge remote-tracking branch 'pgr/develop' into week-2-sloanordering
2 parents b6a1eee + e70aead commit 7dc92b5

File tree

65 files changed

+4988
-3012
lines changed

Some content is hidden

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

65 files changed

+4988
-3012
lines changed

‎CMakeLists.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ set(PROJECT_LIB_NAME "${PROJECT_NAME_LOWER}-${PROJECT_LIB_VERSION}")
4343

4444
string(TIMESTAMP COMPILATION_DATE "%Y/%m/%d" UTC)
4545

46+
# uncomment to show the NOTICE/WARNING of deprecated internal C functions
47+
# add_compile_definitions(SHOWMSG=1)
48+
4649
set(MINORS 4.0 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0 2.6)
4750
set(OLD_SIGNATURES
4851
3.8.0
@@ -196,7 +199,7 @@ find_package(PostgreSQL "${POSTGRESQL_MINIMUM_VERSION}")
196199
string(REGEX REPLACE "([0-9]+)[beta|alpha|rc|devel].*" "\\1.0" POSTGRESQL_VERSION_STRING ${POSTGRESQL_VERSION_STRING})
197200
message(STATUS "POSTGRESQL_VERSION_STRING=${POSTGRESQL_VERSION_STRING}")
198201

199-
# calcualte mayor.micro
202+
# calculate mayor.micro
200203
STRING(REGEX MATCH "([0-9]+)\.([0-9]+)" POSTGRESQL_VERSION "${POSTGRESQL_VERSION_STRING}")
201204
message(STATUS "POSTGRESQL_VERSION=${POSTGRESQL_VERSION}")
202205

@@ -347,7 +350,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
347350
endif()
348351

349352

350-
351353
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
352354

353355
if (PROJECT_DEBUG)

‎NEWS.md‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,30 @@ Functions promoted to official
2424

2525
* Output columns standardized to ``(seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)``
2626
* Function promoted to official.
27+
* Signature change: ``driving_side`` parameter changed from named optional to
28+
unnamed positional.
29+
- Directed graph valid values: ``l`` or ``L`` and ``r``, ``R``
30+
- Undirected graph valid values: ``b`` or ``B``
2731

2832
* [#2905](https://github.com/pgRouting/pgrouting/issues/2905) pgr_withPointsCost
2933

34+
* Function promoted to official.
3035
* Output columns standardized to ``(start_vid, end_vid, agg_cost)``
36+
* Signature change: ``driving_side`` parameter changed from named optional to
37+
unnamed positional.
38+
- Directed graph valid values: ``l`` or ``L`` and ``r``, ``R``
39+
- Undirected graph valid values: ``b`` or ``B``
40+
41+
* [#2905](https://github.com/pgRouting/pgrouting/issues/2905)
42+
pgr_withPointsCostMatrix
43+
3144
* Function promoted to official.
45+
* Output columns standardized to ``(start_vid, end_vid, agg_cost)``
46+
* Signature change: ``driving_side`` parameter changed from named optional to
47+
unnamed positional.
48+
- Directed graph valid values: ``l`` or ``L`` and ``r``, ``R``
49+
- Undirected graph valid values: ``b`` or ``B``
3250

33-
* pgr_withPointsCostMatrix
3451
* pgr_withPointsDD
3552
* pgr_withPointsKSP
3653
* pgr_withPointsVia

‎README.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,22 @@ https://gitter.im/pgRouting/pgrouting](https://badges.gitter.im/Join%20Chat.svg)
55
[Join discourse](https://discourse.osgeo.org/c/pgrouting/15)
66
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.15004469.svg)](https://doi.org/10.5281/zenodo.15004469)
77

8+
# Installation via Package Manager
9+
10+
If you want to install via some [package manager](https://alternativeto.net/software/yellowdog-updater-modified/?license=opensource),
11+
you can run
12+
13+
$ PACKAGE_TOOL install git-filter-repo
14+
15+
The following package managers have packaged pgRouting:
16+
17+
[![Packaging status](https://repology.org/badge/vertical-allrepos/pgrouting.svg)](https://repology.org/project/pgrouting/versions)
18+
19+
This list covers at least Windows (Scoop), Mac OS X (Homebrew), and
20+
Linux (most the rest). Note that pgRouting do not curate this list (and have
21+
no interest in doing so); https://repology.org tracks who packages
22+
these versions.
23+
824

925
## Branches
1026

‎doc/astar/pgr_aStar.rst‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,45 +20,45 @@
2020

2121
.. rubric:: Availability
2222

23-
* Version 4.0.0
23+
.. rubric:: Version 4.0.0
2424

25-
* Combinations signature promoted to official.
25+
* Combinations signature promoted to official.
2626

27-
* Version 3.6.0
27+
.. rubric:: Version 3.6.0
2828

29-
* Standardizing output columns to |short-generic-result|
29+
* Standardizing output columns to |short-generic-result|
3030

31-
* pgr_aStar(One to One) added ``start_vid`` and ``end_vid`` columns.
32-
* pgr_aStar(One to Many) added ``end_vid`` column.
33-
* pgr_aStar(Many to One) added ``start_vid`` column.
31+
* pgr_aStar(One to One) added ``start_vid`` and ``end_vid`` columns.
32+
* pgr_aStar(One to Many) added ``end_vid`` column.
33+
* pgr_aStar(Many to One) added ``start_vid`` column.
3434

35-
* Version 3.2.0
35+
.. rubric:: Version 3.2.0
3636

37-
* New proposed signature:
37+
* New proposed signature:
3838

39-
* pgr_aStar(Combinations)
39+
* pgr_aStar(Combinations)
4040

41-
* Version 3.0.0
41+
.. rubric:: Version 3.0.0
4242

43-
* Function promoted to official.
43+
* Function promoted to official.
4444

45-
* Version 2.4.0
45+
.. rubric:: Version 2.4.0
4646

47-
* New proposed signatures:
47+
* New proposed signatures:
4848

49-
* pgr_aStar(One to Many)
50-
* pgr_aStar(Many to One)
51-
* pgr_aStar(Many to Many)
49+
* pgr_aStar(One to Many)
50+
* pgr_aStar(Many to One)
51+
* pgr_aStar(Many to Many)
5252

53-
* Version 2.3.0
53+
.. rubric:: Version 2.3.0
5454

55-
* Signature change on pgr_aStar(One to One)
55+
* Signature change on pgr_aStar(One to One)
5656

57-
* Old signature no longer supported
57+
* Old signature no longer supported
5858

59-
* Version 2.0.0
59+
.. rubric:: Version 2.0.0
6060

61-
* New official function.
61+
* New official function.
6262

6363
Description
6464
-------------------------------------------------------------------------------
@@ -259,8 +259,8 @@ Result columns
259259
-------------------------------------------------------------------------------
260260

261261
.. include:: pgRouting-concepts.rst
262-
:start-after: return_path_short_start
263-
:end-before: return_path_short_end
262+
:start-after: return_path_complete_start
263+
:end-before: return_path_complete_end
264264

265265
Additional Examples
266266
-------------------------------------------------------------------------------

‎doc/astar/pgr_aStarCost.rst‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@
2121

2222
.. rubric:: Availability
2323

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

26-
* Combinations signature promoted to official.
26+
* Combinations signature promoted to official.
2727

28-
* Version 3.2.0
28+
.. rubric:: Version 3.2.0
2929

30-
* New proposed signature:
30+
* New proposed signature:
3131

32-
* pgr_aStarCost(Combinations)
32+
* pgr_aStarCost(Combinations)
3333

34-
* Version 3.0.0
34+
.. rubric:: Version 3.0.0
3535

36-
* Function promoted to official.
36+
* Function promoted to official.
3737

38-
* Version 2.4.0
38+
.. rubric:: Version 2.4.0
3939

40-
* New proposed function.
40+
* New proposed function.
4141

4242
Description
4343
-------------------------------------------------------------------------------

‎doc/bdAstar/pgr_bdAstar.rst‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,43 +20,43 @@
2020

2121
.. rubric:: Availability
2222

23-
* Version 4.0.0
23+
.. rubric:: Version 4.0.0
2424

25-
* Combinations signature promoted to official.
25+
* Combinations signature promoted to official.
2626

27-
* Version 3.6.0
27+
.. rubric:: Version 3.6.0
2828

29-
* Standardizing output columns to |short-generic-result|
29+
* Standardizing output columns to |short-generic-result|
3030

31-
* pgr_bdAstar(One to One) added ``start_vid`` and ``end_vid`` columns.
32-
* pgr_bdAstar(One to Many) added ``end_vid`` column.
33-
* pgr_bdAstar(Many to One) added ``start_vid`` column.
31+
* pgr_bdAstar(One to One) added ``start_vid`` and ``end_vid`` columns.
32+
* pgr_bdAstar(One to Many) added ``end_vid`` column.
33+
* pgr_bdAstar(Many to One) added ``start_vid`` column.
3434

35-
* Version 3.2.0
35+
.. rubric:: Version 3.2.0
3636

37-
* New proposed signature:
37+
* New proposed signature:
3838

39-
* pgr_bdAstar(Combinations)
39+
* pgr_bdAstar(Combinations)
4040

41-
* Version 3.0.0
41+
.. rubric:: Version 3.0.0
4242

43-
* Function promoted to official.
43+
* Function promoted to official.
4444

45-
* Version 2.5.0
45+
.. rubric:: Version 2.5.0
4646

47-
* New proposed signatures:
47+
* New proposed signatures:
4848

49-
* pgr_bdAstar(One to Many)
50-
* pgr_bdAstar(Many to One)
51-
* pgr_bdAstar(Many to Many)
49+
* pgr_bdAstar(One to Many)
50+
* pgr_bdAstar(Many to One)
51+
* pgr_bdAstar(Many to Many)
5252

53-
* Signature change on pgr_bdAstar(One to One)
53+
* Signature change on pgr_bdAstar(One to One)
5454

55-
* Old signature no longer supported
55+
* Old signature no longer supported
5656

57-
* Version 2.0.0
57+
.. rubric:: Version 2.0.0
5858

59-
* New official function.
59+
* New official function.
6060

6161
Description
6262
-------------------------------------------------------------------------------
@@ -257,8 +257,8 @@ Result columns
257257
-------------------------------------------------------------------------------
258258

259259
.. include:: pgRouting-concepts.rst
260-
:start-after: return_path_short_start
261-
:end-before: return_path_short_end
260+
:start-after: return_path_complete_start
261+
:end-before: return_path_complete_end
262262

263263
Additional Examples
264264
-------------------------------------------------------------------------------

‎doc/bdAstar/pgr_bdAstarCost.rst‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@ A* 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+
* Combinations signature promoted to official.
2727

28-
* Version 3.2.0
28+
.. rubric:: Version 3.2.0
2929

30-
* New proposed signature:
30+
* New proposed signature:
3131

32-
* pgr_bdAstarCost(Combinations)
32+
* pgr_bdAstarCost(Combinations)
3333

34-
* Version 3.0.0
34+
.. rubric:: Version 3.0.0
3535

36-
* Function promoted to official.
36+
* Function promoted to official.
3737

38-
* Version 2.4.0
38+
.. rubric:: Version 2.4.0
3939

40-
* New proposed function.
40+
* New proposed function.
4141

4242
Description
4343
-------------------------------------------------------------------------------

‎doc/bdDijkstra/pgr_bdDijkstra.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,8 @@ Result columns
229229
-------------------------------------------------------------------------------
230230

231231
.. include:: pgRouting-concepts.rst
232-
:start-after: return_path_short_start
233-
:end-before: return_path_short_end
232+
:start-after: return_path_complete_start
233+
:end-before: return_path_complete_end
234234

235235
Additional Examples
236236
-------------------------------------------------------------------------------

‎doc/bdDijkstra/pgr_bdDijkstraCost.rst‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@ Dijkstra 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+
* Combinations signature promoted to official.
2727

28-
* Version 3.2.0
28+
.. rubric:: Version 3.2.0
2929

30-
* New proposed signature:
30+
* New proposed signature:
3131

32-
* pgr_bdDijkstraCost(Combinations)
32+
* pgr_bdDijkstraCost(Combinations)
3333

34-
* Version 3.0.0
34+
.. rubric:: Version 3.0.0
3535

36-
* Function promoted to official.
36+
* Function promoted to official.
3737

38-
* Version 2.5.0
38+
.. rubric:: Version 2.5.0
3939

40-
* New proposed function.
40+
* New proposed function.
4141

4242

4343
Description

‎doc/bellman_ford/pgr_bellmanFord.rst‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@
2222
:start-after: warning-begin
2323
:end-before: end-warning
2424

25-
.. rubric:: Availability
25+
.. rubric:: Availability:
2626

27-
* Version 3.2.0
27+
.. rubric:: Version 3.2.0
2828

29-
* New experimental signature:
29+
* New experimental signature:
3030

31-
* pgr_bellmanFord(Combinations)
31+
* pgr_bellmanFord(Combinations)
3232

33-
* Version 3.0.0
33+
.. rubric:: Version 3.0.0
3434

35-
* New experimental function.
35+
* New experimental function.
3636

3737
Description
3838
-------------------------------------------------------------------------------
@@ -124,8 +124,8 @@ One to Many
124124
| Returns set of |result-1-m|
125125
| OR EMPTY SET
126126
127-
:Example: From vertex :math:`6` to vertices :math:`\{ 10, 17\}` on a
128-
**directed** graph
127+
:Example: From vertex :math:`6` to vertices :math:`\{10, 17\}` on a **directed**
128+
graph
129129

130130
.. literalinclude:: bellmanFord.queries
131131
:start-after: -- q3
@@ -267,9 +267,6 @@ See Also
267267
* `Boost: Bellman Ford <https://www.boost.org/libs/graph/doc/bellman_ford_shortest.html>`__
268268
* https://en.wikipedia.org/wiki/Bellman%E2%80%93Ford_algorithm
269269

270-
Boost Graph Inside
271-
272-
273270
.. rubric:: Indices and tables
274271

275272
* :ref:`genindex`

0 commit comments

Comments
 (0)