From d2a4ab3cdac0d2ec1faad28783042b2ee10ef720 Mon Sep 17 00:00:00 2001 From: Vicky Vergara Date: Tue, 12 Jul 2022 12:21:01 -0500 Subject: [PATCH] Trsp enhancement (#2354) trsp * [code] adding path_id column * [sql] adding path_id column * [docqueries] adjusting results * [pgtap] * adding path_id column to general result * adjusting tests * [doc] fixing & adjusting documentation * [locale] updating the locale --- doc/_static/custom.css | 36 +- doc/conf.py.in | 19 +- doc/trsp/TRSP-family.rst | 4 +- doc/trsp/pgr_trsp.rst | 132 +++-- doc/trsp/pgr_trspVia.rst | 32 +- doc/trsp/pgr_trspVia_withPoints.rst | 41 +- doc/trsp/pgr_trsp_withPoints.rst | 173 +++--- doc/trsp/pgr_turnRestrictedPath.rst | 6 +- docqueries/src/migration.result | 42 +- docqueries/trsp/doc-trsp.result | 148 ++--- docqueries/trsp/trsp_withPoints.result | 256 ++++---- locale/en/LC_MESSAGES/TRSP-family.po | 10 +- locale/en/LC_MESSAGES/pgr_trsp.po | 242 ++++---- locale/en/LC_MESSAGES/pgr_trspVia.po | 128 ++-- .../en/LC_MESSAGES/pgr_trspVia_withPoints.po | 162 +++--- locale/en/LC_MESSAGES/pgr_trsp_withPoints.po | 344 +++++++---- .../en/LC_MESSAGES/pgr_turnRestrictedPath.po | 8 +- locale/es/LC_MESSAGES/TRSP-family.po | 123 ++-- locale/es/LC_MESSAGES/VRP-category.po | 24 +- locale/es/LC_MESSAGES/pgr_trsp.po | 304 +++++----- locale/es/LC_MESSAGES/pgr_trspVia.po | 264 +++++---- .../es/LC_MESSAGES/pgr_trspVia_withPoints.po | 372 ++++++------ locale/es/LC_MESSAGES/pgr_trsp_withPoints.po | 549 +++++++++++------- .../es/LC_MESSAGES/pgr_turnRestrictedPath.po | 64 +- locale/pot/TRSP-family.pot | 6 +- locale/pot/pgr_trsp.pot | 243 ++++---- locale/pot/pgr_trspVia.pot | 126 ++-- locale/pot/pgr_trspVia_withPoints.pot | 160 ++--- locale/pot/pgr_trsp_withPoints.pot | 328 +++++++---- locale/pot/pgr_turnRestrictedPath.pot | 8 +- .../maxCardinalityMatch/inner_query.pg | 1 + pgtap/trsp/trsp/types_check.pg | 23 +- sql/sigs/pgrouting--3.4.sig | 3 +- sql/trsp/_trsp.sql | 29 +- sql/trsp/_trsp_withPoints.sql | 2 + sql/trsp/trsp.sql | 15 +- sql/trsp/trsp_withPoints.sql | 5 + src/trsp/new_trsp.c | 96 ++- src/trsp/trsp_withPoints.c | 45 +- src/trsp/trsp_withPoints_driver.cpp | 5 + tools/testers/types_check.sql | 6 +- 41 files changed, 2664 insertions(+), 1920 deletions(-) diff --git a/doc/_static/custom.css b/doc/_static/custom.css index 43357208fe..e0f91adbe0 100644 --- a/doc/_static/custom.css +++ b/doc/_static/custom.css @@ -11,7 +11,41 @@ div.content-wrapper { } div.topic { - border: none; + border: none; +} + +p.admonition-title { + font-weight: bold; + background-color: aqua; + border: #000000; +} + +.alert-warning { + color: #333; +} + +.alert-info { + color: #333; +} + +div.note { + background-color: white; + background-image: none; +} + +div.warning { + background-color: white; + background-image: none; +} + +div.signatures { + font-family: Menlo,Monaco,Consolas,"Courier New",monospace; + background-image: none; + background-color: #f5f5f5; + border: 1px solid #ccc; + color: #333; + font-size: 13px; + word-break: keep-all; } code.literal { diff --git a/doc/conf.py.in b/doc/conf.py.in index f03b7281db..2e10cd64f5 100644 --- a/doc/conf.py.in +++ b/doc/conf.py.in @@ -86,7 +86,7 @@ release = '@PROJECT_FULL_VERSION@' # for a list of supported languages. language = 'en' locale_dirs = ['@CMAKE_SOURCE_DIR@/locale/'] -#gettext_compact = False + # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: @@ -99,15 +99,9 @@ locale_dirs = ['@CMAKE_SOURCE_DIR@/locale/'] exclude_patterns = [ ] -# 'src/pickDeliver/doc/pgr_withPointsVia.rst', # The reST default role (used for this markup: `text`) to use for all documents. #default_role = None -# If true, '()' will be appended to :func: etc. cross-reference text. -#add_function_parentheses = True - -# If true, the current module name will be prepended to all description -# unit titles (such as .. function::). add_module_names = False # If true, sectionauthor and moduleauthor directives will be shown in the @@ -120,6 +114,15 @@ pygments_style = 'sphinx' # A list of ignored prefixes for module index sorting. #modindex_common_prefix = [] +# -- Options for internationalization --------------------------------------------------- + +gettext_allow_fuzzy_translations = True +gettext_location = True +#gettext_uuid = True +#gettext_additional_targets = [ ] +#gettext_compact = "docs" + + # -- Options for HTML output --------------------------------------------------- @@ -346,6 +349,8 @@ linkcheck_anchors = False 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) +.. |via-result| replace:: (seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost, route_agg_cost) """ # Create a compressed PDF diff --git a/doc/trsp/TRSP-family.rst b/doc/trsp/TRSP-family.rst index 5073f6e3ae..da89f07ea6 100644 --- a/doc/trsp/TRSP-family.rst +++ b/doc/trsp/TRSP-family.rst @@ -64,7 +64,7 @@ Road restrictions are a sequence of road segments that can not be taken in a sequential manner. Some restrictions are implicit on a directed graph, for example, one way roads where the wrong way edge is not even inserted on the graph. -But normally on turns like **left turn** or **right turn**, hence the name turn +But normally on turns like no left turn or no right turn, hence the name turn restrictions, there are sometimes restrictions. .. image:: images/restrictions.png @@ -112,7 +112,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 +A restriction is a sequence of edges, called path and that path is to be avoided. .. TODO update the image diff --git a/doc/trsp/pgr_trsp.rst b/doc/trsp/pgr_trsp.rst index 76a7ba8530..4c675aed0c 100644 --- a/doc/trsp/pgr_trsp.rst +++ b/doc/trsp/pgr_trsp.rst @@ -28,14 +28,22 @@ pgr_trsp - Proposed =============================================================================== - ``pgr_trsp`` - routing vertices with restrictions. +.. figure:: images/boost-inside.jpeg + :target: https://www.boost.org/libs/graph/doc/table_of_contents.html + + Boost Graph Inside + +.. include:: proposed.rst + :start-after: begin-warning + :end-before: end-warning + .. rubric:: Availability * Version 3.4.0 - * New **Proposed** signatures + * New proposed signatures: * ``pgr_trsp`` (`One to One`_) * ``pgr_trsp`` (`One to Many`_) @@ -43,15 +51,16 @@ pgr_trsp - Proposed * ``pgr_trsp`` (`Many to Many`_) * ``pgr_trsp`` (`Combinations`_) - * Deprecated signatures - * ``pgr_trsp(text,integer,integer,boolean,boolean,text)`` - * ``pgr_trsp(text,integer,float,integer,float,boolean,boolean,text)`` - * ``pgr_trspViaVertices(text,anyarray,boolean,boolean,text)`` - * ``pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)`` + * Deprecated signatures: + + * ``pgr_trsp(text,integer,integer,boolean,boolean,text)`` + * ``pgr_trsp(text,integer,float,integer,float,boolean,boolean,text)`` + * ``pgr_trspViaVertices(text,anyarray,boolean,boolean,text)`` + * ``pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)`` * Version 2.1.0 - * New *Via* **prototypes** + * New prototypes: * ``pgr_trspViaVertices`` * ``pgr_trspViaEdges`` @@ -69,41 +78,31 @@ real world navigable road networks. The main characteristics are: -* Automatic detection of ``reverse_cost`` column -* Accepts **ANY-INTEGER** and **ANY-NUMERICAL** on input columns -* All variations give as result the same columns -* It does no guarantee the shortest path as it might contain restriction paths +* It does no guarantee the shortest path as it might contain restriction paths. The general algorithm is as follows: -* Execute a Dijkstra -* If the solution passes thru a restriction then +* Execute a Dijkstra. +* If the solution passes thru a restriction then. - * Execute the **TRSP** algorithm with restrictions + * Execute the **TRSP** algorithm with restrictions. Signatures ------------------------------------------------------------------------------- .. rubric:: Proposed -.. include:: proposed.rst - :start-after: begin-warning - :end-before: end-warning +.. admonition:: \ \ + :class: signatures -.. parsed-literal:: - - pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, start vid, end vid - [, directed]) -- Proposed on v3.4 - pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, start vid, end vids - [, directed]) -- Proposed on v3.4 - pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, start vids, end vid - [, directed]) -- Proposed on v3.4 - pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, start vids, end vids - [, directed]) -- Proposed on v3.4 - pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, `Combinations SQL`_, - [, directed]) -- Proposed on v3.4 - RETURNS (seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost) - OR EMPTY SET + | pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vid**, **end vid**, [directed]) + | pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vid**, **end vids**, [ directed]) + | pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vids**, **end vid**, [directed]) + | 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| + | OR EMPTY SET .. index:: single: trsp(One to One) -- Proposed on v3.4 @@ -111,14 +110,15 @@ Signatures One to One ............................................................................... -.. parsed-literal:: +.. admonition:: \ \ + :class: signatures + + pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vid**, **end vid**, [directed]) - pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, start vid, end vid - [, directed]) -- Proposed on v3.4 - RETURNS (seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost) - OR EMPTY SET + | RETURNS SET OF |generic-result| + | OR EMPTY SET -:Example: From vertex :math:`6` to vertex :math:`10` on an **undirected** graph +:Example: From vertex :math:`6` to vertex :math:`10` on an undirected graph. .. literalinclude:: doc-trsp.queries :start-after: -- q2 @@ -130,15 +130,16 @@ One to One One to Many ............................................................................... -.. parsed-literal:: +.. admonition:: \ \ + :class: signatures - pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, start vid, end vids - [, directed]) -- Proposed on v3.4 - RETURNS (seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost) - OR EMPTY SET + pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vid**, **end vids**, [directed]) + + | RETURNS SET OF |generic-result| + | OR EMPTY SET :Example: From vertex :math:`6` to vertices :math:`\{10, 1\}` on an - **undirected** graph + undirected graph. .. literalinclude:: doc-trsp.queries :start-after: -- q3 @@ -150,15 +151,17 @@ One to Many Many to One ............................................................................... -.. parsed-literal:: +.. admonition:: \ \ + :class: signatures + + pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vids**, **end vid**, + [directed]) - pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, start vids, end vid - [, directed]) -- Proposed on v3.4 - RETURNS (seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost) - OR EMPTY SET + | RETURNS SET OF |generic-result| + | OR EMPTY SET -:Example: From vertices :math:`\{6, 1\}` to vertex :math:`8` on a **directed** - graph +:Example: From vertices :math:`\{6, 1\}` to vertex :math:`8` on a directed + graph. .. literalinclude:: doc-trsp.queries :start-after: -- q4 @@ -170,15 +173,17 @@ Many to One Many to Many ............................................................................... -.. parsed-literal:: +.. admonition:: \ \ + :class: signatures - pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, start vids, end vids - [, directed]) -- Proposed on v3.4 - RETURNS (seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost) - OR EMPTY SET + pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vids**, **end vids**, + [directed]) + + | RETURNS SET OF |generic-result| + | OR EMPTY SET :Example: From vertices :math:`\{6, 1\}` to vertices :math:`\{10, 8\}` on an - **undirected** graph + undirected graph. .. literalinclude:: doc-trsp.queries :start-after: -- q5 @@ -190,14 +195,15 @@ Many to Many Combinations ............................................................................... -.. parsed-literal:: +.. admonition:: \ \ + :class: signatures + + pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, `Combinations SQL`_, [directed]) - pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, `Combinations SQL`_, - [, directed]) -- Proposed on v3.4 - RETURNS (seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost) - OR EMPTY SET + | RETURNS SET OF |generic-result| + | OR EMPTY SET -:Example: Using a combinations table on an **undirected** graph +:Example: Using a combinations table on an undirected graph. .. literalinclude:: doc-trsp.queries :start-after: -- q6 diff --git a/doc/trsp/pgr_trspVia.rst b/doc/trsp/pgr_trspVia.rst index 01e62f653f..12a071f0bc 100644 --- a/doc/trsp/pgr_trspVia.rst +++ b/doc/trsp/pgr_trspVia.rst @@ -18,20 +18,22 @@ ``pgr_trspVia`` Route that goes through a list of vertices with restrictions. -.. include:: proposed.rst - :start-after: stable-begin-warning - :end-before: stable-end-warning - .. figure:: images/boost-inside.jpeg :target: https://www.boost.org/libs/graph/doc/table_of_contents.html Boost Graph Inside +.. include:: proposed.rst + :start-after: stable-begin-warning + :end-before: stable-end-warning + .. rubric:: Availability * Version 3.4.0 - * New **proposed** function ``pgr_trspVia`` (`One Via`_) + * New proposed function: + + * ``pgr_trspVia`` (`One Via`_) Description ------------------------------------------------------------------------------- @@ -60,16 +62,18 @@ Signatures One Via ............................................................................... -.. parsed-literal:: +.. admonition:: \ \ + :class: signatures + + pgr_trspVia(`Edges SQL`_, `Restrictions SQL`_, **via vertices**, [options]) + + :[options]: [directed, strict, U_turn_on_edge] - pgr_trspVia(`Edges SQL`_, `Restrictions SQL`_, **via vertices** - [, directed] [, strict] [, U_turn_on_edge]) - Proposed on v3.4 - RETURNS SET OF (seq, path_pid, path_seq, start_vid, end_vid, - node, edge, cost, agg_cost, route_agg_cost) - OR EMPTY SET + RETURNS SET OF |via-result| + OR EMPTY SET :Example: Find the route that visits the vertices :math:`\{ 5, 1, 8\}` in that - order on an **directed** graph. + order on an directed graph. .. literalinclude:: trspVia.queries :start-after: -- q0 @@ -127,7 +131,7 @@ Additional Examples :local: All this examples are about the route that visits the vertices :math:`\{5, 7, 1, -8, 15\}` in that order on a **directed** graph. +8, 15\}` in that order on a directed graph. The main query ............................................................................... @@ -171,7 +175,7 @@ Status of "passes in front" or "visits" of the nodes. :start-after: -- q6 :end-before: -- q7 -Simulation of how algorithm works +Simulation of how algorithm works. ............................................................................... The algorithm performs a :doc:`pgr_dijkstraVia` diff --git a/doc/trsp/pgr_trspVia_withPoints.rst b/doc/trsp/pgr_trspVia_withPoints.rst index 92371117d0..faddbc08d9 100644 --- a/doc/trsp/pgr_trspVia_withPoints.rst +++ b/doc/trsp/pgr_trspVia_withPoints.rst @@ -19,20 +19,22 @@ ``pgr_trspVia_withPoints`` - Route that goes through a list of vertices and/or points with restrictions. -.. include:: proposed.rst - :start-after: stable-begin-warning - :end-before: stable-end-warning - .. figure:: images/boost-inside.jpeg :target: https://www.boost.org/libs/graph/doc/table_of_contents.html Boost Graph Inside +.. include:: proposed.rst + :start-after: stable-begin-warning + :end-before: stable-end-warning + .. rubric:: Availability * Version 3.4.0 - * New **proposed** function ``pgr_trspVia_withPoints`` (`One Via`_) + * New proposed function: + + ``pgr_trspVia_withPoints`` (`One Via`_) Description ------------------------------------------------------------------------------- @@ -70,16 +72,19 @@ Signatures One Via ............................................................................... -.. parsed-literal:: +.. admonition:: \ \ + :class: signatures - pgr_trspVia_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, **via vertices** - [, directed] [, strict] [, U_turn_on_edge]) - Proposed on v3.4 - RETURNS SET OF (seq, path_pid, path_seq, start_vid, end_vid, - node, edge, cost, agg_cost, route_agg_cost) - OR EMPTY SET + pgr_trspVia(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, **via + vertices**, [options]) + + :[options]: [directed, strict, U_turn_on_edge] + + RETURNS SET OF |via-result| + OR EMPTY SET :Example: Find the route that visits the vertices :math:`\{-6, 15, -5\}` in that - order on an **directed** graph. + order on an directed graph. .. literalinclude:: trspVia_withPoints.queries :start-after: -- q0 @@ -154,9 +159,11 @@ Additional Examples .. contents:: :local: -Use :doc:`pgr_findCloseEdges` in the `Points SQL`_. +Use ``pgr_findCloseEdges`` for points on the fly ............................................................................... +Using :doc:`pgr_findCloseEdges`: + Visit from vertex :math:`1` to the two locations on the graph of point `(2.9, 1.8)` in order of closeness to the graph. @@ -173,7 +180,7 @@ Usage variations ............................................................................... All this examples are about the route that visits the vertices :math:`\{-6, 7, --4, 8, -2\}` in that order on a **directed** graph. +-4, 8, -2\}` in that order on a directed graph. .. literalinclude:: trspVia_withPoints.queries :start-after: -- q1 @@ -214,7 +221,7 @@ Status of "passes in front" or "visits" of the nodes and points. :start-after: -- q6 :end-before: -- q7 -Simulation of how algorithm works +Simulation of how algorithm works. ............................................................................... The algorithm performs a :doc:`pgr_withPointsVia` @@ -249,8 +256,8 @@ Getting the same result as ``pgr_trspVia_withPoints``: :Example 8: Sometimes ``U_turn_on_edge`` flag is ignored when is set to ``false``. -The first step, doing a :doc:`pgr_withPointsVia` does consider not making a U turn -on the same edge. But the path :math:`9 \rightarrow 16` (Rows 4 and 5) is +The first step, doing a :doc:`pgr_withPointsVia` does consider not making a U +turn on the same edge. But the path :math:`9 \rightarrow 16` (Rows 4 and 5) is restricted and the result is using it. .. literalinclude:: trspVia_withPoints.queries diff --git a/doc/trsp/pgr_trsp_withPoints.rst b/doc/trsp/pgr_trsp_withPoints.rst index d1fd09d57e..59b3001503 100644 --- a/doc/trsp/pgr_trsp_withPoints.rst +++ b/doc/trsp/pgr_trsp_withPoints.rst @@ -18,20 +18,20 @@ pgr_trsp_withPoints - Proposed ``pgr_trsp_withPoints`` Routing Vertex/Point with restrictions. -.. include:: proposed.rst - :start-after: begin-warning - :end-before: end-warning - .. figure:: images/boost-inside.jpeg :target: https://www.boost.org/libs/graph/doc/table_of_contents.html Boost Graph Inside +.. include:: proposed.rst + :start-after: begin-warning + :end-before: end-warning + .. rubric:: Availability * Version 3.4.0 - * New **Proposed** signatures + * New proposed signatures: * ``pgr_trsp_withPoints`` (`One to One`_) * ``pgr_trsp_withPoints`` (`One to Many`_) @@ -45,15 +45,14 @@ Description Modify the graph to include points defined by points_sql. Using Dijkstra algorithm, find the shortest path(s) -**The main characteristics are:** +Characteristics: -- Process is done only on edges with positive costs. -- Driving side can not be `b` (**both**) - Vertices of the graph are: - **positive** when it belongs to the `Edges SQL`_ - **negative** when it belongs to the `Points SQL`_ +- Driving side can not be ``b`` - Values are returned when there is a path. - When the starting vertex and ending vertex are the same, there is no path. @@ -78,20 +77,19 @@ Signatures .. rubric:: Summary -.. parsed-literal:: - - pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, start vid, end vid - [, directed], [, driving_side] [, details]) -- Proposed on v3.4 - pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, start vid, end vids - [, directed], [, driving_side] [, details]) -- Proposed on v3.4 - pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, start vids, end vid - [, directed], [, driving_side] [, details]) -- Proposed on v3.4 - pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, start vids, end vids - [, directed], [, driving_side] [, details]) -- Proposed on v3.4 - pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Combinations SQL`_, `Points SQL`_, - [, directed], [, driving_side] [, details]) -- Proposed on v3.4 - RETURNS SET OF (seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost) - OR EMPTY SET +.. admonition:: \ \ + :class: signatures + + | pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, **start vid**, **end vid**, [options]) + | pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, **start vid**, **end vids**, [options]) + | pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, **start vids**, **end vid**, [options]) + | pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, **start vids**, **end vids**, [options]) + | pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Combinations SQL`_, `Points SQL`_, [options]) + + :[options]: [directed, driving_side [details] + + | RETURNS SET OF |generic-result| + | OR EMPTY SET .. index:: single: trsp_withPoints(One to One) - Proposed on v3.4 @@ -99,15 +97,17 @@ Signatures One to One ............................................................................... -.. parsed-literal:: +.. admonition:: \ \ + :class: signatures + + pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, **start + vid**, **end vid**, [directed, driving_side, details]) - pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, start vid, end vid - [, directed], [, driving_side] [, details]) -- Proposed on v3.4 - RETURNS SET OF (seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost) - OR EMPTY SET + | RETURNS SET OF |generic-result| + | OR EMPTY SET -:Example: From point :math:`1` to vertex :math:`10` with details on a **left** - driving side configuration on a **directed** graph with **details**. +:Example: From point :math:`1` to vertex :math:`10` with details on a left + driving side configuration on a directed graph with details. .. literalinclude:: trsp_withPoints.queries :start-after: --e1 @@ -119,12 +119,14 @@ One to One One to Many ............................................................................... -.. parsed-literal:: +.. admonition:: \ \ + :class: signatures + + pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, **start + vid**, **end vids** [directed, driving_side, details]) - pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, start vid, end vids - [, directed], [, driving_side] [, details]) -- Proposed on v3.4 - RETURNS SET OF (seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost) - OR EMPTY SET + | RETURNS SET OF |generic-result| + | OR EMPTY SET :Example: From point :math:`1` to point :math:`3` and vertex :math:`7`. @@ -138,12 +140,14 @@ One to Many Many to One ............................................................................... -.. parsed-literal:: +.. admonition:: \ \ + :class: signatures - pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, start vids, end vid - [, directed], [, driving_side] [, details]) -- Proposed on v3.4 - RETURNS SET OF (seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost) - OR EMPTY SET + pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, **start + vids**, **end vid** [directed, driving_side, details]) + + | RETURNS SET OF |generic-result| + | OR EMPTY SET :Example: From point :math:`1` and vertex :math:`6` to point :math:`3`. @@ -157,14 +161,16 @@ Many to One Many to Many ............................................................................... -.. parsed-literal:: +.. admonition:: \ \ + :class: signatures + + pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, **start + vids**, **end vids** [directed, driving_side, details]) - pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, start vids, end vids - [, directed], [, driving_side] [, details]) -- Proposed on v3.4 - RETURNS SET OF (seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost) - OR EMPTY SET + | RETURNS SET OF |generic-result| + | OR EMPTY SET -:Example: From point :math:`1` and vertex :math:`6` to point :math:`3` and +:Example: From point :math:`1` and vertex :math:`6` to point :math:`3` and vertex :math:`1`. .. literalinclude:: trsp_withPoints.queries @@ -177,14 +183,17 @@ Many to Many Combinations ............................................................................... -.. parsed-literal:: +.. admonition:: \ \ + :class: signatures - pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Combinations SQL`_, `Points SQL`_, - [, directed], [, driving_side] [, details]) -- Proposed on v3.4 - RETURNS SET OF (seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost) + pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Combinations SQL`_, + `Points SQL`_, [directed, driving_side, details]) + + | RETURNS SET OF |generic-result| + | OR EMPTY SET :Example: From point :math:`1` to vertex :math:`10` and from vertex :math:`6` to - point :math:`3` with **right** side driving configuration. + point :math:`3` with right side driving configuration. .. literalinclude:: trsp_withPoints.queries :start-after: --e5 @@ -236,8 +245,6 @@ With points optional parameters .. withPoints_parameters_end -| - Inner Queries ------------------------------------------------------------------------------- @@ -272,49 +279,9 @@ Combinations SQL Result Columns ------------------------------------------------------------------------------- -.. list-table:: - :width: 81 - :widths: 12 14 60 - :header-rows: 1 - - * - Column - - Type - - Description - * - ``seq`` - - ``INTEGER`` - - Sequential value starting from **1**. - * - ``path_seq`` - - ``INTEGER`` - - Relative position in the path. Has value **1** for the beginning of a - path. - * - ``start_vid`` - - ``BIGINT`` - - Identifier of the starting vertex of the path. - * - ``end_vid`` - - ``BIGINT`` - - Identifier of the ending vertex of the path. - * - ``node`` - - ``BIGINT`` - - Identifier of the node in the path from ``start_vid`` to ``end_vid``. - * - ``edge`` - - ``BIGINT`` - - Identifier of the edge used to go from ``node`` to the next node in the - path sequence. - - * -1 for the last node of the path. - * - ``cost`` - - ``FLOAT`` - - Cost to traverse from ``node`` using ``edge`` to the next node in the - path sequence. - - - ``0`` for the last row in the path sequence. - * - ``agg_cost`` - - ``FLOAT`` - - Aggregate cost from ``start_vid`` to ``node``. - - - ``0`` for the first row in the path sequence. - -.. result columns end +.. include:: pgRouting-concepts.rst + :start-after: return_path_all_columns_start + :end-before: return_path_all_columns_end Additional Examples ------------------------------------------------------------------------------- @@ -322,9 +289,11 @@ Additional Examples .. contents:: :local: -Use :doc:`pgr_findCloseEdges` in the `Points SQL`_. +Use ``pgr_findCloseEdges`` for points on the fly ............................................................................... +Using :doc:`pgr_findCloseEdges`: + Find the routes from vertex :math:`1` to the two closest locations on the graph of point `(2.9, 1.8)`. @@ -332,24 +301,24 @@ of point `(2.9, 1.8)`. :start-after: --q3 :end-before: -- q4 -* Point :math:`-1` corresponds to the closest edge from point `(2.9,1.8)`. -* Point :math:`-2` corresponds to the next close edge from point `(2.9,1.8)`. +* Point :math:`-1` corresponds to the closest edge from point `(2.9, 1.8)`. +* Point :math:`-2` corresponds to the next close edge from point `(2.9, 1.8)`. -Pass in front or visits +Pass in front or visits. ............................................................................... Which path (if any) passes in front of point :math:`6` or vertex :math:`11` with -**right** side driving topology. +right side driving topology. .. literalinclude:: trsp_withPoints.queries :start-after: --q1 :end-before: --q2 -Show details on undirected graph +Show details on undirected graph. ............................................................................... From point :math:`1` and vertex :math:`6` to point :math:`3` to vertex :math:`1` -on an **undirected** graph, with details. +on an undirected graph, with details. .. literalinclude:: trsp_withPoints.queries :start-after: --q2 diff --git a/doc/trsp/pgr_turnRestrictedPath.rst b/doc/trsp/pgr_turnRestrictedPath.rst index 4aeacf73d7..7eed83c324 100644 --- a/doc/trsp/pgr_turnRestrictedPath.rst +++ b/doc/trsp/pgr_turnRestrictedPath.rst @@ -31,7 +31,7 @@ restrictions * Version 3.0.0 - * New **Experimental** function + * New experimental function Description ------------------------------------------------------------------------------- @@ -51,7 +51,7 @@ Signatures [, directed] [,heap_paths] [, stop_on_first] [,strict]) RETURNS SETOF (seq, path_id, path_seq, node, edge, cost, agg_cost) -:Example: From vertex :math:`3` to vertex :math:`8` on a **directed** graph +:Example: From vertex :math:`3` to vertex :math:`8` on a directed graph .. literalinclude:: doc-pgr_turnRestrictedPath.queries :start-after: -- q1 @@ -138,7 +138,7 @@ No results because the only path available follows a restriction. :start-after: -- q2 :end-before: -- q3 -:Example: From vertex :math:`3` to vertex :math:`8` on an **undirected** graph +:Example: From vertex :math:`3` to vertex :math:`8` on an undirected graph .. literalinclude:: doc-pgr_turnRestrictedPath.queries :start-after: -- q3 diff --git a/docqueries/src/migration.result b/docqueries/src/migration.result index 3de83cd4d0..0682c1926e 100644 --- a/docqueries/src/migration.result +++ b/docqueries/src/migration.result @@ -131,14 +131,14 @@ SELECT * FROM pgr_trsp( FROM edges WHERE id != 16$$, $$SELECT * FROM new_restrictions$$, 15, 16); - 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 + 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 (6 rows) /* --verticesv6 */ @@ -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_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 + 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 (11 rows) /* --edgesv6 */ diff --git a/docqueries/trsp/doc-trsp.result b/docqueries/trsp/doc-trsp.result index 81064067c3..e2d6bf2e49 100644 --- a/docqueries/trsp/doc-trsp.result +++ b/docqueries/trsp/doc-trsp.result @@ -8,10 +8,10 @@ SELECT * FROM pgr_trsp( $$SELECT path, cost FROM restrictions$$, 6, 10, false); - seq | path_seq | start_vid | end_vid | node | edge | cost | agg_cost ------+----------+-----------+---------+------+------+------+---------- - 1 | 1 | 6 | 10 | 6 | 2 | 1 | 0 - 2 | 2 | 6 | 10 | 10 | -1 | 0 | 1 + seq | path_id | path_seq | start_vid | end_vid | node | edge | cost | agg_cost +-----+---------+----------+-----------+---------+------+------+------+---------- + 1 | 1 | 1 | 6 | 10 | 6 | 2 | 1 | 0 + 2 | 1 | 2 | 6 | 10 | 10 | -1 | 0 | 1 (2 rows) /* -- q3 */ @@ -20,20 +20,20 @@ SELECT * FROM pgr_trsp( $$SELECT * FROM restrictions$$, 6, ARRAY[10, 1], false); - seq | path_seq | start_vid | end_vid | node | edge | cost | agg_cost ------+----------+-----------+---------+------+------+------+---------- - 1 | 1 | 6 | 1 | 6 | 4 | 1 | 0 - 2 | 2 | 6 | 1 | 7 | 10 | 1 | 1 - 3 | 3 | 6 | 1 | 8 | 12 | 1 | 2 - 4 | 4 | 6 | 1 | 12 | 11 | 1 | 3 - 5 | 5 | 6 | 1 | 11 | 8 | 1 | 4 - 6 | 6 | 6 | 1 | 7 | 7 | 1 | 5 - 7 | 7 | 6 | 1 | 3 | 6 | 1 | 6 - 8 | 8 | 6 | 1 | 1 | -1 | 0 | 7 - 9 | 1 | 6 | 10 | 6 | 4 | 1 | 0 - 10 | 2 | 6 | 10 | 7 | 8 | 1 | 1 - 11 | 3 | 6 | 10 | 11 | 5 | 1 | 2 - 12 | 4 | 6 | 10 | 10 | -1 | 0 | 3 + seq | path_id | path_seq | start_vid | end_vid | node | edge | cost | agg_cost +-----+---------+----------+-----------+---------+------+------+------+---------- + 1 | 1 | 1 | 6 | 1 | 6 | 4 | 1 | 0 + 2 | 1 | 2 | 6 | 1 | 7 | 10 | 1 | 1 + 3 | 1 | 3 | 6 | 1 | 8 | 12 | 1 | 2 + 4 | 1 | 4 | 6 | 1 | 12 | 11 | 1 | 3 + 5 | 1 | 5 | 6 | 1 | 11 | 8 | 1 | 4 + 6 | 1 | 6 | 6 | 1 | 7 | 7 | 1 | 5 + 7 | 1 | 7 | 6 | 1 | 3 | 6 | 1 | 6 + 8 | 1 | 8 | 6 | 1 | 1 | -1 | 0 | 7 + 9 | 2 | 1 | 6 | 10 | 6 | 4 | 1 | 0 + 10 | 2 | 2 | 6 | 10 | 7 | 8 | 1 | 1 + 11 | 2 | 3 | 6 | 10 | 11 | 5 | 1 | 2 + 12 | 2 | 4 | 6 | 10 | 10 | -1 | 0 | 3 (12 rows) /* -- q4 */ @@ -41,15 +41,15 @@ SELECT * FROM pgr_trsp( $$SELECT id, source, target, cost, reverse_cost FROM edges$$, $$SELECT path, cost FROM restrictions$$, ARRAY[6, 1], 8); - seq | path_seq | start_vid | end_vid | node | edge | cost | agg_cost ------+----------+-----------+---------+------+------+------+---------- - 1 | 1 | 1 | 8 | 1 | 6 | 1 | 0 - 2 | 2 | 1 | 8 | 3 | 7 | 1 | 1 - 3 | 3 | 1 | 8 | 7 | 10 | 101 | 2 - 4 | 4 | 1 | 8 | 8 | -1 | 0 | 103 - 5 | 1 | 6 | 8 | 6 | 4 | 1 | 0 - 6 | 2 | 6 | 8 | 7 | 10 | 1 | 1 - 7 | 3 | 6 | 8 | 8 | -1 | 0 | 2 + seq | path_id | path_seq | start_vid | end_vid | node | edge | cost | agg_cost +-----+---------+----------+-----------+---------+------+------+------+---------- + 1 | 1 | 1 | 1 | 8 | 1 | 6 | 1 | 0 + 2 | 1 | 2 | 1 | 8 | 3 | 7 | 1 | 1 + 3 | 1 | 3 | 1 | 8 | 7 | 10 | 101 | 2 + 4 | 1 | 4 | 1 | 8 | 8 | -1 | 0 | 103 + 5 | 2 | 1 | 6 | 8 | 6 | 4 | 1 | 0 + 6 | 2 | 2 | 6 | 8 | 7 | 10 | 1 | 1 + 7 | 2 | 3 | 6 | 8 | 8 | -1 | 0 | 2 (7 rows) /* -- q5 */ @@ -58,26 +58,26 @@ SELECT * FROM pgr_trsp( $$SELECT path, cost FROM restrictions$$, ARRAY[6, 1], ARRAY[10, 8], false); - seq | path_seq | start_vid | end_vid | node | edge | cost | agg_cost ------+----------+-----------+---------+------+------+------+---------- - 1 | 1 | 1 | 8 | 1 | 6 | 1 | 0 - 2 | 2 | 1 | 8 | 3 | 7 | 1 | 1 - 3 | 3 | 1 | 8 | 7 | 4 | 1 | 2 - 4 | 4 | 1 | 8 | 6 | 2 | 1 | 3 - 5 | 5 | 1 | 8 | 10 | 5 | 1 | 4 - 6 | 6 | 1 | 8 | 11 | 11 | 1 | 5 - 7 | 7 | 1 | 8 | 12 | 12 | 1 | 6 - 8 | 8 | 1 | 8 | 8 | -1 | 0 | 7 - 9 | 1 | 1 | 10 | 1 | 6 | 1 | 0 - 10 | 2 | 1 | 10 | 3 | 7 | 1 | 1 - 11 | 3 | 1 | 10 | 7 | 4 | 1 | 2 - 12 | 4 | 1 | 10 | 6 | 2 | 1 | 3 - 13 | 5 | 1 | 10 | 10 | -1 | 0 | 4 - 14 | 1 | 6 | 8 | 6 | 4 | 1 | 0 - 15 | 2 | 6 | 8 | 7 | 10 | 1 | 1 - 16 | 3 | 6 | 8 | 8 | -1 | 0 | 2 - 17 | 1 | 6 | 10 | 6 | 2 | 1 | 0 - 18 | 2 | 6 | 10 | 10 | -1 | 0 | 1 + seq | path_id | path_seq | start_vid | end_vid | node | edge | cost | agg_cost +-----+---------+----------+-----------+---------+------+------+------+---------- + 1 | 1 | 1 | 1 | 8 | 1 | 6 | 1 | 0 + 2 | 1 | 2 | 1 | 8 | 3 | 7 | 1 | 1 + 3 | 1 | 3 | 1 | 8 | 7 | 4 | 1 | 2 + 4 | 1 | 4 | 1 | 8 | 6 | 2 | 1 | 3 + 5 | 1 | 5 | 1 | 8 | 10 | 5 | 1 | 4 + 6 | 1 | 6 | 1 | 8 | 11 | 11 | 1 | 5 + 7 | 1 | 7 | 1 | 8 | 12 | 12 | 1 | 6 + 8 | 1 | 8 | 1 | 8 | 8 | -1 | 0 | 7 + 9 | 2 | 1 | 1 | 10 | 1 | 6 | 1 | 0 + 10 | 2 | 2 | 1 | 10 | 3 | 7 | 1 | 1 + 11 | 2 | 3 | 1 | 10 | 7 | 4 | 1 | 2 + 12 | 2 | 4 | 1 | 10 | 6 | 2 | 1 | 3 + 13 | 2 | 5 | 1 | 10 | 10 | -1 | 0 | 4 + 14 | 3 | 1 | 6 | 8 | 6 | 4 | 1 | 0 + 15 | 3 | 2 | 6 | 8 | 7 | 10 | 1 | 1 + 16 | 3 | 3 | 6 | 8 | 8 | -1 | 0 | 2 + 17 | 4 | 1 | 6 | 10 | 6 | 2 | 1 | 0 + 18 | 4 | 2 | 6 | 10 | 10 | -1 | 0 | 1 (18 rows) /* -- q6 */ @@ -85,33 +85,33 @@ SELECT * FROM pgr_trsp( $$SELECT id, source, target, cost, reverse_cost FROM edges$$, $$SELECT path, cost FROM restrictions$$, $$SELECT * FROM (VALUES (6, 10), (6, 1), (6, 8), (1, 8)) AS combinations (source, target)$$); - seq | path_seq | start_vid | end_vid | node | edge | cost | agg_cost ------+----------+-----------+---------+------+------+------+---------- - 1 | 1 | 1 | 8 | 1 | 6 | 1 | 0 - 2 | 2 | 1 | 8 | 3 | 7 | 1 | 1 - 3 | 3 | 1 | 8 | 7 | 10 | 101 | 2 - 4 | 4 | 1 | 8 | 8 | -1 | 0 | 103 - 5 | 1 | 6 | 1 | 6 | 4 | 1 | 0 - 6 | 2 | 6 | 1 | 7 | 10 | 1 | 1 - 7 | 3 | 6 | 1 | 8 | 12 | 1 | 2 - 8 | 4 | 6 | 1 | 12 | 13 | 1 | 3 - 9 | 5 | 6 | 1 | 17 | 15 | 1 | 4 - 10 | 6 | 6 | 1 | 16 | 9 | 1 | 5 - 11 | 7 | 6 | 1 | 11 | 8 | 1 | 6 - 12 | 8 | 6 | 1 | 7 | 7 | 1 | 7 - 13 | 9 | 6 | 1 | 3 | 6 | 1 | 8 - 14 | 10 | 6 | 1 | 1 | -1 | 0 | 9 - 15 | 1 | 6 | 8 | 6 | 4 | 1 | 0 - 16 | 2 | 6 | 8 | 7 | 10 | 1 | 1 - 17 | 3 | 6 | 8 | 8 | -1 | 0 | 2 - 18 | 1 | 6 | 10 | 6 | 4 | 1 | 0 - 19 | 2 | 6 | 10 | 7 | 10 | 1 | 1 - 20 | 3 | 6 | 10 | 8 | 12 | 1 | 2 - 21 | 4 | 6 | 10 | 12 | 13 | 1 | 3 - 22 | 5 | 6 | 10 | 17 | 15 | 1 | 4 - 23 | 6 | 6 | 10 | 16 | 16 | 1 | 5 - 24 | 7 | 6 | 10 | 15 | 3 | 1 | 6 - 25 | 8 | 6 | 10 | 10 | -1 | 0 | 7 + seq | path_id | path_seq | start_vid | end_vid | node | edge | cost | agg_cost +-----+---------+----------+-----------+---------+------+------+------+---------- + 1 | 1 | 1 | 1 | 8 | 1 | 6 | 1 | 0 + 2 | 1 | 2 | 1 | 8 | 3 | 7 | 1 | 1 + 3 | 1 | 3 | 1 | 8 | 7 | 10 | 101 | 2 + 4 | 1 | 4 | 1 | 8 | 8 | -1 | 0 | 103 + 5 | 2 | 1 | 6 | 1 | 6 | 4 | 1 | 0 + 6 | 2 | 2 | 6 | 1 | 7 | 10 | 1 | 1 + 7 | 2 | 3 | 6 | 1 | 8 | 12 | 1 | 2 + 8 | 2 | 4 | 6 | 1 | 12 | 13 | 1 | 3 + 9 | 2 | 5 | 6 | 1 | 17 | 15 | 1 | 4 + 10 | 2 | 6 | 6 | 1 | 16 | 9 | 1 | 5 + 11 | 2 | 7 | 6 | 1 | 11 | 8 | 1 | 6 + 12 | 2 | 8 | 6 | 1 | 7 | 7 | 1 | 7 + 13 | 2 | 9 | 6 | 1 | 3 | 6 | 1 | 8 + 14 | 2 | 10 | 6 | 1 | 1 | -1 | 0 | 9 + 15 | 3 | 1 | 6 | 8 | 6 | 4 | 1 | 0 + 16 | 3 | 2 | 6 | 8 | 7 | 10 | 1 | 1 + 17 | 3 | 3 | 6 | 8 | 8 | -1 | 0 | 2 + 18 | 4 | 1 | 6 | 10 | 6 | 4 | 1 | 0 + 19 | 4 | 2 | 6 | 10 | 7 | 10 | 1 | 1 + 20 | 4 | 3 | 6 | 10 | 8 | 12 | 1 | 2 + 21 | 4 | 4 | 6 | 10 | 12 | 13 | 1 | 3 + 22 | 4 | 5 | 6 | 10 | 17 | 15 | 1 | 4 + 23 | 4 | 6 | 6 | 10 | 16 | 16 | 1 | 5 + 24 | 4 | 7 | 6 | 10 | 15 | 3 | 1 | 6 + 25 | 4 | 8 | 6 | 10 | 10 | -1 | 0 | 7 (25 rows) /* -- q7 */ diff --git a/docqueries/trsp/trsp_withPoints.result b/docqueries/trsp/trsp_withPoints.result index 2f075e2898..dfd39d93d7 100644 --- a/docqueries/trsp/trsp_withPoints.result +++ b/docqueries/trsp/trsp_withPoints.result @@ -11,20 +11,20 @@ SELECT * FROM pgr_trsp_withPoints( $$SELECT pid, edge_id, fraction, side FROM pointsOfInterest$$, -1, 10, details => true); - seq | path_seq | start_vid | end_vid | node | edge | cost | agg_cost ------+----------+-----------+---------+------+------+------+---------- - 1 | 1 | -1 | 10 | -1 | 1 | 0.4 | 0 - 2 | 2 | -1 | 10 | 5 | 1 | 1 | 0.4 - 3 | 3 | -1 | 10 | 6 | 4 | 0.7 | 1.4 - 4 | 4 | -1 | 10 | -6 | 4 | 0.3 | 2.1 - 5 | 5 | -1 | 10 | 7 | 8 | 1 | 2.4 - 6 | 6 | -1 | 10 | 11 | 9 | 1 | 3.4 - 7 | 7 | -1 | 10 | 16 | 15 | 0.4 | 4.4 - 8 | 8 | -1 | 10 | -2 | 15 | 0.6 | 4.8 - 9 | 9 | -1 | 10 | 17 | 15 | 1 | 5.4 - 10 | 10 | -1 | 10 | 16 | 16 | 1 | 6.4 - 11 | 11 | -1 | 10 | 15 | 3 | 1 | 7.4 - 12 | 12 | -1 | 10 | 10 | -1 | 0 | 8.4 + seq | path_id | path_seq | start_vid | end_vid | node | edge | cost | agg_cost +-----+---------+----------+-----------+---------+------+------+------+---------- + 1 | 1 | 1 | -1 | 10 | -1 | 1 | 0.4 | 0 + 2 | 1 | 2 | -1 | 10 | 5 | 1 | 1 | 0.4 + 3 | 1 | 3 | -1 | 10 | 6 | 4 | 0.7 | 1.4 + 4 | 1 | 4 | -1 | 10 | -6 | 4 | 0.3 | 2.1 + 5 | 1 | 5 | -1 | 10 | 7 | 8 | 1 | 2.4 + 6 | 1 | 6 | -1 | 10 | 11 | 9 | 1 | 3.4 + 7 | 1 | 7 | -1 | 10 | 16 | 15 | 0.4 | 4.4 + 8 | 1 | 8 | -1 | 10 | -2 | 15 | 0.6 | 4.8 + 9 | 1 | 9 | -1 | 10 | 17 | 15 | 1 | 5.4 + 10 | 1 | 10 | -1 | 10 | 16 | 16 | 1 | 6.4 + 11 | 1 | 11 | -1 | 10 | 15 | 3 | 1 | 7.4 + 12 | 1 | 12 | -1 | 10 | 10 | -1 | 0 | 8.4 (12 rows) /* --e2 */ @@ -33,16 +33,16 @@ SELECT * FROM pgr_trsp_withPoints( $$SELECT id, path, cost FROM restrictions$$, $$SELECT pid, edge_id, fraction, side FROM pointsOfInterest$$, -1, ARRAY[-3, 7]); - seq | path_seq | start_vid | end_vid | node | edge | cost | agg_cost ------+----------+-----------+---------+------+------+------+---------- - 1 | 1 | -1 | -3 | -1 | 1 | 1.4 | 0 - 2 | 2 | -1 | -3 | 6 | 4 | 1 | 1.4 - 3 | 3 | -1 | -3 | 7 | 10 | 1 | 2.4 - 4 | 4 | -1 | -3 | 8 | 12 | 0.6 | 3.4 - 5 | 5 | -1 | -3 | -3 | -1 | 0 | 4 - 6 | 1 | -1 | 7 | -1 | 1 | 1.4 | 0 - 7 | 2 | -1 | 7 | 6 | 4 | 1 | 1.4 - 8 | 3 | -1 | 7 | 7 | -1 | 0 | 2.4 + seq | path_id | path_seq | start_vid | end_vid | node | edge | cost | agg_cost +-----+---------+----------+-----------+---------+------+------+------+---------- + 1 | 1 | 1 | -1 | -3 | -1 | 1 | 1.4 | 0 + 2 | 1 | 2 | -1 | -3 | 6 | 4 | 1 | 1.4 + 3 | 1 | 3 | -1 | -3 | 7 | 10 | 1 | 2.4 + 4 | 1 | 4 | -1 | -3 | 8 | 12 | 0.6 | 3.4 + 5 | 1 | 5 | -1 | -3 | -3 | -1 | 0 | 4 + 6 | 2 | 1 | -1 | 7 | -1 | 1 | 1.4 | 0 + 7 | 2 | 2 | -1 | 7 | 6 | 4 | 1 | 1.4 + 8 | 2 | 3 | -1 | 7 | 7 | -1 | 0 | 2.4 (8 rows) /* --e3 */ @@ -51,17 +51,17 @@ SELECT * FROM pgr_trsp_withPoints( $$SELECT id, path, cost FROM restrictions$$, $$SELECT pid, edge_id, fraction, side FROM pointsOfInterest$$, ARRAY[-1, 6], -3); - seq | path_seq | start_vid | end_vid | node | edge | cost | agg_cost ------+----------+-----------+---------+------+------+------+---------- - 1 | 1 | -1 | -3 | -1 | 1 | 1.4 | 0 - 2 | 2 | -1 | -3 | 6 | 4 | 1 | 1.4 - 3 | 3 | -1 | -3 | 7 | 10 | 1 | 2.4 - 4 | 4 | -1 | -3 | 8 | 12 | 0.6 | 3.4 - 5 | 5 | -1 | -3 | -3 | -1 | 0 | 4 - 6 | 1 | 6 | -3 | 6 | 4 | 1 | 0 - 7 | 2 | 6 | -3 | 7 | 10 | 1 | 1 - 8 | 3 | 6 | -3 | 8 | 12 | 0.6 | 2 - 9 | 4 | 6 | -3 | -3 | -1 | 0 | 2.6 + seq | path_id | path_seq | start_vid | end_vid | node | edge | cost | agg_cost +-----+---------+----------+-----------+---------+------+------+------+---------- + 1 | 1 | 1 | -1 | -3 | -1 | 1 | 1.4 | 0 + 2 | 1 | 2 | -1 | -3 | 6 | 4 | 1 | 1.4 + 3 | 1 | 3 | -1 | -3 | 7 | 10 | 1 | 2.4 + 4 | 1 | 4 | -1 | -3 | 8 | 12 | 0.6 | 3.4 + 5 | 1 | 5 | -1 | -3 | -3 | -1 | 0 | 4 + 6 | 2 | 1 | 6 | -3 | 6 | 4 | 1 | 0 + 7 | 2 | 2 | 6 | -3 | 7 | 10 | 1 | 1 + 8 | 2 | 3 | 6 | -3 | 8 | 12 | 0.6 | 2 + 9 | 2 | 4 | 6 | -3 | -3 | -1 | 0 | 2.6 (9 rows) /* --e4 */ @@ -70,37 +70,37 @@ SELECT * FROM pgr_trsp_withPoints( $$SELECT id, path, cost FROM restrictions$$, $$SELECT pid, edge_id, fraction, side FROM pointsOfInterest$$, ARRAY[-1, 6], ARRAY[-3, 1]); - seq | path_seq | start_vid | end_vid | node | edge | cost | agg_cost ------+----------+-----------+---------+------+------+------+---------- - 1 | 1 | -1 | -3 | -1 | 1 | 1.4 | 0 - 2 | 2 | -1 | -3 | 6 | 4 | 1 | 1.4 - 3 | 3 | -1 | -3 | 7 | 10 | 1 | 2.4 - 4 | 4 | -1 | -3 | 8 | 12 | 0.6 | 3.4 - 5 | 5 | -1 | -3 | -3 | -1 | 0 | 4 - 6 | 1 | -1 | 1 | -1 | 1 | 1.4 | 0 - 7 | 2 | -1 | 1 | 6 | 4 | 1 | 1.4 - 8 | 3 | -1 | 1 | 7 | 8 | 1 | 2.4 - 9 | 4 | -1 | 1 | 11 | 9 | 1 | 3.4 - 10 | 5 | -1 | 1 | 16 | 15 | 2 | 4.4 - 11 | 6 | -1 | 1 | 16 | 9 | 1 | 6.4 - 12 | 7 | -1 | 1 | 11 | 8 | 1 | 7.4 - 13 | 8 | -1 | 1 | 7 | 7 | 1 | 8.4 - 14 | 9 | -1 | 1 | 3 | 6 | 1 | 9.4 - 15 | 10 | -1 | 1 | 1 | -1 | 0 | 10.4 - 16 | 1 | 6 | -3 | 6 | 4 | 1 | 0 - 17 | 2 | 6 | -3 | 7 | 10 | 1 | 1 - 18 | 3 | 6 | -3 | 8 | 12 | 0.6 | 2 - 19 | 4 | 6 | -3 | -3 | -1 | 0 | 2.6 - 20 | 1 | 6 | 1 | 6 | 4 | 1 | 0 - 21 | 2 | 6 | 1 | 7 | 10 | 1 | 1 - 22 | 3 | 6 | 1 | 8 | 12 | 1 | 2 - 23 | 4 | 6 | 1 | 12 | 13 | 1 | 3 - 24 | 5 | 6 | 1 | 17 | 15 | 1 | 4 - 25 | 6 | 6 | 1 | 16 | 9 | 1 | 5 - 26 | 7 | 6 | 1 | 11 | 8 | 1 | 6 - 27 | 8 | 6 | 1 | 7 | 7 | 1 | 7 - 28 | 9 | 6 | 1 | 3 | 6 | 1 | 8 - 29 | 10 | 6 | 1 | 1 | -1 | 0 | 9 + seq | path_id | path_seq | start_vid | end_vid | node | edge | cost | agg_cost +-----+---------+----------+-----------+---------+------+------+------+---------- + 1 | 1 | 1 | -1 | -3 | -1 | 1 | 1.4 | 0 + 2 | 1 | 2 | -1 | -3 | 6 | 4 | 1 | 1.4 + 3 | 1 | 3 | -1 | -3 | 7 | 10 | 1 | 2.4 + 4 | 1 | 4 | -1 | -3 | 8 | 12 | 0.6 | 3.4 + 5 | 1 | 5 | -1 | -3 | -3 | -1 | 0 | 4 + 6 | 2 | 1 | -1 | 1 | -1 | 1 | 1.4 | 0 + 7 | 2 | 2 | -1 | 1 | 6 | 4 | 1 | 1.4 + 8 | 2 | 3 | -1 | 1 | 7 | 8 | 1 | 2.4 + 9 | 2 | 4 | -1 | 1 | 11 | 9 | 1 | 3.4 + 10 | 2 | 5 | -1 | 1 | 16 | 15 | 2 | 4.4 + 11 | 2 | 6 | -1 | 1 | 16 | 9 | 1 | 6.4 + 12 | 2 | 7 | -1 | 1 | 11 | 8 | 1 | 7.4 + 13 | 2 | 8 | -1 | 1 | 7 | 7 | 1 | 8.4 + 14 | 2 | 9 | -1 | 1 | 3 | 6 | 1 | 9.4 + 15 | 2 | 10 | -1 | 1 | 1 | -1 | 0 | 10.4 + 16 | 3 | 1 | 6 | -3 | 6 | 4 | 1 | 0 + 17 | 3 | 2 | 6 | -3 | 7 | 10 | 1 | 1 + 18 | 3 | 3 | 6 | -3 | 8 | 12 | 0.6 | 2 + 19 | 3 | 4 | 6 | -3 | -3 | -1 | 0 | 2.6 + 20 | 4 | 1 | 6 | 1 | 6 | 4 | 1 | 0 + 21 | 4 | 2 | 6 | 1 | 7 | 10 | 1 | 1 + 22 | 4 | 3 | 6 | 1 | 8 | 12 | 1 | 2 + 23 | 4 | 4 | 6 | 1 | 12 | 13 | 1 | 3 + 24 | 4 | 5 | 6 | 1 | 17 | 15 | 1 | 4 + 25 | 4 | 6 | 6 | 1 | 16 | 9 | 1 | 5 + 26 | 4 | 7 | 6 | 1 | 11 | 8 | 1 | 6 + 27 | 4 | 8 | 6 | 1 | 7 | 7 | 1 | 7 + 28 | 4 | 9 | 6 | 1 | 3 | 6 | 1 | 8 + 29 | 4 | 10 | 6 | 1 | 1 | -1 | 0 | 9 (29 rows) /* --e5 */ @@ -111,25 +111,25 @@ SELECT * FROM pgr_trsp_withPoints( $$SELECT * FROM (VALUES (-1, 10), (6, -3)) AS t(source, target)$$, driving_side => 'r', details => true); - seq | path_seq | start_vid | end_vid | node | edge | cost | agg_cost ------+----------+-----------+---------+------+------+------+---------- - 1 | 1 | -1 | 10 | -1 | 1 | 0.4 | 0 - 2 | 2 | -1 | 10 | 5 | 1 | 1 | 0.4 - 3 | 3 | -1 | 10 | 6 | 4 | 0.7 | 1.4 - 4 | 4 | -1 | 10 | -6 | 4 | 0.3 | 2.1 - 5 | 5 | -1 | 10 | 7 | 8 | 1 | 2.4 - 6 | 6 | -1 | 10 | 11 | 9 | 1 | 3.4 - 7 | 7 | -1 | 10 | 16 | 15 | 0.4 | 4.4 - 8 | 8 | -1 | 10 | -2 | 15 | 0.6 | 4.8 - 9 | 9 | -1 | 10 | 17 | 15 | 1 | 5.4 - 10 | 10 | -1 | 10 | 16 | 16 | 1 | 6.4 - 11 | 11 | -1 | 10 | 15 | 3 | 1 | 7.4 - 12 | 12 | -1 | 10 | 10 | -1 | 0 | 8.4 - 13 | 1 | 6 | -3 | 6 | 4 | 0.7 | 0 - 14 | 2 | 6 | -3 | -6 | 4 | 0.3 | 0.7 - 15 | 3 | 6 | -3 | 7 | 10 | 1 | 1 - 16 | 4 | 6 | -3 | 8 | 12 | 0.6 | 2 - 17 | 5 | 6 | -3 | -3 | -1 | 0 | 2.6 + seq | path_id | path_seq | start_vid | end_vid | node | edge | cost | agg_cost +-----+---------+----------+-----------+---------+------+------+------+---------- + 1 | 1 | 1 | -1 | 10 | -1 | 1 | 0.4 | 0 + 2 | 1 | 2 | -1 | 10 | 5 | 1 | 1 | 0.4 + 3 | 1 | 3 | -1 | 10 | 6 | 4 | 0.7 | 1.4 + 4 | 1 | 4 | -1 | 10 | -6 | 4 | 0.3 | 2.1 + 5 | 1 | 5 | -1 | 10 | 7 | 8 | 1 | 2.4 + 6 | 1 | 6 | -1 | 10 | 11 | 9 | 1 | 3.4 + 7 | 1 | 7 | -1 | 10 | 16 | 15 | 0.4 | 4.4 + 8 | 1 | 8 | -1 | 10 | -2 | 15 | 0.6 | 4.8 + 9 | 1 | 9 | -1 | 10 | 17 | 15 | 1 | 5.4 + 10 | 1 | 10 | -1 | 10 | 16 | 16 | 1 | 6.4 + 11 | 1 | 11 | -1 | 10 | 15 | 3 | 1 | 7.4 + 12 | 1 | 12 | -1 | 10 | 10 | -1 | 0 | 8.4 + 13 | 2 | 1 | 6 | -3 | 6 | 4 | 0.7 | 0 + 14 | 2 | 2 | 6 | -3 | -6 | 4 | 0.3 | 0.7 + 15 | 2 | 3 | 6 | -3 | 7 | 10 | 1 | 1 + 16 | 2 | 4 | 6 | -3 | 8 | 12 | 0.6 | 2 + 17 | 2 | 5 | 6 | -3 | -3 | -1 | 0 | 2.6 (17 rows) /* --q1 */ @@ -172,32 +172,32 @@ SELECT * FROM pgr_trsp_withPoints( ARRAY[-1, 6], ARRAY[-3, 1], directed => false, details => true); - seq | path_seq | start_vid | end_vid | node | edge | cost | agg_cost ------+----------+-----------+---------+------+------+------+---------- - 1 | 1 | -1 | -3 | -1 | 1 | 0.6 | 0 - 2 | 2 | -1 | -3 | 6 | 4 | 0.7 | 0.6 - 3 | 3 | -1 | -3 | -6 | 4 | 0.3 | 1.3 - 4 | 4 | -1 | -3 | 7 | 10 | 1 | 1.6 - 5 | 5 | -1 | -3 | 8 | 12 | 0.6 | 2.6 - 6 | 6 | -1 | -3 | -3 | -1 | 0 | 3.2 - 7 | 1 | -1 | 1 | -1 | 1 | 0.6 | 0 - 8 | 2 | -1 | 1 | 6 | 4 | 0.7 | 0.6 - 9 | 3 | -1 | 1 | -6 | 4 | 0.3 | 1.3 - 10 | 4 | -1 | 1 | 7 | 7 | 1 | 1.6 - 11 | 5 | -1 | 1 | 3 | 6 | 0.7 | 2.6 - 12 | 6 | -1 | 1 | -4 | 6 | 0.3 | 3.3 - 13 | 7 | -1 | 1 | 1 | -1 | 0 | 3.6 - 14 | 1 | 6 | -3 | 6 | 4 | 0.7 | 0 - 15 | 2 | 6 | -3 | -6 | 4 | 0.3 | 0.7 - 16 | 3 | 6 | -3 | 7 | 10 | 1 | 1 - 17 | 4 | 6 | -3 | 8 | 12 | 0.6 | 2 - 18 | 5 | 6 | -3 | -3 | -1 | 0 | 2.6 - 19 | 1 | 6 | 1 | 6 | 4 | 0.7 | 0 - 20 | 2 | 6 | 1 | -6 | 4 | 0.3 | 0.7 - 21 | 3 | 6 | 1 | 7 | 7 | 1 | 1 - 22 | 4 | 6 | 1 | 3 | 6 | 0.7 | 2 - 23 | 5 | 6 | 1 | -4 | 6 | 0.3 | 2.7 - 24 | 6 | 6 | 1 | 1 | -1 | 0 | 3 + seq | path_id | path_seq | start_vid | end_vid | node | edge | cost | agg_cost +-----+---------+----------+-----------+---------+------+------+------+---------- + 1 | 1 | 1 | -1 | -3 | -1 | 1 | 0.6 | 0 + 2 | 1 | 2 | -1 | -3 | 6 | 4 | 0.7 | 0.6 + 3 | 1 | 3 | -1 | -3 | -6 | 4 | 0.3 | 1.3 + 4 | 1 | 4 | -1 | -3 | 7 | 10 | 1 | 1.6 + 5 | 1 | 5 | -1 | -3 | 8 | 12 | 0.6 | 2.6 + 6 | 1 | 6 | -1 | -3 | -3 | -1 | 0 | 3.2 + 7 | 2 | 1 | -1 | 1 | -1 | 1 | 0.6 | 0 + 8 | 2 | 2 | -1 | 1 | 6 | 4 | 0.7 | 0.6 + 9 | 2 | 3 | -1 | 1 | -6 | 4 | 0.3 | 1.3 + 10 | 2 | 4 | -1 | 1 | 7 | 7 | 1 | 1.6 + 11 | 2 | 5 | -1 | 1 | 3 | 6 | 0.7 | 2.6 + 12 | 2 | 6 | -1 | 1 | -4 | 6 | 0.3 | 3.3 + 13 | 2 | 7 | -1 | 1 | 1 | -1 | 0 | 3.6 + 14 | 3 | 1 | 6 | -3 | 6 | 4 | 0.7 | 0 + 15 | 3 | 2 | 6 | -3 | -6 | 4 | 0.3 | 0.7 + 16 | 3 | 3 | 6 | -3 | 7 | 10 | 1 | 1 + 17 | 3 | 4 | 6 | -3 | 8 | 12 | 0.6 | 2 + 18 | 3 | 5 | 6 | -3 | -3 | -1 | 0 | 2.6 + 19 | 4 | 1 | 6 | 1 | 6 | 4 | 0.7 | 0 + 20 | 4 | 2 | 6 | 1 | -6 | 4 | 0.3 | 0.7 + 21 | 4 | 3 | 6 | 1 | 7 | 7 | 1 | 1 + 22 | 4 | 4 | 6 | 1 | 3 | 6 | 0.7 | 2 + 23 | 4 | 5 | 6 | 1 | -4 | 6 | 0.3 | 2.7 + 24 | 4 | 6 | 6 | 1 | 1 | -1 | 0 | 3 (24 rows) /* --q3 */ @@ -212,23 +212,23 @@ SELECT * FROM pgr_trsp_withPoints( $p$, 1, ARRAY[-1, -2], driving_side => 'r'); - seq | path_seq | start_vid | end_vid | node | edge | cost | agg_cost ------+----------+-----------+---------+------+------+------+---------- - 1 | 1 | 1 | -2 | 1 | 6 | 1 | 0 - 2 | 2 | 1 | -2 | 3 | 7 | 1 | 1 - 3 | 3 | 1 | -2 | 7 | 8 | 0.9 | 2 - 4 | 4 | 1 | -2 | -2 | -1 | 0 | 2.9 - 5 | 1 | 1 | -1 | 1 | 6 | 1 | 0 - 6 | 2 | 1 | -1 | 3 | 7 | 1 | 1 - 7 | 3 | 1 | -1 | 7 | 8 | 2 | 2 - 8 | 4 | 1 | -1 | 7 | 10 | 1 | 4 - 9 | 5 | 1 | -1 | 8 | 12 | 1 | 5 - 10 | 6 | 1 | -1 | 12 | 13 | 1 | 6 - 11 | 7 | 1 | -1 | 17 | 15 | 1 | 7 - 12 | 8 | 1 | -1 | 16 | 16 | 1 | 8 - 13 | 9 | 1 | -1 | 15 | 3 | 1 | 9 - 14 | 10 | 1 | -1 | 10 | 5 | 0.8 | 10 - 15 | 11 | 1 | -1 | -1 | -1 | 0 | 10.8 + seq | path_id | path_seq | start_vid | end_vid | node | edge | cost | agg_cost +-----+---------+----------+-----------+---------+------+------+------+---------- + 1 | 1 | 1 | 1 | -2 | 1 | 6 | 1 | 0 + 2 | 1 | 2 | 1 | -2 | 3 | 7 | 1 | 1 + 3 | 1 | 3 | 1 | -2 | 7 | 8 | 0.9 | 2 + 4 | 1 | 4 | 1 | -2 | -2 | -1 | 0 | 2.9 + 5 | 2 | 1 | 1 | -1 | 1 | 6 | 1 | 0 + 6 | 2 | 2 | 1 | -1 | 3 | 7 | 1 | 1 + 7 | 2 | 3 | 1 | -1 | 7 | 8 | 2 | 2 + 8 | 2 | 4 | 1 | -1 | 7 | 10 | 1 | 4 + 9 | 2 | 5 | 1 | -1 | 8 | 12 | 1 | 5 + 10 | 2 | 6 | 1 | -1 | 12 | 13 | 1 | 6 + 11 | 2 | 7 | 1 | -1 | 17 | 15 | 1 | 7 + 12 | 2 | 8 | 1 | -1 | 16 | 16 | 1 | 8 + 13 | 2 | 9 | 1 | -1 | 15 | 3 | 1 | 9 + 14 | 2 | 10 | 1 | -1 | 10 | 5 | 0.8 | 10 + 15 | 2 | 11 | 1 | -1 | -1 | -1 | 0 | 10.8 (15 rows) /* -- q4 */ diff --git a/locale/en/LC_MESSAGES/TRSP-family.po b/locale/en/LC_MESSAGES/TRSP-family.po index 6436a2fe7b..0b3b515a88 100644 --- a/locale/en/LC_MESSAGES/TRSP-family.po +++ b/locale/en/LC_MESSAGES/TRSP-family.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-25 12:55-0500\n" +"POT-Creation-Date: 2022-07-11 18:25-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -181,8 +181,8 @@ msgid "" "Road restrictions are a sequence of road segments that can not be taken " "in a sequential manner. Some restrictions are implicit on a directed " "graph, for example, one way roads where the wrong way edge is not even " -"inserted on the graph. But normally on turns like **left turn** or " -"**right turn**, hence the name turn restrictions, there are sometimes " +"inserted on the graph. But normally on turns like no left turn or no " +"right turn, hence the name turn restrictions, there are sometimes " "restrictions." msgstr "" @@ -273,8 +273,8 @@ msgstr "" #: ../../build/doc/TRSP-family.rst:115 msgid "" -"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." msgstr "" #: ../../build/doc/TRSP-family.rst:123 diff --git a/locale/en/LC_MESSAGES/pgr_trsp.po b/locale/en/LC_MESSAGES/pgr_trsp.po index 4abd093eca..5b4f1ceb36 100644 --- a/locale/en/LC_MESSAGES/pgr_trsp.po +++ b/locale/en/LC_MESSAGES/pgr_trsp.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-25 12:55-0500\n" +"POT-Creation-Date: 2022-07-11 18:25-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -44,185 +44,221 @@ msgstr "" msgid "pgr_trsp - Proposed" msgstr "" -#: ../../build/doc/pgr_trsp.rst:32 +#: ../../build/doc/pgr_trsp.rst:31 msgid "``pgr_trsp`` - routing vertices with restrictions." msgstr "" -#: ../../build/doc/pgr_trsp.rst:35 +#: ../../build/doc/pgr_trsp.rst:36 +msgid "Boost Graph Inside" +msgstr "" + +#: ../../build/doc/proposed.rst:3 +msgid "Proposed functions for next mayor release." +msgstr "" + +#: ../../build/doc/proposed.rst:5 +msgid "They are not officially in the current release." +msgstr "" + +#: ../../build/doc/proposed.rst:6 +msgid "They will likely officially be part of the next mayor release:" +msgstr "" + +#: ../../build/doc/proposed.rst:8 +msgid "The functions make use of ANY-INTEGER and ANY-NUMERICAL" +msgstr "" + +#: ../../build/doc/proposed.rst:9 +msgid "Name might not change. (But still can)" +msgstr "" + +#: ../../build/doc/proposed.rst:10 +msgid "Signature might not change. (But still can)" +msgstr "" + +#: ../../build/doc/proposed.rst:11 +msgid "Functionality might not change. (But still can)" +msgstr "" + +#: ../../build/doc/proposed.rst:12 +msgid "pgTap tests have being done. But might need more." +msgstr "" + +#: ../../build/doc/proposed.rst:13 +msgid "Documentation might need refinement." +msgstr "" + +#: ../../build/doc/pgr_trsp.rst:43 msgid "Availability" msgstr "" -#: ../../build/doc/pgr_trsp.rst:36 +#: ../../build/doc/pgr_trsp.rst:44 msgid "Version 3.4.0" msgstr "" -#: ../../build/doc/pgr_trsp.rst:38 -msgid "New **Proposed** signatures" +#: ../../build/doc/pgr_trsp.rst:46 +msgid "New proposed signatures:" msgstr "" -#: ../../build/doc/pgr_trsp.rst:40 +#: ../../build/doc/pgr_trsp.rst:48 msgid "``pgr_trsp`` (`One to One`_)" msgstr "" -#: ../../build/doc/pgr_trsp.rst:41 +#: ../../build/doc/pgr_trsp.rst:49 msgid "``pgr_trsp`` (`One to Many`_)" msgstr "" -#: ../../build/doc/pgr_trsp.rst:42 +#: ../../build/doc/pgr_trsp.rst:50 msgid "``pgr_trsp`` (`Many to One`_)" msgstr "" -#: ../../build/doc/pgr_trsp.rst:43 +#: ../../build/doc/pgr_trsp.rst:51 msgid "``pgr_trsp`` (`Many to Many`_)" msgstr "" -#: ../../build/doc/pgr_trsp.rst:44 +#: ../../build/doc/pgr_trsp.rst:52 msgid "``pgr_trsp`` (`Combinations`_)" msgstr "" -#: ../../build/doc/pgr_trsp.rst:50 -msgid "Deprecated signatures" +#: ../../build/doc/pgr_trsp.rst:54 +msgid "Deprecated signatures:" msgstr "" -#: ../../build/doc/pgr_trsp.rst:47 +#: ../../build/doc/pgr_trsp.rst:56 msgid "``pgr_trsp(text,integer,integer,boolean,boolean,text)``" msgstr "" -#: ../../build/doc/pgr_trsp.rst:48 +#: ../../build/doc/pgr_trsp.rst:57 msgid "``pgr_trsp(text,integer,float,integer,float,boolean,boolean,text)``" msgstr "" -#: ../../build/doc/pgr_trsp.rst:49 +#: ../../build/doc/pgr_trsp.rst:58 msgid "``pgr_trspViaVertices(text,anyarray,boolean,boolean,text)``" msgstr "" -#: ../../build/doc/pgr_trsp.rst:50 +#: ../../build/doc/pgr_trsp.rst:59 msgid "" "``pgr_trspviaedges(text,integer[],double " "precision[],boolean,boolean,text)``" msgstr "" -#: ../../build/doc/pgr_trsp.rst:52 +#: ../../build/doc/pgr_trsp.rst:61 msgid "Version 2.1.0" msgstr "" -#: ../../build/doc/pgr_trsp.rst:54 -msgid "New *Via* **prototypes**" +#: ../../build/doc/pgr_trsp.rst:63 +msgid "New prototypes:" msgstr "" -#: ../../build/doc/pgr_trsp.rst:56 +#: ../../build/doc/pgr_trsp.rst:65 msgid "``pgr_trspViaVertices``" msgstr "" -#: ../../build/doc/pgr_trsp.rst:57 +#: ../../build/doc/pgr_trsp.rst:66 msgid "``pgr_trspViaEdges``" msgstr "" -#: ../../build/doc/pgr_trsp.rst:59 +#: ../../build/doc/pgr_trsp.rst:68 msgid "Version 2.0.0" msgstr "" -#: ../../build/doc/pgr_trsp.rst:61 +#: ../../build/doc/pgr_trsp.rst:70 msgid "**Official** function" msgstr "" #: ../../build/doc/dijkstra-family.rst:11 #: ../../build/doc/pgRouting-concepts.rst:10 #: ../../build/doc/pgRouting-concepts.rst:11 -#: ../../build/doc/pgRouting-concepts.rst:13 ../../build/doc/pgr_trsp.rst:64 +#: ../../build/doc/pgRouting-concepts.rst:13 ../../build/doc/pgr_trsp.rst:73 msgid "Description" msgstr "" -#: ../../build/doc/pgr_trsp.rst:66 +#: ../../build/doc/pgr_trsp.rst:75 msgid "" "Turn restricted shortest path (TRSP) is an algorithm that receives turn " "restrictions in form of a query like those found in real world navigable " "road networks." msgstr "" -#: ../../build/doc/pgr_trsp.rst:70 +#: ../../build/doc/pgr_trsp.rst:79 msgid "The main characteristics are:" msgstr "" -#: ../../build/doc/pgr_trsp.rst:72 -msgid "Automatic detection of ``reverse_cost`` column" -msgstr "" - -#: ../../build/doc/pgr_trsp.rst:73 -msgid "Accepts **ANY-INTEGER** and **ANY-NUMERICAL** on input columns" -msgstr "" - -#: ../../build/doc/pgr_trsp.rst:74 -msgid "All variations give as result the same columns" -msgstr "" - -#: ../../build/doc/pgr_trsp.rst:75 +#: ../../build/doc/pgr_trsp.rst:81 msgid "" "It does no guarantee the shortest path as it might contain restriction " -"paths" +"paths." msgstr "" -#: ../../build/doc/pgr_trsp.rst:77 +#: ../../build/doc/pgr_trsp.rst:83 msgid "The general algorithm is as follows:" msgstr "" -#: ../../build/doc/pgr_trsp.rst:79 -msgid "Execute a Dijkstra" +#: ../../build/doc/pgr_trsp.rst:85 +msgid "Execute a Dijkstra." msgstr "" -#: ../../build/doc/pgr_trsp.rst:80 -msgid "If the solution passes thru a restriction then" +#: ../../build/doc/pgr_trsp.rst:86 +msgid "If the solution passes thru a restriction then." msgstr "" -#: ../../build/doc/pgr_trsp.rst:82 -msgid "Execute the **TRSP** algorithm with restrictions" +#: ../../build/doc/pgr_trsp.rst:88 +msgid "Execute the **TRSP** algorithm with restrictions." msgstr "" -#: ../../build/doc/pgr_trsp.rst:85 +#: ../../build/doc/pgr_trsp.rst:91 msgid "Signatures" msgstr "" -#: ../../build/doc/pgr_trsp.rst:88 +#: ../../build/doc/pgr_trsp.rst:94 msgid "Proposed" msgstr "" -#: ../../build/doc/proposed.rst:3 -msgid "Proposed functions for next mayor release." +#: ../../build/doc/pgr_trsp.rst:95 ../../build/doc/pgr_trsp.rst:113 +#: ../../build/doc/pgr_trsp.rst:133 ../../build/doc/pgr_trsp.rst:154 +#: ../../build/doc/pgr_trsp.rst:176 ../../build/doc/pgr_trsp.rst:198 +msgid "\\ \\" msgstr "" -#: ../../build/doc/proposed.rst:5 -msgid "They are not officially in the current release." -msgstr "" - -#: ../../build/doc/proposed.rst:6 -msgid "They will likely officially be part of the next mayor release:" +#: ../../build/doc/pgr_trsp.rst ../../build/doc/pgr_trsp.rst:116 +msgid "" +"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vid**, **end vid**, " +"[directed])" msgstr "" -#: ../../build/doc/proposed.rst:8 -msgid "The functions make use of ANY-INTEGER and ANY-NUMERICAL" +#: ../../build/doc/pgr_trsp.rst +msgid "" +"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vid**, **end vids**, " +"[ directed])" msgstr "" -#: ../../build/doc/proposed.rst:9 -msgid "Name might not change. (But still can)" +#: ../../build/doc/pgr_trsp.rst ../../build/doc/pgr_trsp.rst:157 +msgid "" +"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vids**, **end vid**, " +"[directed])" msgstr "" -#: ../../build/doc/proposed.rst:10 -msgid "Signature might not change. (But still can)" +#: ../../build/doc/pgr_trsp.rst ../../build/doc/pgr_trsp.rst:179 +msgid "" +"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vids**, **end vids**," +" [directed])" msgstr "" -#: ../../build/doc/proposed.rst:11 -msgid "Functionality might not change. (But still can)" +#: ../../build/doc/pgr_trsp.rst ../../build/doc/pgr_trsp.rst:201 +msgid "" +"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, `Combinations SQL`_, " +"[directed])" msgstr "" -#: ../../build/doc/proposed.rst:12 -msgid "pgTap tests have being done. But might need more." +#: ../../build/doc/pgr_trsp.rst +msgid "RETURNS SET OF |generic-result|" msgstr "" -#: ../../build/doc/proposed.rst:13 -msgid "Documentation might need refinement." +#: ../../build/doc/pgr_trsp.rst +msgid "OR EMPTY SET" msgstr "" -#: ../../build/doc/pgr_trsp.rst:112 +#: ../../build/doc/pgr_trsp.rst:111 msgid "One to One" msgstr "" @@ -231,48 +267,52 @@ msgid "Example" msgstr "" #: ../../build/doc/pgr_trsp.rst:121 -msgid "From vertex :math:`6` to vertex :math:`10` on an **undirected** graph" +msgid "From vertex :math:`6` to vertex :math:`10` on an undirected graph." msgstr "" #: ../../build/doc/pgr_trsp.rst:131 msgid "One to Many" msgstr "" -#: ../../build/doc/pgr_trsp.rst:140 +#: ../../build/doc/pgr_trsp.rst:136 +msgid "" +"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vid**, **end vids**, " +"[directed])" +msgstr "" + +#: ../../build/doc/pgr_trsp.rst:141 msgid "" -"From vertex :math:`6` to vertices :math:`\\{10, 1\\}` on an " -"**undirected** graph" +"From vertex :math:`6` to vertices :math:`\\{10, 1\\}` on an undirected " +"graph." msgstr "" -#: ../../build/doc/pgr_trsp.rst:151 +#: ../../build/doc/pgr_trsp.rst:152 msgid "Many to One" msgstr "" -#: ../../build/doc/pgr_trsp.rst:160 -msgid "" -"From vertices :math:`\\{6, 1\\}` to vertex :math:`8` on a **directed** " -"graph" +#: ../../build/doc/pgr_trsp.rst:163 +msgid "From vertices :math:`\\{6, 1\\}` to vertex :math:`8` on a directed graph." msgstr "" -#: ../../build/doc/pgr_trsp.rst:171 +#: ../../build/doc/pgr_trsp.rst:174 msgid "Many to Many" msgstr "" -#: ../../build/doc/pgr_trsp.rst:180 +#: ../../build/doc/pgr_trsp.rst:185 msgid "" "From vertices :math:`\\{6, 1\\}` to vertices :math:`\\{10, 8\\}` on an " -"**undirected** graph" +"undirected graph." msgstr "" -#: ../../build/doc/pgr_trsp.rst:191 +#: ../../build/doc/pgr_trsp.rst:196 msgid "Combinations" msgstr "" -#: ../../build/doc/pgr_trsp.rst:200 -msgid "Using a combinations table on an **undirected** graph" +#: ../../build/doc/pgr_trsp.rst:206 +msgid "Using a combinations table on an undirected graph." msgstr "" -#: ../../build/doc/pgr_trsp.rst:208 +#: ../../build/doc/pgr_trsp.rst:214 msgid "Parameters" msgstr "" @@ -375,7 +415,7 @@ msgstr "" msgid "``SMALLINT``, ``INTEGER``, ``BIGINT``" msgstr "" -#: ../../build/doc/pgr_trsp.rst:216 +#: ../../build/doc/pgr_trsp.rst:222 msgid "Optional parameters" msgstr "" @@ -404,11 +444,11 @@ msgstr "" msgid "When ``false`` the graph is considered as `Undirected`." msgstr "" -#: ../../build/doc/pgr_trsp.rst:223 +#: ../../build/doc/pgr_trsp.rst:229 msgid "Inner Queries" msgstr "" -#: ../../build/doc/pgr_trsp.rst:226 +#: ../../build/doc/pgr_trsp.rst:232 msgid "Edges SQL" msgstr "" @@ -480,7 +520,7 @@ msgstr "" msgid "``SMALLINT``, ``INTEGER``, ``BIGINT``, ``REAL``, ``FLOAT``" msgstr "" -#: ../../build/doc/pgr_trsp.rst:233 +#: ../../build/doc/pgr_trsp.rst:239 msgid "Restrictions SQL" msgstr "" @@ -503,7 +543,7 @@ msgstr "" msgid "Cost of taking the forbidden path." msgstr "" -#: ../../build/doc/pgr_trsp.rst:240 +#: ../../build/doc/pgr_trsp.rst:246 msgid "Combinations SQL" msgstr "" @@ -515,7 +555,7 @@ msgstr "" msgid "Identifier of the arrival vertex." msgstr "" -#: ../../build/doc/pgr_trsp.rst:247 +#: ../../build/doc/pgr_trsp.rst:253 msgid "Result Columns" msgstr "" @@ -621,37 +661,37 @@ msgstr "" msgid "Aggregate cost from ``start_vid`` to ``node``." msgstr "" -#: ../../build/doc/pgr_trsp.rst:256 +#: ../../build/doc/pgr_trsp.rst:262 msgid "See Also" msgstr "" -#: ../../build/doc/pgr_trsp.rst:258 +#: ../../build/doc/pgr_trsp.rst:264 msgid ":doc:`TRSP-family`" msgstr "" -#: ../../build/doc/pgr_trsp.rst:259 +#: ../../build/doc/pgr_trsp.rst:265 msgid "" "`Deprecated documentation " "`_" msgstr "" -#: ../../build/doc/pgr_trsp.rst:260 +#: ../../build/doc/pgr_trsp.rst:266 msgid ":doc:`migration`" msgstr "" -#: ../../build/doc/pgr_trsp.rst:261 +#: ../../build/doc/pgr_trsp.rst:267 msgid ":doc:`sampledata`" msgstr "" -#: ../../build/doc/pgr_trsp.rst:264 +#: ../../build/doc/pgr_trsp.rst:270 msgid "Indices and tables" msgstr "" -#: ../../build/doc/pgr_trsp.rst:265 +#: ../../build/doc/pgr_trsp.rst:271 msgid ":ref:`genindex`" msgstr "" -#: ../../build/doc/pgr_trsp.rst:266 +#: ../../build/doc/pgr_trsp.rst:272 msgid ":ref:`search`" msgstr "" diff --git a/locale/en/LC_MESSAGES/pgr_trspVia.po b/locale/en/LC_MESSAGES/pgr_trspVia.po index 91e7d793f6..9e9e53f857 100644 --- a/locale/en/LC_MESSAGES/pgr_trspVia.po +++ b/locale/en/LC_MESSAGES/pgr_trspVia.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-25 12:55-0500\n" +"POT-Creation-Date: 2022-07-11 18:25-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -34,6 +34,10 @@ msgid "" "restrictions." msgstr "" +#: ../../build/doc/pgr_trspVia.rst:24 +msgid "Boost Graph Inside" +msgstr "" + #: ../../build/doc/proposed.rst:3 msgid "Proposed functions for next mayor release." msgstr "" @@ -70,10 +74,6 @@ msgstr "" msgid "Documentation might need refinement." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:28 -msgid "Boost Graph Inside" -msgstr "" - #: ../../build/doc/pgr_trspVia.rst:31 msgid "Availability" msgstr "" @@ -83,17 +83,21 @@ msgid "Version 3.4.0" msgstr "" #: ../../build/doc/pgr_trspVia.rst:34 -msgid "New **proposed** function ``pgr_trspVia`` (`One Via`_)" +msgid "New proposed function:" +msgstr "" + +#: ../../build/doc/pgr_trspVia.rst:36 +msgid "``pgr_trspVia`` (`One Via`_)" msgstr "" #: ../../build/doc/TRSP-family.rst:10 ../../build/doc/dijkstra-family.rst:11 #: ../../build/doc/pgRouting-concepts.rst:10 -#: ../../build/doc/pgRouting-concepts.rst:11 ../../build/doc/pgr_trspVia.rst:37 +#: ../../build/doc/pgRouting-concepts.rst:11 ../../build/doc/pgr_trspVia.rst:39 #: ../../build/doc/via-category.rst:10 ../../build/doc/via-category.rst:11 msgid "Description" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:39 +#: ../../build/doc/pgr_trspVia.rst:41 msgid "" "Given a list of vertices and a graph, this function is equivalent to " "finding the shortest path between :math:`vertex_i` and " @@ -101,51 +105,73 @@ msgid "" " not to use restricted paths." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:43 +#: ../../build/doc/pgr_trspVia.rst:45 msgid "The paths represents the sections of the route." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:45 +#: ../../build/doc/pgr_trspVia.rst:47 msgid "The general algorithm is as follows:" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:47 +#: ../../build/doc/pgr_trspVia.rst:49 msgid "Execute a :doc:`pgr_dijkstraVia`." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:48 +#: ../../build/doc/pgr_trspVia.rst:50 msgid "" "For the set of sub paths of the solution that pass through a restriction " "then" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:50 +#: ../../build/doc/pgr_trspVia.rst:52 msgid "Execute the **TRSP** algorithm with restrictions for the paths." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:51 +#: ../../build/doc/pgr_trspVia.rst:53 msgid "**NOTE** when this is done, ``U_turn_on_edge`` flag is ignored." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:55 +#: ../../build/doc/pgr_trspVia.rst:57 msgid "Signatures" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:61 +#: ../../build/doc/pgr_trspVia.rst:63 msgid "One Via" msgstr "" +#: ../../build/doc/pgr_trspVia.rst:65 +msgid "\\ \\" +msgstr "" + +#: ../../build/doc/pgr_trspVia.rst:68 +msgid "" +"pgr_trspVia(`Edges SQL`_, `Restrictions SQL`_, **via vertices**, " +"[options])" +msgstr "" + +#: ../../build/doc/pgr_trspVia.rst +msgid "[options]" +msgstr "" + +#: ../../build/doc/pgr_trspVia.rst:70 +msgid "[directed, strict, U_turn_on_edge]" +msgstr "" + +#: ../../build/doc/pgr_trspVia.rst:72 +msgid "RETURNS SET OF |via-result| OR EMPTY SET" +msgstr "" + #: ../../build/doc/pgr_trspVia.rst msgid "Example" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:71 +#: ../../build/doc/pgr_trspVia.rst:75 msgid "" "Find the route that visits the vertices :math:`\\{ 5, 1, 8\\}` in that " -"order on an **directed** graph." +"order on an directed graph." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:79 +#: ../../build/doc/pgr_trspVia.rst:83 msgid "Parameters" msgstr "" @@ -203,7 +229,7 @@ msgstr "" msgid "SMALLINT, INTEGER, BIGINT" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:86 +#: ../../build/doc/pgr_trspVia.rst:90 msgid "Optional parameters" msgstr "" @@ -239,7 +265,7 @@ msgstr "" msgid "When ``false`` the graph is considered as `Undirected`." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:93 +#: ../../build/doc/pgr_trspVia.rst:97 msgid "Via optional parameters" msgstr "" @@ -267,11 +293,11 @@ msgstr "" msgid "When ``true`` departing from a visited vertex will not try to avoid" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:100 +#: ../../build/doc/pgr_trspVia.rst:104 msgid "Inner Queries" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:103 +#: ../../build/doc/pgr_trspVia.rst:107 msgid "Edges SQL" msgstr "" @@ -352,7 +378,7 @@ msgstr "" msgid "``SMALLINT``, ``INTEGER``, ``BIGINT``, ``REAL``, ``FLOAT``" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:110 +#: ../../build/doc/pgr_trspVia.rst:114 msgid "Restrictions SQL" msgstr "" @@ -375,7 +401,7 @@ msgstr "" msgid "Cost of taking the forbidden path." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:117 +#: ../../build/doc/pgr_trspVia.rst:121 msgid "Result Columns" msgstr "" @@ -486,67 +512,67 @@ msgid "" "current ``seq``." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:124 +#: ../../build/doc/pgr_trspVia.rst:128 msgid "Additional Examples" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:129 +#: ../../build/doc/pgr_trspVia.rst:133 msgid "" "All this examples are about the route that visits the vertices " -":math:`\\{5, 7, 1, 8, 15\\}` in that order on a **directed** graph." +":math:`\\{5, 7, 1, 8, 15\\}` in that order on a directed graph." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:133 +#: ../../build/doc/pgr_trspVia.rst:137 msgid "The main query" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:140 +#: ../../build/doc/pgr_trspVia.rst:144 msgid "Aggregate cost of the third path." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:147 +#: ../../build/doc/pgr_trspVia.rst:151 msgid "Route's aggregate cost of the route at the end of the third path." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:154 +#: ../../build/doc/pgr_trspVia.rst:158 msgid "Nodes visited in the route." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:161 +#: ../../build/doc/pgr_trspVia.rst:165 msgid "The aggregate costs of the route when the visited vertices are reached." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:168 +#: ../../build/doc/pgr_trspVia.rst:172 msgid "Status of \"passes in front\" or \"visits\" of the nodes." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:175 -msgid "Simulation of how algorithm works" +#: ../../build/doc/pgr_trspVia.rst:179 +msgid "Simulation of how algorithm works." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:177 +#: ../../build/doc/pgr_trspVia.rst:181 msgid "The algorithm performs a :doc:`pgr_dijkstraVia`" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:183 +#: ../../build/doc/pgr_trspVia.rst:187 msgid "" "Detects which of the sub paths pass through a restriction in this case is" " for the ``path_id = 5`` from ``6`` to ``3`` because the path :math:`15 " "\\rightarrow 1` is restricted." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:187 +#: ../../build/doc/pgr_trspVia.rst:191 msgid "Executes the :doc:`pgr_trsp` algorithm for the conflicting paths." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:193 +#: ../../build/doc/pgr_trspVia.rst:197 msgid "" "From the :doc:`pgr_dijkstraVia` result it removes the conflicting paths " "and builds the solution with the results of the :doc:`pgr_trsp` " "algorithm:" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:200 +#: ../../build/doc/pgr_trspVia.rst:204 msgid "Getting the same result as ``pgr_trspVia``:" msgstr "" @@ -554,50 +580,50 @@ msgstr "" msgid "Example 8" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:206 +#: ../../build/doc/pgr_trspVia.rst:210 msgid "Sometimes ``U_turn_on_edge`` flag is ignored when is set to ``false``." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:209 +#: ../../build/doc/pgr_trspVia.rst:213 msgid "" "The first step, doing a :doc:`pgr_dijkstraVia` does consider not making a" " U turn on the same edge. But the path :math:`16 \\rightarrow 13` (Rows 4" " and 5) is restricted and the result is using it." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:217 +#: ../../build/doc/pgr_trspVia.rst:221 msgid "" "When executing the :doc:`pgr_trsp` algorithm for the conflicting path, " "there is no ``U_turn_on_edge`` flag." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:224 +#: ../../build/doc/pgr_trspVia.rst:228 msgid "" "Therefore the result ignores the ``U_turn_on_edge`` flag when set to " "``false``." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:231 +#: ../../build/doc/pgr_trspVia.rst:235 msgid "See Also" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:233 +#: ../../build/doc/pgr_trspVia.rst:237 msgid ":doc:`via-category`" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:234 +#: ../../build/doc/pgr_trspVia.rst:238 msgid ":doc:`sampledata` network." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:237 +#: ../../build/doc/pgr_trspVia.rst:241 msgid "Indices and tables" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:238 +#: ../../build/doc/pgr_trspVia.rst:242 msgid ":ref:`genindex`" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:239 +#: ../../build/doc/pgr_trspVia.rst:243 msgid ":ref:`search`" msgstr "" diff --git a/locale/en/LC_MESSAGES/pgr_trspVia_withPoints.po b/locale/en/LC_MESSAGES/pgr_trspVia_withPoints.po index 436ff331ad..afa1424deb 100644 --- a/locale/en/LC_MESSAGES/pgr_trspVia_withPoints.po +++ b/locale/en/LC_MESSAGES/pgr_trspVia_withPoints.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-25 12:55-0500\n" +"POT-Creation-Date: 2022-07-11 18:25-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -34,6 +34,10 @@ msgid "" "and/or points with restrictions." msgstr "" +#: ../../build/doc/pgr_trspVia_withPoints.rst:25 +msgid "Boost Graph Inside" +msgstr "" + #: ../../build/doc/proposed.rst:3 msgid "Proposed functions for next mayor release." msgstr "" @@ -70,10 +74,6 @@ msgstr "" msgid "Documentation might need refinement." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:29 -msgid "Boost Graph Inside" -msgstr "" - #: ../../build/doc/pgr_trspVia_withPoints.rst:32 msgid "Availability" msgstr "" @@ -83,20 +83,24 @@ msgid "Version 3.4.0" msgstr "" #: ../../build/doc/pgr_trspVia_withPoints.rst:35 -msgid "New **proposed** function ``pgr_trspVia_withPoints`` (`One Via`_)" +msgid "New proposed function:" +msgstr "" + +#: ../../build/doc/pgr_trspVia_withPoints.rst:37 +msgid "``pgr_trspVia_withPoints`` (`One Via`_)" msgstr "" #: ../../build/doc/dijkstra-family.rst:11 #: ../../build/doc/pgRouting-concepts.rst:10 #: ../../build/doc/pgRouting-concepts.rst:11 -#: ../../build/doc/pgr_trspVia_withPoints.rst:38 +#: ../../build/doc/pgr_trspVia_withPoints.rst:40 #: ../../build/doc/pgr_trsp_withPoints.rst:11 #: ../../build/doc/via-category.rst:10 ../../build/doc/via-category.rst:11 #: ../../build/doc/withPoints-category.rst:11 msgid "Description" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:40 +#: ../../build/doc/pgr_trspVia_withPoints.rst:42 msgid "" "Given a graph, a set of restriction on the graph edges, a set of points " "on the graphs edges and a list of vertices, this function is equivalent " @@ -110,7 +114,7 @@ msgstr "" msgid "Route" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:46 +#: ../../build/doc/pgr_trspVia_withPoints.rst:48 msgid "is a sequence of paths" msgstr "" @@ -118,65 +122,87 @@ msgstr "" msgid "Path" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:47 +#: ../../build/doc/pgr_trspVia_withPoints.rst:49 msgid "is a section of the route." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:49 +#: ../../build/doc/pgr_trspVia_withPoints.rst:51 msgid "The general algorithm is as follows:" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:51 +#: ../../build/doc/pgr_trspVia_withPoints.rst:53 msgid "Build the Graph with the new points." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:53 +#: ../../build/doc/pgr_trspVia_withPoints.rst:55 msgid "The points identifiers will be converted to negative values." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:54 +#: ../../build/doc/pgr_trspVia_withPoints.rst:56 msgid "The vertices identifiers will remain positive." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:56 +#: ../../build/doc/pgr_trspVia_withPoints.rst:58 msgid "Execute a :doc:`pgr_withPointsVia`." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:57 +#: ../../build/doc/pgr_trspVia_withPoints.rst:59 msgid "For the set of paths of the solution that pass through a restriction then" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:59 +#: ../../build/doc/pgr_trspVia_withPoints.rst:61 msgid "Execute the **TRSP** algorithm with restrictions for the path." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:60 +#: ../../build/doc/pgr_trspVia_withPoints.rst:62 msgid "**NOTE** when this is done, ``U_turn_on_edge`` flag is ignored." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:62 +#: ../../build/doc/pgr_trspVia_withPoints.rst:64 msgid "Do not use negative values on identifiers of the inner queries." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:65 +#: ../../build/doc/pgr_trspVia_withPoints.rst:67 msgid "Signatures" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:71 +#: ../../build/doc/pgr_trspVia_withPoints.rst:73 msgid "One Via" msgstr "" +#: ../../build/doc/pgr_trspVia_withPoints.rst:75 +msgid "\\ \\" +msgstr "" + +#: ../../build/doc/pgr_trspVia_withPoints.rst:78 +msgid "" +"pgr_trspVia(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, **via " +"vertices**, [options])" +msgstr "" + #: ../../build/doc/pgr_trspVia_withPoints.rst -msgid "Example" +msgid "[options]" msgstr "" #: ../../build/doc/pgr_trspVia_withPoints.rst:81 +msgid "[directed, strict, U_turn_on_edge]" +msgstr "" + +#: ../../build/doc/pgr_trspVia_withPoints.rst:83 +msgid "RETURNS SET OF |via-result| OR EMPTY SET" +msgstr "" + +#: ../../build/doc/pgr_trspVia_withPoints.rst +msgid "Example" +msgstr "" + +#: ../../build/doc/pgr_trspVia_withPoints.rst:86 msgid "" "Find the route that visits the vertices :math:`\\{-6, 15, -5\\}` in that " -"order on an **directed** graph." +"order on an directed graph." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:89 +#: ../../build/doc/pgr_trspVia_withPoints.rst:94 msgid "Parameters" msgstr "" @@ -262,7 +288,7 @@ msgstr "" msgid "SMALLINT, INTEGER, BIGINT, REAL, FLOAT" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:96 +#: ../../build/doc/pgr_trspVia_withPoints.rst:101 msgid "Optional parameters" msgstr "" @@ -293,7 +319,7 @@ msgstr "" msgid "When ``false`` the graph is considered as `Undirected`." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:103 +#: ../../build/doc/pgr_trspVia_withPoints.rst:108 msgid "Via optional parameters" msgstr "" @@ -322,7 +348,7 @@ msgstr "" msgid "When ``true`` departing from a visited vertex will not try to avoid" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:110 +#: ../../build/doc/pgr_trspVia_withPoints.rst:115 msgid "With points optional parameters" msgstr "" @@ -369,11 +395,11 @@ msgid "" "path." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:117 +#: ../../build/doc/pgr_trspVia_withPoints.rst:122 msgid "Inner Queries" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:120 +#: ../../build/doc/pgr_trspVia_withPoints.rst:125 msgid "Edges SQL" msgstr "" @@ -455,7 +481,7 @@ msgstr "" msgid "``SMALLINT``, ``INTEGER``, ``BIGINT``, ``REAL``, ``FLOAT``" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:127 +#: ../../build/doc/pgr_trspVia_withPoints.rst:132 msgid "Restrictions SQL" msgstr "" @@ -478,7 +504,7 @@ msgstr "" msgid "Cost of taking the forbidden path." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:134 +#: ../../build/doc/pgr_trspVia_withPoints.rst:139 msgid "Points SQL" msgstr "" @@ -550,7 +576,7 @@ msgstr "" msgid "In both sides ``b``, ``NULL``" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:141 +#: ../../build/doc/pgr_trspVia_withPoints.rst:146 msgid "Result Columns" msgstr "" @@ -667,93 +693,97 @@ msgid "" "values, the identifier is for a Point." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:152 +#: ../../build/doc/pgr_trspVia_withPoints.rst:157 msgid "Additional Examples" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:158 -msgid "Use :doc:`pgr_findCloseEdges` in the `Points SQL`_." +#: ../../build/doc/pgr_trspVia_withPoints.rst:163 +msgid "Use ``pgr_findCloseEdges`` for points on the fly" +msgstr "" + +#: ../../build/doc/pgr_trspVia_withPoints.rst:165 +msgid "Using :doc:`pgr_findCloseEdges`:" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:160 +#: ../../build/doc/pgr_trspVia_withPoints.rst:167 msgid "" "Visit from vertex :math:`1` to the two locations on the graph of point " "`(2.9, 1.8)` in order of closeness to the graph." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:167 +#: ../../build/doc/pgr_trspVia_withPoints.rst:174 msgid "Point :math:`-1` corresponds to the closest edge from point `(2.9,1.8)`." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:168 +#: ../../build/doc/pgr_trspVia_withPoints.rst:175 msgid "" "Point :math:`-2` corresponds to the next close edge from point " "`(2.9,1.8)`." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:169 +#: ../../build/doc/pgr_trspVia_withPoints.rst:176 msgid "" "Point :math:`-2` is visited on the route to from vertex :math:`1` to " "Point :math:`-1` (See row where :math:`seq = 4`)." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:173 +#: ../../build/doc/pgr_trspVia_withPoints.rst:180 msgid "Usage variations" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:175 +#: ../../build/doc/pgr_trspVia_withPoints.rst:182 msgid "" "All this examples are about the route that visits the vertices " -":math:`\\{-6, 7, -4, 8, -2\\}` in that order on a **directed** graph." +":math:`\\{-6, 7, -4, 8, -2\\}` in that order on a directed graph." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:183 +#: ../../build/doc/pgr_trspVia_withPoints.rst:190 msgid "Aggregate cost of the third path." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:190 +#: ../../build/doc/pgr_trspVia_withPoints.rst:197 msgid "Route's aggregate cost of the route at the end of the third path." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:197 +#: ../../build/doc/pgr_trspVia_withPoints.rst:204 msgid "Nodes visited in the route." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:204 +#: ../../build/doc/pgr_trspVia_withPoints.rst:211 msgid "The aggregate costs of the route when the visited vertices are reached." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:211 +#: ../../build/doc/pgr_trspVia_withPoints.rst:218 msgid "Status of \"passes in front\" or \"visits\" of the nodes and points." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:218 -msgid "Simulation of how algorithm works" +#: ../../build/doc/pgr_trspVia_withPoints.rst:225 +msgid "Simulation of how algorithm works." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:220 +#: ../../build/doc/pgr_trspVia_withPoints.rst:227 msgid "The algorithm performs a :doc:`pgr_withPointsVia`" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:226 +#: ../../build/doc/pgr_trspVia_withPoints.rst:233 msgid "" "Detects which of the paths pass through a restriction in this case is for" " the ``path_id = 1`` from ``-6`` to ``15`` because the path :math:`9 " "\\rightarrow 16` is restricted." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:230 +#: ../../build/doc/pgr_trspVia_withPoints.rst:237 msgid "Executes the :ref:`TRSP-family:TRSP algorithm` for the conflicting paths." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:236 +#: ../../build/doc/pgr_trspVia_withPoints.rst:243 msgid "" "From the :doc:`pgr_withPointsVia` result it removes the conflicting paths" " and builds the solution with the results of the :doc:`pgr_trsp` " "algorithm:" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:243 +#: ../../build/doc/pgr_trspVia_withPoints.rst:250 msgid "Getting the same result as ``pgr_trspVia_withPoints``:" msgstr "" @@ -761,24 +791,24 @@ msgstr "" msgid "Example 8" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:249 +#: ../../build/doc/pgr_trspVia_withPoints.rst:256 msgid "Sometimes ``U_turn_on_edge`` flag is ignored when is set to ``false``." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:252 +#: ../../build/doc/pgr_trspVia_withPoints.rst:259 msgid "" "The first step, doing a :doc:`pgr_withPointsVia` does consider not making" " a U turn on the same edge. But the path :math:`9 \\rightarrow 16` (Rows " "4 and 5) is restricted and the result is using it." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:260 +#: ../../build/doc/pgr_trspVia_withPoints.rst:267 msgid "" "When executing the :doc:`pgr_trsp_withPoints` algorithm for the " "conflicting path, there is no ``U_turn_on_edge`` flag." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:267 +#: ../../build/doc/pgr_trspVia_withPoints.rst:274 msgid "" "Therefore the result ignores the ``U_turn_on_edge`` flag when set to " "``false``. From the :doc:`pgr_withPointsVia` result it removes the " @@ -787,35 +817,35 @@ msgid "" "same edge." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:277 +#: ../../build/doc/pgr_trspVia_withPoints.rst:284 msgid "See Also" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:279 +#: ../../build/doc/pgr_trspVia_withPoints.rst:286 msgid ":doc:`TRSP-family`" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:280 +#: ../../build/doc/pgr_trspVia_withPoints.rst:287 msgid ":doc:`via-category`" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:281 +#: ../../build/doc/pgr_trspVia_withPoints.rst:288 msgid ":doc:`withPoints-category`" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:282 +#: ../../build/doc/pgr_trspVia_withPoints.rst:289 msgid ":doc:`sampledata` network." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:285 +#: ../../build/doc/pgr_trspVia_withPoints.rst:292 msgid "Indices and tables" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:286 +#: ../../build/doc/pgr_trspVia_withPoints.rst:293 msgid ":ref:`genindex`" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:287 +#: ../../build/doc/pgr_trspVia_withPoints.rst:294 msgid ":ref:`search`" msgstr "" diff --git a/locale/en/LC_MESSAGES/pgr_trsp_withPoints.po b/locale/en/LC_MESSAGES/pgr_trsp_withPoints.po index 42ce26bd71..ae4baf1fa1 100644 --- a/locale/en/LC_MESSAGES/pgr_trsp_withPoints.po +++ b/locale/en/LC_MESSAGES/pgr_trsp_withPoints.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-25 12:55-0500\n" +"POT-Creation-Date: 2022-07-11 18:25-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -32,6 +32,10 @@ msgstr "" msgid "``pgr_trsp_withPoints`` Routing Vertex/Point with restrictions." msgstr "" +#: ../../build/doc/pgr_trsp_withPoints.rst:24 +msgid "Boost Graph Inside" +msgstr "" + #: ../../build/doc/proposed.rst:3 msgid "Proposed functions for next mayor release." msgstr "" @@ -68,10 +72,6 @@ msgstr "" msgid "Documentation might need refinement." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:28 -msgid "Boost Graph Inside" -msgstr "" - #: ../../build/doc/pgr_trsp_withPoints.rst:31 msgid "Availability" msgstr "" @@ -81,7 +81,7 @@ msgid "Version 3.4.0" msgstr "" #: ../../build/doc/pgr_trsp_withPoints.rst:34 -msgid "New **Proposed** signatures" +msgid "New proposed signatures:" msgstr "" #: ../../build/doc/pgr_trsp_withPoints.rst:36 @@ -107,9 +107,9 @@ msgstr "" #: ../../build/doc/dijkstra-family.rst:11 #: ../../build/doc/pgRouting-concepts.rst:10 #: ../../build/doc/pgRouting-concepts.rst:11 +#: ../../build/doc/pgRouting-concepts.rst:13 #: ../../build/doc/pgr_trsp_withPoints.rst:43 -#: ../../build/doc/pgr_trsp_withPoints.rst:221 -#: ../../build/doc/pgr_trsp_withPoints.rst:282 +#: ../../build/doc/pgr_trsp_withPoints.rst:230 #: ../../build/doc/withPoints-category.rst:11 msgid "Description" msgstr "" @@ -121,137 +121,218 @@ msgid "" msgstr "" #: ../../build/doc/pgr_trsp_withPoints.rst:48 -msgid "**The main characteristics are:**" +msgid "Characteristics:" msgstr "" #: ../../build/doc/pgr_trsp_withPoints.rst:50 -msgid "Process is done only on edges with positive costs." -msgstr "" - -#: ../../build/doc/pgr_trsp_withPoints.rst:51 -msgid "Driving side can not be `b` (**both**)" +msgid "Vertices of the graph are:" msgstr "" #: ../../build/doc/pgr_trsp_withPoints.rst:52 -msgid "Vertices of the graph are:" +msgid "**positive** when it belongs to the `Edges SQL`_" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:54 -msgid "**positive** when it belongs to the `Edges SQL`_" +#: ../../build/doc/pgr_trsp_withPoints.rst:53 +msgid "**negative** when it belongs to the `Points SQL`_" msgstr "" #: ../../build/doc/pgr_trsp_withPoints.rst:55 -msgid "**negative** when it belongs to the `Points SQL`_" +msgid "Driving side can not be ``b``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:57 +#: ../../build/doc/pgr_trsp_withPoints.rst:56 msgid "Values are returned when there is a path." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:59 +#: ../../build/doc/pgr_trsp_withPoints.rst:58 msgid "When the starting vertex and ending vertex are the same, there is no path." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:61 +#: ../../build/doc/pgr_trsp_withPoints.rst:60 msgid "The agg_cost the non included values (v, v) is 0" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:63 +#: ../../build/doc/pgr_trsp_withPoints.rst:62 msgid "" "When the starting vertex and ending vertex are the different and there is" " no path:" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:66 +#: ../../build/doc/pgr_trsp_withPoints.rst:65 msgid "The agg_cost the non included values (u, v) is ∞" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:68 +#: ../../build/doc/pgr_trsp_withPoints.rst:67 msgid "" "For optimization purposes, any duplicated value in the start_vids or " "end_vids are ignored." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:70 +#: ../../build/doc/pgr_trsp_withPoints.rst:69 msgid "The returned values are ordered: - start_vid ascending - end_vid ascending" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:74 +#: ../../build/doc/pgr_trsp_withPoints.rst:73 msgid "Running time: :math:`O(|start\\_vids|\\times(V \\log V + E))`" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:77 +#: ../../build/doc/pgr_trsp_withPoints.rst:76 msgid "Signatures" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:80 +#: ../../build/doc/pgr_trsp_withPoints.rst:79 msgid "Summary" msgstr "" +#: ../../build/doc/pgr_trsp_withPoints.rst:80 #: ../../build/doc/pgr_trsp_withPoints.rst:100 +#: ../../build/doc/pgr_trsp_withPoints.rst:122 +#: ../../build/doc/pgr_trsp_withPoints.rst:143 +#: ../../build/doc/pgr_trsp_withPoints.rst:164 +#: ../../build/doc/pgr_trsp_withPoints.rst:186 +msgid "\\ \\" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst +msgid "" +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " +"**start vid**, **end vid**, [options])" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst +msgid "" +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " +"**start vid**, **end vids**, [options])" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst +msgid "" +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " +"**start vids**, **end vid**, [options])" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst +msgid "" +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " +"**start vids**, **end vids**, [options])" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst +msgid "" +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Combinations " +"SQL`_, `Points SQL`_, [options])" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst +msgid "[options]" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst:89 +msgid "[directed, driving_side [details]" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst +msgid "RETURNS SET OF |generic-result|" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst +msgid "OR EMPTY SET" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst:98 msgid "One to One" msgstr "" +#: ../../build/doc/pgr_trsp_withPoints.rst:103 +msgid "" +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " +"**start vid**, **end vid**, [directed, driving_side, details])" +msgstr "" + #: ../../build/doc/pgr_trsp_withPoints.rst msgid "Example" msgstr "" #: ../../build/doc/pgr_trsp_withPoints.rst:109 msgid "" -"From point :math:`1` to vertex :math:`10` with details on a **left** " -"driving side configuration on a **directed** graph with **details**." +"From point :math:`1` to vertex :math:`10` with details on a left driving " +"side configuration on a directed graph with details." msgstr "" #: ../../build/doc/pgr_trsp_withPoints.rst:120 msgid "One to Many" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:129 +#: ../../build/doc/pgr_trsp_withPoints.rst:125 +msgid "" +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " +"**start vid**, **end vids** [directed, driving_side, details])" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst:131 msgid "From point :math:`1` to point :math:`3` and vertex :math:`7`." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:139 +#: ../../build/doc/pgr_trsp_withPoints.rst:141 msgid "Many to One" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:148 +#: ../../build/doc/pgr_trsp_withPoints.rst:146 +msgid "" +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " +"**start vids**, **end vid** [directed, driving_side, details])" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst:152 msgid "From point :math:`1` and vertex :math:`6` to point :math:`3`." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:158 +#: ../../build/doc/pgr_trsp_withPoints.rst:162 msgid "Many to Many" msgstr "" #: ../../build/doc/pgr_trsp_withPoints.rst:167 msgid "" -"From point :math:`1` and vertex :math:`6` to point :math:`3` and vertex " +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " +"**start vids**, **end vids** [directed, driving_side, details])" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst:173 +msgid "" +"From point :math:`1` and vertex :math:`6` to point :math:`3` and vertex " ":math:`1`." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:178 +#: ../../build/doc/pgr_trsp_withPoints.rst:184 msgid "Combinations" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:186 +#: ../../build/doc/pgr_trsp_withPoints.rst:189 +msgid "" +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Combinations " +"SQL`_, `Points SQL`_, [directed, driving_side, details])" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst:195 msgid "" "From point :math:`1` to vertex :math:`10` and from vertex :math:`6` to " -"point :math:`3` with **right** side driving configuration." +"point :math:`3` with right side driving configuration." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:194 +#: ../../build/doc/pgr_trsp_withPoints.rst:203 msgid "Parameters" msgstr "" #: ../../build/doc/dijkstra-family.rst:8 #: ../../build/doc/pgRouting-concepts.rst:8 -#: ../../build/doc/pgr_trsp_withPoints.rst:280 +#: ../../build/doc/pgRouting-concepts.rst:11 msgid "Column" msgstr "" #: ../../build/doc/dijkstra-family.rst:9 #: ../../build/doc/pgRouting-concepts.rst:9 -#: ../../build/doc/pgr_trsp_withPoints.rst:219 -#: ../../build/doc/pgr_trsp_withPoints.rst:281 +#: ../../build/doc/pgRouting-concepts.rst:12 +#: ../../build/doc/pgr_trsp_withPoints.rst:228 #: ../../build/doc/withPoints-category.rst:9 msgid "Type" msgstr "" @@ -348,13 +429,13 @@ msgstr "" msgid "``SMALLINT``, ``INTEGER``, ``BIGINT``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:202 +#: ../../build/doc/pgr_trsp_withPoints.rst:211 msgid "Optional parameters" msgstr "" #: ../../build/doc/dijkstra-family.rst:10 #: ../../build/doc/pgRouting-concepts.rst:10 -#: ../../build/doc/pgr_trsp_withPoints.rst:220 +#: ../../build/doc/pgr_trsp_withPoints.rst:229 #: ../../build/doc/withPoints-category.rst:10 msgid "Default" msgstr "" @@ -364,7 +445,7 @@ msgid "``directed``" msgstr "" #: ../../build/doc/dijkstra-family.rst:13 -#: ../../build/doc/pgr_trsp_withPoints.rst:231 +#: ../../build/doc/pgr_trsp_withPoints.rst:240 msgid "``BOOLEAN``" msgstr "" @@ -380,68 +461,68 @@ msgstr "" msgid "When ``false`` the graph is considered as `Undirected`." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:209 +#: ../../build/doc/pgr_trsp_withPoints.rst:218 msgid "With points optional parameters" msgstr "" #: ../../build/doc/pgRouting-concepts.rst:8 -#: ../../build/doc/pgr_trsp_withPoints.rst:218 +#: ../../build/doc/pgr_trsp_withPoints.rst:227 #: ../../build/doc/withPoints-category.rst:8 msgid "Parameter" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:222 +#: ../../build/doc/pgr_trsp_withPoints.rst:231 msgid "``driving_side``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:223 +#: ../../build/doc/pgr_trsp_withPoints.rst:232 #: ../../build/doc/withPoints-category.rst:32 msgid "``CHAR``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:224 +#: ../../build/doc/pgr_trsp_withPoints.rst:233 msgid "``r``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:225 +#: ../../build/doc/pgr_trsp_withPoints.rst:234 msgid "Value in [``r``, ``l``] indicating if the driving side is:" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:227 +#: ../../build/doc/pgr_trsp_withPoints.rst:236 msgid "``r`` for right driving side" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:228 +#: ../../build/doc/pgr_trsp_withPoints.rst:237 msgid "``l`` for left driving side" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:229 +#: ../../build/doc/pgr_trsp_withPoints.rst:238 msgid "Any other value will be considered as ``r``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:230 +#: ../../build/doc/pgr_trsp_withPoints.rst:239 msgid "``details``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:232 +#: ../../build/doc/pgr_trsp_withPoints.rst:241 msgid "``false``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:233 +#: ../../build/doc/pgr_trsp_withPoints.rst:242 msgid "When ``true`` the results will include the points that are in the path." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:234 +#: ../../build/doc/pgr_trsp_withPoints.rst:243 msgid "" "When ``false`` the results will not include the points that are in the " "path." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:242 +#: ../../build/doc/pgr_trsp_withPoints.rst:249 msgid "Inner Queries" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:245 +#: ../../build/doc/pgr_trsp_withPoints.rst:252 msgid "Edges SQL" msgstr "" @@ -472,7 +553,7 @@ msgid "Identifier of the second end point vertex of the edge." msgstr "" #: ../../build/doc/pgRouting-concepts.rst:24 -#: ../../build/doc/pgr_trsp_withPoints.rst:305 +#: ../../build/doc/pgRouting-concepts.rst:40 msgid "``cost``" msgstr "" @@ -516,7 +597,7 @@ msgstr "" msgid "``SMALLINT``, ``INTEGER``, ``BIGINT``, ``REAL``, ``FLOAT``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:252 +#: ../../build/doc/pgr_trsp_withPoints.rst:259 msgid "Restrictions SQL" msgstr "" @@ -539,7 +620,7 @@ msgstr "" msgid "Cost of taking the forbidden path." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:259 +#: ../../build/doc/pgr_trsp_withPoints.rst:266 msgid "Points SQL" msgstr "" @@ -611,7 +692,7 @@ msgstr "" msgid "In both sides ``b``, ``NULL``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:266 +#: ../../build/doc/pgr_trsp_withPoints.rst:273 msgid "Combinations SQL" msgstr "" @@ -619,174 +700,185 @@ msgstr "" msgid "Identifier of the arrival vertex." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:273 +#: ../../build/doc/pgr_trsp_withPoints.rst:280 msgid "Result Columns" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:283 +#: ../../build/doc/pgRouting-concepts.rst:3 +msgid "" +"Returns set of ``(seq, path_id, path_seq, start_vid, end_vid, node, edge," +" cost, agg_cost)``" +msgstr "" + +#: ../../build/doc/pgRouting-concepts.rst:14 msgid "``seq``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:284 -#: ../../build/doc/pgr_trsp_withPoints.rst:287 +#: ../../build/doc/pgRouting-concepts.rst:15 +#: ../../build/doc/pgRouting-concepts.rst:18 +#: ../../build/doc/pgRouting-concepts.rst:24 msgid "``INTEGER``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:285 +#: ../../build/doc/pgRouting-concepts.rst:16 msgid "Sequential value starting from **1**." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:286 +#: ../../build/doc/pgRouting-concepts.rst:17 +msgid "``path_id``" +msgstr "" + +#: ../../build/doc/pgRouting-concepts.rst:19 +msgid "Path identifier." +msgstr "" + +#: ../../build/doc/pgRouting-concepts.rst:21 +msgid "Has value **1** for the first of a path from ``start_vid`` to ``end_vid``." +msgstr "" + +#: ../../build/doc/pgRouting-concepts.rst:23 msgid "``path_seq``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:288 +#: ../../build/doc/pgRouting-concepts.rst:25 msgid "" "Relative position in the path. Has value **1** for the beginning of a " "path." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:290 +#: ../../build/doc/pgRouting-concepts.rst:27 msgid "``start_vid``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:291 -#: ../../build/doc/pgr_trsp_withPoints.rst:294 -#: ../../build/doc/pgr_trsp_withPoints.rst:297 -#: ../../build/doc/pgr_trsp_withPoints.rst:300 +#: ../../build/doc/pgRouting-concepts.rst:28 +#: ../../build/doc/pgRouting-concepts.rst:31 +#: ../../build/doc/pgRouting-concepts.rst:34 +#: ../../build/doc/pgRouting-concepts.rst:37 msgid "``BIGINT``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:292 -msgid "Identifier of the starting vertex of the path." +#: ../../build/doc/pgRouting-concepts.rst:29 +msgid "Identifier of the starting vertex." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:293 +#: ../../build/doc/pgRouting-concepts.rst:30 msgid "``end_vid``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:295 -msgid "Identifier of the ending vertex of the path." +#: ../../build/doc/pgRouting-concepts.rst:32 +msgid "Identifier of the ending vertex." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:296 +#: ../../build/doc/pgRouting-concepts.rst:33 msgid "``node``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:298 +#: ../../build/doc/pgRouting-concepts.rst:35 msgid "Identifier of the node in the path from ``start_vid`` to ``end_vid``." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:299 +#: ../../build/doc/pgRouting-concepts.rst:36 msgid "``edge``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:301 +#: ../../build/doc/pgRouting-concepts.rst:38 msgid "" "Identifier of the edge used to go from ``node`` to the next node in the " -"path sequence." +"path sequence. **-1** for the last node of the path." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:304 -msgid "-1 for the last node of the path." -msgstr "" - -#: ../../build/doc/pgr_trsp_withPoints.rst:306 -#: ../../build/doc/pgr_trsp_withPoints.rst:312 +#: ../../build/doc/pgRouting-concepts.rst:41 +#: ../../build/doc/pgRouting-concepts.rst:45 msgid "``FLOAT``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:307 +#: ../../build/doc/pgRouting-concepts.rst:42 msgid "" "Cost to traverse from ``node`` using ``edge`` to the next node in the " "path sequence." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:310 -msgid "``0`` for the last row in the path sequence." -msgstr "" - -#: ../../build/doc/pgr_trsp_withPoints.rst:311 +#: ../../build/doc/pgRouting-concepts.rst:44 msgid "``agg_cost``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:313 +#: ../../build/doc/pgRouting-concepts.rst:46 msgid "Aggregate cost from ``start_vid`` to ``node``." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:315 -msgid "``0`` for the first row in the path sequence." +#: ../../build/doc/pgr_trsp_withPoints.rst:287 +msgid "Additional Examples" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:320 -msgid "Additional Examples" +#: ../../build/doc/pgr_trsp_withPoints.rst:293 +msgid "Use ``pgr_findCloseEdges`` for points on the fly" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:326 -msgid "Use :doc:`pgr_findCloseEdges` in the `Points SQL`_." +#: ../../build/doc/pgr_trsp_withPoints.rst:295 +msgid "Using :doc:`pgr_findCloseEdges`:" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:328 +#: ../../build/doc/pgr_trsp_withPoints.rst:297 msgid "" "Find the routes from vertex :math:`1` to the two closest locations on the" " graph of point `(2.9, 1.8)`." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:335 -msgid "Point :math:`-1` corresponds to the closest edge from point `(2.9,1.8)`." +#: ../../build/doc/pgr_trsp_withPoints.rst:304 +msgid "Point :math:`-1` corresponds to the closest edge from point `(2.9, 1.8)`." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:336 +#: ../../build/doc/pgr_trsp_withPoints.rst:305 msgid "" -"Point :math:`-2` corresponds to the next close edge from point " -"`(2.9,1.8)`." +"Point :math:`-2` corresponds to the next close edge from point `(2.9, " +"1.8)`." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:339 -msgid "Pass in front or visits" +#: ../../build/doc/pgr_trsp_withPoints.rst:308 +msgid "Pass in front or visits." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:341 +#: ../../build/doc/pgr_trsp_withPoints.rst:310 msgid "" "Which path (if any) passes in front of point :math:`6` or vertex " -":math:`11` with **right** side driving topology." +":math:`11` with right side driving topology." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:349 -msgid "Show details on undirected graph" +#: ../../build/doc/pgr_trsp_withPoints.rst:318 +msgid "Show details on undirected graph." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:351 +#: ../../build/doc/pgr_trsp_withPoints.rst:320 msgid "" "From point :math:`1` and vertex :math:`6` to point :math:`3` to vertex " -":math:`1` on an **undirected** graph, with details." +":math:`1` on an undirected graph, with details." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:359 +#: ../../build/doc/pgr_trsp_withPoints.rst:328 msgid "See Also" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:361 +#: ../../build/doc/pgr_trsp_withPoints.rst:330 msgid ":doc:`TRSP-family`" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:362 +#: ../../build/doc/pgr_trsp_withPoints.rst:331 msgid ":doc:`withPoints-category`" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:363 +#: ../../build/doc/pgr_trsp_withPoints.rst:332 msgid ":doc:`sampledata`" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:366 +#: ../../build/doc/pgr_trsp_withPoints.rst:335 msgid "Indices and tables" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:367 +#: ../../build/doc/pgr_trsp_withPoints.rst:336 msgid ":ref:`genindex`" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:368 +#: ../../build/doc/pgr_trsp_withPoints.rst:337 msgid ":ref:`search`" msgstr "" diff --git a/locale/en/LC_MESSAGES/pgr_turnRestrictedPath.po b/locale/en/LC_MESSAGES/pgr_turnRestrictedPath.po index 30186e881f..cba528426d 100644 --- a/locale/en/LC_MESSAGES/pgr_turnRestrictedPath.po +++ b/locale/en/LC_MESSAGES/pgr_turnRestrictedPath.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-25 12:55-0500\n" +"POT-Creation-Date: 2022-07-11 18:25-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -115,7 +115,7 @@ msgid "Version 3.0.0" msgstr "" #: ../../build/doc/pgr_turnRestrictedPath.rst:34 -msgid "New **Experimental** function" +msgid "New experimental function" msgstr "" #: ../../build/doc/dijkstra-family.rst:11 @@ -142,7 +142,7 @@ msgid "Example" msgstr "" #: ../../build/doc/pgr_turnRestrictedPath.rst:54 -msgid "From vertex :math:`3` to vertex :math:`8` on a **directed** graph" +msgid "From vertex :math:`3` to vertex :math:`8` on a directed graph" msgstr "" #: ../../build/doc/pgr_turnRestrictedPath.rst:61 @@ -524,7 +524,7 @@ msgid "No results because the only path available follows a restriction." msgstr "" #: ../../build/doc/pgr_turnRestrictedPath.rst:141 -msgid "From vertex :math:`3` to vertex :math:`8` on an **undirected** graph" +msgid "From vertex :math:`3` to vertex :math:`8` on an undirected graph" msgstr "" #: ../../build/doc/pgr_turnRestrictedPath.rst:147 diff --git a/locale/es/LC_MESSAGES/TRSP-family.po b/locale/es/LC_MESSAGES/TRSP-family.po index 7393add5cd..c0edce4e40 100644 --- a/locale/es/LC_MESSAGES/TRSP-family.po +++ b/locale/es/LC_MESSAGES/TRSP-family.po @@ -1,33 +1,33 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) pgRouting Contributors - Version v3.4.0-dev # This file is distributed under the same license as the pgRouting package. -# FIRST AUTHOR , YEAR. +# FIRST AUTHOR , 2022. # msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-25 12:55-0500\n" +"POT-Creation-Date: 2022-07-11 18:25-0500\n" "PO-Revision-Date: 2022-07-07 16:48+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" -"Language-Team: Spanish \n" "Language: es\n" +"Language-Team: Spanish \n" +"Plural-Forms: nplurals=2; plural=n != 1\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.13.1\n" +"Generated-By: Babel 2.9.1\n" #: ../../build/doc/TRSP-family.rst:12 msgid "" -"**Supported versions:** `Latest `__ (`3.4 `__)" +"**Supported versions:** `Latest `__ (`3.4 `__)" msgstr "" -"**Versiones Soportadas:** `Latest `__ (`3.4 `__)" +"**Versiones Soportadas:** `Latest `__ (`3.4 `__)" #: ../../build/doc/TRSP-family.rst:17 msgid "TRSP - Family of functions" @@ -91,17 +91,17 @@ msgstr ":doc:`pgr_trsp_withPoints` - Ruteo de Punto/Vértice con restricciones." #: ../../build/doc/TRSP-family.rst:32 msgid "" -":doc:`pgr_trspVia_withPoints` - Via Vertex/point routing with restrictions." -msgstr "" -":doc:`pgr_trspVia_withPoints` - Ruteo Vía Punto/Vértice con restricciones." +":doc:`pgr_trspVia_withPoints` - Via Vertex/point routing with " +"restrictions." +msgstr ":doc:`pgr_trspVia_withPoints` - Ruteo Vía Punto/Vértice con restricciones." #: ../../build/doc/TRSP-family.rst:36 msgid "" "Read the :doc:`migration` about how to migrate from the deprecated TRSP " "functionality to the new signatures or replacement functions." msgstr "" -"Leer :doc:`migration` sobre como migrar de la funcionalidad obsoleta de TRSP " -"a las nuevas firmas o funciones que las reemplazan." +"Leer :doc:`migration` sobre como migrar de la funcionalidad obsoleta de " +"TRSP a las nuevas firmas o funciones que las reemplazan." #: ../../build/doc/TRSP-family.rst:40 msgid "Experimental" @@ -186,19 +186,21 @@ msgid "Introduction" msgstr "Introducción" #: ../../build/doc/TRSP-family.rst:63 +#, fuzzy msgid "" -"Road restrictions are a sequence of road segments that can not be taken in a " -"sequential manner. Some restrictions are implicit on a directed graph, for " -"example, one way roads where the wrong way edge is not even inserted on the " -"graph. But normally on turns like **left turn** or **right turn**, hence the " -"name turn restrictions, there are sometimes restrictions." +"Road restrictions are a sequence of road segments that can not be taken " +"in a sequential manner. Some restrictions are implicit on a directed " +"graph, for example, one way roads where the wrong way edge is not even " +"inserted on the graph. But normally on turns like no left turn or no " +"right turn, hence the name turn restrictions, there are sometimes " +"restrictions." msgstr "" -"Las restricciones viales son una secuencia de tramos viales que no se pueden " -"tomar de manera secuencial. Algunas restricciones están implícitas en un " -"grafo dirigido, por ejemplo, caminos de un solo sentido donde el sentido " -"contrario ni siquiera se inserta en el grafo. Pero normalmente en giros como " -"**giro a la izquierda** o **giro a la derecha**, de ahí el nombre de " -"restricciones de giro, a veces hay restricciones." +"Las restricciones viales son una secuencia de tramos viales que no se " +"pueden tomar de manera secuencial. Algunas restricciones están implícitas" +" en un grafo dirigido, por ejemplo, caminos de un solo sentido donde el " +"sentido contrario ni siquiera se inserta en el grafo. Pero normalmente en" +" giros como **giro a la izquierda** o **giro a la derecha**, de ahí el " +"nombre de restricciones de giro, a veces hay restricciones." #: ../../build/doc/TRSP-family.rst:74 msgid "TRSP algorithm" @@ -206,13 +208,14 @@ msgstr "Algoritmo TRSP" #: ../../build/doc/TRSP-family.rst:76 msgid "" -"The internal TRSP algorithm performs a lookahead over the dijkstra algorithm " -"in order to find out if the attempted path has a restriction. This allows " -"the algorithm to pass twice on the same vertex." +"The internal TRSP algorithm performs a lookahead over the dijkstra " +"algorithm in order to find out if the attempted path has a restriction. " +"This allows the algorithm to pass twice on the same vertex." msgstr "" "Wl algoritmo interno TRSP realiza una búsqueda de avanzada sobre el " -"algoritmo de Dijkstra para encontrar un camino que contenga una restricción. " -"Esto permite que el algoritmo pase dos veces sobre el mismo vértice." +"algoritmo de Dijkstra para encontrar un camino que contenga una " +"restricción. Esto permite que el algoritmo pase dos veces sobre el mismo " +"vértice." #: ../../build/doc/TRSP-family.rst:81 msgid "Parameters" @@ -226,8 +229,8 @@ msgstr "Parámetro" msgid "Type" msgstr "Tipo" -#: ../../build/doc/TRSP-family.rst:92 ../../build/doc/pgRouting-concepts.rst:11 -#: ../../build/doc/pgRouting-concepts.rst:10 +#: ../../build/doc/TRSP-family.rst:92 ../../build/doc/pgRouting-concepts.rst:10 +#: ../../build/doc/pgRouting-concepts.rst:11 msgid "Description" msgstr "Descripción" @@ -265,12 +268,12 @@ msgid "Array of ordered vertices identifiers that are going to be visited." msgstr "Arreglo ordenado de identificadores de vértices que serán visitados." #: ../../build/doc/TRSP-family.rst:103 -#: ../../build/doc/pgRouting-concepts.rst:36 #: ../../build/doc/pgRouting-concepts.rst:21 +#: ../../build/doc/pgRouting-concepts.rst:36 msgid "Where:" msgstr "Donde:" -#: ../../build/doc/TRSP-family.rst:0 ../../build/doc/pgRouting-concepts.rst:0 +#: ../../build/doc/TRSP-family.rst ../../build/doc/pgRouting-concepts.rst msgid "ANY-INTEGER" msgstr "ENTEROS" @@ -287,16 +290,17 @@ msgid "" "On road networks, there are restrictions such as left or right turn " "restrictions, no U turn restrictions." msgstr "" -"En redes de caminos, hay restricciones como vuelta a la izquierda o derecha, " -"no vuelta en U." +"En redes de caminos, hay restricciones como vuelta a la izquierda o " +"derecha, no vuelta en U." #: ../../build/doc/TRSP-family.rst:115 +#, fuzzy msgid "" -"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." msgstr "" -"Una restricción es una secuencia de aristas, llamado **path** y ese **path** " -"se debería evitar." +"Una restricción es una secuencia de aristas, llamado **path** y ese " +"**path** se debería evitar." #: ../../build/doc/TRSP-family.rst:123 msgid "**Restrictions on the road network**" @@ -308,9 +312,9 @@ msgstr "Éstas restricciones son representadas en la siguiente tabla:" #: ../../build/doc/TRSP-family.rst:131 msgid "" -"The table has an identifier, which maybe is needed for the administration of " -"the restrictions, but the algorithms do not need that information. If given " -"it will be ignored." +"The table has an identifier, which maybe is needed for the administration" +" of the restrictions, but the algorithms do not need that information. If" +" given it will be ignored." msgstr "" "La tabla tiene un identificador, lo cual pueda ser necesaria para la " "administración de las restricciones, pero el algoritmo no necesita esa " @@ -362,9 +366,9 @@ msgstr "Identificador del segundo vértice de la arista." msgid "``cost``" msgstr "``cost``" +#: ../../build/doc/pgRouting-concepts.rst:18 #: ../../build/doc/pgRouting-concepts.rst:25 #: ../../build/doc/pgRouting-concepts.rst:29 -#: ../../build/doc/pgRouting-concepts.rst:18 msgid "**ANY-NUMERICAL**" msgstr "**FLOTANTES**" @@ -386,23 +390,23 @@ msgstr "Peso de la arista (``target``, ``source``)" #: ../../build/doc/pgRouting-concepts.rst:33 msgid "" -"When negative: edge (``target``, ``source``) does not exist, therefore it's " -"not part of the graph." +"When negative: edge (``target``, ``source``) does not exist, therefore " +"it's not part of the graph." msgstr "" -"Cuando negativo: la arista (``target``, ``source``) no existe, por lo tanto " -"no es parte del grafo." +"Cuando negativo: la arista (``target``, ``source``) no existe, por lo " +"tanto no es parte del grafo." -#: ../../build/doc/pgRouting-concepts.rst:38 #: ../../build/doc/pgRouting-concepts.rst:23 +#: ../../build/doc/pgRouting-concepts.rst:38 msgid "``SMALLINT``, ``INTEGER``, ``BIGINT``" msgstr "``SMALLINT``, ``INTEGER``, ``BIGINT``" -#: ../../build/doc/pgRouting-concepts.rst:0 +#: ../../build/doc/pgRouting-concepts.rst msgid "ANY-NUMERICAL" msgstr "FLOTANTES" -#: ../../build/doc/pgRouting-concepts.rst:39 #: ../../build/doc/pgRouting-concepts.rst:24 +#: ../../build/doc/pgRouting-concepts.rst:39 msgid "``SMALLINT``, ``INTEGER``, ``BIGINT``, ``REAL``, ``FLOAT``" msgstr "``SMALLINT``, ``INTEGER``, ``BIGINT``, ``REAL``, ``FLOAT``" @@ -417,12 +421,12 @@ msgstr "``path``" #: ../../build/doc/pgRouting-concepts.rst:13 msgid "" "Sequence of edge identifiers that form a path that is not allowed to be " -"taken. - Empty arrays or ``NULL`` arrays are ignored. - Arrays that have a " -"``NULL`` element will raise an exception." +"taken. - Empty arrays or ``NULL`` arrays are ignored. - Arrays that have " +"a ``NULL`` element will raise an exception." msgstr "" "Secuencia de identificadores de aristas que forman un camino que no se " -"permite tomar. - Arreglos vacios o ``NULL`` son ignorados. - Arreglos que " -"tienen ``NULL`` arrojan una excepción." +"permite tomar. - Arreglos vacios o ``NULL`` son ignorados. - Arreglos que" +" tienen ``NULL`` arrojan una excepción." #: ../../build/doc/pgRouting-concepts.rst:17 msgid "``Cost``" @@ -447,3 +451,4 @@ msgstr ":ref:`genindex`" #: ../../build/doc/TRSP-family.rst:157 msgid ":ref:`search`" msgstr ":ref:`search`" + diff --git a/locale/es/LC_MESSAGES/VRP-category.po b/locale/es/LC_MESSAGES/VRP-category.po index 2751ae8d89..d9a2473043 100644 --- a/locale/es/LC_MESSAGES/VRP-category.po +++ b/locale/es/LC_MESSAGES/VRP-category.po @@ -339,7 +339,7 @@ msgstr "Descripción" #: ../../build/doc/VRP-category.rst:125 ../../build/doc/VRP-category.rst:146 #, fuzzy msgid "`Orders SQL`_" -msgstr "**orders_sql**" +msgstr "`Orders SQL`_" #: ../../build/doc/VRP-category.rst:126 ../../build/doc/VRP-category.rst:129 #: ../../build/doc/VRP-category.rst:147 ../../build/doc/VRP-category.rst:150 @@ -354,7 +354,7 @@ msgstr "" #: ../../build/doc/VRP-category.rst:128 ../../build/doc/VRP-category.rst:149 #, fuzzy msgid "`Vehicles SQL`_" -msgstr "**vehicles_sql**" +msgstr "`Vehicles SQL`_" #: ../../build/doc/VRP-category.rst:130 ../../build/doc/VRP-category.rst:151 msgid "`Vehicles SQL`_ as described below." @@ -365,8 +365,9 @@ msgid "Used in :doc:`pgr_pickDeliver`" msgstr "" #: ../../build/doc/VRP-category.rst:152 +#, fuzzy msgid "`Matrix SQL`_" -msgstr "`SQL matriz`_" +msgstr "`Matrix SQL`_" #: ../../build/doc/VRP-category.rst:154 msgid "`Matrix SQL`_ as described below." @@ -461,7 +462,7 @@ msgstr "Consultas Internas" #: ../../build/doc/VRP-category.rst:200 #, fuzzy msgid "Orders SQL" -msgstr "**orders_sql**" +msgstr "Orders SQL" #: ../../build/doc/VRP-category.rst:202 #, fuzzy @@ -609,7 +610,7 @@ msgid "" "`Matrix SQL`_." msgstr "" "El identificador de nodo de la recogida debe coincidir con un " -"identificador de nodo en la tabla de matriz." +"identificador de nodo en la `Matrix SQL`_." #: ../../build/doc/VRP-category.rst:267 #, fuzzy @@ -623,7 +624,7 @@ msgid "" "the `Matrix SQL`_." msgstr "" "El identificador de nodo de la entrega debe coincidir con un " -"identificador de nodo en la tabla de matriz." +"identificador de nodo en la `Matrix SQL`_." #: ../../build/doc/VRP-category.rst:278 ../../build/doc/VRP-category.rst:396 msgid "" @@ -670,9 +671,9 @@ msgstr "valor :math:`y` del lugar de entrega" #: ../../build/doc/VRP-category.rst:315 #, fuzzy msgid "Vehicles SQL" -msgstr "**vehicles_sql**" +msgstr "Vehicles SQL" -#: ../../build/doc/VRP-category.rst:317 +#: ../../build/doc/VRP-category.rst:315 #, fuzzy msgid "Common columns for the vehicles SQL in both implementations:" msgstr "" @@ -783,7 +784,7 @@ msgid "" " in the `Matrix SQL`_." msgstr "" "El identificador de nodo de la ubicación inicial debe coincidir con un " -"identificador de nodo en la tabla de la matriz." +"identificador de nodo en la `Matrix SQL`_." #: ../../build/doc/VRP-category.rst:383 #, fuzzy @@ -797,7 +798,7 @@ msgid "" "in the `Matrix SQL`_." msgstr "" "El identificador de nodo de la ubicación final debe coincidir con un " -"identificador de nodo en la tabla de matriz." +"identificador de nodo en la `Matrix SQL`_." #: ../../build/doc/VRP-category.rst:388 msgid "When missing: ``end_node_id`` is used." @@ -850,8 +851,9 @@ msgid "When missing: ``start_y`` is used." msgstr "" #: ../../build/doc/VRP-category.rst:434 +#, fuzzy msgid "Matrix SQL" -msgstr "SQL de matriz" +msgstr "Matrix SQL" #: ../../build/doc/pgRouting-concepts.rst:3 msgid "Set of ``(start_vid, end_vid, agg_cost)``" diff --git a/locale/es/LC_MESSAGES/pgr_trsp.po b/locale/es/LC_MESSAGES/pgr_trsp.po index daa5b698b6..0ade543757 100644 --- a/locale/es/LC_MESSAGES/pgr_trsp.po +++ b/locale/es/LC_MESSAGES/pgr_trsp.po @@ -11,17 +11,16 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-24 12:46-0500\n" +"POT-Creation-Date: 2022-07-11 18:25-0500\n" "PO-Revision-Date: 2022-07-04 15:45+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" -"Language-Team: Spanish \n" "Language: es\n" +"Language-Team: Spanish " +"\n" +"Plural-Forms: nplurals=2; plural=n != 1\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.13\n" "Generated-By: Babel 2.9.1\n" #: ../../build/doc/pgr_trsp.rst:12 @@ -34,12 +33,13 @@ msgid "" "`__ `3.0 " "`__" msgstr "" -"**Versiones soportadas:** `Última `__ (`3.4 `__)" -" `3.3 `__ `3.2 `__ `3.1 `__ `3.0 `__" +"**Versiones soportadas:** `Última " +"`__ (`3.4 " +"`__) `3.3 " +"`__ `3.2 " +"`__ `3.1 " +"`__ `3.0 " +"`__" #: ../../build/doc/pgr_trsp.rst:19 msgid "" @@ -65,187 +65,224 @@ msgstr "" msgid "pgr_trsp - Proposed" msgstr "" -#: ../../build/doc/pgr_trsp.rst:32 +#: ../../build/doc/pgr_trsp.rst:31 msgid "``pgr_trsp`` - routing vertices with restrictions." msgstr "``pgr_trsp`` - Ruteo con restricciones." -#: ../../build/doc/pgr_trsp.rst:35 +#: ../../build/doc/pgr_trsp.rst:36 +msgid "Boost Graph Inside" +msgstr "" + +#: ../../build/doc/proposed.rst:3 +msgid "Proposed functions for next mayor release." +msgstr "Funciones propuestas para la próxima versión mayor." + +#: ../../build/doc/proposed.rst:5 +msgid "They are not officially in the current release." +msgstr "No están oficialmente en la versión actual." + +#: ../../build/doc/proposed.rst:6 +msgid "They will likely officially be part of the next mayor release:" +msgstr "Es probable que oficialmente formen parte del próximo lanzamiento:" + +#: ../../build/doc/proposed.rst:8 +msgid "The functions make use of ANY-INTEGER and ANY-NUMERICAL" +msgstr "Las funciones hacen uso de ENTEROS y FLOTANTES" + +#: ../../build/doc/proposed.rst:9 +msgid "Name might not change. (But still can)" +msgstr "Probablemente el nombre no cambie. (Pero todavía puede)" + +#: ../../build/doc/proposed.rst:10 +msgid "Signature might not change. (But still can)" +msgstr "Es posible que la firma no cambie. (Pero todavía puede)" + +#: ../../build/doc/proposed.rst:11 +msgid "Functionality might not change. (But still can)" +msgstr "Probablemente la funcionalidad no cambie. (Pero todavía puede)" + +#: ../../build/doc/proposed.rst:12 +msgid "pgTap tests have being done. But might need more." +msgstr "Se han hecho pruebas con pgTap. Pero tal vez se necesiten más." + +#: ../../build/doc/proposed.rst:13 +msgid "Documentation might need refinement." +msgstr "Es posible que la documentación necesite un refinamiento." + +#: ../../build/doc/pgr_trsp.rst:43 msgid "Availability" msgstr "Disponibilidad" -#: ../../build/doc/pgr_trsp.rst:36 +#: ../../build/doc/pgr_trsp.rst:44 msgid "Version 3.4.0" msgstr "Versión 3.4.0" -#: ../../build/doc/pgr_trsp.rst:38 -msgid "New **Proposed** signatures" +#: ../../build/doc/pgr_trsp.rst:46 +msgid "New proposed signatures:" msgstr "" -#: ../../build/doc/pgr_trsp.rst:40 +#: ../../build/doc/pgr_trsp.rst:48 msgid "``pgr_trsp`` (`One to One`_)" msgstr "" -#: ../../build/doc/pgr_trsp.rst:41 +#: ../../build/doc/pgr_trsp.rst:49 msgid "``pgr_trsp`` (`One to Many`_)" msgstr "" -#: ../../build/doc/pgr_trsp.rst:42 +#: ../../build/doc/pgr_trsp.rst:50 msgid "``pgr_trsp`` (`Many to One`_)" msgstr "" -#: ../../build/doc/pgr_trsp.rst:43 +#: ../../build/doc/pgr_trsp.rst:51 msgid "``pgr_trsp`` (`Many to Many`_)" msgstr "" -#: ../../build/doc/pgr_trsp.rst:44 +#: ../../build/doc/pgr_trsp.rst:52 msgid "``pgr_trsp`` (`Combinations`_)" msgstr "" -#: ../../build/doc/pgr_trsp.rst:50 -msgid "Deprecated signatures" +#: ../../build/doc/pgr_trsp.rst:54 +msgid "Deprecated signatures:" msgstr "" -#: ../../build/doc/pgr_trsp.rst:47 +#: ../../build/doc/pgr_trsp.rst:56 msgid "``pgr_trsp(text,integer,integer,boolean,boolean,text)``" msgstr "``pgr_trsp(text,integer,integer,boolean,boolean,text)``" -#: ../../build/doc/pgr_trsp.rst:48 +#: ../../build/doc/pgr_trsp.rst:57 msgid "``pgr_trsp(text,integer,float,integer,float,boolean,boolean,text)``" msgstr "" -#: ../../build/doc/pgr_trsp.rst:49 +#: ../../build/doc/pgr_trsp.rst:58 msgid "``pgr_trspViaVertices(text,anyarray,boolean,boolean,text)``" msgstr "" -#: ../../build/doc/pgr_trsp.rst:50 +#: ../../build/doc/pgr_trsp.rst:59 msgid "" "``pgr_trspviaedges(text,integer[],double " "precision[],boolean,boolean,text)``" msgstr "" -#: ../../build/doc/pgr_trsp.rst:52 +#: ../../build/doc/pgr_trsp.rst:61 msgid "Version 2.1.0" msgstr "Versión 2.1.0" -#: ../../build/doc/pgr_trsp.rst:54 -msgid "New *Via* **prototypes**" +#: ../../build/doc/pgr_trsp.rst:63 +#, fuzzy +msgid "New prototypes:" msgstr "Nuevo *Via* **prototypes**" -#: ../../build/doc/pgr_trsp.rst:56 +#: ../../build/doc/pgr_trsp.rst:65 #, fuzzy msgid "``pgr_trspViaVertices``" msgstr "pgr_trspViaVertices" -#: ../../build/doc/pgr_trsp.rst:57 +#: ../../build/doc/pgr_trsp.rst:66 #, fuzzy msgid "``pgr_trspViaEdges``" msgstr "pgr_trspViaEdges" -#: ../../build/doc/pgr_trsp.rst:59 +#: ../../build/doc/pgr_trsp.rst:68 msgid "Version 2.0.0" msgstr "Versión 2.0.0" -#: ../../build/doc/pgr_trsp.rst:61 +#: ../../build/doc/pgr_trsp.rst:70 msgid "**Official** function" msgstr "Función **oficial**" #: ../../build/doc/dijkstra-family.rst:11 #: ../../build/doc/pgRouting-concepts.rst:10 #: ../../build/doc/pgRouting-concepts.rst:11 -#: ../../build/doc/pgRouting-concepts.rst:13 ../../build/doc/pgr_trsp.rst:64 +#: ../../build/doc/pgRouting-concepts.rst:13 ../../build/doc/pgr_trsp.rst:73 msgid "Description" msgstr "Descripción" -#: ../../build/doc/pgr_trsp.rst:66 +#: ../../build/doc/pgr_trsp.rst:75 msgid "" "Turn restricted shortest path (TRSP) is an algorithm that receives turn " "restrictions in form of a query like those found in real world navigable " "road networks." msgstr "" -#: ../../build/doc/pgr_trsp.rst:70 +#: ../../build/doc/pgr_trsp.rst:79 msgid "The main characteristics are:" msgstr "Las principales características son:" -#: ../../build/doc/pgr_trsp.rst:72 -msgid "Automatic detection of ``reverse_cost`` column" -msgstr "" - -#: ../../build/doc/pgr_trsp.rst:73 -msgid "Accepts **ANY-INTEGER** and **ANY-NUMERICAL** on input columns" -msgstr "" - -#: ../../build/doc/pgr_trsp.rst:74 -msgid "All variations give as result the same columns" -msgstr "" - -#: ../../build/doc/pgr_trsp.rst:75 +#: ../../build/doc/pgr_trsp.rst:81 msgid "" "It does no guarantee the shortest path as it might contain restriction " -"paths" +"paths." msgstr "" -#: ../../build/doc/pgr_trsp.rst:77 +#: ../../build/doc/pgr_trsp.rst:83 msgid "The general algorithm is as follows:" msgstr "" -#: ../../build/doc/pgr_trsp.rst:79 -msgid "Execute a Dijkstra" +#: ../../build/doc/pgr_trsp.rst:85 +msgid "Execute a Dijkstra." msgstr "" -#: ../../build/doc/pgr_trsp.rst:80 -msgid "If the solution passes thru a restriction then" +#: ../../build/doc/pgr_trsp.rst:86 +msgid "If the solution passes thru a restriction then." msgstr "" -#: ../../build/doc/pgr_trsp.rst:82 -msgid "Execute the **TRSP** algorithm with restrictions" +#: ../../build/doc/pgr_trsp.rst:88 +msgid "Execute the **TRSP** algorithm with restrictions." msgstr "" -#: ../../build/doc/pgr_trsp.rst:85 +#: ../../build/doc/pgr_trsp.rst:91 msgid "Signatures" msgstr "Firmas" -#: ../../build/doc/pgr_trsp.rst:88 +#: ../../build/doc/pgr_trsp.rst:94 msgid "Proposed" msgstr "Propuesto" -#: ../../build/doc/proposed.rst:3 -msgid "Proposed functions for next mayor release." -msgstr "Funciones propuestas para la próxima versión mayor." - -#: ../../build/doc/proposed.rst:5 -msgid "They are not officially in the current release." -msgstr "No están oficialmente en la versión actual." +#: ../../build/doc/pgr_trsp.rst:95 ../../build/doc/pgr_trsp.rst:113 +#: ../../build/doc/pgr_trsp.rst:133 ../../build/doc/pgr_trsp.rst:154 +#: ../../build/doc/pgr_trsp.rst:176 ../../build/doc/pgr_trsp.rst:198 +msgid "\\ \\" +msgstr "" -#: ../../build/doc/proposed.rst:6 -msgid "They will likely officially be part of the next mayor release:" -msgstr "Es probable que oficialmente formen parte del próximo lanzamiento:" +#: ../../build/doc/pgr_trsp.rst ../../build/doc/pgr_trsp.rst:116 +msgid "" +"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vid**, **end vid**, " +"[directed])" +msgstr "" -#: ../../build/doc/proposed.rst:8 -msgid "The functions make use of ANY-INTEGER and ANY-NUMERICAL" -msgstr "Las funciones hacen uso de ENTEROS y FLOTANTES" +#: ../../build/doc/pgr_trsp.rst +msgid "" +"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vid**, **end vids**, " +"[ directed])" +msgstr "" -#: ../../build/doc/proposed.rst:9 -msgid "Name might not change. (But still can)" -msgstr "Probablemente el nombre no cambie. (Pero todavía puede)" +#: ../../build/doc/pgr_trsp.rst ../../build/doc/pgr_trsp.rst:157 +msgid "" +"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vids**, **end vid**, " +"[directed])" +msgstr "" -#: ../../build/doc/proposed.rst:10 -msgid "Signature might not change. (But still can)" -msgstr "Es posible que la firma no cambie. (Pero todavía puede)" +#: ../../build/doc/pgr_trsp.rst ../../build/doc/pgr_trsp.rst:179 +msgid "" +"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vids**, **end vids**," +" [directed])" +msgstr "" -#: ../../build/doc/proposed.rst:11 -msgid "Functionality might not change. (But still can)" -msgstr "Probablemente la funcionalidad no cambie. (Pero todavía puede)" +#: ../../build/doc/pgr_trsp.rst ../../build/doc/pgr_trsp.rst:201 +msgid "" +"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, `Combinations SQL`_, " +"[directed])" +msgstr "" -#: ../../build/doc/proposed.rst:12 -msgid "pgTap tests have being done. But might need more." -msgstr "Se han hecho pruebas con pgTap. Pero tal vez se necesiten más." +#: ../../build/doc/pgr_trsp.rst +msgid "RETURNS SET OF |generic-result|" +msgstr "" -#: ../../build/doc/proposed.rst:13 -msgid "Documentation might need refinement." -msgstr "Es posible que la documentación necesite un refinamiento." +#: ../../build/doc/pgr_trsp.rst +msgid "OR EMPTY SET" +msgstr "" -#: ../../build/doc/pgr_trsp.rst:112 +#: ../../build/doc/pgr_trsp.rst:111 msgid "One to One" msgstr "Uno a Uno" @@ -254,48 +291,53 @@ msgid "Example" msgstr "Ejemplo" #: ../../build/doc/pgr_trsp.rst:121 -msgid "From vertex :math:`6` to vertex :math:`10` on an **undirected** graph" +msgid "From vertex :math:`6` to vertex :math:`10` on an undirected graph." msgstr "" #: ../../build/doc/pgr_trsp.rst:131 msgid "One to Many" msgstr "Uno a Muchos" -#: ../../build/doc/pgr_trsp.rst:140 +#: ../../build/doc/pgr_trsp.rst:136 msgid "" -"From vertex :math:`6` to vertices :math:`\\{10, 1\\}` on an " -"**undirected** graph" +"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vid**, **end vids**, " +"[directed])" msgstr "" -#: ../../build/doc/pgr_trsp.rst:151 +#: ../../build/doc/pgr_trsp.rst:141 +msgid "" +"From vertex :math:`6` to vertices :math:`\\{10, 1\\}` on an undirected " +"graph." +msgstr "" + +#: ../../build/doc/pgr_trsp.rst:152 msgid "Many to One" msgstr "Muchos a Uno" -#: ../../build/doc/pgr_trsp.rst:160 -msgid "" -"From vertices :math:`\\{6, 1\\}` to vertex :math:`8` on a **directed** " -"graph" +#: ../../build/doc/pgr_trsp.rst:163 +msgid "From vertices :math:`\\{6, 1\\}` to vertex :math:`8` on a directed graph." msgstr "" -#: ../../build/doc/pgr_trsp.rst:171 +#: ../../build/doc/pgr_trsp.rst:174 msgid "Many to Many" msgstr "Muchos a Muchos" -#: ../../build/doc/pgr_trsp.rst:180 +#: ../../build/doc/pgr_trsp.rst:185 msgid "" "From vertices :math:`\\{6, 1\\}` to vertices :math:`\\{10, 8\\}` on an " -"**undirected** graph" +"undirected graph." msgstr "" -#: ../../build/doc/pgr_trsp.rst:191 +#: ../../build/doc/pgr_trsp.rst:196 msgid "Combinations" msgstr "Combinaciones" -#: ../../build/doc/pgr_trsp.rst:200 -msgid "Using a combinations table on an **undirected** graph" +#: ../../build/doc/pgr_trsp.rst:206 +#, fuzzy +msgid "Using a combinations table on an undirected graph." msgstr "Usando una tabla de combinaciones en un grafo **no dirigido**" -#: ../../build/doc/pgr_trsp.rst:208 +#: ../../build/doc/pgr_trsp.rst:214 msgid "Parameters" msgstr "Parámetros" @@ -398,7 +440,7 @@ msgstr "ENTEROS" msgid "``SMALLINT``, ``INTEGER``, ``BIGINT``" msgstr "``SMALLINT``, ``INTEGER``, ``BIGINT``" -#: ../../build/doc/pgr_trsp.rst:216 +#: ../../build/doc/pgr_trsp.rst:222 msgid "Optional parameters" msgstr "Parámetros opcionales" @@ -427,11 +469,11 @@ msgstr "Cuando ``true`` el gráfo se considera `Dirigido`" msgid "When ``false`` the graph is considered as `Undirected`." msgstr "Cuando ``false`` el gráfo se considera `No Dirigido`." -#: ../../build/doc/pgr_trsp.rst:223 +#: ../../build/doc/pgr_trsp.rst:229 msgid "Inner Queries" msgstr "Consultas Internas" -#: ../../build/doc/pgr_trsp.rst:226 +#: ../../build/doc/pgr_trsp.rst:232 msgid "Edges SQL" msgstr "SQL aristas" @@ -493,8 +535,8 @@ msgid "" "When negative: edge (``target``, ``source``) does not exist, therefore " "it's not part of the graph." msgstr "" -"Cuando negativo: la arista (``target``, ``source``) no existe, por lo tanto " -"no es parte del grafo." +"Cuando negativo: la arista (``target``, ``source``) no existe, por lo " +"tanto no es parte del grafo." #: ../../build/doc/pgRouting-concepts.rst msgid "ANY-NUMERICAL" @@ -505,7 +547,7 @@ msgstr "FLOTANTES" msgid "``SMALLINT``, ``INTEGER``, ``BIGINT``, ``REAL``, ``FLOAT``" msgstr "``SMALLINT``, ``INTEGER``, ``BIGINT``, ``REAL``, ``FLOAT``" -#: ../../build/doc/pgr_trsp.rst:233 +#: ../../build/doc/pgr_trsp.rst:239 msgid "Restrictions SQL" msgstr "SQL restricciones" @@ -520,8 +562,8 @@ msgid "" "a ``NULL`` element will raise an exception." msgstr "" "Secuencia de identificadores de aristas que forman un camino que no se " -"permite tomar. - Arreglos vacios o ``NULL`` son ignorados. - Arreglos que " -"tienen ``NULL`` arrojan una excepción." +"permite tomar. - Arreglos vacios o ``NULL`` son ignorados. - Arreglos que" +" tienen ``NULL`` arrojan una excepción." #: ../../build/doc/pgRouting-concepts.rst:17 msgid "``Cost``" @@ -531,7 +573,7 @@ msgstr "``Cost``" msgid "Cost of taking the forbidden path." msgstr "Costo de tomar el camino prohibido." -#: ../../build/doc/pgr_trsp.rst:240 +#: ../../build/doc/pgr_trsp.rst:246 msgid "Combinations SQL" msgstr "SQL Combinaciones" @@ -543,7 +585,7 @@ msgstr "Parámetro" msgid "Identifier of the arrival vertex." msgstr "Identificador del vértice de llegada." -#: ../../build/doc/pgr_trsp.rst:247 +#: ../../build/doc/pgr_trsp.rst:253 msgid "Result Columns" msgstr "Columnas de Resultados" @@ -552,8 +594,8 @@ msgid "" "Returns set of ``(seq, path_id, path_seq, start_vid, end_vid, node, edge," " cost, agg_cost)``" msgstr "" -"Devuelve el conjunto de ``(seq, path_id, path_seq, start_vid, end_vid, node, " -"edge, cost, agg_cost)``" +"Devuelve el conjunto de ``(seq, path_id, path_seq, start_vid, end_vid, " +"node, edge, cost, agg_cost)``" #: ../../build/doc/pgRouting-concepts.rst:14 msgid "``seq``" @@ -580,7 +622,8 @@ msgstr "Identificador del camino." #: ../../build/doc/pgRouting-concepts.rst:21 msgid "Has value **1** for the first of a path from ``start_vid`` to ``end_vid``." msgstr "" -"Tiene valor **1** para el primero de la ruta de ``start_vid`` a ``end_vid``." +"Tiene valor **1** para el primero de la ruta de ``start_vid`` a " +"``end_vid``." #: ../../build/doc/pgRouting-concepts.rst:23 msgid "``path_seq``" @@ -634,8 +677,8 @@ msgid "" "Identifier of the edge used to go from ``node`` to the next node in the " "path sequence. **-1** for the last node of the path." msgstr "" -"Identificador de la arista utilizado para ir del ``node`` al siguiente nodo " -"de la secuencia de ruta. ``-1`` para el último nodo de la ruta." +"Identificador de la arista utilizado para ir del ``node`` al siguiente " +"nodo de la secuencia de ruta. ``-1`` para el último nodo de la ruta." #: ../../build/doc/pgRouting-concepts.rst:41 #: ../../build/doc/pgRouting-concepts.rst:45 @@ -647,8 +690,8 @@ msgid "" "Cost to traverse from ``node`` using ``edge`` to the next node in the " "path sequence." msgstr "" -"Costo para atravesar desde ``node`` usando ``edge`` hasta el siguiente nodo " -"en la secuencia de la ruta." +"Costo para atravesar desde ``node`` usando ``edge`` hasta el siguiente " +"nodo en la secuencia de la ruta." #: ../../build/doc/pgRouting-concepts.rst:44 msgid "``agg_cost``" @@ -658,36 +701,37 @@ msgstr "``agg_cost``" msgid "Aggregate cost from ``start_vid`` to ``node``." msgstr "Costo agregado desde ``start_vid`` hasta ``node``." -#: ../../build/doc/pgr_trsp.rst:256 +#: ../../build/doc/pgr_trsp.rst:262 msgid "See Also" msgstr "Ver también" -#: ../../build/doc/pgr_trsp.rst:258 +#: ../../build/doc/pgr_trsp.rst:264 msgid ":doc:`TRSP-family`" msgstr ":doc:`TRSP-family`" -#: ../../build/doc/pgr_trsp.rst:259 +#: ../../build/doc/pgr_trsp.rst:265 msgid "" "`Deprecated documentation " "`_" msgstr "" -#: ../../build/doc/pgr_trsp.rst:260 +#: ../../build/doc/pgr_trsp.rst:266 msgid ":doc:`migration`" msgstr "" -#: ../../build/doc/pgr_trsp.rst:261 +#: ../../build/doc/pgr_trsp.rst:267 msgid ":doc:`sampledata`" msgstr ":doc:`sampledata`" -#: ../../build/doc/pgr_trsp.rst:264 +#: ../../build/doc/pgr_trsp.rst:270 msgid "Indices and tables" msgstr "Índices y tablas" -#: ../../build/doc/pgr_trsp.rst:265 +#: ../../build/doc/pgr_trsp.rst:271 msgid ":ref:`genindex`" msgstr ":ref:`genindex`" -#: ../../build/doc/pgr_trsp.rst:266 +#: ../../build/doc/pgr_trsp.rst:272 msgid ":ref:`search`" msgstr ":ref:`search`" + diff --git a/locale/es/LC_MESSAGES/pgr_trspVia.po b/locale/es/LC_MESSAGES/pgr_trspVia.po index 7bf38fb727..1e589de594 100644 --- a/locale/es/LC_MESSAGES/pgr_trspVia.po +++ b/locale/es/LC_MESSAGES/pgr_trspVia.po @@ -1,29 +1,29 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) pgRouting Contributors - Version v3.4.0-dev # This file is distributed under the same license as the pgRouting package. -# FIRST AUTHOR , YEAR. +# FIRST AUTHOR , 2022. # msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-25 12:55-0500\n" +"POT-Creation-Date: 2022-07-11 18:25-0500\n" "PO-Revision-Date: 2022-07-06 23:33+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" -"Language-Team: Spanish \n" "Language: es\n" +"Language-Team: Spanish " +"\n" +"Plural-Forms: nplurals=2; plural=n != 1\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.13.1\n" +"Generated-By: Babel 2.9.1\n" #: ../../build/doc/pgr_trspVia.rst:12 msgid "" -"**Supported versions:** `Latest `__ (`3.4 `__)" +"**Supported versions:** `Latest " +"`__ (`3.4 " +"`__)" msgstr "" #: ../../build/doc/pgr_trspVia.rst:17 @@ -32,9 +32,14 @@ msgstr "" #: ../../build/doc/pgr_trspVia.rst:19 msgid "" -"``pgr_trspVia`` Route that goes through a list of vertices with restrictions." +"``pgr_trspVia`` Route that goes through a list of vertices with " +"restrictions." msgstr "" +#: ../../build/doc/pgr_trspVia.rst:24 +msgid "Boost Graph Inside" +msgstr "Adentro: Boost Graph" + #: ../../build/doc/proposed.rst:3 msgid "Proposed functions for next mayor release." msgstr "Funciones propuestas para la próxima versión mayor." @@ -71,10 +76,6 @@ msgstr "Se han hecho pruebas con pgTap. Pero tal vez se necesiten más." msgid "Documentation might need refinement." msgstr "Es posible que la documentación necesite un refinamiento." -#: ../../build/doc/pgr_trspVia.rst:28 -msgid "Boost Graph Inside" -msgstr "Adentro: Boost Graph" - #: ../../build/doc/pgr_trspVia.rst:31 msgid "Availability" msgstr "Disponibilidad" @@ -84,70 +85,98 @@ msgid "Version 3.4.0" msgstr "Versión 3.4.0" #: ../../build/doc/pgr_trspVia.rst:34 -msgid "New **proposed** function ``pgr_trspVia`` (`One Via`_)" +msgid "New proposed function:" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:37 ../../build/doc/TRSP-family.rst:10 -#: ../../build/doc/dijkstra-family.rst:11 ../../build/doc/via-category.rst:11 -#: ../../build/doc/pgRouting-concepts.rst:11 +#: ../../build/doc/pgr_trspVia.rst:36 +msgid "``pgr_trspVia`` (`One Via`_)" +msgstr "" + +#: ../../build/doc/TRSP-family.rst:10 ../../build/doc/dijkstra-family.rst:11 #: ../../build/doc/pgRouting-concepts.rst:10 -#: ../../build/doc/via-category.rst:10 +#: ../../build/doc/pgRouting-concepts.rst:11 ../../build/doc/pgr_trspVia.rst:39 +#: ../../build/doc/via-category.rst:10 ../../build/doc/via-category.rst:11 msgid "Description" msgstr "Descripción" -#: ../../build/doc/pgr_trspVia.rst:39 +#: ../../build/doc/pgr_trspVia.rst:41 msgid "" -"Given a list of vertices and a graph, this function is equivalent to finding " -"the shortest path between :math:`vertex_i` and :math:`vertex_{i+1}` for all :" -"math:`i < size\\_of(via\\;vertices)` trying not to use restricted paths." +"Given a list of vertices and a graph, this function is equivalent to " +"finding the shortest path between :math:`vertex_i` and " +":math:`vertex_{i+1}` for all :math:`i < size\\_of(via\\;vertices)` trying" +" not to use restricted paths." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:43 +#: ../../build/doc/pgr_trspVia.rst:45 msgid "The paths represents the sections of the route." msgstr "Las trayectorias representan los tramos de la ruta." -#: ../../build/doc/pgr_trspVia.rst:45 +#: ../../build/doc/pgr_trspVia.rst:47 msgid "The general algorithm is as follows:" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:47 +#: ../../build/doc/pgr_trspVia.rst:49 msgid "Execute a :doc:`pgr_dijkstraVia`." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:48 +#: ../../build/doc/pgr_trspVia.rst:50 msgid "" -"For the set of sub paths of the solution that pass through a restriction then" +"For the set of sub paths of the solution that pass through a restriction " +"then" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:50 +#: ../../build/doc/pgr_trspVia.rst:52 msgid "Execute the **TRSP** algorithm with restrictions for the paths." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:51 +#: ../../build/doc/pgr_trspVia.rst:53 msgid "**NOTE** when this is done, ``U_turn_on_edge`` flag is ignored." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:55 +#: ../../build/doc/pgr_trspVia.rst:57 msgid "Signatures" msgstr "Firmas" -#: ../../build/doc/pgr_trspVia.rst:61 +#: ../../build/doc/pgr_trspVia.rst:63 msgid "One Via" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:0 +#: ../../build/doc/pgr_trspVia.rst:65 +msgid "\\ \\" +msgstr "" + +#: ../../build/doc/pgr_trspVia.rst:68 +msgid "" +"pgr_trspVia(`Edges SQL`_, `Restrictions SQL`_, **via vertices**, " +"[options])" +msgstr "" + +#: ../../build/doc/pgr_trspVia.rst +msgid "[options]" +msgstr "" + +#: ../../build/doc/pgr_trspVia.rst:70 +msgid "[directed, strict, U_turn_on_edge]" +msgstr "" + +#: ../../build/doc/pgr_trspVia.rst:72 +msgid "RETURNS SET OF |via-result| OR EMPTY SET" +msgstr "" + +#: ../../build/doc/pgr_trspVia.rst msgid "Example" msgstr "Ejemplo" -#: ../../build/doc/pgr_trspVia.rst:71 +#: ../../build/doc/pgr_trspVia.rst:75 +#, fuzzy msgid "" -"Find the route that visits the vertices :math:`\\{ 5, 1, 8\\}` in that order " -"on an **directed** graph." +"Find the route that visits the vertices :math:`\\{ 5, 1, 8\\}` in that " +"order on an directed graph." msgstr "" "Encontrar la ruta que visita los vértices :math:`\\{ 5, 1, 8\\}` en ese " "orden, en un grafo **dirigido**." -#: ../../build/doc/pgr_trspVia.rst:79 +#: ../../build/doc/pgr_trspVia.rst:83 msgid "Parameters" msgstr "Parámetros" @@ -156,7 +185,7 @@ msgid "Parameter" msgstr "Parámetro" #: ../../build/doc/TRSP-family.rst:9 ../../build/doc/dijkstra-family.rst:9 -#: ../../build/doc/via-category.rst:9 ../../build/doc/pgRouting-concepts.rst:9 +#: ../../build/doc/pgRouting-concepts.rst:9 ../../build/doc/via-category.rst:9 msgid "Type" msgstr "Tipo" @@ -192,12 +221,12 @@ msgstr "``ARRAY[`` **ANY-INTEGER** ``]``" msgid "Array of ordered vertices identifiers that are going to be visited." msgstr "Arreglo ordenado de identificadores de vértices que serán visitados." -#: ../../build/doc/TRSP-family.rst:21 ../../build/doc/pgRouting-concepts.rst:36 -#: ../../build/doc/pgRouting-concepts.rst:21 +#: ../../build/doc/TRSP-family.rst:21 ../../build/doc/pgRouting-concepts.rst:21 +#: ../../build/doc/pgRouting-concepts.rst:36 msgid "Where:" msgstr "Donde:" -#: ../../build/doc/TRSP-family.rst:0 ../../build/doc/pgRouting-concepts.rst:0 +#: ../../build/doc/TRSP-family.rst ../../build/doc/pgRouting-concepts.rst msgid "ANY-INTEGER" msgstr "ENTEROS" @@ -205,7 +234,7 @@ msgstr "ENTEROS" msgid "SMALLINT, INTEGER, BIGINT" msgstr "``SMALLINT, INTEGER, BIGINT``" -#: ../../build/doc/pgr_trspVia.rst:86 +#: ../../build/doc/pgr_trspVia.rst:90 msgid "Optional parameters" msgstr "Parámetros opcionales" @@ -214,8 +243,9 @@ msgstr "Parámetros opcionales" msgid "Column" msgstr "Columna" -#: ../../build/doc/dijkstra-family.rst:10 ../../build/doc/via-category.rst:10 +#: ../../build/doc/dijkstra-family.rst:10 #: ../../build/doc/pgRouting-concepts.rst:10 +#: ../../build/doc/via-category.rst:10 msgid "Default" msgstr "x Defecto" @@ -240,7 +270,7 @@ msgstr "Cuando ``true`` el gráfo se considera `Dirigido`" msgid "When ``false`` the graph is considered as `Undirected`." msgstr "Cuando ``false`` el gráfo se considera `No Dirigido`." -#: ../../build/doc/pgr_trspVia.rst:93 +#: ../../build/doc/pgr_trspVia.rst:97 msgid "Via optional parameters" msgstr "Parámetros opcionales Vía" @@ -268,14 +298,13 @@ msgstr "``U_turn_on_edge``" #: ../../build/doc/via-category.rst:20 msgid "When ``true`` departing from a visited vertex will not try to avoid" -msgstr "" -"Cuando ``true`` saliendo desde un vértice visitado no intentara esquivarlo" +msgstr "Cuando ``true`` saliendo desde un vértice visitado no intentara esquivarlo" -#: ../../build/doc/pgr_trspVia.rst:100 +#: ../../build/doc/pgr_trspVia.rst:104 msgid "Inner Queries" msgstr "Consultas Internas" -#: ../../build/doc/pgr_trspVia.rst:103 +#: ../../build/doc/pgr_trspVia.rst:107 msgid "Edges SQL" msgstr "SQL aristas" @@ -314,9 +343,9 @@ msgstr "Identificador del segundo vértice de la arista." msgid "``cost``" msgstr "``cost``" +#: ../../build/doc/pgRouting-concepts.rst:18 #: ../../build/doc/pgRouting-concepts.rst:25 #: ../../build/doc/pgRouting-concepts.rst:29 -#: ../../build/doc/pgRouting-concepts.rst:18 msgid "**ANY-NUMERICAL**" msgstr "**FLOTANTES**" @@ -338,27 +367,27 @@ msgstr "Peso de la arista (``target``, ``source``)" #: ../../build/doc/pgRouting-concepts.rst:33 msgid "" -"When negative: edge (``target``, ``source``) does not exist, therefore it's " -"not part of the graph." +"When negative: edge (``target``, ``source``) does not exist, therefore " +"it's not part of the graph." msgstr "" -"Cuando negativo: la arista (``target``, ``source``) no existe, por lo tanto " -"no es parte del grafo." +"Cuando negativo: la arista (``target``, ``source``) no existe, por lo " +"tanto no es parte del grafo." -#: ../../build/doc/pgRouting-concepts.rst:38 #: ../../build/doc/pgRouting-concepts.rst:23 +#: ../../build/doc/pgRouting-concepts.rst:38 msgid "``SMALLINT``, ``INTEGER``, ``BIGINT``" msgstr "``SMALLINT``, ``INTEGER``, ``BIGINT``" -#: ../../build/doc/pgRouting-concepts.rst:0 +#: ../../build/doc/pgRouting-concepts.rst msgid "ANY-NUMERICAL" msgstr "FLOTANTES" -#: ../../build/doc/pgRouting-concepts.rst:39 #: ../../build/doc/pgRouting-concepts.rst:24 +#: ../../build/doc/pgRouting-concepts.rst:39 msgid "``SMALLINT``, ``INTEGER``, ``BIGINT``, ``REAL``, ``FLOAT``" msgstr "``SMALLINT``, ``INTEGER``, ``BIGINT``, ``REAL``, ``FLOAT``" -#: ../../build/doc/pgr_trspVia.rst:110 +#: ../../build/doc/pgr_trspVia.rst:114 msgid "Restrictions SQL" msgstr "SQL restricciones" @@ -369,12 +398,12 @@ msgstr "``path``" #: ../../build/doc/pgRouting-concepts.rst:13 msgid "" "Sequence of edge identifiers that form a path that is not allowed to be " -"taken. - Empty arrays or ``NULL`` arrays are ignored. - Arrays that have a " -"``NULL`` element will raise an exception." +"taken. - Empty arrays or ``NULL`` arrays are ignored. - Arrays that have " +"a ``NULL`` element will raise an exception." msgstr "" "Secuencia de identificadores de aristas que forman un camino que no se " -"permite tomar. - Arreglos vacios o ``NULL`` son ignorados. - Arreglos que " -"tienen ``NULL`` arrojan una excepción." +"permite tomar. - Arreglos vacios o ``NULL`` son ignorados. - Arreglos que" +" tienen ``NULL`` arrojan una excepción." #: ../../build/doc/pgRouting-concepts.rst:17 msgid "``Cost``" @@ -384,7 +413,7 @@ msgstr "``Cost``" msgid "Cost of taking the forbidden path." msgstr "Costo de tomar el camino prohibido." -#: ../../build/doc/pgr_trspVia.rst:117 +#: ../../build/doc/pgr_trspVia.rst:121 msgid "Result Columns" msgstr "Columnas de Resultados" @@ -415,7 +444,8 @@ msgstr "``path_seq``" #: ../../build/doc/via-category.rst:19 msgid "" -"Relative position in the path. Has value **1** for the beginning of a path." +"Relative position in the path. Has value **1** for the beginning of a " +"path." msgstr "" "Posición relativa en la ruta. Tiene el valor **1** para el inicio de una " "ruta." @@ -455,11 +485,11 @@ msgstr "``edge``" #: ../../build/doc/via-category.rst:32 msgid "" -"Identifier of the edge used to go from ``node`` to the next node in the path " -"sequence." +"Identifier of the edge used to go from ``node`` to the next node in the " +"path sequence." msgstr "" -"Identificador de la arsita utilizada para ir del ``node`` al siguiente nodo " -"de la secuencia de ruta." +"Identificador de la arsita utilizada para ir del ``node`` al siguiente " +"nodo de la secuencia de ruta." #: ../../build/doc/via-category.rst:35 msgid "-1 for the last node of the path." @@ -476,11 +506,11 @@ msgstr "``FLOAT``" #: ../../build/doc/via-category.rst:39 msgid "" -"Cost to traverse from ``node`` using ``edge`` to the next node in the path " -"sequence." +"Cost to traverse from ``node`` using ``edge`` to the next node in the " +"path sequence." msgstr "" -"Costo para atravesar desde ``node`` usando ``edge`` hasta el siguiente nodo " -"en la secuencia de la ruta." +"Costo para atravesar desde ``node`` usando ``edge`` hasta el siguiente " +"nodo en la secuencia de la ruta." #: ../../build/doc/via-category.rst:41 msgid "``agg_cost``" @@ -496,124 +526,128 @@ msgstr "``route_agg_cost``" #: ../../build/doc/via-category.rst:46 msgid "" -"Total cost from ``start_vid`` of ``seq = 1`` to ``end_vid`` of the current " -"``seq``." +"Total cost from ``start_vid`` of ``seq = 1`` to ``end_vid`` of the " +"current ``seq``." msgstr "" -"Costo total desde ``start_vid`` en ``seq = 1`` hasta ``end_vid`` del ``seq`` " -"actual." +"Costo total desde ``start_vid`` en ``seq = 1`` hasta ``end_vid`` del " +"``seq`` actual." -#: ../../build/doc/pgr_trspVia.rst:124 +#: ../../build/doc/pgr_trspVia.rst:128 msgid "Additional Examples" msgstr "Ejemplos Adicionales" -#: ../../build/doc/pgr_trspVia.rst:129 +#: ../../build/doc/pgr_trspVia.rst:133 +#, fuzzy msgid "" -"All this examples are about the route that visits the vertices :math:`\\{5, " -"7, 1, 8, 15\\}` in that order on a **directed** graph." +"All this examples are about the route that visits the vertices " +":math:`\\{5, 7, 1, 8, 15\\}` in that order on a directed graph." msgstr "" -"Todos estos ejemplos son sobre la ruta que visita los vértices :math:`\\{5, " -"7, 1, 8, 15\\}` en ese orden, en un grafo **dirigido**." +"Todos estos ejemplos son sobre la ruta que visita los vértices " +":math:`\\{5, 7, 1, 8, 15\\}` en ese orden, en un grafo **dirigido**." -#: ../../build/doc/pgr_trspVia.rst:133 +#: ../../build/doc/pgr_trspVia.rst:137 msgid "The main query" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:140 +#: ../../build/doc/pgr_trspVia.rst:144 msgid "Aggregate cost of the third path." msgstr "Costo agregado de la tercera ruta." -#: ../../build/doc/pgr_trspVia.rst:147 +#: ../../build/doc/pgr_trspVia.rst:151 msgid "Route's aggregate cost of the route at the end of the third path." msgstr "Costo agregado al final de la tercera ruta." -#: ../../build/doc/pgr_trspVia.rst:154 +#: ../../build/doc/pgr_trspVia.rst:158 msgid "Nodes visited in the route." msgstr "Nodos visitados en la ruta." -#: ../../build/doc/pgr_trspVia.rst:161 +#: ../../build/doc/pgr_trspVia.rst:165 msgid "The aggregate costs of the route when the visited vertices are reached." msgstr "Costo agregado de la ruta al llegar a los vértices visitados." -#: ../../build/doc/pgr_trspVia.rst:168 +#: ../../build/doc/pgr_trspVia.rst:172 msgid "Status of \"passes in front\" or \"visits\" of the nodes." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:175 -msgid "Simulation of how algorithm works" +#: ../../build/doc/pgr_trspVia.rst:179 +#, fuzzy +msgid "Simulation of how algorithm works." msgstr "Sumulación del functionamiento del algoritmo" -#: ../../build/doc/pgr_trspVia.rst:177 +#: ../../build/doc/pgr_trspVia.rst:181 msgid "The algorithm performs a :doc:`pgr_dijkstraVia`" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:183 +#: ../../build/doc/pgr_trspVia.rst:187 msgid "" -"Detects which of the sub paths pass through a restriction in this case is " -"for the ``path_id = 5`` from ``6`` to ``3`` because the path :math:`15 " +"Detects which of the sub paths pass through a restriction in this case is" +" for the ``path_id = 5`` from ``6`` to ``3`` because the path :math:`15 " "\\rightarrow 1` is restricted." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:187 +#: ../../build/doc/pgr_trspVia.rst:191 msgid "Executes the :doc:`pgr_trsp` algorithm for the conflicting paths." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:193 +#: ../../build/doc/pgr_trspVia.rst:197 msgid "" -"From the :doc:`pgr_dijkstraVia` result it removes the conflicting paths and " -"builds the solution with the results of the :doc:`pgr_trsp` algorithm:" +"From the :doc:`pgr_dijkstraVia` result it removes the conflicting paths " +"and builds the solution with the results of the :doc:`pgr_trsp` " +"algorithm:" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:200 +#: ../../build/doc/pgr_trspVia.rst:204 msgid "Getting the same result as ``pgr_trspVia``:" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:0 +#: ../../build/doc/pgr_trspVia.rst msgid "Example 8" msgstr "Ejemplo 8" -#: ../../build/doc/pgr_trspVia.rst:206 +#: ../../build/doc/pgr_trspVia.rst:210 msgid "Sometimes ``U_turn_on_edge`` flag is ignored when is set to ``false``." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:209 +#: ../../build/doc/pgr_trspVia.rst:213 msgid "" -"The first step, doing a :doc:`pgr_dijkstraVia` does consider not making a U " -"turn on the same edge. But the path :math:`16 \\rightarrow 13` (Rows 4 and " -"5) is restricted and the result is using it." +"The first step, doing a :doc:`pgr_dijkstraVia` does consider not making a" +" U turn on the same edge. But the path :math:`16 \\rightarrow 13` (Rows 4" +" and 5) is restricted and the result is using it." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:217 +#: ../../build/doc/pgr_trspVia.rst:221 msgid "" -"When executing the :doc:`pgr_trsp` algorithm for the conflicting path, there " -"is no ``U_turn_on_edge`` flag." +"When executing the :doc:`pgr_trsp` algorithm for the conflicting path, " +"there is no ``U_turn_on_edge`` flag." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:224 +#: ../../build/doc/pgr_trspVia.rst:228 msgid "" "Therefore the result ignores the ``U_turn_on_edge`` flag when set to " "``false``." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:231 +#: ../../build/doc/pgr_trspVia.rst:235 msgid "See Also" msgstr "Ver también" -#: ../../build/doc/pgr_trspVia.rst:233 +#: ../../build/doc/pgr_trspVia.rst:237 msgid ":doc:`via-category`" msgstr ":doc:`via-category`" -#: ../../build/doc/pgr_trspVia.rst:234 +#: ../../build/doc/pgr_trspVia.rst:238 msgid ":doc:`sampledata` network." msgstr ":doc:`sampledata` ." -#: ../../build/doc/pgr_trspVia.rst:237 +#: ../../build/doc/pgr_trspVia.rst:241 msgid "Indices and tables" msgstr "Índices y tablas" -#: ../../build/doc/pgr_trspVia.rst:238 +#: ../../build/doc/pgr_trspVia.rst:242 msgid ":ref:`genindex`" msgstr ":ref:`genindex`" -#: ../../build/doc/pgr_trspVia.rst:239 +#: ../../build/doc/pgr_trspVia.rst:243 msgid ":ref:`search`" msgstr ":ref:`search`" + diff --git a/locale/es/LC_MESSAGES/pgr_trspVia_withPoints.po b/locale/es/LC_MESSAGES/pgr_trspVia_withPoints.po index fec4226103..7e81f877cc 100644 --- a/locale/es/LC_MESSAGES/pgr_trspVia_withPoints.po +++ b/locale/es/LC_MESSAGES/pgr_trspVia_withPoints.po @@ -1,29 +1,30 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) pgRouting Contributors - Version v3.4.0-dev # This file is distributed under the same license as the pgRouting package. -# FIRST AUTHOR , YEAR. +# FIRST AUTHOR , 2022. # msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-25 12:55-0500\n" +"POT-Creation-Date: 2022-07-11 18:25-0500\n" "PO-Revision-Date: 2022-07-04 16:00+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" -"Language-Team: Spanish \n" "Language: es\n" +"Language-Team: Spanish " +"" +"\n" +"Plural-Forms: nplurals=2; plural=n != 1\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.13\n" +"Generated-By: Babel 2.9.1\n" #: ../../build/doc/pgr_trspVia_withPoints.rst:12 msgid "" -"**Supported versions:** `Latest `__ (`3.4 `__)" +"**Supported versions:** `Latest " +"`__ " +"(`3.4 `__)" msgstr "" #: ../../build/doc/pgr_trspVia_withPoints.rst:17 @@ -32,10 +33,14 @@ msgstr "" #: ../../build/doc/pgr_trspVia_withPoints.rst:19 msgid "" -"``pgr_trspVia_withPoints`` - Route that goes through a list of vertices and/" -"or points with restrictions." +"``pgr_trspVia_withPoints`` - Route that goes through a list of vertices " +"and/or points with restrictions." msgstr "" +#: ../../build/doc/pgr_trspVia_withPoints.rst:25 +msgid "Boost Graph Inside" +msgstr "Adentro: Boost Graph" + #: ../../build/doc/proposed.rst:3 msgid "Proposed functions for next mayor release." msgstr "Funciones propuestas para la próxima versión mayor." @@ -72,10 +77,6 @@ msgstr "Se han hecho pruebas con pgTap. Pero tal vez se necesiten más." msgid "Documentation might need refinement." msgstr "Es posible que la documentación necesite un refinamiento." -#: ../../build/doc/pgr_trspVia_withPoints.rst:29 -msgid "Boost Graph Inside" -msgstr "Adentro: Boost Graph" - #: ../../build/doc/pgr_trspVia_withPoints.rst:32 msgid "Availability" msgstr "Disponibilidad" @@ -85,118 +86,145 @@ msgid "Version 3.4.0" msgstr "Versión 3.4.0" #: ../../build/doc/pgr_trspVia_withPoints.rst:35 -msgid "New **proposed** function ``pgr_trspVia_withPoints`` (`One Via`_)" +msgid "New proposed function:" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:38 -#: ../../build/doc/via-category.rst:11 ../../build/doc/dijkstra-family.rst:11 -#: ../../build/doc/pgr_trsp_withPoints.rst:11 -#: ../../build/doc/pgRouting-concepts.rst:11 +#: ../../build/doc/pgr_trspVia_withPoints.rst:37 +msgid "``pgr_trspVia_withPoints`` (`One Via`_)" +msgstr "" + +#: ../../build/doc/dijkstra-family.rst:11 #: ../../build/doc/pgRouting-concepts.rst:10 +#: ../../build/doc/pgRouting-concepts.rst:11 +#: ../../build/doc/pgr_trspVia_withPoints.rst:40 +#: ../../build/doc/pgr_trsp_withPoints.rst:11 +#: ../../build/doc/via-category.rst:10 ../../build/doc/via-category.rst:11 #: ../../build/doc/withPoints-category.rst:11 -#: ../../build/doc/via-category.rst:10 msgid "Description" msgstr "Descripción" -#: ../../build/doc/pgr_trspVia_withPoints.rst:40 +#: ../../build/doc/pgr_trspVia_withPoints.rst:42 msgid "" -"Given a graph, a set of restriction on the graph edges, a set of points on " -"the graphs edges and a list of vertices, this function is equivalent to " -"finding the shortest path between :math:`vertex_i` and :math:`vertex_{i+1}` " -"(where :math:`vertex` can be a vertex or a point on the graph) for all :math:" -"`i < size\\_of(via\\;vertices)` trying not to use restricted paths." +"Given a graph, a set of restriction on the graph edges, a set of points " +"on the graphs edges and a list of vertices, this function is equivalent " +"to finding the shortest path between :math:`vertex_i` and " +":math:`vertex_{i+1}` (where :math:`vertex` can be a vertex or a point on " +"the graph) for all :math:`i < size\\_of(via\\;vertices)` trying not to " +"use restricted paths." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:0 +#: ../../build/doc/pgr_trspVia_withPoints.rst msgid "Route" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:46 +#: ../../build/doc/pgr_trspVia_withPoints.rst:48 msgid "is a sequence of paths" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:0 +#: ../../build/doc/pgr_trspVia_withPoints.rst msgid "Path" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:47 +#: ../../build/doc/pgr_trspVia_withPoints.rst:49 msgid "is a section of the route." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:49 +#: ../../build/doc/pgr_trspVia_withPoints.rst:51 msgid "The general algorithm is as follows:" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:51 +#: ../../build/doc/pgr_trspVia_withPoints.rst:53 msgid "Build the Graph with the new points." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:53 +#: ../../build/doc/pgr_trspVia_withPoints.rst:55 msgid "The points identifiers will be converted to negative values." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:54 +#: ../../build/doc/pgr_trspVia_withPoints.rst:56 msgid "The vertices identifiers will remain positive." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:56 +#: ../../build/doc/pgr_trspVia_withPoints.rst:58 msgid "Execute a :doc:`pgr_withPointsVia`." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:57 -msgid "" -"For the set of paths of the solution that pass through a restriction then" +#: ../../build/doc/pgr_trspVia_withPoints.rst:59 +msgid "For the set of paths of the solution that pass through a restriction then" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:59 +#: ../../build/doc/pgr_trspVia_withPoints.rst:61 msgid "Execute the **TRSP** algorithm with restrictions for the path." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:60 +#: ../../build/doc/pgr_trspVia_withPoints.rst:62 msgid "**NOTE** when this is done, ``U_turn_on_edge`` flag is ignored." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:62 +#: ../../build/doc/pgr_trspVia_withPoints.rst:64 msgid "Do not use negative values on identifiers of the inner queries." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:65 +#: ../../build/doc/pgr_trspVia_withPoints.rst:67 msgid "Signatures" msgstr "Firmas" -#: ../../build/doc/pgr_trspVia_withPoints.rst:71 +#: ../../build/doc/pgr_trspVia_withPoints.rst:73 msgid "One Via" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:0 +#: ../../build/doc/pgr_trspVia_withPoints.rst:75 +msgid "\\ \\" +msgstr "" + +#: ../../build/doc/pgr_trspVia_withPoints.rst:78 +msgid "" +"pgr_trspVia(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, **via " +"vertices**, [options])" +msgstr "" + +#: ../../build/doc/pgr_trspVia_withPoints.rst +msgid "[options]" +msgstr "" + +#: ../../build/doc/pgr_trspVia_withPoints.rst:81 +msgid "[directed, strict, U_turn_on_edge]" +msgstr "" + +#: ../../build/doc/pgr_trspVia_withPoints.rst:83 +msgid "RETURNS SET OF |via-result| OR EMPTY SET" +msgstr "" + +#: ../../build/doc/pgr_trspVia_withPoints.rst msgid "Example" msgstr "Ejemplo" -#: ../../build/doc/pgr_trspVia_withPoints.rst:81 +#: ../../build/doc/pgr_trspVia_withPoints.rst:86 msgid "" "Find the route that visits the vertices :math:`\\{-6, 15, -5\\}` in that " -"order on an **directed** graph." +"order on an directed graph." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:89 +#: ../../build/doc/pgr_trspVia_withPoints.rst:94 msgid "Parameters" msgstr "Parámetros" -#: ../../build/doc/via-category.rst:8 ../../build/doc/pgr_trsp_withPoints.rst:8 +#: ../../build/doc/pgr_trsp_withPoints.rst:8 ../../build/doc/via-category.rst:8 #: ../../build/doc/withPoints-category.rst:8 msgid "Parameter" msgstr "Parámetro" -#: ../../build/doc/via-category.rst:9 ../../build/doc/dijkstra-family.rst:9 -#: ../../build/doc/pgr_trsp_withPoints.rst:9 +#: ../../build/doc/dijkstra-family.rst:9 #: ../../build/doc/pgRouting-concepts.rst:9 +#: ../../build/doc/pgr_trsp_withPoints.rst:9 ../../build/doc/via-category.rst:9 #: ../../build/doc/withPoints-category.rst:9 msgid "Type" msgstr "Tipo" -#: ../../build/doc/via-category.rst:10 ../../build/doc/dijkstra-family.rst:10 -#: ../../build/doc/pgr_trsp_withPoints.rst:10 +#: ../../build/doc/dijkstra-family.rst:10 #: ../../build/doc/pgRouting-concepts.rst:10 +#: ../../build/doc/pgr_trsp_withPoints.rst:10 +#: ../../build/doc/via-category.rst:10 #: ../../build/doc/withPoints-category.rst:10 msgid "Default" msgstr "x Defecto" @@ -221,8 +249,8 @@ msgstr "`SQL puntos`_" msgid "**via vertices**" msgstr "**vía vértices**" -#: ../../build/doc/via-category.rst:21 #: ../../build/doc/pgRouting-concepts.rst:12 +#: ../../build/doc/via-category.rst:21 msgid "``ARRAY[`` **ANY-INTEGER** ``]``" msgstr "``ARRAY[`` **ANY-INTEGER** ``]``" @@ -238,15 +266,15 @@ msgstr "Cuando sea positivo se considera como un identificador de vértice" msgid "When negative it is considered a point identifier" msgstr "Cuando sea negativo se considera como un identificador de punto" -#: ../../build/doc/via-category.rst:28 -#: ../../build/doc/pgRouting-concepts.rst:36 #: ../../build/doc/pgRouting-concepts.rst:21 +#: ../../build/doc/pgRouting-concepts.rst:36 +#: ../../build/doc/via-category.rst:28 #: ../../build/doc/withPoints-category.rst:40 msgid "Where:" msgstr "Donde:" -#: ../../build/doc/via-category.rst:0 ../../build/doc/pgRouting-concepts.rst:0 -#: ../../build/doc/withPoints-category.rst:0 +#: ../../build/doc/pgRouting-concepts.rst ../../build/doc/via-category.rst +#: ../../build/doc/withPoints-category.rst msgid "ANY-INTEGER" msgstr "ENTEROS" @@ -254,8 +282,8 @@ msgstr "ENTEROS" msgid "SMALLINT, INTEGER, BIGINT" msgstr "``SMALLINT, INTEGER, BIGINT``" -#: ../../build/doc/via-category.rst:0 ../../build/doc/pgRouting-concepts.rst:0 -#: ../../build/doc/withPoints-category.rst:0 +#: ../../build/doc/pgRouting-concepts.rst ../../build/doc/via-category.rst +#: ../../build/doc/withPoints-category.rst msgid "ANY-NUMERICAL" msgstr "FLOTANTES" @@ -263,7 +291,7 @@ msgstr "FLOTANTES" msgid "SMALLINT, INTEGER, BIGINT, REAL, FLOAT" msgstr "``SMALLINT``, ``INTEGER``, ``BIGINT``, ``REAL``, ``FLOAT``" -#: ../../build/doc/pgr_trspVia_withPoints.rst:96 +#: ../../build/doc/pgr_trspVia_withPoints.rst:101 msgid "Optional parameters" msgstr "Parámetros opcionales" @@ -276,9 +304,9 @@ msgstr "Columna" msgid "``directed``" msgstr "``directed``" -#: ../../build/doc/dijkstra-family.rst:13 ../../build/doc/via-category.rst:13 -#: ../../build/doc/via-category.rst:18 +#: ../../build/doc/dijkstra-family.rst:13 #: ../../build/doc/pgr_trsp_withPoints.rst:21 +#: ../../build/doc/via-category.rst:13 ../../build/doc/via-category.rst:18 msgid "``BOOLEAN``" msgstr "``BOOLEAN``" @@ -294,7 +322,7 @@ msgstr "Cuando ``true`` el gráfo se considera `Dirigido`" msgid "When ``false`` the graph is considered as `Undirected`." msgstr "Cuando ``false`` el gráfo se considera `No Dirigido`." -#: ../../build/doc/pgr_trspVia_withPoints.rst:103 +#: ../../build/doc/pgr_trspVia_withPoints.rst:108 msgid "Via optional parameters" msgstr "Parámetros opcionales Vía" @@ -302,8 +330,8 @@ msgstr "Parámetros opcionales Vía" msgid "``strict``" msgstr "``strict``" -#: ../../build/doc/via-category.rst:14 #: ../../build/doc/pgr_trsp_withPoints.rst:22 +#: ../../build/doc/via-category.rst:14 msgid "``false``" msgstr "``false``" @@ -323,10 +351,9 @@ msgstr "``U_turn_on_edge``" #: ../../build/doc/via-category.rst:20 msgid "When ``true`` departing from a visited vertex will not try to avoid" -msgstr "" -"Cuando ``true`` saliendo desde un vértice visitado no intentara esquivarlo" +msgstr "Cuando ``true`` saliendo desde un vértice visitado no intentara esquivarlo" -#: ../../build/doc/pgr_trspVia_withPoints.rst:110 +#: ../../build/doc/pgr_trspVia_withPoints.rst:115 msgid "With points optional parameters" msgstr "Parámetros opcionales para Con puntos" @@ -365,21 +392,21 @@ msgstr "``details``" #: ../../build/doc/pgr_trsp_withPoints.rst:23 msgid "When ``true`` the results will include the points that are in the path." -msgstr "" -"Cuando ``true`` los resultados incluyen los puntos que están en el camino." +msgstr "Cuando ``true`` los resultados incluyen los puntos que están en el camino." #: ../../build/doc/pgr_trsp_withPoints.rst:24 msgid "" -"When ``false`` the results will not include the points that are in the path." +"When ``false`` the results will not include the points that are in the " +"path." msgstr "" "Cuando ``false`` los resultados no incluyen los puntos que están en el " "camino." -#: ../../build/doc/pgr_trspVia_withPoints.rst:117 +#: ../../build/doc/pgr_trspVia_withPoints.rst:122 msgid "Inner Queries" msgstr "Consultas Internas" -#: ../../build/doc/pgr_trspVia_withPoints.rst:120 +#: ../../build/doc/pgr_trspVia_withPoints.rst:125 msgid "Edges SQL" msgstr "SQL aristas" @@ -420,9 +447,9 @@ msgstr "Identificador del segundo vértice de la arista." msgid "``cost``" msgstr "``cost``" +#: ../../build/doc/pgRouting-concepts.rst:18 #: ../../build/doc/pgRouting-concepts.rst:25 #: ../../build/doc/pgRouting-concepts.rst:29 -#: ../../build/doc/pgRouting-concepts.rst:18 #: ../../build/doc/withPoints-category.rst:27 msgid "**ANY-NUMERICAL**" msgstr "**FLOTANTES**" @@ -445,25 +472,25 @@ msgstr "Peso de la arista (``target``, ``source``)" #: ../../build/doc/pgRouting-concepts.rst:33 msgid "" -"When negative: edge (``target``, ``source``) does not exist, therefore it's " -"not part of the graph." +"When negative: edge (``target``, ``source``) does not exist, therefore " +"it's not part of the graph." msgstr "" -"Cuando negativo: la arista (``target``, ``source``) no existe, por lo tanto " -"no es parte del grafo." +"Cuando negativo: la arista (``target``, ``source``) no existe, por lo " +"tanto no es parte del grafo." -#: ../../build/doc/pgRouting-concepts.rst:38 #: ../../build/doc/pgRouting-concepts.rst:23 +#: ../../build/doc/pgRouting-concepts.rst:38 #: ../../build/doc/withPoints-category.rst:42 msgid "``SMALLINT``, ``INTEGER``, ``BIGINT``" msgstr "``SMALLINT``, ``INTEGER``, ``BIGINT``" -#: ../../build/doc/pgRouting-concepts.rst:39 #: ../../build/doc/pgRouting-concepts.rst:24 +#: ../../build/doc/pgRouting-concepts.rst:39 #: ../../build/doc/withPoints-category.rst:43 msgid "``SMALLINT``, ``INTEGER``, ``BIGINT``, ``REAL``, ``FLOAT``" msgstr "``SMALLINT``, ``INTEGER``, ``BIGINT``, ``REAL``, ``FLOAT``" -#: ../../build/doc/pgr_trspVia_withPoints.rst:127 +#: ../../build/doc/pgr_trspVia_withPoints.rst:132 msgid "Restrictions SQL" msgstr "SQL restricciones" @@ -474,12 +501,12 @@ msgstr "``path``" #: ../../build/doc/pgRouting-concepts.rst:13 msgid "" "Sequence of edge identifiers that form a path that is not allowed to be " -"taken. - Empty arrays or ``NULL`` arrays are ignored. - Arrays that have a " -"``NULL`` element will raise an exception." +"taken. - Empty arrays or ``NULL`` arrays are ignored. - Arrays that have " +"a ``NULL`` element will raise an exception." msgstr "" "Secuencia de identificadores de aristas que forman un camino que no se " -"permite tomar. - Arreglos vacios o ``NULL`` son ignorados. - Arreglos que " -"tienen ``NULL`` arrojan una excepción." +"permite tomar. - Arreglos vacios o ``NULL`` son ignorados. - Arreglos que" +" tienen ``NULL`` arrojan una excepción." #: ../../build/doc/pgRouting-concepts.rst:17 msgid "``Cost``" @@ -489,7 +516,7 @@ msgstr "``Cost``" msgid "Cost of taking the forbidden path." msgstr "Costo de tomar el camino prohibido." -#: ../../build/doc/pgr_trspVia_withPoints.rst:134 +#: ../../build/doc/pgr_trspVia_withPoints.rst:139 msgid "Points SQL" msgstr "SQL puntos" @@ -506,11 +533,10 @@ msgid "Identifier of the point." msgstr "Identificador del punto." #: ../../build/doc/withPoints-category.rst:17 -msgid "" -"Use with positive value, as internally will be converted to negative value" +msgid "Use with positive value, as internally will be converted to negative value" msgstr "" -"Use con un valor positivo, dado que internamente se convertirá a un valor " -"negativo" +"Use con un valor positivo, dado que internamente se convertirá a un valor" +" negativo" #: ../../build/doc/withPoints-category.rst:19 msgid "If column is present, it can not be NULL." @@ -521,8 +547,8 @@ msgid "" "If column is not present, a sequential negative **value** will be given " "automatically." msgstr "" -"Si columna no esta presente, un **valor** secuencial negativo se otorgará " -"automáticamente." +"Si columna no esta presente, un **valor** secuencial negativo se otorgará" +" automáticamente." #: ../../build/doc/withPoints-category.rst:22 msgid "``edge_id``" @@ -541,8 +567,8 @@ msgid "" "Value in <0,1> that indicates the relative postition from the first end " "point of the edge." msgstr "" -"El valor en <0,1> que indica la posición relativa desde el primer punto de " -"la arista." +"El valor en <0,1> que indica la posición relativa desde el primer punto " +"de la arista." #: ../../build/doc/withPoints-category.rst:31 msgid "``side``" @@ -568,7 +594,7 @@ msgstr "A la izquierda `l`," msgid "In both sides ``b``, ``NULL``" msgstr "En ambos lados ``b``, ``NULL``" -#: ../../build/doc/pgr_trspVia_withPoints.rst:141 +#: ../../build/doc/pgr_trspVia_withPoints.rst:146 msgid "Result Columns" msgstr "Columnas de Resultados" @@ -599,7 +625,8 @@ msgstr "``path_seq``" #: ../../build/doc/via-category.rst:19 msgid "" -"Relative position in the path. Has value **1** for the beginning of a path." +"Relative position in the path. Has value **1** for the beginning of a " +"path." msgstr "" "Posición relativa en la ruta. Tiene el valor **1** para el inicio de una " "ruta." @@ -639,11 +666,11 @@ msgstr "``edge``" #: ../../build/doc/via-category.rst:32 msgid "" -"Identifier of the edge used to go from ``node`` to the next node in the path " -"sequence." +"Identifier of the edge used to go from ``node`` to the next node in the " +"path sequence." msgstr "" -"Identificador de la arsita utilizada para ir del ``node`` al siguiente nodo " -"de la secuencia de ruta." +"Identificador de la arsita utilizada para ir del ``node`` al siguiente " +"nodo de la secuencia de ruta." #: ../../build/doc/via-category.rst:35 msgid "-1 for the last node of the path." @@ -660,11 +687,11 @@ msgstr "``FLOAT``" #: ../../build/doc/via-category.rst:39 msgid "" -"Cost to traverse from ``node`` using ``edge`` to the next node in the path " -"sequence." +"Cost to traverse from ``node`` using ``edge`` to the next node in the " +"path sequence." msgstr "" -"Costo para atravesar desde ``node`` usando ``edge`` hasta el siguiente nodo " -"en la secuencia de la ruta." +"Costo para atravesar desde ``node`` usando ``edge`` hasta el siguiente " +"nodo en la secuencia de la ruta." #: ../../build/doc/via-category.rst:41 msgid "``agg_cost``" @@ -680,170 +707,179 @@ msgstr "``route_agg_cost``" #: ../../build/doc/via-category.rst:46 msgid "" -"Total cost from ``start_vid`` of ``seq = 1`` to ``end_vid`` of the current " -"``seq``." +"Total cost from ``start_vid`` of ``seq = 1`` to ``end_vid`` of the " +"current ``seq``." msgstr "" -"Costo total desde ``start_vid`` en ``seq = 1`` hasta ``end_vid`` del ``seq`` " -"actual." +"Costo total desde ``start_vid`` en ``seq = 1`` hasta ``end_vid`` del " +"``seq`` actual." #: ../../build/doc/via-category.rst:4 msgid "" -"When ``start_vid``, ``end_vid`` and ``node`` columns have negative values, " -"the identifier is for a Point." +"When ``start_vid``, ``end_vid`` and ``node`` columns have negative " +"values, the identifier is for a Point." msgstr "" "Cuando las columnas ``start_vid``, ``end_vid`` y``node`` tengan valores " "negativos, el identificador es para un Punto." -#: ../../build/doc/pgr_trspVia_withPoints.rst:152 +#: ../../build/doc/pgr_trspVia_withPoints.rst:157 msgid "Additional Examples" msgstr "Ejemplos Adicionales" -#: ../../build/doc/pgr_trspVia_withPoints.rst:158 -msgid "Use :doc:`pgr_findCloseEdges` in the `Points SQL`_." +#: ../../build/doc/pgr_trspVia_withPoints.rst:163 +msgid "Use ``pgr_findCloseEdges`` for points on the fly" +msgstr "" + +#: ../../build/doc/pgr_trspVia_withPoints.rst:165 +#, fuzzy +msgid "Using :doc:`pgr_findCloseEdges`:" msgstr "Usa :doc:`pgr_findCloseEdges` en el `SQL puntos`_." -#: ../../build/doc/pgr_trspVia_withPoints.rst:160 +#: ../../build/doc/pgr_trspVia_withPoints.rst:167 msgid "" "Visit from vertex :math:`1` to the two locations on the graph of point " "`(2.9, 1.8)` in order of closeness to the graph." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:167 -msgid "" -"Point :math:`-1` corresponds to the closest edge from point `(2.9,1.8)`." +#: ../../build/doc/pgr_trspVia_withPoints.rst:174 +msgid "Point :math:`-1` corresponds to the closest edge from point `(2.9,1.8)`." msgstr "" -"Punto :math:`-1` corresponde a la arista más cercana al punto `(2.9, 1.8)`." +"Punto :math:`-1` corresponde a la arista más cercana al punto `(2.9, " +"1.8)`." -#: ../../build/doc/pgr_trspVia_withPoints.rst:168 +#: ../../build/doc/pgr_trspVia_withPoints.rst:175 msgid "" -"Point :math:`-2` corresponds to the next close edge from point `(2.9,1.8)`." +"Point :math:`-2` corresponds to the next close edge from point " +"`(2.9,1.8)`." msgstr "" -"Punto :math:`-2` corresponde a la segunda arista más cercana al punto `(2.9, " -"1.8)`." +"Punto :math:`-2` corresponde a la segunda arista más cercana al punto " +"`(2.9, 1.8)`." -#: ../../build/doc/pgr_trspVia_withPoints.rst:169 +#: ../../build/doc/pgr_trspVia_withPoints.rst:176 msgid "" -"Point :math:`-2` is visited on the route to from vertex :math:`1` to Point :" -"math:`-1` (See row where :math:`seq = 4`)." +"Point :math:`-2` is visited on the route to from vertex :math:`1` to " +"Point :math:`-1` (See row where :math:`seq = 4`)." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:173 +#: ../../build/doc/pgr_trspVia_withPoints.rst:180 msgid "Usage variations" msgstr "Variaciones de uso" -#: ../../build/doc/pgr_trspVia_withPoints.rst:175 +#: ../../build/doc/pgr_trspVia_withPoints.rst:182 msgid "" -"All this examples are about the route that visits the vertices :math:`\\{-6, " -"7, -4, 8, -2\\}` in that order on a **directed** graph." +"All this examples are about the route that visits the vertices " +":math:`\\{-6, 7, -4, 8, -2\\}` in that order on a directed graph." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:183 +#: ../../build/doc/pgr_trspVia_withPoints.rst:190 msgid "Aggregate cost of the third path." msgstr "Costo agregado de la tercera ruta." -#: ../../build/doc/pgr_trspVia_withPoints.rst:190 +#: ../../build/doc/pgr_trspVia_withPoints.rst:197 msgid "Route's aggregate cost of the route at the end of the third path." msgstr "Costo agregado al final de la tercera ruta." -#: ../../build/doc/pgr_trspVia_withPoints.rst:197 +#: ../../build/doc/pgr_trspVia_withPoints.rst:204 msgid "Nodes visited in the route." msgstr "Nodos visitados en la ruta." -#: ../../build/doc/pgr_trspVia_withPoints.rst:204 +#: ../../build/doc/pgr_trspVia_withPoints.rst:211 msgid "The aggregate costs of the route when the visited vertices are reached." msgstr "Costo agregado de la ruta al llegar a los vértices visitados." -#: ../../build/doc/pgr_trspVia_withPoints.rst:211 +#: ../../build/doc/pgr_trspVia_withPoints.rst:218 msgid "Status of \"passes in front\" or \"visits\" of the nodes and points." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:218 -msgid "Simulation of how algorithm works" +#: ../../build/doc/pgr_trspVia_withPoints.rst:225 +#, fuzzy +msgid "Simulation of how algorithm works." msgstr "Sumulación del functionamiento del algoritmo" -#: ../../build/doc/pgr_trspVia_withPoints.rst:220 +#: ../../build/doc/pgr_trspVia_withPoints.rst:227 msgid "The algorithm performs a :doc:`pgr_withPointsVia`" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:226 +#: ../../build/doc/pgr_trspVia_withPoints.rst:233 msgid "" -"Detects which of the paths pass through a restriction in this case is for " -"the ``path_id = 1`` from ``-6`` to ``15`` because the path :math:`9 " +"Detects which of the paths pass through a restriction in this case is for" +" the ``path_id = 1`` from ``-6`` to ``15`` because the path :math:`9 " "\\rightarrow 16` is restricted." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:230 -msgid "" -"Executes the :ref:`TRSP-family:TRSP algorithm` for the conflicting paths." +#: ../../build/doc/pgr_trspVia_withPoints.rst:237 +msgid "Executes the :ref:`TRSP-family:TRSP algorithm` for the conflicting paths." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:236 +#: ../../build/doc/pgr_trspVia_withPoints.rst:243 msgid "" -"From the :doc:`pgr_withPointsVia` result it removes the conflicting paths " -"and builds the solution with the results of the :doc:`pgr_trsp` algorithm:" +"From the :doc:`pgr_withPointsVia` result it removes the conflicting paths" +" and builds the solution with the results of the :doc:`pgr_trsp` " +"algorithm:" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:243 +#: ../../build/doc/pgr_trspVia_withPoints.rst:250 msgid "Getting the same result as ``pgr_trspVia_withPoints``:" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:0 +#: ../../build/doc/pgr_trspVia_withPoints.rst msgid "Example 8" msgstr "Ejemplo 8" -#: ../../build/doc/pgr_trspVia_withPoints.rst:249 +#: ../../build/doc/pgr_trspVia_withPoints.rst:256 msgid "Sometimes ``U_turn_on_edge`` flag is ignored when is set to ``false``." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:252 +#: ../../build/doc/pgr_trspVia_withPoints.rst:259 msgid "" -"The first step, doing a :doc:`pgr_withPointsVia` does consider not making a " -"U turn on the same edge. But the path :math:`9 \\rightarrow 16` (Rows 4 and " -"5) is restricted and the result is using it." +"The first step, doing a :doc:`pgr_withPointsVia` does consider not making" +" a U turn on the same edge. But the path :math:`9 \\rightarrow 16` (Rows " +"4 and 5) is restricted and the result is using it." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:260 +#: ../../build/doc/pgr_trspVia_withPoints.rst:267 msgid "" -"When executing the :doc:`pgr_trsp_withPoints` algorithm for the conflicting " -"path, there is no ``U_turn_on_edge`` flag." +"When executing the :doc:`pgr_trsp_withPoints` algorithm for the " +"conflicting path, there is no ``U_turn_on_edge`` flag." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:267 +#: ../../build/doc/pgr_trspVia_withPoints.rst:274 msgid "" "Therefore the result ignores the ``U_turn_on_edge`` flag when set to " "``false``. From the :doc:`pgr_withPointsVia` result it removes the " -"conflicting paths and builds the solution with the results of the :doc:" -"`pgr_trsp` algorithm. In this case a U turn is been done using the same edge." +"conflicting paths and builds the solution with the results of the " +":doc:`pgr_trsp` algorithm. In this case a U turn is been done using the " +"same edge." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:277 +#: ../../build/doc/pgr_trspVia_withPoints.rst:284 msgid "See Also" msgstr "Ver también" -#: ../../build/doc/pgr_trspVia_withPoints.rst:279 +#: ../../build/doc/pgr_trspVia_withPoints.rst:286 msgid ":doc:`TRSP-family`" msgstr ":doc:`TRSP-family`" -#: ../../build/doc/pgr_trspVia_withPoints.rst:280 +#: ../../build/doc/pgr_trspVia_withPoints.rst:287 msgid ":doc:`via-category`" msgstr ":doc:`via-category`" -#: ../../build/doc/pgr_trspVia_withPoints.rst:281 +#: ../../build/doc/pgr_trspVia_withPoints.rst:288 msgid ":doc:`withPoints-category`" msgstr ":doc:`withPoints-category`" -#: ../../build/doc/pgr_trspVia_withPoints.rst:282 +#: ../../build/doc/pgr_trspVia_withPoints.rst:289 msgid ":doc:`sampledata` network." msgstr ":doc:`sampledata` ." -#: ../../build/doc/pgr_trspVia_withPoints.rst:285 +#: ../../build/doc/pgr_trspVia_withPoints.rst:292 msgid "Indices and tables" msgstr "Índices y tablas" -#: ../../build/doc/pgr_trspVia_withPoints.rst:286 +#: ../../build/doc/pgr_trspVia_withPoints.rst:293 msgid ":ref:`genindex`" msgstr ":ref:`genindex`" -#: ../../build/doc/pgr_trspVia_withPoints.rst:287 +#: ../../build/doc/pgr_trspVia_withPoints.rst:294 msgid ":ref:`search`" msgstr ":ref:`search`" + diff --git a/locale/es/LC_MESSAGES/pgr_trsp_withPoints.po b/locale/es/LC_MESSAGES/pgr_trsp_withPoints.po index 31b5924d92..40e92284c7 100644 --- a/locale/es/LC_MESSAGES/pgr_trsp_withPoints.po +++ b/locale/es/LC_MESSAGES/pgr_trsp_withPoints.po @@ -1,29 +1,29 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) pgRouting Contributors - Version v3.4.0-dev # This file is distributed under the same license as the pgRouting package. -# FIRST AUTHOR , YEAR. +# FIRST AUTHOR , 2022. # msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-25 12:55-0500\n" +"POT-Creation-Date: 2022-07-11 18:25-0500\n" "PO-Revision-Date: 2022-07-07 16:25+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" -"Language-Team: Spanish \n" "Language: es\n" +"Language-Team: Spanish " +"\n" +"Plural-Forms: nplurals=2; plural=n != 1\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.13.1\n" +"Generated-By: Babel 2.9.1\n" #: ../../build/doc/pgr_trsp_withPoints.rst:12 msgid "" -"**Supported versions:** `Latest `__ (`3.4 `__)" +"**Supported versions:** `Latest " +"`__ (`3.4 " +"`__)" msgstr "" #: ../../build/doc/pgr_trsp_withPoints.rst:17 @@ -34,6 +34,10 @@ msgstr "" msgid "``pgr_trsp_withPoints`` Routing Vertex/Point with restrictions." msgstr "" +#: ../../build/doc/pgr_trsp_withPoints.rst:24 +msgid "Boost Graph Inside" +msgstr "Adentro: Boost Graph" + #: ../../build/doc/proposed.rst:3 msgid "Proposed functions for next mayor release." msgstr "Funciones propuestas para la próxima versión mayor." @@ -70,10 +74,6 @@ msgstr "Se han hecho pruebas con pgTap. Pero tal vez se necesiten más." msgid "Documentation might need refinement." msgstr "Es posible que la documentación necesite un refinamiento." -#: ../../build/doc/pgr_trsp_withPoints.rst:28 -msgid "Boost Graph Inside" -msgstr "Adentro: Boost Graph" - #: ../../build/doc/pgr_trsp_withPoints.rst:31 msgid "Availability" msgstr "Disponibilidad" @@ -83,7 +83,7 @@ msgid "Version 3.4.0" msgstr "Versión 3.4.0" #: ../../build/doc/pgr_trsp_withPoints.rst:34 -msgid "New **Proposed** signatures" +msgid "New proposed signatures:" msgstr "" #: ../../build/doc/pgr_trsp_withPoints.rst:36 @@ -106,13 +106,13 @@ msgstr "" msgid "``pgr_trsp_withPoints`` (`Combinations`_)" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:43 -#: ../../build/doc/pgRouting-concepts.rst:10 #: ../../build/doc/dijkstra-family.rst:11 -#: ../../build/doc/pgr_trsp_withPoints.rst:221 +#: ../../build/doc/pgRouting-concepts.rst:10 #: ../../build/doc/pgRouting-concepts.rst:11 +#: ../../build/doc/pgRouting-concepts.rst:13 +#: ../../build/doc/pgr_trsp_withPoints.rst:43 +#: ../../build/doc/pgr_trsp_withPoints.rst:230 #: ../../build/doc/withPoints-category.rst:11 -#: ../../build/doc/pgr_trsp_withPoints.rst:282 msgid "Description" msgstr "Descripción" @@ -121,165 +121,245 @@ msgid "" "Modify the graph to include points defined by points_sql. Using Dijkstra " "algorithm, find the shortest path(s)" msgstr "" -"Modificar el grafo para incluir puntos definidos por points_sql. Usando el " -"algoritmo Dijkstra, busar la o las rutas más cortas" +"Modificar el grafo para incluir puntos definidos por points_sql. Usando " +"el algoritmo Dijkstra, busar la o las rutas más cortas" #: ../../build/doc/pgr_trsp_withPoints.rst:48 -msgid "**The main characteristics are:**" +#, fuzzy +msgid "Characteristics:" msgstr "**Las principales características son:**" #: ../../build/doc/pgr_trsp_withPoints.rst:50 -msgid "Process is done only on edges with positive costs." -msgstr "El proceso se realiza sólo en aristas con costos positivos." - -#: ../../build/doc/pgr_trsp_withPoints.rst:51 -msgid "Driving side can not be `b` (**both**)" -msgstr "" - -#: ../../build/doc/pgr_trsp_withPoints.rst:52 msgid "Vertices of the graph are:" msgstr "Los vértices del grafo son:" -#: ../../build/doc/pgr_trsp_withPoints.rst:54 +#: ../../build/doc/pgr_trsp_withPoints.rst:52 msgid "**positive** when it belongs to the `Edges SQL`_" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:55 +#: ../../build/doc/pgr_trsp_withPoints.rst:53 msgid "**negative** when it belongs to the `Points SQL`_" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:57 +#: ../../build/doc/pgr_trsp_withPoints.rst:55 +msgid "Driving side can not be ``b``" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst:56 msgid "Values are returned when there is a path." msgstr "Los valores se devuelven cuando hay una ruta." -#: ../../build/doc/pgr_trsp_withPoints.rst:59 -msgid "" -"When the starting vertex and ending vertex are the same, there is no path." -msgstr "" -"Cuando el vértice inicial y el vértice final son iguales, no hay camino." +#: ../../build/doc/pgr_trsp_withPoints.rst:58 +msgid "When the starting vertex and ending vertex are the same, there is no path." +msgstr "Cuando el vértice inicial y el vértice final son iguales, no hay camino." -#: ../../build/doc/pgr_trsp_withPoints.rst:61 +#: ../../build/doc/pgr_trsp_withPoints.rst:60 msgid "The agg_cost the non included values (v, v) is 0" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:63 +#: ../../build/doc/pgr_trsp_withPoints.rst:62 msgid "" -"When the starting vertex and ending vertex are the different and there is no " -"path:" +"When the starting vertex and ending vertex are the different and there is" +" no path:" msgstr "" "Cuando el vértice de salida y el vértice destino son diferentes y no hay " "ninguna ruta:" -#: ../../build/doc/pgr_trsp_withPoints.rst:66 +#: ../../build/doc/pgr_trsp_withPoints.rst:65 msgid "The agg_cost the non included values (u, v) is ∞" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:68 +#: ../../build/doc/pgr_trsp_withPoints.rst:67 msgid "" "For optimization purposes, any duplicated value in the start_vids or " "end_vids are ignored." msgstr "" -"Para fines de optimización, se omite cualquier valor duplicado en start_vids " -"o end_vids." +"Para fines de optimización, se omite cualquier valor duplicado en " +"start_vids o end_vids." -#: ../../build/doc/pgr_trsp_withPoints.rst:70 -msgid "" -"The returned values are ordered: - start_vid ascending - end_vid ascending" +#: ../../build/doc/pgr_trsp_withPoints.rst:69 +msgid "The returned values are ordered: - start_vid ascending - end_vid ascending" msgstr "" -"Los valores devueltos se ordenan: - start_vid ascendente - end_vid ascendente" +"Los valores devueltos se ordenan: - start_vid ascendente - end_vid " +"ascendente" -#: ../../build/doc/pgr_trsp_withPoints.rst:74 +#: ../../build/doc/pgr_trsp_withPoints.rst:73 msgid "Running time: :math:`O(|start\\_vids|\\times(V \\log V + E))`" msgstr "Tiempo de ejecución: :math:`O(|start\\_vids|\\times(V \\log V + E))`" -#: ../../build/doc/pgr_trsp_withPoints.rst:77 +#: ../../build/doc/pgr_trsp_withPoints.rst:76 msgid "Signatures" msgstr "Firmas" -#: ../../build/doc/pgr_trsp_withPoints.rst:80 +#: ../../build/doc/pgr_trsp_withPoints.rst:79 msgid "Summary" msgstr "Resumen" +#: ../../build/doc/pgr_trsp_withPoints.rst:80 #: ../../build/doc/pgr_trsp_withPoints.rst:100 +#: ../../build/doc/pgr_trsp_withPoints.rst:122 +#: ../../build/doc/pgr_trsp_withPoints.rst:143 +#: ../../build/doc/pgr_trsp_withPoints.rst:164 +#: ../../build/doc/pgr_trsp_withPoints.rst:186 +msgid "\\ \\" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst +msgid "" +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " +"**start vid**, **end vid**, [options])" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst +msgid "" +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " +"**start vid**, **end vids**, [options])" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst +msgid "" +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " +"**start vids**, **end vid**, [options])" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst +msgid "" +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " +"**start vids**, **end vids**, [options])" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst +msgid "" +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Combinations " +"SQL`_, `Points SQL`_, [options])" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst +msgid "[options]" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst:89 +msgid "[directed, driving_side [details]" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst +msgid "RETURNS SET OF |generic-result|" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst +msgid "OR EMPTY SET" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst:98 msgid "One to One" msgstr "Uno a Uno" -#: ../../build/doc/pgr_trsp_withPoints.rst:0 +#: ../../build/doc/pgr_trsp_withPoints.rst:103 +msgid "" +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " +"**start vid**, **end vid**, [directed, driving_side, details])" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst msgid "Example" msgstr "Ejemplo" +# | msgid "" +# | "From point :math:`1` to vertex :math:`3` with details on a **left** " +# | "driving side configuration on a **directed** graph with **details**." #: ../../build/doc/pgr_trsp_withPoints.rst:109 #, fuzzy -#| msgid "" -#| "From point :math:`1` to vertex :math:`3` with details on a **left** " -#| "driving side configuration on a **directed** graph with **details**." msgid "" -"From point :math:`1` to vertex :math:`10` with details on a **left** driving " -"side configuration on a **directed** graph with **details**." +"From point :math:`1` to vertex :math:`10` with details on a left driving " +"side configuration on a directed graph with details." msgstr "" "Desde el punto :math:`1` al vértice :math:`3` con detalles en una " -"configuración de manejo por la **izquierda** en un grafo **dirigido** con " -"**detalles**." +"configuración de manejo por la **izquierda** en un grafo **dirigido** con" +" **detalles**." #: ../../build/doc/pgr_trsp_withPoints.rst:120 msgid "One to Many" msgstr "Uno a Muchos" -#: ../../build/doc/pgr_trsp_withPoints.rst:129 +#: ../../build/doc/pgr_trsp_withPoints.rst:125 +msgid "" +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " +"**start vid**, **end vids** [directed, driving_side, details])" +msgstr "" + +# | msgid "From point :math:`1` to point :math:`3` and vertex :math:`5`." +#: ../../build/doc/pgr_trsp_withPoints.rst:131 #, fuzzy -#| msgid "From point :math:`1` to point :math:`3` and vertex :math:`5`." msgid "From point :math:`1` to point :math:`3` and vertex :math:`7`." msgstr "Desde el punto :math:`1` al punto :math:`3` y vértice :math:`5`." -#: ../../build/doc/pgr_trsp_withPoints.rst:139 +#: ../../build/doc/pgr_trsp_withPoints.rst:141 msgid "Many to One" msgstr "Muchos a Uno" -#: ../../build/doc/pgr_trsp_withPoints.rst:148 +#: ../../build/doc/pgr_trsp_withPoints.rst:146 +msgid "" +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " +"**start vids**, **end vid** [directed, driving_side, details])" +msgstr "" + +# | msgid "From point :math:`1` and vertex :math:`2` to point :math:`3`." +#: ../../build/doc/pgr_trsp_withPoints.rst:152 #, fuzzy -#| msgid "From point :math:`1` and vertex :math:`2` to point :math:`3`." msgid "From point :math:`1` and vertex :math:`6` to point :math:`3`." msgstr "Desde el punto :math:`1` y vértice :math:`2` al punto :math:`3`." -#: ../../build/doc/pgr_trsp_withPoints.rst:158 +#: ../../build/doc/pgr_trsp_withPoints.rst:162 msgid "Many to Many" msgstr "Muchos a Muchos" #: ../../build/doc/pgr_trsp_withPoints.rst:167 +msgid "" +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " +"**start vids**, **end vids** [directed, driving_side, details])" +msgstr "" + +# | msgid "From point :math:`1` to point :math:`3` and vertex :math:`5`." +#: ../../build/doc/pgr_trsp_withPoints.rst:173 #, fuzzy -#| msgid "From point :math:`1` to point :math:`3` and vertex :math:`5`." msgid "" -"From point :math:`1` and vertex :math:`6` to point :math:`3` and vertex :" -"math:`1`." +"From point :math:`1` and vertex :math:`6` to point :math:`3` and vertex " +":math:`1`." msgstr "Desde el punto :math:`1` al punto :math:`3` y vértice :math:`5`." -#: ../../build/doc/pgr_trsp_withPoints.rst:178 +#: ../../build/doc/pgr_trsp_withPoints.rst:184 msgid "Combinations" msgstr "Combinaciones" -#: ../../build/doc/pgr_trsp_withPoints.rst:186 +#: ../../build/doc/pgr_trsp_withPoints.rst:189 +msgid "" +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Combinations " +"SQL`_, `Points SQL`_, [directed, driving_side, details])" +msgstr "" + +# | msgid "From point :math:`1` and vertex :math:`2` to point :math:`3`." +#: ../../build/doc/pgr_trsp_withPoints.rst:195 #, fuzzy -#| msgid "From point :math:`1` and vertex :math:`2` to point :math:`3`." msgid "" "From point :math:`1` to vertex :math:`10` and from vertex :math:`6` to " -"point :math:`3` with **right** side driving configuration." +"point :math:`3` with right side driving configuration." msgstr "Desde el punto :math:`1` y vértice :math:`2` al punto :math:`3`." -#: ../../build/doc/pgr_trsp_withPoints.rst:194 +#: ../../build/doc/pgr_trsp_withPoints.rst:203 msgid "Parameters" msgstr "Parámetros" -#: ../../build/doc/pgRouting-concepts.rst:8 #: ../../build/doc/dijkstra-family.rst:8 -#: ../../build/doc/pgr_trsp_withPoints.rst:280 +#: ../../build/doc/pgRouting-concepts.rst:8 +#: ../../build/doc/pgRouting-concepts.rst:11 msgid "Column" msgstr "Columna" -#: ../../build/doc/pgRouting-concepts.rst:9 #: ../../build/doc/dijkstra-family.rst:9 -#: ../../build/doc/pgr_trsp_withPoints.rst:219 +#: ../../build/doc/pgRouting-concepts.rst:9 +#: ../../build/doc/pgRouting-concepts.rst:12 +#: ../../build/doc/pgr_trsp_withPoints.rst:228 #: ../../build/doc/withPoints-category.rst:9 -#: ../../build/doc/pgr_trsp_withPoints.rst:281 msgid "Type" msgstr "Tipo" @@ -314,20 +394,20 @@ msgstr "`SQL Combinaciones`_ como se describe a abajo" msgid "**start vid**" msgstr "**vid de salida**" -#: ../../build/doc/pgRouting-concepts.rst:21 -#: ../../build/doc/pgRouting-concepts.rst:27 +#: ../../build/doc/pgRouting-concepts.rst:12 #: ../../build/doc/pgRouting-concepts.rst:13 +#: ../../build/doc/pgRouting-concepts.rst:15 #: ../../build/doc/pgRouting-concepts.rst:17 +#: ../../build/doc/pgRouting-concepts.rst:21 +#: ../../build/doc/pgRouting-concepts.rst:27 #: ../../build/doc/withPoints-category.rst:13 #: ../../build/doc/withPoints-category.rst:23 -#: ../../build/doc/pgRouting-concepts.rst:12 -#: ../../build/doc/pgRouting-concepts.rst:15 msgid "**ANY-INTEGER**" msgstr "**ENTEROS**" +#: ../../build/doc/pgRouting-concepts.rst:13 #: ../../build/doc/pgRouting-concepts.rst:22 #: ../../build/doc/pgRouting-concepts.rst:28 -#: ../../build/doc/pgRouting-concepts.rst:13 msgid "Identifier of the departure vertex." msgstr "Identificador del vértice de salida." @@ -335,9 +415,9 @@ msgstr "Identificador del vértice de salida." msgid "**start vids**" msgstr "**vid salidas**" +#: ../../build/doc/pgRouting-concepts.rst:12 #: ../../build/doc/pgRouting-concepts.rst:24 #: ../../build/doc/pgRouting-concepts.rst:30 -#: ../../build/doc/pgRouting-concepts.rst:12 msgid "``ARRAY[`` **ANY-INTEGER** ``]``" msgstr "``ARRAY[`` **ANY-INTEGER** ``]``" @@ -354,34 +434,34 @@ msgstr "**vid destino**" msgid "**end vids**" msgstr "**vids destinos**" +#: ../../build/doc/pgRouting-concepts.rst:18 +#: ../../build/doc/pgRouting-concepts.rst:21 #: ../../build/doc/pgRouting-concepts.rst:33 #: ../../build/doc/pgRouting-concepts.rst:36 -#: ../../build/doc/pgRouting-concepts.rst:21 #: ../../build/doc/withPoints-category.rst:40 -#: ../../build/doc/pgRouting-concepts.rst:18 msgid "Where:" msgstr "Donde:" -#: ../../build/doc/pgRouting-concepts.rst:0 -#: ../../build/doc/withPoints-category.rst:0 +#: ../../build/doc/pgRouting-concepts.rst +#: ../../build/doc/withPoints-category.rst msgid "ANY-INTEGER" msgstr "ENTEROS" +#: ../../build/doc/pgRouting-concepts.rst:20 +#: ../../build/doc/pgRouting-concepts.rst:23 #: ../../build/doc/pgRouting-concepts.rst:35 #: ../../build/doc/pgRouting-concepts.rst:38 -#: ../../build/doc/pgRouting-concepts.rst:23 #: ../../build/doc/withPoints-category.rst:42 -#: ../../build/doc/pgRouting-concepts.rst:20 msgid "``SMALLINT``, ``INTEGER``, ``BIGINT``" msgstr "``SMALLINT``, ``INTEGER``, ``BIGINT``" -#: ../../build/doc/pgr_trsp_withPoints.rst:202 +#: ../../build/doc/pgr_trsp_withPoints.rst:211 msgid "Optional parameters" msgstr "Parámetros opcionales" #: ../../build/doc/dijkstra-family.rst:10 -#: ../../build/doc/pgr_trsp_withPoints.rst:220 #: ../../build/doc/pgRouting-concepts.rst:10 +#: ../../build/doc/pgr_trsp_withPoints.rst:229 #: ../../build/doc/withPoints-category.rst:10 msgid "Default" msgstr "x Defecto" @@ -391,7 +471,7 @@ msgid "``directed``" msgstr "``directed``" #: ../../build/doc/dijkstra-family.rst:13 -#: ../../build/doc/pgr_trsp_withPoints.rst:231 +#: ../../build/doc/pgr_trsp_withPoints.rst:240 msgid "``BOOLEAN``" msgstr "``BOOLEAN``" @@ -407,70 +487,70 @@ msgstr "Cuando ``true`` el gráfo se considera `Dirigido`" msgid "When ``false`` the graph is considered as `Undirected`." msgstr "Cuando ``false`` el gráfo se considera `No Dirigido`." -#: ../../build/doc/pgr_trsp_withPoints.rst:209 +#: ../../build/doc/pgr_trsp_withPoints.rst:218 msgid "With points optional parameters" msgstr "Parámetros opcionales para Con puntos" -#: ../../build/doc/pgr_trsp_withPoints.rst:218 -#: ../../build/doc/withPoints-category.rst:8 #: ../../build/doc/pgRouting-concepts.rst:8 +#: ../../build/doc/pgr_trsp_withPoints.rst:227 +#: ../../build/doc/withPoints-category.rst:8 msgid "Parameter" msgstr "Parámetro" -#: ../../build/doc/pgr_trsp_withPoints.rst:222 +#: ../../build/doc/pgr_trsp_withPoints.rst:231 msgid "``driving_side``" msgstr "**Lado de manejo**" -#: ../../build/doc/pgr_trsp_withPoints.rst:223 +#: ../../build/doc/pgr_trsp_withPoints.rst:232 #: ../../build/doc/withPoints-category.rst:32 msgid "``CHAR``" msgstr "``CHAR``" -#: ../../build/doc/pgr_trsp_withPoints.rst:224 +#: ../../build/doc/pgr_trsp_withPoints.rst:233 msgid "``r``" msgstr "``r``" -#: ../../build/doc/pgr_trsp_withPoints.rst:225 +#: ../../build/doc/pgr_trsp_withPoints.rst:234 msgid "Value in [``r``, ``l``] indicating if the driving side is:" msgstr "Valor en [``r``, ``l``] indicando si el lado de manejo es:" -#: ../../build/doc/pgr_trsp_withPoints.rst:227 +#: ../../build/doc/pgr_trsp_withPoints.rst:236 msgid "``r`` for right driving side" msgstr "``r`` para el manejo del lado derecho" -#: ../../build/doc/pgr_trsp_withPoints.rst:228 +#: ../../build/doc/pgr_trsp_withPoints.rst:237 msgid "``l`` for left driving side" msgstr "``l`` para el manejo del lado izquierdo" -#: ../../build/doc/pgr_trsp_withPoints.rst:229 +#: ../../build/doc/pgr_trsp_withPoints.rst:238 msgid "Any other value will be considered as ``r``" msgstr "Cualquier otro valor se considera como ``r``" -#: ../../build/doc/pgr_trsp_withPoints.rst:230 +#: ../../build/doc/pgr_trsp_withPoints.rst:239 msgid "``details``" msgstr "``details``" -#: ../../build/doc/pgr_trsp_withPoints.rst:232 +#: ../../build/doc/pgr_trsp_withPoints.rst:241 msgid "``false``" msgstr "``false``" -#: ../../build/doc/pgr_trsp_withPoints.rst:233 +#: ../../build/doc/pgr_trsp_withPoints.rst:242 msgid "When ``true`` the results will include the points that are in the path." -msgstr "" -"Cuando ``true`` los resultados incluyen los puntos que están en el camino." +msgstr "Cuando ``true`` los resultados incluyen los puntos que están en el camino." -#: ../../build/doc/pgr_trsp_withPoints.rst:234 +#: ../../build/doc/pgr_trsp_withPoints.rst:243 msgid "" -"When ``false`` the results will not include the points that are in the path." +"When ``false`` the results will not include the points that are in the " +"path." msgstr "" "Cuando ``false`` los resultados no incluyen los puntos que están en el " "camino." -#: ../../build/doc/pgr_trsp_withPoints.rst:242 +#: ../../build/doc/pgr_trsp_withPoints.rst:249 msgid "Inner Queries" msgstr "Consultas Internas" -#: ../../build/doc/pgr_trsp_withPoints.rst:245 +#: ../../build/doc/pgr_trsp_withPoints.rst:252 msgid "Edges SQL" msgstr "SQL aristas" @@ -482,8 +562,8 @@ msgstr "``id``" msgid "Identifier of the edge." msgstr "Identificador de la arista." -#: ../../build/doc/pgRouting-concepts.rst:16 #: ../../build/doc/pgRouting-concepts.rst:11 +#: ../../build/doc/pgRouting-concepts.rst:16 msgid "``source``" msgstr "``source``" @@ -491,8 +571,8 @@ msgstr "``source``" msgid "Identifier of the first end point vertex of the edge." msgstr "Identificador del primer vértice de la arista." -#: ../../build/doc/pgRouting-concepts.rst:20 #: ../../build/doc/pgRouting-concepts.rst:14 +#: ../../build/doc/pgRouting-concepts.rst:20 msgid "``target``" msgstr "``target``" @@ -501,13 +581,13 @@ msgid "Identifier of the second end point vertex of the edge." msgstr "Identificador del segundo vértice de la arista." #: ../../build/doc/pgRouting-concepts.rst:24 -#: ../../build/doc/pgr_trsp_withPoints.rst:305 +#: ../../build/doc/pgRouting-concepts.rst:40 msgid "``cost``" msgstr "``cost``" +#: ../../build/doc/pgRouting-concepts.rst:18 #: ../../build/doc/pgRouting-concepts.rst:25 #: ../../build/doc/pgRouting-concepts.rst:29 -#: ../../build/doc/pgRouting-concepts.rst:18 #: ../../build/doc/withPoints-category.rst:27 msgid "**ANY-NUMERICAL**" msgstr "**FLOTANTES**" @@ -530,24 +610,24 @@ msgstr "Peso de la arista (``target``, ``source``)" #: ../../build/doc/pgRouting-concepts.rst:33 msgid "" -"When negative: edge (``target``, ``source``) does not exist, therefore it's " -"not part of the graph." +"When negative: edge (``target``, ``source``) does not exist, therefore " +"it's not part of the graph." msgstr "" -"Cuando negativo: la arista (``target``, ``source``) no existe, por lo tanto " -"no es parte del grafo." +"Cuando negativo: la arista (``target``, ``source``) no existe, por lo " +"tanto no es parte del grafo." -#: ../../build/doc/pgRouting-concepts.rst:0 -#: ../../build/doc/withPoints-category.rst:0 +#: ../../build/doc/pgRouting-concepts.rst +#: ../../build/doc/withPoints-category.rst msgid "ANY-NUMERICAL" msgstr "FLOTANTES" -#: ../../build/doc/pgRouting-concepts.rst:39 #: ../../build/doc/pgRouting-concepts.rst:24 +#: ../../build/doc/pgRouting-concepts.rst:39 #: ../../build/doc/withPoints-category.rst:43 msgid "``SMALLINT``, ``INTEGER``, ``BIGINT``, ``REAL``, ``FLOAT``" msgstr "``SMALLINT``, ``INTEGER``, ``BIGINT``, ``REAL``, ``FLOAT``" -#: ../../build/doc/pgr_trsp_withPoints.rst:252 +#: ../../build/doc/pgr_trsp_withPoints.rst:259 msgid "Restrictions SQL" msgstr "SQL restricciones" @@ -558,12 +638,12 @@ msgstr "``path``" #: ../../build/doc/pgRouting-concepts.rst:13 msgid "" "Sequence of edge identifiers that form a path that is not allowed to be " -"taken. - Empty arrays or ``NULL`` arrays are ignored. - Arrays that have a " -"``NULL`` element will raise an exception." +"taken. - Empty arrays or ``NULL`` arrays are ignored. - Arrays that have " +"a ``NULL`` element will raise an exception." msgstr "" "Secuencia de identificadores de aristas que forman un camino que no se " -"permite tomar. - Arreglos vacios o ``NULL`` son ignorados. - Arreglos que " -"tienen ``NULL`` arrojan una excepción." +"permite tomar. - Arreglos vacios o ``NULL`` son ignorados. - Arreglos que" +" tienen ``NULL`` arrojan una excepción." #: ../../build/doc/pgRouting-concepts.rst:17 msgid "``Cost``" @@ -573,7 +653,7 @@ msgstr "``Cost``" msgid "Cost of taking the forbidden path." msgstr "Costo de tomar el camino prohibido." -#: ../../build/doc/pgr_trsp_withPoints.rst:259 +#: ../../build/doc/pgr_trsp_withPoints.rst:266 msgid "Points SQL" msgstr "SQL puntos" @@ -590,11 +670,10 @@ msgid "Identifier of the point." msgstr "Identificador del punto." #: ../../build/doc/withPoints-category.rst:17 -msgid "" -"Use with positive value, as internally will be converted to negative value" +msgid "Use with positive value, as internally will be converted to negative value" msgstr "" -"Use con un valor positivo, dado que internamente se convertirá a un valor " -"negativo" +"Use con un valor positivo, dado que internamente se convertirá a un valor" +" negativo" #: ../../build/doc/withPoints-category.rst:19 msgid "If column is present, it can not be NULL." @@ -605,8 +684,8 @@ msgid "" "If column is not present, a sequential negative **value** will be given " "automatically." msgstr "" -"Si columna no esta presente, un **valor** secuencial negativo se otorgará " -"automáticamente." +"Si columna no esta presente, un **valor** secuencial negativo se otorgará" +" automáticamente." #: ../../build/doc/withPoints-category.rst:22 msgid "``edge_id``" @@ -625,8 +704,8 @@ msgid "" "Value in <0,1> that indicates the relative postition from the first end " "point of the edge." msgstr "" -"El valor en <0,1> que indica la posición relativa desde el primer punto de " -"la arista." +"El valor en <0,1> que indica la posición relativa desde el primer punto " +"de la arista." #: ../../build/doc/withPoints-category.rst:31 msgid "``side``" @@ -652,7 +731,7 @@ msgstr "A la izquierda `l`," msgid "In both sides ``b``, ``NULL``" msgstr "En ambos lados ``b``, ``NULL``" -#: ../../build/doc/pgr_trsp_withPoints.rst:266 +#: ../../build/doc/pgr_trsp_withPoints.rst:273 msgid "Combinations SQL" msgstr "SQL Combinaciones" @@ -660,190 +739,212 @@ msgstr "SQL Combinaciones" msgid "Identifier of the arrival vertex." msgstr "Identificador del vértice de llegada." -#: ../../build/doc/pgr_trsp_withPoints.rst:273 +#: ../../build/doc/pgr_trsp_withPoints.rst:280 msgid "Result Columns" msgstr "Columnas de Resultados" -#: ../../build/doc/pgr_trsp_withPoints.rst:283 +#: ../../build/doc/pgRouting-concepts.rst:3 +msgid "" +"Returns set of ``(seq, path_id, path_seq, start_vid, end_vid, node, edge," +" cost, agg_cost)``" +msgstr "" + +#: ../../build/doc/pgRouting-concepts.rst:14 msgid "``seq``" msgstr "``seq``" -#: ../../build/doc/pgr_trsp_withPoints.rst:284 -#: ../../build/doc/pgr_trsp_withPoints.rst:287 +#: ../../build/doc/pgRouting-concepts.rst:15 +#: ../../build/doc/pgRouting-concepts.rst:18 +#: ../../build/doc/pgRouting-concepts.rst:24 msgid "``INTEGER``" msgstr "``INTEGER``" -#: ../../build/doc/pgr_trsp_withPoints.rst:285 +#: ../../build/doc/pgRouting-concepts.rst:16 msgid "Sequential value starting from **1**." msgstr "Valor secuencial a partir de **1**." -#: ../../build/doc/pgr_trsp_withPoints.rst:286 +#: ../../build/doc/pgRouting-concepts.rst:17 +#, fuzzy +msgid "``path_id``" +msgstr "``path``" + +#: ../../build/doc/pgRouting-concepts.rst:19 +msgid "Path identifier." +msgstr "" + +#: ../../build/doc/pgRouting-concepts.rst:21 +#, fuzzy +msgid "Has value **1** for the first of a path from ``start_vid`` to ``end_vid``." +msgstr "Identificador del nodo en la ruta de ``start_vid`` a ``end_vid``." + +#: ../../build/doc/pgRouting-concepts.rst:23 msgid "``path_seq``" msgstr "``path_seq``" -#: ../../build/doc/pgr_trsp_withPoints.rst:288 +#: ../../build/doc/pgRouting-concepts.rst:25 msgid "" -"Relative position in the path. Has value **1** for the beginning of a path." +"Relative position in the path. Has value **1** for the beginning of a " +"path." msgstr "" "Posición relativa en la ruta. Tiene el valor **1** para el inicio de una " "ruta." -#: ../../build/doc/pgr_trsp_withPoints.rst:290 +#: ../../build/doc/pgRouting-concepts.rst:27 msgid "``start_vid``" msgstr "``start_vid``" -#: ../../build/doc/pgr_trsp_withPoints.rst:291 -#: ../../build/doc/pgr_trsp_withPoints.rst:294 -#: ../../build/doc/pgr_trsp_withPoints.rst:297 -#: ../../build/doc/pgr_trsp_withPoints.rst:300 +#: ../../build/doc/pgRouting-concepts.rst:28 +#: ../../build/doc/pgRouting-concepts.rst:31 +#: ../../build/doc/pgRouting-concepts.rst:34 +#: ../../build/doc/pgRouting-concepts.rst:37 msgid "``BIGINT``" msgstr "``BIGINT``" -#: ../../build/doc/pgr_trsp_withPoints.rst:292 -msgid "Identifier of the starting vertex of the path." -msgstr "Identificador del vértice inicial de la ruta." +#: ../../build/doc/pgRouting-concepts.rst:29 +#, fuzzy +msgid "Identifier of the starting vertex." +msgstr "Identificador del vértice de llegada." -#: ../../build/doc/pgr_trsp_withPoints.rst:293 +#: ../../build/doc/pgRouting-concepts.rst:30 msgid "``end_vid``" msgstr "``end_vid``" -#: ../../build/doc/pgr_trsp_withPoints.rst:295 -msgid "Identifier of the ending vertex of the path." +#: ../../build/doc/pgRouting-concepts.rst:32 +#, fuzzy +msgid "Identifier of the ending vertex." msgstr "Identificador del vértice final de la ruta." -#: ../../build/doc/pgr_trsp_withPoints.rst:296 +#: ../../build/doc/pgRouting-concepts.rst:33 msgid "``node``" msgstr "``node``" -#: ../../build/doc/pgr_trsp_withPoints.rst:298 +#: ../../build/doc/pgRouting-concepts.rst:35 msgid "Identifier of the node in the path from ``start_vid`` to ``end_vid``." msgstr "Identificador del nodo en la ruta de ``start_vid`` a ``end_vid``." -#: ../../build/doc/pgr_trsp_withPoints.rst:299 +#: ../../build/doc/pgRouting-concepts.rst:36 msgid "``edge``" msgstr "``edge``" -#: ../../build/doc/pgr_trsp_withPoints.rst:301 +#: ../../build/doc/pgRouting-concepts.rst:38 +#, fuzzy msgid "" -"Identifier of the edge used to go from ``node`` to the next node in the path " -"sequence." +"Identifier of the edge used to go from ``node`` to the next node in the " +"path sequence. **-1** for the last node of the path." msgstr "" -"Identificador de la arsita utilizada para ir del ``node`` al siguiente nodo " -"de la secuencia de ruta." +"Identificador de la arsita utilizada para ir del ``node`` al siguiente " +"nodo de la secuencia de ruta." -#: ../../build/doc/pgr_trsp_withPoints.rst:304 -msgid "-1 for the last node of the path." -msgstr "-1 para el último nodo de la ruta." - -#: ../../build/doc/pgr_trsp_withPoints.rst:306 -#: ../../build/doc/pgr_trsp_withPoints.rst:312 +#: ../../build/doc/pgRouting-concepts.rst:41 +#: ../../build/doc/pgRouting-concepts.rst:45 msgid "``FLOAT``" msgstr "``FLOAT``" -#: ../../build/doc/pgr_trsp_withPoints.rst:307 +#: ../../build/doc/pgRouting-concepts.rst:42 msgid "" -"Cost to traverse from ``node`` using ``edge`` to the next node in the path " -"sequence." -msgstr "" -"Costo para atravesar desde ``node`` usando ``edge`` hasta el siguiente nodo " -"en la secuencia de la ruta." - -#: ../../build/doc/pgr_trsp_withPoints.rst:310 -msgid "``0`` for the last row in the path sequence." +"Cost to traverse from ``node`` using ``edge`` to the next node in the " +"path sequence." msgstr "" +"Costo para atravesar desde ``node`` usando ``edge`` hasta el siguiente " +"nodo en la secuencia de la ruta." -#: ../../build/doc/pgr_trsp_withPoints.rst:311 +#: ../../build/doc/pgRouting-concepts.rst:44 msgid "``agg_cost``" msgstr "``agg_cost``" -#: ../../build/doc/pgr_trsp_withPoints.rst:313 +#: ../../build/doc/pgRouting-concepts.rst:46 msgid "Aggregate cost from ``start_vid`` to ``node``." msgstr "Costo agregado desde ``start_vid`` hasta ``node``." -#: ../../build/doc/pgr_trsp_withPoints.rst:315 -msgid "``0`` for the first row in the path sequence." -msgstr "" - -#: ../../build/doc/pgr_trsp_withPoints.rst:320 +#: ../../build/doc/pgr_trsp_withPoints.rst:287 msgid "Additional Examples" msgstr "Ejemplos Adicionales" -#: ../../build/doc/pgr_trsp_withPoints.rst:326 -msgid "Use :doc:`pgr_findCloseEdges` in the `Points SQL`_." +#: ../../build/doc/pgr_trsp_withPoints.rst:293 +msgid "Use ``pgr_findCloseEdges`` for points on the fly" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst:295 +#, fuzzy +msgid "Using :doc:`pgr_findCloseEdges`:" msgstr "Usa :doc:`pgr_findCloseEdges` en el `SQL puntos`_." -#: ../../build/doc/pgr_trsp_withPoints.rst:328 +#: ../../build/doc/pgr_trsp_withPoints.rst:297 msgid "" -"Find the routes from vertex :math:`1` to the two closest locations on the " -"graph of point `(2.9, 1.8)`." +"Find the routes from vertex :math:`1` to the two closest locations on the" +" graph of point `(2.9, 1.8)`." msgstr "" "Wncontrar las rutas desde el vértice :math:`1` a las dos ubicaciones más " "cercanas en el grafo al punto`(2.9, 1.8)`." -#: ../../build/doc/pgr_trsp_withPoints.rst:335 -msgid "" -"Point :math:`-1` corresponds to the closest edge from point `(2.9,1.8)`." +#: ../../build/doc/pgr_trsp_withPoints.rst:304 +#, fuzzy +msgid "Point :math:`-1` corresponds to the closest edge from point `(2.9, 1.8)`." msgstr "" -"Punto :math:`-1` corresponde a la arista más cercana al punto `(2.9, 1.8)`." +"Punto :math:`-1` corresponde a la arista más cercana al punto `(2.9, " +"1.8)`." -#: ../../build/doc/pgr_trsp_withPoints.rst:336 +#: ../../build/doc/pgr_trsp_withPoints.rst:305 +#, fuzzy msgid "" -"Point :math:`-2` corresponds to the next close edge from point `(2.9,1.8)`." -msgstr "" -"Punto :math:`-2` corresponde a la segunda arista más cercana al punto `(2.9, " +"Point :math:`-2` corresponds to the next close edge from point `(2.9, " "1.8)`." +msgstr "" +"Punto :math:`-2` corresponde a la segunda arista más cercana al punto " +"`(2.9, 1.8)`." -#: ../../build/doc/pgr_trsp_withPoints.rst:339 -msgid "Pass in front or visits" +#: ../../build/doc/pgr_trsp_withPoints.rst:308 +msgid "Pass in front or visits." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:341 +#: ../../build/doc/pgr_trsp_withPoints.rst:310 msgid "" -"Which path (if any) passes in front of point :math:`6` or vertex :math:`11` " -"with **right** side driving topology." +"Which path (if any) passes in front of point :math:`6` or vertex " +":math:`11` with right side driving topology." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:349 -msgid "Show details on undirected graph" +#: ../../build/doc/pgr_trsp_withPoints.rst:318 +msgid "Show details on undirected graph." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:351 +# | msgid "" +# | "From point :math:`1` to vertex :math:`3` with details on a **left** " +# | "driving side configuration on a **directed** graph with **details**." +#: ../../build/doc/pgr_trsp_withPoints.rst:320 #, fuzzy -#| msgid "" -#| "From point :math:`1` to vertex :math:`3` with details on a **left** " -#| "driving side configuration on a **directed** graph with **details**." msgid "" -"From point :math:`1` and vertex :math:`6` to point :math:`3` to vertex :math:" -"`1` on an **undirected** graph, with details." +"From point :math:`1` and vertex :math:`6` to point :math:`3` to vertex " +":math:`1` on an undirected graph, with details." msgstr "" "Desde el punto :math:`1` al vértice :math:`3` con detalles en una " -"configuración de manejo por la **izquierda** en un grafo **dirigido** con " -"**detalles**." +"configuración de manejo por la **izquierda** en un grafo **dirigido** con" +" **detalles**." -#: ../../build/doc/pgr_trsp_withPoints.rst:359 +#: ../../build/doc/pgr_trsp_withPoints.rst:328 msgid "See Also" msgstr "Ver también" -#: ../../build/doc/pgr_trsp_withPoints.rst:361 +#: ../../build/doc/pgr_trsp_withPoints.rst:330 msgid ":doc:`TRSP-family`" msgstr ":doc:`TRSP-family`" -#: ../../build/doc/pgr_trsp_withPoints.rst:362 +#: ../../build/doc/pgr_trsp_withPoints.rst:331 msgid ":doc:`withPoints-category`" msgstr ":doc:`withPoints-category`" -#: ../../build/doc/pgr_trsp_withPoints.rst:363 +#: ../../build/doc/pgr_trsp_withPoints.rst:332 msgid ":doc:`sampledata`" msgstr ":doc:`sampledata`" -#: ../../build/doc/pgr_trsp_withPoints.rst:366 +#: ../../build/doc/pgr_trsp_withPoints.rst:335 msgid "Indices and tables" msgstr "Índices y tablas" -#: ../../build/doc/pgr_trsp_withPoints.rst:367 +#: ../../build/doc/pgr_trsp_withPoints.rst:336 msgid ":ref:`genindex`" msgstr ":ref:`genindex`" -#: ../../build/doc/pgr_trsp_withPoints.rst:368 +#: ../../build/doc/pgr_trsp_withPoints.rst:337 msgid ":ref:`search`" msgstr ":ref:`search`" + diff --git a/locale/es/LC_MESSAGES/pgr_turnRestrictedPath.po b/locale/es/LC_MESSAGES/pgr_turnRestrictedPath.po index 584cebccdc..0ed8fb5c3e 100644 --- a/locale/es/LC_MESSAGES/pgr_turnRestrictedPath.po +++ b/locale/es/LC_MESSAGES/pgr_turnRestrictedPath.po @@ -11,17 +11,17 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-24 12:46-0500\n" +"POT-Creation-Date: 2022-07-11 18:25-0500\n" "PO-Revision-Date: 2022-07-04 15:45+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" -"Language-Team: Spanish \n" "Language: es\n" +"Language-Team: Spanish " +"" +"\n" +"Plural-Forms: nplurals=2; plural=n != 1\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.13\n" "Generated-By: Babel 2.9.1\n" #: ../../build/doc/pgr_turnRestrictedPath.rst:12 @@ -34,13 +34,13 @@ msgid "" "`3.1 `__ " "`3.0 `__" msgstr "" -"***Versiones soportadas:** `Última `__ (`3.4 `__) `3.3 `__ `3.2 `__ `3.1 `__ `3.0 `__" +"***Versiones soportadas:** `Última " +"`__ " +"(`3.4 `__)" +" `3.3 `__ " +"`3.2 `__ " +"`3.1 `__ " +"`3.0 `__" #: ../../build/doc/pgr_turnRestrictedPath.rst:21 msgid "pgr_turnRestrictedPath - Experimental" @@ -131,7 +131,8 @@ msgid "Version 3.0.0" msgstr "Versión 3.0.0" #: ../../build/doc/pgr_turnRestrictedPath.rst:34 -msgid "New **Experimental** function" +#, fuzzy +msgid "New experimental function" msgstr "Nueva función **Experimental**" #: ../../build/doc/dijkstra-family.rst:11 @@ -158,7 +159,7 @@ msgid "Example" msgstr "Ejemplo" #: ../../build/doc/pgr_turnRestrictedPath.rst:54 -msgid "From vertex :math:`3` to vertex :math:`8` on a **directed** graph" +msgid "From vertex :math:`3` to vertex :math:`8` on a directed graph" msgstr "" #: ../../build/doc/pgr_turnRestrictedPath.rst:61 @@ -285,16 +286,17 @@ msgstr "Cuando ``false`` Regresa a lo más K caminos" #: ../../build/doc/pgr_KSP.rst:16 msgid "When ``true`` all the calculated paths while processing are returned." msgstr "" -"Cuando ``true`` se regresan todos los caminos calulados mientras se procesa." +"Cuando ``true`` se regresan todos los caminos calulados mientras se " +"procesa." #: ../../build/doc/pgr_KSP.rst:17 msgid "" "Roughly, when the shortest path has ``N`` edges, the heap will contain " "about than ``N * K`` paths for small value of ``K`` and ``K > 5``." msgstr "" -"Aproximadamente, si la ruta más corta tiene ``N`` aristas, las procesadas " -"contendrán aproximadamente ``N * K`` rutas para valores pequeños de ``K`` y " -"``K > 5``." +"Aproximadamente, si la ruta más corta tiene ``N`` aristas, las procesadas" +" contendrán aproximadamente ``N * K`` rutas para valores pequeños de " +"``K`` y ``K > 5``." #: ../../build/doc/pgr_turnRestrictedPath.rst:82 msgid "Special optional parameters" @@ -388,8 +390,8 @@ msgid "" "When negative: edge (``target``, ``source``) does not exist, therefore " "it's not part of the graph." msgstr "" -"Cuando negativo: la arista (``target``, ``source``) no existe, por lo tanto " -"no es parte del grafo." +"Cuando negativo: la arista (``target``, ``source``) no existe, por lo " +"tanto no es parte del grafo." #: ../../build/doc/pgRouting-concepts.rst msgid "ANY-NUMERICAL" @@ -419,8 +421,8 @@ msgid "" "a ``NULL`` element will raise an exception." msgstr "" "Secuencia de identificadores de aristas que forman un camino que no se " -"permite tomar. - Arreglos vacios o ``NULL`` son ignorados. - Arreglos que " -"tienen ``NULL`` arrojan una excepción." +"permite tomar. - Arreglos vacios o ``NULL`` son ignorados. - Arreglos que" +" tienen ``NULL`` arrojan una excepción." #: ../../build/doc/pgRouting-concepts.rst:17 msgid "``Cost``" @@ -439,8 +441,8 @@ msgid "" "Returns set of ``(seq, path_id, path_seq, start_vid, end_vid, node, edge," " cost, agg_cost)``" msgstr "" -"Devuelve el conjunto de ``(seq, path_id, path_seq, start_vid, end_vid, node, " -"edge, cost, agg_cost)``" +"Devuelve el conjunto de ``(seq, path_id, path_seq, start_vid, end_vid, " +"node, edge, cost, agg_cost)``" #: ../../build/doc/pgRouting-concepts.rst:14 msgid "``seq``" @@ -467,7 +469,8 @@ msgstr "Identificador del camino." #: ../../build/doc/pgRouting-concepts.rst:21 msgid "Has value **1** for the first of a path from ``start_vid`` to ``end_vid``." msgstr "" -"Tiene valor **1** para el primero de la ruta de ``start_vid`` a ``end_vid``." +"Tiene valor **1** para el primero de la ruta de ``start_vid`` a " +"``end_vid``." #: ../../build/doc/pgRouting-concepts.rst:23 msgid "``path_seq``" @@ -521,8 +524,8 @@ msgid "" "Identifier of the edge used to go from ``node`` to the next node in the " "path sequence. **-1** for the last node of the path." msgstr "" -"Identificador de la arista utilizado para ir del ``node`` al siguiente nodo " -"de la secuencia de ruta. ``-1`` para el último nodo de la ruta." +"Identificador de la arista utilizado para ir del ``node`` al siguiente " +"nodo de la secuencia de ruta. ``-1`` para el último nodo de la ruta." #: ../../build/doc/pgRouting-concepts.rst:41 #: ../../build/doc/pgRouting-concepts.rst:45 @@ -534,8 +537,8 @@ msgid "" "Cost to traverse from ``node`` using ``edge`` to the next node in the " "path sequence." msgstr "" -"Costo para atravesar desde ``node`` usando ``edge`` hasta el siguiente nodo " -"en la secuencia de la ruta." +"Costo para atravesar desde ``node`` usando ``edge`` hasta el siguiente " +"nodo en la secuencia de la ruta." #: ../../build/doc/pgRouting-concepts.rst:44 msgid "``agg_cost``" @@ -558,7 +561,7 @@ msgid "No results because the only path available follows a restriction." msgstr "" #: ../../build/doc/pgr_turnRestrictedPath.rst:141 -msgid "From vertex :math:`3` to vertex :math:`8` on an **undirected** graph" +msgid "From vertex :math:`3` to vertex :math:`8` on an undirected graph" msgstr "" #: ../../build/doc/pgr_turnRestrictedPath.rst:147 @@ -588,3 +591,4 @@ msgstr ":ref:`genindex`" #: ../../build/doc/pgr_turnRestrictedPath.rst:163 msgid ":ref:`search`" msgstr ":ref:`search`" + diff --git a/locale/pot/TRSP-family.pot b/locale/pot/TRSP-family.pot index 7c7910a201..9b335ac1ee 100644 --- a/locale/pot/TRSP-family.pot +++ b/locale/pot/TRSP-family.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-25 12:55-0500\n" +"POT-Creation-Date: 2022-07-11 18:25-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -169,7 +169,7 @@ msgid "Introduction" msgstr "" #: ../../build/doc/TRSP-family.rst:63 -msgid "Road restrictions are a sequence of road segments that can not be taken in a sequential manner. Some restrictions are implicit on a directed graph, for example, one way roads where the wrong way edge is not even inserted on the graph. But normally on turns like **left turn** or **right turn**, hence the name turn restrictions, there are sometimes restrictions." +msgid "Road restrictions are a sequence of road segments that can not be taken in a sequential manner. Some restrictions are implicit on a directed graph, for example, one way roads where the wrong way edge is not even inserted on the graph. But normally on turns like no left turn or no right turn, hence the name turn restrictions, there are sometimes restrictions." msgstr "" #: ../../build/doc/TRSP-family.rst:74 @@ -259,7 +259,7 @@ msgid "On road networks, there are restrictions such as left or right turn restr msgstr "" #: ../../build/doc/TRSP-family.rst:115 -msgid "A restriction is a sequence of edges, called **path** and that **path** is to be avoided." +msgid "A restriction is a sequence of edges, called path and that path is to be avoided." msgstr "" #: ../../build/doc/TRSP-family.rst:123 diff --git a/locale/pot/pgr_trsp.pot b/locale/pot/pgr_trsp.pot index 019812c261..f5ac2188cf 100644 --- a/locale/pot/pgr_trsp.pot +++ b/locale/pot/pgr_trsp.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-25 12:55-0500\n" +"POT-Creation-Date: 2022-07-11 18:25-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,87 +28,127 @@ msgstr "" msgid "pgr_trsp - Proposed" msgstr "" -#: ../../build/doc/pgr_trsp.rst:32 +#: ../../build/doc/pgr_trsp.rst:31 msgid "``pgr_trsp`` - routing vertices with restrictions." msgstr "" -#: ../../build/doc/pgr_trsp.rst:35 +#: ../../build/doc/pgr_trsp.rst:36 +msgid "Boost Graph Inside" +msgstr "" + +#: ../../build/doc/proposed.rst:3 +msgid "Proposed functions for next mayor release." +msgstr "" + +#: ../../build/doc/proposed.rst:5 +msgid "They are not officially in the current release." +msgstr "" + +#: ../../build/doc/proposed.rst:6 +msgid "They will likely officially be part of the next mayor release:" +msgstr "" + +#: ../../build/doc/proposed.rst:8 +msgid "The functions make use of ANY-INTEGER and ANY-NUMERICAL" +msgstr "" + +#: ../../build/doc/proposed.rst:9 +msgid "Name might not change. (But still can)" +msgstr "" + +#: ../../build/doc/proposed.rst:10 +msgid "Signature might not change. (But still can)" +msgstr "" + +#: ../../build/doc/proposed.rst:11 +msgid "Functionality might not change. (But still can)" +msgstr "" + +#: ../../build/doc/proposed.rst:12 +msgid "pgTap tests have being done. But might need more." +msgstr "" + +#: ../../build/doc/proposed.rst:13 +msgid "Documentation might need refinement." +msgstr "" + +#: ../../build/doc/pgr_trsp.rst:43 msgid "Availability" msgstr "" -#: ../../build/doc/pgr_trsp.rst:36 +#: ../../build/doc/pgr_trsp.rst:44 msgid "Version 3.4.0" msgstr "" -#: ../../build/doc/pgr_trsp.rst:38 -msgid "New **Proposed** signatures" +#: ../../build/doc/pgr_trsp.rst:46 +msgid "New proposed signatures:" msgstr "" -#: ../../build/doc/pgr_trsp.rst:40 +#: ../../build/doc/pgr_trsp.rst:48 msgid "``pgr_trsp`` (`One to One`_)" msgstr "" -#: ../../build/doc/pgr_trsp.rst:41 +#: ../../build/doc/pgr_trsp.rst:49 msgid "``pgr_trsp`` (`One to Many`_)" msgstr "" -#: ../../build/doc/pgr_trsp.rst:42 +#: ../../build/doc/pgr_trsp.rst:50 msgid "``pgr_trsp`` (`Many to One`_)" msgstr "" -#: ../../build/doc/pgr_trsp.rst:43 +#: ../../build/doc/pgr_trsp.rst:51 msgid "``pgr_trsp`` (`Many to Many`_)" msgstr "" -#: ../../build/doc/pgr_trsp.rst:44 +#: ../../build/doc/pgr_trsp.rst:52 msgid "``pgr_trsp`` (`Combinations`_)" msgstr "" -#: ../../build/doc/pgr_trsp.rst:50 -msgid "Deprecated signatures" +#: ../../build/doc/pgr_trsp.rst:54 +msgid "Deprecated signatures:" msgstr "" -#: ../../build/doc/pgr_trsp.rst:47 +#: ../../build/doc/pgr_trsp.rst:56 msgid "``pgr_trsp(text,integer,integer,boolean,boolean,text)``" msgstr "" -#: ../../build/doc/pgr_trsp.rst:48 +#: ../../build/doc/pgr_trsp.rst:57 msgid "``pgr_trsp(text,integer,float,integer,float,boolean,boolean,text)``" msgstr "" -#: ../../build/doc/pgr_trsp.rst:49 +#: ../../build/doc/pgr_trsp.rst:58 msgid "``pgr_trspViaVertices(text,anyarray,boolean,boolean,text)``" msgstr "" -#: ../../build/doc/pgr_trsp.rst:50 +#: ../../build/doc/pgr_trsp.rst:59 msgid "``pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)``" msgstr "" -#: ../../build/doc/pgr_trsp.rst:52 +#: ../../build/doc/pgr_trsp.rst:61 msgid "Version 2.1.0" msgstr "" -#: ../../build/doc/pgr_trsp.rst:54 -msgid "New *Via* **prototypes**" +#: ../../build/doc/pgr_trsp.rst:63 +msgid "New prototypes:" msgstr "" -#: ../../build/doc/pgr_trsp.rst:56 +#: ../../build/doc/pgr_trsp.rst:65 msgid "``pgr_trspViaVertices``" msgstr "" -#: ../../build/doc/pgr_trsp.rst:57 +#: ../../build/doc/pgr_trsp.rst:66 msgid "``pgr_trspViaEdges``" msgstr "" -#: ../../build/doc/pgr_trsp.rst:59 +#: ../../build/doc/pgr_trsp.rst:68 msgid "Version 2.0.0" msgstr "" -#: ../../build/doc/pgr_trsp.rst:61 +#: ../../build/doc/pgr_trsp.rst:70 msgid "**Official** function" msgstr "" -#: ../../build/doc/pgr_trsp.rst:64 +#: ../../build/doc/pgr_trsp.rst:73 #: ../../build/doc/pgRouting-concepts.rst:10 #: ../../build/doc/dijkstra-family.rst:11 #: ../../build/doc/pgRouting-concepts.rst:11 @@ -118,91 +158,94 @@ msgstr "" msgid "Description" msgstr "" -#: ../../build/doc/pgr_trsp.rst:66 +#: ../../build/doc/pgr_trsp.rst:75 msgid "Turn restricted shortest path (TRSP) is an algorithm that receives turn restrictions in form of a query like those found in real world navigable road networks." msgstr "" -#: ../../build/doc/pgr_trsp.rst:70 +#: ../../build/doc/pgr_trsp.rst:79 msgid "The main characteristics are:" msgstr "" -#: ../../build/doc/pgr_trsp.rst:72 -msgid "Automatic detection of ``reverse_cost`` column" -msgstr "" - -#: ../../build/doc/pgr_trsp.rst:73 -msgid "Accepts **ANY-INTEGER** and **ANY-NUMERICAL** on input columns" -msgstr "" - -#: ../../build/doc/pgr_trsp.rst:74 -msgid "All variations give as result the same columns" -msgstr "" - -#: ../../build/doc/pgr_trsp.rst:75 -msgid "It does no guarantee the shortest path as it might contain restriction paths" +#: ../../build/doc/pgr_trsp.rst:81 +msgid "It does no guarantee the shortest path as it might contain restriction paths." msgstr "" -#: ../../build/doc/pgr_trsp.rst:77 +#: ../../build/doc/pgr_trsp.rst:83 msgid "The general algorithm is as follows:" msgstr "" -#: ../../build/doc/pgr_trsp.rst:79 -msgid "Execute a Dijkstra" +#: ../../build/doc/pgr_trsp.rst:85 +msgid "Execute a Dijkstra." msgstr "" -#: ../../build/doc/pgr_trsp.rst:80 -msgid "If the solution passes thru a restriction then" +#: ../../build/doc/pgr_trsp.rst:86 +msgid "If the solution passes thru a restriction then." msgstr "" -#: ../../build/doc/pgr_trsp.rst:82 -msgid "Execute the **TRSP** algorithm with restrictions" +#: ../../build/doc/pgr_trsp.rst:88 +msgid "Execute the **TRSP** algorithm with restrictions." msgstr "" -#: ../../build/doc/pgr_trsp.rst:85 +#: ../../build/doc/pgr_trsp.rst:91 msgid "Signatures" msgstr "" -#: ../../build/doc/pgr_trsp.rst:88 +#: ../../build/doc/pgr_trsp.rst:94 msgid "Proposed" msgstr "" -#: ../../build/doc/proposed.rst:3 -msgid "Proposed functions for next mayor release." -msgstr "" - -#: ../../build/doc/proposed.rst:5 -msgid "They are not officially in the current release." +#: ../../build/doc/pgr_trsp.rst:95 +#: ../../build/doc/pgr_trsp.rst:113 +#: ../../build/doc/pgr_trsp.rst:133 +#: ../../build/doc/pgr_trsp.rst:154 +#: ../../build/doc/pgr_trsp.rst:176 +#: ../../build/doc/pgr_trsp.rst:198 +msgid "\\ \\" msgstr "" -#: ../../build/doc/proposed.rst:6 -msgid "They will likely officially be part of the next mayor release:" +#: ../../build/doc/pgr_trsp.rst:0 +#: ../../build/doc/pgr_trsp.rst:116 +msgid "pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vid**, **end vid**, [directed])" msgstr "" -#: ../../build/doc/proposed.rst:8 -msgid "The functions make use of ANY-INTEGER and ANY-NUMERICAL" +#: ../../build/doc/pgr_trsp.rst:0 +msgid "pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vid**, **end vids**, [ directed])" msgstr "" -#: ../../build/doc/proposed.rst:9 -msgid "Name might not change. (But still can)" +#: ../../build/doc/pgr_trsp.rst:0 +#: ../../build/doc/pgr_trsp.rst:157 +msgid "pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vids**, **end vid**, [directed])" msgstr "" -#: ../../build/doc/proposed.rst:10 -msgid "Signature might not change. (But still can)" +#: ../../build/doc/pgr_trsp.rst:0 +#: ../../build/doc/pgr_trsp.rst:179 +msgid "pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vids**, **end vids**, [directed])" msgstr "" -#: ../../build/doc/proposed.rst:11 -msgid "Functionality might not change. (But still can)" +#: ../../build/doc/pgr_trsp.rst:0 +#: ../../build/doc/pgr_trsp.rst:201 +msgid "pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, `Combinations SQL`_, [directed])" msgstr "" -#: ../../build/doc/proposed.rst:12 -msgid "pgTap tests have being done. But might need more." +#: ../../build/doc/pgr_trsp.rst:0 +#: ../../build/doc/pgr_trsp.rst:0 +#: ../../build/doc/pgr_trsp.rst:0 +#: ../../build/doc/pgr_trsp.rst:0 +#: ../../build/doc/pgr_trsp.rst:0 +#: ../../build/doc/pgr_trsp.rst:0 +msgid "RETURNS SET OF |generic-result|" msgstr "" -#: ../../build/doc/proposed.rst:13 -msgid "Documentation might need refinement." +#: ../../build/doc/pgr_trsp.rst:0 +#: ../../build/doc/pgr_trsp.rst:0 +#: ../../build/doc/pgr_trsp.rst:0 +#: ../../build/doc/pgr_trsp.rst:0 +#: ../../build/doc/pgr_trsp.rst:0 +#: ../../build/doc/pgr_trsp.rst:0 +msgid "OR EMPTY SET" msgstr "" -#: ../../build/doc/pgr_trsp.rst:112 +#: ../../build/doc/pgr_trsp.rst:111 msgid "One to One" msgstr "" @@ -215,42 +258,46 @@ msgid "Example" msgstr "" #: ../../build/doc/pgr_trsp.rst:121 -msgid "From vertex :math:`6` to vertex :math:`10` on an **undirected** graph" +msgid "From vertex :math:`6` to vertex :math:`10` on an undirected graph." msgstr "" #: ../../build/doc/pgr_trsp.rst:131 msgid "One to Many" msgstr "" -#: ../../build/doc/pgr_trsp.rst:140 -msgid "From vertex :math:`6` to vertices :math:`\\{10, 1\\}` on an **undirected** graph" +#: ../../build/doc/pgr_trsp.rst:136 +msgid "pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vid**, **end vids**, [directed])" msgstr "" -#: ../../build/doc/pgr_trsp.rst:151 +#: ../../build/doc/pgr_trsp.rst:141 +msgid "From vertex :math:`6` to vertices :math:`\\{10, 1\\}` on an undirected graph." +msgstr "" + +#: ../../build/doc/pgr_trsp.rst:152 msgid "Many to One" msgstr "" -#: ../../build/doc/pgr_trsp.rst:160 -msgid "From vertices :math:`\\{6, 1\\}` to vertex :math:`8` on a **directed** graph" +#: ../../build/doc/pgr_trsp.rst:163 +msgid "From vertices :math:`\\{6, 1\\}` to vertex :math:`8` on a directed graph." msgstr "" -#: ../../build/doc/pgr_trsp.rst:171 +#: ../../build/doc/pgr_trsp.rst:174 msgid "Many to Many" msgstr "" -#: ../../build/doc/pgr_trsp.rst:180 -msgid "From vertices :math:`\\{6, 1\\}` to vertices :math:`\\{10, 8\\}` on an **undirected** graph" +#: ../../build/doc/pgr_trsp.rst:185 +msgid "From vertices :math:`\\{6, 1\\}` to vertices :math:`\\{10, 8\\}` on an undirected graph." msgstr "" -#: ../../build/doc/pgr_trsp.rst:191 +#: ../../build/doc/pgr_trsp.rst:196 msgid "Combinations" msgstr "" -#: ../../build/doc/pgr_trsp.rst:200 -msgid "Using a combinations table on an **undirected** graph" +#: ../../build/doc/pgr_trsp.rst:206 +msgid "Using a combinations table on an undirected graph." msgstr "" -#: ../../build/doc/pgr_trsp.rst:208 +#: ../../build/doc/pgr_trsp.rst:214 msgid "Parameters" msgstr "" @@ -362,7 +409,7 @@ msgstr "" msgid "``SMALLINT``, ``INTEGER``, ``BIGINT``" msgstr "" -#: ../../build/doc/pgr_trsp.rst:216 +#: ../../build/doc/pgr_trsp.rst:222 msgid "Optional parameters" msgstr "" @@ -391,11 +438,11 @@ msgstr "" msgid "When ``false`` the graph is considered as `Undirected`." msgstr "" -#: ../../build/doc/pgr_trsp.rst:223 +#: ../../build/doc/pgr_trsp.rst:229 msgid "Inner Queries" msgstr "" -#: ../../build/doc/pgr_trsp.rst:226 +#: ../../build/doc/pgr_trsp.rst:232 msgid "Edges SQL" msgstr "" @@ -466,7 +513,7 @@ msgstr "" msgid "``SMALLINT``, ``INTEGER``, ``BIGINT``, ``REAL``, ``FLOAT``" msgstr "" -#: ../../build/doc/pgr_trsp.rst:233 +#: ../../build/doc/pgr_trsp.rst:239 msgid "Restrictions SQL" msgstr "" @@ -486,7 +533,7 @@ msgstr "" msgid "Cost of taking the forbidden path." msgstr "" -#: ../../build/doc/pgr_trsp.rst:240 +#: ../../build/doc/pgr_trsp.rst:246 msgid "Combinations SQL" msgstr "" @@ -498,7 +545,7 @@ msgstr "" msgid "Identifier of the arrival vertex." msgstr "" -#: ../../build/doc/pgr_trsp.rst:247 +#: ../../build/doc/pgr_trsp.rst:253 msgid "Result Columns" msgstr "" @@ -596,34 +643,34 @@ msgstr "" msgid "Aggregate cost from ``start_vid`` to ``node``." msgstr "" -#: ../../build/doc/pgr_trsp.rst:256 +#: ../../build/doc/pgr_trsp.rst:262 msgid "See Also" msgstr "" -#: ../../build/doc/pgr_trsp.rst:258 +#: ../../build/doc/pgr_trsp.rst:264 msgid ":doc:`TRSP-family`" msgstr "" -#: ../../build/doc/pgr_trsp.rst:259 +#: ../../build/doc/pgr_trsp.rst:265 msgid "`Deprecated documentation `_" msgstr "" -#: ../../build/doc/pgr_trsp.rst:260 +#: ../../build/doc/pgr_trsp.rst:266 msgid ":doc:`migration`" msgstr "" -#: ../../build/doc/pgr_trsp.rst:261 +#: ../../build/doc/pgr_trsp.rst:267 msgid ":doc:`sampledata`" msgstr "" -#: ../../build/doc/pgr_trsp.rst:264 +#: ../../build/doc/pgr_trsp.rst:270 msgid "Indices and tables" msgstr "" -#: ../../build/doc/pgr_trsp.rst:265 +#: ../../build/doc/pgr_trsp.rst:271 msgid ":ref:`genindex`" msgstr "" -#: ../../build/doc/pgr_trsp.rst:266 +#: ../../build/doc/pgr_trsp.rst:272 msgid ":ref:`search`" msgstr "" diff --git a/locale/pot/pgr_trspVia.pot b/locale/pot/pgr_trspVia.pot index 21f4e0d117..c94b0702f4 100644 --- a/locale/pot/pgr_trspVia.pot +++ b/locale/pot/pgr_trspVia.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-25 12:55-0500\n" +"POT-Creation-Date: 2022-07-11 18:25-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,6 +28,10 @@ msgstr "" msgid "``pgr_trspVia`` Route that goes through a list of vertices with restrictions." msgstr "" +#: ../../build/doc/pgr_trspVia.rst:24 +msgid "Boost Graph Inside" +msgstr "" + #: ../../build/doc/proposed.rst:3 msgid "Proposed functions for next mayor release." msgstr "" @@ -64,10 +68,6 @@ msgstr "" msgid "Documentation might need refinement." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:28 -msgid "Boost Graph Inside" -msgstr "" - #: ../../build/doc/pgr_trspVia.rst:31 msgid "Availability" msgstr "" @@ -77,10 +77,14 @@ msgid "Version 3.4.0" msgstr "" #: ../../build/doc/pgr_trspVia.rst:34 -msgid "New **proposed** function ``pgr_trspVia`` (`One Via`_)" +msgid "New proposed function:" +msgstr "" + +#: ../../build/doc/pgr_trspVia.rst:36 +msgid "``pgr_trspVia`` (`One Via`_)" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:37 +#: ../../build/doc/pgr_trspVia.rst:39 #: ../../build/doc/TRSP-family.rst:10 #: ../../build/doc/dijkstra-family.rst:11 #: ../../build/doc/via-category.rst:11 @@ -90,51 +94,71 @@ msgstr "" msgid "Description" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:39 +#: ../../build/doc/pgr_trspVia.rst:41 msgid "Given a list of vertices and a graph, this function is equivalent to finding the shortest path between :math:`vertex_i` and :math:`vertex_{i+1}` for all :math:`i < size\\_of(via\\;vertices)` trying not to use restricted paths." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:43 +#: ../../build/doc/pgr_trspVia.rst:45 msgid "The paths represents the sections of the route." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:45 +#: ../../build/doc/pgr_trspVia.rst:47 msgid "The general algorithm is as follows:" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:47 +#: ../../build/doc/pgr_trspVia.rst:49 msgid "Execute a :doc:`pgr_dijkstraVia`." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:48 +#: ../../build/doc/pgr_trspVia.rst:50 msgid "For the set of sub paths of the solution that pass through a restriction then" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:50 +#: ../../build/doc/pgr_trspVia.rst:52 msgid "Execute the **TRSP** algorithm with restrictions for the paths." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:51 +#: ../../build/doc/pgr_trspVia.rst:53 msgid "**NOTE** when this is done, ``U_turn_on_edge`` flag is ignored." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:55 +#: ../../build/doc/pgr_trspVia.rst:57 msgid "Signatures" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:61 +#: ../../build/doc/pgr_trspVia.rst:63 msgid "One Via" msgstr "" +#: ../../build/doc/pgr_trspVia.rst:65 +msgid "\\ \\" +msgstr "" + +#: ../../build/doc/pgr_trspVia.rst:68 +msgid "pgr_trspVia(`Edges SQL`_, `Restrictions SQL`_, **via vertices**, [options])" +msgstr "" + +#: ../../build/doc/pgr_trspVia.rst:0 +msgid "[options]" +msgstr "" + +#: ../../build/doc/pgr_trspVia.rst:70 +msgid "[directed, strict, U_turn_on_edge]" +msgstr "" + +#: ../../build/doc/pgr_trspVia.rst:72 +msgid "RETURNS SET OF |via-result| OR EMPTY SET" +msgstr "" + #: ../../build/doc/pgr_trspVia.rst:0 msgid "Example" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:71 -msgid "Find the route that visits the vertices :math:`\\{ 5, 1, 8\\}` in that order on an **directed** graph." +#: ../../build/doc/pgr_trspVia.rst:75 +msgid "Find the route that visits the vertices :math:`\\{ 5, 1, 8\\}` in that order on an directed graph." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:79 +#: ../../build/doc/pgr_trspVia.rst:83 msgid "Parameters" msgstr "" @@ -202,7 +226,7 @@ msgstr "" msgid "SMALLINT, INTEGER, BIGINT" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:86 +#: ../../build/doc/pgr_trspVia.rst:90 msgid "Optional parameters" msgstr "" @@ -242,7 +266,7 @@ msgstr "" msgid "When ``false`` the graph is considered as `Undirected`." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:93 +#: ../../build/doc/pgr_trspVia.rst:97 msgid "Via optional parameters" msgstr "" @@ -270,11 +294,11 @@ msgstr "" msgid "When ``true`` departing from a visited vertex will not try to avoid" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:100 +#: ../../build/doc/pgr_trspVia.rst:104 msgid "Inner Queries" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:103 +#: ../../build/doc/pgr_trspVia.rst:107 msgid "Edges SQL" msgstr "" @@ -354,7 +378,7 @@ msgstr "" msgid "``SMALLINT``, ``INTEGER``, ``BIGINT``, ``REAL``, ``FLOAT``" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:110 +#: ../../build/doc/pgr_trspVia.rst:114 msgid "Restrictions SQL" msgstr "" @@ -374,7 +398,7 @@ msgstr "" msgid "Cost of taking the forbidden path." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:117 +#: ../../build/doc/pgr_trspVia.rst:121 msgid "Result Columns" msgstr "" @@ -481,59 +505,59 @@ msgstr "" msgid "Total cost from ``start_vid`` of ``seq = 1`` to ``end_vid`` of the current ``seq``." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:124 +#: ../../build/doc/pgr_trspVia.rst:128 msgid "Additional Examples" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:129 -msgid "All this examples are about the route that visits the vertices :math:`\\{5, 7, 1, 8, 15\\}` in that order on a **directed** graph." +#: ../../build/doc/pgr_trspVia.rst:133 +msgid "All this examples are about the route that visits the vertices :math:`\\{5, 7, 1, 8, 15\\}` in that order on a directed graph." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:133 +#: ../../build/doc/pgr_trspVia.rst:137 msgid "The main query" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:140 +#: ../../build/doc/pgr_trspVia.rst:144 msgid "Aggregate cost of the third path." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:147 +#: ../../build/doc/pgr_trspVia.rst:151 msgid "Route's aggregate cost of the route at the end of the third path." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:154 +#: ../../build/doc/pgr_trspVia.rst:158 msgid "Nodes visited in the route." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:161 +#: ../../build/doc/pgr_trspVia.rst:165 msgid "The aggregate costs of the route when the visited vertices are reached." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:168 +#: ../../build/doc/pgr_trspVia.rst:172 msgid "Status of \"passes in front\" or \"visits\" of the nodes." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:175 -msgid "Simulation of how algorithm works" +#: ../../build/doc/pgr_trspVia.rst:179 +msgid "Simulation of how algorithm works." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:177 +#: ../../build/doc/pgr_trspVia.rst:181 msgid "The algorithm performs a :doc:`pgr_dijkstraVia`" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:183 +#: ../../build/doc/pgr_trspVia.rst:187 msgid "Detects which of the sub paths pass through a restriction in this case is for the ``path_id = 5`` from ``6`` to ``3`` because the path :math:`15 \\rightarrow 1` is restricted." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:187 +#: ../../build/doc/pgr_trspVia.rst:191 msgid "Executes the :doc:`pgr_trsp` algorithm for the conflicting paths." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:193 +#: ../../build/doc/pgr_trspVia.rst:197 msgid "From the :doc:`pgr_dijkstraVia` result it removes the conflicting paths and builds the solution with the results of the :doc:`pgr_trsp` algorithm:" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:200 +#: ../../build/doc/pgr_trspVia.rst:204 msgid "Getting the same result as ``pgr_trspVia``:" msgstr "" @@ -541,42 +565,42 @@ msgstr "" msgid "Example 8" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:206 +#: ../../build/doc/pgr_trspVia.rst:210 msgid "Sometimes ``U_turn_on_edge`` flag is ignored when is set to ``false``." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:209 +#: ../../build/doc/pgr_trspVia.rst:213 msgid "The first step, doing a :doc:`pgr_dijkstraVia` does consider not making a U turn on the same edge. But the path :math:`16 \\rightarrow 13` (Rows 4 and 5) is restricted and the result is using it." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:217 +#: ../../build/doc/pgr_trspVia.rst:221 msgid "When executing the :doc:`pgr_trsp` algorithm for the conflicting path, there is no ``U_turn_on_edge`` flag." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:224 +#: ../../build/doc/pgr_trspVia.rst:228 msgid "Therefore the result ignores the ``U_turn_on_edge`` flag when set to ``false``." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:231 +#: ../../build/doc/pgr_trspVia.rst:235 msgid "See Also" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:233 +#: ../../build/doc/pgr_trspVia.rst:237 msgid ":doc:`via-category`" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:234 +#: ../../build/doc/pgr_trspVia.rst:238 msgid ":doc:`sampledata` network." msgstr "" -#: ../../build/doc/pgr_trspVia.rst:237 +#: ../../build/doc/pgr_trspVia.rst:241 msgid "Indices and tables" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:238 +#: ../../build/doc/pgr_trspVia.rst:242 msgid ":ref:`genindex`" msgstr "" -#: ../../build/doc/pgr_trspVia.rst:239 +#: ../../build/doc/pgr_trspVia.rst:243 msgid ":ref:`search`" msgstr "" diff --git a/locale/pot/pgr_trspVia_withPoints.pot b/locale/pot/pgr_trspVia_withPoints.pot index 81377d8a01..1aa2cb9779 100644 --- a/locale/pot/pgr_trspVia_withPoints.pot +++ b/locale/pot/pgr_trspVia_withPoints.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-25 12:55-0500\n" +"POT-Creation-Date: 2022-07-11 18:25-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,6 +28,10 @@ msgstr "" msgid "``pgr_trspVia_withPoints`` - Route that goes through a list of vertices and/or points with restrictions." msgstr "" +#: ../../build/doc/pgr_trspVia_withPoints.rst:25 +msgid "Boost Graph Inside" +msgstr "" + #: ../../build/doc/proposed.rst:3 msgid "Proposed functions for next mayor release." msgstr "" @@ -64,10 +68,6 @@ msgstr "" msgid "Documentation might need refinement." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:29 -msgid "Boost Graph Inside" -msgstr "" - #: ../../build/doc/pgr_trspVia_withPoints.rst:32 msgid "Availability" msgstr "" @@ -77,10 +77,14 @@ msgid "Version 3.4.0" msgstr "" #: ../../build/doc/pgr_trspVia_withPoints.rst:35 -msgid "New **proposed** function ``pgr_trspVia_withPoints`` (`One Via`_)" +msgid "New proposed function:" +msgstr "" + +#: ../../build/doc/pgr_trspVia_withPoints.rst:37 +msgid "``pgr_trspVia_withPoints`` (`One Via`_)" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:38 +#: ../../build/doc/pgr_trspVia_withPoints.rst:40 #: ../../build/doc/via-category.rst:11 #: ../../build/doc/dijkstra-family.rst:11 #: ../../build/doc/via-category.rst:11 @@ -92,7 +96,7 @@ msgstr "" msgid "Description" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:40 +#: ../../build/doc/pgr_trspVia_withPoints.rst:42 msgid "Given a graph, a set of restriction on the graph edges, a set of points on the graphs edges and a list of vertices, this function is equivalent to finding the shortest path between :math:`vertex_i` and :math:`vertex_{i+1}` (where :math:`vertex` can be a vertex or a point on the graph) for all :math:`i < size\\_of(via\\;vertices)` trying not to use restricted paths." msgstr "" @@ -100,7 +104,7 @@ msgstr "" msgid "Route" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:46 +#: ../../build/doc/pgr_trspVia_withPoints.rst:48 msgid "is a sequence of paths" msgstr "" @@ -108,63 +112,83 @@ msgstr "" msgid "Path" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:47 +#: ../../build/doc/pgr_trspVia_withPoints.rst:49 msgid "is a section of the route." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:49 +#: ../../build/doc/pgr_trspVia_withPoints.rst:51 msgid "The general algorithm is as follows:" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:51 +#: ../../build/doc/pgr_trspVia_withPoints.rst:53 msgid "Build the Graph with the new points." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:53 +#: ../../build/doc/pgr_trspVia_withPoints.rst:55 msgid "The points identifiers will be converted to negative values." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:54 +#: ../../build/doc/pgr_trspVia_withPoints.rst:56 msgid "The vertices identifiers will remain positive." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:56 +#: ../../build/doc/pgr_trspVia_withPoints.rst:58 msgid "Execute a :doc:`pgr_withPointsVia`." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:57 +#: ../../build/doc/pgr_trspVia_withPoints.rst:59 msgid "For the set of paths of the solution that pass through a restriction then" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:59 +#: ../../build/doc/pgr_trspVia_withPoints.rst:61 msgid "Execute the **TRSP** algorithm with restrictions for the path." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:60 +#: ../../build/doc/pgr_trspVia_withPoints.rst:62 msgid "**NOTE** when this is done, ``U_turn_on_edge`` flag is ignored." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:62 +#: ../../build/doc/pgr_trspVia_withPoints.rst:64 msgid "Do not use negative values on identifiers of the inner queries." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:65 +#: ../../build/doc/pgr_trspVia_withPoints.rst:67 msgid "Signatures" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:71 +#: ../../build/doc/pgr_trspVia_withPoints.rst:73 msgid "One Via" msgstr "" +#: ../../build/doc/pgr_trspVia_withPoints.rst:75 +msgid "\\ \\" +msgstr "" + +#: ../../build/doc/pgr_trspVia_withPoints.rst:78 +msgid "pgr_trspVia(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, **via vertices**, [options])" +msgstr "" + #: ../../build/doc/pgr_trspVia_withPoints.rst:0 -msgid "Example" +msgid "[options]" msgstr "" #: ../../build/doc/pgr_trspVia_withPoints.rst:81 -msgid "Find the route that visits the vertices :math:`\\{-6, 15, -5\\}` in that order on an **directed** graph." +msgid "[directed, strict, U_turn_on_edge]" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:89 +#: ../../build/doc/pgr_trspVia_withPoints.rst:83 +msgid "RETURNS SET OF |via-result| OR EMPTY SET" +msgstr "" + +#: ../../build/doc/pgr_trspVia_withPoints.rst:0 +msgid "Example" +msgstr "" + +#: ../../build/doc/pgr_trspVia_withPoints.rst:86 +msgid "Find the route that visits the vertices :math:`\\{-6, 15, -5\\}` in that order on an directed graph." +msgstr "" + +#: ../../build/doc/pgr_trspVia_withPoints.rst:94 msgid "Parameters" msgstr "" @@ -263,7 +287,7 @@ msgstr "" msgid "SMALLINT, INTEGER, BIGINT, REAL, FLOAT" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:96 +#: ../../build/doc/pgr_trspVia_withPoints.rst:101 msgid "Optional parameters" msgstr "" @@ -298,7 +322,7 @@ msgstr "" msgid "When ``false`` the graph is considered as `Undirected`." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:103 +#: ../../build/doc/pgr_trspVia_withPoints.rst:108 msgid "Via optional parameters" msgstr "" @@ -327,7 +351,7 @@ msgstr "" msgid "When ``true`` departing from a visited vertex will not try to avoid" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:110 +#: ../../build/doc/pgr_trspVia_withPoints.rst:115 msgid "With points optional parameters" msgstr "" @@ -372,11 +396,11 @@ msgstr "" msgid "When ``false`` the results will not include the points that are in the path." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:117 +#: ../../build/doc/pgr_trspVia_withPoints.rst:122 msgid "Inner Queries" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:120 +#: ../../build/doc/pgr_trspVia_withPoints.rst:125 msgid "Edges SQL" msgstr "" @@ -456,7 +480,7 @@ msgstr "" msgid "``SMALLINT``, ``INTEGER``, ``BIGINT``, ``REAL``, ``FLOAT``" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:127 +#: ../../build/doc/pgr_trspVia_withPoints.rst:132 msgid "Restrictions SQL" msgstr "" @@ -476,7 +500,7 @@ msgstr "" msgid "Cost of taking the forbidden path." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:134 +#: ../../build/doc/pgr_trspVia_withPoints.rst:139 msgid "Points SQL" msgstr "" @@ -544,7 +568,7 @@ msgstr "" msgid "In both sides ``b``, ``NULL``" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:141 +#: ../../build/doc/pgr_trspVia_withPoints.rst:146 msgid "Result Columns" msgstr "" @@ -655,79 +679,83 @@ msgstr "" msgid "When ``start_vid``, ``end_vid`` and ``node`` columns have negative values, the identifier is for a Point." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:152 +#: ../../build/doc/pgr_trspVia_withPoints.rst:157 msgid "Additional Examples" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:158 -msgid "Use :doc:`pgr_findCloseEdges` in the `Points SQL`_." +#: ../../build/doc/pgr_trspVia_withPoints.rst:163 +msgid "Use ``pgr_findCloseEdges`` for points on the fly" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:160 -msgid "Visit from vertex :math:`1` to the two locations on the graph of point `(2.9, 1.8)` in order of closeness to the graph." +#: ../../build/doc/pgr_trspVia_withPoints.rst:165 +msgid "Using :doc:`pgr_findCloseEdges`:" msgstr "" #: ../../build/doc/pgr_trspVia_withPoints.rst:167 +msgid "Visit from vertex :math:`1` to the two locations on the graph of point `(2.9, 1.8)` in order of closeness to the graph." +msgstr "" + +#: ../../build/doc/pgr_trspVia_withPoints.rst:174 msgid "Point :math:`-1` corresponds to the closest edge from point `(2.9,1.8)`." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:168 +#: ../../build/doc/pgr_trspVia_withPoints.rst:175 msgid "Point :math:`-2` corresponds to the next close edge from point `(2.9,1.8)`." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:169 +#: ../../build/doc/pgr_trspVia_withPoints.rst:176 msgid "Point :math:`-2` is visited on the route to from vertex :math:`1` to Point :math:`-1` (See row where :math:`seq = 4`)." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:173 +#: ../../build/doc/pgr_trspVia_withPoints.rst:180 msgid "Usage variations" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:175 -msgid "All this examples are about the route that visits the vertices :math:`\\{-6, 7, -4, 8, -2\\}` in that order on a **directed** graph." +#: ../../build/doc/pgr_trspVia_withPoints.rst:182 +msgid "All this examples are about the route that visits the vertices :math:`\\{-6, 7, -4, 8, -2\\}` in that order on a directed graph." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:183 +#: ../../build/doc/pgr_trspVia_withPoints.rst:190 msgid "Aggregate cost of the third path." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:190 +#: ../../build/doc/pgr_trspVia_withPoints.rst:197 msgid "Route's aggregate cost of the route at the end of the third path." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:197 +#: ../../build/doc/pgr_trspVia_withPoints.rst:204 msgid "Nodes visited in the route." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:204 +#: ../../build/doc/pgr_trspVia_withPoints.rst:211 msgid "The aggregate costs of the route when the visited vertices are reached." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:211 +#: ../../build/doc/pgr_trspVia_withPoints.rst:218 msgid "Status of \"passes in front\" or \"visits\" of the nodes and points." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:218 -msgid "Simulation of how algorithm works" +#: ../../build/doc/pgr_trspVia_withPoints.rst:225 +msgid "Simulation of how algorithm works." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:220 +#: ../../build/doc/pgr_trspVia_withPoints.rst:227 msgid "The algorithm performs a :doc:`pgr_withPointsVia`" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:226 +#: ../../build/doc/pgr_trspVia_withPoints.rst:233 msgid "Detects which of the paths pass through a restriction in this case is for the ``path_id = 1`` from ``-6`` to ``15`` because the path :math:`9 \\rightarrow 16` is restricted." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:230 +#: ../../build/doc/pgr_trspVia_withPoints.rst:237 msgid "Executes the :ref:`TRSP-family:TRSP algorithm` for the conflicting paths." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:236 +#: ../../build/doc/pgr_trspVia_withPoints.rst:243 msgid "From the :doc:`pgr_withPointsVia` result it removes the conflicting paths and builds the solution with the results of the :doc:`pgr_trsp` algorithm:" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:243 +#: ../../build/doc/pgr_trspVia_withPoints.rst:250 msgid "Getting the same result as ``pgr_trspVia_withPoints``:" msgstr "" @@ -735,50 +763,50 @@ msgstr "" msgid "Example 8" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:249 +#: ../../build/doc/pgr_trspVia_withPoints.rst:256 msgid "Sometimes ``U_turn_on_edge`` flag is ignored when is set to ``false``." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:252 +#: ../../build/doc/pgr_trspVia_withPoints.rst:259 msgid "The first step, doing a :doc:`pgr_withPointsVia` does consider not making a U turn on the same edge. But the path :math:`9 \\rightarrow 16` (Rows 4 and 5) is restricted and the result is using it." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:260 +#: ../../build/doc/pgr_trspVia_withPoints.rst:267 msgid "When executing the :doc:`pgr_trsp_withPoints` algorithm for the conflicting path, there is no ``U_turn_on_edge`` flag." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:267 +#: ../../build/doc/pgr_trspVia_withPoints.rst:274 msgid "Therefore the result ignores the ``U_turn_on_edge`` flag when set to ``false``. From the :doc:`pgr_withPointsVia` result it removes the conflicting paths and builds the solution with the results of the :doc:`pgr_trsp` algorithm. In this case a U turn is been done using the same edge." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:277 +#: ../../build/doc/pgr_trspVia_withPoints.rst:284 msgid "See Also" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:279 +#: ../../build/doc/pgr_trspVia_withPoints.rst:286 msgid ":doc:`TRSP-family`" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:280 +#: ../../build/doc/pgr_trspVia_withPoints.rst:287 msgid ":doc:`via-category`" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:281 +#: ../../build/doc/pgr_trspVia_withPoints.rst:288 msgid ":doc:`withPoints-category`" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:282 +#: ../../build/doc/pgr_trspVia_withPoints.rst:289 msgid ":doc:`sampledata` network." msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:285 +#: ../../build/doc/pgr_trspVia_withPoints.rst:292 msgid "Indices and tables" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:286 +#: ../../build/doc/pgr_trspVia_withPoints.rst:293 msgid ":ref:`genindex`" msgstr "" -#: ../../build/doc/pgr_trspVia_withPoints.rst:287 +#: ../../build/doc/pgr_trspVia_withPoints.rst:294 msgid ":ref:`search`" msgstr "" diff --git a/locale/pot/pgr_trsp_withPoints.pot b/locale/pot/pgr_trsp_withPoints.pot index 17e9214ec8..04bba809db 100644 --- a/locale/pot/pgr_trsp_withPoints.pot +++ b/locale/pot/pgr_trsp_withPoints.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-25 12:55-0500\n" +"POT-Creation-Date: 2022-07-11 18:25-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,6 +28,10 @@ msgstr "" msgid "``pgr_trsp_withPoints`` Routing Vertex/Point with restrictions." msgstr "" +#: ../../build/doc/pgr_trsp_withPoints.rst:24 +msgid "Boost Graph Inside" +msgstr "" + #: ../../build/doc/proposed.rst:3 msgid "Proposed functions for next mayor release." msgstr "" @@ -64,10 +68,6 @@ msgstr "" msgid "Documentation might need refinement." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:28 -msgid "Boost Graph Inside" -msgstr "" - #: ../../build/doc/pgr_trsp_withPoints.rst:31 msgid "Availability" msgstr "" @@ -77,7 +77,7 @@ msgid "Version 3.4.0" msgstr "" #: ../../build/doc/pgr_trsp_withPoints.rst:34 -msgid "New **Proposed** signatures" +msgid "New proposed signatures:" msgstr "" #: ../../build/doc/pgr_trsp_withPoints.rst:36 @@ -103,12 +103,12 @@ msgstr "" #: ../../build/doc/pgr_trsp_withPoints.rst:43 #: ../../build/doc/pgRouting-concepts.rst:10 #: ../../build/doc/dijkstra-family.rst:11 -#: ../../build/doc/pgr_trsp_withPoints.rst:221 +#: ../../build/doc/pgr_trsp_withPoints.rst:230 #: ../../build/doc/pgRouting-concepts.rst:11 #: ../../build/doc/pgRouting-concepts.rst:10 #: ../../build/doc/withPoints-category.rst:11 #: ../../build/doc/pgRouting-concepts.rst:10 -#: ../../build/doc/pgr_trsp_withPoints.rst:282 +#: ../../build/doc/pgRouting-concepts.rst:13 msgid "Description" msgstr "" @@ -117,73 +117,128 @@ msgid "Modify the graph to include points defined by points_sql. Using Dijkstra msgstr "" #: ../../build/doc/pgr_trsp_withPoints.rst:48 -msgid "**The main characteristics are:**" +msgid "Characteristics:" msgstr "" #: ../../build/doc/pgr_trsp_withPoints.rst:50 -msgid "Process is done only on edges with positive costs." -msgstr "" - -#: ../../build/doc/pgr_trsp_withPoints.rst:51 -msgid "Driving side can not be `b` (**both**)" +msgid "Vertices of the graph are:" msgstr "" #: ../../build/doc/pgr_trsp_withPoints.rst:52 -msgid "Vertices of the graph are:" +msgid "**positive** when it belongs to the `Edges SQL`_" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:54 -msgid "**positive** when it belongs to the `Edges SQL`_" +#: ../../build/doc/pgr_trsp_withPoints.rst:53 +msgid "**negative** when it belongs to the `Points SQL`_" msgstr "" #: ../../build/doc/pgr_trsp_withPoints.rst:55 -msgid "**negative** when it belongs to the `Points SQL`_" +msgid "Driving side can not be ``b``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:57 +#: ../../build/doc/pgr_trsp_withPoints.rst:56 msgid "Values are returned when there is a path." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:59 +#: ../../build/doc/pgr_trsp_withPoints.rst:58 msgid "When the starting vertex and ending vertex are the same, there is no path." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:61 +#: ../../build/doc/pgr_trsp_withPoints.rst:60 msgid "The agg_cost the non included values (v, v) is 0" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:63 +#: ../../build/doc/pgr_trsp_withPoints.rst:62 msgid "When the starting vertex and ending vertex are the different and there is no path:" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:66 +#: ../../build/doc/pgr_trsp_withPoints.rst:65 msgid "The agg_cost the non included values (u, v) is ∞" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:68 +#: ../../build/doc/pgr_trsp_withPoints.rst:67 msgid "For optimization purposes, any duplicated value in the start_vids or end_vids are ignored." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:70 +#: ../../build/doc/pgr_trsp_withPoints.rst:69 msgid "The returned values are ordered: - start_vid ascending - end_vid ascending" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:74 +#: ../../build/doc/pgr_trsp_withPoints.rst:73 msgid "Running time: :math:`O(|start\\_vids|\\times(V \\log V + E))`" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:77 +#: ../../build/doc/pgr_trsp_withPoints.rst:76 msgid "Signatures" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:80 +#: ../../build/doc/pgr_trsp_withPoints.rst:79 msgid "Summary" msgstr "" +#: ../../build/doc/pgr_trsp_withPoints.rst:80 #: ../../build/doc/pgr_trsp_withPoints.rst:100 +#: ../../build/doc/pgr_trsp_withPoints.rst:122 +#: ../../build/doc/pgr_trsp_withPoints.rst:143 +#: ../../build/doc/pgr_trsp_withPoints.rst:164 +#: ../../build/doc/pgr_trsp_withPoints.rst:186 +msgid "\\ \\" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst:0 +msgid "pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, **start vid**, **end vid**, [options])" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst:0 +msgid "pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, **start vid**, **end vids**, [options])" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst:0 +msgid "pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, **start vids**, **end vid**, [options])" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst:0 +msgid "pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, **start vids**, **end vids**, [options])" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst:0 +msgid "pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Combinations SQL`_, `Points SQL`_, [options])" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst:0 +msgid "[options]" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst:89 +msgid "[directed, driving_side [details]" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst:0 +#: ../../build/doc/pgr_trsp_withPoints.rst:0 +#: ../../build/doc/pgr_trsp_withPoints.rst:0 +#: ../../build/doc/pgr_trsp_withPoints.rst:0 +#: ../../build/doc/pgr_trsp_withPoints.rst:0 +#: ../../build/doc/pgr_trsp_withPoints.rst:0 +msgid "RETURNS SET OF |generic-result|" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst:0 +#: ../../build/doc/pgr_trsp_withPoints.rst:0 +#: ../../build/doc/pgr_trsp_withPoints.rst:0 +#: ../../build/doc/pgr_trsp_withPoints.rst:0 +#: ../../build/doc/pgr_trsp_withPoints.rst:0 +#: ../../build/doc/pgr_trsp_withPoints.rst:0 +msgid "OR EMPTY SET" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst:98 msgid "One to One" msgstr "" +#: ../../build/doc/pgr_trsp_withPoints.rst:103 +msgid "pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, **start vid**, **end vid**, [directed, driving_side, details])" +msgstr "" + #: ../../build/doc/pgr_trsp_withPoints.rst:0 #: ../../build/doc/pgr_trsp_withPoints.rst:0 #: ../../build/doc/pgr_trsp_withPoints.rst:0 @@ -193,42 +248,58 @@ msgid "Example" msgstr "" #: ../../build/doc/pgr_trsp_withPoints.rst:109 -msgid "From point :math:`1` to vertex :math:`10` with details on a **left** driving side configuration on a **directed** graph with **details**." +msgid "From point :math:`1` to vertex :math:`10` with details on a left driving side configuration on a directed graph with details." msgstr "" #: ../../build/doc/pgr_trsp_withPoints.rst:120 msgid "One to Many" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:129 +#: ../../build/doc/pgr_trsp_withPoints.rst:125 +msgid "pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, **start vid**, **end vids** [directed, driving_side, details])" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst:131 msgid "From point :math:`1` to point :math:`3` and vertex :math:`7`." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:139 +#: ../../build/doc/pgr_trsp_withPoints.rst:141 msgid "Many to One" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:148 +#: ../../build/doc/pgr_trsp_withPoints.rst:146 +msgid "pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, **start vids**, **end vid** [directed, driving_side, details])" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst:152 msgid "From point :math:`1` and vertex :math:`6` to point :math:`3`." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:158 +#: ../../build/doc/pgr_trsp_withPoints.rst:162 msgid "Many to Many" msgstr "" #: ../../build/doc/pgr_trsp_withPoints.rst:167 -msgid "From point :math:`1` and vertex :math:`6` to point :math:`3` and vertex :math:`1`." +msgid "pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, **start vids**, **end vids** [directed, driving_side, details])" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:178 +#: ../../build/doc/pgr_trsp_withPoints.rst:173 +msgid "From point :math:`1` and vertex :math:`6` to point :math:`3` and vertex :math:`1`." +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst:184 msgid "Combinations" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:186 -msgid "From point :math:`1` to vertex :math:`10` and from vertex :math:`6` to point :math:`3` with **right** side driving configuration." +#: ../../build/doc/pgr_trsp_withPoints.rst:189 +msgid "pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Combinations SQL`_, `Points SQL`_, [directed, driving_side, details])" +msgstr "" + +#: ../../build/doc/pgr_trsp_withPoints.rst:195 +msgid "From point :math:`1` to vertex :math:`10` and from vertex :math:`6` to point :math:`3` with right side driving configuration." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:194 +#: ../../build/doc/pgr_trsp_withPoints.rst:203 msgid "Parameters" msgstr "" @@ -236,18 +307,18 @@ msgstr "" #: ../../build/doc/dijkstra-family.rst:8 #: ../../build/doc/pgRouting-concepts.rst:8 #: ../../build/doc/pgRouting-concepts.rst:8 -#: ../../build/doc/pgr_trsp_withPoints.rst:280 +#: ../../build/doc/pgRouting-concepts.rst:11 msgid "Column" msgstr "" #: ../../build/doc/pgRouting-concepts.rst:9 #: ../../build/doc/dijkstra-family.rst:9 -#: ../../build/doc/pgr_trsp_withPoints.rst:219 +#: ../../build/doc/pgr_trsp_withPoints.rst:228 #: ../../build/doc/pgRouting-concepts.rst:9 #: ../../build/doc/pgRouting-concepts.rst:9 #: ../../build/doc/withPoints-category.rst:9 #: ../../build/doc/pgRouting-concepts.rst:9 -#: ../../build/doc/pgr_trsp_withPoints.rst:281 +#: ../../build/doc/pgRouting-concepts.rst:12 msgid "Type" msgstr "" @@ -347,12 +418,12 @@ msgstr "" msgid "``SMALLINT``, ``INTEGER``, ``BIGINT``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:202 +#: ../../build/doc/pgr_trsp_withPoints.rst:211 msgid "Optional parameters" msgstr "" #: ../../build/doc/dijkstra-family.rst:10 -#: ../../build/doc/pgr_trsp_withPoints.rst:220 +#: ../../build/doc/pgr_trsp_withPoints.rst:229 #: ../../build/doc/pgRouting-concepts.rst:10 #: ../../build/doc/withPoints-category.rst:10 msgid "Default" @@ -363,7 +434,7 @@ msgid "``directed``" msgstr "" #: ../../build/doc/dijkstra-family.rst:13 -#: ../../build/doc/pgr_trsp_withPoints.rst:231 +#: ../../build/doc/pgr_trsp_withPoints.rst:240 msgid "``BOOLEAN``" msgstr "" @@ -379,66 +450,66 @@ msgstr "" msgid "When ``false`` the graph is considered as `Undirected`." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:209 +#: ../../build/doc/pgr_trsp_withPoints.rst:218 msgid "With points optional parameters" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:218 +#: ../../build/doc/pgr_trsp_withPoints.rst:227 #: ../../build/doc/withPoints-category.rst:8 #: ../../build/doc/pgRouting-concepts.rst:8 msgid "Parameter" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:222 +#: ../../build/doc/pgr_trsp_withPoints.rst:231 msgid "``driving_side``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:223 +#: ../../build/doc/pgr_trsp_withPoints.rst:232 #: ../../build/doc/withPoints-category.rst:32 msgid "``CHAR``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:224 +#: ../../build/doc/pgr_trsp_withPoints.rst:233 msgid "``r``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:225 +#: ../../build/doc/pgr_trsp_withPoints.rst:234 msgid "Value in [``r``, ``l``] indicating if the driving side is:" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:227 +#: ../../build/doc/pgr_trsp_withPoints.rst:236 msgid "``r`` for right driving side" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:228 +#: ../../build/doc/pgr_trsp_withPoints.rst:237 msgid "``l`` for left driving side" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:229 +#: ../../build/doc/pgr_trsp_withPoints.rst:238 msgid "Any other value will be considered as ``r``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:230 +#: ../../build/doc/pgr_trsp_withPoints.rst:239 msgid "``details``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:232 +#: ../../build/doc/pgr_trsp_withPoints.rst:241 msgid "``false``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:233 +#: ../../build/doc/pgr_trsp_withPoints.rst:242 msgid "When ``true`` the results will include the points that are in the path." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:234 +#: ../../build/doc/pgr_trsp_withPoints.rst:243 msgid "When ``false`` the results will not include the points that are in the path." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:242 +#: ../../build/doc/pgr_trsp_withPoints.rst:249 msgid "Inner Queries" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:245 +#: ../../build/doc/pgr_trsp_withPoints.rst:252 msgid "Edges SQL" msgstr "" @@ -469,7 +540,7 @@ msgid "Identifier of the second end point vertex of the edge." msgstr "" #: ../../build/doc/pgRouting-concepts.rst:24 -#: ../../build/doc/pgr_trsp_withPoints.rst:305 +#: ../../build/doc/pgRouting-concepts.rst:40 msgid "``cost``" msgstr "" @@ -512,7 +583,7 @@ msgstr "" msgid "``SMALLINT``, ``INTEGER``, ``BIGINT``, ``REAL``, ``FLOAT``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:252 +#: ../../build/doc/pgr_trsp_withPoints.rst:259 msgid "Restrictions SQL" msgstr "" @@ -532,7 +603,7 @@ msgstr "" msgid "Cost of taking the forbidden path." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:259 +#: ../../build/doc/pgr_trsp_withPoints.rst:266 msgid "Points SQL" msgstr "" @@ -600,7 +671,7 @@ msgstr "" msgid "In both sides ``b``, ``NULL``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:266 +#: ../../build/doc/pgr_trsp_withPoints.rst:273 msgid "Combinations SQL" msgstr "" @@ -608,159 +679,168 @@ msgstr "" msgid "Identifier of the arrival vertex." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:273 +#: ../../build/doc/pgr_trsp_withPoints.rst:280 msgid "Result Columns" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:283 +#: ../../build/doc/pgRouting-concepts.rst:3 +msgid "Returns set of ``(seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)``" +msgstr "" + +#: ../../build/doc/pgRouting-concepts.rst:14 msgid "``seq``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:284 -#: ../../build/doc/pgr_trsp_withPoints.rst:287 +#: ../../build/doc/pgRouting-concepts.rst:15 +#: ../../build/doc/pgRouting-concepts.rst:18 +#: ../../build/doc/pgRouting-concepts.rst:24 msgid "``INTEGER``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:285 +#: ../../build/doc/pgRouting-concepts.rst:16 msgid "Sequential value starting from **1**." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:286 +#: ../../build/doc/pgRouting-concepts.rst:17 +msgid "``path_id``" +msgstr "" + +#: ../../build/doc/pgRouting-concepts.rst:19 +msgid "Path identifier." +msgstr "" + +#: ../../build/doc/pgRouting-concepts.rst:21 +msgid "Has value **1** for the first of a path from ``start_vid`` to ``end_vid``." +msgstr "" + +#: ../../build/doc/pgRouting-concepts.rst:23 msgid "``path_seq``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:288 +#: ../../build/doc/pgRouting-concepts.rst:25 msgid "Relative position in the path. Has value **1** for the beginning of a path." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:290 +#: ../../build/doc/pgRouting-concepts.rst:27 msgid "``start_vid``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:291 -#: ../../build/doc/pgr_trsp_withPoints.rst:294 -#: ../../build/doc/pgr_trsp_withPoints.rst:297 -#: ../../build/doc/pgr_trsp_withPoints.rst:300 +#: ../../build/doc/pgRouting-concepts.rst:28 +#: ../../build/doc/pgRouting-concepts.rst:31 +#: ../../build/doc/pgRouting-concepts.rst:34 +#: ../../build/doc/pgRouting-concepts.rst:37 msgid "``BIGINT``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:292 -msgid "Identifier of the starting vertex of the path." +#: ../../build/doc/pgRouting-concepts.rst:29 +msgid "Identifier of the starting vertex." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:293 +#: ../../build/doc/pgRouting-concepts.rst:30 msgid "``end_vid``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:295 -msgid "Identifier of the ending vertex of the path." +#: ../../build/doc/pgRouting-concepts.rst:32 +msgid "Identifier of the ending vertex." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:296 +#: ../../build/doc/pgRouting-concepts.rst:33 msgid "``node``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:298 +#: ../../build/doc/pgRouting-concepts.rst:35 msgid "Identifier of the node in the path from ``start_vid`` to ``end_vid``." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:299 +#: ../../build/doc/pgRouting-concepts.rst:36 msgid "``edge``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:301 -msgid "Identifier of the edge used to go from ``node`` to the next node in the path sequence." -msgstr "" - -#: ../../build/doc/pgr_trsp_withPoints.rst:304 -msgid "-1 for the last node of the path." +#: ../../build/doc/pgRouting-concepts.rst:38 +msgid "Identifier of the edge used to go from ``node`` to the next node in the path sequence. **-1** for the last node of the path." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:306 -#: ../../build/doc/pgr_trsp_withPoints.rst:312 +#: ../../build/doc/pgRouting-concepts.rst:41 +#: ../../build/doc/pgRouting-concepts.rst:45 msgid "``FLOAT``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:307 +#: ../../build/doc/pgRouting-concepts.rst:42 msgid "Cost to traverse from ``node`` using ``edge`` to the next node in the path sequence." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:310 -msgid "``0`` for the last row in the path sequence." -msgstr "" - -#: ../../build/doc/pgr_trsp_withPoints.rst:311 +#: ../../build/doc/pgRouting-concepts.rst:44 msgid "``agg_cost``" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:313 +#: ../../build/doc/pgRouting-concepts.rst:46 msgid "Aggregate cost from ``start_vid`` to ``node``." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:315 -msgid "``0`` for the first row in the path sequence." +#: ../../build/doc/pgr_trsp_withPoints.rst:287 +msgid "Additional Examples" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:320 -msgid "Additional Examples" +#: ../../build/doc/pgr_trsp_withPoints.rst:293 +msgid "Use ``pgr_findCloseEdges`` for points on the fly" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:326 -msgid "Use :doc:`pgr_findCloseEdges` in the `Points SQL`_." +#: ../../build/doc/pgr_trsp_withPoints.rst:295 +msgid "Using :doc:`pgr_findCloseEdges`:" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:328 +#: ../../build/doc/pgr_trsp_withPoints.rst:297 msgid "Find the routes from vertex :math:`1` to the two closest locations on the graph of point `(2.9, 1.8)`." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:335 -msgid "Point :math:`-1` corresponds to the closest edge from point `(2.9,1.8)`." +#: ../../build/doc/pgr_trsp_withPoints.rst:304 +msgid "Point :math:`-1` corresponds to the closest edge from point `(2.9, 1.8)`." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:336 -msgid "Point :math:`-2` corresponds to the next close edge from point `(2.9,1.8)`." +#: ../../build/doc/pgr_trsp_withPoints.rst:305 +msgid "Point :math:`-2` corresponds to the next close edge from point `(2.9, 1.8)`." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:339 -msgid "Pass in front or visits" +#: ../../build/doc/pgr_trsp_withPoints.rst:308 +msgid "Pass in front or visits." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:341 -msgid "Which path (if any) passes in front of point :math:`6` or vertex :math:`11` with **right** side driving topology." +#: ../../build/doc/pgr_trsp_withPoints.rst:310 +msgid "Which path (if any) passes in front of point :math:`6` or vertex :math:`11` with right side driving topology." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:349 -msgid "Show details on undirected graph" +#: ../../build/doc/pgr_trsp_withPoints.rst:318 +msgid "Show details on undirected graph." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:351 -msgid "From point :math:`1` and vertex :math:`6` to point :math:`3` to vertex :math:`1` on an **undirected** graph, with details." +#: ../../build/doc/pgr_trsp_withPoints.rst:320 +msgid "From point :math:`1` and vertex :math:`6` to point :math:`3` to vertex :math:`1` on an undirected graph, with details." msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:359 +#: ../../build/doc/pgr_trsp_withPoints.rst:328 msgid "See Also" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:361 +#: ../../build/doc/pgr_trsp_withPoints.rst:330 msgid ":doc:`TRSP-family`" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:362 +#: ../../build/doc/pgr_trsp_withPoints.rst:331 msgid ":doc:`withPoints-category`" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:363 +#: ../../build/doc/pgr_trsp_withPoints.rst:332 msgid ":doc:`sampledata`" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:366 +#: ../../build/doc/pgr_trsp_withPoints.rst:335 msgid "Indices and tables" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:367 +#: ../../build/doc/pgr_trsp_withPoints.rst:336 msgid ":ref:`genindex`" msgstr "" -#: ../../build/doc/pgr_trsp_withPoints.rst:368 +#: ../../build/doc/pgr_trsp_withPoints.rst:337 msgid ":ref:`search`" msgstr "" diff --git a/locale/pot/pgr_turnRestrictedPath.pot b/locale/pot/pgr_turnRestrictedPath.pot index fffafa9b1d..2b77986a58 100644 --- a/locale/pot/pgr_turnRestrictedPath.pot +++ b/locale/pot/pgr_turnRestrictedPath.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-06-25 12:55-0500\n" +"POT-Creation-Date: 2022-07-11 18:25-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -105,7 +105,7 @@ msgid "Version 3.0.0" msgstr "" #: ../../build/doc/pgr_turnRestrictedPath.rst:34 -msgid "New **Experimental** function" +msgid "New experimental function" msgstr "" #: ../../build/doc/pgr_turnRestrictedPath.rst:37 @@ -135,7 +135,7 @@ msgid "Example" msgstr "" #: ../../build/doc/pgr_turnRestrictedPath.rst:54 -msgid "From vertex :math:`3` to vertex :math:`8` on a **directed** graph" +msgid "From vertex :math:`3` to vertex :math:`8` on a directed graph" msgstr "" #: ../../build/doc/pgr_turnRestrictedPath.rst:61 @@ -518,7 +518,7 @@ msgid "No results because the only path available follows a restriction." msgstr "" #: ../../build/doc/pgr_turnRestrictedPath.rst:141 -msgid "From vertex :math:`3` to vertex :math:`8` on an **undirected** graph" +msgid "From vertex :math:`3` to vertex :math:`8` on an undirected graph" msgstr "" #: ../../build/doc/pgr_turnRestrictedPath.rst:147 diff --git a/pgtap/max_flow/maxCardinalityMatch/inner_query.pg b/pgtap/max_flow/maxCardinalityMatch/inner_query.pg index 78a6e1fead..2808a2d7d9 100644 --- a/pgtap/max_flow/maxCardinalityMatch/inner_query.pg +++ b/pgtap/max_flow/maxCardinalityMatch/inner_query.pg @@ -1,4 +1,5 @@ BEGIN; +SET client_min_messages TO ERROR; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_lib_version('3.4.0') THEN plan(324) ELSE PLAN(162) END; diff --git a/pgtap/trsp/trsp/types_check.pg b/pgtap/trsp/trsp/types_check.pg index e9352f4551..4db12f1416 100644 --- a/pgtap/trsp/trsp/types_check.pg +++ b/pgtap/trsp/trsp/types_check.pg @@ -12,20 +12,21 @@ SELECT function_returns('pgr_trsp', ARRAY['text','integer','integer','boolean',' SELECT function_returns('pgr_trsp', ARRAY['text','integer','double precision','integer','double precision','boolean','boolean','text'],'setof record'); SELECT bag_has( - $$SELECT proargnames from pg_proc where proname = 'pgr_trsp'$$, - $$VALUES - ('{"","","","","","restrictions_sql","seq","id1","id2","cost"}'::TEXT[]), - ('{"","","","","","","","turn_restrict_sql","seq","id1","id2","cost"}'::TEXT[]) - $$); + $$SELECT proargnames from pg_proc where proname = 'pgr_trsp'$$, + $$VALUES + ('{"","","","","","restrictions_sql","seq","id1","id2","cost"}'::TEXT[]), + ('{"","","","","","","","turn_restrict_sql","seq","id1","id2","cost"}'::TEXT[]) + $$, 'old signature names'); SELECT bag_has( - $$SELECT proallargtypes from pg_proc where proname = 'pgr_trsp'$$, - $$VALUES - ('{25,23,23,16,16,25,23,23,23,701}'::OID[]), - ('{25,23,701,23,701,16,16,25,23,23,23,701}'::OID[]) - $$); + $$SELECT proallargtypes from pg_proc where proname = 'pgr_trsp'$$, + $$VALUES + ('{25,23,23,16,16,25,23,23,23,701}'::OID[]), + ('{25,23,701,23,701,16,16,25,23,23,23,701}'::OID[]) + $$, 'old signature types'); -SELECT types_check_general('pgr_trsp_withpoints'); + +SELECT types_check_general('pgr_trsp'); SELECT finish(); ROLLBACK; diff --git a/sql/sigs/pgrouting--3.4.sig b/sql/sigs/pgrouting--3.4.sig index 1dc559cb99..91cde28542 100644 --- a/sql/sigs/pgrouting--3.4.sig +++ b/sql/sigs/pgrouting--3.4.sig @@ -313,4 +313,5 @@ _pgr_withpointsvia(text,bigint[],double precision[],boolean) _pgr_withpointsvia(text,text,anyarray,boolean,boolean,boolean,character,boolean) pgr_withpointsvia(text,text,anyarray,boolean,boolean,boolean,character,boolean) _trsp(text,text,anyarray,anyarray,boolean) -_trsp(text,text,text,boolean) +_v4trsp(text,text,anyarray,anyarray,boolean) +_v4trsp(text,text,text,boolean) diff --git a/sql/trsp/_trsp.sql b/sql/trsp/_trsp.sql index 1fed431b3d..962a8ecdc8 100644 --- a/sql/trsp/_trsp.sql +++ b/sql/trsp/_trsp.sql @@ -56,13 +56,35 @@ RETURNS SETOF RECORD AS LANGUAGE 'c' VOLATILE; --v3.4 -CREATE FUNCTION _trsp( +CREATE FUNCTION _v4trsp( + TEXT, -- edges SQL + TEXT, -- restrictions SQL + ANYARRAY, + ANYARRAY, + directed BOOLEAN DEFAULT true, + + OUT seq INTEGER, + OUT path_id INTEGER, + OUT path_seq INTEGER, + OUT start_vid BIGINT, + OUT end_vid BIGINT, + OUT node BIGINT, + OUT edge BIGINT, + OUT cost FLOAT, + OUT agg_cost FLOAT) +RETURNS SETOF RECORD AS +'MODULE_PATHNAME' +LANGUAGE 'c' VOLATILE; + +--v3.4 +CREATE FUNCTION _v4trsp( TEXT, -- edges SQL TEXT, -- restrictions SQL TEXT, -- combinations SQL directed BOOLEAN DEFAULT true, OUT seq INTEGER, + OUT path_id INTEGER, OUT path_seq INTEGER, OUT start_vid BIGINT, OUT end_vid BIGINT, @@ -78,5 +100,8 @@ LANGUAGE 'c' VOLATILE; COMMENT ON FUNCTION _trsp(TEXT, TEXT, ANYARRAY, ANYARRAY, BOOLEAN) IS 'pgRouting internal function'; -COMMENT ON FUNCTION _trsp(TEXT, TEXT, TEXT, BOOLEAN) +COMMENT ON FUNCTION _v4trsp(TEXT, TEXT, ANYARRAY, ANYARRAY, BOOLEAN) +IS 'pgRouting internal function'; + +COMMENT ON FUNCTION _v4trsp(TEXT, TEXT, TEXT, BOOLEAN) IS 'pgRouting internal function'; diff --git a/sql/trsp/_trsp_withPoints.sql b/sql/trsp/_trsp_withPoints.sql index 21c71ad27a..5bab47dfd9 100644 --- a/sql/trsp/_trsp_withPoints.sql +++ b/sql/trsp/_trsp_withPoints.sql @@ -37,6 +37,7 @@ CREATE FUNCTION _pgr_trsp_withPoints( details BOOLEAN, OUT seq INTEGER, + OUT path_id INTEGER, OUT path_seq INTEGER, OUT departure BIGINT, OUT end_vid BIGINT, @@ -61,6 +62,7 @@ CREATE FUNCTION _pgr_trsp_withPoints( details BOOLEAN, OUT seq INTEGER, + OUT path_id INTEGER, OUT path_seq INTEGER, OUT departure BIGINT, OUT end_vid BIGINT, diff --git a/sql/trsp/trsp.sql b/sql/trsp/trsp.sql index c3c1436a9d..74ba936056 100644 --- a/sql/trsp/trsp.sql +++ b/sql/trsp/trsp.sql @@ -35,6 +35,7 @@ CREATE FUNCTION pgr_trsp( directed BOOLEAN DEFAULT true, OUT seq INTEGER, + OUT path_id INTEGER, OUT path_seq INTEGER, OUT start_vid BIGINT, OUT end_vid BIGINT, @@ -46,7 +47,7 @@ CREATE FUNCTION pgr_trsp( RETURNS SETOF record AS $BODY$ - SELECT * FROM _trsp( + SELECT * FROM _v4trsp( _pgr_get_statement($1), _pgr_get_statement($2), ARRAY[$3]::BIGINT[], @@ -68,6 +69,7 @@ CREATE FUNCTION pgr_trsp( directed BOOLEAN DEFAULT true, OUT seq INTEGER, + OUT path_id INTEGER, OUT path_seq INTEGER, OUT start_vid BIGINT, OUT end_vid BIGINT, @@ -78,7 +80,7 @@ CREATE FUNCTION pgr_trsp( RETURNS SETOF RECORD AS $BODY$ - SELECT * FROM _trsp( + SELECT * FROM _v4trsp( _pgr_get_statement($1), _pgr_get_statement($2), ARRAY[$3]::BIGINT[], @@ -99,6 +101,7 @@ CREATE FUNCTION pgr_trsp( directed BOOLEAN DEFAULT true, OUT seq INTEGER, + OUT path_id INTEGER, OUT path_seq INTEGER, OUT start_vid BIGINT, OUT end_vid BIGINT, @@ -109,7 +112,7 @@ CREATE FUNCTION pgr_trsp( RETURNS SETOF RECORD AS $BODY$ - SELECT * FROM _trsp( + SELECT * FROM _v4trsp( _pgr_get_statement($1), _pgr_get_statement($2), $3::BIGINT[], @@ -130,6 +133,7 @@ CREATE FUNCTION pgr_trsp( directed BOOLEAN DEFAULT true, OUT seq INTEGER, + OUT path_id INTEGER, OUT path_seq INTEGER, OUT start_vid BIGINT, OUT end_vid BIGINT, @@ -140,7 +144,7 @@ CREATE FUNCTION pgr_trsp( RETURNS SETOF RECORD AS $BODY$ - SELECT * FROM _trsp( + SELECT * FROM _v4trsp( _pgr_get_statement($1), _pgr_get_statement($2), $3::BIGINT[], @@ -160,6 +164,7 @@ CREATE FUNCTION pgr_trsp( directed BOOLEAN DEFAULT true, OUT seq INTEGER, + OUT path_id INTEGER, OUT path_seq INTEGER, OUT start_vid BIGINT, OUT end_vid BIGINT, @@ -170,7 +175,7 @@ CREATE FUNCTION pgr_trsp( RETURNS SETOF RECORD AS $BODY$ - SELECT * FROM _trsp( + SELECT * FROM _v4trsp( _pgr_get_statement($1), _pgr_get_statement($2), _pgr_get_statement($3), diff --git a/sql/trsp/trsp_withPoints.sql b/sql/trsp/trsp_withPoints.sql index 8649ca00fb..15b1d29982 100644 --- a/sql/trsp/trsp_withPoints.sql +++ b/sql/trsp/trsp_withPoints.sql @@ -38,6 +38,7 @@ CREATE FUNCTION pgr_trsp_withPoints( details BOOLEAN DEFAULT false, OUT seq INTEGER, + OUT path_id INTEGER, OUT path_seq INTEGER, OUT start_vid BIGINT, OUT end_vid BIGINT, @@ -73,6 +74,7 @@ CREATE FUNCTION pgr_trsp_withPoints( details BOOLEAN DEFAULT false, OUT seq INTEGER, + OUT path_id INTEGER, OUT path_seq INTEGER, OUT start_vid BIGINT, OUT end_vid BIGINT, @@ -107,6 +109,7 @@ CREATE FUNCTION pgr_trsp_withPoints( details BOOLEAN DEFAULT false, OUT seq INTEGER, + OUT path_id INTEGER, OUT path_seq INTEGER, OUT start_vid BIGINT, OUT end_vid BIGINT, @@ -141,6 +144,7 @@ CREATE FUNCTION pgr_trsp_withPoints( details BOOLEAN DEFAULT false, OUT seq INTEGER, + OUT path_id INTEGER, OUT path_seq INTEGER, OUT start_vid BIGINT, OUT end_vid BIGINT, @@ -175,6 +179,7 @@ CREATE FUNCTION pgr_trsp_withPoints( details BOOLEAN DEFAULT false, OUT seq INTEGER, + OUT path_id INTEGER, OUT path_seq INTEGER, OUT start_vid BIGINT, OUT end_vid BIGINT, diff --git a/src/trsp/new_trsp.c b/src/trsp/new_trsp.c index 7d68995220..8a403eee31 100644 --- a/src/trsp/new_trsp.c +++ b/src/trsp/new_trsp.c @@ -4,8 +4,8 @@ File: new_trsp.c Copyright (c) 2017 pgRouting developers Mail: project@pgrouting.org -Copyright (c) 2022 Vicky Vergara -* Handle combinations +Copyright (c) 2017 Vicky Vergara +Mail: vicky at georepublic.de ------ @@ -49,6 +49,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. PGDLLEXPORT Datum _trsp(PG_FUNCTION_ARGS); PG_FUNCTION_INFO_V1(_trsp); +PGDLLEXPORT Datum _v4trsp(PG_FUNCTION_ARGS); +PG_FUNCTION_INFO_V1(_v4trsp); + static void process( @@ -138,9 +141,8 @@ void process( } - PGDLLEXPORT Datum -_trsp(PG_FUNCTION_ARGS) { +_v4trsp(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; @@ -192,6 +194,92 @@ _trsp(PG_FUNCTION_ARGS) { tuple_desc = funcctx->tuple_desc; result_tuples = (Path_rt *) funcctx->user_fctx; + if (funcctx->call_cntr < funcctx->max_calls) { + HeapTuple tuple; + Datum result; + Datum *values; + bool* nulls; + size_t call_cntr = funcctx->call_cntr; + + size_t numb = 9; + values = palloc(numb * sizeof(Datum)); + nulls = palloc(numb * sizeof(bool)); + + size_t i; + for (i = 0; i < numb; ++i) { + nulls[i] = false; + } + + int path_id = call_cntr == 0? 0 : result_tuples[call_cntr - 1].seq; + path_id += result_tuples[call_cntr].seq == 1? 1 : 0; + + values[0] = Int32GetDatum(call_cntr + 1); + values[1] = Int32GetDatum(path_id); + values[2] = Int32GetDatum(result_tuples[call_cntr].seq); + values[3] = Int64GetDatum(result_tuples[call_cntr].start_id); + values[4] = Int64GetDatum(result_tuples[call_cntr].end_id); + values[5] = Int64GetDatum(result_tuples[call_cntr].node); + values[6] = Int64GetDatum(result_tuples[call_cntr].edge); + values[7] = Float8GetDatum(result_tuples[call_cntr].cost); + values[8] = Float8GetDatum(result_tuples[call_cntr].agg_cost); + + result_tuples[call_cntr].seq = path_id; + + tuple = heap_form_tuple(tuple_desc, values, nulls); + + result = HeapTupleGetDatum(tuple); + + pfree(values); + pfree(nulls); + + SRF_RETURN_NEXT(funcctx, result); + } else { + SRF_RETURN_DONE(funcctx); + } +} + +PGDLLEXPORT Datum +_trsp(PG_FUNCTION_ARGS) { + FuncCallContext *funcctx; + TupleDesc tuple_desc; + + size_t result_count = 0; + Path_rt *result_tuples = NULL; + + if (SRF_IS_FIRSTCALL()) { + MemoryContext oldcontext; + funcctx = SRF_FIRSTCALL_INIT(); + oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); + + process( + text_to_cstring(PG_GETARG_TEXT_P(0)), + text_to_cstring(PG_GETARG_TEXT_P(1)), + NULL, + PG_GETARG_ARRAYTYPE_P(2), + PG_GETARG_ARRAYTYPE_P(3), + PG_GETARG_BOOL(4), + &result_tuples, &result_count); + + funcctx->max_calls = result_count; + funcctx->user_fctx = result_tuples; + + if (get_call_result_type(fcinfo, NULL, &tuple_desc) + != TYPEFUNC_COMPOSITE) { + ereport(ERROR, + (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), + errmsg("function returning record called in context " + "that cannot accept type record"))); + } + + funcctx->tuple_desc = tuple_desc; + MemoryContextSwitchTo(oldcontext); + } + + funcctx = SRF_PERCALL_SETUP(); + + tuple_desc = funcctx->tuple_desc; + result_tuples = (Path_rt *) funcctx->user_fctx; + if (funcctx->call_cntr < funcctx->max_calls) { HeapTuple tuple; Datum result; diff --git a/src/trsp/trsp_withPoints.c b/src/trsp/trsp_withPoints.c index baad777ead..767d2c1d89 100644 --- a/src/trsp/trsp_withPoints.c +++ b/src/trsp/trsp_withPoints.c @@ -7,7 +7,7 @@ Mail: project@pgrouting.org Function's developer: Copyright (c) 2022 Celia Virginia Vergara Castillo -Mail: +Mail: vicky at georepublic.de ------ @@ -190,10 +190,8 @@ _pgr_trsp_withpoints(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; - /**********************************************************************/ Path_rt *result_tuples = 0; size_t result_count = 0; - /**********************************************************************/ if (SRF_IS_FIRSTCALL()) { MemoryContext oldcontext; @@ -237,8 +235,6 @@ _pgr_trsp_withpoints(PG_FUNCTION_ARGS) { &result_count); } - /**********************************************************************/ - funcctx->max_calls = result_count; funcctx->user_fctx = result_tuples; @@ -262,34 +258,31 @@ _pgr_trsp_withpoints(PG_FUNCTION_ARGS) { Datum result; Datum *values; bool* nulls; + size_t call_cntr = funcctx->call_cntr; - /**********************************************************************/ - // OUT seq BIGINT, - // OUT path_seq, - // OUT node BIGINT, - // OUT edge BIGINT, - // OUT cost FLOAT, - // OUT agg_cost FLOAT) - - - values = palloc(8 * sizeof(Datum)); - nulls = palloc(8 * sizeof(bool)); + size_t numb = 9; + values = palloc(numb * sizeof(Datum)); + nulls = palloc(numb * sizeof(bool)); size_t i; - for (i = 0; i < 8; ++i) { + for (i = 0; i < numb; ++i) { nulls[i] = false; } + int path_id = call_cntr == 0? 0 : result_tuples[call_cntr - 1].seq; + path_id += result_tuples[call_cntr].seq == 1? 1 : 0; + + values[0] = Int32GetDatum(call_cntr + 1); + values[1] = Int32GetDatum(path_id); + values[2] = Int32GetDatum(result_tuples[call_cntr].seq); + values[3] = Int64GetDatum(result_tuples[call_cntr].start_id); + values[4] = Int64GetDatum(result_tuples[call_cntr].end_id); + values[5] = Int64GetDatum(result_tuples[call_cntr].node); + values[6] = Int64GetDatum(result_tuples[call_cntr].edge); + values[7] = Float8GetDatum(result_tuples[call_cntr].cost); + values[8] = Float8GetDatum(result_tuples[call_cntr].agg_cost); - values[0] = Int32GetDatum(funcctx->call_cntr + 1); - values[1] = Int32GetDatum(result_tuples[funcctx->call_cntr].seq); - values[2] = Int64GetDatum(result_tuples[funcctx->call_cntr].start_id); - values[3] = Int64GetDatum(result_tuples[funcctx->call_cntr].end_id); - values[4] = Int64GetDatum(result_tuples[funcctx->call_cntr].node); - values[5] = Int64GetDatum(result_tuples[funcctx->call_cntr].edge); - values[6] = Float8GetDatum(result_tuples[funcctx->call_cntr].cost); - values[7] = Float8GetDatum(result_tuples[funcctx->call_cntr].agg_cost); - /**********************************************************************/ + result_tuples[call_cntr].seq = path_id; tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); diff --git a/src/trsp/trsp_withPoints_driver.cpp b/src/trsp/trsp_withPoints_driver.cpp index e6dfd47bc2..d13e9801d3 100644 --- a/src/trsp/trsp_withPoints_driver.cpp +++ b/src/trsp/trsp_withPoints_driver.cpp @@ -1,8 +1,13 @@ /*PGR-GNU***************************************************************** File: trsp_withPoints_driver.cpp +Generated with Template by: +Copyright (c) 2015 pgRouting developers +Mail: project@pgrouting.org + Function's developer: Copyright (c) 2022 Celia Virginia Vergara Castillo +Mail: vicky at georepublic.de ------ diff --git a/tools/testers/types_check.sql b/tools/testers/types_check.sql index be8c13f4c0..ec77481d5c 100644 --- a/tools/testers/types_check.sql +++ b/tools/testers/types_check.sql @@ -12,8 +12,8 @@ DECLARE return_params_names TEXT[]; return_params_numbers OID[]; - return_params_names_start TEXT[] = ARRAY['seq','path_seq']; - return_params_numbers_start OID[] = ARRAY[23,23]; + return_params_names_start TEXT[] = ARRAY['seq','path_id','path_seq']; + return_params_numbers_start OID[] = ARRAY[23,23,23]; return_params_names_end TEXT[] = ARRAY['node','edge','cost','agg_cost']; return_params_numbers_end OID[] = ARRAY[20,20,701,701]; @@ -209,7 +209,7 @@ DECLARE return_params_numbers OID[] = ARRAY[23,23,23,20,20,20,20,701,701,701]; BEGIN - IF fn IN ('pgr_trspvia') AND NOT min_version('3.4.0') THEN + IF fn IN ('pgr_trspvia','pgr_trspvia_withpoints') AND NOT min_version('3.4.0') THEN RETURN QUERY SELECT skip(1, 'Signature added on 3.4.0'); RETURN; END IF;