Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Add 3.6.2 info to 3.7.0 #2633

Merged
merged 5 commits into from
Apr 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/doc-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ jobs:
# allways processing english, no matter what the change was
if [[ "${{ matrix.language }}" == "en" ]]; then echo "PROCESS=true" >> $GITHUB_ENV; exit 0; fi

if [[ "${{ matrix.language }}" == "zh_Hans" && "${{ github.repository_owner }}" != "pgRouting" ]]; then echo "PROCESS=false" >> $GITHUB_ENV; exit 0; fi

# when this file changes all languages are tested
if git diff --name-only HEAD^ HEAD | grep -q '.github/workflows/doc-check.yml' ; then echo "PROCESS=true" >> $GITHUB_ENV; exit 0; fi

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
strategy:
fail-fast: false
matrix:
old_pgr: [3.6.1, 3.6.0, 3.5.1, 3.5.0, 3.4.2, 3.4.1, 3.4.0, 3.3.5, 3.3.4, 3.3.3, 3.3.2, 3.3.1, 3.3.0, 3.0.0, 3.0.1, 3.0.2, 3.0.3, 3.0.4, 3.0.6, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.2.0, 3.2.1, 3.2.2]
old_pgr: [3.6.2, 3.6.1, 3.6.0, 3.5.1, 3.5.0, 3.4.2, 3.4.1, 3.4.0, 3.3.5, 3.3.4, 3.3.3, 3.3.2, 3.3.1, 3.3.0, 3.0.0, 3.0.1, 3.0.2, 3.0.3, 3.0.4, 3.0.6, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.2.0, 3.2.1, 3.2.2]

steps:
- uses: actions/checkout@v4
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ string(TIMESTAMP COMPILATION_DATE "%Y/%m/%d" UTC)

set(MINORS 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0 2.6)
set(OLD_SIGNATURES
3.6.2
3.6.1
3.6.0
3.5.1
Expand Down
19 changes: 16 additions & 3 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,29 @@ milestone for 3.7.0
* [#2614](https://github.com/pgRouting/pgrouting/pull/2614) Clang tidy does
not work

## pgRouting 3.6


### pgRouting 3.6.2 Release Notes

To see all issues & pull requests closed by this release see the [Git closed
milestone for 3.6.2
](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.6.2%22)

**Upgrade fix**

* The upgrade was failing for same minor

**Code fixes**

* Fix warnings from cpplint

**Others**

* Adjust NEWS generator

* Name change to `NEWS.md` for better visualization on GitHub

## pgRouting 3.6


### pgRouting 3.6.1 Release Notes

To see all issues & pull requests closed by this release see the [Git closed
Expand Down
22 changes: 11 additions & 11 deletions doc/dijkstra/dijkstra-family.rst
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,10 @@ The weighted directed graph, :math:`G_d(V,E)`, is definied by:
* the set of edges :math:`E`

- :math:`E = \begin{cases}
\text{ } \{(source_i, target_i, cost_i) \text{ when } cost >=0 \} & \quad \text{if } reverse\_cost = \varnothing \\
\text{ } \text{ } & \quad \text{ } \\
\text{ } \{(source_i, target_i, cost_i) \text{ when } cost >=0 \} & \quad \text{ } \\
\cup \{(target_i, source_i, reverse\_cost_i) \text{ when } reverse\_cost_i>=0 \} & \quad \text{if } reverse\_cost \neq \varnothing \\
\text{ } \{(source_i, target_i, cost_i) \text{ when } cost >=0 \} & \quad \text{if } reverse\_cost = \varnothing \\
\text{ } \text{ } & \quad \text{ } \\
\text{ } \{(source_i, target_i, cost_i) \text{ when } cost >=0 \} & \quad \text{ } \\
\cup \{(target_i, source_i, reverse\_cost_i) \text{ when } reverse\_cost_i>=0 \} & \quad \text{if } reverse\_cost \neq \varnothing \\
\end{cases}`


Expand All @@ -220,13 +220,13 @@ The weighted undirected graph, :math:`G_u(V,E)`, is definied by:
* the set of edges :math:`E`

- :math:`E = \begin{cases}
\text{ } \{(source_i, target_i, cost_i) \text{ when } cost >=0 \} & \quad \text{ } \\
\cup \{(target_i, source_i, cost_i) \text{ when } cost >=0 \} & \quad \text{ if } reverse\_cost = \varnothing \\
\text{ } \text{ } & \text{ } \\
\text{ } \{(source_i, target_i, cost_i) \text{ when } cost >=0 \} & \text{ } \\
\cup \{(target_i, source_i, cost_i) \text{ when } cost >=0 \} & \text{ } \\
\cup \{(target_i, source_i, reverse\_cost_i) \text{ when } reverse\_cost_i >=0)\} & \text{ } \\
\cup \{(source_i, target_i, reverse\_cost_i) \text{ when } reverse\_cost_i >=0)\} & \quad \text{ if } reverse\_cost \neq \varnothing \\
\text{ } \{(source_i, target_i, cost_i) \text{ when } cost >=0 \} & \quad \text{ } \\
\cup \{(target_i, source_i, cost_i) \text{ when } cost >=0 \} & \quad \text{ if } reverse\_cost = \varnothing \\
\text{ } \text{ } & \text{ } \\
\text{ } \{(source_i, target_i, cost_i) \text{ when } cost >=0 \} & \text{ } \\
\cup \{(target_i, source_i, cost_i) \text{ when } cost >=0 \} & \text{ } \\
\cup \{(target_i, source_i, reverse\_cost_i) \text{ when } reverse\_cost_i >=0)\} & \text{ } \\
\cup \{(source_i, target_i, reverse\_cost_i) \text{ when } reverse\_cost_i >=0)\} & \quad \text{ if } reverse\_cost \neq \varnothing \\
\end{cases}`


Expand Down
4 changes: 2 additions & 2 deletions doc/pickDeliver/VRP-category.rst
Original file line number Diff line number Diff line change
Expand Up @@ -677,9 +677,9 @@ at 4:30 pm and the service time duration is 10 minutes with 30 seconds.
============ ========== ================= ===================== =========
Meaning of 0 time units 9:00 am 4:30 pm 10 min 30 secs
============ ========== ================= ===================== =========
0:00 am hours 9 16.5 :math:`10.5 / 60 = 0.175`
0:00 am hours 9 16.5 :math:`10.5 / 60 = 0.175`
0:00 am minutes :math:`9*60 = 54` :math:`16.5*60 = 990` 10.5
9:00 am hours 0 7.5 :math:`10.5 / 60 = 0.175`
9:00 am hours 0 7.5 :math:`10.5 / 60 = 0.175`
9:00 am minutes 0 :math:`7.5*60 = 540` 10.5
============ ========== ================= ===================== =========

Expand Down
3 changes: 1 addition & 2 deletions doc/src/costMatrix-category.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ Cost Matrix - Category
.. index from here
* :doc:`pgr_aStarCostMatrix`
* :doc:`pgr_bdAstarCostMatrix`
* :doc:`pgr_bdDijkstraCostMatrix`
* :doc:`pgr_dijkstraCostMatrix`
* :doc:`pgr_bdAstarCostMatrix`
* :doc:`pgr_bdDijkstraCostMatrix`

.. index to here
Expand Down
28 changes: 21 additions & 7 deletions doc/src/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -71,20 +71,34 @@ milestone for 3.7.0
* `#2614 <https://github.com/pgRouting/pgrouting/pull/2614>`__ Clang tidy does
not work


.. rubric:: Others

* Adjust NEWS generator

* Name change to `NEWS.md` for better visualization on GitHub

pgRouting 3.6
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

.. contents:: Contents
:local:
:depth: 1

pgRouting 3.6.2 Release Notes
-------------------------------------------------------------------------------

To see all issues & pull requests closed by this release see the `Git closed
milestone for 3.6.2
<https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.6.2%22>`__

.. rubric:: Upgrade fix

* The upgrade was failing for same minor

.. rubric:: Code fixes

* Fix warnings from cpplint

.. rubric:: Others

* Adjust NEWS generator

* Name change to `NEWS.md` for better visualization on GitHub

pgRouting 3.6.1 Release Notes
-------------------------------------------------------------------------------

Expand Down
6 changes: 3 additions & 3 deletions doc/topology/pgr_nodeNetwork.rst
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Parameters
The output table will have for ``edge_table_noded``

:id: ``bigint`` Unique identifier for the table
:old_id: ``bigint`` Identifier of the edge in original table
:old_id: ``bigint`` Identifier of the edge in original table
:sub_id: ``integer`` Segment number of the original edge
:source: ``integer`` Empty source column to be used with
:doc:`pgr_createTopology` function
Expand Down Expand Up @@ -154,13 +154,13 @@ Comparing with the Analysis in the original edge_table, we see that.
|Fields | All original fields | Has only basic fields to do a topology analysis |
+------------------+-----------------------------------------+--------------------------------------------------------------+
|Dead ends | - Edges with 1 dead end: 1,6,24 | Edges with 1 dead end: 1-1 ,6-1,14-2, 18-1 17-1 18-2 |
| | - Edges with 2 dead ends 17,18 | |
| | - Edges with 2 dead ends: 17,18 | |
| | | |
| | Edge 17's right node is a dead end | |
| | because there is no other edge sharing | |
| | that same node. (cnt=1) | |
+------------------+-----------------------------------------+--------------------------------------------------------------+
|Isolated segments | two isolated segments: 17 and 18 both | No Isolated segments |
|Isolated segments | two isolated segments: 17 and 18 both | No Isolated segments |
| | they have 2 dead ends | - Edge 17 now shares a node with edges 14-1 and 14-2 |
| | | - Edges 18-1 and 18-2 share a node with edges 13-1 and 13-2 |
+------------------+-----------------------------------------+--------------------------------------------------------------+
Expand Down
95 changes: 57 additions & 38 deletions locale/en/LC_MESSAGES/pgrouting_doc_strings.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: pgRouting v3.6.0-dev\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-02-13 01:27+0000\n"
"POT-Creation-Date: 2024-04-28 19:05-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.14.0\n"
"Generated-By: Babel 2.12.1\n"

msgid "BFS - Category"
msgstr ""
Expand Down Expand Up @@ -1448,7 +1448,7 @@ msgstr ""
msgid "16.5"
msgstr ""

msgid ":math:`10.5 / 60 = 0.175`"
msgid ":math:`10.5 / 60 = 0.175`"
msgstr ""

msgid "minutes"
Expand Down Expand Up @@ -3380,13 +3380,13 @@ msgstr ""
msgid ":doc:`pgr_aStarCostMatrix`"
msgstr ""

msgid ":doc:`pgr_bdAstarCostMatrix`"
msgid ":doc:`pgr_dijkstraCostMatrix`"
msgstr ""

msgid ":doc:`pgr_bdDijkstraCostMatrix`"
msgid ":doc:`pgr_bdAstarCostMatrix`"
msgstr ""

msgid ":doc:`pgr_dijkstraCostMatrix`"
msgid ":doc:`pgr_bdDijkstraCostMatrix`"
msgstr ""

msgid "proposed"
Expand Down Expand Up @@ -3663,13 +3663,13 @@ msgid "the set of edges :math:`E`"
msgstr ""

msgid ""
":math:`E = \\begin{cases} \\text{ } \\{(source_i, target_i, cost_i) "
":math:`E = \\begin{cases} \\text{ } \\{(source_i, target_i, cost_i) "
"\\text{ when } cost >=0 \\} & \\quad \\text{if } reverse\\_cost = "
"\\varnothing \\\\ \\text{ } \\text{ } & \\quad \\text{ } \\\\ \\text{ }"
" \\{(source_i, target_i, cost_i) \\text{ when } cost >=0 \\} & \\quad "
"\\text{ } \\\\ \\cup \\{(target_i, source_i, reverse\\_cost_i) "
"\\text{ when } reverse\\_cost_i>=0 \\} & \\quad \\text{if } "
"reverse\\_cost \\neq \\varnothing \\\\ \\end{cases}`"
"\\varnothing \\\\ \\text{ } \\text{ } & \\quad \\text{ } \\\\ \\text{ } "
"\\{(source_i, target_i, cost_i) \\text{ when } cost >=0 \\} & \\quad "
"\\text{ } \\\\ \\cup \\{(target_i, source_i, reverse\\_cost_i) \\text{ "
"when } reverse\\_cost_i>=0 \\} & \\quad \\text{if } reverse\\_cost \\neq "
"\\varnothing \\\\ \\end{cases}`"
msgstr ""

msgid "Undirected graph"
Expand All @@ -3682,17 +3682,17 @@ msgid ":math:`V = source \\cup target \\cup {start_v{vid}} \\cup {end_{vid}}`"
msgstr ""

msgid ""
":math:`E = \\begin{cases} \\text{ } \\{(source_i, target_i, cost_i) "
"\\text{ when } cost >=0 \\} & \\quad \\text{ } \\\\ \\cup "
"\\{(target_i, source_i, cost_i) \\text{ when } cost >=0 \\} & \\quad "
"\\text{ if } reverse\\_cost = \\varnothing \\\\ \\text{ } \\text{ } & "
"\\text{ } \\\\ \\text{ } \\{(source_i, target_i, cost_i) \\text{ when } "
"cost >=0 \\} & \\text{ } \\\\ \\cup \\{(target_i, source_i, cost_i) "
"\\text{ when } cost >=0 \\} & \\text{ } \\\\ \\cup \\{(target_i, "
"source_i, reverse\\_cost_i) \\text{ when } reverse\\_cost_i >=0)\\} & "
"\\text{ } \\\\ \\cup \\{(source_i, target_i, reverse\\_cost_i) \\text{ "
"when } reverse\\_cost_i >=0)\\} & \\quad \\text{ if } reverse\\_cost "
"\\neq \\varnothing \\\\ \\end{cases}`"
":math:`E = \\begin{cases} \\text{ } \\{(source_i, target_i, cost_i) "
"\\text{ when } cost >=0 \\} & \\quad \\text{ } \\\\ \\cup \\{(target_i, "
"source_i, cost_i) \\text{ when } cost >=0 \\} & \\quad \\text{ if } "
"reverse\\_cost = \\varnothing \\\\ \\text{ } \\text{ } & \\text{ } \\\\ "
"\\text{ } \\{(source_i, target_i, cost_i) \\text{ when } cost >=0 \\} & "
"\\text{ } \\\\ \\cup \\{(target_i, source_i, cost_i) \\text{ when } cost "
">=0 \\} & \\text{ } \\\\ \\cup \\{(target_i, source_i, reverse\\_cost_i) "
"\\text{ when } reverse\\_cost_i >=0)\\} & \\text{ } \\\\ \\cup "
"\\{(source_i, target_i, reverse\\_cost_i) \\text{ when } reverse\\_cost_i"
" >=0)\\} & \\quad \\text{ if } reverse\\_cost \\neq \\varnothing \\\\ "
"\\end{cases}`"
msgstr ""

msgid "The problem"
Expand Down Expand Up @@ -4447,15 +4447,6 @@ msgid ""
"does not work"
msgstr ""

msgid "Others"
msgstr ""

msgid "Adjust NEWS generator"
msgstr ""

msgid "Name change to `NEWS.md` for better visualization on GitHub"
msgstr ""

msgid "All releases"
msgstr ""

Expand Down Expand Up @@ -13165,7 +13156,7 @@ msgstr ""
msgid "old_id"
msgstr ""

msgid "``bigint`` Identifier of the edge in original table"
msgid "``bigint`` Identifier of the edge in original table"
msgstr ""

msgid "sub_id"
Expand Down Expand Up @@ -13260,7 +13251,7 @@ msgstr ""
msgid "Edges with 1 dead end: 1,6,24"
msgstr ""

msgid "Edges with 2 dead ends 17,18"
msgid "Edges with 2 dead ends: 17,18"
msgstr ""

msgid ""
Expand All @@ -13274,7 +13265,7 @@ msgstr ""
msgid "Isolated segments"
msgstr ""

msgid "two isolated segments: 17 and 18 both they have 2 dead ends"
msgid "two isolated segments: 17 and 18 both they have 2 dead ends"
msgstr ""

msgid "No Isolated segments"
Expand Down Expand Up @@ -15337,6 +15328,37 @@ msgstr ""
msgid "pgRouting 3.6"
msgstr ""

msgid "pgRouting 3.6.2 Release Notes"
msgstr ""

#, python-format
msgid ""
"To see all issues & pull requests closed by this release see the `Git "
"closed milestone for 3.6.2 "
"<https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.6.2%22>`__"
msgstr ""

msgid "Upgrade fix"
msgstr ""

msgid "The upgrade was failing for same minor"
msgstr ""

msgid "Code fixes"
msgstr ""

msgid "Fix warnings from cpplint"
msgstr ""

msgid "Others"
msgstr ""

msgid "Adjust NEWS generator"
msgstr ""

msgid "Name change to `NEWS.md` for better visualization on GitHub"
msgstr ""

msgid "pgRouting 3.6.1 Release Notes"
msgstr ""

Expand Down Expand Up @@ -15536,9 +15558,6 @@ msgstr ""
msgid "Fix winnie build"
msgstr ""

msgid "Code fixes"
msgstr ""

msgid "Fix clang warnings"
msgstr ""

Expand Down
Loading
Loading