diff --git a/.github/workflows/doc-check.yml b/.github/workflows/doc-check.yml index 7f666bcead..88aa3717a4 100644 --- a/.github/workflows/doc-check.yml +++ b/.github/workflows/doc-check.yml @@ -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 diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index b9ebf34b37..828b6937d2 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 9052c3284f..f1b31e765e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 diff --git a/NEWS.md b/NEWS.md index 70ed5b3e30..f97b3ae1c4 100644 --- a/NEWS.md +++ b/NEWS.md @@ -42,6 +42,22 @@ 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** @@ -49,9 +65,6 @@ milestone for 3.7.0 * 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 diff --git a/doc/dijkstra/dijkstra-family.rst b/doc/dijkstra/dijkstra-family.rst index 0c5f9f81f7..f90c0a5eb5 100644 --- a/doc/dijkstra/dijkstra-family.rst +++ b/doc/dijkstra/dijkstra-family.rst @@ -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}` @@ -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}` diff --git a/doc/pickDeliver/VRP-category.rst b/doc/pickDeliver/VRP-category.rst index 4366110141..34c656a69a 100644 --- a/doc/pickDeliver/VRP-category.rst +++ b/doc/pickDeliver/VRP-category.rst @@ -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 ============ ========== ================= ===================== ========= diff --git a/doc/src/costMatrix-category.rst b/doc/src/costMatrix-category.rst index f05d57fb83..0b50a2615a 100644 --- a/doc/src/costMatrix-category.rst +++ b/doc/src/costMatrix-category.rst @@ -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 diff --git a/doc/src/release_notes.rst b/doc/src/release_notes.rst index 5c473162dc..ea94ef5bb1 100644 --- a/doc/src/release_notes.rst +++ b/doc/src/release_notes.rst @@ -71,13 +71,6 @@ milestone for 3.7.0 * `#2614 `__ Clang tidy does not work - -.. rubric:: Others - -* Adjust NEWS generator - - * Name change to `NEWS.md` for better visualization on GitHub - pgRouting 3.6 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -85,6 +78,27 @@ pgRouting 3.6 :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 +`__ + +.. 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 ------------------------------------------------------------------------------- diff --git a/doc/topology/pgr_nodeNetwork.rst b/doc/topology/pgr_nodeNetwork.rst index 68efeefc87..bc321e160b 100644 --- a/doc/topology/pgr_nodeNetwork.rst +++ b/doc/topology/pgr_nodeNetwork.rst @@ -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 @@ -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 | +------------------+-----------------------------------------+--------------------------------------------------------------+ diff --git a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po index f5f2e3ac9c..d9d37c326e 100644 --- a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po @@ -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 \n" "Language-Team: LANGUAGE \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 "" @@ -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" @@ -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" @@ -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" @@ -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" @@ -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 "" @@ -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" @@ -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 "" @@ -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" @@ -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 " +"`__" +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 "" @@ -15536,9 +15558,6 @@ msgstr "" msgid "Fix winnie build" msgstr "" -msgid "Code fixes" -msgstr "" - msgid "Fix clang warnings" msgstr "" diff --git a/locale/pot/index.pot b/locale/pot/index.pot index de511208d8..1fbf292309 100644 --- a/locale/pot/index.pot +++ b/locale/pot/index.pot @@ -117,7 +117,7 @@ msgid ":doc:`pgr_bdDijkstraCost` - Bidirectional Dijkstra to calculate the cost msgstr "" #: ../../build/doc/bdDijkstra-family.rst:7 -msgid ":doc:`pgr_bdDijkstraCostMatrix` - Bidirectional Dijkstra algorithm to create a matrix of costs of the shortest paths." +msgid ":doc:`pgr_bdDijkstraCostMatrix` - Bidirectional Dijkstra algorithm to create a matrix of costs of the shortest paths." msgstr "" #: ../../build/doc/routingFunctions.rst:29 @@ -275,7 +275,7 @@ msgid "The following functions modify the database directly therefore the user m msgstr "" #: ../../build/doc/topology-functions.rst:6 -msgid ":doc:`pgr_createTopology` - create a topology based on the geometry." +msgid ":doc:`pgr_createTopology` - create a topology based on the geometry." msgstr "" #: ../../build/doc/topology-functions.rst:7 @@ -283,7 +283,7 @@ msgid ":doc:`pgr_createVerticesTable` - reconstruct the vertices table based on msgstr "" #: ../../build/doc/topology-functions.rst:9 -msgid ":doc:`pgr_analyzeGraph` - to analyze the edges and vertices of the edge table." +msgid ":doc:`pgr_analyzeGraph` - to analyze the edges and vertices of the edge table." msgstr "" #: ../../build/doc/topology-functions.rst:11 @@ -291,7 +291,7 @@ msgid ":doc:`pgr_analyzeOneWay` - to analyze directionality of the edges." msgstr "" #: ../../build/doc/topology-functions.rst:12 -msgid ":doc:`pgr_nodeNetwork` -to create nodes to a not noded edge table." +msgid ":doc:`pgr_nodeNetwork` - to create nodes to a not noded edge table." msgstr "" #: ../../build/doc/routingFunctions.rst:77 diff --git a/locale/pot/pgrouting_doc_strings.pot b/locale/pot/pgrouting_doc_strings.pot index 988dd62534..a333b9f88c 100644 --- a/locale/pot/pgrouting_doc_strings.pot +++ b/locale/pot/pgrouting_doc_strings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.7.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 \n" "Language-Team: LANGUAGE \n" @@ -1330,7 +1330,7 @@ msgstr "" msgid "16.5" msgstr "" -msgid ":math:`10.5 / 60 = 0.175`" +msgid ":math:`10.5 / 60 = 0.175`" msgstr "" msgid "minutes" @@ -3076,13 +3076,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" @@ -3331,7 +3331,7 @@ msgstr "" msgid "the set of edges :math:`E`" msgstr "" -msgid ":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}`" +msgid ":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}`" msgstr "" msgid "Undirected graph" @@ -3343,7 +3343,7 @@ msgstr "" 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}`" +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}`" msgstr "" msgid "The problem" @@ -3982,15 +3982,6 @@ msgstr "" msgid "`#2614 `__ Clang tidy 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 "" @@ -11287,7 +11278,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" @@ -11374,7 +11365,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 "Edge 17's right node is a dead end because there is no other edge sharing that same node. (cnt=1)" @@ -11386,7 +11377,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" @@ -13036,6 +13027,33 @@ msgstr "" msgid "pgRouting 3.6" msgstr "" +msgid "pgRouting 3.6.2 Release Notes" +msgstr "" + +msgid "To see all issues & pull requests closed by this release see the `Git closed milestone for 3.6.2 `__" +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 "" @@ -13183,9 +13201,6 @@ msgstr "" msgid "Fix winnie build" msgstr "" -msgid "Code fixes" -msgstr "" - msgid "Fix clang warnings" msgstr "" diff --git a/pgtap/planar/isPlanar/edge_cases.pg b/pgtap/planar/isPlanar/edge_cases.pg index c6a50a831e..5c768663b1 100644 --- a/pgtap/planar/isPlanar/edge_cases.pg +++ b/pgtap/planar/isPlanar/edge_cases.pg @@ -51,7 +51,7 @@ SELECT * FROM pgr_isPlanar('q1'); RETURN QUERY -SELECT throws_ok('zeroEdgeTest2','XX000','No edges found', '2: throws, since graph is empty'); +SELECT set_eq('zeroEdgeTest2',$$VALUES('f'::bool) $$, '2: False, since vertex does not exist'); -- vertex not present in graph test @@ -68,7 +68,7 @@ SELECT * FROM pgr_isPlanar('q3'); RETURN QUERY -SELECT throws_ok('vertexNotPresent4','XX000','No edges found', '2: throws, since graph is empty'); +SELECT set_eq('vertexNotPresent4',$$VALUES('f'::bool) $$, '4:False, Vertex not present in graph'); -- 1 vertex test diff --git a/src/planar/isPlanar_driver.cpp b/src/planar/isPlanar_driver.cpp index 0074935a03..504608e1a9 100644 --- a/src/planar/isPlanar_driver.cpp +++ b/src/planar/isPlanar_driver.cpp @@ -69,7 +69,7 @@ pgr_do_isPlanar( auto edges = get_edges(std::string(edges_sql), true, true); if (edges.empty()) { - throw std::string("No edges found"); + return false; } hint = nullptr; diff --git a/tools/scripts/code_checker.sh b/tools/scripts/code_checker.sh index def08ebbad..8a705e55a1 100755 --- a/tools/scripts/code_checker.sh +++ b/tools/scripts/code_checker.sh @@ -52,11 +52,11 @@ if test -z "$DIRECTORY"; then echo "--------------------" echo "------ *.cpp ------" echo "--------------------" - code_linter/cpplint/cpplint.py --filter=-runtime/references --linelength=120 src/*/*.cpp + code_linter/cpplint/cpplint.py --filter=-runtime/references,-whitespace/indent_namespace --linelength=120 src/*/*.cpp echo "--------------------" echo "------ HEADERS ------" echo "--------------------" - code_linter/cpplint/cpplint.py --extensions=hpp,h --headers=hpp,h --linelength=120 --filter=-runtime/references \ + code_linter/cpplint/cpplint.py --extensions=hpp,h --headers=hpp,h --linelength=120 --filter=-runtime/references,-whitespace/indent_namespace \ include/*/*.h* \ include/*/*/*.h* @@ -78,7 +78,7 @@ else echo "--------------------" echo "------ *.cpp ------" echo "--------------------" - code_linter/cpplint/cpplint.py --linelength=120 --filter=-runtime/references src/"$DIRECTORY"/*.cpp + code_linter/cpplint/cpplint.py --linelength=120 --filter=-runtime/references,-whitespace/indent_namespace src/"$DIRECTORY"/*.cpp echo "--------------------" echo "------ C HEADER ------" echo "--------------------" @@ -89,7 +89,7 @@ else echo "--------------------" echo "------ C++ HEADER ------" echo "--------------------" - code_linter/cpplint/cpplint.py --extensions=hpp,h --headers=hpp --linelength=120 --filter=-runtime/references include/"$DIRECTORY"/*.h* + code_linter/cpplint/cpplint.py --extensions=hpp,h --headers=hpp --linelength=120 --filter=-runtime/references,-whitespace/indent_namespace include/"$DIRECTORY"/*.h* echo "--------------------" echo "------ this shouild fail ------" echo "--------------------"