Skip to content

Commit

Permalink
Merge branch 'develop' into weblate-pgrouting-index
Browse files Browse the repository at this point in the history
  • Loading branch information
cvvergara authored Jul 4, 2022
2 parents 637ea35 + e55f7de commit 71b484e
Show file tree
Hide file tree
Showing 38 changed files with 718 additions and 725 deletions.
13 changes: 0 additions & 13 deletions doc/alpha_shape/pgr_alphaShape.rst
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,6 @@

.. rubric:: Support

* **Supported versions:**
current(`3.1 <https://docs.pgrouting.org/3.1/en/pgr_alphaShape.html>`__)
`3.0 <https://docs.pgrouting.org/3.0/en/pgr_alphaShape.html>`__

* **Unsupported versions:**
`2.6 <https://docs.pgrouting.org/2.6/en/pgr_alphaShape.html>`__
`2.5 <https://docs.pgrouting.org/2.5/en/pgr_alphaShape.html>`__
`2.4 <https://docs.pgrouting.org/2.4/en/pgr_alphaShape.html>`__
`2.3 <https://docs.pgrouting.org/2.3/en/src/alpha_shape/doc/pgr_alphaShape.html>`__
`2.2 <https://docs.pgrouting.org/2.2/en/src/alpha_shape/doc/pgr_alphaShape.html>`__
`2.1 <https://docs.pgrouting.org/2.1/en/src/driving_distance/doc/dd_alphashape.html>`__
`2.0 <https://docs.pgrouting.org/2.0/en/src/driving_distance/doc/dd_alphashape.html>`__

Description
-------------------------------------------------------------------------------

Expand Down
6 changes: 3 additions & 3 deletions doc/breadthFirstSearch/pgr_binaryBreadthFirstSearch.rst
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ It is well-known that the shortest paths between a single source and all other
vertices can be found using Breadth First Search in :math:`O(|E|)` in an
unweighted graph, i.e. the distance is the minimal number of edges that you
need to traverse from the source to another vertex. We can interpret such a
graph also as a weighted graph, where every edge has the weight :math:`5`.
graph also as a weighted graph, where every edge has the weight :math:`1`.
If not alledges in graph have the same weight, that we need a more general
algorithm, like Dijkstra's Algorithm which runs in :math:`O(|E|log|V|)` time.

However if the weights are more constrained, we can use a faster algorithm.
This algorithm, termed as 'Binary Breadth First Search' as well as '0-5 BFS',
This algorithm, termed as 'Binary Breadth First Search' as well as '0-1 BFS',
is a variation of the standard Breadth First Search problem to solve the SSSP
(single-source shortest path) problem in :math:`O(|E|)`, if the weights of each
edge belongs to the set {0,X}, where 'X' is any non-negative real integer.
Expand Down Expand Up @@ -103,7 +103,7 @@ Signatures
OR EMPTY SET
**Note:** Using the :doc:`sampledata` Network as all weights are same (i.e
:math:`5``)
:math:`1``)

.. index::
single: binaryBreadthFirstSearch(One to One) - Experimental on v3.0
Expand Down
1 change: 0 additions & 1 deletion doc/driving_distance/drivingDistance-category.rst
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ Calculate nodes that are within a distance.
* Extracts all the nodes that have costs less than or equal to the value
distance.
* The edges extracted will conform to the corresponding spanning tree.
Edge
* Edge :math:`(u, v)` will not be included when:

* The distance from the **root** to :math:`u` > limit distance.
Expand Down
2 changes: 1 addition & 1 deletion doc/driving_distance/pgr_drivingDistance.rst
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ Where:
Additional Examples
-------------------------------------------------------------------------------

:Example: From vertices :math:`\{11, 16\}` for a distance of :math:`10.0` on an
:Example: From vertices :math:`\{11, 16\}` for a distance of :math:`3.0` on an
undirected graph

.. literalinclude:: doc-pgr_drivingDistance.queries
Expand Down
5 changes: 4 additions & 1 deletion doc/max_flow/pgr_maxCardinalityMatch.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
* **Supported versions:**
`Latest <https://docs.pgrouting.org/latest/en/pgr_maxCardinalityMatch.html>`__
(`3.1 <https://docs.pgrouting.org/3.1/en/pgr_maxCardinalityMatch.html>`__)
(`3.4 <https://docs.pgrouting.org/3.4/en/pgr_maxCardinalityMatch.html>`__)
`3.3 <https://docs.pgrouting.org/3.3/en/pgr_maxCardinalityMatch.html>`__
`3.2 <https://docs.pgrouting.org/3.2/en/pgr_maxCardinalityMatch.html>`__
`3.1 <https://docs.pgrouting.org/3.1/en/pgr_maxCardinalityMatch.html>`__
`3.0 <https://docs.pgrouting.org/3.0/en/pgr_maxCardinalityMatch.html>`__
* **Unsupported versions:**
`2.6 <https://docs.pgrouting.org/2.6/en/pgr_maxCardinalityMatch.html>`__
Expand Down
4 changes: 2 additions & 2 deletions doc/mincut/pgr_stoerWagner.rst
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ weight on the cut determines whether it is a minimum cut.
- Sometimes a graph has multiple min-cuts, but all have the same weight. The
this function determines exactly one of the min-cuts as well as its weight.

* Running time: :math:`O(V*E + V^6*log V)`.
* Running time: :math:`O(V*E + V^2*log V)`.

Signatures
-------------------------------------------------------------------------------
Expand Down Expand Up @@ -116,7 +116,7 @@ Returns set of ``(seq, edge, cost, mincut)``
=============== =========== ==================================================
Column Type Description
=============== =========== ==================================================
**seq** ``INT`` Sequential value starting from **5**.
**seq** ``INT`` Sequential value starting from **1**.
**edge** ``BIGINT`` Edges which divides the set of vertices into two.
**cost** ``FLOAT`` Cost to traverse of edge.
**mincut** ``FLOAT`` Min-cut weight of a undirected graph.
Expand Down
10 changes: 5 additions & 5 deletions doc/planar/pgr_isPlanar.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ Description
A graph is planar if it can be drawn in two-dimensional space with no two of its
edges crossing. Such a drawing of a planar graph is called a plane drawing.
Every planar graph also admits a straight-line drawing, which is a plane drawing
where each edge is represented by a line segment. When a graph has :math:`K_7`
or :math:`K_{10,10}` as subgraph then the
where each edge is represented by a line segment. When a graph has :math:`K_5`
or :math:`K_{3, 3}` as subgraph then the
graph is not planar.

The main characteristics are:
Expand Down Expand Up @@ -104,14 +104,14 @@ Additional Examples
-------------------------------------------------------------------------------

The following edges will make the subgraph with vertices {10, 15, 11, 16, 13} a
:math:`K_7` graph.
:math:`K_1` graph.

.. literalinclude:: doc-pgr_isPlanar.queries
:start-after: -- q2
:end-before: -- q3

The new graph is not planar because it has a :math:`K_7` subgraph. Edges in blue
represent :math:`K_7` subgraph.
The new graph is not planar because it has a :math:`K_5` subgraph. Edges in blue
represent :math:`K_5` subgraph.

.. TODO fix the image
Expand Down
2 changes: 1 addition & 1 deletion doc/spanningTree/pgr_prim.rst
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Edges SQL
Result Columns
-------------------------------------------------------------------------------

include:: pgRouting-concepts.rst
.. include:: pgRouting-concepts.rst
:start-after: r-edge-cost-start
:end-before: r-edge-cost-end

Expand Down
66 changes: 33 additions & 33 deletions locale/en/LC_MESSAGES/drivingDistance-category.po
Original file line number Diff line number Diff line change
Expand Up @@ -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-04 10:33-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -118,102 +118,102 @@ msgid ""
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:62
msgid "The edges extracted will conform to the corresponding spanning tree. Edge"
msgid "The edges extracted will conform to the corresponding spanning tree."
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:64
#: ../../build/doc/drivingDistance-category.rst:63
msgid "Edge :math:`(u, v)` will not be included when:"
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:66
#: ../../build/doc/drivingDistance-category.rst:65
msgid "The distance from the **root** to :math:`u` > limit distance."
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:67
#: ../../build/doc/drivingDistance-category.rst:66
msgid "The distance from the **root** to :math:`v` > limit distance."
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:68
#: ../../build/doc/drivingDistance-category.rst:67
msgid ""
"No new nodes are created on the graph, so when is within the limit and is"
" not within the limit, the edge is not included."
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:74
#: ../../build/doc/drivingDistance-category.rst:73
msgid "Parameters"
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:83
#: ../../build/doc/drivingDistance-category.rst:82
msgid "Parameter"
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:84
#: ../../build/doc/drivingDistance-category.rst:83
#: ../../build/doc/pgRouting-concepts.rst:9
msgid "Type"
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:85
#: ../../build/doc/drivingDistance-category.rst:84
#: ../../build/doc/pgRouting-concepts.rst:11
msgid "Description"
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:86
#: ../../build/doc/drivingDistance-category.rst:85
msgid "`Edges SQL`_"
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:87
#: ../../build/doc/drivingDistance-category.rst:86
msgid "``TEXT``"
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:88
#: ../../build/doc/drivingDistance-category.rst:87
msgid "Edges SQL as described below."
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:89
#: ../../build/doc/drivingDistance-category.rst:88
msgid "**Root vid**"
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:90
#: ../../build/doc/drivingDistance-category.rst:89
msgid "``BIGINT``"
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:91
#: ../../build/doc/drivingDistance-category.rst:90
msgid "Identifier of the root vertex of the tree."
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:92
#: ../../build/doc/drivingDistance-category.rst:91
msgid "**Root vids**"
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:93
#: ../../build/doc/drivingDistance-category.rst:92
msgid "``ARRAY[ANY-INTEGER]``"
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:94
#: ../../build/doc/drivingDistance-category.rst:93
msgid "Array of identifiers of the root vertices."
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:96
#: ../../build/doc/drivingDistance-category.rst:95
msgid ":math:`0` values are ignored"
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:97
#: ../../build/doc/drivingDistance-category.rst:96
msgid "For optimization purposes, any duplicated value is ignored."
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:98
#: ../../build/doc/drivingDistance-category.rst:97
msgid "**distance**"
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:99
#: ../../build/doc/drivingDistance-category.rst:98
msgid "``FLOAT``"
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:100
#: ../../build/doc/drivingDistance-category.rst:99
msgid "Upper limit for the inclusion of a node in the result."
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:102
#: ../../build/doc/drivingDistance-category.rst:101
#: ../../build/doc/pgRouting-concepts.rst:36
msgid "Where:"
msgstr ""
Expand All @@ -223,7 +223,7 @@ msgstr ""
msgid "ANY-INTEGER"
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:104
#: ../../build/doc/drivingDistance-category.rst:103
#: ../../build/doc/pgRouting-concepts.rst:38
msgid "``SMALLINT``, ``INTEGER``, ``BIGINT``"
msgstr ""
Expand All @@ -232,16 +232,16 @@ msgstr ""
msgid "ANY-NUMERIC"
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:105
#: ../../build/doc/drivingDistance-category.rst:104
#: ../../build/doc/pgRouting-concepts.rst:39
msgid "``SMALLINT``, ``INTEGER``, ``BIGINT``, ``REAL``, ``FLOAT``"
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:110
#: ../../build/doc/drivingDistance-category.rst:109
msgid "Inner Queries"
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:113
#: ../../build/doc/drivingDistance-category.rst:112
msgid "Edges SQL"
msgstr ""

Expand Down Expand Up @@ -318,19 +318,19 @@ msgstr ""
msgid "ANY-NUMERICAL"
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:120
#: ../../build/doc/drivingDistance-category.rst:119
msgid "See Also"
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:123
#: ../../build/doc/drivingDistance-category.rst:122
msgid "Indices and tables"
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:124
#: ../../build/doc/drivingDistance-category.rst:123
msgid ":ref:`genindex`"
msgstr ""

#: ../../build/doc/drivingDistance-category.rst:125
#: ../../build/doc/drivingDistance-category.rst:124
msgid ":ref:`search`"
msgstr ""

Loading

0 comments on commit 71b484e

Please sign in to comment.