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

New function pgr_trsp_withPoints (Closing #2245) #2246

Merged
merged 16 commits into from
Feb 6, 2022
Merged

New function pgr_trsp_withPoints (Closing #2245) #2246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
cc3647f
[pgr_trsp_withPoints][SQL] Creating new signatures
cvvergara Feb 4, 2022
b55e956
[pgr_trsp][SQL] Deprecating function
cvvergara Feb 4, 2022
f3eae5c
[pgr_trsp_withPoints][C/C++] Creating code to handle function
cvvergara Feb 4, 2022
7ec9c78
[trsp][C/C++] vertices can have negative values when they are points
cvvergara Feb 4, 2022
e33f0fc
[pgr_trsp_withPoints][docqueries] adding queries intended for the doc…
cvvergara Feb 4, 2022
7ed023b
[pgr_trsp][docqueries] adding queries to help migration to nbew signa…
cvvergara Feb 4, 2022
988ba02
[pgr_trsp[docqueries] adding warning message
cvvergara Feb 4, 2022
6aea0e2
[tools] adding additional tool for pgtap testing
cvvergara Feb 4, 2022
2ebbf66
[trsp][pgtap] ignoring deprecated warning
cvvergara Feb 4, 2022
3d45f98
[pgr_trsp_withPoints] adding the tests that must pass
cvvergara Feb 4, 2022
483b1cc
[pgr_trsp_withPoints][build] adding code to the build
cvvergara Feb 4, 2022
ed7a7d0
[trsp] refining documentation
cvvergara Feb 4, 2022
81249ee
[pgr_trsp_withPoints][doc] adding documentation of new function
cvvergara Feb 4, 2022
1569106
[trsp][doc] removing unused files
cvvergara Feb 4, 2022
63abaf8
[trsp] ignoring links that do not exist
cvvergara Feb 4, 2022
2a4f844
[trsp][docqueries] removing context and fixing a syntax error
cvvergara Feb 6, 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
21 changes: 15 additions & 6 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,26 @@ pgRouting 3.4.0 Release Notes

* pgr_trsp

* pgr_trsp(One to One)
* pgr_trsp(One to Many)
* pgr_trsp(Many to One)
* pgr_trsp(Many to Many)
* pgr_trsp(Combinations)
* ``pgr_trsp`` (One to One)
* ``pgr_trsp`` (One to Many)
* ``pgr_trsp`` (Many to One)
* ``pgr_trsp`` (Many to Many)
* ``pgr_trsp`` (Combinations)

* pgr_trsp_withPoints

* ``pgr_trsp_withPoints`` (One to One)
* ``pgr_trsp_withPoints`` (One to Many)
* ``pgr_trsp_withPoints`` (Many to One)
* ``pgr_trsp_withPoints`` (Many to Many)
* ``pgr_trsp_withPoints`` (Combinations)

**Deprecated functions**

* Turn Restrictions

* pgr_trsp(text, integer, integer, boolean, boolean, text)
* ``pgr_trsp(text, integer, integer, boolean, boolean, text)``
* ``pgr_trsp(text, integer, float8, integer, float8, boolean, boolean, text)``



Expand Down
5 changes: 5 additions & 0 deletions doc/_static/custom.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,8 @@ div.content-wrapper {
div.topic {
border: none;
}

code.literal {
color: #404040;
background-color: #fbfbfb;
}
2 changes: 2 additions & 0 deletions doc/conf.py.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,8 @@ pdf_style_path = ['.', '_styles']
linkcheck_ignore = [
'https://docs.pgrouting.org/latest/en/TRSP-family.html',
'https://docs.pgrouting.org/3.4/en/TRSP-family.html',
'https://docs.pgrouting.org/latest/en/pgr_trsp_withPoints.html',
'https://docs.pgrouting.org/3.4/en/pgr_trsp_withPoints.html',



Expand Down
21 changes: 15 additions & 6 deletions doc/src/release_notes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,26 @@ pgRouting 3.4.0 Release Notes

* pgr_trsp

* pgr_trsp(One to One)
* pgr_trsp(One to Many)
* pgr_trsp(Many to One)
* pgr_trsp(Many to Many)
* pgr_trsp(Combinations)
* ``pgr_trsp`` (One to One)
* ``pgr_trsp`` (One to Many)
* ``pgr_trsp`` (Many to One)
* ``pgr_trsp`` (Many to Many)
* ``pgr_trsp`` (Combinations)

* pgr_trsp_withPoints

* ``pgr_trsp_withPoints`` (One to One)
* ``pgr_trsp_withPoints`` (One to Many)
* ``pgr_trsp_withPoints`` (Many to One)
* ``pgr_trsp_withPoints`` (Many to Many)
* ``pgr_trsp_withPoints`` (Combinations)

.. rubric:: Deprecated functions

* Turn Restrictions

* pgr_trsp(text, integer, integer, boolean, boolean, text)
* ``pgr_trsp(text, integer, integer, boolean, boolean, text)``
* ``pgr_trsp(text, integer, float8, integer, float8, boolean, boolean, text)``



Expand Down
1 change: 1 addition & 0 deletions doc/trsp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
SET(LOCAL_FILES
TRSP-family.rst
pgr_trsp.rst
pgr_trsp_withPoints.rst
pgr_turnRestrictedPath.rst
)

Expand Down
22 changes: 11 additions & 11 deletions doc/trsp/TRSP-family.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ When points are also given as input:
.. index proposed from here

- :doc:`pgr_trsp` - Routing with restrictions.
- :doc:`pgr_trsp_withPoints` - Routing points with restrictions.

.. index proposed to here

Expand All @@ -46,10 +47,9 @@ When points are also given as input:
:hidden:

pgr_trsp
pgr_trsp_withPoints
pgr_turnRestrictedPath



Introduction
-------------------------------------------------------------------------------

Expand All @@ -59,7 +59,7 @@ Restrictions
On road networks, there are restrictions such as left or right turn restrictions,
no U turn restrictions.

A restriction is a sequence of edges, called `path` and that `path` is to be avoided.
A restriction is a sequence of edges, called **path** and that **path** is to be avoided.

.. figure:: /images/with_restrictions.png
:scale: 50%
Expand All @@ -80,17 +80,17 @@ Restrictions SQL

.. restrictions_columns_start

========= ===================== =================================================================================
Column Type Description
========= ===================== =================================================================================
**path** ``ARRAY[ANYINTEGER]`` Sequence of Edges identifiers that form a path that is not allowed to be taken
**Cost** ``ANY-NUMERICAL`` Cost of taking the forbidden path
========= ===================== =================================================================================
========= =============================== =================================================================================
Column Type Description
========= =============================== =================================================================================
``path`` ``ARRAY[`` **ANYINTEGER** ``]`` Sequence of Edges identifiers that form a path that is not allowed to be taken
``Cost`` **ANY-NUMERICAL** Cost of taking the forbidden path
========= =============================== =================================================================================

Where:

:ANY-INTEGER: SMALLINT, INTEGER, BIGINT
:ANY-NUMERICAL: SMALLINT, INTEGER, BIGINT, REAL, FLOAT
:ANY-INTEGER: ``SMALLINT``, ``INTEGER``, ``BIGINT``
:ANY-NUMERICAL: ``SMALLINT``, ``INTEGER``, ``BIGINT``, ``REAL``, ``FLOAT``

.. restrictions_columns_end

Expand Down
Loading