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

Release tasks 3 #2373

Merged
merged 5 commits into from
Sep 21, 2022
Merged

Release tasks 3 #2373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7081876
[sql][trsp] remove path_id where not needed
cvvergara Sep 20, 2022
88ea201
[src][trsp] remove path_id where not needed
cvvergara Sep 20, 2022
cb63b88
[tools] adjust test
cvvergara Sep 20, 2022
a156150
[queries][trsp] adjust results
cvvergara Sep 20, 2022
539fa71
[doc] adjusting name of return columns
cvvergara Sep 21, 2022
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
4 changes: 2 additions & 2 deletions doc/astar/pgr_aStar.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ Many to Many
| pgr_aStar(`Edges SQL`_, **start vids**, **end vids**, [**options**])
| **options:** ``[directed, heuristic, factor, epsilon]``

| RETURNS SET OF |result-m-m|
| RETURNS SET OF |short-generic-result|
| OR EMPTY SET

:Example: From vertices :math:`\{6, 8\}` to vertices :math:`\{10, 12\}` on a
Expand All @@ -204,7 +204,7 @@ Combinations
| pgr_aStar(`Edges SQL`_, `Combinations SQL`_, [**options**])
| **options:** ``[directed, heuristic, factor, epsilon]``

| RETURNS SET OF |result-m-m|
| RETURNS SET OF |short-generic-result|
| OR EMPTY SET

:Example: Using a combinations table on a **directed** graph with factor
Expand Down
4 changes: 2 additions & 2 deletions doc/bdAstar/pgr_bdAstar.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ Many to Many
| pgr_bdAstar(`Edges SQL`_, **start vids**, **end vids**, [**options**])
| **options:** ``[directed, heuristic, factor, epsilon]``

| RETURNS SET OF |result-m-m|
| RETURNS SET OF |short-generic-result|
| OR EMPTY SET

:Example: From vertices :math:`\{6, 8\}` to vertices :math:`\{10, 12\}` on a
Expand All @@ -205,7 +205,7 @@ Combinations
| pgr_bdAstar(`Edges SQL`_, `Combinations SQL`_, [**options**])
| **options:** ``[directed, heuristic, factor, epsilon]``

| RETURNS SET OF |result-m-m|
| RETURNS SET OF |short-generic-result|
| OR EMPTY SET

:Example: Using a combinations table on a **directed** graph with factor
Expand Down
4 changes: 2 additions & 2 deletions doc/bdDijkstra/pgr_bdDijkstra.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ Many to Many

| pgr_bdDijkstra(`Edges SQL`_, **start vids**, **end vids**, [``directed``])

| RETURNS SET OF |result-m-m|
| RETURNS SET OF |short-generic-result|
| OR EMPTY SET

:Example: From vertices :math:`\{6, 1\}` to vertices :math:`\{10, 17\}` on an
Expand All @@ -187,7 +187,7 @@ Combinations

| pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_, [``directed``])

| RETURNS SET OF |result-m-m|
| RETURNS SET OF |short-generic-result|
| OR EMPTY SET

:Example: Using a combinations table on an **undirected** graph
Expand Down
4 changes: 2 additions & 2 deletions doc/bellman_ford/pgr_bellmanFord.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ Many to Many

| pgr_bellmanFord(`Edges SQL`_, **start vids**, **end vids**, [``directed``])

| RETURNS SET OF |result-m-m|
| RETURNS SET OF |short-generic-result|
| OR EMPTY SET

:Example: From vertices :math:`\{6, 1\}` to vertices :math:`\{10, 17\}` on an
Expand All @@ -197,7 +197,7 @@ Combinations

| pgr_bellmanFord(`Edges SQL`_, `Combinations SQL`_, [``directed``])

| RETURNS SET OF |result-m-m|
| RETURNS SET OF |short-generic-result|
| OR EMPTY SET

:Example: Using a combinations table on an **undirected** graph.
Expand Down
4 changes: 2 additions & 2 deletions doc/bellman_ford/pgr_edwardMoore.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ Many to Many

| pgr_edwardMoore(`Edges SQL`_, **start vids**, **end vids**, [``directed``]);

| RETURNS SET OF |result-m-m|
| RETURNS SET OF |short-generic-result|
| OR EMPTY SET

:Example: From vertices :math:`\{6, 1\}` to vertices :math:`\{10, 17\}` on an
Expand All @@ -197,7 +197,7 @@ Combinations

| pgr_edwardMoore(`Edges SQL`_, `Combinations SQL`_, [``directed``]);

| RETURNS SET OF |result-m-m|
| RETURNS SET OF |short-generic-result|
| OR EMPTY SET

:Example: Using a combinations table on an **undirected** graph.
Expand Down
4 changes: 2 additions & 2 deletions doc/breadthFirstSearch/pgr_binaryBreadthFirstSearch.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ Many to Many

| pgr_binaryBreadthFirstSearch(`Edges SQL`_, **start vids**, **end vids**, [``directed``])

| RETURNS SET OF |result-m-m|
| RETURNS SET OF |short-generic-result|
| OR EMPTY SET

:Example: From vertices :math:`\{6, 1\}` to vertices :math:`\{10, 17\}` on an
Expand All @@ -196,7 +196,7 @@ Combinations

| pgr_binaryBreadthFirstSearch(`Edges SQL`_, `Combinations SQL`_, [``directed``])

| RETURNS SET OF |result-m-m|
| RETURNS SET OF |short-generic-result|
| OR EMPTY SET

:Example: Using a combinations table on an **undirected** graph
Expand Down
3 changes: 1 addition & 2 deletions doc/conf.py.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,15 +356,14 @@ rst_epilog="""
.. |ANY-INTEGER| replace:: :abbr:`ANY-INTEGER(SMALLINT, INTEGER, BIGINT)`
.. |ANY-NUMERICAL| replace:: :abbr:`ANY-NUMERICAL(SMALLINT, INTEGER, BIGINT, REAL, FLOAT)`
.. |generic-result| replace:: ``(seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)``
.. |ksp-result| replace:: ``(seq, path_id, path_seq, node, edge, cost, agg_cost)``
.. |short-generic-result| replace:: ``(seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)``
.. |via-result| replace:: ``(seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost, route_agg_cost)``
.. |matrix-result| replace:: ``(start_vid, end_vid, agg_cost)``
.. |ksp-result| replace:: ``(seq, path_id, path_seq, node, edge, cost, agg_cost)``
.. |old-generic-result| replace:: ``(seq, path_seq, [start_vid], [end_vid], node, edge, cost, agg_cost)``
.. |result-1-1| replace:: ``(seq, path_seq, node, edge, cost, agg_cost)``
.. |result-1-m| replace:: ``(seq, path_seq, end_vid, node, edge, cost, agg_cost)``
.. |result-m-1| replace:: ``(seq, path_seq, start_vid, node, edge, cost, agg_cost)``
.. |result-m-m| replace:: ``(seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)``
.. |result-bfs| replace:: ``(seq, depth, start_vid, node, edge, cost, agg_cost)``
.. |result-mst| replace:: ``(edge, cost)``
.. |result-1-1-no-seq| replace:: ``(seq, node, edge, cost, agg_cost)``
Expand Down
4 changes: 2 additions & 2 deletions doc/dijkstra/pgr_dijkstra.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ Many to Many
:class: signatures

| pgr_dijkstra(`Edges SQL`_, **start vids**, **end vids** , [``directed``])
| RETURNS SET OF |result-m-m|
| RETURNS SET OF |short-generic-result|

| RETURNS (seq, path_seq, start vid, end vid, node, edge, cost, agg_cost)
| OR EMPTY SET
Expand All @@ -187,7 +187,7 @@ Combinations

| pgr_dijkstra(`Edges SQL`_, `Combinations SQL`_ , [``directed``])

| RETURNS SET OF |result-m-m|
| RETURNS SET OF |short-generic-result|
| OR EMPTY SET

:Example: Using a combinations table on an **undirected** graph
Expand Down
6 changes: 3 additions & 3 deletions doc/dijkstra/pgr_dijkstraNear.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ Signatures
:class: signatures

| pgr_dijkstraNear(`Edges SQL`_, **start vid**, **end vids**, [**options A**])
| pgr_dijkstraNear(`Edges SQL`_, **start vids**, **end vid** [**options A**])
| pgr_dijkstraNear(`Edges SQL`_, **start vids**, **end vids** [**options B**])
| pgr_dijkstraNear(`Edges SQL`_, `Combinations SQL`_ [**options B**])
| pgr_dijkstraNear(`Edges SQL`_, **start vids**, **end vid**, [**options A**])
| pgr_dijkstraNear(`Edges SQL`_, **start vids**, **end vids**, [**options B**])
| pgr_dijkstraNear(`Edges SQL`_, `Combinations SQL`_, [**options B**])
| **options A:** ``[directed, cap]``
| **options B:** ``[directed, cap, global]``

Expand Down
12 changes: 6 additions & 6 deletions doc/trsp/pgr_trsp.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ Signatures
| pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vids**, **end vids**, [directed])
| pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, `Combinations SQL`_, [directed])

| RETURNS SET OF |generic-result|
| RETURNS SET OF |short-generic-result|
| OR EMPTY SET

.. index::
Expand All @@ -115,7 +115,7 @@ One to One

pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vid**, **end vid**, [directed])

| RETURNS SET OF |generic-result|
| RETURNS SET OF |short-generic-result|
| OR EMPTY SET

:Example: From vertex :math:`6` to vertex :math:`10` on an undirected graph.
Expand All @@ -135,7 +135,7 @@ One to Many

pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vid**, **end vids**, [directed])

| RETURNS SET OF |generic-result|
| RETURNS SET OF |short-generic-result|
| OR EMPTY SET

:Example: From vertex :math:`6` to vertices :math:`\{10, 1\}` on an
Expand All @@ -157,7 +157,7 @@ Many to One
pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vids**, **end vid**,
[directed])

| RETURNS SET OF |generic-result|
| RETURNS SET OF |short-generic-result|
| OR EMPTY SET

:Example: From vertices :math:`\{6, 1\}` to vertex :math:`8` on a directed
Expand All @@ -179,7 +179,7 @@ Many to Many
pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vids**, **end vids**,
[directed])

| RETURNS SET OF |generic-result|
| RETURNS SET OF |short-generic-result|
| OR EMPTY SET

:Example: From vertices :math:`\{6, 1\}` to vertices :math:`\{10, 8\}` on an
Expand All @@ -200,7 +200,7 @@ Combinations

pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, `Combinations SQL`_, [directed])

| RETURNS SET OF |generic-result|
| RETURNS SET OF |short-generic-result|
| OR EMPTY SET

:Example: Using a combinations table on an undirected graph.
Expand Down
12 changes: 6 additions & 6 deletions doc/trsp/pgr_trsp_withPoints.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ Signatures

:[options]: [directed, driving_side [details]

| RETURNS SET OF |generic-result|
| RETURNS SET OF |short-generic-result|
| OR EMPTY SET

.. index::
Expand All @@ -103,7 +103,7 @@ One to One
pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, **start
vid**, **end vid**, [directed, driving_side, details])

| RETURNS SET OF |generic-result|
| RETURNS SET OF |short-generic-result|
| OR EMPTY SET

:Example: From point :math:`1` to vertex :math:`10` with details on a left
Expand All @@ -125,7 +125,7 @@ One to Many
pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, **start
vid**, **end vids** [directed, driving_side, details])

| RETURNS SET OF |generic-result|
| RETURNS SET OF |short-generic-result|
| OR EMPTY SET

:Example: From point :math:`1` to point :math:`3` and vertex :math:`7`.
Expand All @@ -146,7 +146,7 @@ Many to One
pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, **start
vids**, **end vid** [directed, driving_side, details])

| RETURNS SET OF |generic-result|
| RETURNS SET OF |short-generic-result|
| OR EMPTY SET

:Example: From point :math:`1` and vertex :math:`6` to point :math:`3`.
Expand All @@ -167,7 +167,7 @@ Many to Many
pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, **start
vids**, **end vids** [directed, driving_side, details])

| RETURNS SET OF |generic-result|
| RETURNS SET OF |short-generic-result|
| OR EMPTY SET

:Example: From point :math:`1` and vertex :math:`6` to point :math:`3` and
Expand All @@ -189,7 +189,7 @@ Combinations
pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Combinations SQL`_,
`Points SQL`_, [directed, driving_side, details])

| RETURNS SET OF |generic-result|
| RETURNS SET OF |short-generic-result|
| OR EMPTY SET

:Example: From point :math:`1` to vertex :math:`10` and from vertex :math:`6` to
Expand Down
42 changes: 21 additions & 21 deletions docqueries/src/migration.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,14 +131,14 @@ SELECT * FROM pgr_trsp(
FROM edges WHERE id != 16$$,
$$SELECT * FROM new_restrictions$$,
15, 16);
seq | path_id | path_seq | start_vid | end_vid | node | edge | cost | agg_cost
-----+---------+----------+-----------+---------+------+------+------+----------
1 | 1 | 1 | 15 | 16 | 15 | 3 | 1 | 0
2 | 1 | 2 | 15 | 16 | 10 | 5 | 1 | 1
3 | 1 | 3 | 15 | 16 | 11 | 11 | 1 | 2
4 | 1 | 4 | 15 | 16 | 12 | 13 | 1 | 3
5 | 1 | 5 | 15 | 16 | 17 | 15 | 1 | 4
6 | 1 | 6 | 15 | 16 | 16 | -1 | 0 | 5
seq | path_seq | start_vid | end_vid | node | edge | cost | agg_cost
-----+----------+-----------+---------+------+------+------+----------
1 | 1 | 15 | 16 | 15 | 3 | 1 | 0
2 | 2 | 15 | 16 | 10 | 5 | 1 | 1
3 | 3 | 15 | 16 | 11 | 11 | 1 | 2
4 | 4 | 15 | 16 | 12 | 13 | 1 | 3
5 | 5 | 15 | 16 | 17 | 15 | 1 | 4
6 | 6 | 15 | 16 | 16 | -1 | 0 | 5
(6 rows)

/* --verticesv6 */
Expand Down Expand Up @@ -241,19 +241,19 @@ SELECT * FROM pgr_trsp_withPoints(
$$SELECT pid, edge_id, fraction FROM pointsOfInterest WHERE pid IN (4, 3)$$,
-4, -3,
details => false);
seq | path_id | path_seq | start_vid | end_vid | node | edge | cost | agg_cost
-----+---------+----------+-----------+---------+------+------+------+----------
1 | 1 | 1 | -4 | -3 | -4 | 6 | 0.7 | 0
2 | 1 | 2 | -4 | -3 | 3 | 7 | 1 | 0.7
3 | 1 | 3 | -4 | -3 | 7 | 8 | 1 | 1.7
4 | 1 | 4 | -4 | -3 | 11 | 9 | 1 | 2.7
5 | 1 | 5 | -4 | -3 | 16 | 16 | 1 | 3.7
6 | 1 | 6 | -4 | -3 | 15 | 3 | 1 | 4.7
7 | 1 | 7 | -4 | -3 | 10 | 2 | 1 | 5.7
8 | 1 | 8 | -4 | -3 | 6 | 4 | 1 | 6.7
9 | 1 | 9 | -4 | -3 | 7 | 10 | 1 | 7.7
10 | 1 | 10 | -4 | -3 | 8 | 12 | 0.6 | 8.7
11 | 1 | 11 | -4 | -3 | -3 | -1 | 0 | 9.3
seq | path_seq | start_vid | end_vid | node | edge | cost | agg_cost
-----+----------+-----------+---------+------+------+------+----------
1 | 1 | -4 | -3 | -4 | 6 | 0.7 | 0
2 | 2 | -4 | -3 | 3 | 7 | 1 | 0.7
3 | 3 | -4 | -3 | 7 | 8 | 1 | 1.7
4 | 4 | -4 | -3 | 11 | 9 | 1 | 2.7
5 | 5 | -4 | -3 | 16 | 16 | 1 | 3.7
6 | 6 | -4 | -3 | 15 | 3 | 1 | 4.7
7 | 7 | -4 | -3 | 10 | 2 | 1 | 5.7
8 | 8 | -4 | -3 | 6 | 4 | 1 | 6.7
9 | 9 | -4 | -3 | 7 | 10 | 1 | 7.7
10 | 10 | -4 | -3 | 8 | 12 | 0.6 | 8.7
11 | 11 | -4 | -3 | -3 | -1 | 0 | 9.3
(11 rows)

/* --edgesv6 */
Expand Down
Loading