Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pgr_bddijkstra to pgr_dijkstra #2302

Merged
merged 1 commit into from
May 17, 2022
Merged

pgr_bddijkstra to pgr_dijkstra #2302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions doc/dijkstra/pgr_dijkstra.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,19 +237,19 @@ Additional Examples

:Example: Demonstration of repeated values are ignored, and result is sorted.

.. literalinclude:: doc-pgr_bdDijkstra.queries
.. literalinclude:: doc-pgr_dijkstra.queries
:start-after: -- q6
:end-before: -- q7

:Example: Making ``start_vids`` the same as ``end_vids``.

.. literalinclude:: doc-pgr_bdDijkstra.queries
.. literalinclude:: doc-pgr_dijkstra.queries
:start-after: -- q7
:end-before: -- q8

:Example: Manually assigned vertex combinations.

.. literalinclude:: doc-pgr_bdDijkstra.queries
.. literalinclude:: doc-pgr_dijkstra.queries
:start-after: -- q8
:end-before: -- q9

Expand Down
40 changes: 20 additions & 20 deletions docqueries/dijkstra/doc-pgr_dijkstra.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BEGIN
SET client_min_messages TO NOTICE;
SET
/* -- q2 */
SELECT * FROM pgr_bdDijkstra(
SELECT * FROM pgr_Dijkstra(
'select id, source, target, cost, reverse_cost from edge_table',
2, 3, true);
seq | path_seq | node | edge | cost | agg_cost
Expand All @@ -17,7 +17,7 @@ SELECT * FROM pgr_bdDijkstra(
(6 rows)

/* -- q3 */
SELECT * FROM pgr_bdDijkstra(
SELECT * FROM pgr_Dijkstra(
'select id, source, target, cost, reverse_cost from edge_table',
2, ARRAY[3, 12]);
seq | path_seq | end_vid | node | edge | cost | agg_cost
Expand All @@ -36,26 +36,26 @@ SELECT * FROM pgr_bdDijkstra(
(11 rows)

/* -- q4 */
SELECT * FROM pgr_bdDijkstra(
SELECT * FROM pgr_Dijkstra(
'select id, source, target, cost, reverse_cost from edge_table',
ARRAY[2, 7], 12);
seq | path_seq | start_vid | node | edge | cost | agg_cost
-----+----------+-----------+------+------+------+----------
1 | 1 | 2 | 2 | 4 | 1 | 0
2 | 2 | 2 | 5 | 8 | 1 | 1
3 | 3 | 2 | 6 | 9 | 1 | 2
4 | 4 | 2 | 9 | 15 | 1 | 3
2 | 2 | 2 | 5 | 10 | 1 | 1
3 | 3 | 2 | 10 | 12 | 1 | 2
4 | 4 | 2 | 11 | 13 | 1 | 3
5 | 5 | 2 | 12 | -1 | 0 | 4
6 | 1 | 7 | 7 | 6 | 1 | 0
7 | 2 | 7 | 8 | 7 | 1 | 1
8 | 3 | 7 | 5 | 8 | 1 | 2
9 | 4 | 7 | 6 | 11 | 1 | 3
8 | 3 | 7 | 5 | 10 | 1 | 2
9 | 4 | 7 | 10 | 12 | 1 | 3
10 | 5 | 7 | 11 | 13 | 1 | 4
11 | 6 | 7 | 12 | -1 | 0 | 5
(11 rows)

/* -- q5 */
SELECT * FROM pgr_bdDijkstra(
SELECT * FROM pgr_Dijkstra(
'select id, source, target, cost, reverse_cost from edge_table',
ARRAY[2, 7], ARRAY[3, 12],
directed => false);
Expand All @@ -64,9 +64,9 @@ SELECT * FROM pgr_bdDijkstra(
1 | 1 | 2 | 3 | 2 | 2 | 1 | 0
2 | 2 | 2 | 3 | 3 | -1 | 0 | 1
3 | 1 | 2 | 12 | 2 | 4 | 1 | 0
4 | 2 | 2 | 12 | 5 | 8 | 1 | 1
5 | 3 | 2 | 12 | 6 | 9 | 1 | 2
6 | 4 | 2 | 12 | 9 | 15 | 1 | 3
4 | 2 | 2 | 12 | 5 | 10 | 1 | 1
5 | 3 | 2 | 12 | 10 | 12 | 1 | 2
6 | 4 | 2 | 12 | 11 | 13 | 1 | 3
7 | 5 | 2 | 12 | 12 | -1 | 0 | 4
8 | 1 | 7 | 3 | 7 | 6 | 1 | 0
9 | 2 | 7 | 3 | 8 | 7 | 1 | 1
Expand All @@ -93,7 +93,7 @@ SELECT source, target FROM combinations_table;
(5 rows)

/* -- q52 */
SELECT * FROM pgr_bdDijkstra(
SELECT * FROM pgr_Dijkstra(
'SELECT id, source, target, cost, reverse_cost FROM edge_table',
'SELECT source, target FROM combinations_table',
false);
Expand All @@ -112,7 +112,7 @@ SELECT * FROM pgr_bdDijkstra(
(10 rows)

/* -- q6 */
SELECT * FROM pgr_bdDijkstra(
SELECT * FROM pgr_Dijkstra(
'select id, source, target, cost, reverse_cost from edge_table',
ARRAY[5, 3, 4, 3, 3, 4], ARRAY[3, 5, 3, 4]);
seq | path_seq | start_vid | end_vid | node | edge | cost | agg_cost
Expand All @@ -126,8 +126,8 @@ SELECT * FROM pgr_bdDijkstra(
7 | 3 | 3 | 5 | 5 | -1 | 0 | 2
8 | 1 | 4 | 3 | 4 | 3 | 1 | 0
9 | 2 | 4 | 3 | 3 | -1 | 0 | 1
10 | 1 | 4 | 5 | 4 | 16 | 1 | 0
11 | 2 | 4 | 5 | 9 | 9 | 1 | 1
10 | 1 | 4 | 5 | 4 | 3 | 1 | 0
11 | 2 | 4 | 5 | 3 | 5 | 1 | 1
12 | 3 | 4 | 5 | 6 | 8 | 1 | 2
13 | 4 | 4 | 5 | 5 | -1 | 0 | 3
14 | 1 | 5 | 3 | 5 | 8 | 1 | 0
Expand All @@ -142,7 +142,7 @@ SELECT * FROM pgr_bdDijkstra(
(22 rows)

/* -- q7 */
SELECT * FROM pgr_bdDijkstra(
SELECT * FROM pgr_Dijkstra(
'select id, source, target, cost, reverse_cost from edge_table',
ARRAY[5, 3, 4], ARRAY[5, 3, 4]);
seq | path_seq | start_vid | end_vid | node | edge | cost | agg_cost
Expand All @@ -156,8 +156,8 @@ SELECT * FROM pgr_bdDijkstra(
7 | 3 | 3 | 5 | 5 | -1 | 0 | 2
8 | 1 | 4 | 3 | 4 | 3 | 1 | 0
9 | 2 | 4 | 3 | 3 | -1 | 0 | 1
10 | 1 | 4 | 5 | 4 | 16 | 1 | 0
11 | 2 | 4 | 5 | 9 | 9 | 1 | 1
10 | 1 | 4 | 5 | 4 | 3 | 1 | 0
11 | 2 | 4 | 5 | 3 | 5 | 1 | 1
12 | 3 | 4 | 5 | 6 | 8 | 1 | 2
13 | 4 | 4 | 5 | 5 | -1 | 0 | 3
14 | 1 | 5 | 3 | 5 | 8 | 1 | 0
Expand All @@ -172,7 +172,7 @@ SELECT * FROM pgr_bdDijkstra(
(22 rows)

/* -- q8 */
SELECT * FROM pgr_bdDijkstra(
SELECT * FROM pgr_Dijkstra(
'SELECT id, source, target, cost, reverse_cost FROM edge_table',
'SELECT * FROM (VALUES (2, 3), (2, 5), (11, 3)) AS combinations (source, target)');
seq | path_seq | start_vid | end_vid | node | edge | cost | agg_cost
Expand Down
16 changes: 8 additions & 8 deletions docqueries/dijkstra/doc-pgr_dijkstra.test.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
/* -- q2 */
SELECT * FROM pgr_bdDijkstra(
SELECT * FROM pgr_Dijkstra(
'select id, source, target, cost, reverse_cost from edge_table',
2, 3, true);
/* -- q3 */
SELECT * FROM pgr_bdDijkstra(
SELECT * FROM pgr_Dijkstra(
'select id, source, target, cost, reverse_cost from edge_table',
2, ARRAY[3, 12]);
/* -- q4 */
SELECT * FROM pgr_bdDijkstra(
SELECT * FROM pgr_Dijkstra(
'select id, source, target, cost, reverse_cost from edge_table',
ARRAY[2, 7], 12);
/* -- q5 */
SELECT * FROM pgr_bdDijkstra(
SELECT * FROM pgr_Dijkstra(
'select id, source, target, cost, reverse_cost from edge_table',
ARRAY[2, 7], ARRAY[3, 12],
directed => false);
/* -- q51 */
SELECT source, target FROM combinations_table;
/* -- q52 */
SELECT * FROM pgr_bdDijkstra(
SELECT * FROM pgr_Dijkstra(
'SELECT id, source, target, cost, reverse_cost FROM edge_table',
'SELECT source, target FROM combinations_table',
false);
/* -- q6 */
SELECT * FROM pgr_bdDijkstra(
SELECT * FROM pgr_Dijkstra(
'select id, source, target, cost, reverse_cost from edge_table',
ARRAY[5, 3, 4, 3, 3, 4], ARRAY[3, 5, 3, 4]);
/* -- q7 */
SELECT * FROM pgr_bdDijkstra(
SELECT * FROM pgr_Dijkstra(
'select id, source, target, cost, reverse_cost from edge_table',
ARRAY[5, 3, 4], ARRAY[5, 3, 4]);
/* -- q8 */
SELECT * FROM pgr_bdDijkstra(
SELECT * FROM pgr_Dijkstra(
'SELECT id, source, target, cost, reverse_cost FROM edge_table',
'SELECT * FROM (VALUES (2, 3), (2, 5), (11, 3)) AS combinations (source, target)');
/* -- q9 */
Expand Down