From 8d34b42f46cfca22bfc63f03f240f429134a0bc9 Mon Sep 17 00:00:00 2001 From: Paul Ramsey Date: Fri, 24 Nov 2023 14:26:57 -0800 Subject: [PATCH 001/428] MacOS issues with size_t, closes GH-2588 --- include/c_types/restriction_t.h | 2 +- include/cpp_common/get_check_data.hpp | 2 +- src/cpp_common/get_check_data.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/c_types/restriction_t.h b/include/c_types/restriction_t.h index 516a6c8245..a27a77ace8 100644 --- a/include/c_types/restriction_t.h +++ b/include/c_types/restriction_t.h @@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. struct Restriction_t { double cost; int64_t * via; - uint64_t via_size; + size_t via_size; }; #endif // INCLUDE_C_TYPES_RESTRICTION_T_H_ diff --git a/include/cpp_common/get_check_data.hpp b/include/cpp_common/get_check_data.hpp index 8a277b74b8..8e06ce4ca6 100644 --- a/include/cpp_common/get_check_data.hpp +++ b/include/cpp_common/get_check_data.hpp @@ -59,7 +59,7 @@ char getChar(const HeapTuple, const TupleDesc&, const Column_info_t&, bool, char int64_t* get_array(ArrayType*, size_t*, bool); /** @brief Function returns the values of specified columns in array. */ -int64_t* getBigIntArr(const HeapTuple, const TupleDesc&, const Column_info_t&, uint64_t*); +int64_t* getBigIntArr(const HeapTuple, const TupleDesc&, const Column_info_t&, size_t*); /** @brief Function returns the value of specified column in integer type. */ int64_t getBigInt(const HeapTuple, const TupleDesc&, const Column_info_t&); diff --git a/src/cpp_common/get_check_data.cpp b/src/cpp_common/get_check_data.cpp index c3866d6dae..7ae0500b73 100644 --- a/src/cpp_common/get_check_data.cpp +++ b/src/cpp_common/get_check_data.cpp @@ -354,7 +354,7 @@ int64_t* getBigIntArr( const HeapTuple tuple, const TupleDesc &tupdesc, const Column_info_t &info, - uint64_t *the_size) { + size_t *the_size) { bool is_null = false; Datum raw_array = SPI_getbinval(tuple, tupdesc, info.colNumber, &is_null); From 1bea2c04dac0fdf7b411fce1b2082f1bc5e5ee5e Mon Sep 17 00:00:00 2001 From: cvvergara Date: Fri, 24 Nov 2023 17:17:37 -0600 Subject: [PATCH 002/428] pumpup to 3.6.1 --- .github/workflows/boost_version.yml | 2 +- .github/workflows/update.yml | 4 ++-- CMakeLists.txt | 3 ++- NEWS | 5 +++++ doc/src/release_notes.rst | 6 ++++++ docqueries/version/doc-full_version.result | 6 +++--- docqueries/version/doc-version.result | 2 +- locale/de/LC_MESSAGES/index.po | 2 +- locale/de/LC_MESSAGES/pgrouting_doc_strings.po | 2 +- locale/en/LC_MESSAGES/index.po | 2 +- locale/en/LC_MESSAGES/pgrouting_doc_strings.po | 2 +- locale/es/LC_MESSAGES/index.po | 2 +- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 2 +- locale/ja/LC_MESSAGES/index.po | 2 +- locale/ja/LC_MESSAGES/pgrouting_doc_strings.po | 2 +- locale/ko/LC_MESSAGES/index.po | 2 +- locale/ko/LC_MESSAGES/pgrouting_doc_strings.po | 2 +- locale/pot/index.pot | 2 +- locale/pot/pgrouting_doc_strings.pot | 2 +- locale/zh_Hans/LC_MESSAGES/index.po | 2 +- locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po | 2 +- tools/testers/pg_prove_tests.sh | 2 +- 22 files changed, 35 insertions(+), 23 deletions(-) diff --git a/.github/workflows/boost_version.yml b/.github/workflows/boost_version.yml index f06466567e..4eb30be941 100644 --- a/.github/workflows/boost_version.yml +++ b/.github/workflows/boost_version.yml @@ -133,5 +133,5 @@ jobs: sudo service postgresql start psql -c "CREATE DATABASE ___pgr___test___;" DIR=$(git rev-parse --show-toplevel) - bash "${DIR}/tools/testers/setup_db.sh" "${PGPORT}" ___pgr___test___ "${PG_RUNNER_USER}" "3.6.0" + bash "${DIR}/tools/testers/setup_db.sh" "${PGPORT}" ___pgr___test___ "${PG_RUNNER_USER}" "3.6.1" pg_prove -Q -f --normalize --directives --recurse -U "${PG_RUNNER_USER}" -d ___pgr___test___ "pgtap" diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 502f650c40..9d3b2e84d5 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -28,7 +28,7 @@ jobs: strategy: fail-fast: false matrix: - old_pgr: [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.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 @@ -122,6 +122,6 @@ jobs: run: | sudo service postgresql start psql -p "${PGPORT}" -d ___pgr___test___ -c "SELECT * FROM pgr_full_version();" - psql -p "${PGPORT}" -d ___pgr___test___ -c "ALTER EXTENSION pgrouting UPDATE TO '3.6.0';" + psql -p "${PGPORT}" -d ___pgr___test___ -c "ALTER EXTENSION pgrouting UPDATE TO '3.6.1';" psql -p "${PGPORT}" -d ___pgr___test___ -c "SELECT * FROM pgr_full_version();" pg_prove -Q -f --normalize --directives --recurse -U "${PG_RUNNER_USER}" -d ___pgr___test___ "pgtap" diff --git a/CMakeLists.txt b/CMakeLists.txt index 7872d9a7fc..8e2953e329 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ include(pgr/BuildType) #--------------------------------------------- #--------------------------------------------- -project(PGROUTING VERSION 3.6.0 +project(PGROUTING VERSION 3.6.1 LANGUAGES C CXX ) set(PROJECT_VERSION_DEV "") string(TOLOWER "${PROJECT_NAME}" PROJECT_NAME_LOWER) @@ -33,6 +33,7 @@ string(TIMESTAMP COMPILATION_DATE "%Y/%m/%d" UTC) set(MINORS 3.6 3.5 3.4 3.3 3.2 3.1 3.0 2.6) set(OLD_SIGNATURES + 3.6.0 3.5.1 3.5.0 3.4.2 diff --git a/NEWS b/NEWS index 53ba2211a2..af7080659b 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +pgRouting 3.6.1 Release Notes +------------------------------------------------------------------------------- + +No Changes Yet + pgRouting 3.6.0 Release Notes ------------------------------------------------------------------------------- diff --git a/doc/src/release_notes.rst b/doc/src/release_notes.rst index dc9d432160..9e4ea3c97e 100644 --- a/doc/src/release_notes.rst +++ b/doc/src/release_notes.rst @@ -19,6 +19,12 @@ To see the full list of changes check the list of `Git commits .. contents:: Contents :local: + +pgRouting 3.6.1 Release Notes +------------------------------------------------------------------------------- + +No Changes Yet + pgRouting 3.6.0 Release Notes ------------------------------------------------------------------------------- diff --git a/docqueries/version/doc-full_version.result b/docqueries/version/doc-full_version.result index c66f21a014..4657f16d07 100644 --- a/docqueries/version/doc-full_version.result +++ b/docqueries/version/doc-full_version.result @@ -4,9 +4,9 @@ SET client_min_messages TO NOTICE; SET /* -- q1 */ SELECT version, library FROM pgr_full_version(); - version | library ------------+----------------- - 3.6.0-dev | pgrouting-3.6.0 + version | library +---------+----------------- + 3.6.1 | pgrouting-3.6.1 (1 row) /* -- q2 */ diff --git a/docqueries/version/doc-version.result b/docqueries/version/doc-version.result index f898d1bd25..e59f153e08 100644 --- a/docqueries/version/doc-version.result +++ b/docqueries/version/doc-version.result @@ -6,7 +6,7 @@ SET SELECT pgr_version(); pgr_version ------------- - 3.6.0-dev + 3.6.1 (1 row) /* -- q2 */ diff --git a/locale/de/LC_MESSAGES/index.po b/locale/de/LC_MESSAGES/index.po index 033872a244..8cd97e14d4 100644 --- a/locale/de/LC_MESSAGES/index.po +++ b/locale/de/LC_MESSAGES/index.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.6.0-dev +# Copyright (C) pgRouting Contributors - Version v3.6.1 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , YEAR. # diff --git a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po index 23a8f8d848..e72e650c10 100644 --- a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.6.0-dev +# Copyright (C) pgRouting Contributors - Version v3.6.1 # This file is distributed under the same license as the pgRouting package. # Regina Obe , 2023. msgid "" diff --git a/locale/en/LC_MESSAGES/index.po b/locale/en/LC_MESSAGES/index.po index d562dd22ec..ba3bdb9369 100644 --- a/locale/en/LC_MESSAGES/index.po +++ b/locale/en/LC_MESSAGES/index.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.6.0-dev +# Copyright (C) pgRouting Contributors - Version v3.6.1 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , 2022. # diff --git a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po index 2f71b83fc4..44b4c5f438 100644 --- a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.6.0-dev +# Copyright (C) pgRouting Contributors - Version v3.6.1 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , 2022. # diff --git a/locale/es/LC_MESSAGES/index.po b/locale/es/LC_MESSAGES/index.po index fa5221b396..9161b02598 100644 --- a/locale/es/LC_MESSAGES/index.po +++ b/locale/es/LC_MESSAGES/index.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.6.0-dev +# Copyright (C) pgRouting Contributors - Version v3.6.1 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , 2022. # diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index bf23ba709b..f910203549 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.6.0-dev +# Copyright (C) pgRouting Contributors - Version v3.6.1 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , 2022. # Pedro Jose Rios Vergara , 2022. diff --git a/locale/ja/LC_MESSAGES/index.po b/locale/ja/LC_MESSAGES/index.po index a4db89f701..4f43aa81c6 100644 --- a/locale/ja/LC_MESSAGES/index.po +++ b/locale/ja/LC_MESSAGES/index.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.6.0-dev +# Copyright (C) pgRouting Contributors - Version v3.6.1 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , 2022. # diff --git a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po index 5840391d12..111aec1dca 100644 --- a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po @@ -1,6 +1,6 @@ # #-#-#-#-# allpairs-family.po (pgRouting v3.4.0-dev) #-#-#-#-# # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.6.0-dev +# Copyright (C) pgRouting Contributors - Version v3.6.1 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , 2022. # Translators: diff --git a/locale/ko/LC_MESSAGES/index.po b/locale/ko/LC_MESSAGES/index.po index a7caa0d5ce..e3e5aa1cd3 100644 --- a/locale/ko/LC_MESSAGES/index.po +++ b/locale/ko/LC_MESSAGES/index.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.6.0-dev +# Copyright (C) pgRouting Contributors - Version v3.6.1 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , YEAR. # diff --git a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po index 6bc39b5dbb..3e53a22a0a 100644 --- a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.6.0-dev +# Copyright (C) pgRouting Contributors - Version v3.6.1 # This file is distributed under the same license as the pgRouting package. # Regina Obe , 2022. # Hyung-Gyu Ryoo , 2022. diff --git a/locale/pot/index.pot b/locale/pot/index.pot index 6216f844aa..efe2b97fa4 100644 --- a/locale/pot/index.pot +++ b/locale/pot/index.pot @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.6.0-dev +# Copyright (C) pgRouting Contributors - Version v3.6.1 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , YEAR. # diff --git a/locale/pot/pgrouting_doc_strings.pot b/locale/pot/pgrouting_doc_strings.pot index b25cae5c2c..36984ae833 100644 --- a/locale/pot/pgrouting_doc_strings.pot +++ b/locale/pot/pgrouting_doc_strings.pot @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.6.0-dev +# Copyright (C) pgRouting Contributors - Version v3.6.1 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , YEAR. # diff --git a/locale/zh_Hans/LC_MESSAGES/index.po b/locale/zh_Hans/LC_MESSAGES/index.po index 4bef4323a5..c81ae537e1 100644 --- a/locale/zh_Hans/LC_MESSAGES/index.po +++ b/locale/zh_Hans/LC_MESSAGES/index.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.6.0-dev +# Copyright (C) pgRouting Contributors - Version v3.6.1 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , YEAR. # diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 4894e70d50..a7779a281b 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.6.0-dev +# Copyright (C) pgRouting Contributors - Version v3.6.1 # This file is distributed under the same license as the pgRouting package. # Regina Obe , 2023. # Wangdapeng , 2023. diff --git a/tools/testers/pg_prove_tests.sh b/tools/testers/pg_prove_tests.sh index 63194f7eef..cd78868456 100755 --- a/tools/testers/pg_prove_tests.sh +++ b/tools/testers/pg_prove_tests.sh @@ -37,7 +37,7 @@ echo "$PGPORT" pushd ./tools/testers/ || exit 1 -bash setup_db.sh "${PGPORT}" "${PGDATABASE}" "${PGUSER}" "3.6.0" +bash setup_db.sh "${PGPORT}" "${PGDATABASE}" "${PGUSER}" "3.6.1" pg_prove --failures --Q --recurse \ --S client_min_messages=WARNING \ From 26c4ca27cf978b2d72ad5ea0b8cdeb4db45c4409 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Fri, 24 Nov 2023 17:20:08 -0600 Subject: [PATCH 003/428] testing with postgres 16 --- .github/workflows/ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index f8669227c1..3df30812c4 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -29,7 +29,7 @@ jobs: strategy: fail-fast: false matrix: - psql: [11,12,13,14,15] + psql: [11,12,13,14,15,16] postgis: [3] os: [ubuntu-latest, ubuntu-20.04] From 4ef4f714d7c39208e4f779a32c48df2634b9f584 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Fri, 24 Nov 2023 17:28:56 -0600 Subject: [PATCH 004/428] :book: documenting fix done for the release 3.6.1 --- NEWS | 7 ++++++- doc/src/release_notes.rst | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index af7080659b..903b5b1271 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,12 @@ pgRouting 3.6.1 Release Notes ------------------------------------------------------------------------------- -No Changes Yet +To see all issues & pull requests closed by this release see the `Git closed +milestone for 3.6.1 +`_ + +* [#2588](https://github.com/pgRouting/pgrouting/pull/2588) pgrouting 3.6.0 + fails to build on OSX pgRouting 3.6.0 Release Notes ------------------------------------------------------------------------------- diff --git a/doc/src/release_notes.rst b/doc/src/release_notes.rst index 9e4ea3c97e..b27e6fad93 100644 --- a/doc/src/release_notes.rst +++ b/doc/src/release_notes.rst @@ -23,7 +23,12 @@ To see the full list of changes check the list of `Git commits pgRouting 3.6.1 Release Notes ------------------------------------------------------------------------------- -No Changes Yet +To see all issues & pull requests closed by this release see the `Git closed +milestone for 3.6.1 +`_ + +* `#2588 `__ pgrouting 3.6.0 + fails to build on OSX pgRouting 3.6.0 Release Notes ------------------------------------------------------------------------------- From 6d898693f411bfa4efb87bb6190720eea3352631 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Fri, 24 Nov 2023 17:49:58 -0600 Subject: [PATCH 005/428] Marking as todo a failing test --- pgtap/withPoints/withPointsDD/edge_cases/issue_979.pg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pgtap/withPoints/withPointsDD/edge_cases/issue_979.pg b/pgtap/withPoints/withPointsDD/edge_cases/issue_979.pg index f86f057523..f4ecd013e0 100644 --- a/pgtap/withPoints/withPointsDD/edge_cases/issue_979.pg +++ b/pgtap/withPoints/withPointsDD/edge_cases/issue_979.pg @@ -162,6 +162,7 @@ BEGIN RETURN QUERY SELECT set_eq('q1', 'e1', 'right driving side, DIR'); + PERFORM todo(1, 'Fails on postgres 16'); RETURN QUERY SELECT set_eq('q2', 'e2', 'left driving side, DIR'); @@ -174,6 +175,7 @@ BEGIN RETURN QUERY SELECT set_eq('q1old', 'e1', 'old: right driving side, DIR'); + PERFORM todo(1, 'Fails on postgres 16'); RETURN QUERY SELECT set_eq('q2old', 'e2old', 'old: left driving side, DIR'); From 71a656c1a92ea776c02d6db733af9fbd7cfac4d1 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Fri, 24 Nov 2023 18:03:50 -0600 Subject: [PATCH 006/428] Adding automatic test on macos.yml --- .github/workflows/macos.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 3c0825231e..05cce9f198 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -5,6 +5,31 @@ name: Build for macOS on: workflow_dispatch: + push: + paths: + - '.github/workflows/macos.yml' + - 'src/**' + - 'include/**' + - 'pgtap/**' + - 'tools/testers/**' + - './CMakeLists.txt' + + branches-ignore: + - 'gh-pages' + + tags: [] + + pull_request: + paths: + - '.github/workflows/macos.yml' + - 'src/**' + - 'include/**' + - 'pgtap/**' + - 'tools/testers/**' + - './CMakeLists.txt' + + branches-ignore: + - 'gh-pages' concurrency: group: ${{ github.workflow }}-${{ github.ref }} From e0986c643e19c184bd61950d945c1b6096205b9d Mon Sep 17 00:00:00 2001 From: cvvergara Date: Fri, 24 Nov 2023 18:59:20 -0600 Subject: [PATCH 007/428] Only compilation macos, disable test --- .github/workflows/macos.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 05cce9f198..5887eeee78 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -64,6 +64,7 @@ jobs: sudo make install - name: Install pgTAP + if: false run: | git clone https://github.com/theory/pgtap.git pgTapExtension cd pgTapExtension @@ -74,6 +75,7 @@ jobs: sudo ln -s /usr/local/Cellar/perl/5.32.1_1/bin/pg_prove symlink it into /usr/local/bin - name: Test + if: false run: | export PATH=/usr/local/Cellar/perl/$(perl -e 'print substr($^V, 1)')/bin:$PATH pg_ctl -D /usr/local/var/postgres start From 04cb3f2c7d9d9e9af6117e2724a1ddaaf822410a Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 30 Dec 2023 16:20:22 -0600 Subject: [PATCH 008/428] Adjusting pumpup script --- tools/developer/pumpup_version.sh | 32 +++++++------------------------ 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/tools/developer/pumpup_version.sh b/tools/developer/pumpup_version.sh index fefdd62d85..92bb3abd2c 100755 --- a/tools/developer/pumpup_version.sh +++ b/tools/developer/pumpup_version.sh @@ -26,36 +26,12 @@ IFS='\. ' read -r -a a <<< "${OLD_VERSION}" MAYOR="${a[0]}" MINOR="${a[1]}" -function pumpup_doc { - echo "pump up doc" - OLDSTR='^ \(`'"${1}"' (.*)\/'"${1}"'(.*)\)$' - NEWSTR=' \(`'"${2}"' $1\/'"${2}"'$2\)\n `'"${1}"' $1\/'"${1}"'$2' - for f in $(git ls-files './*.rst') - do - perl -pi -e 's/'"$OLDSTR"'/'"${NEWSTR}"'/' "$f" - done - WEBLINK=' Date: Sat, 30 Dec 2023 16:23:30 -0600 Subject: [PATCH 009/428] pumpup to version 3.7 --- .github/workflows/boost_version.yml | 2 +- .github/workflows/update.yml | 4 +- CMakeLists.txt | 7 +- NEWS | 5 + doc/_static/page_history.js | 2 +- doc/src/release_notes.rst | 6 + docqueries/version/doc-full_version.result | 6 +- docqueries/version/doc-version.result | 2 +- .../de/LC_MESSAGES/pgrouting_doc_strings.po | 2 +- .../en/LC_MESSAGES/pgrouting_doc_strings.po | 29 +- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 2 +- .../ja/LC_MESSAGES/pgrouting_doc_strings.po | 2 +- .../ko/LC_MESSAGES/pgrouting_doc_strings.po | 2 +- locale/pot/index.pot | 2 +- locale/pot/pgrouting_doc_strings.pot | 23 +- .../LC_MESSAGES/pgrouting_doc_strings.po | 2 +- sql/scripts/build-extension-update-files.pl | 3 +- sql/sigs/pgrouting--3.7.sig | 340 ++++++++++++++++++ tools/testers/pg_prove_tests.sh | 2 +- 19 files changed, 416 insertions(+), 27 deletions(-) create mode 100644 sql/sigs/pgrouting--3.7.sig diff --git a/.github/workflows/boost_version.yml b/.github/workflows/boost_version.yml index 4eb30be941..4ffb372ed0 100644 --- a/.github/workflows/boost_version.yml +++ b/.github/workflows/boost_version.yml @@ -133,5 +133,5 @@ jobs: sudo service postgresql start psql -c "CREATE DATABASE ___pgr___test___;" DIR=$(git rev-parse --show-toplevel) - bash "${DIR}/tools/testers/setup_db.sh" "${PGPORT}" ___pgr___test___ "${PG_RUNNER_USER}" "3.6.1" + bash "${DIR}/tools/testers/setup_db.sh" "${PGPORT}" ___pgr___test___ "${PG_RUNNER_USER}" "3.7.0" pg_prove -Q -f --normalize --directives --recurse -U "${PG_RUNNER_USER}" -d ___pgr___test___ "pgtap" diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 9d3b2e84d5..b9ebf34b37 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.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.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 @@ -122,6 +122,6 @@ jobs: run: | sudo service postgresql start psql -p "${PGPORT}" -d ___pgr___test___ -c "SELECT * FROM pgr_full_version();" - psql -p "${PGPORT}" -d ___pgr___test___ -c "ALTER EXTENSION pgrouting UPDATE TO '3.6.1';" + psql -p "${PGPORT}" -d ___pgr___test___ -c "ALTER EXTENSION pgrouting UPDATE TO '3.7.0';" psql -p "${PGPORT}" -d ___pgr___test___ -c "SELECT * FROM pgr_full_version();" pg_prove -Q -f --normalize --directives --recurse -U "${PG_RUNNER_USER}" -d ___pgr___test___ "pgtap" diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e2953e329..9052c3284f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,9 +18,9 @@ include(pgr/BuildType) #--------------------------------------------- #--------------------------------------------- -project(PGROUTING VERSION 3.6.1 +project(PGROUTING VERSION 3.7.0 LANGUAGES C CXX ) -set(PROJECT_VERSION_DEV "") +set(PROJECT_VERSION_DEV "-dev") string(TOLOWER "${PROJECT_NAME}" PROJECT_NAME_LOWER) include(pgr/GitInfo) @@ -31,8 +31,9 @@ set(PROJECT_LIB_NAME "${PROJECT_NAME_LOWER}-${PROJECT_LIB_VERSION}") string(TIMESTAMP COMPILATION_DATE "%Y/%m/%d" UTC) -set(MINORS 3.6 3.5 3.4 3.3 3.2 3.1 3.0 2.6) +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.1 3.6.0 3.5.1 3.5.0 diff --git a/NEWS b/NEWS index 903b5b1271..63edbf0835 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +pgRouting 3.7.0 Release Notes +------------------------------------------------------------------------------- + +No Changes Yet + pgRouting 3.6.1 Release Notes ------------------------------------------------------------------------------- diff --git a/doc/_static/page_history.js b/doc/_static/page_history.js index f5a5b65ac8..90a26de1f0 100644 --- a/doc/_static/page_history.js +++ b/doc/_static/page_history.js @@ -4,7 +4,7 @@ function createInfo(file, newat, altnames = '') { this.altnames = altnames; } -var versionsArr = ['3.6', '3.5', '3.4', '3.3', '3.2', '3.1', '3.0']; +var versionsArr = ['3.7', '3.6', '3.5', '3.4', '3.3', '3.2', '3.1', '3.0']; var unsuportedArr = ['2.6', '2.5', '2.4', '2.3', '2.2', '2.1', '2.0']; var titles = [ {k: 'en', v: ['Supported versions', 'Unsupported versions']}, diff --git a/doc/src/release_notes.rst b/doc/src/release_notes.rst index b27e6fad93..07561006d2 100644 --- a/doc/src/release_notes.rst +++ b/doc/src/release_notes.rst @@ -20,6 +20,12 @@ To see the full list of changes check the list of `Git commits :local: + +pgRouting 3.7.0 Release Notes +------------------------------------------------------------------------------- + +No Changes Yet + pgRouting 3.6.1 Release Notes ------------------------------------------------------------------------------- diff --git a/docqueries/version/doc-full_version.result b/docqueries/version/doc-full_version.result index 4657f16d07..9b8c27a06b 100644 --- a/docqueries/version/doc-full_version.result +++ b/docqueries/version/doc-full_version.result @@ -4,9 +4,9 @@ SET client_min_messages TO NOTICE; SET /* -- q1 */ SELECT version, library FROM pgr_full_version(); - version | library ----------+----------------- - 3.6.1 | pgrouting-3.6.1 + version | library +-----------+----------------- + 3.7.0-dev | pgrouting-3.7.0 (1 row) /* -- q2 */ diff --git a/docqueries/version/doc-version.result b/docqueries/version/doc-version.result index e59f153e08..6b23561635 100644 --- a/docqueries/version/doc-version.result +++ b/docqueries/version/doc-version.result @@ -6,7 +6,7 @@ SET SELECT pgr_version(); pgr_version ------------- - 3.6.1 + 3.7.0-dev (1 row) /* -- q2 */ diff --git a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po index e72e650c10..5d674bbd85 100644 --- a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.6.1 +# Copyright (C) pgRouting Contributors - Version v3.7.0-dev # This file is distributed under the same license as the pgRouting package. # Regina Obe , 2023. msgid "" diff --git a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po index 44b4c5f438..897fd62502 100644 --- a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.6.1 +# Copyright (C) pgRouting Contributors - Version v3.7.0-dev # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , 2022. # @@ -8,14 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-19 19:56+0000\n" +"POT-Creation-Date: 2023-12-30 16:20-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.13.0\n" +"Generated-By: Babel 2.12.1\n" msgid "BFS - Category" msgstr "" @@ -6840,7 +6840,7 @@ msgid "Upgrading the database" msgstr "" msgid "" -"To upgrade pgRouting in the database to version 3.6.0 use the following " +"To upgrade pgRouting in the database to version 3.7.0 use the following " "command:" msgstr "" @@ -15179,6 +15179,27 @@ msgid "" "`_ on Github." msgstr "" +msgid "pgRouting 3.7.0 Release Notes" +msgstr "" + +msgid "No Changes Yet" +msgstr "" + +msgid "pgRouting 3.6.1 Release Notes" +msgstr "" + +#, python-format +msgid "" +"To see all issues & pull requests closed by this release see the `Git " +"closed milestone for 3.6.1 " +"`_" +msgstr "" + +msgid "" +"`#2588 `__ pgrouting " +"3.6.0 fails to build on OSX" +msgstr "" + msgid "pgRouting 3.6.0 Release Notes" msgstr "" diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index f910203549..a36a6da29c 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.6.1 +# Copyright (C) pgRouting Contributors - Version v3.7.0-dev # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , 2022. # Pedro Jose Rios Vergara , 2022. diff --git a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po index 111aec1dca..ea520de670 100644 --- a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po @@ -1,6 +1,6 @@ # #-#-#-#-# allpairs-family.po (pgRouting v3.4.0-dev) #-#-#-#-# # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.6.1 +# Copyright (C) pgRouting Contributors - Version v3.7.0-dev # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , 2022. # Translators: diff --git a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po index 3e53a22a0a..d555c09496 100644 --- a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.6.1 +# Copyright (C) pgRouting Contributors - Version v3.7.0-dev # This file is distributed under the same license as the pgRouting package. # Regina Obe , 2022. # Hyung-Gyu Ryoo , 2022. diff --git a/locale/pot/index.pot b/locale/pot/index.pot index efe2b97fa4..de511208d8 100644 --- a/locale/pot/index.pot +++ b/locale/pot/index.pot @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.6.1 +# Copyright (C) pgRouting Contributors - Version v3.7.0-dev # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , YEAR. # diff --git a/locale/pot/pgrouting_doc_strings.pot b/locale/pot/pgrouting_doc_strings.pot index 36984ae833..82df262d46 100644 --- a/locale/pot/pgrouting_doc_strings.pot +++ b/locale/pot/pgrouting_doc_strings.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.6.1 +# Copyright (C) pgRouting Contributors - Version v3.7.0-dev # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: pgRouting v3.6.0-dev\n" +"Project-Id-Version: pgRouting v3.7.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-19 19:56+0000\n" +"POT-Creation-Date: 2023-12-30 16:20-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -6013,7 +6013,7 @@ msgstr "" msgid "Upgrading the database" msgstr "" -msgid "To upgrade pgRouting in the database to version 3.6.0 use the following command:" +msgid "To upgrade pgRouting in the database to version 3.7.0 use the following command:" msgstr "" msgid "More information can be found in https://www.postgresql.org/docs/current/sql-createextension.html" @@ -12907,6 +12907,21 @@ msgstr "" msgid "To see the full list of changes check the list of `Git commits `_ on Github." msgstr "" +msgid "pgRouting 3.7.0 Release Notes" +msgstr "" + +msgid "No Changes Yet" +msgstr "" + +msgid "pgRouting 3.6.1 Release Notes" +msgstr "" + +msgid "To see all issues & pull requests closed by this release see the `Git closed milestone for 3.6.1 `_" +msgstr "" + +msgid "`#2588 `__ pgrouting 3.6.0 fails to build on OSX" +msgstr "" + msgid "pgRouting 3.6.0 Release Notes" msgstr "" diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index a7779a281b..20785845ff 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.6.1 +# Copyright (C) pgRouting Contributors - Version v3.7.0-dev # This file is distributed under the same license as the pgRouting package. # Regina Obe , 2023. # Wangdapeng , 2023. diff --git a/sql/scripts/build-extension-update-files.pl b/sql/scripts/build-extension-update-files.pl index 80071fa070..012946b082 100755 --- a/sql/scripts/build-extension-update-files.pl +++ b/sql/scripts/build-extension-update-files.pl @@ -63,6 +63,7 @@ my $version_3_4 = qr/(3.4.[\d+])/; my $version_3_5 = qr/(3.5.[\d+])/; my $version_3_6 = qr/(3.6.[\d+])/; +my $version_3_7 = qr/(3.7.[\d+])/; # add minor here my $version_2 = qr/(2.[\d+].[\d+])/; @@ -72,7 +73,7 @@ my $mayor_format = qr/([\d+]).[\d+].[\d+]/; -my $current = $version_3_6; +my $current = $version_3_7; sub Usage { diff --git a/sql/sigs/pgrouting--3.7.sig b/sql/sigs/pgrouting--3.7.sig new file mode 100644 index 0000000000..43906c0b1e --- /dev/null +++ b/sql/sigs/pgrouting--3.7.sig @@ -0,0 +1,340 @@ +pgr_alphashape(geometry,double precision) +_pgr_alphashape(text,double precision) +pgr_analyzegraph(text,double precision,text,text,text,text,text) +pgr_analyzeoneway(text,text[],text[],text[],text[],boolean,text,text,text) +_pgr_array_reverse(anyarray) +_pgr_articulationpoints(text) +pgr_articulationpoints(text) +pgr_astarcostmatrix(text,anyarray,boolean,integer,double precision,double precision) +pgr_astarcost(text,anyarray,anyarray,boolean,integer,double precision,double precision) +pgr_astarcost(text,anyarray,bigint,boolean,integer,double precision,double precision) +pgr_astarcost(text,bigint,anyarray,boolean,integer,double precision,double precision) +pgr_astarcost(text,bigint,bigint,boolean,integer,double precision,double precision) +pgr_astarcost(text,text,boolean,integer,double precision,double precision) +pgr_astar(text,anyarray,anyarray,boolean,integer,double precision,double precision) +_pgr_astar(text,anyarray,anyarray,boolean,integer,double precision,double precision,boolean,boolean) +pgr_astar(text,anyarray,bigint,boolean,integer,double precision,double precision) +pgr_astar(text,bigint,anyarray,boolean,integer,double precision,double precision) +pgr_astar(text,bigint,bigint,boolean,integer,double precision,double precision) +pgr_astar(text,text,boolean,integer,double precision,double precision) +_pgr_astar(text,text,boolean,integer,double precision,double precision,boolean) +pgr_bdastarcostmatrix(text,anyarray,boolean,integer,numeric,numeric) +pgr_bdastarcost(text,anyarray,anyarray,boolean,integer,numeric,numeric) +pgr_bdastarcost(text,anyarray,bigint,boolean,integer,numeric,numeric) +pgr_bdastarcost(text,bigint,anyarray,boolean,integer,numeric,numeric) +pgr_bdastarcost(text,bigint,bigint,boolean,integer,numeric,numeric) +pgr_bdastarcost(text,text,boolean,integer,numeric,numeric) +_pgr_bdastar(text,anyarray,anyarray,boolean,integer,double precision,double precision,boolean) +pgr_bdastar(text,anyarray,anyarray,boolean,integer,numeric,numeric) +pgr_bdastar(text,anyarray,bigint,boolean,integer,numeric,numeric) +pgr_bdastar(text,bigint,anyarray,boolean,integer,numeric,numeric) +pgr_bdastar(text,bigint,bigint,boolean,integer,numeric,numeric) +_pgr_bdastar(text,text,boolean,integer,double precision,double precision,boolean) +pgr_bdastar(text,text,boolean,integer,numeric,numeric) +pgr_bddijkstracostmatrix(text,anyarray,boolean) +pgr_bddijkstracost(text,anyarray,anyarray,boolean) +pgr_bddijkstracost(text,anyarray,bigint,boolean) +pgr_bddijkstracost(text,bigint,anyarray,boolean) +pgr_bddijkstracost(text,bigint,bigint,boolean) +pgr_bddijkstracost(text,text,boolean) +pgr_bddijkstra(text,anyarray,anyarray,boolean) +_pgr_bddijkstra(text,anyarray,anyarray,boolean,boolean) +pgr_bddijkstra(text,anyarray,bigint,boolean) +pgr_bddijkstra(text,bigint,anyarray,boolean) +pgr_bddijkstra(text,bigint,bigint,boolean) +pgr_bddijkstra(text,text,boolean) +_pgr_bddijkstra(text,text,boolean,boolean) +pgr_bellmanford(text,anyarray,anyarray,boolean) +_pgr_bellmanford(text,anyarray,anyarray,boolean,boolean) +pgr_bellmanford(text,anyarray,bigint,boolean) +pgr_bellmanford(text,bigint,anyarray,boolean) +pgr_bellmanford(text,bigint,bigint,boolean) +pgr_bellmanford(text,text,boolean) +_pgr_bellmanford(text,text,boolean,boolean) +_pgr_biconnectedcomponents(text) +pgr_biconnectedcomponents(text) +_pgr_binarybreadthfirstsearch(text,anyarray,anyarray,boolean) +pgr_binarybreadthfirstsearch(text,anyarray,anyarray,boolean) +pgr_binarybreadthfirstsearch(text,anyarray,bigint,boolean) +pgr_binarybreadthfirstsearch(text,bigint,anyarray,boolean) +pgr_binarybreadthfirstsearch(text,bigint,bigint,boolean) +_pgr_binarybreadthfirstsearch(text,text,boolean) +pgr_binarybreadthfirstsearch(text,text,boolean) +_pgr_bipartite(text) +pgr_bipartite(text) +_pgr_boost_version() +pgr_boykovkolmogorov(text,anyarray,anyarray) +pgr_boykovkolmogorov(text,anyarray,bigint) +pgr_boykovkolmogorov(text,bigint,anyarray) +pgr_boykovkolmogorov(text,bigint,bigint) +pgr_boykovkolmogorov(text,text) +_pgr_breadthfirstsearch(text,anyarray,bigint,boolean) +pgr_breadthfirstsearch(text,anyarray,bigint,boolean) +pgr_breadthfirstsearch(text,bigint,bigint,boolean) +_pgr_bridges(text) +pgr_bridges(text) +_pgr_build_type() +_pgr_checkcolumn(text,text,text,boolean,boolean) +_pgr_checkquery(text) +_pgr_checkverttab(text,text[],integer,text) +pgr_chinesepostmancost(text) +pgr_chinesepostman(text) +_pgr_chinesepostman(text,boolean) +_pgr_compilation_date() +_pgr_compiler_version() +_pgr_connectedcomponents(text) +pgr_connectedcomponents(text) +_pgr_contraction(text,bigint[],integer,bigint[],boolean) +pgr_contraction(text,bigint[],integer,bigint[],boolean) +_pgr_createindex(text,text,text,integer,text) +_pgr_createindex(text,text,text,text,integer,text) +pgr_createtopology(text,double precision,text,text,text,text,text,boolean) +pgr_createverticestable(text,text,text,text,text) +_pgr_cuthillmckeeordering(text) +pgr_cuthillmckeeordering(text) +pgr_dagshortestpath(text,anyarray,anyarray) +_pgr_dagshortestpath(text,anyarray,anyarray,boolean,boolean) +pgr_dagshortestpath(text,anyarray,bigint) +pgr_dagshortestpath(text,bigint,anyarray) +pgr_dagshortestpath(text,bigint,bigint) +pgr_dagshortestpath(text,text) +_pgr_dagshortestpath(text,text,boolean,boolean) +pgr_degree(text,text,boolean) +_pgr_depthfirstsearch(text,anyarray,boolean,bigint) +pgr_depthfirstsearch(text,anyarray,boolean,bigint) +pgr_depthfirstsearch(text,bigint,boolean,bigint) +pgr_dijkstracostmatrix(text,anyarray,boolean) +pgr_dijkstracost(text,anyarray,anyarray,boolean) +pgr_dijkstracost(text,anyarray,bigint,boolean) +pgr_dijkstracost(text,bigint,anyarray,boolean) +pgr_dijkstracost(text,bigint,bigint,boolean) +pgr_dijkstracost(text,text,boolean) +pgr_dijkstranearcost(text,anyarray,anyarray,boolean,bigint,boolean) +pgr_dijkstranearcost(text,anyarray,bigint,boolean,bigint) +pgr_dijkstranearcost(text,bigint,anyarray,boolean,bigint) +pgr_dijkstranearcost(text,text,boolean,bigint,boolean) +_pgr_dijkstranear(text,anyarray,anyarray,bigint,boolean) +pgr_dijkstranear(text,anyarray,anyarray,boolean,bigint,boolean) +_pgr_dijkstranear(text,anyarray,bigint,bigint,boolean) +pgr_dijkstranear(text,anyarray,bigint,boolean,bigint) +_pgr_dijkstranear(text,bigint,anyarray,bigint,boolean) +pgr_dijkstranear(text,bigint,anyarray,boolean,bigint) +pgr_dijkstranear(text,text,boolean,bigint,boolean) +pgr_dijkstra(text,anyarray,anyarray,boolean) +_pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean,bigint) +_pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean,bigint,boolean) +pgr_dijkstra(text,anyarray,bigint,boolean) +pgr_dijkstra(text,bigint,anyarray,boolean) +pgr_dijkstra(text,bigint,bigint,boolean) +pgr_dijkstra(text,text,boolean) +_pgr_dijkstra(text,text,boolean,boolean,bigint,boolean) +_pgr_dijkstra(text,text,boolean,boolean,boolean) +_pgr_dijkstravia(text,anyarray,boolean,boolean,boolean) +pgr_dijkstravia(text,anyarray,boolean,boolean,boolean) +_pgr_drivingdistance(text,anyarray,double precision,boolean,boolean) +pgr_drivingdistance(text,anyarray,double precision,boolean,boolean) +pgr_drivingdistance(text,bigint,double precision,boolean) +_pgr_drivingdistancev4(text,anyarray,double precision,boolean,boolean) +_pgr_edgecoloring(text) +pgr_edgecoloring(text) +_pgr_edgedisjointpaths(text,anyarray,anyarray,boolean) +pgr_edgedisjointpaths(text,anyarray,anyarray,boolean) +pgr_edgedisjointpaths(text,anyarray,bigint,boolean) +pgr_edgedisjointpaths(text,bigint,anyarray,boolean) +pgr_edgedisjointpaths(text,bigint,bigint,boolean) +_pgr_edgedisjointpaths(text,text,boolean) +pgr_edgedisjointpaths(text,text,boolean) +pgr_edmondskarp(text,anyarray,anyarray) +pgr_edmondskarp(text,anyarray,bigint) +pgr_edmondskarp(text,bigint,anyarray) +pgr_edmondskarp(text,bigint,bigint) +pgr_edmondskarp(text,text) +_pgr_edwardmoore(text,anyarray,anyarray,boolean) +pgr_edwardmoore(text,anyarray,anyarray,boolean) +pgr_edwardmoore(text,anyarray,bigint,boolean) +pgr_edwardmoore(text,bigint,anyarray,boolean) +pgr_edwardmoore(text,bigint,bigint,boolean) +_pgr_edwardmoore(text,text,boolean) +pgr_edwardmoore(text,text,boolean) +_pgr_endpoint(geometry) +pgr_extractvertices(text,boolean) +pgr_findcloseedges(text,geometry,double precision,integer,boolean,boolean) +pgr_findcloseedges(text,geometry[],double precision,integer,boolean,boolean) +_pgr_floydwarshall(text,boolean) +pgr_floydwarshall(text,boolean) +pgr_full_version() +_pgr_getcolumnname(text,text,integer,text) +_pgr_getcolumnname(text,text,text,integer,text) +_pgr_getcolumntype(text,text,integer,text) +_pgr_getcolumntype(text,text,text,integer,text) +_pgr_get_statement(text) +_pgr_gettablename(text,integer,text) +_pgr_git_hash() +_pgr_hawickcircuits(text) +pgr_hawickcircuits(text) +_pgr_iscolumnindexed(text,text,integer,text) +_pgr_iscolumnindexed(text,text,text,integer,text) +_pgr_iscolumnintable(text,text) +_pgr_isplanar(text) +pgr_isplanar(text) +_pgr_johnson(text,boolean) +pgr_johnson(text,boolean) +pgr_kruskalbfs(text,anyarray,bigint) +pgr_kruskalbfs(text,bigint,bigint) +pgr_kruskaldd(text,anyarray,double precision) +pgr_kruskaldd(text,anyarray,numeric) +pgr_kruskaldd(text,bigint,double precision) +pgr_kruskaldd(text,bigint,numeric) +pgr_kruskaldfs(text,anyarray,bigint) +pgr_kruskaldfs(text,bigint,bigint) +pgr_kruskal(text) +_pgr_kruskal(text,anyarray,text,bigint,double precision) +pgr_ksp(text,anyarray,anyarray,integer,boolean,boolean) +_pgr_ksp(text,anyarray,anyarray,integer,boolean,boolean,boolean) +pgr_ksp(text,anyarray,bigint,integer,boolean,boolean) +pgr_ksp(text,bigint,anyarray,integer,boolean,boolean) +_pgr_ksp(text,bigint,bigint,integer,boolean,boolean) +pgr_ksp(text,bigint,bigint,integer,boolean,boolean) +_pgr_ksp(text,text,integer,boolean,boolean) +pgr_ksp(text,text,integer,boolean,boolean) +_pgr_lengauertarjandominatortree(text,bigint) +pgr_lengauertarjandominatortree(text,bigint) +_pgr_lib_version() +_pgr_linegraphfull(text) +pgr_linegraphfull(text) +_pgr_linegraph(text,boolean) +pgr_linegraph(text,boolean) +_pgr_makeconnected(text) +pgr_makeconnected(text) +pgr_maxcardinalitymatch(text) +_pgr_maxcardinalitymatch(text,boolean) +pgr_maxcardinalitymatch(text,boolean) +pgr_maxflowmincost_cost(text,anyarray,anyarray) +pgr_maxflowmincost_cost(text,anyarray,bigint) +pgr_maxflowmincost_cost(text,bigint,anyarray) +pgr_maxflowmincost_cost(text,bigint,bigint) +pgr_maxflowmincost_cost(text,text) +pgr_maxflowmincost(text,anyarray,anyarray) +_pgr_maxflowmincost(text,anyarray,anyarray,boolean) +pgr_maxflowmincost(text,anyarray,bigint) +pgr_maxflowmincost(text,bigint,anyarray) +pgr_maxflowmincost(text,bigint,bigint) +pgr_maxflowmincost(text,text) +_pgr_maxflowmincost(text,text,boolean) +pgr_maxflow(text,anyarray,anyarray) +_pgr_maxflow(text,anyarray,anyarray,integer,boolean) +pgr_maxflow(text,anyarray,bigint) +pgr_maxflow(text,bigint,anyarray) +pgr_maxflow(text,bigint,bigint) +pgr_maxflow(text,text) +_pgr_maxflow(text,text,integer,boolean) +_pgr_msg(integer,text,text) +pgr_nodenetwork(text,double precision,text,text,text,text,boolean) +_pgr_onerror(boolean,integer,text,text,text,text) +_pgr_operating_system() +_pgr_parameter_check(text,text,boolean) +_pgr_pgsql_version() +_pgr_pickdelivereuclidean(text,text,double precision,integer,integer) +pgr_pickdelivereuclidean(text,text,double precision,integer,integer) +_pgr_pickdeliver(text,text,text,double precision,integer,integer) +pgr_pickdeliver(text,text,text,double precision,integer,integer) +_pgr_pointtoid(geometry,double precision,text,integer) +pgr_primbfs(text,anyarray,bigint) +pgr_primbfs(text,bigint,bigint) +pgr_primdd(text,anyarray,double precision) +pgr_primdd(text,anyarray,numeric) +pgr_primdd(text,bigint,double precision) +pgr_primdd(text,bigint,numeric) +pgr_primdfs(text,anyarray,bigint) +pgr_primdfs(text,bigint,bigint) +pgr_prim(text) +_pgr_prim(text,anyarray,text,bigint,double precision) +pgr_pushrelabel(text,anyarray,anyarray) +pgr_pushrelabel(text,anyarray,bigint) +pgr_pushrelabel(text,bigint,anyarray) +pgr_pushrelabel(text,bigint,bigint) +pgr_pushrelabel(text,text) +_pgr_quote_ident(text) +_pgr_sequentialvertexcoloring(text) +pgr_sequentialvertexcoloring(text) +_pgr_startpoint(geometry) +_pgr_stoerwagner(text) +pgr_stoerwagner(text) +_pgr_strongcomponents(text) +pgr_strongcomponents(text) +_pgr_topologicalsort(text) +pgr_topologicalsort(text) +_pgr_transitiveclosure(text) +pgr_transitiveclosure(text) +_pgr_trsp(text,integer,double precision,integer,double precision,boolean,boolean,text) +pgr_trsp(text,integer,double precision,integer,double precision,boolean,boolean,text) +pgr_trsp(text,integer,integer,boolean,boolean,text) +_pgr_trsp(text,text,anyarray,anyarray,boolean) +pgr_trsp(text,text,anyarray,anyarray,boolean) +_pgr_trsp(text,text,anyarray,bigint,boolean) +pgr_trsp(text,text,anyarray,bigint,boolean) +_pgr_trsp(text,text,bigint,anyarray,boolean) +pgr_trsp(text,text,bigint,anyarray,boolean) +_pgr_trsp(text,text,bigint,bigint,boolean) +pgr_trsp(text,text,bigint,bigint,boolean) +pgr_trsp(text,text,text,boolean) +_pgr_trspv4(text,text,anyarray,anyarray,boolean) +_pgr_trspv4(text,text,text,boolean) +pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text) +_pgr_trspvia(text,text,anyarray,boolean,boolean,boolean) +pgr_trspvia(text,text,anyarray,boolean,boolean,boolean) +pgr_trspviavertices(text,anyarray,boolean,boolean,text) +_pgr_trspviavertices(text,integer[],boolean,boolean,text) +_pgr_trspvia_withpoints(text,text,text,anyarray,boolean,boolean,boolean,character,boolean) +pgr_trspvia_withpoints(text,text,text,anyarray,boolean,boolean,boolean,character,boolean) +_pgr_trsp_withpoints(text,text,text,anyarray,anyarray,boolean,character,boolean) +pgr_trsp_withpoints(text,text,text,anyarray,anyarray,boolean,character,boolean) +pgr_trsp_withpoints(text,text,text,anyarray,bigint,boolean,character,boolean) +pgr_trsp_withpoints(text,text,text,bigint,anyarray,boolean,character,boolean) +pgr_trsp_withpoints(text,text,text,bigint,bigint,boolean,character,boolean) +_pgr_trsp_withpoints(text,text,text,text,boolean,character,boolean) +pgr_trsp_withpoints(text,text,text,text,boolean,character,boolean) +_pgr_tspeuclidean(text,bigint,bigint,double precision,integer,integer,integer,double precision,double precision,double precision,boolean) +pgr_tspeuclidean(text,bigint,bigint,double precision,integer,integer,integer,double precision,double precision,double precision,boolean) +_pgr_tsp(text,bigint,bigint,double precision,integer,integer,integer,double precision,double precision,double precision,boolean) +pgr_tsp(text,bigint,bigint,double precision,integer,integer,integer,double precision,double precision,double precision,boolean) +_pgr_turnrestrictedpath(text,text,bigint,bigint,integer,boolean,boolean,boolean,boolean) +pgr_turnrestrictedpath(text,text,bigint,bigint,integer,boolean,boolean,boolean,boolean) +pgr_version() +_pgr_versionless(text,text) +_pgr_vrponedepot(text,text,text,integer) +pgr_vrponedepot(text,text,text,integer) +pgr_withpointscostmatrix(text,text,anyarray,boolean,character) +pgr_withpointscost(text,text,anyarray,anyarray,boolean,character) +pgr_withpointscost(text,text,anyarray,bigint,boolean,character) +pgr_withpointscost(text,text,bigint,anyarray,boolean,character) +pgr_withpointscost(text,text,bigint,bigint,boolean,character) +pgr_withpointscost(text,text,text,boolean,character) +_pgr_withpointsdd(text,text,anyarray,double precision,boolean,character,boolean,boolean) +pgr_withpointsdd(text,text,anyarray,double precision,boolean,character,boolean,boolean) +pgr_withpointsdd(text,text,anyarray,double precision,character,boolean,boolean,boolean) +pgr_withpointsdd(text,text,bigint,double precision,boolean,character,boolean) +pgr_withpointsdd(text,text,bigint,double precision,character,boolean,boolean) +_pgr_withpointsddv4(text,text,anyarray,double precision,character,boolean,boolean,boolean) +pgr_withpointsksp(text,text,anyarray,anyarray,integer,character,boolean,boolean,boolean) +_pgr_withpointsksp(text,text,anyarray,anyarray,integer,character,boolean,boolean,boolean,boolean) +pgr_withpointsksp(text,text,anyarray,bigint,integer,character,boolean,boolean,boolean) +pgr_withpointsksp(text,text,bigint,anyarray,integer,character,boolean,boolean,boolean) +_pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,character,boolean) +pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,character,boolean) +pgr_withpointsksp(text,text,bigint,bigint,integer,character,boolean,boolean,boolean) +_pgr_withpointsksp(text,text,text,integer,character,boolean,boolean,boolean) +pgr_withpointsksp(text,text,text,integer,character,boolean,boolean,boolean) +pgr_withpoints(text,text,anyarray,anyarray,boolean,character,boolean) +_pgr_withpoints(text,text,anyarray,anyarray,boolean,character,boolean,boolean,boolean) +pgr_withpoints(text,text,anyarray,bigint,boolean,character,boolean) +pgr_withpoints(text,text,bigint,anyarray,boolean,character,boolean) +pgr_withpoints(text,text,bigint,bigint,boolean,character,boolean) +pgr_withpoints(text,text,text,boolean,character,boolean) +_pgr_withpoints(text,text,text,boolean,character,boolean,boolean) +_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) +_v4trsp(text,text,anyarray,anyarray,boolean) +_v4trsp(text,text,text,boolean) diff --git a/tools/testers/pg_prove_tests.sh b/tools/testers/pg_prove_tests.sh index cd78868456..2ef4ce74b1 100755 --- a/tools/testers/pg_prove_tests.sh +++ b/tools/testers/pg_prove_tests.sh @@ -37,7 +37,7 @@ echo "$PGPORT" pushd ./tools/testers/ || exit 1 -bash setup_db.sh "${PGPORT}" "${PGDATABASE}" "${PGUSER}" "3.6.1" +bash setup_db.sh "${PGPORT}" "${PGDATABASE}" "${PGUSER}" "3.7.0" pg_prove --failures --Q --recurse \ --S client_min_messages=WARNING \ From ccdc5f44d054941c474a6c79f2444675f398b579 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 30 Dec 2023 18:30:28 -0600 Subject: [PATCH 010/428] Updating developers tools --- tools/developer/run.sh | 45 ++++++++++++++++++++++++++++---------- tools/developer/taptest.sh | 16 +++++++++++--- 2 files changed, 47 insertions(+), 14 deletions(-) diff --git a/tools/developer/run.sh b/tools/developer/run.sh index a03bf90c90..359a75661b 100755 --- a/tools/developer/run.sh +++ b/tools/developer/run.sh @@ -30,7 +30,7 @@ VERSION=$(grep -Po '(?<=project\(PGROUTING VERSION )[^;]+' CMakeLists.txt) echo "pgRouting VERSION ${VERSION}" # set up your postgres version, port and compiler (if more than one) -PGVERSION="13" +PGVERSION="15" PGPORT="5432" PGBIN="/usr/lib/postgresql/${PGVERSION}/bin" # When more than one compiler is installed @@ -40,7 +40,7 @@ QUERIES_DIRS=$(ls docqueries -1) TAP_DIRS=$(ls pgtap -1) QUERIES_DIRS="dijkstra" -TAP_DIRS="" +TAP_DIRS="dijkstra" function set_cmake { # Using all defaults @@ -58,6 +58,17 @@ function set_cmake { # with developers documentation #cmake -DWITH_DOC=ON -DBUILD_DOXY=ON .. + # Building using clang + #CXX=clang++ CC=clang cmake -DPOSTGRESQL_BIN=${PGBIN} -DCMAKE_BUILD_TYPE=Debug .. + + #cmake -DPOSTGRESQL_BIN=${PGBIN} -DDOC_USE_BOOTSTRAP=ON -DWITH_DOC=ON -DBUILD_DOXY=ON -DBUILD_LATEX=ON -DCMAKE_BUILD_TYPE=Debug -DES=ON -DPROJECT_DEBUG=ON .. + + # building languages -DES=ON -DJA=ON -DZH_HANS=ON -DDE=ON -DKO=ON + #cmake -DPOSTGRESQL_BIN=${PGBIN} -DDOC_USE_BOOTSTRAP=ON -DWITH_DOC=ON -DBUILD_DOXY=ON -DBUILD_LATEX=ON -DES=ON -DCMAKE_BUILD_TYPE=Debug .. + + # check link in documentation + #cmake -DPOSTGRESQL_BIN=${PGBIN} -DDOC_USE_BOOTSTRAP=ON -DWITH_DOC=ON -DES=ON -DLINKCHECK=ON -DCMAKE_BUILD_TYPE=Release .. + cmake -DPOSTGRESQL_BIN=${PGBIN} -DDOC_USE_BOOTSTRAP=ON -DWITH_DOC=ON -DBUILD_DOXY=ON -DBUILD_LATEX=ON -DCMAKE_BUILD_TYPE=Debug .. } @@ -100,32 +111,41 @@ function set_compiler { function build_doc { pushd build > /dev/null || exit 1 - #rm -rf doc/* + #rm -rf doc/* ; rm -rf locale/*/*/*.mo + rm -rf doc/* make doc + #example on how to only build spanish html + #make html-es + + # developers documentation #rm -rf doxygen/* make doxy popd > /dev/null || exit 1 } - -function test_compile { - - set_compiler "${GCC}" - - +function build { pushd build > /dev/null || exit 1 set_cmake - make -j 4 + #make -j 16 VERBOSE=1 + make -j 16 + #make sudo make install popd > /dev/null || exit 1 +} + +function test_compile { + + set_compiler "${GCC}" + + build echo -------------------------------------------- echo Execute tap_directories echo -------------------------------------------- for d in ${TAP_DIRS} do - bash taptest.sh "${d}" "-p ${PGPORT}" + time bash taptest.sh "${d}" "-p ${PGPORT}" done echo -------------------------------------------- @@ -134,9 +154,12 @@ function test_compile { for d in ${QUERIES_DIRS} do #tools/testers/doc_queries_generator.pl -alg "${d}" -documentation -pgport "${PGPORT}" + #tools/testers/doc_queries_generator.pl -alg "${d}" -debug1 -pgport "${PGPORT}" tools/testers/doc_queries_generator.pl -alg "${d}" -pgport "${PGPORT}" done + build_doc + #exit 0 tap_test action_tests } diff --git a/tools/developer/taptest.sh b/tools/developer/taptest.sh index 539477d1b3..25777967ec 100755 --- a/tools/developer/taptest.sh +++ b/tools/developer/taptest.sh @@ -37,7 +37,8 @@ QUIET="-v" QUIET="-q" PGDATABASE="___pgr___test___" -PGRVERSION="3.4.0 3.3.0 3.2.0 3.1.0 3.0.0" +PGRVERSION="3.6.1 3.6.0 3.5.1 3.5.0 3.2.0 3.1.3 3.0.6" +PGRVERSION="3.7.0" for v in ${PGRVERSION} @@ -53,11 +54,18 @@ do psql "$PGFLAGS" -d "$PGDATABASE" -X -q --set client_min_messages=WARNING --set ON_ERROR_STOP=1 --pset pager=off \ -c "CREATE EXTENSION IF NOT EXISTS pgtap; CREATE EXTENSION IF NOT EXISTS pgrouting WITH VERSION '${v}' CASCADE;" + echo "--------------------------" + echo " Installed version" + echo "--------------------------" + psql "${PGFLAGS}" -d "$PGDATABASE" -c "SELECT * FROM pgr_full_version();" + #psql "${PGFLAGS}" -d "$PGDATABASE" -c "SET client_min_messages TO DEBUG3; ALTER EXTENSION pgrouting UPDATE TO '3.7.0';" + echo "--------------------------" + echo " update version" + echo "--------------------------" psql "${PGFLAGS}" -d "$PGDATABASE" -c "SELECT * FROM pgr_full_version();" psql "${PGFLAGS}" -d "$PGDATABASE" -X -q --set client_min_messages=WARNING --set ON_ERROR_STOP=1 --pset pager=off \ -f sampledata.sql \ - -f vrppdtw_data.sql \ -f solomon_100_rc101.data.sql \ -f innerQuery.sql \ -f innerQuery_old.sql \ @@ -74,11 +82,13 @@ do -f types_check.sql \ -f via_compare.sql \ -f astar_pgtap_tests.sql \ + -f compare_dijkstra.sql \ + -f allpairs_tests.sql \ + -f contraction_tapfuncs.sql\ -f tsp_pgtap_tests.sql popd pg_prove "$QUIET" --normalize --directives --recurse "${PGFLAGS}" -d "${PGDATABASE}" "pgtap/${DIR}" - #pg_prove "$QUIET" --normalize --directive --recurse "${PGFLAGS}" -d "${PGDATABASE}" "../../pgtap/" #dropdb --if-exists "${PGFLAGS}" "${PGDATABASE}" done From 7ea586836d9114e56831e79b6d1f75282a873d8b Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 30 Dec 2023 18:21:23 -0600 Subject: [PATCH 011/428] Adjusting variables for the update script --- sql/ksp/ksp.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sql/ksp/ksp.sql b/sql/ksp/ksp.sql index 7d3d98075f..310778c7ce 100644 --- a/sql/ksp/ksp.sql +++ b/sql/ksp/ksp.sql @@ -56,7 +56,7 @@ ROWS 1000; -- one-to-many --- v3.6 +--v3.6 CREATE FUNCTION pgr_ksp( TEXT, BIGINT, @@ -84,7 +84,7 @@ COST 100 ROWS 1000; -- many-to-one --- v3.6 +--v3.6 CREATE FUNCTION pgr_ksp( TEXT, ANYARRAY, @@ -112,7 +112,7 @@ COST 100 ROWS 1000; -- many-to-many --- v3.6 +--v3.6 CREATE FUNCTION pgr_ksp( TEXT, ANYARRAY, @@ -140,7 +140,7 @@ COST 100 ROWS 1000; -- combinations --- v3.6 +--v3.6 CREATE FUNCTION pgr_ksp( TEXT, TEXT, From ec5350cbe14599beba98682b0059f45ac0fd1a79 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 2 Jan 2024 17:12:14 -0600 Subject: [PATCH 012/428] Updating missing files on locale --- locale/de/LC_MESSAGES/index.po | 2 +- locale/en/LC_MESSAGES/index.po | 2 +- locale/es/LC_MESSAGES/index.po | 2 +- locale/ja/LC_MESSAGES/index.po | 2 +- locale/ko/LC_MESSAGES/index.po | 2 +- locale/zh_Hans/LC_MESSAGES/index.po | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/locale/de/LC_MESSAGES/index.po b/locale/de/LC_MESSAGES/index.po index 8cd97e14d4..12a82e826a 100644 --- a/locale/de/LC_MESSAGES/index.po +++ b/locale/de/LC_MESSAGES/index.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.6.1 +# Copyright (C) pgRouting Contributors - Version v3.7.0-dev # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , YEAR. # diff --git a/locale/en/LC_MESSAGES/index.po b/locale/en/LC_MESSAGES/index.po index ba3bdb9369..8c31f33526 100644 --- a/locale/en/LC_MESSAGES/index.po +++ b/locale/en/LC_MESSAGES/index.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.6.1 +# Copyright (C) pgRouting Contributors - Version v3.7.0-dev # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , 2022. # diff --git a/locale/es/LC_MESSAGES/index.po b/locale/es/LC_MESSAGES/index.po index 9161b02598..83100a6434 100644 --- a/locale/es/LC_MESSAGES/index.po +++ b/locale/es/LC_MESSAGES/index.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.6.1 +# Copyright (C) pgRouting Contributors - Version v3.7.0-dev # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , 2022. # diff --git a/locale/ja/LC_MESSAGES/index.po b/locale/ja/LC_MESSAGES/index.po index 4f43aa81c6..aec2251df6 100644 --- a/locale/ja/LC_MESSAGES/index.po +++ b/locale/ja/LC_MESSAGES/index.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.6.1 +# Copyright (C) pgRouting Contributors - Version v3.7.0-dev # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , 2022. # diff --git a/locale/ko/LC_MESSAGES/index.po b/locale/ko/LC_MESSAGES/index.po index e3e5aa1cd3..65102c4152 100644 --- a/locale/ko/LC_MESSAGES/index.po +++ b/locale/ko/LC_MESSAGES/index.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.6.1 +# Copyright (C) pgRouting Contributors - Version v3.7.0-dev # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , YEAR. # diff --git a/locale/zh_Hans/LC_MESSAGES/index.po b/locale/zh_Hans/LC_MESSAGES/index.po index c81ae537e1..ba2a8f34ef 100644 --- a/locale/zh_Hans/LC_MESSAGES/index.po +++ b/locale/zh_Hans/LC_MESSAGES/index.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.6.1 +# Copyright (C) pgRouting Contributors - Version v3.7.0-dev # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , YEAR. # From 47434c923d1579170afb5697f4b3ff9a921d8f92 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 3 Jan 2024 12:23:11 -0600 Subject: [PATCH 013/428] Updating contributors names for v3.7 --- doc/src/pgRouting-introduction.rst | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/doc/src/pgRouting-introduction.rst b/doc/src/pgRouting-introduction.rst index dfe2086276..661c38a9e9 100644 --- a/doc/src/pgRouting-introduction.rst +++ b/doc/src/pgRouting-introduction.rst @@ -63,21 +63,13 @@ Contributors This Release Contributors +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -Individuals in this release (in alphabetical order) +Individuals in this release v3.7.x (in alphabetical order) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Aniket Agarwal, -Aryan Gupta, -Ashish Kumar, -Cayetano Benavent, -Daniel Kastl, -Nitish Chauhan, -Rajat Shinde, +(Alphabetical order) + Regina Obe, -Shobhit Chaurasia, -Swapnil Joshi, -Virginia Vergara, -Yige Huang +Vicky Vergara And all the people that give us a little of their time making comments, finding @@ -91,7 +83,8 @@ Corporate Sponsors in this release (in alphabetical order) These are corporate entities that have contributed developer time, hosting, or direct monetary funding to the pgRouting project: -- `Georepublic `__ +- `OSGeo `__ +- `OSGeo UK `__ - `Google Summer of Code `__ - `Paragon Corporation `__ @@ -171,6 +164,8 @@ direct monetary funding to the pgRouting project: - iMaptools - Leopark - Orkney +- OSGeo +- OSGeo UK - Paragon Corporation - Versaterm Inc. @@ -184,5 +179,4 @@ More Information https://www.postgresql.org. * PostGIS extension at the PostGIS project web site https://postgis.net. * Boost C++ source libraries at https://www.boost.org. -* The Migration guide from 2.6 can be found at - https://github.com/pgRouting/pgrouting/wiki/Migration-Guide. +* :doc:`migration` From 1fb99d9512a6d79e05c4e073007bd557012ec0c1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 3 Jan 2024 19:33:29 +0000 Subject: [PATCH 014/428] Update locale: commit 47434c923d --- .../en/LC_MESSAGES/pgrouting_doc_strings.po | 32 +++++++++++-------- locale/pot/pgrouting_doc_strings.pot | 25 ++++++++++----- 2 files changed, 35 insertions(+), 22 deletions(-) diff --git a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po index 897fd62502..c017dc66f5 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: 2023-12-30 16:20-0600\n" +"POT-Creation-Date: 2024-01-03 19:33+0000\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.12.1\n" +"Generated-By: Babel 2.14.0\n" msgid "BFS - Category" msgstr "" @@ -7178,13 +7178,13 @@ msgstr "" msgid "This Release Contributors" msgstr "" -msgid "Individuals in this release (in alphabetical order)" +msgid "Individuals in this release v3.7.x (in alphabetical order)" msgstr "" -msgid "" -"Aniket Agarwal, Aryan Gupta, Ashish Kumar, Cayetano Benavent, Daniel " -"Kastl, Nitish Chauhan, Rajat Shinde, Regina Obe, Shobhit Chaurasia, " -"Swapnil Joshi, Virginia Vergara, Yige Huang" +msgid "(Alphabetical order)" +msgstr "" + +msgid "Regina Obe, Vicky Vergara" msgstr "" msgid "" @@ -7201,7 +7201,10 @@ msgid "" "hosting, or direct monetary funding to the pgRouting project:" msgstr "" -msgid "`Georepublic `__" +msgid "`OSGeo `__" +msgstr "" + +msgid "`OSGeo UK `__" msgstr "" msgid "`Google Summer of Code `__" @@ -7256,6 +7259,12 @@ msgstr "" msgid "Orkney" msgstr "" +msgid "OSGeo" +msgstr "" + +msgid "OSGeo UK" +msgstr "" + msgid "Paragon Corporation" msgstr "" @@ -7281,9 +7290,7 @@ msgstr "" msgid "Boost C++ source libraries at https://www.boost.org." msgstr "" -msgid "" -"The Migration guide from 2.6 can be found at " -"https://github.com/pgRouting/pgrouting/wiki/Migration-Guide." +msgid ":doc:`migration`" msgstr "" msgid "pgr_KSP" @@ -12785,9 +12792,6 @@ msgstr "" msgid "Identifier of the edge in the original query." msgstr "" -msgid ":doc:`migration`" -msgstr "" - msgid "https://www.boost.org/libs/graph/doc/maximum_matching.html" msgstr "" diff --git a/locale/pot/pgrouting_doc_strings.pot b/locale/pot/pgrouting_doc_strings.pot index 82df262d46..633ce7f019 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: 2023-12-30 16:20-0600\n" +"POT-Creation-Date: 2024-01-03 19:33+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -6304,10 +6304,13 @@ msgstr "" msgid "This Release Contributors" msgstr "" -msgid "Individuals in this release (in alphabetical order)" +msgid "Individuals in this release v3.7.x (in alphabetical order)" msgstr "" -msgid "Aniket Agarwal, Aryan Gupta, Ashish Kumar, Cayetano Benavent, Daniel Kastl, Nitish Chauhan, Rajat Shinde, Regina Obe, Shobhit Chaurasia, Swapnil Joshi, Virginia Vergara, Yige Huang" +msgid "(Alphabetical order)" +msgstr "" + +msgid "Regina Obe, Vicky Vergara" msgstr "" msgid "And all the people that give us a little of their time making comments, finding issues, making pull requests etc. in any of our products: osm2pgrouting, pgRouting, pgRoutingLayer, workshop." @@ -6319,7 +6322,10 @@ msgstr "" msgid "These are corporate entities that have contributed developer time, hosting, or direct monetary funding to the pgRouting project:" msgstr "" -msgid "`Georepublic `__" +msgid "`OSGeo `__" +msgstr "" + +msgid "`OSGeo UK `__" msgstr "" msgid "`Google Summer of Code `__" @@ -6361,6 +6367,12 @@ msgstr "" msgid "Orkney" msgstr "" +msgid "OSGeo" +msgstr "" + +msgid "OSGeo UK" +msgstr "" + msgid "Paragon Corporation" msgstr "" @@ -6382,7 +6394,7 @@ msgstr "" msgid "Boost C++ source libraries at https://www.boost.org." msgstr "" -msgid "The Migration guide from 2.6 can be found at https://github.com/pgRouting/pgrouting/wiki/Migration-Guide." +msgid ":doc:`migration`" msgstr "" msgid "pgr_KSP" @@ -10963,9 +10975,6 @@ msgstr "" msgid "Identifier of the edge in the original query." msgstr "" -msgid ":doc:`migration`" -msgstr "" - msgid "https://www.boost.org/libs/graph/doc/maximum_matching.html" msgstr "" From a3000a5fce14c37a10c88543e5124355c12e985c Mon Sep 17 00:00:00 2001 From: Vicky Vergara Date: Wed, 3 Jan 2024 22:07:18 -0600 Subject: [PATCH 015/428] Drivingdistance cleanup (#2599) * Enhancement of drivingDist.hpp * Adjusting code to changes * Updating release notes & NEWS --- NEWS | 9 +- doc/src/release_notes.rst | 9 +- .../withPoints/doc-pgr_withPointsDD.result | 16 +- include/dijkstra/drivingDist.hpp | 763 ++++++++---------- include/visitors/dijkstra_visitors.hpp | 35 +- src/driving_distance/drivedist_driver.cpp | 7 +- src/driving_distance/withPoints_dd_driver.cpp | 7 +- 7 files changed, 360 insertions(+), 486 deletions(-) diff --git a/NEWS b/NEWS index 63edbf0835..6d9cfc0007 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,14 @@ pgRouting 3.7.0 Release Notes ------------------------------------------------------------------------------- -No Changes Yet +To see all issues & pull requests closed by this release see the `Git closed +milestone for 3.7.0 +`_ + +**Code enhancement** + +* [#2599](https://github.com/pgRouting/pgrouting/pull/2599) Driving distance + cleanup pgRouting 3.6.1 Release Notes ------------------------------------------------------------------------------- diff --git a/doc/src/release_notes.rst b/doc/src/release_notes.rst index 07561006d2..111b7c095d 100644 --- a/doc/src/release_notes.rst +++ b/doc/src/release_notes.rst @@ -24,7 +24,14 @@ To see the full list of changes check the list of `Git commits pgRouting 3.7.0 Release Notes ------------------------------------------------------------------------------- -No Changes Yet +To see all issues & pull requests closed by this release see the `Git closed +milestone for 3.7.0 +`_ + +.. rubric:: Code enhancement + +* `#2599 `__ Driving distance + cleanup pgRouting 3.6.1 Release Notes ------------------------------------------------------------------------------- diff --git a/docqueries/withPoints/doc-pgr_withPointsDD.result b/docqueries/withPoints/doc-pgr_withPointsDD.result index efef2cd6ba..73feef7dec 100644 --- a/docqueries/withPoints/doc-pgr_withPointsDD.result +++ b/docqueries/withPoints/doc-pgr_withPointsDD.result @@ -83,8 +83,8 @@ SELECT * FROM pgr_withPointsDD( 1 | 0 | -2 | -2 | -2 | -1 | 0 | 0 2 | 1 | -2 | -2 | 11 | 8 | 0.1 | 0.1 3 | 2 | -2 | 11 | 16 | 9 | 1 | 1.1 - 4 | 2 | -2 | 11 | 7 | 8 | 1 | 1.1 - 5 | 2 | -2 | 11 | 12 | 11 | 1 | 1.1 + 4 | 2 | -2 | 11 | 12 | 11 | 1 | 1.1 + 5 | 2 | -2 | 11 | 7 | 8 | 1 | 1.1 6 | 3 | -2 | 12 | 17 | 13 | 1 | 2.1 7 | 3 | -2 | 16 | 15 | 16 | 1 | 2.1 8 | 3 | -2 | 7 | 8 | 10 | 1 | 2.1 @@ -93,14 +93,14 @@ SELECT * FROM pgr_withPointsDD( 11 | 0 | -1 | -1 | -1 | -1 | 0 | 0 12 | 1 | -1 | -1 | 11 | 5 | 0.2 | 0.2 13 | 2 | -1 | 11 | 7 | 8 | 1 | 1.2 - 14 | 2 | -1 | 11 | 12 | 11 | 1 | 1.2 - 15 | 2 | -1 | 11 | 16 | 9 | 1 | 1.2 + 14 | 2 | -1 | 11 | 16 | 9 | 1 | 1.2 + 15 | 2 | -1 | 11 | 12 | 11 | 1 | 1.2 16 | 3 | -1 | 7 | -2 | 8 | 0.9 | 2.1 - 17 | 3 | -1 | 12 | 17 | 13 | 1 | 2.2 - 18 | 3 | -1 | 16 | 15 | 16 | 1 | 2.2 + 17 | 3 | -1 | 7 | 3 | 7 | 1 | 2.2 + 18 | 3 | -1 | 7 | 6 | 4 | 1 | 2.2 19 | 3 | -1 | 7 | 8 | 10 | 1 | 2.2 - 20 | 3 | -1 | 7 | 6 | 4 | 1 | 2.2 - 21 | 3 | -1 | 7 | 3 | 7 | 1 | 2.2 + 20 | 3 | -1 | 16 | 15 | 16 | 1 | 2.2 + 21 | 3 | -1 | 12 | 17 | 13 | 1 | 2.2 (21 rows) /* -- q6 */ diff --git a/include/dijkstra/drivingDist.hpp b/include/dijkstra/drivingDist.hpp index a8e16543cc..9c9e02d314 100644 --- a/include/dijkstra/drivingDist.hpp +++ b/include/dijkstra/drivingDist.hpp @@ -41,13 +41,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include -#include -#include #include #include #include #include -#include + #include #include @@ -59,6 +57,102 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "visitors/dijkstra_visitors.hpp" +namespace bg_detail { + +/** @brief Dijkstra 1 to distance + * + * Used on: + * - 1 to distance + * - many to distance + * - On the first call of many to distance with equi_cost + * + * @param [in] bg boost graph + * @param [in] root vertex root of the spanning tree + * @param [in] distance maximum distance. + * @param [in] predecessors predecessors list + * @param [in] distances distances from root + */ +template +void dijkstra_1_to_distance( + const B_G &bg, + V root, + std::vector &predecessors, + std::vector &distances, + double distance) { + CHECK_FOR_INTERRUPTS(); + try { + boost::dijkstra_shortest_paths(bg, root, + boost::predecessor_map(&predecessors[0]) + .weight_map(get(&T_E::cost, bg)) + .distance_map(&distances[0]) + .visitor(pgrouting::visitors::dijkstra_distance_visitor(distance, distances))); + } catch(pgrouting::found_goals &) { + /*No op*/ + } catch (boost::exception const&) { + throw; + } catch (std::exception&) { + throw; + } catch (...) { + throw; + } +} + +/** @brief Dijkstra 1 to distance no initialization + * + * Used on: + * On the subsequent calls of many to distance with equi_cost + * + * @param [in] bg boost graph + * @param [in] root vertex root of the spanning tree + * @param [in] distance maximum distance. + * @param [in] predecessors predecessors list + * @param [in] distances distances from root + */ +template +void dijkstra_1_to_distance_no_init( + const B_G &bg, + V root, + std::vector &predecessors, + std::vector &distances, + double distance) { + pgassert(predecessors.size() == num_vertices(bg)); + pgassert(distances.size() == num_vertices(bg)); + + distances[root] = 0; + /* + * Not using the default, because vertices visited from other roots are marked color black + */ + std::vector color_map(num_vertices(bg)); + auto vidx(boost::get(boost::vertex_index, bg)); + + CHECK_FOR_INTERRUPTS(); + try { + boost::dijkstra_shortest_paths_no_init(bg, root, + make_iterator_property_map(predecessors.begin(), vidx), + make_iterator_property_map(distances.begin(), vidx), + get(&G_T_E::cost, bg), + vidx, + std::less(), + boost::closed_plus(), + static_cast(0), + pgrouting::visitors::dijkstra_distance_visitor_no_init(root, distance, predecessors, distances, + color_map), + make_iterator_property_map(color_map.begin(), vidx, color_map[0])); + } catch(pgrouting::found_goals &) { + /* no op */ + } catch (boost::exception const& ex) { + (void)ex; + throw; + } catch (std::exception &e) { + (void)e; + throw; + } catch (...) { + throw; + } +} + +} // namespace bg_detail + namespace detail { /* notation: @@ -68,12 +162,13 @@ namespace detail { */ template void remove_details(const G &graph, - std::vector &distances, - std::vector &predecessors) { + const std::vector &distances, + std::vector &predecessors) { /* * find all the points that are predecessors */ std::set node_with_predecessor_point; + CHECK_FOR_INTERRUPTS(); for (V v = 0; v < predecessors.size() ; ++v) { /* * skipping unreachable nodes and or initial node @@ -97,10 +192,10 @@ void remove_details(const G &graph, pgassert(graph[u].id < 0); /* - * while u is a point and its predecessor is not itself + * while u is a point and it's predecessor is not itself */ + CHECK_FOR_INTERRUPTS(); while (graph[u].id < 0 && predecessors[u] != u) { - CHECK_FOR_INTERRUPTS(); pgassert(graph[u].id < 0); pgassert(distances[v] != std::numeric_limits::infinity()); v = u; @@ -119,13 +214,14 @@ void remove_details(const G &graph, * @param [in] distances An array of vertices @b id * @param [in] predecessors an array of predecessors * @param [in] distance the max distance + * @param [in] details the max distance */ template std::map get_depth( const G &graph, V root, - std::vector &distances, - std::vector &predecessors, + const std::vector& distances, + std::vector& predecessors, double distance, bool details) { std::map depth; @@ -179,458 +275,239 @@ std::map get_depth( return depth; } -} // namespace detail +/** @brief gets results for many vertices and equi costs + * + * @param [in] graph The graph that is being worked + * @param [in] roots a set of roots + * @param [in] predecessors an array of predecessors + * @param [in] noDetailsPredecessors veritces that do not have a predecessor + * @param [in] distances a map of distances + * @param [in] distance maximum distance + * @param [in] details flag to indicate to include points + * + * @pre one predecessor per root + */ +template +std::deque get_drivingDistance_with_equicost_paths( + const G &graph, + const std::set &roots, + std::deque> &predecessors, + std::vector &distances, + std::deque> &noDetailsPredecessors, + double distance, bool details) { + using Path = pgrouting::Path; + pgassert(roots.size() == predecessors.size()); -namespace pgrouting { -// TODO(v4) convert to functions + /* + * Creating all the result "paths" + */ + std::deque paths; + for (const auto r : roots) { + paths.push_back(Path(r, r)); + paths.back().push_back({r, -1, 0, 0, r}); + } -namespace algorithm { -template < class G > class Pgr_dijkstra; -} // namespace algorithm + /* + * Ciclying the vertices: + * To which vertex do they belong to? + */ + for (V v = 0; v < distances.size(); ++v) { + /* + * Sikiping distances greater than the one asked for + */ + if (!(distances[v] <= distance)) continue; + + for (auto i = roots.size(); i > 0; --i) { + const auto &predecessor = predecessors[i - 1]; + /* + * The vertex does not exist on the graph + * The predecessor = current then its unreachable to this vertex + */ + if (predecessor.empty()) break; + if (predecessor[v] == v) continue; -template -std::deque -pgr_drivingdistance( + auto u = details? predecessor[v] : noDetailsPredecessors[i - 1][v]; + /* + * precalculating cost to find the edge + */ + auto cost = distances[v] - distances[predecessor[v]]; + auto edge_id = graph.get_edge_id(predecessor[v], v, cost); + pgassert(edge_id != -1); + /* + * real cost is with real predecessor + */ + cost = details? cost : distances[v] - distances[u]; + paths[i - 1].push_back({graph[v].id, edge_id, cost, distances[v], graph[u].id}); + break; + } + } + + for (auto &path : paths) { + path.sort_by_node_agg_cost(); + } + return paths; +} + +/* preparation for many to distance with equicost + * + * The distances vector does not change + * The predecessors vector does not change + * The first @b valid execution is done normally: + * - The distances will have: + * - inf + * - values < distance + * - values > distance + * Subsequent @b valid executions + * - will not change the: + * - values < distance + * Don't know yet what happens to predecessors + */ +template +std::deque drivingDistance_with_equicost( G &graph, - const std::vector &start_vids, - double distance, - bool equicost, + const std::set &roots, std::vector> &depths, - bool details) { - algorithm::Pgr_dijkstra fn_dijkstra; - return fn_dijkstra.drivingDistance(graph, start_vids, distance, equicost, depths, details); -} + double distance, bool details) { + using V = typename G::V; + using E = typename G::E; + using T_E = typename G::G_T_E; + using B_G = typename G::B_G; -namespace algorithm { + depths.resize(roots.size()); + std::vector predecessors(graph.num_vertices()); + std::vector distances(graph.num_vertices(), std::numeric_limits::infinity()); -template < class G > -class Pgr_dijkstra { - public: - typedef typename G::V V; - typedef typename G::E E; - - //! @name drivingDistance - //@{ - //! 1 to distance - Path drivingDistance( - G &graph, - int64_t start_vertex, - double distance) { - if (execute_drivingDistance( - graph, - start_vertex, - distance)) { - auto path = Path(graph, - start_vertex, - distance, - predecessors, - distances); - - std::sort(path.begin(), path.end(), - [](const Path_t &l, const Path_t &r) - {return l.node < r.node;}); - std::stable_sort(path.begin(), path.end(), - [](const Path_t &l, const Path_t &r) - {return l.agg_cost < r.agg_cost;}); - return path; + std::deque> pred(roots.size()); + std::deque> noDetailsPredecessors(roots.size()); + + size_t i = 0; + for (const auto &root : roots) { + /* + * The vertex does not exist Nothing to do + */ + if (!(graph.has_vertex(root))) continue; + + std::iota(predecessors.begin(), predecessors.end(), 0); + bg_detail::dijkstra_1_to_distance_no_init(graph.graph, graph.get_V(root), predecessors, + distances, distance); + + pred[i] = predecessors; + depths[i] = detail::get_depth(graph, graph.get_V(root), distances, predecessors, distance, details); + if (!details) { + noDetailsPredecessors[i] = predecessors; } + ++i; + } - /* The result is empty */ - Path p(start_vertex, start_vertex); - p.push_back({start_vertex, -1, 0, 0}); - return p; - } - - // preparation for many to distance - std::deque drivingDistance( - G &graph, - const std::vector &start_vertex, - double distance, - bool equicost, - std::vector> &depths, - bool details) { - if (equicost) { - return drivingDistance_with_equicost( - graph, - start_vertex, - depths, - distance, details); - } else { - return drivingDistance_no_equicost( - graph, - start_vertex, - depths, - distance, details); - } - } - - - - - - - //@} - - - private: - /** Call to Dijkstra 1 to distance - * - * Used on: - * 1 to distance - * many to distance - * On the first call of many to distance with equi_cost - */ - bool dijkstra_1_to_distance( - G &graph, - V source, - double distance) { - /* abort in case of an interruption occurs (e.g. the query is being cancelled) */ - CHECK_FOR_INTERRUPTS(); - try { - boost::dijkstra_shortest_paths(graph.graph, source, - boost::predecessor_map(&predecessors[0]) - .weight_map(get(&G::G_T_E::cost, graph.graph)) - .distance_map(&distances[0]) - .visitor(visitors::dijkstra_distance_visitor(distance, nodesInDistance, distances))); - } catch(found_goals &) { - /*No op*/ - } catch (boost::exception const&) { - throw; - } catch (std::exception&) { - throw; - } catch (...) { - throw; - } - return true; - } - - /** Call to Dijkstra 1 to distance no init - * - * Used on: - * On the subsequent calls of many to distance with equi_cost - */ - bool dijkstra_1_to_distance_no_init( - G &graph, - V source, - double distance) { - pgassert(predecessors.size() == graph.num_vertices()); - pgassert(distances.size() == graph.num_vertices()); - distances[source] = 0; - std::vector color_map(graph.num_vertices()); - /* abort in case of an interruption occurs (e.g. the query is being cancelled) */ - CHECK_FOR_INTERRUPTS(); - try { - boost::dijkstra_shortest_paths_no_init(graph.graph, source, - make_iterator_property_map( - predecessors.begin(), - graph.vertIndex), - make_iterator_property_map( - distances.begin(), - graph.vertIndex), - get(&G::G_T_E::cost, graph.graph), - graph.vertIndex, - std::less(), - boost::closed_plus(), - static_cast(0), - visitors::dijkstra_distance_visitor_no_init(log, source, distance, predecessors, distances, - color_map), - boost::make_iterator_property_map( - color_map.begin(), - graph.vertIndex, - color_map[0])); - } catch(found_goals &) { - return true; - } catch (boost::exception const& ex) { - (void)ex; - throw; - } catch (std::exception &e) { - (void)e; - throw; - } catch (...) { - throw; - } + /* + * predecessors of root vertices are themselves + */ + for (const auto &root : roots) { + for (auto &p : pred) { + if (!p.empty() && graph.has_vertex(root)) + p[graph.get_V(root)] = graph.get_V(root); + } + } - return true; - } - - - /** @brief to use with driving distance - * - * Prepares the execution for a driving distance: - * - * @param graph - * @param start_vertex - * @param distance - * - * Results are kept on predecessor & distances - * - * @returns bool @b True when results are found - */ - bool execute_drivingDistance( - G &graph, - int64_t start_vertex, - double distance) { - clear(); - - predecessors.resize(graph.num_vertices()); - distances.resize( - graph.num_vertices(), - std::numeric_limits::infinity()); - - // get source; - if (!graph.has_vertex(start_vertex)) { - return false; - } + return get_drivingDistance_with_equicost_paths( + graph, + roots, + pred, + distances, + noDetailsPredecessors, + distance, details); +} - return dijkstra_1_to_distance( - graph, - graph.get_V(start_vertex), - distance); - } - - - /** @brief to use with driving distance - * - * Prepares the execution for a driving distance: - * - * @param graph - * @param start_vertex - * @param distance - * - * Results are kept on predecessor & distances - * - * @returns bool @b True when results are found - */ - bool execute_drivingDistance_no_init( - G &graph, - V start_vertex, - double distance) { - pgassert(predecessors.size() == graph.num_vertices()); - pgassert(distances.size() == graph.num_vertices()); - - std::iota(predecessors.begin(), predecessors.end(), 0); - - return dijkstra_1_to_distance_no_init( - graph, - start_vertex, - distance); - } - - /* preparation for many to distance with equicost - * - * Idea: - * The distances vector does not change - * The predecessors vector does not change - * The first @b valid execution is done normally: - * - The distances will have: - * - inf - * - values < distance - * - values > distance - * Subsequent @b valid executions - * - will not change the: - * - values < distance - * Don't know yet what happens to predecessors - */ - std::deque drivingDistance_with_equicost( - G &graph, - const std::vector &start_vertex, - std::vector> &depths, - double distance, bool details) { - clear(); - log << "Number of edges:" << boost::num_edges(graph.graph) << "\n"; - - depths.resize(start_vertex.size()); - predecessors.resize(graph.num_vertices()); - distances.resize( - graph.num_vertices(), - std::numeric_limits::infinity()); - - /* - * Vector to store the different predessesors - * each is of size = graph.num_vertices() - * - * TODO(gsoc) - * - figure out less storage if possible - */ - std::deque< std::vector> pred(start_vertex.size()); - std::deque< std::vector> nodetailspred(start_vertex.size()); - - // perform the algorithm - size_t i = 0; - for (const auto &vertex : start_vertex) { - nodesInDistance.clear(); - /* - * The vertex does not exist - * Nothing to do - */ - if (!(graph.has_vertex(vertex))) continue; - - if (execute_drivingDistance_no_init( - graph, graph.get_V(vertex), distance)) { - pred[i] = predecessors; - depths[i] = detail::get_depth(graph, graph.get_V(vertex), distances, predecessors, distance, details); - if (!details) { - nodetailspred[i] = predecessors; - } - } - ++i; - } +/** @brief gets results for many vertices and equi costs + * + * @param [in] graph The graph that is being worked + * @param [in] roots a set of roots + * @param [in] depths a vector of map of depths + * @param [in] distance maximum distance + * @param [in] details flag to indicate to include points + */ +template +std::deque drivingDistance_no_equicost( + const G &graph, + const std::set &roots, + std::vector> &depths, + double distance, bool details) { + using Path = pgrouting::Path; + using B_G = typename G::B_G; + using V = typename G::V; + using T_E = typename G::G_T_E; + std::deque paths; - /* - * predecessors of vertices in the set are themselves - */ - for (const auto &vertex : start_vertex) { - for (auto &p : pred) { - if (!p.empty() && graph.has_vertex(vertex)) - p[graph.get_V(vertex)] = graph.get_V(vertex); - } - } + for (const auto &root : roots) { + if (graph.has_vertex(root)) { + std::vector predecessors(graph.num_vertices()); + std::vector distances(graph.num_vertices(), std::numeric_limits::infinity()); + bg_detail::dijkstra_1_to_distance( + graph.graph, graph.get_V(root), predecessors, distances, distance); - return get_drivingDistance_with_equicost_paths( - graph, - start_vertex, - pred, - nodetailspred, - distance, details); - } - - /** @brief gets results in form of a container of paths - * - * @param [in] graph The graph that is being worked - * @param [in] start_vertex An array of vertices @b id - * @param [in] pred an array of predecessors - * @param [in] distance the max distance - * @pre one predecessor per root - */ - std::deque< Path > get_drivingDistance_with_equicost_paths( - G &graph, - const std::vector &start_vertex, - std::deque> &pred, - std::deque> &nodetailspred, - double distance, bool details) { - /* - * precondition - */ - pgassert(start_vertex.size() == pred.size()); - - - /* - * Creating all the result "paths" - */ - std::deque paths; - for (const auto vertex : start_vertex) { - paths.push_back(Path(vertex, vertex)); - paths.back().push_back({vertex, -1, 0, 0, vertex}); - } + auto path = Path(graph, root, distance, predecessors, distances); + path.sort_by_node_agg_cost(); + depths.push_back(detail::get_depth(graph, graph.get_V(root), distances, predecessors, distance, details)); + /* + * When details are not wanted update costs + */ + if (!details) { + for (auto &pathstop : path) { + auto node = graph.get_V(pathstop.node); - /* - * Ciclying the distances: - * To which vertex do they belong to? - */ - for (V d = 0; d < distances.size(); ++d) { - /* - * Sikiping distances greater than the one asked for - */ - if (!(distances[d] <= distance)) continue; - - for (auto i = start_vertex.size(); i > 0; --i) { - /* - * The vertex does not exist on the graph - */ - if (pred[i - 1].empty()) break; - - - /* - * The predecessor = current then - * its unreachable to this vertex - */ - if (pred[i - 1][d] == d) continue; - - auto cost = distances[d] - distances[pred[i - 1][d]]; - auto edge_id = graph.get_edge_id(pred[i - 1][d], d, cost); - int64_t pred_node = details? graph[pred[i - 1][d]].id : graph[nodetailspred[i - 1][d]].id; - pgassert(edge_id != -1); - paths[i - 1].push_back( - {graph[d].id, - edge_id, - details? cost : distances[d] - distances[nodetailspred[i - 1][d]], - distances[d], pred_node}); - break; - } - } + /* skip points */ + if (graph[node].id < 0) continue; - for (auto &path : paths) { - path.sort_by_node_agg_cost(); - } - return paths; - } - - - // preparation for many to distance No equicost - std::deque drivingDistance_no_equicost( - G &graph, - const std::vector< int64_t > &start_vertex, - std::vector> &depths, - double distance, bool details) { - // perform the algorithm - std::deque paths; - for (const auto &vertex : start_vertex) { - if (execute_drivingDistance(graph, vertex, distance)) { - auto path = Path( - graph, - vertex, - distance, - predecessors, - distances); - path.sort_by_node_agg_cost(); - auto root = graph.get_V(vertex); - depths.push_back(detail::get_depth(graph, root, distances, predecessors, distance, details)); - /* - * When details are not wanted update costs - */ - if (!details) { - for (auto &pathstop : path) { - auto node = graph.get_V(pathstop.node); - - /* skip points */ - if (graph[node].id < 0) continue; - - pathstop.cost = distances[node] - distances[predecessors[node]]; - } - log << "Updated costs of path " << path; - } - paths.push_back(path); - - } else { - Path p(vertex, vertex); - p.push_back({vertex, -1, 0, 0, vertex}); - paths.push_back(p); - std::map m; - m[vertex] = 0; - depths.push_back(m); - } - } - return paths; - } - - - void clear() { - predecessors.clear(); - distances.clear(); - nodesInDistance.clear(); - } - - //! @name members - //@{ - std::vector predecessors; - std::vector distances; - std::deque nodesInDistance; - std::ostringstream log; - //@} -}; + pathstop.cost = distances[node] - distances[predecessors[node]]; + } + } + paths.push_back(path); + + } else { + Path p(root, root); + p.push_back({root, -1, 0, 0, root}); + paths.push_back(p); + + std::map m; + m[root] = 0; + depths.push_back(m); + } + } + return paths; +} + + +} // namespace detail + + +namespace pgrouting { +namespace algorithm { + +template +std::deque drivingDistance( + const G &graph, + const std::set &roots, + double distance, + bool equicost, + std::vector> &depths, + bool details) { + if (equicost) { + return detail::drivingDistance_with_equicost( + graph, + roots, + depths, + distance, details); + } else { + return detail::drivingDistance_no_equicost( + graph, + roots, + depths, + distance, details); + } +} } // namespace algorithm } // namespace pgrouting diff --git a/include/visitors/dijkstra_visitors.hpp b/include/visitors/dijkstra_visitors.hpp index 58db9b9d7c..35fc1f195b 100644 --- a/include/visitors/dijkstra_visitors.hpp +++ b/include/visitors/dijkstra_visitors.hpp @@ -92,12 +92,9 @@ class dijkstra_distance_visitor : public boost::default_dijkstra_visitor { public: explicit dijkstra_distance_visitor( double distance_goal, - std::deque &nodesInDistance, std::vector &distances) : m_distance_goal(distance_goal), - m_nodes(nodesInDistance), m_dist(distances) { - pgassert(m_nodes.empty()); pgassert(m_distance_goal > 0); } template @@ -105,12 +102,10 @@ class dijkstra_distance_visitor : public boost::default_dijkstra_visitor { if (m_dist[u] > m_distance_goal) { throw found_goals(); } - m_nodes.push_back(u); } private: double m_distance_goal; - std::deque &m_nodes; std::vector &m_dist; }; @@ -118,69 +113,55 @@ template class dijkstra_distance_visitor_no_init : public boost::default_dijkstra_visitor { public: explicit dijkstra_distance_visitor_no_init( - std::ostringstream &p_log, - V source, + V root, double distance_goal, std::vector &predecessors, std::vector &distances, std::vector &color_map) : - log(p_log), - first(source), + m_root(root), m_distance_goal(distance_goal), m_num_examined(0), m_predecessors(predecessors), m_dist(distances), m_color(color_map) { - pgassert(m_num_examined == 0); pgassert(m_distance_goal > 0); } template void examine_vertex(V u, B_G &) { - if ( 0 == m_num_examined++) first = u; + if ( 0 == m_num_examined++) m_root = u; if (m_dist[u] > m_distance_goal) { throw found_goals(); } - if (u != first && m_predecessors[u] == u) { + if (u != m_root && m_predecessors[u] == u) { m_color[u] = boost::black_color; } } template void examine_edge(E e, B_G &g) { - if (source(e, g) != first - && m_predecessors[source(e, g)] == source(e, g)) { + if (source(e, g) != m_root && m_predecessors[source(e, g)] == source(e, g)) { m_color[target(e, g)] = boost::black_color; } } - template - void edge_relaxed(E, B_G &) { - } - template void edge_not_relaxed(E e, B_G &g) { - if (source(e, g) != first - && m_predecessors[source(e, g)] == source(e, g)) { + if (source(e, g) != m_root && m_predecessors[source(e, g)] == source(e, g)) { m_color[target(e, g)] = boost::black_color; } } - template - void finish_vertex(V, B_G &) { - } - template void discover_vertex(V u, B_G &) { - if (u != first && m_predecessors[u] == u) { + if (u != m_root && m_predecessors[u] == u) { m_color[u] = boost::black_color; } } private: - std::ostringstream &log; - V first; + V m_root; double m_distance_goal; size_t m_num_examined; std::vector &m_predecessors; diff --git a/src/driving_distance/drivedist_driver.cpp b/src/driving_distance/drivedist_driver.cpp index b9500c4c6f..dfea2383c0 100644 --- a/src/driving_distance/drivedist_driver.cpp +++ b/src/driving_distance/drivedist_driver.cpp @@ -55,6 +55,7 @@ pgr_do_drivingdist( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::algorithm::drivingDistance; std::ostringstream log; std::ostringstream err; @@ -72,18 +73,18 @@ pgr_do_drivingdist( graphType gType = directedFlag? DIRECTED: UNDIRECTED; std::deque paths; - std::vector start_vertices(start_vertex, start_vertex + s_len); + std::set start_vertices(start_vertex, start_vertex + s_len); std::vector> depths; if (directedFlag) { pgrouting::DirectedGraph digraph(gType); digraph.insert_edges(data_edges, total_edges); - paths = pgr_drivingdistance(digraph, start_vertices, distance, equiCostFlag, depths, true); + paths = drivingDistance(digraph, start_vertices, distance, equiCostFlag, depths, true); } else { pgrouting::UndirectedGraph undigraph(gType); undigraph.insert_edges(data_edges, total_edges); - paths = pgr_drivingdistance(undigraph, start_vertices, distance, equiCostFlag, depths, true); + paths = drivingDistance(undigraph, start_vertices, distance, equiCostFlag, depths, true); } size_t count(count_tuples(paths)); diff --git a/src/driving_distance/withPoints_dd_driver.cpp b/src/driving_distance/withPoints_dd_driver.cpp index 3a38abf6cc..bb50bfdb4f 100644 --- a/src/driving_distance/withPoints_dd_driver.cpp +++ b/src/driving_distance/withPoints_dd_driver.cpp @@ -66,6 +66,7 @@ pgr_do_withPointsDD( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::algorithm::drivingDistance; std::ostringstream log; std::ostringstream notice; @@ -99,7 +100,7 @@ pgr_do_withPointsDD( return; } - std::vector start_vids(start_pidsArr, start_pidsArr + s_len); + std::set start_vids(start_pidsArr, start_pidsArr + s_len); graphType gType = directed? DIRECTED: UNDIRECTED; @@ -110,12 +111,12 @@ pgr_do_withPointsDD( pgrouting::DirectedGraph digraph(gType); digraph.insert_edges(edges, total_edges); digraph.insert_edges(pg_graph.new_edges()); - paths = pgr_drivingdistance(digraph, start_vids, distance, equiCost, depths, details); + paths = drivingDistance(digraph, start_vids, distance, equiCost, depths, details); } else { pgrouting::UndirectedGraph undigraph(gType); undigraph.insert_edges(edges, total_edges); undigraph.insert_edges(pg_graph.new_edges()); - paths = pgr_drivingdistance(undigraph, start_vids, distance, equiCost, depths, details); + paths = drivingDistance(undigraph, start_vids, distance, equiCost, depths, details); } if (!details) { From ed5740546c03a9a8946ec44ed5abb4f80b5bd4d8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 4 Jan 2024 04:09:23 +0000 Subject: [PATCH 016/428] Update locale: commit a3000a5fce --- locale/en/LC_MESSAGES/pgrouting_doc_strings.po | 16 ++++++++++++++-- locale/pot/pgrouting_doc_strings.pot | 10 ++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po index c017dc66f5..afe6d3010e 100644 --- a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-03 19:33+0000\n" +"POT-Creation-Date: 2024-01-04 04:09+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -15186,7 +15186,19 @@ msgstr "" msgid "pgRouting 3.7.0 Release Notes" msgstr "" -msgid "No Changes Yet" +#, python-format +msgid "" +"To see all issues & pull requests closed by this release see the `Git " +"closed milestone for 3.7.0 " +"`_" +msgstr "" + +msgid "Code enhancement" +msgstr "" + +msgid "" +"`#2599 `__ Driving " +"distance cleanup" msgstr "" msgid "pgRouting 3.6.1 Release Notes" diff --git a/locale/pot/pgrouting_doc_strings.pot b/locale/pot/pgrouting_doc_strings.pot index 633ce7f019..64a742fa72 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-01-03 19:33+0000\n" +"POT-Creation-Date: 2024-01-04 04:09+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -12919,7 +12919,13 @@ msgstr "" msgid "pgRouting 3.7.0 Release Notes" msgstr "" -msgid "No Changes Yet" +msgid "To see all issues & pull requests closed by this release see the `Git closed milestone for 3.7.0 `_" +msgstr "" + +msgid "Code enhancement" +msgstr "" + +msgid "`#2599 `__ Driving distance cleanup" msgstr "" msgid "pgRouting 3.6.1 Release Notes" From 136e74370b0a6ca518ce5749cc7dfea75b793a5d Mon Sep 17 00:00:00 2001 From: Vicky Vergara Date: Thu, 4 Jan 2024 09:09:59 -0600 Subject: [PATCH 017/428] Test chinese (#2600) * [ci] processing chinese documentation test * adding rule --- .github/workflows/doc-check.yml | 4 ++-- doc/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/doc-check.yml b/.github/workflows/doc-check.yml index 1593d748c0..7f666bcead 100644 --- a/.github/workflows/doc-check.yml +++ b/.github/workflows/doc-check.yml @@ -52,7 +52,7 @@ jobs: strategy: fail-fast: false matrix: - language: [en,es] + language: [en,es,zh_Hans] steps: - uses: actions/checkout@v4 @@ -119,7 +119,7 @@ jobs: mkdir build cd build cmake -DLINKCHECK=ON -DWITH_DOC=ON \ - -DES=ON -DBUILD_DOXY=ON \ + -DES=ON -DZH_HANS=ON -DBUILD_DOXY=ON \ -DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_BUILD_TYPE=Release .. - name: Check Documentation diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 238af12653..d32b651da9 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -78,7 +78,7 @@ message(STATUS "PROJECT_DOC_TARGETS = ${PROJECT_DOC_TARGETS}") # Available Languages # English is always built #--------------------------------------------- -set(PROJECT_SUPPORTED_LANGUAGES "de" "es" "fr" "it" "ja" "ru") +set(PROJECT_SUPPORTED_LANGUAGES "de" "es" "fr" "it" "ja" "zh_Hans") set(PROJECT_ENGLISH "en") #--------------------------------------------- From 61c9785a0be55c15fbbe2bee9d27fc51ed212dfd Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 6 Jan 2024 09:03:54 -0600 Subject: [PATCH 018/428] Update notes2news script and applying it --- NEWS | 1719 +---------------- NEWS.md | 1696 ++++++++++++++++ doc/conf.py.in | 2 +- .../drivingDistance-category.rst | 9 - doc/driving_distance/pgr_drivingDistance.rst | 6 +- doc/src/index.rst | 9 + doc/src/release_notes.rst | 151 +- tools/release-scripts/notes2news.pl | 70 +- 8 files changed, 1901 insertions(+), 1761 deletions(-) create mode 100644 NEWS.md diff --git a/NEWS b/NEWS index 6d9cfc0007..e837ecbb95 100644 --- a/NEWS +++ b/NEWS @@ -1,1718 +1 @@ -pgRouting 3.7.0 Release Notes -------------------------------------------------------------------------------- - -To see all issues & pull requests closed by this release see the `Git closed -milestone for 3.7.0 -`_ - -**Code enhancement** - -* [#2599](https://github.com/pgRouting/pgrouting/pull/2599) Driving distance - cleanup - -pgRouting 3.6.1 Release Notes -------------------------------------------------------------------------------- - -To see all issues & pull requests closed by this release see the `Git closed -milestone for 3.6.1 -`_ - -* [#2588](https://github.com/pgRouting/pgrouting/pull/2588) pgrouting 3.6.0 - fails to build on OSX - -pgRouting 3.6.0 Release Notes -------------------------------------------------------------------------------- - -To see all issues & pull requests closed by this release see the `Git closed -milestone for 3.6.0 -`_ - -**Official functions changes** - -* [#2516](https://github.com/pgRouting/pgrouting/pull/2516) Standarize output - pgr_aStar - - * Standarizing output columns to |short-generic-result| - - * ``pgr_aStar`` (`One to One`) added ``start_vid`` and ``end_vid`` columns. - * ``pgr_aStar`` (`One to Many`) added ``end_vid`` column. - * ``pgr_aStar`` (`Many to One`) added ``start_vid`` column. - -* [#2523](https://github.com/pgRouting/pgrouting/pull/2523) Standarize output - pgr_bdAstar - - * Standarizing output columns to |short-generic-result| - - * ``pgr_bdAstar`` (`One to One`) added ``start_vid`` and ``end_vid`` - columns. - * ``pgr_bdAstar`` (`One to Many`) added ``end_vid`` column. - * ``pgr_bdAstar`` (`Many to One`) added ``start_vid`` column. - -* [#2547](https://github.com/pgRouting/pgrouting/pull/2547) Standarize output - and modifying signature pgr_KSP - - - * Result columns standarized to: |nksp-result| - * ``pgr_ksp`` (One to One) - - * Added ``start_vid`` and ``end_vid`` result columns. - - * New overload functions: - - * ``pgr_ksp`` (One to Many) - * ``pgr_ksp`` (Many to One) - * ``pgr_ksp`` (Many to Many) - * ``pgr_ksp`` (Combinations) - - -* [#2548](https://github.com/pgRouting/pgrouting/pull/2548) Standarize output - pgr_drivingdistance - - - * Standarizing output columns to |result-spantree| - - * ``pgr_drivingdistance`` (Single vertex) - - * Added ``depth`` and ``start_vid`` result columns. - - * ``pgr_drivingdistance`` (Multiple vertices) - - * Result column name change: ``from_v`` to ``start_vid``. - * Added ``depth`` and ``pred`` result columns. - - -**Proposed functions changes** - -* [#2544](https://github.com/pgRouting/pgrouting/pull/2544) Standarize output - and modifying signature pgr_withPointsDD - - - * Signature change: ``driving_side`` parameter changed from named optional to - unnamed compulsory **driving side**. - - * ``pgr_withPointsDD`` (`Single vertex`) - * ``pgr_withPointsDD`` (`Multiple vertices`) - - * Standarizing output columns to |result-spantree| - - * ``pgr_withPointsDD`` (`Single vertex`) - - * Added ``depth``, ``pred`` and ``start_vid`` column. - - * ``pgr_withPointsDD`` (`Multiple vertices`) - - * Added ``depth``, ``pred`` columns. - - * When ``details`` is ``false``: - - * Only points that are visited are removed, that is, points reached within the - distance are included - - * Deprecated signatures - - * ``pgr_withpointsdd(text,text,bigint,double precision,boolean,character,boolean)`` - * ``pgr_withpointsdd(text,text,anyarray,double precision,boolean,character,boolean,boolean)`` - - -* [#2546](https://github.com/pgRouting/pgrouting/pull/2546) Standarize output - and modifying signature pgr_withPointsKSP - - - * Standarizing output columns to |nksp-result| - * ``pgr_withPointsKSP`` (One to One) - - * Signature change: ``driving_side`` parameter changed from named optional to - unnamed compulsory **driving side**. - * Added ``start_vid`` and ``end_vid`` result columns. - - * New overload functions - - * ``pgr_withPointsKSP`` (One to Many) - * ``pgr_withPointsKSP`` (Many to One) - * ``pgr_withPointsKSP`` (Many to Many) - * ``pgr_withPointsKSP`` (Combinations) - - * Deprecated signature - - * ``pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,char,boolean)`` - - -**C/C++ code enhancements** - -* [#2504](https://github.com/pgRouting/pgrouting/pull/2504) To C++ pg data get, - fetch and check. - - * Stopping support for compilation with MSVC. - -* [#2505](https://github.com/pgRouting/pgrouting/pull/2505) Using namespace. -* [#2512](https://github.com/pgRouting/pgrouting/pull/2512) [Dijkstra] Removing - duplicate code on Dijkstra. -* [#2517](https://github.com/pgRouting/pgrouting/pull/2517) Astar code - simplification. -* [#2521](https://github.com/pgRouting/pgrouting/pull/2521) Dijkstra code - simplification. -* [#2522](https://github.com/pgRouting/pgrouting/pull/2522) bdAstar code - simplification. - -**Documentation** - -* [#2490](https://github.com/pgRouting/pgrouting/pull/2490) Automatic page - history links. - -* ..rubric:: SQL standarization - -* [#2555](https://github.com/pgRouting/pgrouting/pull/2555) standarize - deprecated messages -* On new internal function: do not use named parameters and default parameters. - - -pgRouting 3.5.1 Release Notes -------------------------------------------------------------------------------- - -To see all issues & pull requests closed by this release see the `Git closed -milestone for 3.5.1 -`_ - -**Documentation fixes** - -Changes on the documentation to the following: - -* pgr_degree -* pgr_dijkstra -* pgr_ksp -* Automatic page history links - - * using bootstrap_version 2 because 3+ does not do dropdowns - -**Issue fixes** - -* [#2565](https://github.com/pgRouting/pgrouting/issues/2565) - pgr_pgr_lengauerTarjanDominatorTree triggers an assertion - -**SQL enhancements** - -* [#2561](https://github.com/pgRouting/pgrouting/issues/2561) Not use - wildcards on SQL - -**pgtap tests** - -* [#2559](https://github.com/pgRouting/pgrouting/issues/2559) pgtap test using sampledata - -**Build fixes** - -* Fix winnie build - -**Code fixes** - -* Fix clang warnings - - * Grouping headers of postgres readers - -pgRouting 3.5.0 Release Notes -------------------------------------------------------------------------------- - -To see all issues & pull requests closed by this release see the `Git closed -milestone for 3.5.0 -`_ - -**Official functions changes** - -* Dijkstra - - * Standarizing output columns to |short-generic-result| - - * ``pgr_dijkstra`` (`One to One`) added ``start_vid`` and ``end_vid`` columns. - * ``pgr_dijkstra`` (`One to Many`) added ``end_vid`` column. - * ``pgr_dijkstra`` (`Many to One`) added ``start_vid`` column. - -pgRouting 3.4.2 Release Notes -------------------------------------------------------------------------------- - -To see all issues & pull requests closed by this release see the `Git closed -milestone for 3.4.2 -`_ - -**Issue fixes** - -* [#2394](https://github.com/pgRouting/pgrouting/issues/2394): - pgr_bdAstar accumulates heuristic cost in visited node cost. -* [#2427](https://github.com/pgRouting/pgrouting/issues/2427): - pgr_createVerticesTable & pgr_createTopology, variable should be of type Record. - -pgRouting 3.4.1 Release Notes -------------------------------------------------------------------------------- - -To see all issues & pull requests closed by this release see the `Git closed -milestone for 3.4.1 -`_ - -**Issue fixes** - -* [#2401](https://github.com/pgRouting/pgrouting/issues/2401): - pgRouting 3.4.0 do not build docs when sphinx is too low or missing -* [#2398](https://github.com/pgRouting/pgrouting/issues/2398): - v3.4.0 does not upgrade from 3.3.3 - -pgRouting 3.4.0 Release Notes -------------------------------------------------------------------------------- - -To see all issues & pull requests closed by this release see the `Git closed -milestone for 3.4.0 -`_ - -**Issue fixes** - -* [#1891](https://github.com/pgRouting/pgrouting/issues/1891): - pgr_ksp doesn't give all correct shortest path - -**New proposed functions** - -* With points - - * ``pgr_withPointsVia`` (One Via) - -* Turn Restrictions - - * Via with turn restrictions - - * ``pgr_trspVia`` (One Via) - * ``pgr_trspVia_withPoints`` (One Via) - - * ``pgr_trsp`` - - * ``pgr_trsp`` (One to One) - * ``pgr_trsp`` (One to Many) - * ``pgr_trsp`` (Many to One) - * ``pgr_trsp`` (Many to Many) - * ``pgr_trsp`` (Combinations) - - * ``pgr_trsp_withPoints`` - - * ``pgr_trsp_withPoints`` (One to One) - * ``pgr_trsp_withPoints`` (One to Many) - * ``pgr_trsp_withPoints`` (Many to One) - * ``pgr_trsp_withPoints`` (Many to Many) - * ``pgr_trsp_withPoints`` (Combinations) - -* Topology - - * ``pgr_degree`` - -* Utilities - - * ``pgr_findCloseEdges`` (One point) - * ``pgr_findCloseEdges`` (Many points) - -**New experimental functions** - -* Ordering - - * ``pgr_cuthillMckeeOrdering`` - -* Unclassified - - * ``pgr_hawickCircuits`` - -**Official functions changes** - -* Flow functions - - * ``pgr_maxCardinalityMatch(text)`` - - * Deprecating ``pgr_maxCardinalityMatch(text,boolean)`` - -**Deprecated Functions** - -* Turn Restrictions - - * ``pgr_trsp(text,integer,integer,boolean,boolean,text)`` - * ``pgr_trsp(text,integer,float8,integer,float8,boolean,boolean,text)`` - * ``pgr_trspViaVertices(text,anyarray,boolean,boolean,text)`` - * ``pgr_trspViaEdges(text,integer[],float[],boolean,boolean,text)`` - -pgRouting 3.3.5 Release Notes -------------------------------------------------------------------------------- - -* [#2401](https://github.com/pgRouting/pgrouting/issues/2401): - pgRouting 3.4.0 do not build docs when sphinx is too low or missing - -pgRouting 3.3.4 Release Notes -------------------------------------------------------------------------------- - -To see all issues & pull requests closed by this release see the `Git closed -milestone for 3.3.4 -`_ - -**Issue fixes** - -* [#2400](https://github.com/pgRouting/pgrouting/issues/2400): - pgRouting 3.3.3 does not build in focal - -pgRouting 3.3.3 Release Notes -------------------------------------------------------------------------------- - -To see all issues & pull requests closed by this release see the `Git closed -milestone for 3.3.3 -`_ - -**Issue fixes** - -* [#1891](https://github.com/pgRouting/pgrouting/issues/1891): - pgr_ksp doesn't give all correct shortest path - -**Official functions changes** - -* Flow functions - - * ``pgr_maxCardinalityMatch(text,boolean)`` - - * Ignoring optional boolean parameter, as the algorithm works only for - undirected graphs. - - -pgRouting 3.3.2 Release Notes -------------------------------------------------------------------------------- - -To see all issues & pull requests closed by this release see the `Git closed -milestone for 3.3.2 -`_ - -* Revised documentation - - * Simplifying table names and table columns, for example: - - * ``edges`` instead of ``edge_table`` - - * Removing unused columns ``category_id`` and ``reverse_category_id``. - - * ``combinations`` instead of ``combinations_table`` - - * Using PostGIS standard for geometry column. - - * ``geom`` instead of ``the_geom`` - - * Avoiding usage of functions that modify indexes, columns etc on tables. - - * Using ``pgr_extractVertices`` to create a routing topology - - * Restructure of the pgRouting concepts page. - - -**Issue fixes** - -* [#2276](https://github.com/pgRouting/pgrouting/issues/2276): - edgeDisjointPaths issues with start_vid and combinations -* [#2312](https://github.com/pgRouting/pgrouting/issues/2312): - pgr_extractVertices error when target is not BIGINT -* [#2357](https://github.com/pgRouting/pgrouting/issues/2357): - Apply clang-tidy performance-* - -pgRouting 3.3.1 Release Notes -------------------------------------------------------------------------------- - -To see all issues & pull requests closed by this release see the `Git closed -milestone for 3.3.1 -`_ -on Github. - -**Issue fixes** - -* [#2216](https://github.com/pgRouting/pgrouting/issues/2216): Warnings when using clang -* [#2266](https://github.com/pgRouting/pgrouting/issues/2266): Error processing restrictions - - -pgRouting 3.3.0 Release Notes -------------------------------------------------------------------------------- - -To see all issues & pull requests closed by this release see the `Git closed -milestone for 3.3.0 -`_ -on Github. - -**Issue fixes** - -* [#2057](https://github.com/pgRouting/pgrouting/issues/2057): trspViaEdges columns in different order -* [#2087](https://github.com/pgRouting/pgrouting/issues/2087): pgr_extractVertices to proposed -* [#2201](https://github.com/pgRouting/pgrouting/issues/2201): pgr_depthFirstSearch to proposed -* [#2202](https://github.com/pgRouting/pgrouting/issues/2202): pgr_sequentialVertexColoring to proposed -* [#2203](https://github.com/pgRouting/pgrouting/issues/2203): pgr_dijkstraNear and pgr_dijkstraNearCost to proposed - -**New experimental functions** - -* Coloring - - * pgr_edgeColoring - -**Experimental promoted to Proposed** - -* Dijkstra - - * pgr_dijkstraNear - - * pgr_dijkstraNear(Combinations) - * pgr_dijkstraNear(Many to Many) - * pgr_dijkstraNear(Many to One) - * pgr_dijkstraNear(One to Many) - - * pgr_dijkstraNearCost - - * pgr_dijkstraNearCost(Combinations) - * pgr_dijkstraNearCost(Many to Many) - * pgr_dijkstraNearCost(Many to One) - * pgr_dijkstraNearCost(One to Many) - -* Coloring - - * pgr_sequentialVertexColoring - -* Topology - - * pgr_extractVertices - -* Traversal - - * pgr_depthFirstSearch(Multiple vertices) - * pgr_depthFirstSearch(Single vertex) - -pgRouting 3.2.2 Release Notes -------------------------------------------------------------------------------- - -To see all issues & pull requests closed by this release see the `Git closed -milestone for 3.2.2 -`_ -on Github. - -**Issue fixes** - -* [#2093](https://github.com/pgRouting/pgrouting/issues/2093): Compilation on Visual Studio -* [#2189](https://github.com/pgRouting/pgrouting/issues/2189): Build error on RHEL 7 - -pgRouting 3.2.1 Release Notes -------------------------------------------------------------------------------- - -To see all issues & pull requests closed by this release see the `Git closed -milestone for 3.2.1 -`_ -on Github. - -**Issue fixes** - -* [#1883](https://github.com/pgRouting/pgrouting/issues/1883): pgr_TSPEuclidean crashes connection on Windows - - * The solution is to use Boost::graph::metric_tsp_approx - * To not break user's code the optional parameters related to the TSP Annaeling are ignored - * The function with the annaeling optional parameters is deprecated - - -pgRouting 3.2.0 Release Notes -------------------------------------------------------------------------------- - -To see all issues & pull requests closed by this release see the `Git closed -milestone for 3.2.0 -`_ -on Github. - -**Build** - -* [#1850](https://github.com/pgRouting/pgrouting/issues/1850): Change Boost - min version to 1.56 - - * Removing support for Boost v1.53, v1.54 & v1.55 - -**New experimental functions** - -* pgr_bellmanFord(Combinations) -* pgr_binaryBreadthFirstSearch(Combinations) -* pgr_bipartite -* pgr_dagShortestPath(Combinations) -* pgr_depthFirstSearch -* Dijkstra Near - - * pgr_dijkstraNear - - * pgr_dijkstraNear(One to Many) - * pgr_dijkstraNear(Many to One) - * pgr_dijkstraNear(Many to Many) - * pgr_dijkstraNear(Combinations) - - * pgr_dijkstraNearCost - - * pgr_dijkstraNearCost(One to Many) - * pgr_dijkstraNearCost(Many to One) - * pgr_dijkstraNearCost(Many to Many) - * pgr_dijkstraNearCost(Combinations) - -* pgr_edwardMoore(Combinations) -* pgr_isPlanar -* pgr_lengauerTarjanDominatorTree -* pgr_makeConnected -* Flow - - * pgr_maxFlowMinCost(Combinations) - * pgr_maxFlowMinCost_Cost(Combinations) - -* pgr_sequentialVertexColoring - -**New proposed functions** - -* Astar - - * pgr_aStar(Combinations) - * pgr_aStarCost(Combinations) - -* Bidirectional Astar - - * pgr_bdAstar(Combinations) - * pgr_bdAstarCost(Combinations) - -* Bidirectional Dijkstra - - * pgr_bdDijkstra(Combinations) - * pgr_bdDijkstraCost(Combinations) - -* Flow - - * pgr_boykovKolmogorov(Combinations) - * pgr_edgeDisjointPaths(Combinations) - * pgr_edmondsKarp(Combinations) - * pgr_maxFlow(Combinations) - * pgr_pushRelabel(Combinations) - -* pgr_withPoints(Combinations) -* pgr_withPointsCost(Combinations) - -pgRouting 3.1.4 Release Notes --------------------------------------------------------------------------------- - -To see all issues & pull requests closed by this release see the `Git closed -milestone for 3.1.4 -`_ -on Github. - -**Issues fixes** - -* [#2189](https://github.com/pgRouting/pgrouting/issues/2189): Build error on - RHEL 7 - - -pgRouting 3.1.3 Release Notes -------------------------------------------------------------------------------- - -To see all issues & pull requests closed by this release see the `Git closed -milestone for 3.1.3 -`_ -on Github. - -**Issues fixes** - -* [#1825](https://github.com/pgRouting/pgrouting/issues/1825): Boost versions - are not honored -* [#1849](https://github.com/pgRouting/pgrouting/issues/1849): Boost 1.75.0 - geometry "point_xy.hpp" build error on macOS environment -* [#1861](https://github.com/pgRouting/pgrouting/issues/1861): vrp functions - crash server - - -pgRouting 3.1.2 Release Notes -------------------------------------------------------------------------------- - -To see all issues & pull requests closed by this release see the `Git closed -milestone for 3.1.2 -`_ -on Github. - -**Issues fixes** - -* [#1304](https://github.com/pgRouting/pgrouting/issues/1304): FreeBSD 12 - 64-bit crashes on pgr_vrOneDepot tests Experimental Function -* [#1356](https://github.com/pgRouting/pgrouting/issues/1356): - tools/testers/pg_prove_tests.sh fails when PostgreSQL port is not passed -* [#1725](https://github.com/pgRouting/pgrouting/issues/1725): Server crash - on pgr_pickDeliver and pgr_vrpOneDepot on openbsd -* [#1760](https://github.com/pgRouting/pgrouting/issues/1760): TSP server - crash on ubuntu 20.04 #1760 -* [#1770](https://github.com/pgRouting/pgrouting/issues/1770): Remove - warnings when using clang compiler - - -pgRouting 3.1.1 Release Notes -------------------------------------------------------------------------------- - -To see all issues & pull requests closed by this release see the `Git closed -milestone for 3.1.1 -`_ -on Github. - -**Issues fixes** - -* [#1733](https://github.com/pgRouting/pgrouting/issues/1733): pgr_bdAstar - fails when source or target vertex does not exist in the graph -* [#1647](https://github.com/pgRouting/pgrouting/issues/1647): Linear - Contraction contracts self loops -* [#1640](https://github.com/pgRouting/pgrouting/issues/1640): pgr_withPoints - fails when points_sql is empty -* [#1616](https://github.com/pgRouting/pgrouting/issues/1616): Path - evaluation on C++ not updated before the results go back to C -* [#1300](https://github.com/pgRouting/pgrouting/issues/1300): - pgr_chinesePostman crash on test data - - - -pgRouting 3.1.0 Release Notes -------------------------------------------------------------------------------- - -To see all issues & pull requests closed by this release see the `Git closed -milestone for 3.1.0 -`_ -on Github. - -**New proposed functions** - -* pgr_dijkstra(combinations) -* pgr_dijkstraCost(combinations) - -**Build changes** - -* Minimal requirement for Sphinx: version 1.8 - -pgRouting 3.0.6 Release Notes --------------------------------------------------------------------------------- - -To see all issues & pull requests closed by this release see the `Git closed -milestone for 3.0.6 -`_ -on Github. - -**Issues fixes** - -* [#2189](https://github.com/pgRouting/pgrouting/issues/2189): Build error on - RHEL 7 - - -pgRouting 3.0.5 Release Notes -------------------------------------------------------------------------------- - -To see all issues & pull requests closed by this release see the `Git closed -milestone for 3.0.5 -`_ -on Github. - -**Backport issue fixes** - -* [#1825](https://github.com/pgRouting/pgrouting/issues/1825): Boost versions - are not honored -* [#1849](https://github.com/pgRouting/pgrouting/issues/1849): Boost 1.75.0 - geometry "point_xy.hpp" build error on macOS environment -* [#1861](https://github.com/pgRouting/pgrouting/issues/1861): vrp functions - crash server - - -pgRouting 3.0.4 Release Notes -------------------------------------------------------------------------------- - -To see all issues & pull requests closed by this release see the `Git closed -milestone for 3.0.4 -`_ -on Github. - -**Backport issue fixes** - -* [#1304](https://github.com/pgRouting/pgrouting/issues/1304): FreeBSD 12 - 64-bit crashes on pgr_vrOneDepot tests Experimental Function -* [#1356](https://github.com/pgRouting/pgrouting/issues/1356): - tools/testers/pg_prove_tests.sh fails when PostgreSQL port is not passed -* [#1725](https://github.com/pgRouting/pgrouting/issues/1725): Server crash - on pgr_pickDeliver and pgr_vrpOneDepot on openbsd -* [#1760](https://github.com/pgRouting/pgrouting/issues/1760): TSP server - crash on ubuntu 20.04 #1760 -* [#1770](https://github.com/pgRouting/pgrouting/issues/1770): Remove - warnings when using clang compiler - - - -pgRouting 3.0.3 Release Notes -------------------------------------------------------------------------------- - -**Backport issue fixes** - -* [#1733](https://github.com/pgRouting/pgrouting/issues/1733): pgr_bdAstar - fails when source or target vertex does not exist in the graph -* [#1647](https://github.com/pgRouting/pgrouting/issues/1647): Linear - Contraction contracts self loops -* [#1640](https://github.com/pgRouting/pgrouting/issues/1640): pgr_withPoints - fails when points_sql is empty -* [#1616](https://github.com/pgRouting/pgrouting/issues/1616): Path - evaluation on C++ not updated before the results go back to C -* [#1300](https://github.com/pgRouting/pgrouting/issues/1300): - pgr_chinesePostman crash on test data - - - -pgRouting 3.0.2 Release Notes -------------------------------------------------------------------------------- - -To see all issues & pull requests closed by this release see the `Git closed -milestone for 3.0.2 -`_ -on Github. - -**Issues fixes** - -* [#1378](https://github.com/pgRouting/pgrouting/issues/1378): Visual Studio - build failing - - -pgRouting 3.0.1 Release Notes -------------------------------------------------------------------------------- - -To see all issues & pull requests closed by this release see the `Git closed -milestone for 3.0.1 -`_ -on Github. - -**Issues fixes** - -* [#232](https://github.com/pgRouting/pgrouting/issues/232): Honor client - cancel requests in C /C++ code - - -pgRouting 3.0.0 Release Notes -------------------------------------------------------------------------------- - -To see all issues & pull requests closed by this release see the `Git closed -milestone for 3.0.0 -`_ -on Github. - -**Fixed Issues** - -* [#1153](https://github.com/pgRouting/pgrouting/issues/1153): Renamed - pgr_eucledianTSP to pgr_TSPeuclidean -* [#1188](https://github.com/pgRouting/pgrouting/issues/1188): Removed CGAL - dependency -* [#1002](https://github.com/pgRouting/pgrouting/issues/1002): Fixed - contraction issues: - - * [#1004](https://github.com/pgRouting/pgrouting/issues/1004): Contracts - when forbidden vertices do not belong to graph - * [#1005](https://github.com/pgRouting/pgrouting/issues/1005): Intermideate - results eliminated - * [#1006](https://github.com/pgRouting/pgrouting/issues/1006): No loss of - information - -**New functions** - -* Kruskal family - - * pgr_kruskal - * pgr_kruskalBFS - * pgr_kruskalDD - * pgr_kruskalDFS - -* Prim family - - * pgr_prim - * pgr_primDD - * pgr_primDFS - * pgr_primBFS - - -**Proposed moved to official on pgRouting** - -* aStar Family - - * pgr_aStar(one to many) - * pgr_aStar(many to one) - * pgr_aStar(many to many) - * pgr_aStarCost(one to one) - * pgr_aStarCost(one to many) - * pgr_aStarCost(many to one) - * pgr_aStarCost(many to many) - * pgr_aStarCostMatrix(one to one) - * pgr_aStarCostMatrix(one to many) - * pgr_aStarCostMatrix(many to one) - * pgr_aStarCostMatrix(many to many) - -* bdAstar Family - - * pgr_bdAstar(one to many) - * pgr_bdAstar(many to one) - * pgr_bdAstar(many to many) - * pgr_bdAstarCost(one to one) - * pgr_bdAstarCost(one to many) - * pgr_bdAstarCost(many to one) - * pgr_bdAstarCost(many to many) - * pgr_bdAstarCostMatrix(one to one) - * pgr_bdAstarCostMatrix(one to many) - * pgr_bdAstarCostMatrix(many to one) - * pgr_bdAstarCostMatrix(many to many) - -* bdDijkstra Family - - * pgr_bdDijkstra(one to many) - * pgr_bdDijkstra(many to one) - * pgr_bdDijkstra(many to many) - * pgr_bdDijkstraCost(one to one) - * pgr_bdDijkstraCost(one to many) - * pgr_bdDijkstraCost(many to one) - * pgr_bdDijkstraCost(many to many) - * pgr_bdDijkstraCostMatrix(one to one) - * pgr_bdDijkstraCostMatrix(one to many) - * pgr_bdDijkstraCostMatrix(many to one) - * pgr_bdDijkstraCostMatrix(many to many) - -* Flow Family - - * pgr_pushRelabel(one to one) - * pgr_pushRelabel(one to many) - * pgr_pushRelabel(many to one) - * pgr_pushRelabel(many to many) - * pgr_edmondsKarp(one to one) - * pgr_edmondsKarp(one to many) - * pgr_edmondsKarp(many to one) - * pgr_edmondsKarp(many to many) - * pgr_boykovKolmogorov (one to one) - * pgr_boykovKolmogorov (one to many) - * pgr_boykovKolmogorov (many to one) - * pgr_boykovKolmogorov (many to many) - * pgr_maxCardinalityMatching - * pgr_maxFlow - * pgr_edgeDisjointPaths(one to one) - * pgr_edgeDisjointPaths(one to many) - * pgr_edgeDisjointPaths(many to one) - * pgr_edgeDisjointPaths(many to many) - -* Components family - - * pgr_connectedComponents - * pgr_strongComponents - * pgr_biconnectedComponents - * pgr_articulationPoints - * pgr_bridges - -* Contraction: - - * Removed unnecessary column seq - * Bug Fixes - - -**New experimental functions** - -* pgr_maxFlowMinCost -* pgr_maxFlowMinCost_Cost -* pgr_extractVertices -* pgr_turnRestrictedPath -* pgr_stoerWagner -* pgr_dagShortestpath -* pgr_topologicalSort -* pgr_transitiveClosure -* VRP category - - * pgr_pickDeliverEuclidean - * pgr_pickDeliver - -* Chinese Postman family - - * pgr_chinesePostman - * pgr_chinesePostmanCost - -* Breadth First Search family - - * pgr_breadthFirstSearch - * pgr_binaryBreadthFirstSearch - -* Bellman Ford family - - * pgr_bellmanFord - * pgr_edwardMoore - -**Moved to legacy** - -* Experimental functions - - * pgr_labelGraph - Use the components family of functions instead. - * Max flow - functions were renamed on v2.5.0 - - * pgr_maxFlowPushRelabel - * pgr_maxFlowBoykovKolmogorov - * pgr_maxFlowEdmondsKarp - * pgr_maximumcardinalitymatching - - * VRP - - * pgr_gsoc_vrppdtw - -* TSP old signatures -* pgr_pointsAsPolygon -* pgr_alphaShape old signature - - - -pgRouting 2.6.3 Release Notes -------------------------------------------------------------------------------- - -To see the issues closed by this release see the `Git closed milestone for 2.6.3 -`_ -on Github. - -**Bug fixes** - -* [#1219](https://github.com/pgRouting/pgrouting/pull/1219) Implicit cast for - via_path integer to text -* [#1193](https://github.com/pgRouting/pgrouting/pull/1193) Fixed - pgr_pointsAsPolygon breaking when comparing strings in WHERE clause -* [#1185](https://github.com/pgRouting/pgrouting/pull/1185) Improve - FindPostgreSQL.cmake - - - -pgRouting 2.6.2 Release Notes -------------------------------------------------------------------------------- - -To see the issues closed by this release see the `Git closed milestone for 2.6.2 -`_ -on Github. - -**Bug fixes** - -* [#1152](https://github.com/pgRouting/pgrouting/issues/1152) Fixes driving - distance when vertex is not part of the graph -* [#1098](https://github.com/pgRouting/pgrouting/issues/1098) Fixes windows - test -* [#1165](https://github.com/pgRouting/pgrouting/issues/1165) Fixes build for - python3 and perl5 - - -pgRouting 2.6.1 Release Notes -------------------------------------------------------------------------------- - -To see the issues closed by this release see the `Git closed milestone for 2.6.1 -`_ -on Github. - -* Fixes server crash on several functions. - - * pgr_floydWarshall - * pgr_johnson - * pgr_astar - * pgr_bdAstar - * pgr_bdDijstra - * pgr_alphashape - * pgr_dijkstraCostMatrix - * pgr_dijkstra - * pgr_dijkstraCost - * pgr_drivingDistance - * pgr_KSP - * pgr_dijkstraVia (proposed) - * pgr_boykovKolmogorov (proposed) - * pgr_edgeDisjointPaths (proposed) - * pgr_edmondsKarp (proposed) - * pgr_maxCardinalityMatch (proposed) - * pgr_maxFlow (proposed) - * pgr_withPoints (proposed) - * pgr_withPointsCost (proposed) - * pgr_withPointsKSP (proposed) - * pgr_withPointsDD (proposed) - * pgr_withPointsCostMatrix (proposed) - * pgr_contractGraph (experimental) - * pgr_pushRelabel (experimental) - * pgr_vrpOneDepot (experimental) - * pgr_gsoc_vrppdtw (experimental) - * Fixes for deprecated functions where also applied but not tested - -* Removed compilation warning for g++8 -* Fixed a fallthrugh on Astar and bdAstar. - - -pgRouting 2.6.0 Release Notes -------------------------------------------------------------------------------- - -To see the issues closed by this release see the `Git closed milestone for 2.6.0 -`_ -on Github. - - -**New experimental functions** - -* pgr_lineGraphFull - -**Bug fixes** - -* Fix pgr_trsp(text,integer,double precision,integer,double - precision,boolean,boolean[,text]) - - * without restrictions - - * calls pgr_dijkstra when both end points have a fraction IN (0,1) - * calls pgr_withPoints when at least one fraction NOT IN (0,1) - - * with restrictions - - * calls original trsp code - -**Internal code** - -* Cleaned the internal code of trsp(text,integer,integer,boolean,boolean [, - text]) - - * Removed the use of pointers - * Internal code can accept BIGINT - -* Cleaned the internal code of withPoints - - -pgRouting 2.5.5 Release Notes -------------------------------------------------------------------------------- - -To see the issues closed by this release see the `Git closed milestone for 2.5.5 -`_ -on Github. - -**Bug fixes** - -* Fixes driving distance when vertex is not part of the graph -* Fixes windows test -* Fixes build for python3 and perl5 - - -pgRouting 2.5.4 Release Notes -------------------------------------------------------------------------------- - -To see the issues closed by this release see the [Git closed milestone for 2.5.4](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.4%22%20) on Github. - -* Fixes server crash on several functions. - - * pgr_floydWarshall - * pgr_johnson - * pgr_astar - * pgr_bdAstar - * pgr_bdDijstra - * pgr_alphashape - * pgr_dijkstraCostMatrix - * pgr_dijkstra - * pgr_dijkstraCost - * pgr_drivingDistance - * pgr_KSP - * pgr_dijkstraVia (proposed) - * pgr_boykovKolmogorov (proposed) - * pgr_edgeDisjointPaths (proposed) - * pgr_edmondsKarp (proposed) - * pgr_maxCardinalityMatch (proposed) - * pgr_maxFlow (proposed) - * pgr_withPoints (proposed) - * pgr_withPointsCost (proposed) - * pgr_withPointsKSP (proposed) - * pgr_withPointsDD (proposed) - * pgr_withPointsCostMatrix (proposed) - * pgr_contractGraph (experimental) - * pgr_pushRelabel (experimental) - * pgr_vrpOneDepot (experimental) - * pgr_gsoc_vrppdtw (experimental) - * Fixes for deprecated functions where also applied but not tested - -* Removed compilation warning for g++8 -* Fixed a fallthrugh on Astar and bdAstar. - - -pgRouting 2.5.3 Release Notes -------------------------------------------------------------------------------- - -To see the issues closed by this release see the `Git closed milestone for 2.5.3 -`_ -on Github. - -**Bug fixes** - -* Fix for postgresql 11: Removed a compilation error when compiling with - postgreSQL - - -pgRouting 2.5.2 Release Notes -------------------------------------------------------------------------------- - -To see the issues closed by this release see the [Git closed milestone for 2.5.2](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.2%22%20) on Github. - -**Bug fixes** - -* Fix for postgresql 10.1: Removed a compiler condition - - - -pgRouting 2.5.1 Release Notes -------------------------------------------------------------------------------- - -To see the issues closed by this release see the `Git closed milestone for 2.5.1 -`_ -on Github. - -**Bug fixes** - -* Fixed prerequisite minimum version of: cmake - - - -pgRouting 2.5.0 Release Notes -------------------------------------------------------------------------------- - -To see the issues closed by this release see the `Git closed issues for 2.5.0 -`_ -on Github. - - -**enhancement:** - -* pgr_version is now on SQL language - -**Breaking change on:** - -* pgr_edgeDisjointPaths: - - * Added path_id, cost and agg_cost columns on the result - * Parameter names changed - * The many version results are the union of the one to one version - -**New Signatures** - -* pgr_bdAstar(one to one) - -**New Proposed functions** - -* pgr_bdAstar(one to many) -* pgr_bdAstar(many to one) -* pgr_bdAstar(many to many) -* pgr_bdAstarCost(one to one) -* pgr_bdAstarCost(one to many) -* pgr_bdAstarCost(many to one) -* pgr_bdAstarCost(many to many) -* pgr_bdAstarCostMatrix -* pgr_bdDijkstra(one to many) -* pgr_bdDijkstra(many to one) -* pgr_bdDijkstra(many to many) -* pgr_bdDijkstraCost(one to one) -* pgr_bdDijkstraCost(one to many) -* pgr_bdDijkstraCost(many to one) -* pgr_bdDijkstraCost(many to many) -* pgr_bdDijkstraCostMatrix -* pgr_lineGraph -* pgr_lineGraphFull -* pgr_connectedComponents -* pgr_strongComponents -* pgr_biconnectedComponents -* pgr_articulationPoints -* pgr_bridges - -**Deprecated signatures** - -* pgr_bdastar - use pgr_bdAstar instead - -**Renamed functions** - -* pgr_maxFlowPushRelabel - use pgr_pushRelabel instead -* pgr_maxFlowEdmondsKarp -use pgr_edmondsKarp instead -* pgr_maxFlowBoykovKolmogorov - use pgr_boykovKolmogorov instead -* pgr_maximumCardinalityMatching - use pgr_maxCardinalityMatch instead - -**Deprecated Function** - -* pgr_pointToEdgeNode - - - -pgRouting 2.4.2 Release Notes -------------------------------------------------------------------------------- - -To see the issues closed by this release see the `Git closed milestone for 2.4.2 -`_ -on Github. - -**Improvement** - -* Works for postgreSQL 10 - -**Bug fixes** - -* Fixed: Unexpected error column "cname" -* Replace __linux__ with __GLIBC__ for glibc-specific headers and functions - - - - -pgRouting 2.4.1 Release Notes -------------------------------------------------------------------------------- - -To see the issues closed by this release see the `Git closed milestone for 2.4.1 -`_ -on Github. - -**Bug fixes** - -* Fixed compiling error on macOS -* Condition error on pgr_withPoints - - -pgRouting 2.4.0 Release Notes -------------------------------------------------------------------------------- - -To see the issues closed by this release see the `Git closed issues for 2.4.0 -`_ -on Github. - -**New Signatures** - -* pgr_bdDijkstra - - -**New Proposed Signatures** - -* pgr_maxFlow -* pgr_astar(one to many) -* pgr_astar(many to one) -* pgr_astar(many to many) -* pgr_astarCost(one to one) -* pgr_astarCost(one to many) -* pgr_astarCost(many to one) -* pgr_astarCost(many to many) -* pgr_astarCostMatrix - -**Deprecated signatures** - -* pgr_bddijkstra - use pgr_bdDijkstra instead - -**Deprecated Functions** - -* pgr_pointsToVids - -**Bug fixes** - -* Bug fixes on proposed functions - - * pgr_withPointsKSP: fixed ordering - -* TRSP original code is used with no changes on the compilation warnings - - -pgRouting 2.3.2 Release Notes -------------------------------------------------------------------------------- - -To see the issues closed by this release see the `Git closed issues for 2.3.2 -`_ -on Github. - -**Bug Fixes** - -* Fixed pgr_gsoc_vrppdtw crash when all orders fit on one truck. -* Fixed pgr_trsp: - - * Alternate code is not executed when the point is in reality a vertex - * Fixed ambiguity on seq - - - -pgRouting 2.3.1 Release Notes -------------------------------------------------------------------------------- - -To see the issues closed by this release see the `Git closed issues for 2.3.1 -`_ -on Github. - -**Bug Fixes** - -* Leaks on proposed max_flow functions -* Regression error on pgr_trsp -* Types discrepancy on pgr_createVerticesTable - - - -pgRouting 2.3.0 Release Notes -------------------------------------------------------------------------------- - -To see the issues closed by this release see the `Git closed issues for 2.3.0 -`_ -on Github. - -**New Signatures** - -* pgr_TSP -* pgr_aStar - -**New Functions** - -* pgr_eucledianTSP - - -**New Proposed functions** - -* pgr_dijkstraCostMatrix -* pgr_withPointsCostMatrix -* pgr_maxFlowPushRelabel(one to one) -* pgr_maxFlowPushRelabel(one to many) -* pgr_maxFlowPushRelabel(many to one) -* pgr_maxFlowPushRelabel(many to many) -* pgr_maxFlowEdmondsKarp(one to one) -* pgr_maxFlowEdmondsKarp(one to many) -* pgr_maxFlowEdmondsKarp(many to one) -* pgr_maxFlowEdmondsKarp(many to many) -* pgr_maxFlowBoykovKolmogorov (one to one) -* pgr_maxFlowBoykovKolmogorov (one to many) -* pgr_maxFlowBoykovKolmogorov (many to one) -* pgr_maxFlowBoykovKolmogorov (many to many) -* pgr_maximumCardinalityMatching -* pgr_edgeDisjointPaths(one to one) -* pgr_edgeDisjointPaths(one to many) -* pgr_edgeDisjointPaths(many to one) -* pgr_edgeDisjointPaths(many to many) -* pgr_contractGraph - - -**Deprecated signatures** - -* pgr_tsp - use pgr_TSP or pgr_eucledianTSP instead -* pgr_astar - use pgr_aStar instead - - -**Deprecated Functions** - -* pgr_flip_edges -* pgr_vidsToDmatrix -* pgr_pointsToDMatrix -* pgr_textToPoints - - - - -pgRouting 2.2.4 Release Notes -------------------------------------------------------------------------------- - -To see the issues closed by this release see the `Git closed issues for 2.2.4 -`_ -on Github. - -**Bug Fixes** - -* Bogus uses of extern "C" -* Build error on Fedora 24 + GCC 6.0 -* Regression error pgr_nodeNetwork - - -pgRouting 2.2.3 Release Notes -------------------------------------------------------------------------------- - -To see the issues closed by this release see the `Git closed issues for 2.2.3 -`_ -on Github. - -**Bug Fixes** - -* Fixed compatibility issues with PostgreSQL 9.6. - - -pgRouting 2.2.2 Release Notes -------------------------------------------------------------------------------- - -To see the issues closed by this release see the `Git closed issues for 2.2.2 -`_ -on Github. - -**Bug Fixes** - -* Fixed regression error on pgr_drivingDistance - - - -pgRouting 2.2.1 Release Notes -------------------------------------------------------------------------------- - -To see the issues closed by this release see the `Git closed issues for 2.2.1 -`_ -on Github. - -**Bug Fixes** - -* Server crash fix on pgr_alphaShape -* Bug fix on With Points family of functions - - - -pgRouting 2.2.0 Release Notes -------------------------------------------------------------------------------- - -To see the issues closed by this release see the `Git closed issues for 2.2.0 -`_ -on Github. - - -**Improvements** - -- pgr_nodeNetwork - - - Adding a row_where and outall optional parameters - -- Signature fix - - - pgr_dijkstra -- to match what is documented - - -**New Functions** - -- pgr_floydWarshall -- pgr_Johnson -- pgr_dijkstraCost(one to one) -- pgr_dijkstraCost(one to many) -- pgr_dijkstraCost(many to one) -- pgr_dijkstraCost(many to many) - -**Proposed Functionality** - -- pgr_withPoints(one to one) -- pgr_withPoints(one to many) -- pgr_withPoints(many to one) -- pgr_withPoints(many to many) -- pgr_withPointsCost(one to one) -- pgr_withPointsCost(one to many) -- pgr_withPointsCost(many to one) -- pgr_withPointsCost(many to many) -- pgr_withPointsDD(single vertex) -- pgr_withPointsDD(multiple vertices) -- pgr_withPointsKSP -- pgr_dijkstraVia - - -**Deprecated Functions** - -- pgr_apspWarshall use pgr_floydWarshall instead -- pgr_apspJohnson use pgr_Johnson instead -- pgr_kDijkstraCost use pgr_dijkstraCost instead -- pgr_kDijkstraPath use pgr_dijkstra instead - -**Renamed and Deprecated Function** - -- pgr_makeDistanceMatrix renamed to _pgr_makeDistanceMatrix - - - -pgRouting 2.1.0 Release Notes -------------------------------------------------------------------------------- - -To see the issues closed by this release see the `Git closed issues for 2.1.0 -`_ -on Github. - -**New Signatures** - -- pgr_dijkstra(one to many) -- pgr_dijkstra(many to one) -- pgr_dijkstra(many to many) -- pgr_drivingDistance(multiple vertices) - -**Refactored** - -- pgr_dijkstra(one to one) -- pgr_ksp -- pgr_drivingDistance(single vertex) - -**Improvements** - -- pgr_alphaShape function now can generate better (multi)polygon with holes and - alpha parameter. - -**Proposed Functionality** - -- Proposed functions from Steve Woodbridge, (Classified as Convenience by the - author.) - - - pgr_pointToEdgeNode - convert a point geometry to a vertex_id based on - closest edge. - - pgr_flipEdges - flip the edges in an array of geometries so the connect end - to end. - - pgr_textToPoints - convert a string of x,y;x,y;... locations into point - geometries. - - pgr_pointsToVids - convert an array of point geometries into vertex ids. - - pgr_pointsToDMatrix - Create a distance matrix from an array of points. - - pgr_vidsToDMatrix - Create a distance matrix from an array of vertix_id. - - pgr_vidsToDMatrix - Create a distance matrix from an array of vertix_id. - -- Added proposed functions from GSoc Projects: - - - pgr_vrppdtw - - pgr_vrponedepot - -**Deprecated Functions** - -- pgr_getColumnName -- pgr_getTableName -- pgr_isColumnCndexed -- pgr_isColumnInTable -- pgr_quote_ident -- pgr_versionless -- pgr_startPoint -- pgr_endPoint -- pgr_pointToId - -**No longer supported** - -- Removed the 1.x legacy functions - -**Bug Fixes** - -- Some bug fixes in other functions - - -**Refactoring Internal Code** - -- A C and C++ library for developer was created - - - encapsulates postgreSQL related functions - - encapsulates Boost.Graph graphs - - - Directed Boost.Graph - - Undirected Boost.graph. - - - allow any-integer in the id's - - allow any-numerical on the cost/reverse_cost columns - -- Instead of generating many libraries: - - All functions are encapsulated in one library - - The library has the prefix 2-1-0 - - - -pgRouting 2.0.1 Release Notes -------------------------------------------------------------------------------- - -Minor bug fixes. - -**Bug Fixes** - -* No track of the bug fixes were kept. - - - -pgRouting 2.0.0 Release Notes -------------------------------------------------------------------------------- - -To see the issues closed by this release see the `Git closed issues for 2.0.0 -`_ -on Github. - -With the release of pgRouting 2.0.0 the library has abandoned backwards -compatibility to `pgRouting 1.x Release Notes`_ releases. -The main Goals for this release are: - -* Major restructuring of pgRouting. -* Standardization of the function naming -* Preparation of the project for future development. - -As a result of this effort: - -* pgRouting has a simplified structure -* Significant new functionality has being added -* Documentation has being integrated -* Testing has being integrated -* And made it easier for multiple developers to make contributions. - - -**Important Changes** - -* Graph Analytics - tools for detecting and fixing connection some problems in a - graph -* A collection of useful utility functions -* Two new All Pairs Short Path algorithms (pgr_apspJohnson, pgr_apspWarshall) -* Bi-directional Dijkstra and A-star search algorithms (pgr_bdAstar, - pgr_bdDijkstra) -* One to many nodes search (pgr_kDijkstra) -* K alternate paths shortest path (pgr_ksp) -* New TSP solver that simplifies the code and the build process (pgr_tsp), - dropped "Gaul Library" dependency -* Turn Restricted shortest path (pgr_trsp) that replaces Shooting Star -* Dropped support for Shooting Star -* Built a test infrastructure that is run before major code changes are checked - in -* Tested and fixed most all of the outstanding bugs reported against 1.x that - existing in the 2.0-dev code base. -* Improved build process for Windows -* Automated testing on Linux and Windows platforms trigger by every commit -* Modular library design -* Compatibility with PostgreSQL 9.1 or newer -* Compatibility with PostGIS 2.0 or newer -* Installs as PostgreSQL EXTENSION -* Return types re factored and unified -* Support for table SCHEMA in function parameters -* Support for ``st_`` PostGIS function prefix -* Added ``pgr_`` prefix to functions and types -* Better documentation: https://docs.pgrouting.org -* shooting_star is discontinued - - - - -pgRouting 1.x Release Notes -------------------------------------------------------------------------------- - -To see the issues closed by this release see the `Git closed issues for 1.x -`_ -on Github. -The following release notes have been copied from the previous ``RELEASE_NOTES`` -file and are kept as a reference. - - -Changes for release 1.05 -............................................................................... - -* Bug fixes - - -Changes for release 1.03 -............................................................................... - -* Much faster topology creation -* Bug fixes - - -Changes for release 1.02 -............................................................................... - -* Shooting* bug fixes -* Compilation problems solved - - -Changes for release 1.01 -............................................................................... - -* Shooting* bug fixes - - -Changes for release 1.0 -............................................................................... - -* Core and extra functions are separated -* Cmake build process -* Bug fixes - - -Changes for release 1.0.0b -............................................................................... - -* Additional SQL file with more simple names for wrapper functions -* Bug fixes - - -Changes for release 1.0.0a -............................................................................... - -* Shooting* shortest path algorithm for real road networks -* Several SQL bugs were fixed - - -Changes for release 0.9.9 -............................................................................... - -* PostgreSQL 8.2 support -* Shortest path functions return empty result if they could not find any path - - -Changes for release 0.9.8 -............................................................................... - -* Renumbering scheme was added to shortest path functions -* Directed shortest path functions were added -* routing_postgis.sql was modified to use dijkstra in TSP search +MOVED TO https://github.com/pgRouting/pgrouting/main/NEWS.md diff --git a/NEWS.md b/NEWS.md new file mode 100644 index 0000000000..4ba6b37779 --- /dev/null +++ b/NEWS.md @@ -0,0 +1,1696 @@ +# pgRouting 3 + + +## pgRouting 3.7 + +### pgRouting 3.7.0 Release Notes + +To see all issues & pull requests closed by this release see the [Git closed +milestone for 3.7.0 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.7.0%22) + +**Code enhancement** + +* [#2599](https://github.com/pgRouting/pgrouting/pull/2599) Driving distance + cleanup + +**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 +milestone for 3.6.1 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.6.1%22) + +* [#2588](https://github.com/pgRouting/pgrouting/pull/2588) pgrouting 3.6.0 + fails to build on OSX + +### pgRouting 3.6.0 Release Notes + +To see all issues & pull requests closed by this release see the [Git closed +milestone for 3.6.0 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.6.0%22) + +**Official functions changes** + +* [#2516](https://github.com/pgRouting/pgrouting/pull/2516) Standarize output + pgr_aStar + + * Standarizing output columns to ``(seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)`` + + * ``pgr_aStar`` (`One to One`) added ``start_vid`` and ``end_vid`` columns. + * ``pgr_aStar`` (`One to Many`) added ``end_vid`` column. + * ``pgr_aStar`` (`Many to One`) added ``start_vid`` column. + +* [#2523](https://github.com/pgRouting/pgrouting/pull/2523) Standarize output + pgr_bdAstar + + * Standarizing output columns to ``(seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)`` + + * ``pgr_bdAstar`` (`One to One`) added ``start_vid`` and ``end_vid`` + columns. + * ``pgr_bdAstar`` (`One to Many`) added ``end_vid`` column. + * ``pgr_bdAstar`` (`Many to One`) added ``start_vid`` column. + +* [#2547](https://github.com/pgRouting/pgrouting/pull/2547) Standarize output + and modifying signature pgr_KSP + + + * Result columns standarized to: ``(seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)`` + * ``pgr_ksp`` (One to One) + + * Added ``start_vid`` and ``end_vid`` result columns. + + * New overload functions: + + * ``pgr_ksp`` (One to Many) + * ``pgr_ksp`` (Many to One) + * ``pgr_ksp`` (Many to Many) + * ``pgr_ksp`` (Combinations) + + +* [#2548](https://github.com/pgRouting/pgrouting/pull/2548) Standarize output + pgr_drivingdistance + + + * Standarizing output columns to ``(seq, depth, start_vid, pred, node, edge, cost, agg_cost)`` + + * ``pgr_drivingdistance`` (Single vertex) + + * Added ``depth`` and ``start_vid`` result columns. + + * ``pgr_drivingdistance`` (Multiple vertices) + + * Result column name change: ``from_v`` to ``start_vid``. + * Added ``depth`` and ``pred`` result columns. + + +**Proposed functions changes** + +* [#2544](https://github.com/pgRouting/pgrouting/pull/2544) Standarize output + and modifying signature pgr_withPointsDD + + + * Signature change: ``driving_side`` parameter changed from named optional to + unnamed compulsory **driving side**. + + * ``pgr_withPointsDD`` (`Single vertex`) + * ``pgr_withPointsDD`` (`Multiple vertices`) + + * Standarizing output columns to ``(seq, depth, start_vid, pred, node, edge, cost, agg_cost)`` + + * ``pgr_withPointsDD`` (`Single vertex`) + + * Added ``depth``, ``pred`` and ``start_vid`` column. + + * ``pgr_withPointsDD`` (`Multiple vertices`) + + * Added ``depth``, ``pred`` columns. + + * When ``details`` is ``false``: + + * Only points that are visited are removed, that is, points reached within the + distance are included + + * Deprecated signatures + + * ``pgr_withpointsdd(text,text,bigint,double precision,boolean,character,boolean)`` + * ``pgr_withpointsdd(text,text,anyarray,double precision,boolean,character,boolean,boolean)`` + + +* [#2546](https://github.com/pgRouting/pgrouting/pull/2546) Standarize output + and modifying signature pgr_withPointsKSP + + + * Standarizing output columns to ``(seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)`` + * ``pgr_withPointsKSP`` (One to One) + + * Signature change: ``driving_side`` parameter changed from named optional to + unnamed compulsory **driving side**. + * Added ``start_vid`` and ``end_vid`` result columns. + + * New overload functions + + * ``pgr_withPointsKSP`` (One to Many) + * ``pgr_withPointsKSP`` (Many to One) + * ``pgr_withPointsKSP`` (Many to Many) + * ``pgr_withPointsKSP`` (Combinations) + + * Deprecated signature + + * ``pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,char,boolean)`` + + +**C/C++ code enhancements** + +* [#2504](https://github.com/pgRouting/pgrouting/pull/2504) To C++ pg data get, + fetch and check. + + * Stopping support for compilation with MSVC. + +* [#2505](https://github.com/pgRouting/pgrouting/pull/2505) Using namespace. +* [#2512](https://github.com/pgRouting/pgrouting/pull/2512) [Dijkstra] Removing + duplicate code on Dijkstra. +* [#2517](https://github.com/pgRouting/pgrouting/pull/2517) Astar code + simplification. +* [#2521](https://github.com/pgRouting/pgrouting/pull/2521) Dijkstra code + simplification. +* [#2522](https://github.com/pgRouting/pgrouting/pull/2522) bdAstar code + simplification. + +**Documentation** + +* [#2490](https://github.com/pgRouting/pgrouting/pull/2490) Automatic page + history links. + +* ..rubric:: SQL standarization + +* [#2555](https://github.com/pgRouting/pgrouting/pull/2555) standarize + deprecated messages +* On new internal function: do not use named parameters and default parameters. + +## pgRouting 3.5 + + +### pgRouting 3.5.1 Release Notes + +To see all issues & pull requests closed by this release see the [Git closed +milestone for 3.5.1 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.5.1%22) + +**Documentation fixes** + +Changes on the documentation to the following: + +* pgr_degree +* pgr_dijkstra +* pgr_ksp +* Automatic page history links + + * using bootstrap_version 2 because 3+ does not do dropdowns + +**Issue fixes** + +* [#2565](https://github.com/pgRouting/pgrouting/issues/2565) + pgr_pgr_lengauerTarjanDominatorTree triggers an assertion + +**SQL enhancements** + +* [#2561](https://github.com/pgRouting/pgrouting/issues/2561) Not use + wildcards on SQL + +**pgtap tests** + +* [#2559](https://github.com/pgRouting/pgrouting/issues/2559) pgtap test using sampledata + +**Build fixes** + +* Fix winnie build + +**Code fixes** + +* Fix clang warnings + + * Grouping headers of postgres readers + +### pgRouting 3.5.0 Release Notes + +To see all issues & pull requests closed by this release see the [Git closed +milestone for 3.5.0 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.5.0%22) + +**Official functions changes** + +* Dijkstra + + * Standarizing output columns to ``(seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)`` + + * ``pgr_dijkstra`` (`One to One`) added ``start_vid`` and ``end_vid`` columns. + * ``pgr_dijkstra`` (`One to Many`) added ``end_vid`` column. + * ``pgr_dijkstra`` (`Many to One`) added ``start_vid`` column. + +## pgRouting 3.4 + + +### pgRouting 3.4.2 Release Notes + +To see all issues & pull requests closed by this release see the [Git closed +milestone for 3.4.2 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.4.2%22) + +**Issue fixes** + +* [#2394](https://github.com/pgRouting/pgrouting/issues/2394): + pgr_bdAstar accumulates heuristic cost in visited node cost. +* [#2427](https://github.com/pgRouting/pgrouting/issues/2427): + pgr_createVerticesTable & pgr_createTopology, variable should be of type Record. + +### pgRouting 3.4.1 Release Notes + +To see all issues & pull requests closed by this release see the [Git closed +milestone for 3.4.1 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.4.1%22) + +**Issue fixes** + +* [#2401](https://github.com/pgRouting/pgrouting/issues/2401): + pgRouting 3.4.0 do not build docs when sphinx is too low or missing +* [#2398](https://github.com/pgRouting/pgrouting/issues/2398): + v3.4.0 does not upgrade from 3.3.3 + +### pgRouting 3.4.0 Release Notes + +To see all issues & pull requests closed by this release see the [Git closed +milestone for 3.4.0 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.4.0%22) + +**Issue fixes** + +* [#1891](https://github.com/pgRouting/pgrouting/issues/1891): + pgr_ksp doesn't give all correct shortest path + +**New proposed functions** + +* With points + + * ``pgr_withPointsVia`` (One Via) + +* Turn Restrictions + + * Via with turn restrictions + + * ``pgr_trspVia`` (One Via) + * ``pgr_trspVia_withPoints`` (One Via) + + * ``pgr_trsp`` + + * ``pgr_trsp`` (One to One) + * ``pgr_trsp`` (One to Many) + * ``pgr_trsp`` (Many to One) + * ``pgr_trsp`` (Many to Many) + * ``pgr_trsp`` (Combinations) + + * ``pgr_trsp_withPoints`` + + * ``pgr_trsp_withPoints`` (One to One) + * ``pgr_trsp_withPoints`` (One to Many) + * ``pgr_trsp_withPoints`` (Many to One) + * ``pgr_trsp_withPoints`` (Many to Many) + * ``pgr_trsp_withPoints`` (Combinations) + +* Topology + + * ``pgr_degree`` + +* Utilities + + * ``pgr_findCloseEdges`` (One point) + * ``pgr_findCloseEdges`` (Many points) + +**New experimental functions** + +* Ordering + + * ``pgr_cuthillMckeeOrdering`` + +* Unclassified + + * ``pgr_hawickCircuits`` + +**Official functions changes** + +* Flow functions + + * ``pgr_maxCardinalityMatch(text)`` + + * Deprecating ``pgr_maxCardinalityMatch(text,boolean)`` + +**Deprecated Functions** + +* Turn Restrictions + + * ``pgr_trsp(text,integer,integer,boolean,boolean,text)`` + * ``pgr_trsp(text,integer,float8,integer,float8,boolean,boolean,text)`` + * ``pgr_trspViaVertices(text,anyarray,boolean,boolean,text)`` + * ``pgr_trspViaEdges(text,integer[],float[],boolean,boolean,text)`` + +## pgRouting 3.3 + + +### pgRouting 3.3.5 Release Notes + +* [#2401](https://github.com/pgRouting/pgrouting/issues/2401): + pgRouting 3.4.0 do not build docs when sphinx is too low or missing + +### pgRouting 3.3.4 Release Notes + +To see all issues & pull requests closed by this release see the [Git closed +milestone for 3.3.4 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.3.4%22) + +**Issue fixes** + +* [#2400](https://github.com/pgRouting/pgrouting/issues/2400): + pgRouting 3.3.3 does not build in focal + +### pgRouting 3.3.3 Release Notes + +To see all issues & pull requests closed by this release see the [Git closed +milestone for 3.3.3 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.3.3%22) + +**Issue fixes** + +* [#1891](https://github.com/pgRouting/pgrouting/issues/1891): + pgr_ksp doesn't give all correct shortest path + +**Official functions changes** + +* Flow functions + + * ``pgr_maxCardinalityMatch(text,boolean)`` + + * Ignoring optional boolean parameter, as the algorithm works only for + undirected graphs. + + +### pgRouting 3.3.2 Release Notes + +To see all issues & pull requests closed by this release see the [Git closed +milestone for 3.3.2 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.3.2%22) + +* Revised documentation + + * Simplifying table names and table columns, for example: + + * ``edges`` instead of ``edge_table`` + + * Removing unused columns ``category_id`` and ``reverse_category_id``. + + * ``combinations`` instead of ``combinations_table`` + + * Using PostGIS standard for geometry column. + + * ``geom`` instead of ``the_geom`` + + * Avoiding usage of functions that modify indexes, columns etc on tables. + + * Using ``pgr_extractVertices`` to create a routing topology + + * Restructure of the pgRouting concepts page. + + +**Issue fixes** + +* [#2276](https://github.com/pgRouting/pgrouting/issues/2276): + edgeDisjointPaths issues with start_vid and combinations +* [#2312](https://github.com/pgRouting/pgrouting/issues/2312): + pgr_extractVertices error when target is not BIGINT +* [#2357](https://github.com/pgRouting/pgrouting/issues/2357): + Apply clang-tidy performance-* + +### pgRouting 3.3.1 Release Notes + +To see all issues & pull requests closed by this release see the [Git closed +milestone for 3.3.1 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.3.1%22) +on Github. + +**Issue fixes** + +* [#2216](https://github.com/pgRouting/pgrouting/issues/2216): Warnings when using clang +* [#2266](https://github.com/pgRouting/pgrouting/issues/2266): Error processing restrictions + + +### pgRouting 3.3.0 Release Notes + +To see all issues & pull requests closed by this release see the [Git closed +milestone for 3.3.0 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.3.0%22) +on Github. + +**Issue fixes** + +* [#2057](https://github.com/pgRouting/pgrouting/issues/2057): trspViaEdges columns in different order +* [#2087](https://github.com/pgRouting/pgrouting/issues/2087): pgr_extractVertices to proposed +* [#2201](https://github.com/pgRouting/pgrouting/issues/2201): pgr_depthFirstSearch to proposed +* [#2202](https://github.com/pgRouting/pgrouting/issues/2202): pgr_sequentialVertexColoring to proposed +* [#2203](https://github.com/pgRouting/pgrouting/issues/2203): pgr_dijkstraNear and pgr_dijkstraNearCost to proposed + +**New experimental functions** + +* Coloring + + * pgr_edgeColoring + +**Experimental promoted to Proposed** + +* Dijkstra + + * pgr_dijkstraNear + + * pgr_dijkstraNear(Combinations) + * pgr_dijkstraNear(Many to Many) + * pgr_dijkstraNear(Many to One) + * pgr_dijkstraNear(One to Many) + + * pgr_dijkstraNearCost + + * pgr_dijkstraNearCost(Combinations) + * pgr_dijkstraNearCost(Many to Many) + * pgr_dijkstraNearCost(Many to One) + * pgr_dijkstraNearCost(One to Many) + +* Coloring + + * pgr_sequentialVertexColoring + +* Topology + + * pgr_extractVertices + +* Traversal + + * pgr_depthFirstSearch(Multiple vertices) + * pgr_depthFirstSearch(Single vertex) + +## pgRouting 3.2 + + +### pgRouting 3.2.2 Release Notes + +To see all issues & pull requests closed by this release see the [Git closed +milestone for 3.2.2 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.2.2%22) +on Github. + +**Issue fixes** + +* [#2093](https://github.com/pgRouting/pgrouting/issues/2093): Compilation on Visual Studio +* [#2189](https://github.com/pgRouting/pgrouting/issues/2189): Build error on RHEL 7 + +### pgRouting 3.2.1 Release Notes + +To see all issues & pull requests closed by this release see the [Git closed +milestone for 3.2.1 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.2.1%22) +on Github. + +**Issue fixes** + +* [#1883](https://github.com/pgRouting/pgrouting/issues/1883): pgr_TSPEuclidean crashes connection on Windows + + * The solution is to use Boost::graph::metric_tsp_approx + * To not break user's code the optional parameters related to the TSP Annaeling are ignored + * The function with the annaeling optional parameters is deprecated + + +### pgRouting 3.2.0 Release Notes + +To see all issues & pull requests closed by this release see the [Git closed +milestone for 3.2.0 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.2.0%22) +on Github. + +**Build** + +* [#1850](https://github.com/pgRouting/pgrouting/issues/1850): Change Boost + min version to 1.56 + + * Removing support for Boost v1.53, v1.54 & v1.55 + +**New experimental functions** + +* pgr_bellmanFord(Combinations) +* pgr_binaryBreadthFirstSearch(Combinations) +* pgr_bipartite +* pgr_dagShortestPath(Combinations) +* pgr_depthFirstSearch +* Dijkstra Near + + * pgr_dijkstraNear + + * pgr_dijkstraNear(One to Many) + * pgr_dijkstraNear(Many to One) + * pgr_dijkstraNear(Many to Many) + * pgr_dijkstraNear(Combinations) + + * pgr_dijkstraNearCost + + * pgr_dijkstraNearCost(One to Many) + * pgr_dijkstraNearCost(Many to One) + * pgr_dijkstraNearCost(Many to Many) + * pgr_dijkstraNearCost(Combinations) + +* pgr_edwardMoore(Combinations) +* pgr_isPlanar +* pgr_lengauerTarjanDominatorTree +* pgr_makeConnected +* Flow + + * pgr_maxFlowMinCost(Combinations) + * pgr_maxFlowMinCost_Cost(Combinations) + +* pgr_sequentialVertexColoring + +**New proposed functions** + +* Astar + + * pgr_aStar(Combinations) + * pgr_aStarCost(Combinations) + +* Bidirectional Astar + + * pgr_bdAstar(Combinations) + * pgr_bdAstarCost(Combinations) + +* Bidirectional Dijkstra + + * pgr_bdDijkstra(Combinations) + * pgr_bdDijkstraCost(Combinations) + +* Flow + + * pgr_boykovKolmogorov(Combinations) + * pgr_edgeDisjointPaths(Combinations) + * pgr_edmondsKarp(Combinations) + * pgr_maxFlow(Combinations) + * pgr_pushRelabel(Combinations) + +* pgr_withPoints(Combinations) +* pgr_withPointsCost(Combinations) + +## pgRouting 3.1 + + +### pgRouting 3.1.4 Release Notes + +To see all issues & pull requests closed by this release see the [Git closed +milestone for 3.1.4 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.1.4%22) +on Github. + +**Issues fixes** + +* [#2189](https://github.com/pgRouting/pgrouting/issues/2189): Build error on + RHEL 7 + + +### pgRouting 3.1.3 Release Notes + +To see all issues & pull requests closed by this release see the [Git closed +milestone for 3.1.3 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.1.3%22) +on Github. + +**Issues fixes** + +* [#1825](https://github.com/pgRouting/pgrouting/issues/1825): Boost versions + are not honored +* [#1849](https://github.com/pgRouting/pgrouting/issues/1849): Boost 1.75.0 + geometry "point_xy.hpp" build error on macOS environment +* [#1861](https://github.com/pgRouting/pgrouting/issues/1861): vrp functions + crash server + + +### pgRouting 3.1.2 Release Notes + +To see all issues & pull requests closed by this release see the [Git closed +milestone for 3.1.2 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.1.2%22) +on Github. + +**Issues fixes** + +* [#1304](https://github.com/pgRouting/pgrouting/issues/1304): FreeBSD 12 + 64-bit crashes on pgr_vrOneDepot tests Experimental Function +* [#1356](https://github.com/pgRouting/pgrouting/issues/1356): + tools/testers/pg_prove_tests.sh fails when PostgreSQL port is not passed +* [#1725](https://github.com/pgRouting/pgrouting/issues/1725): Server crash + on pgr_pickDeliver and pgr_vrpOneDepot on openbsd +* [#1760](https://github.com/pgRouting/pgrouting/issues/1760): TSP server + crash on ubuntu 20.04 #1760 +* [#1770](https://github.com/pgRouting/pgrouting/issues/1770): Remove + warnings when using clang compiler + + +### pgRouting 3.1.1 Release Notes + +To see all issues & pull requests closed by this release see the [Git closed +milestone for 3.1.1 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.1.1%22) +on Github. + +**Issues fixes** + +* [#1733](https://github.com/pgRouting/pgrouting/issues/1733): pgr_bdAstar + fails when source or target vertex does not exist in the graph +* [#1647](https://github.com/pgRouting/pgrouting/issues/1647): Linear + Contraction contracts self loops +* [#1640](https://github.com/pgRouting/pgrouting/issues/1640): pgr_withPoints + fails when points_sql is empty +* [#1616](https://github.com/pgRouting/pgrouting/issues/1616): Path + evaluation on C++ not updated before the results go back to C +* [#1300](https://github.com/pgRouting/pgrouting/issues/1300): + pgr_chinesePostman crash on test data + + + +### pgRouting 3.1.0 Release Notes + +To see all issues & pull requests closed by this release see the [Git closed +milestone for 3.1.0 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.1.0%22) +on Github. + +**New proposed functions** + +* pgr_dijkstra(combinations) +* pgr_dijkstraCost(combinations) + +**Build changes** + +* Minimal requirement for Sphinx: version 1.8 + +## pgRouting 3.0 + + +### pgRouting 3.0.6 Release Notes + +To see all issues & pull requests closed by this release see the [Git closed +milestone for 3.0.6 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.0.6%22) +on Github. + +**Issues fixes** + +* [#2189](https://github.com/pgRouting/pgrouting/issues/2189): Build error on + RHEL 7 + + +### pgRouting 3.0.5 Release Notes + +To see all issues & pull requests closed by this release see the [Git closed +milestone for 3.0.5 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.0.5%22) +on Github. + +**Backport issue fixes** + +* [#1825](https://github.com/pgRouting/pgrouting/issues/1825): Boost versions + are not honored +* [#1849](https://github.com/pgRouting/pgrouting/issues/1849): Boost 1.75.0 + geometry "point_xy.hpp" build error on macOS environment +* [#1861](https://github.com/pgRouting/pgrouting/issues/1861): vrp functions + crash server + + +### pgRouting 3.0.4 Release Notes + +To see all issues & pull requests closed by this release see the [Git closed +milestone for 3.0.4 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.0.4%22) +on Github. + +**Backport issue fixes** + +* [#1304](https://github.com/pgRouting/pgrouting/issues/1304): FreeBSD 12 + 64-bit crashes on pgr_vrOneDepot tests Experimental Function +* [#1356](https://github.com/pgRouting/pgrouting/issues/1356): + tools/testers/pg_prove_tests.sh fails when PostgreSQL port is not passed +* [#1725](https://github.com/pgRouting/pgrouting/issues/1725): Server crash + on pgr_pickDeliver and pgr_vrpOneDepot on openbsd +* [#1760](https://github.com/pgRouting/pgrouting/issues/1760): TSP server + crash on ubuntu 20.04 #1760 +* [#1770](https://github.com/pgRouting/pgrouting/issues/1770): Remove + warnings when using clang compiler + + + +### pgRouting 3.0.3 Release Notes + +**Backport issue fixes** + +* [#1733](https://github.com/pgRouting/pgrouting/issues/1733): pgr_bdAstar + fails when source or target vertex does not exist in the graph +* [#1647](https://github.com/pgRouting/pgrouting/issues/1647): Linear + Contraction contracts self loops +* [#1640](https://github.com/pgRouting/pgrouting/issues/1640): pgr_withPoints + fails when points_sql is empty +* [#1616](https://github.com/pgRouting/pgrouting/issues/1616): Path + evaluation on C++ not updated before the results go back to C +* [#1300](https://github.com/pgRouting/pgrouting/issues/1300): + pgr_chinesePostman crash on test data + + + +### pgRouting 3.0.2 Release Notes + +To see all issues & pull requests closed by this release see the [Git closed +milestone for 3.0.2 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.0.2%22) +on Github. + +**Issues fixes** + +* [#1378](https://github.com/pgRouting/pgrouting/issues/1378): Visual Studio + build failing + + +### pgRouting 3.0.1 Release Notes + +To see all issues & pull requests closed by this release see the [Git closed +milestone for 3.0.1 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.0.1%22) +on Github. + +**Issues fixes** + +* [#232](https://github.com/pgRouting/pgrouting/issues/232): Honor client + cancel requests in C /C++ code + + +### pgRouting 3.0.0 Release Notes + + +To see all issues & pull requests closed by this release see the [Git closed +milestone for 3.0.0 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.0.0%22) +on Github. + +**Fixed Issues** + +* [#1153](https://github.com/pgRouting/pgrouting/issues/1153): Renamed + pgr_eucledianTSP to pgr_TSPeuclidean +* [#1188](https://github.com/pgRouting/pgrouting/issues/1188): Removed CGAL + dependency +* [#1002](https://github.com/pgRouting/pgrouting/issues/1002): Fixed + contraction issues: + + * [#1004](https://github.com/pgRouting/pgrouting/issues/1004): Contracts + when forbidden vertices do not belong to graph + * [#1005](https://github.com/pgRouting/pgrouting/issues/1005): Intermideate + results eliminated + * [#1006](https://github.com/pgRouting/pgrouting/issues/1006): No loss of + information + +**New functions** + +* Kruskal family + + * pgr_kruskal + * pgr_kruskalBFS + * pgr_kruskalDD + * pgr_kruskalDFS + +* Prim family + + * pgr_prim + * pgr_primDD + * pgr_primDFS + * pgr_primBFS + + +**Proposed moved to official on pgRouting** + +* aStar Family + + * pgr_aStar(one to many) + * pgr_aStar(many to one) + * pgr_aStar(many to many) + * pgr_aStarCost(one to one) + * pgr_aStarCost(one to many) + * pgr_aStarCost(many to one) + * pgr_aStarCost(many to many) + * pgr_aStarCostMatrix(one to one) + * pgr_aStarCostMatrix(one to many) + * pgr_aStarCostMatrix(many to one) + * pgr_aStarCostMatrix(many to many) + +* bdAstar Family + + * pgr_bdAstar(one to many) + * pgr_bdAstar(many to one) + * pgr_bdAstar(many to many) + * pgr_bdAstarCost(one to one) + * pgr_bdAstarCost(one to many) + * pgr_bdAstarCost(many to one) + * pgr_bdAstarCost(many to many) + * pgr_bdAstarCostMatrix(one to one) + * pgr_bdAstarCostMatrix(one to many) + * pgr_bdAstarCostMatrix(many to one) + * pgr_bdAstarCostMatrix(many to many) + +* bdDijkstra Family + + * pgr_bdDijkstra(one to many) + * pgr_bdDijkstra(many to one) + * pgr_bdDijkstra(many to many) + * pgr_bdDijkstraCost(one to one) + * pgr_bdDijkstraCost(one to many) + * pgr_bdDijkstraCost(many to one) + * pgr_bdDijkstraCost(many to many) + * pgr_bdDijkstraCostMatrix(one to one) + * pgr_bdDijkstraCostMatrix(one to many) + * pgr_bdDijkstraCostMatrix(many to one) + * pgr_bdDijkstraCostMatrix(many to many) + +* Flow Family + + * pgr_pushRelabel(one to one) + * pgr_pushRelabel(one to many) + * pgr_pushRelabel(many to one) + * pgr_pushRelabel(many to many) + * pgr_edmondsKarp(one to one) + * pgr_edmondsKarp(one to many) + * pgr_edmondsKarp(many to one) + * pgr_edmondsKarp(many to many) + * pgr_boykovKolmogorov (one to one) + * pgr_boykovKolmogorov (one to many) + * pgr_boykovKolmogorov (many to one) + * pgr_boykovKolmogorov (many to many) + * pgr_maxCardinalityMatching + * pgr_maxFlow + * pgr_edgeDisjointPaths(one to one) + * pgr_edgeDisjointPaths(one to many) + * pgr_edgeDisjointPaths(many to one) + * pgr_edgeDisjointPaths(many to many) + +* Components family + + * pgr_connectedComponents + * pgr_strongComponents + * pgr_biconnectedComponents + * pgr_articulationPoints + * pgr_bridges + +* Contraction: + + * Removed unnecessary column seq + * Bug Fixes + + +**New experimental functions** + +* pgr_maxFlowMinCost +* pgr_maxFlowMinCost_Cost +* pgr_extractVertices +* pgr_turnRestrictedPath +* pgr_stoerWagner +* pgr_dagShortestpath +* pgr_topologicalSort +* pgr_transitiveClosure +* VRP category + + * pgr_pickDeliverEuclidean + * pgr_pickDeliver + +* Chinese Postman family + + * pgr_chinesePostman + * pgr_chinesePostmanCost + +* Breadth First Search family + + * pgr_breadthFirstSearch + * pgr_binaryBreadthFirstSearch + +* Bellman Ford family + + * pgr_bellmanFord + * pgr_edwardMoore + +**Moved to legacy** + +* Experimental functions + + * pgr_labelGraph - Use the components family of functions instead. + * Max flow - functions were renamed on v2.5.0 + + * pgr_maxFlowPushRelabel + * pgr_maxFlowBoykovKolmogorov + * pgr_maxFlowEdmondsKarp + * pgr_maximumcardinalitymatching + + * VRP + + * pgr_gsoc_vrppdtw + +* TSP old signatures +* pgr_pointsAsPolygon +* pgr_alphaShape old signature + +# pgRouting 2 + + +## pgRouting 2.6 + + +### pgRouting 2.6.3 Release Notes + +To see the issues closed by this release see the [Git closed milestone for 2.6.3 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.6.3%22%20) +on Github. + +**Bug fixes** + +* [#1219](https://github.com/pgRouting/pgrouting/pull/1219) Implicit cast for + via_path integer to text +* [#1193](https://github.com/pgRouting/pgrouting/pull/1193) Fixed + pgr_pointsAsPolygon breaking when comparing strings in WHERE clause +* [#1185](https://github.com/pgRouting/pgrouting/pull/1185) Improve + FindPostgreSQL.cmake + + + +### pgRouting 2.6.2 Release Notes + +To see the issues closed by this release see the [Git closed milestone for 2.6.2 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.6.2%22%20) +on Github. + +**Bug fixes** + +* [#1152](https://github.com/pgRouting/pgrouting/issues/1152) Fixes driving + distance when vertex is not part of the graph +* [#1098](https://github.com/pgRouting/pgrouting/issues/1098) Fixes windows + test +* [#1165](https://github.com/pgRouting/pgrouting/issues/1165) Fixes build for + python3 and perl5 + + +### pgRouting 2.6.1 Release Notes + +To see the issues closed by this release see the [Git closed milestone for 2.6.1 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.6.1%22%20) +on Github. + +* Fixes server crash on several functions. + + * pgr_floydWarshall + * pgr_johnson + * pgr_astar + * pgr_bdAstar + * pgr_bdDijstra + * pgr_alphashape + * pgr_dijkstraCostMatrix + * pgr_dijkstra + * pgr_dijkstraCost + * pgr_drivingDistance + * pgr_KSP + * pgr_dijkstraVia (proposed) + * pgr_boykovKolmogorov (proposed) + * pgr_edgeDisjointPaths (proposed) + * pgr_edmondsKarp (proposed) + * pgr_maxCardinalityMatch (proposed) + * pgr_maxFlow (proposed) + * pgr_withPoints (proposed) + * pgr_withPointsCost (proposed) + * pgr_withPointsKSP (proposed) + * pgr_withPointsDD (proposed) + * pgr_withPointsCostMatrix (proposed) + * pgr_contractGraph (experimental) + * pgr_pushRelabel (experimental) + * pgr_vrpOneDepot (experimental) + * pgr_gsoc_vrppdtw (experimental) + * Fixes for deprecated functions where also applied but not tested + +* Removed compilation warning for g++8 +* Fixed a fallthrugh on Astar and bdAstar. + + +### pgRouting 2.6.0 Release Notes + +To see the issues closed by this release see the [Git closed milestone for 2.6.0 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.6.0%22%20) +on Github. + + +**New experimental functions** + +* pgr_lineGraphFull + +**Bug fixes** + +* Fix pgr_trsp(text,integer,double precision,integer,double + precision,boolean,boolean[,text]) + + * without restrictions + + * calls pgr_dijkstra when both end points have a fraction IN (0,1) + * calls pgr_withPoints when at least one fraction NOT IN (0,1) + + * with restrictions + + * calls original trsp code + +**Internal code** + +* Cleaned the internal code of trsp(text,integer,integer,boolean,boolean [, + text]) + + * Removed the use of pointers + * Internal code can accept BIGINT + +* Cleaned the internal code of withPoints + +## pgRouting 2.5 + + +### pgRouting 2.5.5 Release Notes + +To see the issues closed by this release see the [Git closed milestone for 2.5.5 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.5%22%20) +on Github. + +**Bug fixes** + +* Fixes driving distance when vertex is not part of the graph +* Fixes windows test +* Fixes build for python3 and perl5 + + +### pgRouting 2.5.4 Release Notes + +To see the issues closed by this release see the [Git closed milestone for 2.5.4](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.4%22%20) on Github. + +* Fixes server crash on several functions. + + * pgr_floydWarshall + * pgr_johnson + * pgr_astar + * pgr_bdAstar + * pgr_bdDijstra + * pgr_alphashape + * pgr_dijkstraCostMatrix + * pgr_dijkstra + * pgr_dijkstraCost + * pgr_drivingDistance + * pgr_KSP + * pgr_dijkstraVia (proposed) + * pgr_boykovKolmogorov (proposed) + * pgr_edgeDisjointPaths (proposed) + * pgr_edmondsKarp (proposed) + * pgr_maxCardinalityMatch (proposed) + * pgr_maxFlow (proposed) + * pgr_withPoints (proposed) + * pgr_withPointsCost (proposed) + * pgr_withPointsKSP (proposed) + * pgr_withPointsDD (proposed) + * pgr_withPointsCostMatrix (proposed) + * pgr_contractGraph (experimental) + * pgr_pushRelabel (experimental) + * pgr_vrpOneDepot (experimental) + * pgr_gsoc_vrppdtw (experimental) + * Fixes for deprecated functions where also applied but not tested + +* Removed compilation warning for g++8 +* Fixed a fallthrugh on Astar and bdAstar. + + +### pgRouting 2.5.3 Release Notes + +To see the issues closed by this release see the [Git closed milestone for 2.5.3 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.3%22%20) +on Github. + +**Bug fixes** + +* Fix for postgresql 11: Removed a compilation error when compiling with + postgreSQL + + +### pgRouting 2.5.2 Release Notes + +To see the issues closed by this release see the [Git closed milestone for 2.5.2](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.2%22%20) on Github. + +**Bug fixes** + +* Fix for postgresql 10.1: Removed a compiler condition + + + +### pgRouting 2.5.1 Release Notes + +To see the issues closed by this release see the [Git closed milestone for 2.5.1 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.1%22%20) +on Github. + +**Bug fixes** + +* Fixed prerequisite minimum version of: cmake + + + +### pgRouting 2.5.0 Release Notes + +To see the issues closed by this release see the [Git closed issues for 2.5.0 +](https://github.com/pgRouting/pgrouting/issues?q=milestone%3A%22Release+2.5.0%22+is%3Aclosed) +on Github. + + +**enhancement:** + +* pgr_version is now on SQL language + +**Breaking change on:** + +* pgr_edgeDisjointPaths: + + * Added path_id, cost and agg_cost columns on the result + * Parameter names changed + * The many version results are the union of the one to one version + +**New Signatures** + +* pgr_bdAstar(one to one) + +**New Proposed functions** + +* pgr_bdAstar(one to many) +* pgr_bdAstar(many to one) +* pgr_bdAstar(many to many) +* pgr_bdAstarCost(one to one) +* pgr_bdAstarCost(one to many) +* pgr_bdAstarCost(many to one) +* pgr_bdAstarCost(many to many) +* pgr_bdAstarCostMatrix +* pgr_bdDijkstra(one to many) +* pgr_bdDijkstra(many to one) +* pgr_bdDijkstra(many to many) +* pgr_bdDijkstraCost(one to one) +* pgr_bdDijkstraCost(one to many) +* pgr_bdDijkstraCost(many to one) +* pgr_bdDijkstraCost(many to many) +* pgr_bdDijkstraCostMatrix +* pgr_lineGraph +* pgr_lineGraphFull +* pgr_connectedComponents +* pgr_strongComponents +* pgr_biconnectedComponents +* pgr_articulationPoints +* pgr_bridges + +**Deprecated signatures** + +* pgr_bdastar - use pgr_bdAstar instead + +**Renamed functions** + +* pgr_maxFlowPushRelabel - use pgr_pushRelabel instead +* pgr_maxFlowEdmondsKarp -use pgr_edmondsKarp instead +* pgr_maxFlowBoykovKolmogorov - use pgr_boykovKolmogorov instead +* pgr_maximumCardinalityMatching - use pgr_maxCardinalityMatch instead + +**Deprecated Function** + +* pgr_pointToEdgeNode + + +## pgRouting 2.4 + + +### pgRouting 2.4.2 Release Notes + +To see the issues closed by this release see the [Git closed milestone for 2.4.2 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.4.2%22%20) +on Github. + +**Improvement** + +* Works for postgreSQL 10 + +**Bug fixes** + +* Fixed: Unexpected error column "cname" +* Replace __linux__ with __GLIBC__ for glibc-specific headers and functions + + + + +### pgRouting 2.4.1 Release Notes + +To see the issues closed by this release see the [Git closed milestone for 2.4.1 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.4.1%22%20) +on Github. + +**Bug fixes** + +* Fixed compiling error on macOS +* Condition error on pgr_withPoints + + +### pgRouting 2.4.0 Release Notes + +To see the issues closed by this release see the [Git closed issues for 2.4.0 +](https://github.com/pgRouting/pgrouting/issues?q=milestone%3A%22Release+2.4.0%22+is%3Aclosed) +on Github. + +**New Signatures** + +* pgr_bdDijkstra + + +**New Proposed Signatures** + +* pgr_maxFlow +* pgr_astar(one to many) +* pgr_astar(many to one) +* pgr_astar(many to many) +* pgr_astarCost(one to one) +* pgr_astarCost(one to many) +* pgr_astarCost(many to one) +* pgr_astarCost(many to many) +* pgr_astarCostMatrix + +**Deprecated signatures** + +* pgr_bddijkstra - use pgr_bdDijkstra instead + +**Deprecated Functions** + +* pgr_pointsToVids + +**Bug fixes** + +* Bug fixes on proposed functions + + * pgr_withPointsKSP: fixed ordering + +* TRSP original code is used with no changes on the compilation warnings + +## pgRouting 2.3 + +### pgRouting 2.3.2 Release Notes + +To see the issues closed by this release see the [Git closed issues for 2.3.2 +](https://github.com/pgRouting/pgrouting/issues?q=milestone%3A%22Release+2.3.2%22+is%3Aclosed) +on Github. + +**Bug Fixes** + +* Fixed pgr_gsoc_vrppdtw crash when all orders fit on one truck. +* Fixed pgr_trsp: + + * Alternate code is not executed when the point is in reality a vertex + * Fixed ambiguity on seq + + + +### pgRouting 2.3.1 Release Notes + +To see the issues closed by this release see the [Git closed issues for 2.3.1 +](https://github.com/pgRouting/pgrouting/issues?q=milestone%3A%22Release+2.3.1%22+is%3Aclosed) +on Github. + +**Bug Fixes** + +* Leaks on proposed max_flow functions +* Regression error on pgr_trsp +* Types discrepancy on pgr_createVerticesTable + + + +### pgRouting 2.3.0 Release Notes + +To see the issues closed by this release see the [Git closed issues for 2.3.0 +](https://github.com/pgRouting/pgrouting/issues?q=milestone%3A%22Release+2.3.0%22+is%3Aclosed) +on Github. + +**New Signatures** + +* pgr_TSP +* pgr_aStar + +**New Functions** + +* pgr_eucledianTSP + + +**New Proposed functions** + +* pgr_dijkstraCostMatrix +* pgr_withPointsCostMatrix +* pgr_maxFlowPushRelabel(one to one) +* pgr_maxFlowPushRelabel(one to many) +* pgr_maxFlowPushRelabel(many to one) +* pgr_maxFlowPushRelabel(many to many) +* pgr_maxFlowEdmondsKarp(one to one) +* pgr_maxFlowEdmondsKarp(one to many) +* pgr_maxFlowEdmondsKarp(many to one) +* pgr_maxFlowEdmondsKarp(many to many) +* pgr_maxFlowBoykovKolmogorov (one to one) +* pgr_maxFlowBoykovKolmogorov (one to many) +* pgr_maxFlowBoykovKolmogorov (many to one) +* pgr_maxFlowBoykovKolmogorov (many to many) +* pgr_maximumCardinalityMatching +* pgr_edgeDisjointPaths(one to one) +* pgr_edgeDisjointPaths(one to many) +* pgr_edgeDisjointPaths(many to one) +* pgr_edgeDisjointPaths(many to many) +* pgr_contractGraph + + +**Deprecated signatures** + +* pgr_tsp - use pgr_TSP or pgr_eucledianTSP instead +* pgr_astar - use pgr_aStar instead + + +**Deprecated Functions** + +* pgr_flip_edges +* pgr_vidsToDmatrix +* pgr_pointsToDMatrix +* pgr_textToPoints + +## pgRouting 2.2 + + +### pgRouting 2.2.4 Release Notes + +To see the issues closed by this release see the [Git closed issues for 2.2.4 +](https://github.com/pgRouting/pgrouting/issues?q=milestone%3A%22Release+2.2.4%22+is%3Aclosed) +on Github. + +**Bug Fixes** + +* Bogus uses of extern "C" +* Build error on Fedora 24 + GCC 6.0 +* Regression error pgr_nodeNetwork + + +### pgRouting 2.2.3 Release Notes + +To see the issues closed by this release see the [Git closed issues for 2.2.3 +](https://github.com/pgRouting/pgrouting/issues?q=milestone%3A%22Release+2.2.3%22+is%3Aclosed) +on Github. + +**Bug Fixes** + +* Fixed compatibility issues with PostgreSQL 9.6. + + +### pgRouting 2.2.2 Release Notes + +To see the issues closed by this release see the [Git closed issues for 2.2.2 +](https://github.com/pgRouting/pgrouting/issues?q=milestone%3A%22Release+2.2.2%22+is%3Aclosed) +on Github. + +**Bug Fixes** + +* Fixed regression error on pgr_drivingDistance + + + +### pgRouting 2.2.1 Release Notes + +To see the issues closed by this release see the [Git closed issues for 2.2.1 +](https://github.com/pgRouting/pgrouting/issues?q=milestone%3A2.2.1+is%3Aclosed) +on Github. + +**Bug Fixes** + +* Server crash fix on pgr_alphaShape +* Bug fix on With Points family of functions + + + +### pgRouting 2.2.0 Release Notes + +To see the issues closed by this release see the [Git closed issues for 2.2.0 +](https://github.com/pgRouting/pgrouting/issues?q=milestone%3A%22Release+2.2.0%22+is%3Aclosed) +on Github. + + +**Improvements** + +- pgr_nodeNetwork + + - Adding a row_where and outall optional parameters + +- Signature fix + + - pgr_dijkstra -- to match what is documented + + +**New Functions** + +- pgr_floydWarshall +- pgr_Johnson +- pgr_dijkstraCost(one to one) +- pgr_dijkstraCost(one to many) +- pgr_dijkstraCost(many to one) +- pgr_dijkstraCost(many to many) + +**Proposed Functionality** + +- pgr_withPoints(one to one) +- pgr_withPoints(one to many) +- pgr_withPoints(many to one) +- pgr_withPoints(many to many) +- pgr_withPointsCost(one to one) +- pgr_withPointsCost(one to many) +- pgr_withPointsCost(many to one) +- pgr_withPointsCost(many to many) +- pgr_withPointsDD(single vertex) +- pgr_withPointsDD(multiple vertices) +- pgr_withPointsKSP +- pgr_dijkstraVia + + +**Deprecated Functions** + +- pgr_apspWarshall use pgr_floydWarshall instead +- pgr_apspJohnson use pgr_Johnson instead +- pgr_kDijkstraCost use pgr_dijkstraCost instead +- pgr_kDijkstraPath use pgr_dijkstra instead + +**Renamed and Deprecated Function** + +- pgr_makeDistanceMatrix renamed to _pgr_makeDistanceMatrix + +## pgRouting 2.1 + + +### pgRouting 2.1.0 Release Notes + +To see the issues closed by this release see the [Git closed issues for 2.1.0 +](https://github.com/pgRouting/pgrouting/issues?q=is%3Aissue+milestone%3A%22Release+2.1.0%22+is%3Aclosed) +on Github. + +**New Signatures** + +- pgr_dijkstra(one to many) +- pgr_dijkstra(many to one) +- pgr_dijkstra(many to many) +- pgr_drivingDistance(multiple vertices) + +**Refactored** + +- pgr_dijkstra(one to one) +- pgr_ksp +- pgr_drivingDistance(single vertex) + +**Improvements** + +- pgr_alphaShape function now can generate better (multi)polygon with holes and + alpha parameter. + +**Proposed Functionality** + +- Proposed functions from Steve Woodbridge, (Classified as Convenience by the + author.) + + - pgr_pointToEdgeNode - convert a point geometry to a vertex_id based on + closest edge. + - pgr_flipEdges - flip the edges in an array of geometries so the connect end + to end. + - pgr_textToPoints - convert a string of x,y;x,y;... locations into point + geometries. + - pgr_pointsToVids - convert an array of point geometries into vertex ids. + - pgr_pointsToDMatrix - Create a distance matrix from an array of points. + - pgr_vidsToDMatrix - Create a distance matrix from an array of vertix_id. + - pgr_vidsToDMatrix - Create a distance matrix from an array of vertix_id. + +- Added proposed functions from GSoc Projects: + + - pgr_vrppdtw + - pgr_vrponedepot + +**Deprecated Functions** + +- pgr_getColumnName +- pgr_getTableName +- pgr_isColumnCndexed +- pgr_isColumnInTable +- pgr_quote_ident +- pgr_versionless +- pgr_startPoint +- pgr_endPoint +- pgr_pointToId + +**No longer supported** + +- Removed the 1.x legacy functions + +**Bug Fixes** + +- Some bug fixes in other functions + + +**Refactoring Internal Code** + +- A C and C++ library for developer was created + + - encapsulates postgreSQL related functions + - encapsulates Boost.Graph graphs + + - Directed Boost.Graph + - Undirected Boost.graph. + + - allow any-integer in the id's + - allow any-numerical on the cost/reverse_cost columns + +- Instead of generating many libraries: + - All functions are encapsulated in one library + - The library has the prefix 2-1-0 + + +## pgRouting 2.0 + + +### pgRouting 2.0.1 Release Notes + +Minor bug fixes. + +**Bug Fixes** + +* No track of the bug fixes were kept. + +### pgRouting 2.0.0 Release Notes + +To see the issues closed by this release see the [Git closed issues for 2.0.0 +](https://github.com/pgRouting/pgrouting/issues?q=milestone%3A%22Release+2.0.0%22+is%3Aclosed) +on Github. + +With the release of pgRouting 2.0.0 the library has abandoned backwards +compatibility to `pgRouting 1.0`_ releases. +The main Goals for this release are: + +* Major restructuring of pgRouting. +* Standardization of the function naming +* Preparation of the project for future development. + +As a result of this effort: + +* pgRouting has a simplified structure +* Significant new functionality has being added +* Documentation has being integrated +* Testing has being integrated +* And made it easier for multiple developers to make contributions. + + +**Important Changes** + +* Graph Analytics - tools for detecting and fixing connection some problems in a + graph +* A collection of useful utility functions +* Two new All Pairs Short Path algorithms (pgr_apspJohnson, pgr_apspWarshall) +* Bi-directional Dijkstra and A-star search algorithms (pgr_bdAstar, + pgr_bdDijkstra) +* One to many nodes search (pgr_kDijkstra) +* K alternate paths shortest path (pgr_ksp) +* New TSP solver that simplifies the code and the build process (pgr_tsp), + dropped "Gaul Library" dependency +* Turn Restricted shortest path (pgr_trsp) that replaces Shooting Star +* Dropped support for Shooting Star +* Built a test infrastructure that is run before major code changes are checked + in +* Tested and fixed most all of the outstanding bugs reported against 1.x that + existing in the 2.0-dev code base. +* Improved build process for Windows +* Automated testing on Linux and Windows platforms trigger by every commit +* Modular library design +* Compatibility with PostgreSQL 9.1 or newer +* Compatibility with PostGIS 2.0 or newer +* Installs as PostgreSQL EXTENSION +* Return types re factored and unified +* Support for table SCHEMA in function parameters +* Support for ``st_`` PostGIS function prefix +* Added ``pgr_`` prefix to functions and types +* Better documentation: https://docs.pgrouting.org +* shooting_star is discontinued + +# pgRouting 1 + +## pgRouting 1.0 + + +To see the issues closed by this release see the [Git closed issues for 1.x +](https://github.com/pgRouting/pgrouting/issues?q=milestone%3A%22Release+1.x%22+is%3Aclosed) +on Github. +The following release notes have been copied from the previous ``RELEASE_NOTES`` +file and are kept as a reference. + + +Changes for release 1.05 + +* Bug fixes + + +Changes for release 1.03 + +* Much faster topology creation +* Bug fixes + + +Changes for release 1.02 + +* Shooting* bug fixes +* Compilation problems solved + +Changes for release 1.01 + +* Shooting* bug fixes + + +Changes for release 1.0 + +* Core and extra functions are separated +* Cmake build process +* Bug fixes + + +Changes for release 1.0.0b + +* Additional SQL file with more simple names for wrapper functions +* Bug fixes + + +Changes for release 1.0.0a + +* Shooting* shortest path algorithm for real road networks +* Several SQL bugs were fixed + + +Changes for release 0.9.9 + +* PostgreSQL 8.2 support +* Shortest path functions return empty result if they could not find any path + + +Changes for release 0.9.8 + +* Renumbering scheme was added to shortest path functions +* Directed shortest path functions were added +* routing_postgis.sql was modified to use dijkstra in TSP search diff --git a/doc/conf.py.in b/doc/conf.py.in index 0abac52a3b..14816fa941 100644 --- a/doc/conf.py.in +++ b/doc/conf.py.in @@ -390,7 +390,7 @@ rst_epilog=""" .. |result-disjoint-m-m| replace:: ``(seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)`` .. |result-mincut| replace:: ``(seq, edge, cost, mincut)`` .. |result-pickdrop| replace:: ``(seq, vehicle_number, vehicle_id, stop, order_id, stop_type, cargo, travel_time, arrival_time, wait_time, service_time, departure_time)`` - +.. |epilog_end| replace:: just a marker for notes2news """ # Create a compressed PDF diff --git a/doc/driving_distance/drivingDistance-category.rst b/doc/driving_distance/drivingDistance-category.rst index e52f978563..08978bef70 100644 --- a/doc/driving_distance/drivingDistance-category.rst +++ b/doc/driving_distance/drivingDistance-category.rst @@ -89,7 +89,6 @@ Parameters Where: -:ANY-INTEGER: ``SMALLINT``, ``INTEGER``, ``BIGINT`` :ANY-NUMERIC: ``SMALLINT``, ``INTEGER``, ``BIGINT``, ``REAL``, ``FLOAT`` .. mst-dd-params_end @@ -153,16 +152,8 @@ Returns set of |result-spantree| - ``FLOAT`` - Aggregate cost from ``start_vid`` to ``node``. -Where: - -:ANY-INTEGER: SMALLINT, INTEGER, BIGINT -:ANY-NUMERIC: SMALLINT, INTEGER, BIGINT, REAL, FLOAT, NUMERIC - .. spantree-result-columns-end -.. NOTE:: Column ``pred`` only applies to :doc:`pgr_drivingDistance` and - :doc:`pgr_withPointsDD`. - See Also ------------------------------------------------------------------------------- diff --git a/doc/driving_distance/pgr_drivingDistance.rst b/doc/driving_distance/pgr_drivingDistance.rst index c9addd4a59..003f563ebb 100644 --- a/doc/driving_distance/pgr_drivingDistance.rst +++ b/doc/driving_distance/pgr_drivingDistance.rst @@ -22,7 +22,7 @@ .. rubric:: Availability -:Version 3.6.0: +.. rubric:: Version 3.6.0 * Standarizing output columns to |result-spantree| @@ -35,12 +35,12 @@ * Result column name change: ``from_v`` to ``start_vid``. * Added ``depth`` and ``pred`` result columns. -:Version 2.1.0: +.. rubric:: Version 2.1.0 * Signature change pgr_drivingDistance(single vertex) * New **Official** pgr_drivingDistance(multiple vertices) -:Version 2.0.0: +.. rubric:: Version 2.0.0 * Official:: pgr_drivingDistance(single vertex) diff --git a/doc/src/index.rst b/doc/src/index.rst index 75e9fa135f..9da7cd4589 100644 --- a/doc/src/index.rst +++ b/doc/src/index.rst @@ -89,6 +89,15 @@ Available Functions but not official pgRouting functions :doc:`release_notes` =============================================================================== +Current release +------------------------------------------------------------------------------- +.. include:: release_notes.rst + :start-after: 0%22>`_ + :end-before: pgRouting 3.6 + +All releases +------------------------------------------------------------------------------- + .. toctree:: :maxdepth: 2 diff --git a/doc/src/release_notes.rst b/doc/src/release_notes.rst index 111b7c095d..cc7ec1cfa7 100644 --- a/doc/src/release_notes.rst +++ b/doc/src/release_notes.rst @@ -16,23 +16,45 @@ Release Notes To see the full list of changes check the list of `Git commits `_ on Github. -.. contents:: Contents +.. contents:: Mayors :local: + :depth: 1 + +pgRouting 3 +******************************************************************************* +.. contents:: Minors 3.x + :local: + :depth: 1 +pgRouting 3.7 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pgRouting 3.7.0 Release Notes ------------------------------------------------------------------------------- To see all issues & pull requests closed by this release see the `Git closed milestone for 3.7.0 -`_ +`__ .. rubric:: Code enhancement * `#2599 `__ Driving distance cleanup +.. 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.1 Release Notes ------------------------------------------------------------------------------- @@ -82,8 +104,8 @@ milestone for 3.6.0 pgr_drivingdistance .. include:: pgr_drivingDistance.rst - :start-after: Version 3.6.0: - :end-before: :Version + :start-after: Version 3.6.0 + :end-before: .. rubric .. rubric:: Proposed functions changes @@ -129,6 +151,12 @@ milestone for 3.6.0 deprecated messages * On new internal function: do not use named parameters and default parameters. +pgRouting 3.5 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +.. contents:: Contents + :local: + :depth: 1 pgRouting 3.5.1 Release Notes ------------------------------------------------------------------------------- @@ -189,6 +217,13 @@ milestone for 3.5.0 * ``pgr_dijkstra`` (`One to Many`) added ``end_vid`` column. * ``pgr_dijkstra`` (`Many to One`) added ``start_vid`` column. +pgRouting 3.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +.. contents:: Contents + :local: + :depth: 1 + pgRouting 3.4.2 Release Notes ------------------------------------------------------------------------------- @@ -294,6 +329,13 @@ milestone for 3.4.0 * ``pgr_trspViaVertices(text,anyarray,boolean,boolean,text)`` * ``pgr_trspViaEdges(text,integer[],float[],boolean,boolean,text)`` +pgRouting 3.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +.. contents:: Contents + :local: + :depth: 1 + pgRouting 3.3.5 Release Notes ------------------------------------------------------------------------------- @@ -438,6 +480,13 @@ on Github. * pgr_depthFirstSearch(Multiple vertices) * pgr_depthFirstSearch(Single vertex) +pgRouting 3.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +.. contents:: Contents + :local: + :depth: 1 + pgRouting 3.2.2 Release Notes ------------------------------------------------------------------------------- @@ -545,6 +594,13 @@ on Github. * pgr_withPoints(Combinations) * pgr_withPointsCost(Combinations) +pgRouting 3.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +.. contents:: Contents + :local: + :depth: 1 + pgRouting 3.1.4 Release Notes -------------------------------------------------------------------------------- @@ -639,6 +695,13 @@ on Github. * Minimal requirement for Sphinx: version 1.8 +pgRouting 3.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +.. contents:: Contents + :local: + :depth: 1 + pgRouting 3.0.6 Release Notes -------------------------------------------------------------------------------- @@ -743,6 +806,10 @@ on Github. pgRouting 3.0.0 Release Notes ------------------------------------------------------------------------------- +.. contents:: Contents + :local: + :depth: 1 + To see all issues & pull requests closed by this release see the `Git closed milestone for 3.0.0 `_ @@ -910,7 +977,19 @@ on Github. * pgr_pointsAsPolygon * pgr_alphaShape old signature +pgRouting 2 +******************************************************************************* + +.. contents:: Minors 2.x + :local: + :depth: 1 +pgRouting 2.6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +.. contents:: Contents + :local: + :depth: 1 pgRouting 2.6.3 Release Notes ------------------------------------------------------------------------------- @@ -1024,6 +1103,12 @@ on Github. * Cleaned the internal code of withPoints +pgRouting 2.5 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +.. contents:: Contents + :local: + :depth: 1 pgRouting 2.5.5 Release Notes ------------------------------------------------------------------------------- @@ -1181,6 +1266,12 @@ on Github. * pgr_pointToEdgeNode +pgRouting 2.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +.. contents:: Contents + :local: + :depth: 1 pgRouting 2.4.2 Release Notes ------------------------------------------------------------------------------- @@ -1254,6 +1345,8 @@ on Github. * TRSP original code is used with no changes on the compilation warnings +pgRouting 2.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pgRouting 2.3.2 Release Notes ------------------------------------------------------------------------------- @@ -1341,8 +1434,12 @@ on Github. * pgr_pointsToDMatrix * pgr_textToPoints +pgRouting 2.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - +.. contents:: Contents + :local: + :depth: 1 pgRouting 2.2.4 Release Notes ------------------------------------------------------------------------------- @@ -1452,7 +1549,12 @@ on Github. - pgr_makeDistanceMatrix renamed to _pgr_makeDistanceMatrix +pgRouting 2.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +.. contents:: Contents + :local: + :depth: 1 pgRouting 2.1.0 Release Notes ------------------------------------------------------------------------------- @@ -1539,6 +1641,12 @@ on Github. - The library has the prefix 2-1-0 +pgRouting 2.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +.. contents:: Contents + :local: + :depth: 1 pgRouting 2.0.1 Release Notes ------------------------------------------------------------------------------- @@ -1549,8 +1657,6 @@ Minor bug fixes. * No track of the bug fixes were kept. - - pgRouting 2.0.0 Release Notes ------------------------------------------------------------------------------- @@ -1559,7 +1665,7 @@ To see the issues closed by this release see the `Git closed issues for 2.0.0 on Github. With the release of pgRouting 2.0.0 the library has abandoned backwards -compatibility to `pgRouting 1.x Release Notes`_ releases. +compatibility to `pgRouting 1.0`_ releases. The main Goals for this release are: * Major restructuring of pgRouting. @@ -1606,11 +1712,15 @@ As a result of this effort: * Better documentation: https://docs.pgrouting.org * shooting_star is discontinued +pgRouting 1 +******************************************************************************* +pgRouting 1.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -pgRouting 1.x Release Notes -------------------------------------------------------------------------------- +.. contents:: Contents + :local: + :depth: 1 To see the issues closed by this release see the `Git closed issues for 1.x `_ @@ -1620,33 +1730,32 @@ file and are kept as a reference. Changes for release 1.05 -............................................................................... +------------------------------------------------------------------------------- * Bug fixes Changes for release 1.03 -............................................................................... +------------------------------------------------------------------------------- * Much faster topology creation * Bug fixes Changes for release 1.02 -............................................................................... +------------------------------------------------------------------------------- * Shooting* bug fixes * Compilation problems solved - Changes for release 1.01 -............................................................................... +------------------------------------------------------------------------------- * Shooting* bug fixes Changes for release 1.0 -............................................................................... +------------------------------------------------------------------------------- * Core and extra functions are separated * Cmake build process @@ -1654,28 +1763,28 @@ Changes for release 1.0 Changes for release 1.0.0b -............................................................................... +------------------------------------------------------------------------------- * Additional SQL file with more simple names for wrapper functions * Bug fixes Changes for release 1.0.0a -............................................................................... +------------------------------------------------------------------------------- * Shooting* shortest path algorithm for real road networks * Several SQL bugs were fixed Changes for release 0.9.9 -............................................................................... +------------------------------------------------------------------------------- * PostgreSQL 8.2 support * Shortest path functions return empty result if they could not find any path Changes for release 0.9.8 -............................................................................... +------------------------------------------------------------------------------- * Renumbering scheme was added to shortest path functions * Directed shortest path functions were added diff --git a/tools/release-scripts/notes2news.pl b/tools/release-scripts/notes2news.pl index 978d6c4311..8789dc3539 100755 --- a/tools/release-scripts/notes2news.pl +++ b/tools/release-scripts/notes2news.pl @@ -21,14 +21,15 @@ use strict; use warnings; use File::Find; +use Data::Dumper; sub Usage { die "Usage: notes2news.pl (from the root of the repository or pre-commit hook)\n"; } - +my $DEBUG = ''; my $in_file = "doc/src/release_notes.rst"; -my $out_file = "NEWS"; +my $out_file = "NEWS.md"; my $ofh; open($ofh, ">$out_file") || die "ERROR: failed to open '$out_file' for write! : $!\n"; @@ -36,6 +37,10 @@ sub Usage { my $ifh; open($ifh, "$in_file") || die "ERROR: failed to open '$in_file' for read! : $!\n"; +my %conversions = get_substitutions(); +my $check = join '|', keys %conversions; +print Dumper(\%conversions) if $DEBUG; + my $skipping = 1; my $file = ''; @@ -45,6 +50,25 @@ sub Usage { next if $skipping and $line !~ /^pgRouting/; $skipping = 0; + next if $line =~ /contents|:local:|:depth:|\*\*\*\*\*\*\*|\=\=\=\=\=\=\=|\-\-\-\-\-\-\-|\+\+\+\+\+\+\+\+/; + + $line =~ s/[\|]+//g; + $line =~ s/($check)/$conversions{$1}/go; + + # Handling the headers + if ($line =~ m/^pgRouting [0-9]$/i) { + print $ofh "# $line"; + next; + }; + if ($line =~ m/^pgRouting [0-9].[0-9]$/i) { + print $ofh "## $line"; + next; + }; + if ($line =~ m/^pgRouting [0-9].[0-9].[0-9] Release Notes$/i) { + print $ofh "### $line"; + next; + }; + # get include filename if ($line =~ /include/) { $line =~ s/^.*include\:\: (.*)/$1/; @@ -59,10 +83,10 @@ sub Usage { }, "doc" ); foreach(@wanted_files){ - print "wanted: $_\n" + print "wanted: $_\n" if $DEBUG; } $file = $wanted_files[0]; - print "rewanted: $file\n"; + print "rewanted: $file\n" if $DEBUG; next; }; @@ -81,7 +105,7 @@ sub Usage { chomp $line; $line =~ s/^\s+//; $end = $line; - print "---> $file from $start to $end \n"; + print "---> $file from $start to $end \n" if $DEBUG; find_stuff($file, $start, $end); next; } @@ -89,8 +113,10 @@ sub Usage { # convert urls to markdown - $line =~ s/`([^<]+?)\s*<([^>]+)>`__/\[$1\]($2)/g; - $line =~ s/`([^<]+?)\s*<([^>]+)>`_/\[$1\]($2)/g; + $line =~ s/`([^<]+?)\s*<([^>]+)>`_*/\[$1\]($2)/g; + + $line =~ s/`(Git closed)/\[$1/g; + $line =~ s/<([^>]+)>`_*/\]($1)/g; # convert rubric to bold $line =~ s/^\.\. rubric::\s*(.+)$/**$1**/; @@ -106,18 +132,44 @@ sub Usage { sub find_stuff { my ($file, $mstart, $mend) = @_; - print "$file from $mstart to $mend \n"; + print "find_stuff $file from $mstart to $mend \n" if $DEBUG; my $fh; open($fh, "$file") || die "ERROR: failed to open '$file' for read! : $!\n"; - print "different '$mstart'\n" if $mstart ne "Version 3.6.0"; my $skipping = 1; while (my $line = <$fh>) { next if $skipping and $line !~ /$mstart/; $skipping = 0; next if $line =~ /$mstart/; + $line =~ s/[\|]+//g; + $line =~ s/($check)/$conversions{$1}/go; print $ofh " $line" if $line !~ /$mend/; last if $line =~ /$mend/; } close($fh); } + +sub get_substitutions { + my $file = "doc/conf.py.in"; + my $mstart = "rst_epilog"; + my $mend = "epilog_end"; + print "get_substitutions $file from $mstart to $mend \n" if $DEBUG; + my $fh; + open($fh, "$file") || die "ERROR: failed to open '$file' for read! : $!\n"; + my %data; + + my $skipping = 1; + while (my $line = <$fh>) { + next if $skipping and $line !~ /$mstart/; + $skipping = 0; + next if $line =~ /$mstart/; + last if $line =~ /$mend/; + my ($key) = substr($line, 4, index(substr($line, 4), "|")); + my ($value) = substr($line, index($line,"`")); + $value =~ s/\R//g; + $data{$key} = $value; + print "$key $data{$key} \n" if $DEBUG; + } + close($fh); + return %data; +} From 30046daca7e6dbb8c2b6c1ae83910a7e7bd5b41e Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 6 Jan 2024 11:27:05 -0600 Subject: [PATCH 019/428] [CI] testing NEWS.md instead of NEWS --- .github/workflows/check-files.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-files.yml b/.github/workflows/check-files.yml index 5ba6231e30..98634b9baf 100644 --- a/.github/workflows/check-files.yml +++ b/.github/workflows/check-files.yml @@ -33,8 +33,8 @@ jobs: - name: News file up to date run: | tools/release-scripts/notes2news.pl - if git status | grep 'NEWS'; then echo "NEWS is not up to date"; exit 1; fi - if ! grep -q $(grep -Po '(?<=project\(PGROUTING VERSION )[^;]+' CMakeLists.txt) NEWS; then echo "Missing section in NEWS"; exit 1; fi + if git status | grep 'NEWS.md'; then echo "NEWS.md is not up to date"; exit 1; fi + if ! grep -q $(grep -Po '(?<=project\(PGROUTING VERSION )[^;]+' CMakeLists.txt) NEWS.md; then echo "Missing section in NEWS"; exit 1; fi License_check: runs-on: ubuntu-latest From 915afd5c55758bfcd650514391d12fd5a79bc97c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 6 Jan 2024 18:14:22 +0000 Subject: [PATCH 020/428] Update locale: commit 30046daca7 --- .../en/LC_MESSAGES/pgrouting_doc_strings.po | 108 +++++++++++++++--- locale/pot/pgrouting_doc_strings.pot | 98 ++++++++++++++-- 2 files changed, 180 insertions(+), 26 deletions(-) diff --git a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po index afe6d3010e..c20e21e4af 100644 --- a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-04 04:09+0000\n" +"POT-Creation-Date: 2024-01-06 18:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3865,11 +3865,6 @@ msgstr "" msgid "Identifier of the ``edge`` used to arrive from ``pred`` to ``node``." msgstr "" -msgid "" -"Column ``pred`` only applies to :doc:`pgr_drivingDistance` and " -":doc:`pgr_withPointsDD`." -msgstr "" - msgid "Experimental Functions" msgstr "" @@ -4389,6 +4384,32 @@ msgstr "" msgid ":doc:`release_notes`" msgstr "" +msgid "Current release" +msgstr "" + +msgid "_" +msgstr "" + +msgid "Code enhancement" +msgstr "" + +msgid "" +"`#2599 `__ Driving " +"distance cleanup" +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 "" + msgid "Kruskal - Family of functions" msgstr "" @@ -15183,6 +15204,18 @@ msgid "" "`_ on Github." msgstr "" +msgid "Mayors" +msgstr "" + +msgid "pgRouting 3" +msgstr "" + +msgid "Minors 3.x" +msgstr "" + +msgid "pgRouting 3.7" +msgstr "" + msgid "pgRouting 3.7.0 Release Notes" msgstr "" @@ -15190,15 +15223,10 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git " "closed milestone for 3.7.0 " -"`_" +"`__" msgstr "" -msgid "Code enhancement" -msgstr "" - -msgid "" -"`#2599 `__ Driving " -"distance cleanup" +msgid "pgRouting 3.6" msgstr "" msgid "pgRouting 3.6.1 Release Notes" @@ -15339,6 +15367,9 @@ msgid "" "parameters." msgstr "" +msgid "pgRouting 3.5" +msgstr "" + msgid "pgRouting 3.5.1 Release Notes" msgstr "" @@ -15433,6 +15464,9 @@ msgstr "" msgid "``pgr_dijkstra`` (`Many to One`) added ``start_vid`` column." msgstr "" +msgid "pgRouting 3.4" +msgstr "" + msgid "pgRouting 3.4.2 Release Notes" msgstr "" @@ -15585,6 +15619,9 @@ msgstr "" msgid "``pgr_trspViaEdges(text,integer[],float[],boolean,boolean,text)``" msgstr "" +msgid "pgRouting 3.3" +msgstr "" + msgid "pgRouting 3.3.5 Release Notes" msgstr "" @@ -15784,6 +15821,9 @@ msgstr "" msgid "pgr_depthFirstSearch(Single vertex)" msgstr "" +msgid "pgRouting 3.2" +msgstr "" + msgid "pgRouting 3.2.2 Release Notes" msgstr "" @@ -15926,6 +15966,9 @@ msgstr "" msgid "pgr_pushRelabel(Combinations)" msgstr "" +msgid "pgRouting 3.1" +msgstr "" + msgid "pgRouting 3.1.4 Release Notes" msgstr "" @@ -16062,6 +16105,9 @@ msgstr "" msgid "Minimal requirement for Sphinx: version 1.8" msgstr "" +msgid "pgRouting 3.0" +msgstr "" + msgid "pgRouting 3.0.6 Release Notes" msgstr "" @@ -16495,6 +16541,15 @@ msgstr "" msgid "pgr_alphaShape old signature" msgstr "" +msgid "pgRouting 2" +msgstr "" + +msgid "Minors 2.x" +msgstr "" + +msgid "pgRouting 2.6" +msgstr "" + msgid "pgRouting 2.6.3 Release Notes" msgstr "" @@ -16693,6 +16748,9 @@ msgstr "" msgid "Cleaned the internal code of withPoints" msgstr "" +msgid "pgRouting 2.5" +msgstr "" + msgid "pgRouting 2.5.5 Release Notes" msgstr "" @@ -16841,6 +16899,9 @@ msgstr "" msgid "pgr_pointToEdgeNode" msgstr "" +msgid "pgRouting 2.4" +msgstr "" + msgid "pgRouting 2.4.2 Release Notes" msgstr "" @@ -16936,6 +16997,9 @@ msgstr "" msgid "TRSP original code is used with no changes on the compilation warnings" msgstr "" +msgid "pgRouting 2.3" +msgstr "" + msgid "pgRouting 2.3.2 Release Notes" msgstr "" @@ -17062,6 +17126,9 @@ msgstr "" msgid "pgr_textToPoints" msgstr "" +msgid "pgRouting 2.2" +msgstr "" + msgid "pgRouting 2.2.4 Release Notes" msgstr "" @@ -17217,6 +17284,9 @@ msgstr "" msgid "pgr_makeDistanceMatrix renamed to _pgr_makeDistanceMatrix" msgstr "" +msgid "pgRouting 2.1" +msgstr "" + msgid "pgRouting 2.1.0 Release Notes" msgstr "" @@ -17356,6 +17426,9 @@ msgid "" " one library - The library has the prefix 2-1-0" msgstr "" +msgid "pgRouting 2.0" +msgstr "" + msgid "pgRouting 2.0.1 Release Notes" msgstr "" @@ -17377,8 +17450,8 @@ msgstr "" msgid "" "With the release of pgRouting 2.0.0 the library has abandoned backwards " -"compatibility to `pgRouting 1.x Release Notes`_ releases. The main Goals " -"for this release are:" +"compatibility to `pgRouting 1.0`_ releases. The main Goals for this " +"release are:" msgstr "" msgid "Major restructuring of pgRouting." @@ -17492,7 +17565,10 @@ msgstr "" msgid "shooting_star is discontinued" msgstr "" -msgid "pgRouting 1.x Release Notes" +msgid "pgRouting 1" +msgstr "" + +msgid "pgRouting 1.0" msgstr "" msgid "" diff --git a/locale/pot/pgrouting_doc_strings.pot b/locale/pot/pgrouting_doc_strings.pot index 64a742fa72..1f2e91456c 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-01-04 04:09+0000\n" +"POT-Creation-Date: 2024-01-06 18:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3490,9 +3490,6 @@ msgstr "" msgid "Identifier of the ``edge`` used to arrive from ``pred`` to ``node``." msgstr "" -msgid "Column ``pred`` only applies to :doc:`pgr_drivingDistance` and :doc:`pgr_withPointsDD`." -msgstr "" - msgid "Experimental Functions" msgstr "" @@ -3934,6 +3931,30 @@ msgstr "" msgid ":doc:`release_notes`" msgstr "" +msgid "Current release" +msgstr "" + +msgid "_" +msgstr "" + +msgid "Code enhancement" +msgstr "" + +msgid "`#2599 `__ Driving distance cleanup" +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 "" + msgid "Kruskal - Family of functions" msgstr "" @@ -12916,16 +12937,25 @@ msgstr "" msgid "To see the full list of changes check the list of `Git commits `_ on Github." msgstr "" -msgid "pgRouting 3.7.0 Release Notes" +msgid "Mayors" msgstr "" -msgid "To see all issues & pull requests closed by this release see the `Git closed milestone for 3.7.0 `_" +msgid "pgRouting 3" msgstr "" -msgid "Code enhancement" +msgid "Minors 3.x" msgstr "" -msgid "`#2599 `__ Driving distance cleanup" +msgid "pgRouting 3.7" +msgstr "" + +msgid "pgRouting 3.7.0 Release Notes" +msgstr "" + +msgid "To see all issues & pull requests closed by this release see the `Git closed milestone for 3.7.0 `__" +msgstr "" + +msgid "pgRouting 3.6" msgstr "" msgid "pgRouting 3.6.1 Release Notes" @@ -13024,6 +13054,9 @@ msgstr "" msgid "On new internal function: do not use named parameters and default parameters." msgstr "" +msgid "pgRouting 3.5" +msgstr "" + msgid "pgRouting 3.5.1 Release Notes" msgstr "" @@ -13102,6 +13135,9 @@ msgstr "" msgid "``pgr_dijkstra`` (`Many to One`) added ``start_vid`` column." msgstr "" +msgid "pgRouting 3.4" +msgstr "" + msgid "pgRouting 3.4.2 Release Notes" msgstr "" @@ -13231,6 +13267,9 @@ msgstr "" msgid "``pgr_trspViaEdges(text,integer[],float[],boolean,boolean,text)``" msgstr "" +msgid "pgRouting 3.3" +msgstr "" + msgid "pgRouting 3.3.5 Release Notes" msgstr "" @@ -13384,6 +13423,9 @@ msgstr "" msgid "pgr_depthFirstSearch(Single vertex)" msgstr "" +msgid "pgRouting 3.2" +msgstr "" + msgid "pgRouting 3.2.2 Release Notes" msgstr "" @@ -13501,6 +13543,9 @@ msgstr "" msgid "pgr_pushRelabel(Combinations)" msgstr "" +msgid "pgRouting 3.1" +msgstr "" + msgid "pgRouting 3.1.4 Release Notes" msgstr "" @@ -13585,6 +13630,9 @@ msgstr "" msgid "Minimal requirement for Sphinx: version 1.8" msgstr "" +msgid "pgRouting 3.0" +msgstr "" + msgid "pgRouting 3.0.6 Release Notes" msgstr "" @@ -13972,6 +14020,15 @@ msgstr "" msgid "pgr_alphaShape old signature" msgstr "" +msgid "pgRouting 2" +msgstr "" + +msgid "Minors 2.x" +msgstr "" + +msgid "pgRouting 2.6" +msgstr "" + msgid "pgRouting 2.6.3 Release Notes" msgstr "" @@ -14134,6 +14191,9 @@ msgstr "" msgid "Cleaned the internal code of withPoints" msgstr "" +msgid "pgRouting 2.5" +msgstr "" + msgid "pgRouting 2.5.5 Release Notes" msgstr "" @@ -14251,6 +14311,9 @@ msgstr "" msgid "pgr_pointToEdgeNode" msgstr "" +msgid "pgRouting 2.4" +msgstr "" + msgid "pgRouting 2.4.2 Release Notes" msgstr "" @@ -14332,6 +14395,9 @@ msgstr "" msgid "TRSP original code is used with no changes on the compilation warnings" msgstr "" +msgid "pgRouting 2.3" +msgstr "" + msgid "pgRouting 2.3.2 Release Notes" msgstr "" @@ -14446,6 +14512,9 @@ msgstr "" msgid "pgr_textToPoints" msgstr "" +msgid "pgRouting 2.2" +msgstr "" + msgid "pgRouting 2.2.4 Release Notes" msgstr "" @@ -14581,6 +14650,9 @@ msgstr "" msgid "pgr_makeDistanceMatrix renamed to _pgr_makeDistanceMatrix" msgstr "" +msgid "pgRouting 2.1" +msgstr "" + msgid "pgRouting 2.1.0 Release Notes" msgstr "" @@ -14704,6 +14776,9 @@ msgstr "" msgid "Instead of generating many libraries: - All functions are encapsulated in one library - The library has the prefix 2-1-0" msgstr "" +msgid "pgRouting 2.0" +msgstr "" + msgid "pgRouting 2.0.1 Release Notes" msgstr "" @@ -14719,7 +14794,7 @@ msgstr "" msgid "To see the issues closed by this release see the `Git closed issues for 2.0.0 `_ on Github." msgstr "" -msgid "With the release of pgRouting 2.0.0 the library has abandoned backwards compatibility to `pgRouting 1.x Release Notes`_ releases. The main Goals for this release are:" +msgid "With the release of pgRouting 2.0.0 the library has abandoned backwards compatibility to `pgRouting 1.0`_ releases. The main Goals for this release are:" msgstr "" msgid "Major restructuring of pgRouting." @@ -14821,7 +14896,10 @@ msgstr "" msgid "shooting_star is discontinued" msgstr "" -msgid "pgRouting 1.x Release Notes" +msgid "pgRouting 1" +msgstr "" + +msgid "pgRouting 1.0" msgstr "" msgid "To see the issues closed by this release see the `Git closed issues for 1.x `_ on Github. The following release notes have been copied from the previous ``RELEASE_NOTES`` file and are kept as a reference." From eb76e2f3484039b05c585efc96354a282771589d Mon Sep 17 00:00:00 2001 From: Vicky Vergara Date: Tue, 9 Jan 2024 13:51:03 -0600 Subject: [PATCH 021/428] Fixing issue 2602 (#2604) * fix #2302 test fails for pgr_stoerWagner * PostgreSQL 11 is no longer supported * Fixing test * Updating boost versions to test --- .github/workflows/boost_version.yml | 12 +++++++----- .github/workflows/ubuntu.yml | 2 +- pgtap/mincut/stoerWagner/compare_components.pg | 8 ++++++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/boost_version.yml b/.github/workflows/boost_version.yml index 4ffb372ed0..afc490150b 100644 --- a/.github/workflows/boost_version.yml +++ b/.github/workflows/boost_version.yml @@ -18,10 +18,12 @@ name: Boost supported versions # Currently # - boost::geometry has not changed anything we use # -# - boost::graph changed on 1.80 -# - boost::graph 1.75 requires C++14 -# - boost::graph changed on 1.68 -# - 1.56 is the minimum version we ask +# boost::graph +# - 1.84 is failing its own tests (Jul 2022) +# - 1.80 changed on 1.80 (Aug 2022) +# - 1.75 requires C++14 (Dec 2020) +# - 1.68 changed on 1.68 (Aug 2018) +# - 1.56 is the minimum version we ask (Aug 2014) on: push: @@ -65,7 +67,7 @@ jobs: strategy: fail-fast: false matrix: - boost_minor: [56, 68, 75] + boost_minor: [56, 68, 75, 76, 77, 78, 79, 80, 84] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 3df30812c4..60711b3860 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -29,7 +29,7 @@ jobs: strategy: fail-fast: false matrix: - psql: [11,12,13,14,15,16] + psql: [12,13,14,15,16] postgis: [3] os: [ubuntu-latest, ubuntu-20.04] diff --git a/pgtap/mincut/stoerWagner/compare_components.pg b/pgtap/mincut/stoerWagner/compare_components.pg index e62a0e058e..c67c96c407 100644 --- a/pgtap/mincut/stoerWagner/compare_components.pg +++ b/pgtap/mincut/stoerWagner/compare_components.pg @@ -85,6 +85,7 @@ SELECT * FROM pgr_stoerWagner( ) $$ ); +SELECT set_eq('stoerWagner5', 'stoerWagner6', '5: Mincut of edge 17'); PREPARE stoerWagner7 AS SELECT * @@ -93,8 +94,11 @@ FROM pgr_stoerWagner( FROM edges WHERE id < 17 ORDER BY id' ); -SELECT set_eq('stoerWagner5', 'stoerWagner6', '5: Mincut of edge 17'); -SELECT set_eq('stoerWagner7', 'VALUES (1, 1, 1, 1)', '6: Compare the mincut of subgraph with actual result'); +SELECT CASE WHEN (SELECT boost FROM pgr_full_version()) < '1.80' THEN + collect_tap(set_eq('stoerWagner7', 'VALUES (1, 1, 1, 1)', '6: Compare the mincut of subgraph with actual result')) +ELSE + collect_tap(set_eq('stoerWagner7', 'VALUES (1, 14, 1, 1)', '6: Compare the mincut of subgraph with actual result')) +END CASE; SELECT * FROM finish(); ROLLBACK; From c97515ec8184cbb95561c2a53d0b0023d3995ce2 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 6 Jan 2024 08:54:14 -0600 Subject: [PATCH 022/428] Deprecating min supported versions --- .github/workflows/boost_version.yml | 3 ++- .github/workflows/check-files.yml | 2 +- README.md | 26 ++++++++++---------------- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/.github/workflows/boost_version.yml b/.github/workflows/boost_version.yml index afc490150b..412c7ab92c 100644 --- a/.github/workflows/boost_version.yml +++ b/.github/workflows/boost_version.yml @@ -20,6 +20,7 @@ name: Boost supported versions # # boost::graph # - 1.84 is failing its own tests (Jul 2022) +# - 1.83 transitive closure & stoer wagner changed on 83 (Jul 2022) # - 1.80 changed on 1.80 (Aug 2022) # - 1.75 requires C++14 (Dec 2020) # - 1.68 changed on 1.68 (Aug 2018) @@ -67,7 +68,7 @@ jobs: strategy: fail-fast: false matrix: - boost_minor: [56, 68, 75, 76, 77, 78, 79, 80, 84] + boost_minor: [56, 68, 75, 76, 77, 78, 79, 80, 83, 84] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/check-files.yml b/.github/workflows/check-files.yml index 98634b9baf..ee47758591 100644 --- a/.github/workflows/check-files.yml +++ b/.github/workflows/check-files.yml @@ -34,7 +34,7 @@ jobs: run: | tools/release-scripts/notes2news.pl if git status | grep 'NEWS.md'; then echo "NEWS.md is not up to date"; exit 1; fi - if ! grep -q $(grep -Po '(?<=project\(PGROUTING VERSION )[^;]+' CMakeLists.txt) NEWS.md; then echo "Missing section in NEWS"; exit 1; fi + if ! grep -q $(grep -Po '(?<=project\(PGROUTING VERSION )[^;]+' CMakeLists.txt) NEWS.md; then echo "Missing section in NEWS.md"; exit 1; fi License_check: runs-on: ubuntu-latest diff --git a/README.md b/README.md index 9f55c9035f..ce6604abc2 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ # pgRouting - Routing on PostgreSQL -[![Join the chat at https://gitter.im/pgRouting/pgrouting](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/pgRouting/pgrouting?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[![Join the chat at +https://gitter.im/pgRouting/pgrouting](https://badges.gitter.im/Join%20Chat.svg)](https://app.gitter.im/#/room/#pgrouting:osgeo.org) +[Join discourse](https://discourse.osgeo.org/c/pgrouting/15) + ## Branches @@ -10,6 +13,9 @@ For the complete list of releases go to: https://github.com/pgRouting/pgrouting/releases +For the release notes go to: https://docs.pgrouting.org/latest/en/release_notes.html + + ## LINKS * https://pgrouting.org/ @@ -27,44 +33,32 @@ pgRouting extends the PostGIS/PostgreSQL geospatial database to provide geospati This library contains the following features: * All Pairs Shortest Path Algorithms - * A-star algorithm - * Bi-directional algorithms - * A variety of applications of Dijkstra algorithms - * Cost functions * With points - * Driving Distance * With points - * Yen's algorithm - * Traveling Sales Person (TSP) and many more. -The latest documentation: http://docs.pgrouting.org/latest +The latest documentation: https://docs.pgrouting.org/latest ## REQUIREMENTS ### Building requirements * perl - * C and C++ compilers * Compiling with Boost 1.56 up to Boost 1.74 requires C++ Compiler with C++03 or C++11 standard support * Compiling with Boost 1.75 requires C++ Compiler with C++14 standard support - -* Postgresql = Supported version by PostgreSQL - +* Postgresql = Supported [version](https://www.postgresql.org/support/versioning/) by PostgreSQL * The Boost Graph Library (BGL) >= 1.56 - * CMake >= 3.2 - -* Sphinx >= 4.0.0 +* 7.0 > Sphinx >= 4.0.0 ### User's requirements From d9ed68ddb9dd43badb97db8e339d9b26e1587144 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 13 Jan 2024 11:05:36 -0600 Subject: [PATCH 023/428] [sql][prim] New _primv4 function with additional output column --- sql/spanningTree/_prim.sql | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/sql/spanningTree/_prim.sql b/sql/spanningTree/_prim.sql index 4d519320a6..3401e2812d 100644 --- a/sql/spanningTree/_prim.sql +++ b/sql/spanningTree/_prim.sql @@ -39,6 +39,29 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ---------------- +--v3.7 +CREATE FUNCTION _pgr_primv4( + TEXT, -- Edge sql + ANYARRAY, -- tree root for traversal + TEXT, -- order by + BIGINT, -- max depth + FLOAT, -- distance + + OUT seq BIGINT, + OUT depth BIGINT, + OUT start_vid BIGINT, + OUT pred BIGINT, + OUT node BIGINT, + OUT edge BIGINT, + OUT cost FLOAT, + OUT agg_cost FLOAT) +RETURNS SETOF RECORD AS +'MODULE_PATHNAME' +LANGUAGE C VOLATILE STRICT; + +COMMENT ON FUNCTION _pgr_primv4(TEXT, ANYARRAY, TEXT, BIGINT, FLOAT) +IS 'pgRouting internal function'; + --v3.0 CREATE FUNCTION _pgr_prim( TEXT, -- Edge sql @@ -63,5 +86,5 @@ LANGUAGE C VOLATILE STRICT; COMMENT ON FUNCTION _pgr_prim(TEXT, ANYARRAY, TEXT, BIGINT, FLOAT) -IS 'pgRouting internal function'; +IS 'pgRouting internal function deprecated on v3.7.0'; From fe8550cdcfbefeea1f12c0d0ef89a583c7e94af4 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 13 Jan 2024 11:04:43 -0600 Subject: [PATCH 024/428] [sql][prim] Adding pred column to results --- sql/spanningTree/prim.sql | 2 +- sql/spanningTree/primBFS.sql | 39 ++++++-------------- sql/spanningTree/primDD.sql | 71 +++++++++++------------------------- sql/spanningTree/primDFS.sql | 39 ++++++-------------- 4 files changed, 44 insertions(+), 107 deletions(-) diff --git a/sql/spanningTree/prim.sql b/sql/spanningTree/prim.sql index 96286179f5..91ebe71b01 100644 --- a/sql/spanningTree/prim.sql +++ b/sql/spanningTree/prim.sql @@ -42,7 +42,7 @@ CREATE FUNCTION pgr_prim( RETURNS SETOF RECORD AS $BODY$ SELECT edge, cost - FROM _pgr_prim(_pgr_get_statement($1), ARRAY[0]::BIGINT[], '', -1, -1); + FROM _pgr_primv4(_pgr_get_statement($1), ARRAY[0]::BIGINT[], '', -1, -1); $BODY$ LANGUAGE sql VOLATILE STRICT; diff --git a/sql/spanningTree/primBFS.sql b/sql/spanningTree/primBFS.sql index 01bcae4bb7..2e23bcad70 100644 --- a/sql/spanningTree/primBFS.sql +++ b/sql/spanningTree/primBFS.sql @@ -2,7 +2,7 @@ File: primBFS.sql Copyright (c) 2018 Vicky Vergara -Mail: vicky at georepublic dot de +Mail: vicky at erosion dot dev ------ @@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -- SINGLE VERTEX ---v3.0 +--v3.7 CREATE FUNCTION pgr_primBFS( TEXT, -- Edge sql BIGINT, -- root vertex @@ -39,29 +39,20 @@ CREATE FUNCTION pgr_primBFS( OUT seq BIGINT, OUT depth BIGINT, OUT start_vid BIGINT, + OUT pred BIGINT, OUT node BIGINT, OUT edge BIGINT, OUT cost FLOAT, OUT agg_cost FLOAT) RETURNS SETOF RECORD AS $BODY$ -BEGIN - IF $3 < 0 THEN - RAISE EXCEPTION 'Negative value found on ''max_depth''' - USING HINT = format('Value found: %s', $3); - END IF; - - - RETURN QUERY - SELECT a.seq, a.depth, a.start_vid, a.node, a.edge, a.cost, a.agg_cost - FROM _pgr_prim(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], 'BFS', $3, -1) AS a; -END; + SELECT seq, depth, start_vid, pred, node, edge, cost, agg_cost + FROM _pgr_primv4(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], 'BFS', $3, -1); $BODY$ -LANGUAGE plpgsql VOLATILE STRICT; +LANGUAGE SQL VOLATILE STRICT; --- MULTIPLE VERTICES ---v3.0 +--v3.7 CREATE FUNCTION pgr_primBFS( TEXT, -- Edge sql ANYARRAY, -- root vertices @@ -71,25 +62,17 @@ CREATE FUNCTION pgr_primBFS( OUT seq BIGINT, OUT depth BIGINT, OUT start_vid BIGINT, + OUT pred BIGINT, OUT node BIGINT, OUT edge BIGINT, OUT cost FLOAT, OUT agg_cost FLOAT) RETURNS SETOF RECORD AS $BODY$ -BEGIN - IF $3 < 0 THEN - RAISE EXCEPTION 'Negative value found on ''max_depth''' - USING HINT = format('Value found: %s', $3); - END IF; - - - RETURN QUERY - SELECT a.seq, a.depth, a.start_vid, a.node, a.edge, a.cost, a.agg_cost - FROM _pgr_prim(_pgr_get_statement($1), $2, 'BFS', $3, -1) AS a; -END; + SELECT seq, depth, start_vid, pred, node, edge, cost, agg_cost + FROM _pgr_primv4(_pgr_get_statement($1), $2, 'BFS', $3, -1); $BODY$ -LANGUAGE plpgsql VOLATILE STRICT; +LANGUAGE SQL VOLATILE STRICT; -- COMMENTS diff --git a/sql/spanningTree/primDD.sql b/sql/spanningTree/primDD.sql index 1223e26f73..aa3d37989a 100644 --- a/sql/spanningTree/primDD.sql +++ b/sql/spanningTree/primDD.sql @@ -2,7 +2,7 @@ File: primDD.sql Copyright (c) 2018 Vicky Vergara -Mail: vicky at georepublic dot de +Mail: vicky at vicky at erosion dot dev ------ @@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -- SINGLE VERTEX ---v3.0 +--v3.7 CREATE FUNCTION pgr_primDD ( TEXT, -- Edge sql BIGINT, -- root vertex @@ -37,26 +37,19 @@ CREATE FUNCTION pgr_primDD ( OUT seq BIGINT, OUT depth BIGINT, OUT start_vid BIGINT, + OUT pred BIGINT, OUT node BIGINT, OUT edge BIGINT, OUT cost FLOAT, OUT agg_cost FLOAT) RETURNS SETOF RECORD AS $BODY$ -BEGIN - IF $3 < 0 THEN - RAISE EXCEPTION 'Negative value found on ''distance''' - USING HINT = format('Value found: %s', $3); - END IF; - - RETURN QUERY - SELECT a.seq, a.depth, a.start_vid, a.node, a.edge, a.cost, a.agg_cost - FROM _pgr_prim(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], 'DD', -1, $3::FLOAT) AS a; -END; + SELECT seq, depth, start_vid, pred, node, edge, cost, agg_cost + FROM _pgr_primv4(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], 'DD', -1, $3::FLOAT); $BODY$ -LANGUAGE plpgsql VOLATILE STRICT; +LANGUAGE SQL VOLATILE STRICT; ---v3.0 +--v3.7 CREATE FUNCTION pgr_primDD ( TEXT, -- Edge sql BIGINT, -- root vertex @@ -65,28 +58,20 @@ CREATE FUNCTION pgr_primDD ( OUT seq BIGINT, OUT depth BIGINT, OUT start_vid BIGINT, + OUT pred BIGINT, OUT node BIGINT, OUT edge BIGINT, OUT cost FLOAT, OUT agg_cost FLOAT) RETURNS SETOF RECORD AS $BODY$ -BEGIN - IF $3 < 0 THEN - RAISE EXCEPTION 'Negative value found on ''distance''' - USING HINT = format('Value found: %s', $3); - END IF; - - RETURN QUERY - SELECT a.seq, a.depth, a.start_vid, a.node, a.edge, a.cost, a.agg_cost - FROM _pgr_prim(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], 'DD', -1, $3::FLOAT) AS a; -END; + SELECT seq, depth, start_vid, pred, node, edge, cost, agg_cost + FROM _pgr_primv4(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], 'DD', -1, $3::FLOAT); $BODY$ -LANGUAGE plpgsql VOLATILE STRICT; +LANGUAGE SQL VOLATILE STRICT; --- MULTIPLE VERTICES ---v3.0 +--v3.7 CREATE FUNCTION pgr_primDD ( TEXT, -- Edge sql ANYARRAY, -- root vertex @@ -96,27 +81,20 @@ CREATE FUNCTION pgr_primDD ( OUT seq BIGINT, OUT depth BIGINT, OUT start_vid BIGINT, + OUT pred BIGINT, OUT node BIGINT, OUT edge BIGINT, OUT cost FLOAT, OUT agg_cost FLOAT) RETURNS SETOF RECORD AS $BODY$ -BEGIN - IF $3 < 0 THEN - RAISE EXCEPTION 'Negative value found on ''distance''' - USING HINT = format('Value found: %s', $3); - END IF; - - RETURN QUERY - SELECT a.seq, a.depth, a.start_vid, a.node, a.edge, a.cost, a.agg_cost - FROM _pgr_prim(_pgr_get_statement($1), $2, 'DD', -1, $3) AS a; -END; + SELECT seq, depth, start_vid, pred, node, edge, cost, agg_cost + FROM _pgr_primv4(_pgr_get_statement($1), $2, 'DD', -1, $3); $BODY$ -LANGUAGE plpgsql VOLATILE STRICT; +LANGUAGE SQL VOLATILE STRICT; ---v3.0 +--v3.7 CREATE FUNCTION pgr_primDD ( TEXT, -- Edge sql ANYARRAY, -- root vertex @@ -126,24 +104,17 @@ CREATE FUNCTION pgr_primDD ( OUT seq BIGINT, OUT depth BIGINT, OUT start_vid BIGINT, + OUT pred BIGINT, OUT node BIGINT, OUT edge BIGINT, OUT cost FLOAT, OUT agg_cost FLOAT) RETURNS SETOF RECORD AS $BODY$ -BEGIN - IF $3 < 0 THEN - RAISE EXCEPTION 'Negative value found on ''distance''' - USING HINT = format('Value found: %s', $3); - END IF; - - RETURN QUERY - SELECT a.seq, a.depth, a.start_vid, a.node, a.edge, a.cost, a.agg_cost - FROM _pgr_prim(_pgr_get_statement($1), $2, 'DD', -1, $3::FLOAT) AS a; -END; + SELECT seq, depth, start_vid, pred, node, edge, cost, agg_cost + FROM _pgr_primv4(_pgr_get_statement($1), $2, 'DD', -1, $3::FLOAT); $BODY$ -LANGUAGE plpgsql VOLATILE STRICT; +LANGUAGE SQL VOLATILE STRICT; -- COMMENTS diff --git a/sql/spanningTree/primDFS.sql b/sql/spanningTree/primDFS.sql index 4967b4c7f0..c8bcf6a725 100644 --- a/sql/spanningTree/primDFS.sql +++ b/sql/spanningTree/primDFS.sql @@ -2,7 +2,7 @@ File: primDFS.sql Copyright (c) 2018 Vicky Vergara -Mail: vicky at georepublic dot de +Mail: vicky at vicky at erosion dot dev ------ @@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -- SINGLE VERTEX ---v3.0 +--v3.7 CREATE FUNCTION pgr_primDFS( TEXT, -- Edge sql BIGINT, -- root vertex @@ -38,29 +38,20 @@ CREATE FUNCTION pgr_primDFS( OUT seq BIGINT, OUT depth BIGINT, OUT start_vid BIGINT, + OUT pred BIGINT, OUT node BIGINT, OUT edge BIGINT, OUT cost FLOAT, OUT agg_cost FLOAT) RETURNS SETOF RECORD AS $BODY$ -BEGIN - IF $3 < 0 THEN - RAISE EXCEPTION 'Negative value found on ''max_depth''' - USING HINT = format('Value found: %s', $3); - END IF; - - - RETURN QUERY - SELECT a.seq, a.depth, a.start_vid, a.node, a.edge, a.cost, a.agg_cost - FROM _pgr_prim(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], 'DFS', $3, -1) AS a; -END; + SELECT seq, depth, start_vid, pred, node, edge, cost, agg_cost + FROM _pgr_primv4(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], 'DFS', $3, -1); $BODY$ -LANGUAGE plpgsql VOLATILE STRICT; +LANGUAGE SQL VOLATILE STRICT; --- MULTIPLE VERTICES ---v3.0 +--v3.7 CREATE FUNCTION pgr_primDFS( TEXT, -- Edge sql ANYARRAY, -- root vertices @@ -70,25 +61,17 @@ CREATE FUNCTION pgr_primDFS( OUT seq BIGINT, OUT depth BIGINT, OUT start_vid BIGINT, + OUT pred BIGINT, OUT node BIGINT, OUT edge BIGINT, OUT cost FLOAT, OUT agg_cost FLOAT) RETURNS SETOF RECORD AS $BODY$ -BEGIN - IF $3 < 0 THEN - RAISE EXCEPTION 'Negative value found on ''max_depth''' - USING HINT = format('Value found: %s', $3); - END IF; - - - RETURN QUERY - SELECT a.seq, a.depth, a.start_vid, a.node, a.edge, a.cost, a.agg_cost - FROM _pgr_prim(_pgr_get_statement($1), $2, 'DFS', $3, -1) AS a; -END; + SELECT seq, depth, start_vid, pred, node, edge, cost, agg_cost + FROM _pgr_primv4(_pgr_get_statement($1), $2, 'DFS', $3, -1); $BODY$ -LANGUAGE plpgsql VOLATILE STRICT; +LANGUAGE SQL VOLATILE STRICT; -- COMMENTS From c1b00961fed0b52e4315ffd5692f508389436f1e Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 13 Jan 2024 11:08:21 -0600 Subject: [PATCH 025/428] [sql][kruskal] New _pgr_kruskalv4 function with additional pred output column --- sql/spanningTree/_kruskal.sql | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/sql/spanningTree/_kruskal.sql b/sql/spanningTree/_kruskal.sql index 4ae8d7d471..8842258bfb 100644 --- a/sql/spanningTree/_kruskal.sql +++ b/sql/spanningTree/_kruskal.sql @@ -31,6 +31,28 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -- _pgr_kruskal ---------------- +--v3.7 +CREATE FUNCTION _pgr_kruskalv4( + TEXT, -- Edge sql + ANYARRAY, -- tree root for traversal + TEXT, -- gn suffix + BIGINT, -- max depth + FLOAT, -- distance + + OUT seq BIGINT, + OUT depth BIGINT, + OUT start_vid BIGINT, + OUT pred BIGINT, + OUT node BIGINT, + OUT edge BIGINT, + OUT cost FLOAT, + OUT agg_cost FLOAT) +RETURNS SETOF RECORD AS +'MODULE_PATHNAME' +LANGUAGE C VOLATILE STRICT; + +COMMENT ON FUNCTION _pgr_kruskalv4(TEXT, ANYARRAY, TEXT, BIGINT, FLOAT) +IS 'pgRouting internal function'; --v3.0 CREATE FUNCTION _pgr_kruskal( @@ -56,4 +78,4 @@ LANGUAGE C VOLATILE STRICT; COMMENT ON FUNCTION _pgr_kruskal(TEXT, ANYARRAY, TEXT, BIGINT, FLOAT) -IS 'pgRouting internal function'; +IS 'pgRouting internal function deprecated on v3.7.0'; From 9d37384960316b8dad91cd1d85999997832a2baf Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 13 Jan 2024 11:08:51 -0600 Subject: [PATCH 026/428] [sql][kruskal] Adding pred column to results --- sql/spanningTree/kruskal.sql | 2 +- sql/spanningTree/kruskalBFS.sql | 36 +++++------------ sql/spanningTree/kruskalDD.sql | 69 ++++++++++----------------------- sql/spanningTree/kruskalDFS.sql | 36 +++++------------ 4 files changed, 41 insertions(+), 102 deletions(-) diff --git a/sql/spanningTree/kruskal.sql b/sql/spanningTree/kruskal.sql index 0648390dc0..bd26304377 100644 --- a/sql/spanningTree/kruskal.sql +++ b/sql/spanningTree/kruskal.sql @@ -42,7 +42,7 @@ CREATE FUNCTION pgr_kruskal( RETURNS SETOF RECORD AS $BODY$ SELECT edge, cost - FROM _pgr_kruskal(_pgr_get_statement($1), ARRAY[0]::BIGINT[], '', -1, -1); + FROM _pgr_kruskalv4(_pgr_get_statement($1), ARRAY[0]::BIGINT[], '', -1, -1); $BODY$ LANGUAGE SQL VOLATILE STRICT; diff --git a/sql/spanningTree/kruskalBFS.sql b/sql/spanningTree/kruskalBFS.sql index 7a64b03329..aaa75fe765 100644 --- a/sql/spanningTree/kruskalBFS.sql +++ b/sql/spanningTree/kruskalBFS.sql @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ----------------- ---v3.0 +--v3.7 CREATE FUNCTION pgr_kruskalBFS( TEXT, -- Edge sql (required) BIGINT, -- root vertex (required) @@ -43,28 +43,20 @@ CREATE FUNCTION pgr_kruskalBFS( OUT seq BIGINT, OUT depth BIGINT, OUT start_vid BIGINT, + OUT pred BIGINT, OUT node BIGINT, OUT edge BIGINT, OUT cost FLOAT, OUT agg_cost FLOAT) RETURNS SETOF RECORD AS $BODY$ -BEGIN - IF $3 < 0 THEN - RAISE EXCEPTION 'Negative value found on ''max_depth''' - USING HINT = format('Value found: %s', $3); - END IF; - - - RETURN QUERY - SELECT a.seq, a.depth, a.start_vid, a.node, a.edge, a.cost, a.agg_cost - FROM _pgr_kruskal(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], 'BFS', $3, -1) AS a; -END; + SELECT seq, depth, start_vid, pred, node, edge, cost, agg_cost + FROM _pgr_kruskalv4(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], 'BFS', $3, -1); $BODY$ -LANGUAGE plpgsql VOLATILE STRICT; +LANGUAGE SQL VOLATILE STRICT; ---v3.0 +--v3.7 CREATE FUNCTION pgr_kruskalBFS( TEXT, -- Edge sql (required) ANYARRAY, -- root vertices (required) @@ -74,25 +66,17 @@ CREATE FUNCTION pgr_kruskalBFS( OUT seq BIGINT, OUT depth BIGINT, OUT start_vid BIGINT, + OUT pred BIGINT, OUT node BIGINT, OUT edge BIGINT, OUT cost FLOAT, OUT agg_cost FLOAT) RETURNS SETOF RECORD AS $BODY$ -BEGIN - IF $3 < 0 THEN - RAISE EXCEPTION 'Negative value found on ''max_depth''' - USING HINT = format('Value found: %s', $3); - END IF; - - - RETURN QUERY - SELECT a.seq, a.depth, a.start_vid, a.node, a.edge, a.cost, a.agg_cost - FROM _pgr_kruskal(_pgr_get_statement($1), $2, 'BFS', $3, -1) AS a; -END; + SELECT seq, depth, start_vid, pred, node, edge, cost, agg_cost + FROM _pgr_kruskalv4(_pgr_get_statement($1), $2, 'BFS', $3, -1); $BODY$ -LANGUAGE plpgsql VOLATILE STRICT; +LANGUAGE SQL VOLATILE STRICT; -- COMMENTS diff --git a/sql/spanningTree/kruskalDD.sql b/sql/spanningTree/kruskalDD.sql index 3c0754c472..4d2db5f98b 100644 --- a/sql/spanningTree/kruskalDD.sql +++ b/sql/spanningTree/kruskalDD.sql @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -- SINGLE VERTEX ---v3.0 +--v3.7 CREATE FUNCTION pgr_kruskalDD ( TEXT, -- Edge sql BIGINT, -- root vertex @@ -43,26 +43,19 @@ CREATE FUNCTION pgr_kruskalDD ( OUT seq BIGINT, OUT depth BIGINT, OUT start_vid BIGINT, + OUT pred BIGINT, OUT node BIGINT, OUT edge BIGINT, OUT cost FLOAT, OUT agg_cost FLOAT) RETURNS SETOF RECORD AS $BODY$ -BEGIN - IF $3 < 0 THEN - RAISE EXCEPTION 'Negative value found on ''distance''' - USING HINT = format('Value found: %s', $3); - END IF; - - RETURN QUERY - SELECT a.seq, a.depth, a.start_vid, a.node, a.edge, a.cost, a.agg_cost - FROM _pgr_kruskal(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], 'DD', -1, $3::FLOAT) AS a; -END; + SELECT seq, depth, start_vid, pred, node, edge, cost, agg_cost + FROM _pgr_kruskalv4(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], 'DD', -1, $3::FLOAT); $BODY$ -LANGUAGE plpgsql VOLATILE STRICT; +LANGUAGE SQL VOLATILE STRICT; ---v3.0 +--v3.7 CREATE FUNCTION pgr_kruskalDD ( TEXT, -- Edge sql BIGINT, -- root vertex @@ -71,28 +64,20 @@ CREATE FUNCTION pgr_kruskalDD ( OUT seq BIGINT, OUT depth BIGINT, OUT start_vid BIGINT, + OUT pred BIGINT, OUT node BIGINT, OUT edge BIGINT, OUT cost FLOAT, OUT agg_cost FLOAT) RETURNS SETOF RECORD AS $BODY$ -BEGIN - IF $3 < 0 THEN - RAISE EXCEPTION 'Negative value found on ''distance''' - USING HINT = format('Value found: %s', $3); - END IF; - - RETURN QUERY - SELECT a.seq, a.depth, a.start_vid, a.node, a.edge, a.cost, a.agg_cost - FROM _pgr_kruskal(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], 'DD', -1, $3::FLOAT) AS a; -END; + SELECT seq, depth, start_vid, pred, node, edge, cost, agg_cost + FROM _pgr_kruskalv4(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], 'DD', -1, $3::FLOAT); $BODY$ -LANGUAGE plpgsql VOLATILE STRICT; - +LANGUAGE SQL VOLATILE STRICT; -- MULTIPLE VERTICES ---v3.0 +--v3.7 CREATE FUNCTION pgr_kruskalDD ( TEXT, -- Edge sql ANYARRAY, -- root vertex @@ -102,27 +87,20 @@ CREATE FUNCTION pgr_kruskalDD ( OUT seq BIGINT, OUT depth BIGINT, OUT start_vid BIGINT, + OUT pred BIGINT, OUT node BIGINT, OUT edge BIGINT, OUT cost FLOAT, OUT agg_cost FLOAT) RETURNS SETOF RECORD AS $BODY$ -BEGIN - IF $3 < 0 THEN - RAISE EXCEPTION 'Negative value found on ''distance''' - USING HINT = format('Value found: %s', $3); - END IF; - - RETURN QUERY - SELECT a.seq, a.depth, a.start_vid, a.node, a.edge, a.cost, a.agg_cost - FROM _pgr_kruskal(_pgr_get_statement($1), $2, 'DD', -1, $3) AS a; -END; + SELECT seq, depth, start_vid, pred, node, edge, cost, agg_cost + FROM _pgr_kruskalv4(_pgr_get_statement($1), $2, 'DD', -1, $3); $BODY$ -LANGUAGE plpgsql VOLATILE STRICT; +LANGUAGE SQL VOLATILE STRICT; ---v3.0 +--v3.7 CREATE FUNCTION pgr_kruskalDD ( TEXT, -- Edge sql ANYARRAY, -- root vertex @@ -132,24 +110,17 @@ CREATE FUNCTION pgr_kruskalDD ( OUT seq BIGINT, OUT depth BIGINT, OUT start_vid BIGINT, + OUT pred BIGINT, OUT node BIGINT, OUT edge BIGINT, OUT cost FLOAT, OUT agg_cost FLOAT) RETURNS SETOF RECORD AS $BODY$ -BEGIN - IF $3 < 0 THEN - RAISE EXCEPTION 'Negative value found on ''distance''' - USING HINT = format('Value found: %s', $3); - END IF; - - RETURN QUERY - SELECT a.seq, a.depth, a.start_vid, a.node, a.edge, a.cost, a.agg_cost - FROM _pgr_kruskal(_pgr_get_statement($1), $2, 'DD', -1, $3::FLOAT) AS a; -END; + SELECT seq, depth, start_vid, pred, node, edge, cost, agg_cost + FROM _pgr_kruskalv4(_pgr_get_statement($1), $2, 'DD', -1, $3::FLOAT); $BODY$ -LANGUAGE plpgsql VOLATILE STRICT; +LANGUAGE SQL VOLATILE STRICT; -- COMMENTS diff --git a/sql/spanningTree/kruskalDFS.sql b/sql/spanningTree/kruskalDFS.sql index 26f5a719f2..9a32ee1113 100644 --- a/sql/spanningTree/kruskalDFS.sql +++ b/sql/spanningTree/kruskalDFS.sql @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -- SINGLE VERTEX ---v3.0 +--v3.7 CREATE FUNCTION pgr_kruskalDFS( TEXT, -- Edge sql BIGINT, -- root vertex @@ -44,28 +44,20 @@ CREATE FUNCTION pgr_kruskalDFS( OUT seq BIGINT, OUT depth BIGINT, OUT start_vid BIGINT, + OUT pred BIGINT, OUT node BIGINT, OUT edge BIGINT, OUT cost FLOAT, OUT agg_cost FLOAT) RETURNS SETOF RECORD AS $BODY$ -BEGIN - IF $3 < 0 THEN - RAISE EXCEPTION 'Negative value found on ''max_depth''' - USING HINT = format('Value found: %s', $3); - END IF; - - - RETURN QUERY - SELECT a.seq, a.depth, a.start_vid, a.node, a.edge, a.cost, a.agg_cost - FROM _pgr_kruskal(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], 'DFS', $3, -1) AS a; -END; + SELECT seq, depth, start_vid, pred, node, edge, cost, agg_cost + FROM _pgr_kruskalv4(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], 'DFS', $3, -1); $BODY$ -LANGUAGE plpgsql VOLATILE STRICT; +LANGUAGE SQL VOLATILE STRICT; -- MULTIPLE VERTICES ---v3.0 +--v3.7 CREATE FUNCTION pgr_kruskalDFS( TEXT, -- Edge sql ANYARRAY, -- root vertices @@ -75,25 +67,17 @@ CREATE FUNCTION pgr_kruskalDFS( OUT seq BIGINT, OUT depth BIGINT, OUT start_vid BIGINT, + OUT pred BIGINT, OUT node BIGINT, OUT edge BIGINT, OUT cost FLOAT, OUT agg_cost FLOAT) RETURNS SETOF RECORD AS $BODY$ -BEGIN - IF $3 < 0 THEN - RAISE EXCEPTION 'Negative value found on ''max_depth''' - USING HINT = format('Value found: %s', $3); - END IF; - - - RETURN QUERY - SELECT a.seq, a.depth, a.start_vid, a.node, a.edge, a.cost, a.agg_cost - FROM _pgr_kruskal(_pgr_get_statement($1), $2, 'DFS', $3, -1) AS a; -END; + SELECT seq, depth, start_vid, pred, node, edge, cost, agg_cost + FROM _pgr_kruskalv4(_pgr_get_statement($1), $2, 'DFS', $3, -1); $BODY$ -LANGUAGE plpgsql VOLATILE STRICT; +LANGUAGE SQL VOLATILE STRICT; -- COMMENTS From 402f7406fc10f2f5d56a5706507befb511926a2d Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 13 Jan 2024 11:24:20 -0600 Subject: [PATCH 027/428] [src][kruskal] adding new _kruskalv4 C function --- src/spanningTree/kruskal.c | 90 +++++++++++++++++++++++++++++++++++++- 1 file changed, 88 insertions(+), 2 deletions(-) diff --git a/src/spanningTree/kruskal.c b/src/spanningTree/kruskal.c index c56ae8eae4..5cc8eca132 100644 --- a/src/spanningTree/kruskal.c +++ b/src/spanningTree/kruskal.c @@ -40,8 +40,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "drivers/spanningTree/mst_common.h" #include "drivers/spanningTree/kruskal_driver.h" -PGDLLEXPORT Datum _pgr_kruskal(PG_FUNCTION_ARGS); -PG_FUNCTION_INFO_V1(_pgr_kruskal); +PGDLLEXPORT Datum _pgr_kruskalv4(PG_FUNCTION_ARGS); +PG_FUNCTION_INFO_V1(_pgr_kruskalv4); static @@ -67,6 +67,13 @@ process( return; } + /* checks previously done on sql now done here */ + if (strcmp(fn_suffix, "DD") == 0 && distance < 0) { + throw_error("Negative value found on 'distance'", "Must be positive"); + } else if ((strcmp(fn_suffix, "BFS") == 0 || strcmp(fn_suffix, "DFS") == 0) && max_depth < 0) { + throw_error("Negative value found on 'max_depth'", "Must be positive"); + } + size_t size_rootsArr = 0; int64_t* rootsArr = pgr_get_bigIntArray(&size_rootsArr, roots, false, &err_msg); throw_error(err_msg, "While getting start vids"); @@ -109,6 +116,85 @@ process( pgr_SPI_finish(); } +PGDLLEXPORT Datum _pgr_kruskalv4(PG_FUNCTION_ARGS) { + FuncCallContext *funcctx; + TupleDesc tuple_desc; + + MST_rt *result_tuples = NULL; + size_t result_count = 0; + + if (SRF_IS_FIRSTCALL()) { + MemoryContext oldcontext; + funcctx = SRF_FIRSTCALL_INIT(); + oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); + + + /* Edge sql, tree roots, fn_suffix, max_depth, distance */ + process( + text_to_cstring(PG_GETARG_TEXT_P(0)), + PG_GETARG_ARRAYTYPE_P(1), + text_to_cstring(PG_GETARG_TEXT_P(2)), + PG_GETARG_INT64(3), + PG_GETARG_FLOAT8(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 = (MST_rt*) funcctx->user_fctx; + + if (funcctx->call_cntr < funcctx->max_calls) { + HeapTuple tuple; + Datum result; + Datum *values; + bool* nulls; + + size_t num = 8; + values = palloc(num * sizeof(Datum)); + nulls = palloc(num * sizeof(bool)); + + + size_t i; + for (i = 0; i < num; ++i) { + nulls[i] = false; + } + + values[0] = Int64GetDatum((int64_t)funcctx->call_cntr + 1); + values[1] = Int64GetDatum(result_tuples[funcctx->call_cntr].depth); + values[2] = Int64GetDatum(result_tuples[funcctx->call_cntr].from_v); + values[3] = Int64GetDatum(result_tuples[funcctx->call_cntr].node); + 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); + + tuple = heap_form_tuple(tuple_desc, values, nulls); + result = HeapTupleGetDatum(tuple); + SRF_RETURN_NEXT(funcctx, result); + } else { + SRF_RETURN_DONE(funcctx); + } +} + +/***********************************************************************************/ + +PGDLLEXPORT Datum _pgr_kruskal(PG_FUNCTION_ARGS); +PG_FUNCTION_INFO_V1(_pgr_kruskal); + PGDLLEXPORT Datum _pgr_kruskal(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; From 0cb935ec302bab97a40268162c1aba8af57b4cc3 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 13 Jan 2024 11:24:35 -0600 Subject: [PATCH 028/428] [src][prim] adding new _primv4 C function --- src/spanningTree/prim.c | 92 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 88 insertions(+), 4 deletions(-) diff --git a/src/spanningTree/prim.c b/src/spanningTree/prim.c index 53ab94477a..1cbe8369b8 100644 --- a/src/spanningTree/prim.c +++ b/src/spanningTree/prim.c @@ -27,6 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ #include +#include #include "c_common/postgres_connection.h" #include "c_common/debug_macro.h" @@ -38,9 +39,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "drivers/spanningTree/mst_common.h" #include "drivers/spanningTree/prim_driver.h" -PGDLLEXPORT Datum _pgr_prim(PG_FUNCTION_ARGS); -PG_FUNCTION_INFO_V1(_pgr_prim); - +PGDLLEXPORT Datum _pgr_primv4(PG_FUNCTION_ARGS); +PG_FUNCTION_INFO_V1(_pgr_primv4); static void @@ -65,6 +65,12 @@ process( return; } + if (strcmp(fn_suffix, "DD") == 0 && distance < 0) { + throw_error("Negative value found on 'distance'", "Must be positive"); + } else if ((strcmp(fn_suffix, "BFS") == 0 || strcmp(fn_suffix, "DFS") == 0) && max_depth < 0) { + throw_error("Negative value found on 'max_depth'", "Must be positive"); + } + size_t size_rootsArr = 0; int64_t* rootsArr = pgr_get_bigIntArray(&size_rootsArr, roots, false, &err_msg); throw_error(err_msg, "While getting start vids"); @@ -110,9 +116,87 @@ process( pgr_SPI_finish(); } -/* */ + + +PGDLLEXPORT Datum _pgr_primv4(PG_FUNCTION_ARGS) { + FuncCallContext *funcctx; + TupleDesc tuple_desc; + + MST_rt *result_tuples = NULL; + size_t result_count = 0; + + if (SRF_IS_FIRSTCALL()) { + MemoryContext oldcontext; + funcctx = SRF_FIRSTCALL_INIT(); + oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); + + /* Edge sql, tree roots, fn_suffix, max_depth, distance */ + process( + text_to_cstring(PG_GETARG_TEXT_P(0)), + PG_GETARG_ARRAYTYPE_P(1), + text_to_cstring(PG_GETARG_TEXT_P(2)), + PG_GETARG_INT64(3), + PG_GETARG_FLOAT8(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 = (MST_rt*) funcctx->user_fctx; + + if (funcctx->call_cntr < funcctx->max_calls) { + HeapTuple tuple; + Datum result; + Datum *values; + bool* nulls; + + size_t num = 8; + values = palloc(num * sizeof(Datum)); + nulls = palloc(num * sizeof(bool)); + + + size_t i; + for (i = 0; i < num; ++i) { + nulls[i] = false; + } + + values[0] = Int64GetDatum((int64_t)funcctx->call_cntr + 1); + values[1] = Int64GetDatum(result_tuples[funcctx->call_cntr].depth); + values[2] = Int64GetDatum(result_tuples[funcctx->call_cntr].from_v); + values[3] = Int64GetDatum(result_tuples[funcctx->call_cntr].pred); + 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); + + tuple = heap_form_tuple(tuple_desc, values, nulls); + result = HeapTupleGetDatum(tuple); + SRF_RETURN_NEXT(funcctx, result); + } else { + SRF_RETURN_DONE(funcctx); + } +} + /******************************************************************************/ +PGDLLEXPORT Datum _pgr_prim(PG_FUNCTION_ARGS); +PG_FUNCTION_INFO_V1(_pgr_prim); + PGDLLEXPORT Datum _pgr_prim(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; From 2d8ae358c8830d29ea1ad5fff5a0249dc242c9d9 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 13 Jan 2024 11:27:07 -0600 Subject: [PATCH 029/428] [docqueries][prim] adjusting to new results --- .../spanningTree/doc-pgr_primBFS.result | 68 +++++++++---------- docqueries/spanningTree/doc-pgr_primDD.result | 66 +++++++++--------- .../spanningTree/doc-pgr_primDFS.result | 68 +++++++++---------- 3 files changed, 101 insertions(+), 101 deletions(-) diff --git a/docqueries/spanningTree/doc-pgr_primBFS.result b/docqueries/spanningTree/doc-pgr_primBFS.result index 7263280e20..4a90683431 100644 --- a/docqueries/spanningTree/doc-pgr_primBFS.result +++ b/docqueries/spanningTree/doc-pgr_primBFS.result @@ -6,46 +6,46 @@ SET SELECT * FROM pgr_primBFS( 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', 6); - seq | depth | start_vid | node | edge | cost | agg_cost ------+-------+-----------+------+------+------+---------- - 1 | 0 | 6 | 6 | -1 | 0 | 0 - 2 | 1 | 6 | 5 | 1 | 1 | 1 - 3 | 1 | 6 | 10 | 2 | 1 | 1 - 4 | 1 | 6 | 7 | 4 | 1 | 1 - 5 | 2 | 6 | 15 | 3 | 1 | 2 - 6 | 2 | 6 | 11 | 5 | 1 | 2 - 7 | 2 | 6 | 3 | 7 | 1 | 2 - 8 | 2 | 6 | 8 | 10 | 1 | 2 - 9 | 3 | 6 | 16 | 9 | 1 | 3 - 10 | 3 | 6 | 12 | 11 | 1 | 3 - 11 | 3 | 6 | 1 | 6 | 1 | 3 - 12 | 3 | 6 | 9 | 14 | 1 | 3 - 13 | 4 | 6 | 17 | 13 | 1 | 4 + seq | depth | start_vid | pred | node | edge | cost | agg_cost +-----+-------+-----------+------+------+------+------+---------- + 1 | 0 | 6 | 6 | 6 | -1 | 0 | 0 + 2 | 1 | 6 | 6 | 5 | 1 | 1 | 1 + 3 | 1 | 6 | 6 | 10 | 2 | 1 | 1 + 4 | 1 | 6 | 6 | 7 | 4 | 1 | 1 + 5 | 2 | 6 | 10 | 15 | 3 | 1 | 2 + 6 | 2 | 6 | 10 | 11 | 5 | 1 | 2 + 7 | 2 | 6 | 7 | 3 | 7 | 1 | 2 + 8 | 2 | 6 | 7 | 8 | 10 | 1 | 2 + 9 | 3 | 6 | 11 | 16 | 9 | 1 | 3 + 10 | 3 | 6 | 11 | 12 | 11 | 1 | 3 + 11 | 3 | 6 | 3 | 1 | 6 | 1 | 3 + 12 | 3 | 6 | 8 | 9 | 14 | 1 | 3 + 13 | 4 | 6 | 12 | 17 | 13 | 1 | 4 (13 rows) /* -- q2 */ SELECT * FROM pgr_primBFS( 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', ARRAY[9, 6], max_depth => 3); - seq | depth | start_vid | node | edge | cost | agg_cost ------+-------+-----------+------+------+------+---------- - 1 | 0 | 6 | 6 | -1 | 0 | 0 - 2 | 1 | 6 | 5 | 1 | 1 | 1 - 3 | 1 | 6 | 10 | 2 | 1 | 1 - 4 | 1 | 6 | 7 | 4 | 1 | 1 - 5 | 2 | 6 | 15 | 3 | 1 | 2 - 6 | 2 | 6 | 11 | 5 | 1 | 2 - 7 | 2 | 6 | 3 | 7 | 1 | 2 - 8 | 2 | 6 | 8 | 10 | 1 | 2 - 9 | 3 | 6 | 16 | 9 | 1 | 3 - 10 | 3 | 6 | 12 | 11 | 1 | 3 - 11 | 3 | 6 | 1 | 6 | 1 | 3 - 12 | 3 | 6 | 9 | 14 | 1 | 3 - 13 | 0 | 9 | 9 | -1 | 0 | 0 - 14 | 1 | 9 | 8 | 14 | 1 | 1 - 15 | 2 | 9 | 7 | 10 | 1 | 2 - 16 | 3 | 9 | 6 | 4 | 1 | 3 - 17 | 3 | 9 | 3 | 7 | 1 | 3 + seq | depth | start_vid | pred | node | edge | cost | agg_cost +-----+-------+-----------+------+------+------+------+---------- + 1 | 0 | 6 | 6 | 6 | -1 | 0 | 0 + 2 | 1 | 6 | 6 | 5 | 1 | 1 | 1 + 3 | 1 | 6 | 6 | 10 | 2 | 1 | 1 + 4 | 1 | 6 | 6 | 7 | 4 | 1 | 1 + 5 | 2 | 6 | 10 | 15 | 3 | 1 | 2 + 6 | 2 | 6 | 10 | 11 | 5 | 1 | 2 + 7 | 2 | 6 | 7 | 3 | 7 | 1 | 2 + 8 | 2 | 6 | 7 | 8 | 10 | 1 | 2 + 9 | 3 | 6 | 11 | 16 | 9 | 1 | 3 + 10 | 3 | 6 | 11 | 12 | 11 | 1 | 3 + 11 | 3 | 6 | 3 | 1 | 6 | 1 | 3 + 12 | 3 | 6 | 8 | 9 | 14 | 1 | 3 + 13 | 0 | 9 | 9 | 9 | -1 | 0 | 0 + 14 | 1 | 9 | 9 | 8 | 14 | 1 | 1 + 15 | 2 | 9 | 8 | 7 | 10 | 1 | 2 + 16 | 3 | 9 | 7 | 6 | 4 | 1 | 3 + 17 | 3 | 9 | 7 | 3 | 7 | 1 | 3 (17 rows) /* -- q3 */ diff --git a/docqueries/spanningTree/doc-pgr_primDD.result b/docqueries/spanningTree/doc-pgr_primDD.result index dd2c976fe3..d9c255d726 100644 --- a/docqueries/spanningTree/doc-pgr_primDD.result +++ b/docqueries/spanningTree/doc-pgr_primDD.result @@ -6,45 +6,45 @@ SET SELECT * FROM pgr_primDD( 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', 6, 3.5); - seq | depth | start_vid | node | edge | cost | agg_cost ------+-------+-----------+------+------+------+---------- - 1 | 0 | 6 | 6 | -1 | 0 | 0 - 2 | 1 | 6 | 5 | 1 | 1 | 1 - 3 | 1 | 6 | 10 | 2 | 1 | 1 - 4 | 2 | 6 | 15 | 3 | 1 | 2 - 5 | 2 | 6 | 11 | 5 | 1 | 2 - 6 | 3 | 6 | 16 | 9 | 1 | 3 - 7 | 3 | 6 | 12 | 11 | 1 | 3 - 8 | 1 | 6 | 7 | 4 | 1 | 1 - 9 | 2 | 6 | 3 | 7 | 1 | 2 - 10 | 3 | 6 | 1 | 6 | 1 | 3 - 11 | 2 | 6 | 8 | 10 | 1 | 2 - 12 | 3 | 6 | 9 | 14 | 1 | 3 + seq | depth | start_vid | pred | node | edge | cost | agg_cost +-----+-------+-----------+------+------+------+------+---------- + 1 | 0 | 6 | 6 | 6 | -1 | 0 | 0 + 2 | 1 | 6 | 6 | 5 | 1 | 1 | 1 + 3 | 1 | 6 | 6 | 10 | 2 | 1 | 1 + 4 | 2 | 6 | 10 | 15 | 3 | 1 | 2 + 5 | 2 | 6 | 10 | 11 | 5 | 1 | 2 + 6 | 3 | 6 | 11 | 16 | 9 | 1 | 3 + 7 | 3 | 6 | 11 | 12 | 11 | 1 | 3 + 8 | 1 | 6 | 6 | 7 | 4 | 1 | 1 + 9 | 2 | 6 | 7 | 3 | 7 | 1 | 2 + 10 | 3 | 6 | 3 | 1 | 6 | 1 | 3 + 11 | 2 | 6 | 7 | 8 | 10 | 1 | 2 + 12 | 3 | 6 | 8 | 9 | 14 | 1 | 3 (12 rows) /* -- q2 */ SELECT * FROM pgr_primDD( 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', ARRAY[9, 6], 3.5); - seq | depth | start_vid | node | edge | cost | agg_cost ------+-------+-----------+------+------+------+---------- - 1 | 0 | 6 | 6 | -1 | 0 | 0 - 2 | 1 | 6 | 5 | 1 | 1 | 1 - 3 | 1 | 6 | 10 | 2 | 1 | 1 - 4 | 2 | 6 | 15 | 3 | 1 | 2 - 5 | 2 | 6 | 11 | 5 | 1 | 2 - 6 | 3 | 6 | 16 | 9 | 1 | 3 - 7 | 3 | 6 | 12 | 11 | 1 | 3 - 8 | 1 | 6 | 7 | 4 | 1 | 1 - 9 | 2 | 6 | 3 | 7 | 1 | 2 - 10 | 3 | 6 | 1 | 6 | 1 | 3 - 11 | 2 | 6 | 8 | 10 | 1 | 2 - 12 | 3 | 6 | 9 | 14 | 1 | 3 - 13 | 0 | 9 | 9 | -1 | 0 | 0 - 14 | 1 | 9 | 8 | 14 | 1 | 1 - 15 | 2 | 9 | 7 | 10 | 1 | 2 - 16 | 3 | 9 | 6 | 4 | 1 | 3 - 17 | 3 | 9 | 3 | 7 | 1 | 3 + seq | depth | start_vid | pred | node | edge | cost | agg_cost +-----+-------+-----------+------+------+------+------+---------- + 1 | 0 | 6 | 6 | 6 | -1 | 0 | 0 + 2 | 1 | 6 | 6 | 5 | 1 | 1 | 1 + 3 | 1 | 6 | 6 | 10 | 2 | 1 | 1 + 4 | 2 | 6 | 10 | 15 | 3 | 1 | 2 + 5 | 2 | 6 | 10 | 11 | 5 | 1 | 2 + 6 | 3 | 6 | 11 | 16 | 9 | 1 | 3 + 7 | 3 | 6 | 11 | 12 | 11 | 1 | 3 + 8 | 1 | 6 | 6 | 7 | 4 | 1 | 1 + 9 | 2 | 6 | 7 | 3 | 7 | 1 | 2 + 10 | 3 | 6 | 3 | 1 | 6 | 1 | 3 + 11 | 2 | 6 | 7 | 8 | 10 | 1 | 2 + 12 | 3 | 6 | 8 | 9 | 14 | 1 | 3 + 13 | 0 | 9 | 9 | 9 | -1 | 0 | 0 + 14 | 1 | 9 | 9 | 8 | 14 | 1 | 1 + 15 | 2 | 9 | 8 | 7 | 10 | 1 | 2 + 16 | 3 | 9 | 7 | 6 | 4 | 1 | 3 + 17 | 3 | 9 | 7 | 3 | 7 | 1 | 3 (17 rows) /* -- q3 */ diff --git a/docqueries/spanningTree/doc-pgr_primDFS.result b/docqueries/spanningTree/doc-pgr_primDFS.result index 8d16ea4229..b9e2fcf86a 100644 --- a/docqueries/spanningTree/doc-pgr_primDFS.result +++ b/docqueries/spanningTree/doc-pgr_primDFS.result @@ -6,46 +6,46 @@ SET SELECT * FROM pgr_primDFS( 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', 6); - seq | depth | start_vid | node | edge | cost | agg_cost ------+-------+-----------+------+------+------+---------- - 1 | 0 | 6 | 6 | -1 | 0 | 0 - 2 | 1 | 6 | 5 | 1 | 1 | 1 - 3 | 1 | 6 | 10 | 2 | 1 | 1 - 4 | 2 | 6 | 15 | 3 | 1 | 2 - 5 | 2 | 6 | 11 | 5 | 1 | 2 - 6 | 3 | 6 | 16 | 9 | 1 | 3 - 7 | 3 | 6 | 12 | 11 | 1 | 3 - 8 | 4 | 6 | 17 | 13 | 1 | 4 - 9 | 1 | 6 | 7 | 4 | 1 | 1 - 10 | 2 | 6 | 3 | 7 | 1 | 2 - 11 | 3 | 6 | 1 | 6 | 1 | 3 - 12 | 2 | 6 | 8 | 10 | 1 | 2 - 13 | 3 | 6 | 9 | 14 | 1 | 3 + seq | depth | start_vid | pred | node | edge | cost | agg_cost +-----+-------+-----------+------+------+------+------+---------- + 1 | 0 | 6 | 6 | 6 | -1 | 0 | 0 + 2 | 1 | 6 | 6 | 5 | 1 | 1 | 1 + 3 | 1 | 6 | 6 | 10 | 2 | 1 | 1 + 4 | 2 | 6 | 10 | 15 | 3 | 1 | 2 + 5 | 2 | 6 | 10 | 11 | 5 | 1 | 2 + 6 | 3 | 6 | 11 | 16 | 9 | 1 | 3 + 7 | 3 | 6 | 11 | 12 | 11 | 1 | 3 + 8 | 4 | 6 | 12 | 17 | 13 | 1 | 4 + 9 | 1 | 6 | 6 | 7 | 4 | 1 | 1 + 10 | 2 | 6 | 7 | 3 | 7 | 1 | 2 + 11 | 3 | 6 | 3 | 1 | 6 | 1 | 3 + 12 | 2 | 6 | 7 | 8 | 10 | 1 | 2 + 13 | 3 | 6 | 8 | 9 | 14 | 1 | 3 (13 rows) /* -- q2 */ SELECT * FROM pgr_primDFS( 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', ARRAY[9, 6], max_depth => 3); - seq | depth | start_vid | node | edge | cost | agg_cost ------+-------+-----------+------+------+------+---------- - 1 | 0 | 6 | 6 | -1 | 0 | 0 - 2 | 1 | 6 | 5 | 1 | 1 | 1 - 3 | 1 | 6 | 10 | 2 | 1 | 1 - 4 | 2 | 6 | 15 | 3 | 1 | 2 - 5 | 2 | 6 | 11 | 5 | 1 | 2 - 6 | 3 | 6 | 16 | 9 | 1 | 3 - 7 | 3 | 6 | 12 | 11 | 1 | 3 - 8 | 1 | 6 | 7 | 4 | 1 | 1 - 9 | 2 | 6 | 3 | 7 | 1 | 2 - 10 | 3 | 6 | 1 | 6 | 1 | 3 - 11 | 2 | 6 | 8 | 10 | 1 | 2 - 12 | 3 | 6 | 9 | 14 | 1 | 3 - 13 | 0 | 9 | 9 | -1 | 0 | 0 - 14 | 1 | 9 | 8 | 14 | 1 | 1 - 15 | 2 | 9 | 7 | 10 | 1 | 2 - 16 | 3 | 9 | 6 | 4 | 1 | 3 - 17 | 3 | 9 | 3 | 7 | 1 | 3 + seq | depth | start_vid | pred | node | edge | cost | agg_cost +-----+-------+-----------+------+------+------+------+---------- + 1 | 0 | 6 | 6 | 6 | -1 | 0 | 0 + 2 | 1 | 6 | 6 | 5 | 1 | 1 | 1 + 3 | 1 | 6 | 6 | 10 | 2 | 1 | 1 + 4 | 2 | 6 | 10 | 15 | 3 | 1 | 2 + 5 | 2 | 6 | 10 | 11 | 5 | 1 | 2 + 6 | 3 | 6 | 11 | 16 | 9 | 1 | 3 + 7 | 3 | 6 | 11 | 12 | 11 | 1 | 3 + 8 | 1 | 6 | 6 | 7 | 4 | 1 | 1 + 9 | 2 | 6 | 7 | 3 | 7 | 1 | 2 + 10 | 3 | 6 | 3 | 1 | 6 | 1 | 3 + 11 | 2 | 6 | 7 | 8 | 10 | 1 | 2 + 12 | 3 | 6 | 8 | 9 | 14 | 1 | 3 + 13 | 0 | 9 | 9 | 9 | -1 | 0 | 0 + 14 | 1 | 9 | 9 | 8 | 14 | 1 | 1 + 15 | 2 | 9 | 8 | 7 | 10 | 1 | 2 + 16 | 3 | 9 | 7 | 6 | 4 | 1 | 3 + 17 | 3 | 9 | 7 | 3 | 7 | 1 | 3 (17 rows) /* -- q3 */ From 28b4d23f60e68c2d39cef9f0c165261553f6ff89 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 13 Jan 2024 11:26:50 -0600 Subject: [PATCH 030/428] [docqueries][kruskal] adjusting to new results --- .../spanningTree/doc-pgr_kruskalBFS.result | 58 +++++++++---------- .../spanningTree/doc-pgr_kruskalDD.result | 42 +++++++------- .../spanningTree/doc-pgr_kruskalDFS.result | 58 +++++++++---------- 3 files changed, 79 insertions(+), 79 deletions(-) diff --git a/docqueries/spanningTree/doc-pgr_kruskalBFS.result b/docqueries/spanningTree/doc-pgr_kruskalBFS.result index 378883b210..6c0a91a81b 100644 --- a/docqueries/spanningTree/doc-pgr_kruskalBFS.result +++ b/docqueries/spanningTree/doc-pgr_kruskalBFS.result @@ -6,41 +6,41 @@ SET SELECT * FROM pgr_kruskalBFS( 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', 6); - seq | depth | start_vid | node | edge | cost | agg_cost ------+-------+-----------+------+------+------+---------- - 1 | 0 | 6 | 6 | -1 | 0 | 0 - 2 | 1 | 6 | 5 | 1 | 1 | 1 - 3 | 1 | 6 | 10 | 2 | 1 | 1 - 4 | 2 | 6 | 15 | 3 | 1 | 2 - 5 | 3 | 6 | 16 | 16 | 1 | 3 - 6 | 4 | 6 | 17 | 15 | 1 | 4 - 7 | 5 | 6 | 12 | 13 | 1 | 5 - 8 | 6 | 6 | 11 | 11 | 1 | 6 - 9 | 6 | 6 | 8 | 12 | 1 | 6 - 10 | 7 | 6 | 7 | 10 | 1 | 7 - 11 | 7 | 6 | 9 | 14 | 1 | 7 - 12 | 8 | 6 | 3 | 7 | 1 | 8 - 13 | 9 | 6 | 1 | 6 | 1 | 9 + seq | depth | start_vid | pred | node | edge | cost | agg_cost +-----+-------+-----------+------+------+------+------+---------- + 1 | 0 | 6 | 6 | 6 | -1 | 0 | 0 + 2 | 1 | 6 | 5 | 5 | 1 | 1 | 1 + 3 | 1 | 6 | 10 | 10 | 2 | 1 | 1 + 4 | 2 | 6 | 15 | 15 | 3 | 1 | 2 + 5 | 3 | 6 | 16 | 16 | 16 | 1 | 3 + 6 | 4 | 6 | 17 | 17 | 15 | 1 | 4 + 7 | 5 | 6 | 12 | 12 | 13 | 1 | 5 + 8 | 6 | 6 | 11 | 11 | 11 | 1 | 6 + 9 | 6 | 6 | 8 | 8 | 12 | 1 | 6 + 10 | 7 | 6 | 7 | 7 | 10 | 1 | 7 + 11 | 7 | 6 | 9 | 9 | 14 | 1 | 7 + 12 | 8 | 6 | 3 | 3 | 7 | 1 | 8 + 13 | 9 | 6 | 1 | 1 | 6 | 1 | 9 (13 rows) /* -- q2 */ SELECT * FROM pgr_kruskalBFS( 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', ARRAY[9, 6], max_depth => 3); - seq | depth | start_vid | node | edge | cost | agg_cost ------+-------+-----------+------+------+------+---------- - 1 | 0 | 6 | 6 | -1 | 0 | 0 - 2 | 1 | 6 | 5 | 1 | 1 | 1 - 3 | 1 | 6 | 10 | 2 | 1 | 1 - 4 | 2 | 6 | 15 | 3 | 1 | 2 - 5 | 3 | 6 | 16 | 16 | 1 | 3 - 6 | 0 | 9 | 9 | -1 | 0 | 0 - 7 | 1 | 9 | 8 | 14 | 1 | 1 - 8 | 2 | 9 | 7 | 10 | 1 | 2 - 9 | 2 | 9 | 12 | 12 | 1 | 2 - 10 | 3 | 9 | 3 | 7 | 1 | 3 - 11 | 3 | 9 | 11 | 11 | 1 | 3 - 12 | 3 | 9 | 17 | 13 | 1 | 3 + seq | depth | start_vid | pred | node | edge | cost | agg_cost +-----+-------+-----------+------+------+------+------+---------- + 1 | 0 | 6 | 6 | 6 | -1 | 0 | 0 + 2 | 1 | 6 | 5 | 5 | 1 | 1 | 1 + 3 | 1 | 6 | 10 | 10 | 2 | 1 | 1 + 4 | 2 | 6 | 15 | 15 | 3 | 1 | 2 + 5 | 3 | 6 | 16 | 16 | 16 | 1 | 3 + 6 | 0 | 9 | 9 | 9 | -1 | 0 | 0 + 7 | 1 | 9 | 8 | 8 | 14 | 1 | 1 + 8 | 2 | 9 | 7 | 7 | 10 | 1 | 2 + 9 | 2 | 9 | 12 | 12 | 12 | 1 | 2 + 10 | 3 | 9 | 3 | 3 | 7 | 1 | 3 + 11 | 3 | 9 | 11 | 11 | 11 | 1 | 3 + 12 | 3 | 9 | 17 | 17 | 13 | 1 | 3 (12 rows) /* -- q3 */ diff --git a/docqueries/spanningTree/doc-pgr_kruskalDD.result b/docqueries/spanningTree/doc-pgr_kruskalDD.result index eff6fd12b4..98c88fbc76 100644 --- a/docqueries/spanningTree/doc-pgr_kruskalDD.result +++ b/docqueries/spanningTree/doc-pgr_kruskalDD.result @@ -6,33 +6,33 @@ SET SELECT * FROM pgr_kruskalDD( 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', 6, 3.5); - seq | depth | start_vid | node | edge | cost | agg_cost ------+-------+-----------+------+------+------+---------- - 1 | 0 | 6 | 6 | -1 | 0 | 0 - 2 | 1 | 6 | 5 | 1 | 1 | 1 - 3 | 1 | 6 | 10 | 2 | 1 | 1 - 4 | 2 | 6 | 15 | 3 | 1 | 2 - 5 | 3 | 6 | 16 | 16 | 1 | 3 + seq | depth | start_vid | pred | node | edge | cost | agg_cost +-----+-------+-----------+------+------+------+------+---------- + 1 | 0 | 6 | 6 | 6 | -1 | 0 | 0 + 2 | 1 | 6 | 5 | 5 | 1 | 1 | 1 + 3 | 1 | 6 | 10 | 10 | 2 | 1 | 1 + 4 | 2 | 6 | 15 | 15 | 3 | 1 | 2 + 5 | 3 | 6 | 16 | 16 | 16 | 1 | 3 (5 rows) /* -- q2 */ SELECT * FROM pgr_kruskalDD( 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', ARRAY[9, 6], 3.5); - seq | depth | start_vid | node | edge | cost | agg_cost ------+-------+-----------+------+------+------+---------- - 1 | 0 | 6 | 6 | -1 | 0 | 0 - 2 | 1 | 6 | 5 | 1 | 1 | 1 - 3 | 1 | 6 | 10 | 2 | 1 | 1 - 4 | 2 | 6 | 15 | 3 | 1 | 2 - 5 | 3 | 6 | 16 | 16 | 1 | 3 - 6 | 0 | 9 | 9 | -1 | 0 | 0 - 7 | 1 | 9 | 8 | 14 | 1 | 1 - 8 | 2 | 9 | 7 | 10 | 1 | 2 - 9 | 3 | 9 | 3 | 7 | 1 | 3 - 10 | 2 | 9 | 12 | 12 | 1 | 2 - 11 | 3 | 9 | 11 | 11 | 1 | 3 - 12 | 3 | 9 | 17 | 13 | 1 | 3 + seq | depth | start_vid | pred | node | edge | cost | agg_cost +-----+-------+-----------+------+------+------+------+---------- + 1 | 0 | 6 | 6 | 6 | -1 | 0 | 0 + 2 | 1 | 6 | 5 | 5 | 1 | 1 | 1 + 3 | 1 | 6 | 10 | 10 | 2 | 1 | 1 + 4 | 2 | 6 | 15 | 15 | 3 | 1 | 2 + 5 | 3 | 6 | 16 | 16 | 16 | 1 | 3 + 6 | 0 | 9 | 9 | 9 | -1 | 0 | 0 + 7 | 1 | 9 | 8 | 8 | 14 | 1 | 1 + 8 | 2 | 9 | 7 | 7 | 10 | 1 | 2 + 9 | 3 | 9 | 3 | 3 | 7 | 1 | 3 + 10 | 2 | 9 | 12 | 12 | 12 | 1 | 2 + 11 | 3 | 9 | 11 | 11 | 11 | 1 | 3 + 12 | 3 | 9 | 17 | 17 | 13 | 1 | 3 (12 rows) /* -- q3 */ diff --git a/docqueries/spanningTree/doc-pgr_kruskalDFS.result b/docqueries/spanningTree/doc-pgr_kruskalDFS.result index 03d62fac4e..f8e57cef67 100644 --- a/docqueries/spanningTree/doc-pgr_kruskalDFS.result +++ b/docqueries/spanningTree/doc-pgr_kruskalDFS.result @@ -6,41 +6,41 @@ SET SELECT * FROM pgr_kruskalDFS( 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', 6); - seq | depth | start_vid | node | edge | cost | agg_cost ------+-------+-----------+------+------+------+---------- - 1 | 0 | 6 | 6 | -1 | 0 | 0 - 2 | 1 | 6 | 5 | 1 | 1 | 1 - 3 | 1 | 6 | 10 | 2 | 1 | 1 - 4 | 2 | 6 | 15 | 3 | 1 | 2 - 5 | 3 | 6 | 16 | 16 | 1 | 3 - 6 | 4 | 6 | 17 | 15 | 1 | 4 - 7 | 5 | 6 | 12 | 13 | 1 | 5 - 8 | 6 | 6 | 11 | 11 | 1 | 6 - 9 | 6 | 6 | 8 | 12 | 1 | 6 - 10 | 7 | 6 | 7 | 10 | 1 | 7 - 11 | 8 | 6 | 3 | 7 | 1 | 8 - 12 | 9 | 6 | 1 | 6 | 1 | 9 - 13 | 7 | 6 | 9 | 14 | 1 | 7 + seq | depth | start_vid | pred | node | edge | cost | agg_cost +-----+-------+-----------+------+------+------+------+---------- + 1 | 0 | 6 | 6 | 6 | -1 | 0 | 0 + 2 | 1 | 6 | 5 | 5 | 1 | 1 | 1 + 3 | 1 | 6 | 10 | 10 | 2 | 1 | 1 + 4 | 2 | 6 | 15 | 15 | 3 | 1 | 2 + 5 | 3 | 6 | 16 | 16 | 16 | 1 | 3 + 6 | 4 | 6 | 17 | 17 | 15 | 1 | 4 + 7 | 5 | 6 | 12 | 12 | 13 | 1 | 5 + 8 | 6 | 6 | 11 | 11 | 11 | 1 | 6 + 9 | 6 | 6 | 8 | 8 | 12 | 1 | 6 + 10 | 7 | 6 | 7 | 7 | 10 | 1 | 7 + 11 | 8 | 6 | 3 | 3 | 7 | 1 | 8 + 12 | 9 | 6 | 1 | 1 | 6 | 1 | 9 + 13 | 7 | 6 | 9 | 9 | 14 | 1 | 7 (13 rows) /* -- q2 */ SELECT * FROM pgr_kruskalDFS( 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', ARRAY[9, 6], max_depth => 3); - seq | depth | start_vid | node | edge | cost | agg_cost ------+-------+-----------+------+------+------+---------- - 1 | 0 | 6 | 6 | -1 | 0 | 0 - 2 | 1 | 6 | 5 | 1 | 1 | 1 - 3 | 1 | 6 | 10 | 2 | 1 | 1 - 4 | 2 | 6 | 15 | 3 | 1 | 2 - 5 | 3 | 6 | 16 | 16 | 1 | 3 - 6 | 0 | 9 | 9 | -1 | 0 | 0 - 7 | 1 | 9 | 8 | 14 | 1 | 1 - 8 | 2 | 9 | 7 | 10 | 1 | 2 - 9 | 3 | 9 | 3 | 7 | 1 | 3 - 10 | 2 | 9 | 12 | 12 | 1 | 2 - 11 | 3 | 9 | 11 | 11 | 1 | 3 - 12 | 3 | 9 | 17 | 13 | 1 | 3 + seq | depth | start_vid | pred | node | edge | cost | agg_cost +-----+-------+-----------+------+------+------+------+---------- + 1 | 0 | 6 | 6 | 6 | -1 | 0 | 0 + 2 | 1 | 6 | 5 | 5 | 1 | 1 | 1 + 3 | 1 | 6 | 10 | 10 | 2 | 1 | 1 + 4 | 2 | 6 | 15 | 15 | 3 | 1 | 2 + 5 | 3 | 6 | 16 | 16 | 16 | 1 | 3 + 6 | 0 | 9 | 9 | 9 | -1 | 0 | 0 + 7 | 1 | 9 | 8 | 8 | 14 | 1 | 1 + 8 | 2 | 9 | 7 | 7 | 10 | 1 | 2 + 9 | 3 | 9 | 3 | 3 | 7 | 1 | 3 + 10 | 2 | 9 | 12 | 12 | 12 | 1 | 2 + 11 | 3 | 9 | 11 | 11 | 11 | 1 | 3 + 12 | 3 | 9 | 17 | 17 | 13 | 1 | 3 (12 rows) /* -- q3 */ From ecc3ec0b7e9a2665b74e3aef13d3ae5e878244ce Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 13 Jan 2024 11:30:52 -0600 Subject: [PATCH 031/428] [tap][spanningTree] tools for types_check standarizing --- tools/testers/spanningtree.sql | 45 ++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/tools/testers/spanningtree.sql b/tools/testers/spanningtree.sql index 98a068a3c1..b7f0d74bd9 100644 --- a/tools/testers/spanningtree.sql +++ b/tools/testers/spanningtree.sql @@ -31,6 +31,8 @@ BEGIN RETURN QUERY SELECT function_returns(fn, ARRAY['text','bigint','bigint'], 'setof record'); RETURN QUERY SELECT function_returns(fn, ARRAY['text','anyarray','bigint'], 'setof record'); + IF NOT min_version('3.7.0') THEN + RETURN QUERY SELECT set_eq( format($$SELECT proargnames FROM pg_proc WHERE proname = %1$L$$,fn), $$VALUES @@ -46,6 +48,24 @@ BEGIN $$ ); + ELSE + + RETURN QUERY SELECT set_eq( + format($$SELECT proargnames FROM pg_proc WHERE proname = %1$L$$,fn), + $$VALUES + ('{"","","max_depth","seq","depth","start_vid","pred","node","edge","cost","agg_cost"}'::TEXT[]) + $$ + ); + + RETURN QUERY SELECT set_eq( + format($$SELECT proallargtypes FROM pg_proc WHERE proname = %1$L$$, fn), + $$VALUES + ('{25,20,20,20,20,20,20,20,20,701,701}'::OID[]), + ('{25,2277,20,20,20,20,20,20,20,701,701}'::OID[]) + $$ + ); + + END IF; END; $BODY$ LANGUAGE plpgsql VOLATILE; @@ -67,6 +87,8 @@ BEGIN RETURN QUERY SELECT function_returns(fn, ARRAY['text','bigint','double precision'], 'setof record'); RETURN QUERY SELECT function_returns(fn, ARRAY['text','anyarray','double precision'], 'setof record'); + IF NOT min_version('3.7.0') THEN + RETURN QUERY SELECT set_eq( format($$SELECT proargnames FROM pg_proc WHERE proname = %1$L$$,fn), $$VALUES @@ -85,6 +107,29 @@ BEGIN ('{25,2277,701,20,20,20,20,20,701,701}'::OID[]) $$ ); + + ELSE + + RETURN QUERY SELECT set_eq( + format($$SELECT proargnames FROM pg_proc WHERE proname = %1$L$$,fn), + $$VALUES + ('{"","","","seq","depth","start_vid","pred","node","edge","cost","agg_cost"}'::TEXT[]) + $$ + ); + + RETURN QUERY SELECT set_eq( + format($$SELECT proallargtypes FROM pg_proc WHERE proname = %1$L$$, fn), + $$VALUES + ('{25,20,701,20,20,20,20,20,20,701,701}'::OID[]), + ('{25,2277,701,20,20,20,20,20,20,701,701}'::OID[]), + ('{25,20,1700,20,20,20,20,20,20,701,701}'::OID[]), + ('{25,2277,1700,20,20,20,20,20,20,701,701}'::OID[]), + ('{25,20,701,20,20,20,20,20,20,701,701}'::OID[]), + ('{25,2277,701,20,20,20,20,20,20,701,701}'::OID[]) + $$ + ); + + END IF; END; $BODY$ LANGUAGE plpgsql VOLATILE; From 5f028e7ff065aa9f2401885a46db76873ecf27d4 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 13 Jan 2024 11:33:14 -0600 Subject: [PATCH 032/428] [tap][kruskal] Error code based on version --- .../spanningTree/kruskal/kruskalBFS/edge_cases.pg | 14 ++++++-------- .../spanningTree/kruskal/kruskalDD/edge_cases.pg | 12 ++++++------ .../spanningTree/kruskal/kruskalDFS/edge_cases.pg | 15 +++++++-------- 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/pgtap/spanningTree/kruskal/kruskalBFS/edge_cases.pg b/pgtap/spanningTree/kruskal/kruskalBFS/edge_cases.pg index f05993ddf5..e3e842aa23 100644 --- a/pgtap/spanningTree/kruskal/kruskalBFS/edge_cases.pg +++ b/pgtap/spanningTree/kruskal/kruskalBFS/edge_cases.pg @@ -25,7 +25,7 @@ UPDATE edges SET cost = sign(cost) + 0.001 * id * id, reverse_cost = sign(revers -- PREPARE kruskal1 AS -SELECT * FROM pgr_kruskalBFS( +SELECT seq, depth, start_vid, node, edge, cost, agg_cost FROM pgr_kruskalBFS( 'SELECT id, source, target, cost, reverse_cost FROM edges WHERE id > 18 ORDER BY id', 21, 3 @@ -37,7 +37,7 @@ SELECT set_eq('kruskal1', PREPARE kruskal2 AS -SELECT * +SELECT seq, depth, start_vid, node, edge, cost, agg_cost FROM pgr_kruskalBFS( 'SELECT id, source, target, cost FROM edges WHERE id > 18 ORDER BY id', @@ -55,7 +55,7 @@ SELECT set_eq('kruskal2', -- PREPARE kruskal3 AS -SELECT * +SELECT seq, depth, start_vid, node, edge, cost, agg_cost FROM pgr_kruskalBFS( 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', @@ -123,12 +123,10 @@ FROM pgr_kruskalBFS( SELECT throws_ok('kruskal6', - 'P0001', + CASE WHEN min_version('3.7.0') THEN 'XX000' ELSE 'P0001' END, 'Negative value found on ''max_depth''', '6: Negative max_depth throws'); - - PREPARE kruskal7 AS SELECT * FROM pgr_kruskalBFS( @@ -138,13 +136,13 @@ FROM pgr_kruskalBFS( ); SELECT throws_ok('kruskal7', - 'P0001', + CASE WHEN min_version('3.7.0') THEN 'XX000' ELSE 'P0001' END, 'Negative value found on ''max_depth''', '7: Negative max_depth throws'); -- PREPARE kruskal8 AS -SELECT * +SELECT seq, depth, start_vid, node, edge, cost, agg_cost FROM pgr_kruskalBFS( 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', diff --git a/pgtap/spanningTree/kruskal/kruskalDD/edge_cases.pg b/pgtap/spanningTree/kruskal/kruskalDD/edge_cases.pg index 4eab3962de..ea3813fd5d 100644 --- a/pgtap/spanningTree/kruskal/kruskalDD/edge_cases.pg +++ b/pgtap/spanningTree/kruskal/kruskalDD/edge_cases.pg @@ -25,7 +25,7 @@ UPDATE edges SET cost = sign(cost) + 0.001 * id * id, reverse_cost = sign(revers -- PREPARE kruskal1 AS -SELECT * +SELECT seq, depth, start_vid, node, edge, cost, agg_cost FROM pgr_kruskalDD( 'SELECT id, source, target, cost, reverse_cost FROM edges WHERE id > 18 ORDER BY id', @@ -38,7 +38,7 @@ SELECT set_eq('kruskal1', PREPARE kruskal2 AS -SELECT * +SELECT seq, depth, start_vid, node, edge, cost, agg_cost FROM pgr_kruskalDD( 'SELECT id, source, target, cost FROM edges WHERE id > 18 ORDER BY id', @@ -56,7 +56,7 @@ SELECT set_eq('kruskal2', -- PREPARE kruskal3 AS -SELECT * +SELECT seq, depth, start_vid, node, edge, cost, agg_cost FROM pgr_kruskalDD( 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', @@ -126,7 +126,7 @@ FROM pgr_kruskalDD( ); SELECT throws_ok('kruskal6', - 'P0001', + CASE WHEN min_version('3.7.0') THEN 'XX000' ELSE 'P0001' END, 'Negative value found on ''distance''', '6: Negative distance throws'); @@ -141,13 +141,13 @@ FROM pgr_kruskalDD( ); SELECT throws_ok('kruskal7', - 'P0001', + CASE WHEN min_version('3.7.0') THEN 'XX000' ELSE 'P0001' END, 'Negative value found on ''distance''', '7:Negative distance throws'); -- PREPARE kruskal8 AS -SELECT * +SELECT seq, depth, start_vid, node, edge, cost, agg_cost FROM pgr_kruskalDD( 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', diff --git a/pgtap/spanningTree/kruskal/kruskalDFS/edge_cases.pg b/pgtap/spanningTree/kruskal/kruskalDFS/edge_cases.pg index 869d040d27..bc9ea5b367 100644 --- a/pgtap/spanningTree/kruskal/kruskalDFS/edge_cases.pg +++ b/pgtap/spanningTree/kruskal/kruskalDFS/edge_cases.pg @@ -25,7 +25,8 @@ UPDATE edges SET cost = sign(cost) + 0.001 * id * id, reverse_cost = sign(revers -- PREPARE kruskal1 AS -SELECT * FROM pgr_kruskalDFS( +SELECT seq, depth, start_vid, node, edge, cost, agg_cost +FROM pgr_kruskalDFS( 'SELECT id, source, target, cost, reverse_cost FROM edges WHERE id > 18 ORDER BY id', 21, 3 @@ -37,7 +38,7 @@ SELECT set_eq('kruskal1', PREPARE kruskal2 AS -SELECT * +SELECT seq, depth, start_vid, node, edge, cost, agg_cost FROM pgr_kruskalDFS( 'SELECT id, source, target, cost FROM edges WHERE id > 18 ORDER BY id', @@ -55,7 +56,7 @@ SELECT set_eq('kruskal2', -- PREPARE kruskal3 AS -SELECT * +SELECT seq, depth, start_vid, node, edge, cost, agg_cost FROM pgr_kruskalDFS( 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', @@ -126,12 +127,10 @@ FROM pgr_kruskalDFS( SELECT throws_ok('kruskal6', - 'P0001', + CASE WHEN min_version('3.7.0') THEN 'XX000' ELSE 'P0001' END, 'Negative value found on ''max_depth''', '6: Negative max_depth throws'); - - PREPARE kruskal7 AS SELECT * FROM pgr_kruskalDFS( @@ -141,13 +140,13 @@ FROM pgr_kruskalDFS( ); SELECT throws_ok('kruskal7', - 'P0001', + CASE WHEN min_version('3.7.0') THEN 'XX000' ELSE 'P0001' END, 'Negative value found on ''max_depth''', '7: Negative max_depth throws'); -- PREPARE kruskal8 AS -SELECT * +SELECT seq, depth, start_vid, node, edge, cost, agg_cost FROM pgr_kruskalDFS( 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', From dbbaa73545cdd1cc2dae7e3c31298b3f1c721522 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 13 Jan 2024 11:33:32 -0600 Subject: [PATCH 033/428] [tap][prim] Error code based on version --- pgtap/spanningTree/prim/primBFS/edge_cases.pg | 18 ++++++++++-------- pgtap/spanningTree/prim/primDD/edge_cases.pg | 12 ++++++------ pgtap/spanningTree/prim/primDFS/edge_cases.pg | 15 +++++++-------- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/pgtap/spanningTree/prim/primBFS/edge_cases.pg b/pgtap/spanningTree/prim/primBFS/edge_cases.pg index 31db46ffb6..5d2a8956ed 100644 --- a/pgtap/spanningTree/prim/primBFS/edge_cases.pg +++ b/pgtap/spanningTree/prim/primBFS/edge_cases.pg @@ -25,7 +25,8 @@ UPDATE edges SET cost = sign(cost) + 0.001 * id * id, reverse_cost = sign(revers -- PREPARE prim1 AS -SELECT * FROM pgr_primBFS( +SELECT seq, depth, start_vid, node, edge, cost, agg_cost +FROM pgr_primBFS( 'SELECT id, source, target, cost, reverse_cost FROM edges WHERE id > 18 ORDER BY id', 21, 3 @@ -37,7 +38,7 @@ SELECT set_eq('prim1', PREPARE prim2 AS -SELECT * +SELECT seq, depth, start_vid, node, edge, cost, agg_cost FROM pgr_primBFS( 'SELECT id, source, target, cost FROM edges WHERE id > 18 ORDER BY id', @@ -55,7 +56,7 @@ SELECT set_eq('prim2', -- PREPARE prim3 AS -SELECT * +SELECT seq, depth, start_vid, node, edge, cost, agg_cost FROM pgr_primBFS( 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', @@ -123,7 +124,7 @@ FROM pgr_primBFS( SELECT throws_ok('prim6', - 'P0001', + CASE WHEN min_version('3.7.0') THEN 'XX000' ELSE 'P0001' END, 'Negative value found on ''max_depth''', '6: Negative max_depth throws'); @@ -138,13 +139,13 @@ FROM pgr_primBFS( ); SELECT throws_ok('prim7', - 'P0001', + CASE WHEN min_version('3.7.0') THEN 'XX000' ELSE 'P0001' END, 'Negative value found on ''max_depth''', '7: Negative max_depth throws'); -- PREPARE prim8 AS -SELECT * +SELECT seq, depth, start_vid, node, edge, cost, agg_cost FROM pgr_primBFS( 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', @@ -215,7 +216,8 @@ SELECT set_eq('prim10', -- PREPARE prim11 AS -SELECT * FROM pgr_primBFS( +SELECT seq, depth, start_vid, node, edge, cost, agg_cost +FROM pgr_primBFS( 'SELECT id, source, target, cost, reverse_cost FROM edges', 18 ); @@ -234,7 +236,7 @@ SELECT is_empty('prim12', 'No cost can be negative'); -- PREPARE prim13 AS -SELECT * +SELECT seq, depth, start_vid, node, edge, cost, agg_cost FROM pgr_primBFS( 'SELECT id, source, target, cost, reverse_cost FROM edges ', 13 diff --git a/pgtap/spanningTree/prim/primDD/edge_cases.pg b/pgtap/spanningTree/prim/primDD/edge_cases.pg index 332a493c71..e87e2b07cd 100644 --- a/pgtap/spanningTree/prim/primDD/edge_cases.pg +++ b/pgtap/spanningTree/prim/primDD/edge_cases.pg @@ -25,7 +25,7 @@ UPDATE edges SET cost = sign(cost) + 0.001 * id * id, reverse_cost = sign(revers -- PREPARE prim1 AS -SELECT * +SELECT seq, depth, start_vid, node, edge, cost, agg_cost FROM pgr_primDD( 'SELECT id, source, target, cost, reverse_cost FROM edges WHERE id > 18 ORDER BY id', @@ -38,7 +38,7 @@ SELECT set_eq('prim1', PREPARE prim2 AS -SELECT * +SELECT seq, depth, start_vid, node, edge, cost, agg_cost FROM pgr_primDD( 'SELECT id, source, target, cost FROM edges WHERE id > 18 ORDER BY id', @@ -56,7 +56,7 @@ SELECT set_eq('prim2', -- PREPARE prim3 AS -SELECT * +SELECT seq, depth, start_vid, node, edge, cost, agg_cost FROM pgr_primDD( 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', @@ -126,7 +126,7 @@ FROM pgr_primDD( ); SELECT throws_ok('prim6', - 'P0001', + CASE WHEN min_version('3.7.0') THEN 'XX000' ELSE 'P0001' END, 'Negative value found on ''distance''', '6: Negative distance throws'); @@ -141,13 +141,13 @@ FROM pgr_primDD( ); SELECT throws_ok('prim7', - 'P0001', + CASE WHEN min_version('3.7.0') THEN 'XX000' ELSE 'P0001' END, 'Negative value found on ''distance''', '7:Negative distance throws'); -- PREPARE prim8 AS -SELECT * +SELECT seq, depth, start_vid, node, edge, cost, agg_cost FROM pgr_primDD( 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', diff --git a/pgtap/spanningTree/prim/primDFS/edge_cases.pg b/pgtap/spanningTree/prim/primDFS/edge_cases.pg index 2ef97f24e6..029d932f4f 100644 --- a/pgtap/spanningTree/prim/primDFS/edge_cases.pg +++ b/pgtap/spanningTree/prim/primDFS/edge_cases.pg @@ -25,7 +25,8 @@ UPDATE edges SET cost = sign(cost) + 0.001 * id * id, reverse_cost = sign(revers -- PREPARE prim1 AS -SELECT * FROM pgr_primDFS( +SELECT seq, depth, start_vid, node, edge, cost, agg_cost +FROM pgr_primDFS( 'SELECT id, source, target, cost, reverse_cost FROM edges WHERE id > 18 ORDER BY id', 21, 3 @@ -37,7 +38,7 @@ SELECT set_eq('prim1', PREPARE prim2 AS -SELECT * +SELECT seq, depth, start_vid, node, edge, cost, agg_cost FROM pgr_primDFS( 'SELECT id, source, target, cost FROM edges WHERE id > 18 ORDER BY id', @@ -55,7 +56,7 @@ SELECT set_eq('prim2', -- PREPARE prim3 AS -SELECT * +SELECT seq, depth, start_vid, node, edge, cost, agg_cost FROM pgr_primDFS( 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', @@ -126,12 +127,10 @@ FROM pgr_primDFS( SELECT throws_ok('prim6', - 'P0001', + CASE WHEN min_version('3.7.0') THEN 'XX000' ELSE 'P0001' END, 'Negative value found on ''max_depth''', '6: Negative max_depth throws'); - - PREPARE prim7 AS SELECT * FROM pgr_primDFS( @@ -141,13 +140,13 @@ FROM pgr_primDFS( ); SELECT throws_ok('prim7', - 'P0001', + CASE WHEN min_version('3.7.0') THEN 'XX000' ELSE 'P0001' END, 'Negative value found on ''max_depth''', '7: Negative max_depth throws'); -- PREPARE prim8 AS -SELECT * +SELECT seq, depth, start_vid, node, edge, cost, agg_cost FROM pgr_primDFS( 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', From de203c1b08e40d61fc579ffaaa768fb3cce456e1 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 13 Jan 2024 11:42:33 -0600 Subject: [PATCH 034/428] [doc] mst-dd-params -> spantree-params_ --- doc/driving_distance/drivingDistance-category.rst | 4 ++-- doc/driving_distance/pgr_drivingDistance.rst | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/driving_distance/drivingDistance-category.rst b/doc/driving_distance/drivingDistance-category.rst index 08978bef70..440e6820ed 100644 --- a/doc/driving_distance/drivingDistance-category.rst +++ b/doc/driving_distance/drivingDistance-category.rst @@ -61,7 +61,7 @@ Calculate nodes that are within a distance. Parameters ------------------------------------------------------------------------------- -.. mst-dd-params_start +.. spantree-params_start .. list-table:: :width: 81 @@ -91,7 +91,7 @@ Where: :ANY-NUMERIC: ``SMALLINT``, ``INTEGER``, ``BIGINT``, ``REAL``, ``FLOAT`` -.. mst-dd-params_end +.. spantree-params_end Inner Queries ------------------------------------------------------------------------------- diff --git a/doc/driving_distance/pgr_drivingDistance.rst b/doc/driving_distance/pgr_drivingDistance.rst index 003f563ebb..51b5a670a9 100644 --- a/doc/driving_distance/pgr_drivingDistance.rst +++ b/doc/driving_distance/pgr_drivingDistance.rst @@ -108,8 +108,8 @@ Parameters ------------------------------------------------------------------------------- .. include:: drivingDistance-category.rst - :start-after: mst-dd-params_start - :end-before: mst-dd-params_end + :start-after: spantree-params_start + :end-before: spantree-params_end Optional parameters ............................................................................... From 30c0f2e2d4ff8e68238c5c9b39a701758c0f6c77 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 13 Jan 2024 11:40:22 -0600 Subject: [PATCH 035/428] [doc][kruskal] adjusting documentation to new output column --- doc/spanningTree/pgr_kruskalBFS.rst | 29 +++++++++++++++++------------ doc/spanningTree/pgr_kruskalDD.rst | 24 +++++++++++++++--------- doc/spanningTree/pgr_kruskalDFS.rst | 28 +++++++++++++++++----------- 3 files changed, 49 insertions(+), 32 deletions(-) diff --git a/doc/spanningTree/pgr_kruskalBFS.rst b/doc/spanningTree/pgr_kruskalBFS.rst index fc9206e3eb..1fc7b62cbe 100644 --- a/doc/spanningTree/pgr_kruskalBFS.rst +++ b/doc/spanningTree/pgr_kruskalBFS.rst @@ -23,10 +23,15 @@ First Search ordering. .. rubric:: Availability -* Version 3.0.0 +:Version 3.7.0: - * New **Official** function +* Standarizing output columns to |result-spantree| + + * Added ``pred`` result columns. +:Version 3.0.0: + + * New **Official** function Description ------------------------------------------------------------------------------- @@ -52,7 +57,7 @@ Signatures | pgr_kruskalBFS(`Edges SQL`_, **root vid**, [``max_depth``]) | pgr_kruskalBFS(`Edges SQL`_, **root vids**, [``max_depth``]) - | Returns set of |result-bfs| + | Returns set of |result-spantree| .. index:: single: kruskalBFS(Single vertex) @@ -65,7 +70,7 @@ Single vertex | pgr_kruskalBFS(`Edges SQL`_, **root vid**, [``max_depth``]) - | Returns set of |result-bfs| + | Returns set of |result-spantree| :Example: The Minimum Spanning Tree having as root vertex :math:`6` @@ -84,7 +89,7 @@ Multiple vertices | pgr_kruskalBFS(`Edges SQL`_, **root vids**, [``max_depth``]) - | Returns set of |result-bfs| + | Returns set of |result-spantree| :Example: The Minimum Spanning Tree starting on vertices :math:`\{9, 6\}` with :math:`depth \leq 3` @@ -96,9 +101,9 @@ Multiple vertices Parameters ------------------------------------------------------------------------------- -.. include:: BFS-category.rst - :start-after: mst-bfs-dfs-params_start - :end-before: mst-bfs-dfs-params_end +.. include:: drivingDistance-category.rst + :start-after: spantree-params_start + :end-before: spantree-params_end BFS optional parameters ............................................................................... @@ -111,7 +116,7 @@ Inner Queries ------------------------------------------------------------------------------- Edges SQL -............................................................................... +.............................................................................. .. include:: pgRouting-concepts.rst :start-after: basic_edges_sql_start @@ -120,9 +125,9 @@ Edges SQL Result columns ------------------------------------------------------------------------------- -.. include:: BFS-category.rst - :start-after: mst-bfs-dfs-dd-result-columns-start - :end-before: mst-bfs-dfs-dd-result-columns-end +.. include:: drivingDistance-category.rst + :start-after: spantree-result-columns-start + :end-before: spantree-result-columns-end See Also ------------------------------------------------------------------------------- diff --git a/doc/spanningTree/pgr_kruskalDD.rst b/doc/spanningTree/pgr_kruskalDD.rst index 111f1f3e08..96488a3a83 100644 --- a/doc/spanningTree/pgr_kruskalDD.rst +++ b/doc/spanningTree/pgr_kruskalDD.rst @@ -22,7 +22,13 @@ .. rubric:: Availability -* Version 3.0.0 +:Version 3.7.0: + +* Standarizing output columns to |result-spantree| + + * Added ``pred`` result columns. + +:Version 3.0.0: * New **Official** function @@ -55,7 +61,7 @@ Signatures | pgr_kruskalDD(`Edges SQL`_, **root vid**, **distance**) | pgr_kruskalDD(`Edges SQL`_, **root vids**, **distance**) - | Returns set of |result-bfs| + | Returns set of |result-spantree| .. index:: single: kruskalDD(Single vertex) @@ -68,7 +74,7 @@ Single vertex | pgr_kruskalDD(`Edges SQL`_, **root vid**, **distance**) - | Returns set of |result-bfs| + | Returns set of |result-spantree| :Example: The Minimum Spanning Tree starting on vertex :math:`6` with :math:`distance \leq 3.5` @@ -88,7 +94,7 @@ Multiple vertices | pgr_kruskalDD(`Edges SQL`_, **root vids**, **distance**) - | Returns set of |result-bfs| + | Returns set of |result-spantree| :Example: The Minimum Spanning Tree starting on vertices :math:`\{9, 6\}` with :math:`distance \leq 3.5` @@ -101,8 +107,8 @@ Parameters ------------------------------------------------------------------------------- .. include:: drivingDistance-category.rst - :start-after: mst-dd-params_start - :end-before: mst-dd-params_end + :start-after: spantree-params_start + :end-before: spantree-params_end Inner Queries ------------------------------------------------------------------------------- @@ -117,9 +123,9 @@ Edges SQL Result columns ------------------------------------------------------------------------------- -.. include:: BFS-category.rst - :start-after: mst-bfs-dfs-dd-result-columns-start - :end-before: mst-bfs-dfs-dd-result-columns-end +.. include:: drivingDistance-category.rst + :start-after: spantree-result-columns-start + :end-before: spantree-result-columns-end See Also ------------------------------------------------------------------------------- diff --git a/doc/spanningTree/pgr_kruskalDFS.rst b/doc/spanningTree/pgr_kruskalDFS.rst index 1093d1f8a8..1e009046b7 100644 --- a/doc/spanningTree/pgr_kruskalDFS.rst +++ b/doc/spanningTree/pgr_kruskalDFS.rst @@ -23,7 +23,13 @@ First Search ordering. .. rubric:: Availability -* Version 3.0.0 +:Version 3.7.0: + +* Standarizing output columns to |result-spantree| + + * Added ``pred`` result columns. + +:Version 3.0.0: * New **Official** function @@ -52,7 +58,7 @@ Signatures | pgr_kruskalDFS(`Edges SQL`_, **root vid**, [``max_depth``]) | pgr_kruskalDFS(`Edges SQL`_, **root vids**, [``max_depth``]) - | Returns set of |result-bfs| + | Returns set of |result-spantree| .. index:: single: kruskalDFS(Single vertex) @@ -65,7 +71,7 @@ Single vertex | pgr_kruskalDFS(`Edges SQL`_, **root vid**, [``max_depth``]) - | Returns set of |result-bfs| + | Returns set of |result-spantree| :Example: The Minimum Spanning Tree having as root vertex :math:`6` @@ -84,7 +90,7 @@ Multiple vertices | pgr_kruskalDFS(`Edges SQL`_, **root vids**, [``max_depth``]) - | Returns set of |result-bfs| + | Returns set of |result-spantree| :Example: The Minimum Spanning Tree starting on vertices :math:`\{9, 6\}` with :math:`depth \leq 3` @@ -96,9 +102,9 @@ Multiple vertices Parameters ------------------------------------------------------------------------------- -.. include:: BFS-category.rst - :start-after: mst-bfs-dfs-params_start - :end-before: mst-bfs-dfs-params_end +.. include:: drivingDistance-category.rst + :start-after: spantree-params_start + :end-before: spantree-params_end DFS optional parameters ............................................................................... @@ -111,7 +117,7 @@ Inner Queries ------------------------------------------------------------------------------- Edges SQL -............................................................................... +.............................................................................. .. include:: pgRouting-concepts.rst :start-after: basic_edges_sql_start @@ -120,9 +126,9 @@ Edges SQL Result columns ------------------------------------------------------------------------------- -.. include:: BFS-category.rst - :start-after: mst-bfs-dfs-dd-result-columns-start - :end-before: mst-bfs-dfs-dd-result-columns-end +.. include:: drivingDistance-category.rst + :start-after: spantree-result-columns-start + :end-before: spantree-result-columns-end See Also ------------------------------------------------------------------------------- From 116479d4dde3ea3249e20e1c905da417689fa0cc Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 13 Jan 2024 11:40:46 -0600 Subject: [PATCH 036/428] [doc][prim] adjusting documentation to new output column --- doc/spanningTree/pgr_primBFS.rst | 37 ++++++++++++++++++-------------- doc/spanningTree/pgr_primDD.rst | 29 ++++++++++++++----------- doc/spanningTree/pgr_primDFS.rst | 29 ++++++++++++++----------- 3 files changed, 55 insertions(+), 40 deletions(-) diff --git a/doc/spanningTree/pgr_primBFS.rst b/doc/spanningTree/pgr_primBFS.rst index 2557238a61..fd28b0fbd6 100644 --- a/doc/spanningTree/pgr_primBFS.rst +++ b/doc/spanningTree/pgr_primBFS.rst @@ -23,16 +23,21 @@ Search ordering. .. rubric:: Availability -* Version 3.0.0 +:Version 3.7.0: - * New **Official** function +* Standarizing output columns to |result-spantree| + + * Added ``pred`` result columns. +:Version 3.0.0: + + * New **Official** function Description ------------------------------------------------------------------------------- Visits and extracts the nodes information in Breath First Search ordering -of the Minimum Spanning Tree created with Prims's algorithm. +of the Minimum Spanning Tree created using Prims's algorithm. **The main Characteristics are:** @@ -52,7 +57,7 @@ Signatures | pgr_primBFS(`Edges SQL`_, **root vid**, [``max_depth``]) | pgr_primBFS(`Edges SQL`_, **root vids**, [``max_depth``]) - | Returns set of |result-bfs| + | Returns set of |result-spantree| .. index:: single: primBFS(Single vertex) @@ -65,7 +70,7 @@ Single vertex | pgr_primBFS(`Edges SQL`_, **root vid**, [``max_depth``]) - | Returns set of |result-bfs| + | Returns set of |result-spantree| :Example: The Minimum Spanning Tree having as root vertex :math:`6` @@ -84,7 +89,7 @@ Multiple vertices | pgr_primBFS(`Edges SQL`_, **root vids**, [``max_depth``]) - | Returns set of |result-bfs| + | Returns set of |result-spantree| :Example: The Minimum Spanning Tree starting on vertices :math:`\{9, 6\}` with :math:`depth \leq 3` @@ -96,9 +101,9 @@ Multiple vertices Parameters ------------------------------------------------------------------------------- -.. include:: BFS-category.rst - :start-after: mst-bfs-dfs-params_start - :end-before: mst-bfs-dfs-params_end +.. include:: drivingDistance-category.rst + :start-after: spantree-params_start + :end-before: spantree-params_end BFS optional parameters ............................................................................... @@ -111,25 +116,25 @@ Inner Queries ------------------------------------------------------------------------------- Edges SQL -............................................................................... +.............................................................................. .. include:: pgRouting-concepts.rst - :start-after: basic_edges_sql_start - :end-before: basic_edges_sql_end + :start-after: basic_edges_sql_start + :end-before: basic_edges_sql_end Result columns ------------------------------------------------------------------------------- -.. include:: BFS-category.rst - :start-after: mst-bfs-dfs-dd-result-columns-start - :end-before: mst-bfs-dfs-dd-result-columns-end +.. include:: drivingDistance-category.rst + :start-after: spantree-result-columns-start + :end-before: spantree-result-columns-end See Also ------------------------------------------------------------------------------- * :doc:`spanningTree-family` * :doc:`prim-family` -* The queries use the :doc:`sampledata` network. +* :doc:`sampledata` * `Boost: Prim's algorithm documentation `__ * `Wikipedia: Prim's algorithm diff --git a/doc/spanningTree/pgr_primDD.rst b/doc/spanningTree/pgr_primDD.rst index 2f05af5fa1..4f8cc6be6e 100644 --- a/doc/spanningTree/pgr_primDD.rst +++ b/doc/spanningTree/pgr_primDD.rst @@ -22,15 +22,21 @@ .. rubric:: Availability -* Version 3.0.0 +.. rubric:: Version 3.7.0 - * New **Official** function +* Standarizing output columns to |result-spantree| + + * Added ``pred`` result columns. + +.. rubric:: Version 3.0.0 + +* New **Official** function Description ------------------------------------------------------------------------------- Using Prim's algorithm, extracts the nodes that have aggregate costs less than -or equal to a **distance** from a **root** vertex (or vertices) within the +or equal to a distance from a root vertex (or vertices) within the calculated minimum spanning tree. **The main Characteristics are:** @@ -55,7 +61,7 @@ Signatures | pgr_primDD(`Edges SQL`_, **root vid**, **distance**) | pgr_primDD(`Edges SQL`_, **root vids**, **distance**) - | Returns set of |result-bfs| + | Returns set of |result-spantree| .. index:: single: primDD(Single vertex) @@ -68,7 +74,7 @@ Single vertex | pgr_primDD(`Edges SQL`_, **root vid**, **distance**) - | Returns set of |result-bfs| + | Returns set of |result-spantree| :Example: The Minimum Spanning Tree starting on vertex :math:`6` with :math:`distance \leq 3.5` @@ -88,7 +94,7 @@ Multiple vertices | pgr_primDD(`Edges SQL`_, **root vids**, **distance**) - | Returns set of |result-bfs| + | Returns set of |result-spantree| :Example: The Minimum Spanning Tree starting on vertices :math:`\{9, 6\}` with :math:`distance \leq 3.5` @@ -101,8 +107,8 @@ Parameters ------------------------------------------------------------------------------- .. include:: drivingDistance-category.rst - :start-after: mst-dd-params_start - :end-before: mst-dd-params_end + :start-after: spantree-params_start + :end-before: spantree-params_end Inner Queries ------------------------------------------------------------------------------- @@ -117,9 +123,9 @@ Edges SQL Result columns ------------------------------------------------------------------------------- -.. include:: BFS-category.rst - :start-after: mst-bfs-dfs-dd-result-columns-start - :end-before: mst-bfs-dfs-dd-result-columns-end +.. include:: drivingDistance-category.rst + :start-after: spantree-result-columns-start + :end-before: spantree-result-columns-end See Also ------------------------------------------------------------------------------- @@ -136,4 +142,3 @@ See Also * :ref:`genindex` * :ref:`search` - diff --git a/doc/spanningTree/pgr_primDFS.rst b/doc/spanningTree/pgr_primDFS.rst index c2620719f6..09c00570fa 100644 --- a/doc/spanningTree/pgr_primDFS.rst +++ b/doc/spanningTree/pgr_primDFS.rst @@ -23,10 +23,15 @@ Search ordering. .. rubric:: Availability -* Version 3.0.0 +:Version 3.7.0: - * New **Official** function +* Standarizing output columns to |result-spantree| + + * Added ``pred`` result columns. +:Version 3.0.0: + + * New **Official** function Description ------------------------------------------------------------------------------- @@ -52,7 +57,7 @@ Signatures | pgr_primDFS(`Edges SQL`_, **root vid**, [``max_depth``]) | pgr_primDFS(`Edges SQL`_, **root vids**, [``max_depth``]) - | Returns set of |result-bfs| + | Returns set of |result-spantree| .. index:: single: primDFS(Single vertex) @@ -65,7 +70,7 @@ Single vertex | pgr_primDFS(`Edges SQL`_, **root vid**, [``max_depth``]) - | Returns set of |result-bfs| + | Returns set of |result-spantree| :Example: The Minimum Spanning Tree having as root vertex :math:`6` @@ -84,7 +89,7 @@ Multiple vertices | pgr_primDFS(`Edges SQL`_, **root vids**, [``max_depth``]) - | Returns set of |result-bfs| + | Returns set of |result-spantree| :Example: The Minimum Spanning Tree starting on vertices :math:`\{9, 6\}` with :math:`depth \leq 3` @@ -96,9 +101,9 @@ Multiple vertices Parameters ------------------------------------------------------------------------------- -.. include:: BFS-category.rst - :start-after: mst-bfs-dfs-params_start - :end-before: mst-bfs-dfs-params_end +.. include:: drivingDistance-category.rst + :start-after: spantree-params_start + :end-before: spantree-params_end DFS optional parameters ............................................................................... @@ -111,7 +116,7 @@ Inner Queries ------------------------------------------------------------------------------- Edges SQL -............................................................................... +.............................................................................. .. include:: pgRouting-concepts.rst :start-after: basic_edges_sql_start @@ -120,9 +125,9 @@ Edges SQL Result columns ------------------------------------------------------------------------------- -.. include:: BFS-category.rst - :start-after: mst-bfs-dfs-dd-result-columns-start - :end-before: mst-bfs-dfs-dd-result-columns-end +.. include:: drivingDistance-category.rst + :start-after: spantree-result-columns-start + :end-before: spantree-result-columns-end See Also ------------------------------------------------------------------------------- From 5367d771da2654cb38a86a044db30223809dc074 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 13 Jan 2024 12:21:42 -0600 Subject: [PATCH 037/428] [doc] Adding release notes & NEWS --- NEWS.md | 21 +++++++++++++++++++++ doc/src/release_notes.rst | 19 +++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/NEWS.md b/NEWS.md index 4ba6b37779..9204caf24d 100644 --- a/NEWS.md +++ b/NEWS.md @@ -9,6 +9,27 @@ To see all issues & pull requests closed by this release see the [Git closed milestone for 3.7.0 ](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.7.0%22) +**Official functions changes** + +* [#2605](https://github.com/pgRouting/pgrouting/pull/2605) Standarize + spanning tree functions output + + * Functions: + + * ``pgr_kruskalDD`` + * ``pgr_kruskalDFS`` + * ``pgr_kruskalBFS`` + * ``pgr_primDD`` + * ``pgr_primDFS`` + * ``pgr_primBFS`` + + + * Standarizing output columns to ``(seq, depth, start_vid, pred, node, edge, cost, agg_cost)`` + + * Added ``pred`` result columns. + + + **Code enhancement** * [#2599](https://github.com/pgRouting/pgrouting/pull/2599) Driving distance diff --git a/doc/src/release_notes.rst b/doc/src/release_notes.rst index cc7ec1cfa7..b6ff2e9678 100644 --- a/doc/src/release_notes.rst +++ b/doc/src/release_notes.rst @@ -37,6 +37,25 @@ To see all issues & pull requests closed by this release see the `Git closed milestone for 3.7.0 `__ +.. rubric:: Official functions changes + +* `#2605 `__ Standarize + spanning tree functions output + + * Functions: + + * ``pgr_kruskalDD`` + * ``pgr_kruskalDFS`` + * ``pgr_kruskalBFS`` + * ``pgr_primDD`` + * ``pgr_primDFS`` + * ``pgr_primBFS`` + + .. include:: pgr_primDD.rst + :start-after: Version 3.7.0 + :end-before: .. rubric + + .. rubric:: Code enhancement * `#2599 `__ Driving distance From e8b272dc89661b21284e1bde9c831a22dbe5f091 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 13 Jan 2024 13:10:00 -0600 Subject: [PATCH 038/428] [kruskal][doc] adding migration guide --- doc/src/migration.rst | 83 +++++++++++++++++++++++++++++++ docqueries/src/migration.result | 69 +++++++++++++++++++++++++ docqueries/src/migration.test.sql | 20 ++++++++ 3 files changed, 172 insertions(+) diff --git a/doc/src/migration.rst b/doc/src/migration.rst index f9eb524fb8..36b5f6226c 100644 --- a/doc/src/migration.rst +++ b/doc/src/migration.rst @@ -307,6 +307,89 @@ columns: :start-after: --drivingdistance4 :end-before: --drivingdistance5 +Migration of ``pgr_kruskalDD`` / ``pgr_kruskalBFS`` / ``pgr_kruskalDFS`` +------------------------------------------------------------------------------- + +Starting from `v3.7.0 `__ +:doc:`pgr_kruskalDD`, :doc:`pgr_kruskalBFS` and +:doc:`pgr_kruskalDFS` result columns are being standarized. + +:from: |result-bfs| +:to: |result-spantree| + +* ``pgr_kruskalDD`` + + * Single vertex + * Multiple vertices + +* ``pgr_kruskalDFS`` + + * Single vertex + * Multiple vertices + +* ``pgr_kruskalBFS`` + + * Single vertex + * Multiple vertices + + +:Before Migration: + +Output columns were |result-bfs| + +* Single vertex and Multiple vertices + + * Do not have ``pred`` result column. + +:Migration: + +* Be aware of the existance of `pred` result columns. +* If needed filter out the added columns + +Kruskal single vertex +............................................................................... + +Using ``pgr_KruskalDD`` as example. +Migration is similar to al the affected functions. + +Comparing with `this +`__ example. + +Now column ``pred`` exists and contains the predecessor of the ``node``. + +.. literalinclude:: migration.queries + :start-after: --kruskalDD1 + :end-before: --kruskalDD2 + +If needed filter out the added columns, for example, to return the original +columns + +.. literalinclude:: migration.queries + :start-after: --kruskalDD2 + :end-before: --kruskalDD3 + +Kruskal multiple vertices +............................................................................... + +Using ``pgr_KruskalDD`` as example. +Migration is similar to al the affected functions. + +Comparing with `this +`__ +example. + +Now column ``pred`` exists and contains the predecessor of the ``node``. + +.. literalinclude:: migration.queries + :start-after: --kruskalDD3 + :end-before: --kruskalDD4 + +If needed filter out the added columns, for example, to return the original +columns + +.. literalinclude:: migration.queries + :start-after: --kruskalDD4 + :end-before: --kruskalDD5 Migration of ``pgr_KSP`` ------------------------------------------------------------------------------- diff --git a/docqueries/src/migration.result b/docqueries/src/migration.result index c88792e5fb..d530b3fd84 100644 --- a/docqueries/src/migration.result +++ b/docqueries/src/migration.result @@ -1079,5 +1079,74 @@ FROM pgr_drivingDistance( (13 rows) /* --drivingdistance5 */ +/* --kruskalDD1 */ +SELECT * FROM pgr_kruskalDD( + 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', + 6, 3.5); + seq | depth | start_vid | pred | node | edge | cost | agg_cost +-----+-------+-----------+------+------+------+------+---------- + 1 | 0 | 6 | 6 | 6 | -1 | 0 | 0 + 2 | 1 | 6 | 5 | 5 | 1 | 1 | 1 + 3 | 1 | 6 | 10 | 10 | 2 | 1 | 1 + 4 | 2 | 6 | 15 | 15 | 3 | 1 | 2 + 5 | 3 | 6 | 16 | 16 | 16 | 1 | 3 +(5 rows) + +/* --kruskalDD2 */ +SELECT seq, depth, start_vid, node, edge, cost, agg_cost +FROM pgr_kruskalDD( + 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', + 6, 3.5); + seq | depth | start_vid | node | edge | cost | agg_cost +-----+-------+-----------+------+------+------+---------- + 1 | 0 | 6 | 6 | -1 | 0 | 0 + 2 | 1 | 6 | 5 | 1 | 1 | 1 + 3 | 1 | 6 | 10 | 2 | 1 | 1 + 4 | 2 | 6 | 15 | 3 | 1 | 2 + 5 | 3 | 6 | 16 | 16 | 1 | 3 +(5 rows) + +/* --kruskalDD3 */ +SELECT * FROM pgr_kruskalDD( + 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', + ARRAY[9, 6], 3.5); + seq | depth | start_vid | pred | node | edge | cost | agg_cost +-----+-------+-----------+------+------+------+------+---------- + 1 | 0 | 6 | 6 | 6 | -1 | 0 | 0 + 2 | 1 | 6 | 5 | 5 | 1 | 1 | 1 + 3 | 1 | 6 | 10 | 10 | 2 | 1 | 1 + 4 | 2 | 6 | 15 | 15 | 3 | 1 | 2 + 5 | 3 | 6 | 16 | 16 | 16 | 1 | 3 + 6 | 0 | 9 | 9 | 9 | -1 | 0 | 0 + 7 | 1 | 9 | 8 | 8 | 14 | 1 | 1 + 8 | 2 | 9 | 7 | 7 | 10 | 1 | 2 + 9 | 3 | 9 | 3 | 3 | 7 | 1 | 3 + 10 | 2 | 9 | 12 | 12 | 12 | 1 | 2 + 11 | 3 | 9 | 11 | 11 | 11 | 1 | 3 + 12 | 3 | 9 | 17 | 17 | 13 | 1 | 3 +(12 rows) + +/* --kruskalDD4 */ +SELECT seq, depth, start_vid, node, edge, cost, agg_cost +FROM pgr_kruskalDD( + 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', + ARRAY[9, 6], 3.5); + seq | depth | start_vid | node | edge | cost | agg_cost +-----+-------+-----------+------+------+------+---------- + 1 | 0 | 6 | 6 | -1 | 0 | 0 + 2 | 1 | 6 | 5 | 1 | 1 | 1 + 3 | 1 | 6 | 10 | 2 | 1 | 1 + 4 | 2 | 6 | 15 | 3 | 1 | 2 + 5 | 3 | 6 | 16 | 16 | 1 | 3 + 6 | 0 | 9 | 9 | -1 | 0 | 0 + 7 | 1 | 9 | 8 | 14 | 1 | 1 + 8 | 2 | 9 | 7 | 10 | 1 | 2 + 9 | 3 | 9 | 3 | 7 | 1 | 3 + 10 | 2 | 9 | 12 | 12 | 1 | 2 + 11 | 3 | 9 | 11 | 11 | 1 | 3 + 12 | 3 | 9 | 17 | 13 | 1 | 3 +(12 rows) + +/* --kruskalDD5 */ ROLLBACK; ROLLBACK diff --git a/docqueries/src/migration.test.sql b/docqueries/src/migration.test.sql index cea07bd769..cb2baaa5e5 100644 --- a/docqueries/src/migration.test.sql +++ b/docqueries/src/migration.test.sql @@ -338,3 +338,23 @@ FROM pgr_drivingDistance( ARRAY[11, 16], 3.0, equicost => true); /* --drivingdistance5 */ + +/* --kruskalDD1 */ +SELECT * FROM pgr_kruskalDD( + 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', + 6, 3.5); +/* --kruskalDD2 */ +SELECT seq, depth, start_vid, node, edge, cost, agg_cost +FROM pgr_kruskalDD( + 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', + 6, 3.5); +/* --kruskalDD3 */ +SELECT * FROM pgr_kruskalDD( + 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', + ARRAY[9, 6], 3.5); +/* --kruskalDD4 */ +SELECT seq, depth, start_vid, node, edge, cost, agg_cost +FROM pgr_kruskalDD( + 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', + ARRAY[9, 6], 3.5); +/* --kruskalDD5 */ From 6c2c986b5d0ee695cc4dbdc278dc316f87874e7f Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 13 Jan 2024 13:19:59 -0600 Subject: [PATCH 039/428] [prim][doc] adding migration guide --- doc/src/migration.rst | 84 ++++++++++++++++++++++++++++ docqueries/src/migration.result | 93 +++++++++++++++++++++++++++++++ docqueries/src/migration.test.sql | 21 ++++++- 3 files changed, 197 insertions(+), 1 deletion(-) diff --git a/doc/src/migration.rst b/doc/src/migration.rst index 36b5f6226c..cd1ad9efb9 100644 --- a/doc/src/migration.rst +++ b/doc/src/migration.rst @@ -489,6 +489,90 @@ Migration is needed, because: :start-after: --maxcard2 :end-before: --maxcard3 +Migration of ``pgr_primDD`` / ``pgr_primBFS`` / ``pgr_primDFS`` +------------------------------------------------------------------------------- + +Starting from `v3.7.0 `__ +:doc:`pgr_primDD`, :doc:`pgr_primBFS` and :doc:`pgr_primDFS` result columns are +being standarized. + +:from: |result-bfs| +:to: |result-spantree| + +* ``pgr_primDD`` + + * Single vertex + * Multiple vertices + +* ``pgr_primDFS`` + + * Single vertex + * Multiple vertices + +* ``pgr_primBFS`` + + * Single vertex + * Multiple vertices + + +:Before Migration: + +Output columns were |result-bfs| + +* Single vertex and Multiple vertices + + * Do not have ``pred`` result column. + +:Migration: + +* Be aware of the existance of `pred` result columns. +* If needed filter out the added columns + +Prim single vertex +............................................................................... + +Using ``pgr_primDD`` as example. +Migration is similar to al the affected functions. + +Comparing with `this +`__ example. + +Now column ``pred`` exists and contains the predecessor of the ``node``. + +.. literalinclude:: migration.queries + :start-after: --primDD1 + :end-before: --primDD2 + +If needed filter out the added columns, for example, to return the original +columns + +.. literalinclude:: migration.queries + :start-after: --primDD2 + :end-before: --primDD3 + +Prim multiple vertices +............................................................................... + +Using ``pgr_primDD`` as example. +Migration is similar to al the affected functions. + +Comparing with `this +`__ +example. + +Now column ``pred`` exists and contains the predecessor of the ``node``. + +.. literalinclude:: migration.queries + :start-after: --primDD3 + :end-before: --primDD4 + +If needed filter out the added columns, for example, to return the original +columns + +.. literalinclude:: migration.queries + :start-after: --primDD4 + :end-before: --primDD5 + Migration of ``pgr_withPointsDD`` ------------------------------------------------------------------------------- diff --git a/docqueries/src/migration.result b/docqueries/src/migration.result index d530b3fd84..1f3999ba84 100644 --- a/docqueries/src/migration.result +++ b/docqueries/src/migration.result @@ -1148,5 +1148,98 @@ FROM pgr_kruskalDD( (12 rows) /* --kruskalDD5 */ +/* --primDD1 */ +SELECT * FROM pgr_primDD( + 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', + 6, 3.5); + seq | depth | start_vid | pred | node | edge | cost | agg_cost +-----+-------+-----------+------+------+------+------+---------- + 1 | 0 | 6 | 6 | 6 | -1 | 0 | 0 + 2 | 1 | 6 | 6 | 5 | 1 | 1 | 1 + 3 | 1 | 6 | 6 | 10 | 2 | 1 | 1 + 4 | 2 | 6 | 10 | 15 | 3 | 1 | 2 + 5 | 2 | 6 | 10 | 11 | 5 | 1 | 2 + 6 | 3 | 6 | 11 | 16 | 9 | 1 | 3 + 7 | 3 | 6 | 11 | 12 | 11 | 1 | 3 + 8 | 1 | 6 | 6 | 7 | 4 | 1 | 1 + 9 | 2 | 6 | 7 | 3 | 7 | 1 | 2 + 10 | 3 | 6 | 3 | 1 | 6 | 1 | 3 + 11 | 2 | 6 | 7 | 8 | 10 | 1 | 2 + 12 | 3 | 6 | 8 | 9 | 14 | 1 | 3 +(12 rows) + +/* --primDD2 */ +SELECT seq, depth, start_vid, node, edge, cost, agg_cost +FROM pgr_primDD( + 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', + 6, 3.5); + seq | depth | start_vid | node | edge | cost | agg_cost +-----+-------+-----------+------+------+------+---------- + 1 | 0 | 6 | 6 | -1 | 0 | 0 + 2 | 1 | 6 | 5 | 1 | 1 | 1 + 3 | 1 | 6 | 10 | 2 | 1 | 1 + 4 | 2 | 6 | 15 | 3 | 1 | 2 + 5 | 2 | 6 | 11 | 5 | 1 | 2 + 6 | 3 | 6 | 16 | 9 | 1 | 3 + 7 | 3 | 6 | 12 | 11 | 1 | 3 + 8 | 1 | 6 | 7 | 4 | 1 | 1 + 9 | 2 | 6 | 3 | 7 | 1 | 2 + 10 | 3 | 6 | 1 | 6 | 1 | 3 + 11 | 2 | 6 | 8 | 10 | 1 | 2 + 12 | 3 | 6 | 9 | 14 | 1 | 3 +(12 rows) + +/* --primDD3 */ +SELECT * FROM pgr_primDD( + 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', + ARRAY[9, 6], 3.5); + seq | depth | start_vid | pred | node | edge | cost | agg_cost +-----+-------+-----------+------+------+------+------+---------- + 1 | 0 | 6 | 6 | 6 | -1 | 0 | 0 + 2 | 1 | 6 | 6 | 5 | 1 | 1 | 1 + 3 | 1 | 6 | 6 | 10 | 2 | 1 | 1 + 4 | 2 | 6 | 10 | 15 | 3 | 1 | 2 + 5 | 2 | 6 | 10 | 11 | 5 | 1 | 2 + 6 | 3 | 6 | 11 | 16 | 9 | 1 | 3 + 7 | 3 | 6 | 11 | 12 | 11 | 1 | 3 + 8 | 1 | 6 | 6 | 7 | 4 | 1 | 1 + 9 | 2 | 6 | 7 | 3 | 7 | 1 | 2 + 10 | 3 | 6 | 3 | 1 | 6 | 1 | 3 + 11 | 2 | 6 | 7 | 8 | 10 | 1 | 2 + 12 | 3 | 6 | 8 | 9 | 14 | 1 | 3 + 13 | 0 | 9 | 9 | 9 | -1 | 0 | 0 + 14 | 1 | 9 | 9 | 8 | 14 | 1 | 1 + 15 | 2 | 9 | 8 | 7 | 10 | 1 | 2 + 16 | 3 | 9 | 7 | 6 | 4 | 1 | 3 + 17 | 3 | 9 | 7 | 3 | 7 | 1 | 3 +(17 rows) + +/* --primDD4 */ +SELECT seq, depth, start_vid, node, edge, cost, agg_cost +FROM pgr_primDD( + 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', + ARRAY[9, 6], 3.5); + seq | depth | start_vid | node | edge | cost | agg_cost +-----+-------+-----------+------+------+------+---------- + 1 | 0 | 6 | 6 | -1 | 0 | 0 + 2 | 1 | 6 | 5 | 1 | 1 | 1 + 3 | 1 | 6 | 10 | 2 | 1 | 1 + 4 | 2 | 6 | 15 | 3 | 1 | 2 + 5 | 2 | 6 | 11 | 5 | 1 | 2 + 6 | 3 | 6 | 16 | 9 | 1 | 3 + 7 | 3 | 6 | 12 | 11 | 1 | 3 + 8 | 1 | 6 | 7 | 4 | 1 | 1 + 9 | 2 | 6 | 3 | 7 | 1 | 2 + 10 | 3 | 6 | 1 | 6 | 1 | 3 + 11 | 2 | 6 | 8 | 10 | 1 | 2 + 12 | 3 | 6 | 9 | 14 | 1 | 3 + 13 | 0 | 9 | 9 | -1 | 0 | 0 + 14 | 1 | 9 | 8 | 14 | 1 | 1 + 15 | 2 | 9 | 7 | 10 | 1 | 2 + 16 | 3 | 9 | 6 | 4 | 1 | 3 + 17 | 3 | 9 | 3 | 7 | 1 | 3 +(17 rows) + +/* --primDD5 */ ROLLBACK; ROLLBACK diff --git a/docqueries/src/migration.test.sql b/docqueries/src/migration.test.sql index cb2baaa5e5..d332ab6d9c 100644 --- a/docqueries/src/migration.test.sql +++ b/docqueries/src/migration.test.sql @@ -338,7 +338,6 @@ FROM pgr_drivingDistance( ARRAY[11, 16], 3.0, equicost => true); /* --drivingdistance5 */ - /* --kruskalDD1 */ SELECT * FROM pgr_kruskalDD( 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', @@ -358,3 +357,23 @@ FROM pgr_kruskalDD( 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', ARRAY[9, 6], 3.5); /* --kruskalDD5 */ + +/* --primDD1 */ +SELECT * FROM pgr_primDD( + 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', + 6, 3.5); +/* --primDD2 */ +SELECT seq, depth, start_vid, node, edge, cost, agg_cost +FROM pgr_primDD( + 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', + 6, 3.5); +/* --primDD3 */ +SELECT * FROM pgr_primDD( + 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', + ARRAY[9, 6], 3.5); +/* --primDD4 */ +SELECT seq, depth, start_vid, node, edge, cost, agg_cost +FROM pgr_primDD( + 'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id', + ARRAY[9, 6], 3.5); +/* --primDD5 */ From 9ee888e77d63450d6b67781299b795171e799ce7 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 13 Jan 2024 13:25:21 -0600 Subject: [PATCH 040/428] [doc] fixing spelling mistakes --- doc/src/migration.rst | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/doc/src/migration.rst b/doc/src/migration.rst index cd1ad9efb9..072e60275a 100644 --- a/doc/src/migration.rst +++ b/doc/src/migration.rst @@ -54,7 +54,7 @@ Signatures to be migrated: :Migration: -* Be aware of the existance of the additional columns. +* Be aware of the existence of the additional columns. * In ``pgr_aStar`` (`One to One`) @@ -123,7 +123,7 @@ Signatures to be migrated: :Migration: -* Be aware of the existance of the additional columns. +* Be aware of the existence of the additional columns. * In ``pgr_bdAstar`` (`One to One`) @@ -192,7 +192,7 @@ Signatures to be migrated: :Migration: -* Be aware of the existance of the additional columns. +* Be aware of the existence of the additional columns. * In ``pgr_dijkstra`` (`One to One`) @@ -237,7 +237,7 @@ Migration of ``pgr_drivingdistance`` ------------------------------------------------------------------------------- Starting from `v3.6.0 `__ -:doc:`pgr_drivingDistance` result columns are being standarized. +:doc:`pgr_drivingDistance` result columns are being standardized. :from: |result-dij-dd| :to: |result-spantree| @@ -262,7 +262,7 @@ Output columns were |result-dij-dd| :Migration: -* Be aware of the existance and name change of the result columns. +* Be aware of the existence and name change of the result columns. ``pgr_drivingdistance`` (Single vertex) ............................................................................... @@ -300,7 +300,7 @@ example. :start-after: --drivingdistance3 :end-before: --drivingdistance4 -If needed filter out and rename colums, for example, to return the original +If needed filter out and rename columns, for example, to return the original columns: .. literalinclude:: migration.queries @@ -312,7 +312,7 @@ Migration of ``pgr_kruskalDD`` / ``pgr_kruskalBFS`` / ``pgr_kruskalDFS`` Starting from `v3.7.0 `__ :doc:`pgr_kruskalDD`, :doc:`pgr_kruskalBFS` and -:doc:`pgr_kruskalDFS` result columns are being standarized. +:doc:`pgr_kruskalDFS` result columns are being standardized. :from: |result-bfs| :to: |result-spantree| @@ -343,7 +343,7 @@ Output columns were |result-bfs| :Migration: -* Be aware of the existance of `pred` result columns. +* Be aware of the existence of `pred` result columns. * If needed filter out the added columns Kruskal single vertex @@ -395,7 +395,7 @@ Migration of ``pgr_KSP`` ------------------------------------------------------------------------------- Starting from `v3.6.0 `__ -:doc:`pgr_KSP` result columns are being standarized. +:doc:`pgr_KSP` result columns are being standardized. :from: |ksp-result| :from: |nksp-result| @@ -414,7 +414,7 @@ Signatures to be migrated: :Migration: -* Be aware of the existance of the additional columns. +* Be aware of the existence of the additional columns. ``pgr_KSP`` (One to One) ............................................................................... @@ -494,7 +494,7 @@ Migration of ``pgr_primDD`` / ``pgr_primBFS`` / ``pgr_primDFS`` Starting from `v3.7.0 `__ :doc:`pgr_primDD`, :doc:`pgr_primBFS` and :doc:`pgr_primDFS` result columns are -being standarized. +being standardized. :from: |result-bfs| :to: |result-spantree| @@ -525,7 +525,7 @@ Output columns were |result-bfs| :Migration: -* Be aware of the existance of `pred` result columns. +* Be aware of the existence of `pred` result columns. * If needed filter out the added columns Prim single vertex @@ -577,7 +577,7 @@ Migration of ``pgr_withPointsDD`` ------------------------------------------------------------------------------- Starting from `v3.6.0 `__ -:doc:`pgr_withPointsDD` result columns are being standarized. +:doc:`pgr_withPointsDD` result columns are being standardized. :from: |result-generic-no-seq| :to: |result-spantree| @@ -596,13 +596,13 @@ Signatures to be migrated: * Output columns were |result-1-1-no-seq| * Does not have ``start_vid``, ``pred`` and ``depth`` result columns. - * ``driving_side`` parameter was named optional now it is compulsory unamed. + * ``driving_side`` parameter was named optional now it is compulsory unnamed. * ``pgr_withPointsDD`` (`Multiple vertices`) * Output columns were |result-m-1-no-seq| * Does not have ``depth`` and ``pred`` result columns. - * ``driving_side`` parameter was named optional now it is compulsory unamed. + * ``driving_side`` parameter was named optional now it is compulsory unnamed. .. rubric:: Driving side was optional @@ -647,7 +647,7 @@ Also ``l`` could be used as **driving side** :After Migration: -* Be aware of the existance of the additional result Columns. +* Be aware of the existence of the additional result Columns. * New output columns are |result-spantree| * **driving side** parameter is unnamed compulsory, and valid values differ for directed and undirected graphs. @@ -718,7 +718,7 @@ Migration of ``pgr_withPointsKSP`` ------------------------------------------------------------------------------- Starting from `v3.6.0 `__ -:doc:`pgr_withPointsKSP` result columns are being standarized. +:doc:`pgr_withPointsKSP` result columns are being standardized. :from: |ksp-result| :from: |nksp-result| @@ -739,7 +739,7 @@ Signatures to be migrated: :Migration: -* Be aware of the existance of the additional result Columns. +* Be aware of the existence of the additional result Columns. * New output columns are |nksp-result| * **driving side** parameter is unnamed compulsory, and valid values differ for directed and undirected graphs. From 47de3bb22d5b6a5e494ece2992716acdeb288d0f Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 15 Jan 2024 21:35:00 -0600 Subject: [PATCH 041/428] [sigs] signature file adding _pgr_kruskalv4 & _pgr_primv4 --- sql/sigs/pgrouting--3.7.sig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sql/sigs/pgrouting--3.7.sig b/sql/sigs/pgrouting--3.7.sig index 43906c0b1e..987a688ccf 100644 --- a/sql/sigs/pgrouting--3.7.sig +++ b/sql/sigs/pgrouting--3.7.sig @@ -189,6 +189,7 @@ pgr_kruskaldfs(text,anyarray,bigint) pgr_kruskaldfs(text,bigint,bigint) pgr_kruskal(text) _pgr_kruskal(text,anyarray,text,bigint,double precision) +_pgr_kruskalv4(text,anyarray,text,bigint,double precision) pgr_ksp(text,anyarray,anyarray,integer,boolean,boolean) _pgr_ksp(text,anyarray,anyarray,integer,boolean,boolean,boolean) pgr_ksp(text,anyarray,bigint,integer,boolean,boolean) @@ -249,6 +250,7 @@ pgr_primdfs(text,anyarray,bigint) pgr_primdfs(text,bigint,bigint) pgr_prim(text) _pgr_prim(text,anyarray,text,bigint,double precision) +_pgr_primv4(text,anyarray,text,bigint,double precision) pgr_pushrelabel(text,anyarray,anyarray) pgr_pushrelabel(text,anyarray,bigint) pgr_pushrelabel(text,bigint,anyarray) From b641a71b03c3f55f9d44b3b490c553e94f7d71d4 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 15 Jan 2024 21:40:16 -0600 Subject: [PATCH 042/428] [kruskal] fixing node -> pred --- .../spanningTree/doc-pgr_kruskalBFS.result | 44 +++++++++---------- .../spanningTree/doc-pgr_kruskalDD.result | 28 ++++++------ .../spanningTree/doc-pgr_kruskalDFS.result | 44 +++++++++---------- src/spanningTree/kruskal.c | 2 +- 4 files changed, 59 insertions(+), 59 deletions(-) diff --git a/docqueries/spanningTree/doc-pgr_kruskalBFS.result b/docqueries/spanningTree/doc-pgr_kruskalBFS.result index 6c0a91a81b..3470f79bfe 100644 --- a/docqueries/spanningTree/doc-pgr_kruskalBFS.result +++ b/docqueries/spanningTree/doc-pgr_kruskalBFS.result @@ -9,18 +9,18 @@ SELECT * FROM pgr_kruskalBFS( seq | depth | start_vid | pred | node | edge | cost | agg_cost -----+-------+-----------+------+------+------+------+---------- 1 | 0 | 6 | 6 | 6 | -1 | 0 | 0 - 2 | 1 | 6 | 5 | 5 | 1 | 1 | 1 - 3 | 1 | 6 | 10 | 10 | 2 | 1 | 1 - 4 | 2 | 6 | 15 | 15 | 3 | 1 | 2 - 5 | 3 | 6 | 16 | 16 | 16 | 1 | 3 - 6 | 4 | 6 | 17 | 17 | 15 | 1 | 4 - 7 | 5 | 6 | 12 | 12 | 13 | 1 | 5 - 8 | 6 | 6 | 11 | 11 | 11 | 1 | 6 - 9 | 6 | 6 | 8 | 8 | 12 | 1 | 6 - 10 | 7 | 6 | 7 | 7 | 10 | 1 | 7 - 11 | 7 | 6 | 9 | 9 | 14 | 1 | 7 - 12 | 8 | 6 | 3 | 3 | 7 | 1 | 8 - 13 | 9 | 6 | 1 | 1 | 6 | 1 | 9 + 2 | 1 | 6 | 6 | 5 | 1 | 1 | 1 + 3 | 1 | 6 | 6 | 10 | 2 | 1 | 1 + 4 | 2 | 6 | 10 | 15 | 3 | 1 | 2 + 5 | 3 | 6 | 15 | 16 | 16 | 1 | 3 + 6 | 4 | 6 | 16 | 17 | 15 | 1 | 4 + 7 | 5 | 6 | 17 | 12 | 13 | 1 | 5 + 8 | 6 | 6 | 12 | 11 | 11 | 1 | 6 + 9 | 6 | 6 | 12 | 8 | 12 | 1 | 6 + 10 | 7 | 6 | 8 | 7 | 10 | 1 | 7 + 11 | 7 | 6 | 8 | 9 | 14 | 1 | 7 + 12 | 8 | 6 | 7 | 3 | 7 | 1 | 8 + 13 | 9 | 6 | 3 | 1 | 6 | 1 | 9 (13 rows) /* -- q2 */ @@ -30,17 +30,17 @@ SELECT * FROM pgr_kruskalBFS( seq | depth | start_vid | pred | node | edge | cost | agg_cost -----+-------+-----------+------+------+------+------+---------- 1 | 0 | 6 | 6 | 6 | -1 | 0 | 0 - 2 | 1 | 6 | 5 | 5 | 1 | 1 | 1 - 3 | 1 | 6 | 10 | 10 | 2 | 1 | 1 - 4 | 2 | 6 | 15 | 15 | 3 | 1 | 2 - 5 | 3 | 6 | 16 | 16 | 16 | 1 | 3 + 2 | 1 | 6 | 6 | 5 | 1 | 1 | 1 + 3 | 1 | 6 | 6 | 10 | 2 | 1 | 1 + 4 | 2 | 6 | 10 | 15 | 3 | 1 | 2 + 5 | 3 | 6 | 15 | 16 | 16 | 1 | 3 6 | 0 | 9 | 9 | 9 | -1 | 0 | 0 - 7 | 1 | 9 | 8 | 8 | 14 | 1 | 1 - 8 | 2 | 9 | 7 | 7 | 10 | 1 | 2 - 9 | 2 | 9 | 12 | 12 | 12 | 1 | 2 - 10 | 3 | 9 | 3 | 3 | 7 | 1 | 3 - 11 | 3 | 9 | 11 | 11 | 11 | 1 | 3 - 12 | 3 | 9 | 17 | 17 | 13 | 1 | 3 + 7 | 1 | 9 | 9 | 8 | 14 | 1 | 1 + 8 | 2 | 9 | 8 | 7 | 10 | 1 | 2 + 9 | 2 | 9 | 8 | 12 | 12 | 1 | 2 + 10 | 3 | 9 | 7 | 3 | 7 | 1 | 3 + 11 | 3 | 9 | 12 | 11 | 11 | 1 | 3 + 12 | 3 | 9 | 12 | 17 | 13 | 1 | 3 (12 rows) /* -- q3 */ diff --git a/docqueries/spanningTree/doc-pgr_kruskalDD.result b/docqueries/spanningTree/doc-pgr_kruskalDD.result index 98c88fbc76..c13a139b2e 100644 --- a/docqueries/spanningTree/doc-pgr_kruskalDD.result +++ b/docqueries/spanningTree/doc-pgr_kruskalDD.result @@ -9,10 +9,10 @@ SELECT * FROM pgr_kruskalDD( seq | depth | start_vid | pred | node | edge | cost | agg_cost -----+-------+-----------+------+------+------+------+---------- 1 | 0 | 6 | 6 | 6 | -1 | 0 | 0 - 2 | 1 | 6 | 5 | 5 | 1 | 1 | 1 - 3 | 1 | 6 | 10 | 10 | 2 | 1 | 1 - 4 | 2 | 6 | 15 | 15 | 3 | 1 | 2 - 5 | 3 | 6 | 16 | 16 | 16 | 1 | 3 + 2 | 1 | 6 | 6 | 5 | 1 | 1 | 1 + 3 | 1 | 6 | 6 | 10 | 2 | 1 | 1 + 4 | 2 | 6 | 10 | 15 | 3 | 1 | 2 + 5 | 3 | 6 | 15 | 16 | 16 | 1 | 3 (5 rows) /* -- q2 */ @@ -22,17 +22,17 @@ SELECT * FROM pgr_kruskalDD( seq | depth | start_vid | pred | node | edge | cost | agg_cost -----+-------+-----------+------+------+------+------+---------- 1 | 0 | 6 | 6 | 6 | -1 | 0 | 0 - 2 | 1 | 6 | 5 | 5 | 1 | 1 | 1 - 3 | 1 | 6 | 10 | 10 | 2 | 1 | 1 - 4 | 2 | 6 | 15 | 15 | 3 | 1 | 2 - 5 | 3 | 6 | 16 | 16 | 16 | 1 | 3 + 2 | 1 | 6 | 6 | 5 | 1 | 1 | 1 + 3 | 1 | 6 | 6 | 10 | 2 | 1 | 1 + 4 | 2 | 6 | 10 | 15 | 3 | 1 | 2 + 5 | 3 | 6 | 15 | 16 | 16 | 1 | 3 6 | 0 | 9 | 9 | 9 | -1 | 0 | 0 - 7 | 1 | 9 | 8 | 8 | 14 | 1 | 1 - 8 | 2 | 9 | 7 | 7 | 10 | 1 | 2 - 9 | 3 | 9 | 3 | 3 | 7 | 1 | 3 - 10 | 2 | 9 | 12 | 12 | 12 | 1 | 2 - 11 | 3 | 9 | 11 | 11 | 11 | 1 | 3 - 12 | 3 | 9 | 17 | 17 | 13 | 1 | 3 + 7 | 1 | 9 | 9 | 8 | 14 | 1 | 1 + 8 | 2 | 9 | 8 | 7 | 10 | 1 | 2 + 9 | 3 | 9 | 7 | 3 | 7 | 1 | 3 + 10 | 2 | 9 | 8 | 12 | 12 | 1 | 2 + 11 | 3 | 9 | 12 | 11 | 11 | 1 | 3 + 12 | 3 | 9 | 12 | 17 | 13 | 1 | 3 (12 rows) /* -- q3 */ diff --git a/docqueries/spanningTree/doc-pgr_kruskalDFS.result b/docqueries/spanningTree/doc-pgr_kruskalDFS.result index f8e57cef67..19bdaf3392 100644 --- a/docqueries/spanningTree/doc-pgr_kruskalDFS.result +++ b/docqueries/spanningTree/doc-pgr_kruskalDFS.result @@ -9,18 +9,18 @@ SELECT * FROM pgr_kruskalDFS( seq | depth | start_vid | pred | node | edge | cost | agg_cost -----+-------+-----------+------+------+------+------+---------- 1 | 0 | 6 | 6 | 6 | -1 | 0 | 0 - 2 | 1 | 6 | 5 | 5 | 1 | 1 | 1 - 3 | 1 | 6 | 10 | 10 | 2 | 1 | 1 - 4 | 2 | 6 | 15 | 15 | 3 | 1 | 2 - 5 | 3 | 6 | 16 | 16 | 16 | 1 | 3 - 6 | 4 | 6 | 17 | 17 | 15 | 1 | 4 - 7 | 5 | 6 | 12 | 12 | 13 | 1 | 5 - 8 | 6 | 6 | 11 | 11 | 11 | 1 | 6 - 9 | 6 | 6 | 8 | 8 | 12 | 1 | 6 - 10 | 7 | 6 | 7 | 7 | 10 | 1 | 7 - 11 | 8 | 6 | 3 | 3 | 7 | 1 | 8 - 12 | 9 | 6 | 1 | 1 | 6 | 1 | 9 - 13 | 7 | 6 | 9 | 9 | 14 | 1 | 7 + 2 | 1 | 6 | 6 | 5 | 1 | 1 | 1 + 3 | 1 | 6 | 6 | 10 | 2 | 1 | 1 + 4 | 2 | 6 | 10 | 15 | 3 | 1 | 2 + 5 | 3 | 6 | 15 | 16 | 16 | 1 | 3 + 6 | 4 | 6 | 16 | 17 | 15 | 1 | 4 + 7 | 5 | 6 | 17 | 12 | 13 | 1 | 5 + 8 | 6 | 6 | 12 | 11 | 11 | 1 | 6 + 9 | 6 | 6 | 12 | 8 | 12 | 1 | 6 + 10 | 7 | 6 | 8 | 7 | 10 | 1 | 7 + 11 | 8 | 6 | 7 | 3 | 7 | 1 | 8 + 12 | 9 | 6 | 3 | 1 | 6 | 1 | 9 + 13 | 7 | 6 | 8 | 9 | 14 | 1 | 7 (13 rows) /* -- q2 */ @@ -30,17 +30,17 @@ SELECT * FROM pgr_kruskalDFS( seq | depth | start_vid | pred | node | edge | cost | agg_cost -----+-------+-----------+------+------+------+------+---------- 1 | 0 | 6 | 6 | 6 | -1 | 0 | 0 - 2 | 1 | 6 | 5 | 5 | 1 | 1 | 1 - 3 | 1 | 6 | 10 | 10 | 2 | 1 | 1 - 4 | 2 | 6 | 15 | 15 | 3 | 1 | 2 - 5 | 3 | 6 | 16 | 16 | 16 | 1 | 3 + 2 | 1 | 6 | 6 | 5 | 1 | 1 | 1 + 3 | 1 | 6 | 6 | 10 | 2 | 1 | 1 + 4 | 2 | 6 | 10 | 15 | 3 | 1 | 2 + 5 | 3 | 6 | 15 | 16 | 16 | 1 | 3 6 | 0 | 9 | 9 | 9 | -1 | 0 | 0 - 7 | 1 | 9 | 8 | 8 | 14 | 1 | 1 - 8 | 2 | 9 | 7 | 7 | 10 | 1 | 2 - 9 | 3 | 9 | 3 | 3 | 7 | 1 | 3 - 10 | 2 | 9 | 12 | 12 | 12 | 1 | 2 - 11 | 3 | 9 | 11 | 11 | 11 | 1 | 3 - 12 | 3 | 9 | 17 | 17 | 13 | 1 | 3 + 7 | 1 | 9 | 9 | 8 | 14 | 1 | 1 + 8 | 2 | 9 | 8 | 7 | 10 | 1 | 2 + 9 | 3 | 9 | 7 | 3 | 7 | 1 | 3 + 10 | 2 | 9 | 8 | 12 | 12 | 1 | 2 + 11 | 3 | 9 | 12 | 11 | 11 | 1 | 3 + 12 | 3 | 9 | 12 | 17 | 13 | 1 | 3 (12 rows) /* -- q3 */ diff --git a/src/spanningTree/kruskal.c b/src/spanningTree/kruskal.c index 5cc8eca132..2fe5d6c646 100644 --- a/src/spanningTree/kruskal.c +++ b/src/spanningTree/kruskal.c @@ -176,7 +176,7 @@ PGDLLEXPORT Datum _pgr_kruskalv4(PG_FUNCTION_ARGS) { values[0] = Int64GetDatum((int64_t)funcctx->call_cntr + 1); values[1] = Int64GetDatum(result_tuples[funcctx->call_cntr].depth); values[2] = Int64GetDatum(result_tuples[funcctx->call_cntr].from_v); - values[3] = Int64GetDatum(result_tuples[funcctx->call_cntr].node); + values[3] = Int64GetDatum(result_tuples[funcctx->call_cntr].pred); 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); From 9e33e89ee04fda328e6f5b0ff1cb750391002660 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 15 Jan 2024 21:46:41 -0600 Subject: [PATCH 043/428] [doc] Updating queries for the migration guide --- docqueries/src/migration.result | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/docqueries/src/migration.result b/docqueries/src/migration.result index 1f3999ba84..93e5af8927 100644 --- a/docqueries/src/migration.result +++ b/docqueries/src/migration.result @@ -1086,10 +1086,10 @@ SELECT * FROM pgr_kruskalDD( seq | depth | start_vid | pred | node | edge | cost | agg_cost -----+-------+-----------+------+------+------+------+---------- 1 | 0 | 6 | 6 | 6 | -1 | 0 | 0 - 2 | 1 | 6 | 5 | 5 | 1 | 1 | 1 - 3 | 1 | 6 | 10 | 10 | 2 | 1 | 1 - 4 | 2 | 6 | 15 | 15 | 3 | 1 | 2 - 5 | 3 | 6 | 16 | 16 | 16 | 1 | 3 + 2 | 1 | 6 | 6 | 5 | 1 | 1 | 1 + 3 | 1 | 6 | 6 | 10 | 2 | 1 | 1 + 4 | 2 | 6 | 10 | 15 | 3 | 1 | 2 + 5 | 3 | 6 | 15 | 16 | 16 | 1 | 3 (5 rows) /* --kruskalDD2 */ @@ -1113,17 +1113,17 @@ SELECT * FROM pgr_kruskalDD( seq | depth | start_vid | pred | node | edge | cost | agg_cost -----+-------+-----------+------+------+------+------+---------- 1 | 0 | 6 | 6 | 6 | -1 | 0 | 0 - 2 | 1 | 6 | 5 | 5 | 1 | 1 | 1 - 3 | 1 | 6 | 10 | 10 | 2 | 1 | 1 - 4 | 2 | 6 | 15 | 15 | 3 | 1 | 2 - 5 | 3 | 6 | 16 | 16 | 16 | 1 | 3 + 2 | 1 | 6 | 6 | 5 | 1 | 1 | 1 + 3 | 1 | 6 | 6 | 10 | 2 | 1 | 1 + 4 | 2 | 6 | 10 | 15 | 3 | 1 | 2 + 5 | 3 | 6 | 15 | 16 | 16 | 1 | 3 6 | 0 | 9 | 9 | 9 | -1 | 0 | 0 - 7 | 1 | 9 | 8 | 8 | 14 | 1 | 1 - 8 | 2 | 9 | 7 | 7 | 10 | 1 | 2 - 9 | 3 | 9 | 3 | 3 | 7 | 1 | 3 - 10 | 2 | 9 | 12 | 12 | 12 | 1 | 2 - 11 | 3 | 9 | 11 | 11 | 11 | 1 | 3 - 12 | 3 | 9 | 17 | 17 | 13 | 1 | 3 + 7 | 1 | 9 | 9 | 8 | 14 | 1 | 1 + 8 | 2 | 9 | 8 | 7 | 10 | 1 | 2 + 9 | 3 | 9 | 7 | 3 | 7 | 1 | 3 + 10 | 2 | 9 | 8 | 12 | 12 | 1 | 2 + 11 | 3 | 9 | 12 | 11 | 11 | 1 | 3 + 12 | 3 | 9 | 12 | 17 | 13 | 1 | 3 (12 rows) /* --kruskalDD4 */ From 9eb61e81b6d9ff6c23ac8f2dc625d8f73c939b93 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 17 Jan 2024 14:00:37 -0600 Subject: [PATCH 044/428] [Upgrade] adjusting update scripts --- sql/scripts/build-extension-update-files.pl | 26 ++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/sql/scripts/build-extension-update-files.pl b/sql/scripts/build-extension-update-files.pl index 012946b082..8fa5358852 100755 --- a/sql/scripts/build-extension-update-files.pl +++ b/sql/scripts/build-extension-update-files.pl @@ -221,19 +221,19 @@ sub generate_upgrade_script { } # updating to 3.4+ - if ($old_mayor == 2 or $old_minor < 4) { + if ($old_mayor == 2 or ($old_mayor == 3 and $old_minor < 4)) { push @commands, drop_special_case_function("pgr_maxcardinalitymatch(text,boolean)"); } # updating to 3.5+ - if ($old_mayor == 2 or $old_minor < 5) { + if ($old_mayor == 2 or ($old_mayor == 3 && $old_minor < 5)) { push @commands, drop_special_case_function("pgr_dijkstra(text,anyarray,bigint,boolean)"); push @commands, drop_special_case_function("pgr_dijkstra(text,bigint,anyarray,boolean)"); push @commands, drop_special_case_function("pgr_dijkstra(text,bigint,bigint,boolean)"); } # updating to 3.6+ - if ($old_mayor == 2 or $old_minor < 6) { + if ($old_mayor == 2 or ($old_mayor == 3 && $old_minor < 6)) { push @commands, drop_special_case_function("pgr_withpointsksp(text, text, bigint, bigint, integer, boolean, boolean, char, boolean)"); push @commands, drop_special_case_function("pgr_astar(text,anyarray,bigint,boolean,integer,double precision,double precision)"); push @commands, drop_special_case_function("pgr_astar(text,bigint,anyarray,boolean,integer,double precision,double precision)"); @@ -248,6 +248,26 @@ sub generate_upgrade_script { push @commands, drop_special_case_function("pgr_drivingdistance(text,bigint,double precision,boolean)"); } + # updating to 3.7+ + if ($old_mayor == 2 or ($old_mayor == 3 && $old_minor < 7)) { + push @commands, drop_special_case_function("pgr_primbfs(text,anyarray,bigint)"); + push @commands, drop_special_case_function("pgr_primbfs(text,bigint,bigint)"); + push @commands, drop_special_case_function("pgr_primdfs(text,anyarray,bigint)"); + push @commands, drop_special_case_function("pgr_primdfs(text,bigint,bigint)"); + push @commands, drop_special_case_function("pgr_primdd(text,bigint,numeric)"); + push @commands, drop_special_case_function("pgr_primdd(text,bigint,double precision)"); + push @commands, drop_special_case_function("pgr_primdd(text,anyarray,numeric)"); + push @commands, drop_special_case_function("pgr_primdd(text,anyarray,double precision)"); + push @commands, drop_special_case_function("pgr_kruskalbfs(text,anyarray,bigint)"); + push @commands, drop_special_case_function("pgr_kruskalbfs(text,bigint,bigint)"); + push @commands, drop_special_case_function("pgr_kruskaldfs(text,anyarray,bigint)"); + push @commands, drop_special_case_function("pgr_kruskaldfs(text,bigint,bigint)"); + push @commands, drop_special_case_function("pgr_kruskaldd(text,bigint,numeric)"); + push @commands, drop_special_case_function("pgr_kruskaldd(text,bigint,double precision)"); + push @commands, drop_special_case_function("pgr_kruskaldd(text,anyarray,numeric)"); + push @commands, drop_special_case_function("pgr_kruskaldd(text,anyarray,double precision)"); + } + } #------------------------------------ From fcc617a6cada163c96b16c5b1025e72de6dc510b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 24 Jan 2024 17:45:05 +0000 Subject: [PATCH 045/428] Update locale: commit 9eb61e81b6 --- .../en/LC_MESSAGES/pgrouting_doc_strings.po | 187 ++++++++++++++---- locale/pot/pgrouting_doc_strings.pot | 157 +++++++++++---- 2 files changed, 260 insertions(+), 84 deletions(-) diff --git a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po index c20e21e4af..2ed8b905b9 100644 --- a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-06 18:14+0000\n" +"POT-Creation-Date: 2024-01-24 17:44+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -4390,6 +4390,41 @@ msgstr "" msgid "_" msgstr "" +msgid "Official functions changes" +msgstr "" + +msgid "" +"`#2605 `__ Standarize " +"spanning tree functions output" +msgstr "" + +msgid "Functions:" +msgstr "" + +msgid "``pgr_kruskalDD``" +msgstr "" + +msgid "``pgr_kruskalDFS``" +msgstr "" + +msgid "``pgr_kruskalBFS``" +msgstr "" + +msgid "``pgr_primDD``" +msgstr "" + +msgid "``pgr_primDFS``" +msgstr "" + +msgid "``pgr_primBFS``" +msgstr "" + +msgid "Standarizing output columns to |result-spantree|" +msgstr "" + +msgid "Added ``pred`` result columns." +msgstr "" + msgid "Code enhancement" msgstr "" @@ -4494,7 +4529,7 @@ msgstr "" msgid "Migration" msgstr "" -msgid "Be aware of the existance of the additional columns." +msgid "Be aware of the existence of the additional columns." msgstr "" msgid "In ``pgr_aStar`` (`One to One`)" @@ -4612,7 +4647,7 @@ msgstr "" msgid "" "Starting from `v3.6.0 " "`__ " -":doc:`pgr_drivingDistance` result columns are being standarized." +":doc:`pgr_drivingDistance` result columns are being standardized." msgstr "" msgid "from" @@ -4645,7 +4680,7 @@ msgstr "" msgid "does not have ``depth`` result column." msgstr "" -msgid "Be aware of the existance and name change of the result columns." +msgid "Be aware of the existence and name change of the result columns." msgstr "" msgid "" @@ -4673,17 +4708,77 @@ msgid "The ``from_v`` result column name changes to ``start_vid``." msgstr "" msgid "" -"If needed filter out and rename colums, for example, to return the " +"If needed filter out and rename columns, for example, to return the " "original columns:" msgstr "" +msgid "Migration of ``pgr_kruskalDD`` / ``pgr_kruskalBFS`` / ``pgr_kruskalDFS``" +msgstr "" + +msgid "" +"Starting from `v3.7.0 " +"`__ " +":doc:`pgr_kruskalDD`, :doc:`pgr_kruskalBFS` and :doc:`pgr_kruskalDFS` " +"result columns are being standardized." +msgstr "" + +msgid "|result-bfs|" +msgstr "" + +msgid "Single vertex" +msgstr "" + +msgid "Multiple vertices" +msgstr "" + +msgid "Output columns were |result-bfs|" +msgstr "" + +msgid "Single vertex and Multiple vertices" +msgstr "" + +msgid "Do not have ``pred`` result column." +msgstr "" + +msgid "Be aware of the existence of `pred` result columns." +msgstr "" + +msgid "If needed filter out the added columns" +msgstr "" + +msgid "Kruskal single vertex" +msgstr "" + +msgid "" +"Using ``pgr_KruskalDD`` as example. Migration is similar to al the " +"affected functions." +msgstr "" + +msgid "" +"Comparing with `this " +"`__ " +"example." +msgstr "" + +msgid "Now column ``pred`` exists and contains the predecessor of the ``node``." +msgstr "" + +msgid "Kruskal multiple vertices" +msgstr "" + +msgid "" +"Comparing with `this " +"`__" +" example." +msgstr "" + msgid "Migration of ``pgr_KSP``" msgstr "" msgid "" "Starting from `v3.6.0 " "`__ :doc:`pgr_KSP` " -"result columns are being standarized." +"result columns are being standardized." msgstr "" msgid "|ksp-result|" @@ -4783,13 +4878,44 @@ msgstr "" msgid "In the query returns only ``edge`` column." msgstr "" +msgid "Migration of ``pgr_primDD`` / ``pgr_primBFS`` / ``pgr_primDFS``" +msgstr "" + +msgid "" +"Starting from `v3.7.0 " +"`__ :doc:`pgr_primDD`, " +":doc:`pgr_primBFS` and :doc:`pgr_primDFS` result columns are being " +"standardized." +msgstr "" + +msgid "Prim single vertex" +msgstr "" + +msgid "" +"Using ``pgr_primDD`` as example. Migration is similar to al the affected " +"functions." +msgstr "" + +msgid "" +"Comparing with `this `__ example." +msgstr "" + +msgid "Prim multiple vertices" +msgstr "" + +msgid "" +"Comparing with `this `__ example." +msgstr "" + msgid "Migration of ``pgr_withPointsDD``" msgstr "" msgid "" "Starting from `v3.6.0 " "`__ " -":doc:`pgr_withPointsDD` result columns are being standarized." +":doc:`pgr_withPointsDD` result columns are being standardized." msgstr "" msgid "|result-generic-no-seq|" @@ -4813,7 +4939,9 @@ msgstr "" msgid "Does not have ``start_vid``, ``pred`` and ``depth`` result columns." msgstr "" -msgid "``driving_side`` parameter was named optional now it is compulsory unamed." +msgid "" +"``driving_side`` parameter was named optional now it is compulsory " +"unnamed." msgstr "" msgid "``pgr_withPointsDD`` (`Multiple vertices`)" @@ -4864,7 +4992,7 @@ msgstr "" msgid "After Migration" msgstr "" -msgid "Be aware of the existance of the additional result Columns." +msgid "Be aware of the existence of the additional result Columns." msgstr "" msgid "New output columns are |result-spantree|" @@ -4927,7 +5055,7 @@ msgstr "" msgid "" "Starting from `v3.6.0 " "`__ " -":doc:`pgr_withPointsKSP` result columns are being standarized." +":doc:`pgr_withPointsKSP` result columns are being standardized." msgstr "" msgid "" @@ -9273,17 +9401,11 @@ msgstr "" msgid "Returns set of |result-bfs|" msgstr "" -msgid "Single vertex" -msgstr "" - msgid "" "From root vertex :math:`6` on a **directed** graph with edges in " "ascending order of ``id``" msgstr "" -msgid "Multiple vertices" -msgstr "" - msgid "" "From root vertices :math:`\\{12, 6\\}` on an **undirected** graph with " "**depth** :math:`<= 2` and edges in ascending order of ``id``" @@ -11042,9 +11164,6 @@ msgstr "" msgid "``pgr_drivingDistance`` - Returns the driving distance from a start node." msgstr "" -msgid "Standarizing output columns to |result-spantree|" -msgstr "" - msgid "Added ``depth`` and ``start_vid`` result columns." msgstr "" @@ -12245,14 +12364,14 @@ msgstr "" msgid "Minimum spanning forest" msgstr "" -msgid "``pgr_kruskalBFS``" -msgstr "" - msgid "" "``pgr_kruskalBFS`` — Kruskal's algorithm for Minimum Spanning Tree with " "breadth First Search ordering." msgstr "" +msgid "Version 3.7.0" +msgstr "" + msgid "" "Visits and extracts the nodes information in Breath First Search ordering" " of the Minimum Spanning Tree created using Kruskal's algorithm." @@ -12278,9 +12397,6 @@ msgid "" ":math:`depth \\leq 3`" msgstr "" -msgid "``pgr_kruskalDD``" -msgstr "" - msgid "``pgr_kruskalDD`` — Catchament nodes using Kruskal's algorithm." msgstr "" @@ -12312,9 +12428,6 @@ msgid "" ":math:`distance \\leq 3.5`" msgstr "" -msgid "``pgr_kruskalDFS``" -msgstr "" - msgid "" "``pgr_kruskalDFS`` — Kruskal's algorithm for Minimum Spanning Tree with " "Depth First Search ordering." @@ -13457,9 +13570,6 @@ msgid "" "`__" msgstr "" -msgid "``pgr_primBFS``" -msgstr "" - msgid "" "``pgr_primBFS`` — Prim's algorithm for Minimum Spanning Tree with Depth " "First Search ordering." @@ -13467,7 +13577,7 @@ msgstr "" msgid "" "Visits and extracts the nodes information in Breath First Search ordering" -" of the Minimum Spanning Tree created with Prims's algorithm." +" of the Minimum Spanning Tree created using Prims's algorithm." msgstr "" msgid "pgr_primBFS(`Edges SQL`_, **root vid**, [``max_depth``])" @@ -13476,16 +13586,13 @@ msgstr "" msgid "pgr_primBFS(`Edges SQL`_, **root vids**, [``max_depth``])" msgstr "" -msgid "``pgr_primDD``" -msgstr "" - msgid "``pgr_primDD`` — Catchament nodes using Prim's algorithm." msgstr "" msgid "" "Using Prim's algorithm, extracts the nodes that have aggregate costs less" -" than or equal to a **distance** from a **root** vertex (or vertices) " -"within the calculated minimum spanning tree." +" than or equal to a distance from a root vertex (or vertices) within the " +"calculated minimum spanning tree." msgstr "" msgid "pgr_primDD(`Edges SQL`_, **root vid**, **distance**)" @@ -13494,9 +13601,6 @@ msgstr "" msgid "pgr_primDD(`Edges SQL`_, **root vids**, **distance**)" msgstr "" -msgid "``pgr_primDFS``" -msgstr "" - msgid "" "``pgr_primDFS`` — Prim algorithm for Minimum Spanning Tree with Depth " "First Search ordering." @@ -15254,9 +15358,6 @@ msgid "" "`_" msgstr "" -msgid "Official functions changes" -msgstr "" - msgid "" "`#2516 `__ Standarize " "output pgr_aStar" diff --git a/locale/pot/pgrouting_doc_strings.pot b/locale/pot/pgrouting_doc_strings.pot index 1f2e91456c..f9c0b86f65 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-01-06 18:14+0000\n" +"POT-Creation-Date: 2024-01-24 17:44+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3937,6 +3937,39 @@ msgstr "" msgid "_" msgstr "" +msgid "Official functions changes" +msgstr "" + +msgid "`#2605 `__ Standarize spanning tree functions output" +msgstr "" + +msgid "Functions:" +msgstr "" + +msgid "``pgr_kruskalDD``" +msgstr "" + +msgid "``pgr_kruskalDFS``" +msgstr "" + +msgid "``pgr_kruskalBFS``" +msgstr "" + +msgid "``pgr_primDD``" +msgstr "" + +msgid "``pgr_primDFS``" +msgstr "" + +msgid "``pgr_primBFS``" +msgstr "" + +msgid "Standarizing output columns to |result-spantree|" +msgstr "" + +msgid "Added ``pred`` result columns." +msgstr "" + msgid "Code enhancement" msgstr "" @@ -4030,7 +4063,7 @@ msgstr "" msgid "Migration" msgstr "" -msgid "Be aware of the existance of the additional columns." +msgid "Be aware of the existence of the additional columns." msgstr "" msgid "In ``pgr_aStar`` (`One to One`)" @@ -4129,7 +4162,7 @@ msgstr "" msgid "Migration of ``pgr_drivingdistance``" msgstr "" -msgid "Starting from `v3.6.0 `__ :doc:`pgr_drivingDistance` result columns are being standarized." +msgid "Starting from `v3.6.0 `__ :doc:`pgr_drivingDistance` result columns are being standardized." msgstr "" msgid "from" @@ -4162,7 +4195,7 @@ msgstr "" msgid "does not have ``depth`` result column." msgstr "" -msgid "Be aware of the existance and name change of the result columns." +msgid "Be aware of the existence and name change of the result columns." msgstr "" msgid "Using `this `__ example." @@ -4183,13 +4216,61 @@ msgstr "" msgid "The ``from_v`` result column name changes to ``start_vid``." msgstr "" -msgid "If needed filter out and rename colums, for example, to return the original columns:" +msgid "If needed filter out and rename columns, for example, to return the original columns:" +msgstr "" + +msgid "Migration of ``pgr_kruskalDD`` / ``pgr_kruskalBFS`` / ``pgr_kruskalDFS``" +msgstr "" + +msgid "Starting from `v3.7.0 `__ :doc:`pgr_kruskalDD`, :doc:`pgr_kruskalBFS` and :doc:`pgr_kruskalDFS` result columns are being standardized." +msgstr "" + +msgid "|result-bfs|" +msgstr "" + +msgid "Single vertex" +msgstr "" + +msgid "Multiple vertices" +msgstr "" + +msgid "Output columns were |result-bfs|" +msgstr "" + +msgid "Single vertex and Multiple vertices" +msgstr "" + +msgid "Do not have ``pred`` result column." +msgstr "" + +msgid "Be aware of the existence of `pred` result columns." +msgstr "" + +msgid "If needed filter out the added columns" +msgstr "" + +msgid "Kruskal single vertex" +msgstr "" + +msgid "Using ``pgr_KruskalDD`` as example. Migration is similar to al the affected functions." +msgstr "" + +msgid "Comparing with `this `__ example." +msgstr "" + +msgid "Now column ``pred`` exists and contains the predecessor of the ``node``." +msgstr "" + +msgid "Kruskal multiple vertices" +msgstr "" + +msgid "Comparing with `this `__ example." msgstr "" msgid "Migration of ``pgr_KSP``" msgstr "" -msgid "Starting from `v3.6.0 `__ :doc:`pgr_KSP` result columns are being standarized." +msgid "Starting from `v3.6.0 `__ :doc:`pgr_KSP` result columns are being standardized." msgstr "" msgid "|ksp-result|" @@ -4273,10 +4354,31 @@ msgstr "" msgid "In the query returns only ``edge`` column." msgstr "" +msgid "Migration of ``pgr_primDD`` / ``pgr_primBFS`` / ``pgr_primDFS``" +msgstr "" + +msgid "Starting from `v3.7.0 `__ :doc:`pgr_primDD`, :doc:`pgr_primBFS` and :doc:`pgr_primDFS` result columns are being standardized." +msgstr "" + +msgid "Prim single vertex" +msgstr "" + +msgid "Using ``pgr_primDD`` as example. Migration is similar to al the affected functions." +msgstr "" + +msgid "Comparing with `this `__ example." +msgstr "" + +msgid "Prim multiple vertices" +msgstr "" + +msgid "Comparing with `this `__ example." +msgstr "" + msgid "Migration of ``pgr_withPointsDD``" msgstr "" -msgid "Starting from `v3.6.0 `__ :doc:`pgr_withPointsDD` result columns are being standarized." +msgid "Starting from `v3.6.0 `__ :doc:`pgr_withPointsDD` result columns are being standardized." msgstr "" msgid "|result-generic-no-seq|" @@ -4297,7 +4399,7 @@ msgstr "" msgid "Does not have ``start_vid``, ``pred`` and ``depth`` result columns." msgstr "" -msgid "``driving_side`` parameter was named optional now it is compulsory unamed." +msgid "``driving_side`` parameter was named optional now it is compulsory unnamed." msgstr "" msgid "``pgr_withPointsDD`` (`Multiple vertices`)" @@ -4348,7 +4450,7 @@ msgstr "" msgid "After Migration" msgstr "" -msgid "Be aware of the existance of the additional result Columns." +msgid "Be aware of the existence of the additional result Columns." msgstr "" msgid "New output columns are |result-spantree|" @@ -4396,7 +4498,7 @@ msgstr "" msgid "Migration of ``pgr_withPointsKSP``" msgstr "" -msgid "Starting from `v3.6.0 `__ :doc:`pgr_withPointsKSP` result columns are being standarized." +msgid "Starting from `v3.6.0 `__ :doc:`pgr_withPointsKSP` result columns are being standardized." msgstr "" msgid "And ``driving side`` parameter changed from named optional to unnamed compulsory **driving side** and its validity differ for directed and undirected graphs." @@ -8047,15 +8149,9 @@ msgstr "" msgid "Returns set of |result-bfs|" msgstr "" -msgid "Single vertex" -msgstr "" - msgid "From root vertex :math:`6` on a **directed** graph with edges in ascending order of ``id``" msgstr "" -msgid "Multiple vertices" -msgstr "" - msgid "From root vertices :math:`\\{12, 6\\}` on an **undirected** graph with **depth** :math:`<= 2` and edges in ascending order of ``id``" msgstr "" @@ -9532,9 +9628,6 @@ msgstr "" msgid "``pgr_drivingDistance`` - Returns the driving distance from a start node." msgstr "" -msgid "Standarizing output columns to |result-spantree|" -msgstr "" - msgid "Added ``depth`` and ``start_vid`` result columns." msgstr "" @@ -10534,10 +10627,10 @@ msgstr "" msgid "Minimum spanning forest" msgstr "" -msgid "``pgr_kruskalBFS``" +msgid "``pgr_kruskalBFS`` — Kruskal's algorithm for Minimum Spanning Tree with breadth First Search ordering." msgstr "" -msgid "``pgr_kruskalBFS`` — Kruskal's algorithm for Minimum Spanning Tree with breadth First Search ordering." +msgid "Version 3.7.0" msgstr "" msgid "Visits and extracts the nodes information in Breath First Search ordering of the Minimum Spanning Tree created using Kruskal's algorithm." @@ -10561,9 +10654,6 @@ msgstr "" msgid "The Minimum Spanning Tree starting on vertices :math:`\\{9, 6\\}` with :math:`depth \\leq 3`" msgstr "" -msgid "``pgr_kruskalDD``" -msgstr "" - msgid "``pgr_kruskalDD`` — Catchament nodes using Kruskal's algorithm." msgstr "" @@ -10588,9 +10678,6 @@ msgstr "" msgid "The Minimum Spanning Tree starting on vertices :math:`\\{9, 6\\}` with :math:`distance \\leq 3.5`" msgstr "" -msgid "``pgr_kruskalDFS``" -msgstr "" - msgid "``pgr_kruskalDFS`` — Kruskal's algorithm for Minimum Spanning Tree with Depth First Search ordering." msgstr "" @@ -11563,13 +11650,10 @@ msgstr "" msgid "`Boost: Prim's algorithm documentation `__" msgstr "" -msgid "``pgr_primBFS``" -msgstr "" - msgid "``pgr_primBFS`` — Prim's algorithm for Minimum Spanning Tree with Depth First Search ordering." msgstr "" -msgid "Visits and extracts the nodes information in Breath First Search ordering of the Minimum Spanning Tree created with Prims's algorithm." +msgid "Visits and extracts the nodes information in Breath First Search ordering of the Minimum Spanning Tree created using Prims's algorithm." msgstr "" msgid "pgr_primBFS(`Edges SQL`_, **root vid**, [``max_depth``])" @@ -11578,13 +11662,10 @@ msgstr "" msgid "pgr_primBFS(`Edges SQL`_, **root vids**, [``max_depth``])" msgstr "" -msgid "``pgr_primDD``" -msgstr "" - msgid "``pgr_primDD`` — Catchament nodes using Prim's algorithm." msgstr "" -msgid "Using Prim's algorithm, extracts the nodes that have aggregate costs less than or equal to a **distance** from a **root** vertex (or vertices) within the calculated minimum spanning tree." +msgid "Using Prim's algorithm, extracts the nodes that have aggregate costs less than or equal to a distance from a root vertex (or vertices) within the calculated minimum spanning tree." msgstr "" msgid "pgr_primDD(`Edges SQL`_, **root vid**, **distance**)" @@ -11593,9 +11674,6 @@ msgstr "" msgid "pgr_primDD(`Edges SQL`_, **root vids**, **distance**)" msgstr "" -msgid "``pgr_primDFS``" -msgstr "" - msgid "``pgr_primDFS`` — Prim algorithm for Minimum Spanning Tree with Depth First Search ordering." msgstr "" @@ -12973,9 +13051,6 @@ msgstr "" msgid "To see all issues & pull requests closed by this release see the `Git closed milestone for 3.6.0 `_" msgstr "" -msgid "Official functions changes" -msgstr "" - msgid "`#2516 `__ Standarize output pgr_aStar" msgstr "" From c6661130ec9d2b3a638265dfafada2e58dbfcdce Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 22 Jan 2024 13:34:02 -0600 Subject: [PATCH 046/428] postgres_connection.h char* -> const char* --- include/c_common/postgres_connection.h | 4 +++- src/common/postgres_connection.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/c_common/postgres_connection.h b/include/c_common/postgres_connection.h index 26c5cfc02b..0ebc9ff1af 100644 --- a/include/c_common/postgres_connection.h +++ b/include/c_common/postgres_connection.h @@ -41,11 +41,13 @@ extern "C" { #include #include +#include "cpp_common/undefPostgresDefine.hpp" + void pgr_send_error(int errcode); void pgr_SPI_finish(void); void pgr_SPI_connect(void); -SPIPlanPtr pgr_SPI_prepare(char* sql); +SPIPlanPtr pgr_SPI_prepare(const char* sql); Portal pgr_SPI_cursor_open(SPIPlanPtr SPIplan); #ifdef __cplusplus diff --git a/src/common/postgres_connection.c b/src/common/postgres_connection.c index 60cfb87ffc..47e6a8d27e 100644 --- a/src/common/postgres_connection.c +++ b/src/common/postgres_connection.c @@ -78,7 +78,7 @@ pgr_SPI_connect(void) { } SPIPlanPtr -pgr_SPI_prepare(char* sql) { +pgr_SPI_prepare(const char* sql) { #if 0 PGR_DBG("Preparing Plan"); #endif From 09d8c213322abb5c13f8037f38c4a48e08e916c9 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 22 Jan 2024 11:03:42 -0600 Subject: [PATCH 047/428] :heavy-plus-sign: trsp_pgfetch copy of pgdata_fetchers --- include/cpp_common/trsp_pgfetch.hpp | 151 +++++++++ src/cpp_common/CMakeLists.txt | 1 + src/cpp_common/trsp_pgfetch.cpp | 479 ++++++++++++++++++++++++++++ 3 files changed, 631 insertions(+) create mode 100644 include/cpp_common/trsp_pgfetch.hpp create mode 100644 src/cpp_common/trsp_pgfetch.cpp diff --git a/include/cpp_common/trsp_pgfetch.hpp b/include/cpp_common/trsp_pgfetch.hpp new file mode 100644 index 0000000000..47572b4f90 --- /dev/null +++ b/include/cpp_common/trsp_pgfetch.hpp @@ -0,0 +1,151 @@ +/*PGR-GNU***************************************************************** +File: trsp_pgfetch.hpp + +Copyright (c) 2015 pgRouting developers +Mail: project@pgrouting.org + +Copyright (c) 2023 Celia Virginia Vergara Castillo +mail: vicky at erosion.dev +Copyright (c) 2020 Mahmoud SAKR and Esteban ZIMANYI +mail: m_attia_sakrcw at yahoo.com, estebanzimanyicw at gmail.com +Copyright (c) 2016 Rohith Reddy +Copyright (c) 2016 Andrea Nardelli +mail: nrd.nardelli at gmail.com +Copyright (c) 2015 Celia Virginia Vergara Castillo +mail: vicky at erosion.dev + +------ + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + ********************************************************************PGR-GNU*/ +/** @file +This is a copy of pgdata_fetchers.hpp + +The old version of TRSP +- Is the only function that has its own edge reader within its code, + hence the name of the file. +- The old version of TRSP will exist during 3.x series + + +@note +- The only function that should remain after all functions read the data on the + C++ code is `fetch_edge` +- The code to be removed is marked with "if 1 ... endif" directives +- The old version of TRSP will be removed on V4 + + @todo: Remove marked code + @todo: V4 Delete this file +*/ + +#ifndef INCLUDE_CPP_COMMON_TRSP_PGFETCH_HPP_ +#define INCLUDE_CPP_COMMON_TRSP_PGFETCH_HPP_ + +/* for HeapTuple, TupleDesc */ +extern "C" { +#include +#include +} + +#include +#include "cpp_common/undefPostgresDefine.hpp" + +#if 1 +using II_t_rt = struct II_t_rt; +using IID_t_rt = struct IID_t_rt; +using Coordinate_t = struct Coordinate_t; +using Delauny_t = struct Delauny_t; +using Edge_bool_t = struct Edge_bool_t; +#endif +using Edge_t = struct Edge_t; +#if 1 +using CostFlow_t = struct CostFlow_t; +using Edge_xy_t = struct Edge_xy_t; +using Orders_t = struct Orders_t; +using Restriction_t = struct Restriction_t; +using Point_on_edge_t = struct Point_on_edge_t; +using Vehicle_t = struct Vehicle_t; +#endif + +namespace pgrouting { +using Column_info_t = struct Column_info_t; + +#if 1 +void fetch_combination( + const HeapTuple, const TupleDesc &, + const std::vector &, + int64_t*, II_t_rt*, size_t*, bool); + +void fetch_coordinate( + const HeapTuple, const TupleDesc &, + const std::vector &, + int64_t*, Coordinate_t*, size_t*, bool); + +void fetch_delauny( + const HeapTuple, const TupleDesc &, + const std::vector &, + int64_t*, Delauny_t*, size_t*, bool); + +void fetch_basic_edge( + const HeapTuple, const TupleDesc &, + const std::vector &, + int64_t*, Edge_bool_t*, size_t*, bool); +#endif + +void fetch_edge( + const HeapTuple, const TupleDesc &, + const std::vector &, + int64_t*, Edge_t*, size_t*, bool); + +#if 1 +void fetch_costFlow_edge( + const HeapTuple, const TupleDesc &, + const std::vector &, + int64_t*, CostFlow_t*, size_t*, bool); + +void fetch_edge_with_xy( + const HeapTuple, const TupleDesc &, + const std::vector &, + int64_t*, Edge_xy_t*, size_t*, bool); + +void pgr_fetch_row( + const HeapTuple, const TupleDesc &, + const std::vector &, + int64_t*, IID_t_rt*, size_t*, bool); + +void fetch_orders( + const HeapTuple, const TupleDesc &, + const std::vector &, + int64_t*, Orders_t*, size_t*, bool); + +void fetch_restriction( + const HeapTuple, const TupleDesc &, + const std::vector &, + int64_t*, Restriction_t*, size_t*, bool); + +void fetch_point( + const HeapTuple, const TupleDesc &, + const std::vector &, + int64_t*, Point_on_edge_t*, size_t*, bool); + +void fetch_vehicle( + const HeapTuple, const TupleDesc &, + const std::vector &, + int64_t*, Vehicle_t*, size_t*, bool); +#endif + +} // namespace pgrouting + +#endif // INCLUDE_CPP_COMMON_TRSP_PGFETCH_HPP_ diff --git a/src/cpp_common/CMakeLists.txt b/src/cpp_common/CMakeLists.txt index 87d8138523..8d0dbacff9 100644 --- a/src/cpp_common/CMakeLists.txt +++ b/src/cpp_common/CMakeLists.txt @@ -8,6 +8,7 @@ ADD_LIBRARY(cpp_common OBJECT get_check_data.cpp pgdata_fetchers.cpp + trsp_pgfetch.cpp # linked as C, but compiled as C++ pgdata_getters.cpp ) diff --git a/src/cpp_common/trsp_pgfetch.cpp b/src/cpp_common/trsp_pgfetch.cpp new file mode 100644 index 0000000000..ae5ec3d9dc --- /dev/null +++ b/src/cpp_common/trsp_pgfetch.cpp @@ -0,0 +1,479 @@ +/*PGR-GNU***************************************************************** +File: trsp_pgfetch.cpp + +Copyright (c) 2015 pgRouting developers +Mail: project@pgrouting.org + +Copyright (c) 2023 Celia Virginia Vergara Castillo +mail: vicky at erosion.dev +Copyright (c) 2020 Mahmoud SAKR and Esteban ZIMANYI +mail: m_attia_sakrcw at yahoo.com, estebanzimanyicw at gmail.com +Copyright (c) 2016 Rohith Reddy +Copyright (c) 2016 Andrea Nardelli +mail: nrd.nardelli at gmail.com +Copyright (c) 2015 Celia Virginia Vergara Castillo +mail: vicky at erosion.dev + + +------ + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + ********************************************************************PGR-GNU*/ +/** @file + +This is a copy of pgdata_fetchers.cpp + +The old version of TRSP +- Is the only function that has its own edge reader within its code, + hence the name of the file. +- The old version of TRSP will exist during 3.x series + + +Notes +- The only function that should remain after all functions read the data on the C++ code is `fetch_edge` +- The code to be removed is marked with "if 1 ... endif" directives +- The old version of TRSP will be removed on V4 + +@todo: Remove marked code +@todo: V4 Delete this file + */ + +#include "cpp_common/trsp_pgfetch.hpp" + +#include +#include +#include + +#include "cpp_common/get_check_data.hpp" + +#include "c_types/info_t.hpp" +#if 1 +#include "c_types/ii_t_rt.h" +#include "c_types/coordinate_t.h" +#include "c_types/delauny_t.h" +#include "c_types/edge_bool_t_rt.h" +#include "c_types/costFlow_t.h" +#include "c_types/edge_xy_t.h" +#endif +#include "c_types/edge_t.h" + +#if 1 +#include "c_types/iid_t_rt.h" +#include "c_types/pickDeliver/orders_t.h" +#include "c_types/restriction_t.h" +#include "c_types/point_on_edge_t.h" +#include "c_types/pickDeliver/vehicle_t.h" +#endif + +namespace pgrouting { +#if 1 +void fetch_combination( + const HeapTuple tuple, + const TupleDesc &tupdesc, + const std::vector &info, + int64_t*, + II_t_rt *combination, + size_t* valid_combinations, + bool) { + combination->d1.source = pgrouting::getBigInt(tuple, tupdesc, info[0]); + combination->d2.target = pgrouting::getBigInt(tuple, tupdesc, info[1]); + + *valid_combinations = *valid_combinations + 1; +} + +void fetch_coordinate( + const HeapTuple tuple, + const TupleDesc &tupdesc, + const std::vector &info, + int64_t *default_id, + Coordinate_t* coordinate, + size_t*, + bool) { + if (pgrouting::column_found(info[0].colNumber)) { + coordinate->id = pgrouting::getBigInt(tuple, tupdesc, info[0]); + } else { + coordinate->id = *default_id; + ++(*default_id); + } + coordinate->x = pgrouting::getFloat8(tuple, tupdesc, info[1]); + coordinate->y = pgrouting::getFloat8(tuple, tupdesc, info[2]); +} + +void fetch_delauny( + const HeapTuple tuple, + const TupleDesc &tupdesc, + const std::vector &info, + int64_t*, + Delauny_t* delauny, + size_t*, + bool) { + delauny->tid = pgrouting::getBigInt(tuple, tupdesc, info[0]); + delauny->pid = pgrouting::getBigInt(tuple, tupdesc, info[1]); + delauny->x = pgrouting::getFloat8(tuple, tupdesc, info[2]); + delauny->y = pgrouting::getFloat8(tuple, tupdesc, info[3]); +} + +/* edges have many fetchers */ + +void fetch_basic_edge( + const HeapTuple tuple, + const TupleDesc &tupdesc, + const std::vector &info, + int64_t *default_id, + Edge_bool_t *edge, + size_t *valid_edges, + bool) { + if (pgrouting::column_found(info[0].colNumber)) { + edge->id = pgrouting::getBigInt(tuple, tupdesc, info[0]); + } else { + edge->id = *default_id; + ++(*default_id); + } + bool new_columns = pgrouting::column_found(info[5].colNumber); + + edge->source = pgrouting::getBigInt(tuple, tupdesc, info[1]); + edge->target = pgrouting::getBigInt(tuple, tupdesc, info[2]); + + if (new_columns) { + edge->going = pgrouting::getFloat8(tuple, tupdesc, info[5]) > 0 + || (pgrouting::column_found(info[6].colNumber) + && pgrouting::getFloat8(tuple, tupdesc, info[6]) > 0); + } else { + edge->going = pgrouting::getFloat8(tuple, tupdesc, info[3]) > 0 + || (pgrouting::column_found(info[4].colNumber) + && pgrouting::getFloat8(tuple, tupdesc, info[4]) > 0); + } + + (*valid_edges)++; +} +#endif + +void fetch_edge( + const HeapTuple tuple, + const TupleDesc &tupdesc, + const std::vector &info, + int64_t *default_id, + Edge_t *edge, + size_t *valid_edges, + bool normal) { + if (pgrouting::column_found(info[0].colNumber)) { + edge->id = pgrouting::getBigInt(tuple, tupdesc, info[0]); + } else { + edge->id = *default_id; + ++(*default_id); + } + + if (normal) { + edge->source = pgrouting::getBigInt(tuple, tupdesc, info[1]); + edge->target = pgrouting::getBigInt(tuple, tupdesc, info[2]); + } else { + edge->target = pgrouting::getBigInt(tuple, tupdesc, info[1]); + edge->source = pgrouting::getBigInt(tuple, tupdesc, info[2]); + } + + edge->cost = pgrouting::getFloat8(tuple, tupdesc, info[3]); + + if (pgrouting::column_found(info[4].colNumber)) { + edge->reverse_cost = pgrouting::getFloat8(tuple, tupdesc, info[4]); + } else { + edge->reverse_cost = -1; + } + + edge->cost = std::isinf(edge->cost)? + DBL_MAX : edge->cost; + + edge->reverse_cost = std::isinf(edge->reverse_cost)? + DBL_MAX : edge->reverse_cost; + + *valid_edges = edge->cost < 0? *valid_edges: *valid_edges + 1; + *valid_edges = edge->reverse_cost < 0? *valid_edges: *valid_edges + 1; +} + +#if 1 +void fetch_costFlow_edge( + const HeapTuple tuple, + const TupleDesc &tupdesc, + const std::vector &info, + int64_t *default_id, + CostFlow_t *edge, + size_t *valid_edges, + bool normal) { + if (pgrouting::column_found(info[0].colNumber)) { + edge->edge_id = pgrouting::getBigInt(tuple, tupdesc, info[0]); + } else { + edge->edge_id = *default_id; + ++(*default_id); + } + + if (normal) { + edge->source = pgrouting::getBigInt(tuple, tupdesc, info[1]); + edge->target = pgrouting::getBigInt(tuple, tupdesc, info[2]); + } else { + edge->target = pgrouting::getBigInt(tuple, tupdesc, info[1]); + edge->source = pgrouting::getBigInt(tuple, tupdesc, info[2]); + } + + edge->capacity = pgrouting::getBigInt(tuple, tupdesc, info[3]); + if (pgrouting::column_found(info[4].colNumber)) { + edge->reverse_capacity = pgrouting::getBigInt(tuple, tupdesc, info[4]); + } else { + edge->reverse_capacity = -1; + } + + edge->cost = pgrouting::getFloat8(tuple, tupdesc, info[5]); + if (pgrouting::column_found(info[6].colNumber)) { + edge->reverse_cost = pgrouting::getFloat8(tuple, tupdesc, info[6]); + } else { + edge->reverse_cost = 0; + } + + *valid_edges = edge->capacity < 0? *valid_edges: *valid_edges + 1; + *valid_edges = edge->reverse_capacity < 0? *valid_edges: *valid_edges + 1; +} + +void fetch_edge_with_xy( + const HeapTuple tuple, + const TupleDesc &tupdesc, + const std::vector &info, + int64_t *default_id, + Edge_xy_t *edge, + size_t *valid_edges, + bool normal) { + if (pgrouting::column_found(info[0].colNumber)) { + edge->id = pgrouting::getBigInt(tuple, tupdesc, info[0]); + } else { + edge->id = *default_id; + ++(*default_id); + } + + if (normal) { + edge->source = pgrouting::getBigInt(tuple, tupdesc, info[1]); + edge->target = pgrouting::getBigInt(tuple, tupdesc, info[2]); + } else { + edge->target = pgrouting::getBigInt(tuple, tupdesc, info[1]); + edge->source = pgrouting::getBigInt(tuple, tupdesc, info[2]); + } + edge->cost = pgrouting::getFloat8(tuple, tupdesc, info[3]); + + if (pgrouting::column_found(info[4].colNumber)) { + edge->reverse_cost = pgrouting::getFloat8(tuple, tupdesc, info[4]); + } else { + edge->reverse_cost = -1; + } + + edge->x1 = pgrouting::getFloat8(tuple, tupdesc, info[5]); + edge->y1 = pgrouting::getFloat8(tuple, tupdesc, info[6]); + edge->x2 = pgrouting::getFloat8(tuple, tupdesc, info[7]); + edge->y2 = pgrouting::getFloat8(tuple, tupdesc, info[8]); + + *valid_edges = edge->cost < 0? *valid_edges: *valid_edges + 1; + *valid_edges = edge->reverse_cost < 0? *valid_edges: *valid_edges + 1; +} + +void pgr_fetch_row( + const HeapTuple tuple, + const TupleDesc &tupdesc, + const std::vector &info, + int64_t*, + IID_t_rt *distance, + size_t*, + bool) { + distance->from_vid = pgrouting::getBigInt(tuple, tupdesc, info[0]); + distance->to_vid = pgrouting::getBigInt(tuple, tupdesc, info[1]); + distance->cost = pgrouting::getFloat8(tuple, tupdesc, info[2]); +} + + +void fetch_orders( + const HeapTuple tuple, + const TupleDesc &tupdesc, + const std::vector &info, + int64_t*, + Orders_t* pd_order, + size_t*, + bool with_id) { + pd_order->id = pgrouting::getBigInt(tuple, tupdesc, info[0]); + pd_order->demand = pgrouting::getFloat8(tuple, tupdesc, info[1]); + + /* + * the pickups + */ + pd_order->pick_x = with_id ? + 0 : pgrouting::getFloat8(tuple, tupdesc, info[2]); + pd_order->pick_y = with_id ? + 0 : pgrouting::getFloat8(tuple, tupdesc, info[3]); + pd_order->pick_open_t = pgrouting::getFloat8(tuple, tupdesc, info[4]); + pd_order->pick_close_t = pgrouting::getFloat8(tuple, tupdesc, info[5]); + pd_order->pick_service_t = pgrouting::column_found(info[6].colNumber) ? + pgrouting::getFloat8(tuple, tupdesc, info[6]) : 0; + + /* + * the deliveries + */ + pd_order->deliver_x = with_id ? + 0 : pgrouting::getFloat8(tuple, tupdesc, info[7]); + pd_order->deliver_y = with_id ? + 0 : pgrouting::getFloat8(tuple, tupdesc, info[8]); + pd_order->deliver_open_t = pgrouting::getFloat8(tuple, tupdesc, info[9]); + pd_order->deliver_close_t = pgrouting::getFloat8(tuple, tupdesc, info[10]); + pd_order->deliver_service_t = pgrouting::column_found(info[11].colNumber) ? + pgrouting::getFloat8(tuple, tupdesc, info[11]) : 0; + + pd_order->pick_node_id = with_id ? + pgrouting::getBigInt(tuple, tupdesc, info[12]) : 0; + pd_order->deliver_node_id = with_id ? + pgrouting::getBigInt(tuple, tupdesc, info[13]) : 0; +} + + +void fetch_restriction( + const HeapTuple tuple, + const TupleDesc &tupdesc, + const std::vector &info, + int64_t*, + Restriction_t *restriction, + size_t*, + bool) { + restriction->cost = pgrouting::getFloat8(tuple, tupdesc, info[0]); + + restriction->via = NULL; + restriction->via_size = 0; + restriction->via = pgrouting::getBigIntArr(tuple, tupdesc, info[1], &restriction->via_size); +} + + +void fetch_point( + const HeapTuple tuple, + const TupleDesc &tupdesc, + const std::vector &info, + int64_t *default_pid, + Point_on_edge_t* point, + size_t*, + bool) { + if (pgrouting::column_found(info[0].colNumber)) { + point->pid = pgrouting::getBigInt(tuple, tupdesc, info[0]); + } else { + ++(*default_pid); + point->pid = *default_pid; + } + + point->edge_id = pgrouting::getBigInt(tuple, tupdesc, info[1]); + point->fraction = pgrouting::getFloat8(tuple, tupdesc, info[2]); + + if (pgrouting::column_found(info[3].colNumber)) { + point->side = pgrouting::getChar(tuple, tupdesc, info[3], false, 'b'); + } else { + point->side = 'b'; + } +} + +void fetch_vehicle( + const HeapTuple tuple, + const TupleDesc &tupdesc, + const std::vector &info, + int64_t*, + Vehicle_t *vehicle, + size_t*, + bool with_id) { + vehicle->id = pgrouting::getBigInt(tuple, tupdesc, info[0]); + vehicle->capacity = pgrouting::getFloat8(tuple, tupdesc, info[1]); + + vehicle->start_x = with_id ? + 0 : + pgrouting::getFloat8(tuple, tupdesc, info[2]); + vehicle->start_y = with_id ? + 0 : + pgrouting::getFloat8(tuple, tupdesc, info[3]); + + vehicle->speed = pgrouting::column_found(info[13].colNumber) ? + pgrouting::getFloat8(tuple, tupdesc, info[13]) : + 1; + vehicle->cant_v = pgrouting::column_found(info[4].colNumber) ? + pgrouting::getBigInt(tuple, tupdesc, info[4]) : + 1; + vehicle->start_open_t = pgrouting::column_found(info[5].colNumber) ? + pgrouting::getFloat8(tuple, tupdesc, info[5]) : + 0; + vehicle->start_close_t = pgrouting::column_found(info[6].colNumber) ? + pgrouting::getFloat8(tuple, tupdesc, info[6]) : + DBL_MAX; + vehicle->start_service_t = pgrouting::column_found(info[7].colNumber) ? + pgrouting::getFloat8(tuple, tupdesc, info[7]) : + 0; + + + if (!(pgrouting::column_found(info[8].colNumber)) + && pgrouting::column_found(info[9].colNumber)) { + ereport(ERROR, + (errmsg("Column \'%s\' not Found", info[8].name.c_str()), + errhint("%s was found, also column is expected %s ", + info[9].name.c_str(), info[8].name.c_str()))); + } + if (pgrouting::column_found(info[8].colNumber) + && !(pgrouting::column_found(info[9].colNumber))) { + ereport(ERROR, + (errmsg("Column \'%s\' not Found", info[9].name.c_str()), + errhint("%s was found, also column is expected %s ", + info[8].name.c_str(), info[9].name.c_str()))); + } + + vehicle->end_x = pgrouting::column_found(info[8].colNumber) ? + pgrouting::getFloat8(tuple, tupdesc, info[8]) : + vehicle->start_x; + vehicle->end_y = pgrouting::column_found(info[9].colNumber) ? + pgrouting::getFloat8(tuple, tupdesc, info[9]) : + vehicle->start_y; + + if (!(pgrouting::column_found(info[10].colNumber)) + && pgrouting::column_found(info[11].colNumber)) { + ereport(ERROR, + (errmsg("Column \'%s\' not Found", info[10].name.c_str()), + errhint("%s was found, also column is expected %s ", + info[10].name.c_str(), info[11].name.c_str()))); + } + + if (pgrouting::column_found(info[10].colNumber) + && !(pgrouting::column_found(info[11].colNumber))) { + ereport(ERROR, + (errmsg("Column \'%s\' not Found", info[11].name.c_str()), + errhint("%s was found, also column is expected %s ", + info[11].name.c_str(), info[10].name.c_str()))); + } + vehicle->end_open_t = pgrouting::column_found(info[10].colNumber) ? + pgrouting::getFloat8(tuple, tupdesc, info[10]) : + vehicle->start_open_t; + vehicle->end_close_t = pgrouting::column_found(info[11].colNumber) ? + pgrouting::getFloat8(tuple, tupdesc, info[11]) : + vehicle->start_close_t; + vehicle->end_service_t = pgrouting::column_found(info[12].colNumber) ? + pgrouting::getFloat8(tuple, tupdesc, info[12]) : + vehicle->start_service_t; + + vehicle->speed = pgrouting::column_found(info[13].colNumber) ? + pgrouting::getFloat8(tuple, tupdesc, info[13]) : + 1; + vehicle->start_node_id = with_id ? + pgrouting::getBigInt(tuple, tupdesc, info[14]) : + 0; + vehicle->end_node_id = with_id ? + (pgrouting::column_found(info[12].colNumber) ? + pgrouting::getBigInt(tuple, tupdesc, info[15]) : + vehicle->start_node_id) : + 0; +} +#endif + +} // namespace pgrouting From c9c0a66f2fa5820ee22ef39b8553182d49e11073 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 22 Jan 2024 11:09:27 -0600 Subject: [PATCH 048/428] :heavy-plus-sign: undefPostgresDefine.hpp needed for undef postgres define --- include/cpp_common/undefPostgresDefine.hpp | 75 ++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 include/cpp_common/undefPostgresDefine.hpp diff --git a/include/cpp_common/undefPostgresDefine.hpp b/include/cpp_common/undefPostgresDefine.hpp new file mode 100644 index 0000000000..58b5877c4b --- /dev/null +++ b/include/cpp_common/undefPostgresDefine.hpp @@ -0,0 +1,75 @@ +/*PGR-GNU***************************************************************** +File: undefPostgresDefine.hpp + +Copyright (c) 2024 pgRouting developers +Mail: project@pgrouting.org + +Copyright (c) 2024 Celia Virginia Vergara Castillo +Mail: vicky at erosion.dev + +------ + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + ********************************************************************PGR-GNU*/ + +#ifndef INCLUDE_CPP_COMMON_UNDEFPOSTGRESDEFINE_HPP_ +#define INCLUDE_CPP_COMMON_UNDEFPOSTGRESDEFINE_HPP_ + +/** @file undefPostgresDefine.hpp + +https://doxygen.postgresql.org/port_8h.html +Has the line +`#define snprintf pg_snprintf` + +Being `snprintf` part of [stdio.h](https://en.cppreference.com/w/cpp/header/cstdio) since C++11 +Work arount is to undef it. + +It's affecting boost 83+ + +Placing after including extern C postgres files +Example +~~~ c +extern "C" { +#include +#include +} + +#include + +#include "cpp_common/undefPostgresDefine.hpp" +~~~ + +*/ +#ifdef __cplusplus +#ifdef sprintf +#undef sprintf +#endif + +#ifdef snprintf +#undef snprintf +#endif + +#ifdef vsprintf +#undef vsprintf +#endif + +#ifdef vsnprintf +#undef vsnprintf +#endif + +#endif + +#endif // INCLUDE_CPP_COMMON_UNDEFPOSTGRESDEFINE_HPP_ From 824dc0a6647f06df3be9a53a7e67ba2af35798e6 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 22 Jan 2024 11:28:39 -0600 Subject: [PATCH 049/428] :heavy-plus-sign: trsp_pgget copy of pgdata_getters --- include/c_common/trsp_pgget.h | 174 +++++++++ src/cpp_common/CMakeLists.txt | 5 +- src/cpp_common/trsp_pgget.cpp | 696 ++++++++++++++++++++++++++++++++++ 3 files changed, 874 insertions(+), 1 deletion(-) create mode 100644 include/c_common/trsp_pgget.h create mode 100644 src/cpp_common/trsp_pgget.cpp diff --git a/include/c_common/trsp_pgget.h b/include/c_common/trsp_pgget.h new file mode 100644 index 0000000000..64a3a4074b --- /dev/null +++ b/include/c_common/trsp_pgget.h @@ -0,0 +1,174 @@ +/*PGR-GNU***************************************************************** +File: trsp_pgget.h + +Copyright (c) 2015 pgRouting developers +Mail: project@pgrouting.org + +Copyright (c) 2023 Celia Virginia Vergara Castillo +mail: vicky at erosion.dev +Copyright (c) 2020 Mahmoud SAKR and Esteban ZIMANYI +mail: m_attia_sakrcw at yahoo.com, estebanzimanyicw at gmail.com +Copyright (c) 2016 Rohith Reddy +Copyright (c) 2016 Andrea Nardelli +mail: nrd.nardelli at gmail.com +Copyright (c) 2015 Celia Virginia Vergara Castillo +mail: vicky at erosion.dev + +------ + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + ********************************************************************PGR-GNU*/ +/** @file + +This is a copy of pgdata_getters.h + +The old version of TRSP +- Is the only function that has its own edge reader within its code, + hence the name of the file. +- The old version of TRSP will exist during 3.x series + + +@note +- The only function that should remain after all functions read the data on the + C++ code is `fetch_edge` +- The code to be removed is marked with "if 1 ... endif" directives +- The old version of TRSP will be removed on V4 + + @todo: Remove marked code + @todo: V4 Delete this file +*/ +#ifndef INCLUDE_C_COMMON_TRSP_PGGET_H_ +#define INCLUDE_C_COMMON_TRSP_PGGET_H_ +#pragma once + +#ifdef __cplusplus +extern "C" { +#endif +#include +#include +#include +#include +#include +#include +#include +#include +#ifdef __cplusplus +} +#endif + +#ifdef __cplusplus +#include +#include +#else +#include +#include +#include +#endif + +#include "cpp_common/undefPostgresDefine.hpp" + +#ifdef __cplusplus +#if 1 +using IID_t_rt = struct IID_t_rt; +using II_t_rt = struct II_t_rt; +using Coordinate_t = struct Coordinate_t; +using Delauny_t = struct Delauny_t; +using Edge_xy_t = struct Edge_xy_t; +using Flow_t = struct Flow_t; +using Edge_bool_t = struct Edge_bool_t; +using CostFlow_t = struct CostFlow_t; +#endif +using Edge_t = struct Edge_t; +#if 1 +using Orders_t = struct Orders_t; +using Point_on_edge_t = struct Point_on_edge_t; +using Vehicle_t = struct Vehicle_t; +using Restriction_t = struct Restriction_t; +#endif +#else +#if 1 +typedef struct IID_t_rt IID_t_rt; +typedef struct II_t_rt II_t_rt; +typedef struct Coordinate_t Coordinate_t; +typedef struct Delauny_t Delauny_t; +typedef struct Edge_xy_t Edge_xy_t; +typedef struct Flow_t Flow_t; +typedef struct Edge_bool_t Edge_bool_t; +typedef struct CostFlow_t CostFlow_t; +#endif +typedef struct Edge_t Edge_t; +#if 1 +typedef struct Orders_t Orders_t; +typedef struct Point_on_edge_t Point_on_edge_t; +typedef struct Restriction_t Restriction_t; +typedef struct Vehicle_t Vehicle_t; +#endif +#endif + + +#ifdef __cplusplus +extern "C" { +#endif +#if 1 +/** @brief Read rows of combinations, called from C file*/ +void pgr_get_combinations(char *, II_t_rt **, size_t *, char**); + +/** @brief Read rows of matrix, called from C file*/ +void pgr_get_coordinates(char*, Coordinate_t**, size_t*, char**); + +/** @brief Read rows of delauny triangles, called from C file*/ +void pgr_get_delauny(char*, Delauny_t**, size_t*, char**); +#endif + +/** @brief Read edges called from C file*/ +void pgr_get_edges(char*, Edge_t**, size_t*, bool, bool, char**); + +#if 1 +/** @brief Read edges with x, y endpointscalled from C file */ +void pgr_get_edges_xy(char*, Edge_xy_t**, size_t*, bool, char**); + +/** @brief Read edges for flow called from C file */ +void pgr_get_flow_edges(char*, Edge_t**, size_t*, char**); + +/** @brief Read edges for cost called from C fileflow */ +void pgr_get_costFlow_edges(char*, CostFlow_t**, size_t*, char**); + +/** @brief Read "basic edges" called from C file */ +void pgr_get_basic_edges(char*, Edge_bool_t**, size_t*, char**); + +/** @brief Read rows of matrix, called from C file*/ +void pgr_get_matrixRows(char*, IID_t_rt**, size_t *, char **); + +/** @brief Reads the pick-Deliver orders */ +void pgr_get_orders(char *, Orders_t **, size_t *, bool, char**); + +/** @brief Read rows of points, called from C file*/ +void pgr_get_points(char*, Point_on_edge_t**, size_t*, char**); + +/** @brief Read rows of matrix, called from C file*/ +void pgr_get_restrictions(char*, Restriction_t**, size_t*, char**); + +/** @brief Reads the vehicles */ +void pgr_get_vehicles(char*, Vehicle_t**, size_t*, bool, char**); + +/** @brief Enforces the input array to be @b NOT empty */ +int64_t* pgr_get_bigIntArray(size_t*, ArrayType*, bool, char**); +#endif +#ifdef __cplusplus +} +#endif + +#endif // INCLUDE_C_COMMON_TRSP_PGGET_H_ diff --git a/src/cpp_common/CMakeLists.txt b/src/cpp_common/CMakeLists.txt index 8d0dbacff9..a05eb5dbfb 100644 --- a/src/cpp_common/CMakeLists.txt +++ b/src/cpp_common/CMakeLists.txt @@ -8,7 +8,10 @@ ADD_LIBRARY(cpp_common OBJECT get_check_data.cpp pgdata_fetchers.cpp + pgdata_getters.cpp + + # for old trsp code trsp_pgfetch.cpp # linked as C, but compiled as C++ - pgdata_getters.cpp + trsp_pgget.cpp ) diff --git a/src/cpp_common/trsp_pgget.cpp b/src/cpp_common/trsp_pgget.cpp new file mode 100644 index 0000000000..88e3aa9458 --- /dev/null +++ b/src/cpp_common/trsp_pgget.cpp @@ -0,0 +1,696 @@ +/*PGR-GNU***************************************************************** +File: trsp_pgget.cpp + +Copyright (c) 2015 pgRouting developers +Mail: project@pgrouting.org + +Copyright (c) 2023 Celia Virginia Vergara Castillo +mail: vicky at erosion.dev +Copyright (c) 2020 Mahmoud SAKR and Esteban ZIMANYI +mail: m_attia_sakrcw at yahoo.com, estebanzimanyicw at gmail.com +Copyright (c) 2016 Rohith Reddy +Copyright (c) 2016 Andrea Nardelli +mail: nrd.nardelli at gmail.com +Copyright (c) 2015 Celia Virginia Vergara Castillo +mail: vicky at erosion.dev + + +------ + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + ********************************************************************PGR-GNU*/ +/** file + +This is a copy of pgdata_getters.cpp + +The old version of TRSP +- Is the only function that has its own edge reader within its code, + hence the name of the file. +- The old version of TRSP will exist during 3.x series + + +@note +- The only function that should remain after all functions read the data on the +C++ code is `fetch_edge` +- The code to be removed is marked with "if 1 ... endif" directives +- The old version of TRSP will be removed on V4 + + @todo: Remove marked code + @todo: V4 Delete this file +*/ + +#include "c_common/trsp_pgget.h" +#include +#include +#include +#include + +#include "cpp_common/get_data.hpp" +#include "cpp_common/get_check_data.hpp" +#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/trsp_pgfetch.hpp" + +#include "c_types/info_t.hpp" +#if 1 +#include "c_types/coordinate_t.h" +#include "c_types/costFlow_t.h" +#include "c_types/ii_t_rt.h" +#include "c_types/iid_t_rt.h" +#include "c_types/delauny_t.h" +#endif +#include "c_types/edge_t.h" +#if 1 +#include "c_types/edge_bool_t_rt.h" +#include "c_types/edge_xy_t.h" +#include "c_types/flow_t.h" +#include "c_types/pickDeliver/orders_t.h" +#include "c_types/pickDeliver/vehicle_t.h" +#include "c_types/point_on_edge_t.h" +#include "c_types/restriction_t.h" +#endif + +#if 1 +/** + * @param[out] arrlen Length of the array + * @param[in] input the postgres array + * @param[in] allow_empty when true, empty arrays are accepted. + * @param[out] err_msg when not null, there was an error and contains the message + * @returns Returns a C array of integers + */ +int64_t* pgr_get_bigIntArray(size_t *arrlen, ArrayType *input, bool allow_empty, char** err_msg) { + using pgrouting::pgr_msg; + try { + return pgrouting::get_array(input, arrlen, allow_empty); + } catch (const std::string &ex) { + (*arrlen) = 0; + *err_msg = pgr_msg(ex.c_str()); + return nullptr; + } catch(...) { + (*arrlen) = 0; + *err_msg = pgr_msg("Caught unknown exception!"); + return nullptr; + } +} + +/** + For queries of the type: + ~~~~{.c} + SELECT source, target FROM combinations; + ~~~~ + + @param[in] sql The query + @param [out] rows array of combinations + @param [out] total_rows size of combinations + @param[out] err_msg when not null, there was an error and contains the message + */ +void pgr_get_combinations( + char *sql, + II_t_rt **rows, + size_t *total_rows, + char **err_msg) { + using pgrouting::pgr_msg; + using pgrouting::pgr_free; + using pgrouting::Column_info_t; + try { + std::vector info{2}; + + info[0] = {-1, 0, true, "source", pgrouting::ANY_INTEGER}; + info[1] = {-1, 0, true, "target", pgrouting::ANY_INTEGER}; + pgrouting::get_data(sql, rows, total_rows, true, info, &pgrouting::fetch_combination); + } catch (const std::string &ex) { + (*rows) = pgr_free(*rows); + (*total_rows) = 0; + *err_msg = pgr_msg(ex.c_str()); + } catch(...) { + (*rows) = pgr_free(*rows); + (*total_rows) = 0; + *err_msg = pgr_msg("Caught unknown exception!"); + } +} + + +/** + For queries of the type: + ~~~~{.c} + SELECT id, x, y FROM coordinates; + ~~~~ + + @param[in] sql The query + @param[out] rows the matrix coordinates + @param[out] total_rows size of coordinates + @param[out] err_msg when not null, there was an error and contains the message + */ +void pgr_get_coordinates( + char *sql, + Coordinate_t **rows, + size_t *total_rows, + char **err_msg) { + using pgrouting::pgr_msg; + using pgrouting::pgr_free; + using pgrouting::Column_info_t; + try { + std::vector info{3}; + + info[0] = {-1, 0, true, "id", pgrouting::ANY_INTEGER}; + info[1] = {-1, 0, true, "x", pgrouting::ANY_NUMERICAL}; + info[2] = {-1, 0, true, "y", pgrouting::ANY_NUMERICAL}; + pgrouting::get_data(sql, rows, total_rows, true, info, &pgrouting::fetch_coordinate); + } catch (const std::string &ex) { + (*rows) = pgr_free(*rows); + (*total_rows) = 0; + *err_msg = pgr_msg(ex.c_str()); + } catch(...) { + (*rows) = pgr_free(*rows); + (*total_rows) = 0; + *err_msg = pgr_msg("Caught unknown exception!"); + } +} + + +/** + For queries of the type: + ~~~~{.c} + SELECT tid, pid, x, y FROM delauny; + SELECT pid, pid, x, y FROM delauny; + ~~~~ + + @param[in] sql The query + @param[out] rows the delauny array + @param[out] total_rows size of delauny + @param[out] err_msg when not null, there was an error and contains the message + */ +void pgr_get_delauny( + char *sql, + Delauny_t **rows, + size_t *total_rows, + char **err_msg) { + using pgrouting::pgr_msg; + using pgrouting::pgr_free; + using pgrouting::Column_info_t; + try { + std::vector info{4}; + + info[0] = {-1, 0, true, "tid", pgrouting::ANY_INTEGER}; + info[1] = {-1, 0, true, "pid", pgrouting::ANY_INTEGER}; + info[2] = {-1, 0, true, "x", pgrouting::ANY_NUMERICAL}; + info[3] = {-1, 0, true, "y", pgrouting::ANY_NUMERICAL}; + pgrouting::get_data(sql, rows, total_rows, true, info, &pgrouting::fetch_delauny); + } catch (const std::string &ex) { + (*rows) = pgr_free(*rows); + (*total_rows) = 0; + *err_msg = pgr_msg(ex.c_str()); + } catch(...) { + (*rows) = pgr_free(*rows); + (*total_rows) = 0; + *err_msg = pgr_msg("Caught unknown exception!"); + } +} + + +/** + For queries of the type: + ~~~~{.c} + SELECT id, source, target, capacity, [reverse_capacity] FROM edge_table; + ~~~~ + + @param[in] sql The query + @param[out] rows the edges array + @param[out] total_rows size of edges + @param[out] err_msg when not null, there was an error and contains the message + */ +void +pgr_get_flow_edges( + char *sql, + Edge_t **rows, + size_t *total_rows, + char **err_msg) { + using pgrouting::pgr_msg; + using pgrouting::pgr_free; + using pgrouting::Column_info_t; + try { + std::vector info{5}; + + info[0] = {-1, 0, true, "id", pgrouting::ANY_INTEGER}; + info[1] = {-1, 0, true, "source", pgrouting::ANY_INTEGER}; + info[2] = {-1, 0, true, "target", pgrouting::ANY_INTEGER}; + info[3] = {-1, 0, true, "capacity", pgrouting::ANY_INTEGER}; + info[4] = {-1, 0, false, "reverse_capacity", pgrouting::ANY_INTEGER}; + + pgrouting::get_data(sql, rows, total_rows, true, info, &pgrouting::fetch_edge); + } catch (const std::string &ex) { + (*rows) = pgr_free(*rows); + (*total_rows) = 0; + *err_msg = pgr_msg(ex.c_str()); + } catch(...) { + (*rows) = pgr_free(*rows); + (*total_rows) = 0; + *err_msg = pgr_msg("Caught unknown exception!"); + } +} + +/** + For queries of the type: + ~~~~{.c} + SELECT id, source, target, capacity, [reverse_capacity], cost, [reverse_cost] + FROM edge_table; + ~~~~ + + @param[in] sql The query + @param[out] rows the edges array + @param[out] total_rows size of edges + @param[out] err_msg when not null, there was an error and contains the message + */ +void +pgr_get_costFlow_edges( + char *sql, + CostFlow_t **rows, + size_t *total_rows, + char **err_msg) { + using pgrouting::pgr_msg; + using pgrouting::pgr_free; + using pgrouting::Column_info_t; + try { + std::vector info{7}; + + info[0] = {-1, 0, true, "id", pgrouting::ANY_INTEGER}; + info[1] = {-1, 0, true, "source", pgrouting::ANY_INTEGER}; + info[2] = {-1, 0, true, "target", pgrouting::ANY_INTEGER}; + info[3] = {-1, 0, true, "capacity", pgrouting::ANY_INTEGER}; + info[4] = {-1, 0, false, "reverse_capacity", pgrouting::ANY_INTEGER}; + info[5] = {-1, 0, true, "cost", pgrouting::ANY_NUMERICAL}; + info[6] = {-1, 0, false, "reverse_cost", pgrouting::ANY_NUMERICAL}; + + pgrouting::get_data(sql, rows, total_rows, true, info, &pgrouting::fetch_costFlow_edge); + } catch (const std::string &ex) { + (*rows) = pgr_free(*rows); + (*total_rows) = 0; + *err_msg = pgr_msg(ex.c_str()); + } catch(...) { + (*rows) = pgr_free(*rows); + (*total_rows) = 0; + *err_msg = pgr_msg("Caught unknown exception!"); + } +} + + +/** + For queries of the type: + ~~~~{.c} + SELECT id, source, target, cost, [reverse_cost] FROM edge_table; + ~~~~ + + For backward compatability it also accepts: + ~~~~{.c} + SELECT id, source, target, going, [coming] FROM edge_table; + ~~~~ + @todo This option will be removed on V4 + + @param[in] sql The query + @param[out] rows the edges array + @param[out] total_rows size of edges + @param[out] err_msg when not null, there was an error and contains the message + */ +void +pgr_get_basic_edges( + char *sql, + Edge_bool_t **rows, + size_t *total_rows, + char **err_msg) { + using pgrouting::pgr_msg; + using pgrouting::pgr_free; + using pgrouting::Column_info_t; + try { + std::vector info{7}; + + info[0] = {-1, 0, true, "id", pgrouting::ANY_INTEGER}; + info[1] = {-1, 0, true, "source", pgrouting::ANY_INTEGER}; + info[2] = {-1, 0, true, "target", pgrouting::ANY_INTEGER}; + info[3] = {-1, 0, false, "going", pgrouting::ANY_NUMERICAL}; + info[4] = {-1, 0, false, "coming", pgrouting::ANY_NUMERICAL}; + info[5] = {-1, 0, false, "cost", pgrouting::ANY_NUMERICAL}; + info[6] = {-1, 0, false, "reverse_cost", pgrouting::ANY_NUMERICAL}; + + pgrouting::get_data(sql, rows, total_rows, true, info, &pgrouting::fetch_basic_edge); + } catch (const std::string &ex) { + (*rows) = pgr_free(*rows); + (*total_rows) = 0; + *err_msg = pgr_msg(ex.c_str()); + } catch(...) { + (*rows) = pgr_free(*rows); + (*total_rows) = 0; + *err_msg = pgr_msg("Caught unknown exception!"); + } +} + +/** + For queries of the type: + ~~~~{.c} + SELECT id, source, target, cost, [reverse_cost], x1, y1, x2, y2 FROM edge_table; + ~~~~ + + @param[in] sql The query + @param[out] rows the edges array + @param[out] total_rows size of edges + @param[in] normal when false then the graph is reversed + @param[out] err_msg when not null, there was an error and contains the message + */ +void +pgr_get_edges_xy( + char *sql, + Edge_xy_t **rows, + size_t *total_rows, + bool normal, + char **err_msg) { + using pgrouting::pgr_msg; + using pgrouting::pgr_free; + using pgrouting::Column_info_t; + try { + std::vector info{9}; + + info[0] = {-1, 0, true, "id", pgrouting::ANY_INTEGER}; + info[1] = {-1, 0, true, "source", pgrouting::ANY_INTEGER}; + info[2] = {-1, 0, true, "target", pgrouting::ANY_INTEGER}; + info[3] = {-1, 0, true, "cost", pgrouting::ANY_NUMERICAL}; + info[4] = {-1, 0, false, "reverse_cost", pgrouting::ANY_NUMERICAL}; + info[5] = {-1, 0, true, "x1", pgrouting::ANY_NUMERICAL}; + info[6] = {-1, 0, true, "y1", pgrouting::ANY_NUMERICAL}; + info[7] = {-1, 0, true, "x2", pgrouting::ANY_NUMERICAL}; + info[8] = {-1, 0, true, "y2", pgrouting::ANY_NUMERICAL}; + + pgrouting::get_data(sql, rows, total_rows, normal, info, &pgrouting::fetch_edge_with_xy); + } catch (const std::string &ex) { + (*rows) = pgr_free(*rows); + (*total_rows) = 0; + *err_msg = pgr_msg(ex.c_str()); + } catch(...) { + (*rows) = pgr_free(*rows); + (*total_rows) = 0; + *err_msg = pgr_msg("Caught unknown exception!"); + } +} +#endif + +/** + For queries of the type: + ~~~~{.c} + SELECT id, source, target, cost, [reverse_cost] FROM edge_table; + ~~~~ + + @param[in] sql The query + @param[out] rows the edges array + @param[out] total_rows size of edges + @param[in] normal when false then the graph is reversed + @param[in] ignore_id when true id value of edge is ignored + @param[out] err_msg when not null, there was an error and contains the message + */ +void +pgr_get_edges( + char *sql, + Edge_t **rows, + size_t *total_rows, + bool normal, + bool ignore_id, + char **err_msg) { + using pgrouting::pgr_msg; + using pgrouting::pgr_free; + using pgrouting::Column_info_t; + try { + std::vector info{ + {-1, 0, !ignore_id, "id", pgrouting::ANY_INTEGER}, + {-1, 0, true, "source", pgrouting::ANY_INTEGER}, + {-1, 0, true, "target", pgrouting::ANY_INTEGER}, + {-1, 0, true, "cost", pgrouting::ANY_NUMERICAL}, + {-1, 0, false, "reverse_cost", pgrouting::ANY_NUMERICAL}}; + + pgrouting::get_data(sql, rows, total_rows, normal, info, &pgrouting::fetch_edge); + } catch (const std::string &ex) { + (*rows) = pgr_free(*rows); + (*total_rows) = 0; + *err_msg = pgr_msg(ex.c_str()); + } catch(...) { + (*rows) = pgr_free(*rows); + (*total_rows) = 0; + *err_msg = pgr_msg("Caught unknown exception!"); + } +} + +#if 1 +/** + For queries of the type: + ~~~~{.c} + SELECT start_vid, end_vid, agg_cost FROM matrix_data; + ~~~~ + + @param[in] sql The query + @param[out] rows of the matrix array + @param[out] total_rows size of matrix rows + @param[out] err_msg when not null, there was an error and contains the message + */ +void pgr_get_matrixRows( + char *sql, + IID_t_rt **rows, + size_t *total_rows, + char **err_msg) { + using pgrouting::pgr_msg; + using pgrouting::pgr_free; + using pgrouting::Column_info_t; + try { + std::vector info{3}; + + info[0] = {-1, 0, true, "start_vid", pgrouting::ANY_INTEGER}; + info[1] = {-1, 0, true, "end_vid", pgrouting::ANY_INTEGER}; + info[2] = {-1, 0, true, "agg_cost", pgrouting::ANY_NUMERICAL}; + pgrouting::get_data(sql, rows, total_rows, true, info, &pgrouting::pgr_fetch_row); + } catch (const std::string &ex) { + (*rows) = pgr_free(*rows); + (*total_rows) = 0; + *err_msg = pgr_msg(ex.c_str()); + } catch(...) { + (*rows) = pgr_free(*rows); + (*total_rows) = 0; + *err_msg = pgr_msg("Caught unknown exception!"); + } +} + + +/** + For queries of the type: + ~~~~{.c} + SELECT id, demand + [p_node_id | p_x, p_y], p_open, p_close, p_service, + [d_node_id | d_x, d_y], d_open, d_close, d_service, + FROM orders; + ~~~~ + + @param[in] sql The query + @param[out] rows of the orders + @param[out] total_rows size of orders rows + @param[out] with_id flag to choose if its euclidean or matrix + @param[out] err_msg when not null, there was an error and contains the message + */ +void pgr_get_orders( + char *sql, + Orders_t **rows, + size_t *total_rows, + bool with_id, + char **err_msg) { + using pgrouting::pgr_msg; + using pgrouting::pgr_free; + using pgrouting::Column_info_t; + try { + std::vector info{14}; + + info[0] = {-1, 0, true, "id", pgrouting::ANY_INTEGER}; + info[1] = {-1, 0, true, "demand", pgrouting::ANY_NUMERICAL}; + info[2] = {-1, 0, true, "p_x", pgrouting::ANY_NUMERICAL}; + info[3] = {-1, 0, true, "p_y", pgrouting::ANY_NUMERICAL}; + info[4] = {-1, 0, true, "p_open", pgrouting::ANY_NUMERICAL}; + info[5] = {-1, 0, true, "p_close", pgrouting::ANY_NUMERICAL}; + info[6] = {-1, 0, false, "p_service", pgrouting::ANY_NUMERICAL}; + info[7] = {-1, 0, true, "d_x", pgrouting::ANY_NUMERICAL}; + info[8] = {-1, 0, true, "d_y", pgrouting::ANY_NUMERICAL}; + info[9] = {-1, 0, true, "d_open", pgrouting::ANY_NUMERICAL}; + info[10] = {-1, 0, true, "d_close", pgrouting::ANY_NUMERICAL}; + info[11] = {-1, 0, false, "d_service", pgrouting::ANY_NUMERICAL}; + /* nodes are going to be ignored*/ + info[12] = {-1, 0, false, "p_node_id", pgrouting::ANY_INTEGER}; + info[13] = {-1, 0, false, "d_node_id", pgrouting::ANY_INTEGER}; + + if (with_id) { + /* (x,y) values are ignored*/ + info[2].strict = false; + info[3].strict = false; + info[7].strict = false; + info[8].strict = false; + /* nodes are compulsory*/ + info[12].strict = true; + info[13].strict = true; + } + + pgrouting::get_data(sql, rows, total_rows, with_id, info, &pgrouting::fetch_orders); + } catch (const std::string &ex) { + (*rows) = pgr_free(*rows); + (*total_rows) = 0; + *err_msg = pgr_msg(ex.c_str()); + } catch(...) { + (*rows) = pgr_free(*rows); + (*total_rows) = 0; + *err_msg = pgr_msg("Caught unknown exception!"); + } +} + + +/** + For queries of the type: + ~~~~{.c} + SELECT pid, edge_id, fraction side FROM points; + ~~~~ + + @param[in] sql The query + @param[out] rows the points array + @param[out] total_rows size of points + @param[out] err_msg when not null, there was an error and contains the message + */ +void pgr_get_points( + char *sql, + Point_on_edge_t **rows, + size_t *total_rows, + char **err_msg) { + using pgrouting::pgr_free; + using pgrouting::pgr_msg; + using pgrouting::Column_info_t; + try { + std::vector info{4}; + + info[0] = {-1, 0, false, "pid", pgrouting::ANY_INTEGER}; + info[1] = {-1, 0, true, "edge_id", pgrouting::ANY_INTEGER}; + info[2] = {-1, 0, true, "fraction", pgrouting::ANY_NUMERICAL}; + info[3] = {-1, 0, false, "side", pgrouting::CHAR1}; + pgrouting::get_data(sql, rows, total_rows, true, info, &pgrouting::fetch_point); + } catch (const std::string &ex) { + (*rows) = pgr_free(*rows); + (*total_rows) = 0; + *err_msg = pgr_msg(ex.c_str()); + } catch(...) { + (*rows) = pgr_free(*rows); + (*total_rows) = 0; + *err_msg = pgr_msg("Caught unknown exception!"); + } +} + + +/** + For queries of the type: + ~~~~{.c} + SELECT cost, path FROM restrictions; + ~~~~ + + @param[in] sql The query + @param[out] rows the restrictions array + @param[out] total_rows size of restrictions + @param[out] err_msg when not null, there was an error and contains the message + */ +void pgr_get_restrictions( + char *sql, + Restriction_t **rows, + size_t *total_rows, + char **err_msg) { + using pgrouting::pgr_msg; + using pgrouting::pgr_free; + using pgrouting::Column_info_t; + try { + std::vector info{2}; + + info[0] = {-1, 0, true, "cost", pgrouting::ANY_NUMERICAL}; + info[1] = {-1, 0, true, "path", pgrouting::ANY_INTEGER_ARRAY}; + pgrouting::get_data(sql, rows, total_rows, true, info, &pgrouting::fetch_restriction); + } catch (const std::string &ex) { + (*rows) = pgr_free(*rows); + (*total_rows) = 0; + *err_msg = pgr_msg(ex.c_str()); + } catch(...) { + (*rows) = pgr_free(*rows); + (*total_rows) = 0; + *err_msg = pgr_msg("Caught unknown exception!"); + } +} + + +/** + For queries of the type: + ~~~~{.c} + SELECT id, capacity, speed, number + [start_node_id | start_x, start_y], start_open, start_close, start_service, + [end_node_id | end_x, end_y], end_open, end_close, end_service, + FROM orders; + ~~~~ + + @param[in] sql The query + @param[out] rows of vehicles + @param[out] total_rows size of vehicles rows + @param[out] with_id flag to choose if its euclidean or matrix + @param[out] err_msg when not null, there was an error and contains the message + */ +void pgr_get_vehicles( + char *sql, + Vehicle_t **rows, + size_t *total_rows, + bool with_id, + char **err_msg) { + using pgrouting::pgr_msg; + using pgrouting::pgr_free; + using pgrouting::Column_info_t; + try { + std::vector info{16}; + + info[0] = {-1, 0, true, "id", pgrouting::ANY_INTEGER}; + info[1] = {-1, 0, true, "capacity", pgrouting::ANY_NUMERICAL}; + info[2] = {-1, 0, true, "start_x", pgrouting::ANY_NUMERICAL}; + info[3] = {-1, 0, true, "start_y", pgrouting::ANY_NUMERICAL}; + info[4] = {-1, 0, false, "number", pgrouting::ANY_INTEGER}; + info[5] = {-1, 0, false, "start_open", pgrouting::ANY_NUMERICAL}; + info[6] = {-1, 0, false, "start_close", pgrouting::ANY_NUMERICAL}; + info[7] = {-1, 0, false, "start_service", pgrouting::ANY_NUMERICAL}; + info[8] = {-1, 0, false, "end_x", pgrouting::ANY_NUMERICAL}; + info[9] = {-1, 0, false, "end_y", pgrouting::ANY_NUMERICAL}; + info[10] = {-1, 0, false, "end_open", pgrouting::ANY_NUMERICAL}; + info[11] = {-1, 0, false, "end_close", pgrouting::ANY_NUMERICAL}; + info[12] = {-1, 0, false, "end_service", pgrouting::ANY_NUMERICAL}; + info[13] = {-1, 0, false, "speed", pgrouting::ANY_NUMERICAL}; + /* nodes are going to be ignored*/ + info[14] = {-1, 0, false, "start_node_id", pgrouting::ANY_INTEGER}; + info[15] = {-1, 0, false, "end_node_id", pgrouting::ANY_INTEGER}; + + if (with_id) { + /* (x,y) values are ignored*/ + info[2].strict = false; + info[3].strict = false; + /* start nodes are compulsory*/ + info[14].strict = false; + } + + pgrouting::get_data(sql, rows, total_rows, with_id, info, &pgrouting::fetch_vehicle); + } catch (const std::string &ex) { + (*rows) = pgr_free(*rows); + (*total_rows) = 0; + *err_msg = pgr_msg(ex.c_str()); + } catch(...) { + (*rows) = pgr_free(*rows); + (*total_rows) = 0; + *err_msg = pgr_msg("Caught unknown exception!"); + } +} +#endif From 30530a6452d3bdfa4f2a8276ab053445d25dcf19 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 22 Jan 2024 11:54:29 -0600 Subject: [PATCH 050/428] c_common pgdata_getters.h -> cpp_common/pgdata_getters.hpp pgdata_getters will be called from C++ code only --- .../{c_common/pgdata_getters.h => cpp_common/pgdata_getters.hpp} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename include/{c_common/pgdata_getters.h => cpp_common/pgdata_getters.hpp} (100%) diff --git a/include/c_common/pgdata_getters.h b/include/cpp_common/pgdata_getters.hpp similarity index 100% rename from include/c_common/pgdata_getters.h rename to include/cpp_common/pgdata_getters.hpp From 41567da74cc07805558d3128cbebd9dd370129fa Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 22 Jan 2024 12:01:25 -0600 Subject: [PATCH 051/428] pgdata_getters to be used from C++ - parameter is the sql query - returns a C++ container --- include/cpp_common/pgdata_getters.hpp | 147 +++--- src/cpp_common/pgdata_getters.cpp | 674 +++++++++----------------- 2 files changed, 281 insertions(+), 540 deletions(-) diff --git a/include/cpp_common/pgdata_getters.hpp b/include/cpp_common/pgdata_getters.hpp index e28d5e0337..4da365f0c1 100644 --- a/include/cpp_common/pgdata_getters.hpp +++ b/include/cpp_common/pgdata_getters.hpp @@ -1,11 +1,13 @@ /*PGR-GNU***************************************************************** -File: pgdata_getters.h +File: pgdata_getters.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org +Copyright (c) 2024 Celia Virginia Vergara Castillo +- Return C++ container Copyright (c) 2023 Celia Virginia Vergara Castillo -mail: vicky at erosion.dev +- cat into one file Copyright (c) 2020 Mahmoud SAKR and Esteban ZIMANYI mail: m_attia_sakrcw at yahoo.com, estebanzimanyicw at gmail.com Copyright (c) 2016 Rohith Reddy @@ -32,113 +34,86 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_C_COMMON_PGDATA_GETTERS_H_ -#define INCLUDE_C_COMMON_PGDATA_GETTERS_H_ +#ifndef INCLUDE_C_COMMON_PGDATA_GETTERS_HPP_ +#define INCLUDE_C_COMMON_PGDATA_GETTERS_HPP_ #pragma once -#ifdef __cplusplus extern "C" { -#endif #include -#include -#include -#include -#include -#include #include -#include -#ifdef __cplusplus } -#endif -#ifdef __cplusplus #include #include -#else -#include -#include -#include -#endif - -#ifdef __cplusplus -using IID_t_rt = struct IID_t_rt; -using II_t_rt = struct II_t_rt; -using Coordinate_t = struct Coordinate_t; -using Delauny_t = struct Delauny_t; -using Edge_xy_t = struct Edge_xy_t; -using Flow_t = struct Flow_t; -using Edge_bool_t = struct Edge_bool_t; -using CostFlow_t = struct CostFlow_t; -using Edge_t = struct Edge_t; -using Orders_t = struct Orders_t; -using Point_on_edge_t = struct Point_on_edge_t; -using Vehicle_t = struct Vehicle_t; -using Restriction_t = struct Restriction_t; -#else -typedef struct IID_t_rt IID_t_rt; -typedef struct II_t_rt II_t_rt; -typedef struct Coordinate_t Coordinate_t; -typedef struct Delauny_t Delauny_t; -typedef struct Edge_xy_t Edge_xy_t; -typedef struct Flow_t Flow_t; -typedef struct Edge_bool_t Edge_bool_t; -typedef struct CostFlow_t CostFlow_t; -typedef struct Edge_t Edge_t; -typedef struct Orders_t Orders_t; -typedef struct Point_on_edge_t Point_on_edge_t; -typedef struct Restriction_t Restriction_t; -typedef struct Vehicle_t Vehicle_t; -#endif - - -#ifdef __cplusplus -extern "C" { -#endif +#include +#include +#include + +#include "cpp_common/undefPostgresDefine.hpp" + +#include "c_types/info_t.hpp" +#include "c_types/ii_t_rt.h" +#include "c_types/coordinate_t.h" +#include "c_types/delauny_t.h" +#include "c_types/edge_bool_t_rt.h" +#include "c_types/costFlow_t.h" +#include "c_types/edge_xy_t.h" +#include "c_types/edge_t.h" +#include "c_types/iid_t_rt.h" +#include "c_types/pickDeliver/orders_t.h" +#include "c_types/restriction_t.h" +#include "c_types/point_on_edge_t.h" +#include "c_types/pickDeliver/vehicle_t.h" + +namespace pgrouting { +namespace pgget { + +/** @brief Enforces the input array to be @b NOT empty */ +std::vector get_intArray(ArrayType*, bool); -/** @brief Read rows of combinations, called from C file*/ -void pgr_get_combinations(char *, II_t_rt **, size_t *, char**); +/** @brief Reads a postgres array saving it as set */ +std::set get_intSet(ArrayType*); -/** @brief Read rows of matrix, called from C file*/ -void pgr_get_coordinates(char*, Coordinate_t**, size_t*, char**); +/** @brief Read rows of combinations */ +std::vector get_combinations(const std::string&); -/** @brief Read rows of delauny triangles, called from C file*/ -void pgr_get_delauny(char*, Delauny_t**, size_t*, char**); +/** @brief Read rows of matrix */ +std::vector get_coordinates(const std::string&); -/** @brief Read edges called from C file*/ -void pgr_get_edges(char*, Edge_t**, size_t*, bool, bool, char**); +/** @brief Read rows of delauny triangles */ +std::vector get_delauny(const std::string&); -/** @brief Read edges with x, y endpointscalled from C file */ -void pgr_get_edges_xy(char*, Edge_xy_t**, size_t*, bool, char**); +/** @brief Read edges */ +std::vector get_edges(const std::string&, bool, bool); -/** @brief Read edges for flow called from C file */ -void pgr_get_flow_edges(char*, Edge_t**, size_t*, char**); +/** @brief Read edges with x, y endpoints */ +std::vector get_edges_xy(const std::string&, bool); -/** @brief Read edges for cost called from C fileflow */ -void pgr_get_costFlow_edges(char*, CostFlow_t**, size_t*, char**); +/** @brief Read edges for flow */ +std::vector get_flow_edges(const std::string&); -/** @brief Read "basic edges" called from C file */ -void pgr_get_basic_edges(char*, Edge_bool_t**, size_t*, char**); +/** @brief Read edges for cost */ +std::vector get_costFlow_edges(const std::string&); -/** @brief Read rows of matrix, called from C file*/ -void pgr_get_matrixRows(char*, IID_t_rt**, size_t *, char **); +/** @brief Read basic edges */ +std::vector get_basic_edges(const std::string&); + +/** @brief Read rows of matrix */ +std::vector get_matrixRows(const std::string&); /** @brief Reads the pick-Deliver orders */ -void pgr_get_orders(char *, Orders_t **, size_t *, bool, char**); +std::vector get_orders(const std::string&, bool); -/** @brief Read rows of points, called from C file*/ -void pgr_get_points(char*, Point_on_edge_t**, size_t*, char**); +/** @brief Read rows of points */ +std::vector get_points(const std::string&); -/** @brief Read rows of matrix, called from C file*/ -void pgr_get_restrictions(char*, Restriction_t**, size_t*, char**); +/** @brief Read rows of matrix */ +std::vector get_restrictions(const std::string&); /** @brief Reads the vehicles */ -void pgr_get_vehicles(char*, Vehicle_t**, size_t*, bool, char**); - -/** @brief Enforces the input array to be @b NOT empty */ -int64_t* pgr_get_bigIntArray(size_t*, ArrayType*, bool, char**); +std::vector get_vehicles(const std::string&, bool); -#ifdef __cplusplus -} -#endif +} // namespace pgget +} // namespace pgrouting -#endif // INCLUDE_C_COMMON_PGDATA_GETTERS_H_ +#endif // INCLUDE_CPP_COMMON_PGGET_H_ diff --git a/src/cpp_common/pgdata_getters.cpp b/src/cpp_common/pgdata_getters.cpp index ef60c0c189..5ad053a543 100644 --- a/src/cpp_common/pgdata_getters.cpp +++ b/src/cpp_common/pgdata_getters.cpp @@ -4,8 +4,10 @@ File: pgdata_getters.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org +Copyright (c) 2024 Celia Virginia Vergara Castillo +- Return C++ container Copyright (c) 2023 Celia Virginia Vergara Castillo -mail: vicky at erosion.dev +- cat into one file Copyright (c) 2020 Mahmoud SAKR and Esteban ZIMANYI mail: m_attia_sakrcw at yahoo.com, estebanzimanyicw at gmail.com Copyright (c) 2016 Rohith Reddy @@ -33,15 +35,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "c_common/pgdata_getters.h" +#include "cpp_common/pgdata_getters.hpp" #include #include #include #include +#include #include "cpp_common/get_data.hpp" #include "cpp_common/get_check_data.hpp" -#include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgdata_fetchers.hpp" #include "c_types/info_t.hpp" @@ -59,187 +61,116 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/point_on_edge_t.h" #include "c_types/restriction_t.h" +namespace pgrouting { +namespace pgget { /** - * @param[out] arrlen Length of the array * @param[in] input the postgres array * @param[in] allow_empty when true, empty arrays are accepted. - * @param[out] err_msg when not null, there was an error and contains the message - * @returns Returns a C array of integers + * @returns Returns a vector of int64_t */ -int64_t* pgr_get_bigIntArray(size_t *arrlen, ArrayType *input, bool allow_empty, char** err_msg) { - using pgrouting::pgr_msg; - try { - return pgrouting::get_array(input, arrlen, allow_empty); - } catch (const std::string &ex) { - (*arrlen) = 0; - *err_msg = pgr_msg(ex.c_str()); - return nullptr; - } catch(...) { - (*arrlen) = 0; - *err_msg = pgr_msg("Caught unknown exception!"); - return nullptr; - } +std::vector get_intArray(ArrayType *input, bool allow_empty) { + return pgrouting::get_pgarray(input, allow_empty); +} + +/** + * @param[in] arr 1 dimension postgres array + * @returns Returns a set of int64_t + * + * Can be empty set. + */ +std::set get_intSet(ArrayType *arr) { + return pgrouting::get_pgset(arr); } /** + For queries of the type: ~~~~{.c} SELECT source, target FROM combinations; ~~~~ - @param[in] sql The query - @param [out] rows array of combinations - @param [out] total_rows size of combinations - @param[out] err_msg when not null, there was an error and contains the message + @param[in] sql The combinations query + @returns vector of `II_t_rt` combinations */ -void pgr_get_combinations( - char *sql, - II_t_rt **rows, - size_t *total_rows, - char **err_msg) { - using pgrouting::pgr_msg; - using pgrouting::pgr_free; +std::vector get_combinations(const std::string &sql) { using pgrouting::Column_info_t; - try { - std::vector info{2}; - - info[0] = {-1, 0, true, "source", pgrouting::ANY_INTEGER}; - info[1] = {-1, 0, true, "target", pgrouting::ANY_INTEGER}; - pgrouting::get_data(sql, rows, total_rows, true, info, &pgrouting::fetch_combination); - } catch (const std::string &ex) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg(ex.c_str()); - } catch(...) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg("Caught unknown exception!"); - } + std::vector info{ + {-1, 0, true, "source", ANY_INTEGER}, + {-1, 0, true, "target", ANY_INTEGER}}; + + return get_data(sql, true, info, &fetch_combination); } +/** @details -/** For queries of the type: ~~~~{.c} SELECT id, x, y FROM coordinates; ~~~~ - @param[in] sql The query - @param[out] rows the matrix coordinates - @param[out] total_rows size of coordinates - @param[out] err_msg when not null, there was an error and contains the message + @param[in] sql The coordinates query + @returns vector of `Coordinate_t` */ -void pgr_get_coordinates( - char *sql, - Coordinate_t **rows, - size_t *total_rows, - char **err_msg) { - using pgrouting::pgr_msg; - using pgrouting::pgr_free; +std::vector get_coordinates(const std::string &sql) { using pgrouting::Column_info_t; - try { - std::vector info{3}; - - info[0] = {-1, 0, true, "id", pgrouting::ANY_INTEGER}; - info[1] = {-1, 0, true, "x", pgrouting::ANY_NUMERICAL}; - info[2] = {-1, 0, true, "y", pgrouting::ANY_NUMERICAL}; - pgrouting::get_data(sql, rows, total_rows, true, info, &pgrouting::fetch_coordinate); - } catch (const std::string &ex) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg(ex.c_str()); - } catch(...) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg("Caught unknown exception!"); - } + std::vector info{ + {-1, 0, true, "id", ANY_INTEGER}, + {-1, 0, true, "x", ANY_NUMERICAL}, + {-1, 0, true, "y", ANY_NUMERICAL}}; + + return get_data(sql, true, info, &fetch_coordinate); } -/** +/** @details + For queries of the type: ~~~~{.c} SELECT tid, pid, x, y FROM delauny; SELECT pid, pid, x, y FROM delauny; ~~~~ - @param[in] sql The query - @param[out] rows the delauny array - @param[out] total_rows size of delauny - @param[out] err_msg when not null, there was an error and contains the message + @param[in] sql The delauny triangles query + @returns vector of `Delauny_t` */ -void pgr_get_delauny( - char *sql, - Delauny_t **rows, - size_t *total_rows, - char **err_msg) { - using pgrouting::pgr_msg; - using pgrouting::pgr_free; +std::vector get_delauny(const std::string &sql) { using pgrouting::Column_info_t; - try { - std::vector info{4}; - - info[0] = {-1, 0, true, "tid", pgrouting::ANY_INTEGER}; - info[1] = {-1, 0, true, "pid", pgrouting::ANY_INTEGER}; - info[2] = {-1, 0, true, "x", pgrouting::ANY_NUMERICAL}; - info[3] = {-1, 0, true, "y", pgrouting::ANY_NUMERICAL}; - pgrouting::get_data(sql, rows, total_rows, true, info, &pgrouting::fetch_delauny); - } catch (const std::string &ex) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg(ex.c_str()); - } catch(...) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg("Caught unknown exception!"); - } + std::vector info{ + {-1, 0, true, "tid", ANY_INTEGER}, + {-1, 0, true, "pid", ANY_INTEGER}, + {-1, 0, true, "x", ANY_NUMERICAL}, + {-1, 0, true, "y", ANY_NUMERICAL}}; + + return get_data(sql, true, info, &fetch_delauny); } /** + For queries of the type: ~~~~{.c} SELECT id, source, target, capacity, [reverse_capacity] FROM edge_table; ~~~~ - @param[in] sql The query - @param[out] rows the edges array - @param[out] total_rows size of edges - @param[out] err_msg when not null, there was an error and contains the message + @param[in] sql The flow edges query + @returns vector of `Edge_t` */ -void -pgr_get_flow_edges( - char *sql, - Edge_t **rows, - size_t *total_rows, - char **err_msg) { - using pgrouting::pgr_msg; - using pgrouting::pgr_free; +std::vector get_flow_edges(const std::string &sql) { using pgrouting::Column_info_t; - try { - std::vector info{5}; - - info[0] = {-1, 0, true, "id", pgrouting::ANY_INTEGER}; - info[1] = {-1, 0, true, "source", pgrouting::ANY_INTEGER}; - info[2] = {-1, 0, true, "target", pgrouting::ANY_INTEGER}; - info[3] = {-1, 0, true, "capacity", pgrouting::ANY_INTEGER}; - info[4] = {-1, 0, false, "reverse_capacity", pgrouting::ANY_INTEGER}; - - pgrouting::get_data(sql, rows, total_rows, true, info, &pgrouting::fetch_edge); - } catch (const std::string &ex) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg(ex.c_str()); - } catch(...) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg("Caught unknown exception!"); - } + std::vector info{ + {-1, 0, true, "id", ANY_INTEGER}, + {-1, 0, true, "source", ANY_INTEGER}, + {-1, 0, true, "target", ANY_INTEGER}, + {-1, 0, true, "capacity", ANY_INTEGER}, + {-1, 0, false, "reverse_capacity", ANY_INTEGER}}; + + return get_data(sql, true, info, &fetch_edge); } /** + For queries of the type: ~~~~{.c} SELECT id, source, target, capacity, [reverse_capacity], cost, [reverse_cost] @@ -247,44 +178,25 @@ pgr_get_flow_edges( ~~~~ @param[in] sql The query - @param[out] rows the edges array - @param[out] total_rows size of edges - @param[out] err_msg when not null, there was an error and contains the message + @returns vector of `CostFlow_t` edges */ -void -pgr_get_costFlow_edges( - char *sql, - CostFlow_t **rows, - size_t *total_rows, - char **err_msg) { - using pgrouting::pgr_msg; - using pgrouting::pgr_free; +std::vector get_costFlow_edges(const std::string &sql) { using pgrouting::Column_info_t; - try { - std::vector info{7}; - - info[0] = {-1, 0, true, "id", pgrouting::ANY_INTEGER}; - info[1] = {-1, 0, true, "source", pgrouting::ANY_INTEGER}; - info[2] = {-1, 0, true, "target", pgrouting::ANY_INTEGER}; - info[3] = {-1, 0, true, "capacity", pgrouting::ANY_INTEGER}; - info[4] = {-1, 0, false, "reverse_capacity", pgrouting::ANY_INTEGER}; - info[5] = {-1, 0, true, "cost", pgrouting::ANY_NUMERICAL}; - info[6] = {-1, 0, false, "reverse_cost", pgrouting::ANY_NUMERICAL}; - - pgrouting::get_data(sql, rows, total_rows, true, info, &pgrouting::fetch_costFlow_edge); - } catch (const std::string &ex) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg(ex.c_str()); - } catch(...) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg("Caught unknown exception!"); - } + std::vector info{ + {-1, 0, true, "id", ANY_INTEGER}, + {-1, 0, true, "source", ANY_INTEGER}, + {-1, 0, true, "target", ANY_INTEGER}, + {-1, 0, true, "capacity", ANY_INTEGER}, + {-1, 0, false, "reverse_capacity", ANY_INTEGER}, + {-1, 0, true, "cost", ANY_NUMERICAL}, + {-1, 0, false, "reverse_cost", ANY_NUMERICAL}}; + + return get_data(sql, true, info, &fetch_costFlow_edge); } /** + For queries of the type: ~~~~{.c} SELECT id, source, target, cost, [reverse_cost] FROM edge_table; @@ -297,377 +209,231 @@ pgr_get_costFlow_edges( @todo This option will be removed on V4 @param[in] sql The query - @param[out] rows the edges array - @param[out] total_rows size of edges - @param[out] err_msg when not null, there was an error and contains the message + @returns vector of `Edge_bool_t` */ -void -pgr_get_basic_edges( - char *sql, - Edge_bool_t **rows, - size_t *total_rows, - char **err_msg) { - using pgrouting::pgr_msg; - using pgrouting::pgr_free; +std::vector get_basic_edges(const std::string &sql) { using pgrouting::Column_info_t; - try { - std::vector info{7}; - - info[0] = {-1, 0, true, "id", pgrouting::ANY_INTEGER}; - info[1] = {-1, 0, true, "source", pgrouting::ANY_INTEGER}; - info[2] = {-1, 0, true, "target", pgrouting::ANY_INTEGER}; - info[3] = {-1, 0, false, "going", pgrouting::ANY_NUMERICAL}; - info[4] = {-1, 0, false, "coming", pgrouting::ANY_NUMERICAL}; - info[5] = {-1, 0, false, "cost", pgrouting::ANY_NUMERICAL}; - info[6] = {-1, 0, false, "reverse_cost", pgrouting::ANY_NUMERICAL}; - - pgrouting::get_data(sql, rows, total_rows, true, info, &pgrouting::fetch_basic_edge); - } catch (const std::string &ex) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg(ex.c_str()); - } catch(...) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg("Caught unknown exception!"); - } + std::vector info{ + {-1, 0, true, "id", ANY_INTEGER}, + {-1, 0, true, "source", ANY_INTEGER}, + {-1, 0, true, "target", ANY_INTEGER}, + {-1, 0, false, "going", ANY_NUMERICAL}, + {-1, 0, false, "coming", ANY_NUMERICAL}, + {-1, 0, false, "cost", ANY_NUMERICAL}, + {-1, 0, false, "reverse_cost", ANY_NUMERICAL}}; + + return get_data(sql, true, info, &fetch_basic_edge); } /** + For queries of the type: ~~~~{.c} SELECT id, source, target, cost, [reverse_cost], x1, y1, x2, y2 FROM edge_table; ~~~~ - @param[in] sql The query - @param[out] rows the edges array - @param[out] total_rows size of edges + @param[in] sql The edges query @param[in] normal when false then the graph is reversed - @param[out] err_msg when not null, there was an error and contains the message + @returns vector of `Edge_xy_t` */ -void -pgr_get_edges_xy( - char *sql, - Edge_xy_t **rows, - size_t *total_rows, - bool normal, - char **err_msg) { - using pgrouting::pgr_msg; - using pgrouting::pgr_free; +std::vector get_edges_xy(const std::string &sql, bool normal) { using pgrouting::Column_info_t; - try { - std::vector info{9}; - - info[0] = {-1, 0, true, "id", pgrouting::ANY_INTEGER}; - info[1] = {-1, 0, true, "source", pgrouting::ANY_INTEGER}; - info[2] = {-1, 0, true, "target", pgrouting::ANY_INTEGER}; - info[3] = {-1, 0, true, "cost", pgrouting::ANY_NUMERICAL}; - info[4] = {-1, 0, false, "reverse_cost", pgrouting::ANY_NUMERICAL}; - info[5] = {-1, 0, true, "x1", pgrouting::ANY_NUMERICAL}; - info[6] = {-1, 0, true, "y1", pgrouting::ANY_NUMERICAL}; - info[7] = {-1, 0, true, "x2", pgrouting::ANY_NUMERICAL}; - info[8] = {-1, 0, true, "y2", pgrouting::ANY_NUMERICAL}; - - pgrouting::get_data(sql, rows, total_rows, normal, info, &pgrouting::fetch_edge_with_xy); - } catch (const std::string &ex) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg(ex.c_str()); - } catch(...) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg("Caught unknown exception!"); - } + std::vector info{ + {-1, 0, true, "id", ANY_INTEGER}, + {-1, 0, true, "source", ANY_INTEGER}, + {-1, 0, true, "target", ANY_INTEGER}, + {-1, 0, true, "cost", ANY_NUMERICAL}, + {-1, 0, false, "reverse_cost", ANY_NUMERICAL}, + {-1, 0, true, "x1", ANY_NUMERICAL}, + {-1, 0, true, "y1", ANY_NUMERICAL}, + {-1, 0, true, "x2", ANY_NUMERICAL}, + {-1, 0, true, "y2", ANY_NUMERICAL}}; + + return get_data(sql, normal, info, &fetch_edge_xy); } /** + For queries of the type: ~~~~{.c} SELECT id, source, target, cost, [reverse_cost] FROM edge_table; ~~~~ @param[in] sql The query - @param[out] rows the edges array - @param[out] total_rows size of edges @param[in] normal when false then the graph is reversed @param[in] ignore_id when true id value of edge is ignored - @param[out] err_msg when not null, there was an error and contains the message + @returns vector of `Edge_t` */ -void -pgr_get_edges( - char *sql, - Edge_t **rows, - size_t *total_rows, - bool normal, - bool ignore_id, - char **err_msg) { - using pgrouting::pgr_msg; - using pgrouting::pgr_free; +std::vector get_edges(const std::string &sql, bool normal, bool ignore_id) { using pgrouting::Column_info_t; - try { - std::vector info{5}; - - info[0] = {-1, 0, !ignore_id, "id", pgrouting::ANY_INTEGER}; - info[1] = {-1, 0, true, "source", pgrouting::ANY_INTEGER}; - info[2] = {-1, 0, true, "target", pgrouting::ANY_INTEGER}; - info[3] = {-1, 0, true, "cost", pgrouting::ANY_NUMERICAL}; - info[4] = {-1, 0, false, "reverse_cost", pgrouting::ANY_NUMERICAL}; - - pgrouting::get_data(sql, rows, total_rows, normal, info, &pgrouting::fetch_edge); - } catch (const std::string &ex) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg(ex.c_str()); - } catch(...) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg("Caught unknown exception!"); - } + std::vector info{ + {-1, 0, !ignore_id, "id", ANY_INTEGER}, + {-1, 0, true, "source", ANY_INTEGER}, + {-1, 0, true, "target", ANY_INTEGER}, + {-1, 0, true, "cost", ANY_NUMERICAL}, + {-1, 0, false, "reverse_cost", ANY_NUMERICAL}}; + + return get_data(sql, normal, info, &fetch_edge); } /** + For queries of the type: ~~~~{.c} SELECT start_vid, end_vid, agg_cost FROM matrix_data; ~~~~ - @param[in] sql The query - @param[out] rows of the matrix array - @param[out] total_rows size of matrix rows - @param[out] err_msg when not null, there was an error and contains the message + @param[in] sql The matrix + @returns vector of `IID_t_rt` */ -void pgr_get_matrixRows( - char *sql, - IID_t_rt **rows, - size_t *total_rows, - char **err_msg) { - using pgrouting::pgr_msg; - using pgrouting::pgr_free; +std::vector get_matrixRows(const std::string &sql) { using pgrouting::Column_info_t; - try { - std::vector info{3}; - - info[0] = {-1, 0, true, "start_vid", pgrouting::ANY_INTEGER}; - info[1] = {-1, 0, true, "end_vid", pgrouting::ANY_INTEGER}; - info[2] = {-1, 0, true, "agg_cost", pgrouting::ANY_NUMERICAL}; - pgrouting::get_data(sql, rows, total_rows, true, info, &pgrouting::pgr_fetch_row); - } catch (const std::string &ex) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg(ex.c_str()); - } catch(...) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg("Caught unknown exception!"); - } + std::vector info{ + {-1, 0, true, "start_vid", ANY_INTEGER}, + {-1, 0, true, "end_vid", ANY_INTEGER}, + {-1, 0, true, "agg_cost", ANY_NUMERICAL}}; + return get_data(sql, true, info, &pgr_fetch_row); } /** + For queries of the type: ~~~~{.c} SELECT id, demand - [p_node_id | p_x, p_y], p_open, p_close, p_service, - [d_node_id | d_x, d_y], d_open, d_close, d_service, + [p_node_id | p_x, p_y], p_open, p_close, p_service, + [d_node_id | d_x, d_y], d_open, d_close, d_service, FROM orders; ~~~~ - @param[in] sql The query - @param[out] rows of the orders - @param[out] total_rows size of orders rows - @param[out] with_id flag to choose if its euclidean or matrix - @param[out] err_msg when not null, there was an error and contains the message + @param[in] sql The orders query + @param[in] with_id flag that idicates if id is to be used + @returns vector of `Orders_t` */ -void pgr_get_orders( - char *sql, - Orders_t **rows, - size_t *total_rows, - bool with_id, - char **err_msg) { - using pgrouting::pgr_msg; - using pgrouting::pgr_free; +std::vector get_orders( + const std::string &sql, + bool with_id + ) { using pgrouting::Column_info_t; - try { - std::vector info{14}; - - info[0] = {-1, 0, true, "id", pgrouting::ANY_INTEGER}; - info[1] = {-1, 0, true, "demand", pgrouting::ANY_NUMERICAL}; - info[2] = {-1, 0, true, "p_x", pgrouting::ANY_NUMERICAL}; - info[3] = {-1, 0, true, "p_y", pgrouting::ANY_NUMERICAL}; - info[4] = {-1, 0, true, "p_open", pgrouting::ANY_NUMERICAL}; - info[5] = {-1, 0, true, "p_close", pgrouting::ANY_NUMERICAL}; - info[6] = {-1, 0, false, "p_service", pgrouting::ANY_NUMERICAL}; - info[7] = {-1, 0, true, "d_x", pgrouting::ANY_NUMERICAL}; - info[8] = {-1, 0, true, "d_y", pgrouting::ANY_NUMERICAL}; - info[9] = {-1, 0, true, "d_open", pgrouting::ANY_NUMERICAL}; - info[10] = {-1, 0, true, "d_close", pgrouting::ANY_NUMERICAL}; - info[11] = {-1, 0, false, "d_service", pgrouting::ANY_NUMERICAL}; - /* nodes are going to be ignored*/ - info[12] = {-1, 0, false, "p_node_id", pgrouting::ANY_INTEGER}; - info[13] = {-1, 0, false, "d_node_id", pgrouting::ANY_INTEGER}; - - if (with_id) { - /* (x,y) values are ignored*/ - info[2].strict = false; - info[3].strict = false; - info[7].strict = false; - info[8].strict = false; - /* nodes are compulsory*/ - info[12].strict = true; - info[13].strict = true; - } - - pgrouting::get_data(sql, rows, total_rows, with_id, info, &pgrouting::fetch_orders); - } catch (const std::string &ex) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg(ex.c_str()); - } catch(...) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg("Caught unknown exception!"); + std::vector info{ + {-1, 0, true, "id", ANY_INTEGER}, + {-1, 0, true, "demand", ANY_NUMERICAL}, + {-1, 0, true, "p_x", ANY_NUMERICAL}, + {-1, 0, true, "p_y", ANY_NUMERICAL}, + {-1, 0, true, "p_open", ANY_NUMERICAL}, + {-1, 0, true, "p_close", ANY_NUMERICAL}, + {-1, 0, false, "p_service", ANY_NUMERICAL}, + {-1, 0, true, "d_x", ANY_NUMERICAL}, + {-1, 0, true, "d_y", ANY_NUMERICAL}, + {-1, 0, true, "d_open", ANY_NUMERICAL}, + {-1, 0, true, "d_close", ANY_NUMERICAL}, + {-1, 0, false, "d_service", ANY_NUMERICAL}, + /* nodes are going to be ignored*/ + {-1, 0, false, "p_node_id", ANY_INTEGER}, + {-1, 0, false, "d_node_id", ANY_INTEGER}}; + + if (with_id) { + /* (x,y) values are ignored*/ + info[2].strict = false; + info[3].strict = false; + info[7].strict = false; + info[8].strict = false; + /* nodes are compulsory*/ + info[12].strict = true; + info[13].strict = true; } -} + return get_data(sql, with_id, info, &fetch_orders); +} /** + For queries of the type: ~~~~{.c} SELECT pid, edge_id, fraction side FROM points; ~~~~ - @param[in] sql The query - @param[out] rows the points array - @param[out] total_rows size of points - @param[out] err_msg when not null, there was an error and contains the message + @param[in] sql The points query + @returns vector of `Point_on_edge_t` */ -void pgr_get_points( - char *sql, - Point_on_edge_t **rows, - size_t *total_rows, - char **err_msg) { - using pgrouting::pgr_free; - using pgrouting::pgr_msg; +std::vector get_points(const std::string &sql) { using pgrouting::Column_info_t; - try { - std::vector info{4}; - - info[0] = {-1, 0, false, "pid", pgrouting::ANY_INTEGER}; - info[1] = {-1, 0, true, "edge_id", pgrouting::ANY_INTEGER}; - info[2] = {-1, 0, true, "fraction", pgrouting::ANY_NUMERICAL}; - info[3] = {-1, 0, false, "side", pgrouting::CHAR1}; - pgrouting::get_data(sql, rows, total_rows, true, info, &pgrouting::fetch_point); - } catch (const std::string &ex) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg(ex.c_str()); - } catch(...) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg("Caught unknown exception!"); - } + std::vector info{ + {-1, 0, false, "pid", ANY_INTEGER}, + {-1, 0, true, "edge_id", ANY_INTEGER}, + {-1, 0, true, "fraction", ANY_NUMERICAL}, + {-1, 0, false, "side", pgrouting::CHAR1}}; + + return get_data(sql, true, info, &fetch_point); } /** + For queries of the type: ~~~~{.c} SELECT cost, path FROM restrictions; ~~~~ - @param[in] sql The query - @param[out] rows the restrictions array - @param[out] total_rows size of restrictions - @param[out] err_msg when not null, there was an error and contains the message + @param[in] sql The restrictions query + @returns vector of `Restriction_t` */ -void pgr_get_restrictions( - char *sql, - Restriction_t **rows, - size_t *total_rows, - char **err_msg) { - using pgrouting::pgr_msg; - using pgrouting::pgr_free; +std::vector get_restrictions(const std::string &sql) { using pgrouting::Column_info_t; - try { - std::vector info{2}; - - info[0] = {-1, 0, true, "cost", pgrouting::ANY_NUMERICAL}; - info[1] = {-1, 0, true, "path", pgrouting::ANY_INTEGER_ARRAY}; - pgrouting::get_data(sql, rows, total_rows, true, info, &pgrouting::fetch_restriction); - } catch (const std::string &ex) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg(ex.c_str()); - } catch(...) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg("Caught unknown exception!"); - } + std::vector info{ + {-1, 0, true, "cost", ANY_NUMERICAL}, + {-1, 0, true, "path", ANY_INTEGER_ARRAY}}; + + return get_data(sql, true, info, &fetch_restriction); } /** + For queries of the type: ~~~~{.c} SELECT id, capacity, speed, number - [start_node_id | start_x, start_y], start_open, start_close, start_service, - [end_node_id | end_x, end_y], end_open, end_close, end_service, + [start_node_id | start_x, start_y], start_open, start_close, start_service, + [end_node_id | end_x, end_y], end_open, end_close, end_service, FROM orders; ~~~~ - @param[in] sql The query - @param[out] rows of vehicles - @param[out] total_rows size of vehicles rows - @param[out] with_id flag to choose if its euclidean or matrix - @param[out] err_msg when not null, there was an error and contains the message + @param[in] sql The vehicles query + @param[in] with_id flag that idicates if id is to be used + @returns vector of `Vehicle_t` */ -void pgr_get_vehicles( - char *sql, - Vehicle_t **rows, - size_t *total_rows, - bool with_id, - char **err_msg) { - using pgrouting::pgr_msg; - using pgrouting::pgr_free; +std::vector get_vehicles(const std::string &sql, bool with_id) { using pgrouting::Column_info_t; - try { - std::vector info{16}; - - info[0] = {-1, 0, true, "id", pgrouting::ANY_INTEGER}; - info[1] = {-1, 0, true, "capacity", pgrouting::ANY_NUMERICAL}; - info[2] = {-1, 0, true, "start_x", pgrouting::ANY_NUMERICAL}; - info[3] = {-1, 0, true, "start_y", pgrouting::ANY_NUMERICAL}; - info[4] = {-1, 0, false, "number", pgrouting::ANY_INTEGER}; - info[5] = {-1, 0, false, "start_open", pgrouting::ANY_NUMERICAL}; - info[6] = {-1, 0, false, "start_close", pgrouting::ANY_NUMERICAL}; - info[7] = {-1, 0, false, "start_service", pgrouting::ANY_NUMERICAL}; - info[8] = {-1, 0, false, "end_x", pgrouting::ANY_NUMERICAL}; - info[9] = {-1, 0, false, "end_y", pgrouting::ANY_NUMERICAL}; - info[10] = {-1, 0, false, "end_open", pgrouting::ANY_NUMERICAL}; - info[11] = {-1, 0, false, "end_close", pgrouting::ANY_NUMERICAL}; - info[12] = {-1, 0, false, "end_service", pgrouting::ANY_NUMERICAL}; - info[13] = {-1, 0, false, "speed", pgrouting::ANY_NUMERICAL}; - /* nodes are going to be ignored*/ - info[14] = {-1, 0, false, "start_node_id", pgrouting::ANY_INTEGER}; - info[15] = {-1, 0, false, "end_node_id", pgrouting::ANY_INTEGER}; - - if (with_id) { - /* (x,y) values are ignored*/ - info[2].strict = false; - info[3].strict = false; - /* start nodes are compulsory*/ - info[14].strict = false; - } - - pgrouting::get_data(sql, rows, total_rows, with_id, info, &pgrouting::fetch_vehicle); - } catch (const std::string &ex) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg(ex.c_str()); - } catch(...) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg("Caught unknown exception!"); + std::vector info{ + {-1, 0, true, "id", ANY_INTEGER}, + {-1, 0, true, "capacity", ANY_NUMERICAL}, + {-1, 0, true, "start_x", ANY_NUMERICAL}, + {-1, 0, true, "start_y", ANY_NUMERICAL}, + {-1, 0, false, "number", ANY_INTEGER}, + {-1, 0, false, "start_open", ANY_NUMERICAL}, + {-1, 0, false, "start_close", ANY_NUMERICAL}, + {-1, 0, false, "start_service", ANY_NUMERICAL}, + {-1, 0, false, "end_x", ANY_NUMERICAL}, + {-1, 0, false, "end_y", ANY_NUMERICAL}, + {-1, 0, false, "end_open", ANY_NUMERICAL}, + {-1, 0, false, "end_close", ANY_NUMERICAL}, + {-1, 0, false, "end_service", ANY_NUMERICAL}, + {-1, 0, false, "speed", ANY_NUMERICAL}, + /* nodes are going to be ignored*/ + {-1, 0, false, "start_node_id", ANY_INTEGER}, + {-1, 0, false, "end_node_id", ANY_INTEGER}}; + + if (with_id) { + /* (x,y) values are ignored*/ + info[2].strict = false; + info[3].strict = false; + /* start nodes are compulsory*/ + info[14].strict = false; } + + return get_data(sql, with_id, info, &fetch_vehicle); } + +} // namespace pgget +} // namespace pgrouting From ebd8df4b984fb3123ee68659fea54110f91c42b6 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 22 Jan 2024 12:07:27 -0600 Subject: [PATCH 052/428] pgdata_fetchers to return a (C++) structure --- include/cpp_common/pgdata_fetchers.hpp | 84 +++--- src/cpp_common/pgdata_fetchers.cpp | 396 +++++++++++++------------ 2 files changed, 250 insertions(+), 230 deletions(-) diff --git a/include/cpp_common/pgdata_fetchers.hpp b/include/cpp_common/pgdata_fetchers.hpp index e2566352e5..cb701765de 100644 --- a/include/cpp_common/pgdata_fetchers.hpp +++ b/include/cpp_common/pgdata_fetchers.hpp @@ -4,8 +4,10 @@ File: pgdata_fetchers.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org +Copyright (c) 2024 Celia Virginia Vergara Castillo +- Return (C++) structure Copyright (c) 2023 Celia Virginia Vergara Castillo -mail: vicky at erosion.dev +- cat into one file Copyright (c) 2020 Mahmoud SAKR and Esteban ZIMANYI mail: m_attia_sakrcw at yahoo.com, estebanzimanyicw at gmail.com Copyright (c) 2016 Rohith Reddy @@ -44,84 +46,86 @@ extern "C" { #include -using II_t_rt = struct II_t_rt; -using IID_t_rt = struct IID_t_rt; -using Coordinate_t = struct Coordinate_t; -using Delauny_t = struct Delauny_t; -using Edge_bool_t = struct Edge_bool_t; -using Edge_t = struct Edge_t; -using CostFlow_t = struct CostFlow_t; -using Edge_xy_t = struct Edge_xy_t; -using Orders_t = struct Orders_t; -using Restriction_t = struct Restriction_t; -using Point_on_edge_t = struct Point_on_edge_t; -using Vehicle_t = struct Vehicle_t; +#include "cpp_common/undefPostgresDefine.hpp" + +#include "c_types/info_t.hpp" +#include "c_types/ii_t_rt.h" +#include "c_types/coordinate_t.h" +#include "c_types/delauny_t.h" +#include "c_types/edge_bool_t_rt.h" +#include "c_types/costFlow_t.h" +#include "c_types/edge_xy_t.h" +#include "c_types/edge_t.h" +#include "c_types/iid_t_rt.h" +#include "c_types/pickDeliver/orders_t.h" +#include "c_types/restriction_t.h" +#include "c_types/point_on_edge_t.h" +#include "c_types/pickDeliver/vehicle_t.h" namespace pgrouting { -using Column_info_t = struct Column_info_t; +namespace pgget { -void fetch_combination( +II_t_rt fetch_combination( const HeapTuple, const TupleDesc &, const std::vector &, - int64_t*, II_t_rt*, size_t*, bool); + int64_t*, size_t*, bool); -void fetch_coordinate( +Coordinate_t fetch_coordinate( const HeapTuple, const TupleDesc &, const std::vector &, - int64_t*, Coordinate_t*, size_t*, bool); + int64_t*, size_t*, bool); -void fetch_delauny( +Delauny_t fetch_delauny( const HeapTuple, const TupleDesc &, const std::vector &, - int64_t*, Delauny_t*, size_t*, bool); + int64_t*, size_t*, bool); -void fetch_basic_edge( +Edge_bool_t fetch_basic_edge( const HeapTuple, const TupleDesc &, const std::vector &, - int64_t*, Edge_bool_t*, size_t*, bool); + int64_t*, size_t*, bool); -void fetch_edge( +Edge_t fetch_edge( const HeapTuple, const TupleDesc &, const std::vector &, - int64_t*, Edge_t*, size_t*, bool); + int64_t*, size_t*, bool); -void fetch_costFlow_edge( +Edge_xy_t fetch_edge_xy( const HeapTuple, const TupleDesc &, const std::vector &, - int64_t*, CostFlow_t*, size_t*, bool); + int64_t*, size_t*, bool); -void fetch_edge_with_xy( +CostFlow_t fetch_costFlow_edge( const HeapTuple, const TupleDesc &, const std::vector &, - int64_t*, Edge_xy_t*, size_t*, bool); + int64_t*, size_t*, bool); -void pgr_fetch_row( +IID_t_rt pgr_fetch_row( const HeapTuple, const TupleDesc &, const std::vector &, - int64_t*, IID_t_rt*, size_t*, bool); + int64_t*, size_t*, bool); -void fetch_orders( +Orders_t fetch_orders( const HeapTuple, const TupleDesc &, const std::vector &, - int64_t*, Orders_t*, size_t*, bool); + int64_t*, size_t*, bool); -void fetch_restriction( +Restriction_t fetch_restriction( const HeapTuple, const TupleDesc &, const std::vector &, - int64_t*, Restriction_t*, size_t*, bool); + int64_t*, size_t*, bool); -void fetch_point( +Point_on_edge_t fetch_point( const HeapTuple, const TupleDesc &, const std::vector &, - int64_t*, Point_on_edge_t*, size_t*, bool); + int64_t*, size_t*, bool); -void fetch_vehicle( +Vehicle_t fetch_vehicle( const HeapTuple, const TupleDesc &, const std::vector &, - int64_t*, Vehicle_t*, size_t*, bool); - - + int64_t*, size_t*, bool); +} // namespace pgget } // namespace pgrouting #endif // INCLUDE_C_COMMON_PGDATA_FETCHERS_HPP_ diff --git a/src/cpp_common/pgdata_fetchers.cpp b/src/cpp_common/pgdata_fetchers.cpp index d60e41e44a..d65a771b51 100644 --- a/src/cpp_common/pgdata_fetchers.cpp +++ b/src/cpp_common/pgdata_fetchers.cpp @@ -4,8 +4,10 @@ File: pgdata_fetchers.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org +Copyright (c) 2024 Celia Virginia Vergara Castillo +- Return (C++) structure Copyright (c) 2023 Celia Virginia Vergara Castillo -mail: vicky at erosion.dev +- cat into one file Copyright (c) 2020 Mahmoud SAKR and Esteban ZIMANYI mail: m_attia_sakrcw at yahoo.com, estebanzimanyicw at gmail.com Copyright (c) 2016 Rohith Reddy @@ -36,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_fetchers.hpp" #include -#include +#include #include #include "cpp_common/get_check_data.hpp" @@ -57,398 +59,412 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. namespace pgrouting { +namespace pgget { -void fetch_combination( +II_t_rt fetch_combination( const HeapTuple tuple, const TupleDesc &tupdesc, const std::vector &info, int64_t*, - II_t_rt *combination, - size_t* valid_combinations, + size_t*, bool) { - combination->d1.source = pgrouting::getBigInt(tuple, tupdesc, info[0]); - combination->d2.target = pgrouting::getBigInt(tuple, tupdesc, info[1]); - - *valid_combinations = *valid_combinations + 1; + II_t_rt combination; + combination.d1.source = getBigInt(tuple, tupdesc, info[0]); + combination.d2.target = getBigInt(tuple, tupdesc, info[1]); + return combination; } -void fetch_coordinate( +Coordinate_t fetch_coordinate( const HeapTuple tuple, const TupleDesc &tupdesc, const std::vector &info, int64_t *default_id, - Coordinate_t* coordinate, size_t*, bool) { - if (pgrouting::column_found(info[0].colNumber)) { - coordinate->id = pgrouting::getBigInt(tuple, tupdesc, info[0]); + Coordinate_t coordinate; + if (column_found(info[0].colNumber)) { + coordinate.id = getBigInt(tuple, tupdesc, info[0]); } else { - coordinate->id = *default_id; + coordinate.id = *default_id; ++(*default_id); } - coordinate->x = pgrouting::getFloat8(tuple, tupdesc, info[1]); - coordinate->y = pgrouting::getFloat8(tuple, tupdesc, info[2]); + coordinate.x = getFloat8(tuple, tupdesc, info[1]); + coordinate.y = getFloat8(tuple, tupdesc, info[2]); + return coordinate; } -void fetch_delauny( +Delauny_t fetch_delauny( const HeapTuple tuple, const TupleDesc &tupdesc, const std::vector &info, int64_t*, - Delauny_t* delauny, size_t*, bool) { - delauny->tid = pgrouting::getBigInt(tuple, tupdesc, info[0]); - delauny->pid = pgrouting::getBigInt(tuple, tupdesc, info[1]); - delauny->x = pgrouting::getFloat8(tuple, tupdesc, info[2]); - delauny->y = pgrouting::getFloat8(tuple, tupdesc, info[3]); + Delauny_t delauny; + delauny.tid = getBigInt(tuple, tupdesc, info[0]); + delauny.pid = getBigInt(tuple, tupdesc, info[1]); + delauny.x = getFloat8(tuple, tupdesc, info[2]); + delauny.y = getFloat8(tuple, tupdesc, info[3]); + return delauny; } /* edges have many fetchers */ -void fetch_basic_edge( +Edge_bool_t fetch_basic_edge( const HeapTuple tuple, const TupleDesc &tupdesc, const std::vector &info, int64_t *default_id, - Edge_bool_t *edge, size_t *valid_edges, bool) { - if (pgrouting::column_found(info[0].colNumber)) { - edge->id = pgrouting::getBigInt(tuple, tupdesc, info[0]); + Edge_bool_t edge; + if (column_found(info[0].colNumber)) { + edge.id = getBigInt(tuple, tupdesc, info[0]); } else { - edge->id = *default_id; + edge.id = *default_id; ++(*default_id); } - bool new_columns = pgrouting::column_found(info[5].colNumber); + bool new_columns = column_found(info[5].colNumber); - edge->source = pgrouting::getBigInt(tuple, tupdesc, info[1]); - edge->target = pgrouting::getBigInt(tuple, tupdesc, info[2]); + edge.source = getBigInt(tuple, tupdesc, info[1]); + edge.target = getBigInt(tuple, tupdesc, info[2]); if (new_columns) { - edge->going = pgrouting::getFloat8(tuple, tupdesc, info[5]) > 0 - || (pgrouting::column_found(info[6].colNumber) - && pgrouting::getFloat8(tuple, tupdesc, info[6]) > 0); + edge.going = getFloat8(tuple, tupdesc, info[5]) > 0 + || (column_found(info[6].colNumber) + && getFloat8(tuple, tupdesc, info[6]) > 0); } else { - edge->going = pgrouting::getFloat8(tuple, tupdesc, info[3]) > 0 - || (pgrouting::column_found(info[4].colNumber) - && pgrouting::getFloat8(tuple, tupdesc, info[4]) > 0); + edge.going = getFloat8(tuple, tupdesc, info[3]) > 0 + || (column_found(info[4].colNumber) + && getFloat8(tuple, tupdesc, info[4]) > 0); } (*valid_edges)++; + return edge; } -void fetch_edge( +Edge_t fetch_edge( const HeapTuple tuple, const TupleDesc &tupdesc, const std::vector &info, int64_t *default_id, - Edge_t *edge, size_t *valid_edges, bool normal) { - if (pgrouting::column_found(info[0].colNumber)) { - edge->id = pgrouting::getBigInt(tuple, tupdesc, info[0]); + Edge_t edge; + if (column_found(info[0].colNumber)) { + edge.id = getBigInt(tuple, tupdesc, info[0]); } else { - edge->id = *default_id; + edge.id = *default_id; ++(*default_id); } if (normal) { - edge->source = pgrouting::getBigInt(tuple, tupdesc, info[1]); - edge->target = pgrouting::getBigInt(tuple, tupdesc, info[2]); + edge.source = getBigInt(tuple, tupdesc, info[1]); + edge.target = getBigInt(tuple, tupdesc, info[2]); } else { - edge->target = pgrouting::getBigInt(tuple, tupdesc, info[1]); - edge->source = pgrouting::getBigInt(tuple, tupdesc, info[2]); + edge.target = getBigInt(tuple, tupdesc, info[1]); + edge.source = getBigInt(tuple, tupdesc, info[2]); } - edge->cost = pgrouting::getFloat8(tuple, tupdesc, info[3]); + edge.cost = getFloat8(tuple, tupdesc, info[3]); - if (pgrouting::column_found(info[4].colNumber)) { - edge->reverse_cost = pgrouting::getFloat8(tuple, tupdesc, info[4]); + if (column_found(info[4].colNumber)) { + edge.reverse_cost = getFloat8(tuple, tupdesc, info[4]); } else { - edge->reverse_cost = -1; + edge.reverse_cost = -1; } - edge->cost = std::isinf(edge->cost)? - DBL_MAX : edge->cost; + edge.cost = std::isinf(edge.cost)? + std::numeric_limits::max() : edge.cost; - edge->reverse_cost = std::isinf(edge->reverse_cost)? - DBL_MAX : edge->reverse_cost; + edge.reverse_cost = std::isinf(edge.reverse_cost)? + std::numeric_limits::max() : edge.reverse_cost; - *valid_edges = edge->cost < 0? *valid_edges: *valid_edges + 1; - *valid_edges = edge->reverse_cost < 0? *valid_edges: *valid_edges + 1; + *valid_edges = edge.cost < 0? *valid_edges: *valid_edges + 1; + *valid_edges = edge.reverse_cost < 0? *valid_edges: *valid_edges + 1; + + return edge; } -void fetch_costFlow_edge( + +CostFlow_t fetch_costFlow_edge( const HeapTuple tuple, const TupleDesc &tupdesc, const std::vector &info, int64_t *default_id, - CostFlow_t *edge, size_t *valid_edges, bool normal) { - if (pgrouting::column_found(info[0].colNumber)) { - edge->edge_id = pgrouting::getBigInt(tuple, tupdesc, info[0]); + CostFlow_t edge; + if (column_found(info[0].colNumber)) { + edge.edge_id = getBigInt(tuple, tupdesc, info[0]); } else { - edge->edge_id = *default_id; + edge.edge_id = *default_id; ++(*default_id); } if (normal) { - edge->source = pgrouting::getBigInt(tuple, tupdesc, info[1]); - edge->target = pgrouting::getBigInt(tuple, tupdesc, info[2]); + edge.source = getBigInt(tuple, tupdesc, info[1]); + edge.target = getBigInt(tuple, tupdesc, info[2]); } else { - edge->target = pgrouting::getBigInt(tuple, tupdesc, info[1]); - edge->source = pgrouting::getBigInt(tuple, tupdesc, info[2]); + edge.target = getBigInt(tuple, tupdesc, info[1]); + edge.source = getBigInt(tuple, tupdesc, info[2]); } - edge->capacity = pgrouting::getBigInt(tuple, tupdesc, info[3]); - if (pgrouting::column_found(info[4].colNumber)) { - edge->reverse_capacity = pgrouting::getBigInt(tuple, tupdesc, info[4]); + edge.capacity = getBigInt(tuple, tupdesc, info[3]); + if (column_found(info[4].colNumber)) { + edge.reverse_capacity = getBigInt(tuple, tupdesc, info[4]); } else { - edge->reverse_capacity = -1; + edge.reverse_capacity = -1; } - edge->cost = pgrouting::getFloat8(tuple, tupdesc, info[5]); - if (pgrouting::column_found(info[6].colNumber)) { - edge->reverse_cost = pgrouting::getFloat8(tuple, tupdesc, info[6]); + edge.cost = getFloat8(tuple, tupdesc, info[5]); + if (column_found(info[6].colNumber)) { + edge.reverse_cost = getFloat8(tuple, tupdesc, info[6]); } else { - edge->reverse_cost = 0; + edge.reverse_cost = 0; } - *valid_edges = edge->capacity < 0? *valid_edges: *valid_edges + 1; - *valid_edges = edge->reverse_capacity < 0? *valid_edges: *valid_edges + 1; + *valid_edges = edge.capacity < 0? *valid_edges: *valid_edges + 1; + *valid_edges = edge.reverse_capacity < 0? *valid_edges: *valid_edges + 1; + return edge; } -void fetch_edge_with_xy( +Edge_xy_t fetch_edge_xy( const HeapTuple tuple, const TupleDesc &tupdesc, const std::vector &info, int64_t *default_id, - Edge_xy_t *edge, size_t *valid_edges, bool normal) { - if (pgrouting::column_found(info[0].colNumber)) { - edge->id = pgrouting::getBigInt(tuple, tupdesc, info[0]); + Edge_xy_t edge; + if (column_found(info[0].colNumber)) { + edge.id = getBigInt(tuple, tupdesc, info[0]); } else { - edge->id = *default_id; + edge.id = *default_id; ++(*default_id); } if (normal) { - edge->source = pgrouting::getBigInt(tuple, tupdesc, info[1]); - edge->target = pgrouting::getBigInt(tuple, tupdesc, info[2]); + edge.source = getBigInt(tuple, tupdesc, info[1]); + edge.target = getBigInt(tuple, tupdesc, info[2]); } else { - edge->target = pgrouting::getBigInt(tuple, tupdesc, info[1]); - edge->source = pgrouting::getBigInt(tuple, tupdesc, info[2]); + edge.target = getBigInt(tuple, tupdesc, info[1]); + edge.source = getBigInt(tuple, tupdesc, info[2]); } - edge->cost = pgrouting::getFloat8(tuple, tupdesc, info[3]); + edge.cost = getFloat8(tuple, tupdesc, info[3]); - if (pgrouting::column_found(info[4].colNumber)) { - edge->reverse_cost = pgrouting::getFloat8(tuple, tupdesc, info[4]); + if (column_found(info[4].colNumber)) { + edge.reverse_cost = getFloat8(tuple, tupdesc, info[4]); } else { - edge->reverse_cost = -1; + edge.reverse_cost = -1; } - edge->x1 = pgrouting::getFloat8(tuple, tupdesc, info[5]); - edge->y1 = pgrouting::getFloat8(tuple, tupdesc, info[6]); - edge->x2 = pgrouting::getFloat8(tuple, tupdesc, info[7]); - edge->y2 = pgrouting::getFloat8(tuple, tupdesc, info[8]); + edge.x1 = getFloat8(tuple, tupdesc, info[5]); + edge.y1 = getFloat8(tuple, tupdesc, info[6]); + edge.x2 = getFloat8(tuple, tupdesc, info[7]); + edge.y2 = getFloat8(tuple, tupdesc, info[8]); - *valid_edges = edge->cost < 0? *valid_edges: *valid_edges + 1; - *valid_edges = edge->reverse_cost < 0? *valid_edges: *valid_edges + 1; + *valid_edges = edge.cost < 0? *valid_edges: *valid_edges + 1; + *valid_edges = edge.reverse_cost < 0? *valid_edges: *valid_edges + 1; + return edge; } -void pgr_fetch_row( +IID_t_rt pgr_fetch_row( const HeapTuple tuple, const TupleDesc &tupdesc, const std::vector &info, int64_t*, - IID_t_rt *distance, size_t*, bool) { - distance->from_vid = pgrouting::getBigInt(tuple, tupdesc, info[0]); - distance->to_vid = pgrouting::getBigInt(tuple, tupdesc, info[1]); - distance->cost = pgrouting::getFloat8(tuple, tupdesc, info[2]); + IID_t_rt distance; + distance.from_vid = getBigInt(tuple, tupdesc, info[0]); + distance.to_vid = getBigInt(tuple, tupdesc, info[1]); + distance.cost = getFloat8(tuple, tupdesc, info[2]); + return distance; } -void fetch_orders( +Orders_t fetch_orders( const HeapTuple tuple, const TupleDesc &tupdesc, const std::vector &info, int64_t*, - Orders_t* pd_order, size_t*, bool with_id) { - pd_order->id = pgrouting::getBigInt(tuple, tupdesc, info[0]); - pd_order->demand = pgrouting::getFloat8(tuple, tupdesc, info[1]); + Orders_t pd_order; + pd_order.id = getBigInt(tuple, tupdesc, info[0]); + pd_order.demand = getFloat8(tuple, tupdesc, info[1]); /* * the pickups */ - pd_order->pick_x = with_id ? - 0 : pgrouting::getFloat8(tuple, tupdesc, info[2]); - pd_order->pick_y = with_id ? - 0 : pgrouting::getFloat8(tuple, tupdesc, info[3]); - pd_order->pick_open_t = pgrouting::getFloat8(tuple, tupdesc, info[4]); - pd_order->pick_close_t = pgrouting::getFloat8(tuple, tupdesc, info[5]); - pd_order->pick_service_t = pgrouting::column_found(info[6].colNumber) ? - pgrouting::getFloat8(tuple, tupdesc, info[6]) : 0; + pd_order.pick_x = with_id ? + 0 : getFloat8(tuple, tupdesc, info[2]); + pd_order.pick_y = with_id ? + 0 : getFloat8(tuple, tupdesc, info[3]); + pd_order.pick_open_t = getFloat8(tuple, tupdesc, info[4]); + pd_order.pick_close_t = getFloat8(tuple, tupdesc, info[5]); + pd_order.pick_service_t = column_found(info[6].colNumber) ? + getFloat8(tuple, tupdesc, info[6]) : 0; /* * the deliveries */ - pd_order->deliver_x = with_id ? - 0 : pgrouting::getFloat8(tuple, tupdesc, info[7]); - pd_order->deliver_y = with_id ? - 0 : pgrouting::getFloat8(tuple, tupdesc, info[8]); - pd_order->deliver_open_t = pgrouting::getFloat8(tuple, tupdesc, info[9]); - pd_order->deliver_close_t = pgrouting::getFloat8(tuple, tupdesc, info[10]); - pd_order->deliver_service_t = pgrouting::column_found(info[11].colNumber) ? - pgrouting::getFloat8(tuple, tupdesc, info[11]) : 0; - - pd_order->pick_node_id = with_id ? - pgrouting::getBigInt(tuple, tupdesc, info[12]) : 0; - pd_order->deliver_node_id = with_id ? - pgrouting::getBigInt(tuple, tupdesc, info[13]) : 0; + pd_order.deliver_x = with_id ? + 0 : getFloat8(tuple, tupdesc, info[7]); + pd_order.deliver_y = with_id ? + 0 : getFloat8(tuple, tupdesc, info[8]); + pd_order.deliver_open_t = getFloat8(tuple, tupdesc, info[9]); + pd_order.deliver_close_t = getFloat8(tuple, tupdesc, info[10]); + pd_order.deliver_service_t = column_found(info[11].colNumber) ? + getFloat8(tuple, tupdesc, info[11]) : 0; + + pd_order.pick_node_id = with_id ? + getBigInt(tuple, tupdesc, info[12]) : 0; + pd_order.deliver_node_id = with_id ? + getBigInt(tuple, tupdesc, info[13]) : 0; + return pd_order; } -void fetch_restriction( +Restriction_t fetch_restriction( const HeapTuple tuple, const TupleDesc &tupdesc, const std::vector &info, int64_t*, - Restriction_t *restriction, size_t*, bool) { - restriction->cost = pgrouting::getFloat8(tuple, tupdesc, info[0]); + Restriction_t restriction; + restriction.cost = getFloat8(tuple, tupdesc, info[0]); - restriction->via = NULL; - restriction->via_size = 0; - restriction->via = pgrouting::getBigIntArr(tuple, tupdesc, info[1], &restriction->via_size); + restriction.via = NULL; + restriction.via_size = 0; + restriction.via = getBigIntArr(tuple, tupdesc, info[1], &restriction.via_size); + return restriction; } -void fetch_point( +Point_on_edge_t fetch_point( const HeapTuple tuple, const TupleDesc &tupdesc, const std::vector &info, int64_t *default_pid, - Point_on_edge_t* point, size_t*, bool) { - if (pgrouting::column_found(info[0].colNumber)) { - point->pid = pgrouting::getBigInt(tuple, tupdesc, info[0]); + Point_on_edge_t point; + if (column_found(info[0].colNumber)) { + point.pid = getBigInt(tuple, tupdesc, info[0]); } else { ++(*default_pid); - point->pid = *default_pid; + point.pid = *default_pid; } - point->edge_id = pgrouting::getBigInt(tuple, tupdesc, info[1]); - point->fraction = pgrouting::getFloat8(tuple, tupdesc, info[2]); + point.edge_id = getBigInt(tuple, tupdesc, info[1]); + point.fraction = getFloat8(tuple, tupdesc, info[2]); - if (pgrouting::column_found(info[3].colNumber)) { - point->side = pgrouting::getChar(tuple, tupdesc, info[3], false, 'b'); + if (column_found(info[3].colNumber)) { + point.side = getChar(tuple, tupdesc, info[3], false, 'b'); } else { - point->side = 'b'; + point.side = 'b'; } + return point; } -void fetch_vehicle( +Vehicle_t fetch_vehicle( const HeapTuple tuple, const TupleDesc &tupdesc, const std::vector &info, int64_t*, - Vehicle_t *vehicle, size_t*, bool with_id) { - vehicle->id = pgrouting::getBigInt(tuple, tupdesc, info[0]); - vehicle->capacity = pgrouting::getFloat8(tuple, tupdesc, info[1]); + Vehicle_t vehicle; + vehicle.id = getBigInt(tuple, tupdesc, info[0]); + vehicle.capacity = getFloat8(tuple, tupdesc, info[1]); - vehicle->start_x = with_id ? + vehicle.start_x = with_id ? 0 : - pgrouting::getFloat8(tuple, tupdesc, info[2]); - vehicle->start_y = with_id ? + getFloat8(tuple, tupdesc, info[2]); + vehicle.start_y = with_id ? 0 : - pgrouting::getFloat8(tuple, tupdesc, info[3]); + getFloat8(tuple, tupdesc, info[3]); - vehicle->speed = pgrouting::column_found(info[13].colNumber) ? - pgrouting::getFloat8(tuple, tupdesc, info[13]) : + vehicle.speed = column_found(info[13].colNumber) ? + getFloat8(tuple, tupdesc, info[13]) : 1; - vehicle->cant_v = pgrouting::column_found(info[4].colNumber) ? - pgrouting::getBigInt(tuple, tupdesc, info[4]) : + vehicle.cant_v = column_found(info[4].colNumber) ? + getBigInt(tuple, tupdesc, info[4]) : 1; - vehicle->start_open_t = pgrouting::column_found(info[5].colNumber) ? - pgrouting::getFloat8(tuple, tupdesc, info[5]) : + vehicle.start_open_t = column_found(info[5].colNumber) ? + getFloat8(tuple, tupdesc, info[5]) : 0; - vehicle->start_close_t = pgrouting::column_found(info[6].colNumber) ? - pgrouting::getFloat8(tuple, tupdesc, info[6]) : - DBL_MAX; - vehicle->start_service_t = pgrouting::column_found(info[7].colNumber) ? - pgrouting::getFloat8(tuple, tupdesc, info[7]) : + vehicle.start_close_t = column_found(info[6].colNumber) ? + getFloat8(tuple, tupdesc, info[6]) : + std::numeric_limits::max(); + vehicle.start_service_t = column_found(info[7].colNumber) ? + getFloat8(tuple, tupdesc, info[7]) : 0; - if (!(pgrouting::column_found(info[8].colNumber)) - && pgrouting::column_found(info[9].colNumber)) { + if (!(column_found(info[8].colNumber)) + && column_found(info[9].colNumber)) { ereport(ERROR, (errmsg("Column \'%s\' not Found", info[8].name.c_str()), errhint("%s was found, also column is expected %s ", info[9].name.c_str(), info[8].name.c_str()))); } - if (pgrouting::column_found(info[8].colNumber) - && !(pgrouting::column_found(info[9].colNumber))) { + if (column_found(info[8].colNumber) + && !(column_found(info[9].colNumber))) { ereport(ERROR, (errmsg("Column \'%s\' not Found", info[9].name.c_str()), errhint("%s was found, also column is expected %s ", info[8].name.c_str(), info[9].name.c_str()))); } - vehicle->end_x = pgrouting::column_found(info[8].colNumber) ? - pgrouting::getFloat8(tuple, tupdesc, info[8]) : - vehicle->start_x; - vehicle->end_y = pgrouting::column_found(info[9].colNumber) ? - pgrouting::getFloat8(tuple, tupdesc, info[9]) : - vehicle->start_y; + vehicle.end_x = column_found(info[8].colNumber) ? + getFloat8(tuple, tupdesc, info[8]) : + vehicle.start_x; + vehicle.end_y = column_found(info[9].colNumber) ? + getFloat8(tuple, tupdesc, info[9]) : + vehicle.start_y; - if (!(pgrouting::column_found(info[10].colNumber)) - && pgrouting::column_found(info[11].colNumber)) { + if (!(column_found(info[10].colNumber)) + && column_found(info[11].colNumber)) { ereport(ERROR, (errmsg("Column \'%s\' not Found", info[10].name.c_str()), errhint("%s was found, also column is expected %s ", info[10].name.c_str(), info[11].name.c_str()))); } - if (pgrouting::column_found(info[10].colNumber) - && !(pgrouting::column_found(info[11].colNumber))) { + if (column_found(info[10].colNumber) + && !(column_found(info[11].colNumber))) { ereport(ERROR, (errmsg("Column \'%s\' not Found", info[11].name.c_str()), errhint("%s was found, also column is expected %s ", info[11].name.c_str(), info[10].name.c_str()))); } - vehicle->end_open_t = pgrouting::column_found(info[10].colNumber) ? - pgrouting::getFloat8(tuple, tupdesc, info[10]) : - vehicle->start_open_t; - vehicle->end_close_t = pgrouting::column_found(info[11].colNumber) ? - pgrouting::getFloat8(tuple, tupdesc, info[11]) : - vehicle->start_close_t; - vehicle->end_service_t = pgrouting::column_found(info[12].colNumber) ? - pgrouting::getFloat8(tuple, tupdesc, info[12]) : - vehicle->start_service_t; - - vehicle->speed = pgrouting::column_found(info[13].colNumber) ? - pgrouting::getFloat8(tuple, tupdesc, info[13]) : + vehicle.end_open_t = column_found(info[10].colNumber) ? + getFloat8(tuple, tupdesc, info[10]) : + vehicle.start_open_t; + vehicle.end_close_t = column_found(info[11].colNumber) ? + getFloat8(tuple, tupdesc, info[11]) : + vehicle.start_close_t; + vehicle.end_service_t = column_found(info[12].colNumber) ? + getFloat8(tuple, tupdesc, info[12]) : + vehicle.start_service_t; + + vehicle.speed = column_found(info[13].colNumber) ? + getFloat8(tuple, tupdesc, info[13]) : 1; - vehicle->start_node_id = with_id ? - pgrouting::getBigInt(tuple, tupdesc, info[14]) : + vehicle.start_node_id = with_id ? + getBigInt(tuple, tupdesc, info[14]) : 0; - vehicle->end_node_id = with_id ? - (pgrouting::column_found(info[12].colNumber) ? - pgrouting::getBigInt(tuple, tupdesc, info[15]) : - vehicle->start_node_id) : + vehicle.end_node_id = with_id ? + (column_found(info[12].colNumber) ? + getBigInt(tuple, tupdesc, info[15]) : + vehicle.start_node_id) : 0; + return vehicle; } +} // namespace pgget } // namespace pgrouting From 44eb224e15bafccf5216014d3ef6ad8738ae0fb9 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 22 Jan 2024 12:12:14 -0600 Subject: [PATCH 053/428] get_check_data arrays stored them in C++ containers --- include/cpp_common/get_check_data.hpp | 12 +- src/cpp_common/get_check_data.cpp | 179 ++++++++++++++++++++++++++ 2 files changed, 189 insertions(+), 2 deletions(-) diff --git a/include/cpp_common/get_check_data.hpp b/include/cpp_common/get_check_data.hpp index 8e06ce4ca6..4e3a4eb685 100644 --- a/include/cpp_common/get_check_data.hpp +++ b/include/cpp_common/get_check_data.hpp @@ -37,10 +37,12 @@ extern "C" { #include } -#include -#include #include +#include +#include +#include +#include "cpp_common/undefPostgresDefine.hpp" namespace pgrouting { @@ -55,6 +57,12 @@ void fetch_column_info(const TupleDesc&, std::vector&); /** @brief Function return the value of specified column in char type. */ char getChar(const HeapTuple, const TupleDesc&, const Column_info_t&, bool, char); +/** @brief get postgres array into c++ set container */ +std::set get_pgset(ArrayType*); + +/** @brief get postgres array into c++ vector container */ +std::vector get_pgarray(ArrayType*, bool); + /** @brief Enforces the input array to be @b NOT empty */ int64_t* get_array(ArrayType*, size_t*, bool); diff --git a/src/cpp_common/get_check_data.cpp b/src/cpp_common/get_check_data.cpp index 7ae0500b73..c0de8bc3f3 100644 --- a/src/cpp_common/get_check_data.cpp +++ b/src/cpp_common/get_check_data.cpp @@ -35,7 +35,9 @@ extern "C" { } #include +#include +#include "cpp_common/undefPostgresDefine.hpp" #include "cpp_common/pgr_alloc.hpp" #include "c_types/info_t.hpp" @@ -240,6 +242,183 @@ char getChar( return value; } +/** @brief get the array contents from postgres + * + * @details This function generates the array inputs according to their type + * received through @a ArrayType *v parameter and store them in @a c_array. It + * can be empty also if received @a allow_empty true. The cases of failure are:- + * 1. When @a ndim is not equal to one dimension. + * 2. When no element is found i.e. nitems is zero or negative. + * 3. If the element type doesn't lie in switch cases, give the error of expected array of any integer type + * 4. When size of @a c_array is out of range or memory. + * 5. When null value is found in the array. + * + * All these failures are represented as error through @a elog. + * @param[in] v Pointer to the postgres C array + * + * @pre the array has to be one dimension + * @pre Must have elements (when allow_empty is false) + * + * @returns set of elements on the PostgreSQL array + */ +std::set +get_pgset(ArrayType *v) { + std::set results; + + if (!v) return results; + + auto element_type = ARR_ELEMTYPE(v); + auto dim = ARR_DIMS(v); + auto ndim = ARR_NDIM(v); + auto nitems = ArrayGetNItems(ndim, dim); + Datum *elements = nullptr; + bool *nulls = nullptr; + int16 typlen; + bool typbyval; + char typalign; + + + if (ndim == 0 || nitems <= 0) { + return results; + } + + if (ndim != 1) { + throw std::string("One dimension expected"); + } + + get_typlenbyvalalign(element_type, &typlen, &typbyval, &typalign); + + switch (element_type) { + case INT2OID: + case INT4OID: + case INT8OID: + break; + default: + throw std::string("Expected array of ANY-INTEGER"); + } + + deconstruct_array(v, element_type, typlen, typbyval, + typalign, &elements, &nulls, + &nitems); + + int64_t data(0); + + for (int i = 0; i < nitems; i++) { + if (nulls[i]) { + throw std::string("NULL value found in Array!"); + } else { + switch (element_type) { + case INT2OID: + data = static_cast(DatumGetInt16(elements[i])); + break; + case INT4OID: + data = static_cast(DatumGetInt32(elements[i])); + break; + case INT8OID: + data = DatumGetInt64(elements[i]); + break; + } + } + results.insert(data); + } + + pfree(elements); + pfree(nulls); + return results; +} + +/** @brief get the array contents from postgres + * + * @details This function generates the array inputs according to their type + * received through @a ArrayType *v parameter and store them in @a c_array. It + * can be empty also if received @a allow_empty true. The cases of failure are:- + * 1. When @a ndim is not equal to one dimension. + * 2. When no element is found i.e. nitems is zero or negative. + * 3. If the element type doesn't lie in switch cases, give the error of expected array of any integer type + * 4. When size of @a c_array is out of range or memory. + * 5. When null value is found in the array. + * + * All these failures are represented as error through @a elog. + * @param[in] v Pointer to the postgres C array + * @param[in] allow_empty flag to allow empty arrays + * + * @pre the array has to be one dimension + * @pre Must have elements (when allow_empty is false) + * + * @returns Vector of elements of the PostgreSQL array + */ +std::vector +get_pgarray(ArrayType *v, bool allow_empty) { + std::vector results; + if (!v) return results; + + auto element_type = ARR_ELEMTYPE(v); + auto dim = ARR_DIMS(v); + auto ndim = ARR_NDIM(v); + auto nitems = ArrayGetNItems(ndim, dim); + Datum *elements = nullptr; + bool *nulls = nullptr; + int16 typlen; + bool typbyval; + char typalign; + + + if (allow_empty && (ndim == 0 || nitems <= 0)) { + return results; + } + + if (ndim != 1) { + throw std::string("One dimension expected"); + } + + if (nitems <= 0) { + throw std::string("No elements found"); + } + + get_typlenbyvalalign(element_type, &typlen, &typbyval, &typalign); + + /* validate input data type */ + switch (element_type) { + case INT2OID: + case INT4OID: + case INT8OID: + break; + default: + throw std::string("Expected array of ANY-INTEGER"); + } + + deconstruct_array(v, element_type, typlen, typbyval, + typalign, &elements, &nulls, + &nitems); + + int64_t data(0); + + results.reserve(static_cast(nitems)); + + for (int i = 0; i < nitems; i++) { + if (nulls[i]) { + throw std::string("NULL value found in Array!"); + } else { + switch (element_type) { + case INT2OID: + data = static_cast(DatumGetInt16(elements[i])); + break; + case INT4OID: + data = static_cast(DatumGetInt32(elements[i])); + break; + case INT8OID: + data = DatumGetInt64(elements[i]); + break; + } + } + results.push_back(data); + } + + pfree(elements); + pfree(nulls); + return results; +} + /** @brief get the array contents from postgres * * @details This function generates the array inputs according to their type From 6394bd08b30a107a83590c10a999d841c72c2a1f Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 22 Jan 2024 12:34:31 -0600 Subject: [PATCH 054/428] cpp_common headers minor changes --- include/cpp_common/basePath_SSEC.hpp | 2 ++ include/cpp_common/pgr_base_graph.hpp | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/include/cpp_common/basePath_SSEC.hpp b/include/cpp_common/basePath_SSEC.hpp index d2ba6120ca..d3823d80bf 100644 --- a/include/cpp_common/basePath_SSEC.hpp +++ b/include/cpp_common/basePath_SSEC.hpp @@ -38,6 +38,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include +#include "cpp_common/undefPostgresDefine.hpp" + #include #include diff --git a/include/cpp_common/pgr_base_graph.hpp b/include/cpp_common/pgr_base_graph.hpp index 0e3914e272..4e4699a8f6 100644 --- a/include/cpp_common/pgr_base_graph.hpp +++ b/include/cpp_common/pgr_base_graph.hpp @@ -364,6 +364,11 @@ class Pgr_base_graph { insert_edges(std::vector < T >(edges, edges + count)); } + template + void insert_edges_neg(const std::vector &edges) { + insert_edges(edges, false); + } + template < typename T > void insert_edges_neg(const T *edges, size_t count) { insert_edges(std::vector < T >(edges, edges + count), false); From 2fc1d869b0bb5b41688b9fe153419dff051f9536 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 22 Jan 2024 12:36:49 -0600 Subject: [PATCH 055/428] get_data: New template function to read data from C++ --- include/cpp_common/get_data.hpp | 60 ++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/include/cpp_common/get_data.hpp b/include/cpp_common/get_data.hpp index adf43a8c0b..f1f86815ef 100644 --- a/include/cpp_common/get_data.hpp +++ b/include/cpp_common/get_data.hpp @@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. namespace pgrouting { -/** @brief Retrives the tuples +/** @brief Retrives the tuples for TRSP * @tparam Data_type Scructure of data * @tparam Func fetcher function * @param[in] sql Query to be processed @@ -48,6 +48,8 @@ namespace pgrouting { * @param[in] flag useful flag depending on data * @param[in] info information about the data * @param[in] func fetcher function to be used + * + * @todo: V4 remove this template function */ template void get_data( @@ -101,6 +103,62 @@ void get_data( (*total_pgtuples) = total_tuples; } +namespace pgget { +/** @brief Retrives the tuples + * @tparam Data_type Scructure of data + * @tparam Func fetcher function + * @param[in] sql Query to be processed + * @param[in] flag useful flag depending on data + * @param[in] info information about the data + * @param[in] func fetcher function to be used + */ +template +std::vector get_data( + const std::string& sql, + bool flag, + std::vector info, + Func func) { + const int tuple_limit = 1000000; + + size_t total_tuples; + size_t valid_pgtuples; + + auto SPIplan = pgr_SPI_prepare(sql.c_str()); + auto SPIportal = pgr_SPI_cursor_open(SPIplan); + + bool moredata = true; + total_tuples = valid_pgtuples = 0; + + int64_t default_id = 0; + std::vector tuples; + + while (moredata == true) { + SPI_cursor_fetch(SPIportal, true, tuple_limit); + auto tuptable = SPI_tuptable; + auto tupdesc = SPI_tuptable->tupdesc; + if (total_tuples == 0) fetch_column_info(tupdesc, info); + + size_t ntuples = SPI_processed; + total_tuples += ntuples; + + if (ntuples > 0) { + tuples.reserve(total_tuples); + for (size_t t = 0; t < ntuples; t++) { + tuples.push_back(func(tuptable->vals[t], tupdesc, info, + &default_id, + &valid_pgtuples, flag)); + } + SPI_freetuptable(tuptable); + } else { + moredata = false; + } + } + + SPI_cursor_close(SPIportal); + return tuples; +} + +} // namespace pgget } // namespace pgrouting #endif // INCLUDE_CPP_COMMON_GET_DATA_HPP_ From 93cd6ff210e030a8eecbd297ab275328253d5f2d Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 22 Jan 2024 13:00:44 -0600 Subject: [PATCH 056/428] interruption.h -> interruption.hpp should be a C++ header file --- include/cpp_common/{interruption.h => interruption.hpp} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename include/cpp_common/{interruption.h => interruption.hpp} (100%) diff --git a/include/cpp_common/interruption.h b/include/cpp_common/interruption.hpp similarity index 100% rename from include/cpp_common/interruption.h rename to include/cpp_common/interruption.hpp From 1e587c6422c0c55f54162ea701895f934b5b96c2 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 22 Jan 2024 13:01:15 -0600 Subject: [PATCH 057/428] (C++) Using interruption.hpp --- include/allpairs/pgr_allpairs.hpp | 2 +- include/astar/astar.hpp | 2 +- include/bellman_ford/pgr_bellman_ford.hpp | 2 +- include/bellman_ford/pgr_edwardMoore.hpp | 2 +- include/breadthFirstSearch/pgr_breadthFirstSearch.hpp | 2 +- include/circuits/hawickcircuits.hpp | 2 +- include/coloring/pgr_bipartite_driver.hpp | 2 +- include/coloring/pgr_sequentialVertexColoring.hpp | 2 +- include/components/pgr_makeConnected.hpp | 2 +- include/contraction/pgr_deadEndContraction.hpp | 2 +- include/dagShortestPath/pgr_dagShortestPath.hpp | 2 +- include/dijkstra/dijkstra.hpp | 2 +- include/dijkstra/drivingDist.hpp | 2 +- include/dominator/pgr_lengauerTarjanDominatorTree_driver.hpp | 2 +- include/max_flow/pgr_maxflow.hpp | 2 +- include/ordering/cuthillMckeeOrdering.hpp | 2 +- include/planar/pgr_boyerMyrvold.hpp | 2 +- include/spanningTree/pgr_kruskal.hpp | 2 +- include/spanningTree/pgr_mst.hpp | 2 +- include/spanningTree/pgr_prim.hpp | 2 +- include/spanningTree/pgr_randomSpanningTree.hpp | 2 +- include/topologicalSort/pgr_topologicalSort.hpp | 2 +- include/traversal/pgr_depthFirstSearch.hpp | 2 +- src/alpha_shape/pgr_alphaShape.cpp | 2 +- src/coloring/pgr_edgeColoring.cpp | 2 +- src/components/pgr_components.cpp | 2 +- src/tsp/tsp.cpp | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/include/allpairs/pgr_allpairs.hpp b/include/allpairs/pgr_allpairs.hpp index f322e546f8..96f96842ac 100644 --- a/include/allpairs/pgr_allpairs.hpp +++ b/include/allpairs/pgr_allpairs.hpp @@ -45,7 +45,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/iid_t_rt.h" #include "cpp_common/basePath_SSEC.hpp" #include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/interruption.h" +#include "cpp_common/interruption.hpp" // TODO(vicky) don't keep it here #include "cpp_common/pgr_alloc.hpp" diff --git a/include/astar/astar.hpp b/include/astar/astar.hpp index c68e62545a..1f87bfb756 100644 --- a/include/astar/astar.hpp +++ b/include/astar/astar.hpp @@ -42,7 +42,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "visitors/astar_visitors.hpp" #include "cpp_common/basePath_SSEC.hpp" #include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/interruption.h" +#include "cpp_common/interruption.hpp" #include "c_types/ii_t_rt.h" namespace detail { diff --git a/include/bellman_ford/pgr_bellman_ford.hpp b/include/bellman_ford/pgr_bellman_ford.hpp index 2ed3299b36..4b5db000e7 100644 --- a/include/bellman_ford/pgr_bellman_ford.hpp +++ b/include/bellman_ford/pgr_bellman_ford.hpp @@ -43,7 +43,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgr_messages.h" #include "cpp_common/basePath_SSEC.hpp" #include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/interruption.h" +#include "cpp_common/interruption.hpp" #include "c_types/ii_t_rt.h" diff --git a/include/bellman_ford/pgr_edwardMoore.hpp b/include/bellman_ford/pgr_edwardMoore.hpp index 2c461ef075..d54af99ede 100644 --- a/include/bellman_ford/pgr_edwardMoore.hpp +++ b/include/bellman_ford/pgr_edwardMoore.hpp @@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/basePath_SSEC.hpp" #include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/interruption.h" +#include "cpp_common/interruption.hpp" #include "c_types/ii_t_rt.h" diff --git a/include/breadthFirstSearch/pgr_breadthFirstSearch.hpp b/include/breadthFirstSearch/pgr_breadthFirstSearch.hpp index 942fb89f8c..4e68873a32 100644 --- a/include/breadthFirstSearch/pgr_breadthFirstSearch.hpp +++ b/include/breadthFirstSearch/pgr_breadthFirstSearch.hpp @@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/interruption.h" +#include "cpp_common/interruption.hpp" #include "c_types/mst_rt.h" //****************************************** diff --git a/include/circuits/hawickcircuits.hpp b/include/circuits/hawickcircuits.hpp index 7e4a6590b8..4d25461f1a 100644 --- a/include/circuits/hawickcircuits.hpp +++ b/include/circuits/hawickcircuits.hpp @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/basePath_SSEC.hpp" #include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/interruption.h" +#include "cpp_common/interruption.hpp" #include "cpp_common/pgr_assert.h" #include "c_types/circuits_rt.h" diff --git a/include/coloring/pgr_bipartite_driver.hpp b/include/coloring/pgr_bipartite_driver.hpp index 84abe2e0cd..3ede0233b0 100644 --- a/include/coloring/pgr_bipartite_driver.hpp +++ b/include/coloring/pgr_bipartite_driver.hpp @@ -43,7 +43,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgr_base_graph.hpp" #include "cpp_common/pgr_messages.h" -#include "cpp_common/interruption.h" +#include "cpp_common/interruption.hpp" typedef struct II_t_rt II_t_rt; namespace pgrouting { diff --git a/include/coloring/pgr_sequentialVertexColoring.hpp b/include/coloring/pgr_sequentialVertexColoring.hpp index 0fc5e611c0..4e05132800 100644 --- a/include/coloring/pgr_sequentialVertexColoring.hpp +++ b/include/coloring/pgr_sequentialVertexColoring.hpp @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/interruption.h" +#include "cpp_common/interruption.hpp" #include "c_types/ii_t_rt.h" diff --git a/include/components/pgr_makeConnected.hpp b/include/components/pgr_makeConnected.hpp index 1b3661f5b6..2583eb7ffa 100644 --- a/include/components/pgr_makeConnected.hpp +++ b/include/components/pgr_makeConnected.hpp @@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/ii_t_rt.h" #include "cpp_common/pgr_messages.h" #include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/interruption.h" +#include "cpp_common/interruption.hpp" //****************************************** namespace pgrouting { diff --git a/include/contraction/pgr_deadEndContraction.hpp b/include/contraction/pgr_deadEndContraction.hpp index faf936b2d1..ea234a66a3 100644 --- a/include/contraction/pgr_deadEndContraction.hpp +++ b/include/contraction/pgr_deadEndContraction.hpp @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include "cpp_common/identifiers.hpp" -#include "cpp_common/interruption.h" +#include "cpp_common/interruption.hpp" namespace pgrouting { namespace contraction { diff --git a/include/dagShortestPath/pgr_dagShortestPath.hpp b/include/dagShortestPath/pgr_dagShortestPath.hpp index 36df617222..7df9b0d24f 100644 --- a/include/dagShortestPath/pgr_dagShortestPath.hpp +++ b/include/dagShortestPath/pgr_dagShortestPath.hpp @@ -44,7 +44,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/basePath_SSEC.hpp" #include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/interruption.h" +#include "cpp_common/interruption.hpp" #include "c_types/ii_t_rt.h" diff --git a/include/dijkstra/dijkstra.hpp b/include/dijkstra/dijkstra.hpp index a4ed2825e5..93d9c4c566 100644 --- a/include/dijkstra/dijkstra.hpp +++ b/include/dijkstra/dijkstra.hpp @@ -53,7 +53,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/ii_t_rt.h" #include "cpp_common/basePath_SSEC.hpp" #include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/interruption.h" +#include "cpp_common/interruption.hpp" #include "visitors/dijkstra_visitors.hpp" namespace detail { diff --git a/include/dijkstra/drivingDist.hpp b/include/dijkstra/drivingDist.hpp index 9c9e02d314..aed2081e32 100644 --- a/include/dijkstra/drivingDist.hpp +++ b/include/dijkstra/drivingDist.hpp @@ -53,7 +53,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/basePath_SSEC.hpp" #include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/interruption.h" +#include "cpp_common/interruption.hpp" #include "visitors/dijkstra_visitors.hpp" diff --git a/include/dominator/pgr_lengauerTarjanDominatorTree_driver.hpp b/include/dominator/pgr_lengauerTarjanDominatorTree_driver.hpp index 18c5ece32d..51d98d28e5 100644 --- a/include/dominator/pgr_lengauerTarjanDominatorTree_driver.hpp +++ b/include/dominator/pgr_lengauerTarjanDominatorTree_driver.hpp @@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/interruption.h" +#include "cpp_common/interruption.hpp" #include "cpp_common/pgr_messages.h" #include "cpp_common/pgr_base_graph.hpp" diff --git a/include/max_flow/pgr_maxflow.hpp b/include/max_flow/pgr_maxflow.hpp index 49d21ebd6d..fd2c51f6f1 100644 --- a/include/max_flow/pgr_maxflow.hpp +++ b/include/max_flow/pgr_maxflow.hpp @@ -43,7 +43,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/flow_t.h" #include "c_types/edge_t.h" #include "c_types/path_rt.h" -#include "cpp_common/interruption.h" +#include "cpp_common/interruption.hpp" namespace pgrouting { diff --git a/include/ordering/cuthillMckeeOrdering.hpp b/include/ordering/cuthillMckeeOrdering.hpp index 26767e3ed2..a41acc54c2 100644 --- a/include/ordering/cuthillMckeeOrdering.hpp +++ b/include/ordering/cuthillMckeeOrdering.hpp @@ -43,7 +43,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/interruption.h" +#include "cpp_common/interruption.hpp" #include "cpp_common/pgr_messages.h" #include "c_types/ii_t_rt.h" diff --git a/include/planar/pgr_boyerMyrvold.hpp b/include/planar/pgr_boyerMyrvold.hpp index 3134e767ab..0e5d2f8a43 100644 --- a/include/planar/pgr_boyerMyrvold.hpp +++ b/include/planar/pgr_boyerMyrvold.hpp @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgr_messages.h" #include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/interruption.h" +#include "cpp_common/interruption.hpp" #include "c_types/iid_t_rt.h" //****************************************** namespace pgrouting { diff --git a/include/spanningTree/pgr_kruskal.hpp b/include/spanningTree/pgr_kruskal.hpp index 53955242e5..034644d068 100644 --- a/include/spanningTree/pgr_kruskal.hpp +++ b/include/spanningTree/pgr_kruskal.hpp @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include "spanningTree/pgr_mst.hpp" -#include "cpp_common/interruption.h" +#include "cpp_common/interruption.hpp" namespace pgrouting { namespace functions { diff --git a/include/spanningTree/pgr_mst.hpp b/include/spanningTree/pgr_mst.hpp index 5ab84f5f39..e5e8440e60 100644 --- a/include/spanningTree/pgr_mst.hpp +++ b/include/spanningTree/pgr_mst.hpp @@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/interruption.h" +#include "cpp_common/interruption.hpp" #include "spanningTree/details.hpp" namespace pgrouting { diff --git a/include/spanningTree/pgr_prim.hpp b/include/spanningTree/pgr_prim.hpp index 00b7c52fdd..fbf5178015 100644 --- a/include/spanningTree/pgr_prim.hpp +++ b/include/spanningTree/pgr_prim.hpp @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "spanningTree/pgr_mst.hpp" -#include "cpp_common/interruption.h" +#include "cpp_common/interruption.hpp" //****************************************** diff --git a/include/spanningTree/pgr_randomSpanningTree.hpp b/include/spanningTree/pgr_randomSpanningTree.hpp index fad84cd6f0..e385fd00b4 100644 --- a/include/spanningTree/pgr_randomSpanningTree.hpp +++ b/include/spanningTree/pgr_randomSpanningTree.hpp @@ -42,7 +42,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/basePath_SSEC.hpp" #include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/interruption.h" +#include "cpp_common/interruption.hpp" template < class G > class Pgr_randomSpanningTree; // user's functions diff --git a/include/topologicalSort/pgr_topologicalSort.hpp b/include/topologicalSort/pgr_topologicalSort.hpp index b45dd639f7..837b5ec941 100644 --- a/include/topologicalSort/pgr_topologicalSort.hpp +++ b/include/topologicalSort/pgr_topologicalSort.hpp @@ -43,7 +43,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/basePath_SSEC.hpp" #include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/interruption.h" +#include "cpp_common/interruption.hpp" #include "c_types//i_rt.h" // user's functions diff --git a/include/traversal/pgr_depthFirstSearch.hpp b/include/traversal/pgr_depthFirstSearch.hpp index b417985b75..ae49de0b06 100644 --- a/include/traversal/pgr_depthFirstSearch.hpp +++ b/include/traversal/pgr_depthFirstSearch.hpp @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/interruption.h" +#include "cpp_common/interruption.hpp" #include "c_types/mst_rt.h" diff --git a/src/alpha_shape/pgr_alphaShape.cpp b/src/alpha_shape/pgr_alphaShape.cpp index bde3ff931e..e2e1f4d0dc 100644 --- a/src/alpha_shape/pgr_alphaShape.cpp +++ b/src/alpha_shape/pgr_alphaShape.cpp @@ -50,7 +50,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include -#include "cpp_common/interruption.h" +#include "cpp_common/interruption.hpp" namespace bg = boost::geometry; diff --git a/src/coloring/pgr_edgeColoring.cpp b/src/coloring/pgr_edgeColoring.cpp index 17ef2764a5..2193945cf9 100644 --- a/src/coloring/pgr_edgeColoring.cpp +++ b/src/coloring/pgr_edgeColoring.cpp @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgr_assert.h" -#include "cpp_common/interruption.h" +#include "cpp_common/interruption.hpp" namespace pgrouting { diff --git a/src/components/pgr_components.cpp b/src/components/pgr_components.cpp index a90fa71ddd..5af64171dc 100644 --- a/src/components/pgr_components.cpp +++ b/src/components/pgr_components.cpp @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/identifiers.hpp" -#include "cpp_common/interruption.h" +#include "cpp_common/interruption.hpp" namespace pgrouting { namespace algorithms { diff --git a/src/tsp/tsp.cpp b/src/tsp/tsp.cpp index 2336ea1e92..36b1901c98 100644 --- a/src/tsp/tsp.cpp +++ b/src/tsp/tsp.cpp @@ -42,7 +42,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/identifiers.hpp" #include "cpp_common/pgr_messages.h" #include "cpp_common/pgr_assert.h" -#include "cpp_common/interruption.h" +#include "cpp_common/interruption.hpp" #include "visitors/dijkstra_visitors.hpp" From 519611f028dc8fb2b563ed593d9228ee27a1a0ab Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 22 Jan 2024 13:03:04 -0600 Subject: [PATCH 058/428] interruption.hpp undef posgres defines --- include/cpp_common/interruption.hpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/cpp_common/interruption.hpp b/include/cpp_common/interruption.hpp index 1706610fa7..52c6e7297e 100644 --- a/include/cpp_common/interruption.hpp +++ b/include/cpp_common/interruption.hpp @@ -24,8 +24,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_CPP_COMMON_INTERRUPTION_H_ -#define INCLUDE_CPP_COMMON_INTERRUPTION_H_ +#ifndef INCLUDE_CPP_COMMON_INTERRUPTION_HPP_ +#define INCLUDE_CPP_COMMON_INTERRUPTION_HPP_ #ifdef _MSC_VER #define __PGR_PRETTY_FUNCTION__ __FUNCSIG__ @@ -86,5 +86,6 @@ extern "C" { } +#include "cpp_common/undefPostgresDefine.hpp" -#endif // INCLUDE_CPP_COMMON_INTERRUPTION_H_ +#endif // INCLUDE_CPP_COMMON_INTERRUPTION_HPP_ From 3c78d138c78149771048ad68ea98e2e03bf79a38 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 22 Jan 2024 13:04:33 -0600 Subject: [PATCH 059/428] pgr_base_graph.hpp --- include/cpp_common/get_data.hpp | 4 +--- include/cpp_common/pgr_base_graph.hpp | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/cpp_common/get_data.hpp b/include/cpp_common/get_data.hpp index f1f86815ef..d50e8ac69e 100644 --- a/include/cpp_common/get_data.hpp +++ b/include/cpp_common/get_data.hpp @@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. namespace pgrouting { -/** @brief Retrives the tuples for TRSP +/** @brief Retrives the tuples * @tparam Data_type Scructure of data * @tparam Func fetcher function * @param[in] sql Query to be processed @@ -48,8 +48,6 @@ namespace pgrouting { * @param[in] flag useful flag depending on data * @param[in] info information about the data * @param[in] func fetcher function to be used - * - * @todo: V4 remove this template function */ template void get_data( diff --git a/include/cpp_common/pgr_base_graph.hpp b/include/cpp_common/pgr_base_graph.hpp index 4e4699a8f6..e0c4edbfd3 100644 --- a/include/cpp_common/pgr_base_graph.hpp +++ b/include/cpp_common/pgr_base_graph.hpp @@ -998,7 +998,7 @@ Pgr_base_graph< G, T_V, T_E >::graph_add_min_edge_no_parallel(const T &edge) { if (edge.cost >= 0) { E e1; bool found; - boost::tie(e1, found) = edge(vm_s, vm_t, graph); + boost::tie(e1, found) = boost::edge(vm_s, vm_t, graph); if (found) { if (edge.cost < graph[e1].cost) { graph[e1].cost = edge.cost; @@ -1017,7 +1017,7 @@ Pgr_base_graph< G, T_V, T_E >::graph_add_min_edge_no_parallel(const T &edge) { || (m_gType == UNDIRECTED && edge.cost != edge.reverse_cost))) { E e1; bool found; - boost::tie(e1, found) = edge(vm_t, vm_s, graph); + boost::tie(e1, found) = boost::edge(vm_t, vm_s, graph); if (found) { if (edge.reverse_cost < graph[e1].cost) { graph[e1].cost = edge.reverse_cost; From f84b7be49f36c0079fda32d9a819736f025601ff Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 22 Jan 2024 13:06:46 -0600 Subject: [PATCH 060/428] combinations.h -> combinations.hpp should be A c++ header --- include/cpp_common/{combinations.h => combinations.hpp} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename include/cpp_common/{combinations.h => combinations.hpp} (100%) diff --git a/include/cpp_common/combinations.h b/include/cpp_common/combinations.hpp similarity index 100% rename from include/cpp_common/combinations.h rename to include/cpp_common/combinations.hpp From 89d4a4010fe7df92680130bf0c374a6d504e0d64 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 22 Jan 2024 13:28:12 -0600 Subject: [PATCH 061/428] Combinations new functions to create from container --- include/cpp_common/combinations.hpp | 29 ++++++++++++--- src/cpp_common/combinations.cpp | 56 ++++++++++++++++++++++++++++- 2 files changed, 79 insertions(+), 6 deletions(-) diff --git a/include/cpp_common/combinations.hpp b/include/cpp_common/combinations.hpp index fe6361b7f4..578f72743e 100644 --- a/include/cpp_common/combinations.hpp +++ b/include/cpp_common/combinations.hpp @@ -1,6 +1,5 @@ - /*PGR-GNU***************************************************************** -File: combinations.h +File: combinations.hpp Copyright (c) 2021 pgRouting developers Mail: project@pgrouting.org @@ -25,10 +24,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_CPP_COMMON_COMBINATIONS_H_ -#define INCLUDE_CPP_COMMON_COMBINATIONS_H_ +#ifndef INCLUDE_CPP_COMMON_COMBINATIONS_HPP_ +#define INCLUDE_CPP_COMMON_COMBINATIONS_HPP_ #pragma once +extern "C" { +#include +#include +} + #include #include #include @@ -36,24 +40,39 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include +#include "cpp_common/undefPostgresDefine.hpp" + #include "c_types/ii_t_rt.h" #include "cpp_common/basePath_SSEC.hpp" +#include "cpp_common/rule.h" namespace pgrouting { + +class Path; + namespace utilities { +#if 1 std::map> get_combinations(const II_t_rt *, size_t); std::map> get_combinations(int64_t*, size_t, int64_t*, size_t); +#endif std::map> get_combinations( std::deque&, const std::vector&); +std::map> +get_combinations(const std::vector&); + + +std::map> +get_combinations(char*, ArrayType*, ArrayType*, bool); + } // namespace utilities } // namespace pgrouting -#endif // INCLUDE_CPP_COMMON_COMBINATIONS_H_ +#endif // INCLUDE_CPP_COMMON_COMBINATIONS_HPP_ diff --git a/src/cpp_common/combinations.cpp b/src/cpp_common/combinations.cpp index f465336ed2..9fdd759a70 100644 --- a/src/cpp_common/combinations.cpp +++ b/src/cpp_common/combinations.cpp @@ -24,18 +24,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "cpp_common/combinations.h" +#include "cpp_common/combinations.hpp" #include #include #include #include +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/basePath_SSEC.hpp" namespace pgrouting { namespace utilities { +#if 1 std::map> get_combinations(const II_t_rt *combinations, size_t total) { std::map> result; @@ -63,6 +65,7 @@ get_combinations( } return result; } +#endif std::map> get_combinations( @@ -109,5 +112,56 @@ get_combinations( return new_combinations; } +std::map> +get_combinations(const std::vector &combinations) { + std::map> result; + + for (const auto &row : combinations) { + result[row.d1.source].insert(row.d2.target); + } + return result; +} + +/** @brief gets all the departures and destinations + * @param[in] combinations_sql from the @b combinations signatures + * @param[in] startsArr PostgreSQL array with the departures + * @param[in] endsArr PostgreSQL array with the destinations + * @param[in] normal the graph is reversed so reverse starts & ends + * @returns[out] map: for each departure a set of destinations + * + * The resulting map can be empty + */ +std::map> +get_combinations( + char *combinations_sql, + ArrayType* startsArr, ArrayType* endsArr, bool normal) { + using pgrouting::pgget::get_intSet; + std::map> result; + + std::set starts; + std::set ends; + + if (startsArr && endsArr) { + starts = normal? get_intSet(startsArr) : get_intSet(endsArr); + ends = normal? get_intSet(endsArr) : get_intSet(startsArr); + } + + /* TODO Read query storing like std::map> */ + /* queries are stored in vectors */ + auto combinations = combinations_sql? + pgrouting::pgget::get_combinations(std::string(combinations_sql)) : std::vector(); + + /* data comes from a combinations */ + for (const auto &row : combinations) { + result[row.d1.source].insert(row.d2.target); + } + + /* data comes from many to many */ + for (const auto &s : starts) { + result[s] = ends; + } + return result; +} + } // namespace utilities } // namespace pgrouting From 96d5a27c8ef9b5ef2dd55dd9b085e52d23133dd1 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 22 Jan 2024 13:30:13 -0600 Subject: [PATCH 062/428] Using combinations.hpp --- src/astar/astar_driver.cpp | 2 +- src/bdAstar/bdAstar_driver.cpp | 2 +- src/dijkstra/dijkstra_driver.cpp | 2 +- src/ksp/ksp_driver.cpp | 2 +- src/ksp/withPoints_ksp_driver.cpp | 2 +- src/max_flow/edge_disjoint_paths_driver.cpp | 2 +- src/trsp/trspVia_driver.cpp | 2 +- src/trsp/trspVia_withPoints_driver.cpp | 2 +- src/trsp/trsp_driver.cpp | 2 +- src/trsp/trsp_withPoints_driver.cpp | 2 +- src/withPoints/withPoints_driver.cpp | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/astar/astar_driver.cpp b/src/astar/astar_driver.cpp index e38523bf98..ff7686634a 100644 --- a/src/astar/astar_driver.cpp +++ b/src/astar/astar_driver.cpp @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "astar/astar.hpp" -#include "cpp_common/combinations.h" +#include "cpp_common/combinations.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" diff --git a/src/bdAstar/bdAstar_driver.cpp b/src/bdAstar/bdAstar_driver.cpp index cc9a671ad4..72e58bfcd4 100644 --- a/src/bdAstar/bdAstar_driver.cpp +++ b/src/bdAstar/bdAstar_driver.cpp @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "bdAstar/bdAstar.hpp" -#include "cpp_common/combinations.h" +#include "cpp_common/combinations.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" diff --git a/src/dijkstra/dijkstra_driver.cpp b/src/dijkstra/dijkstra_driver.cpp index 3539f1c1b5..0a5ef74a9a 100644 --- a/src/dijkstra/dijkstra_driver.cpp +++ b/src/dijkstra/dijkstra_driver.cpp @@ -42,7 +42,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/ii_t_rt.h" -#include "cpp_common/combinations.h" +#include "cpp_common/combinations.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" diff --git a/src/ksp/ksp_driver.cpp b/src/ksp/ksp_driver.cpp index b231760a2d..c9d1c1b675 100644 --- a/src/ksp/ksp_driver.cpp +++ b/src/ksp/ksp_driver.cpp @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "yen/pgr_ksp.hpp" -#include "cpp_common/combinations.h" +#include "cpp_common/combinations.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" diff --git a/src/ksp/withPoints_ksp_driver.cpp b/src/ksp/withPoints_ksp_driver.cpp index d1b5ac7f61..9d15d836dd 100644 --- a/src/ksp/withPoints_ksp_driver.cpp +++ b/src/ksp/withPoints_ksp_driver.cpp @@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "c_types/ii_t_rt.h" -#include "cpp_common/combinations.h" +#include "cpp_common/combinations.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" diff --git a/src/max_flow/edge_disjoint_paths_driver.cpp b/src/max_flow/edge_disjoint_paths_driver.cpp index 5e2b438672..5d4fe41859 100644 --- a/src/max_flow/edge_disjoint_paths_driver.cpp +++ b/src/max_flow/edge_disjoint_paths_driver.cpp @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "max_flow/pgr_maxflow.hpp" -#include "cpp_common/combinations.h" +#include "cpp_common/combinations.hpp" #include "cpp_common/identifiers.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" diff --git a/src/trsp/trspVia_driver.cpp b/src/trsp/trspVia_driver.cpp index 707fca73e7..20f0e0b54a 100644 --- a/src/trsp/trspVia_driver.cpp +++ b/src/trsp/trspVia_driver.cpp @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/routes_t.h" #include "c_types/restriction_t.h" #include "cpp_common/rule.h" -#include "cpp_common/combinations.h" +#include "cpp_common/combinations.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" diff --git a/src/trsp/trspVia_withPoints_driver.cpp b/src/trsp/trspVia_withPoints_driver.cpp index 791fbdbe82..a48e97c708 100644 --- a/src/trsp/trspVia_withPoints_driver.cpp +++ b/src/trsp/trspVia_withPoints_driver.cpp @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/routes_t.h" #include "c_types/restriction_t.h" #include "cpp_common/rule.h" -#include "cpp_common/combinations.h" +#include "cpp_common/combinations.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" diff --git a/src/trsp/trsp_driver.cpp b/src/trsp/trsp_driver.cpp index 47cb0b139f..4a13438ea6 100644 --- a/src/trsp/trsp_driver.cpp +++ b/src/trsp/trsp_driver.cpp @@ -43,7 +43,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/rule.h" #include "cpp_common/pgr_assert.h" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/combinations.h" +#include "cpp_common/combinations.hpp" #include "c_types/restriction_t.h" #include "c_types/ii_t_rt.h" #include "dijkstra/dijkstra.hpp" diff --git a/src/trsp/trsp_withPoints_driver.cpp b/src/trsp/trsp_withPoints_driver.cpp index 8a67c1720e..bb08818ead 100644 --- a/src/trsp/trsp_withPoints_driver.cpp +++ b/src/trsp/trsp_withPoints_driver.cpp @@ -43,7 +43,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/rule.h" #include "cpp_common/pgr_assert.h" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/combinations.h" +#include "cpp_common/combinations.hpp" #include "c_types/restriction_t.h" #include "c_types/ii_t_rt.h" #include "dijkstra/dijkstra.hpp" diff --git a/src/withPoints/withPoints_driver.cpp b/src/withPoints/withPoints_driver.cpp index ddd0eadbab..2310d0400d 100644 --- a/src/withPoints/withPoints_driver.cpp +++ b/src/withPoints/withPoints_driver.cpp @@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "dijkstra/dijkstra.hpp" #include "withPoints/pgr_withPoints.hpp" -#include "cpp_common/combinations.h" +#include "cpp_common/combinations.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" From 2c0ceef2261b66d77e15bc37b9106ccf7e7e9bbf Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 22 Jan 2024 13:56:51 -0600 Subject: [PATCH 063/428] On C code using trsp_pgget - This include will be removed when the reading takes place on C++ - The only expected place to remain is on old function of trsp --- src/allpairs/floydWarshall.c | 2 +- src/allpairs/johnson.c | 2 +- src/alpha_shape/alphaShape.c | 2 +- src/astar/astar.c | 2 +- src/bdAstar/bdAstar.c | 2 +- src/bdDijkstra/bdDijkstra.c | 2 +- src/bellman_ford/bellman_ford.c | 2 +- src/bellman_ford/bellman_ford_neg.c | 2 +- src/bellman_ford/edwardMoore.c | 2 +- src/breadthFirstSearch/binaryBreadthFirstSearch.c | 2 +- src/breadthFirstSearch/breadthFirstSearch.c | 2 +- src/chinese/chinesePostman.c | 2 +- src/circuits/hawickCircuits.c | 2 +- src/coloring/bipartite.c | 2 +- src/coloring/edgeColoring.c | 2 +- src/coloring/sequentialVertexColoring.c | 2 +- src/components/articulationPoints.c | 2 +- src/components/biconnectedComponents.c | 2 +- src/components/bridges.c | 2 +- src/components/connectedComponents.c | 2 +- src/components/makeConnected.c | 2 +- src/components/strongComponents.c | 2 +- src/contraction/contractGraph.c | 2 +- src/dagShortestPath/dagShortestPath.c | 2 +- src/dijkstra/dijkstra.c | 2 +- src/dijkstra/dijkstraVia.c | 2 +- src/dominator/lengauerTarjanDominatorTree.c | 2 +- src/driving_distance/many_to_dist_driving_distance.c | 2 +- src/driving_distance/many_to_dist_withPointsDD.c | 2 +- src/ksp/ksp.c | 2 +- src/ksp/turnRestrictedPath.c | 2 +- src/ksp/withPoints_ksp.c | 2 +- src/lineGraph/lineGraph.c | 2 +- src/lineGraph/lineGraphFull.c | 2 +- src/max_flow/edge_disjoint_paths.c | 2 +- src/max_flow/max_flow.c | 2 +- src/max_flow/maximum_cardinality_matching.c | 2 +- src/max_flow/minCostMaxFlow.c | 2 +- src/mincut/stoerWagner.c | 2 +- src/ordering/cuthillMckeeOrdering.c | 2 +- src/pickDeliver/pickDeliver.c | 2 +- src/pickDeliver/pickDeliverEuclidean.c | 2 +- src/planar/boyerMyrvold.c | 2 +- src/planar/isPlanar.c | 2 +- src/spanningTree/kruskal.c | 2 +- src/spanningTree/prim.c | 2 +- src/spanningTree/randomSpanningTree.c | 2 +- src/topologicalSort/topologicalSort.c | 2 +- src/transitiveClosure/transitiveClosure.c | 2 +- src/traversal/depthFirstSearch.c | 2 +- src/trsp/new_trsp.c | 2 +- src/trsp/trsp.c | 2 +- src/trsp/trspVia.c | 2 +- src/trsp/trspVia_withPoints.c | 2 +- src/trsp/trsp_withPoints.c | 2 +- src/tsp/TSP.c | 2 +- src/tsp/euclideanTSP.c | 2 +- src/withPoints/withPoints.c | 2 +- src/withPoints/withPointsVia.c | 2 +- 59 files changed, 59 insertions(+), 59 deletions(-) diff --git a/src/allpairs/floydWarshall.c b/src/allpairs/floydWarshall.c index e55162cc5d..fd3f2d0273 100644 --- a/src/allpairs/floydWarshall.c +++ b/src/allpairs/floydWarshall.c @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/allpairs/floydWarshall_driver.h" diff --git a/src/allpairs/johnson.c b/src/allpairs/johnson.c index 274498271f..294407c82b 100644 --- a/src/allpairs/johnson.c +++ b/src/allpairs/johnson.c @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/allpairs/johnson_driver.h" diff --git a/src/alpha_shape/alphaShape.c b/src/alpha_shape/alphaShape.c index ba56b55d54..1baa3a7eb3 100644 --- a/src/alpha_shape/alphaShape.c +++ b/src/alpha_shape/alphaShape.c @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "c_types/geom_text_rt.h" #include "drivers/alpha_shape/alphaShape_driver.h" diff --git a/src/astar/astar.c b/src/astar/astar.c index d4fc8039da..2fe679f4e0 100644 --- a/src/astar/astar.c +++ b/src/astar/astar.c @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "c_common/check_parameters.h" #include "drivers/astar/astar_driver.h" diff --git a/src/bdAstar/bdAstar.c b/src/bdAstar/bdAstar.c index 845ccc3ad2..1d83b038a5 100644 --- a/src/bdAstar/bdAstar.c +++ b/src/bdAstar/bdAstar.c @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "c_common/check_parameters.h" #include "drivers/bdAstar/bdAstar_driver.h" diff --git a/src/bdDijkstra/bdDijkstra.c b/src/bdDijkstra/bdDijkstra.c index d367dcf221..e5add81be5 100644 --- a/src/bdDijkstra/bdDijkstra.c +++ b/src/bdDijkstra/bdDijkstra.c @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/bdDijkstra/bdDijkstra_driver.h" diff --git a/src/bellman_ford/bellman_ford.c b/src/bellman_ford/bellman_ford.c index efa5113e44..a499740020 100644 --- a/src/bellman_ford/bellman_ford.c +++ b/src/bellman_ford/bellman_ford.c @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/bellman_ford/bellman_ford_driver.h" diff --git a/src/bellman_ford/bellman_ford_neg.c b/src/bellman_ford/bellman_ford_neg.c index 8bae728b8f..957e6ecfa5 100644 --- a/src/bellman_ford/bellman_ford_neg.c +++ b/src/bellman_ford/bellman_ford_neg.c @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/bellman_ford/bellman_ford_neg_driver.h" // the link to the C++ code of the function diff --git a/src/bellman_ford/edwardMoore.c b/src/bellman_ford/edwardMoore.c index ca7cd5c8f4..ce3501d0fb 100644 --- a/src/bellman_ford/edwardMoore.c +++ b/src/bellman_ford/edwardMoore.c @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/bellman_ford/edwardMoore_driver.h" diff --git a/src/breadthFirstSearch/binaryBreadthFirstSearch.c b/src/breadthFirstSearch/binaryBreadthFirstSearch.c index fa4ec4da49..3cb6a731d9 100644 --- a/src/breadthFirstSearch/binaryBreadthFirstSearch.c +++ b/src/breadthFirstSearch/binaryBreadthFirstSearch.c @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/breadthFirstSearch/binaryBreadthFirstSearch_driver.h" diff --git a/src/breadthFirstSearch/breadthFirstSearch.c b/src/breadthFirstSearch/breadthFirstSearch.c index f47f26a152..aefb5f8b26 100644 --- a/src/breadthFirstSearch/breadthFirstSearch.c +++ b/src/breadthFirstSearch/breadthFirstSearch.c @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "c_types/mst_rt.h" diff --git a/src/chinese/chinesePostman.c b/src/chinese/chinesePostman.c index 5e600336be..ff49febd59 100644 --- a/src/chinese/chinesePostman.c +++ b/src/chinese/chinesePostman.c @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/chinese/chinesePostman_driver.h" diff --git a/src/circuits/hawickCircuits.c b/src/circuits/hawickCircuits.c index e6cff0eab3..8c1bcb1f81 100644 --- a/src/circuits/hawickCircuits.c +++ b/src/circuits/hawickCircuits.c @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/circuits/hawickcircuits_driver.h" PGDLLEXPORT Datum _pgr_hawickcircuits(PG_FUNCTION_ARGS); diff --git a/src/coloring/bipartite.c b/src/coloring/bipartite.c index 4f575e5dfe..e9435de231 100644 --- a/src/coloring/bipartite.c +++ b/src/coloring/bipartite.c @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/coloring/bipartite_driver.h" diff --git a/src/coloring/edgeColoring.c b/src/coloring/edgeColoring.c index 618220cf24..1c71e7a545 100644 --- a/src/coloring/edgeColoring.c +++ b/src/coloring/edgeColoring.c @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "c_types/ii_t_rt.h" #include "drivers/coloring/edgeColoring_driver.h" diff --git a/src/coloring/sequentialVertexColoring.c b/src/coloring/sequentialVertexColoring.c index 3d266bfbd5..a3bc266b10 100644 --- a/src/coloring/sequentialVertexColoring.c +++ b/src/coloring/sequentialVertexColoring.c @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "c_types/ii_t_rt.h" diff --git a/src/components/articulationPoints.c b/src/components/articulationPoints.c index 68df104e6c..e9198dc1f5 100644 --- a/src/components/articulationPoints.c +++ b/src/components/articulationPoints.c @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/components/articulationPoints_driver.h" diff --git a/src/components/biconnectedComponents.c b/src/components/biconnectedComponents.c index 7e5bf9bba8..09910cffbd 100644 --- a/src/components/biconnectedComponents.c +++ b/src/components/biconnectedComponents.c @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/components/biconnectedComponents_driver.h" diff --git a/src/components/bridges.c b/src/components/bridges.c index aef3be4e74..105cf764f8 100644 --- a/src/components/bridges.c +++ b/src/components/bridges.c @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/components/bridges_driver.h" diff --git a/src/components/connectedComponents.c b/src/components/connectedComponents.c index 81c24bd969..2f8773a8f9 100644 --- a/src/components/connectedComponents.c +++ b/src/components/connectedComponents.c @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/components/connectedComponents_driver.h" diff --git a/src/components/makeConnected.c b/src/components/makeConnected.c index ee4f967a31..d86dde1e9e 100644 --- a/src/components/makeConnected.c +++ b/src/components/makeConnected.c @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/components/makeConnected_driver.h" PGDLLEXPORT Datum _pgr_makeconnected(PG_FUNCTION_ARGS); diff --git a/src/components/strongComponents.c b/src/components/strongComponents.c index 3176c48f5c..f78289a192 100644 --- a/src/components/strongComponents.c +++ b/src/components/strongComponents.c @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/components/strongComponents_driver.h" diff --git a/src/contraction/contractGraph.c b/src/contraction/contractGraph.c index 7fb0a45a28..8c45e537f4 100644 --- a/src/contraction/contractGraph.c +++ b/src/contraction/contractGraph.c @@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" #include "c_types/contracted_rt.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/contraction/contractGraph_driver.h" PGDLLEXPORT Datum _pgr_contraction(PG_FUNCTION_ARGS); diff --git a/src/dagShortestPath/dagShortestPath.c b/src/dagShortestPath/dagShortestPath.c index 5d4a12df54..8ec7e23b5b 100644 --- a/src/dagShortestPath/dagShortestPath.c +++ b/src/dagShortestPath/dagShortestPath.c @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/dagShortestPath/dagShortestPath_driver.h" // the link to the C++ code of the function PGDLLEXPORT Datum _pgr_dagshortestpath(PG_FUNCTION_ARGS); diff --git a/src/dijkstra/dijkstra.c b/src/dijkstra/dijkstra.c index fa764c67e5..5e7ff94ff7 100644 --- a/src/dijkstra/dijkstra.c +++ b/src/dijkstra/dijkstra.c @@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/dijkstra/dijkstra_driver.h" PG_MODULE_MAGIC; diff --git a/src/dijkstra/dijkstraVia.c b/src/dijkstra/dijkstraVia.c index 4151503655..e96656a7a2 100644 --- a/src/dijkstra/dijkstraVia.c +++ b/src/dijkstra/dijkstraVia.c @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/dijkstra/dijkstraVia_driver.h" PGDLLEXPORT Datum _pgr_dijkstravia(PG_FUNCTION_ARGS); diff --git a/src/dominator/lengauerTarjanDominatorTree.c b/src/dominator/lengauerTarjanDominatorTree.c index fc5eaafea0..645238108f 100644 --- a/src/dominator/lengauerTarjanDominatorTree.c +++ b/src/dominator/lengauerTarjanDominatorTree.c @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" #include "c_types/ii_t_rt.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/dominator/lengauerTarjanDominatorTree_driver.h" diff --git a/src/driving_distance/many_to_dist_driving_distance.c b/src/driving_distance/many_to_dist_driving_distance.c index 1b4e33beda..dad29d1e25 100644 --- a/src/driving_distance/many_to_dist_driving_distance.c +++ b/src/driving_distance/many_to_dist_driving_distance.c @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/driving_distance/drivedist_driver.h" diff --git a/src/driving_distance/many_to_dist_withPointsDD.c b/src/driving_distance/many_to_dist_withPointsDD.c index 66c71405f2..4a05804ebb 100644 --- a/src/driving_distance/many_to_dist_withPointsDD.c +++ b/src/driving_distance/many_to_dist_withPointsDD.c @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/time_msg.h" #include "c_types/mst_rt.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/withPoints/get_new_queries.h" #include "drivers/driving_distance/withPoints_dd_driver.h" diff --git a/src/ksp/ksp.c b/src/ksp/ksp.c index 059099f6b6..8d2df058a7 100644 --- a/src/ksp/ksp.c +++ b/src/ksp/ksp.c @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/yen/ksp_driver.h" diff --git a/src/ksp/turnRestrictedPath.c b/src/ksp/turnRestrictedPath.c index c8a1dd9391..b4b8582ff0 100644 --- a/src/ksp/turnRestrictedPath.c +++ b/src/ksp/turnRestrictedPath.c @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/yen/turnRestrictedPath_driver.h" diff --git a/src/ksp/withPoints_ksp.c b/src/ksp/withPoints_ksp.c index 17389ee0a3..a42ee05fca 100644 --- a/src/ksp/withPoints_ksp.c +++ b/src/ksp/withPoints_ksp.c @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/time_msg.h" #include "c_common/e_report.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/withPoints/get_new_queries.h" #include "drivers/yen/withPoints_ksp_driver.h" diff --git a/src/lineGraph/lineGraph.c b/src/lineGraph/lineGraph.c index cbaafb7417..a6895672c7 100644 --- a/src/lineGraph/lineGraph.c +++ b/src/lineGraph/lineGraph.c @@ -50,7 +50,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/lineGraph/lineGraph_driver.h" // the link to the C++ code of the function diff --git a/src/lineGraph/lineGraphFull.c b/src/lineGraph/lineGraphFull.c index cb8970c93f..9e5f3accfa 100644 --- a/src/lineGraph/lineGraphFull.c +++ b/src/lineGraph/lineGraphFull.c @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/lineGraph/lineGraphFull_driver.h" PGDLLEXPORT Datum _pgr_linegraphfull(PG_FUNCTION_ARGS); diff --git a/src/max_flow/edge_disjoint_paths.c b/src/max_flow/edge_disjoint_paths.c index afee7829fe..399a033430 100644 --- a/src/max_flow/edge_disjoint_paths.c +++ b/src/max_flow/edge_disjoint_paths.c @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/max_flow/edge_disjoint_paths_driver.h" PGDLLEXPORT Datum diff --git a/src/max_flow/max_flow.c b/src/max_flow/max_flow.c index d582616682..4d912d36bc 100644 --- a/src/max_flow/max_flow.c +++ b/src/max_flow/max_flow.c @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/max_flow/max_flow_driver.h" #include "c_types/flow_t.h" diff --git a/src/max_flow/maximum_cardinality_matching.c b/src/max_flow/maximum_cardinality_matching.c index 22a6dc9821..e5486aa027 100644 --- a/src/max_flow/maximum_cardinality_matching.c +++ b/src/max_flow/maximum_cardinality_matching.c @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "c_types/edge_bool_t_rt.h" diff --git a/src/max_flow/minCostMaxFlow.c b/src/max_flow/minCostMaxFlow.c index 1b2706540d..de014efd26 100644 --- a/src/max_flow/minCostMaxFlow.c +++ b/src/max_flow/minCostMaxFlow.c @@ -49,7 +49,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/max_flow/minCostMaxFlow_driver.h" diff --git a/src/mincut/stoerWagner.c b/src/mincut/stoerWagner.c index c074b9ba30..00bad20d2c 100644 --- a/src/mincut/stoerWagner.c +++ b/src/mincut/stoerWagner.c @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "c_types/stoerWagner_t.h" #include "drivers/mincut/stoerWagner_driver.h" diff --git a/src/ordering/cuthillMckeeOrdering.c b/src/ordering/cuthillMckeeOrdering.c index 51d97894fd..ce08414619 100644 --- a/src/ordering/cuthillMckeeOrdering.c +++ b/src/ordering/cuthillMckeeOrdering.c @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "c_types/ii_t_rt.h" diff --git a/src/pickDeliver/pickDeliver.c b/src/pickDeliver/pickDeliver.c index 431aa948aa..d71c5c56e5 100644 --- a/src/pickDeliver/pickDeliver.c +++ b/src/pickDeliver/pickDeliver.c @@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "c_types/iid_t_rt.h" #include "c_types/pickDeliver/schedule_rt.h" diff --git a/src/pickDeliver/pickDeliverEuclidean.c b/src/pickDeliver/pickDeliverEuclidean.c index bd9fb1047f..6a64657ac5 100644 --- a/src/pickDeliver/pickDeliverEuclidean.c +++ b/src/pickDeliver/pickDeliverEuclidean.c @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "c_types/iid_t_rt.h" #include "c_types/pickDeliver/orders_t.h" #include "c_types/pickDeliver/vehicle_t.h" diff --git a/src/planar/boyerMyrvold.c b/src/planar/boyerMyrvold.c index b8c8182180..95fec5165e 100644 --- a/src/planar/boyerMyrvold.c +++ b/src/planar/boyerMyrvold.c @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/planar/boyerMyrvold_driver.h" PGDLLEXPORT Datum _pgr_boyermyrvold(PG_FUNCTION_ARGS); diff --git a/src/planar/isPlanar.c b/src/planar/isPlanar.c index 14586abf54..768bae76f2 100644 --- a/src/planar/isPlanar.c +++ b/src/planar/isPlanar.c @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/planar/isPlanar_driver.h" PGDLLEXPORT Datum _pgr_isplanar(PG_FUNCTION_ARGS); diff --git a/src/spanningTree/kruskal.c b/src/spanningTree/kruskal.c index 2fe5d6c646..cc3e5d3f4f 100644 --- a/src/spanningTree/kruskal.c +++ b/src/spanningTree/kruskal.c @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "c_types/mst_rt.h" #include "drivers/spanningTree/mst_common.h" diff --git a/src/spanningTree/prim.c b/src/spanningTree/prim.c index 1cbe8369b8..16f4f1a874 100644 --- a/src/spanningTree/prim.c +++ b/src/spanningTree/prim.c @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "c_types/mst_rt.h" #include "drivers/spanningTree/mst_common.h" diff --git a/src/spanningTree/randomSpanningTree.c b/src/spanningTree/randomSpanningTree.c index 50f87b3ff0..dbf004678b 100644 --- a/src/spanningTree/randomSpanningTree.c +++ b/src/spanningTree/randomSpanningTree.c @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/spanningTree/randomSpanningTree_driver.h" diff --git a/src/topologicalSort/topologicalSort.c b/src/topologicalSort/topologicalSort.c index 2b4610aa20..f3b9e05b01 100644 --- a/src/topologicalSort/topologicalSort.c +++ b/src/topologicalSort/topologicalSort.c @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/topologicalSort/topologicalSort_driver.h" #if 0 PG_MODULE_MAGIC; diff --git a/src/transitiveClosure/transitiveClosure.c b/src/transitiveClosure/transitiveClosure.c index 22e6510ee2..8a83529589 100644 --- a/src/transitiveClosure/transitiveClosure.c +++ b/src/transitiveClosure/transitiveClosure.c @@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" #include "c_types/transitiveClosure_rt.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/transitiveClosure/transitiveClosure_driver.h" PGDLLEXPORT Datum _pgr_transitiveclosure(PG_FUNCTION_ARGS); diff --git a/src/traversal/depthFirstSearch.c b/src/traversal/depthFirstSearch.c index 68d3b17f9b..cf308043a3 100644 --- a/src/traversal/depthFirstSearch.c +++ b/src/traversal/depthFirstSearch.c @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "c_types/mst_rt.h" diff --git a/src/trsp/new_trsp.c b/src/trsp/new_trsp.c index 096e705991..3e389871fb 100644 --- a/src/trsp/new_trsp.c +++ b/src/trsp/new_trsp.c @@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/restriction_t.h" #include "c_types/path_rt.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" PGDLLEXPORT Datum _pgr_trspv4(PG_FUNCTION_ARGS); PG_FUNCTION_INFO_V1(_pgr_trspv4); diff --git a/src/trsp/trsp.c b/src/trsp/trsp.c index ebcfb6860f..18ab4e3478 100644 --- a/src/trsp/trsp.c +++ b/src/trsp/trsp.c @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/trsp/trsp.h" #include "c_types/edge_t.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "trsp/trsp_core.h" typedef struct restrict_t restrict_t; diff --git a/src/trsp/trspVia.c b/src/trsp/trspVia.c index cd00eb5d00..4e2633113d 100644 --- a/src/trsp/trspVia.c +++ b/src/trsp/trspVia.c @@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/trsp/trspVia_driver.h" PGDLLEXPORT Datum _pgr_trspvia(PG_FUNCTION_ARGS); diff --git a/src/trsp/trspVia_withPoints.c b/src/trsp/trspVia_withPoints.c index 74b838a053..e78d1ef10d 100644 --- a/src/trsp/trspVia_withPoints.c +++ b/src/trsp/trspVia_withPoints.c @@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/withPoints/get_new_queries.h" #include "drivers/trsp/trspVia_withPoints_driver.h" diff --git a/src/trsp/trsp_withPoints.c b/src/trsp/trsp_withPoints.c index 5a945b894e..9010f8fe20 100644 --- a/src/trsp/trsp_withPoints.c +++ b/src/trsp/trsp_withPoints.c @@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/withPoints/get_new_queries.h" #include "drivers/trsp/trsp_withPoints_driver.h" diff --git a/src/tsp/TSP.c b/src/tsp/TSP.c index 92f28e40d6..5fcf4a7f72 100644 --- a/src/tsp/TSP.c +++ b/src/tsp/TSP.c @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "c_types/tsp_tour_rt.h" #include "drivers/tsp/TSP_driver.h" diff --git a/src/tsp/euclideanTSP.c b/src/tsp/euclideanTSP.c index 1f24ced1ed..30deba69ac 100644 --- a/src/tsp/euclideanTSP.c +++ b/src/tsp/euclideanTSP.c @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "c_types/tsp_tour_rt.h" #include "drivers/tsp/euclideanTSP_driver.h" diff --git a/src/withPoints/withPoints.c b/src/withPoints/withPoints.c index c9f6b51778..5489d158ae 100644 --- a/src/withPoints/withPoints.c +++ b/src/withPoints/withPoints.c @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/withPoints/get_new_queries.h" #include "drivers/withPoints/withPoints_driver.h" diff --git a/src/withPoints/withPointsVia.c b/src/withPoints/withPointsVia.c index 6cb4793e6e..305c80ddf5 100644 --- a/src/withPoints/withPointsVia.c +++ b/src/withPoints/withPointsVia.c @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/pgdata_getters.h" +#include "c_common/trsp_pgget.h" #include "drivers/withPoints/get_new_queries.h" #include "drivers/withPoints/withPointsVia_driver.h" From 5e26168b93bfb0404e05ea3134b9997e2fa69225 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 24 Jan 2024 15:25:15 -0600 Subject: [PATCH 064/428] [tools] pgtap script to not show NOTICE --- tools/testers/pg_prove_tests.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tools/testers/pg_prove_tests.sh b/tools/testers/pg_prove_tests.sh index 2ef4ce74b1..672489585e 100755 --- a/tools/testers/pg_prove_tests.sh +++ b/tools/testers/pg_prove_tests.sh @@ -39,13 +39,12 @@ pushd ./tools/testers/ || exit 1 bash setup_db.sh "${PGPORT}" "${PGDATABASE}" "${PGUSER}" "3.7.0" -pg_prove --failures --Q --recurse \ - --S client_min_messages=WARNING \ - --S on_error_rollback=off \ - --S on_error_stop=true \ - --P format=unaligned \ - --P tuples_only=true \ - --P pager=off \ +PGOPTIONS="-c client_min_messages=WARNING" pg_prove --failures --Q --recurse \ + -S on_error_rollback=off \ + -S on_error_stop=true \ + -P format=unaligned \ + -P tuples_only=true \ + -P pager=off \ -p "$PGPORT" -d "$PGDATABASE" -U "$PGUSER" ../../pgtap/ popd From fe6f023ed7ce11168ed6500f6833a7bb7c1459f9 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 22 Jan 2024 14:15:42 -0600 Subject: [PATCH 065/428] [allpairs] Reading data on C++ code part1 - C files: marking unused code - cleanup: removing comments - _driver.h: - parameter for queries is the sql char* - Clean up: removing parameter names & comments - _driver.cpp: - c++ code read the data from the SQL queries - Adding a catch for input errors --- .../drivers/allpairs/floydWarshall_driver.h | 18 ++++----- include/drivers/allpairs/johnson_driver.h | 15 +++---- src/allpairs/floydWarshall.c | 39 +++++------------- src/allpairs/floydWarshall_driver.cpp | 21 +++++++--- src/allpairs/johnson.c | 40 +++++-------------- src/allpairs/johnson_driver.cpp | 27 +++++++++---- 6 files changed, 65 insertions(+), 95 deletions(-) diff --git a/include/drivers/allpairs/floydWarshall_driver.h b/include/drivers/allpairs/floydWarshall_driver.h index a1850be4b4..a0ee760427 100644 --- a/include/drivers/allpairs/floydWarshall_driver.h +++ b/include/drivers/allpairs/floydWarshall_driver.h @@ -34,11 +34,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /* for size-t */ #ifdef __cplusplus # include -using Edge_t = struct Edge_t; using IID_t_rt = struct IID_t_rt; #else # include -typedef struct Edge_t Edge_t; typedef struct IID_t_rt IID_t_rt; #endif @@ -50,15 +48,13 @@ extern "C" { void do_pgr_floydWarshall( - Edge_t *data_edges, - size_t total_tuples, - bool directedFlag, - - // return values - IID_t_rt **ret_matrix, - size_t *return_tuple_count, - char ** log_msg, - char ** err_msg); + char*, + bool, + + IID_t_rt**, + size_t*, + char**, + char**); #ifdef __cplusplus } diff --git a/include/drivers/allpairs/johnson_driver.h b/include/drivers/allpairs/johnson_driver.h index 97c3a96b46..7f3dc24c22 100644 --- a/include/drivers/allpairs/johnson_driver.h +++ b/include/drivers/allpairs/johnson_driver.h @@ -33,11 +33,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /* for size-t */ #ifdef __cplusplus # include -using Edge_t = struct Edge_t; using IID_t_rt = struct IID_t_rt; #else # include -typedef struct Edge_t Edge_t; typedef struct IID_t_rt IID_t_rt; #endif @@ -47,17 +45,14 @@ typedef struct IID_t_rt IID_t_rt; extern "C" { #endif -// CREATE OR REPLACE FUNCTION pgr_johnson(edges_sql TEXT, directed BOOLEAN, void do_pgr_johnson( - Edge_t *data_edges, - size_t total_tuples, - bool directed, - IID_t_rt **return_tuples, - size_t *return_count, - char ** log_msg, - char ** err_msg); + char*, + bool, + IID_t_rt**, size_t*, + char**, + char**); #ifdef __cplusplus } diff --git a/src/allpairs/floydWarshall.c b/src/allpairs/floydWarshall.c index fd3f2d0273..f4ad170de4 100644 --- a/src/allpairs/floydWarshall.c +++ b/src/allpairs/floydWarshall.c @@ -28,7 +28,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ #include - #include "c_common/postgres_connection.h" #include "c_types/iid_t_rt.h" @@ -36,8 +35,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" +#if 0 #include "c_common/trsp_pgget.h" - +#endif #include "drivers/allpairs/floydWarshall_driver.h" PGDLLEXPORT Datum _pgr_floydwarshall(PG_FUNCTION_ARGS); @@ -55,6 +55,7 @@ process( char* notice_msg = NULL; char* err_msg = NULL; +#if 0 PGR_DBG("Load data"); Edge_t *edges = NULL; size_t total_tuples = 0; @@ -69,12 +70,10 @@ process( return; } PGR_DBG("Total %ld tuples in query:", total_tuples); - +#endif clock_t start_t = clock(); - PGR_DBG("Starting processing"); - do_pgr_floydWarshall( - edges, - total_tuples, + pgr_do_floydWarshall( + edges_sql, directed, result_tuples, result_count, @@ -94,8 +93,9 @@ process( if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - +#if 0 pfree(edges); +#endif pgr_SPI_finish(); } @@ -105,12 +105,9 @@ _pgr_floydwarshall(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; - /**************************************************************************/ - /* */ + IID_t_rt *result_tuples = NULL; size_t result_count = 0; - /* */ - /**************************************************************************/ if (SRF_IS_FIRSTCALL()) { MemoryContext oldcontext; @@ -118,28 +115,12 @@ _pgr_floydwarshall(PG_FUNCTION_ARGS) { oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - /*********************************************************************/ - /* */ - // QUERY - // CREATE OR REPLACE FUNCTION pgr_floydWarshalll( - // edges_sql TEXT, - // directed BOOLEAN, - // OUT seq INTEGER, - // OUT from_vid bigint, - // OUT to_vid bigint, - // OUT cost float) - - - PGR_DBG("Calling process"); process( text_to_cstring(PG_GETARG_TEXT_P(0)), PG_GETARG_BOOL(1), &result_tuples, &result_count); - /* */ - /*********************************************************************/ - funcctx->max_calls = result_count; funcctx->user_fctx = result_tuples; if (get_call_result_type(fcinfo, NULL, &tuple_desc) @@ -163,7 +144,6 @@ _pgr_floydwarshall(PG_FUNCTION_ARGS) { Datum *values; bool* nulls; - /*********************************************************************/ values = palloc(3 * sizeof(Datum)); nulls = palloc(3 * sizeof(bool)); @@ -174,7 +154,6 @@ _pgr_floydwarshall(PG_FUNCTION_ARGS) { nulls[1] = false; values[2] = Float8GetDatum(result_tuples[funcctx->call_cntr].cost); nulls[2] = false; - /*********************************************************************/ tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); diff --git a/src/allpairs/floydWarshall_driver.cpp b/src/allpairs/floydWarshall_driver.cpp index 9dbb95aed4..8bd8038dff 100644 --- a/src/allpairs/floydWarshall_driver.cpp +++ b/src/allpairs/floydWarshall_driver.cpp @@ -34,14 +34,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "allpairs/pgr_allpairs.hpp" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_assert.h" void -do_pgr_floydWarshall( - Edge_t *data_edges, - size_t total_tuples, +pgr_do_floydWarshall( + char *edges_sql, bool directedFlag, IID_t_rt **return_tuples, @@ -53,6 +53,7 @@ do_pgr_floydWarshall( std::ostringstream log; std::ostringstream err; + char *hint = nullptr; try { pgassert(!(*log_msg)); @@ -62,16 +63,23 @@ do_pgr_floydWarshall( graphType gType = directedFlag? DIRECTED: UNDIRECTED; + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, true); + + if (edges.empty()) { + throw std::string("No edges found"); + } + hint = nullptr; if (directedFlag) { log << "Processing Directed graph\n"; pgrouting::DirectedGraph digraph(gType); - digraph.insert_edges(data_edges, total_tuples); + digraph.insert_edges(edges); pgr_floydWarshall(digraph, *return_count, return_tuples); } else { log << "Processing Undirected graph\n"; pgrouting::UndirectedGraph undigraph(gType); - undigraph.insert_edges(data_edges, total_tuples); + undigraph.insert_edges(edges); pgr_floydWarshall(undigraph, *return_count, return_tuples); } @@ -93,6 +101,9 @@ do_pgr_floydWarshall( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; diff --git a/src/allpairs/johnson.c b/src/allpairs/johnson.c index 294407c82b..164a6d331d 100644 --- a/src/allpairs/johnson.c +++ b/src/allpairs/johnson.c @@ -34,15 +34,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" +#if 0 #include "c_common/trsp_pgget.h" +#endif #include "drivers/allpairs/johnson_driver.h" PGDLLEXPORT Datum _pgr_johnson(PG_FUNCTION_ARGS); PG_FUNCTION_INFO_V1(_pgr_johnson); -/******************************************************************************/ -/* MODIFY AS NEEDED */ static void process( char* edges_sql, @@ -54,6 +54,7 @@ void process( char* notice_msg = NULL; char* err_msg = NULL; +#if 0 PGR_DBG("Load data"); Edge_t *edges = NULL; size_t total_tuples = 0; @@ -70,10 +71,11 @@ void process( PGR_DBG("Total %ld tuples in query:", total_tuples); PGR_DBG("Starting processing"); +#endif + clock_t start_t = clock(); - do_pgr_johnson( - edges, - total_tuples, + pgr_do_johnson( + edges_sql, directed, result_tuples, result_count, @@ -94,24 +96,19 @@ void process( if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); +#if 0 pfree(edges); +#endif pgr_SPI_finish(); } -/* */ -/******************************************************************************/ PGDLLEXPORT Datum _pgr_johnson(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; - /**************************************************************************/ - /* MODIFY AS NEEDED */ - /* */ IID_t_rt *result_tuples = NULL; size_t result_count = 0; - /* */ - /**************************************************************************/ if (SRF_IS_FIRSTCALL()) { MemoryContext oldcontext; @@ -119,22 +116,12 @@ _pgr_johnson(PG_FUNCTION_ARGS) { oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - /*********************************************************************/ - /* MODIFY AS NEEDED */ - // CREATE OR REPLACE FUNCTION pgr_johnson( - // edges_sql TEXT, - // directed BOOLEAN, - - PGR_DBG("Calling process"); process( text_to_cstring(PG_GETARG_TEXT_P(0)), PG_GETARG_BOOL(1), &result_tuples, &result_count); - /* */ - /*********************************************************************/ - funcctx->max_calls = result_count; funcctx->user_fctx = result_tuples; if (get_call_result_type(fcinfo, NULL, &tuple_desc) @@ -158,13 +145,6 @@ _pgr_johnson(PG_FUNCTION_ARGS) { Datum *values; bool *nulls; - /*********************************************************************/ - /* MODIFY AS NEEDED */ - // OUT seq BIGINT, - // OUT from_vid BIGINT, - // OUT to_vid BIGINT, - // OUT cost float) - values = palloc(3 * sizeof(Datum)); nulls = palloc(3 * sizeof(bool)); @@ -176,8 +156,6 @@ _pgr_johnson(PG_FUNCTION_ARGS) { values[2] = Float8GetDatum(result_tuples[funcctx->call_cntr].cost); nulls[2] = false; - /*********************************************************************/ - tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); diff --git a/src/allpairs/johnson_driver.cpp b/src/allpairs/johnson_driver.cpp index ff0c914f13..b59b787e69 100644 --- a/src/allpairs/johnson_driver.cpp +++ b/src/allpairs/johnson_driver.cpp @@ -34,14 +34,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "allpairs/pgr_allpairs.hpp" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_assert.h" void -do_pgr_johnson( - Edge_t *data_edges, - size_t total_tuples, +pgr_do_johnson( + char *edges_sql, bool directed, IID_t_rt **return_tuples, size_t *return_count, @@ -52,6 +52,7 @@ do_pgr_johnson( std::ostringstream log; std::ostringstream err; + char *hint = nullptr; try { pgassert(!(*log_msg)); @@ -61,28 +62,35 @@ do_pgr_johnson( graphType gType = directed? DIRECTED: UNDIRECTED; + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, true); + + if (edges.empty()) { + throw std::string("No edges found"); + } + hint = nullptr; + if (directed) { log << "Processing Directed graph\n"; pgrouting::DirectedGraph digraph(gType); - digraph.insert_edges(data_edges, total_tuples); + digraph.insert_edges(edges); pgr_johnson(digraph, *return_count, return_tuples); } else { log << "Processing Undirected graph\n"; pgrouting::UndirectedGraph undigraph(gType); - undigraph.insert_edges(data_edges, total_tuples); + undigraph.insert_edges(edges); pgr_johnson(undigraph, *return_count, return_tuples); } if (*return_count == 0) { - log << "No result generated, report this error\n"; - *log_msg = pgr_msg(err.str().c_str()); + err << "No result generated, report this error\n"; + *err_msg = pgr_msg(err.str().c_str()); *return_tuples = NULL; *return_count = 0; return; } - *log_msg = log.str().empty()? *log_msg : pgr_msg(log.str().c_str()); @@ -92,6 +100,9 @@ do_pgr_johnson( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; From 49813cefb65764dc3ac6bb2dd685a5ab13792b58 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 22 Jan 2024 14:30:38 -0600 Subject: [PATCH 066/428] [allpairs] Reading data on C++ code part2 (removing unused code) --- .../drivers/allpairs/floydWarshall_driver.h | 2 +- include/drivers/allpairs/johnson_driver.h | 2 +- src/allpairs/floydWarshall.c | 22 ----------------- src/allpairs/johnson.c | 24 ------------------- 4 files changed, 2 insertions(+), 48 deletions(-) diff --git a/include/drivers/allpairs/floydWarshall_driver.h b/include/drivers/allpairs/floydWarshall_driver.h index a0ee760427..202a398fab 100644 --- a/include/drivers/allpairs/floydWarshall_driver.h +++ b/include/drivers/allpairs/floydWarshall_driver.h @@ -47,7 +47,7 @@ extern "C" { #endif void -do_pgr_floydWarshall( +pgr_do_floydWarshall( char*, bool, diff --git a/include/drivers/allpairs/johnson_driver.h b/include/drivers/allpairs/johnson_driver.h index 7f3dc24c22..2602909c12 100644 --- a/include/drivers/allpairs/johnson_driver.h +++ b/include/drivers/allpairs/johnson_driver.h @@ -46,7 +46,7 @@ extern "C" { #endif void -do_pgr_johnson( +pgr_do_johnson( char*, bool, diff --git a/src/allpairs/floydWarshall.c b/src/allpairs/floydWarshall.c index f4ad170de4..5c2702c254 100644 --- a/src/allpairs/floydWarshall.c +++ b/src/allpairs/floydWarshall.c @@ -35,9 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#if 0 -#include "c_common/trsp_pgget.h" -#endif #include "drivers/allpairs/floydWarshall_driver.h" PGDLLEXPORT Datum _pgr_floydwarshall(PG_FUNCTION_ARGS); @@ -55,22 +52,6 @@ process( char* notice_msg = NULL; char* err_msg = NULL; -#if 0 - PGR_DBG("Load data"); - Edge_t *edges = NULL; - size_t total_tuples = 0; - pgr_get_edges(edges_sql, &edges, &total_tuples, true, true, &err_msg); - throw_error(err_msg, edges_sql); - - if (total_tuples == 0) { - PGR_DBG("No edges found"); - (*result_count) = 0; - (*result_tuples) = NULL; - pgr_SPI_finish(); - return; - } - PGR_DBG("Total %ld tuples in query:", total_tuples); -#endif clock_t start_t = clock(); pgr_do_floydWarshall( edges_sql, @@ -93,9 +74,6 @@ process( if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); -#if 0 - pfree(edges); -#endif pgr_SPI_finish(); } diff --git a/src/allpairs/johnson.c b/src/allpairs/johnson.c index 164a6d331d..66c6c9a457 100644 --- a/src/allpairs/johnson.c +++ b/src/allpairs/johnson.c @@ -34,9 +34,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#if 0 -#include "c_common/trsp_pgget.h" -#endif #include "drivers/allpairs/johnson_driver.h" @@ -54,24 +51,6 @@ void process( char* notice_msg = NULL; char* err_msg = NULL; -#if 0 - PGR_DBG("Load data"); - Edge_t *edges = NULL; - size_t total_tuples = 0; - pgr_get_edges(edges_sql, &edges, &total_tuples, true, true, &err_msg); - throw_error(err_msg, edges_sql); - - if (total_tuples == 0) { - PGR_DBG("No edges found"); - (*result_count) = 0; - (*result_tuples) = NULL; - pgr_SPI_finish(); - return; - } - PGR_DBG("Total %ld tuples in query:", total_tuples); - - PGR_DBG("Starting processing"); -#endif clock_t start_t = clock(); pgr_do_johnson( @@ -96,9 +75,6 @@ void process( if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); -#if 0 - pfree(edges); -#endif pgr_SPI_finish(); } From fac28e422ccc94a2678f43009212c69331917986 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 22 Jan 2024 14:41:54 -0600 Subject: [PATCH 067/428] [alpha_shape] Reading data on C++ code --- .../drivers/alpha_shape/alphaShape_driver.h | 17 +++------ src/alpha_shape/alphaShape.c | 38 +------------------ src/alpha_shape/alphaShape_driver.cpp | 28 +++++++++----- 3 files changed, 26 insertions(+), 57 deletions(-) diff --git a/include/drivers/alpha_shape/alphaShape_driver.h b/include/drivers/alpha_shape/alphaShape_driver.h index 40e28d5e33..aea52dc3ed 100644 --- a/include/drivers/alpha_shape/alphaShape_driver.h +++ b/include/drivers/alpha_shape/alphaShape_driver.h @@ -29,10 +29,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #ifdef __cplusplus # include using GeomText_t = struct GeomText_t; -using Edge_xy_t = struct Edge_xy_t; #else # include -typedef struct Edge_xy_t Edge_xy_t; typedef struct GeomText_t GeomText_t; #endif @@ -40,18 +38,13 @@ typedef struct GeomText_t GeomText_t; extern "C" { #endif - void do_alphaShape( - Edge_xy_t *edgesArr, - size_t edgesTotal, +void do_alphaShape( + char*, - double alpha, + double, - GeomText_t **return_tuples, - size_t *return_count, - char **log_msg, - char **notice_msg, - - char **err_msg); + GeomText_t**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/src/alpha_shape/alphaShape.c b/src/alpha_shape/alphaShape.c index 1baa3a7eb3..7175cb75bf 100644 --- a/src/alpha_shape/alphaShape.c +++ b/src/alpha_shape/alphaShape.c @@ -35,7 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "c_types/geom_text_rt.h" #include "drivers/alpha_shape/alphaShape_driver.h" @@ -53,34 +52,8 @@ static void process( char* notice_msg = NULL; char* err_msg = NULL; - Edge_xy_t *edgesArr = NULL; - size_t edgesSize = 0; - - pgr_get_edges_xy(edges_sql, &edgesArr, &edgesSize, true, &err_msg); - throw_error(err_msg, edges_sql); - - PGR_DBG("total edges %ld", edgesSize); - PGR_DBG("alpha %f", alpha); -#if 0 - for (size_t i = 0; i < edgesSize; ++i) { - PGR_DBG("x1=%f y1=%f", edgesArr[i].x1, edgesArr[i].y1); - PGR_DBG("x2=%f y2=%f", edgesArr[i].x2, edgesArr[i].y2); - } -#endif - - if (edgesSize < 3) { - if (edgesArr) pfree(edgesArr); - elog(ERROR, "Less than 3 vertices." - " pgr_alphaShape needs at least 3 vertices."); - pgr_SPI_finish(); - return; - } - - PGR_DBG("Calling alpha-shape driver\n"); - - - do_alphaShape( - edgesArr, edgesSize, + pgr_do_alphaShape( + edges_sql, alpha, res, @@ -100,7 +73,6 @@ static void process( if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - if (edgesArr) pfree(edgesArr); pgr_SPI_finish(); } @@ -111,26 +83,20 @@ Datum _pgr_alphashape(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; - /**********************************************************************/ GeomText_t *result_tuples = NULL; size_t result_count = 0; - /**********************************************************************/ 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)), PG_GETARG_FLOAT8(1), &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) diff --git a/src/alpha_shape/alphaShape_driver.cpp b/src/alpha_shape/alphaShape_driver.cpp index 8a85601c6e..6f554fb929 100644 --- a/src/alpha_shape/alphaShape_driver.cpp +++ b/src/alpha_shape/alphaShape_driver.cpp @@ -40,6 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/geom_text_rt.h" #include "cpp_common/pgr_assert.h" +#include "cpp_common/pgdata_getters.hpp" #include "alphaShape/pgr_alphaShape.h" #include "cpp_common/pgr_alloc.hpp" @@ -61,10 +62,8 @@ data_eq(const Edge_xy_t &lhs, const Edge_xy_t &rhs, int64_t round) { } void -do_alphaShape( - Edge_xy_t *edgesArr, - size_t edgesSize, - +pgr_do_alphaShape( + char* edges_sql, double alpha, GeomText_t **return_tuples, @@ -80,13 +79,20 @@ do_alphaShape( std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char* hint = nullptr; + try { - pgassert(edgesArr); - pgassert(edgesSize > 2); pgassert(*return_count == 0); const int64_t round = 100000000000000; - std::vector edges(edgesArr, edgesArr + edgesSize); + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges_xy(std::string(edges_sql), true); + + if (edges.size() < 3) { + throw std::string("Less than 3 vertices. pgr_alphaShape needs at least 3 vertices."); + } + hint = nullptr; + /* id | source | target | cost | x1 | y1 | x2 | y2 -------+--------+--------+------+------------+------------+----+---- @@ -107,8 +113,6 @@ do_alphaShape( return std::floor(lhs.x1 * static_cast(round)) < std::floor(rhs.x1 * static_cast(round)); }); - log << "ending sort"; - int64_t source_id(0); @@ -201,15 +205,21 @@ do_alphaShape( (*return_count) = 0; err << except.what(); *err_msg = pgr_msg(err.str().c_str()); + *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; err << except.what(); *err_msg = pgr_msg(err.str().c_str()); + *log_msg = pgr_msg(log.str().c_str()); } catch(...) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; err << "Caught unknown exception!"; *err_msg = pgr_msg(err.str().c_str()); + *log_msg = pgr_msg(log.str().c_str()); } } From 1f38b08499fbfacf2c8fca924ff87ab460e4031a Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 24 Jan 2024 15:57:24 -0600 Subject: [PATCH 068/428] [alpha_shape] do_ -> pgr_do_ --- include/drivers/alpha_shape/alphaShape_driver.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/drivers/alpha_shape/alphaShape_driver.h b/include/drivers/alpha_shape/alphaShape_driver.h index aea52dc3ed..0928967b1f 100644 --- a/include/drivers/alpha_shape/alphaShape_driver.h +++ b/include/drivers/alpha_shape/alphaShape_driver.h @@ -38,7 +38,7 @@ typedef struct GeomText_t GeomText_t; extern "C" { #endif -void do_alphaShape( +void pgr_do_alphaShape( char*, double, From a18516a730cd23c3a8bfd199665e411b0a0b205a Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 22 Jan 2024 14:52:03 -0600 Subject: [PATCH 069/428] [astar] Reading data on C++ code --- include/drivers/astar/astar_driver.h | 33 +++++++----- src/astar/astar.c | 80 ++++++---------------------- src/astar/astar_driver.cpp | 60 ++++++++++++++------- 3 files changed, 79 insertions(+), 94 deletions(-) diff --git a/include/drivers/astar/astar_driver.h b/include/drivers/astar/astar_driver.h index 4f7728f226..3636de7c6b 100644 --- a/include/drivers/astar/astar_driver.h +++ b/include/drivers/astar/astar_driver.h @@ -31,17 +31,26 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_ASTAR_ASTAR_DRIVER_H_ #pragma once +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#include "cpp_common/undefPostgresDefine.hpp" + #ifdef __cplusplus # include # include -using Edge_xy_t = struct Edge_xy_t; -using II_t_rt = struct II_t_rt; using Path_rt = struct Path_rt; #else # include # include -typedef struct Edge_xy_t Edge_xy_t; -typedef struct II_t_rt II_t_rt; typedef struct Path_rt Path_rt; #endif @@ -49,16 +58,16 @@ typedef struct Path_rt Path_rt; extern "C" { #endif - void pgr_do_astar( - Edge_xy_t*, size_t, - II_t_rt*, size_t, - int64_t*, size_t, - int64_t*, size_t, +void pgr_do_astar( + char*, + char*, + ArrayType*, + ArrayType*, - bool, int, double, double, bool, bool, + bool, int, double, double, bool, bool, - Path_rt**, size_t*, - char**, char**, char**); + Path_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus diff --git a/src/astar/astar.c b/src/astar/astar.c index 2fe679f4e0..d3351e2c84 100644 --- a/src/astar/astar.c +++ b/src/astar/astar.c @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: astarOneToOne.c +File: astar.c Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -7,7 +7,7 @@ Mail: project@pgrouting.org Function's developer: Copyright (c) 2015 Celia Virginia Vergara Castillo -Mail: +Mail: vicky at erosion.dev ------ @@ -29,15 +29,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "c_common/postgres_connection.h" -#include "utils/array.h" #include "c_types/path_rt.h" #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "c_common/check_parameters.h" - #include "drivers/astar/astar_driver.h" PGDLLEXPORT Datum _pgr_astar(PG_FUNCTION_ARGS); @@ -64,55 +61,13 @@ process(char* edges_sql, char* notice_msg = NULL; char* err_msg = NULL; - int64_t* start_vidsArr = NULL; - size_t size_start_vidsArr = 0; - - int64_t* end_vidsArr = NULL; - size_t size_end_vidsArr = 0; - - Edge_xy_t *edges = NULL; - size_t total_edges = 0; - - II_t_rt *combinations = NULL; - size_t total_combinations = 0; - - if (normal) { - pgr_get_edges_xy(edges_sql, &edges, &total_edges, true, &err_msg); - throw_error(err_msg, edges_sql); - if (starts && ends) { - start_vidsArr = pgr_get_bigIntArray(&size_start_vidsArr, starts, false, &err_msg); - throw_error(err_msg, "While getting start vids"); - end_vidsArr = pgr_get_bigIntArray(&size_end_vidsArr, ends, false, &err_msg); - throw_error(err_msg, "While getting end vids"); - } else if (combinations_sql) { - pgr_get_combinations(combinations_sql, &combinations, &total_combinations, &err_msg); - throw_error(err_msg, combinations_sql); - } - } else { - pgr_get_edges_xy(edges_sql, &edges, &total_edges, false, &err_msg); - throw_error(err_msg, edges_sql); - end_vidsArr = pgr_get_bigIntArray(&size_end_vidsArr, starts, false, &err_msg); - throw_error(err_msg, "While getting start vids"); - start_vidsArr = pgr_get_bigIntArray(&size_start_vidsArr, ends, false, &err_msg); - throw_error(err_msg, "While getting end vids"); - } - - if (total_edges == 0) { - PGR_DBG("No edges found"); - (*result_count) = 0; - (*result_tuples) = NULL; - pgr_SPI_finish(); - return; - } - clock_t start_t = clock(); pgr_do_astar( - edges, total_edges, - - combinations, total_combinations, + edges_sql, + combinations_sql, + starts, + ends, - start_vidsArr, size_start_vidsArr, - end_vidsArr, size_end_vidsArr, directed, heuristic, factor, @@ -130,7 +85,6 @@ process(char* edges_sql, time_msg("processing pgr_astar", start_t, clock()); } - if (err_msg && (*result_tuples)) { pfree(*result_tuples); (*result_tuples) = NULL; @@ -142,9 +96,6 @@ process(char* edges_sql, if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - if (edges) pfree(edges); - if (start_vidsArr) pfree(start_vidsArr); - if (end_vidsArr) pfree(end_vidsArr); pgr_SPI_finish(); } @@ -222,6 +173,8 @@ _pgr_astar(PG_FUNCTION_ARGS) { Datum result; Datum *values; bool* nulls; + size_t call_cntr = funcctx->call_cntr; + size_t numb = 8; values = palloc(numb * sizeof(Datum)); @@ -232,15 +185,14 @@ _pgr_astar(PG_FUNCTION_ARGS) { nulls[i] = false; } - - values[0] = Int32GetDatum((int32_t)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); + values[0] = Int32GetDatum((int32_t)call_cntr + 1); + values[1] = Int32GetDatum(result_tuples[call_cntr].seq); + values[2] = Int64GetDatum(result_tuples[call_cntr].start_id); + values[3] = Int64GetDatum(result_tuples[call_cntr].end_id); + values[4] = Int64GetDatum(result_tuples[call_cntr].node); + values[5] = Int64GetDatum(result_tuples[call_cntr].edge); + values[6] = Float8GetDatum(result_tuples[call_cntr].cost); + values[7] = Float8GetDatum(result_tuples[call_cntr].agg_cost); tuple = heap_form_tuple(tuple_desc, values, nulls); diff --git a/src/astar/astar_driver.cpp b/src/astar/astar_driver.cpp index ff7686634a..7c0d4faaf5 100644 --- a/src/astar/astar_driver.cpp +++ b/src/astar/astar_driver.cpp @@ -37,6 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "astar/astar.hpp" #include "cpp_common/combinations.hpp" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" @@ -44,12 +45,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/ii_t_rt.h" void pgr_do_astar( - Edge_xy_t *edges, size_t total_edges, + char *edges_sql, + char *combinations_sql, + ArrayType *starts, + ArrayType *ends, - II_t_rt *combinationsArr, size_t total_combinations, - - int64_t *start_vidsArr, size_t size_start_vidsArr, - int64_t *end_vidsArr, size_t size_end_vidsArr, bool directed, int heuristic, double factor, @@ -62,37 +62,58 @@ void pgr_do_astar( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::utilities::get_combinations; std::ostringstream log; std::ostringstream notice; std::ostringstream err; + + char* hint = nullptr; try { pgassert(!(*log_msg)); + pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - pgassert(total_edges != 0); - auto combinations = total_combinations? - pgrouting::utilities::get_combinations(combinationsArr, total_combinations) - : pgrouting::utilities::get_combinations(start_vidsArr, size_start_vidsArr, end_vidsArr, size_end_vidsArr); + (*return_tuples) = nullptr; + (*return_count) = 0; + + hint = combinations_sql; + auto combinations = get_combinations(combinations_sql, starts, ends, normal); + hint = nullptr; + + if (combinations.empty() && combinations_sql) { + *notice_msg = pgr_msg("No (source, target) pairs found"); + *log_msg = pgr_msg(combinations_sql); + return; + } + + + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges_xy(std::string(edges_sql), normal); + hint = nullptr; + + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = pgr_msg(edges_sql); + return; + } + graphType gType = directed? DIRECTED: UNDIRECTED; std::deque paths; if (directed) { - pgrouting::xyDirectedGraph graph( - pgrouting::extract_vertices(edges, total_edges), - gType); - graph.insert_edges(edges, total_edges); + pgrouting::xyDirectedGraph graph(gType); + graph.insert_edges(edges); paths = pgrouting::algorithms::astar(graph, combinations, heuristic, factor, epsilon, only_cost); } else { - pgrouting::xyUndirectedGraph graph( - pgrouting::extract_vertices(edges, total_edges), - gType); - graph.insert_edges(edges, total_edges); + pgrouting::xyUndirectedGraph graph(gType); + graph.insert_edges(edges); paths = pgrouting::algorithms::astar(graph, combinations, heuristic, factor, epsilon, only_cost); } + if (!normal) { for (auto &path : paths) { path.reverse(); @@ -103,7 +124,7 @@ void pgr_do_astar( count = count_tuples(paths); if (count == 0) { - (*return_tuples) = NULL; + (*return_tuples) = nullptr; (*return_count) = 0; notice << "No paths found\n"; *log_msg = pgr_msg(notice.str().c_str()); @@ -125,6 +146,9 @@ void pgr_do_astar( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; From ec87bdc5a31156a4ee252618dca6ef1091e8ea30 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 22 Jan 2024 15:00:51 -0600 Subject: [PATCH 070/428] [bdAstar] Reading data on C++ code --- docqueries/bdAstar/doc-pgr_bdAstar.result | 4 +- include/drivers/bdAstar/bdAstar_driver.h | 44 +++++++--------- src/bdAstar/bdAstar.c | 49 ++---------------- src/bdAstar/bdAstar_driver.cpp | 62 ++++++++++++++--------- 4 files changed, 64 insertions(+), 95 deletions(-) diff --git a/docqueries/bdAstar/doc-pgr_bdAstar.result b/docqueries/bdAstar/doc-pgr_bdAstar.result index 046d1d13b1..8ab9de8c73 100644 --- a/docqueries/bdAstar/doc-pgr_bdAstar.result +++ b/docqueries/bdAstar/doc-pgr_bdAstar.result @@ -71,8 +71,8 @@ SELECT * FROM pgr_bdAstar( 5 | 5 | 6 | 10 | 15 | 3 | 1 | 4 6 | 6 | 6 | 10 | 10 | -1 | 0 | 5 7 | 1 | 6 | 12 | 6 | 4 | 1 | 0 - 8 | 2 | 6 | 12 | 7 | 10 | 1 | 1 - 9 | 3 | 6 | 12 | 8 | 12 | 1 | 2 + 8 | 2 | 6 | 12 | 7 | 8 | 1 | 1 + 9 | 3 | 6 | 12 | 11 | 11 | 1 | 2 10 | 4 | 6 | 12 | 12 | -1 | 0 | 3 11 | 1 | 8 | 10 | 8 | 10 | 1 | 0 12 | 2 | 8 | 10 | 7 | 8 | 1 | 1 diff --git a/include/drivers/bdAstar/bdAstar_driver.h b/include/drivers/bdAstar/bdAstar_driver.h index c73dac74b6..21d4d23b7e 100644 --- a/include/drivers/bdAstar/bdAstar_driver.h +++ b/include/drivers/bdAstar/bdAstar_driver.h @@ -31,19 +31,27 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_BDASTAR_BDASTAR_DRIVER_H_ #pragma once -/* for size-t */ +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#include "cpp_common/undefPostgresDefine.hpp" + #ifdef __cplusplus # include # include -using Edge_xy_t = struct Edge_xy_t; using Path_rt = struct Path_rt; -using II_t_rt = struct II_t_rt; #else # include # include -typedef struct Edge_xy_t Edge_xy_t; typedef struct Path_rt Path_rt; -typedef struct II_t_rt II_t_rt; #endif #ifdef __cplusplus @@ -51,29 +59,15 @@ extern "C" { #endif void pgr_do_bdAstar( - Edge_xy_t *data_edges, - size_t total_edges, - - II_t_rt *combinations, - size_t total_combinations, - - int64_t *start_vidsArr, - size_t size_start_vidsArr, - int64_t *end_vidsArr, - size_t size_end_vidsArr, + char*, + char*, + ArrayType*, ArrayType*, - bool directed, - int heuristic, - double factor, - double epsilon, - bool only_cost, + bool, int, double, double, bool, - Path_rt **return_tuples, - size_t *return_count, + Path_rt**, size_t*, - char** log_msg, - char** notice_msg, - char** err_msg); + char**, char**, char**); #ifdef __cplusplus diff --git a/src/bdAstar/bdAstar.c b/src/bdAstar/bdAstar.c index 1d83b038a5..b6fbfaa08d 100644 --- a/src/bdAstar/bdAstar.c +++ b/src/bdAstar/bdAstar.c @@ -7,7 +7,7 @@ Mail: project@pgrouting.org Function's developer: Copyright (c) 2015 Celia Virginia Vergara Castillo -Mail:vicky at erosion.dev +Mail: vicky at erosion.dev ------ @@ -34,9 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "c_common/check_parameters.h" - #include "drivers/bdAstar/bdAstar_driver.h" PGDLLEXPORT Datum _pgr_bdastar(PG_FUNCTION_ARGS); @@ -63,47 +61,12 @@ process(char* edges_sql, char* notice_msg = NULL; char* err_msg = NULL; - int64_t* start_vidsArr = NULL; - size_t size_start_vidsArr = 0; - - int64_t* end_vidsArr = NULL; - size_t size_end_vidsArr = 0; - - Edge_xy_t *edges = NULL; - size_t total_edges = 0; - - II_t_rt *combinations = NULL; - size_t total_combinations = 0; - - if (starts && ends) { - start_vidsArr = pgr_get_bigIntArray(&size_start_vidsArr, starts, false, &err_msg); - throw_error(err_msg, "While getting start vids"); - end_vidsArr = pgr_get_bigIntArray(&size_end_vidsArr, ends, false, &err_msg); - throw_error(err_msg, "While getting end vids"); - } else if (combinations_sql) { - pgr_get_combinations(combinations_sql, &combinations, &total_combinations, &err_msg); - throw_error(err_msg, combinations_sql); - } - - pgr_get_edges_xy(edges_sql, &edges, &total_edges, true, &err_msg); - throw_error(err_msg, edges_sql); - - if (total_edges == 0) { - PGR_DBG("No edges found"); - (*result_count) = 0; - (*result_tuples) = NULL; - pgr_SPI_finish(); - return; - } - clock_t start_t = clock(); pgr_do_bdAstar( - edges, total_edges, - - combinations, total_combinations, + edges_sql, + combinations_sql, + starts, ends, - start_vidsArr, size_start_vidsArr, - end_vidsArr, size_end_vidsArr, directed, heuristic, factor, @@ -131,9 +94,6 @@ process(char* edges_sql, if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - if (edges) pfree(edges); - if (start_vidsArr) pfree(start_vidsArr); - if (end_vidsArr) pfree(end_vidsArr); pgr_SPI_finish(); } @@ -161,7 +121,6 @@ _pgr_bdastar(PG_FUNCTION_ARGS) { NULL, PG_GETARG_ARRAYTYPE_P(1), PG_GETARG_ARRAYTYPE_P(2), - PG_GETARG_BOOL(3), PG_GETARG_INT32(4), PG_GETARG_FLOAT8(5), diff --git a/src/bdAstar/bdAstar_driver.cpp b/src/bdAstar/bdAstar_driver.cpp index 72e58bfcd4..7848756f8c 100644 --- a/src/bdAstar/bdAstar_driver.cpp +++ b/src/bdAstar/bdAstar_driver.cpp @@ -32,26 +32,25 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include #include +#include #include "bdAstar/bdAstar.hpp" #include "cpp_common/combinations.hpp" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" +#include "c_types/edge_xy_t.h" #include "c_types/ii_t_rt.h" +void pgr_do_bdAstar( + char *edges_sql, + char *combinations_sql, + ArrayType *starts, + ArrayType *ends, -void -pgr_do_bdAstar( - Edge_xy_t *edges, size_t total_edges, - - II_t_rt *combinationsArr, size_t total_combinations, - - int64_t *start_vidsArr, size_t size_start_vidsArr, - int64_t *end_vidsArr, size_t size_end_vidsArr, bool directed, int heuristic, double factor, @@ -64,35 +63,51 @@ pgr_do_bdAstar( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::utilities::get_combinations; std::ostringstream log; std::ostringstream notice; std::ostringstream err; + + char* hint = nullptr; try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - pgassert(total_edges != 0); - auto combinations = total_combinations? - pgrouting::utilities::get_combinations(combinationsArr, total_combinations) - : pgrouting::utilities::get_combinations(start_vidsArr, size_start_vidsArr, end_vidsArr, size_end_vidsArr); + hint = combinations_sql; + auto combinations = get_combinations(combinations_sql, starts, ends, true); + hint = nullptr; + + if (combinations.empty() && combinations_sql) { + *notice_msg = pgr_msg("No (source, target) pairs found"); + *log_msg = pgr_msg(combinations_sql); + return; + } + + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges_xy(std::string(edges_sql), true); + + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; graphType gType = directed? DIRECTED: UNDIRECTED; std::deque paths; if (directed) { - pgrouting::xyDirectedGraph digraph(pgrouting::extract_vertices(edges, total_edges), gType); - digraph.insert_edges(edges, total_edges); - - paths = pgrouting::algorithms::bdastar(digraph, combinations, heuristic, factor, epsilon, only_cost); + pgrouting::xyDirectedGraph graph(gType); + graph.insert_edges(edges); + paths = pgrouting::algorithms::bdastar(graph, combinations, heuristic, factor, epsilon, only_cost); } else { - pgrouting::xyUndirectedGraph undigraph(pgrouting::extract_vertices(edges, total_edges), gType); - undigraph.insert_edges(edges, total_edges); - - paths = pgrouting::algorithms::bdastar(undigraph, combinations, heuristic, factor, epsilon, only_cost); + pgrouting::xyUndirectedGraph graph(gType); + graph.insert_edges(edges); + paths = pgrouting::algorithms::bdastar(graph, combinations, heuristic, factor, epsilon, only_cost); } size_t count(0); @@ -109,8 +124,6 @@ pgr_do_bdAstar( (*return_tuples) = pgr_alloc(count, (*return_tuples)); (*return_count) = (collapse_paths(return_tuples, paths)); - - pgassert(*err_msg == nullptr); *log_msg = log.str().empty()? *log_msg : pgr_msg(log.str().c_str()); @@ -123,6 +136,9 @@ pgr_do_bdAstar( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; From 00c29a36752990c1fec264940bdd2fff504cd4a7 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 23 Jan 2024 08:01:11 -0600 Subject: [PATCH 071/428] [bdDijkstra] Reading data on C++ code --- .../drivers/bdDijkstra/bdDijkstra_driver.h | 46 +++-- src/bdDijkstra/bdDijkstra.c | 93 ++--------- src/bdDijkstra/bdDijkstra_driver.cpp | 157 ++++++------------ 3 files changed, 83 insertions(+), 213 deletions(-) diff --git a/include/drivers/bdDijkstra/bdDijkstra_driver.h b/include/drivers/bdDijkstra/bdDijkstra_driver.h index 6a13b338a8..9c7ef5e6e7 100644 --- a/include/drivers/bdDijkstra/bdDijkstra_driver.h +++ b/include/drivers/bdDijkstra/bdDijkstra_driver.h @@ -7,7 +7,7 @@ Mail: project@pgrouting.org Function's developer: Copyright (c) 2015 Celia Virginia Vergara Castillo -Mail: vicky_vergara@hotmail.com +Mail: vicky at erosion.dev ------ @@ -31,45 +31,43 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_BDDIJKSTRA_BDDIJKSTRA_DRIVER_H_ #pragma once -/* for size-t */ + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#include "cpp_common/undefPostgresDefine.hpp" + #ifdef __cplusplus # include # include -using Edge_t = struct Edge_t; using Path_rt = struct Path_rt; -using II_t_rt = struct II_t_rt; #else # include # include -typedef struct Edge_t Edge_t; typedef struct Path_rt Path_rt; -typedef struct II_t_rt II_t_rt; #endif #ifdef __cplusplus extern "C" { #endif - void do_pgr_bdDijkstra( - Edge_t *data_edges, - size_t total_edges, - - II_t_rt *combinations, - size_t total_combinations, - - int64_t *start_vidsArr, - size_t size_start_vidsArr, - int64_t *end_vidsArr, - size_t size_end_vidsArr, +void pgr_do_bdDijkstra( + char*, + char*, + ArrayType*, ArrayType*, - bool directed, - bool only_cost, + bool, bool, - Path_rt **return_tuples, - size_t *return_count, - char ** log_msg, - char ** notice_msg, - char ** err_msg); + Path_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/src/bdDijkstra/bdDijkstra.c b/src/bdDijkstra/bdDijkstra.c index e5add81be5..19274e0130 100644 --- a/src/bdDijkstra/bdDijkstra.c +++ b/src/bdDijkstra/bdDijkstra.c @@ -7,7 +7,7 @@ Mail: project@pgrouting.org Function's developer: Copyright (c) 2016 Celia Virginia Vergara Castillo -Mail: vicky_vergara@hotmail.com +Mail: vicky at erosion.dev ------ @@ -31,29 +31,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "c_common/postgres_connection.h" - #include "c_types/path_rt.h" #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" - -#include "c_common/trsp_pgget.h" - #include "drivers/bdDijkstra/bdDijkstra_driver.h" PGDLLEXPORT Datum _pgr_bddijkstra(PG_FUNCTION_ARGS); PG_FUNCTION_INFO_V1(_pgr_bddijkstra); - -/******************************************************************************/ -/* MODIFY AS NEEDED */ -static -void +static void process( - char* edges_sql, - char* combinations_sql, + char *edges_sql, + char *combinations_sql, ArrayType *starts, ArrayType *ends, + bool directed, bool only_cost, Path_rt **result_tuples, @@ -63,45 +56,11 @@ process( char* notice_msg = NULL; char* err_msg = NULL; - int64_t* start_vidsArr = NULL; - size_t size_start_vidsArr = 0; - - int64_t* end_vidsArr = NULL; - size_t size_end_vidsArr = 0; - - Edge_t *edges = NULL; - size_t total_edges = 0; - - II_t_rt *combinations = NULL; - size_t total_combinations = 0; - - if (starts && ends) { - start_vidsArr = pgr_get_bigIntArray(&size_start_vidsArr, starts, false, &err_msg); - throw_error(err_msg, "While getting start vids"); - end_vidsArr = pgr_get_bigIntArray(&size_end_vidsArr, ends, false, &err_msg); - throw_error(err_msg, "While getting end vids"); - } else if (combinations_sql) { - pgr_get_combinations(combinations_sql, &combinations, &total_combinations, &err_msg); - throw_error(err_msg, combinations_sql); - } - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - PGR_DBG("Total %ld edges in query:", total_edges); - - if (total_edges == 0) { - PGR_DBG("No edges found"); - pgr_SPI_finish(); - return; - } - - PGR_DBG("Starting processing"); clock_t start_t = clock(); - do_pgr_bdDijkstra( - edges, total_edges, - combinations, total_combinations, - start_vidsArr, size_start_vidsArr, - end_vidsArr, size_end_vidsArr, + pgr_do_bdDijkstra( + edges_sql, + combinations_sql, + starts, ends, directed, only_cost, @@ -111,7 +70,6 @@ process( &log_msg, ¬ice_msg, &err_msg); - time_msg(" processing pgr_bdDijkstra", start_t, clock()); @@ -126,31 +84,22 @@ process( if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - if (edges) pfree(edges); pgr_SPI_finish(); } -/* */ -/******************************************************************************/ + PGDLLEXPORT Datum _pgr_bddijkstra(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; - TupleDesc tuple_desc; + TupleDesc tuple_desc; - /**************************************************************************/ - /* MODIFY AS NEEDED */ - /* */ Path_rt *result_tuples = NULL; size_t result_count = 0; - /* */ - /**************************************************************************/ if (SRF_IS_FIRSTCALL()) { MemoryContext oldcontext; funcctx = SRF_FIRSTCALL_INIT(); oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - - if (PG_NARGS() == 5) { /* * many to many @@ -180,11 +129,7 @@ PGDLLEXPORT Datum _pgr_bddijkstra(PG_FUNCTION_ARGS) { &result_count); } - /* */ - /**********************************************************************/ - funcctx->max_calls = result_count; - funcctx->user_fctx = result_tuples; if (get_call_result_type(fcinfo, NULL, &tuple_desc) != TYPEFUNC_COMPOSITE) { @@ -200,7 +145,6 @@ PGDLLEXPORT Datum _pgr_bddijkstra(PG_FUNCTION_ARGS) { funcctx = SRF_PERCALL_SETUP(); tuple_desc = funcctx->tuple_desc; - result_tuples = (Path_rt*) funcctx->user_fctx; if (funcctx->call_cntr < funcctx->max_calls) { @@ -210,23 +154,10 @@ PGDLLEXPORT Datum _pgr_bddijkstra(PG_FUNCTION_ARGS) { bool* nulls; size_t call_cntr = funcctx->call_cntr; - - /**********************************************************************/ - /* MODIFY AS NEEDED */ - /* - OUT seq INTEGER, - OUT path_seq INTEGER, - OUT node BIGINT, - OUT edge BIGINT, - OUT cost FLOAT, - OUT agg_cost FLOAT - ***********************************************************************/ - size_t numb = 8; values = palloc(numb * sizeof(Datum)); nulls = palloc(numb * sizeof(bool)); - size_t i; for (i = 0; i < numb; ++i) { nulls[i] = false; @@ -241,8 +172,6 @@ PGDLLEXPORT Datum _pgr_bddijkstra(PG_FUNCTION_ARGS) { values[6] = Float8GetDatum(result_tuples[call_cntr].cost); values[7] = Float8GetDatum(result_tuples[call_cntr].agg_cost); - /**********************************************************************/ - tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); diff --git a/src/bdDijkstra/bdDijkstra_driver.cpp b/src/bdDijkstra/bdDijkstra_driver.cpp index 48bb0062a0..6995d708f0 100644 --- a/src/bdDijkstra/bdDijkstra_driver.cpp +++ b/src/bdDijkstra/bdDijkstra_driver.cpp @@ -7,7 +7,7 @@ Mail: project@pgrouting.org Function's developer: Copyright (c) 2016 Celia Virginia Vergara Castillo -Mail: vicky_vergara@hotmail.com +Mail: vicky at erosion.dev ------ @@ -34,12 +34,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "bdDijkstra/pgr_bdDijkstra.hpp" - +#include "cpp_common/combinations.hpp" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" #include "cpp_common/pgr_base_graph.hpp" +#include "bdDijkstra/pgr_bdDijkstra.hpp" #include "c_types/ii_t_rt.h" @@ -51,92 +52,35 @@ template < class G > std::deque pgr_bdDijkstra( G &graph, - std::vector < II_t_rt > &combinations, - std::vector < int64_t > sources, - std::vector < int64_t > targets, - - std::ostream &log, + const std::map> &combinations, bool only_cost) { using pgrouting::Path; pgrouting::bidirectional::Pgr_bdDijkstra fn_bdDijkstra(graph); std::deque paths; - if (combinations.empty()) { - std::sort(sources.begin(), sources.end()); - sources.erase( - std::unique(sources.begin(), sources.end()), - sources.end()); - - std::sort(targets.begin(), targets.end()); - targets.erase( - std::unique(targets.begin(), targets.end()), - targets.end()); - - for (const auto source : sources) { - for (const auto target : targets) { - fn_bdDijkstra.clear(); - - if (!graph.has_vertex(source) - || !graph.has_vertex(target)) { - paths.push_back(Path(source, target)); - continue; - } - - paths.push_back(fn_bdDijkstra.pgr_bdDijkstra( - graph.get_V(source), graph.get_V(target), only_cost)); - } - } - - } else { - std::sort(combinations.begin(), combinations.end(), - [](const II_t_rt &lhs, const II_t_rt &rhs)->bool { - return lhs.d2.target < rhs.d2.target; - }); - std::stable_sort(combinations.begin(), combinations.end(), - [](const II_t_rt &lhs, const II_t_rt &rhs)->bool { - return lhs.d1.source < rhs.d1.source; - }); + for (const auto &comb : combinations) { + auto source = comb.first; + if (!graph.has_vertex(source)) continue; - II_t_rt previousCombination {{0}, {0}}; - - for (const II_t_rt &comb : combinations) { + for (const auto &target : comb.second) { + if (!graph.has_vertex(target)) continue; fn_bdDijkstra.clear(); - if (comb.d1.source == previousCombination.d1.source && - comb.d2.target == previousCombination.d2.target) { - continue; - } - - if (!graph.has_vertex(comb.d1.source) - || !graph.has_vertex(comb.d2.target)) { - paths.push_back(Path(comb.d1.source, comb.d2.target)); - continue; - } - - paths.push_back(fn_bdDijkstra.pgr_bdDijkstra( - graph.get_V(comb.d1.source), graph.get_V(comb.d2.target), only_cost)); - previousCombination = comb; + paths.push_back(fn_bdDijkstra.pgr_bdDijkstra(graph.get_V(source), graph.get_V(target), only_cost)); } } - - log << fn_bdDijkstra.log(); - return paths; } } // namespace void -do_pgr_bdDijkstra( - Edge_t *data_edges, - size_t total_edges, - II_t_rt *combinations, - size_t total_combinations, - int64_t *start_vidsArr, - size_t size_start_vidsArr, - int64_t *end_vidsArr, - size_t size_end_vidsArr, +pgr_do_bdDijkstra( + char *edges_sql, + char *combinations_sql, + ArrayType *starts, + ArrayType *ends, bool directed, bool only_cost, @@ -147,74 +91,70 @@ do_pgr_bdDijkstra( char **notice_msg, char **err_msg) { using pgrouting::Path; + using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; - using pgrouting::pgr_alloc; + using pgrouting::utilities::get_combinations; std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; + try { - pgassert(total_edges != 0); pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - log << "Inserting vertices into a c++ vector structure"; - std::vector - start_vertices(start_vidsArr, start_vidsArr + size_start_vidsArr); - std::vector< int64_t > - end_vertices(end_vidsArr, end_vidsArr + size_end_vidsArr); - std::vector< II_t_rt > - combinations_vector(combinations, combinations + total_combinations); + hint = combinations_sql; + auto combinations = get_combinations(combinations_sql, starts, ends, true); + hint = nullptr; + + if (combinations.empty() && combinations_sql) { + *notice_msg = pgr_msg("No (source, target) pairs found"); + *log_msg = pgr_msg(combinations_sql); + return; + } graphType gType = directed? DIRECTED: UNDIRECTED; + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); + + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; + std::deque paths; - log << "starting process\n"; if (directed) { - log << "Working with directed Graph\n"; - pgrouting::DirectedGraph digraph(gType); - digraph.insert_edges(data_edges, total_edges); - paths = pgr_bdDijkstra(digraph, - combinations_vector, - start_vertices, - end_vertices, - log, - only_cost); + pgrouting::DirectedGraph graph(gType); + graph.insert_edges(edges); + paths = pgr_bdDijkstra(graph, combinations, only_cost); } else { - log << "Working with Undirected Graph\n"; - pgrouting::UndirectedGraph undigraph(gType); - undigraph.insert_edges(data_edges, total_edges); - paths = pgr_bdDijkstra( - undigraph, - combinations_vector, - start_vertices, - end_vertices, - log, - only_cost); + pgrouting::UndirectedGraph graph(gType); + graph.insert_edges(edges); + paths = pgr_bdDijkstra(graph, combinations, only_cost); } - size_t count(0); - count = count_tuples(paths); + auto count = count_tuples(paths); if (count == 0) { (*return_tuples) = NULL; (*return_count) = 0; - notice << - "No paths found"; + notice << "No paths found"; *log_msg = pgr_msg(notice.str().c_str()); return; } (*return_tuples) = pgr_alloc(count, (*return_tuples)); - log << "\nConverting a set of paths into the tuples"; (*return_count) = (collapse_paths(return_tuples, paths)); - pgassert(*err_msg == NULL); *log_msg = log.str().empty()? *log_msg : pgr_msg(log.str().c_str()); @@ -227,6 +167,9 @@ do_pgr_bdDijkstra( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; From 71723cf2e26ecd091e703af2222d7d1228fc168b Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 23 Jan 2024 14:02:23 -0600 Subject: [PATCH 072/428] [bellman_ford] Reading data on C++ code --- include/bellman_ford/pgr_bellman_ford.hpp | 55 +++++--- include/bellman_ford/pgr_edwardMoore.hpp | 39 +++++- .../bellman_ford/bellman_ford_driver.h | 44 +++---- .../bellman_ford/bellman_ford_neg_driver.h | 49 ++++--- .../drivers/bellman_ford/edwardMoore_driver.h | 44 +++---- src/bellman_ford/bellman_ford.c | 103 ++------------- src/bellman_ford/bellman_ford_driver.cpp | 105 +++++++-------- src/bellman_ford/bellman_ford_neg.c | 117 ++--------------- src/bellman_ford/bellman_ford_neg_driver.cpp | 122 +++++++++--------- src/bellman_ford/edwardMoore.c | 111 ++-------------- src/bellman_ford/edwardMoore_driver.cpp | 93 ++++++------- 11 files changed, 338 insertions(+), 544 deletions(-) diff --git a/include/bellman_ford/pgr_bellman_ford.hpp b/include/bellman_ford/pgr_bellman_ford.hpp index 4b5db000e7..bbc6caba5a 100644 --- a/include/bellman_ford/pgr_bellman_ford.hpp +++ b/include/bellman_ford/pgr_bellman_ford.hpp @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: pgr_bellman_ford.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -46,10 +47,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/interruption.hpp" #include "c_types/ii_t_rt.h" - - - -//****************************************** namespace pgrouting { template < class G > @@ -57,8 +54,9 @@ class Pgr_bellman_ford : public pgrouting::Pgr_messages { public: typedef typename G::V V; typedef typename G::E E; - //@} + //@{ +#if 0 //! @name BellmanFord //@{ //! BellmanFord 1 to 1 @@ -94,39 +92,40 @@ class Pgr_bellman_ford : public pgrouting::Pgr_messages { predecessors, distances, only_cost, true); } +#endif + + /** @brief bellman_ford one to a set of many + * @todo document this function + */ - //! BellmanFord 1 to many std::deque bellman_ford( G &graph, int64_t start_vertex, - const std::vector< int64_t > &end_vertex, + const std::set &end_vertex, bool only_cost = false) { // adjust predecessors and distances vectors clear(); - log << std::string(__FUNCTION__) << "\n"; predecessors.resize(graph.num_vertices()); distances.resize(graph.num_vertices()); - // get the graphs source and target - if (!graph.has_vertex(start_vertex)) - return std::deque(); + // get the graphs source and targets + if (!graph.has_vertex(start_vertex)) return std::deque(); auto v_source(graph.get_V(start_vertex)); - std::set< V > s_v_targets; + std::set s_v_targets; for (const auto &vertex : end_vertex) { if (graph.has_vertex(vertex)) { s_v_targets.insert(graph.get_V(vertex)); } } - std::vector< V > v_targets(s_v_targets.begin(), s_v_targets.end()); + std::vector v_targets(s_v_targets.begin(), s_v_targets.end()); // perform the algorithm bellman_ford_1_to_many(graph, v_source); - std::deque< Path > paths; // get the results // route id are the targets - paths = get_paths(graph, v_source, v_targets, only_cost); + auto paths = get_paths(graph, v_source, v_targets, only_cost); std::stable_sort(paths.begin(), paths.end(), [](const Path &e1, const Path &e2)->bool { @@ -136,6 +135,7 @@ class Pgr_bellman_ford : public pgrouting::Pgr_messages { return paths; } +#if 0 // BellmanFord many to 1 std::deque bellman_ford( G &graph, @@ -219,10 +219,28 @@ class Pgr_bellman_ford : public pgrouting::Pgr_messages { return paths; } +#endif + + /** @brief BellmanFord combinations **/ + std::deque bellman_ford( + G &graph, + const std::map> &combinations, + bool only_cost = false) { + std::deque paths; + + for (const auto &comb : combinations) { + if (!graph.has_vertex(comb.first)) continue; + auto tmp_paths = bellman_ford(graph, comb.first, comb.second, only_cost); + paths.insert(paths.end(), tmp_paths.begin(), tmp_paths.end()); + } + + return paths; + } //@} private: +#if 0 //! Call to BellmanFord 1 source to 1 target bool bellman_ford_1_to_1( G &graph, @@ -250,6 +268,8 @@ class Pgr_bellman_ford : public pgrouting::Pgr_messages { } return true; } +#endif + //! Call to BellmanFord 1 source to many targets bool bellman_ford_1_to_many( G &graph, @@ -291,7 +311,6 @@ class Pgr_bellman_ford : public pgrouting::Pgr_messages { V source, std::vector< V > &targets, bool only_cost) const { - log << std::string(__FUNCTION__) << "\n"; std::deque paths; for (const auto target : targets) { paths.push_back(Path( @@ -307,8 +326,8 @@ class Pgr_bellman_ford : public pgrouting::Pgr_messages { //! @name members //@{ - std::vector< V > predecessors; - std::vector< double > distances; + std::vector predecessors; + std::vector distances; //@} }; diff --git a/include/bellman_ford/pgr_edwardMoore.hpp b/include/bellman_ford/pgr_edwardMoore.hpp index d54af99ede..2a8073228a 100644 --- a/include/bellman_ford/pgr_edwardMoore.hpp +++ b/include/bellman_ford/pgr_edwardMoore.hpp @@ -1,7 +1,9 @@ /*PGR-GNU***************************************************************** File: pgr_edwardMoore.hpp + Copyright (c) 2019 pgRouting developers Mail: project@pgrouting.org + Copyright (c) 2019 Gudesa Venkata Sai AKhil Mail: gvs.akhil1997@gmail.com ------ @@ -26,6 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include #include "cpp_common/basePath_SSEC.hpp" @@ -42,10 +45,9 @@ class Pgr_edwardMoore { public: typedef typename G::V V; typedef typename G::E E; - typedef typename G::B_G B_G; typedef typename G::EO_i EO_i; - typedef typename G::E_i E_i; +#if 0 std::deque edwardMoore( G &graph, const std::vector &start_vertex, @@ -117,14 +119,37 @@ class Pgr_edwardMoore { return paths; } +#endif + + /** @brief edwardMoore for combinations */ + std::deque edwardMoore( + G &graph, + const std::map> &combinations) { + std::deque paths; + + for (const auto &comb : combinations) { + if (!graph.has_vertex(comb.first)) continue; + auto tmp_paths = one_to_many_edwardMoore(graph, comb.first, comb.second); + paths.insert(paths.end(), tmp_paths.begin(), tmp_paths.end()); + } + std::sort(paths.begin(), paths.end(), + [](const Path &e1, const Path &e2) -> bool { + return e1.end_id() < e2.end_id(); + }); + std::stable_sort(paths.begin(), paths.end(), + [](const Path &e1, const Path &e2) -> bool { + return e1.start_id() < e2.start_id(); + }); + return paths; + } private: - E DEFAULT_EDGE; + E default_edge; std::deque one_to_many_edwardMoore( G &graph, int64_t start_vertex, - std::vector end_vertex) { + std::set end_vertex) { std::deque paths; if (graph.has_vertex(start_vertex) == false) { @@ -135,7 +160,7 @@ class Pgr_edwardMoore { std::vector isInQ(graph.num_vertices(), false); std::vector from_edge(graph.num_vertices()); std::deque dq; - DEFAULT_EDGE = from_edge[0]; + default_edge = from_edge[0]; auto bgl_start_vertex = graph.get_V(start_vertex); @@ -159,7 +184,7 @@ class Pgr_edwardMoore { auto bgl_target_vertex = graph.get_V(target_vertex); - if (from_edge[bgl_target_vertex] == DEFAULT_EDGE) { + if (from_edge[bgl_target_vertex] == default_edge) { continue; } @@ -192,7 +217,7 @@ class Pgr_edwardMoore { path.push_back({graph[from].id, graph[e].id, graph[e].cost, current_cost[from], 0}); current_node = from; - } while (from_edge[current_node] != DEFAULT_EDGE); + } while (from_edge[current_node] != default_edge); std::reverse(path.begin(), path.end()); return path; diff --git a/include/drivers/bellman_ford/bellman_ford_driver.h b/include/drivers/bellman_ford/bellman_ford_driver.h index 3dfb8c7716..436dc27046 100644 --- a/include/drivers/bellman_ford/bellman_ford_driver.h +++ b/include/drivers/bellman_ford/bellman_ford_driver.h @@ -31,43 +31,43 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_BELLMAN_FORD_BELLMAN_FORD_DRIVER_H_ #pragma once -/* for size-t */ + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#include "cpp_common/undefPostgresDefine.hpp" + #ifdef __cplusplus # include # include -using Edge_t = struct Edge_t; using Path_rt = struct Path_rt; -using II_t_rt = struct II_t_rt; #else # include # include -typedef struct Edge_t Edge_t; typedef struct Path_rt Path_rt; -typedef struct II_t_rt II_t_rt; #endif #ifdef __cplusplus extern "C" { #endif - void - do_pgr_bellman_ford( - Edge_t *data_edges, - size_t total_tuples, - II_t_rt *combinations, - size_t total_combinations, - int64_t *start_vidsArr, - size_t size_start_vidsArr, - int64_t *end_vidsArr, - size_t size_end_vidsArr, - bool directed, - bool only_cost, - Path_rt **return_tuples, - size_t *return_count, - char ** log_msg, - char ** notice_msg, - char ** err_msg); +void pgr_do_bellman_ford( + char*, + char*, + ArrayType*, ArrayType*, + + bool, bool, + Path_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/include/drivers/bellman_ford/bellman_ford_neg_driver.h b/include/drivers/bellman_ford/bellman_ford_neg_driver.h index e60b115f04..a64fab4ad0 100644 --- a/include/drivers/bellman_ford/bellman_ford_neg_driver.h +++ b/include/drivers/bellman_ford/bellman_ford_neg_driver.h @@ -31,44 +31,43 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_BELLMAN_FORD_BELLMAN_FORD_NEG_DRIVER_H_ #pragma once -/* for size-t */ +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#include "cpp_common/undefPostgresDefine.hpp" + #ifdef __cplusplus # include -using Edge_t = struct Edge_t; +# include using Path_rt = struct Path_rt; -using II_t_rt = struct II_t_rt; #else # include -typedef struct Edge_t Edge_t; +# include typedef struct Path_rt Path_rt; -typedef struct II_t_rt II_t_rt; #endif #ifdef __cplusplus extern "C" { #endif - void - do_pgr_bellman_ford_neg( - Edge_t *positive_edges, - size_t total_positive_edges, - Edge_t *negative_edges, - size_t total_negative_edges, - II_t_rt *combinations, - size_t total_combinations, - int64_t *start_vidsArr, - size_t size_start_vidsArr, - int64_t *end_vidsArr, - size_t size_end_vidsArr, - bool directed, - bool only_cost, - - Path_rt **return_tuples, - size_t *return_count, - char ** log_msg, - char ** notice_msg, - char ** err_msg); +void pgr_do_bellman_ford_neg( + char*, + char*, + char*, + ArrayType*, ArrayType*, + + bool, bool, + Path_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/include/drivers/bellman_ford/edwardMoore_driver.h b/include/drivers/bellman_ford/edwardMoore_driver.h index 578699912a..a2669127aa 100644 --- a/include/drivers/bellman_ford/edwardMoore_driver.h +++ b/include/drivers/bellman_ford/edwardMoore_driver.h @@ -31,42 +31,42 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_BELLMAN_FORD_EDWARDMOORE_DRIVER_H_ #pragma once -/* for size-t */ +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#include "cpp_common/undefPostgresDefine.hpp" + #ifdef __cplusplus # include # include -using Edge_t = struct Edge_t; using Path_rt = struct Path_rt; -using II_t_rt = struct II_t_rt; #else # include # include -typedef struct Edge_t Edge_t; typedef struct Path_rt Path_rt; -typedef struct II_t_rt II_t_rt; #endif #ifdef __cplusplus extern "C" { #endif - void do_pgr_edwardMoore( - Edge_t *data_edges, - size_t total_tuples, - II_t_rt *combinations, - size_t total_combinations, - int64_t *start_vidsArr, - size_t size_start_vidsArr, - int64_t *end_vidsArr, - size_t size_end_vidsArr, - bool directed, - - Path_rt **return_tuples, - size_t *return_count, - - char ** log_msg, - char ** notice_msg, - char ** err_msg); + void pgr_do_edwardMoore( + char*, + char*, + ArrayType*, ArrayType*, + + bool, + + Path_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus diff --git a/src/bellman_ford/bellman_ford.c b/src/bellman_ford/bellman_ford.c index a499740020..bc1f2feef6 100644 --- a/src/bellman_ford/bellman_ford.c +++ b/src/bellman_ford/bellman_ford.c @@ -35,9 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" - -#include "c_common/trsp_pgget.h" - #include "drivers/bellman_ford/bellman_ford_driver.h" PGDLLEXPORT Datum _pgr_bellmanford(PG_FUNCTION_ARGS); @@ -59,61 +56,15 @@ process( char* log_msg = NULL; char* notice_msg = NULL; char* err_msg = NULL; - - PGR_DBG("Initializing arrays"); - - size_t size_start_vidsArr = 0; - int64_t* start_vidsArr = NULL; - - size_t size_end_vidsArr = 0; - int64_t* end_vidsArr = NULL; - - size_t total_combinations = 0; - II_t_rt *combinations = NULL; - - if (starts && ends) { - start_vidsArr = pgr_get_bigIntArray(&size_start_vidsArr, starts, false, &err_msg); - throw_error(err_msg, "While getting start vids"); - end_vidsArr = pgr_get_bigIntArray(&size_end_vidsArr, ends, false, &err_msg); - throw_error(err_msg, "While getting end vids"); - } else if (combinations_sql) { - pgr_get_combinations(combinations_sql, &combinations, &total_combinations, &err_msg); - throw_error(err_msg, combinations_sql); - if (total_combinations == 0) { - if (combinations) - pfree(combinations); - pgr_SPI_finish(); - return; - } - } - (*result_tuples) = NULL; (*result_count) = 0; - PGR_DBG("Load data"); - Edge_t *edges = NULL; - size_t total_edges = 0; - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - PGR_DBG("Total %ld edges in query:", total_edges); - - if (total_edges == 0) { - if (end_vidsArr) pfree(end_vidsArr); - if (start_vidsArr) pfree(start_vidsArr); - pgr_SPI_finish(); - return; - } - - PGR_DBG("Starting processing"); clock_t start_t = clock(); - do_pgr_bellman_ford( - edges, - total_edges, - combinations, - total_combinations, - start_vidsArr, size_start_vidsArr, - end_vidsArr, size_end_vidsArr, + pgr_do_bellman_ford( + edges_sql, + combinations_sql, + starts, ends, + directed, only_cost, @@ -125,41 +76,35 @@ process( &err_msg); time_msg(" processing pgr_bellman_ford", start_t, clock()); - PGR_DBG("Returning %ld tuples", *result_count); - if (err_msg) { - if (*result_tuples) pfree(*result_tuples); + if (err_msg && (*result_tuples)) { + pfree(*result_tuples); + (*result_tuples) = NULL; + (*result_count) = 0; } pgr_global_report(log_msg, notice_msg, err_msg); - if (edges) pfree(edges); if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - if (end_vidsArr) pfree(end_vidsArr); - if (start_vidsArr) pfree(start_vidsArr); pgr_SPI_finish(); } - -PGDLLEXPORT Datum _pgr_bellmanford(PG_FUNCTION_ARGS) { +PGDLLEXPORT Datum +_pgr_bellmanford(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; - TupleDesc tuple_desc; + TupleDesc tuple_desc; - /**************************************************************************/ Path_rt *result_tuples = NULL; size_t result_count = 0; - /**************************************************************************/ if (SRF_IS_FIRSTCALL()) { MemoryContext oldcontext; funcctx = SRF_FIRSTCALL_INIT(); oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - - PGR_DBG("Calling process"); if (PG_NARGS() == 5) { /* * many to many @@ -189,9 +134,6 @@ PGDLLEXPORT Datum _pgr_bellmanford(PG_FUNCTION_ARGS) { &result_count); } - - /**********************************************************************/ - funcctx->max_calls = result_count; funcctx->user_fctx = result_tuples; if (get_call_result_type(fcinfo, NULL, &tuple_desc) @@ -216,23 +158,10 @@ PGDLLEXPORT Datum _pgr_bellmanford(PG_FUNCTION_ARGS) { Datum *values; bool* nulls; - /**********************************************************************/ - /* - OUT seq 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 - */ - /**********************************************************************/ size_t numb = 8; values = palloc(numb * sizeof(Datum)); nulls = palloc(numb * sizeof(bool)); - size_t i; for (i = 0; i < numb; ++i) { nulls[i] = false; @@ -247,18 +176,10 @@ PGDLLEXPORT Datum _pgr_bellmanford(PG_FUNCTION_ARGS) { values[6] = Float8GetDatum(result_tuples[funcctx->call_cntr].cost); values[7] = Float8GetDatum(result_tuples[funcctx->call_cntr].agg_cost); - /**********************************************************************/ - tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); } else { - /**********************************************************************/ - - PGR_DBG("Clean up code"); - - /**********************************************************************/ - SRF_RETURN_DONE(funcctx); } } diff --git a/src/bellman_ford/bellman_ford_driver.cpp b/src/bellman_ford/bellman_ford_driver.cpp index eef5eee042..85af76055c 100644 --- a/src/bellman_ford/bellman_ford_driver.cpp +++ b/src/bellman_ford/bellman_ford_driver.cpp @@ -37,21 +37,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "bellman_ford/pgr_bellman_ford.hpp" +#include "cpp_common/combinations.hpp" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" #include "c_types/ii_t_rt.h" -/* Bellman Ford Shortest Path */ -/************************************************************ - EDGE_SQL, - ANYARRAY, - ANYARRAY, - directed BOOLEAN DEFAULT true, - ***********************************************************/ - namespace { +#if 0 template std::deque pgr_bellman_ford( @@ -81,19 +76,28 @@ pgr_bellman_ford( } return paths; } +#endif + +template +std::deque +bellman_ford( + G &graph, + const std::map> &combinations, + bool only_cost = false) { + pgrouting::Pgr_bellman_ford fn_bellman_ford; + auto paths = fn_bellman_ford.bellman_ford(graph, combinations, only_cost); + for (auto &p : paths) p.recalculate_agg_cost(); + return paths; +} } // namespace void -do_pgr_bellman_ford( - Edge_t *data_edges, - size_t total_edges, - II_t_rt *combinations, - size_t total_combinations, - int64_t *start_vidsArr, - size_t size_start_vidsArr, - int64_t *end_vidsArr, - size_t size_end_vidsArr, +pgr_do_bellman_ford( + char *edges_sql, + char *combinations_sql, + ArrayType *starts, + ArrayType *ends, bool directed, bool only_cost, @@ -106,70 +110,66 @@ do_pgr_bellman_ford( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::utilities::get_combinations; + using pgrouting::pgget::get_edges; std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; + try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - pgassert(total_edges != 0); - pgassert(data_edges); - pgassert((start_vidsArr && end_vidsArr) || combinations); - pgassert((size_start_vidsArr && size_end_vidsArr) || total_combinations); graphType gType = directed? DIRECTED: UNDIRECTED; - log << "Inserting vertices into a c++ vector structure"; - std::vector - start_vertices(start_vidsArr, start_vidsArr + size_start_vidsArr); - std::vector< int64_t > - end_vertices(end_vidsArr, end_vidsArr + size_end_vidsArr); - std::vector< II_t_rt > - combinations_vector(combinations, combinations + total_combinations); + hint = combinations_sql; + auto combinations = get_combinations(combinations_sql, starts, ends, true); + hint = nullptr; - std::deque< Path >paths; - std::string logstr; + if (combinations.empty() && combinations_sql) { + *notice_msg = pgr_msg("No (source, target) pairs found"); + *log_msg = pgr_msg(combinations_sql); + return; + } + + hint = edges_sql; + auto edges = get_edges(std::string(edges_sql), true, false); + + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; + + std::deque paths; if (directed) { - log << "Working with directed Graph\n"; pgrouting::DirectedGraph digraph(gType); - digraph.insert_edges(data_edges, total_edges); - paths = pgr_bellman_ford(digraph, - combinations_vector, - start_vertices, - end_vertices, - logstr, - only_cost); + digraph.insert_edges(edges); + paths = bellman_ford(digraph, combinations, only_cost); } else { - log << "Working with Undirected Graph\n"; pgrouting::UndirectedGraph undigraph(gType); - undigraph.insert_edges(data_edges, total_edges); - paths = pgr_bellman_ford( - undigraph, - combinations_vector, - start_vertices, - end_vertices, - logstr, - only_cost); + undigraph.insert_edges(edges); + paths = bellman_ford(undigraph, combinations, only_cost); } - log<< logstr; + size_t count(0); count = count_tuples(paths); if (count == 0) { (*return_tuples) = NULL; (*return_count) = 0; - notice << - "No paths found"; + notice << "No paths found"; *log_msg = pgr_msg(notice.str().c_str()); return; } (*return_tuples) = pgr_alloc(count, (*return_tuples)); - log << "\nConverting a set of paths into the tuples"; (*return_count) = (collapse_paths(return_tuples, paths)); *log_msg = log.str().empty()? @@ -184,6 +184,9 @@ do_pgr_bellman_ford( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; diff --git a/src/bellman_ford/bellman_ford_neg.c b/src/bellman_ford/bellman_ford_neg.c index 957e6ecfa5..1812301f75 100644 --- a/src/bellman_ford/bellman_ford_neg.c +++ b/src/bellman_ford/bellman_ford_neg.c @@ -31,13 +31,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "c_common/postgres_connection.h" +#include "c_types/path_rt.h" #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" - -#include "c_common/trsp_pgget.h" - -#include "drivers/bellman_ford/bellman_ford_neg_driver.h" // the link to the C++ code of the function +#include "drivers/bellman_ford/bellman_ford_neg_driver.h" PGDLLEXPORT Datum _pgr_bellmanfordneg(PG_FUNCTION_ARGS); PG_FUNCTION_INFO_V1(_pgr_bellmanfordneg); @@ -59,78 +57,15 @@ process( char* log_msg = NULL; char* notice_msg = NULL; char* err_msg = NULL; - - PGR_DBG("Initializing arrays"); - - size_t size_start_vidsArr = 0; - int64_t* start_vidsArr = NULL; - - size_t size_end_vidsArr = 0; - int64_t* end_vidsArr = NULL; - - size_t total_combinations = 0; - II_t_rt *combinations = NULL; - - if (starts && ends) { - start_vidsArr = (int64_t*) - pgr_get_bigIntArray(&size_start_vidsArr, starts, false); - end_vidsArr = (int64_t*) - pgr_get_bigIntArray(&size_end_vidsArr, ends, false); - } else if (combinations_sql) { - pgr_get_combinations(combinations_sql, &combinations, &total_combinations, &err_msg); - throw_error(err_msg, combinations_sql); - if (total_combinations == 0) { - if (combinations) - pfree(combinations); - pgr_SPI_finish(); - return; - } - } - (*result_tuples) = NULL; (*result_count) = 0; - PGR_DBG("Load data"); - Edge_t *positive_edges = NULL; - size_t total_positive_edges = 0; - - pgr_get_edges(edges_sql, &positive_edges, &total_positive_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - PGR_DBG( - "Total positive weighted edges in query: %ld", - total_positive_edges); - - Edge_t *negative_edges = NULL; - size_t total_negative_edges = 0; - - pgr_get_edges(neg_edges_sql, &negative_edges, &total_negative_edges, true, false, &err_msg); - throw_error(err_msg, neg_edges_sql); - PGR_DBG( - "Total negative weighted edges in query: %ld", - total_negative_edges); - - size_t total_edges = total_positive_edges + total_negative_edges; - - if (total_edges == 0) { - if (end_vidsArr) pfree(end_vidsArr); - if (start_vidsArr) pfree(start_vidsArr); - pgr_SPI_finish(); - return; - } - - PGR_DBG("Starting processing"); clock_t start_t = clock(); - do_pgr_bellman_ford_neg( - positive_edges, - total_positive_edges, - negative_edges, - total_negative_edges, - combinations, - total_combinations, - start_vidsArr, - size_start_vidsArr, - end_vidsArr, - size_end_vidsArr, + pgr_do_bellman_ford_neg( + edges_sql, + neg_edges_sql, + combinations_sql, + starts, ends, directed, only_cost, @@ -142,42 +77,34 @@ process( &err_msg); time_msg(" processing pgr_bellman_ford", start_t, clock()); - PGR_DBG("Returning %ld tuples", *result_count); - if (err_msg) { - if (*result_tuples) pfree(*result_tuples); + if (err_msg && (*result_tuples)) { + pfree(*result_tuples); + (*result_tuples) = NULL; + (*result_count) = 0; } pgr_global_report(log_msg, notice_msg, err_msg); - if (positive_edges) pfree(positive_edges); - if (negative_edges) pfree(negative_edges); if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - if (end_vidsArr) pfree(end_vidsArr); - if (start_vidsArr) pfree(start_vidsArr); pgr_SPI_finish(); } - PGDLLEXPORT Datum _pgr_bellmanfordneg(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; - /**************************************************************************/ Path_rt *result_tuples = NULL; size_t result_count = 0; - /**************************************************************************/ if (SRF_IS_FIRSTCALL()) { MemoryContext oldcontext; funcctx = SRF_FIRSTCALL_INIT(); oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - - PGR_DBG("Calling process"); if (PG_NARGS() == 6) { /* * many to many @@ -208,9 +135,6 @@ PGDLLEXPORT Datum _pgr_bellmanfordneg(PG_FUNCTION_ARGS) { &result_count); } - - /**********************************************************************/ - funcctx->max_calls = result_count; funcctx->user_fctx = result_tuples; if (get_call_result_type(fcinfo, NULL, &tuple_desc) @@ -235,18 +159,6 @@ PGDLLEXPORT Datum _pgr_bellmanfordneg(PG_FUNCTION_ARGS) { Datum *values; bool* nulls; - /**********************************************************************/ - /* - OUT seq 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 - */ - /**********************************************************************/ size_t numb = 8; values = palloc(numb * sizeof(Datum)); nulls = palloc(numb * sizeof(bool)); @@ -266,18 +178,11 @@ PGDLLEXPORT Datum _pgr_bellmanfordneg(PG_FUNCTION_ARGS) { values[6] = Float8GetDatum(result_tuples[funcctx->call_cntr].cost); values[7] = Float8GetDatum(result_tuples[funcctx->call_cntr].agg_cost); - /**********************************************************************/ tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); } else { - /**********************************************************************/ - - PGR_DBG("Clean up code"); - - /**********************************************************************/ - SRF_RETURN_DONE(funcctx); } } diff --git a/src/bellman_ford/bellman_ford_neg_driver.cpp b/src/bellman_ford/bellman_ford_neg_driver.cpp index 95ee2963fb..696cf874e9 100644 --- a/src/bellman_ford/bellman_ford_neg_driver.cpp +++ b/src/bellman_ford/bellman_ford_neg_driver.cpp @@ -37,18 +37,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "bellman_ford/pgr_bellman_ford.hpp" +#include "c_types/ii_t_rt.h" +#include "cpp_common/combinations.hpp" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" -/* Bellman Ford Shortest Path */ -/************************************************************ - EDGE_SQL, - ANYARRAY, - ANYARRAY, - directed BOOLEAN DEFAULT true, - ***********************************************************/ namespace { +#if 0 template < class G > std::deque pgr_bellman_ford( @@ -75,21 +72,30 @@ pgr_bellman_ford( log += fn_bellman_ford.get_log(); return paths; } +#endif + +template +std::deque +bellman_ford( + G &graph, + const std::map> &combinations, + bool only_cost = false) { + pgrouting::Pgr_bellman_ford fn_bellman_ford; + auto paths = fn_bellman_ford.bellman_ford(graph, combinations, only_cost); + for (auto &p : paths) p.recalculate_agg_cost(); + return paths; +} } // namespace void -do_pgr_bellman_ford_neg( - Edge_t *positive_edges, - size_t total_positive_edges, - Edge_t *negative_edges, - size_t total_negative_edges, - II_t_rt *combinations, - size_t total_combinations, - int64_t *start_vidsArr, - size_t size_start_vidsArr, - int64_t *end_vidsArr, - size_t size_end_vidsArr, +pgr_do_bellman_ford_neg( + char *edges_sql, + char *neg_edges_sql, + char *combinations_sql, + ArrayType *starts, + ArrayType *ends, + bool directed, bool only_cost, @@ -102,78 +108,73 @@ do_pgr_bellman_ford_neg( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::utilities::get_combinations; + using pgrouting::pgget::get_edges; std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; + try { - size_t total_edges = total_positive_edges + total_negative_edges; pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - pgassert(total_edges != 0); - pgassert(total_positive_edges || total_negative_edges); - pgassert((start_vidsArr && end_vidsArr) || combinations); - pgassert((size_start_vidsArr && size_end_vidsArr) || total_combinations); graphType gType = directed? DIRECTED: UNDIRECTED; - log << "Inserting vertices into a c++ vector structure"; + hint = combinations_sql; + auto combinations = get_combinations(combinations_sql, starts, ends, normal); + hint = nullptr; + + if (combinations.empty() && combinations_sql) { + *notice_msg = pgr_msg("No (source, target) pairs found"); + *log_msg = pgr_msg(combinations_sql); + return; + } + + hint = edges_sql; + auto edges = get_edges(std::string(edges_sql), true, false); + + hint = neg_edges_sql; + auto neg_edges = get_edges(std::string(neg_edges_sql), true, false); + - std::vector - start_vertices(start_vidsArr, start_vidsArr + size_start_vidsArr); - std::vector< int64_t > - end_vertices(end_vidsArr, end_vidsArr + size_end_vidsArr); - std::vector< II_t_rt > - combinations_vector(combinations, combinations + total_combinations); - std::deque< Path >paths; - std::string logstr; + if (edges.size() + neg_edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; + + std::deque paths; if (directed) { - log << "Working with directed Graph\n"; pgrouting::DirectedGraph digraph(gType); - digraph.insert_edges(positive_edges, total_positive_edges); - digraph.insert_negative_edges(negative_edges, total_negative_edges); - log << digraph; - paths = pgr_bellman_ford(digraph, - combinations_vector, - start_vertices, - end_vertices, - logstr, - only_cost); + digraph.insert_edges(edges); + digraph.insert_negative_edges(neg_edges); + paths = bellman_ford(digraph, combinations, only_cost); } else { - log << "Working with Undirected Graph\n"; pgrouting::UndirectedGraph undigraph(gType); - undigraph.insert_edges(positive_edges, total_positive_edges); - undigraph.insert_negative_edges( - negative_edges, - total_negative_edges); - log << undigraph; - paths = pgr_bellman_ford( - undigraph, - combinations_vector, - start_vertices, - end_vertices, - logstr, - only_cost); + undigraph.insert_edges(edges); + undigraph.insert_negative_edges(neg_edges); + paths = pgr_bellman_ford(undigraph, combinations, only_cost); } - log<< logstr; + size_t count(0); count = count_tuples(paths); if (count == 0) { (*return_tuples) = NULL; (*return_count) = 0; - notice << - "No paths found"; + notice << "No paths found"; *log_msg = pgr_msg(notice.str().c_str()); return; } (*return_tuples) = pgr_alloc(count, (*return_tuples)); - log << "\nConverting a set of paths into the tuples"; (*return_count) = (collapse_paths(return_tuples, paths)); *log_msg = log.str().empty()? @@ -188,6 +189,9 @@ do_pgr_bellman_ford_neg( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; diff --git a/src/bellman_ford/edwardMoore.c b/src/bellman_ford/edwardMoore.c index ce3501d0fb..fb136ed480 100644 --- a/src/bellman_ford/edwardMoore.c +++ b/src/bellman_ford/edwardMoore.c @@ -35,9 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" - -#include "c_common/trsp_pgget.h" - #include "drivers/bellman_ford/edwardMoore_driver.h" PGDLLEXPORT Datum _pgr_edwardmoore(PG_FUNCTION_ARGS); @@ -57,63 +54,14 @@ process( char* log_msg = NULL; char* notice_msg = NULL; char* err_msg = NULL; - - PGR_DBG("Initializing arrays"); - - size_t size_start_vidsArr = 0; - int64_t *start_vidsArr = NULL; - - size_t size_end_vidsArr = 0; - int64_t *end_vidsArr = NULL; - - size_t total_combinations = 0; - II_t_rt *combinations = NULL; - - if (starts && ends) { - start_vidsArr = pgr_get_bigIntArray(&size_start_vidsArr, starts, false, &err_msg); - throw_error(err_msg, "While getting start vids"); - end_vidsArr = pgr_get_bigIntArray(&size_end_vidsArr, ends, false, &err_msg); - throw_error(err_msg, "While getting end vids"); - } else if (combinations_sql) { - pgr_get_combinations(combinations_sql, &combinations, &total_combinations, &err_msg); - throw_error(err_msg, combinations_sql); - if (total_combinations == 0) { - if (combinations) - pfree(combinations); - pgr_SPI_finish(); - return; - } - } - (*result_tuples) = NULL; (*result_count) = 0; - PGR_DBG("Load data"); - Edge_t *edges = NULL; - size_t total_edges = 0; - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - PGR_DBG("Total %ld edges in query:", total_edges); - - if (total_edges == 0) { - if (start_vidsArr) - pfree(start_vidsArr); - if (end_vidsArr) - pfree(end_vidsArr); - pgr_SPI_finish(); - return; - } - - PGR_DBG("Starting processing"); clock_t start_t = clock(); - do_pgr_edwardMoore( - edges, - total_edges, - combinations, - total_combinations, - start_vidsArr, size_start_vidsArr, - end_vidsArr, size_end_vidsArr, + pgr_do_edwardMoore( + edges_sql, + combinations_sql, + starts, ends, directed, @@ -125,28 +73,19 @@ process( &err_msg); time_msg(" processing pgr_edwardMoore", start_t, clock()); - PGR_DBG("Returning %ld tuples", *result_count); - if (err_msg) { - if (*result_tuples) - pfree(*result_tuples); + if (err_msg && (*result_tuples)) { + pfree(*result_tuples); + (*result_tuples) = NULL; + (*result_count) = 0; } pgr_global_report(log_msg, notice_msg, err_msg); - if (edges) - pfree(edges); - if (log_msg) - pfree(log_msg); - if (notice_msg) - pfree(notice_msg); - if (err_msg) - pfree(err_msg); - - if (start_vidsArr) - pfree(start_vidsArr); - if (end_vidsArr) - pfree(end_vidsArr); + if (log_msg) pfree(log_msg); + if (notice_msg) pfree(notice_msg); + if (err_msg) pfree(err_msg); + pgr_SPI_finish(); } @@ -154,17 +93,14 @@ PGDLLEXPORT Datum _pgr_edwardmoore(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; - /**************************************************************************/ Path_rt *result_tuples = NULL; size_t result_count = 0; - /**************************************************************************/ if (SRF_IS_FIRSTCALL()) { MemoryContext oldcontext; funcctx = SRF_FIRSTCALL_INIT(); oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - PGR_DBG("Calling process"); if (PG_NARGS() == 4) { /* * many to many @@ -192,9 +128,6 @@ PGDLLEXPORT Datum _pgr_edwardmoore(PG_FUNCTION_ARGS) { &result_count); } - - /**********************************************************************/ - funcctx->max_calls = result_count; funcctx->user_fctx = result_tuples; if (get_call_result_type(fcinfo, NULL, &tuple_desc) != TYPEFUNC_COMPOSITE) { @@ -218,18 +151,6 @@ PGDLLEXPORT Datum _pgr_edwardmoore(PG_FUNCTION_ARGS) { Datum *values; bool *nulls; - /**********************************************************************/ - /* - OUT seq BIGINT, - OUT path_seq BIGINT, - OUT start_vid BIGINT, - OUT end_vid BIGINT, - OUT node BIGINT, - OUT edge BIGINT, - OUT cost FLOAT, - OUT agg_cost FLOAT - */ - /**********************************************************************/ size_t numb = 8; values = palloc(numb * sizeof(Datum)); nulls = palloc(numb * sizeof(bool)); @@ -248,18 +169,10 @@ PGDLLEXPORT Datum _pgr_edwardmoore(PG_FUNCTION_ARGS) { values[6] = Float8GetDatum(result_tuples[funcctx->call_cntr].cost); values[7] = Float8GetDatum(result_tuples[funcctx->call_cntr].agg_cost); - /**********************************************************************/ - tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); } else { - /**********************************************************************/ - - PGR_DBG("Clean up code"); - - /**********************************************************************/ - SRF_RETURN_DONE(funcctx); } } diff --git a/src/bellman_ford/edwardMoore_driver.cpp b/src/bellman_ford/edwardMoore_driver.cpp index 8dc08daa60..06fdbf74b0 100644 --- a/src/bellman_ford/edwardMoore_driver.cpp +++ b/src/bellman_ford/edwardMoore_driver.cpp @@ -35,13 +35,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include -#include -#include -#include - #include "bellman_ford/pgr_edwardMoore.hpp" +#include "cpp_common/combinations.hpp" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/basePath_SSEC.hpp" #include "cpp_common/pgr_base_graph.hpp" #include "cpp_common/pgr_alloc.hpp" @@ -51,6 +48,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. namespace { +#if 0 template < class G > std::deque< pgrouting::Path > pgr_edwardMoore( @@ -75,19 +73,26 @@ pgr_edwardMoore( return paths; } +#endif + +template +std::deque +edwardMoore( + G &graph, + const std::map> &combinations) { + pgrouting::functions::Pgr_edwardMoore fn_edwardMoore; + return fn_edwardMoore.edwardMoore(graph, combinations); +} } // namespace void -do_pgr_edwardMoore( - Edge_t *data_edges, - size_t total_edges, - II_t_rt *combinations, - size_t total_combinations, - int64_t *start_vidsArr, - size_t size_start_vidsArr, - int64_t *end_vidsArr, - size_t size_end_vidsArr, +pgr_do_edwardMoore( + char *edges_sql, + char *combinations_sql, + ArrayType *starts, + ArrayType *ends, + bool directed, Path_rt **return_tuples, @@ -99,53 +104,52 @@ do_pgr_edwardMoore( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::utilities::get_combinations; + using pgrouting::pgget::get_edges; std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; try { - pgassert(total_edges != 0); pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - pgassert(data_edges); - pgassert((start_vidsArr && end_vidsArr) || combinations); - pgassert((size_start_vidsArr && size_end_vidsArr) || total_combinations); graphType gType = directed? DIRECTED: UNDIRECTED; - log << "Inserting vertices into a c++ vector structure"; - std::vector - start_vertices(start_vidsArr, start_vidsArr + size_start_vidsArr); - std::vector< int64_t > - end_vertices(end_vidsArr, end_vidsArr + size_end_vidsArr); - std::vector< II_t_rt > - combinations_vector(combinations, combinations + total_combinations); + hint = combinations_sql; + auto combinations = get_combinations(combinations_sql, starts, ends, true); + hint = nullptr; + + if (combinations.empty() && combinations_sql) { + *notice_msg = pgr_msg("No (source, target) pairs found"); + *log_msg = pgr_msg(combinations_sql); + return; + } + + hint = edges_sql; + auto edges = get_edges(std::string(edges_sql), true, false); + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; - std::deque< Path >paths; + std::deque paths; if (directed) { - log << "\nWorking with directed Graph"; pgrouting::DirectedGraph digraph(gType); - digraph.insert_edges(data_edges, total_edges); - paths = pgr_edwardMoore( - digraph, - combinations_vector, - start_vertices, - end_vertices); + digraph.insert_edges(edges); + paths = edwardMoore(digraph, combinations); } else { - log << "\nWorking with Undirected Graph"; pgrouting::UndirectedGraph undigraph(gType); - undigraph.insert_edges(data_edges, total_edges); - - paths = pgr_edwardMoore( - undigraph, - combinations_vector, - start_vertices, - end_vertices); + undigraph.insert_edges(edges); + paths = edwardMoore(undigraph, combinations); } size_t count(0); @@ -154,14 +158,12 @@ do_pgr_edwardMoore( if (count == 0) { (*return_tuples) = NULL; (*return_count) = 0; - notice << - "No paths found"; + notice << "No paths found"; *log_msg = pgr_msg(notice.str().c_str()); return; } (*return_tuples) = pgr_alloc(count, (*return_tuples)); - log << "\nConverting a set of paths into the tuples"; (*return_count) = (collapse_paths(return_tuples, paths)); *log_msg = log.str().empty()? @@ -176,6 +178,9 @@ do_pgr_edwardMoore( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; From 312acbba8bce3ee239d24e0986fe0dcaa73226c2 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 23 Jan 2024 14:46:01 -0600 Subject: [PATCH 073/428] [breadthFirstSearch] Reading data on C++ code --- .../pgr_binaryBreadthFirstSearch.hpp | 67 +++++----- .../pgr_breadthFirstSearch.hpp | 3 +- .../binaryBreadthFirstSearch_driver.h | 53 ++++---- .../breadthFirstSearch_driver.h | 45 +++---- .../binaryBreadthFirstSearch.c | 120 ++---------------- .../binaryBreadthFirstSearch_driver.cpp | 91 +++++++------ src/breadthFirstSearch/breadthFirstSearch.c | 94 ++------------ .../breadthFirstSearch_driver.cpp | 66 ++++++---- 8 files changed, 200 insertions(+), 339 deletions(-) diff --git a/include/breadthFirstSearch/pgr_binaryBreadthFirstSearch.hpp b/include/breadthFirstSearch/pgr_binaryBreadthFirstSearch.hpp index f0e1f16cac..90d12fd698 100644 --- a/include/breadthFirstSearch/pgr_binaryBreadthFirstSearch.hpp +++ b/include/breadthFirstSearch/pgr_binaryBreadthFirstSearch.hpp @@ -30,6 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include #include "cpp_common/basePath_SSEC.hpp" @@ -50,6 +51,7 @@ class Pgr_binaryBreadthFirstSearch { typedef typename G::EO_i EO_i; typedef typename G::E_i E_i; +#if 0 std::deque binaryBreadthFirstSearch( G &graph, const std::vector &start_vertex, @@ -78,30 +80,43 @@ class Pgr_binaryBreadthFirstSearch { return paths; } +#endif - // preparation for parallel arrays std::deque binaryBreadthFirstSearch( G &graph, - const std::vector &combinations) { + const std::vector &start_vertex, + const std::vector &end_vertex) { std::deque paths; - // group targets per distinct source - std::map< int64_t, std::vector > vertex_map; - for (const II_t_rt &comb : combinations) { - std::map< int64_t, std::vector >::iterator it = vertex_map.find(comb.d1.source); - if (it != vertex_map.end()) { - it->second.push_back(comb.d2.target); - } else { - std::vector targets{comb.d2.target}; - vertex_map[comb.d1.source] = targets; - } + for (const auto &source : start_vertex) { + auto result_paths = one_to_many_binaryBreadthFirstSearch( + graph, + source, + end_vertex); + std::sort(result_paths.begin(), result_paths.end(), + [](const Path &e1, const Path &e2) -> bool { + return e1.end_id() < e2.end_id(); + }); + paths.insert( + paths.begin(), + std::make_move_iterator(result_paths.begin()), + std::make_move_iterator(result_paths.end())); } - for (const auto &start_ends : vertex_map) { + return paths; + } + + + std::deque binaryBreadthFirstSearch( + G &graph, + const std::map> &combinations) { + std::deque paths; + + for (const auto &c : combinations) { + if (!graph.has_vertex(c.first)) continue; + std::deque result_paths = one_to_many_binaryBreadthFirstSearch( - graph, - start_ends.first, - start_ends.second); + graph, c.first, c.second); paths.insert( paths.begin(), std::make_move_iterator(result_paths.begin()), @@ -121,22 +136,20 @@ class Pgr_binaryBreadthFirstSearch { } private: - E DEFAULT_EDGE; + E default_edge; std::deque one_to_many_binaryBreadthFirstSearch( G &graph, int64_t start_vertex, - std::vector end_vertex) { + std::set end_vertex) { std::deque paths; - if (graph.has_vertex(start_vertex) == false) { - return paths; - } + if (!graph.has_vertex(start_vertex)) return paths; std::vector current_cost(graph.num_vertices(), std::numeric_limits::infinity()); std::vector from_edge(graph.num_vertices()); std::deque dq; - DEFAULT_EDGE = from_edge[0]; + default_edge = from_edge[0]; auto bgl_start_vertex = graph.get_V(start_vertex); @@ -152,15 +165,11 @@ class Pgr_binaryBreadthFirstSearch { } for (auto target_vertex : end_vertex) { - if (graph.has_vertex(target_vertex) == false) { - continue; - } + if (!graph.has_vertex(target_vertex)) continue; auto bgl_target_vertex = graph.get_V(target_vertex); - if (from_edge[bgl_target_vertex] == DEFAULT_EDGE) { - continue; - } + if (from_edge[bgl_target_vertex] == default_edge) continue; paths.push_front( getPath(graph, bgl_start_vertex, target_vertex, bgl_target_vertex, from_edge, current_cost)); @@ -191,7 +200,7 @@ class Pgr_binaryBreadthFirstSearch { path.push_back({graph[from].id, graph[e].id, graph[e].cost, current_cost[from], 0}); current_node = from; - } while (from_edge[current_node] != DEFAULT_EDGE); + } while (from_edge[current_node] != default_edge); std::reverse(path.begin(), path.end()); return path; diff --git a/include/breadthFirstSearch/pgr_breadthFirstSearch.hpp b/include/breadthFirstSearch/pgr_breadthFirstSearch.hpp index 4e68873a32..21c8fef3eb 100644 --- a/include/breadthFirstSearch/pgr_breadthFirstSearch.hpp +++ b/include/breadthFirstSearch/pgr_breadthFirstSearch.hpp @@ -26,6 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #pragma once #include +#include #include #include @@ -49,7 +50,7 @@ class Pgr_breadthFirstSearch { std::vector breadthFirstSearch( G &graph, - std::vector start_vertex, + std::set start_vertex, int64_t depth) { std::vector results; using bfs_visitor = visitors::Edges_order_bfs_visitor; diff --git a/include/drivers/breadthFirstSearch/binaryBreadthFirstSearch_driver.h b/include/drivers/breadthFirstSearch/binaryBreadthFirstSearch_driver.h index 09420970d6..e7ff1d1757 100644 --- a/include/drivers/breadthFirstSearch/binaryBreadthFirstSearch_driver.h +++ b/include/drivers/breadthFirstSearch/binaryBreadthFirstSearch_driver.h @@ -31,51 +31,42 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_BREADTHFIRSTSEARCH_BINARYBREADTHFIRSTSEARCH_DRIVER_H_ #pragma once -/* for size-t */ + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#include "cpp_common/undefPostgresDefine.hpp" + #ifdef __cplusplus # include # include -using Edge_t = struct Edge_t; using Path_rt = struct Path_rt; -using II_t_rt = struct II_t_rt; #else # include # include -typedef struct Edge_t Edge_t; typedef struct Path_rt Path_rt; -typedef struct II_t_rt II_t_rt; #endif - #ifdef __cplusplus extern "C" { #endif - /********************************************************* - TEXT, - ANYARRAY, - ANYARRAY, - directed BOOLEAN DEFAULT true - ********************************************************/ - - - void do_pgr_binaryBreadthFirstSearch( - Edge_t *data_edges, - size_t total_tuples, - II_t_rt *combinations, - size_t total_combinations, - int64_t *start_vidsArr, - size_t size_start_vidsArr, - int64_t *end_vidsArr, - size_t size_end_vidsArr, - bool directed, - - Path_rt **return_tuples, - size_t *return_count, - - char ** log_msg, - char ** notice_msg, - char ** err_msg); +void pgr_do_binaryBreadthFirstSearch( + char*, + char*, + ArrayType*, ArrayType*, + bool, + + Path_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus diff --git a/include/drivers/breadthFirstSearch/breadthFirstSearch_driver.h b/include/drivers/breadthFirstSearch/breadthFirstSearch_driver.h index 61c4d1546b..30711861b3 100644 --- a/include/drivers/breadthFirstSearch/breadthFirstSearch_driver.h +++ b/include/drivers/breadthFirstSearch/breadthFirstSearch_driver.h @@ -31,16 +31,26 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_BREADTHFIRSTSEARCH_BREADTHFIRSTSEARCH_DRIVER_H_ #pragma once -/* for size-t */ +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#include "cpp_common/undefPostgresDefine.hpp" + #ifdef __cplusplus # include # include -using Edge_t = struct Edge_t; using MST_rt = struct MST_rt; #else # include # include -typedef struct Edge_t Edge_t; typedef struct MST_rt MST_rt; #endif @@ -50,30 +60,17 @@ typedef struct MST_rt MST_rt; extern "C" { #endif - /********************************************************* - TEXT, - ANYARRAY, - max_depth BIGINT DEFAULT 9223372036854775807, - directed BOOLEAN DEFAULT true - ********************************************************/ - - - void do_pgr_breadthFirstSearch( - Edge_t *data_edges, - size_t total_tuples, - int64_t *start_vidsArr, - size_t size_start_vidsArr, - int64_t max_depth, - bool directed, - MST_rt **return_tuples, - size_t *return_count, - char ** log_msg, - char ** notice_msg, - char ** err_msg); +void pgr_do_breadthFirstSearch( + char*, + ArrayType*, + int64_t, + bool, + MST_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus -} + } #endif #endif // INCLUDE_DRIVERS_BREADTHFIRSTSEARCH_BREADTHFIRSTSEARCH_DRIVER_H_ diff --git a/src/breadthFirstSearch/binaryBreadthFirstSearch.c b/src/breadthFirstSearch/binaryBreadthFirstSearch.c index 3cb6a731d9..3122967287 100644 --- a/src/breadthFirstSearch/binaryBreadthFirstSearch.c +++ b/src/breadthFirstSearch/binaryBreadthFirstSearch.c @@ -35,9 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" - -#include "c_common/trsp_pgget.h" - #include "drivers/breadthFirstSearch/binaryBreadthFirstSearch_driver.h" PGDLLEXPORT Datum _pgr_binarybreadthfirstsearch(PG_FUNCTION_ARGS); @@ -57,63 +54,14 @@ process( char* log_msg = NULL; char* notice_msg = NULL; char* err_msg = NULL; - - PGR_DBG("Initializing arrays"); - - size_t size_start_vidsArr = 0; - int64_t *start_vidsArr = NULL; - - size_t size_end_vidsArr = 0; - int64_t *end_vidsArr = NULL; - - size_t total_combinations = 0; - II_t_rt *combinations = NULL; - - if (starts && ends) { - start_vidsArr = pgr_get_bigIntArray(&size_start_vidsArr, starts, false, &err_msg); - throw_error(err_msg, "While getting start vids"); - end_vidsArr = pgr_get_bigIntArray(&size_end_vidsArr, ends, false, &err_msg); - throw_error(err_msg, "While getting end vids"); - } else if (combinations_sql) { - pgr_get_combinations(combinations_sql, &combinations, &total_combinations, &err_msg); - throw_error(err_msg, combinations_sql); - if (total_combinations == 0) { - if (combinations) - pfree(combinations); - pgr_SPI_finish(); - return; - } - } - (*result_tuples) = NULL; (*result_count) = 0; - PGR_DBG("Load data"); - Edge_t *edges = NULL; - size_t total_edges = 0; - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - PGR_DBG("Total %ld edges in query:", total_edges); - - if (total_edges == 0) { - if (start_vidsArr) - pfree(start_vidsArr); - if (end_vidsArr) - pfree(end_vidsArr); - pgr_SPI_finish(); - return; - } - - PGR_DBG("Starting processing"); clock_t start_t = clock(); - do_pgr_binaryBreadthFirstSearch( - edges, - total_edges, - combinations, - total_combinations, - start_vidsArr, size_start_vidsArr, - end_vidsArr, size_end_vidsArr, + pgr_do_binaryBreadthFirstSearch( + edges_sql, + combinations_sql, + starts, ends, directed, @@ -125,54 +73,33 @@ process( &err_msg); time_msg(" processing pgr_binaryBreadthFirstSearch", start_t, clock()); - PGR_DBG("Returning %ld tuples", *result_count); - if (err_msg) { - if (*result_tuples) - pfree(*result_tuples); + if (err_msg && (*result_tuples)) { + pfree(*result_tuples); + (*result_tuples) = NULL; + (*result_count) = 0; } pgr_global_report(log_msg, notice_msg, err_msg); - if (edges) - pfree(edges); - if (log_msg) - pfree(log_msg); - if (notice_msg) - pfree(notice_msg); - if (err_msg) - pfree(err_msg); - - if (start_vidsArr) - pfree(start_vidsArr); - if (end_vidsArr) - pfree(end_vidsArr); + if (log_msg) pfree(log_msg); + if (notice_msg) pfree(notice_msg); + if (err_msg) pfree(err_msg); + pgr_SPI_finish(); } PGDLLEXPORT Datum _pgr_binarybreadthfirstsearch(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; - - /**************************************************************************/ Path_rt *result_tuples = NULL; size_t result_count = 0; - /**************************************************************************/ if (SRF_IS_FIRSTCALL()) { MemoryContext oldcontext; funcctx = SRF_FIRSTCALL_INIT(); oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - /**********************************************************************/ - // pgr_binaryBreadthFirstSearch( - // sql TEXT, - // start_vids ANYARRAY, - // end_vids ANYARRAY, - // directed BOOLEAN default true, - - PGR_DBG("Calling process"); - if (PG_NARGS() == 4) { /* * many to many @@ -200,9 +127,6 @@ PGDLLEXPORT Datum _pgr_binarybreadthfirstsearch(PG_FUNCTION_ARGS) { &result_count); } - - /**********************************************************************/ - funcctx->max_calls = result_count; funcctx->user_fctx = result_tuples; @@ -227,18 +151,6 @@ PGDLLEXPORT Datum _pgr_binarybreadthfirstsearch(PG_FUNCTION_ARGS) { Datum *values; bool *nulls; - /**********************************************************************/ - /* - OUT seq BIGINT, - OUT path_seq BIGINT, - OUT start_vid BIGINT, - OUT end_vid BIGINT, - OUT node BIGINT, - OUT edge BIGINT, - OUT cost FLOAT, - OUT agg_cost FLOAT - */ - /**********************************************************************/ size_t numb = 8; values = palloc(numb * sizeof(Datum)); nulls = palloc(numb * sizeof(bool)); @@ -257,18 +169,10 @@ PGDLLEXPORT Datum _pgr_binarybreadthfirstsearch(PG_FUNCTION_ARGS) { values[6] = Float8GetDatum(result_tuples[funcctx->call_cntr].cost); values[7] = Float8GetDatum(result_tuples[funcctx->call_cntr].agg_cost); - /**********************************************************************/ - tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); } else { - /**********************************************************************/ - - PGR_DBG("Clean up code"); - - /**********************************************************************/ - SRF_RETURN_DONE(funcctx); } } diff --git a/src/breadthFirstSearch/binaryBreadthFirstSearch_driver.cpp b/src/breadthFirstSearch/binaryBreadthFirstSearch_driver.cpp index 5fed2418f3..45a8c26c6c 100644 --- a/src/breadthFirstSearch/binaryBreadthFirstSearch_driver.cpp +++ b/src/breadthFirstSearch/binaryBreadthFirstSearch_driver.cpp @@ -39,11 +39,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "breadthFirstSearch/pgr_binaryBreadthFirstSearch.hpp" +#include "cpp_common/combinations.hpp" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" namespace { +#if 0 template < class G > std::deque pgr_binaryBreadthFirstSearch( @@ -72,12 +75,15 @@ pgr_binaryBreadthFirstSearch( const size_t MAX_UNIQUE_EDGE_COSTS = 2; const char COST_ERR_MSG[] = "Graph Condition Failed: Graph should have atmost two distinct non-negative edge costs! " "If there are exactly two distinct edge costs, one of them must equal zero!"; +#endif + template < class G > bool costCheck(G &graph) { typedef typename G::E E; typedef typename G::E_i E_i; + const size_t max_unique_edge_costs = 2; auto edges = boost::edges(graph.graph); E e; E_i out_i; @@ -88,7 +94,7 @@ costCheck(G &graph) { e = *out_i; cost_set.insert(graph[e].cost); - if (cost_set.size() > MAX_UNIQUE_EDGE_COSTS) { + if (cost_set.size() > max_unique_edge_costs) { return false; } } @@ -102,19 +108,24 @@ costCheck(G &graph) { return true; } +template std::deque binaryBreadthFirstSearch( + G &graph, + std::map> &combinations) { + pgrouting::functions::Pgr_binaryBreadthFirstSearch< G > fn_binaryBreadthFirstSearch; + auto paths = fn_binaryBreadthFirstSearch.binaryBreadthFirstSearch(graph, combinations); + + return paths; +} + } // namespace void -do_pgr_binaryBreadthFirstSearch( - Edge_t *data_edges, - size_t total_edges, - II_t_rt *combinations, - size_t total_combinations, - int64_t *start_vidsArr, - size_t size_start_vidsArr, - int64_t *end_vidsArr, - size_t size_end_vidsArr, +pgr_do_binaryBreadthFirstSearch( + char *edges_sql, + char *combinations_sql, + ArrayType *starts, + ArrayType *ends, bool directed, Path_rt **return_tuples, @@ -126,65 +137,68 @@ do_pgr_binaryBreadthFirstSearch( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::utilities::get_combinations; + using pgrouting::pgget::get_edges; std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; + const char c_err_msg[] = "Graph Condition Failed: Graph should have atmost two distinct non-negative edge costs! " + "If there are exactly two distinct edge costs, one of them must equal zero!"; try { - pgassert(total_edges != 0); pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - pgassert(data_edges); - pgassert((start_vidsArr && end_vidsArr) || combinations); - pgassert((size_start_vidsArr && size_end_vidsArr) || total_combinations); graphType gType = directed? DIRECTED: UNDIRECTED; - // log << "Inserting vertices into a c++ vector structure"; - std::vector - start_vertices(start_vidsArr, start_vidsArr + size_start_vidsArr); - std::vector< int64_t > - end_vertices(end_vidsArr, end_vidsArr + size_end_vidsArr); - std::vector< II_t_rt > - combinations_vector(combinations, combinations + total_combinations); + hint = combinations_sql; + auto combinations = get_combinations(combinations_sql, starts, ends, true); + hint = nullptr; + + if (combinations.empty() && combinations_sql) { + *notice_msg = pgr_msg("No (source, target) pairs found"); + *log_msg = pgr_msg(combinations_sql); + return; + } + + + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); + + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } std::deque< Path >paths; if (directed) { - // log << "\nWorking with directed Graph"; pgrouting::DirectedGraph digraph(gType); - digraph.insert_edges(data_edges, total_edges); + digraph.insert_edges(edges); if (!(costCheck(digraph))) { - err << COST_ERR_MSG; + err << c_err_msg; *err_msg = pgr_msg(err.str().c_str()); return; } - paths = pgr_binaryBreadthFirstSearch( - digraph, - combinations_vector, - start_vertices, - end_vertices); + paths = binaryBreadthFirstSearch(digraph, combinations); } else { - // log << "\nWorking with Undirected Graph"; pgrouting::UndirectedGraph undigraph(gType); - undigraph.insert_edges(data_edges, total_edges); + undigraph.insert_edges(edges); if (!(costCheck(undigraph))) { - err << COST_ERR_MSG; + err << c_err_msg; *err_msg = pgr_msg(err.str().c_str()); return; } - paths = pgr_binaryBreadthFirstSearch( - undigraph, - combinations_vector, - start_vertices, - end_vertices); + paths = binaryBreadthFirstSearch(undigraph, combinations); } size_t count(0); @@ -215,6 +229,9 @@ do_pgr_binaryBreadthFirstSearch( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; diff --git a/src/breadthFirstSearch/breadthFirstSearch.c b/src/breadthFirstSearch/breadthFirstSearch.c index aefb5f8b26..7f4637f325 100644 --- a/src/breadthFirstSearch/breadthFirstSearch.c +++ b/src/breadthFirstSearch/breadthFirstSearch.c @@ -26,7 +26,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -********************************************************************PGR-GNU*/ + ********************************************************************PGR-GNU*/ #include #include "c_common/postgres_connection.h" @@ -34,11 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" - -#include "c_common/trsp_pgget.h" - #include "c_types/mst_rt.h" - #include "drivers/breadthFirstSearch/breadthFirstSearch_driver.h" PGDLLEXPORT Datum _pgr_breadthfirstsearch(PG_FUNCTION_ARGS); @@ -57,39 +53,14 @@ process( char* log_msg = NULL; char* notice_msg = NULL; char* err_msg = NULL; - - PGR_DBG("Initializing arrays"); - - size_t size_start_vidsArr = 0; - int64_t *start_vidsArr = pgr_get_bigIntArray(&size_start_vidsArr, starts, false, &err_msg); - throw_error(err_msg, "While getting start vids"); - PGR_DBG("start_vidsArr size %ld ", size_start_vidsArr); - - (*result_tuples) = NULL; (*result_count) = 0; - PGR_DBG("Load data"); - Edge_t *edges = NULL; - size_t total_edges = 0; - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - PGR_DBG("Total %ld edges in query:", total_edges); - if (total_edges == 0) { - if (start_vidsArr) - pfree(start_vidsArr); - pgr_SPI_finish(); - return; - } - - PGR_DBG("Starting processing"); clock_t start_t = clock(); - do_pgr_breadthFirstSearch( - edges, - total_edges, - start_vidsArr, size_start_vidsArr, + pgr_do_breadthFirstSearch( + edges_sql, + starts, max_depth, directed, @@ -101,26 +72,19 @@ process( &err_msg); time_msg(" processing pgr_breadthFirstSearch", start_t, clock()); - PGR_DBG("Returning %ld tuples", *result_count); - if (err_msg) { - if (*result_tuples) - pfree(*result_tuples); + if (err_msg && (*result_tuples)) { + pfree(*result_tuples); + (*result_tuples) = NULL; + (*result_count) = 0; } pgr_global_report(log_msg, notice_msg, err_msg); - if (edges) - pfree(edges); - if (log_msg) - pfree(log_msg); - if (notice_msg) - pfree(notice_msg); - if (err_msg) - pfree(err_msg); - - if (start_vidsArr) - pfree(start_vidsArr); + if (log_msg) pfree(log_msg); + if (notice_msg) pfree(notice_msg); + if (err_msg) pfree(err_msg); + pgr_SPI_finish(); } @@ -128,27 +92,14 @@ PGDLLEXPORT Datum _pgr_breadthfirstsearch(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; - /**************************************************************************/ MST_rt *result_tuples = NULL; size_t result_count = 0; - /**************************************************************************/ if (SRF_IS_FIRSTCALL()) { MemoryContext oldcontext; funcctx = SRF_FIRSTCALL_INIT(); oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - /**********************************************************************/ - /* - pgr_breadthFirstSearch( - edge_sql TEXT, - start_vids ANYARRAY, - max_depth BIGINT DEFAULT 9223372036854775807, - directed BOOLEAN DEFAULT true) - */ - /**********************************************************************/ - - PGR_DBG("Calling process"); process( text_to_cstring(PG_GETARG_TEXT_P(0)), PG_GETARG_ARRAYTYPE_P(1), @@ -157,10 +108,7 @@ PGDLLEXPORT Datum _pgr_breadthfirstsearch(PG_FUNCTION_ARGS) { &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, @@ -183,17 +131,6 @@ PGDLLEXPORT Datum _pgr_breadthfirstsearch(PG_FUNCTION_ARGS) { Datum *values; bool *nulls; - /**********************************************************************/ - /* - OUT seq BIGINT, - OUT depth BIGINT, - OUT start_vid BIGINT, - OUT node BIGINT, - OUT edge BIGINT, - OUT cost FLOAT, - OUT agg_cost FLOAT - */ - /**********************************************************************/ size_t numb = 7; values = palloc(numb * sizeof(Datum)); nulls = palloc(numb * sizeof(bool)); @@ -211,18 +148,11 @@ PGDLLEXPORT Datum _pgr_breadthfirstsearch(PG_FUNCTION_ARGS) { values[5] = Float8GetDatum(result_tuples[funcctx->call_cntr].cost); values[6] = Float8GetDatum(result_tuples[funcctx->call_cntr].agg_cost); - /**********************************************************************/ tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); } else { - /**********************************************************************/ - - PGR_DBG("Clean up code"); - - /**********************************************************************/ - SRF_RETURN_DONE(funcctx); } } diff --git a/src/breadthFirstSearch/breadthFirstSearch_driver.cpp b/src/breadthFirstSearch/breadthFirstSearch_driver.cpp index fb75a561a5..5763281ef8 100644 --- a/src/breadthFirstSearch/breadthFirstSearch_driver.cpp +++ b/src/breadthFirstSearch/breadthFirstSearch_driver.cpp @@ -32,7 +32,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" @@ -40,6 +42,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. namespace { +#if 0 template < class G > std::vector pgr_breadthFirstSearch( @@ -57,15 +60,23 @@ pgr_breadthFirstSearch( graph, sources, max_depth); return results; } +#endif + +template std::vector breadthFirstSearch( + G &graph, + std::set sources, + int64_t max_depth) { + pgrouting::functions::Pgr_breadthFirstSearch fn_breadthFirstSearch; + auto results = fn_breadthFirstSearch.breadthFirstSearch(graph, sources, max_depth); + return results; +} } // namespace void -do_pgr_breadthFirstSearch( - Edge_t *data_edges, - size_t total_edges, - int64_t *start_vidsArr, - size_t size_start_vidsArr, +pgr_do_breadthFirstSearch( + char *edges_sql, + ArrayType* starts, int64_t max_depth, bool directed, @@ -77,43 +88,44 @@ do_pgr_breadthFirstSearch( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::pgget::get_intSet; std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; + try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - pgassert(total_edges != 0); graphType gType = directed? DIRECTED: UNDIRECTED; - log << "Inserting vertices into a c++ vector structure"; - std::vector - start_vertices(start_vidsArr, start_vidsArr + size_start_vidsArr); + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); + + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; + + auto roots = get_intSet(starts); std::vector results; if (directed) { - log << "Working with directed Graph\n"; pgrouting::DirectedGraph digraph(gType); - digraph.insert_edges(data_edges, total_edges); - results = pgr_breadthFirstSearch( - digraph, - start_vertices, - max_depth); + digraph.insert_edges(edges); + results = breadthFirstSearch(digraph, roots, max_depth); } else { - log << "Working with Undirected Graph\n"; pgrouting::UndirectedGraph undigraph(gType); - undigraph.insert_edges(data_edges, total_edges); - - results = pgr_breadthFirstSearch( - undigraph, - start_vertices, - max_depth); + undigraph.insert_edges(edges); + results = breadthFirstSearch(undigraph, roots, max_depth); } auto count = results.size(); @@ -121,20 +133,17 @@ do_pgr_breadthFirstSearch( if (count == 0) { (*return_tuples) = NULL; (*return_count) = 0; - notice << - "No traversal found"; + notice << "No traversal found"; *log_msg = pgr_msg(notice.str().c_str()); return; } (*return_tuples) = pgr_alloc(count, (*return_tuples)); - log << "\nConverting a set of traversals into the tuples"; + (*return_count) = count; for (size_t i = 0; i < count; i++) { *((*return_tuples) + i) = results[i]; } - (*return_count) = count; - pgassert(*err_msg == NULL); *log_msg = log.str().empty()? *log_msg : pgr_msg(log.str().c_str()); @@ -147,6 +156,9 @@ do_pgr_breadthFirstSearch( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; From cbc4dea174f2248eaae0f25c0fd1f0846c018d84 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 23 Jan 2024 14:51:41 -0600 Subject: [PATCH 074/428] [chinese] Reading data on C++ code --- include/chinese/pgr_chinesePostman.hpp | 31 +++++++--------- .../drivers/chinese/chinesePostman_driver.h | 24 +++---------- src/chinese/chinesePostman.c | 35 ++----------------- src/chinese/chinesePostman_driver.cpp | 25 +++++++++---- 4 files changed, 39 insertions(+), 76 deletions(-) diff --git a/include/chinese/pgr_chinesePostman.hpp b/include/chinese/pgr_chinesePostman.hpp index a1a40a87e1..199b524335 100644 --- a/include/chinese/pgr_chinesePostman.hpp +++ b/include/chinese/pgr_chinesePostman.hpp @@ -48,9 +48,7 @@ namespace graph { class PgrDirectedChPPGraph { public: - PgrDirectedChPPGraph( - const Edge_t *dataEdges, - const size_t totalEdges); + explicit PgrDirectedChPPGraph(const std::vector&); double DirectedChPP() const { return m_cost; @@ -105,39 +103,36 @@ class PgrDirectedChPPGraph { PgrDirectedChPPGraph::~PgrDirectedChPPGraph() { edgeToIdx.clear(); } -PgrDirectedChPPGraph::PgrDirectedChPPGraph( - const Edge_t *dataEdges, - const size_t totalEdges) : +PgrDirectedChPPGraph::PgrDirectedChPPGraph(const std::vector &dataEdges) : totalDeg(0), totalCost(0), vertices(), edgeToIdx(), originalEdges(), resultGraph(), VToVecid(), edgeVisited(), pathStack(), resultPath(), edges(), sources(), targets() { - pgassert(totalEdges > 0); pgassert(pathStack.empty()); pgassert(originalEdges.empty()); startPoint = dataEdges[0].source; - for (size_t i = 0; i < totalEdges; ++i) { - if (dataEdges[i].cost > 0) { - auto edge(dataEdges[i]); + for (const auto e : dataEdges) { + if (e.cost > 0) { + auto edge = e; edge.reverse_cost = -1.0; totalCost += edge.cost; originalEdges.push_back(edge); - vertices += dataEdges[i].source; - vertices += dataEdges[i].target; + vertices += e.source; + vertices += e.target; } - if (dataEdges[i].reverse_cost > 0) { - auto edge(dataEdges[i]); + if (e.reverse_cost > 0) { + auto edge = e; std::swap(edge.source, edge.target); std::swap(edge.cost, edge.reverse_cost); edge.reverse_cost = -1.0; totalCost += edge.cost; originalEdges.push_back(edge); - vertices += dataEdges[i].source; - vertices += dataEdges[i].target; - pgassert(dataEdges[i].source == edge.target); - pgassert(dataEdges[i].target == edge.source); + vertices += e.source; + vertices += e.target; + pgassert(e.source == edge.target); + pgassert(e.target == edge.source); } } diff --git a/include/drivers/chinese/chinesePostman_driver.h b/include/drivers/chinese/chinesePostman_driver.h index 5ed32edecb..945c81fd36 100644 --- a/include/drivers/chinese/chinesePostman_driver.h +++ b/include/drivers/chinese/chinesePostman_driver.h @@ -31,14 +31,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_CHINESE_CHINESEPOSTMAN_DRIVER_H_ #pragma once -/* for size-t */ #ifdef __cplusplus # include -using Edge_t = struct Edge_t; using Path_rt = struct Path_rt; #else # include -typedef struct Edge_t Edge_t; typedef struct Path_rt Path_rt; #endif @@ -47,24 +44,13 @@ typedef struct Path_rt Path_rt; extern "C" { #endif - /********************************************************* - TEXT, - BIGINT, - BIGINT, - ********************************************************/ +void pgr_do_directedChPP( + char*, + bool, - void - do_pgr_directedChPP( - Edge_t *data_edges, - size_t total_edges, - bool only_cost, - Path_rt **return_tuples, - size_t *return_count, - char ** log_msg, - char ** notice_msg, - char ** err_msg); - + Path_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/src/chinese/chinesePostman.c b/src/chinese/chinesePostman.c index ff49febd59..52509a3066 100644 --- a/src/chinese/chinesePostman.c +++ b/src/chinese/chinesePostman.c @@ -37,7 +37,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "drivers/chinese/chinesePostman_driver.h" @@ -45,7 +44,6 @@ PGDLLEXPORT Datum _pgr_chinesepostman(PG_FUNCTION_ARGS); PG_FUNCTION_INFO_V1(_pgr_chinesepostman); -/******************************************************************************/ static void process( @@ -58,21 +56,9 @@ process( char* notice_msg = NULL; char* err_msg = NULL; - Edge_t *edges = NULL; - size_t total_edges = 0; - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - - if (total_edges == 0) { - pgr_SPI_finish(); - return; - } - clock_t start_t = clock(); - - do_pgr_directedChPP( - edges, total_edges, + pgr_do_directedChPP( + edges_sql, only_cost, result_tuples, result_count, @@ -87,8 +73,6 @@ process( time_msg(" processing pgr_chinesePostman", start_t, clock()); } - if (edges) pfree(edges); - if (err_msg && (*result_tuples)) { pfree(*result_tuples); (*result_tuples) = NULL; @@ -109,30 +93,21 @@ PGDLLEXPORT Datum _pgr_chinesepostman(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; - /**************************************************************************/ Path_rt *result_tuples = NULL; size_t result_count = 0; - /**************************************************************************/ 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)), PG_GETARG_BOOL(1), &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) { @@ -157,11 +132,6 @@ PGDLLEXPORT Datum _pgr_chinesepostman(PG_FUNCTION_ARGS) { bool* nulls; size_t call_cntr = funcctx->call_cntr; - /**********************************************************************/ - /* MODIFY AS NEEDED */ - /* - ***********************************************************************/ - size_t numb = 5; values =(Datum *)palloc(numb * sizeof(Datum)); nulls = palloc(numb * sizeof(bool)); @@ -176,7 +146,6 @@ PGDLLEXPORT Datum _pgr_chinesepostman(PG_FUNCTION_ARGS) { values[2] = Int64GetDatum(result_tuples[call_cntr].edge); values[3] = Float8GetDatum(result_tuples[call_cntr].cost); values[4] = Float8GetDatum(result_tuples[call_cntr].agg_cost); - /**********************************************************************/ tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); diff --git a/src/chinese/chinesePostman_driver.cpp b/src/chinese/chinesePostman_driver.cpp index de4a7afbee..dcf8f5bd4e 100644 --- a/src/chinese/chinesePostman_driver.cpp +++ b/src/chinese/chinesePostman_driver.cpp @@ -35,14 +35,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include // work for only directed +#include "cpp_common/pgdata_getters.hpp" #include "chinese/pgr_chinesePostman.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" void -do_pgr_directedChPP( - Edge_t *data_edges, size_t total_edges, +pgr_do_directedChPP( + char *edges_sql, bool only_cost, Path_rt **return_tuples, size_t *return_count, @@ -56,16 +57,26 @@ do_pgr_directedChPP( std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; + try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - pgassert(total_edges != 0); - pgrouting::graph::PgrDirectedChPPGraph digraph( - data_edges, total_edges); + + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; + + pgrouting::graph::PgrDirectedChPPGraph digraph(edges); double minCost; minCost = digraph.DirectedChPP(); @@ -83,7 +94,6 @@ do_pgr_directedChPP( pathEdges = digraph.GetPathEdges(); } - size_t count = pathEdges.size(); if (count == 0) { @@ -114,6 +124,9 @@ do_pgr_directedChPP( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; From 404d08bb923503cd39439e17e92cb25305a05774 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 23 Jan 2024 14:56:08 -0600 Subject: [PATCH 075/428] [circuits] hawickcircuits_driver.h -> hawickCircuits_driver.h --- .../circuits/{hawickcircuits_driver.h => hawickCircuits_driver.h} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename include/drivers/circuits/{hawickcircuits_driver.h => hawickCircuits_driver.h} (100%) diff --git a/include/drivers/circuits/hawickcircuits_driver.h b/include/drivers/circuits/hawickCircuits_driver.h similarity index 100% rename from include/drivers/circuits/hawickcircuits_driver.h rename to include/drivers/circuits/hawickCircuits_driver.h From a4dde4a86d0e1c6a39f758b708b67a60fdfaa30b Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 23 Jan 2024 15:03:49 -0600 Subject: [PATCH 076/428] [circuits] Reading data on C++ code --- .../drivers/circuits/hawickCircuits_driver.h | 15 ++--- src/circuits/hawickCircuits.c | 65 +------------------ src/circuits/hawickCircuits_driver.cpp | 57 +++++++--------- 3 files changed, 30 insertions(+), 107 deletions(-) diff --git a/include/drivers/circuits/hawickCircuits_driver.h b/include/drivers/circuits/hawickCircuits_driver.h index 4a7d00cb8a..000c4ba12b 100644 --- a/include/drivers/circuits/hawickCircuits_driver.h +++ b/include/drivers/circuits/hawickCircuits_driver.h @@ -30,8 +30,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #ifndef INCLUDE_DRIVERS_CIRCUITS_HAWICKCIRCUITS_DRIVER_H_ #define INCLUDE_DRIVERS_CIRCUITS_HAWICKCIRCUITS_DRIVER_H_ - -/* for size-t */ #ifdef __cplusplus # include #else @@ -46,16 +44,11 @@ extern "C" { #endif void -do_hawickCircuits( - Edge_t *, // data_edges - size_t, // total_tuples - circuits_rt **, // return_tuples - size_t *, // return_count - - char **, // log_msg - char **, // notice_msg - char **); // err_msg +pgr_do_hawickCircuits( + char*, + circuits_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/src/circuits/hawickCircuits.c b/src/circuits/hawickCircuits.c index 8c1bcb1f81..68228499a1 100644 --- a/src/circuits/hawickCircuits.c +++ b/src/circuits/hawickCircuits.c @@ -26,10 +26,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -/** @file hawickCircuits.c - * @brief Connecting code with postgres. - * - */ #include #include "c_common/postgres_connection.h" #include "c_types/circuits_rt.h" @@ -37,25 +33,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" -#include "drivers/circuits/hawickcircuits_driver.h" +#include "drivers/circuits/hawickCircuits_driver.h" PGDLLEXPORT Datum _pgr_hawickcircuits(PG_FUNCTION_ARGS); PG_FUNCTION_INFO_V1(_pgr_hawickcircuits); -/** @brief Static function, loads the data from postgres to C types for further processing. - * - * It first connects the C function to the SPI manager. Then converts - * the postgres array to C array and loads the edges belonging to the graph - * in C types. Then it calls the function `do_cuthillMckeeOrdering` defined - * in the `cuthillMckeeOrdering_driver.h` file for further processing. - * Finally, it frees the memory and disconnects the C function to the SPI manager. - * - * @param edges_sql the edges of the SQL query - * @param result_tuples the rows in the result - * @param result_count the count of rows in the result - */ - static void process( char* edges_sql, @@ -70,27 +52,15 @@ process( (*result_tuples) = NULL; (*result_count) = 0; - Edge_t *edges = NULL; - size_t total_edges = 0; - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - if (total_edges == 0) { - pgr_SPI_finish(); - return; - } - - PGR_DBG("Starting timer"); clock_t start_t = clock(); - do_hawickCircuits( - edges, total_edges, + pgr_do_hawickCircuits( + edges_sql, result_tuples, result_count, &log_msg, ¬ice_msg, &err_msg); - time_msg("processing hawickCircuits", start_t, clock()); if (err_msg && (*result_tuples)) { @@ -104,37 +74,22 @@ process( if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - if (edges) pfree(edges); pgr_SPI_finish(); } -/* */ -/******************************************************************************/ - -/** @brief Helps in converting postgres variables to C variables, and returns the result. - * - */ PGDLLEXPORT Datum _pgr_hawickcircuits(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; - /**********************************************************************/ circuits_rt *result_tuples = NULL; size_t result_count = 0; - /**********************************************************************/ if (SRF_IS_FIRSTCALL()) { MemoryContext oldcontext; funcctx = SRF_FIRSTCALL_INIT(); oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - /*********************************************************************** - * - * pgr_hawickCircuits(edges_sql TEXT); - * - **********************************************************************/ - process( text_to_cstring(PG_GETARG_TEXT_P(0)), &result_tuples, @@ -185,20 +140,6 @@ PGDLLEXPORT Datum _pgr_hawickcircuits(PG_FUNCTION_ARGS) { values[7] = Float8GetDatum(result_tuples[call_cntr].cost); values[8] = Float8GetDatum(result_tuples[call_cntr].agg_cost); - /*********************************************************************** - * - * OUT seq INTEGER, - * OUT path_id INTEGER, - * OUT path_seq INTEGER, - * OUT start_vid BIGINT, - * OUT end_vid BIGINT, - * OUT node BIGINT, - * OUT edge FLOAT, - * OUT cost FLOAT, - * OUT agg_cost FLOAT - * - **********************************************************************/ - tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); diff --git a/src/circuits/hawickCircuits_driver.cpp b/src/circuits/hawickCircuits_driver.cpp index b53265d6b4..a85248d4e9 100644 --- a/src/circuits/hawickCircuits_driver.cpp +++ b/src/circuits/hawickCircuits_driver.cpp @@ -28,20 +28,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ +#include "drivers/circuits/hawickCircuits_driver.h" #include #include #include #include +#include "circuits/hawickcircuits.hpp" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" -#include "drivers/circuits/hawickcircuits_driver.h" -#include "circuits/hawickcircuits.hpp" - -/** @file hawickCircuits_driver.cpp */ - +namespace { /** @brief Calls the main function defined in the C++ Header file. * @@ -57,33 +56,11 @@ pgr_hawickCircuits(G &graph) { auto results = fn_hawickCircuits.hawickCircuits(graph); return results; } - -/** @brief Performs exception handling and converts the results to postgres. - * - * @pre log_msg is empty - * @pre notice_msg is empty - * @pre err_msg is empty - * @pre return_tuples is empty - * @pre return_count is 0 - * - * It builds the undirected graph using the `data_edges` variable. - * Then, it passes the required variables to the template function - * `cuthillMckeeOrdering` which calls the main function - * defined in the C++ Header file. It also does exception handling. - * - * @param data_edges the set of edges from the SQL query - * @param total_edges the total number of edges in the SQL query - * @param return_tuples the rows in the result - * @param return_count the count of rows in the result - * @param log_msg stores the log message - * @param notice_msg stores the notice message - * @param err_msg stores the error message - */ +} // namespace void -do_hawickCircuits( - Edge_t *data_edges, - size_t total_edges, +pgr_do_hawickCircuits( + char *edges_sql, circuits_rt **return_tuples, size_t *return_count, @@ -99,20 +76,29 @@ do_hawickCircuits( std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; + try { pgassert(!(*log_msg)); - pgassert(total_edges != 0); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - std::deque < circuits_rt > results; + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; + + std::deque results; graphType gType = DIRECTED; pgrouting::DirectedGraph digraph(gType); - - digraph.insert_edges(data_edges, total_edges); + digraph.insert_edges(edges); results = pgr_hawickCircuits(digraph); @@ -145,6 +131,9 @@ do_hawickCircuits( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; From c94da62ca2529bc6dbe2b3fdf330c39b372c795b Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 23 Jan 2024 15:15:21 -0600 Subject: [PATCH 077/428] [coloring] Reading data on C++ code --- include/coloring/pgr_edgeColoring.hpp | 2 +- include/drivers/coloring/bipartite_driver.h | 18 ++---- .../drivers/coloring/edgeColoring_driver.h | 24 ++----- .../sequentialVertexColoring_driver.h | 23 ++----- src/coloring/bipartite.c | 18 +----- src/coloring/bipartite_driver.cpp | 30 +++++---- src/coloring/edgeColoring.c | 62 +------------------ src/coloring/edgeColoring_driver.cpp | 27 +++++--- src/coloring/pgr_edgeColoring.cpp | 12 ++-- src/coloring/sequentialVertexColoring.c | 51 +-------------- .../sequentialVertexColoring_driver.cpp | 51 ++++++--------- 11 files changed, 81 insertions(+), 237 deletions(-) diff --git a/include/coloring/pgr_edgeColoring.hpp b/include/coloring/pgr_edgeColoring.hpp index b1eaa63717..5d5911ac4e 100644 --- a/include/coloring/pgr_edgeColoring.hpp +++ b/include/coloring/pgr_edgeColoring.hpp @@ -56,7 +56,7 @@ class Pgr_edgeColoring : public Pgr_messages { public: std::vector edgeColoring(); - Pgr_edgeColoring(Edge_t*, size_t); + explicit Pgr_edgeColoring(const std::vector&); Pgr_edgeColoring() = delete; #if Boost_VERSION_MACRO >= 106800 diff --git a/include/drivers/coloring/bipartite_driver.h b/include/drivers/coloring/bipartite_driver.h index 8bc3bb5dfc..0ee76c78ab 100644 --- a/include/drivers/coloring/bipartite_driver.h +++ b/include/drivers/coloring/bipartite_driver.h @@ -34,11 +34,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /* for size-t */ #ifdef __cplusplus # include -using Edge_t = struct Edge_t; using II_t_rt = struct II_t_rt; #else # include -typedef struct Edge_t Edge_t; typedef struct II_t_rt II_t_rt; #endif @@ -47,20 +45,12 @@ typedef struct II_t_rt II_t_rt; extern "C" { #endif -/********************************************************* - edges_sql TEXT, - - ********************************************************/ void -do_pgr_bipartite( - Edge_t *data_edges, - size_t total_tuples, - II_t_rt **return_tuples, - size_t *return_count, - char **log_msg, - char **notice_msg, - char **err_msg); +pgr_do_bipartite( + char*, + II_t_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/include/drivers/coloring/edgeColoring_driver.h b/include/drivers/coloring/edgeColoring_driver.h index 13110039c1..4b0b9104e1 100644 --- a/include/drivers/coloring/edgeColoring_driver.h +++ b/include/drivers/coloring/edgeColoring_driver.h @@ -31,36 +31,24 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_COLORING_EDGECOLORING_DRIVER_H_ -/* for size-t */ #ifdef __cplusplus # include +using II_t_rt = struct II_t_rt; #else # include -#endif - -typedef struct Edge_t Edge_t; typedef struct II_t_rt II_t_rt; +#endif #ifdef __cplusplus extern "C" { #endif -/********************************************************* - edges_sql TEXT, - - ********************************************************/ - void -do_pgr_edgeColoring( - Edge_t *data_edges, - size_t total_tuples, - II_t_rt **return_tuples, - size_t *return_count, - - char **log_msg, - char **notice_msg, - char **err_msg); +pgr_do_edgeColoring( + char*, + II_t_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/include/drivers/coloring/sequentialVertexColoring_driver.h b/include/drivers/coloring/sequentialVertexColoring_driver.h index f1098cc89d..7880cdbea0 100644 --- a/include/drivers/coloring/sequentialVertexColoring_driver.h +++ b/include/drivers/coloring/sequentialVertexColoring_driver.h @@ -31,14 +31,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_COLORING_SEQUENTIALVERTEXCOLORING_DRIVER_H_ #pragma once -/* for size-t */ #ifdef __cplusplus # include -using Edge_t = struct Edge_t; using II_t_rt = struct II_t_rt; #else # include -typedef struct Edge_t Edge_t; typedef struct II_t_rt II_t_rt; #endif @@ -47,23 +44,11 @@ typedef struct II_t_rt II_t_rt; extern "C" { #endif - /************************************************** - * - * pgr_sequentialVertexColoring( - * edges_sql TEXT - * ); - * - *************************************************/ - void do_pgr_sequentialVertexColoring( - Edge_t *data_edges, - size_t total_edges, +void pgr_do_sequentialVertexColoring( + char*, - II_t_rt **return_tuples, - size_t *return_count, - - char ** log_msg, - char ** notice_msg, - char ** err_msg); + II_t_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/src/coloring/bipartite.c b/src/coloring/bipartite.c index e9435de231..97eda52d49 100644 --- a/src/coloring/bipartite.c +++ b/src/coloring/bipartite.c @@ -28,8 +28,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -/******************************************************************************/ - #include #include "c_common/postgres_connection.h" @@ -38,7 +36,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "drivers/coloring/bipartite_driver.h" @@ -56,24 +53,14 @@ process(char* edges_sql, char* notice_msg = NULL; char* err_msg = NULL; - size_t total_edges = 0; - Edge_t* edges = NULL; - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - if (total_edges == 0) { - pgr_SPI_finish(); - return; - } - PGR_DBG("Starting timer"); clock_t start_t = clock(); - do_pgr_bipartite( - edges, total_edges, + pgr_do_bipartite( + edges_sql, result_tuples, result_count, &log_msg, ¬ice_msg, &err_msg); - time_msg("processing pgr_bipartite()", start_t, clock()); @@ -88,7 +75,6 @@ process(char* edges_sql, if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - if (edges) pfree(edges); pgr_SPI_finish(); } diff --git a/src/coloring/bipartite_driver.cpp b/src/coloring/bipartite_driver.cpp index 61f8e846b5..3d80b8b734 100644 --- a/src/coloring/bipartite_driver.cpp +++ b/src/coloring/bipartite_driver.cpp @@ -28,15 +28,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -/************************************************************ - edges_sql TEXT - ***********************************************************/ - #include #include #include #include #include +#include "cpp_common/pgdata_getters.hpp" #include "c_types/ii_t_rt.h" #include "cpp_common/identifiers.hpp" #include "cpp_common/pgr_alloc.hpp" @@ -46,13 +43,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "coloring/pgr_bipartite_driver.hpp" -/************************************************************ - edges_sql TEXT - ***********************************************************/ void -do_pgr_bipartite( - Edge_t *data_edges, - size_t total_edges, +pgr_do_bipartite( + char *edges_sql, + II_t_rt **return_tuples, size_t *return_count, char **log_msg, @@ -65,20 +59,29 @@ do_pgr_bipartite( std::ostringstream log; std::ostringstream notice; std::ostringstream err; + char *hint = nullptr; try { - pgassert(total_edges != 0); pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; + std::string logstr; graphType gType = UNDIRECTED; pgrouting::UndirectedGraph undigraph(gType); - undigraph.insert_edges(data_edges, total_edges); + undigraph.insert_edges(edges); std::vector results; pgrouting::functions::Pgr_Bipartite fn_Bipartite; results = fn_Bipartite.pgr_bipartite(undigraph); @@ -115,6 +118,9 @@ do_pgr_bipartite( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; diff --git a/src/coloring/edgeColoring.c b/src/coloring/edgeColoring.c index 1c71e7a545..662e08a549 100644 --- a/src/coloring/edgeColoring.c +++ b/src/coloring/edgeColoring.c @@ -38,7 +38,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "c_types/ii_t_rt.h" #include "drivers/coloring/edgeColoring_driver.h" @@ -46,18 +45,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. PGDLLEXPORT Datum _pgr_edgecoloring(PG_FUNCTION_ARGS); PG_FUNCTION_INFO_V1(_pgr_edgecoloring); -/** @brief Static function, loads the data from postgres to C types for further processing. - * - * It first connects the C function to the SPI manager. Then converts - * the postgres array to C array and loads the edges belonging to the graph - * in C types. Then it calls the function `do_pgr_edgeColoring` defined - * in the `edgeColoring_driver.h` file for further processing. - * Finally, it frees the memory and disconnects the C function to the SPI manager. - * - * @param edges_sql the edges of the SQL query - * @param result_tuples the rows in the result - * @param result_count the count of rows in the result - */ static void @@ -74,33 +61,15 @@ process( (*result_tuples) = NULL; (*result_count) = 0; - Edge_t *edges = NULL; - size_t total_edges = 0; - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - - if (total_edges == 0) { - ereport(WARNING, - (errmsg("Insufficient data found on inner query."), - errhint("%s", edges_sql))); - (*result_count) = 0; - (*result_tuples) = NULL; - pgr_SPI_finish(); - return; - } - clock_t start_t = clock(); - - do_pgr_edgeColoring( - edges, total_edges, + pgr_do_edgeColoring( + edges_sql, result_tuples, result_count, &log_msg, ¬ice_msg, &err_msg); - time_msg("processing pgr_edgeColoring", start_t, clock()); if (err_msg && (*result_tuples)) { @@ -114,45 +83,27 @@ process( if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - if (edges) pfree(edges); pgr_SPI_finish(); } -/* */ -/******************************************************************************/ - -/** @brief Helps in converting postgres variables to C variables, and returns the result. - * - */ - PGDLLEXPORT Datum _pgr_edgecoloring(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; - /**********************************************************************/ II_t_rt *result_tuples = NULL; size_t result_count = 0; - /**********************************************************************/ if (SRF_IS_FIRSTCALL()) { MemoryContext oldcontext; funcctx = SRF_FIRSTCALL_INIT(); oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - /*********************************************************************** - * - * pgr_edgeColoring(edges_sql TEXT); - * - **********************************************************************/ - process( text_to_cstring(PG_GETARG_TEXT_P(0)), &result_tuples, &result_count); - /**********************************************************************/ - funcctx->max_calls = result_count; funcctx->user_fctx = result_tuples; @@ -178,13 +129,6 @@ PGDLLEXPORT Datum _pgr_edgecoloring(PG_FUNCTION_ARGS) { Datum *values; bool* nulls; - /*********************************************************************** - * - * OUT edge BIGINT - * OUT color BIGINT - * - **********************************************************************/ - size_t num = 3; values = palloc(num * sizeof(Datum)); nulls = palloc(num * sizeof(bool)); @@ -198,8 +142,6 @@ PGDLLEXPORT Datum _pgr_edgecoloring(PG_FUNCTION_ARGS) { values[0] = Int64GetDatum(result_tuples[funcctx->call_cntr].d1.id); values[1] = Int64GetDatum(result_tuples[funcctx->call_cntr].d2.value); - /**********************************************************************/ - tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); diff --git a/src/coloring/edgeColoring_driver.cpp b/src/coloring/edgeColoring_driver.cpp index e0871bb1c9..b255eac184 100644 --- a/src/coloring/edgeColoring_driver.cpp +++ b/src/coloring/edgeColoring_driver.cpp @@ -32,17 +32,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "coloring/pgr_edgeColoring.hpp" +#include "cpp_common/pgdata_getters.hpp" #include "c_types/graph_enum.h" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" -/************************************************************ - edges_sql TEXT - ***********************************************************/ - -void do_pgr_edgeColoring( - Edge_t *data_edges, - size_t total_edges, +void pgr_do_edgeColoring( + char *edges_sql, II_t_rt **return_tuples, size_t *return_count, @@ -57,6 +53,8 @@ void do_pgr_edgeColoring( std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; + try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); @@ -64,9 +62,19 @@ void do_pgr_edgeColoring( pgassert(!(*return_tuples)); pgassert(*return_count == 0); + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; + + std::vector results; - pgrouting::functions::Pgr_edgeColoring fn_edgeColoring {data_edges, total_edges}; + pgrouting::functions::Pgr_edgeColoring fn_edgeColoring(edges); results = fn_edgeColoring.edgeColoring(); @@ -95,6 +103,9 @@ void do_pgr_edgeColoring( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; diff --git a/src/coloring/pgr_edgeColoring.cpp b/src/coloring/pgr_edgeColoring.cpp index 2193945cf9..4ec0b74742 100644 --- a/src/coloring/pgr_edgeColoring.cpp +++ b/src/coloring/pgr_edgeColoring.cpp @@ -65,15 +65,14 @@ Pgr_edgeColoring::edgeColoring() { return results; } -Pgr_edgeColoring::Pgr_edgeColoring(Edge_t *edges, - size_t total_edges) { +Pgr_edgeColoring::Pgr_edgeColoring(const std::vector &edges) { /* * Inserting vertices */ Identifiers ids; - for (size_t i = 0; i < total_edges; ++i) { - ids += edges[i].source; - ids += edges[i].target; + for (const auto &e : edges) { + ids += e.source; + ids += e.target; } for (const auto id : ids) { @@ -86,8 +85,7 @@ Pgr_edgeColoring::Pgr_edgeColoring(Edge_t *edges, * Inserting edges */ bool added; - for (size_t i = 0; i < total_edges; ++i) { - auto edge = edges[i]; + for (const auto &edge : edges) { auto v1 = get_boost_vertex(edge.source); auto v2 = get_boost_vertex(edge.target); auto e_exists = boost::edge(v1, v2, graph); diff --git a/src/coloring/sequentialVertexColoring.c b/src/coloring/sequentialVertexColoring.c index a3bc266b10..497e411636 100644 --- a/src/coloring/sequentialVertexColoring.c +++ b/src/coloring/sequentialVertexColoring.c @@ -38,7 +38,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "c_types/ii_t_rt.h" @@ -47,18 +46,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. PGDLLEXPORT Datum _pgr_sequentialvertexcoloring(PG_FUNCTION_ARGS); PG_FUNCTION_INFO_V1(_pgr_sequentialvertexcoloring); -/** @brief Static function, loads the data from postgres to C types for further processing. - * - * It first connects the C function to the SPI manager. Then converts - * the postgres array to C array and loads the edges belonging to the graph - * in C types. Then it calls the function `do_pgr_sequentialVertexColoring` defined - * in the `sequentialVertexColoring_driver.h` file for further processing. - * Finally, it frees the memory and disconnects the C function to the SPI manager. - * - * @param edges_sql the edges of the SQL query - * @param result_tuples the rows in the result - * @param result_count the count of rows in the result - */ static void process( @@ -74,22 +61,15 @@ process( (*result_tuples) = NULL; (*result_count) = 0; - Edge_t *edges = NULL; - size_t total_edges = 0; - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - clock_t start_t = clock(); - do_pgr_sequentialVertexColoring( - edges, total_edges, + pgr_do_sequentialVertexColoring( + edges_sql, result_tuples, result_count, &log_msg, ¬ice_msg, &err_msg); - time_msg("processing pgr_sequentialVertexColoring", start_t, clock()); if (err_msg && (*result_tuples)) { @@ -103,45 +83,27 @@ process( if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - if (edges) pfree(edges); pgr_SPI_finish(); } -/* */ -/******************************************************************************/ - -/** @brief Helps in converting postgres variables to C variables, and returns the result. - * - */ PGDLLEXPORT Datum _pgr_sequentialvertexcoloring(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; - /**********************************************************************/ II_t_rt *result_tuples = NULL; size_t result_count = 0; - /**********************************************************************/ if (SRF_IS_FIRSTCALL()) { MemoryContext oldcontext; funcctx = SRF_FIRSTCALL_INIT(); oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - /*********************************************************************** - * - * pgr_sequentialVertexColoring(edges_sql TEXT); - * - **********************************************************************/ - process( text_to_cstring(PG_GETARG_TEXT_P(0)), &result_tuples, &result_count); - /**********************************************************************/ - - funcctx->max_calls = result_count; funcctx->user_fctx = result_tuples; @@ -167,13 +129,6 @@ PGDLLEXPORT Datum _pgr_sequentialvertexcoloring(PG_FUNCTION_ARGS) { Datum *values; bool* nulls; - /*********************************************************************** - * - * OUT node BIGINT, - * OUT color BIGINT, - * - **********************************************************************/ - size_t num = 2; values = palloc(num * sizeof(Datum)); nulls = palloc(num * sizeof(bool)); @@ -187,8 +142,6 @@ PGDLLEXPORT Datum _pgr_sequentialvertexcoloring(PG_FUNCTION_ARGS) { values[0] = Int64GetDatum(result_tuples[funcctx->call_cntr].d1.id); values[1] = Int64GetDatum(result_tuples[funcctx->call_cntr].d2.value); - /**********************************************************************/ - tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); diff --git a/src/coloring/sequentialVertexColoring_driver.cpp b/src/coloring/sequentialVertexColoring_driver.cpp index 677d8aaef7..f3d36f8e32 100644 --- a/src/coloring/sequentialVertexColoring_driver.cpp +++ b/src/coloring/sequentialVertexColoring_driver.cpp @@ -33,6 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" @@ -43,13 +44,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. namespace { -/** @brief Calls the main function defined in the C++ Header file. - * - * @param graph the graph containing the edges - * - * @returns results, when results are found - */ - template < class G > std::vector pgr_sequentialVertexColoring(G &graph) { @@ -60,32 +54,9 @@ pgr_sequentialVertexColoring(G &graph) { } // namespace -/** @brief Performs exception handling and converts the results to postgres. - * - * @pre log_msg is empty - * @pre notice_msg is empty - * @pre err_msg is empty - * @pre return_tuples is empty - * @pre return_count is 0 - * - * It builds the undirected graph using the `data_edges` variable. - * Then, it passes the required variables to the template function - * `pgr_sequentialVertexColoring` which calls the main function - * defined in the C++ Header file. It also does exception handling. - * - * @param data_edges the set of edges from the SQL query - * @param total_edges the total number of edges in the SQL query - * @param return_tuples the rows in the result - * @param return_count the count of rows in the result - * @param log_msg stores the log message - * @param notice_msg stores the notice message - * @param err_msg stores the error message - */ - void -do_pgr_sequentialVertexColoring( - Edge_t *data_edges, - size_t total_edges, +pgr_do_sequentialVertexColoring( + char *edges_sql, II_t_rt **return_tuples, size_t *return_count, @@ -100,6 +71,8 @@ do_pgr_sequentialVertexColoring( std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; + try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); @@ -107,12 +80,21 @@ do_pgr_sequentialVertexColoring( pgassert(!(*return_tuples)); pgassert(*return_count == 0); + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; + std::vector results; graphType gType = UNDIRECTED; pgrouting::UndirectedGraph undigraph(gType); - undigraph.insert_edges(data_edges, total_edges); + undigraph.insert_edges(edges); results = pgr_sequentialVertexColoring(undigraph); @@ -145,6 +127,9 @@ do_pgr_sequentialVertexColoring( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; From 79cddb954eaf0aa358a04f16a1a01986b2d29435 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 24 Jan 2024 10:44:33 -0600 Subject: [PATCH 078/428] [components] Reading data on C++ code --- .../components/articulationPoints_driver.h | 21 ++---- .../components/biconnectedComponents_driver.h | 20 ++---- include/drivers/components/bridges_driver.h | 23 ++----- .../components/connectedComponents_driver.h | 23 ++----- .../drivers/components/makeConnected_driver.h | 20 ++---- .../components/strongComponents_driver.h | 23 ++----- src/components/articulationPoints.c | 20 +----- src/components/articulationPoints_driver.cpp | 29 ++++++--- src/components/biconnectedComponents.c | 19 +----- .../biconnectedComponents_driver.cpp | 25 ++++++-- src/components/bridges.c | 20 +----- src/components/bridges_driver.cpp | 28 +++++--- src/components/connectedComponents.c | 19 +----- src/components/connectedComponents_driver.cpp | 32 ++++++---- src/components/makeConnected.c | 64 ++----------------- src/components/makeConnected_driver.cpp | 25 ++++++-- src/components/strongComponents.c | 19 +----- src/components/strongComponents_driver.cpp | 30 +++++++-- 18 files changed, 171 insertions(+), 289 deletions(-) diff --git a/include/drivers/components/articulationPoints_driver.h b/include/drivers/components/articulationPoints_driver.h index 7b15b88679..ab6b5ef024 100644 --- a/include/drivers/components/articulationPoints_driver.h +++ b/include/drivers/components/articulationPoints_driver.h @@ -47,22 +47,11 @@ typedef struct Edge_t Edge_t; extern "C" { #endif - /********************************************************* - TEXT, - BIGINT, - BIGINT, - ********************************************************/ - - - void - do_pgr_articulationPoints( - Edge_t *data_edges, - size_t total_edges, - int64_t **return_tuples, - size_t *return_count, - char ** log_msg, - char ** notice_msg, - char ** err_msg); +void pgr_do_articulationPoints( + char*, + int64_t**, size_t*, + + char**, char**, char**); #ifdef __cplusplus diff --git a/include/drivers/components/biconnectedComponents_driver.h b/include/drivers/components/biconnectedComponents_driver.h index d4d642d9eb..cac3ab1ff7 100644 --- a/include/drivers/components/biconnectedComponents_driver.h +++ b/include/drivers/components/biconnectedComponents_driver.h @@ -47,23 +47,11 @@ typedef struct II_t_rt II_t_rt; extern "C" { #endif - /********************************************************* - TEXT, - BIGINT, - BIGINT, - ********************************************************/ - - - void - do_pgr_biconnectedComponents( - Edge_t *data_edges, - size_t total_edges, - II_t_rt **return_tuples, - size_t *return_count, - char ** log_msg, - char ** notice_msg, - char ** err_msg); +void pgr_do_biconnectedComponents( + char*, + II_t_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/include/drivers/components/bridges_driver.h b/include/drivers/components/bridges_driver.h index a279ac3ed3..df661aa597 100644 --- a/include/drivers/components/bridges_driver.h +++ b/include/drivers/components/bridges_driver.h @@ -31,15 +31,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_COMPONENTS_BRIDGES_DRIVER_H_ #pragma once -/* for size-t */ #ifdef __cplusplus # include # include -using Edge_t = struct Edge_t; #else # include # include -typedef struct Edge_t Edge_t; #endif @@ -48,23 +45,11 @@ typedef struct Edge_t Edge_t; extern "C" { #endif - /********************************************************* - TEXT, - BIGINT, - BIGINT, - ********************************************************/ - - - void - do_pgr_bridges( - Edge_t *data_edges, - size_t total_edges, - int64_t **return_tuples, - size_t *return_count, - char ** log_msg, - char ** notice_msg, - char ** err_msg); +void pgr_do_bridges( + char*, + int64_t**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/include/drivers/components/connectedComponents_driver.h b/include/drivers/components/connectedComponents_driver.h index 75fbeb9397..8c64127971 100644 --- a/include/drivers/components/connectedComponents_driver.h +++ b/include/drivers/components/connectedComponents_driver.h @@ -31,14 +31,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_COMPONENTS_CONNECTEDCOMPONENTS_DRIVER_H_ #pragma once -/* for size-t */ #ifdef __cplusplus # include -using Edge_t = struct Edge_t; using II_t_rt = struct II_t_rt; #else # include -typedef struct Edge_t Edge_t; typedef struct II_t_rt II_t_rt; #endif @@ -47,23 +44,11 @@ typedef struct II_t_rt II_t_rt; extern "C" { #endif - /********************************************************* - TEXT, - BIGINT, - BIGINT, - ********************************************************/ - - - void - do_pgr_connectedComponents( - Edge_t *data_edges, - size_t total_edges, - II_t_rt **return_tuples, - size_t *return_count, - char ** log_msg, - char ** notice_msg, - char ** err_msg); +void pgr_do_connectedComponents( + char*, + II_t_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/include/drivers/components/makeConnected_driver.h b/include/drivers/components/makeConnected_driver.h index baafdab98b..d2daa9af56 100644 --- a/include/drivers/components/makeConnected_driver.h +++ b/include/drivers/components/makeConnected_driver.h @@ -31,14 +31,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_COMPONENTS_MAKECONNECTED_DRIVER_H_ #pragma once -/* for size-t */ #ifdef __cplusplus # include -using Edge_t = struct Edge_t; using II_t_rt = struct II_t_rt; #else # include -typedef struct Edge_t Edge_t; typedef struct II_t_rt II_t_rt; #endif @@ -47,20 +44,11 @@ typedef struct II_t_rt II_t_rt; extern "C" { #endif - /********************************************************* - TEXT - ********************************************************/ - - - void do_pgr_makeConnected( - Edge_t *data_edges, - size_t total_tuples, - II_t_rt **return_tuples, - size_t *return_count, - char ** log_msg, - char ** notice_msg, - char ** err_msg); +void pgr_do_makeConnected( + char*, + II_t_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/include/drivers/components/strongComponents_driver.h b/include/drivers/components/strongComponents_driver.h index 7bb3c2a817..614851b240 100644 --- a/include/drivers/components/strongComponents_driver.h +++ b/include/drivers/components/strongComponents_driver.h @@ -31,14 +31,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_COMPONENTS_STRONGCOMPONENTS_DRIVER_H_ #pragma once -/* for size-t */ #ifdef __cplusplus # include -using Edge_t = struct Edge_t; using II_t_rt = struct II_t_rt; #else # include -typedef struct Edge_t Edge_t; typedef struct II_t_rt II_t_rt; #endif @@ -47,23 +44,11 @@ typedef struct II_t_rt II_t_rt; extern "C" { #endif - /********************************************************* - TEXT, - BIGINT, - BIGINT, - ********************************************************/ - - - void - do_pgr_strongComponents( - Edge_t *data_edges, - size_t total_edges, - II_t_rt **return_tuples, - size_t *return_count, - char ** log_msg, - char ** notice_msg, - char ** err_msg); +void pgr_do_strongComponents( + char*, + II_t_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/src/components/articulationPoints.c b/src/components/articulationPoints.c index e9198dc1f5..78e671c6b8 100644 --- a/src/components/articulationPoints.c +++ b/src/components/articulationPoints.c @@ -37,7 +37,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "drivers/components/articulationPoints_driver.h" @@ -59,36 +58,23 @@ process( (*result_tuples) = NULL; (*result_count) = 0; - Edge_t *edges = NULL; - size_t total_edges = 0; - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - - if (total_edges == 0) { - pgr_SPI_finish(); - return; - } - clock_t start_t = clock(); - do_pgr_articulationPoints( - edges, - total_edges, + pgr_do_articulationPoints( + edges_sql, result_tuples, result_count, &log_msg, ¬ice_msg, &err_msg); - time_msg(" processing pgr_articulationPoints", start_t, clock()); if (err_msg) { if (*result_tuples) pfree(*result_tuples); + (*result_count) = 0; } pgr_global_report(log_msg, notice_msg, err_msg); - if (edges) pfree(edges); if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); diff --git a/src/components/articulationPoints_driver.cpp b/src/components/articulationPoints_driver.cpp index 6cb983bcb7..c10328d856 100644 --- a/src/components/articulationPoints_driver.cpp +++ b/src/components/articulationPoints_driver.cpp @@ -35,15 +35,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "components/pgr_components.hpp" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" #include "cpp_common/pgr_base_graph.hpp" void -do_pgr_articulationPoints( - Edge_t *data_edges, - size_t total_edges, +pgr_do_articulationPoints( + char *edges_sql, + int64_t **return_tuples, size_t *return_count, char ** log_msg, @@ -52,23 +53,33 @@ do_pgr_articulationPoints( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::pgget::get_edges; std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; + try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - pgassert(total_edges != 0); + + hint = edges_sql; + auto edges = get_edges(std::string(edges_sql), true, false); + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; graphType gType = UNDIRECTED; - log << "Working with Undirected Graph\n"; pgrouting::UndirectedGraph undigraph(gType); - undigraph.insert_edges(data_edges, total_edges); + undigraph.insert_edges(edges); auto results(pgrouting::algorithms::articulationPoints(undigraph)); auto count = results.size(); @@ -76,8 +87,7 @@ do_pgr_articulationPoints( if (count == 0) { (*return_tuples) = NULL; (*return_count) = 0; - notice << - "No paths found between start_vid and end_vid vertices"; + notice << "No paths found between start_vid and end_vid vertices"; return; } @@ -103,6 +113,9 @@ do_pgr_articulationPoints( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; diff --git a/src/components/biconnectedComponents.c b/src/components/biconnectedComponents.c index 09910cffbd..b4ae000d96 100644 --- a/src/components/biconnectedComponents.c +++ b/src/components/biconnectedComponents.c @@ -38,7 +38,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "drivers/components/biconnectedComponents_driver.h" @@ -60,21 +59,9 @@ process( (*result_tuples) = NULL; (*result_count) = 0; - Edge_t *edges = NULL; - size_t total_edges = 0; - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - - if (total_edges == 0) { - pgr_SPI_finish(); - return; - } - clock_t start_t = clock(); - do_pgr_biconnectedComponents( - edges, - total_edges, + pgr_do_biconnectedComponents( + edges_sql, result_tuples, result_count, @@ -86,10 +73,10 @@ process( if (err_msg) { if (*result_tuples) pfree(*result_tuples); + (*result_count) = 0; } pgr_global_report(log_msg, notice_msg, err_msg); - if (edges) pfree(edges); if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); diff --git a/src/components/biconnectedComponents_driver.cpp b/src/components/biconnectedComponents_driver.cpp index 6b07adb6fc..469b08b699 100644 --- a/src/components/biconnectedComponents_driver.cpp +++ b/src/components/biconnectedComponents_driver.cpp @@ -35,6 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "components/pgr_components.hpp" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" @@ -42,9 +43,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. void -do_pgr_biconnectedComponents( - Edge_t *data_edges, - size_t total_edges, +pgr_do_biconnectedComponents( + char *edges_sql, + II_t_rt **return_tuples, size_t *return_count, char ** log_msg, @@ -53,23 +54,34 @@ do_pgr_biconnectedComponents( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::pgget::get_edges; std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; + try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - pgassert(total_edges != 0); + + hint = edges_sql; + auto edges = get_edges(std::string(edges_sql), true, false); + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; graphType gType = UNDIRECTED; log << "Working with Undirected Graph\n"; pgrouting::UndirectedGraph undigraph(gType); - undigraph.insert_edges(data_edges, total_edges); + undigraph.insert_edges(edges); auto results(pgrouting::algorithms::biconnectedComponents(undigraph)); auto count = results.size(); @@ -101,6 +113,9 @@ do_pgr_biconnectedComponents( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; diff --git a/src/components/bridges.c b/src/components/bridges.c index 105cf764f8..8e4f8702aa 100644 --- a/src/components/bridges.c +++ b/src/components/bridges.c @@ -37,7 +37,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "drivers/components/bridges_driver.h" @@ -59,36 +58,23 @@ process( (*result_tuples) = NULL; (*result_count) = 0; - Edge_t *edges = NULL; - size_t total_edges = 0; - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - - if (total_edges == 0) { - pgr_SPI_finish(); - return; - } - clock_t start_t = clock(); - do_pgr_bridges( - edges, - total_edges, + pgr_do_bridges( + edges_sql, result_tuples, result_count, &log_msg, ¬ice_msg, &err_msg); - time_msg(" processing pgr_bridges", start_t, clock()); if (err_msg) { if (*result_tuples) pfree(*result_tuples); + (*result_count) = 0; } pgr_global_report(log_msg, notice_msg, err_msg); - if (edges) pfree(edges); if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); diff --git a/src/components/bridges_driver.cpp b/src/components/bridges_driver.cpp index 382dcf545c..05ec349e3a 100644 --- a/src/components/bridges_driver.cpp +++ b/src/components/bridges_driver.cpp @@ -35,15 +35,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "components/pgr_components.hpp" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" #include "cpp_common/pgr_base_graph.hpp" void -do_pgr_bridges( - Edge_t *data_edges, - size_t total_edges, +pgr_do_bridges( + char *edges_sql, int64_t **return_tuples, size_t *return_count, char ** log_msg, @@ -52,24 +52,34 @@ do_pgr_bridges( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::pgget::get_edges; std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; + try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - pgassert(total_edges != 0); + + hint = edges_sql; + auto edges = get_edges(std::string(edges_sql), true, false); + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; graphType gType = UNDIRECTED; - log << "Working with Undirected Graph\n"; pgrouting::UndirectedGraph undigraph(gType); - undigraph.insert_edges(data_edges, total_edges); + undigraph.insert_edges(edges); auto results = pgrouting::algorithms::bridges(undigraph); auto count = results.size(); @@ -77,8 +87,7 @@ do_pgr_bridges( if (count == 0) { (*return_tuples) = NULL; (*return_count) = 0; - notice << - "No paths found between start_vid and end_vid vertices"; + notice << "No paths found between start_vid and end_vid vertices"; return; } @@ -103,6 +112,9 @@ do_pgr_bridges( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; diff --git a/src/components/connectedComponents.c b/src/components/connectedComponents.c index 2f8773a8f9..545dd9b9aa 100644 --- a/src/components/connectedComponents.c +++ b/src/components/connectedComponents.c @@ -38,7 +38,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "drivers/components/connectedComponents_driver.h" @@ -60,21 +59,9 @@ process( (*result_tuples) = NULL; (*result_count) = 0; - Edge_t *edges = NULL; - size_t total_edges = 0; - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - - if (total_edges == 0) { - pgr_SPI_finish(); - return; - } - clock_t start_t = clock(); - do_pgr_connectedComponents( - edges, - total_edges, + pgr_do_connectedComponents( + edges_sql, result_tuples, result_count, @@ -86,10 +73,10 @@ process( if (err_msg) { if (*result_tuples) pfree(*result_tuples); + (*result_count) = 0; } pgr_global_report(log_msg, notice_msg, err_msg); - if (edges) pfree(edges); if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); diff --git a/src/components/connectedComponents_driver.cpp b/src/components/connectedComponents_driver.cpp index f8d7014a20..c9206afb8e 100644 --- a/src/components/connectedComponents_driver.cpp +++ b/src/components/connectedComponents_driver.cpp @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include - +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" #include "cpp_common/pgr_base_graph.hpp" @@ -41,12 +41,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "components/pgr_components.hpp" - - void -do_pgr_connectedComponents( - Edge_t *data_edges, - size_t total_edges, +pgr_do_connectedComponents( + char *edges_sql, + II_t_rt **return_tuples, size_t *return_count, char ** log_msg, @@ -55,23 +53,33 @@ do_pgr_connectedComponents( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::pgget::get_edges; std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; + try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - pgassert(total_edges != 0); + + hint = edges_sql; + auto edges = get_edges(std::string(edges_sql), true, false); + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; graphType gType = UNDIRECTED; - log << "Working with Undirected Graph\n"; pgrouting::UndirectedGraph undigraph(gType); - undigraph.insert_edges(data_edges, total_edges); + undigraph.insert_edges(edges); auto results(pgrouting::algorithms::pgr_connectedComponents(undigraph)); auto count = results.size(); @@ -79,8 +87,7 @@ do_pgr_connectedComponents( if (count == 0) { (*return_tuples) = NULL; (*return_count) = 0; - notice << - "No paths found between start_vid and end_vid vertices"; + notice << "No paths found between start_vid and end_vid vertices"; return; } @@ -103,6 +110,9 @@ do_pgr_connectedComponents( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; diff --git a/src/components/makeConnected.c b/src/components/makeConnected.c index d86dde1e9e..def4ef0b3f 100644 --- a/src/components/makeConnected.c +++ b/src/components/makeConnected.c @@ -36,7 +36,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "drivers/components/makeConnected_driver.h" PGDLLEXPORT Datum _pgr_makeconnected(PG_FUNCTION_ARGS); @@ -53,30 +52,12 @@ process( char* notice_msg = NULL; char* err_msg = NULL; - PGR_DBG("Initializing arrays"); - - (*result_tuples) = NULL; (*result_count) = 0; - PGR_DBG("Load data"); - Edge_t *edges = NULL; - size_t total_edges = 0; - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - PGR_DBG("Total %ld edges in query:", total_edges); - - if (total_edges == 0) { - pgr_SPI_finish(); - return; - } - - PGR_DBG("Starting processing"); clock_t start_t = clock(); - do_pgr_makeConnected( - edges, - total_edges, + pgr_do_makeConnected( + edges_sql, result_tuples, result_count, @@ -85,23 +66,17 @@ process( ¬ice_msg, &err_msg); time_msg(" processing pgr_makeConnected", start_t, clock()); - PGR_DBG("Returning %ld tuples", *result_count); if (err_msg) { - if (*result_tuples) - pfree(*result_tuples); + if (*result_tuples) pfree(*result_tuples); + (*result_count) = 0; } pgr_global_report(log_msg, notice_msg, err_msg); - if (edges) - pfree(edges); - if (log_msg) - pfree(log_msg); - if (notice_msg) - pfree(notice_msg); - if (err_msg) - pfree(err_msg); + if (log_msg) pfree(log_msg); + if (notice_msg) pfree(notice_msg); + if (err_msg) pfree(err_msg); pgr_SPI_finish(); } @@ -110,31 +85,20 @@ PGDLLEXPORT Datum _pgr_makeconnected(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; - /**************************************************************************/ II_t_rt *result_tuples = NULL; size_t result_count = 0; - /**************************************************************************/ if (SRF_IS_FIRSTCALL()) { MemoryContext oldcontext; funcctx = SRF_FIRSTCALL_INIT(); oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - /**********************************************************************/ - /* - pgr_makeConnected( - edge_sql TEXT) - */ - /**********************************************************************/ - PGR_DBG("Calling process"); process( text_to_cstring(PG_GETARG_TEXT_P(0)), &result_tuples, &result_count); - /**********************************************************************/ - funcctx->max_calls = result_count; funcctx->user_fctx = result_tuples; @@ -159,12 +123,6 @@ PGDLLEXPORT Datum _pgr_makeconnected(PG_FUNCTION_ARGS) { Datum *values; bool *nulls; - /**********************************************************************/ - /* - OUT start_vid BIGINT, - OUT end_vid BIGINT - */ - /**********************************************************************/ size_t numb = 3; values = palloc(numb * sizeof(Datum)); nulls = palloc(numb * sizeof(bool)); @@ -178,18 +136,10 @@ PGDLLEXPORT Datum _pgr_makeconnected(PG_FUNCTION_ARGS) { values[1] = Int64GetDatum(result_tuples[funcctx->call_cntr].d1.start_vid); values[2] = Int64GetDatum(result_tuples[funcctx->call_cntr].d2.end_vid); - /**********************************************************************/ - tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); } else { - /**********************************************************************/ - - PGR_DBG("Clean up code"); - - /**********************************************************************/ - SRF_RETURN_DONE(funcctx); } } diff --git a/src/components/makeConnected_driver.cpp b/src/components/makeConnected_driver.cpp index 11057e9360..be9301899a 100644 --- a/src/components/makeConnected_driver.cpp +++ b/src/components/makeConnected_driver.cpp @@ -33,6 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" @@ -40,9 +41,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgr_base_graph.hpp" void -do_pgr_makeConnected( - Edge_t *data_edges, - size_t total_edges, +pgr_do_makeConnected( + char *edges_sql, + II_t_rt **return_tuples, size_t *return_count, @@ -52,26 +53,35 @@ do_pgr_makeConnected( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::pgget::get_edges; std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; + try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - pgassert(total_edges != 0); std::vector results; std::string logstr; + hint = edges_sql; + auto edges = get_edges(std::string(edges_sql), true, false); + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; graphType gType = UNDIRECTED; - log << "Working with Undirected Graph\n"; pgrouting::UndirectedGraph undigraph(gType); - undigraph.insert_edges(data_edges, total_edges); + undigraph.insert_edges(edges); pgrouting::functions::Pgr_makeConnected fn_makeConnected; results = fn_makeConnected.makeConnected(undigraph); logstr += fn_makeConnected.get_log(); @@ -108,6 +118,9 @@ do_pgr_makeConnected( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; diff --git a/src/components/strongComponents.c b/src/components/strongComponents.c index f78289a192..7731d818dc 100644 --- a/src/components/strongComponents.c +++ b/src/components/strongComponents.c @@ -38,7 +38,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "drivers/components/strongComponents_driver.h" @@ -60,21 +59,9 @@ process( (*result_tuples) = NULL; (*result_count) = 0; - Edge_t *edges = NULL; - size_t total_edges = 0; - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - - if (total_edges == 0) { - pgr_SPI_finish(); - return; - } - clock_t start_t = clock(); - do_pgr_strongComponents( - edges, - total_edges, + pgr_do_strongComponents( + edges_sql, result_tuples, result_count, @@ -86,10 +73,10 @@ process( if (err_msg) { if (*result_tuples) pfree(*result_tuples); + (*result_count) = 0; } pgr_global_report(log_msg, notice_msg, err_msg); - if (edges) pfree(edges); if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); diff --git a/src/components/strongComponents_driver.cpp b/src/components/strongComponents_driver.cpp index 9d055df1bb..2fa62c4013 100644 --- a/src/components/strongComponents_driver.cpp +++ b/src/components/strongComponents_driver.cpp @@ -34,6 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" #include "cpp_common/pgr_base_graph.hpp" @@ -42,9 +43,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. void -do_pgr_strongComponents( - Edge_t *data_edges, - size_t total_edges, +pgr_do_strongComponents( + char *edges_sql, + II_t_rt **return_tuples, size_t *return_count, char ** log_msg, @@ -53,22 +54,35 @@ do_pgr_strongComponents( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::pgget::get_edges; std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; + try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - pgassert(total_edges != 0); graphType gType = DIRECTED; + hint = edges_sql; + auto edges = get_edges(std::string(edges_sql), true, false); + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; + + + pgrouting::DirectedGraph digraph(gType); - digraph.insert_edges(data_edges, total_edges); + digraph.insert_edges(edges); auto results(pgrouting::algorithms::strongComponents(digraph)); auto count = results.size(); @@ -76,8 +90,7 @@ do_pgr_strongComponents( if (count == 0) { (*return_tuples) = NULL; (*return_count) = 0; - notice << - "No components found"; + notice << "No components found"; return; } @@ -100,6 +113,9 @@ do_pgr_strongComponents( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; From eacc5fe2af64040d3de89b66f7ff5ee1d40bf425 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 24 Jan 2024 10:52:41 -0600 Subject: [PATCH 079/428] [contraction] Reading data on C++ code --- .../contraction/contractGraph_driver.h | 45 +++++++--------- src/contraction/contractGraph.c | 52 ++----------------- src/contraction/contractGraph_driver.cpp | 51 +++++++++--------- 3 files changed, 49 insertions(+), 99 deletions(-) diff --git a/include/drivers/contraction/contractGraph_driver.h b/include/drivers/contraction/contractGraph_driver.h index 15dff91562..28719d6ef3 100644 --- a/include/drivers/contraction/contractGraph_driver.h +++ b/include/drivers/contraction/contractGraph_driver.h @@ -30,17 +30,27 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_CONTRACTION_CONTRACTGRAPH_DRIVER_H_ #pragma once -/* for size-t */ +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#include "cpp_common/undefPostgresDefine.hpp" + #ifdef __cplusplus # include # include using contracted_rt = struct contracted_rt; -using Edge_t = struct Edge_t; #else # include # include typedef struct contracted_rt contracted_rt; -typedef struct Edge_t Edge_t; #endif @@ -48,29 +58,14 @@ typedef struct Edge_t Edge_t; extern "C" { #endif - /********************************************************* - edges_sql TEXT, - contraction_order BIGINT[], - forbidden_vertices BIGINT[] DEFAULT ARRAY[]::BIGINT[], - max_cycles integer DEFAULT 1, - directed BOOLEAN DEFAULT true - ********************************************************/ - void - do_pgr_contractGraph( - Edge_t *data_edges, - size_t total_tuples, - int64_t *forbidden_vertices, - size_t size_forbidden_vertices, - int64_t *contraction_order, - size_t size_contraction_order, - int64_t max_cycles, - bool directed, - contracted_rt **return_tuples, - size_t *return_count, - char **log_msg, - char **notice_msg, - char **err_msg); +void pgr_do_contractGraph( + char*, + ArrayType*, ArrayType*, + + int64_t, bool, + contracted_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/src/contraction/contractGraph.c b/src/contraction/contractGraph.c index 8c45e537f4..551645c89b 100644 --- a/src/contraction/contractGraph.c +++ b/src/contraction/contractGraph.c @@ -41,7 +41,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" #include "c_types/contracted_rt.h" -#include "c_common/trsp_pgget.h" #include "drivers/contraction/contractGraph_driver.h" PGDLLEXPORT Datum _pgr_contraction(PG_FUNCTION_ARGS); @@ -68,41 +67,17 @@ process(char* edges_sql, char* notice_msg = NULL; char* err_msg = NULL; - size_t size_forbidden_vertices = 0; - int64_t* forbidden_vertices = pgr_get_bigIntArray(&size_forbidden_vertices, forbidden, true, &err_msg); - throw_error(err_msg, "While getting forbidden_vertices"); - PGR_DBG("size_forbidden_vertices %ld", size_forbidden_vertices); - - size_t size_contraction_order = 0; - int64_t* contraction_order = pgr_get_bigIntArray(&size_contraction_order, order, false, &err_msg); - throw_error(err_msg, "While getting contraction order"); - PGR_DBG("size_contraction_order %ld ", size_contraction_order); - - - size_t total_edges = 0; - Edge_t* edges = NULL; - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - if (total_edges == 0) { - if (forbidden_vertices) pfree(forbidden_vertices); - if (contraction_order) pfree(contraction_order); - pgr_SPI_finish(); - return; - } - - PGR_DBG("Starting timer"); clock_t start_t = clock(); - do_pgr_contractGraph( - edges, total_edges, - forbidden_vertices, size_forbidden_vertices, - contraction_order, size_contraction_order, + pgr_do_contractGraph( + edges_sql, + forbidden, + order, num_cycles, directed, result_tuples, result_count, &log_msg, ¬ice_msg, &err_msg); - time_msg("processing pgr_contraction()", start_t, clock()); @@ -111,15 +86,11 @@ process(char* edges_sql, (*result_tuples) = NULL; (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - if (edges) pfree(edges); - if (forbidden_vertices) pfree(forbidden_vertices); - if (contraction_order) pfree(contraction_order); pgr_SPI_finish(); } @@ -128,24 +99,13 @@ _pgr_contraction(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; - /**********************************************************************/ contracted_rt *result_tuples = NULL; size_t result_count = 0; - /**********************************************************************/ if (SRF_IS_FIRSTCALL()) { MemoryContext oldcontext; funcctx = SRF_FIRSTCALL_INIT(); oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - /**********************************************************************/ - /* - edges_sql TEXT, - contraction_order BIGINT[], - max_cycles integer DEFAULT 1, - forbidden_vertices BIGINT[] DEFAULT ARRAY[]::BIGINT[], - directed BOOLEAN DEFAULT true, - - **********************************************************************/ process( text_to_cstring(PG_GETARG_TEXT_P(0)), @@ -156,8 +116,6 @@ _pgr_contraction(PG_FUNCTION_ARGS) { &result_tuples, &result_count); - - /**********************************************************************/ funcctx->max_calls = result_count; funcctx->user_fctx = result_tuples; @@ -183,7 +141,6 @@ _pgr_contraction(PG_FUNCTION_ARGS) { int16 typlen; size_t call_cntr = funcctx->call_cntr; - /**********************************************************************/ size_t numb = 6; values =(Datum *)palloc(numb * sizeof(Datum)); nulls = palloc(numb * sizeof(bool)); @@ -243,7 +200,6 @@ _pgr_contraction(PG_FUNCTION_ARGS) { values[4] = Int64GetDatum(result_tuples[call_cntr].target); values[5] = Float8GetDatum(result_tuples[call_cntr].cost); - /*********************************************************************/ tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); diff --git a/src/contraction/contractGraph_driver.cpp b/src/contraction/contractGraph_driver.cpp index 392845351e..6488f0dc33 100644 --- a/src/contraction/contractGraph_driver.cpp +++ b/src/contraction/contractGraph_driver.cpp @@ -35,6 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include +#include "cpp_common/pgdata_getters.hpp" #include "contraction/ch_graphs.hpp" #include "contraction/pgr_contract.hpp" @@ -168,21 +169,13 @@ void get_postgres_result( -/************************************************************ - edges_sql TEXT, - contraction_order BIGINT[], - forbidden_vertices BIGINT[] DEFAULT ARRAY[]::BIGINT[], - max_cycles integer DEFAULT 1, - directed BOOLEAN DEFAULT true - ***********************************************************/ void -do_pgr_contractGraph( - Edge_t *data_edges, - size_t total_edges, - int64_t *forbidden_vertices, - size_t size_forbidden_vertices, - int64_t *contraction_order, - size_t size_contraction_order, +pgr_do_contractGraph( + char *edges_sql, + + ArrayType* forbidden, + ArrayType* order, + int64_t max_cycles, bool directed, contracted_rt **return_tuples, @@ -193,13 +186,15 @@ do_pgr_contractGraph( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::pgget::get_intArray; + using pgrouting::pgget::get_edges; std::ostringstream log; std::ostringstream notice; std::ostringstream err; + char *hint = nullptr; + try { - pgassert(total_edges != 0); - pgassert(size_contraction_order != 0); pgassert(max_cycles != 0); pgassert(!(*log_msg)); pgassert(!(*notice_msg)); @@ -207,16 +202,17 @@ do_pgr_contractGraph( pgassert(!(*return_tuples)); pgassert(*return_count == 0); - /* - * Converting to C++ structures - */ - std::vector edges(data_edges, data_edges + total_edges); - std::vector forbid( - forbidden_vertices, - forbidden_vertices + size_forbidden_vertices); - std::vector ordering( - contraction_order, - contraction_order + size_contraction_order); + hint = edges_sql; + auto edges = get_edges(std::string(edges_sql), true, false); + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; + + auto forbid = get_intArray(forbidden, true); + auto ordering = get_intArray(order, false); for (const auto kind : ordering) { if (!pgrouting::contraction::is_valid_contraction(static_cast(kind))) { @@ -265,6 +261,9 @@ do_pgr_contractGraph( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; From 7fe0e2b8baff57298852edbbdc34928a146a6158 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 24 Jan 2024 11:08:19 -0600 Subject: [PATCH 080/428] [dagShortestPath] Reading data on C++ code --- .../dagShortestPath/pgr_dagShortestPath.hpp | 78 +++++------- .../dagShortestPath/dagShortestPath_driver.h | 43 ++++--- src/dagShortestPath/dagShortestPath.c | 72 +---------- .../dagShortestPath_driver.cpp | 117 ++++++++---------- 4 files changed, 107 insertions(+), 203 deletions(-) diff --git a/include/dagShortestPath/pgr_dagShortestPath.hpp b/include/dagShortestPath/pgr_dagShortestPath.hpp index 7df9b0d24f..f26cf56838 100644 --- a/include/dagShortestPath/pgr_dagShortestPath.hpp +++ b/include/dagShortestPath/pgr_dagShortestPath.hpp @@ -50,13 +50,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. namespace pgrouting { -template < class G > +template class Pgr_dag { public: typedef typename G::V V; typedef typename G::E E; - +#if 0 //! Dijkstra 1 to 1 Path dag( G &graph, @@ -91,15 +91,20 @@ class Pgr_dag { predecessors, distances, only_cost, true); } +#endif - - //! Dijkstra 1 to many + /** dag 1 to many */ std::deque dag( G &graph, int64_t start_vertex, - const std::vector< int64_t > &end_vertex, + const std::set &end_vertex, bool only_cost) { - // adjust predecessors and distances vectors + std::deque paths; + + /* precondition */ + if (!graph.has_vertex(start_vertex)) return paths; + + /* adjust predecessors and distances vectors */ clear(); size_t n_goals = (std::numeric_limits::max)(); predecessors.resize(graph.num_vertices()); @@ -108,24 +113,15 @@ class Pgr_dag { std::numeric_limits::infinity()); - // get the graphs source and target - if (!graph.has_vertex(start_vertex)) - return std::deque(); auto v_source(graph.get_V(start_vertex)); - std::set< V > s_v_targets; + std::set v_targets; for (const auto &vertex : end_vertex) { - if (graph.has_vertex(vertex)) { - s_v_targets.insert(graph.get_V(vertex)); - } + if (graph.has_vertex(vertex)) v_targets.insert(graph.get_V(vertex)); } + if (v_targets.empty()) return paths; - std::vector< V > v_targets(s_v_targets.begin(), s_v_targets.end()); - // perform the algorithm dag_1_to_many(graph, v_source, v_targets, n_goals); - - std::deque< Path > paths; - // get the results // route id are the targets paths = get_paths(graph, v_source, v_targets, only_cost); std::stable_sort(paths.begin(), paths.end(), @@ -136,6 +132,7 @@ class Pgr_dag { return paths; } +#if 0 // preparation for many to 1 std::deque dag( G &graph, @@ -156,7 +153,6 @@ class Pgr_dag { return paths; } - // preparation for many to many std::deque dag( G &graph, @@ -184,32 +180,17 @@ class Pgr_dag { }); return paths; } +#endif - // preparation for parallel arrays + /** combinations */ std::deque dag( G &graph, - const std::vector &combinations, + const std::map> &combinations, bool only_cost) { std::deque paths; - // group targets per distinct source - std::map< int64_t, std::vector > vertex_map; - for (const II_t_rt &comb : combinations) { - std::map< int64_t, std::vector >::iterator it = vertex_map.find(comb.d1.source); - if (it != vertex_map.end()) { - it->second.push_back(comb.d2.target); - } else { - std::vector targets{comb.d2.target}; - vertex_map[comb.d1.source] = targets; - } - } - - for (const auto &start_ends : vertex_map) { - auto result_paths = dag( - graph, - start_ends.first, - start_ends.second, - only_cost); + for (const auto &c : combinations) { + auto result_paths = dag(graph, c.first, c.second, only_cost); paths.insert( paths.end(), std::make_move_iterator(result_paths.begin()), @@ -222,6 +203,7 @@ class Pgr_dag { //@} private: +#if 0 //! Call to Dijkstra 1 source to 1 target bool dag_1_to_1( G &graph, @@ -248,14 +230,14 @@ class Pgr_dag { } return true; } +#endif - //! Dijkstra 1 source to many targets + /** DAG 1 source to many targets */ bool dag_1_to_many( G &graph, V source, - const std::vector< V > &targets, + const std::set &targets, size_t n_goals = (std::numeric_limits::max)()) { - /* abort in case of an interruption occurs (e.g. the query is being cancelled) */ CHECK_FOR_INTERRUPTS(); try { boost::dag_shortest_paths(graph.graph, source, @@ -292,7 +274,7 @@ class Pgr_dag { std::deque get_paths( const G &graph, V source, - std::vector< V > &targets, + std::set &targets, bool only_cost) const { std::deque paths; for (const auto target : targets) { @@ -317,6 +299,7 @@ class Pgr_dag { //@} +#if 0 //! @name Stopping classes //@{ //! class for stopping when 1 target is found @@ -331,15 +314,16 @@ class Pgr_dag { private: V m_goal; }; +#endif //! class for stopping when all targets are found class dijkstra_many_goal_visitor : public boost::default_dijkstra_visitor { public: explicit dijkstra_many_goal_visitor( - const std::vector< V > &goals, + const std::set &goals, size_t n_goals) : - m_goals(goals.begin(), goals.end()), - m_n_goals(n_goals) {} + m_goals(goals), + m_n_goals(n_goals) {} template void examine_vertex(V u, B_G &) { auto s_it = m_goals.find(u); @@ -357,7 +341,7 @@ class Pgr_dag { } private: - std::set< V > m_goals; + std::set m_goals; size_t m_n_goals; }; }; diff --git a/include/drivers/dagShortestPath/dagShortestPath_driver.h b/include/drivers/dagShortestPath/dagShortestPath_driver.h index 701609ca16..955cf5844e 100644 --- a/include/drivers/dagShortestPath/dagShortestPath_driver.h +++ b/include/drivers/dagShortestPath/dagShortestPath_driver.h @@ -31,19 +31,28 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_DAGSHORTESTPATH_DAGSHORTESTPATH_DRIVER_H_ #pragma once -/* for size-t */ + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#include "cpp_common/undefPostgresDefine.hpp" + #ifdef __cplusplus # include # include -using Edge_t = struct Edge_t; using Path_rt = struct Path_rt; -using II_t_rt = struct II_t_rt; #else # include # include -typedef struct Edge_t Edge_t; typedef struct Path_rt Path_rt; -typedef struct II_t_rt II_t_rt; #endif #ifdef __cplusplus @@ -51,23 +60,13 @@ extern "C" { #endif - void - do_pgr_dagShortestPath( - Edge_t *data_edges, - size_t total_tuples, - II_t_rt *combinations, - size_t total_combinations, - int64_t *start_vidsArr, - size_t size_start_vidsArr, - int64_t *end_vidsArr, - size_t size_end_vidsArr, - bool directed, - bool only_cost, - Path_rt **return_tuples, - size_t *return_count, - char ** log_msg, - char ** notice_msg, - char ** err_msg); +void pgr_do_dagShortestPath( + char*, + char*, + ArrayType*, ArrayType*, + bool, bool, + Path_rt **, size_t*, + char**, char**, char**); #ifdef __cplusplus diff --git a/src/dagShortestPath/dagShortestPath.c b/src/dagShortestPath/dagShortestPath.c index 8ec7e23b5b..937ffc15e4 100644 --- a/src/dagShortestPath/dagShortestPath.c +++ b/src/dagShortestPath/dagShortestPath.c @@ -35,8 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" -#include "drivers/dagShortestPath/dagShortestPath_driver.h" // the link to the C++ code of the function +#include "drivers/dagShortestPath/dagShortestPath_driver.h" PGDLLEXPORT Datum _pgr_dagshortestpath(PG_FUNCTION_ARGS); PG_FUNCTION_INFO_V1(_pgr_dagshortestpath); @@ -53,69 +52,18 @@ process( bool only_cost, Path_rt **result_tuples, size_t *result_count) { - /* - * https://www.postgresql.org/docs/current/static/spi-spi-connect.html - */ pgr_SPI_connect(); char* log_msg = NULL; char* notice_msg = NULL; char* err_msg = NULL; - - - - - PGR_DBG("Initializing arrays"); - size_t size_start_vidsArr = 0; - int64_t* start_vidsArr = NULL; - - size_t size_end_vidsArr = 0; - int64_t* end_vidsArr = NULL; - - size_t total_combinations = 0; - II_t_rt *combinations = NULL; - - if (starts && ends) { - start_vidsArr = pgr_get_bigIntArray(&size_start_vidsArr, starts, false, &err_msg); - throw_error(err_msg, "While getting start vids"); - end_vidsArr = pgr_get_bigIntArray(&size_end_vidsArr, ends, false, &err_msg); - throw_error(err_msg, "While getting end vids"); - } else if (combinations_sql) { - pgr_get_combinations(combinations_sql, &combinations, &total_combinations, &err_msg); - throw_error(err_msg, combinations_sql); - if (total_combinations == 0) { - if (combinations) - pfree(combinations); - pgr_SPI_finish(); - return; - } - } - (*result_tuples) = NULL; (*result_count) = 0; - PGR_DBG("Load data"); - Edge_t *edges = NULL; - size_t total_edges = 0; - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - PGR_DBG("Total %ld edges in query:", total_edges); - - if (total_edges == 0) { - PGR_DBG("No edges found"); - pgr_SPI_finish(); - return; - } - - PGR_DBG("Starting processing"); clock_t start_t = clock(); - do_pgr_dagShortestPath( - edges, - total_edges, - combinations, - total_combinations, - start_vidsArr, size_start_vidsArr, - end_vidsArr, size_end_vidsArr, + pgr_do_dagShortestPath( + edges_sql, + combinations_sql, + starts, ends, directed, only_cost, @@ -124,28 +72,19 @@ process( &log_msg, ¬ice_msg, &err_msg); - time_msg(" processing pgr_dagShortestPath", start_t, clock()); - PGR_DBG("Returning %ld tuples", *result_count); if (err_msg) { if (*result_tuples) pfree(*result_tuples); } pgr_global_report(log_msg, notice_msg, err_msg); - if (edges) pfree(edges); if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - - if (end_vidsArr) pfree(end_vidsArr); - if (start_vidsArr) pfree(start_vidsArr); - pgr_SPI_finish(); } -/* */ -/******************************************************************************/ PGDLLEXPORT Datum _pgr_dagshortestpath(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; @@ -228,7 +167,6 @@ PGDLLEXPORT Datum _pgr_dagshortestpath(PG_FUNCTION_ARGS) { nulls[i] = false; } - // postgres starts counting from 1 values[0] = Int32GetDatum((int32_t)funcctx->call_cntr + 1); values[1] = Int32GetDatum(result_tuples[funcctx->call_cntr].seq); values[2] = Int64GetDatum(result_tuples[funcctx->call_cntr].node); diff --git a/src/dagShortestPath/dagShortestPath_driver.cpp b/src/dagShortestPath/dagShortestPath_driver.cpp index 8ca6a0f63f..a3452f6715 100644 --- a/src/dagShortestPath/dagShortestPath_driver.cpp +++ b/src/dagShortestPath/dagShortestPath_driver.cpp @@ -36,37 +36,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "dagShortestPath/pgr_dagShortestPath.hpp" +#include "cpp_common/combinations.hpp" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" - - - namespace { template < class G > std::deque pgr_dagShortestPath( G &graph, - std::vector &combinations, - std::vector < int64_t > sources, - std::vector < int64_t > targets, + std::map> &combinations, bool only_cost = false) { - std::sort(sources.begin(), sources.end()); - sources.erase( - std::unique(sources.begin(), sources.end()), - sources.end()); - - std::sort(targets.begin(), targets.end()); - targets.erase( - std::unique(targets.begin(), targets.end()), - targets.end()); - - - pgrouting::Pgr_dag< G > fn_dag; - auto paths = combinations.empty() ? - fn_dag.dag(graph, sources, targets, only_cost) - : fn_dag.dag(graph, combinations, only_cost); + pgrouting::Pgr_dag fn_dag; + auto paths = fn_dag.dag(graph, combinations, only_cost); return paths; } @@ -74,88 +58,84 @@ pgr_dagShortestPath( } // namespace void -do_pgr_dagShortestPath( - Edge_t *data_edges, - size_t total_edges, - II_t_rt *combinations, - size_t total_combinations, - int64_t *start_vidsArr, - size_t size_start_vidsArr, - int64_t *end_vidsArr, - size_t size_end_vidsArr, +pgr_do_dagShortestPath( + char *edges_sql, + char *combinations_sql, + ArrayType *starts, + ArrayType *ends, + bool directed, bool only_cost, Path_rt **return_tuples, size_t *return_count, - char ** log_msg, - char ** notice_msg, - char ** err_msg) { + char **log_msg, + char **notice_msg, + char **err_msg) { using pgrouting::Path; using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::utilities::get_combinations; + using pgrouting::pgget::get_edges; + std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; + try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - pgassert(total_edges != 0); - pgassert(data_edges); - pgassert((start_vidsArr && end_vidsArr) || combinations); - pgassert((size_start_vidsArr && size_end_vidsArr) || total_combinations); + + hint = combinations_sql; + auto combinations = get_combinations(combinations_sql, starts, ends, true); + hint = nullptr; + + if (combinations.empty() && combinations_sql) { + *notice_msg = pgr_msg("No (source, target) pairs found"); + *log_msg = pgr_msg(combinations_sql); + return; + } graphType gType = directed? DIRECTED: UNDIRECTED; - log << "Inserting vertices into a c++ vector structure"; - std::vector - start_vertices(start_vidsArr, start_vidsArr + size_start_vidsArr); - std::vector< int64_t > - end_vertices(end_vidsArr, end_vidsArr + size_end_vidsArr); - std::vector< II_t_rt > - combinations_vector(combinations, combinations + total_combinations); + hint = edges_sql; + auto edges = get_edges(std::string(edges_sql), true, false); - std::deque< Path >paths; + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; + std::deque paths; if (directed) { - log << "Working with directed Graph\n"; - pgrouting::DirectedGraph digraph(gType); - digraph.insert_edges(data_edges, total_edges); - paths = pgr_dagShortestPath(digraph, - combinations_vector, - start_vertices, - end_vertices, - only_cost); + pgrouting::DirectedGraph graph(gType); + graph.insert_edges(edges); + paths = pgr_dagShortestPath(graph, combinations, only_cost); } else { - log << "Working with Undirected Graph\n"; - pgrouting::UndirectedGraph undigraph(gType); - undigraph.insert_edges(data_edges, total_edges); - paths = pgr_dagShortestPath( - undigraph, - combinations_vector, - start_vertices, - end_vertices, - only_cost); + pgrouting::UndirectedGraph graph(gType); + graph.insert_edges(edges); + paths = pgr_dagShortestPath(graph, combinations, only_cost); } - size_t count(0); - count = count_tuples(paths); + auto count = count_tuples(paths); if (count == 0) { (*return_tuples) = NULL; (*return_count) = 0; - notice << - "No paths found between start_vid and end_vid vertices"; + notice << "No paths found"; + *log_msg = pgr_msg(notice.str().c_str()); return; } (*return_tuples) = pgr_alloc(count, (*return_tuples)); - log << "\nConverting a set of paths into the tuples"; (*return_count) = (collapse_paths(return_tuples, paths)); *log_msg = log.str().empty()? @@ -170,6 +150,9 @@ do_pgr_dagShortestPath( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; From cef58f45040b96fcefa7d548c5a98a953a247ac7 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 24 Jan 2024 11:14:28 -0600 Subject: [PATCH 081/428] [dijkstra] Reading data on C++ code --- include/drivers/dijkstra/dijkstraVia_driver.h | 49 +++++++------- include/drivers/dijkstra/dijkstra_driver.h | 26 ++++--- src/dijkstra/dijkstra.c | 67 ++----------------- src/dijkstra/dijkstraVia.c | 62 +++-------------- src/dijkstra/dijkstraVia_driver.cpp | 47 ++++++++----- src/dijkstra/dijkstra_driver.cpp | 62 +++++++++++------ 6 files changed, 125 insertions(+), 188 deletions(-) diff --git a/include/drivers/dijkstra/dijkstraVia_driver.h b/include/drivers/dijkstra/dijkstraVia_driver.h index 522ad61453..594219cb4c 100644 --- a/include/drivers/dijkstra/dijkstraVia_driver.h +++ b/include/drivers/dijkstra/dijkstraVia_driver.h @@ -1,11 +1,13 @@ /*PGR-GNU***************************************************************** -File: dijkstraViaVertex.c +File: dijkstraVia_driver.h Generated with Template by: Copyright (c) 2015 pgRouting developers +Mail: project@pgrouting.org Function's developer: Copyright (c) 2015 Celia Virginia Vergara Castillo +Mail: vicky at erosion.dev ------ @@ -29,42 +31,41 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_DIJKSTRA_DIJKSTRAVIA_DRIVER_H_ #pragma once -/* for size-t */ #ifdef __cplusplus -# include +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#include "cpp_common/undefPostgresDefine.hpp" + +#ifdef __cplusplus # include -using Edge_t = struct Edge_t; +# include using Routes_t = struct Routes_t; #else # include # include -typedef struct Edge_t Edge_t; typedef struct Routes_t Routes_t; #endif - #ifdef __cplusplus extern "C" { #endif - /* - CREATE OR REPLACE FUNCTION pgr_dijkstraViaVertices( - sql text, - vertices anyarray, - directed boolean default true, - */ - void - do_pgr_dijkstraVia( - Edge_t *data_edges, size_t total_edges, - int64_t *via_vidsArr, size_t size_via_vidsArr, - bool directed, - bool strict, - bool U_turn_on_edge, - Routes_t **return_tuples, size_t *return_count, - - char** log_msg, - char** notice_msg, - char** err_msg); +void pgr_do_dijkstraVia( + char*, + ArrayType*, + + bool, bool, bool, + + Routes_t**, size_t *, + char**, char**, char**); #ifdef __cplusplus } diff --git a/include/drivers/dijkstra/dijkstra_driver.h b/include/drivers/dijkstra/dijkstra_driver.h index 84d8511296..a5d32e6e89 100644 --- a/include/drivers/dijkstra/dijkstra_driver.h +++ b/include/drivers/dijkstra/dijkstra_driver.h @@ -35,19 +35,29 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #ifndef INCLUDE_DRIVERS_DIJKSTRA_DIJKSTRA_DRIVER_H_ #define INCLUDE_DRIVERS_DIJKSTRA_DIJKSTRA_DRIVER_H_ +#pragma once + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#include "cpp_common/undefPostgresDefine.hpp" #ifdef __cplusplus # include # include -using Edge_t = struct Edge_t; using Path_rt = struct Path_rt; -using II_t_rt = struct II_t_rt; #else # include # include -typedef struct Edge_t Edge_t; typedef struct Path_rt Path_rt; -typedef struct II_t_rt II_t_rt; #endif #ifdef __cplusplus @@ -55,10 +65,9 @@ extern "C" { #endif void pgr_do_dijkstra( - Edge_t*, size_t, - II_t_rt*, size_t, - int64_t*, size_t, - int64_t*, size_t, + char*, + char*, + ArrayType*, ArrayType*, bool, bool, bool, int64_t, bool, @@ -66,7 +75,6 @@ void pgr_do_dijkstra( Path_rt**, size_t*, char**, char**, char**); - #ifdef __cplusplus } #endif diff --git a/src/dijkstra/dijkstra.c b/src/dijkstra/dijkstra.c index 5e7ff94ff7..fef5bc0444 100644 --- a/src/dijkstra/dijkstra.c +++ b/src/dijkstra/dijkstra.c @@ -1,5 +1,4 @@ /*PGR-GNU***************************************************************** - File: dijkstra.c Generated with Template by: @@ -34,14 +33,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ #include - #include "c_common/postgres_connection.h" #include "c_types/path_rt.h" #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "drivers/dijkstra/dijkstra_driver.h" PG_MODULE_MAGIC; @@ -53,7 +50,7 @@ static void process( char *edges_sql, - char* combinations_sql, + char *combinations_sql, ArrayType *starts, ArrayType *ends, @@ -70,60 +67,11 @@ process( char* notice_msg = NULL; char* err_msg = NULL; - int64_t* start_vidsArr = NULL; - size_t size_start_vidsArr = 0; - - int64_t* end_vidsArr = NULL; - size_t size_end_vidsArr = 0; - - Edge_t *edges = NULL; - size_t total_edges = 0; - - II_t_rt *combinationsArr = NULL; - size_t total_combinations = 0; - - if (normal) { - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - - if (combinations_sql) { - pgr_get_combinations(combinations_sql, &combinationsArr, &total_combinations, &err_msg); - throw_error(err_msg, combinations_sql); - } else { - start_vidsArr = pgr_get_bigIntArray(&size_start_vidsArr, starts, false, &err_msg); - throw_error(err_msg, "While getting start vids"); - end_vidsArr = pgr_get_bigIntArray(&size_end_vidsArr, ends, false, &err_msg); - throw_error(err_msg, "While getting end vids"); - } - } else { - pgr_get_edges(edges_sql, &edges, &total_edges, false, false, &err_msg); - throw_error(err_msg, edges_sql); - end_vidsArr = pgr_get_bigIntArray(&size_end_vidsArr, starts, false, &err_msg); - throw_error(err_msg, "While getting start vids"); - start_vidsArr = pgr_get_bigIntArray(&size_start_vidsArr, ends, false, &err_msg); - throw_error(err_msg, "While getting end vids"); - } - - if (total_edges == 0) { - if (end_vidsArr) pfree(end_vidsArr); - if (start_vidsArr) pfree(start_vidsArr); - if (combinationsArr) pfree(combinationsArr); - pgr_SPI_finish(); - return; - } - - if (total_combinations == 0 && (size_end_vidsArr== 0 || size_start_vidsArr == 0)) { - if (edges) pfree(edges); - pgr_SPI_finish(); - return; - } - clock_t start_t = clock(); pgr_do_dijkstra( - edges, total_edges, - combinationsArr, total_combinations, - start_vidsArr, size_start_vidsArr, - end_vidsArr, size_end_vidsArr, + edges_sql, + combinations_sql, + starts, ends, directed, only_cost, @@ -164,10 +112,7 @@ process( if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - if (edges) pfree(edges); - if (start_vidsArr) pfree(start_vidsArr); - if (end_vidsArr) pfree(end_vidsArr); - if (combinationsArr) pfree(combinationsArr); + pgr_SPI_finish(); } @@ -183,6 +128,7 @@ _pgr_dijkstra(PG_FUNCTION_ARGS) { MemoryContext oldcontext; funcctx = SRF_FIRSTCALL_INIT(); oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); + if (PG_NARGS() == 7) { /* kept for backwards compatibility * TODO remove on 4.0.0 */ @@ -290,4 +236,3 @@ _pgr_dijkstra(PG_FUNCTION_ARGS) { SRF_RETURN_DONE(funcctx); } } - diff --git a/src/dijkstra/dijkstraVia.c b/src/dijkstra/dijkstraVia.c index e96656a7a2..b3b48b47d8 100644 --- a/src/dijkstra/dijkstraVia.c +++ b/src/dijkstra/dijkstraVia.c @@ -1,11 +1,12 @@ /*PGR-GNU***************************************************************** -File: dijkstraViaVertex.c +File: dijkstraVia.c Generated with Template by: Copyright (c) 2015 pgRouting developers Function's developer: Copyright (c) 2015 Celia Virginia Vergara Castillo +Mail: vicky at erosion.dev ------ @@ -26,13 +27,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ #include + #include "c_common/postgres_connection.h" -#include "utils/array.h" + #include "c_types/routes_t.h" #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "drivers/dijkstra/dijkstraVia_driver.h" PGDLLEXPORT Datum _pgr_dijkstravia(PG_FUNCTION_ARGS); @@ -52,26 +53,11 @@ process(char* edges_sql, char* notice_msg = NULL; char* err_msg = NULL; - size_t size_via_vidsArr = 0; - int64_t* via_vidsArr = pgr_get_bigIntArray(&size_via_vidsArr, vias, false, &err_msg); - throw_error(err_msg, "While getting via vertices"); - - Edge_t* edges = NULL; - size_t total_edges = 0; - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - - if (total_edges == 0) { - if (via_vidsArr) pfree(via_vidsArr); - pgr_SPI_finish(); - return; - } - PGR_DBG("Starting timer"); clock_t start_t = clock(); - do_pgr_dijkstraVia( - edges, total_edges, - via_vidsArr, size_via_vidsArr, + pgr_do_dijkstraVia( + edges_sql, + vias, directed, strict, U_turn_on_edge, @@ -87,14 +73,12 @@ process(char* edges_sql, (*result_tuples) = NULL; (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - if (edges) pfree(edges); - if (via_vidsArr) pfree(via_vidsArr); + pgr_SPI_finish(); } @@ -104,25 +88,14 @@ _pgr_dijkstravia(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; - /**********************************************************************/ Routes_t *result_tuples = 0; size_t result_count = 0; - /**********************************************************************/ if (SRF_IS_FIRSTCALL()) { MemoryContext oldcontext; funcctx = SRF_FIRSTCALL_INIT(); oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - - /********************************************************************** - * pgr_dijkstraVia(edges_sql text, - * vertices anyarray, - * directed boolean default true, - * strict boolean default false, - * U_turn_on_edge boolean default false, - **********************************************************************/ - process( text_to_cstring(PG_GETARG_TEXT_P(0)), PG_GETARG_ARRAYTYPE_P(1), @@ -132,8 +105,6 @@ _pgr_dijkstravia(PG_FUNCTION_ARGS) { &result_tuples, &result_count); - /**********************************************************************/ - funcctx->max_calls = result_count; funcctx->user_fctx = result_tuples; @@ -159,20 +130,6 @@ _pgr_dijkstravia(PG_FUNCTION_ARGS) { bool* nulls; size_t call_cntr = funcctx->call_cntr; - /**********************************************************************/ - /* - 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, - OUT route_agg_cost FLOAT - */ - size_t numb_out = 10; values = palloc(numb_out * sizeof(Datum)); nulls = palloc(numb_out * sizeof(bool)); @@ -181,7 +138,6 @@ _pgr_dijkstravia(PG_FUNCTION_ARGS) { nulls[i] = false; } - // postgres starts counting from 1 values[0] = Int32GetDatum((int32_t)call_cntr + 1); values[1] = Int32GetDatum(result_tuples[call_cntr].path_id); values[2] = Int32GetDatum(result_tuples[call_cntr].path_seq + 1); @@ -193,8 +149,6 @@ _pgr_dijkstravia(PG_FUNCTION_ARGS) { values[8] = Float8GetDatum(result_tuples[call_cntr].agg_cost); values[9] = Float8GetDatum(result_tuples[call_cntr].route_agg_cost); - /**********************************************************************/ - tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); diff --git a/src/dijkstra/dijkstraVia_driver.cpp b/src/dijkstra/dijkstraVia_driver.cpp index 4ac213d522..9a171c70fa 100644 --- a/src/dijkstra/dijkstraVia_driver.cpp +++ b/src/dijkstra/dijkstraVia_driver.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: dijkstraViaVertex_driver.cpp +File: dijkstraVia_driver.cpp Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -31,10 +31,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "dijkstra/pgr_dijkstraVia.hpp" #include "c_types/routes_t.h" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" +#include "dijkstra/pgr_dijkstraVia.hpp" namespace { @@ -87,9 +88,10 @@ get_route( } // namespace void -do_pgr_dijkstraVia( - Edge_t* data_edges, size_t total_edges, - int64_t* via_vidsArr, size_t size_via_vidsArr, +pgr_do_dijkstraVia( + char *edges_sql, + ArrayType* viaArr, + bool directed, bool strict, bool U_turn_on_edge, @@ -102,13 +104,15 @@ do_pgr_dijkstraVia( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::pgget::get_intArray; + using pgrouting::pgget::get_edges; std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; try { - pgassert(total_edges != 0); pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); @@ -117,29 +121,35 @@ do_pgr_dijkstraVia( graphType gType = directed? DIRECTED: UNDIRECTED; - std::deque< Path >paths; - log << "\nInserting vertices into a c++ vector structure"; - std::vector< int64_t > via_vertices( - via_vidsArr, via_vidsArr + size_via_vidsArr); + auto via = get_intArray(viaArr, false); + hint = edges_sql; + auto edges = get_edges(std::string(edges_sql), true, false); + + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; + + std::dequepaths; if (directed) { - log << "\nWorking with directed Graph"; pgrouting::DirectedGraph digraph(gType); - digraph.insert_edges(data_edges, total_edges); + digraph.insert_edges(edges); pgrouting::pgr_dijkstraVia( digraph, - via_vertices, + via, paths, strict, U_turn_on_edge, log); } else { - log << "\nWorking with Undirected Graph"; pgrouting::UndirectedGraph undigraph(gType); - undigraph.insert_edges(data_edges, total_edges); + undigraph.insert_edges(edges); pgrouting::pgr_dijkstraVia( undigraph, - via_vertices, + via, paths, strict, U_turn_on_edge, @@ -175,6 +185,9 @@ do_pgr_dijkstraVia( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; @@ -189,5 +202,3 @@ do_pgr_dijkstraVia( *log_msg = pgr_msg(log.str().c_str()); } } - - diff --git a/src/dijkstra/dijkstra_driver.cpp b/src/dijkstra/dijkstra_driver.cpp index 0a5ef74a9a..455c66ef67 100644 --- a/src/dijkstra/dijkstra_driver.cpp +++ b/src/dijkstra/dijkstra_driver.cpp @@ -41,14 +41,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include -#include "c_types/ii_t_rt.h" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/combinations.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" #include "dijkstra/dijkstra.hpp" -namespace detail { +namespace { void post_process(std::deque &paths, bool only_cost, bool normal, size_t n_goals, bool global) { @@ -98,16 +98,15 @@ post_process(std::deque &paths, bool only_cost, bool normal, si } } -} // namespace detail +} // namespace void pgr_do_dijkstra( - Edge_t *data_edges, size_t total_edges, - - II_t_rt *combinationsArr, size_t total_combinations, - int64_t *start_vidsArr, size_t size_start_vidsArr, - int64_t *end_vidsArr, size_t size_end_vidsArr, + char *edges_sql, + char *combinations_sql, + ArrayType *starts, + ArrayType *ends, bool directed, bool only_cost, @@ -117,50 +116,66 @@ pgr_do_dijkstra( Path_rt **return_tuples, size_t *return_count, - char ** log_msg, - char ** notice_msg, - char ** err_msg) { + char **log_msg, + char **notice_msg, + char **err_msg) { using pgrouting::Path; using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::utilities::get_combinations; + using pgrouting::pgget::get_edges; std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; try { - pgassert(total_edges != 0); pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - pgassert(total_combinations != 0 || (size_start_vidsArr != 0 && size_end_vidsArr != 0)); + + hint = combinations_sql; + auto combinations = get_combinations(combinations_sql, starts, ends, normal); + hint = nullptr; + + if (combinations.empty() && combinations_sql) { + *notice_msg = pgr_msg("No (source, target) pairs found"); + *log_msg = pgr_msg(combinations_sql); + return; + } graphType gType = directed? DIRECTED: UNDIRECTED; + hint = edges_sql; + auto edges = get_edges(std::string(edges_sql), normal, false); + + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; + size_t n = n_goals <= 0? (std::numeric_limits::max)() : static_cast(n_goals); std::dequepaths; - auto combinations = total_combinations? - pgrouting::utilities::get_combinations(combinationsArr, total_combinations) - : pgrouting::utilities::get_combinations(start_vidsArr, size_start_vidsArr, end_vidsArr, size_end_vidsArr); - if (directed) { pgrouting::DirectedGraph graph(gType); - graph.insert_edges(data_edges, total_edges); + graph.insert_edges(edges); paths = pgrouting::algorithms::dijkstra(graph, combinations, only_cost, n); } else { pgrouting::UndirectedGraph graph(gType); - graph.insert_edges(data_edges, total_edges); + graph.insert_edges(edges); paths = pgrouting::algorithms::dijkstra(graph, combinations, only_cost, n); } - detail::post_process(paths, only_cost, normal, n, global); + post_process(paths, only_cost, normal, n, global); combinations.clear(); - size_t count(0); - count = count_tuples(paths); + auto count = count_tuples(paths); if (count == 0) { (*return_tuples) = NULL; @@ -185,6 +200,9 @@ pgr_do_dijkstra( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; From 9844d42b7f844084ab9579b9ebccbf796cbd5332 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 24 Jan 2024 11:18:10 -0600 Subject: [PATCH 082/428] [dominator] Reading data on C++ code --- .../lengauerTarjanDominatorTree_driver.h | 26 +++++--------- src/dominator/lengauerTarjanDominatorTree.c | 25 ++------------ .../lengauerTarjanDominatorTree_driver.cpp | 34 +++++++++++-------- 3 files changed, 32 insertions(+), 53 deletions(-) diff --git a/include/drivers/dominator/lengauerTarjanDominatorTree_driver.h b/include/drivers/dominator/lengauerTarjanDominatorTree_driver.h index 7c201fb958..a3460f74b7 100644 --- a/include/drivers/dominator/lengauerTarjanDominatorTree_driver.h +++ b/include/drivers/dominator/lengauerTarjanDominatorTree_driver.h @@ -31,14 +31,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_DOMINATOR_LENGAUERTARJANDOMINATORTREE_DRIVER_H_ #pragma once -/* for size-t */ #ifdef __cplusplus +# include # include -using Edge_t = struct Edge_t; using II_t_rt = struct II_t_rt; #else # include -typedef struct Edge_t Edge_t; +# include typedef struct II_t_rt II_t_rt; #endif @@ -48,20 +47,13 @@ typedef struct II_t_rt II_t_rt; extern "C" { #endif -/********************************************************* - edges_sql TEXT, - - ********************************************************/ -void -do_pgr_LTDTree( - Edge_t *data_edges, - size_t total_tuples, - int64_t root_vertex, - II_t_rt **return_tuples, - size_t *return_count, - char **log_msg, - char **notice_msg, - char **err_msg); +void pgr_do_LTDTree( + char*, + + int64_t, + + II_t_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus diff --git a/src/dominator/lengauerTarjanDominatorTree.c b/src/dominator/lengauerTarjanDominatorTree.c index 645238108f..dac79235e9 100644 --- a/src/dominator/lengauerTarjanDominatorTree.c +++ b/src/dominator/lengauerTarjanDominatorTree.c @@ -35,7 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" #include "c_types/ii_t_rt.h" -#include "c_common/trsp_pgget.h" #include "drivers/dominator/lengauerTarjanDominatorTree_driver.h" @@ -55,26 +54,15 @@ process(char* edges_sql, char* notice_msg = NULL; char* err_msg = NULL; - size_t total_edges = 0; - Edge_t* edges = NULL; - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - if (total_edges == 0) { - pgr_SPI_finish(); - return; - } - - PGR_DBG("Starting timer"); clock_t start_t = clock(); - do_pgr_LTDTree( - edges, total_edges, + pgr_do_LTDTree( + edges_sql, + root_vertex, result_tuples, result_count, &log_msg, ¬ice_msg, &err_msg); - time_msg("processing pgr_LTDTree()", start_t, clock()); @@ -89,7 +77,6 @@ process(char* edges_sql, if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - if (edges) pfree(edges); pgr_SPI_finish(); } @@ -98,17 +85,13 @@ _pgr_lengauertarjandominatortree(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; - /**********************************************************************/ II_t_rt *result_tuples = NULL; size_t result_count = 0; - /**********************************************************************/ 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)), @@ -116,8 +99,6 @@ _pgr_lengauertarjandominatortree(PG_FUNCTION_ARGS) { &result_tuples, &result_count); - - /**********************************************************************/ funcctx->max_calls = result_count; funcctx->user_fctx = result_tuples; diff --git a/src/dominator/lengauerTarjanDominatorTree_driver.cpp b/src/dominator/lengauerTarjanDominatorTree_driver.cpp index 714d57071a..71b0985ac8 100644 --- a/src/dominator/lengauerTarjanDominatorTree_driver.cpp +++ b/src/dominator/lengauerTarjanDominatorTree_driver.cpp @@ -27,30 +27,27 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ - - +#include "drivers/dominator/lengauerTarjanDominatorTree_driver.h" #include #include #include #include #include + +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/identifiers.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/basePath_SSEC.hpp" #include "cpp_common/pgr_base_graph.hpp" #include "c_types/ii_t_rt.h" -#include "drivers/dominator/lengauerTarjanDominatorTree_driver.h" #include "dominator/pgr_lengauerTarjanDominatorTree_driver.hpp" -/************************************************************ - edges_sql TEXT - ***********************************************************/ void -do_pgr_LTDTree( - Edge_t *data_edges, - size_t total_edges, +pgr_do_LTDTree( + char *edges_sql, + int64_t root_vertex, II_t_rt **return_tuples, size_t *return_count, @@ -65,23 +62,29 @@ do_pgr_LTDTree( std::ostringstream log; std::ostringstream notice; std::ostringstream err; - + char *hint = nullptr; try { - pgassert(total_edges != 0); pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - std::string logstr; + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; -/***********************Working with graph**************************/ + std::string logstr; graphType gType = DIRECTED; pgrouting::DirectedGraph digraph(gType); - digraph.insert_edges(data_edges, total_edges); + digraph.insert_edges(edges); std::vector results; pgrouting::functions::Pgr_LTDTree fn_LTDTree; results = fn_LTDTree.pgr_ltdtree(digraph, root_vertex); @@ -122,6 +125,9 @@ do_pgr_LTDTree( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; From 4072d024298f37eb0b472d952410875f387f3064 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 24 Jan 2024 11:25:37 -0600 Subject: [PATCH 083/428] [driving_distance] Reading data on C++ code --- .../driving_distance/drivedist_driver.h | 28 ++++-- .../driving_distance/withPoints_dd_driver.h | 36 +++++--- src/driving_distance/drivedist_driver.cpp | 35 +++++--- .../many_to_dist_driving_distance.c | 23 +---- .../many_to_dist_withPointsDD.c | 59 ++----------- src/driving_distance/withPoints_dd_driver.cpp | 87 +++++++++++-------- 6 files changed, 131 insertions(+), 137 deletions(-) diff --git a/include/drivers/driving_distance/drivedist_driver.h b/include/drivers/driving_distance/drivedist_driver.h index 2d98ed3f63..d82a977f63 100644 --- a/include/drivers/driving_distance/drivedist_driver.h +++ b/include/drivers/driving_distance/drivedist_driver.h @@ -30,15 +30,26 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #ifndef INCLUDE_DRIVERS_DRIVING_DISTANCE_DRIVEDIST_DRIVER_H_ #define INCLUDE_DRIVERS_DRIVING_DISTANCE_DRIVEDIST_DRIVER_H_ +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#include "cpp_common/undefPostgresDefine.hpp" + #ifdef __cplusplus # include # include -using Edge_t = struct Edge_t; using MST_rt = struct MST_rt; #else # include # include -typedef struct Edge_t Edge_t; typedef struct MST_rt MST_rt; #endif @@ -46,13 +57,12 @@ typedef struct MST_rt MST_rt; extern "C" { #endif -void pgr_do_drivingdist( - Edge_t* , size_t , - int64_t* , size_t , - double , - bool, bool, - MST_rt** , size_t* r, - char **, char **, char **); +void pgr_do_drivingDistance( + char*, + ArrayType*, + double, bool, bool, + MST_rt**, size_t*, + char**, char**, char **); #ifdef __cplusplus } diff --git a/include/drivers/driving_distance/withPoints_dd_driver.h b/include/drivers/driving_distance/withPoints_dd_driver.h index 6f7897f172..64bd4636ca 100644 --- a/include/drivers/driving_distance/withPoints_dd_driver.h +++ b/include/drivers/driving_distance/withPoints_dd_driver.h @@ -33,19 +33,27 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_DRIVING_DISTANCE_WITHPOINTS_DD_DRIVER_H_ #pragma once -/* for size-t */ + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#include "cpp_common/undefPostgresDefine.hpp" + #ifdef __cplusplus # include # include -using Point_on_edge_t = struct Point_on_edge_t; -using Edge_t = struct Edge_t; -using Path_rt = struct Path_rt; using MST_rt = struct MST_rt; #else # include # include -typedef struct Point_on_edge_t Point_on_edge_t; -typedef struct Edge_t Edge_t; typedef struct MST_rt MST_rt; #endif @@ -53,16 +61,16 @@ typedef struct MST_rt MST_rt; extern "C" { #endif - void pgr_do_withPointsDD( - Edge_t*, size_t, - Point_on_edge_t*, size_t, - Edge_t*, size_t, - int64_t*, size_t, +void pgr_do_withPointsDD( + char*, + char*, + char*, + ArrayType*, - double, char, bool, bool, bool, + double, char, bool, bool, bool, - MST_rt**, size_t*, - char**, char**, char **); + MST_rt**, size_t*, + char**, char**, char **); #ifdef __cplusplus } diff --git a/src/driving_distance/drivedist_driver.cpp b/src/driving_distance/drivedist_driver.cpp index dfea2383c0..954f07005f 100644 --- a/src/driving_distance/drivedist_driver.cpp +++ b/src/driving_distance/drivedist_driver.cpp @@ -33,6 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include +#include "cpp_common/pgdata_getters.hpp" #include "dijkstra/drivingDist.hpp" #include "c_types/mst_rt.h" @@ -41,9 +42,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. void -pgr_do_drivingdist( - Edge_t *data_edges, size_t total_edges, - int64_t *start_vertex, size_t s_len, +pgr_do_drivingDistance( + char *edges_sql, + ArrayType* starts, double distance, bool directedFlag, bool equiCostFlag, @@ -56,13 +57,14 @@ pgr_do_drivingdist( using pgrouting::pgr_msg; using pgrouting::pgr_free; using pgrouting::algorithm::drivingDistance; + using pgrouting::pgget::get_intSet; std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; try { - pgassert(total_edges != 0); pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); @@ -70,21 +72,31 @@ pgr_do_drivingdist( pgassert(*return_count == 0); pgassert((*return_tuples) == NULL); + auto roots = get_intSet(starts); + + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); + + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; + graphType gType = directedFlag? DIRECTED: UNDIRECTED; std::deque paths; - std::set start_vertices(start_vertex, start_vertex + s_len); - std::vector> depths; if (directedFlag) { pgrouting::DirectedGraph digraph(gType); - digraph.insert_edges(data_edges, total_edges); - paths = drivingDistance(digraph, start_vertices, distance, equiCostFlag, depths, true); + digraph.insert_edges(edges); + paths = drivingDistance(digraph, roots, distance, equiCostFlag, depths, true); } else { pgrouting::UndirectedGraph undigraph(gType); - undigraph.insert_edges(data_edges, total_edges); - paths = drivingDistance(undigraph, start_vertices, distance, equiCostFlag, depths, true); + undigraph.insert_edges(edges); + paths = drivingDistance(undigraph, roots, distance, equiCostFlag, depths, true); } size_t count(count_tuples(paths)); @@ -124,6 +136,9 @@ pgr_do_drivingdist( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; diff --git a/src/driving_distance/many_to_dist_driving_distance.c b/src/driving_distance/many_to_dist_driving_distance.c index dad29d1e25..56132ca110 100644 --- a/src/driving_distance/many_to_dist_driving_distance.c +++ b/src/driving_distance/many_to_dist_driving_distance.c @@ -35,7 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "drivers/driving_distance/drivedist_driver.h" @@ -59,24 +58,10 @@ void process( char* notice_msg = NULL; char* err_msg = NULL; - size_t size_start_vidsArr = 0; - int64_t* start_vidsArr = pgr_get_bigIntArray(&size_start_vidsArr, starts, false, &err_msg); - throw_error(err_msg, "While getting start vids"); - - Edge_t *edges = NULL; - size_t total_tuples = 0; - pgr_get_edges(edges_sql, &edges, &total_tuples, true, false, &err_msg); - throw_error(err_msg, edges_sql); - - if (total_tuples == 0) { - return; - } - - PGR_DBG("Starting timer"); clock_t start_t = clock(); - pgr_do_drivingdist( - edges, total_tuples, - start_vidsArr, size_start_vidsArr, + pgr_do_drivingDistance( + edges_sql, + starts, distance, directed, equicost, @@ -99,8 +84,6 @@ void process( if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - if (edges) pfree(edges); - if (start_vidsArr) pfree(start_vidsArr); pgr_SPI_finish(); } diff --git a/src/driving_distance/many_to_dist_withPointsDD.c b/src/driving_distance/many_to_dist_withPointsDD.c index 4a05804ebb..92bb0a2429 100644 --- a/src/driving_distance/many_to_dist_withPointsDD.c +++ b/src/driving_distance/many_to_dist_withPointsDD.c @@ -30,22 +30,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "c_common/postgres_connection.h" +#include "c_types/mst_rt.h" #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_types/mst_rt.h" - -#include "c_common/trsp_pgget.h" - #include "drivers/withPoints/get_new_queries.h" #include "drivers/driving_distance/withPoints_dd_driver.h" - PGDLLEXPORT Datum _pgr_withpointsddv4(PG_FUNCTION_ARGS); PG_FUNCTION_INFO_V1(_pgr_withpointsddv4); static -void process( +void +process( char* edges_sql, char* points_sql, ArrayType* starts, @@ -82,16 +79,6 @@ void process( char* notice_msg = NULL; char* err_msg = NULL; - size_t total_starts = 0; - int64_t* start_pidsArr = pgr_get_bigIntArray(&total_starts, starts, false, &err_msg); - throw_error(err_msg, "While getting start vids"); - PGR_DBG("sourcesArr size %ld ", total_starts); - - Point_on_edge_t *points = NULL; - size_t total_points = 0; - pgr_get_points(points_sql, &points, &total_points, &err_msg); - throw_error(err_msg, points_sql); - char *edges_of_points_query = NULL; char *edges_no_points_query = NULL; get_new_queries( @@ -100,35 +87,12 @@ void process( &edges_no_points_query); - Edge_t *edges_of_points = NULL; - size_t total_edges_of_points = 0; - pgr_get_edges(edges_of_points_query, &edges_of_points, &total_edges_of_points, true, false, &err_msg); - throw_error(err_msg, edges_of_points_query); - - Edge_t *edges = NULL; - size_t total_edges = 0; - pgr_get_edges(edges_no_points_query, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_no_points_query); - - PGR_DBG("freeing allocated memory not used anymore"); - pfree(edges_of_points_query); - pfree(edges_no_points_query); - - if ((total_edges + total_edges_of_points) == 0) { - if (edges) pfree(edges); - if (edges_of_points) pfree(edges_of_points); - if (points) pfree(points); - pgr_SPI_finish(); - return; - } - - PGR_DBG("Starting timer"); clock_t start_t = clock(); pgr_do_withPointsDD( - edges, total_edges, - points, total_points, - edges_of_points, total_edges_of_points, - start_pidsArr, total_starts, + edges_no_points_query, + points_sql, + edges_of_points_query, + starts, distance, d_side, @@ -153,15 +117,10 @@ void process( if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - if (edges) pfree(edges); - if (edges_of_points) pfree(edges_of_points); - if (points) pfree(points); - if (start_pidsArr) pfree(start_pidsArr); + pgr_SPI_finish(); } - - PGDLLEXPORT Datum _pgr_withpointsddv4(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; @@ -201,8 +160,8 @@ _pgr_withpointsddv4(PG_FUNCTION_ARGS) { funcctx->tuple_desc = tuple_desc; MemoryContextSwitchTo(oldcontext); } - funcctx = SRF_PERCALL_SETUP(); + funcctx = SRF_PERCALL_SETUP(); tuple_desc = funcctx->tuple_desc; result_tuples = (MST_rt*) funcctx->user_fctx; diff --git a/src/driving_distance/withPoints_dd_driver.cpp b/src/driving_distance/withPoints_dd_driver.cpp index bb50bfdb4f..c9916f04f9 100644 --- a/src/driving_distance/withPoints_dd_driver.cpp +++ b/src/driving_distance/withPoints_dd_driver.cpp @@ -37,19 +37,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include +#include "cpp_common/pgdata_getters.hpp" #include "dijkstra/drivingDist.hpp" #include "withPoints/pgr_withPoints.hpp" #include "c_types/mst_rt.h" - +#include "cpp_common/combinations.hpp" #include "cpp_common/pgr_alloc.hpp" void pgr_do_withPointsDD( - Edge_t *edges, size_t total_edges, - Point_on_edge_t *points_p, size_t total_points, - Edge_t *edges_of_points, size_t total_edges_of_points, - int64_t *start_pidsArr, size_t s_len, + char *edges_sql, + char *points_sql, + char *edges_of_points_sql, + ArrayType* starts, double distance, char driving_side, @@ -66,31 +67,47 @@ pgr_do_withPointsDD( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::pgget::get_intSet; + using pgrouting::utilities::get_combinations; + using pgrouting::pgget::get_points; + using pgrouting::pgget::get_edges; using pgrouting::algorithm::drivingDistance; std::ostringstream log; std::ostringstream notice; std::ostringstream err; + char *hint = nullptr; + try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); - pgassert((*return_count) == 0); - pgassert(edges); - pgassert(start_pidsArr); - - - pgrouting::Pg_points_graph pg_graph( - std::vector( - points_p, - points_p + total_points), - std::vector< Edge_t >( - edges_of_points, - edges_of_points + total_edges_of_points), - true, - driving_side, - directed); + pgassert(*return_count == 0); + + auto roots = get_intSet(starts); + + hint = points_sql; + auto points = get_points(std::string(points_sql)); + + hint = edges_of_points_sql; + auto edges_of_points = get_edges(std::string(edges_of_points_sql), true, false); + + hint = edges_sql; + auto edges = get_edges(std::string(edges_sql), true, false); + + if (edges.size() + edges_of_points.size() == 0) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; + + /* + * processing points + */ + pgrouting::Pg_points_graph pg_graph(points, edges_of_points, + true, driving_side, directed); if (pg_graph.has_error()) { log << pg_graph.get_log(); @@ -100,8 +117,6 @@ pgr_do_withPointsDD( return; } - std::set start_vids(start_pidsArr, start_pidsArr + s_len); - graphType gType = directed? DIRECTED: UNDIRECTED; std::deque paths; @@ -109,33 +124,34 @@ pgr_do_withPointsDD( if (directed) { pgrouting::DirectedGraph digraph(gType); - digraph.insert_edges(edges, total_edges); + digraph.insert_edges(edges); digraph.insert_edges(pg_graph.new_edges()); - paths = drivingDistance(digraph, start_vids, distance, equiCost, depths, details); + paths = drivingDistance(digraph, roots, distance, equiCost, depths, details); } else { pgrouting::UndirectedGraph undigraph(gType); - undigraph.insert_edges(edges, total_edges); + undigraph.insert_edges(edges); undigraph.insert_edges(pg_graph.new_edges()); - paths = drivingDistance(undigraph, start_vids, distance, equiCost, depths, details); + paths = drivingDistance(undigraph, roots, distance, equiCost, depths, details); } if (!details) { - for (auto &path : paths) { - pg_graph.eliminate_details_dd(path); - } + for (auto &path : paths) pg_graph.eliminate_details_dd(path); } - size_t count(count_tuples(paths)); + auto count(count_tuples(paths)); + if (count == 0) { - log << "\nNo return values were found"; - *notice_msg = pgr_msg(log.str().c_str()); + (*return_tuples) = NULL; + (*return_count) = 0; + notice << "No paths found"; + *log_msg = pgr_msg(notice.str().c_str()); return; } - *return_tuples = pgr_alloc(count, (*return_tuples)); - *return_count = collapse_paths(return_tuples, paths); + (*return_tuples) = pgr_alloc(count, (*return_tuples)); + (*return_count) = (collapse_paths(return_tuples, paths)); for (size_t i = 0; i < count; i++) { auto row = (*return_tuples)[i]; @@ -170,6 +186,9 @@ pgr_do_withPointsDD( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; From 73ac7ce226b4187ff57cdf505f4b65b48c6dc4e3 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 24 Jan 2024 11:36:31 -0600 Subject: [PATCH 084/428] [ksp] Reading data on C++ code --- include/drivers/yen/ksp_driver.h | 28 +++-- .../drivers/yen/turnRestrictedPath_driver.h | 46 +++----- include/drivers/yen/withPoints_ksp_driver.h | 49 +++++---- src/ksp/ksp.c | 93 ++++------------ src/ksp/ksp_driver.cpp | 96 +++++++++++------ src/ksp/turnRestrictedPath.c | 63 +---------- src/ksp/turnRestrictedPath_driver.cpp | 47 ++++---- src/ksp/withPoints_ksp.c | 81 ++------------ src/ksp/withPoints_ksp_driver.cpp | 102 ++++++++++++------ 9 files changed, 251 insertions(+), 354 deletions(-) diff --git a/include/drivers/yen/ksp_driver.h b/include/drivers/yen/ksp_driver.h index 26bf0592d6..39a4bdca6c 100644 --- a/include/drivers/yen/ksp_driver.h +++ b/include/drivers/yen/ksp_driver.h @@ -32,31 +32,39 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_YEN_KSP_DRIVER_H_ #pragma once -/* for size-t */ +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#include "cpp_common/undefPostgresDefine.hpp" + #ifdef __cplusplus # include # include -using Edge_t = struct Edge_t; using Path_rt = struct Path_rt; -using II_t_rt = struct II_t_rt; #else # include # include -typedef struct Edge_t Edge_t; typedef struct Path_rt Path_rt; -typedef struct II_t_rt II_t_rt; #endif - #ifdef __cplusplus extern "C" { #endif void pgr_do_ksp( - Edge_t*, size_t, - II_t_rt*, size_t, - int64_t*, size_t, - int64_t*, size_t, + char*, + char*, + ArrayType*, ArrayType*, + int64_t*, + int64_t*, size_t, bool, bool, diff --git a/include/drivers/yen/turnRestrictedPath_driver.h b/include/drivers/yen/turnRestrictedPath_driver.h index 11066bdb9f..4712cd3093 100644 --- a/include/drivers/yen/turnRestrictedPath_driver.h +++ b/include/drivers/yen/turnRestrictedPath_driver.h @@ -35,14 +35,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #ifdef __cplusplus # include # include -using Edge_t = struct Edge_t; -using Restriction_t = struct Restriction_t; using Path_rt = struct Path_rt; #else # include # include -typedef struct Edge_t Edge_t; -typedef struct Restriction_t Restriction_t; typedef struct Path_rt Path_rt; #endif @@ -51,39 +47,21 @@ typedef struct Path_rt Path_rt; extern "C" { #endif - /********************************************************* +void pgr_do_turnRestrictedPath( + char*, + char*, - TEXT, -- edges_sql - TEXT, -- restrictions_sql - BIGINT, -- source - BIGINT, -- target - directed BOOLEAN DEFAULT true, - only_cost BOOLEAN DEFAULT false, - strict BOOLEAN DEFAULT false - ********************************************************/ + int64_t, + int64_t, + size_t, + bool, + bool, + bool, + bool, - void do_pgr_turnRestrictedPath( - Edge_t *data_edges, - size_t total_edges, - - Restriction_t *restrictions, - size_t total_restrictions, - - int64_t start_vid, - int64_t end_vid, - - size_t k, - bool directed, - bool heap_paths, - bool stop_on_first, - bool strict, - - Path_rt **return_tuples, - size_t *return_count, - char ** log_msg, - char ** notice_msg, - char ** err_msg); + Path_rt **, size_t *, + char**, char**, char**); #ifdef __cplusplus diff --git a/include/drivers/yen/withPoints_ksp_driver.h b/include/drivers/yen/withPoints_ksp_driver.h index 70c1860634..da45c12f47 100644 --- a/include/drivers/yen/withPoints_ksp_driver.h +++ b/include/drivers/yen/withPoints_ksp_driver.h @@ -33,46 +33,51 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_YEN_WITHPOINTS_KSP_DRIVER_H_ #pragma once -/* for size-t */ + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#include "cpp_common/undefPostgresDefine.hpp" + #ifdef __cplusplus -# include # include -using Point_on_edge_t = struct Point_on_edge_t; -using Edge_t = struct Edge_t; +# include using Path_rt = struct Path_rt; -using II_t_rt = struct II_t_rt; #else # include # include -typedef struct Point_on_edge_t Point_on_edge_t; -typedef struct Edge_t Edge_t; typedef struct Path_rt Path_rt; #endif - #ifdef __cplusplus extern "C" { #endif - int pgr_do_withPointsKsp( - Edge_t*, size_t, - Point_on_edge_t*, size_t, - Edge_t*, size_t, - II_t_rt*, size_t, - int64_t*, size_t, - int64_t*, size_t, - size_t, - bool, bool, - char, - bool, +void pgr_do_withPointsKsp( + char*, + char*, + char*, + char*, + ArrayType*, ArrayType*, + int64_t*, int64_t*, + size_t, - Path_rt**, size_t*, - char**, char**, char**); +bool, bool, char, bool, + Path_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus - } +} #endif #endif // INCLUDE_DRIVERS_YEN_WITHPOINTS_KSP_DRIVER_H_ diff --git a/src/ksp/ksp.c b/src/ksp/ksp.c index 8d2df058a7..45af7fa1c8 100644 --- a/src/ksp/ksp.c +++ b/src/ksp/ksp.c @@ -28,7 +28,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ - #include #include "c_common/postgres_connection.h" @@ -37,7 +36,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "drivers/yen/ksp_driver.h" @@ -45,9 +43,10 @@ PGDLLEXPORT Datum _pgr_ksp(PG_FUNCTION_ARGS); PG_FUNCTION_INFO_V1(_pgr_ksp); static -void process( - char* edges_sql, - char* combinations_sql, +void +process( + char *edges_sql, + char *combinations_sql, ArrayType *starts, ArrayType *ends, @@ -57,59 +56,25 @@ void process( int p_k, bool directed, bool heap_paths, - Path_rt **result_tuples, size_t *result_count) { + Path_rt **result_tuples, + size_t *result_count) { pgr_SPI_connect(); char* log_msg = NULL; char* notice_msg = NULL; char* err_msg = NULL; if (p_k < 0) { - return; - } - - size_t k = (size_t)p_k; - - int64_t* start_vidsArr = NULL; - size_t size_start_vidsArr = 0; - - int64_t* end_vidsArr = NULL; - size_t size_end_vidsArr = 0; - - II_t_rt *combinations = NULL; - size_t total_combinations = 0; - - if (start_vertex && end_vertex) { - start_vidsArr = start_vertex; size_start_vidsArr = 1; - end_vidsArr = end_vertex; size_end_vidsArr = 1; - } else if (starts && ends) { - start_vidsArr = pgr_get_bigIntArray(&size_start_vidsArr, starts, false, &err_msg); - throw_error(err_msg, "While getting start vids"); - end_vidsArr = pgr_get_bigIntArray(&size_end_vidsArr, ends, false, &err_msg); - throw_error(err_msg, "While getting end vids"); - } else if (combinations_sql) { - pgr_get_combinations(combinations_sql, &combinations, &total_combinations, &err_msg); - throw_error(err_msg, combinations_sql); - } - - Edge_t *edges = NULL; - size_t total_edges = 0; - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - - if (total_edges == 0) { - PGR_DBG("No edges found"); - pgr_SPI_finish(); + /* TODO return error message */ return; } clock_t start_t = clock(); - pgr_do_ksp( - edges, total_edges, - combinations, total_combinations, - start_vidsArr, size_start_vidsArr, - end_vidsArr, size_end_vidsArr, - k, + edges_sql, + combinations_sql, + starts, ends, + + start_vertex, end_vertex, + (size_t) p_k, directed, heap_paths, result_tuples, @@ -131,27 +96,15 @@ void process( if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - if (start_vertex && end_vertex) { - start_vidsArr = NULL; - end_vidsArr = NULL; - } - if (start_vidsArr) pfree(start_vidsArr); - if (end_vidsArr) pfree(end_vidsArr); - - - pgr_global_report(log_msg, notice_msg, err_msg); - - pfree(edges); pgr_SPI_finish(); } - - PGDLLEXPORT Datum _pgr_ksp(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; Path_rt *path = NULL; + size_t result_count = 0; if (SRF_IS_FIRSTCALL()) { @@ -159,7 +112,6 @@ _pgr_ksp(PG_FUNCTION_ARGS) { funcctx = SRF_FIRSTCALL_INIT(); oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - if (PG_NARGS() == 7) { /* * many to many @@ -207,38 +159,33 @@ _pgr_ksp(PG_FUNCTION_ARGS) { } funcctx->max_calls = result_count; - funcctx->user_fctx = path; if (get_call_result_type(fcinfo, NULL, &tuple_desc) - != TYPEFUNC_COMPOSITE) + != TYPEFUNC_COMPOSITE) { ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("function returning record called in context " - "that cannot accept type record\n"))); + "that cannot accept type record"))); + } funcctx->tuple_desc = tuple_desc; MemoryContextSwitchTo(oldcontext); } - funcctx = SRF_PERCALL_SETUP(); - - tuple_desc = funcctx->tuple_desc; path = (Path_rt*) funcctx->user_fctx; if (funcctx->call_cntr < funcctx->max_calls) { HeapTuple tuple; Datum result; - Datum *values; - bool* nulls; + Datum *values; + bool* nulls; size_t n = (PG_NARGS() == 6)? 7 : 9; - values = palloc(n * sizeof(Datum)); nulls = palloc(n * sizeof(bool)); - size_t i; for (i = 0; i < n; ++i) { nulls[i] = false; @@ -270,7 +217,7 @@ _pgr_ksp(PG_FUNCTION_ARGS) { tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); - } else { /* do when there is no more left */ + } else { SRF_RETURN_DONE(funcctx); } } diff --git a/src/ksp/ksp_driver.cpp b/src/ksp/ksp_driver.cpp index c9d1c1b675..827597f4bf 100644 --- a/src/ksp/ksp_driver.cpp +++ b/src/ksp/ksp_driver.cpp @@ -38,77 +38,106 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "yen/pgr_ksp.hpp" #include "cpp_common/combinations.hpp" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" -#include "cpp_common/pgr_base_graph.hpp" - #include "c_types/ii_t_rt.h" -void pgr_do_ksp( - Edge_t *data_edges, size_t total_edges, - II_t_rt *combinationsArr, size_t total_combinations, - int64_t* start_vids, size_t size_start_vids, - int64_t * end_vids, size_t size_end_vids, +void pgr_do_ksp( + char* edges_sql, + char* combinations_sql, + ArrayType* starts, + ArrayType* ends, + + int64_t *start_vid, + int64_t *end_vid, + size_t k, bool directed, bool heap_paths, Path_rt **return_tuples, size_t *return_count, - char ** log_msg, - char ** notice_msg, - char ** err_msg) { + char **log_msg, + char **notice_msg, + char **err_msg) { using pgrouting::Path; using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::utilities::get_combinations; using pgrouting::yen::Pgr_ksp; std::ostringstream err; std::ostringstream log; std::ostringstream notice; + char *hint = nullptr; + try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - pgassert(total_edges != 0); - - auto combinations = total_combinations? - pgrouting::utilities::get_combinations(combinationsArr, total_combinations) - : pgrouting::utilities::get_combinations(start_vids, size_start_vids, end_vids, size_end_vids); graphType gType = directed? DIRECTED: UNDIRECTED; - std::deque< Path > paths; + hint = combinations_sql; + auto combinations = get_combinations(combinations_sql, starts, ends, true); + hint = nullptr; + + if (start_vid && end_vid) { + combinations[*start_vid].insert(*end_vid); + } + + if (combinations.empty() && combinations_sql) { + *notice_msg = pgr_msg("No (source, target) pairs found"); + *log_msg = pgr_msg(combinations_sql); + return; + } + + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); + + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; + + std::dequepaths; if (directed) { - pgrouting::DirectedGraph digraph(gType); - digraph.insert_edges(data_edges, total_edges); - paths = pgrouting::algorithms::Yen(digraph, combinations, k, heap_paths); + pgrouting::DirectedGraph graph(gType); + graph.insert_edges(edges); + paths = pgrouting::algorithms::Yen(graph, combinations, k, heap_paths); } else { - pgrouting::UndirectedGraph undigraph(gType); - undigraph.insert_edges(data_edges, total_edges); - paths = pgrouting::algorithms::Yen(undigraph, combinations, k, heap_paths); + pgrouting::UndirectedGraph graph(gType); + graph.insert_edges(edges); + paths = pgrouting::algorithms::Yen(graph, combinations, k, heap_paths); } + combinations.clear(); + auto count = count_tuples(paths); - auto count(count_tuples(paths)); + if (count == 0) { + (*return_tuples) = NULL; + (*return_count) = 0; + notice << "No paths found"; + *log_msg = pgr_msg(notice.str().c_str()); + return; + } - if (!(count == 0)) { - *return_tuples = NULL; - *return_tuples = pgr_alloc(count, (*return_tuples)); + (*return_tuples) = pgr_alloc(count, (*return_tuples)); + (*return_count) = (collapse_paths(return_tuples, paths)); - size_t sequence = 0; - for (const auto &path : paths) { - if (path.size() > 0) - path.get_pg_nksp_path(return_tuples, sequence); - } + size_t sequence = 0; + for (const auto &path : paths) { + if (path.size() > 0) path.get_pg_nksp_path(return_tuples, sequence); } *return_count = count; - pgassert(*err_msg == NULL); *log_msg = log.str().empty()? *log_msg : pgr_msg(log.str().c_str()); @@ -121,6 +150,9 @@ void pgr_do_ksp( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; diff --git a/src/ksp/turnRestrictedPath.c b/src/ksp/turnRestrictedPath.c index b4b8582ff0..ea5794f679 100644 --- a/src/ksp/turnRestrictedPath.c +++ b/src/ksp/turnRestrictedPath.c @@ -38,7 +38,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "drivers/yen/turnRestrictedPath_driver.h" @@ -81,32 +80,11 @@ process( char* notice_msg = NULL; char* err_msg = NULL; - - Edge_t *edges = NULL; - size_t total_edges = 0; - - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - - Restriction_t *restrictions = NULL; - size_t total_restrictions = 0; - - pgr_get_restrictions(restrictions_sql, &restrictions, &total_restrictions, &err_msg); - throw_error(err_msg, restrictions_sql); - - if (total_edges == 0) { - PGR_DBG("No edges found"); - pgr_SPI_finish(); - return; - } - clock_t start_t = clock(); - do_pgr_turnRestrictedPath( - edges, - total_edges, - restrictions, - total_restrictions, + pgr_do_turnRestrictedPath( + edges_sql, + restrictions_sql, + start_vid, end_vid, k, @@ -128,11 +106,9 @@ process( } pgr_global_report(log_msg, notice_msg, err_msg); - if (edges) {pfree(edges); edges = NULL;} if (log_msg) {pfree(log_msg); log_msg = NULL;} if (notice_msg) {pfree(notice_msg); notice_msg = NULL;} if (err_msg) {pfree(err_msg); err_msg = NULL;} - if (restrictions) {pfree(restrictions); edges = NULL;} pgr_SPI_finish(); } @@ -151,26 +127,6 @@ _pgr_turnrestrictedpath(PG_FUNCTION_ARGS) { oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - /**********************************************************************/ - /* - TEXT, -- edges_sql - TEXT, -- restrictions_sql - BIGINT, -- start_vertex - BIGINT, -- end_vertex - INTEGER,-- K cycles - directed BOOLEAN DEFAULT true, - heap_paths BOOLEAN DEFAULT false, - stop_on_first BOOLEAN DEFAULT true, - - OUT seq INTEGER, - OUT path_seq INTEGER, - OUT node BIGINT, - OUT edge BIGINT, - OUT cost FLOAT, - OUT agg_cost FLOAT) - **********************************************************************/ - - PGR_DBG("Calling process"); process( text_to_cstring(PG_GETARG_TEXT_P(0)), @@ -210,17 +166,6 @@ _pgr_turnrestrictedpath(PG_FUNCTION_ARGS) { Datum *values; bool* nulls; - /**********************************************************************/ - /* MODIFY AS NEEDED */ - /* - OUT seq INTEGER, - OUT path_seq INTEGER, - OUT node BIGINT, - OUT edge BIGINT, - OUT cost FLOAT, - OUT agg_cost FLOAT - ***********************************************************************/ - size_t v_count = 7; values = palloc(v_count * sizeof(Datum)); diff --git a/src/ksp/turnRestrictedPath_driver.cpp b/src/ksp/turnRestrictedPath_driver.cpp index aac9fa9b37..77917932f3 100644 --- a/src/ksp/turnRestrictedPath_driver.cpp +++ b/src/ksp/turnRestrictedPath_driver.cpp @@ -34,6 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" @@ -77,12 +78,9 @@ pgr_dijkstraTR( } // namespace void -do_pgr_turnRestrictedPath( - Edge_t *data_edges, - size_t total_edges, - - Restriction_t *restrictions, - size_t total_restrictions, +pgr_do_turnRestrictedPath( + char *edges_sql, + char *restrictions_sql, int64_t start_vid, int64_t end_vid, @@ -105,32 +103,42 @@ do_pgr_turnRestrictedPath( using pgrouting::pgr_free; using pgrouting::yen::Pgr_turnRestrictedPath; using pgrouting::trsp::Rule; + using pgrouting::pgget::get_restrictions; + using pgrouting::pgget::get_edges; std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - pgassert(total_edges != 0); - std::vector ruleList; - for (size_t i = 0; i < total_restrictions; ++i) { - ruleList.push_back(Rule(*(restrictions + i))); - } + graphType gType = directed? DIRECTED: UNDIRECTED; - log << "\n---------------------------------------\nRestrictions data\n"; - for (const auto &r : ruleList) { - log << r << "\n"; + hint = edges_sql; + auto edges = get_edges(std::string(edges_sql), true, false); + + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; } - log <<"------------------------------------------------------------\n"; + hint = nullptr; - graphType gType = directed? DIRECTED: UNDIRECTED; + hint = restrictions_sql; + auto restrictions = restrictions_sql? + get_restrictions(std::string(restrictions_sql)) + : std::vector(); + hint = nullptr; - std::vector < Edge_t > edges(data_edges, data_edges + total_edges); + std::vector ruleList; + for (const auto &r : restrictions) { + ruleList.push_back(Rule(r)); + } std::deque paths; @@ -156,7 +164,7 @@ do_pgr_turnRestrictedPath( log << "TODO Working with Undirected Graph\n"; pgrouting::UndirectedGraph undigraph(gType); Pgr_turnRestrictedPath < pgrouting::UndirectedGraph > fn_TRSP; - undigraph.insert_edges(data_edges, total_edges); + undigraph.insert_edges(edges); paths = pgr_dijkstraTR(undigraph, ruleList, @@ -216,6 +224,9 @@ do_pgr_turnRestrictedPath( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch(...) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; diff --git a/src/ksp/withPoints_ksp.c b/src/ksp/withPoints_ksp.c index a42ee05fca..2bd66b4df3 100644 --- a/src/ksp/withPoints_ksp.c +++ b/src/ksp/withPoints_ksp.c @@ -36,12 +36,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/path_rt.h" #include "c_common/time_msg.h" #include "c_common/e_report.h" - -#include "c_common/trsp_pgget.h" - #include "drivers/withPoints/get_new_queries.h" #include "drivers/yen/withPoints_ksp_driver.h" -#include "c_common/debug_macro.h" PGDLLEXPORT Datum _pgr_withpointsksp(PG_FUNCTION_ARGS); PG_FUNCTION_INFO_V1(_pgr_withpointsksp); @@ -55,8 +51,8 @@ process( ArrayType *starts, ArrayType *ends, - int64_t* start_pid, - int64_t* end_pid, + int64_t* start_vid, + int64_t* end_vid, int p_k, char *driving_side, @@ -68,12 +64,13 @@ process( Path_rt **result_tuples, size_t *result_count) { if (p_k < 0) { + /* TODO add error message */ return; } size_t k = (size_t)p_k; - if (start_pid) { + if (start_vid) { driving_side[0] = (char) tolower(driving_side[0]); if (!((driving_side[0] == 'r') || (driving_side[0] == 'l'))) { @@ -98,11 +95,6 @@ process( char* notice_msg = NULL; char* err_msg = NULL; - Point_on_edge_t *points = NULL; - size_t total_points = 0; - pgr_get_points(points_sql, &points, &total_points, &err_msg); - throw_error(err_msg, points_sql); - char *edges_of_points_query = NULL; char *edges_no_points_query = NULL; get_new_queries( @@ -110,62 +102,17 @@ process( &edges_of_points_query, &edges_no_points_query); - Edge_t *edges_of_points = NULL; - size_t total_edges_of_points = 0; - pgr_get_edges(edges_of_points_query, &edges_of_points, &total_edges_of_points, true, false, &err_msg); - throw_error(err_msg, edges_of_points_query); - - Edge_t *edges = NULL; - size_t total_edges = 0; - pgr_get_edges(edges_no_points_query, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_no_points_query); - - int64_t* start_pidsArr = NULL; - size_t size_start_pidsArr = 0; - int64_t* end_pidsArr = NULL; - size_t size_end_pidsArr = 0; - II_t_rt *combinationsArr = NULL; - size_t total_combinations = 0; - if (start_pid && end_pid) { - start_pidsArr = start_pid; size_start_pidsArr = 1; - end_pidsArr = end_pid; size_end_pidsArr = 1; - } else if (starts && ends) { - start_pidsArr = pgr_get_bigIntArray(&size_start_pidsArr, starts, false, &err_msg); - throw_error(err_msg, "While getting start pids"); - end_pidsArr = pgr_get_bigIntArray(&size_end_pidsArr, ends, false, &err_msg); - throw_error(err_msg, "While getting end pids"); - } else if (combinations_sql) { - pgr_get_combinations(combinations_sql, &combinationsArr, &total_combinations, &err_msg); - throw_error(err_msg, combinations_sql); - } - - pfree(edges_of_points_query); - pfree(edges_no_points_query); - - if ((total_edges + total_edges_of_points) == 0) { - if (end_pidsArr) pfree(end_pidsArr); - if (start_pidsArr) pfree(start_pidsArr); - if (combinationsArr) pfree(combinationsArr); - pgr_SPI_finish(); - return; - } - - if (total_combinations == 0 && (size_start_pidsArr== 0 || size_end_pidsArr == 0)) { - if (edges) pfree(edges); - pgr_SPI_finish(); - return; - } clock_t start_t = clock(); pgr_do_withPointsKsp( - edges, total_edges, - points, total_points, - edges_of_points, total_edges_of_points, - combinationsArr, total_combinations, - start_pidsArr, size_start_pidsArr, - end_pidsArr, size_end_pidsArr, + edges_no_points_query, + points_sql, + edges_of_points_query, + combinations_sql, + starts, ends, + start_vid, end_vid, k, directed, @@ -192,14 +139,6 @@ process( if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - if (edges) pfree(edges); - if (start_pid && end_pid) { - start_pidsArr = NULL; - end_pidsArr = NULL; - } - if (start_pidsArr) pfree(start_pidsArr); - if (end_pidsArr) pfree(end_pidsArr); - if (combinationsArr) pfree(combinationsArr); pgr_SPI_finish(); } diff --git a/src/ksp/withPoints_ksp_driver.cpp b/src/ksp/withPoints_ksp_driver.cpp index 9d15d836dd..4e842c2ca5 100644 --- a/src/ksp/withPoints_ksp_driver.cpp +++ b/src/ksp/withPoints_ksp_driver.cpp @@ -14,8 +14,6 @@ Mail: this.abhinav at gmail.com ------ - - This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -39,25 +37,25 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "c_types/ii_t_rt.h" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/combinations.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" - -#include "yen/pgr_ksp.hpp" #include "withPoints/pgr_withPoints.hpp" -using pgrouting::yen::Pgr_ksp; +#include "yen/pgr_ksp.hpp" -int +void pgr_do_withPointsKsp( - Edge_t *edges, size_t total_edges, - Point_on_edge_t *points_p, size_t total_points, - Edge_t *edges_of_points, size_t total_edges_of_points, + char *edges_sql, + char *points_sql, + char *edges_of_points_sql, + char *combinations_sql, + ArrayType *starts, + ArrayType *ends, - II_t_rt *combinationsArr, size_t total_combinations, - int64_t *start_pidsArr, size_t size_start_pidsArr, - int64_t *end_pidsArr, size_t size_end_pidsArr, + int64_t *start_vid, + int64_t *end_vid, size_t k, bool directed, @@ -73,27 +71,57 @@ pgr_do_withPointsKsp( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::yen::Pgr_ksp; + using pgrouting::utilities::get_combinations; + using pgrouting::pgget::get_points; + using pgrouting::pgget::get_edges; std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; + try { - pgassert(total_edges != 0); pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - pgassert(total_combinations != 0 || (size_start_pidsArr != 0 && size_end_pidsArr != 0)); - pgrouting::Pg_points_graph pg_graph( - std::vector( - points_p, - points_p + total_points), - std::vector< Edge_t >( - edges_of_points, - edges_of_points + total_edges_of_points), + hint = combinations_sql; + auto combinations = get_combinations(combinations_sql, starts, ends, true); + hint = nullptr; + + if (start_vid && end_vid) { + combinations[*start_vid].insert(*end_vid); + } + + if (combinations.empty() && combinations_sql) { + *notice_msg = pgr_msg("No (source, target) pairs found"); + *log_msg = pgr_msg(combinations_sql); + return; + } + + log << "Combinations size " << combinations.size(); + + hint = points_sql; + auto points = get_points(std::string(points_sql)); + + hint = edges_of_points_sql; + auto edges_of_points = get_edges(std::string(edges_of_points_sql), true, false); + + hint = edges_sql; + auto edges = get_edges(std::string(edges_sql), true, false); + + if (edges.size() + edges_of_points.size() == 0) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; + + pgrouting::Pg_points_graph pg_graph(points, edges_of_points, true, driving_side, directed); @@ -103,31 +131,27 @@ pgr_do_withPointsKsp( err << pg_graph.get_error(); *log_msg = pgr_msg(log.str().c_str()); *err_msg = pgr_msg(err.str().c_str()); - return -1; + return; } graphType gType = directed? DIRECTED: UNDIRECTED; - std::deque< Path > paths; - - auto combinations = total_combinations? - pgrouting::utilities::get_combinations(combinationsArr, total_combinations) - : pgrouting::utilities::get_combinations(start_pidsArr, size_start_pidsArr, end_pidsArr, size_end_pidsArr); + std::deque paths; - auto vertices(pgrouting::extract_vertices(edges, total_edges)); + auto vertices(pgrouting::extract_vertices(edges)); vertices = pgrouting::extract_vertices(vertices, pg_graph.new_edges()); if (directed) { pgrouting::DirectedGraph digraph(vertices, gType); - digraph.insert_edges(edges, total_edges); + digraph.insert_edges(edges); digraph.insert_edges(pg_graph.new_edges()); paths = pgrouting::algorithms::Yen(digraph, combinations, k, heap_paths); } else { pgrouting::UndirectedGraph undigraph(gType); - undigraph.insert_edges(edges, total_edges); + undigraph.insert_edges(edges); undigraph.insert_edges(pg_graph.new_edges()); paths = pgrouting::algorithms::Yen(undigraph, combinations, k, heap_paths); @@ -143,7 +167,11 @@ pgr_do_withPointsKsp( auto count(count_tuples(paths)); if (count == 0) { - return 0; + (*return_tuples) = NULL; + (*return_count) = 0; + notice << "No paths found"; + *log_msg = pgr_msg(notice.str().c_str()); + return; } @@ -157,7 +185,10 @@ pgr_do_withPointsKsp( } if (count != sequence) { - return 2; + (*return_count) = 0; + notice << "Something went wrong"; + *log_msg = pgr_msg(notice.str().c_str()); + return; } (*return_count) = sequence; @@ -167,13 +198,15 @@ pgr_do_withPointsKsp( *notice_msg = notice.str().empty()? *notice_msg : pgr_msg(notice.str().c_str()); - return 0; } catch (AssertFailedException &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; @@ -187,5 +220,4 @@ pgr_do_withPointsKsp( *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); } - return 1000; } From b6aa67c0920ae76c71e3a201c6f6cc29f822163f Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 24 Jan 2024 11:43:57 -0600 Subject: [PATCH 085/428] [linegraph] Reading data on C++ code --- .../pgtap_design_lineGraphFull.result | 2 + .../drivers/lineGraph/lineGraphFull_driver.h | 13 +-- include/drivers/lineGraph/lineGraph_driver.h | 22 ++--- src/lineGraph/lineGraph.c | 80 +------------------ src/lineGraph/lineGraphFull.c | 29 +------ src/lineGraph/lineGraphFull_driver.cpp | 31 ++++--- src/lineGraph/lineGraph_driver.cpp | 29 +++++-- 7 files changed, 61 insertions(+), 145 deletions(-) diff --git a/docqueries/lineGraph/pgtap_design_lineGraphFull.result b/docqueries/lineGraph/pgtap_design_lineGraphFull.result index 8041fb4d26..0085f595f0 100644 --- a/docqueries/lineGraph/pgtap_design_lineGraphFull.result +++ b/docqueries/lineGraph/pgtap_design_lineGraphFull.result @@ -54,6 +54,8 @@ SELECT id FROM vertices; SELECT * FROM pgr_lineGraphFull( $$SELECT id, source, target, cost FROM edges WHERE id = 1$$ ); +NOTICE: No edges found +HINT: SELECT id, source, target, cost FROM edges WHERE id = 1 seq | source | target | cost | edge -----+--------+--------+------+------ (0 rows) diff --git a/include/drivers/lineGraph/lineGraphFull_driver.h b/include/drivers/lineGraph/lineGraphFull_driver.h index c12b64032c..fa578e7b59 100644 --- a/include/drivers/lineGraph/lineGraphFull_driver.h +++ b/include/drivers/lineGraph/lineGraphFull_driver.h @@ -46,16 +46,11 @@ typedef struct Line_graph_full_rt Line_graph_full_rt; extern "C" { #endif - void - do_pgr_lineGraphFull( - Edge_t *data_edges, - size_t total_edges, - Line_graph_full_rt **return_tuples, - size_t *return_count, - char ** log_msg, - char ** notice_msg, - char ** err_msg); +void pgr_do_lineGraphFull( + char*, + Line_graph_full_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/include/drivers/lineGraph/lineGraph_driver.h b/include/drivers/lineGraph/lineGraph_driver.h index bbbc655037..7f1018ade7 100644 --- a/include/drivers/lineGraph/lineGraph_driver.h +++ b/include/drivers/lineGraph/lineGraph_driver.h @@ -45,23 +45,13 @@ typedef struct Edge_t Edge_t; extern "C" { #endif - /********************************************************* - TEXT, - directed BOOLEAN DEFAULT true, - ********************************************************/ - - - void - do_pgr_lineGraph( - Edge_t *data_edges, - size_t total_edges, - bool directed, - Edge_t **return_tuples, - size_t *return_count, - char ** log_msg, - char ** notice_msg, - char ** err_msg); +void pgr_do_lineGraph( + char*, + bool, + + Edge_t**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/src/lineGraph/lineGraph.c b/src/lineGraph/lineGraph.c index a6895672c7..bb4719d127 100644 --- a/src/lineGraph/lineGraph.c +++ b/src/lineGraph/lineGraph.c @@ -27,21 +27,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -/** @file lineGraph.c - * @brief Connecting code with postgres. - * - * This file is fully documented for understanding - * how the postgres connectinon works - * - * TODO Remove unnecessary comments before submiting the function. - * some comments are in form of PGR_DBG message - */ - -/** - * postgres_connection.h - * - * - should always be first in the C code - */ #include #include "c_common/postgres_connection.h" @@ -50,16 +35,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" -#include "drivers/lineGraph/lineGraph_driver.h" // the link to the C++ code of the function +#include "drivers/lineGraph/lineGraph_driver.h" PGDLLEXPORT Datum _pgr_linegraph(PG_FUNCTION_ARGS); PG_FUNCTION_INFO_V1(_pgr_linegraph); -/******************************************************************************/ -/* MODIFY AS NEEDED */ static void process( @@ -67,15 +49,6 @@ process( bool directed, Edge_t **result_tuples, size_t *result_count) { - /* - * https://www.postgresql.org/docs/current/static/spi-spi-connect.html - */ - PGR_DBG("\nSQL QUERY: %s\n", edges_sql); - if (directed) { - PGR_DBG("\nDirectedGraph\n"); - } else { - PGR_DBG("\nUndirectedGraph\n"); - } pgr_SPI_connect(); char* log_msg = NULL; char* notice_msg = NULL; @@ -84,25 +57,10 @@ process( (*result_tuples) = NULL; (*result_count) = 0; - PGR_DBG("Load data"); - Edge_t *edges = NULL; - size_t total_edges = 0; - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - PGR_DBG("Total %ld edges in query:", total_edges); - - if (total_edges == 0) { - PGR_DBG("No edges found"); - pgr_SPI_finish(); - return; - } - - PGR_DBG("Starting processing"); clock_t start_t = clock(); - do_pgr_lineGraph( - edges, - total_edges, + pgr_do_lineGraph( + edges_sql, + directed, result_tuples, result_count, @@ -111,34 +69,25 @@ process( &err_msg); time_msg(" processing pgr_lineGraph", start_t, clock()); - PGR_DBG("Returning %ld tuples", *result_count); if (err_msg) { if (*result_tuples) pfree(*result_tuples); } pgr_global_report(log_msg, notice_msg, err_msg); - if (edges) pfree(edges); if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); pgr_SPI_finish(); } -/* */ -/******************************************************************************/ PGDLLEXPORT Datum _pgr_linegraph(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; - /**************************************************************************/ - /* MODIFY AS NEEDED */ - /* */ Edge_t *result_tuples = NULL; size_t result_count = 0; - /* */ - /**************************************************************************/ if (SRF_IS_FIRSTCALL()) { MemoryContext oldcontext; @@ -146,25 +95,12 @@ PGDLLEXPORT Datum _pgr_linegraph(PG_FUNCTION_ARGS) { oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - /**********************************************************************/ - /* MODIFY AS NEEDED */ - /* - TEXT, - directed BOOLEAN DEFAULT true, - **********************************************************************/ - - - PGR_DBG("Calling process"); process( text_to_cstring(PG_GETARG_TEXT_P(0)), PG_GETARG_BOOL(1), &result_tuples, &result_count); - - /* */ - /**********************************************************************/ - funcctx->max_calls = result_count; funcctx->user_fctx = result_tuples; if (get_call_result_type(fcinfo, NULL, &tuple_desc) @@ -198,7 +134,6 @@ PGDLLEXPORT Datum _pgr_linegraph(PG_FUNCTION_ARGS) { nulls[i] = false; } - // postgres starts counting from 1 values[0] = Int32GetDatum((int32_t)funcctx->call_cntr + 1); values[1] = Int64GetDatum(result_tuples[funcctx->call_cntr].source); values[2] = Int64GetDatum(result_tuples[funcctx->call_cntr].target); @@ -210,13 +145,6 @@ PGDLLEXPORT Datum _pgr_linegraph(PG_FUNCTION_ARGS) { result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); } else { - /**********************************************************************/ - /* MODIFY AS NEEDED */ - - PGR_DBG("Clean up code"); - - /**********************************************************************/ - SRF_RETURN_DONE(funcctx); } } diff --git a/src/lineGraph/lineGraphFull.c b/src/lineGraph/lineGraphFull.c index 9e5f3accfa..d677d490ad 100644 --- a/src/lineGraph/lineGraphFull.c +++ b/src/lineGraph/lineGraphFull.c @@ -34,7 +34,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "drivers/lineGraph/lineGraphFull_driver.h" PGDLLEXPORT Datum _pgr_linegraphfull(PG_FUNCTION_ARGS); @@ -46,8 +45,6 @@ process( char* edges_sql, Line_graph_full_rt **result_tuples, size_t *result_count) { - PGR_DBG("\nSQL QUERY: %s\n", edges_sql); - PGR_DBG("\nDirectedGraph\n"); pgr_SPI_connect(); char* log_msg = NULL; char* notice_msg = NULL; @@ -56,33 +53,16 @@ process( (*result_tuples) = NULL; (*result_count) = 0; - PGR_DBG("Load data"); - Edge_t *edges = NULL; - size_t total_edges = 0; - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - PGR_DBG("Total %ld edges in query:", total_edges); - - if (total_edges == 0) { - PGR_DBG("No edges found"); - pgr_SPI_finish(); - return; - } - - PGR_DBG("Starting processing"); clock_t start_t = clock(); - do_pgr_lineGraphFull( - edges, - total_edges, + pgr_do_lineGraphFull( + edges_sql, + result_tuples, result_count, &log_msg, ¬ice_msg, &err_msg); - time_msg(" processing pgr_lineGraphFull", start_t, clock()); - PGR_DBG("Returning %ld tuples", *result_count); if (err_msg) { if (*result_tuples) pfree(*result_tuples); @@ -90,15 +70,12 @@ process( pgr_global_report(log_msg, notice_msg, err_msg); - if (edges) pfree(edges); if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); pgr_SPI_finish(); } -/* */ -/******************************************************************************/ PGDLLEXPORT Datum _pgr_linegraphfull(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; diff --git a/src/lineGraph/lineGraphFull_driver.cpp b/src/lineGraph/lineGraphFull_driver.cpp index c484741169..25fbbca11f 100644 --- a/src/lineGraph/lineGraphFull_driver.cpp +++ b/src/lineGraph/lineGraphFull_driver.cpp @@ -33,15 +33,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "dijkstra/dijkstra.hpp" - #include "c_types/line_graph_full_rt.h" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" #include "lineGraph/pgr_lineGraphFull.hpp" #include "cpp_common/linear_directed_graph.h" +#include "dijkstra/dijkstra.hpp" + namespace { void get_turn_penalty_postgres_result( @@ -65,9 +66,9 @@ void get_turn_penalty_postgres_result( } // namespace void -do_pgr_lineGraphFull( - Edge_t *data_edges, - size_t total_edges, +pgr_do_lineGraphFull( + char *edges_sql, + Line_graph_full_rt **return_tuples, size_t *return_count, char ** log_msg, @@ -79,22 +80,29 @@ do_pgr_lineGraphFull( std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; + try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - pgassert(total_edges != 0); + + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; graphType gType = DIRECTED; pgrouting::DirectedGraph digraph(gType); - digraph.insert_edges_neg(data_edges, total_edges); + digraph.insert_edges_neg(edges); -#if 0 - log << digraph << "\n"; -#endif pgrouting::graph::Pgr_lineGraphFull< pgrouting::LinearDirectedGraph, pgrouting::Line_vertex, @@ -137,6 +145,9 @@ do_pgr_lineGraphFull( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; diff --git a/src/lineGraph/lineGraph_driver.cpp b/src/lineGraph/lineGraph_driver.cpp index ed5a5b94ef..2d07aa3f24 100644 --- a/src/lineGraph/lineGraph_driver.cpp +++ b/src/lineGraph/lineGraph_driver.cpp @@ -34,13 +34,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "dijkstra/dijkstra.hpp" - +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" +#include "cpp_common/linear_directed_graph.h" #include "lineGraph/pgr_lineGraph.hpp" -#include "cpp_common/linear_directed_graph.h" namespace { @@ -60,9 +59,9 @@ void get_postgres_result( } // namespace void -do_pgr_lineGraph( - Edge_t *data_edges, - size_t total_edges, +pgr_do_lineGraph( + char *edges_sql, + bool directed, Edge_t **return_tuples, size_t *return_count, @@ -75,18 +74,29 @@ do_pgr_lineGraph( std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; + try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - pgassert(total_edges != 0); + + + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; graphType gType = directed? DIRECTED: UNDIRECTED; pgrouting::DirectedGraph digraph(gType); - digraph.insert_edges_neg(data_edges, total_edges); + digraph.insert_edges_neg(edges); log << digraph << "\n"; pgrouting::graph::Pgr_lineGraph< @@ -125,6 +135,9 @@ do_pgr_lineGraph( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; From 79bbfa5a8c0097a4596a55b92a15157981e16093 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 24 Jan 2024 11:48:18 -0600 Subject: [PATCH 086/428] [max_flow] Reading data on C++ code --- .../max_flow/edge_disjoint_paths_driver.h | 42 +++--- include/drivers/max_flow/max_flow_driver.h | 45 +++---- .../maximum_cardinality_matching_driver.h | 10 +- .../drivers/max_flow/minCostMaxFlow_driver.h | 43 +++--- .../pgr_maximumcardinalitymatching.hpp | 18 +-- src/max_flow/edge_disjoint_paths.c | 59 +------- src/max_flow/edge_disjoint_paths_driver.cpp | 54 +++++--- src/max_flow/max_flow.c | 70 ++-------- src/max_flow/max_flow_driver.cpp | 69 +++++----- src/max_flow/maximum_cardinality_matching.c | 32 +---- .../maximum_cardinality_matching_driver.cpp | 26 +++- src/max_flow/minCostMaxFlow.c | 126 +----------------- src/max_flow/minCostMaxFlow_driver.cpp | 83 +++++++----- 13 files changed, 238 insertions(+), 439 deletions(-) diff --git a/include/drivers/max_flow/edge_disjoint_paths_driver.h b/include/drivers/max_flow/edge_disjoint_paths_driver.h index 785531b7c7..0b11e46d6c 100644 --- a/include/drivers/max_flow/edge_disjoint_paths_driver.h +++ b/include/drivers/max_flow/edge_disjoint_paths_driver.h @@ -31,19 +31,27 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_MAX_FLOW_EDGE_DISJOINT_PATHS_DRIVER_H_ #pragma once -/* for size-t */ +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#include "cpp_common/undefPostgresDefine.hpp" + #ifdef __cplusplus # include # include -using Edge_t = struct Edge_t; using Path_rt = struct Path_rt; -using II_t_rt = struct II_t_rt; #else # include # include -typedef struct Edge_t Edge_t; typedef struct Path_rt Path_rt; -typedef struct II_t_rt II_t_rt; #endif @@ -51,23 +59,15 @@ typedef struct II_t_rt II_t_rt; extern "C" { #endif - void - do_pgr_edge_disjoint_paths( - Edge_t *data_edges, - size_t total_tuples, - II_t_rt *combinations, - size_t total_combinations, - int64_t *source_vertices, - size_t size_source_verticesArr, - int64_t *sink_vertices, - size_t size_sink_verticesArr, - bool directed, - Path_rt **return_tuples, - size_t *return_count, - char** log_msg, - char** notice_msg, - char** err_msg); +void pgr_do_edge_disjoint_paths( + char*, + char*, + ArrayType*, ArrayType*, + + bool, + Path_rt**, size_t *, + char**, char**, char**); #ifdef __cplusplus } diff --git a/include/drivers/max_flow/max_flow_driver.h b/include/drivers/max_flow/max_flow_driver.h index e7d485607d..5641624ee5 100644 --- a/include/drivers/max_flow/max_flow_driver.h +++ b/include/drivers/max_flow/max_flow_driver.h @@ -31,45 +31,42 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_MAX_FLOW_MAX_FLOW_DRIVER_H_ #pragma once -/* for size-t */ +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#include "cpp_common/undefPostgresDefine.hpp" + #ifdef __cplusplus # include # include -using Edge_t = struct Edge_t; using Flow_t = struct Flow_t; -using II_t_rt = struct II_t_rt; #else # include # include -typedef struct Edge_t Edge_t; typedef struct Flow_t Flow_t; -typedef struct II_t_rt II_t_rt; #endif #ifdef __cplusplus extern "C" { #endif - void - do_pgr_max_flow( - Edge_t *data_edges, - size_t total_tuples, - - II_t_rt *combinations, - size_t total_combinations, - - int64_t* source_vertices, - size_t size_source_verticesArr, - int64_t* sink_vertices, - size_t size_sink_verticesArr, - int algorithm, - bool only_flow, - Flow_t **return_tuples, - size_t *return_count, - char** log_msg, - char** notice_msg, - char** err_msg); +void pgr_do_max_flow( + char*, + char*, + ArrayType*, ArrayType*, + + int, bool, + Flow_t**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/include/drivers/max_flow/maximum_cardinality_matching_driver.h b/include/drivers/max_flow/maximum_cardinality_matching_driver.h index d720e99588..a8e917b89c 100644 --- a/include/drivers/max_flow/maximum_cardinality_matching_driver.h +++ b/include/drivers/max_flow/maximum_cardinality_matching_driver.h @@ -34,10 +34,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #ifdef __cplusplus -using Edge_bool_t = struct Edge_bool_t; using Only_int_rt = struct Only_int_rt; #else -typedef struct Edge_bool_t Edge_bool_t; typedef struct Only_int_rt Only_int_rt; #endif @@ -45,9 +43,11 @@ typedef struct Only_int_rt Only_int_rt; extern "C" { #endif - void - do_pgr_maximum_cardinality_matching( - Edge_bool_t*, size_t, bool, +void pgr_do_maximum_cardinality_matching( + char*, + + bool, + Only_int_rt **, size_t *, char**, char**, char **); diff --git a/include/drivers/max_flow/minCostMaxFlow_driver.h b/include/drivers/max_flow/minCostMaxFlow_driver.h index 2b0b7c8e91..d09087c9d9 100644 --- a/include/drivers/max_flow/minCostMaxFlow_driver.h +++ b/include/drivers/max_flow/minCostMaxFlow_driver.h @@ -31,19 +31,27 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_MAX_FLOW_MINCOSTMAXFLOW_DRIVER_H_ #pragma once -/* for size-t */ +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#include "cpp_common/undefPostgresDefine.hpp" + #ifdef __cplusplus # include # include -using CostFlow_t = struct CostFlow_t; using Flow_t = struct Flow_t; -using II_t_rt = struct II_t_rt; #else # include # include typedef struct Flow_t Flow_t; -typedef struct Flow_t Flow_t; -typedef struct II_t_rt II_t_rt; #endif @@ -52,22 +60,15 @@ typedef struct II_t_rt II_t_rt; extern "C" { #endif - void - do_pgr_minCostMaxFlow( - CostFlow_t *data_edges, - size_t total_edges, - II_t_rt *combinations, - size_t total_combinations, - int64_t* source_vertices, - size_t size_source_verticesArr, - int64_t* sink_vertices, - size_t size_sink_verticesArr, - bool only_cost, - Flow_t **return_tuples, - size_t *return_count, - char ** log_msg, - char ** notice_msg, - char ** err_msg); +void pgr_do_minCostMaxFlow( + char*, + char*, + ArrayType*, ArrayType*, + + bool, + + Flow_t**, size_t*, + char**, char**, char**); #ifdef __cplusplus diff --git a/include/max_flow/pgr_maximumcardinalitymatching.hpp b/include/max_flow/pgr_maximumcardinalitymatching.hpp index 5118f979f8..e082f44c66 100644 --- a/include/max_flow/pgr_maximumcardinalitymatching.hpp +++ b/include/max_flow/pgr_maximumcardinalitymatching.hpp @@ -77,11 +77,11 @@ class PgrCardinalityGraph { return E_to_id[e]; } - PgrCardinalityGraph(Edge_bool_t *data_edges, size_t total_tuples) { + explicit PgrCardinalityGraph(const std::vector &edges) { std::set vertices; - for (size_t i = 0; i < total_tuples; ++i) { - vertices.insert(data_edges[i].source); - vertices.insert(data_edges[i].target); + for (const auto &e : edges) { + vertices.insert(e.source); + vertices.insert(e.target); } for (int64_t id : vertices) { V v = add_vertex(boost_graph); @@ -90,14 +90,14 @@ class PgrCardinalityGraph { } bool added; - for (size_t i = 0; i < total_tuples; ++i) { - V v1 = get_boost_vertex(data_edges[i].source); - V v2 = get_boost_vertex(data_edges[i].target); + for (const auto &e : edges) { + V v1 = get_boost_vertex(e.source); + V v2 = get_boost_vertex(e.target); E e1; E e2; - if (data_edges[i].going) { + if (e.going) { boost::tie(e1, added) = boost::add_edge(v1, v2, boost_graph); - E_to_id.insert(std::pair(e1, data_edges[i].id)); + E_to_id.insert(std::pair(e1, e.id)); } } } diff --git a/src/max_flow/edge_disjoint_paths.c b/src/max_flow/edge_disjoint_paths.c index 399a033430..cab17488b8 100644 --- a/src/max_flow/edge_disjoint_paths.c +++ b/src/max_flow/edge_disjoint_paths.c @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: edge_disjoint_paths_many_to_many.c +File: edge_disjoint_paths.c Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -35,7 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "drivers/max_flow/edge_disjoint_paths_driver.h" PGDLLEXPORT Datum @@ -57,54 +56,11 @@ process( char* notice_msg = NULL; char* err_msg = NULL; - int64_t *source_vertices = NULL; - size_t size_source_verticesArr = 0; - - int64_t *sink_vertices = NULL; - size_t size_sink_verticesArr = 0; - - - Edge_t *edges = NULL; - size_t total_edges = 0; - - II_t_rt *combinations = NULL; - size_t total_combinations = 0; - - if (starts && ends) { - source_vertices = pgr_get_bigIntArray(&size_source_verticesArr, starts, false, &err_msg); - throw_error(err_msg, "While getting start vids"); - sink_vertices = pgr_get_bigIntArray(&size_sink_verticesArr, ends, false, &err_msg); - throw_error(err_msg, "While getting end_vids"); - } else if (combinations_sql) { - pgr_get_combinations(combinations_sql, &combinations, &total_combinations, &err_msg); - throw_error(err_msg, combinations_sql); - if (total_combinations == 0) { - if (combinations) - pfree(combinations); - pgr_SPI_finish(); - return; - } - } - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - - if (total_edges == 0) { - if (source_vertices) pfree(source_vertices); - if (sink_vertices) pfree(sink_vertices); - pgr_SPI_finish(); - return; - } - - - PGR_DBG("Starting timer"); clock_t start_t = clock(); - - do_pgr_edge_disjoint_paths( - edges, total_edges, - combinations, total_combinations, - source_vertices, size_source_verticesArr, - sink_vertices, size_sink_verticesArr, + pgr_do_edge_disjoint_paths( + edges_sql, + combinations_sql, + starts, ends, directed, result_tuples, result_count, @@ -112,13 +68,8 @@ process( &log_msg, ¬ice_msg, &err_msg); - time_msg("pgr_edgeDisjointPaths(many to many)", start_t, clock()); - if (edges) pfree(edges); - if (source_vertices) pfree(source_vertices); - if (sink_vertices) pfree(sink_vertices); - if (err_msg && (*result_tuples)) { pfree(*result_tuples); (*result_tuples) = NULL; diff --git a/src/max_flow/edge_disjoint_paths_driver.cpp b/src/max_flow/edge_disjoint_paths_driver.cpp index 5d4fe41859..ea4cc00025 100644 --- a/src/max_flow/edge_disjoint_paths_driver.cpp +++ b/src/max_flow/edge_disjoint_paths_driver.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: edge_disjoint_paths_many_to_many_driver.cpp +File: edge_disjoint_paths_driver.cpp Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -35,10 +35,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "max_flow/pgr_maxflow.hpp" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/combinations.hpp" #include "cpp_common/identifiers.hpp" -#include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_alloc.hpp" #include "c_types/ii_t_rt.h" @@ -69,15 +70,11 @@ single_execution( } // namespace void -do_pgr_edge_disjoint_paths( - Edge_t *data_edges, - size_t total_edges, - II_t_rt *combinations, - size_t total_combinations, - int64_t *sources, - size_t size_source_verticesArr, - int64_t *sinks, - size_t size_sink_verticesArr, +pgr_do_edge_disjoint_paths( + char *edges_sql, + char *combinations_sql, + ArrayType *starts, + ArrayType *ends, bool directed, Path_rt **return_tuples, size_t *return_count, @@ -87,30 +84,42 @@ do_pgr_edge_disjoint_paths( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::utilities::get_combinations; std::ostringstream log; std::ostringstream notice; std::ostringstream err; + char* hint = nullptr; + try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - pgassert(data_edges); - pgassert(total_edges != 0); - pgassert((sources && sinks) || combinations); - pgassert((size_source_verticesArr && size_sink_verticesArr) || total_combinations); - auto combinations_data = total_combinations? - pgrouting::utilities::get_combinations(combinations, total_combinations) - : pgrouting::utilities::get_combinations(sources, size_source_verticesArr, sinks, size_sink_verticesArr); + hint = combinations_sql; + auto combinations = get_combinations(combinations_sql, starts, ends, true); + hint = nullptr; - std::vector edges( - data_edges, data_edges + total_edges); + if (combinations.empty() && combinations_sql) { + *notice_msg = pgr_msg("No (source, target) pairs found"); + *log_msg = pgr_msg(combinations_sql); + return; + } + + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); + hint = nullptr; + + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(edges_sql) : pgr_msg(log.str().c_str()); + return; + } std::vector paths; - for (const auto &c : combinations_data) { + for (const auto &c : combinations) { for (const auto &t : c.second) { /* * a source can not be a sink @@ -192,6 +201,9 @@ do_pgr_edge_disjoint_paths( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch(...) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; diff --git a/src/max_flow/max_flow.c b/src/max_flow/max_flow.c index 4d912d36bc..4535dbbb7d 100644 --- a/src/max_flow/max_flow.c +++ b/src/max_flow/max_flow.c @@ -34,7 +34,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "drivers/max_flow/max_flow_driver.h" #include "c_types/flow_t.h" @@ -62,56 +61,12 @@ process( char* notice_msg = NULL; char* err_msg = NULL; - int64_t *source_vertices = NULL; - size_t size_source_verticesArr = 0; - - int64_t *sink_vertices = NULL; - size_t size_sink_verticesArr = 0; - - Edge_t *edges = NULL; - size_t total_edges = 0; - - II_t_rt *combinations = NULL; - size_t total_combinations = 0; - - if (starts && ends) { - source_vertices = pgr_get_bigIntArray(&size_source_verticesArr, starts, false, &err_msg); - throw_error(err_msg, "While getting start vids"); - sink_vertices = pgr_get_bigIntArray(&size_sink_verticesArr, ends, false, &err_msg); - throw_error(err_msg, "While getting end vids"); - } else if (combinations_sql) { - pgr_get_combinations(combinations_sql, &combinations, &total_combinations, &err_msg); - throw_error(err_msg, combinations_sql); - if (total_combinations == 0) { - if (combinations) - pfree(combinations); - pgr_SPI_finish(); - return; - } - } - - /* NOTE: - * For flow, cost and reverse_cost are really capacity and reverse_capacity - */ - pgr_get_flow_edges(edges_sql, &edges, &total_edges, &err_msg); - throw_error(err_msg, edges_sql); - - if (total_edges == 0) { - if (source_vertices) pfree(source_vertices); - if (sink_vertices) pfree(sink_vertices); - pgr_SPI_finish(); - return; - } - - - PGR_DBG("Starting timer"); clock_t start_t = clock(); + pgr_do_max_flow( + edges_sql, + combinations_sql, + starts, ends, - do_pgr_max_flow( - edges, total_edges, - combinations, total_combinations, - source_vertices, size_source_verticesArr, - sink_vertices, size_sink_verticesArr, algorithm, only_flow, @@ -122,24 +77,15 @@ process( &err_msg); if (only_flow) { - time_msg("pgr_maxFlow(many to many)", - start_t, clock()); + time_msg("pgr_maxFlow(many to many)", start_t, clock()); } else if (algorithm == 1) { - time_msg("pgr_maxFlowPushRelabel(many to many)", - start_t, clock()); + time_msg("pgr_maxFlowPushRelabel(many to many)", start_t, clock()); } else if (algorithm == 3) { - time_msg("pgr_maxFlowEdmondsKarp(many to many)", - start_t, clock()); + time_msg("pgr_maxFlowEdmondsKarp(many to many)", start_t, clock()); } else { - time_msg("pgr_maxFlowBoykovKolmogorov(many to many)", - start_t, clock()); + time_msg("pgr_maxFlowBoykovKolmogorov(many to many)", start_t, clock()); } - - if (edges) pfree(edges); - if (source_vertices) pfree(source_vertices); - if (sink_vertices) pfree(sink_vertices); - if (err_msg && (*result_tuples)) { pfree(*result_tuples); (*result_tuples) = NULL; diff --git a/src/max_flow/max_flow_driver.cpp b/src/max_flow/max_flow_driver.cpp index bc82a2aac3..f577fd4f82 100644 --- a/src/max_flow/max_flow_driver.cpp +++ b/src/max_flow/max_flow_driver.cpp @@ -35,17 +35,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "max_flow/pgr_maxflow.hpp" +#include "cpp_common/combinations.hpp" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_assert.h" #include "cpp_common/pgr_alloc.hpp" #include "c_types/ii_t_rt.h" void -do_pgr_max_flow( - Edge_t *data_edges, size_t total_edges, - II_t_rt *combinations, size_t total_combinations, - int64_t *source_vertices, size_t size_source_verticesArr, - int64_t *sink_vertices, size_t size_sink_verticesArr, +pgr_do_max_flow( + char *edges_sql, + char *combinations_sql, + ArrayType *starts, + ArrayType *ends, + int algorithm, bool only_flow, @@ -56,10 +59,12 @@ do_pgr_max_flow( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::utilities::get_combinations; std::ostringstream log; std::ostringstream notice; std::ostringstream err; + char* hint = nullptr; try { pgassert(!(*log_msg)); @@ -67,39 +72,41 @@ do_pgr_max_flow( pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - pgassert(data_edges); - pgassert(total_edges != 0); - pgassert((source_vertices && sink_vertices) || combinations); - pgassert((size_source_verticesArr && size_sink_verticesArr) || total_combinations); - - std::vector edges(data_edges, data_edges + total_edges); - std::set sources( - source_vertices, source_vertices + size_source_verticesArr); - std::set targets( - sink_vertices, sink_vertices + size_sink_verticesArr); - std::vector< II_t_rt > combinations_vector( - combinations, combinations + total_combinations); - - if (!combinations_vector.empty()) { - pgassert(sources.empty()); - pgassert(targets.empty()); - - for (const II_t_rt &comb : combinations_vector) { - sources.insert(comb.d1.source); - targets.insert(comb.d2.target); - } + + hint = combinations_sql; + auto combinations = get_combinations(combinations_sql, starts, ends, true); + hint = nullptr; + + if (combinations.empty() && combinations_sql) { + *notice_msg = pgr_msg("No (source, target) pairs found"); + *log_msg = pgr_msg(combinations_sql); + return; + } + + std::set sources; + std::set targets; + for (const auto &c : combinations) { + sources.insert(c.first); + targets.insert(c.second.begin(), c.second.end()); } std::set vertices(sources); vertices.insert(targets.begin(), targets.end()); - if (vertices.size() - != (sources.size() + targets.size())) { + if (vertices.size() != (sources.size() + targets.size())) { *err_msg = pgr_msg("A source found as sink"); - // TODO(vicky) return as hint the sources that are also sinks return; } + hint = edges_sql; + auto edges = pgrouting::pgget::get_flow_edges(std::string(edges_sql)); + hint = nullptr; + + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = edges_sql; + return; + } pgrouting::graph::PgrFlowGraph digraph( @@ -160,6 +167,9 @@ do_pgr_max_flow( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch(...) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; @@ -168,4 +178,3 @@ do_pgr_max_flow( *log_msg = pgr_msg(log.str().c_str()); } } - diff --git a/src/max_flow/maximum_cardinality_matching.c b/src/max_flow/maximum_cardinality_matching.c index e5486aa027..ee63ff8f11 100644 --- a/src/max_flow/maximum_cardinality_matching.c +++ b/src/max_flow/maximum_cardinality_matching.c @@ -34,7 +34,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "c_types/edge_bool_t_rt.h" @@ -44,8 +43,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. PGDLLEXPORT Datum _pgr_maxcardinalitymatch(PG_FUNCTION_ARGS); -/******************************************************************************/ -/* MODIFY AS NEEDED */ static void process( @@ -58,21 +55,9 @@ process( char* notice_msg = NULL; char* err_msg = NULL; - Edge_bool_t* edges = NULL; - size_t total_edges = 0; - pgr_get_basic_edges(edges_sql, &edges, &total_edges, &err_msg); - throw_error(err_msg, edges_sql); - - if (total_edges == 0) { - pgr_SPI_finish(); - return; - } - - PGR_DBG("Starting timer"); clock_t start_t = clock(); - - do_pgr_maximum_cardinality_matching( - edges, total_edges, + pgr_do_maximum_cardinality_matching( + edges_sql, directed, result_tuples, result_count, @@ -80,11 +65,8 @@ process( &log_msg, ¬ice_msg, &err_msg); - time_msg("pgr_maximumCardinalityMatching()", start_t, clock()); - if (edges) pfree(edges); - if (err_msg && (*result_tuples)) { pfree(*result_tuples); (*result_tuples) = NULL; @@ -97,7 +79,6 @@ process( if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - pgr_SPI_finish(); } @@ -109,7 +90,6 @@ _pgr_maxcardinalitymatch(PG_FUNCTION_ARGS) { Only_int_rt* result_tuples = NULL; size_t result_count = 0; - /**************************************************************************/ if (SRF_IS_FIRSTCALL()) { MemoryContext oldcontext; @@ -117,16 +97,12 @@ _pgr_maxcardinalitymatch(PG_FUNCTION_ARGS) { oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - /**********************************************************************/ - PGR_DBG("Calling process"); process( text_to_cstring(PG_GETARG_TEXT_P(0)), PG_GETARG_BOOL(1), &result_tuples, &result_count); - /**********************************************************************/ - funcctx->max_calls = result_count; funcctx->user_fctx = result_tuples; if (get_call_result_type(fcinfo, NULL, &tuple_desc) @@ -151,8 +127,6 @@ _pgr_maxcardinalitymatch(PG_FUNCTION_ARGS) { Datum *values; bool *nulls; - /**********************************************************************/ - values = palloc(4 * sizeof(Datum)); nulls = palloc(4 * sizeof(bool)); @@ -167,8 +141,6 @@ _pgr_maxcardinalitymatch(PG_FUNCTION_ARGS) { values[2] = Int64GetDatum(result_tuples[funcctx->call_cntr].source); values[3] = Int64GetDatum(result_tuples[funcctx->call_cntr].target); - /**********************************************************************/ - tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); diff --git a/src/max_flow/maximum_cardinality_matching_driver.cpp b/src/max_flow/maximum_cardinality_matching_driver.cpp index cd9c6d6a36..5c5299a3ba 100644 --- a/src/max_flow/maximum_cardinality_matching_driver.cpp +++ b/src/max_flow/maximum_cardinality_matching_driver.cpp @@ -36,17 +36,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "max_flow/pgr_maximumcardinalitymatching.hpp" +#include "c_types/edge_bool_t_rt.h" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" +#include "max_flow/pgr_maximumcardinalitymatching.hpp" -#include "c_types/edge_bool_t_rt.h" void -do_pgr_maximum_cardinality_matching( - Edge_bool_t *data_edges, - size_t total_tuples, +pgr_do_maximum_cardinality_matching( + char *edges_sql, /* TODO(v4) flag directed is to be removed */ bool, @@ -63,9 +63,20 @@ do_pgr_maximum_cardinality_matching( std::ostringstream log; std::ostringstream notice; std::ostringstream err; + char* hint = nullptr; try { - pgrouting::flow::PgrCardinalityGraph G(data_edges, total_tuples); + hint = edges_sql; + auto edges = pgrouting::pgget::get_basic_edges(std::string(edges_sql)); + + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; + + pgrouting::flow::PgrCardinalityGraph G(edges); auto matched_vertices = G.get_matched_vertices(); (*return_tuples) = pgr_alloc(matched_vertices.size(), (*return_tuples)); @@ -86,6 +97,9 @@ do_pgr_maximum_cardinality_matching( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; diff --git a/src/max_flow/minCostMaxFlow.c b/src/max_flow/minCostMaxFlow.c index de014efd26..f1301dc36f 100644 --- a/src/max_flow/minCostMaxFlow.c +++ b/src/max_flow/minCostMaxFlow.c @@ -28,29 +28,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -/** @file minCostMaxFlow.c - * @brief Connecting code with postgres. - * - * This file is fully documented for understanding - * how the postgres connectinon works - * - * TODO Remove unnecessary comments before submiting the function. - * some comments are in form of PGR_DBG message - */ - -/** - * postgres_connection.h - * - * - should always be first in the C code - */ #include #include "c_common/postgres_connection.h" #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" - #include "drivers/max_flow/minCostMaxFlow_driver.h" #include "c_types/flow_t.h" @@ -59,8 +42,6 @@ PGDLLEXPORT Datum _pgr_maxflowmincost(PG_FUNCTION_ARGS); PG_FUNCTION_INFO_V1(_pgr_maxflowmincost); -/******************************************************************************/ -/* MODIFY AS NEEDED */ static void process( @@ -71,65 +52,16 @@ process( bool only_cost, Flow_t **result_tuples, size_t *result_count) { - /* - * https://www.postgresql.org/docs/current/static/spi-spi-connect.html - */ pgr_SPI_connect(); char* log_msg = NULL; char* notice_msg = NULL; char* err_msg = NULL; - int64_t *sourceVertices = NULL; - size_t sizeSourceVerticesArr = 0; - - int64_t *sinkVertices = NULL; - size_t sizeSinkVerticesArr = 0; - - PGR_DBG("Load data"); - CostFlow_t *edges = NULL; - size_t total_edges = 0; - - II_t_rt *combinations = NULL; - size_t total_combinations = 0; - - if (starts && ends) { - sourceVertices = pgr_get_bigIntArray(&sizeSourceVerticesArr, starts, false, &err_msg); - throw_error(err_msg, "While getting start vids"); - sinkVertices = pgr_get_bigIntArray(&sizeSinkVerticesArr, ends, false, &err_msg); - throw_error(err_msg, "While getting end vids"); - } else if (combinations_sql) { - pgr_get_combinations(combinations_sql, &combinations, &total_combinations, &err_msg); - throw_error(err_msg, combinations_sql); - if (total_combinations == 0) { - if (combinations) - pfree(combinations); - pgr_SPI_finish(); - return; - } - } - - pgr_get_costFlow_edges(edges_sql, &edges, &total_edges, &err_msg); - throw_error(err_msg, edges_sql); - PGR_DBG("Total %ld edges in query:", total_edges); - - if (total_edges == 0) { - if (sourceVertices) - pfree(sourceVertices); - if (sinkVertices) - pfree(sinkVertices); - PGR_DBG("No edges found"); - pgr_SPI_finish(); - return; - } - - PGR_DBG("Starting processing"); clock_t start_t = clock(); - - do_pgr_minCostMaxFlow( - edges, total_edges, - combinations, total_combinations, - sourceVertices, sizeSourceVerticesArr, - sinkVertices, sizeSinkVerticesArr, + pgr_do_minCostMaxFlow( + edges_sql, + combinations_sql, + starts, ends, only_cost, result_tuples, result_count, @@ -137,22 +69,12 @@ process( &log_msg, ¬ice_msg, &err_msg); - if (only_cost) { time_msg(" processing pgr_minCostMaxFlow_Cost", start_t, clock()); } else { time_msg(" processing pgr_minCostMaxFlow", start_t, clock()); } - PGR_DBG("Returning %ld tuples", *result_count); - - if (edges) - pfree(edges); - if (sourceVertices) - pfree(sourceVertices); - if (sinkVertices) - pfree(sinkVertices); - if (err_msg && (*result_tuples)) { pfree(*result_tuples); (*result_tuples) = NULL; @@ -167,20 +89,13 @@ process( pgr_SPI_finish(); } -/* */ -/******************************************************************************/ PGDLLEXPORT Datum _pgr_maxflowmincost(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; - /**************************************************************************/ - /* MODIFY AS NEEDED */ - /* */ Flow_t *result_tuples = NULL; size_t result_count = 0; - /* */ - /**************************************************************************/ if (SRF_IS_FIRSTCALL()) { MemoryContext oldcontext; @@ -188,17 +103,6 @@ PGDLLEXPORT Datum _pgr_maxflowmincost(PG_FUNCTION_ARGS) { oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - /**********************************************************************/ - /* MODIFY AS NEEDED */ - /* - TEXT, - BIGINT, - BIGINT, - **********************************************************************/ - - - PGR_DBG("Calling process"); - if (PG_NARGS() == 4) { /* * many to many @@ -226,9 +130,6 @@ PGDLLEXPORT Datum _pgr_maxflowmincost(PG_FUNCTION_ARGS) { &result_count); } - /* */ - /**********************************************************************/ - funcctx->max_calls = result_count; funcctx->user_fctx = result_tuples; if (get_call_result_type(fcinfo, NULL, &tuple_desc) @@ -252,44 +153,27 @@ PGDLLEXPORT Datum _pgr_maxflowmincost(PG_FUNCTION_ARGS) { Datum result; Datum *values; bool* nulls; - - /**********************************************************************/ - /* MODIFY AS NEEDED */ - /* - ***********************************************************************/ - values = palloc(8 * sizeof(Datum)); nulls = palloc(8 * sizeof(bool)); - size_t i; for (i = 0; i < 8; ++i) { nulls[i] = false; } - // postgres starts counting from 1 values[0] = Int32GetDatum((int32_t)funcctx->call_cntr + 1); values[1] = Int64GetDatum(result_tuples[funcctx->call_cntr].edge); values[2] = Int64GetDatum(result_tuples[funcctx->call_cntr].source); values[3] = Int64GetDatum(result_tuples[funcctx->call_cntr].target); values[4] = Int64GetDatum(result_tuples[funcctx->call_cntr].flow); - values[5] = Int64GetDatum( - result_tuples[funcctx->call_cntr].residual_capacity); + values[5] = Int64GetDatum(result_tuples[funcctx->call_cntr].residual_capacity); values[6] = Float8GetDatum(result_tuples[funcctx->call_cntr].cost); values[7] = Float8GetDatum(result_tuples[funcctx->call_cntr].agg_cost); - /**********************************************************************/ tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); } else { - /**********************************************************************/ - /* MODIFY AS NEEDED */ - - PGR_DBG("Clean up code"); - - /**********************************************************************/ - SRF_RETURN_DONE(funcctx); } } diff --git a/src/max_flow/minCostMaxFlow_driver.cpp b/src/max_flow/minCostMaxFlow_driver.cpp index 752405d91f..f24899708f 100644 --- a/src/max_flow/minCostMaxFlow_driver.cpp +++ b/src/max_flow/minCostMaxFlow_driver.cpp @@ -34,71 +34,82 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "max_flow/pgr_minCostMaxFlow.hpp" +#include "c_types/costFlow_t.h" + +#include "cpp_common/combinations.hpp" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" -#include "c_types/costFlow_t.h" -#include "c_types/ii_t_rt.h" +#include "max_flow/pgr_minCostMaxFlow.hpp" void -do_pgr_minCostMaxFlow( - CostFlow_t *data_edges, size_t total_edges, - II_t_rt *combinations, size_t total_combinations, - int64_t *sourceVertices, size_t sizeSourceVerticesArr, - int64_t *sinkVertices, size_t sizeSinkVerticesArr, +pgr_do_minCostMaxFlow( + char *edges_sql, + char *combinations_sql, + ArrayType *starts, + ArrayType *ends, + bool only_cost, Flow_t **return_tuples, size_t *return_count, - char ** log_msg, - char ** notice_msg, - char ** err_msg) { + char **log_msg, + char **notice_msg, + char **err_msg) { using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::utilities::get_combinations; std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; + try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - pgassert(data_edges); - pgassert(total_edges != 0); - pgassert((sourceVertices && sinkVertices) || combinations); - pgassert((sizeSourceVerticesArr && sizeSinkVerticesArr) || total_combinations); - - std::vector edges(data_edges, data_edges + total_edges); - std::set sources( - sourceVertices, sourceVertices + sizeSourceVerticesArr); - std::set targets( - sinkVertices, sinkVertices + sizeSinkVerticesArr); - std::vector< II_t_rt > combinations_vector( - combinations, combinations + total_combinations); - - if (!combinations_vector.empty()) { - pgassert(sources.empty()); - pgassert(targets.empty()); - - for (const II_t_rt &comb : combinations_vector) { - sources.insert(comb.d1.source); - targets.insert(comb.d2.target); - } + + hint = combinations_sql; + auto combinations = get_combinations(combinations_sql, starts, ends, true); + hint = nullptr; + + if (combinations.empty() && combinations_sql) { + *notice_msg = pgr_msg("No (source, target) pairs found"); + *log_msg = pgr_msg(combinations_sql); + return; + } + + std::set sources; + std::set targets; + for (const auto &c : combinations) { + sources.insert(c.first); + targets.insert(c.second.begin(), c.second.end()); } std::set vertices(sources); vertices.insert(targets.begin(), targets.end()); - if (vertices.size() - != (sources.size() + targets.size())) { + if (vertices.size() != (sources.size() + targets.size())) { *err_msg = pgr_msg("A source found as sink"); return; } + hint = edges_sql; + auto edges = pgrouting::pgget::get_costFlow_edges(std::string(edges_sql)); + + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; + + pgrouting::graph::PgrCostFlowGraph digraph( edges, sources, targets); @@ -140,6 +151,9 @@ do_pgr_minCostMaxFlow( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; @@ -154,4 +168,3 @@ do_pgr_minCostMaxFlow( *log_msg = pgr_msg(log.str().c_str()); } } - From 42a414fd6266d411b4d83d97e11ea6aa6bc6d007 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 24 Jan 2024 11:49:16 -0600 Subject: [PATCH 087/428] [mincut] Reading data on C++ code --- include/drivers/mincut/stoerWagner_driver.h | 17 +++---- src/mincut/stoerWagner.c | 50 ++------------------- src/mincut/stoerWagner_driver.cpp | 24 +++++++--- 3 files changed, 27 insertions(+), 64 deletions(-) diff --git a/include/drivers/mincut/stoerWagner_driver.h b/include/drivers/mincut/stoerWagner_driver.h index 950889fe3f..2aa3bac5cd 100644 --- a/include/drivers/mincut/stoerWagner_driver.h +++ b/include/drivers/mincut/stoerWagner_driver.h @@ -34,29 +34,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /* for size-t */ #ifdef __cplusplus # include -using Edge_t = struct Edge_t; using StoerWagner_t = struct StoerWagner_t; #else # include -typedef struct Edge_t Edge_t; typedef struct StoerWagner_t StoerWagner_t; #endif - #ifdef __cplusplus extern "C" { #endif - void - do_pgr_stoerWagner( - Edge_t *data_edges, - size_t total_edges, - StoerWagner_t **return_tuples, - size_t *return_count, - char ** log_msg, - char ** notice_msg, - char ** err_msg); +void pgr_do_stoerWagner( + char*, + + StoerWagner_t**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/src/mincut/stoerWagner.c b/src/mincut/stoerWagner.c index 00bad20d2c..d6352eb5b9 100644 --- a/src/mincut/stoerWagner.c +++ b/src/mincut/stoerWagner.c @@ -33,7 +33,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "c_types/stoerWagner_t.h" #include "drivers/mincut/stoerWagner_driver.h" @@ -50,9 +49,6 @@ process( char* edges_sql, StoerWagner_t **result_tuples, size_t *result_count) { - /* - * https://www.postgresql.org/docs/current/static/spi-spi-connect.html - */ pgr_SPI_connect(); char* log_msg = NULL; char* notice_msg = NULL; @@ -61,60 +57,35 @@ process( (*result_tuples) = NULL; (*result_count) = 0; - PGR_DBG("Load data"); - Edge_t *edges = NULL; - size_t total_edges = 0; - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - PGR_DBG("Total %ld edges in query:", total_edges); - - if (total_edges == 0) { - PGR_DBG("No edges found"); - pgr_SPI_finish(); - return; - } - - PGR_DBG("Starting processing"); clock_t start_t = clock(); - do_pgr_stoerWagner( - edges, - total_edges, + pgr_do_stoerWagner( + edges_sql, + result_tuples, result_count, &log_msg, ¬ice_msg, &err_msg); - time_msg(" processing pgr_stoerWagner", start_t, clock()); - PGR_DBG("Returning %ld tuples", *result_count); if (err_msg) { if (*result_tuples) pfree(*result_tuples); } pgr_global_report(log_msg, notice_msg, err_msg); - if (edges) pfree(edges); if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); pgr_SPI_finish(); } -/* */ -/******************************************************************************/ PGDLLEXPORT Datum _pgr_stoerwagner(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; - /**************************************************************************/ - /* MODIFY AS NEEDED */ - /* */ StoerWagner_t *result_tuples = NULL; size_t result_count = 0; - /* */ - /**************************************************************************/ if (SRF_IS_FIRSTCALL()) { MemoryContext oldcontext; @@ -128,13 +99,7 @@ PGDLLEXPORT Datum _pgr_stoerwagner(PG_FUNCTION_ARGS) { &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) { @@ -167,24 +132,15 @@ PGDLLEXPORT Datum _pgr_stoerwagner(PG_FUNCTION_ARGS) { nulls[i] = false; } - // postgres starts counting from 1 values[0] = Int32GetDatum((int32_t)funcctx->call_cntr + 1); values[1] = Int64GetDatum(result_tuples[funcctx->call_cntr].edge); values[2] = Float8GetDatum(result_tuples[funcctx->call_cntr].cost); values[3] = Float8GetDatum(result_tuples[funcctx->call_cntr].mincut); - /**********************************************************************/ tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); } else { - /**********************************************************************/ - /* MODIFY AS NEEDED */ - - PGR_DBG("Clean up code"); - - /**********************************************************************/ - SRF_RETURN_DONE(funcctx); } } diff --git a/src/mincut/stoerWagner_driver.cpp b/src/mincut/stoerWagner_driver.cpp index b60dccfede..bc9a04fe7a 100644 --- a/src/mincut/stoerWagner_driver.cpp +++ b/src/mincut/stoerWagner_driver.cpp @@ -34,6 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "mincut/pgr_stoerWagner.hpp" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" #include "c_types/stoerWagner_t.h" @@ -50,9 +51,9 @@ pgr_stoerWagner( } // namespace void -do_pgr_stoerWagner( - Edge_t *data_edges, - size_t total_edges, +pgr_do_stoerWagner( + char *edges_sql, + StoerWagner_t **return_tuples, size_t *return_count, char ** log_msg, @@ -65,13 +66,23 @@ do_pgr_stoerWagner( std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; + try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - pgassert(total_edges != 0); + + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; graphType gType = UNDIRECTED; @@ -80,7 +91,7 @@ do_pgr_stoerWagner( log << "Working with Undirected Graph\n"; pgrouting::UndirectedGraph undigraph(gType); - undigraph.insert_edges(data_edges, total_edges); + undigraph.insert_edges(edges); results = pgr_stoerWagner( undigraph); @@ -113,6 +124,9 @@ do_pgr_stoerWagner( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; From 913689da4fc0a18c315fd5e1bb5e58df8c31f4ba Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 24 Jan 2024 11:50:10 -0600 Subject: [PATCH 088/428] [ordering] Reading data on C++ code --- .../ordering/cuthillMckeeOrdering_driver.h | 11 ++- src/ordering/cuthillMckeeOrdering.c | 67 ++----------------- src/ordering/cuthillMckeeOrdering_driver.cpp | 43 +++++------- 3 files changed, 28 insertions(+), 93 deletions(-) diff --git a/include/drivers/ordering/cuthillMckeeOrdering_driver.h b/include/drivers/ordering/cuthillMckeeOrdering_driver.h index fe4309ec2b..d36657f397 100644 --- a/include/drivers/ordering/cuthillMckeeOrdering_driver.h +++ b/include/drivers/ordering/cuthillMckeeOrdering_driver.h @@ -49,14 +49,11 @@ extern "C" { #endif void -do_cuthillMckeeOrdering( - Edge_t*, size_t, // edges +pgr_do_cuthillMckeeOrdering( + char*, - II_t_rt**, size_t*, // results - - char **, // log msg - char **, // notice msg - char **); // err msg + II_t_rt**, size_t*, + char **, char **, char **); #ifdef __cplusplus diff --git a/src/ordering/cuthillMckeeOrdering.c b/src/ordering/cuthillMckeeOrdering.c index ce08414619..2e04ffb407 100644 --- a/src/ordering/cuthillMckeeOrdering.c +++ b/src/ordering/cuthillMckeeOrdering.c @@ -25,11 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -/** @file cuthillMckeeOrdering.c - * @brief Connecting code with postgres. - * - */ - #include #include "c_common/postgres_connection.h" @@ -37,7 +32,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "c_types/ii_t_rt.h" @@ -46,26 +40,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. PGDLLEXPORT Datum _pgr_cuthillmckeeordering(PG_FUNCTION_ARGS); PG_FUNCTION_INFO_V1(_pgr_cuthillmckeeordering); -/** @brief Static function, loads the data from postgres to C types for further processing. - * - * It first connects the C function to the SPI manager. Then converts - * the postgres array to C array and loads the edges belonging to the graph - * in C types. Then it calls the function `do_cuthillMckeeOrdering` defined - * in the `cuthillMckeeOrdering_driver.h` file for further processing. - * Finally, it frees the memory and disconnects the C function to the SPI manager. - * - * @param edges_sql the edges of the SQL query - * @param result_tuples the rows in the result - * @param result_count the count of rows in the result - */ - static void process( - char* edges_sql, + char* edges_sql, - II_t_rt **result_tuples, - size_t *result_count) { + II_t_rt **result_tuples, + size_t *result_count) { pgr_SPI_connect(); char* log_msg = NULL; char* notice_msg = NULL; @@ -74,32 +55,15 @@ process( (*result_tuples) = NULL; (*result_count) = 0; - Edge_t *edges = NULL; - size_t total_edges = 0; - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - if (total_edges == 0) { - ereport(WARNING, - (errmsg("Insufficient data edges SQL."), - errhint("%s", edges_sql))); - (*result_count) = 0; - (*result_tuples) = NULL; - pgr_SPI_finish(); - return; - } - - PGR_DBG("Starting timer"); clock_t start_t = clock(); + pgr_do_cuthillMckeeOrdering( + edges_sql, - do_cuthillMckeeOrdering( - edges, total_edges, result_tuples, result_count, &log_msg, ¬ice_msg, &err_msg); - time_msg("processing cuthillmckeeordering", start_t, clock()); if (err_msg && (*result_tuples)) { @@ -113,15 +77,10 @@ process( if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - if (edges) pfree(edges); pgr_SPI_finish(); } -/** @brief Helps in converting postgres variables to C variables, and returns the result. - * - */ - PGDLLEXPORT Datum _pgr_cuthillmckeeordering(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; @@ -135,19 +94,12 @@ _pgr_cuthillmckeeordering(PG_FUNCTION_ARGS) { funcctx = SRF_FIRSTCALL_INIT(); oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - /*********************************************************************** - * - * pgr_cuthillMckeeOrdering(edges_sql TEXT); - * - **********************************************************************/ - process( text_to_cstring(PG_GETARG_TEXT_P(0)), &result_tuples, &result_count); - funcctx->max_calls = result_count; - + funcctx->max_calls = result_count; funcctx->user_fctx = result_tuples; if (get_call_result_type(fcinfo, NULL, &tuple_desc) != TYPEFUNC_COMPOSITE) { @@ -171,13 +123,6 @@ _pgr_cuthillmckeeordering(PG_FUNCTION_ARGS) { Datum *values; bool* nulls; - /*********************************************************************** - * - * OUT seq BIGINT, - * OUT node BIGINT, - * - **********************************************************************/ - size_t num = 3; values = palloc(num * sizeof(Datum)); nulls = palloc(num * sizeof(bool)); diff --git a/src/ordering/cuthillMckeeOrdering_driver.cpp b/src/ordering/cuthillMckeeOrdering_driver.cpp index 3ea3210952..e4b53c97dd 100644 --- a/src/ordering/cuthillMckeeOrdering_driver.cpp +++ b/src/ordering/cuthillMckeeOrdering_driver.cpp @@ -31,6 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" #include "c_types/ii_t_rt.h" @@ -67,31 +68,9 @@ cuthillMckeeOrdering(G &graph) { } // namespace -/** @brief Performs exception handling and converts the results to postgres. - * - * @pre log_msg is empty - * @pre notice_msg is empty - * @pre err_msg is empty - * @pre return_tuples is empty - * @pre return_count is 0 - * - * It builds the undirected graph using the `data_edges` variable. - * Then, it passes the required variables to the template function - * `cuthillMckeeOrdering` which calls the main function - * defined in the C++ Header file. It also does exception handling. - * - * @param data_edges the set of edges from the SQL query - * @param total_edges the total number of edges in the SQL query - * @param return_tuples the rows in the result - * @param return_count the count of rows in the result - * @param log_msg stores the log message - * @param notice_msg stores the notice message - * @param err_msg stores the error message - */ -void do_cuthillMckeeOrdering( - Edge_t *data_edges, - size_t total_edges, +void pgr_do_cuthillMckeeOrdering( + char *edges_sql, II_t_rt **return_tuples, size_t *return_count, @@ -106,6 +85,8 @@ void do_cuthillMckeeOrdering( std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; + try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); @@ -113,12 +94,21 @@ void do_cuthillMckeeOrdering( pgassert(!(*return_tuples)); pgassert(*return_count == 0); + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; + graphType gType = UNDIRECTED; std::vectorresults; pgrouting::UndirectedGraph undigraph(gType); - undigraph.insert_edges(data_edges, total_edges); + undigraph.insert_edges(edges); results = cuthillMckeeOrdering(undigraph); auto count = results.size(); @@ -149,6 +139,9 @@ void do_cuthillMckeeOrdering( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; From a90ef00448e1d42d9d1550a346b2466383fea6ef Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 24 Jan 2024 12:17:13 -0600 Subject: [PATCH 089/428] [pickDeliver] Reading data on C++ code --- .../pickDeliver/pickDeliverEuclidean_driver.h | 28 +--- .../drivers/pickDeliver/pickDeliver_driver.h | 37 ++--- src/pickDeliver/pickDeliver.c | 137 +----------------- src/pickDeliver/pickDeliverEuclidean.c | 115 +-------------- .../pickDeliverEuclidean_driver.cpp | 46 +++--- src/pickDeliver/pickDeliver_driver.cpp | 55 ++++--- 6 files changed, 83 insertions(+), 335 deletions(-) diff --git a/include/drivers/pickDeliver/pickDeliverEuclidean_driver.h b/include/drivers/pickDeliver/pickDeliverEuclidean_driver.h index dbde1c8e13..115f80b090 100644 --- a/include/drivers/pickDeliver/pickDeliverEuclidean_driver.h +++ b/include/drivers/pickDeliver/pickDeliverEuclidean_driver.h @@ -35,13 +35,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /* for size-t */ #ifdef __cplusplus # include -using Orders_t = struct Orders_t; -using Vehicle_t = struct Vehicle_t; using Schedule_rt = struct Schedule_rt; #else # include -typedef struct Orders_t Orders_t; -typedef struct Vehicle_t Vehicle_t; typedef struct Schedule_rt Schedule_rt; #endif @@ -49,27 +45,15 @@ typedef struct Schedule_rt Schedule_rt; extern "C" { #endif - /********************************************************* - orders_sql TEXT, - max_vehicles INTEGER, - capacity FLOAT, - max_cycles INTEGER, - ********************************************************/ - void do_pgr_pickDeliverEuclidean( - Orders_t *pd_orders_arr, size_t total_pd_orders, - Vehicle_t *vehicles_arr, size_t total_vehicles, +void pgr_do_pickDeliverEuclidean( + char*, + char*, - double factor, - int max_cycles, - int initial_solution_id, + double, int, int, - Schedule_rt **return_tuples, - size_t *return_count, - - char **log_msg, - char **notice_msg, - char **err_msg); + Schedule_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/include/drivers/pickDeliver/pickDeliver_driver.h b/include/drivers/pickDeliver/pickDeliver_driver.h index 1396815202..730f88b893 100644 --- a/include/drivers/pickDeliver/pickDeliver_driver.h +++ b/include/drivers/pickDeliver/pickDeliver_driver.h @@ -35,43 +35,26 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /* for size-t */ #ifdef __cplusplus # include -using Orders_t = struct Orders_t; -using Vehicle_t = struct Vehicle_t; using Schedule_rt = struct Schedule_rt; -using IID_t_rt = struct IID_t_rt; #else # include -typedef struct Orders_t Orders_t; -typedef struct Vehicle_t Vehicle_t; typedef struct Schedule_rt Schedule_rt; -typedef struct IID_t_rt IID_t_rt; #endif #ifdef __cplusplus extern "C" { #endif - /********************************************************* - orders_sql TEXT, - max_vehicles INTEGER, - capacity FLOAT, - max_cycles INTEGER, - ********************************************************/ - void do_pgr_pickDeliver( - Orders_t *pd_orders_arr, size_t total_pd_orders, - Vehicle_t *vehicles_arr, size_t total_vehicles, - IID_t_rt *matrix_cells_arr, size_t total_cells, - - double factor, - int max_cycles, - int initial_solution_id, - - Schedule_rt **return_tuples, - size_t *return_count, - - char **log_msg, - char **notice_msg, - char **err_msg); +void pgr_do_pickDeliver( + char*, + char*, + char*, + + double, int, int, + + Schedule_rt**, size_t*, + + char**, char**, char**); #ifdef __cplusplus diff --git a/src/pickDeliver/pickDeliver.c b/src/pickDeliver/pickDeliver.c index d71c5c56e5..3564d4362d 100644 --- a/src/pickDeliver/pickDeliver.c +++ b/src/pickDeliver/pickDeliver.c @@ -31,7 +31,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "c_types/iid_t_rt.h" #include "c_types/pickDeliver/schedule_rt.h" @@ -84,92 +83,11 @@ process( char* notice_msg = NULL; char* err_msg = NULL; - PGR_DBG("Load orders"); - Orders_t *pd_orders_arr = NULL; - size_t total_pd_orders = 0; - pgr_get_orders(pd_orders_sql, &pd_orders_arr, &total_pd_orders, true, &err_msg); - throw_error(err_msg, pd_orders_sql); - - PGR_DBG("Load vehicles"); - Vehicle_t *vehicles_arr = NULL; - size_t total_vehicles = 0; - pgr_get_vehicles(vehicles_sql, &vehicles_arr, &total_vehicles, true, &err_msg); - throw_error(err_msg, vehicles_sql); - PGR_DBG("total vehicles %ld", total_vehicles); - - -#if 0 - for (size_t i = 0; i < total_pd_orders; i++) { - PGR_DBG("%ld %f pick %f %f %ld - " - "%f %f %f deliver %f %f %ld - %f %f %f ", - pd_orders_arr[i].id, - pd_orders_arr[i].demand, - - pd_orders_arr[i].pick_x, - pd_orders_arr[i].pick_y, - pd_orders_arr[i].pick_node_id, - - pd_orders_arr[i].pick_open_t, - pd_orders_arr[i].pick_close_t, - pd_orders_arr[i].pick_service_t, - - pd_orders_arr[i].deliver_x, - pd_orders_arr[i].deliver_y, - pd_orders_arr[i].deliver_node_id, - - pd_orders_arr[i].deliver_open_t, - pd_orders_arr[i].deliver_close_t, - pd_orders_arr[i].deliver_service_t); - } - - for (size_t i = 0; i < total_vehicles; i++) { - PGR_DBG("%ld %f %f / %ld %f %f %f %f %f / %ld %f %f %f %f %f / %ld ", - vehicles_arr[i].id, - vehicles_arr[i].capacity, - vehicles_arr[i].speed, - - vehicles_arr[i].start_node_id, - vehicles_arr[i].start_x, - vehicles_arr[i].start_y, - vehicles_arr[i].start_open_t, - vehicles_arr[i].start_close_t, - vehicles_arr[i].start_service_t, - - vehicles_arr[i].end_node_id, - vehicles_arr[i].end_x, - vehicles_arr[i].end_y, - vehicles_arr[i].end_open_t, - vehicles_arr[i].end_close_t, - vehicles_arr[i].end_service_t, - - vehicles_arr[i].cant_v); - } -#endif - PGR_DBG("load matrix"); - IID_t_rt *matrix_cells_arr = NULL; - size_t total_cells = 0; - pgr_get_matrixRows(matrix_sql, &matrix_cells_arr, &total_cells, &err_msg); - throw_error(err_msg, matrix_sql); - - - if (total_pd_orders == 0 || total_vehicles == 0 || total_cells == 0) { - (*result_count) = 0; - (*result_tuples) = NULL; - pgr_SPI_finish(); - return; - } - PGR_DBG("Total %ld orders in query:", total_pd_orders); - PGR_DBG("Total %ld vehicles in query:", total_vehicles); - PGR_DBG("Total %ld matrix cells in query:", total_cells); - - - PGR_DBG("Starting processing"); - clock_t start_t = clock(); - - do_pgr_pickDeliver( - pd_orders_arr, total_pd_orders, - vehicles_arr, total_vehicles, - matrix_cells_arr, total_cells, + clock_t start_t = clock(); + pgr_do_pickDeliver( + pd_orders_sql, + vehicles_sql, + matrix_sql, factor, max_cycles, @@ -189,51 +107,30 @@ process( (*result_count) = 0; (*result_tuples) = NULL; } -#if 1 + pgr_global_report(log_msg, notice_msg, err_msg); -#else - pgr_global_report(notice_msg, log_msg, err_msg); -#endif if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - if (pd_orders_arr) pfree(pd_orders_arr); - if (vehicles_arr) pfree(vehicles_arr); - if (matrix_cells_arr) pfree(matrix_cells_arr); pgr_SPI_finish(); } - -/******************************************************************************/ - - PGDLLEXPORT Datum _pgr_pickdeliver(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; - /**************************************************************************/ Schedule_rt *result_tuples = 0; size_t result_count = 0; - /**************************************************************************/ if (SRF_IS_FIRSTCALL()) { MemoryContext oldcontext; funcctx = SRF_FIRSTCALL_INIT(); oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - /********************************************************************** - orders_sql TEXT, - vehicles_sql TEXT, - matrix_cell_sql TEXT, - factor FLOAT DEFAULT 1, - max_cycles INTEGER DEFAULT 10, - initial_sol INTEGER DEFAULT 4, - **********************************************************************/ - process( text_to_cstring(PG_GETARG_TEXT_P(0)), text_to_cstring(PG_GETARG_TEXT_P(1)), @@ -244,9 +141,6 @@ _pgr_pickdeliver(PG_FUNCTION_ARGS) { &result_tuples, &result_count); - /*********************************************************************/ - - funcctx->max_calls = result_count; funcctx->user_fctx = result_tuples; @@ -273,24 +167,6 @@ _pgr_pickdeliver(PG_FUNCTION_ARGS) { bool* nulls; size_t call_cntr = funcctx->call_cntr; - /********************************************************************* - - OUT seq INTEGER, - OUT vehicle_number INTEGER, - OUT vehicle_id BIGINT, - OUT vehicle_seq INTEGER, - OUT order_id BIGINT, - OUT stop_type INT, - OUT cargo FLOAT, - OUT travel_time FLOAT, - OUT arrival_time FLOAT, - OUT wait_time FLOAT, - OUT service_time FLOAT, - OUT departure_time FLOAT - - *********************************************************************/ - - size_t numb = 13; values = palloc(numb * sizeof(Datum)); nulls = palloc(numb * sizeof(bool)); @@ -315,7 +191,6 @@ _pgr_pickdeliver(PG_FUNCTION_ARGS) { values[11] = Float8GetDatum(result_tuples[call_cntr].serviceTime); values[12] = Float8GetDatum(result_tuples[call_cntr].departureTime); - /*********************************************************************/ tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); diff --git a/src/pickDeliver/pickDeliverEuclidean.c b/src/pickDeliver/pickDeliverEuclidean.c index 6a64657ac5..014d8fdb78 100644 --- a/src/pickDeliver/pickDeliverEuclidean.c +++ b/src/pickDeliver/pickDeliverEuclidean.c @@ -33,7 +33,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "c_types/iid_t_rt.h" #include "c_types/pickDeliver/orders_t.h" #include "c_types/pickDeliver/vehicle_t.h" @@ -88,80 +87,10 @@ process( char* notice_msg = NULL; char* err_msg = NULL; - PGR_DBG("Load orders"); - Orders_t *pd_orders_arr = NULL; - size_t total_pd_orders = 0; - pgr_get_orders(pd_orders_sql, &pd_orders_arr, &total_pd_orders, false, &err_msg); - throw_error(err_msg, pd_orders_sql); - - PGR_DBG("Load vehicles"); - Vehicle_t *vehicles_arr = NULL; - size_t total_vehicles = 0; - pgr_get_vehicles(vehicles_sql, &vehicles_arr, &total_vehicles, false, &err_msg); - throw_error(err_msg, vehicles_sql); - PGR_DBG("total vehicles %ld", total_vehicles); - - size_t i; - for (i = 0; i < total_pd_orders; i++) { - PGR_DBG("%ld %f pick %f %f %ld - " - "%f %f %f deliver %f %f %ld - %f %f %f ", - pd_orders_arr[i].id, - pd_orders_arr[i].demand, - - pd_orders_arr[i].pick_x, - pd_orders_arr[i].pick_y, - pd_orders_arr[i].pick_node_id, - - pd_orders_arr[i].pick_open_t, - pd_orders_arr[i].pick_close_t, - pd_orders_arr[i].pick_service_t, - - pd_orders_arr[i].deliver_x, - pd_orders_arr[i].deliver_y, - pd_orders_arr[i].deliver_node_id, - - pd_orders_arr[i].deliver_open_t, - pd_orders_arr[i].deliver_close_t, - pd_orders_arr[i].deliver_service_t); - } - - - - for (i = 0; i < total_vehicles; i++) { - PGR_DBG("%ld %f %f , start %f %f %f %f %f " - "end %f %f %f %f %f number %ld ", - vehicles_arr[i].id, - vehicles_arr[i].capacity, - vehicles_arr[i].speed, - - vehicles_arr[i].start_x, - vehicles_arr[i].start_y, - vehicles_arr[i].start_open_t, - vehicles_arr[i].start_close_t, - vehicles_arr[i].start_service_t, - - vehicles_arr[i].end_x, - vehicles_arr[i].end_y, - vehicles_arr[i].end_open_t, - vehicles_arr[i].end_close_t, - vehicles_arr[i].end_service_t, - - vehicles_arr[i].cant_v); - } - - if (total_pd_orders == 0 || total_vehicles == 0) { - (*result_count) = 0; - (*result_tuples) = NULL; - pgr_SPI_finish(); - return; - } - PGR_DBG("Total %ld orders in query:", total_pd_orders); - - PGR_DBG("Starting processing"); clock_t start_t = clock(); - do_pgr_pickDeliverEuclidean( - pd_orders_arr, total_pd_orders, - vehicles_arr, total_vehicles, + pgr_do_pickDeliverEuclidean( + pd_orders_sql, + vehicles_sql, factor, max_cycles, @@ -186,41 +115,23 @@ process( if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - if (pd_orders_arr) pfree(pd_orders_arr); - if (vehicles_arr) pfree(vehicles_arr); pgr_SPI_finish(); } -/* */ -/******************************************************************************/ PGDLLEXPORT Datum _pgr_pickdelivereuclidean(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; - /**************************************************************************/ - /* MODIFY AS NEEDED */ - /* */ Schedule_rt *result_tuples = 0; size_t result_count = 0; - /* */ - /**************************************************************************/ if (SRF_IS_FIRSTCALL()) { MemoryContext oldcontext; funcctx = SRF_FIRSTCALL_INIT(); oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - /**********************************************************************/ - /* MODIFY AS NEEDED */ - /* - orders_sql TEXT, - vehicles_sql INTEGER, - max_cycles INTEGER, - initial_id INTEGER, - **********************************************************************/ - PGR_DBG("Calling process"); process( text_to_cstring(PG_GETARG_TEXT_P(0)), @@ -231,10 +142,6 @@ _pgr_pickdelivereuclidean(PG_FUNCTION_ARGS) { &result_tuples, &result_count); - /* */ - /*********************************************************************/ - - funcctx->max_calls = result_count; funcctx->user_fctx = result_tuples; @@ -261,19 +168,6 @@ _pgr_pickdelivereuclidean(PG_FUNCTION_ARGS) { bool* nulls; size_t call_cntr = funcctx->call_cntr; - /*********************************************************************/ - /* MODIFY!!!!! */ - /* This has to match you output otherwise the server crashes */ - /* - OUT seq INTEGER, - OUT vehicle_id INTEGER, - OUT vehicle_seq INTEGER, - OUT order_id BIGINT, - OUT cost FLOAT, - OUT agg_cost FLOAT - *********************************************************************/ - - size_t numb = 12; values = palloc(numb * sizeof(Datum)); nulls = palloc(numb * sizeof(bool)); @@ -284,7 +178,6 @@ _pgr_pickdelivereuclidean(PG_FUNCTION_ARGS) { } - // postgres starts counting from 1 values[0] = Int32GetDatum((int32_t)funcctx->call_cntr + 1); values[1] = Int32GetDatum(result_tuples[call_cntr].vehicle_seq); values[2] = Int64GetDatum(result_tuples[call_cntr].vehicle_id); @@ -298,8 +191,6 @@ _pgr_pickdelivereuclidean(PG_FUNCTION_ARGS) { values[10] = Float8GetDatum(result_tuples[call_cntr].serviceTime); values[11] = Float8GetDatum(result_tuples[call_cntr].departureTime); - /*********************************************************************/ - tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); diff --git a/src/pickDeliver/pickDeliverEuclidean_driver.cpp b/src/pickDeliver/pickDeliverEuclidean_driver.cpp index c82cbaae54..4b40409aab 100644 --- a/src/pickDeliver/pickDeliverEuclidean_driver.cpp +++ b/src/pickDeliver/pickDeliverEuclidean_driver.cpp @@ -41,23 +41,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "vrp/pgr_pickDeliver.h" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_assert.h" #include "cpp_common/pgr_alloc.hpp" -/************************************************************ - customers_sql TEXT, - max_vehicles INTEGER, - factor FLOAT, - capacity FLOAT, - max_cycles INTEGER, - ***********************************************************/ void -do_pgr_pickDeliverEuclidean( - Orders_t *customers_arr, - size_t total_customers, - - Vehicle_t *vehicles_arr, - size_t total_vehicles, +pgr_do_pickDeliverEuclidean( + char *customers_sql, + char *vehicles_sql, double factor, int max_cycles, @@ -76,17 +67,29 @@ do_pgr_pickDeliverEuclidean( std::ostringstream log; std::ostringstream notice; std::ostringstream err; + char* hint = nullptr; + try { *return_tuples = nullptr; *return_count = 0; - /* - * transform to C++ containers - */ - std::vector orders( - customers_arr, customers_arr + total_customers); - std::vector vehicles( - vehicles_arr, vehicles_arr + total_vehicles); + hint = customers_sql; + auto orders = pgrouting::pgget::get_orders(std::string(customers_sql), false); + if (orders.size() == 0) { + *notice_msg = pgr_msg("Insufficient data found on inner query"); + *log_msg = hint? pgr_msg(hint) : nullptr; + return; + } + + hint = vehicles_sql; + auto vehicles = pgrouting::pgget::get_vehicles(std::string(vehicles_sql), false); + if (vehicles.size() == 0) { + *notice_msg = pgr_msg("Insufficient data found on inner query"); + *log_msg = hint? pgr_msg(hint) : nullptr; + return; + } + + hint = nullptr; std::map, int64_t> matrix_data; @@ -194,6 +197,9 @@ do_pgr_pickDeliverEuclidean( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (const std::pair& ex) { (*return_count) = 0; err << ex.first; diff --git a/src/pickDeliver/pickDeliver_driver.cpp b/src/pickDeliver/pickDeliver_driver.cpp index b56b82ced0..6a47ad0550 100644 --- a/src/pickDeliver/pickDeliver_driver.cpp +++ b/src/pickDeliver/pickDeliver_driver.cpp @@ -38,6 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "vrp/pgr_pickDeliver.h" #include "vrp/initials_code.h" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/Dmatrix.h" #include "cpp_common/pgr_assert.h" @@ -49,15 +50,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/pickDeliver/schedule_rt.h" void -do_pgr_pickDeliver( - Orders_t customers_arr[], - size_t total_customers, - - Vehicle_t *vehicles_arr, - size_t total_vehicles, - - IID_t_rt *matrix_cells_arr, - size_t total_cells, +pgr_do_pickDeliver( + char* customers_sql, + char *vehicles_sql, + char *matrix_sql, double factor, int max_cycles, @@ -76,30 +72,40 @@ do_pgr_pickDeliver( std::ostringstream log; std::ostringstream notice; std::ostringstream err; + char *hint = nullptr; + try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); - pgassert(total_customers); - pgassert(total_vehicles); - pgassert(total_vehicles); pgassert(*return_count == 0); pgassert(!(*return_tuples)); - log << "do_pgr_pickDeliver\n"; + hint = customers_sql; + auto orders = pgrouting::pgget::get_orders(std::string(customers_sql), true); + if (orders.size() == 0) { + *notice_msg = pgr_msg("Insufficient data found on inner query"); + *log_msg = hint? pgr_msg(hint) : nullptr; + return; + } - /* - * transform to C++ containers - */ - std::vector orders( - customers_arr, customers_arr + total_customers); + hint = vehicles_sql; + auto vehicles = pgrouting::pgget::get_vehicles(std::string(vehicles_sql), true); + if (vehicles.size() == 0) { + *notice_msg = pgr_msg("Insufficient data found on inner query"); + *log_msg = hint? pgr_msg(hint) : nullptr; + return; + } - std::vector vehicles( - vehicles_arr, vehicles_arr + total_vehicles); + hint = matrix_sql; + auto data_costs = pgrouting::pgget::get_matrixRows(std::string(matrix_sql)); - std::vector data_costs( - matrix_cells_arr, - matrix_cells_arr + total_cells); + if (data_costs.size() == 0) { + *notice_msg = pgr_msg("Insufficient data found on inner query"); + *log_msg = hint? pgr_msg(hint) : nullptr; + return; + } + hint = nullptr; pgrouting::tsp::Dmatrix cost_matrix(data_costs); @@ -210,6 +216,9 @@ do_pgr_pickDeliver( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (const std::pair& ex) { (*return_count) = 0; err << ex.first; From d65baf1e86f67aa1b02a928fcac6d1e6acd293d2 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 24 Jan 2024 12:18:06 -0600 Subject: [PATCH 090/428] [planar] Reading data on C++ code --- include/drivers/planar/boyerMyrvold_driver.h | 2 +- include/drivers/planar/isPlanar_driver.h | 2 +- src/planar/boyerMyrvold.c | 2 +- src/planar/boyerMyrvold_driver.cpp | 2 +- src/planar/isPlanar.c | 2 +- src/planar/isPlanar_driver.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/drivers/planar/boyerMyrvold_driver.h b/include/drivers/planar/boyerMyrvold_driver.h index e4a83a2a71..08f688d6f7 100644 --- a/include/drivers/planar/boyerMyrvold_driver.h +++ b/include/drivers/planar/boyerMyrvold_driver.h @@ -44,7 +44,7 @@ typedef struct IID_t_rt IID_t_rt; #ifdef __cplusplus extern "C" { #endif - void do_pgr_boyerMyrvold( + void pgr_do_pgr_boyerMyrvold( Edge_t *data_edges, size_t total_tuples, IID_t_rt **return_tuples, diff --git a/include/drivers/planar/isPlanar_driver.h b/include/drivers/planar/isPlanar_driver.h index decf784a86..8ce82253a0 100644 --- a/include/drivers/planar/isPlanar_driver.h +++ b/include/drivers/planar/isPlanar_driver.h @@ -42,7 +42,7 @@ typedef struct Edge_t Edge_t; #ifdef __cplusplus extern "C" { #endif - bool do_pgr_isPlanar( + bool pgr_do_isPlanar( Edge_t *data_edges, size_t total_tuples, char ** log_msg, diff --git a/src/planar/boyerMyrvold.c b/src/planar/boyerMyrvold.c index 95fec5165e..d466aa44c1 100644 --- a/src/planar/boyerMyrvold.c +++ b/src/planar/boyerMyrvold.c @@ -73,7 +73,7 @@ process( PGR_DBG("Starting processing"); clock_t start_t = clock(); - do_pgr_boyerMyrvold( + pgr_do_boyerMyrvold( edges, total_edges, diff --git a/src/planar/boyerMyrvold_driver.cpp b/src/planar/boyerMyrvold_driver.cpp index 77bd82d1d9..eb78f6d164 100644 --- a/src/planar/boyerMyrvold_driver.cpp +++ b/src/planar/boyerMyrvold_driver.cpp @@ -43,7 +43,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. void -do_pgr_boyerMyrvold( +pgr_do_boyerMyrvold( Edge_t *data_edges, size_t total_edges, diff --git a/src/planar/isPlanar.c b/src/planar/isPlanar.c index 768bae76f2..851aa70cbd 100644 --- a/src/planar/isPlanar.c +++ b/src/planar/isPlanar.c @@ -64,7 +64,7 @@ process( clock_t start_t = clock(); - planarity = do_pgr_isPlanar( + planarity = pgr_do_isPlanar( edges, total_edges, diff --git a/src/planar/isPlanar_driver.cpp b/src/planar/isPlanar_driver.cpp index 11ad825a63..ea312f57a0 100644 --- a/src/planar/isPlanar_driver.cpp +++ b/src/planar/isPlanar_driver.cpp @@ -42,7 +42,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. bool -do_pgr_isPlanar( +pgr_do_isPlanar( Edge_t *data_edges, size_t total_edges, From 95b66b6b614f77249332cc527e93e824e8eaa5c5 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 24 Jan 2024 12:35:23 -0600 Subject: [PATCH 091/428] [topologicalSort] Reading data on C++ code --- .../doc-topologicalSort.result | 1 + .../topologicalSort/topologicalSort_driver.h | 18 +++-------- src/topologicalSort/topologicalSort.c | 31 ++----------------- .../topologicalSort_driver.cpp | 29 ++++++++++------- 4 files changed, 25 insertions(+), 54 deletions(-) diff --git a/docqueries/topologicalSort/doc-topologicalSort.result b/docqueries/topologicalSort/doc-topologicalSort.result index ac0fd1cad1..f055e8336f 100644 --- a/docqueries/topologicalSort/doc-topologicalSort.result +++ b/docqueries/topologicalSort/doc-topologicalSort.result @@ -62,6 +62,7 @@ SELECT * FROM pgr_topologicalsort( SELECT * FROM pgr_topologicalsort( $$SELECT id, source, target, cost, reverse_cost FROM edges$$); ERROR: Graph is not DAG +HINT: CONTEXT: SQL function "pgr_topologicalsort" statement 1 /* -- q4 */ ROLLBACK; diff --git a/include/drivers/topologicalSort/topologicalSort_driver.h b/include/drivers/topologicalSort/topologicalSort_driver.h index f0c88a9132..183b19084f 100644 --- a/include/drivers/topologicalSort/topologicalSort_driver.h +++ b/include/drivers/topologicalSort/topologicalSort_driver.h @@ -31,14 +31,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #ifndef INCLUDE_DRIVERS_TOPOLOGICALSORT_TOPOLOGICALSORT_DRIVER_H_ #define INCLUDE_DRIVERS_TOPOLOGICALSORT_TOPOLOGICALSORT_DRIVER_H_ -/* for size-t */ #ifdef __cplusplus # include -using Edge_t = struct Edge_t; using I_rt = struct I_rt; #else # include -typedef struct Edge_t Edge_t; typedef struct I_rt I_rt; #endif @@ -46,18 +43,11 @@ typedef struct I_rt I_rt; extern "C" { #endif - // CREATE OR REPLACE FUNCTION pgr_topologicalSort( - // sql text, - void do_pgr_topologicalSort( - Edge_t *data_edges, - size_t total_tuples, +void pgr_do_topologicalSort( + char*, - I_rt **return_tuples, - size_t *return_count, - - char** log_msg, - char** notice_msg, - char** err_msg); + I_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/src/topologicalSort/topologicalSort.c b/src/topologicalSort/topologicalSort.c index f3b9e05b01..867f632317 100644 --- a/src/topologicalSort/topologicalSort.c +++ b/src/topologicalSort/topologicalSort.c @@ -36,11 +36,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "drivers/topologicalSort/topologicalSort_driver.h" -#if 0 -PG_MODULE_MAGIC; -#endif + PGDLLEXPORT Datum _pgr_topologicalsort(PG_FUNCTION_ARGS); PG_FUNCTION_INFO_V1(_pgr_topologicalsort); @@ -55,15 +52,9 @@ process( char* notice_msg = NULL; char* err_msg = NULL; - Edge_t *edges = NULL; - size_t total_edges = 0; - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - - PGR_DBG("Starting timer"); clock_t start_t = clock(); - do_pgr_topologicalSort( - edges, total_edges, + pgr_do_topologicalSort( + edges_sql, result_tuples, result_count, &log_msg, @@ -72,7 +63,6 @@ process( time_msg("processing pgr_topologicalSort", start_t, clock()); - if (err_msg && (*result_tuples)) { pfree(*result_tuples); (*result_tuples) = NULL; @@ -84,7 +74,6 @@ process( if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - if (edges) pfree(edges); pgr_SPI_finish(); } @@ -93,28 +82,19 @@ _pgr_topologicalsort(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; - /**********************************************************************/ I_rt *result_tuples = NULL; size_t result_count = 0; - /**********************************************************************/ if (SRF_IS_FIRSTCALL()) { MemoryContext oldcontext; funcctx = SRF_FIRSTCALL_INIT(); oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - - /**********************************************************************/ - // pgr_topologicalSort( - // sql TEXT, - process( text_to_cstring(PG_GETARG_TEXT_P(0)), &result_tuples, &result_count); - /**********************************************************************/ - funcctx->max_calls = result_count; funcctx->user_fctx = result_tuples; @@ -141,10 +121,6 @@ _pgr_topologicalsort(PG_FUNCTION_ARGS) { bool* nulls; size_t call_cntr = funcctx->call_cntr; - /**********************************************************************/ - // OUT seq INTEGER, - // OUT sorted_v BIGINT) - size_t numb = 2; values = palloc(numb * sizeof(Datum)); nulls = palloc(numb * sizeof(bool)); @@ -156,7 +132,6 @@ _pgr_topologicalsort(PG_FUNCTION_ARGS) { values[0] = Int32GetDatum((int32_t)call_cntr + 1); values[1] = Int64GetDatum(result_tuples[call_cntr].id); - /**********************************************************************/ tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); diff --git a/src/topologicalSort/topologicalSort_driver.cpp b/src/topologicalSort/topologicalSort_driver.cpp index 0f49530431..edbdc0e4ee 100644 --- a/src/topologicalSort/topologicalSort_driver.cpp +++ b/src/topologicalSort/topologicalSort_driver.cpp @@ -38,6 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "topologicalSort/pgr_topologicalSort.hpp" #include "c_types/i_rt.h" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" @@ -56,10 +57,8 @@ pgr_topologicalSort( // CREATE OR REPLACE FUNCTION pgr_topologicalSort( // sql text, void -do_pgr_topologicalSort( - Edge_t *data_edges, - size_t total_edges, - +pgr_do_topologicalSort( + char *edges_sql, I_rt **return_tuples, size_t *return_count, @@ -73,21 +72,30 @@ do_pgr_topologicalSort( std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; try { - pgassert(total_edges != 0); pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; + graphType gType = DIRECTED; std::vector results; pgrouting::DirectedGraph digraph(gType); - digraph.insert_edges(data_edges, total_edges); + digraph.insert_edges(edges); results = pgr_topologicalSort( digraph); @@ -120,18 +128,15 @@ do_pgr_topologicalSort( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); - } catch (const std::string& ex) { - (*return_count) = 0; - err << ex; - log.str(""); - log.clear(); - *err_msg = pgr_msg(err.str().c_str()); } catch(...) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; From 0d186f6f6dc5abb27e6e8136470f380ed2ad6a83 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 24 Jan 2024 12:36:38 -0600 Subject: [PATCH 092/428] [transitiveClosure] Reading data on C++ code --- .../transitiveClosure_driver.h | 20 +++---------- src/transitiveClosure/transitiveClosure.c | 30 ++----------------- .../transitiveClosure_driver.cpp | 28 ++++++++++------- 3 files changed, 25 insertions(+), 53 deletions(-) diff --git a/include/drivers/transitiveClosure/transitiveClosure_driver.h b/include/drivers/transitiveClosure/transitiveClosure_driver.h index dd191f85f8..428d5d93ac 100644 --- a/include/drivers/transitiveClosure/transitiveClosure_driver.h +++ b/include/drivers/transitiveClosure/transitiveClosure_driver.h @@ -30,35 +30,23 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_TRANSITIVECLOSURE_TRANSITIVECLOSURE_DRIVER_H_ #pragma once -/* for size-t */ #ifdef __cplusplus # include using TransitiveClosure_rt = struct TransitiveClosure_rt; -using Edge_t = struct Edge_t; #else # include typedef struct TransitiveClosure_rt TransitiveClosure_rt; -typedef struct Edge_t Edge_t; #endif #ifdef __cplusplus extern "C" { #endif - /********************************************************* - edges_sql TEXT, - - ********************************************************/ - void - do_pgr_transitiveClosure( - Edge_t *data_edges, - size_t total_tuples, - TransitiveClosure_rt **return_tuples, - size_t *return_count, - char **log_msg, - char **notice_msg, - char **err_msg); +void pgr_do_transitiveClosure( + char*, + TransitiveClosure_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/src/transitiveClosure/transitiveClosure.c b/src/transitiveClosure/transitiveClosure.c index 8a83529589..2b8a1e09e1 100644 --- a/src/transitiveClosure/transitiveClosure.c +++ b/src/transitiveClosure/transitiveClosure.c @@ -41,7 +41,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" #include "c_types/transitiveClosure_rt.h" -#include "c_common/trsp_pgget.h" #include "drivers/transitiveClosure/transitiveClosure_driver.h" PGDLLEXPORT Datum _pgr_transitiveclosure(PG_FUNCTION_ARGS); @@ -59,25 +58,14 @@ process(char* edges_sql, char* notice_msg = NULL; char* err_msg = NULL; - size_t total_edges = 0; - Edge_t* edges = NULL; - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - if (total_edges == 0) { - pgr_SPI_finish(); - return; - } - - PGR_DBG("Starting timer"); clock_t start_t = clock(); - do_pgr_transitiveClosure( - edges, total_edges, + pgr_do_transitiveClosure( + edges_sql, result_tuples, result_count, &log_msg, ¬ice_msg, &err_msg); - time_msg("processing pgr_transitiveClosure()", start_t, clock()); @@ -92,7 +80,7 @@ process(char* edges_sql, if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - if (edges) pfree(edges); + pgr_SPI_finish(); } @@ -101,30 +89,20 @@ _pgr_transitiveclosure(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; - /**********************************************************************/ TransitiveClosure_rt *result_tuples = NULL; size_t result_count = 0; - /**********************************************************************/ if (SRF_IS_FIRSTCALL()) { MemoryContext oldcontext; funcctx = SRF_FIRSTCALL_INIT(); oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - /**********************************************************************/ - /* - edges_sql TEXT, - - **********************************************************************/ process( text_to_cstring(PG_GETARG_TEXT_P(0)), &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) @@ -148,7 +126,6 @@ _pgr_transitiveclosure(PG_FUNCTION_ARGS) { int16 typlen; size_t call_cntr = funcctx->call_cntr; - /**********************************************************************/ size_t numb = 3; values =(Datum *)palloc(numb * sizeof(Datum)); nulls = palloc(numb * sizeof(bool)); @@ -205,7 +182,6 @@ _pgr_transitiveclosure(PG_FUNCTION_ARGS) { values[1] = Int64GetDatum(result_tuples[call_cntr].vid); values[2] = PointerGetDatum(arrayType); - /*********************************************************************/ tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); diff --git a/src/transitiveClosure/transitiveClosure_driver.cpp b/src/transitiveClosure/transitiveClosure_driver.cpp index 163d3cc913..7232bc74b8 100644 --- a/src/transitiveClosure/transitiveClosure_driver.cpp +++ b/src/transitiveClosure/transitiveClosure_driver.cpp @@ -30,6 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "transitiveClosure/pgr_transitiveClosure.hpp" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/identifiers.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/basePath_SSEC.hpp" @@ -93,9 +94,9 @@ void get_postgres_result( edges_sql TEXT ***********************************************************/ void -do_pgr_transitiveClosure( - Edge_t *data_edges, - size_t total_edges, +pgr_do_transitiveClosure( + char *edges_sql, + TransitiveClosure_rt **return_tuples, size_t *return_count, char **log_msg, @@ -107,23 +108,27 @@ do_pgr_transitiveClosure( std::ostringstream log; std::ostringstream notice; std::ostringstream err; + char *hint = nullptr; + try { - pgassert(total_edges != 0); pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - /* - * Converting to C++ structures - */ - std::vector edges(data_edges, data_edges + total_edges); - + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; graphType gType = DIRECTED; pgrouting::DirectedGraph digraph(gType); - digraph.insert_edges(data_edges, total_edges); + digraph.insert_edges(edges); get_postgres_result( digraph, @@ -142,6 +147,9 @@ do_pgr_transitiveClosure( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; From 6bd95aa6f848920678af36a2482b17f9f2e6df29 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 24 Jan 2024 15:14:23 -0600 Subject: [PATCH 093/428] [traversal] Reading data on C++ code --- .../traversal/depthFirstSearch_driver.h | 48 +++++------ src/traversal/depthFirstSearch.c | 82 +------------------ src/traversal/depthFirstSearch_driver.cpp | 82 ++++++++----------- 3 files changed, 58 insertions(+), 154 deletions(-) diff --git a/include/drivers/traversal/depthFirstSearch_driver.h b/include/drivers/traversal/depthFirstSearch_driver.h index f5df64ad3f..a157a54e3e 100644 --- a/include/drivers/traversal/depthFirstSearch_driver.h +++ b/include/drivers/traversal/depthFirstSearch_driver.h @@ -31,7 +31,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_TRAVERSAL_DEPTHFIRSTSEARCH_DRIVER_H_ #pragma once -/* for size-t */ +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#include "cpp_common/undefPostgresDefine.hpp" + #ifdef __cplusplus # include # include @@ -48,32 +60,14 @@ typedef struct MST_rt MST_rt; extern "C" { #endif - /************************************************** - * - * pgr_depthFirstSearch( - * edges_sql TEXT, - * root_vids ANYARRAY, - * directed BOOLEAN DEFAULT true - * max_depth BIGINT DEFAULT 9223372036854775807, - * ); - * - *************************************************/ - void do_pgr_depthFirstSearch( - Edge_t *data_edges, - size_t total_edges, - - int64_t *rootsArr, - size_t size_rootsArr, - - bool directed, - int64_t max_depth, - - MST_rt **return_tuples, - size_t *return_count, - - char ** log_msg, - char ** notice_msg, - char ** err_msg); +void pgr_do_depthFirstSearch( + char*, + ArrayType*, + + bool, int64_t, + + MST_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/src/traversal/depthFirstSearch.c b/src/traversal/depthFirstSearch.c index cf308043a3..b6aaf46522 100644 --- a/src/traversal/depthFirstSearch.c +++ b/src/traversal/depthFirstSearch.c @@ -26,20 +26,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -/** @file depthFirstSearch.c - * @brief Connecting code with postgres. - * - */ - #include #include "c_common/postgres_connection.h" #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" - -#include "c_common/trsp_pgget.h" - #include "c_types/mst_rt.h" #include "drivers/traversal/depthFirstSearch_driver.h" @@ -47,21 +39,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. PGDLLEXPORT Datum _pgr_depthfirstsearch(PG_FUNCTION_ARGS); PG_FUNCTION_INFO_V1(_pgr_depthfirstsearch); -/** @brief Static function, loads the data from postgres to C types for further processing. - * - * It first connects the C function to the SPI manager. Then converts - * the postgres array to C array and loads the edges belonging to the graph - * in C types. Then it calls the function `do_pgr_depthFirstSearch` defined - * in the `depthFirstSearch_driver.h` file for further processing. - * Finally, it frees the memory and disconnects the C function to the SPI manager. - * - * @param edges_sql the edges of the SQL query - * @param roots the root vertices - * @param directed whether the graph is directed or undirected - * @param max_depth the maximum depth of traversal - * @param result_tuples the rows in the result - * @param result_count the count of rows in the result - */ static void process( @@ -76,25 +53,13 @@ process( char* log_msg = NULL; char* notice_msg = NULL; char* err_msg = NULL; - - size_t size_rootsArr = 0; - - int64_t* rootsArr = pgr_get_bigIntArray(&size_rootsArr, roots, false, &err_msg); - throw_error(err_msg, "While getting start vids"); - (*result_tuples) = NULL; (*result_count) = 0; - Edge_t *edges = NULL; - size_t total_edges = 0; - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - clock_t start_t = clock(); - do_pgr_depthFirstSearch( - edges, total_edges, - rootsArr, size_rootsArr, + pgr_do_depthFirstSearch( + edges_sql, + roots, directed, max_depth, @@ -104,7 +69,6 @@ process( &log_msg, ¬ice_msg, &err_msg); - time_msg("processing pgr_depthFirstSearch", start_t, clock()); if (err_msg && (*result_tuples)) { @@ -118,43 +82,22 @@ process( if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - if (edges) pfree(edges); - if (rootsArr) pfree(rootsArr); pgr_SPI_finish(); } -/* */ -/******************************************************************************/ - -/** @brief Helps in converting postgres variables to C variables, and returns the result. - * - */ PGDLLEXPORT Datum _pgr_depthfirstsearch(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; - /**********************************************************************/ MST_rt *result_tuples = NULL; size_t result_count = 0; - /**********************************************************************/ if (SRF_IS_FIRSTCALL()) { MemoryContext oldcontext; funcctx = SRF_FIRSTCALL_INIT(); oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - /*********************************************************************** - * - * pgr_depthFirstSearch( - * edges_sql TEXT, - * root_vids ANYARRAY, - * directed BOOLEAN DEFAULT true - * max_depth BIGINT DEFAULT 9223372036854775807, - * ); - * - **********************************************************************/ - process( text_to_cstring(PG_GETARG_TEXT_P(0)), PG_GETARG_ARRAYTYPE_P(1), @@ -163,12 +106,7 @@ PGDLLEXPORT Datum _pgr_depthfirstsearch(PG_FUNCTION_ARGS) { &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) { @@ -192,18 +130,6 @@ PGDLLEXPORT Datum _pgr_depthfirstsearch(PG_FUNCTION_ARGS) { Datum *values; bool* nulls; - /*********************************************************************** - * - * OUT seq BIGINT, - * OUT depth BIGINT, - * OUT start_vid BIGINT, - * OUT node BIGINT, - * OUT edge BIGINT, - * OUT cost FLOAT, - * OUT agg_cost FLOAT - * - **********************************************************************/ - size_t num = 7; values = palloc(num * sizeof(Datum)); nulls = palloc(num * sizeof(bool)); @@ -222,8 +148,6 @@ PGDLLEXPORT Datum _pgr_depthfirstsearch(PG_FUNCTION_ARGS) { values[5] = Float8GetDatum(result_tuples[funcctx->call_cntr].cost); values[6] = Float8GetDatum(result_tuples[funcctx->call_cntr].agg_cost); - /**********************************************************************/ - tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); diff --git a/src/traversal/depthFirstSearch_driver.cpp b/src/traversal/depthFirstSearch_driver.cpp index 547a102e90..c3c521ddaf 100644 --- a/src/traversal/depthFirstSearch_driver.cpp +++ b/src/traversal/depthFirstSearch_driver.cpp @@ -32,9 +32,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" +#include "spanningTree/details.hpp" #include "traversal/pgr_depthFirstSearch.hpp" /** @file depthFirstSearch_driver.cpp @@ -77,40 +79,10 @@ pgr_depthFirstSearch( } // namespace -/** @brief Performs exception handling and converts the results to postgres. - * - * @pre log_msg is empty - * @pre notice_msg is empty - * @pre err_msg is empty - * @pre return_tuples is empty - * @pre return_count is 0 - * - * It builds the graph using the `data_edges`, depending on whether - * the graph is directed or undirected. It also converts the C types - * to the C++ types, such as the `rootsArr` to `roots` vector and - * passes these variables to the template function `pgr_depthFirstSearch` - * which calls the main function defined in the C++ Header file. It also does - * exception handling. - * - * @param data_edges the set of edges from the SQL query - * @param total_edges the total number of edges in the SQL query - * @param rootsArr the array containing the root vertices - * @param size_rootsArr the size of the array containing the root vertices - * @param directed whether the graph is directed or undirected - * @param max_depth the maximum depth of traversal - * @param return_tuples the rows in the result - * @param return_count the count of rows in the result - * @param log_msg stores the log message - * @param notice_msg stores the notice message - * @param err_msg stores the error message - */ void -do_pgr_depthFirstSearch( - Edge_t *data_edges, - size_t total_edges, - - int64_t *rootsArr, - size_t size_rootsArr, +pgr_do_depthFirstSearch( + char *edges_sql, + ArrayType* starts, bool directed, int64_t max_depth, @@ -124,10 +96,13 @@ do_pgr_depthFirstSearch( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::pgget::get_intArray; std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; + try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); @@ -135,30 +110,38 @@ do_pgr_depthFirstSearch( pgassert(!(*return_tuples)); pgassert(*return_count == 0); - std::vector < int64_t > roots(rootsArr, rootsArr + size_rootsArr); - - std::vector < MST_rt > results; - + auto roots = get_intArray(starts, false); + std::vector results; graphType gType = directed ? DIRECTED : UNDIRECTED; - if (directed) { - pgrouting::DirectedGraph digraph(gType); - digraph.insert_edges(data_edges, total_edges); + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); + hint = nullptr; - results = pgr_depthFirstSearch( - digraph, - roots, - directed, - max_depth); + if (edges.empty()) { + results = pgrouting::details::get_no_edge_graph_result(roots); + *notice_msg = pgr_msg("No edges found"); + *log_msg = pgr_msg(edges_sql); } else { - pgrouting::UndirectedGraph undigraph(gType); - undigraph.insert_edges(data_edges, total_edges); + if (directed) { + pgrouting::DirectedGraph digraph(gType); + digraph.insert_edges(edges); results = pgr_depthFirstSearch( - undigraph, + digraph, roots, directed, max_depth); + } else { + pgrouting::UndirectedGraph undigraph(gType); + undigraph.insert_edges(edges); + + results = pgr_depthFirstSearch( + undigraph, + roots, + directed, + max_depth); + } } auto count = results.size(); @@ -190,6 +173,9 @@ do_pgr_depthFirstSearch( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; From 0655097479951561b626cfc26537962ac33a1582 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 24 Jan 2024 15:20:10 -0600 Subject: [PATCH 094/428] [trsp] Reading data on C++ code --- include/drivers/trsp/trspVia_driver.h | 40 +++--- .../drivers/trsp/trspVia_withPoints_driver.h | 52 ++++---- include/drivers/trsp/trsp_driver.h | 41 +++--- include/drivers/trsp/trsp_withPoints_driver.h | 49 ++++--- include/trsp/pgr_trspHandler.h | 12 ++ src/trsp/new_trsp.c | 62 +-------- src/trsp/pgr_trspHandler.cpp | 95 ++++++++++++++ src/trsp/trspVia.c | 66 +--------- src/trsp/trspVia_driver.cpp | 66 ++++++---- src/trsp/trspVia_withPoints.c | 74 ++--------- src/trsp/trspVia_withPoints_driver.cpp | 100 ++++++++------- src/trsp/trsp_driver.cpp | 73 +++++++---- src/trsp/trsp_withPoints.c | 101 +++------------ src/trsp/trsp_withPoints_driver.cpp | 120 ++++++++++-------- 14 files changed, 458 insertions(+), 493 deletions(-) diff --git a/include/drivers/trsp/trspVia_driver.h b/include/drivers/trsp/trspVia_driver.h index 60547961d3..01129c15a6 100644 --- a/include/drivers/trsp/trspVia_driver.h +++ b/include/drivers/trsp/trspVia_driver.h @@ -29,40 +29,44 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_TRSP_TRSPVIA_DRIVER_H_ #pragma once -/* for size-t */ +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#include "cpp_common/undefPostgresDefine.hpp" + #ifdef __cplusplus # include # include -using Edge_t = struct Edge_t; using Routes_t = struct Routes_t; -using Restriction_t = struct Restriction_t; #else # include # include -typedef struct Edge_t Edge_t; typedef struct Routes_t Routes_t; -typedef struct Restriction_t Restriction_t; #endif - #ifdef __cplusplus extern "C" { #endif -void do_trspVia( - Edge_t *, size_t, // edges - Restriction_t *, size_t, // restrictions - int64_t *, size_t, // vias - - bool, // directed - bool, // strict - bool, // U_turn_on_edge +void pgr_do_trspVia( + char*, + char*, + ArrayType*, - Routes_t **, size_t *, // tuples + bool, + bool, + bool, - char**, // log - char**, // notice - char**); // err + Routes_t **, size_t *, + char**, char**, char**); #ifdef __cplusplus } diff --git a/include/drivers/trsp/trspVia_withPoints_driver.h b/include/drivers/trsp/trspVia_withPoints_driver.h index 08ed20c48d..816e5ca61a 100644 --- a/include/drivers/trsp/trspVia_withPoints_driver.h +++ b/include/drivers/trsp/trspVia_withPoints_driver.h @@ -29,20 +29,27 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_TRSP_TRSPVIA_WITHPOINTS_DRIVER_H_ #pragma once +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#include "cpp_common/undefPostgresDefine.hpp" + #ifdef __cplusplus # include # include -using Point_on_edge_t = struct Point_on_edge_t; -using Edge_t = struct Edge_t; using Routes_t = struct Routes_t; -using Restriction_t = struct Restriction_t; #else # include # include -typedef struct Point_on_edge_t Point_on_edge_t; -typedef struct Edge_t Edge_t; typedef struct Routes_t Routes_t; -typedef struct Restriction_t Restriction_t; #endif @@ -52,26 +59,19 @@ extern "C" { /** @brief Process pgr_trsp_withPointsVia */ void -do_trspVia_withPoints( - Edge_t*, size_t, // edges - Restriction_t *, size_t, // restrictions - Point_on_edge_t *, size_t, // Points - Edge_t*, size_t, // edges of points - int64_t *, size_t, // via vertices - - bool, // directed - - char, // driving_side - bool, // details - - bool, // strict - bool, // U_turn_on_edge, - - Routes_t**, size_t*, // results - - char**, // log - char**, // notice - char**); // error +pgr_do_trspVia_withPoints( + char*, + char*, + char*, + char*, + ArrayType*, + + bool, + char, bool, + bool, bool, + + Routes_t**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/include/drivers/trsp/trsp_driver.h b/include/drivers/trsp/trsp_driver.h index f4b113f3f8..96b67cb798 100644 --- a/include/drivers/trsp/trsp_driver.h +++ b/include/drivers/trsp/trsp_driver.h @@ -32,41 +32,44 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_TRSP_TRSP_DRIVER_H_ #pragma once + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#include "cpp_common/undefPostgresDefine.hpp" + #ifdef __cplusplus #include #include -using Restriction_t = struct Restriction_t; using Path_rt = struct Path_rt; -using Edge_t = struct Edge_t; -using II_t_rt = struct II_t_rt; #else #include #include -typedef struct Restriction_t Restriction_t; typedef struct Path_rt Path_rt; -typedef struct Edge_t Edge_t; -typedef struct II_t_rt II_t_rt; #endif #ifdef __cplusplus extern "C" { #endif -void do_trsp( - Edge_t *, size_t, // edges - Restriction_t *, size_t, // restrictions - - II_t_rt *, size_t, // combinations - int64_t *, size_t, // starts - int64_t *, size_t, // ends - - bool, // directed +void pgr_do_trsp( + char*, + char*, + char*, + ArrayType*, ArrayType*, - Path_rt **, size_t *, // tuples + bool, - char**, // log - char**, // notice - char**); // err + Path_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/include/drivers/trsp/trsp_withPoints_driver.h b/include/drivers/trsp/trsp_withPoints_driver.h index ac5bfb82ba..14d273cf3d 100644 --- a/include/drivers/trsp/trsp_withPoints_driver.h +++ b/include/drivers/trsp/trsp_withPoints_driver.h @@ -29,47 +29,46 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_TRSP_TRSP_WITHPOINTS_DRIVER_H_ #pragma once + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#include "cpp_common/undefPostgresDefine.hpp" + #ifdef __cplusplus #include #include -using Restriction_t = struct Restriction_t; using Path_rt = struct Path_rt; -using Edge_t = struct Edge_t; -using II_t_rt = struct II_t_rt; -using Point_on_edge_t = struct Point_on_edge_t; #else #include #include -typedef struct Restriction_t Restriction_t; typedef struct Path_rt Path_rt; -typedef struct Edge_t Edge_t; -typedef struct II_t_rt II_t_rt; -typedef struct Point_on_edge_t Point_on_edge_t; #endif #ifdef __cplusplus extern "C" { #endif -void do_trsp_withPoints( - Edge_t *, size_t, // edges - Restriction_t *, size_t, // restrictions - Point_on_edge_t *, size_t, // points - Edge_t *, size_t, // edges of points - - II_t_rt *, size_t, // combinations - int64_t *, size_t, // starts - int64_t *, size_t, // ends - - bool, // directed - char, // driving_side - bool, // details +void pgr_do_trsp_withPoints( + char*, + char*, + char*, + char*, + char*, + ArrayType*, ArrayType*, - Path_rt **, size_t *, // tuples + bool, char, bool, - char**, // log - char**, // notice - char**); // err + Path_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/include/trsp/pgr_trspHandler.h b/include/trsp/pgr_trspHandler.h index 994b8c2d92..d239280fa6 100644 --- a/include/trsp/pgr_trspHandler.h +++ b/include/trsp/pgr_trspHandler.h @@ -102,6 +102,15 @@ class Pgr_trspHandler : public pgrouting::Pgr_messages { public: + Pgr_trspHandler( + std::vector &edges, + const std::vector &new_edges, + const bool directed, + const std::vector &ruleList); + Pgr_trspHandler( + std::vector &edges, + const bool directed, + const std::vector &ruleList); Pgr_trspHandler( Edge_t *edges, const size_t edge_count, @@ -135,6 +144,7 @@ class Pgr_trspHandler : public pgrouting::Pgr_messages { void clear(); private: + void construct_graph(const std::vector&, const bool); void construct_graph( Edge_t *edges, const size_t edge_count, @@ -178,6 +188,8 @@ class Pgr_trspHandler : public pgrouting::Pgr_messages { void renumber_edges(Edge_t*, const size_t); void renumber_edges(Edge_t*, const size_t, std::vector&); + void renumber_edges(std::vector&); + void renumber_edges(std::vector&, std::vector&); void add_to_que( double cost, diff --git a/src/trsp/new_trsp.c b/src/trsp/new_trsp.c index 3e389871fb..45b2c59cbf 100644 --- a/src/trsp/new_trsp.c +++ b/src/trsp/new_trsp.c @@ -29,17 +29,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "c_common/postgres_connection.h" -#include "drivers/trsp/trsp_driver.h" - +#include "c_types/path_rt.h" #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" - -#include "c_types/edge_t.h" -#include "c_types/restriction_t.h" -#include "c_types/path_rt.h" - -#include "c_common/trsp_pgget.h" +#include "drivers/trsp/trsp_driver.h" PGDLLEXPORT Datum _pgr_trspv4(PG_FUNCTION_ARGS); PG_FUNCTION_INFO_V1(_pgr_trspv4); @@ -69,49 +63,12 @@ void process( char* notice_msg = NULL; char* err_msg = NULL; - size_t size_start_vidsArr = 0; - int64_t* start_vidsArr = NULL; - - size_t size_end_vidsArr = 0; - int64_t* end_vidsArr = NULL; - - II_t_rt *combinations = NULL; - size_t total_combinations = 0; - - Edge_t *edges = NULL; - size_t total_edges = 0; - - Restriction_t * restrictions = NULL; - size_t total_restrictions = 0; - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - - if (total_edges == 0) { - pgr_SPI_finish(); - return; - } - pgr_get_restrictions(restrictions_sql, &restrictions, &total_restrictions, &err_msg); - throw_error(err_msg, restrictions_sql); - - if (starts && ends) { - start_vidsArr = pgr_get_bigIntArray(&size_start_vidsArr, starts, false, &err_msg); - throw_error(err_msg, "While getting start vids"); - end_vidsArr = pgr_get_bigIntArray(&size_end_vidsArr, ends, false, &err_msg); - throw_error(err_msg, "While getting end vids"); - } else if (combinations_sql) { - pgr_get_combinations(combinations_sql, &combinations, &total_combinations, &err_msg); - throw_error(err_msg, combinations_sql); - } - clock_t start_t = clock(); - - do_trsp( - edges, total_edges, - restrictions, total_restrictions, - - combinations, total_combinations, - start_vidsArr, size_start_vidsArr, - end_vidsArr, size_end_vidsArr, + pgr_do_trsp( + edges_sql, + restrictions_sql, + combinations_sql, + starts, ends, directed, @@ -128,11 +85,6 @@ void process( } pgr_global_report(log_msg, notice_msg, err_msg); - if (edges) {pfree(edges); edges=NULL;} - if (restrictions) {pfree(restrictions); restrictions=NULL;} - if (combinations) {pfree(combinations); combinations=NULL;} - if (start_vidsArr) {pfree(start_vidsArr); start_vidsArr=NULL;} - if (end_vidsArr) {pfree(end_vidsArr); end_vidsArr=NULL;} if (log_msg) {pfree(log_msg); log_msg=NULL;} if (notice_msg) {pfree(notice_msg); notice_msg=NULL;} if (err_msg) {pfree(err_msg); err_msg=NULL;} diff --git a/src/trsp/pgr_trspHandler.cpp b/src/trsp/pgr_trspHandler.cpp index f4c6085739..2c491774b5 100644 --- a/src/trsp/pgr_trspHandler.cpp +++ b/src/trsp/pgr_trspHandler.cpp @@ -44,6 +44,21 @@ namespace pgrouting { namespace trsp { // ------------------------------------------------------------------------- +Pgr_trspHandler::Pgr_trspHandler( + std::vector &edges, + const bool directed, + const std::vector &ruleList) : + m_ruleTable() { + initialize_restrictions(ruleList); + + renumber_edges(edges); + for (const auto& id : m_id_to_idx) { + m_idx_to_id[id.second] = id.first; + } + + construct_graph(edges, directed); +} + Pgr_trspHandler::Pgr_trspHandler( Edge_t *edges, const size_t edge_count, @@ -63,6 +78,29 @@ Pgr_trspHandler::Pgr_trspHandler( directed); } +Pgr_trspHandler::Pgr_trspHandler( + std::vector &edges, + const std::vector &new_edges, + const bool directed, + const std::vector &ruleList) : + m_ruleTable() { + initialize_restrictions(ruleList); + + auto point_edges = new_edges; + renumber_edges(edges, point_edges); + + for (const auto& id : m_id_to_idx) { + m_idx_to_id[id.second] = id.first; + } + + construct_graph( + edges, + directed); + add_point_edges( + point_edges, + directed); +} + Pgr_trspHandler::Pgr_trspHandler( Edge_t *edges, const size_t edge_count, @@ -91,6 +129,23 @@ Pgr_trspHandler::Pgr_trspHandler( // ------------------------------------------------------------------------- +void +Pgr_trspHandler::renumber_edges(std::vector &edges) { + int64_t idx(0); + for (auto &e : edges) { + if (m_id_to_idx.find(e.source) == m_id_to_idx.end()) { + m_id_to_idx[e.source] = idx; + ++idx; + } + if (m_id_to_idx.find(e.target) == m_id_to_idx.end()) { + m_id_to_idx[e.target] = idx; + ++idx; + } + e.source = m_id_to_idx.at(e.source); + e.target = m_id_to_idx.at(e.target); + } +} + void Pgr_trspHandler::renumber_edges( Edge_t *edges, @@ -110,6 +165,37 @@ Pgr_trspHandler::renumber_edges( } } +void +Pgr_trspHandler::renumber_edges( + std::vector &edges, + std::vector &new_edges) { + int64_t idx(0); + for (auto &e : edges) { + if (m_id_to_idx.find(e.source) == m_id_to_idx.end()) { + m_id_to_idx[e.source] = idx; + ++idx; + } + if (m_id_to_idx.find(e.target) == m_id_to_idx.end()) { + m_id_to_idx[e.target] = idx; + ++idx; + } + e.source = m_id_to_idx.at(e.source); + e.target = m_id_to_idx.at(e.target); + } + for (auto &e : new_edges) { + if (m_id_to_idx.find(e.source) == m_id_to_idx.end()) { + m_id_to_idx[e.source] = idx; + ++idx; + } + if (m_id_to_idx.find(e.target) == m_id_to_idx.end()) { + m_id_to_idx[e.target] = idx; + ++idx; + } + e.source = m_id_to_idx.at(e.source); + e.target = m_id_to_idx.at(e.target); + } +} + void Pgr_trspHandler::renumber_edges( Edge_t *edges, @@ -512,6 +598,15 @@ Pgr_trspHandler::process_trsp( // ------------------------------------------------------------------------- +void Pgr_trspHandler::construct_graph( + const std::vector &edges, + const bool directed) { + for (const auto &e : edges) { + addEdge(e, directed); + } + m_mapEdgeId2Index.clear(); +} + void Pgr_trspHandler::construct_graph( Edge_t* edges, const size_t edge_count, diff --git a/src/trsp/trspVia.c b/src/trsp/trspVia.c index 4e2633113d..a61d3cda5f 100644 --- a/src/trsp/trspVia.c +++ b/src/trsp/trspVia.c @@ -31,7 +31,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "drivers/trsp/trspVia_driver.h" PGDLLEXPORT Datum _pgr_trspvia(PG_FUNCTION_ARGS); @@ -42,7 +41,7 @@ void process( char* edges_sql, char* restrictions_sql, - ArrayType *via_arr, + ArrayType *vias, bool directed, bool strict, bool U_turn_on_edge, @@ -53,32 +52,11 @@ process( char* notice_msg = NULL; char* err_msg = NULL; - size_t size_via = 0; - int64_t* via = pgr_get_bigIntArray(&size_via, via_arr, false, &err_msg); - throw_error(err_msg, "While getting via vertices"); - - Edge_t* edges = NULL; - size_t size_edges = 0; - pgr_get_edges(edges_sql, &edges, &size_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - - if (size_edges == 0) { - if (via) pfree(via); - pgr_SPI_finish(); - return; - } - - Restriction_t * restrictions = NULL; - size_t size_restrictions = 0; - - pgr_get_restrictions(restrictions_sql, &restrictions, &size_restrictions, &err_msg); - throw_error(err_msg, restrictions_sql); - clock_t start_t = clock(); - do_trspVia( - edges, size_edges, - restrictions, size_restrictions, - via, size_via, + pgr_do_trspVia( + edges_sql, + restrictions_sql, + vias, directed, strict, U_turn_on_edge, @@ -100,9 +78,7 @@ process( if (log_msg) {pfree(log_msg); log_msg = NULL;} if (notice_msg) {pfree(notice_msg); notice_msg = NULL;} if (err_msg) {pfree(err_msg); err_msg = NULL;} - if (edges) {pfree(edges); edges = NULL;} - if (via) {pfree(via); via = NULL;} - if (restrictions) {pfree(restrictions); restrictions = NULL;} + pgr_SPI_finish(); } @@ -112,25 +88,14 @@ _pgr_trspvia(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; - /**********************************************************************/ Routes_t *result_tuples = 0; size_t result_count = 0; - /**********************************************************************/ if (SRF_IS_FIRSTCALL()) { MemoryContext oldcontext; funcctx = SRF_FIRSTCALL_INIT(); oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - - /********************************************************************** - * pgr_trspVia(edges_sql text, - * vertices anyarray, - * directed boolean default true, - * strict boolean default false, - * U_turn_on_edge boolean default false, - **********************************************************************/ - process( text_to_cstring(PG_GETARG_TEXT_P(0)), text_to_cstring(PG_GETARG_TEXT_P(1)), @@ -141,8 +106,6 @@ _pgr_trspvia(PG_FUNCTION_ARGS) { &result_tuples, &result_count); - /**********************************************************************/ - funcctx->max_calls = result_count; funcctx->user_fctx = result_tuples; @@ -168,20 +131,6 @@ _pgr_trspvia(PG_FUNCTION_ARGS) { bool* nulls; size_t call_cntr = funcctx->call_cntr; - /**********************************************************************/ - /* - 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, - OUT route_agg_cost FLOAT - */ - size_t numb_out = 10; values = palloc(numb_out * sizeof(Datum)); nulls = palloc(numb_out * sizeof(bool)); @@ -190,7 +139,6 @@ _pgr_trspvia(PG_FUNCTION_ARGS) { nulls[i] = false; } - // postgres starts counting from 1 values[0] = Int32GetDatum((int32_t)call_cntr + 1); values[1] = Int32GetDatum(result_tuples[call_cntr].path_id); values[2] = Int32GetDatum(result_tuples[call_cntr].path_seq + 1); @@ -202,8 +150,6 @@ _pgr_trspvia(PG_FUNCTION_ARGS) { values[8] = Float8GetDatum(result_tuples[call_cntr].agg_cost); values[9] = Float8GetDatum(result_tuples[call_cntr].route_agg_cost); - /**********************************************************************/ - tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); diff --git a/src/trsp/trspVia_driver.cpp b/src/trsp/trspVia_driver.cpp index 20f0e0b54a..fe14662320 100644 --- a/src/trsp/trspVia_driver.cpp +++ b/src/trsp/trspVia_driver.cpp @@ -35,6 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "dijkstra/pgr_dijkstraVia.hpp" #include "c_types/routes_t.h" #include "c_types/restriction_t.h" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/rule.h" #include "cpp_common/combinations.hpp" #include "cpp_common/pgr_alloc.hpp" @@ -129,10 +130,10 @@ get_route( } // namespace void -do_trspVia( - Edge_t* data_edges, size_t total_edges, - Restriction_t *restrictions, size_t restrictions_size, - int64_t* via_vidsArr, size_t size_via_vidsArr, +pgr_do_trspVia( + char *edges_sql, + char *restrictions_sql, + ArrayType* viaArr, bool directed, bool strict, @@ -146,41 +147,53 @@ do_trspVia( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::pgget::get_intArray; std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; try { - pgassert(total_edges != 0); pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); + if (!edges_sql) return; + + auto via = get_intArray(viaArr, false); + + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); + + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; + graphType gType = directed? DIRECTED: UNDIRECTED; std::deque paths; - std::vector via_vertices( - via_vidsArr, via_vidsArr + size_via_vidsArr); - if (directed) { pgrouting::DirectedGraph digraph(gType); - digraph.insert_edges(data_edges, total_edges); + digraph.insert_edges(edges); pgrouting::pgr_dijkstraVia( digraph, - via_vertices, + via, paths, strict, U_turn_on_edge, log); } else { pgrouting::UndirectedGraph undigraph(gType); - undigraph.insert_edges(data_edges, total_edges); + undigraph.insert_edges(edges); pgrouting::pgr_dijkstraVia( undigraph, - via_vertices, + via, paths, strict, U_turn_on_edge, @@ -195,7 +208,7 @@ do_trspVia( return; } - if (restrictions_size == 0) { + if (!restrictions_sql) { (*return_tuples) = pgr_alloc(count, (*return_tuples)); (*return_count) = (get_route(return_tuples, paths)); (*return_tuples)[count - 1].edge = -2; @@ -205,24 +218,30 @@ do_trspVia( /* * When there are turn restrictions */ + hint = restrictions_sql; + auto restrictions = restrictions_sql? + pgrouting::pgget::get_restrictions(std::string(restrictions_sql)) : std::vector(); + if (restrictions.empty()) { + (*return_tuples) = pgr_alloc(count, (*return_tuples)); + (*return_count) = (get_route(return_tuples, paths)); + (*return_tuples)[count - 1].edge = -2; + return; + } + std::vector ruleList; - for (size_t i = 0; i < restrictions_size; ++i) { - if (restrictions[i].via_size == 0) continue; - ruleList.push_back(pgrouting::trsp::Rule(*(restrictions + i))); + for (const auto &r : restrictions) { + if (r.via) ruleList.push_back(pgrouting::trsp::Rule(r)); } + hint = nullptr; auto new_combinations = pgrouting::utilities::get_combinations(paths, ruleList); if (!new_combinations.empty()) { - pgrouting::trsp::Pgr_trspHandler gdef( - data_edges, - total_edges, - directed, - ruleList); + pgrouting::trsp::Pgr_trspHandler gdef(edges, directed, ruleList); auto new_paths = gdef.process(new_combinations); paths.insert(paths.end(), new_paths.begin(), new_paths.end()); } - post_process_trspvia(paths, via_vertices); + post_process_trspvia(paths, via); count = count_tuples(paths); @@ -248,6 +267,9 @@ do_trspVia( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; diff --git a/src/trsp/trspVia_withPoints.c b/src/trsp/trspVia_withPoints.c index e78d1ef10d..f9eaf43c9a 100644 --- a/src/trsp/trspVia_withPoints.c +++ b/src/trsp/trspVia_withPoints.c @@ -31,7 +31,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "drivers/withPoints/get_new_queries.h" #include "drivers/trsp/trspVia_withPoints_driver.h" @@ -44,7 +43,7 @@ process( char* edges_sql, char* restrictions_sql, char* points_sql, - ArrayType *viasArr, + ArrayType *vias, bool directed, bool strict, @@ -60,73 +59,26 @@ process( char* notice_msg = NULL; char* err_msg = NULL; - /* - * Processing Via - */ - size_t size_via = 0; - int64_t* via = pgr_get_bigIntArray(&size_via, viasArr, false, &err_msg); - throw_error(err_msg, "While getting via vertices"); - - // TODO(vicky) figure out what happens when one point or 0 points are given /* - * Processing Points + * Estimate driving side */ driving_side[0] = estimate_drivingSide(driving_side[0]); if (driving_side[0] != 'r' && driving_side[0] != 'l') { - driving_side[0] = 'l'; + driving_side[0] = 'r'; } - Point_on_edge_t *points = NULL; - size_t total_points = 0; - pgr_get_points(points_sql, &points, &total_points, &err_msg); - throw_error(err_msg, points_sql); - char *edges_of_points_query = NULL; char *edges_no_points_query = NULL; get_new_queries(edges_sql, points_sql, &edges_of_points_query, &edges_no_points_query); - /* - * Processing Edges - */ - Edge_t *edges_of_points = NULL; - size_t total_edges_of_points = 0; - - Edge_t *edges = NULL; - size_t total_edges = 0; - - pgr_get_edges(edges_no_points_query, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_no_points_query); - pgr_get_edges(edges_of_points_query, &edges_of_points, &total_edges_of_points, true, false, &err_msg); - throw_error(err_msg, edges_of_points_query); - - {pfree(edges_of_points_query); edges_of_points_query = NULL;} - {pfree(edges_no_points_query); edges_no_points_query = NULL;} - - if ((total_edges + total_edges_of_points) == 0) { - if (edges) {pfree(edges); edges = NULL;} - if (edges_of_points) {pfree(edges_of_points); edges_of_points = NULL;} - if (via) {pfree(via); via = NULL;} - pgr_SPI_finish(); - return; - } - - /* - * Processing restrictions - */ - Restriction_t * restrictions = NULL; - size_t size_restrictions = 0; - - pgr_get_restrictions(restrictions_sql, &restrictions, &size_restrictions, &err_msg); - throw_error(err_msg, restrictions_sql); - clock_t start_t = clock(); - do_trspVia_withPoints( - edges, total_edges, - restrictions, size_restrictions, - points, total_points, - edges_of_points, total_edges_of_points, - via, size_via, + pgr_do_trspVia_withPoints( + edges_no_points_query, + restrictions_sql, + points_sql, + edges_of_points_query, + vias, directed, @@ -151,11 +103,9 @@ process( if (log_msg) {pfree(log_msg); log_msg = NULL;} if (notice_msg) {pfree(notice_msg); notice_msg = NULL;} if (err_msg) {pfree(err_msg); err_msg = NULL;} - if (edges) {pfree(edges); edges = NULL;} - if (via) {pfree(via); via = NULL;} - if (restrictions) {pfree(restrictions); restrictions = NULL;} - if (edges_of_points) {pfree(edges_of_points); edges_of_points = NULL;} - if (points) {pfree(points); points = NULL;} + if (edges_of_points_query) {pfree(edges_of_points_query); edges_of_points_query = NULL;} + if (edges_no_points_query) {pfree(edges_no_points_query); edges_no_points_query = NULL;} + pgr_SPI_finish(); } diff --git a/src/trsp/trspVia_withPoints_driver.cpp b/src/trsp/trspVia_withPoints_driver.cpp index a48e97c708..3f30c3642b 100644 --- a/src/trsp/trspVia_withPoints_driver.cpp +++ b/src/trsp/trspVia_withPoints_driver.cpp @@ -29,15 +29,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "dijkstra/pgr_dijkstraVia.hpp" -#include "withPoints/pgr_withPoints.hpp" + #include "c_types/routes_t.h" -#include "c_types/restriction_t.h" -#include "cpp_common/rule.h" -#include "cpp_common/combinations.hpp" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" +#include "cpp_common/rule.h" +#include "cpp_common/combinations.hpp" +#include "dijkstra/pgr_dijkstraVia.hpp" +#include "withPoints/pgr_withPoints.hpp" #include "trsp/pgr_trspHandler.h" @@ -127,22 +128,20 @@ get_route( } // namespace void -do_trspVia_withPoints( - Edge_t* edges, size_t total_edges, - Restriction_t *restrictions, size_t restrictions_size, - Point_on_edge_t *points_p, size_t total_points, - Edge_t *edges_of_points, size_t total_edges_of_points, - int64_t* via_vidsArr, size_t size_via_vidsArr, +pgr_do_trspVia_withPoints( + char *edges_sql, + char *restrictions_sql, + char *points_sql, + char *edges_of_points_sql, + ArrayType* viaArr, bool directed, - char driving_side, bool details, - bool strict, bool U_turn_on_edge, - Routes_t** return_tuples, size_t* return_count, + Routes_t** return_tuples, size_t *return_count, char** log_msg, char** notice_msg, @@ -151,41 +150,51 @@ do_trspVia_withPoints( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::pgget::get_intArray; std::ostringstream log; - std::ostringstream err; std::ostringstream notice; + std::ostringstream err; + char *hint = nullptr; try { - pgassert((total_edges + total_edges_of_points) != 0); pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - std::dequepaths; + auto via = get_intArray(viaArr, false); - graphType gType = directed? DIRECTED: UNDIRECTED; + hint = points_sql; + auto points = pgrouting::pgget::get_points(std::string(points_sql)); - /* - * processing via - */ - std::vector via_vertices(via_vidsArr, via_vidsArr + size_via_vidsArr); + hint = edges_of_points_sql; + auto edges_of_points = pgrouting::pgget::get_edges(std::string(edges_of_points_sql), true, false); - /* - * processing points - */ + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); + + if (edges.size() + edges_of_points.size() == 0) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + + hint = restrictions_sql; + auto restrictions = restrictions_sql? + pgrouting::pgget::get_restrictions(std::string(restrictions_sql)) : std::vector(); + + + graphType gType = directed? DIRECTED: UNDIRECTED; + + /* Dealing with points */ pgrouting::Pg_points_graph pg_graph( - std::vector( - points_p, - points_p + total_points), - std::vector< Edge_t >( - edges_of_points, - edges_of_points + total_edges_of_points), + points, edges_of_points, true, driving_side, directed); + log << pg_graph.get_log(); if (pg_graph.has_error()) { log << pg_graph.get_log(); @@ -195,27 +204,28 @@ do_trspVia_withPoints( return; } - auto vertices(pgrouting::extract_vertices(edges, total_edges)); + auto vertices(pgrouting::extract_vertices(edges)); vertices = pgrouting::extract_vertices(vertices, pg_graph.new_edges()); + std::deque paths; if (directed) { pgrouting::DirectedGraph digraph(vertices, gType); - digraph.insert_edges(edges, total_edges); + digraph.insert_edges(edges); digraph.insert_edges(pg_graph.new_edges()); pgrouting::pgr_dijkstraVia( digraph, - via_vertices, + via, paths, strict, U_turn_on_edge, log); } else { pgrouting::UndirectedGraph undigraph(vertices, gType); - undigraph.insert_edges(edges, total_edges); + undigraph.insert_edges(edges); undigraph.insert_edges(pg_graph.new_edges()); pgrouting::pgr_dijkstraVia( undigraph, - via_vertices, + via, paths, strict, U_turn_on_edge, @@ -234,35 +244,32 @@ do_trspVia_withPoints( return; } - if (restrictions_size == 0) { + if (!restrictions_sql || restrictions.empty()) { (*return_tuples) = pgr_alloc(count, (*return_tuples)); (*return_count) = (get_route(return_tuples, paths)); (*return_tuples)[count - 1].edge = -2; return; } - /* - * When there are turn restrictions - */ + std::vector ruleList; - for (size_t i = 0; i < restrictions_size; ++i) { - if (restrictions[i].via_size == 0) continue; - ruleList.push_back(pgrouting::trsp::Rule(*(restrictions + i))); + for (const auto &r : restrictions) { + if (r.via) ruleList.push_back(pgrouting::trsp::Rule(r)); } + hint = nullptr; auto new_combinations = pgrouting::utilities::get_combinations(paths, ruleList); if (!new_combinations.empty()) { pgrouting::trsp::Pgr_trspHandler gdef( edges, - total_edges, pg_graph.new_edges(), directed, ruleList); auto new_paths = gdef.process(new_combinations); paths.insert(paths.end(), new_paths.begin(), new_paths.end()); } - post_process_trspvia(paths, via_vertices); + post_process_trspvia(paths, via); if (!details) { for (auto &path : paths) path = pg_graph.eliminate_details(path); } @@ -292,6 +299,9 @@ do_trspVia_withPoints( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; diff --git a/src/trsp/trsp_driver.cpp b/src/trsp/trsp_driver.cpp index 4a13438ea6..1afc6f4c08 100644 --- a/src/trsp/trsp_driver.cpp +++ b/src/trsp/trsp_driver.cpp @@ -40,15 +40,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "trsp/pgr_trspHandler.h" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/rule.h" #include "cpp_common/pgr_assert.h" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/combinations.hpp" #include "c_types/restriction_t.h" #include "c_types/ii_t_rt.h" -#include "dijkstra/dijkstra.hpp" #include "withPoints/pgr_withPoints.hpp" +#include "dijkstra/dijkstra.hpp" namespace { @@ -93,13 +94,12 @@ pgr_dijkstra( } // namespace void -do_trsp( - Edge_t *edges, size_t total_edges, - Restriction_t *restrictions, size_t restrictions_size, - - II_t_rt *combinations_arr, size_t total_combinations, - int64_t *starts_arr, size_t size_starts_arr, - int64_t *ends_arr, size_t size_ends_arr, +pgr_do_trsp( + char *edges_sql, + char *restrictions_sql, + char *combinations_sql, + ArrayType *starts, + ArrayType *ends, bool directed, @@ -112,37 +112,53 @@ do_trsp( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::utilities::get_combinations; std::ostringstream log; std::ostringstream notice; std::ostringstream err; + char *hint = nullptr; + try { - pgassert(edges); pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - graphType gType = directed? DIRECTED: UNDIRECTED; + hint = combinations_sql; + auto combinations = get_combinations(combinations_sql, starts, ends, true); + hint = nullptr; - auto vertices(pgrouting::extract_vertices(edges, total_edges)); + if (combinations.empty() && combinations_sql) { + *notice_msg = pgr_msg("No (source, target) pairs found"); + *log_msg = pgr_msg(combinations_sql); + return; + } - auto combinations = total_combinations? - pgrouting::utilities::get_combinations(combinations_arr, total_combinations) - : pgrouting::utilities::get_combinations(starts_arr, size_starts_arr, ends_arr, size_ends_arr); + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); + hint = nullptr; + + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(edges_sql) : pgr_msg(log.str().c_str()); + return; + } + + graphType gType = directed? DIRECTED: UNDIRECTED; std::deque paths; if (directed) { - pgrouting::DirectedGraph digraph(vertices, gType); - digraph.insert_edges(edges, total_edges); + pgrouting::DirectedGraph digraph(gType); + digraph.insert_edges(edges); paths = pgr_dijkstra( digraph, combinations); } else { - pgrouting::UndirectedGraph undigraph(vertices, gType); - undigraph.insert_edges(edges, total_edges); + pgrouting::UndirectedGraph undigraph(gType); + undigraph.insert_edges(edges); paths = pgr_dijkstra( undigraph, @@ -159,7 +175,7 @@ do_trsp( return; } - if (restrictions_size == 0) { + if (!restrictions_sql) { (*return_tuples) = pgr_alloc(count, (*return_tuples)); (*return_count) = (collapse_paths(return_tuples, paths)); return; @@ -168,18 +184,26 @@ do_trsp( /* * When there are turn restrictions */ + hint = restrictions_sql; + auto restrictions = restrictions_sql? + pgrouting::pgget::get_restrictions(std::string(restrictions_sql)) : std::vector(); + if (restrictions.empty()) { + (*return_tuples) = pgr_alloc(count, (*return_tuples)); + (*return_count) = (collapse_paths(return_tuples, paths)); + return; + } + std::vector ruleList; - for (size_t i = 0; i < restrictions_size; ++i) { - if (restrictions[i].via_size == 0) continue; - ruleList.push_back(pgrouting::trsp::Rule(*(restrictions + i))); + for (const auto &r : restrictions) { + if (r.via) ruleList.push_back(pgrouting::trsp::Rule(r)); } + hint = nullptr; auto new_combinations = pgrouting::utilities::get_combinations(paths, ruleList); if (!new_combinations.empty()) { pgrouting::trsp::Pgr_trspHandler gdef( edges, - total_edges, directed, ruleList); auto new_paths = gdef.process(new_combinations); @@ -216,6 +240,9 @@ do_trsp( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch(...) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; diff --git a/src/trsp/trsp_withPoints.c b/src/trsp/trsp_withPoints.c index 9010f8fe20..99dc7df6f5 100644 --- a/src/trsp/trsp_withPoints.c +++ b/src/trsp/trsp_withPoints.c @@ -32,15 +32,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "utils/array.h" #include "c_types/path_rt.h" -#include "c_types/point_on_edge_t.h" -#include "c_types/restriction_t.h" - #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" - -#include "c_common/trsp_pgget.h" - #include "drivers/withPoints/get_new_queries.h" #include "drivers/trsp/trsp_withPoints_driver.h" @@ -65,26 +59,20 @@ process( Path_rt **result_tuples, size_t *result_count) { - driving_side[0] = estimate_drivingSide(driving_side[0]); - if (driving_side[0] != 'r' && driving_side[0] != 'l') { - driving_side[0] = 'l'; - } - pgr_SPI_connect(); char* log_msg = NULL; char* notice_msg = NULL; char* err_msg = NULL; - size_t size_start_pidsArr = 0; - int64_t* start_pidsArr = NULL; - size_t size_end_pidsArr = 0; - int64_t* end_pidsArr = NULL; - - II_t_rt *combinations = NULL; - size_t total_combinations = 0; + /* + * Estimate driving side + */ + driving_side[0] = estimate_drivingSide(driving_side[0]); + if (driving_side[0] != 'r' && driving_side[0] != 'l') { + driving_side[0] = 'l'; + } - /* managing edges */ char *edges_of_points_query = NULL; char *edges_no_points_query = NULL; get_new_queries( @@ -92,65 +80,18 @@ process( &edges_of_points_query, &edges_no_points_query); - Edge_t *edges_of_points = NULL; - size_t total_edges_of_points = 0; - - Edge_t *edges = NULL; - size_t total_edges = 0; - - pgr_get_edges(edges_of_points_query, &edges_of_points, &total_edges_of_points, true, false, &err_msg); - throw_error(err_msg, edges_of_points_query); - pgr_get_edges(edges_no_points_query, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_no_points_query); - - pfree(edges_of_points_query); - pfree(edges_no_points_query); - edges_of_points_query = NULL; - edges_no_points_query = NULL; - - if ((total_edges + total_edges_of_points) == 0) { - pgr_SPI_finish(); - return; - } - - /* Managing departure & destination */ - if (starts && ends) { - start_pidsArr = (int64_t*) pgr_get_bigIntArray(&size_start_pidsArr, starts, false, &err_msg); - throw_error(err_msg, "While getting start vids"); - end_pidsArr = (int64_t*) pgr_get_bigIntArray(&size_end_pidsArr, ends, false, &err_msg); - throw_error(err_msg, "While getting end vids"); - } else if (combinations_sql) { - pgr_get_combinations(combinations_sql, &combinations, &total_combinations, &err_msg); - throw_error(err_msg, combinations_sql); - } - - /* Managing Points */ - Point_on_edge_t *points = NULL; - size_t total_points = 0; - pgr_get_points(points_sql, &points, &total_points, &err_msg); - throw_error(err_msg, points_sql); - - /* Managing restrictions */ - Restriction_t *restrictions = NULL; - size_t restrictions_size = 0; - pgr_get_restrictions(restrictions_sql, &restrictions, &restrictions_size, &err_msg); - throw_error(err_msg, restrictions_sql); - clock_t start_t = clock(); - - do_trsp_withPoints( - edges, total_edges, - restrictions, restrictions_size, - points, total_points, - edges_of_points, total_edges_of_points, - - combinations, total_combinations, - - start_pidsArr, size_start_pidsArr, - end_pidsArr, size_end_pidsArr, + pgr_do_trsp_withPoints( + edges_no_points_query, + restrictions_sql, + points_sql, + edges_of_points_query, + combinations_sql, + starts, ends, directed, + driving_side[0], details, @@ -163,8 +104,8 @@ process( if (err_msg && (*result_tuples)) { pfree(*result_tuples); - (*result_count) = 0; (*result_tuples) = NULL; + (*result_count) = 0; } pgr_global_report(log_msg, notice_msg, err_msg); @@ -172,12 +113,8 @@ process( if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - if (edges) {pfree(edges); edges = NULL;} - if (edges_of_points) {pfree(edges_of_points); edges_of_points = NULL;} - if (edges_of_points) {pfree(edges_of_points); edges_of_points = NULL;} - if (start_pidsArr) {pfree(start_pidsArr); start_pidsArr = NULL;} - if (end_pidsArr) {pfree(end_pidsArr); end_pidsArr = NULL;} - if (combinations) {pfree(combinations); combinations = NULL;} + if (edges_of_points_query) {pfree(edges_of_points_query); edges_of_points_query = NULL;} + if (edges_no_points_query) {pfree(edges_no_points_query); edges_no_points_query = NULL;} pgr_SPI_finish(); } @@ -236,7 +173,6 @@ _pgr_trsp_withpoints(PG_FUNCTION_ARGS) { } funcctx->max_calls = result_count; - funcctx->user_fctx = result_tuples; if (get_call_result_type(fcinfo, NULL, &tuple_desc) != TYPEFUNC_COMPOSITE) @@ -290,4 +226,3 @@ _pgr_trsp_withpoints(PG_FUNCTION_ARGS) { SRF_RETURN_DONE(funcctx); } } - diff --git a/src/trsp/trsp_withPoints_driver.cpp b/src/trsp/trsp_withPoints_driver.cpp index bb08818ead..e7477a66f5 100644 --- a/src/trsp/trsp_withPoints_driver.cpp +++ b/src/trsp/trsp_withPoints_driver.cpp @@ -39,16 +39,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "trsp/pgr_trspHandler.h" -#include "cpp_common/rule.h" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/pgr_assert.h" +#include "cpp_common/rule.h" #include "cpp_common/combinations.hpp" -#include "c_types/restriction_t.h" -#include "c_types/ii_t_rt.h" -#include "dijkstra/dijkstra.hpp" #include "withPoints/pgr_withPoints.hpp" +#include "trsp/pgr_trspHandler.h" +#include "dijkstra/dijkstra.hpp" namespace { @@ -73,33 +72,17 @@ post_process_trsp(std::deque &paths) { return e1.start_id() < e2.start_id(); }); } - -template -std::deque -pgr_dijkstra( - G &graph, - std::map> &combinations - ) { - auto paths = pgrouting::algorithms::dijkstra( - graph, - combinations, - false, (std::numeric_limits::max)()); - - return paths; -} - } // namespace void -do_trsp_withPoints( - Edge_t *edges, size_t total_edges, - Restriction_t *restrictions, size_t restrictions_size, - Point_on_edge_t *points_p, size_t total_points, - Edge_t *edges_of_points, size_t total_edges_of_points, - - II_t_rt *combinations_arr, size_t total_combinations, - int64_t *starts_arr, size_t size_starts_arr, - int64_t *ends_arr, size_t size_ends_arr, +pgr_do_trsp_withPoints( + char *edges_sql, + char *restrictions_sql, + char *points_sql, + char *edges_of_points_sql, + char *combinations_sql, + ArrayType *starts, + ArrayType *ends, bool directed, char driving_side, @@ -114,28 +97,55 @@ do_trsp_withPoints( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::utilities::get_combinations; std::ostringstream log; std::ostringstream notice; std::ostringstream err; + char *hint = nullptr; + try { - pgassert(edges || edges_of_points); pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); + hint = combinations_sql; + auto combinations = get_combinations(combinations_sql, starts, ends, true); + hint = nullptr; + + if (combinations.empty() && combinations_sql) { + *notice_msg = pgr_msg("No (source, target) pairs found"); + *log_msg = pgr_msg(combinations_sql); + return; + } + + hint = points_sql; + auto points = pgrouting::pgget::get_points(std::string(points_sql)); + + hint = edges_of_points_sql; + auto edges_of_points = pgrouting::pgget::get_edges(std::string(edges_of_points_sql), true, false); + + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); + + if (edges.size() + edges_of_points.size() == 0) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + + hint = restrictions_sql; + auto restrictions = restrictions_sql? + pgrouting::pgget::get_restrictions(std::string(restrictions_sql)) : std::vector(); + + graphType gType = directed? DIRECTED: UNDIRECTED; /* Dealing with points */ pgrouting::Pg_points_graph pg_graph( - std::vector( - points_p, - points_p + total_points), - std::vector< Edge_t >( - edges_of_points, - edges_of_points + total_edges_of_points), + points, edges_of_points, true, driving_side, directed); @@ -149,39 +159,37 @@ do_trsp_withPoints( return; } - auto vertices(pgrouting::extract_vertices(edges, total_edges)); + auto vertices(pgrouting::extract_vertices(edges)); vertices = pgrouting::extract_vertices(vertices, pg_graph.new_edges()); - auto combinations = total_combinations? - pgrouting::utilities::get_combinations(combinations_arr, total_combinations) - : pgrouting::utilities::get_combinations(starts_arr, size_starts_arr, ends_arr, size_ends_arr); - std::deque paths; if (directed) { pgrouting::DirectedGraph digraph(vertices, gType); - digraph.insert_edges(edges, total_edges); + digraph.insert_edges(edges); digraph.insert_edges(pg_graph.new_edges()); - paths = pgr_dijkstra( + paths = pgrouting::algorithms::dijkstra( digraph, - combinations); + combinations, + false, (std::numeric_limits::max)()); } else { pgrouting::UndirectedGraph undigraph(vertices, gType); - undigraph.insert_edges(edges, total_edges); + undigraph.insert_edges(edges); undigraph.insert_edges(pg_graph.new_edges()); - paths = pgr_dijkstra( + paths = pgrouting::algorithms::dijkstra( undigraph, - combinations); + combinations, + false, (std::numeric_limits::max)()); } post_process_trsp(paths); + if (!details) { for (auto &path : paths) path = pg_graph.eliminate_details(path); } - size_t count(0); - count = count_tuples(paths); + size_t count(count_tuples(paths)); if (count == 0) { notice << "No paths found"; @@ -189,7 +197,7 @@ do_trsp_withPoints( return; } - if (restrictions_size == 0) { + if (!restrictions_sql || restrictions.empty()) { if (!details) { for (auto &path : paths) { path = pg_graph.eliminate_details(path); @@ -213,17 +221,16 @@ do_trsp_withPoints( * When there are turn restrictions */ std::vector ruleList; - for (size_t i = 0; i < restrictions_size; ++i) { - if (restrictions[i].via_size == 0) continue; - ruleList.push_back(pgrouting::trsp::Rule(*(restrictions + i))); + for (const auto &r : restrictions) { + if (r.via) ruleList.push_back(pgrouting::trsp::Rule(r)); } + hint = nullptr; auto new_combinations = pgrouting::utilities::get_combinations(paths, ruleList); if (!new_combinations.empty()) { pgrouting::trsp::Pgr_trspHandler gdef( edges, - total_edges, pg_graph.new_edges(), directed, ruleList); @@ -265,6 +272,9 @@ do_trsp_withPoints( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch(...) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; From 8d285185cfca16aa4869fc0c60d07aa5e103dce3 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 24 Jan 2024 15:21:40 -0600 Subject: [PATCH 095/428] [tsp] Reading data on C++ code --- include/drivers/tsp/TSP_driver.h | 20 ++++++------- include/drivers/tsp/euclideanTSP_driver.h | 20 ++++++------- include/tsp/tsp.hpp | 4 +-- src/tsp/TSP.c | 24 ++-------------- src/tsp/TSP_driver.cpp | 28 +++++++++++++++---- src/tsp/euclideanTSP.c | 24 ++-------------- src/tsp/euclideanTSP_driver.cpp | 22 ++++++++++++--- src/tsp/tsp.cpp | 34 ++++++++++------------- 8 files changed, 76 insertions(+), 100 deletions(-) diff --git a/include/drivers/tsp/TSP_driver.h b/include/drivers/tsp/TSP_driver.h index 38756e15bc..2b53a2e7cf 100644 --- a/include/drivers/tsp/TSP_driver.h +++ b/include/drivers/tsp/TSP_driver.h @@ -37,12 +37,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # include # include using TSP_tour_rt = struct TSP_tour_rt; -using IID_t_rt = struct IID_t_rt; #else # include # include typedef struct TSP_tour_rt TSP_tour_rt; -typedef struct IID_t_rt IID_t_rt; #endif #ifdef __cplusplus @@ -50,17 +48,15 @@ extern "C" { #endif void -do_pgr_tsp( - IID_t_rt *distances, size_t total_distances, - int64_t start_vid, - int64_t end_vid, - bool strict, +pgr_do_tsp( + char*, - TSP_tour_rt **results, - size_t *total_results, - char **log_msg, - char **notice_msg, - char **err_msg); + int64_t, + int64_t, + bool, + + TSP_tour_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/include/drivers/tsp/euclideanTSP_driver.h b/include/drivers/tsp/euclideanTSP_driver.h index eecdc7c077..0d942f6e0a 100644 --- a/include/drivers/tsp/euclideanTSP_driver.h +++ b/include/drivers/tsp/euclideanTSP_driver.h @@ -36,12 +36,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # include # include using TSP_tour_rt = struct TSP_tour_rt; -using Coordinate_t = struct Coordinate_t; #else # include # include typedef struct TSP_tour_rt TSP_tour_rt; -typedef struct Coordinate_t Coordinate_t; #endif #ifdef __cplusplus @@ -49,17 +47,15 @@ extern "C" { #endif void -do_pgr_euclideanTSP( - Coordinate_t *coordinates, size_t total_coordinates, - int64_t start_vid, - int64_t end_vid, - bool strict, +pgr_do_euclideanTSP( + char*, - TSP_tour_rt **results, - size_t *total_results, - char **log_msg, - char **notice_msg, - char **err_msg); + int64_t, + int64_t, + bool, + + TSP_tour_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/include/tsp/tsp.hpp b/include/tsp/tsp.hpp index 830fb78c0d..174649eda7 100644 --- a/include/tsp/tsp.hpp +++ b/include/tsp/tsp.hpp @@ -73,8 +73,8 @@ class TSP : public Pgr_messages { std::deque> result, size_t limit, int cycles); - TSP(IID_t_rt *, size_t, bool); - TSP(Coordinate_t *, size_t, bool); + explicit TSP(std::vector&); + explicit TSP(const std::vector&); TSP() = delete; #if Boost_VERSION_MACRO >= 106800 diff --git a/src/tsp/TSP.c b/src/tsp/TSP.c index 5fcf4a7f72..8ef89f901c 100644 --- a/src/tsp/TSP.c +++ b/src/tsp/TSP.c @@ -36,7 +36,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "c_types/tsp_tour_rt.h" #include "drivers/tsp/TSP_driver.h" @@ -58,26 +57,9 @@ process( char* notice_msg = NULL; char* err_msg = NULL; - IID_t_rt *distances = NULL; - size_t total_distances = 0; - pgr_get_matrixRows(matrix_sql, &distances, &total_distances, &err_msg); - throw_error(err_msg, matrix_sql); - if (total_distances == 0) { - ereport(WARNING, - (errmsg("Insufficient data found on inner query."), - errhint("%s", matrix_sql))); - (*result_count) = 0; - (*result_tuples) = NULL; - pgr_SPI_finish(); - return; - } - - - PGR_DBG("Starting timer"); clock_t start_t = clock(); - - do_pgr_tsp( - distances, total_distances, + pgr_do_tsp( + matrix_sql, start_vid, end_vid, max_cycles, @@ -87,7 +69,6 @@ process( &log_msg, ¬ice_msg, &err_msg); - time_msg("TSP", start_t, clock()); if (err_msg && (*result_tuples)) { @@ -101,7 +82,6 @@ process( if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - if (distances) pfree(distances); pgr_SPI_finish(); } diff --git a/src/tsp/TSP_driver.cpp b/src/tsp/TSP_driver.cpp index cc43a358ff..b54ea8955c 100644 --- a/src/tsp/TSP_driver.cpp +++ b/src/tsp/TSP_driver.cpp @@ -36,18 +36,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "tsp/tsp.hpp" #include "c_types/tsp_tour_rt.h" +#include "c_types/ii_t_rt.h" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" -#include "c_types/ii_t_rt.h" + +#include "tsp/tsp.hpp" void -do_pgr_tsp( - IID_t_rt *distances, - size_t total_distances, +pgr_do_tsp( + char *matrix_sql, int64_t start_vid, int64_t end_vid, bool max_cycles, @@ -64,8 +65,20 @@ do_pgr_tsp( std::ostringstream log; std::ostringstream notice; std::ostringstream err; + char *hint = nullptr; + try { - pgrouting::algorithm::TSP fn_tsp{distances, total_distances, true}; + hint = matrix_sql; + auto distances = pgrouting::pgget::get_matrixRows(std::string(matrix_sql)); + + if (distances.size() == 0) { + *notice_msg = pgr_msg("Insufficient data found on inner query"); + *log_msg = hint? pgr_msg(hint) : nullptr; + return; + } + hint = nullptr; + + pgrouting::algorithm::TSP fn_tsp{distances}; if (start_vid != 0 && !fn_tsp.has_vertex(start_vid)) { err << "Parameter 'start_id' do not exist on the data"; @@ -111,6 +124,9 @@ do_pgr_tsp( (*return_count) = 0; *err_msg = pgr_msg(ex.first.c_str()); *log_msg = pgr_msg(ex.second.c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; diff --git a/src/tsp/euclideanTSP.c b/src/tsp/euclideanTSP.c index 30deba69ac..e40b7c8fa5 100644 --- a/src/tsp/euclideanTSP.c +++ b/src/tsp/euclideanTSP.c @@ -36,7 +36,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "c_types/tsp_tour_rt.h" #include "drivers/tsp/euclideanTSP_driver.h" @@ -59,26 +58,9 @@ process( char* notice_msg = NULL; char* err_msg = NULL; - Coordinate_t *coordinates = NULL; - size_t total_coordinates = 0; - pgr_get_coordinates(coordinates_sql, &coordinates, &total_coordinates, &err_msg); - throw_error(err_msg, coordinates_sql); - - if (total_coordinates == 0) { - ereport(WARNING, - (errmsg("Insufficient data found on inner query."), - errhint("%s", coordinates_sql))); - (*result_count) = 0; - (*result_tuples) = NULL; - pgr_SPI_finish(); - return; - } - - PGR_DBG("Starting timer"); clock_t start_t = clock(); - - do_pgr_euclideanTSP( - coordinates, total_coordinates, + pgr_do_euclideanTSP( + coordinates_sql, start_vid, end_vid, max_cycles, @@ -88,7 +70,6 @@ process( &log_msg, ¬ice_msg, &err_msg); - time_msg("euclideanTSP", start_t, clock()); if (err_msg && (*result_tuples)) { @@ -102,7 +83,6 @@ process( if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - if (coordinates) pfree(coordinates); pgr_SPI_finish(); } diff --git a/src/tsp/euclideanTSP_driver.cpp b/src/tsp/euclideanTSP_driver.cpp index b4b67b9041..1f1476a509 100644 --- a/src/tsp/euclideanTSP_driver.cpp +++ b/src/tsp/euclideanTSP_driver.cpp @@ -39,13 +39,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "tsp/tsp.hpp" #include "c_types/tsp_tour_rt.h" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" void -do_pgr_euclideanTSP( - Coordinate_t *coordinates, - size_t total_coordinates, +pgr_do_euclideanTSP( + char *coordinates_sql, int64_t start_vid, int64_t end_vid, bool max_cycles, @@ -62,9 +62,20 @@ do_pgr_euclideanTSP( std::ostringstream log; std::ostringstream notice; std::ostringstream err; + char *hint = nullptr; try { - pgrouting::algorithm::TSP fn_tsp{coordinates, total_coordinates, true}; + hint = coordinates_sql; + auto coordinates = pgrouting::pgget::get_coordinates(std::string(coordinates_sql)); + + if (coordinates.size() == 0) { + *notice_msg = pgr_msg("No coordinates found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; + + pgrouting::algorithm::TSP fn_tsp{coordinates}; if (start_vid != 0 && !fn_tsp.has_vertex(start_vid)) { err << "Parameter 'start_id' do not exist on the data"; @@ -110,6 +121,9 @@ do_pgr_euclideanTSP( (*return_count) = 0; *err_msg = pgr_msg(ex.first.c_str()); *log_msg = pgr_msg(ex.second.c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; diff --git a/src/tsp/tsp.cpp b/src/tsp/tsp.cpp index 36b1901c98..20948eee3f 100644 --- a/src/tsp/tsp.cpp +++ b/src/tsp/tsp.cpp @@ -282,22 +282,20 @@ TSP::crossover_optimize(std::deque> result, size_t li -TSP::TSP( - IID_t_rt *distances, - size_t total_distances, bool) { +TSP::TSP(std::vector &distances) { /* * Inserting vertices */ Identifiers ids; - for (size_t i = 0; i < total_distances; ++i) { - ids += distances[i].from_vid; - ids += distances[i].to_vid; + for (auto &d : distances) { + ids += d.from_vid; + ids += d.to_vid; /* * Its undirected graph: * keeping from_vid < to_vid */ - if (distances[i].to_vid > distances[i].from_vid) { - std::swap(distances[i].to_vid, distances[i].from_vid); + if (d.to_vid > d.from_vid) { + std::swap(d.to_vid, d.from_vid); } } @@ -312,8 +310,7 @@ TSP::TSP( /* * Inserting edges */ - for (size_t i = 0; i < total_distances; ++i) { - auto edge = distances[i]; + for (const auto &edge : distances) { /* * skip loops */ @@ -373,24 +370,22 @@ TSP::TSP( * 2 , 3.6 1 * but when the remove_duplicates flag is on, keep only the first row that has the same id */ -TSP::TSP(Coordinate_t *coordinates, - size_t total_coordinates, - bool ) { - log << "before total_coordinates" << total_coordinates; +TSP::TSP(const std::vector &coordinates) { + log << "before total_coordinates" << coordinates.size(); /* * keeping the vertex identifiers */ Identifiers ids; - for (size_t i = 0; i < total_coordinates; ++i) { - ids += coordinates[i].id; + for (const auto c : coordinates) { + ids += c.id; } /* * Inserting vertices */ size_t i{0}; - for (const auto id : ids) { + for (const auto &id : ids) { auto v = add_vertex(i, graph); id_to_V.insert(std::make_pair(id, v)); V_to_id.insert(std::make_pair(v, id)); @@ -400,7 +395,7 @@ TSP::TSP(Coordinate_t *coordinates, /* * Inserting edges */ - for (size_t i = 0; i < total_coordinates; ++i) { + for (size_t i = 0; i < coordinates.size(); ++i) { auto u = get_boost_vertex(coordinates[i].id); auto ux = coordinates[i].x; auto uy = coordinates[i].y; @@ -408,7 +403,7 @@ TSP::TSP(Coordinate_t *coordinates, /* * undirected, so only need traverse higher coordinates for connections */ - for (size_t j = i + 1; j < total_coordinates; ++j) { + for (size_t j = i + 1; j < coordinates.size(); ++j) { auto v = get_boost_vertex(coordinates[j].id); /* @@ -437,7 +432,6 @@ TSP::TSP(Coordinate_t *coordinates, - std::deque> TSP::eval_tour(const std::vector &tsp_tour) { std::deque> results; From 56a6cb7f213ac7e922014e6a3e426a40c18bf618 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 24 Jan 2024 15:23:14 -0600 Subject: [PATCH 096/428] [withPoints] Reading data on C++ code --- .../drivers/withPoints/withPointsVia_driver.h | 48 ++++---- .../drivers/withPoints/withPoints_driver.h | 61 ++++------ src/withPoints/withPoints.c | 106 ++--------------- src/withPoints/withPointsVia.c | 64 ++-------- src/withPoints/withPointsVia_driver.cpp | 66 ++++++----- src/withPoints/withPoints_driver.cpp | 110 ++++++++++-------- 6 files changed, 161 insertions(+), 294 deletions(-) diff --git a/include/drivers/withPoints/withPointsVia_driver.h b/include/drivers/withPoints/withPointsVia_driver.h index 33a0715492..ca9bf2cba3 100644 --- a/include/drivers/withPoints/withPointsVia_driver.h +++ b/include/drivers/withPoints/withPointsVia_driver.h @@ -29,17 +29,26 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_WITHPOINTS_WITHPOINTSVIA_DRIVER_H_ #pragma once +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#include "cpp_common/undefPostgresDefine.hpp" + #ifdef __cplusplus # include # include -using Point_on_edge_t = struct Point_on_edge_t; -using Edge_t = struct Edge_t; using Routes_t = struct Routes_t; #else # include # include -typedef struct Point_on_edge_t Point_on_edge_t; -typedef struct Edge_t Edge_t; typedef struct Routes_t Routes_t; #endif @@ -50,25 +59,18 @@ extern "C" { /** @brief Process pgr_withPointsVia */ void -do_withPointsVia( - Edge_t*, size_t, // edges - Point_on_edge_t *, size_t, // Points - Edge_t*, size_t, // edges of points - int64_t *, size_t, // via vertices - - bool, // directed - - char, // driving_side - bool, // details - - bool, // strict - bool, // U_turn_on_edge, - - Routes_t**, size_t*, // results - - char**, // log - char**, // notice - char**); // error +pgr_do_withPointsVia( + char*, + char*, + char*, + ArrayType*, + + bool, + char, + bool, bool, bool, + + Routes_t**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/include/drivers/withPoints/withPoints_driver.h b/include/drivers/withPoints/withPoints_driver.h index 08ccdb2e17..9b39a329c0 100644 --- a/include/drivers/withPoints/withPoints_driver.h +++ b/include/drivers/withPoints/withPoints_driver.h @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: many_to_many_withPoints_driver.h +File: withPoints_driver.h Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -30,58 +30,45 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_WITHPOINTS_WITHPOINTS_DRIVER_H_ #pragma once -/* for size-t */ + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#include "cpp_common/undefPostgresDefine.hpp" + #ifdef __cplusplus # include # include -using Point_on_edge_t = struct Point_on_edge_t; -using Edge_t = struct Edge_t; using Path_rt = struct Path_rt; -using II_t_rt = struct II_t_rt; #else # include # include -typedef struct Point_on_edge_t Point_on_edge_t; -typedef struct Edge_t Edge_t; typedef struct Path_rt Path_rt; -typedef struct II_t_rt II_t_rt; #endif #ifdef __cplusplus extern "C" { #endif - void do_pgr_withPoints( - Edge_t *edges, - size_t total_edges, - - Point_on_edge_t *points, - size_t total_points, - - Edge_t *edges_of_points, - size_t total_edges_of_points, - - II_t_rt *combinations, - size_t total_combinations, - - int64_t *start_pidsArr, - size_t size_start_pidsArr, - - int64_t *end_pidsArr, - size_t size_end_pidsArr, - +void pgr_do_withPoints( + char*, + char*, + char*, + char*, + ArrayType*, ArrayType*, - char driving_side, - bool details, - bool directed, - bool only_cost, - bool normal, + char, bool, bool, bool, bool, - Path_rt **return_tuples, - size_t *return_count, - char** log_msg, - char** notice_msg, - char** err_msg); + Path_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/src/withPoints/withPoints.c b/src/withPoints/withPoints.c index 5489d158ae..bef63f3595 100644 --- a/src/withPoints/withPoints.c +++ b/src/withPoints/withPoints.c @@ -31,12 +31,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/postgres_connection.h" #include "c_types/path_rt.h" -#include "c_types/point_on_edge_t.h" #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" - -#include "c_common/trsp_pgget.h" #include "drivers/withPoints/get_new_queries.h" #include "drivers/withPoints/withPoints_driver.h" @@ -69,26 +66,6 @@ process( char* notice_msg = NULL; char* err_msg = NULL; - size_t size_start_pidsArr = 0; - int64_t* start_pidsArr = NULL; - - size_t size_end_pidsArr = 0; - int64_t* end_pidsArr = NULL; - - II_t_rt *combinations = NULL; - size_t total_combinations = 0; - - Point_on_edge_t *points = NULL; - size_t total_points = 0; - pgr_get_points(points_sql, &points, &total_points, &err_msg); - throw_error(err_msg, points_sql); - -#ifndef NDEBUG - size_t i; - for (i = 0; i< total_points; i++) { - PGR_DBG("%ld ", points[i].pid); - } -#endif char *edges_of_points_query = NULL; char *edges_no_points_query = NULL; get_new_queries( @@ -97,61 +74,13 @@ process( &edges_no_points_query); - Edge_t *edges_of_points = NULL; - size_t total_edges_of_points = 0; - - Edge_t *edges = NULL; - size_t total_edges = 0; - - if (normal) { - pgr_get_edges(edges_of_points_query, &edges_of_points, &total_edges_of_points, true, false, &err_msg); - throw_error(err_msg, edges_of_points_query); - pgr_get_edges(edges_no_points_query, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_no_points_query); - - if (starts && ends) { - start_pidsArr = pgr_get_bigIntArray(&size_start_pidsArr, starts, false, &err_msg); - throw_error(err_msg, "While getting start vids"); - end_pidsArr = pgr_get_bigIntArray(&size_end_pidsArr, ends, false, &err_msg); - throw_error(err_msg, "While getting end vids"); - } else if (combinations_sql) { - pgr_get_combinations(combinations_sql, &combinations, &total_combinations, &err_msg); - throw_error(err_msg, combinations_sql); - } - } else { - pgr_get_edges(edges_of_points_query, &edges_of_points, &total_edges_of_points, false, false, &err_msg); - throw_error(err_msg, edges_of_points_query); - pgr_get_edges(edges_no_points_query, &edges, &total_edges, false, false, &err_msg); - throw_error(err_msg, edges_no_points_query); - - end_pidsArr = pgr_get_bigIntArray(&size_end_pidsArr, starts, false, &err_msg); - throw_error(err_msg, "While getting start vids"); - start_pidsArr = pgr_get_bigIntArray(&size_start_pidsArr, ends, false, &err_msg); - throw_error(err_msg, "While getting end vids"); - } - - - pfree(edges_of_points_query); - pfree(edges_no_points_query); - edges_of_points_query = NULL; - edges_no_points_query = NULL; - - if ((total_edges + total_edges_of_points) == 0) { - pgr_SPI_finish(); - return; - } - clock_t start_t = clock(); - - do_pgr_withPoints( - edges, total_edges, - points, total_points, - edges_of_points, total_edges_of_points, - - combinations, total_combinations, - - start_pidsArr, size_start_pidsArr, - end_pidsArr, size_end_pidsArr, + pgr_do_withPoints( + edges_no_points_query, + points_sql, + edges_of_points_query, + combinations_sql, + starts, ends, driving_side[0], details, @@ -178,16 +107,10 @@ process( pgr_global_report(log_msg, notice_msg, err_msg); -#if 0 if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); - if (edges) pfree(edges); - if (points) pfree(points); - if (edges_of_points) pfree(edges_of_points); - if (start_pidsArr) pfree(start_pidsArr); - if (end_pidsArr) pfree(end_pidsArr); -#endif + pgr_SPI_finish(); } @@ -199,10 +122,8 @@ _pgr_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; @@ -249,8 +170,6 @@ _pgr_withpoints(PG_FUNCTION_ARGS) { &result_count); } - /**********************************************************************/ - funcctx->max_calls = result_count; funcctx->user_fctx = result_tuples; @@ -275,15 +194,6 @@ _pgr_withpoints(PG_FUNCTION_ARGS) { Datum *values; bool* nulls; - /**********************************************************************/ - // 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)); @@ -301,7 +211,6 @@ _pgr_withpoints(PG_FUNCTION_ARGS) { 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); - /**********************************************************************/ tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); @@ -310,4 +219,3 @@ _pgr_withpoints(PG_FUNCTION_ARGS) { SRF_RETURN_DONE(funcctx); } } - diff --git a/src/withPoints/withPointsVia.c b/src/withPoints/withPointsVia.c index 305c80ddf5..e227db7d22 100644 --- a/src/withPoints/withPointsVia.c +++ b/src/withPoints/withPointsVia.c @@ -32,7 +32,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "drivers/withPoints/get_new_queries.h" #include "drivers/withPoints/withPointsVia_driver.h" @@ -44,7 +43,7 @@ void process( char* edges_sql, char* points_sql, - ArrayType *viasArr, + ArrayType *vias, bool directed, bool strict, bool U_turn_on_edge, @@ -59,55 +58,16 @@ process( driving_side[0] = estimate_drivingSide(driving_side[0]); - /* - * Processing Via - */ - size_t size_vias = 0; - int64_t* vias = pgr_get_bigIntArray(&size_vias, viasArr, false, &err_msg); - throw_error(err_msg, "While getting via vertices"); - - // TODO(vicky) figure out what happens when one point or 0 points are given - - /* - * Processing Points - */ - Point_on_edge_t *points = NULL; - size_t total_points = 0; - pgr_get_points(points_sql, &points, &total_points, &err_msg); - throw_error(err_msg, points_sql); - char *edges_of_points_query = NULL; char *edges_no_points_query = NULL; get_new_queries(edges_sql, points_sql, &edges_of_points_query, &edges_no_points_query); - Edge_t *edges_of_points = NULL; - size_t total_edges_of_points = 0; - - Edge_t *edges = NULL; - size_t total_edges = 0; - - pgr_get_edges(edges_no_points_query, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_no_points_query); - pgr_get_edges(edges_of_points_query, &edges_of_points, &total_edges_of_points, true, false, &err_msg); - throw_error(err_msg, edges_of_points_query); - - {pfree(edges_of_points_query); edges_of_points_query = NULL;} - {pfree(edges_no_points_query); edges_no_points_query = NULL;} - - if ((total_edges + total_edges_of_points) == 0) { - if (edges) {pfree(edges), edges = NULL;} - if (edges_of_points) {pfree(edges_of_points), edges_of_points = NULL;} - if (vias) {pfree(vias), vias = NULL;} - pgr_SPI_finish(); - return; - } - clock_t start_t = clock(); - do_withPointsVia( - edges, total_edges, - points, total_points, - edges_of_points, total_edges_of_points, - vias, size_vias, + pgr_do_withPointsVia( + edges_no_points_query, + points_sql, + edges_of_points_query, + vias, directed, @@ -129,13 +89,10 @@ process( pgr_global_report(log_msg, notice_msg, err_msg); - if (points) {pfree(points), points = NULL;} - if (edges) {pfree(edges), edges = NULL;} - if (edges_of_points) {pfree(edges_of_points), edges_of_points = NULL;} - if (vias) {pfree(vias), vias = NULL;} if (log_msg) {pfree(log_msg); log_msg = NULL;} if (notice_msg) {pfree(notice_msg); notice_msg = NULL;} if (err_msg) {pfree(err_msg); err_msg = NULL;} + pgr_SPI_finish(); } @@ -145,10 +102,8 @@ _pgr_withpointsvia(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; - /**********************************************************************/ Routes_t *result_tuples = 0; size_t result_count = 0; - /**********************************************************************/ if (SRF_IS_FIRSTCALL()) { MemoryContext oldcontext; @@ -171,8 +126,6 @@ _pgr_withpointsvia(PG_FUNCTION_ARGS) { &result_tuples, &result_count); - /**********************************************************************/ - funcctx->max_calls = result_count; funcctx->user_fctx = result_tuples; @@ -206,7 +159,6 @@ _pgr_withpointsvia(PG_FUNCTION_ARGS) { nulls[i] = false; } - // postgres starts counting from 1 values[0] = Int32GetDatum((int32_t)call_cntr + 1); values[1] = Int32GetDatum(result_tuples[call_cntr].path_id); values[2] = Int32GetDatum(result_tuples[call_cntr].path_seq + 1); @@ -218,8 +170,6 @@ _pgr_withpointsvia(PG_FUNCTION_ARGS) { values[8] = Float8GetDatum(result_tuples[call_cntr].agg_cost); values[9] = Float8GetDatum(result_tuples[call_cntr].route_agg_cost); - /**********************************************************************/ - tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); diff --git a/src/withPoints/withPointsVia_driver.cpp b/src/withPoints/withPointsVia_driver.cpp index fe7a438e0d..3efcdb08f0 100644 --- a/src/withPoints/withPointsVia_driver.cpp +++ b/src/withPoints/withPointsVia_driver.cpp @@ -31,12 +31,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "dijkstra/pgr_dijkstraVia.hpp" -#include "withPoints/pgr_withPoints.hpp" + #include "c_types/routes_t.h" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" - +#include "dijkstra/pgr_dijkstraVia.hpp" +#include "withPoints/pgr_withPoints.hpp" namespace { @@ -90,21 +91,19 @@ get_route( } // namespace void -do_withPointsVia( - Edge_t* edges, size_t total_edges, - Point_on_edge_t *points_p, size_t total_points, - Edge_t *edges_of_points, size_t total_edges_of_points, - int64_t* via_vidsArr, size_t size_via_vidsArr, +pgr_do_withPointsVia( + char *edges_sql, + char *points_sql, + char *edges_of_points_sql, + ArrayType* starts, bool directed, - char driving_side, bool details, - bool strict, bool U_turn_on_edge, - Routes_t** return_tuples, size_t* return_count, + Routes_t** return_tuples, size_t *return_count, char** log_msg, char** notice_msg, @@ -113,38 +112,45 @@ do_withPointsVia( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::pgget::get_intArray; std::ostringstream log; - std::ostringstream err; std::ostringstream notice; + std::ostringstream err; + char *hint = nullptr; try { - pgassert(total_edges != 0); pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - std::dequepaths; + auto via_vertices = get_intArray(starts, false); graphType gType = directed? DIRECTED: UNDIRECTED; - /* - * processing via - */ - std::vector via_vertices(via_vidsArr, via_vidsArr + size_via_vidsArr); + hint = points_sql; + auto points = pgrouting::pgget::get_points(std::string(points_sql)); + + hint = edges_of_points_sql; + auto edges_of_points = pgrouting::pgget::get_edges(std::string(edges_of_points_sql), true, false); + + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); + + if (edges.size() + edges_of_points.size() == 0) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; + /* * processing points */ - pgrouting::Pg_points_graph pg_graph( - std::vector( - points_p, - points_p + total_points), - std::vector< Edge_t >( - edges_of_points, - edges_of_points + total_edges_of_points), + pgrouting::Pg_points_graph pg_graph(points, edges_of_points, true, driving_side, directed); @@ -157,12 +163,13 @@ do_withPointsVia( return; } - auto vertices(pgrouting::extract_vertices(edges, total_edges)); + auto vertices(pgrouting::extract_vertices(edges)); vertices = pgrouting::extract_vertices(vertices, pg_graph.new_edges()); + std::deque paths; if (directed) { pgrouting::DirectedGraph digraph(vertices, gType); - digraph.insert_edges(edges, total_edges); + digraph.insert_edges(edges); digraph.insert_edges(pg_graph.new_edges()); pgrouting::pgr_dijkstraVia( digraph, @@ -173,7 +180,7 @@ do_withPointsVia( log); } else { pgrouting::UndirectedGraph undigraph(vertices, gType); - undigraph.insert_edges(edges, total_edges); + undigraph.insert_edges(edges); undigraph.insert_edges(pg_graph.new_edges()); pgrouting::pgr_dijkstraVia( undigraph, @@ -215,6 +222,9 @@ do_withPointsVia( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; diff --git a/src/withPoints/withPoints_driver.cpp b/src/withPoints/withPoints_driver.cpp index 2310d0400d..b323873e64 100644 --- a/src/withPoints/withPoints_driver.cpp +++ b/src/withPoints/withPoints_driver.cpp @@ -37,13 +37,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include -#include "dijkstra/dijkstra.hpp" #include "withPoints/pgr_withPoints.hpp" - +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/combinations.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" +#include "dijkstra/dijkstra.hpp" + namespace { template < class G > @@ -71,23 +72,16 @@ pgr_dijkstra( } // namespace -// CREATE OR REPLACE FUNCTION pgr_withPoint( -// edges_sql TEXT, -// points_sql TEXT, -// start_pid ANYARRAY, -// end_pid BIGINT, -// directed BOOLEAN DEFAULT true -void -do_pgr_withPoints( - Edge_t *edges, size_t total_edges, - Point_on_edge_t *points_p, size_t total_points, - Edge_t *edges_of_points, size_t total_edges_of_points, - - II_t_rt *combinationsArr, size_t total_combinations, - int64_t *start_vidsArr, size_t size_start_vidsArr, - int64_t *end_vidsArr, size_t size_end_vidsArr, +void +pgr_do_withPoints( + char *edges_sql, + char *points_sql, + char *edges_of_points_sql, + char *combinations_sql, + ArrayType *starts, + ArrayType *ends, char driving_side, bool details, @@ -104,25 +98,53 @@ do_pgr_withPoints( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::utilities::get_combinations; std::ostringstream log; std::ostringstream notice; std::ostringstream err; + char *hint = nullptr; + try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); - pgassert((*return_count) == 0); - pgassert(edges || edges_of_points); - - pgrouting::Pg_points_graph pg_graph( - std::vector( - points_p, - points_p + total_points), - std::vector< Edge_t >( - edges_of_points, - edges_of_points + total_edges_of_points), + pgassert(*return_count == 0); + + graphType gType = directed? DIRECTED: UNDIRECTED; + + hint = combinations_sql; + auto combinations = get_combinations(combinations_sql, starts, ends, normal); + hint = nullptr; + + if (combinations.empty() && combinations_sql) { + *notice_msg = pgr_msg("No (source, target) pairs found"); + *log_msg = pgr_msg(combinations_sql); + return; + } + + + hint = points_sql; + auto points = pgrouting::pgget::get_points(std::string(points_sql)); + + hint = edges_of_points_sql; + auto edges_of_points = pgrouting::pgget::get_edges(std::string(edges_of_points_sql), normal, false); + + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), normal, false); + + if (edges.size() + edges_of_points.size() == 0) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; + + /* + * processing points + */ + pgrouting::Pg_points_graph pg_graph(points, edges_of_points, normal, driving_side, directed); @@ -135,21 +157,13 @@ do_pgr_withPoints( return; } - auto combinations = total_combinations? - pgrouting::utilities::get_combinations(combinationsArr, total_combinations) - : pgrouting::utilities::get_combinations(start_vidsArr, size_start_vidsArr, end_vidsArr, size_end_vidsArr); - - auto vertices(pgrouting::extract_vertices(edges, total_edges)); + auto vertices(pgrouting::extract_vertices(edges)); vertices = pgrouting::extract_vertices(vertices, pg_graph.new_edges()); - graphType gType = directed? DIRECTED: UNDIRECTED; - - std::deque< Path > paths; - + std::deque paths; if (directed) { - log << "Working with directed Graph\n"; pgrouting::DirectedGraph digraph(vertices, gType); - digraph.insert_edges(edges, total_edges); + digraph.insert_edges(edges); digraph.insert_edges(pg_graph.new_edges()); paths = pgr_dijkstra( @@ -157,9 +171,8 @@ do_pgr_withPoints( combinations, only_cost, normal); } else { - log << "Working with Undirected Graph\n"; pgrouting::UndirectedGraph undigraph(vertices, gType); - undigraph.insert_edges(edges, total_edges); + undigraph.insert_edges(edges); undigraph.insert_edges(pg_graph.new_edges()); paths = pgr_dijkstra( undigraph, @@ -168,9 +181,7 @@ do_pgr_withPoints( } if (!details) { - for (auto &path : paths) { - path = pg_graph.eliminate_details(path); - } + for (auto &path : paths) path = pg_graph.eliminate_details(path); } /* @@ -185,24 +196,20 @@ do_pgr_withPoints( return a.end_id() < b.end_id(); }); - size_t count(0); - count = count_tuples(paths); + auto count(count_tuples(paths)); if (count == 0) { (*return_tuples) = NULL; (*return_count) = 0; + notice << "No paths found"; + *log_msg = pgr_msg(notice.str().c_str()); return; } (*return_tuples) = pgr_alloc(count, (*return_tuples)); - log << "Converting a set of paths into the tuples\n"; (*return_count) = (collapse_paths(return_tuples, paths)); - log << "************************************************"; - log << pg_graph.get_log(); - log << "************************************************"; - *log_msg = log.str().empty()? *log_msg : pgr_msg(log.str().c_str()); @@ -215,6 +222,9 @@ do_pgr_withPoints( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; From ebd718e0a5b1e0691116e32b5e26756c1e47bb4f Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 24 Jan 2024 15:34:44 -0600 Subject: [PATCH 097/428] [spannTree] Reading data on C++ code --- include/drivers/spanningTree/kruskal_driver.h | 37 ++++++++-------- include/drivers/spanningTree/prim_driver.h | 40 +++++++++-------- .../spanningTree/randomSpanningTree_driver.h | 37 ++++++++++------ src/spanningTree/kruskal.c | 34 +++----------- src/spanningTree/kruskal_driver.cpp | 44 ++++++++++--------- src/spanningTree/prim.c | 32 ++------------ src/spanningTree/prim_driver.cpp | 41 +++++++++-------- src/spanningTree/randomSpanningTree.c | 26 +---------- .../randomSpanningTree_driver.cpp | 26 ++++++++--- 9 files changed, 139 insertions(+), 178 deletions(-) diff --git a/include/drivers/spanningTree/kruskal_driver.h b/include/drivers/spanningTree/kruskal_driver.h index 6b559638e9..7cf11e1f20 100644 --- a/include/drivers/spanningTree/kruskal_driver.h +++ b/include/drivers/spanningTree/kruskal_driver.h @@ -31,40 +31,41 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_SPANNINGTREE_KRUSKAL_DRIVER_H_ #pragma once -/* for size-t */ +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#include "cpp_common/undefPostgresDefine.hpp" + #ifdef __cplusplus # include # include -using Edge_t = struct Edge_t; using MST_rt = struct MST_rt; #else # include # include -typedef struct Edge_t Edge_t; typedef struct MST_rt MST_rt; #endif #ifdef __cplusplus extern "C" { #endif - void - do_pgr_kruskal( - Edge_t *data_edges, - size_t total_edges, - - int64_t *root, - size_t total_roots, - char* fn_suffix, +void pgr_do_kruskal( + char*, + ArrayType*, - int64_t max_depth, - double distance, + char*, int64_t, double, - MST_rt **return_tuples, - size_t *return_count, - char ** log_msg, - char ** notice_msg, - char ** err_msg); + MST_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/include/drivers/spanningTree/prim_driver.h b/include/drivers/spanningTree/prim_driver.h index a7e24eed2a..0ea5408bcd 100644 --- a/include/drivers/spanningTree/prim_driver.h +++ b/include/drivers/spanningTree/prim_driver.h @@ -31,40 +31,42 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_SPANNINGTREE_PRIM_DRIVER_H_ #pragma once -/* for size-t */ +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#include "cpp_common/undefPostgresDefine.hpp" + #ifdef __cplusplus # include # include +using MST_rt = struct MST_rt; #else # include # include +typedef struct MST_rt MST_rt; #endif -typedef struct Edge_t Edge_t; -typedef struct MST_rt MST_rt; #ifdef __cplusplus extern "C" { #endif -void do_pgr_prim( - Edge_t *data_edges, - size_t total_edges, - - int64_t *rootsArr, - size_t size_rootsArr, - - char* fn_suffix, - - int64_t max_depth, - double distance, +void pgr_do_prim( + char*, + ArrayType*, - MST_rt **return_tuples, - size_t *return_count, + char*, int64_t, double, - char ** log_msg, - char ** notice_msg, - char ** err_msg); + MST_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/include/drivers/spanningTree/randomSpanningTree_driver.h b/include/drivers/spanningTree/randomSpanningTree_driver.h index 434887d3b5..febaa96ada 100644 --- a/include/drivers/spanningTree/randomSpanningTree_driver.h +++ b/include/drivers/spanningTree/randomSpanningTree_driver.h @@ -31,31 +31,40 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_SPANNINGTREE_RANDOMSPANNINGTREE_DRIVER_H_ #pragma once -/* for size-t */ +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#ifdef __cplusplus +} +#endif + +#include "cpp_common/undefPostgresDefine.hpp" + #ifdef __cplusplus # include +using SpanTree_rt = struct SpanTree_rt; #else # include +typedef SpanTree_rt SpanTree_rt; #endif -typedef struct Edge_t Edge_t; -typedef SpanTree_rt SpanTree_rt; #ifdef __cplusplus extern "C" { #endif - void - do_pgr_randomSpanningTree( - Edge_t *data_edges, - size_t total_edges, - int64_t root_vertex, - bool directed, - SpanTree_rt **return_tuples, - size_t *return_count, - char ** log_msg, - char ** notice_msg, - char ** err_msg); +void pgr_do_randomSpanningTree( + char*, + ArrayType*, + + int64_t, double, + + SpanTree_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus } diff --git a/src/spanningTree/kruskal.c b/src/spanningTree/kruskal.c index cc3e5d3f4f..338b129c9c 100644 --- a/src/spanningTree/kruskal.c +++ b/src/spanningTree/kruskal.c @@ -34,7 +34,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "c_types/mst_rt.h" #include "drivers/spanningTree/mst_common.h" @@ -59,6 +58,8 @@ process( char* log_msg = NULL; char* notice_msg = NULL; char* err_msg = NULL; + (*result_tuples) = NULL; + (*result_count) = 0; char * fn_name = get_name(0, fn_suffix, &err_msg); @@ -67,30 +68,10 @@ process( return; } - /* checks previously done on sql now done here */ - if (strcmp(fn_suffix, "DD") == 0 && distance < 0) { - throw_error("Negative value found on 'distance'", "Must be positive"); - } else if ((strcmp(fn_suffix, "BFS") == 0 || strcmp(fn_suffix, "DFS") == 0) && max_depth < 0) { - throw_error("Negative value found on 'max_depth'", "Must be positive"); - } - - size_t size_rootsArr = 0; - int64_t* rootsArr = pgr_get_bigIntArray(&size_rootsArr, roots, false, &err_msg); - throw_error(err_msg, "While getting start vids"); - - (*result_tuples) = NULL; - (*result_count) = 0; - - Edge_t *edges = NULL; - size_t total_edges = 0; - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - clock_t start_t = clock(); - do_pgr_kruskal( - edges, total_edges, - rootsArr, size_rootsArr, + pgr_do_kruskal( + edges_sql, + roots, fn_suffix, max_depth, distance, @@ -100,7 +81,6 @@ process( &log_msg, ¬ice_msg, &err_msg); - time_msg(fn_name, start_t, clock()); if (err_msg) { @@ -108,7 +88,6 @@ process( } pgr_global_report(log_msg, notice_msg, err_msg); - if (edges) pfree(edges); if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); @@ -128,8 +107,6 @@ PGDLLEXPORT Datum _pgr_kruskalv4(PG_FUNCTION_ARGS) { funcctx = SRF_FIRSTCALL_INIT(); oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - - /* Edge sql, tree roots, fn_suffix, max_depth, distance */ process( text_to_cstring(PG_GETARG_TEXT_P(0)), PG_GETARG_ARRAYTYPE_P(1), @@ -259,7 +236,6 @@ PGDLLEXPORT Datum _pgr_kruskal(PG_FUNCTION_ARGS) { values[4] = Int64GetDatum(result_tuples[funcctx->call_cntr].edge); values[5] = Float8GetDatum(result_tuples[funcctx->call_cntr].cost); values[6] = Float8GetDatum(result_tuples[funcctx->call_cntr].agg_cost); - /**********************************************************************/ tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); diff --git a/src/spanningTree/kruskal_driver.cpp b/src/spanningTree/kruskal_driver.cpp index 0bc5c75892..135eab0b1b 100644 --- a/src/spanningTree/kruskal_driver.cpp +++ b/src/spanningTree/kruskal_driver.cpp @@ -33,6 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" @@ -41,12 +42,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. void -do_pgr_kruskal( - Edge_t *data_edges, - size_t total_edges, - - int64_t *rootsArr, - size_t size_rootsArr, +pgr_do_kruskal( + char *edges_sql, + ArrayType* starts, char* fn_suffix, @@ -62,10 +60,13 @@ do_pgr_kruskal( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::pgget::get_intArray; std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; + try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); @@ -73,20 +74,25 @@ do_pgr_kruskal( pgassert(!(*return_tuples)); pgassert(*return_count == 0); - std::vector roots(rootsArr, rootsArr + size_rootsArr); + auto roots = get_intArray(starts, false); + + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); + hint = nullptr; + std::string suffix(fn_suffix); std::vector results; - if (total_edges == 0) { + pgrouting::UndirectedGraph undigraph(UNDIRECTED); + undigraph.insert_edges(edges); + pgrouting::functions::Pgr_kruskal kruskal; + + if (edges.empty()) { results = pgrouting::details::get_no_edge_graph_result(roots); + *notice_msg = pgr_msg("No edges found"); + *log_msg = pgr_msg(edges_sql); } else { - pgrouting::UndirectedGraph undigraph(UNDIRECTED); - undigraph.insert_edges(data_edges, total_edges); - - pgrouting::functions::Pgr_kruskal - kruskal; - if (suffix == "") { results = kruskal.kruskal(undigraph); } else if (suffix == "BFS") { @@ -104,13 +110,6 @@ do_pgr_kruskal( auto count = results.size(); - if (count == 0) { - (*return_tuples) = NULL; - (*return_count) = 0; - notice << "No spanning tree found"; - return; - } - (*return_tuples) = pgr_alloc(count, (*return_tuples)); for (size_t i = 0; i < count; i++) { *((*return_tuples) + i) = results[i]; @@ -130,6 +129,9 @@ do_pgr_kruskal( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; diff --git a/src/spanningTree/prim.c b/src/spanningTree/prim.c index 16f4f1a874..26a86b1bbf 100644 --- a/src/spanningTree/prim.c +++ b/src/spanningTree/prim.c @@ -27,13 +27,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ #include -#include #include "c_common/postgres_connection.h" #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "c_types/mst_rt.h" #include "drivers/spanningTree/mst_common.h" @@ -65,30 +63,10 @@ process( return; } - if (strcmp(fn_suffix, "DD") == 0 && distance < 0) { - throw_error("Negative value found on 'distance'", "Must be positive"); - } else if ((strcmp(fn_suffix, "BFS") == 0 || strcmp(fn_suffix, "DFS") == 0) && max_depth < 0) { - throw_error("Negative value found on 'max_depth'", "Must be positive"); - } - - size_t size_rootsArr = 0; - int64_t* rootsArr = pgr_get_bigIntArray(&size_rootsArr, roots, false, &err_msg); - throw_error(err_msg, "While getting start vids"); - - (*result_tuples) = NULL; - (*result_count) = 0; - - Edge_t *edges = NULL; - size_t total_edges = 0; - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - - clock_t start_t = clock(); - do_pgr_prim( - edges, total_edges, - rootsArr, size_rootsArr, + pgr_do_prim( + edges_sql, + roots, fn_suffix, @@ -109,7 +87,6 @@ process( } pgr_global_report(log_msg, notice_msg, err_msg); - if (edges) pfree(edges); if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); @@ -209,7 +186,6 @@ PGDLLEXPORT Datum _pgr_prim(PG_FUNCTION_ARGS) { funcctx = SRF_FIRSTCALL_INIT(); oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - /* Edge sql, tree roots, fn_suffix, max_depth, distance */ process( text_to_cstring(PG_GETARG_TEXT_P(0)), PG_GETARG_ARRAYTYPE_P(1), @@ -262,8 +238,6 @@ PGDLLEXPORT Datum _pgr_prim(PG_FUNCTION_ARGS) { values[5] = Float8GetDatum(result_tuples[funcctx->call_cntr].cost); values[6] = Float8GetDatum(result_tuples[funcctx->call_cntr].agg_cost); - /**********************************************************************/ - tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); diff --git a/src/spanningTree/prim_driver.cpp b/src/spanningTree/prim_driver.cpp index f99fe5a7c9..895dc3e013 100644 --- a/src/spanningTree/prim_driver.cpp +++ b/src/spanningTree/prim_driver.cpp @@ -33,6 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" @@ -43,12 +44,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. void -do_pgr_prim( - Edge_t *data_edges, - size_t total_edges, - - int64_t *rootsArr, - size_t size_rootsArr, +pgr_do_prim( + char *edges_sql, + ArrayType* starts, char* fn_suffix, @@ -64,10 +62,13 @@ do_pgr_prim( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::pgget::get_intArray; std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; + try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); @@ -75,17 +76,25 @@ do_pgr_prim( pgassert(!(*return_tuples)); pgassert(*return_count == 0); - std::vector roots(rootsArr, rootsArr + size_rootsArr); + auto roots = get_intArray(starts, false); + + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); + hint = nullptr; + std::string suffix(fn_suffix); std::vector results; - if (total_edges == 0) { + pgrouting::UndirectedGraph undigraph(UNDIRECTED); + undigraph.insert_min_edges_no_parallel(edges); + pgrouting::functions::Pgr_prim prim; + + if (edges.empty()) { results = pgrouting::details::get_no_edge_graph_result(roots); + *notice_msg = pgr_msg("No edges found"); + *log_msg = pgr_msg(edges_sql); } else { - pgrouting::UndirectedGraph undigraph(UNDIRECTED); - undigraph.insert_min_edges_no_parallel(data_edges, total_edges); - pgrouting::functions::Pgr_prim prim; if (suffix == "") { results = prim.prim(undigraph); } else if (suffix == "BFS") { @@ -103,13 +112,6 @@ do_pgr_prim( auto count = results.size(); - if (count == 0) { - (*return_tuples) = NULL; - (*return_count) = 0; - notice << "No spanning tree found"; - return; - } - (*return_tuples) = pgr_alloc(count, (*return_tuples)); for (size_t i = 0; i < count; i++) { *((*return_tuples) + i) = results[i]; @@ -129,6 +131,9 @@ do_pgr_prim( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; diff --git a/src/spanningTree/randomSpanningTree.c b/src/spanningTree/randomSpanningTree.c index dbf004678b..75e9315ea5 100644 --- a/src/spanningTree/randomSpanningTree.c +++ b/src/spanningTree/randomSpanningTree.c @@ -33,7 +33,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "c_common/trsp_pgget.h" #include "drivers/spanningTree/randomSpanningTree_driver.h" @@ -48,9 +47,6 @@ process( bool directed, SpanTree_rt **result_tuples, size_t *result_count) { - /* - * https://www.postgresql.org/docs/current/static/spi-spi-connect.html - */ pgr_SPI_connect(); char* log_msg = NULL; char* notice_msg = NULL; @@ -59,23 +55,8 @@ process( (*result_tuples) = NULL; (*result_count) = 0; - PGR_DBG("Load data"); - Edge_t *edges = NULL; - size_t total_edges = 0; - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - PGR_DBG("Total %ld edges in query:", total_edges); - - if (total_edges == 0) { - PGR_DBG("No edges found"); - pgr_SPI_finish(); - return; - } - - PGR_DBG("Starting processing"); clock_t start_t = clock(); - do_pgr_randomSpanningTree( + pgr_do_randomSpanningTree( edges, total_edges, root_vertex, @@ -94,15 +75,14 @@ process( } pgr_global_report(log_msg, notice_msg, err_msg); - if (edges) pfree(edges); if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); if (err_msg) pfree(err_msg); + if (roots) pfree(roots); pgr_SPI_finish(); } /* */ -/******************************************************************************/ PGDLLEXPORT Datum randomSpanningTree(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; @@ -158,14 +138,12 @@ PGDLLEXPORT Datum randomSpanningTree(PG_FUNCTION_ARGS) { nulls[i] = false; } - // postgres starts counting from 1 values[0] = Int64GetDatum((int64_t)funcctx->call_cntr + 1); values[1] = Int64GetDatum(result_tuples[funcctx->call_cntr].root_vertex); values[2] = Int64GetDatum(result_tuples[funcctx->call_cntr].edge); values[3] = Float8GetDatum(result_tuples[funcctx->call_cntr].cost); values[4] = Float8GetDatum(result_tuples[funcctx->call_cntr].tree_cost); - /**********************************************************************/ tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); diff --git a/src/spanningTree/randomSpanningTree_driver.cpp b/src/spanningTree/randomSpanningTree_driver.cpp index 649b1ce131..e16b6cb341 100644 --- a/src/spanningTree/randomSpanningTree_driver.cpp +++ b/src/spanningTree/randomSpanningTree_driver.cpp @@ -32,10 +32,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "spanningTree/pgr_randomSpanningTree.hpp" +#include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" +#include "spanningTree/pgr_randomSpanningTree.hpp" template < class G > static @@ -49,9 +50,8 @@ pgr_randomSpanningTree( void -do_pgr_randomSpanningTree( - Edge_t *data_edges, - size_t total_edges, +pgr_do_randomSpanningTree( + char *edges_sql, int64_t root_vertex, bool directed, SpanTree_rt **return_tuples, @@ -66,6 +66,8 @@ do_pgr_randomSpanningTree( std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char *hint = nullptr; + try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); @@ -74,6 +76,16 @@ do_pgr_randomSpanningTree( pgassert(*return_count == 0); pgassert(total_edges != 0); + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); + + if (edges.empty()) { + *notice_msg = pgr_msg("No edges found"); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + return; + } + hint = nullptr; + graphType gType = directed? DIRECTED: UNDIRECTED; std::vector results; @@ -99,8 +111,7 @@ do_pgr_randomSpanningTree( if (count == 0) { (*return_tuples) = NULL; (*return_count) = 0; - notice << - "No paths found"; + notice << "No paths found"; return; } @@ -123,6 +134,9 @@ do_pgr_randomSpanningTree( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; From 96c4a3f069e0fe9b3b0b92c484abfb21825b19e6 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 24 Jan 2024 17:03:47 -0600 Subject: [PATCH 098/428] [spannTree] fix failing tests --- src/spanningTree/kruskal.c | 7 +++++++ src/spanningTree/prim.c | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/src/spanningTree/kruskal.c b/src/spanningTree/kruskal.c index 338b129c9c..f58513f13d 100644 --- a/src/spanningTree/kruskal.c +++ b/src/spanningTree/kruskal.c @@ -68,6 +68,13 @@ process( return; } + /* checks previously done on sql now done here */ + if (strcmp(fn_suffix, "DD") == 0 && distance < 0) { + throw_error("Negative value found on 'distance'", "Must be positive"); + } else if ((strcmp(fn_suffix, "BFS") == 0 || strcmp(fn_suffix, "DFS") == 0) && max_depth < 0) { + throw_error("Negative value found on 'max_depth'", "Must be positive"); + } + clock_t start_t = clock(); pgr_do_kruskal( edges_sql, diff --git a/src/spanningTree/prim.c b/src/spanningTree/prim.c index 26a86b1bbf..1c43bfd103 100644 --- a/src/spanningTree/prim.c +++ b/src/spanningTree/prim.c @@ -63,6 +63,12 @@ process( return; } + if (strcmp(fn_suffix, "DD") == 0 && distance < 0) { + throw_error("Negative value found on 'distance'", "Must be positive"); + } else if ((strcmp(fn_suffix, "BFS") == 0 || strcmp(fn_suffix, "DFS") == 0) && max_depth < 0) { + throw_error("Negative value found on 'max_depth'", "Must be positive"); + } + clock_t start_t = clock(); pgr_do_prim( edges_sql, From d6edd104b0870456e0530f258971f712b3bb7dd9 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 25 Jan 2024 09:54:50 -0600 Subject: [PATCH 099/428] [bellman_ford] Fixing codacy errors --- include/bellman_ford/pgr_edwardMoore.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/bellman_ford/pgr_edwardMoore.hpp b/include/bellman_ford/pgr_edwardMoore.hpp index 2a8073228a..db02c5facd 100644 --- a/include/bellman_ford/pgr_edwardMoore.hpp +++ b/include/bellman_ford/pgr_edwardMoore.hpp @@ -149,7 +149,7 @@ class Pgr_edwardMoore { std::deque one_to_many_edwardMoore( G &graph, int64_t start_vertex, - std::set end_vertex) { + const std::set &end_vertex) { std::deque paths; if (graph.has_vertex(start_vertex) == false) { From 550fc7f37353b0aae8f669fe9a3c6c57e2b63451 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 25 Jan 2024 09:54:50 -0600 Subject: [PATCH 100/428] [breadthFirstSearch] Fixing codacy errors --- .../breadthFirstSearch/pgr_binaryBreadthFirstSearch.hpp | 8 ++++---- include/breadthFirstSearch/pgr_breadthFirstSearch.hpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/breadthFirstSearch/pgr_binaryBreadthFirstSearch.hpp b/include/breadthFirstSearch/pgr_binaryBreadthFirstSearch.hpp index 90d12fd698..7677e44c81 100644 --- a/include/breadthFirstSearch/pgr_binaryBreadthFirstSearch.hpp +++ b/include/breadthFirstSearch/pgr_binaryBreadthFirstSearch.hpp @@ -139,9 +139,9 @@ class Pgr_binaryBreadthFirstSearch { E default_edge; std::deque one_to_many_binaryBreadthFirstSearch( - G &graph, + const G &graph, int64_t start_vertex, - std::set end_vertex) { + const std::set end_vertex) { std::deque paths; if (!graph.has_vertex(start_vertex)) return paths; @@ -179,7 +179,7 @@ class Pgr_binaryBreadthFirstSearch { } Path getPath( - G &graph, + const G &graph, V bgl_start_vertex, int64_t target, V bgl_target_vertex, @@ -208,7 +208,7 @@ class Pgr_binaryBreadthFirstSearch { void updateVertexCosts( - G &graph, + const G &graph, std::vector ¤t_cost, std::vector &from_edge, std::deque &dq, diff --git a/include/breadthFirstSearch/pgr_breadthFirstSearch.hpp b/include/breadthFirstSearch/pgr_breadthFirstSearch.hpp index 21c8fef3eb..3a123fed47 100644 --- a/include/breadthFirstSearch/pgr_breadthFirstSearch.hpp +++ b/include/breadthFirstSearch/pgr_breadthFirstSearch.hpp @@ -49,8 +49,8 @@ class Pgr_breadthFirstSearch { std::vector breadthFirstSearch( - G &graph, - std::set start_vertex, + const G &graph, + const std::set &start_vertex, int64_t depth) { std::vector results; using bfs_visitor = visitors::Edges_order_bfs_visitor; From 044f2cbaa350bc85f71250eb2deeff2e6e4091a5 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 25 Jan 2024 09:54:50 -0600 Subject: [PATCH 101/428] [max_flow] Fixing codacy errors --- src/max_flow/edge_disjoint_paths_driver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/max_flow/edge_disjoint_paths_driver.cpp b/src/max_flow/edge_disjoint_paths_driver.cpp index ea4cc00025..34e09248a9 100644 --- a/src/max_flow/edge_disjoint_paths_driver.cpp +++ b/src/max_flow/edge_disjoint_paths_driver.cpp @@ -114,7 +114,7 @@ pgr_do_edge_disjoint_paths( if (edges.empty()) { *notice_msg = pgr_msg("No edges found"); - *log_msg = hint? pgr_msg(edges_sql) : pgr_msg(log.str().c_str()); + *log_msg = pgr_msg(edges_sql); return; } From 59f888da4d45d3a78b6f25aee0b248280808295f Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 25 Jan 2024 09:54:50 -0600 Subject: [PATCH 102/428] [trsp] Fixing codacy errors --- src/trsp/trspVia_driver.cpp | 5 ++--- src/trsp/trsp_driver.cpp | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/trsp/trspVia_driver.cpp b/src/trsp/trspVia_driver.cpp index fe14662320..8849275f7b 100644 --- a/src/trsp/trspVia_driver.cpp +++ b/src/trsp/trspVia_driver.cpp @@ -169,7 +169,7 @@ pgr_do_trspVia( if (edges.empty()) { *notice_msg = pgr_msg("No edges found"); - *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + *log_msg = pgr_msg(edges_sql); return; } hint = nullptr; @@ -219,8 +219,7 @@ pgr_do_trspVia( * When there are turn restrictions */ hint = restrictions_sql; - auto restrictions = restrictions_sql? - pgrouting::pgget::get_restrictions(std::string(restrictions_sql)) : std::vector(); + auto restrictions = pgrouting::pgget::get_restrictions(std::string(restrictions_sql)); if (restrictions.empty()) { (*return_tuples) = pgr_alloc(count, (*return_tuples)); (*return_count) = (get_route(return_tuples, paths)); diff --git a/src/trsp/trsp_driver.cpp b/src/trsp/trsp_driver.cpp index 1afc6f4c08..98cace7a94 100644 --- a/src/trsp/trsp_driver.cpp +++ b/src/trsp/trsp_driver.cpp @@ -142,7 +142,7 @@ pgr_do_trsp( if (edges.empty()) { *notice_msg = pgr_msg("No edges found"); - *log_msg = hint? pgr_msg(edges_sql) : pgr_msg(log.str().c_str()); + *log_msg = pgr_msg(edges_sql); return; } @@ -185,8 +185,7 @@ pgr_do_trsp( * When there are turn restrictions */ hint = restrictions_sql; - auto restrictions = restrictions_sql? - pgrouting::pgget::get_restrictions(std::string(restrictions_sql)) : std::vector(); + auto restrictions = pgrouting::pgget::get_restrictions(std::string(restrictions_sql)); if (restrictions.empty()) { (*return_tuples) = pgr_alloc(count, (*return_tuples)); (*return_count) = (collapse_paths(return_tuples, paths)); From 48c22ac8d4264d240a72150d374f6a85df8f410a Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 25 Jan 2024 10:16:16 -0600 Subject: [PATCH 103/428] [trsp_pgget] marking unused code --- include/c_common/trsp_pgget.h | 14 +++++++------- src/cpp_common/trsp_pgget.cpp | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/c_common/trsp_pgget.h b/include/c_common/trsp_pgget.h index 64a3a4074b..4134433147 100644 --- a/include/c_common/trsp_pgget.h +++ b/include/c_common/trsp_pgget.h @@ -44,7 +44,7 @@ The old version of TRSP @note - The only function that should remain after all functions read the data on the C++ code is `fetch_edge` -- The code to be removed is marked with "if 1 ... endif" directives +- The code to be removed is marked with "if 0 ... endif" directives - The old version of TRSP will be removed on V4 @todo: Remove marked code @@ -81,7 +81,7 @@ extern "C" { #include "cpp_common/undefPostgresDefine.hpp" #ifdef __cplusplus -#if 1 +#if 0 using IID_t_rt = struct IID_t_rt; using II_t_rt = struct II_t_rt; using Coordinate_t = struct Coordinate_t; @@ -92,14 +92,14 @@ using Edge_bool_t = struct Edge_bool_t; using CostFlow_t = struct CostFlow_t; #endif using Edge_t = struct Edge_t; -#if 1 +#if 0 using Orders_t = struct Orders_t; using Point_on_edge_t = struct Point_on_edge_t; using Vehicle_t = struct Vehicle_t; using Restriction_t = struct Restriction_t; #endif #else -#if 1 +#if 0 typedef struct IID_t_rt IID_t_rt; typedef struct II_t_rt II_t_rt; typedef struct Coordinate_t Coordinate_t; @@ -110,7 +110,7 @@ typedef struct Edge_bool_t Edge_bool_t; typedef struct CostFlow_t CostFlow_t; #endif typedef struct Edge_t Edge_t; -#if 1 +#if 0 typedef struct Orders_t Orders_t; typedef struct Point_on_edge_t Point_on_edge_t; typedef struct Restriction_t Restriction_t; @@ -122,7 +122,7 @@ typedef struct Vehicle_t Vehicle_t; #ifdef __cplusplus extern "C" { #endif -#if 1 +#if 0 /** @brief Read rows of combinations, called from C file*/ void pgr_get_combinations(char *, II_t_rt **, size_t *, char**); @@ -136,7 +136,7 @@ void pgr_get_delauny(char*, Delauny_t**, size_t*, char**); /** @brief Read edges called from C file*/ void pgr_get_edges(char*, Edge_t**, size_t*, bool, bool, char**); -#if 1 +#if 0 /** @brief Read edges with x, y endpointscalled from C file */ void pgr_get_edges_xy(char*, Edge_xy_t**, size_t*, bool, char**); diff --git a/src/cpp_common/trsp_pgget.cpp b/src/cpp_common/trsp_pgget.cpp index 88e3aa9458..602599e4c0 100644 --- a/src/cpp_common/trsp_pgget.cpp +++ b/src/cpp_common/trsp_pgget.cpp @@ -45,7 +45,7 @@ The old version of TRSP @note - The only function that should remain after all functions read the data on the C++ code is `fetch_edge` -- The code to be removed is marked with "if 1 ... endif" directives +- The code to be removed is marked with "if 0 ... endif" directives - The old version of TRSP will be removed on V4 @todo: Remove marked code @@ -64,7 +64,7 @@ C++ code is `fetch_edge` #include "cpp_common/trsp_pgfetch.hpp" #include "c_types/info_t.hpp" -#if 1 +#if 0 #include "c_types/coordinate_t.h" #include "c_types/costFlow_t.h" #include "c_types/ii_t_rt.h" @@ -72,7 +72,7 @@ C++ code is `fetch_edge` #include "c_types/delauny_t.h" #endif #include "c_types/edge_t.h" -#if 1 +#if 0 #include "c_types/edge_bool_t_rt.h" #include "c_types/edge_xy_t.h" #include "c_types/flow_t.h" @@ -82,7 +82,7 @@ C++ code is `fetch_edge` #include "c_types/restriction_t.h" #endif -#if 1 +#if 0 /** * @param[out] arrlen Length of the array * @param[in] input the postgres array @@ -447,7 +447,7 @@ pgr_get_edges( } } -#if 1 +#if 0 /** For queries of the type: ~~~~{.c} From 0713789b5bdd1faaa02771c13f23af056a51fb66 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 25 Jan 2024 10:49:43 -0600 Subject: [PATCH 104/428] [trsp_pgfetch] marking unused code --- include/cpp_common/trsp_pgfetch.hpp | 10 +++++----- src/cpp_common/trsp_pgfetch.cpp | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/cpp_common/trsp_pgfetch.hpp b/include/cpp_common/trsp_pgfetch.hpp index 47572b4f90..30f2ae63ef 100644 --- a/include/cpp_common/trsp_pgfetch.hpp +++ b/include/cpp_common/trsp_pgfetch.hpp @@ -43,7 +43,7 @@ The old version of TRSP @note - The only function that should remain after all functions read the data on the C++ code is `fetch_edge` -- The code to be removed is marked with "if 1 ... endif" directives +- The code to be removed is marked with "if 0 ... endif" directives - The old version of TRSP will be removed on V4 @todo: Remove marked code @@ -62,7 +62,7 @@ extern "C" { #include #include "cpp_common/undefPostgresDefine.hpp" -#if 1 +#if 0 using II_t_rt = struct II_t_rt; using IID_t_rt = struct IID_t_rt; using Coordinate_t = struct Coordinate_t; @@ -70,7 +70,7 @@ using Delauny_t = struct Delauny_t; using Edge_bool_t = struct Edge_bool_t; #endif using Edge_t = struct Edge_t; -#if 1 +#if 0 using CostFlow_t = struct CostFlow_t; using Edge_xy_t = struct Edge_xy_t; using Orders_t = struct Orders_t; @@ -82,7 +82,7 @@ using Vehicle_t = struct Vehicle_t; namespace pgrouting { using Column_info_t = struct Column_info_t; -#if 1 +#if 0 void fetch_combination( const HeapTuple, const TupleDesc &, const std::vector &, @@ -109,7 +109,7 @@ void fetch_edge( const std::vector &, int64_t*, Edge_t*, size_t*, bool); -#if 1 +#if 0 void fetch_costFlow_edge( const HeapTuple, const TupleDesc &, const std::vector &, diff --git a/src/cpp_common/trsp_pgfetch.cpp b/src/cpp_common/trsp_pgfetch.cpp index ae5ec3d9dc..cca04312ff 100644 --- a/src/cpp_common/trsp_pgfetch.cpp +++ b/src/cpp_common/trsp_pgfetch.cpp @@ -44,7 +44,7 @@ The old version of TRSP Notes - The only function that should remain after all functions read the data on the C++ code is `fetch_edge` -- The code to be removed is marked with "if 1 ... endif" directives +- The code to be removed is marked with "if 0 ... endif" directives - The old version of TRSP will be removed on V4 @todo: Remove marked code @@ -60,7 +60,7 @@ Notes #include "cpp_common/get_check_data.hpp" #include "c_types/info_t.hpp" -#if 1 +#if 0 #include "c_types/ii_t_rt.h" #include "c_types/coordinate_t.h" #include "c_types/delauny_t.h" @@ -70,7 +70,7 @@ Notes #endif #include "c_types/edge_t.h" -#if 1 +#if 0 #include "c_types/iid_t_rt.h" #include "c_types/pickDeliver/orders_t.h" #include "c_types/restriction_t.h" @@ -79,7 +79,7 @@ Notes #endif namespace pgrouting { -#if 1 +#if 0 void fetch_combination( const HeapTuple tuple, const TupleDesc &tupdesc, @@ -202,7 +202,7 @@ void fetch_edge( *valid_edges = edge->reverse_cost < 0? *valid_edges: *valid_edges + 1; } -#if 1 +#if 0 void fetch_costFlow_edge( const HeapTuple tuple, const TupleDesc &tupdesc, From 7eef47423414deb23a69916ca0c3a9cde38509da Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 25 Jan 2024 10:54:04 -0600 Subject: [PATCH 105/428] [pgdata_fetchers.cpp] Fixing codacy errors --- src/cpp_common/pgdata_fetchers.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cpp_common/pgdata_fetchers.cpp b/src/cpp_common/pgdata_fetchers.cpp index d65a771b51..6ba42e18bf 100644 --- a/src/cpp_common/pgdata_fetchers.cpp +++ b/src/cpp_common/pgdata_fetchers.cpp @@ -351,7 +351,7 @@ Point_on_edge_t fetch_point( int64_t *default_pid, size_t*, bool) { - Point_on_edge_t point; + Point_on_edge_t point = {}; if (column_found(info[0].colNumber)) { point.pid = getBigInt(tuple, tupdesc, info[0]); } else { From a60f9eb9b4a2cc7d03223b17e28dc88aae6597ff Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 30 Jan 2024 10:14:19 -0600 Subject: [PATCH 106/428] [planar] Reading data on C++ code --- include/drivers/planar/boyerMyrvold_driver.h | 12 +--- include/drivers/planar/isPlanar_driver.h | 9 +-- pgtap/planar/isPlanar/edge_cases.pg | 4 +- pgtap/planar/isPlanar/no_crash_test.pg | 3 - src/planar/boyerMyrvold.c | 67 ++------------------ src/planar/boyerMyrvold_driver.cpp | 22 +++++-- src/planar/isPlanar.c | 38 ++--------- src/planar/isPlanar_driver.cpp | 26 ++++++-- tools/testers/no_crash_test.sql | 2 +- 9 files changed, 56 insertions(+), 127 deletions(-) diff --git a/include/drivers/planar/boyerMyrvold_driver.h b/include/drivers/planar/boyerMyrvold_driver.h index 08f688d6f7..8baa6c5d9b 100644 --- a/include/drivers/planar/boyerMyrvold_driver.h +++ b/include/drivers/planar/boyerMyrvold_driver.h @@ -33,11 +33,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #ifdef __cplusplus # include -using Edge_t = struct Edge_t; using IID_t_rt = struct IID_t_rt; #else # include -typedef struct Edge_t Edge_t; typedef struct IID_t_rt IID_t_rt; #endif @@ -45,13 +43,9 @@ typedef struct IID_t_rt IID_t_rt; extern "C" { #endif void pgr_do_pgr_boyerMyrvold( - Edge_t *data_edges, - size_t total_tuples, - IID_t_rt **return_tuples, - size_t *return_count, - char ** log_msg, - char ** notice_msg, - char ** err_msg); + char*, + IID_t_rt**, size_t*, + char**, char**, char**); #ifdef __cplusplus diff --git a/include/drivers/planar/isPlanar_driver.h b/include/drivers/planar/isPlanar_driver.h index 8ce82253a0..a17a1f10e9 100644 --- a/include/drivers/planar/isPlanar_driver.h +++ b/include/drivers/planar/isPlanar_driver.h @@ -33,21 +33,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #ifdef __cplusplus # include -using Edge_t = struct Edge_t; #else # include -typedef struct Edge_t Edge_t; #endif #ifdef __cplusplus extern "C" { #endif bool pgr_do_isPlanar( - Edge_t *data_edges, - size_t total_tuples, - char ** log_msg, - char ** notice_msg, - char ** err_msg); + char*, + char**, char**, char**); #ifdef __cplusplus diff --git a/pgtap/planar/isPlanar/edge_cases.pg b/pgtap/planar/isPlanar/edge_cases.pg index 5c768663b1..c6a50a831e 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 set_eq('zeroEdgeTest2',$$VALUES('f'::bool) $$, '2: False, since vertex does not exist'); +SELECT throws_ok('zeroEdgeTest2','XX000','No edges found', '2: throws, since graph is empty'); -- vertex not present in graph test @@ -68,7 +68,7 @@ SELECT * FROM pgr_isPlanar('q3'); RETURN QUERY -SELECT set_eq('vertexNotPresent4',$$VALUES('f'::bool) $$, '4:False, Vertex not present in graph'); +SELECT throws_ok('vertexNotPresent4','XX000','No edges found', '2: throws, since graph is empty'); -- 1 vertex test diff --git a/pgtap/planar/isPlanar/no_crash_test.pg b/pgtap/planar/isPlanar/no_crash_test.pg index d60050befd..e5c144c3a9 100644 --- a/pgtap/planar/isPlanar/no_crash_test.pg +++ b/pgtap/planar/isPlanar/no_crash_test.pg @@ -46,12 +46,9 @@ BEGIN 'NULL' ]::TEXT[]; - PERFORM todo_start('Fix these checks, for 3.2 onwards'); - RETURN QUERY SELECT * FROM no_crash_test('pgr_isplanar', params, subs); - PERFORM todo_end(); END $BODY$ LANGUAGE plpgsql VOLATILE; diff --git a/src/planar/boyerMyrvold.c b/src/planar/boyerMyrvold.c index d466aa44c1..10d7ffbd7b 100644 --- a/src/planar/boyerMyrvold.c +++ b/src/planar/boyerMyrvold.c @@ -31,13 +31,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "c_common/postgres_connection.h" +#include "c_types/iid_t_rt.h" #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" - -#include "c_common/trsp_pgget.h" - #include "drivers/planar/boyerMyrvold_driver.h" + PGDLLEXPORT Datum _pgr_boyermyrvold(PG_FUNCTION_ARGS); PG_FUNCTION_INFO_V1(_pgr_boyermyrvold); @@ -52,40 +51,19 @@ process( char* notice_msg = NULL; char* err_msg = NULL; - PGR_DBG("Initializing arrays"); - - (*result_tuples) = NULL; (*result_count) = 0; - PGR_DBG("Load data"); - Edge_t *edges = NULL; - size_t total_edges = 0; - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - PGR_DBG("Total %ld edges in query:", total_edges); - - if (total_edges == 0) { - pgr_SPI_finish(); - return; - } - - PGR_DBG("Starting processing"); clock_t start_t = clock(); pgr_do_boyerMyrvold( - edges, - total_edges, + edges_sql, - result_tuples, - result_count, + result_tuples, result_count, &log_msg, ¬ice_msg, &err_msg); - time_msg(" processing pgr_boyerMyrvold", start_t, clock()); - PGR_DBG("Returning %ld tuples", *result_count); if (err_msg) { if (*result_tuples) @@ -94,14 +72,9 @@ process( pgr_global_report(log_msg, notice_msg, err_msg); - if (edges) - pfree(edges); - if (log_msg) - pfree(log_msg); - if (notice_msg) - pfree(notice_msg); - if (err_msg) - pfree(err_msg); + if (log_msg) pfree(log_msg); + if (notice_msg) pfree(notice_msg); + if (err_msg) pfree(err_msg); pgr_SPI_finish(); } @@ -110,22 +83,14 @@ PGDLLEXPORT Datum _pgr_boyermyrvold(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; - /**************************************************************************/ IID_t_rt *result_tuples = NULL; size_t result_count = 0; - /**************************************************************************/ if (SRF_IS_FIRSTCALL()) { MemoryContext oldcontext; funcctx = SRF_FIRSTCALL_INIT(); oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); - /**********************************************************************/ - /* - pgr_boyerMyrvold( - edge_sql TEXT) - */ - /**********************************************************************/ PGR_DBG("Calling process"); process( @@ -133,10 +98,7 @@ PGDLLEXPORT Datum _pgr_boyermyrvold(PG_FUNCTION_ARGS) { &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, @@ -159,13 +121,6 @@ PGDLLEXPORT Datum _pgr_boyermyrvold(PG_FUNCTION_ARGS) { Datum *values; bool *nulls; - /**********************************************************************/ - /* - OUT source BIGINT, - OUT target_vid BIGINT, - OUT cost FLOAT, - */ - /**********************************************************************/ size_t numb = 4; values = palloc(numb * sizeof(Datum)); nulls = palloc(numb * sizeof(bool)); @@ -180,18 +135,10 @@ PGDLLEXPORT Datum _pgr_boyermyrvold(PG_FUNCTION_ARGS) { values[2] = Int64GetDatum(result_tuples[funcctx->call_cntr].target); values[3] = Float8GetDatum(result_tuples[funcctx->call_cntr].cost); - /**********************************************************************/ - tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); } else { - /**********************************************************************/ - - PGR_DBG("Clean up code"); - - /**********************************************************************/ - SRF_RETURN_DONE(funcctx); } } diff --git a/src/planar/boyerMyrvold_driver.cpp b/src/planar/boyerMyrvold_driver.cpp index eb78f6d164..d68c352811 100644 --- a/src/planar/boyerMyrvold_driver.cpp +++ b/src/planar/boyerMyrvold_driver.cpp @@ -35,6 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" +#include "cpp_common/pgdata_getters.hpp" #include "c_types/iid_t_rt.h" #include "planar/pgr_boyerMyrvold.hpp" @@ -44,8 +45,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. void pgr_do_boyerMyrvold( - Edge_t *data_edges, - size_t total_edges, + char *edges_sql, IID_t_rt **return_tuples, size_t *return_count, @@ -55,25 +55,35 @@ pgr_do_boyerMyrvold( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::pgget::get_edges; std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char* hint = nullptr; try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); - pgassert(total_edges != 0); std::vector results; std::string logstr; graphType gType = UNDIRECTED; + + hint = edges_sql; + auto edges = get_edges(std::string(edges_sql), true, true); + + if (edges.empty()) { + throw std::string("No edges found"); + } + hint = nullptr; + log << "Working with Undirected Graph\n"; pgrouting::UndirectedGraph undigraph(gType); - undigraph.insert_edges(data_edges, total_edges); + undigraph.insert_edges(edges); pgrouting::functions::Pgr_boyerMyrvold fn_boyerMyrvold; results = fn_boyerMyrvold.boyerMyrvold(undigraph); logstr += fn_boyerMyrvold.get_log(); @@ -92,7 +102,6 @@ pgr_do_boyerMyrvold( } (*return_tuples) = pgr_alloc(count, (*return_tuples)); - log << "\nConverting a set of traversals into the tuples"; for (size_t i = 0; i < count; i++) { *((*return_tuples) + i) = results[i]; } @@ -111,6 +120,9 @@ pgr_do_boyerMyrvold( err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; diff --git a/src/planar/isPlanar.c b/src/planar/isPlanar.c index 851aa70cbd..64395f85c4 100644 --- a/src/planar/isPlanar.c +++ b/src/planar/isPlanar.c @@ -34,10 +34,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" - -#include "c_common/trsp_pgget.h" - #include "drivers/planar/isPlanar_driver.h" + PGDLLEXPORT Datum _pgr_isplanar(PG_FUNCTION_ARGS); PG_FUNCTION_INFO_V1(_pgr_isplanar); @@ -51,39 +49,20 @@ process( char* notice_msg = NULL; char* err_msg = NULL; - Edge_t *edges = NULL; - size_t total_edges = 0; - - pgr_get_edges(edges_sql, &edges, &total_edges, true, false, &err_msg); - throw_error(err_msg, edges_sql); - - if (total_edges == 0) { - pgr_SPI_finish(); - return (false); - } - clock_t start_t = clock(); - planarity = pgr_do_isPlanar( - edges, - total_edges, + edges_sql, &log_msg, ¬ice_msg, &err_msg); - time_msg(" processing pgr_isPlanar", start_t, clock()); pgr_global_report(log_msg, notice_msg, err_msg); - if (edges) - pfree(edges); - if (log_msg) - pfree(log_msg); - if (notice_msg) - pfree(notice_msg); - if (err_msg) - pfree(err_msg); + if (log_msg) pfree(log_msg); + if (notice_msg) pfree(notice_msg); + if (err_msg) pfree(err_msg); pgr_SPI_finish(); @@ -91,12 +70,5 @@ process( } PGDLLEXPORT Datum _pgr_isplanar(PG_FUNCTION_ARGS) { - /**********************************************************************/ - /* - pgr_isPlanar( - edge_sql TEXT) - */ - /**********************************************************************/ PG_RETURN_BOOL(process(text_to_cstring(PG_GETARG_TEXT_P(0)))); - /**********************************************************************/ } diff --git a/src/planar/isPlanar_driver.cpp b/src/planar/isPlanar_driver.cpp index ea312f57a0..6d6eaf2031 100644 --- a/src/planar/isPlanar_driver.cpp +++ b/src/planar/isPlanar_driver.cpp @@ -35,6 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.h" +#include "cpp_common/pgdata_getters.hpp" #include "planar/pgr_boyerMyrvold.hpp" #include "cpp_common/pgr_base_graph.hpp" @@ -43,8 +44,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. bool pgr_do_isPlanar( - Edge_t *data_edges, - size_t total_edges, + char *edges_sql, char ** log_msg, char ** notice_msg, @@ -52,24 +52,32 @@ pgr_do_isPlanar( using pgrouting::pgr_alloc; using pgrouting::pgr_msg; using pgrouting::pgr_free; + using pgrouting::pgget::get_edges; std::ostringstream log; std::ostringstream err; std::ostringstream notice; + char* hint = nullptr; bool result = false; try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); - pgassert(total_edges != 0); - graphType gType = UNDIRECTED; + + hint = edges_sql; + auto edges = get_edges(std::string(edges_sql), true, true); + + if (edges.empty()) { + throw std::string("No edges found"); + } + hint = nullptr; + log << "Working with Undirected Graph\n"; pgrouting::UndirectedGraph undigraph(gType); - undigraph.insert_edges(data_edges, total_edges); + undigraph.insert_edges(edges); pgrouting::functions::Pgr_boyerMyrvold fn_isPlanar; result = fn_isPlanar.isPlanar(undigraph); - return result; pgassert(*err_msg == NULL); *log_msg = log.str().empty()? @@ -78,10 +86,14 @@ pgr_do_isPlanar( *notice_msg = notice.str().empty()? *notice_msg : pgr_msg(notice.str().c_str()); + return result; } catch (AssertFailedException &except) { err << except.what(); *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); } catch (std::exception &except) { err << except.what(); *err_msg = pgr_msg(err.str().c_str()); @@ -91,5 +103,5 @@ pgr_do_isPlanar( *err_msg = pgr_msg(err.str().c_str()); *log_msg = pgr_msg(log.str().c_str()); } - return result; + return false; } diff --git a/tools/testers/no_crash_test.sql b/tools/testers/no_crash_test.sql index f8a4c1ed6d..fb30370f13 100644 --- a/tools/testers/no_crash_test.sql +++ b/tools/testers/no_crash_test.sql @@ -35,7 +35,7 @@ BEGIN IF i = 0 THEN RETURN query SELECT * FROM isnt_empty(q1, 'isnt_empty ' || q1); ELSE - IF func='pgr_alphashape' THEN + IF func='pgr_alphashape' OR func='pgr_isplanar' THEN RETURN query SELECT * FROM isnt_empty(q1, 'isnt_empty' || q1); ELSIF func='pgr_maxFlow' OR func='pgr_maxFlowMinCost_Cost' THEN RETURN query SELECT * FROM set_eq(q1, 'SELECT NULL::BIGINT', 'set_eq' || q1); From 7043c3deb60ed2ab1ff0d92a1171c180a27e7aae Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 30 Jan 2024 09:45:41 -0600 Subject: [PATCH 107/428] [trsp_pgget trsp_pgfetch] Removing unused code --- include/c_common/trsp_pgget.h | 80 +--- include/cpp_common/trsp_pgfetch.hpp | 79 +--- src/cpp_common/trsp_pgfetch.cpp | 375 +----------------- src/cpp_common/trsp_pgget.cpp | 590 +--------------------------- 4 files changed, 8 insertions(+), 1116 deletions(-) diff --git a/include/c_common/trsp_pgget.h b/include/c_common/trsp_pgget.h index 4134433147..8a0aed4c74 100644 --- a/include/c_common/trsp_pgget.h +++ b/include/c_common/trsp_pgget.h @@ -42,13 +42,10 @@ The old version of TRSP @note -- The only function that should remain after all functions read the data on the - C++ code is `fetch_edge` -- The code to be removed is marked with "if 0 ... endif" directives +- The only function that remains is `fetch_edge` - The old version of TRSP will be removed on V4 - @todo: Remove marked code - @todo: V4 Delete this file + @todo: TODO V4 Delete this file */ #ifndef INCLUDE_C_COMMON_TRSP_PGGET_H_ #define INCLUDE_C_COMMON_TRSP_PGGET_H_ @@ -81,92 +78,19 @@ extern "C" { #include "cpp_common/undefPostgresDefine.hpp" #ifdef __cplusplus -#if 0 -using IID_t_rt = struct IID_t_rt; -using II_t_rt = struct II_t_rt; -using Coordinate_t = struct Coordinate_t; -using Delauny_t = struct Delauny_t; -using Edge_xy_t = struct Edge_xy_t; -using Flow_t = struct Flow_t; -using Edge_bool_t = struct Edge_bool_t; -using CostFlow_t = struct CostFlow_t; -#endif using Edge_t = struct Edge_t; -#if 0 -using Orders_t = struct Orders_t; -using Point_on_edge_t = struct Point_on_edge_t; -using Vehicle_t = struct Vehicle_t; -using Restriction_t = struct Restriction_t; -#endif #else -#if 0 -typedef struct IID_t_rt IID_t_rt; -typedef struct II_t_rt II_t_rt; -typedef struct Coordinate_t Coordinate_t; -typedef struct Delauny_t Delauny_t; -typedef struct Edge_xy_t Edge_xy_t; -typedef struct Flow_t Flow_t; -typedef struct Edge_bool_t Edge_bool_t; -typedef struct CostFlow_t CostFlow_t; -#endif typedef struct Edge_t Edge_t; -#if 0 -typedef struct Orders_t Orders_t; -typedef struct Point_on_edge_t Point_on_edge_t; -typedef struct Restriction_t Restriction_t; -typedef struct Vehicle_t Vehicle_t; -#endif #endif #ifdef __cplusplus extern "C" { #endif -#if 0 -/** @brief Read rows of combinations, called from C file*/ -void pgr_get_combinations(char *, II_t_rt **, size_t *, char**); - -/** @brief Read rows of matrix, called from C file*/ -void pgr_get_coordinates(char*, Coordinate_t**, size_t*, char**); - -/** @brief Read rows of delauny triangles, called from C file*/ -void pgr_get_delauny(char*, Delauny_t**, size_t*, char**); -#endif /** @brief Read edges called from C file*/ void pgr_get_edges(char*, Edge_t**, size_t*, bool, bool, char**); -#if 0 -/** @brief Read edges with x, y endpointscalled from C file */ -void pgr_get_edges_xy(char*, Edge_xy_t**, size_t*, bool, char**); - -/** @brief Read edges for flow called from C file */ -void pgr_get_flow_edges(char*, Edge_t**, size_t*, char**); - -/** @brief Read edges for cost called from C fileflow */ -void pgr_get_costFlow_edges(char*, CostFlow_t**, size_t*, char**); - -/** @brief Read "basic edges" called from C file */ -void pgr_get_basic_edges(char*, Edge_bool_t**, size_t*, char**); - -/** @brief Read rows of matrix, called from C file*/ -void pgr_get_matrixRows(char*, IID_t_rt**, size_t *, char **); - -/** @brief Reads the pick-Deliver orders */ -void pgr_get_orders(char *, Orders_t **, size_t *, bool, char**); - -/** @brief Read rows of points, called from C file*/ -void pgr_get_points(char*, Point_on_edge_t**, size_t*, char**); - -/** @brief Read rows of matrix, called from C file*/ -void pgr_get_restrictions(char*, Restriction_t**, size_t*, char**); - -/** @brief Reads the vehicles */ -void pgr_get_vehicles(char*, Vehicle_t**, size_t*, bool, char**); - -/** @brief Enforces the input array to be @b NOT empty */ -int64_t* pgr_get_bigIntArray(size_t*, ArrayType*, bool, char**); -#endif #ifdef __cplusplus } #endif diff --git a/include/cpp_common/trsp_pgfetch.hpp b/include/cpp_common/trsp_pgfetch.hpp index 30f2ae63ef..cb2bf83470 100644 --- a/include/cpp_common/trsp_pgfetch.hpp +++ b/include/cpp_common/trsp_pgfetch.hpp @@ -41,13 +41,10 @@ The old version of TRSP @note -- The only function that should remain after all functions read the data on the - C++ code is `fetch_edge` -- The code to be removed is marked with "if 0 ... endif" directives +- The only function that remains is `fetch_edge` - The old version of TRSP will be removed on V4 - @todo: Remove marked code - @todo: V4 Delete this file + @todo: V4 TODO Delete this file */ #ifndef INCLUDE_CPP_COMMON_TRSP_PGFETCH_HPP_ @@ -62,89 +59,17 @@ extern "C" { #include #include "cpp_common/undefPostgresDefine.hpp" -#if 0 -using II_t_rt = struct II_t_rt; -using IID_t_rt = struct IID_t_rt; -using Coordinate_t = struct Coordinate_t; -using Delauny_t = struct Delauny_t; -using Edge_bool_t = struct Edge_bool_t; -#endif using Edge_t = struct Edge_t; -#if 0 -using CostFlow_t = struct CostFlow_t; -using Edge_xy_t = struct Edge_xy_t; -using Orders_t = struct Orders_t; -using Restriction_t = struct Restriction_t; -using Point_on_edge_t = struct Point_on_edge_t; -using Vehicle_t = struct Vehicle_t; -#endif namespace pgrouting { using Column_info_t = struct Column_info_t; -#if 0 -void fetch_combination( - const HeapTuple, const TupleDesc &, - const std::vector &, - int64_t*, II_t_rt*, size_t*, bool); - -void fetch_coordinate( - const HeapTuple, const TupleDesc &, - const std::vector &, - int64_t*, Coordinate_t*, size_t*, bool); - -void fetch_delauny( - const HeapTuple, const TupleDesc &, - const std::vector &, - int64_t*, Delauny_t*, size_t*, bool); - -void fetch_basic_edge( - const HeapTuple, const TupleDesc &, - const std::vector &, - int64_t*, Edge_bool_t*, size_t*, bool); -#endif void fetch_edge( const HeapTuple, const TupleDesc &, const std::vector &, int64_t*, Edge_t*, size_t*, bool); -#if 0 -void fetch_costFlow_edge( - const HeapTuple, const TupleDesc &, - const std::vector &, - int64_t*, CostFlow_t*, size_t*, bool); - -void fetch_edge_with_xy( - const HeapTuple, const TupleDesc &, - const std::vector &, - int64_t*, Edge_xy_t*, size_t*, bool); - -void pgr_fetch_row( - const HeapTuple, const TupleDesc &, - const std::vector &, - int64_t*, IID_t_rt*, size_t*, bool); - -void fetch_orders( - const HeapTuple, const TupleDesc &, - const std::vector &, - int64_t*, Orders_t*, size_t*, bool); - -void fetch_restriction( - const HeapTuple, const TupleDesc &, - const std::vector &, - int64_t*, Restriction_t*, size_t*, bool); - -void fetch_point( - const HeapTuple, const TupleDesc &, - const std::vector &, - int64_t*, Point_on_edge_t*, size_t*, bool); - -void fetch_vehicle( - const HeapTuple, const TupleDesc &, - const std::vector &, - int64_t*, Vehicle_t*, size_t*, bool); -#endif } // namespace pgrouting diff --git a/src/cpp_common/trsp_pgfetch.cpp b/src/cpp_common/trsp_pgfetch.cpp index cca04312ff..ddcc37f609 100644 --- a/src/cpp_common/trsp_pgfetch.cpp +++ b/src/cpp_common/trsp_pgfetch.cpp @@ -43,12 +43,10 @@ The old version of TRSP Notes -- The only function that should remain after all functions read the data on the C++ code is `fetch_edge` -- The code to be removed is marked with "if 0 ... endif" directives +- The only function that remains is `fetch_edge` - The old version of TRSP will be removed on V4 -@todo: Remove marked code -@todo: V4 Delete this file +@todo: V4 TODO Delete this file */ #include "cpp_common/trsp_pgfetch.hpp" @@ -60,106 +58,10 @@ Notes #include "cpp_common/get_check_data.hpp" #include "c_types/info_t.hpp" -#if 0 -#include "c_types/ii_t_rt.h" -#include "c_types/coordinate_t.h" -#include "c_types/delauny_t.h" -#include "c_types/edge_bool_t_rt.h" -#include "c_types/costFlow_t.h" -#include "c_types/edge_xy_t.h" -#endif #include "c_types/edge_t.h" -#if 0 -#include "c_types/iid_t_rt.h" -#include "c_types/pickDeliver/orders_t.h" -#include "c_types/restriction_t.h" -#include "c_types/point_on_edge_t.h" -#include "c_types/pickDeliver/vehicle_t.h" -#endif namespace pgrouting { -#if 0 -void fetch_combination( - const HeapTuple tuple, - const TupleDesc &tupdesc, - const std::vector &info, - int64_t*, - II_t_rt *combination, - size_t* valid_combinations, - bool) { - combination->d1.source = pgrouting::getBigInt(tuple, tupdesc, info[0]); - combination->d2.target = pgrouting::getBigInt(tuple, tupdesc, info[1]); - - *valid_combinations = *valid_combinations + 1; -} - -void fetch_coordinate( - const HeapTuple tuple, - const TupleDesc &tupdesc, - const std::vector &info, - int64_t *default_id, - Coordinate_t* coordinate, - size_t*, - bool) { - if (pgrouting::column_found(info[0].colNumber)) { - coordinate->id = pgrouting::getBigInt(tuple, tupdesc, info[0]); - } else { - coordinate->id = *default_id; - ++(*default_id); - } - coordinate->x = pgrouting::getFloat8(tuple, tupdesc, info[1]); - coordinate->y = pgrouting::getFloat8(tuple, tupdesc, info[2]); -} - -void fetch_delauny( - const HeapTuple tuple, - const TupleDesc &tupdesc, - const std::vector &info, - int64_t*, - Delauny_t* delauny, - size_t*, - bool) { - delauny->tid = pgrouting::getBigInt(tuple, tupdesc, info[0]); - delauny->pid = pgrouting::getBigInt(tuple, tupdesc, info[1]); - delauny->x = pgrouting::getFloat8(tuple, tupdesc, info[2]); - delauny->y = pgrouting::getFloat8(tuple, tupdesc, info[3]); -} - -/* edges have many fetchers */ - -void fetch_basic_edge( - const HeapTuple tuple, - const TupleDesc &tupdesc, - const std::vector &info, - int64_t *default_id, - Edge_bool_t *edge, - size_t *valid_edges, - bool) { - if (pgrouting::column_found(info[0].colNumber)) { - edge->id = pgrouting::getBigInt(tuple, tupdesc, info[0]); - } else { - edge->id = *default_id; - ++(*default_id); - } - bool new_columns = pgrouting::column_found(info[5].colNumber); - - edge->source = pgrouting::getBigInt(tuple, tupdesc, info[1]); - edge->target = pgrouting::getBigInt(tuple, tupdesc, info[2]); - - if (new_columns) { - edge->going = pgrouting::getFloat8(tuple, tupdesc, info[5]) > 0 - || (pgrouting::column_found(info[6].colNumber) - && pgrouting::getFloat8(tuple, tupdesc, info[6]) > 0); - } else { - edge->going = pgrouting::getFloat8(tuple, tupdesc, info[3]) > 0 - || (pgrouting::column_found(info[4].colNumber) - && pgrouting::getFloat8(tuple, tupdesc, info[4]) > 0); - } - - (*valid_edges)++; -} -#endif void fetch_edge( const HeapTuple tuple, @@ -202,278 +104,5 @@ void fetch_edge( *valid_edges = edge->reverse_cost < 0? *valid_edges: *valid_edges + 1; } -#if 0 -void fetch_costFlow_edge( - const HeapTuple tuple, - const TupleDesc &tupdesc, - const std::vector &info, - int64_t *default_id, - CostFlow_t *edge, - size_t *valid_edges, - bool normal) { - if (pgrouting::column_found(info[0].colNumber)) { - edge->edge_id = pgrouting::getBigInt(tuple, tupdesc, info[0]); - } else { - edge->edge_id = *default_id; - ++(*default_id); - } - - if (normal) { - edge->source = pgrouting::getBigInt(tuple, tupdesc, info[1]); - edge->target = pgrouting::getBigInt(tuple, tupdesc, info[2]); - } else { - edge->target = pgrouting::getBigInt(tuple, tupdesc, info[1]); - edge->source = pgrouting::getBigInt(tuple, tupdesc, info[2]); - } - - edge->capacity = pgrouting::getBigInt(tuple, tupdesc, info[3]); - if (pgrouting::column_found(info[4].colNumber)) { - edge->reverse_capacity = pgrouting::getBigInt(tuple, tupdesc, info[4]); - } else { - edge->reverse_capacity = -1; - } - - edge->cost = pgrouting::getFloat8(tuple, tupdesc, info[5]); - if (pgrouting::column_found(info[6].colNumber)) { - edge->reverse_cost = pgrouting::getFloat8(tuple, tupdesc, info[6]); - } else { - edge->reverse_cost = 0; - } - - *valid_edges = edge->capacity < 0? *valid_edges: *valid_edges + 1; - *valid_edges = edge->reverse_capacity < 0? *valid_edges: *valid_edges + 1; -} - -void fetch_edge_with_xy( - const HeapTuple tuple, - const TupleDesc &tupdesc, - const std::vector &info, - int64_t *default_id, - Edge_xy_t *edge, - size_t *valid_edges, - bool normal) { - if (pgrouting::column_found(info[0].colNumber)) { - edge->id = pgrouting::getBigInt(tuple, tupdesc, info[0]); - } else { - edge->id = *default_id; - ++(*default_id); - } - - if (normal) { - edge->source = pgrouting::getBigInt(tuple, tupdesc, info[1]); - edge->target = pgrouting::getBigInt(tuple, tupdesc, info[2]); - } else { - edge->target = pgrouting::getBigInt(tuple, tupdesc, info[1]); - edge->source = pgrouting::getBigInt(tuple, tupdesc, info[2]); - } - edge->cost = pgrouting::getFloat8(tuple, tupdesc, info[3]); - - if (pgrouting::column_found(info[4].colNumber)) { - edge->reverse_cost = pgrouting::getFloat8(tuple, tupdesc, info[4]); - } else { - edge->reverse_cost = -1; - } - - edge->x1 = pgrouting::getFloat8(tuple, tupdesc, info[5]); - edge->y1 = pgrouting::getFloat8(tuple, tupdesc, info[6]); - edge->x2 = pgrouting::getFloat8(tuple, tupdesc, info[7]); - edge->y2 = pgrouting::getFloat8(tuple, tupdesc, info[8]); - - *valid_edges = edge->cost < 0? *valid_edges: *valid_edges + 1; - *valid_edges = edge->reverse_cost < 0? *valid_edges: *valid_edges + 1; -} - -void pgr_fetch_row( - const HeapTuple tuple, - const TupleDesc &tupdesc, - const std::vector &info, - int64_t*, - IID_t_rt *distance, - size_t*, - bool) { - distance->from_vid = pgrouting::getBigInt(tuple, tupdesc, info[0]); - distance->to_vid = pgrouting::getBigInt(tuple, tupdesc, info[1]); - distance->cost = pgrouting::getFloat8(tuple, tupdesc, info[2]); -} - - -void fetch_orders( - const HeapTuple tuple, - const TupleDesc &tupdesc, - const std::vector &info, - int64_t*, - Orders_t* pd_order, - size_t*, - bool with_id) { - pd_order->id = pgrouting::getBigInt(tuple, tupdesc, info[0]); - pd_order->demand = pgrouting::getFloat8(tuple, tupdesc, info[1]); - - /* - * the pickups - */ - pd_order->pick_x = with_id ? - 0 : pgrouting::getFloat8(tuple, tupdesc, info[2]); - pd_order->pick_y = with_id ? - 0 : pgrouting::getFloat8(tuple, tupdesc, info[3]); - pd_order->pick_open_t = pgrouting::getFloat8(tuple, tupdesc, info[4]); - pd_order->pick_close_t = pgrouting::getFloat8(tuple, tupdesc, info[5]); - pd_order->pick_service_t = pgrouting::column_found(info[6].colNumber) ? - pgrouting::getFloat8(tuple, tupdesc, info[6]) : 0; - - /* - * the deliveries - */ - pd_order->deliver_x = with_id ? - 0 : pgrouting::getFloat8(tuple, tupdesc, info[7]); - pd_order->deliver_y = with_id ? - 0 : pgrouting::getFloat8(tuple, tupdesc, info[8]); - pd_order->deliver_open_t = pgrouting::getFloat8(tuple, tupdesc, info[9]); - pd_order->deliver_close_t = pgrouting::getFloat8(tuple, tupdesc, info[10]); - pd_order->deliver_service_t = pgrouting::column_found(info[11].colNumber) ? - pgrouting::getFloat8(tuple, tupdesc, info[11]) : 0; - - pd_order->pick_node_id = with_id ? - pgrouting::getBigInt(tuple, tupdesc, info[12]) : 0; - pd_order->deliver_node_id = with_id ? - pgrouting::getBigInt(tuple, tupdesc, info[13]) : 0; -} - - -void fetch_restriction( - const HeapTuple tuple, - const TupleDesc &tupdesc, - const std::vector &info, - int64_t*, - Restriction_t *restriction, - size_t*, - bool) { - restriction->cost = pgrouting::getFloat8(tuple, tupdesc, info[0]); - - restriction->via = NULL; - restriction->via_size = 0; - restriction->via = pgrouting::getBigIntArr(tuple, tupdesc, info[1], &restriction->via_size); -} - - -void fetch_point( - const HeapTuple tuple, - const TupleDesc &tupdesc, - const std::vector &info, - int64_t *default_pid, - Point_on_edge_t* point, - size_t*, - bool) { - if (pgrouting::column_found(info[0].colNumber)) { - point->pid = pgrouting::getBigInt(tuple, tupdesc, info[0]); - } else { - ++(*default_pid); - point->pid = *default_pid; - } - - point->edge_id = pgrouting::getBigInt(tuple, tupdesc, info[1]); - point->fraction = pgrouting::getFloat8(tuple, tupdesc, info[2]); - - if (pgrouting::column_found(info[3].colNumber)) { - point->side = pgrouting::getChar(tuple, tupdesc, info[3], false, 'b'); - } else { - point->side = 'b'; - } -} - -void fetch_vehicle( - const HeapTuple tuple, - const TupleDesc &tupdesc, - const std::vector &info, - int64_t*, - Vehicle_t *vehicle, - size_t*, - bool with_id) { - vehicle->id = pgrouting::getBigInt(tuple, tupdesc, info[0]); - vehicle->capacity = pgrouting::getFloat8(tuple, tupdesc, info[1]); - - vehicle->start_x = with_id ? - 0 : - pgrouting::getFloat8(tuple, tupdesc, info[2]); - vehicle->start_y = with_id ? - 0 : - pgrouting::getFloat8(tuple, tupdesc, info[3]); - - vehicle->speed = pgrouting::column_found(info[13].colNumber) ? - pgrouting::getFloat8(tuple, tupdesc, info[13]) : - 1; - vehicle->cant_v = pgrouting::column_found(info[4].colNumber) ? - pgrouting::getBigInt(tuple, tupdesc, info[4]) : - 1; - vehicle->start_open_t = pgrouting::column_found(info[5].colNumber) ? - pgrouting::getFloat8(tuple, tupdesc, info[5]) : - 0; - vehicle->start_close_t = pgrouting::column_found(info[6].colNumber) ? - pgrouting::getFloat8(tuple, tupdesc, info[6]) : - DBL_MAX; - vehicle->start_service_t = pgrouting::column_found(info[7].colNumber) ? - pgrouting::getFloat8(tuple, tupdesc, info[7]) : - 0; - - - if (!(pgrouting::column_found(info[8].colNumber)) - && pgrouting::column_found(info[9].colNumber)) { - ereport(ERROR, - (errmsg("Column \'%s\' not Found", info[8].name.c_str()), - errhint("%s was found, also column is expected %s ", - info[9].name.c_str(), info[8].name.c_str()))); - } - if (pgrouting::column_found(info[8].colNumber) - && !(pgrouting::column_found(info[9].colNumber))) { - ereport(ERROR, - (errmsg("Column \'%s\' not Found", info[9].name.c_str()), - errhint("%s was found, also column is expected %s ", - info[8].name.c_str(), info[9].name.c_str()))); - } - - vehicle->end_x = pgrouting::column_found(info[8].colNumber) ? - pgrouting::getFloat8(tuple, tupdesc, info[8]) : - vehicle->start_x; - vehicle->end_y = pgrouting::column_found(info[9].colNumber) ? - pgrouting::getFloat8(tuple, tupdesc, info[9]) : - vehicle->start_y; - - if (!(pgrouting::column_found(info[10].colNumber)) - && pgrouting::column_found(info[11].colNumber)) { - ereport(ERROR, - (errmsg("Column \'%s\' not Found", info[10].name.c_str()), - errhint("%s was found, also column is expected %s ", - info[10].name.c_str(), info[11].name.c_str()))); - } - - if (pgrouting::column_found(info[10].colNumber) - && !(pgrouting::column_found(info[11].colNumber))) { - ereport(ERROR, - (errmsg("Column \'%s\' not Found", info[11].name.c_str()), - errhint("%s was found, also column is expected %s ", - info[11].name.c_str(), info[10].name.c_str()))); - } - vehicle->end_open_t = pgrouting::column_found(info[10].colNumber) ? - pgrouting::getFloat8(tuple, tupdesc, info[10]) : - vehicle->start_open_t; - vehicle->end_close_t = pgrouting::column_found(info[11].colNumber) ? - pgrouting::getFloat8(tuple, tupdesc, info[11]) : - vehicle->start_close_t; - vehicle->end_service_t = pgrouting::column_found(info[12].colNumber) ? - pgrouting::getFloat8(tuple, tupdesc, info[12]) : - vehicle->start_service_t; - - vehicle->speed = pgrouting::column_found(info[13].colNumber) ? - pgrouting::getFloat8(tuple, tupdesc, info[13]) : - 1; - vehicle->start_node_id = with_id ? - pgrouting::getBigInt(tuple, tupdesc, info[14]) : - 0; - vehicle->end_node_id = with_id ? - (pgrouting::column_found(info[12].colNumber) ? - pgrouting::getBigInt(tuple, tupdesc, info[15]) : - vehicle->start_node_id) : - 0; -} -#endif } // namespace pgrouting diff --git a/src/cpp_common/trsp_pgget.cpp b/src/cpp_common/trsp_pgget.cpp index 602599e4c0..d3a243bd4d 100644 --- a/src/cpp_common/trsp_pgget.cpp +++ b/src/cpp_common/trsp_pgget.cpp @@ -43,13 +43,10 @@ The old version of TRSP @note -- The only function that should remain after all functions read the data on the -C++ code is `fetch_edge` -- The code to be removed is marked with "if 0 ... endif" directives +- The only function that remains is `fetch_edge` - The old version of TRSP will be removed on V4 - @todo: Remove marked code - @todo: V4 Delete this file + @todo: V4 TODO Delete this file */ #include "c_common/trsp_pgget.h" @@ -64,345 +61,9 @@ C++ code is `fetch_edge` #include "cpp_common/trsp_pgfetch.hpp" #include "c_types/info_t.hpp" -#if 0 -#include "c_types/coordinate_t.h" -#include "c_types/costFlow_t.h" -#include "c_types/ii_t_rt.h" -#include "c_types/iid_t_rt.h" -#include "c_types/delauny_t.h" -#endif #include "c_types/edge_t.h" -#if 0 -#include "c_types/edge_bool_t_rt.h" -#include "c_types/edge_xy_t.h" -#include "c_types/flow_t.h" -#include "c_types/pickDeliver/orders_t.h" -#include "c_types/pickDeliver/vehicle_t.h" -#include "c_types/point_on_edge_t.h" -#include "c_types/restriction_t.h" -#endif - -#if 0 -/** - * @param[out] arrlen Length of the array - * @param[in] input the postgres array - * @param[in] allow_empty when true, empty arrays are accepted. - * @param[out] err_msg when not null, there was an error and contains the message - * @returns Returns a C array of integers - */ -int64_t* pgr_get_bigIntArray(size_t *arrlen, ArrayType *input, bool allow_empty, char** err_msg) { - using pgrouting::pgr_msg; - try { - return pgrouting::get_array(input, arrlen, allow_empty); - } catch (const std::string &ex) { - (*arrlen) = 0; - *err_msg = pgr_msg(ex.c_str()); - return nullptr; - } catch(...) { - (*arrlen) = 0; - *err_msg = pgr_msg("Caught unknown exception!"); - return nullptr; - } -} - -/** - For queries of the type: - ~~~~{.c} - SELECT source, target FROM combinations; - ~~~~ - - @param[in] sql The query - @param [out] rows array of combinations - @param [out] total_rows size of combinations - @param[out] err_msg when not null, there was an error and contains the message - */ -void pgr_get_combinations( - char *sql, - II_t_rt **rows, - size_t *total_rows, - char **err_msg) { - using pgrouting::pgr_msg; - using pgrouting::pgr_free; - using pgrouting::Column_info_t; - try { - std::vector info{2}; - - info[0] = {-1, 0, true, "source", pgrouting::ANY_INTEGER}; - info[1] = {-1, 0, true, "target", pgrouting::ANY_INTEGER}; - pgrouting::get_data(sql, rows, total_rows, true, info, &pgrouting::fetch_combination); - } catch (const std::string &ex) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg(ex.c_str()); - } catch(...) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg("Caught unknown exception!"); - } -} - - -/** - For queries of the type: - ~~~~{.c} - SELECT id, x, y FROM coordinates; - ~~~~ - - @param[in] sql The query - @param[out] rows the matrix coordinates - @param[out] total_rows size of coordinates - @param[out] err_msg when not null, there was an error and contains the message - */ -void pgr_get_coordinates( - char *sql, - Coordinate_t **rows, - size_t *total_rows, - char **err_msg) { - using pgrouting::pgr_msg; - using pgrouting::pgr_free; - using pgrouting::Column_info_t; - try { - std::vector info{3}; - - info[0] = {-1, 0, true, "id", pgrouting::ANY_INTEGER}; - info[1] = {-1, 0, true, "x", pgrouting::ANY_NUMERICAL}; - info[2] = {-1, 0, true, "y", pgrouting::ANY_NUMERICAL}; - pgrouting::get_data(sql, rows, total_rows, true, info, &pgrouting::fetch_coordinate); - } catch (const std::string &ex) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg(ex.c_str()); - } catch(...) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg("Caught unknown exception!"); - } -} - - -/** - For queries of the type: - ~~~~{.c} - SELECT tid, pid, x, y FROM delauny; - SELECT pid, pid, x, y FROM delauny; - ~~~~ - - @param[in] sql The query - @param[out] rows the delauny array - @param[out] total_rows size of delauny - @param[out] err_msg when not null, there was an error and contains the message - */ -void pgr_get_delauny( - char *sql, - Delauny_t **rows, - size_t *total_rows, - char **err_msg) { - using pgrouting::pgr_msg; - using pgrouting::pgr_free; - using pgrouting::Column_info_t; - try { - std::vector info{4}; - - info[0] = {-1, 0, true, "tid", pgrouting::ANY_INTEGER}; - info[1] = {-1, 0, true, "pid", pgrouting::ANY_INTEGER}; - info[2] = {-1, 0, true, "x", pgrouting::ANY_NUMERICAL}; - info[3] = {-1, 0, true, "y", pgrouting::ANY_NUMERICAL}; - pgrouting::get_data(sql, rows, total_rows, true, info, &pgrouting::fetch_delauny); - } catch (const std::string &ex) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg(ex.c_str()); - } catch(...) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg("Caught unknown exception!"); - } -} - - -/** - For queries of the type: - ~~~~{.c} - SELECT id, source, target, capacity, [reverse_capacity] FROM edge_table; - ~~~~ - - @param[in] sql The query - @param[out] rows the edges array - @param[out] total_rows size of edges - @param[out] err_msg when not null, there was an error and contains the message - */ -void -pgr_get_flow_edges( - char *sql, - Edge_t **rows, - size_t *total_rows, - char **err_msg) { - using pgrouting::pgr_msg; - using pgrouting::pgr_free; - using pgrouting::Column_info_t; - try { - std::vector info{5}; - - info[0] = {-1, 0, true, "id", pgrouting::ANY_INTEGER}; - info[1] = {-1, 0, true, "source", pgrouting::ANY_INTEGER}; - info[2] = {-1, 0, true, "target", pgrouting::ANY_INTEGER}; - info[3] = {-1, 0, true, "capacity", pgrouting::ANY_INTEGER}; - info[4] = {-1, 0, false, "reverse_capacity", pgrouting::ANY_INTEGER}; - - pgrouting::get_data(sql, rows, total_rows, true, info, &pgrouting::fetch_edge); - } catch (const std::string &ex) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg(ex.c_str()); - } catch(...) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg("Caught unknown exception!"); - } -} - -/** - For queries of the type: - ~~~~{.c} - SELECT id, source, target, capacity, [reverse_capacity], cost, [reverse_cost] - FROM edge_table; - ~~~~ - - @param[in] sql The query - @param[out] rows the edges array - @param[out] total_rows size of edges - @param[out] err_msg when not null, there was an error and contains the message - */ -void -pgr_get_costFlow_edges( - char *sql, - CostFlow_t **rows, - size_t *total_rows, - char **err_msg) { - using pgrouting::pgr_msg; - using pgrouting::pgr_free; - using pgrouting::Column_info_t; - try { - std::vector info{7}; - - info[0] = {-1, 0, true, "id", pgrouting::ANY_INTEGER}; - info[1] = {-1, 0, true, "source", pgrouting::ANY_INTEGER}; - info[2] = {-1, 0, true, "target", pgrouting::ANY_INTEGER}; - info[3] = {-1, 0, true, "capacity", pgrouting::ANY_INTEGER}; - info[4] = {-1, 0, false, "reverse_capacity", pgrouting::ANY_INTEGER}; - info[5] = {-1, 0, true, "cost", pgrouting::ANY_NUMERICAL}; - info[6] = {-1, 0, false, "reverse_cost", pgrouting::ANY_NUMERICAL}; - - pgrouting::get_data(sql, rows, total_rows, true, info, &pgrouting::fetch_costFlow_edge); - } catch (const std::string &ex) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg(ex.c_str()); - } catch(...) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg("Caught unknown exception!"); - } -} -/** - For queries of the type: - ~~~~{.c} - SELECT id, source, target, cost, [reverse_cost] FROM edge_table; - ~~~~ - - For backward compatability it also accepts: - ~~~~{.c} - SELECT id, source, target, going, [coming] FROM edge_table; - ~~~~ - @todo This option will be removed on V4 - - @param[in] sql The query - @param[out] rows the edges array - @param[out] total_rows size of edges - @param[out] err_msg when not null, there was an error and contains the message - */ -void -pgr_get_basic_edges( - char *sql, - Edge_bool_t **rows, - size_t *total_rows, - char **err_msg) { - using pgrouting::pgr_msg; - using pgrouting::pgr_free; - using pgrouting::Column_info_t; - try { - std::vector info{7}; - - info[0] = {-1, 0, true, "id", pgrouting::ANY_INTEGER}; - info[1] = {-1, 0, true, "source", pgrouting::ANY_INTEGER}; - info[2] = {-1, 0, true, "target", pgrouting::ANY_INTEGER}; - info[3] = {-1, 0, false, "going", pgrouting::ANY_NUMERICAL}; - info[4] = {-1, 0, false, "coming", pgrouting::ANY_NUMERICAL}; - info[5] = {-1, 0, false, "cost", pgrouting::ANY_NUMERICAL}; - info[6] = {-1, 0, false, "reverse_cost", pgrouting::ANY_NUMERICAL}; - - pgrouting::get_data(sql, rows, total_rows, true, info, &pgrouting::fetch_basic_edge); - } catch (const std::string &ex) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg(ex.c_str()); - } catch(...) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg("Caught unknown exception!"); - } -} - -/** - For queries of the type: - ~~~~{.c} - SELECT id, source, target, cost, [reverse_cost], x1, y1, x2, y2 FROM edge_table; - ~~~~ - - @param[in] sql The query - @param[out] rows the edges array - @param[out] total_rows size of edges - @param[in] normal when false then the graph is reversed - @param[out] err_msg when not null, there was an error and contains the message - */ -void -pgr_get_edges_xy( - char *sql, - Edge_xy_t **rows, - size_t *total_rows, - bool normal, - char **err_msg) { - using pgrouting::pgr_msg; - using pgrouting::pgr_free; - using pgrouting::Column_info_t; - try { - std::vector info{9}; - - info[0] = {-1, 0, true, "id", pgrouting::ANY_INTEGER}; - info[1] = {-1, 0, true, "source", pgrouting::ANY_INTEGER}; - info[2] = {-1, 0, true, "target", pgrouting::ANY_INTEGER}; - info[3] = {-1, 0, true, "cost", pgrouting::ANY_NUMERICAL}; - info[4] = {-1, 0, false, "reverse_cost", pgrouting::ANY_NUMERICAL}; - info[5] = {-1, 0, true, "x1", pgrouting::ANY_NUMERICAL}; - info[6] = {-1, 0, true, "y1", pgrouting::ANY_NUMERICAL}; - info[7] = {-1, 0, true, "x2", pgrouting::ANY_NUMERICAL}; - info[8] = {-1, 0, true, "y2", pgrouting::ANY_NUMERICAL}; - - pgrouting::get_data(sql, rows, total_rows, normal, info, &pgrouting::fetch_edge_with_xy); - } catch (const std::string &ex) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg(ex.c_str()); - } catch(...) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg("Caught unknown exception!"); - } -} -#endif - /** For queries of the type: ~~~~{.c} @@ -447,250 +108,3 @@ pgr_get_edges( } } -#if 0 -/** - For queries of the type: - ~~~~{.c} - SELECT start_vid, end_vid, agg_cost FROM matrix_data; - ~~~~ - - @param[in] sql The query - @param[out] rows of the matrix array - @param[out] total_rows size of matrix rows - @param[out] err_msg when not null, there was an error and contains the message - */ -void pgr_get_matrixRows( - char *sql, - IID_t_rt **rows, - size_t *total_rows, - char **err_msg) { - using pgrouting::pgr_msg; - using pgrouting::pgr_free; - using pgrouting::Column_info_t; - try { - std::vector info{3}; - - info[0] = {-1, 0, true, "start_vid", pgrouting::ANY_INTEGER}; - info[1] = {-1, 0, true, "end_vid", pgrouting::ANY_INTEGER}; - info[2] = {-1, 0, true, "agg_cost", pgrouting::ANY_NUMERICAL}; - pgrouting::get_data(sql, rows, total_rows, true, info, &pgrouting::pgr_fetch_row); - } catch (const std::string &ex) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg(ex.c_str()); - } catch(...) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg("Caught unknown exception!"); - } -} - - -/** - For queries of the type: - ~~~~{.c} - SELECT id, demand - [p_node_id | p_x, p_y], p_open, p_close, p_service, - [d_node_id | d_x, d_y], d_open, d_close, d_service, - FROM orders; - ~~~~ - - @param[in] sql The query - @param[out] rows of the orders - @param[out] total_rows size of orders rows - @param[out] with_id flag to choose if its euclidean or matrix - @param[out] err_msg when not null, there was an error and contains the message - */ -void pgr_get_orders( - char *sql, - Orders_t **rows, - size_t *total_rows, - bool with_id, - char **err_msg) { - using pgrouting::pgr_msg; - using pgrouting::pgr_free; - using pgrouting::Column_info_t; - try { - std::vector info{14}; - - info[0] = {-1, 0, true, "id", pgrouting::ANY_INTEGER}; - info[1] = {-1, 0, true, "demand", pgrouting::ANY_NUMERICAL}; - info[2] = {-1, 0, true, "p_x", pgrouting::ANY_NUMERICAL}; - info[3] = {-1, 0, true, "p_y", pgrouting::ANY_NUMERICAL}; - info[4] = {-1, 0, true, "p_open", pgrouting::ANY_NUMERICAL}; - info[5] = {-1, 0, true, "p_close", pgrouting::ANY_NUMERICAL}; - info[6] = {-1, 0, false, "p_service", pgrouting::ANY_NUMERICAL}; - info[7] = {-1, 0, true, "d_x", pgrouting::ANY_NUMERICAL}; - info[8] = {-1, 0, true, "d_y", pgrouting::ANY_NUMERICAL}; - info[9] = {-1, 0, true, "d_open", pgrouting::ANY_NUMERICAL}; - info[10] = {-1, 0, true, "d_close", pgrouting::ANY_NUMERICAL}; - info[11] = {-1, 0, false, "d_service", pgrouting::ANY_NUMERICAL}; - /* nodes are going to be ignored*/ - info[12] = {-1, 0, false, "p_node_id", pgrouting::ANY_INTEGER}; - info[13] = {-1, 0, false, "d_node_id", pgrouting::ANY_INTEGER}; - - if (with_id) { - /* (x,y) values are ignored*/ - info[2].strict = false; - info[3].strict = false; - info[7].strict = false; - info[8].strict = false; - /* nodes are compulsory*/ - info[12].strict = true; - info[13].strict = true; - } - - pgrouting::get_data(sql, rows, total_rows, with_id, info, &pgrouting::fetch_orders); - } catch (const std::string &ex) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg(ex.c_str()); - } catch(...) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg("Caught unknown exception!"); - } -} - - -/** - For queries of the type: - ~~~~{.c} - SELECT pid, edge_id, fraction side FROM points; - ~~~~ - - @param[in] sql The query - @param[out] rows the points array - @param[out] total_rows size of points - @param[out] err_msg when not null, there was an error and contains the message - */ -void pgr_get_points( - char *sql, - Point_on_edge_t **rows, - size_t *total_rows, - char **err_msg) { - using pgrouting::pgr_free; - using pgrouting::pgr_msg; - using pgrouting::Column_info_t; - try { - std::vector info{4}; - - info[0] = {-1, 0, false, "pid", pgrouting::ANY_INTEGER}; - info[1] = {-1, 0, true, "edge_id", pgrouting::ANY_INTEGER}; - info[2] = {-1, 0, true, "fraction", pgrouting::ANY_NUMERICAL}; - info[3] = {-1, 0, false, "side", pgrouting::CHAR1}; - pgrouting::get_data(sql, rows, total_rows, true, info, &pgrouting::fetch_point); - } catch (const std::string &ex) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg(ex.c_str()); - } catch(...) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg("Caught unknown exception!"); - } -} - - -/** - For queries of the type: - ~~~~{.c} - SELECT cost, path FROM restrictions; - ~~~~ - - @param[in] sql The query - @param[out] rows the restrictions array - @param[out] total_rows size of restrictions - @param[out] err_msg when not null, there was an error and contains the message - */ -void pgr_get_restrictions( - char *sql, - Restriction_t **rows, - size_t *total_rows, - char **err_msg) { - using pgrouting::pgr_msg; - using pgrouting::pgr_free; - using pgrouting::Column_info_t; - try { - std::vector info{2}; - - info[0] = {-1, 0, true, "cost", pgrouting::ANY_NUMERICAL}; - info[1] = {-1, 0, true, "path", pgrouting::ANY_INTEGER_ARRAY}; - pgrouting::get_data(sql, rows, total_rows, true, info, &pgrouting::fetch_restriction); - } catch (const std::string &ex) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg(ex.c_str()); - } catch(...) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg("Caught unknown exception!"); - } -} - - -/** - For queries of the type: - ~~~~{.c} - SELECT id, capacity, speed, number - [start_node_id | start_x, start_y], start_open, start_close, start_service, - [end_node_id | end_x, end_y], end_open, end_close, end_service, - FROM orders; - ~~~~ - - @param[in] sql The query - @param[out] rows of vehicles - @param[out] total_rows size of vehicles rows - @param[out] with_id flag to choose if its euclidean or matrix - @param[out] err_msg when not null, there was an error and contains the message - */ -void pgr_get_vehicles( - char *sql, - Vehicle_t **rows, - size_t *total_rows, - bool with_id, - char **err_msg) { - using pgrouting::pgr_msg; - using pgrouting::pgr_free; - using pgrouting::Column_info_t; - try { - std::vector info{16}; - - info[0] = {-1, 0, true, "id", pgrouting::ANY_INTEGER}; - info[1] = {-1, 0, true, "capacity", pgrouting::ANY_NUMERICAL}; - info[2] = {-1, 0, true, "start_x", pgrouting::ANY_NUMERICAL}; - info[3] = {-1, 0, true, "start_y", pgrouting::ANY_NUMERICAL}; - info[4] = {-1, 0, false, "number", pgrouting::ANY_INTEGER}; - info[5] = {-1, 0, false, "start_open", pgrouting::ANY_NUMERICAL}; - info[6] = {-1, 0, false, "start_close", pgrouting::ANY_NUMERICAL}; - info[7] = {-1, 0, false, "start_service", pgrouting::ANY_NUMERICAL}; - info[8] = {-1, 0, false, "end_x", pgrouting::ANY_NUMERICAL}; - info[9] = {-1, 0, false, "end_y", pgrouting::ANY_NUMERICAL}; - info[10] = {-1, 0, false, "end_open", pgrouting::ANY_NUMERICAL}; - info[11] = {-1, 0, false, "end_close", pgrouting::ANY_NUMERICAL}; - info[12] = {-1, 0, false, "end_service", pgrouting::ANY_NUMERICAL}; - info[13] = {-1, 0, false, "speed", pgrouting::ANY_NUMERICAL}; - /* nodes are going to be ignored*/ - info[14] = {-1, 0, false, "start_node_id", pgrouting::ANY_INTEGER}; - info[15] = {-1, 0, false, "end_node_id", pgrouting::ANY_INTEGER}; - - if (with_id) { - /* (x,y) values are ignored*/ - info[2].strict = false; - info[3].strict = false; - /* start nodes are compulsory*/ - info[14].strict = false; - } - - pgrouting::get_data(sql, rows, total_rows, with_id, info, &pgrouting::fetch_vehicle); - } catch (const std::string &ex) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg(ex.c_str()); - } catch(...) { - (*rows) = pgr_free(*rows); - (*total_rows) = 0; - *err_msg = pgr_msg("Caught unknown exception!"); - } -} -#endif From 8a24a1af4eecdec4fa3ae00741341f3bd286f2f3 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 30 Jan 2024 13:23:44 -0600 Subject: [PATCH 108/428] [doc] Updating NEWS & release_notes --- NEWS.md | 2 ++ doc/src/release_notes.rst | 2 ++ 2 files changed, 4 insertions(+) diff --git a/NEWS.md b/NEWS.md index 9204caf24d..0cff40508c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -34,6 +34,8 @@ milestone for 3.7.0 * [#2599](https://github.com/pgRouting/pgrouting/pull/2599) Driving distance cleanup +* [#2607](https://github.com/pgRouting/pgrouting/pull/2607) Read postgresql + data on C++ **Others** diff --git a/doc/src/release_notes.rst b/doc/src/release_notes.rst index b6ff2e9678..781bd584f0 100644 --- a/doc/src/release_notes.rst +++ b/doc/src/release_notes.rst @@ -60,6 +60,8 @@ milestone for 3.7.0 * `#2599 `__ Driving distance cleanup +* `#2607 `__ Read postgresql + data on C++ .. rubric:: Others From 9ec1ba099bbcb2099b5168ef1acd56cc8e4cffde Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 31 Jan 2024 08:00:25 -0600 Subject: [PATCH 109/428] [breadthFirstSearch] Fixing codacy errors --- include/breadthFirstSearch/pgr_binaryBreadthFirstSearch.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/breadthFirstSearch/pgr_binaryBreadthFirstSearch.hpp b/include/breadthFirstSearch/pgr_binaryBreadthFirstSearch.hpp index 7677e44c81..72752fd498 100644 --- a/include/breadthFirstSearch/pgr_binaryBreadthFirstSearch.hpp +++ b/include/breadthFirstSearch/pgr_binaryBreadthFirstSearch.hpp @@ -141,7 +141,7 @@ class Pgr_binaryBreadthFirstSearch { std::deque one_to_many_binaryBreadthFirstSearch( const G &graph, int64_t start_vertex, - const std::set end_vertex) { + const std::set &end_vertex) { std::deque paths; if (!graph.has_vertex(start_vertex)) return paths; From 8c26411be26251bfd60c3c8e0e319aab98dd04ef Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 31 Jan 2024 08:00:25 -0600 Subject: [PATCH 110/428] [chinese] Fixing codacy errors --- include/chinese/pgr_chinesePostman.hpp | 15 +++++---------- src/chinese/chinesePostman_driver.cpp | 2 +- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/include/chinese/pgr_chinesePostman.hpp b/include/chinese/pgr_chinesePostman.hpp index 199b524335..04acc9b1a4 100644 --- a/include/chinese/pgr_chinesePostman.hpp +++ b/include/chinese/pgr_chinesePostman.hpp @@ -179,18 +179,13 @@ PgrDirectedChPPGraph::PgrDirectedChPPGraph(const std::vector &dataEdges) for (iter = deg.begin(); iter != deg.end(); ++iter) { int64_t p = iter->first; int d = iter->second; - if (d == 0) - continue; - if (d > 0) - totalDeg += d; - CostFlow_t edge; + if (d == 0) continue; + if (d > 0) totalDeg += d; + CostFlow_t edge = {}; edge.reverse_capacity = -1; edge.reverse_cost = -1.0; edge.cost = 0.0; - if (d > 0) - edge.capacity = d; - else - edge.capacity = -d; + edge.capacity = std::abs(d); edge.edge_id = 0; if (d > 0) edge.source = p, edge.target = superTarget; @@ -267,7 +262,7 @@ PgrDirectedChPPGraph::BuildResultPath() { int64_t preNode = pathStack.top(); pathStack.pop(); - Path_rt newElement; + Path_rt newElement = {}; while (!pathStack.empty()) { int64_t nowNode = pathStack.top(); pathStack.pop(); diff --git a/src/chinese/chinesePostman_driver.cpp b/src/chinese/chinesePostman_driver.cpp index dcf8f5bd4e..1642a5ebc4 100644 --- a/src/chinese/chinesePostman_driver.cpp +++ b/src/chinese/chinesePostman_driver.cpp @@ -84,7 +84,7 @@ pgr_do_directedChPP( std::vector pathEdges; if (only_cost) { if (minCost >= 0.0) { - Path_rt edge; + Path_rt edge = {}; edge.seq = -1; edge.node = edge.edge = -1; edge.cost = edge.agg_cost = minCost; From 3ab45fd74c63b8dc4ad9e7226656e83889f4d2ec Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 31 Jan 2024 08:00:25 -0600 Subject: [PATCH 111/428] [mincut] Fixing codacy errors --- include/mincut/pgr_stoerWagner.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/mincut/pgr_stoerWagner.hpp b/include/mincut/pgr_stoerWagner.hpp index fb5a7741e8..e8ca146950 100644 --- a/include/mincut/pgr_stoerWagner.hpp +++ b/include/mincut/pgr_stoerWagner.hpp @@ -86,7 +86,7 @@ class Pgr_stoerWagner { auto t = target(*ei, graph.graph); if (get(parities, s) != get(parities, t)) { - StoerWagner_t tmp; + StoerWagner_t tmp = {}; tmp.cost = graph[*ei].cost; From b291b7ea5776b85b93b799ebbd0d2717f5922152 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 31 Jan 2024 08:00:25 -0600 Subject: [PATCH 112/428] [max_flow] Fixing codacy errors --- src/max_flow/max_flow_driver.cpp | 7 +------ src/max_flow/pgr_maxflow.cpp | 6 +++--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/max_flow/max_flow_driver.cpp b/src/max_flow/max_flow_driver.cpp index f577fd4f82..e3c804acae 100644 --- a/src/max_flow/max_flow_driver.cpp +++ b/src/max_flow/max_flow_driver.cpp @@ -132,12 +132,7 @@ pgr_do_max_flow( std::vector flow_edges; if (only_flow) { - Flow_t edge; - edge.edge = -1; - edge.source = -1; - edge.target = -1; - edge.flow = max_flow; - edge.residual_capacity = -1; + Flow_t edge = {-1, -1, -1, max_flow, -1, 0, 0}; flow_edges.push_back(edge); } else { flow_edges = digraph.get_flow_edges(); diff --git a/src/max_flow/pgr_maxflow.cpp b/src/max_flow/pgr_maxflow.cpp index 553e105aa6..7418459bbb 100644 --- a/src/max_flow/pgr_maxflow.cpp +++ b/src/max_flow/pgr_maxflow.cpp @@ -210,7 +210,7 @@ PgrFlowGraph::get_flow_edges() const { if (((capacity[*e] - residual_capacity[*e]) > 0) && ((*e).m_source != supersource) && ((*e).m_target != supersink)) { - Flow_t edge; + Flow_t edge = {}; edge.edge = get_edge_id(*e); edge.source = get_vertex_id((*e).m_source); edge.target = get_vertex_id((*e).m_target); @@ -280,7 +280,7 @@ PgrFlowGraph::get_edge_disjoint_paths( bool exists; size_t j; for (j = 0; j < size - 1; j++) { - Path_rt edge; + Path_rt edge = {}; edge.seq = static_cast(j + 1); edge.start_id = paths[i][0]; edge.end_id = paths[i][size - 1]; @@ -291,7 +291,7 @@ PgrFlowGraph::get_edge_disjoint_paths( edge.edge = get_edge_id(e); path_elements.push_back(edge); } - Path_rt edge; + Path_rt edge = {}; edge.seq = static_cast(j + 1); edge.start_id = paths[i][0]; edge.end_id = paths[i][size - 1]; From 6fd5bad65b7aa07055f8666e2fec90c53e3eb7f8 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 31 Jan 2024 08:00:25 -0600 Subject: [PATCH 113/428] [trsp] Fixing codacy errors --- src/trsp/pgr_trspHandler.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/trsp/pgr_trspHandler.cpp b/src/trsp/pgr_trspHandler.cpp index 2c491774b5..bf1bb3da7c 100644 --- a/src/trsp/pgr_trspHandler.cpp +++ b/src/trsp/pgr_trspHandler.cpp @@ -244,7 +244,7 @@ double Pgr_trspHandler::construct_path(int64_t ed_id, Position pos) { pgassert(pos != ILLEGAL); if (m_parent[static_cast(ed_id)].isIllegal(pos)) { - Path_t pelement; + Path_t pelement = {}; auto cur_edge = &m_edges[static_cast(ed_id)]; if (pos == RC_EDGE) { pelement.node = cur_edge->startNode(); @@ -263,7 +263,7 @@ double Pgr_trspHandler::construct_path(int64_t ed_id, Position pos) { double ret = construct_path( static_cast(m_parent[static_cast(ed_id)].e_idx[static_cast(pos)]), static_cast(m_parent[static_cast(ed_id)].v_pos[static_cast(pos)])); - Path_t pelement; + Path_t pelement = {}; auto cur_edge = &m_edges[static_cast(ed_id)]; if (pos == RC_EDGE) { pelement.node = cur_edge->startNode(); @@ -583,7 +583,7 @@ Pgr_trspHandler::process_trsp( construct_path(static_cast(cur_edge.idx()), RC_EDGE); } - Path_t pelement; + Path_t pelement = {}; pelement.node = m_end_vertex; pelement.edge = -1; pelement.cost = 0.0; From 1c280b87412873250325ec807995eab55bdd46a3 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 31 Jan 2024 08:04:42 -0600 Subject: [PATCH 114/428] [planar] Fixing codacy errors --- src/planar/isPlanar_driver.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/planar/isPlanar_driver.cpp b/src/planar/isPlanar_driver.cpp index 6d6eaf2031..21742e8be9 100644 --- a/src/planar/isPlanar_driver.cpp +++ b/src/planar/isPlanar_driver.cpp @@ -58,11 +58,12 @@ pgr_do_isPlanar( std::ostringstream err; std::ostringstream notice; char* hint = nullptr; - bool result = false; try { pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); + + bool result = false; graphType gType = UNDIRECTED; hint = edges_sql; From 3ecd2537362b87964338a5b1fcac7b582204dd3f Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 31 Jan 2024 08:32:03 -0600 Subject: [PATCH 115/428] fixing issue with code checker --- tools/scripts/code_checker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/scripts/code_checker.sh b/tools/scripts/code_checker.sh index def08ebbad..6d53e18255 100755 --- a/tools/scripts/code_checker.sh +++ b/tools/scripts/code_checker.sh @@ -33,7 +33,7 @@ if ! test -d code_linter; then # Get our fork of codespell that adds --words-white-list and full filename support for -S option mkdir code_linter pushd code_linter || exit 1 - git clone --branch develop https://github.com/cpplint/cpplint + git clone --branch 1.6.1 https://github.com/cpplint/cpplint # cd styleguide || exit 1 # git checkout gh-pages popd || exit 1 From e15a0c554d245381bb479014a9b3f6b072a37f0f Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 1 Feb 2024 09:19:47 -0600 Subject: [PATCH 116/428] using tag 1.6.1 on cpplint --- .github/workflows/check-files.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-files.yml b/.github/workflows/check-files.yml index ee47758591..284657ee4b 100644 --- a/.github/workflows/check-files.yml +++ b/.github/workflows/check-files.yml @@ -67,7 +67,7 @@ jobs: uses: actions/checkout@v4 with: repository: 'cpplint/cpplint' - ref: "develop" + ref: "1.6.1" path: "code_linter/cpplint" - name: Run linter run: | From 562b6b3bfb455fe0132c46a07637ebbe97d704e6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 17:52:02 +0000 Subject: [PATCH 117/428] Update locale: commit e15a0c554d --- locale/en/LC_MESSAGES/pgrouting_doc_strings.po | 7 ++++++- locale/pot/pgrouting_doc_strings.pot | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po index 2ed8b905b9..0433dfe030 100644 --- a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-24 17:44+0000\n" +"POT-Creation-Date: 2024-02-01 17:51+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -4433,6 +4433,11 @@ msgid "" "distance cleanup" msgstr "" +msgid "" +"`#2607 `__ Read " +"postgresql data on C++" +msgstr "" + msgid "Others" msgstr "" diff --git a/locale/pot/pgrouting_doc_strings.pot b/locale/pot/pgrouting_doc_strings.pot index f9c0b86f65..047463b5ec 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-01-24 17:44+0000\n" +"POT-Creation-Date: 2024-02-01 17:51+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3976,6 +3976,9 @@ msgstr "" msgid "`#2599 `__ Driving distance cleanup" msgstr "" +msgid "`#2607 `__ Read postgresql data on C++" +msgstr "" + msgid "Others" msgstr "" From 888b6a198a76c1e09ab1f9477828b034b23493e3 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 4 Feb 2024 13:06:37 -0600 Subject: [PATCH 118/428] Update mailing list to discourse --- doc/src/support.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/src/support.rst b/doc/src/support.rst index fca3d2ff45..91bdab74dd 100644 --- a/doc/src/support.rst +++ b/doc/src/support.rst @@ -54,7 +54,9 @@ Mailing List and GIS StackExchange There are two mailing lists for pgRouting hosted on OSGeo mailing list server: * User mailing list: https://lists.osgeo.org/mailman/listinfo/pgrouting-users -* Developer mailing list: https://lists.osgeo.org/mailman/listinfo/pgrouting-dev +* Developer mailing list: https://discourse.osgeo.org/c/pgrouting/pgrouting-dev/ + + * Subscribe: https://discourse.osgeo.org/g/pgrouting-dev For general questions and topics about how to use pgRouting, please write to the user mailing list. From 589167a2ce8840e380f30be830665ff1e8fad7b8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 15:37:18 +0000 Subject: [PATCH 119/428] Update locale: commit 888b6a198a --- locale/en/LC_MESSAGES/pgrouting_doc_strings.po | 9 ++++++--- locale/pot/pgrouting_doc_strings.pot | 7 +++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po index 0433dfe030..d183a0a45e 100644 --- a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-01 17:51+0000\n" +"POT-Creation-Date: 2024-02-06 15:37+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18062,8 +18062,11 @@ msgid "" msgstr "" msgid "" -"Developer mailing list: https://lists.osgeo.org/mailman/listinfo" -"/pgrouting-dev" +"Developer mailing list: https://discourse.osgeo.org/c/pgrouting" +"/pgrouting-dev/" +msgstr "" + +msgid "Subscribe: https://discourse.osgeo.org/g/pgrouting-dev" msgstr "" msgid "" diff --git a/locale/pot/pgrouting_doc_strings.pot b/locale/pot/pgrouting_doc_strings.pot index 047463b5ec..ac72c56009 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-01 17:51+0000\n" +"POT-Creation-Date: 2024-02-06 15:37+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -15286,7 +15286,10 @@ msgstr "" msgid "User mailing list: https://lists.osgeo.org/mailman/listinfo/pgrouting-users" msgstr "" -msgid "Developer mailing list: https://lists.osgeo.org/mailman/listinfo/pgrouting-dev" +msgid "Developer mailing list: https://discourse.osgeo.org/c/pgrouting/pgrouting-dev/" +msgstr "" + +msgid "Subscribe: https://discourse.osgeo.org/g/pgrouting-dev" msgstr "" msgid "For general questions and topics about how to use pgRouting, please write to the user mailing list." From 9ac58c42bb6387a54a5228abd9bc20da3834eaaf Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 8 Feb 2024 11:33:14 -0600 Subject: [PATCH 120/428] (C++)(lint) adding mising includes after code checkr works --- .github/workflows/check-files.yml | 2 +- src/allpairs/floydWarshall_driver.cpp | 1 + src/allpairs/johnson_driver.cpp | 1 + src/astar/astar_driver.cpp | 1 + src/bdAstar/bdAstar_driver.cpp | 1 + src/bdDijkstra/bdDijkstra_driver.cpp | 3 +++ src/bellman_ford/bellman_ford_driver.cpp | 2 ++ src/bellman_ford/bellman_ford_neg_driver.cpp | 2 ++ src/bellman_ford/edwardMoore_driver.cpp | 3 +++ .../binaryBreadthFirstSearch_driver.cpp | 1 + src/chinese/chinesePostman_driver.cpp | 1 + src/coloring/edgeColoring_driver.cpp | 1 + src/components/articulationPoints_driver.cpp | 1 + src/components/biconnectedComponents_driver.cpp | 1 + src/components/bridges_driver.cpp | 1 + src/components/connectedComponents_driver.cpp | 1 + src/components/strongComponents_driver.cpp | 1 + src/cpp_common/combinations.cpp | 1 + src/cpp_common/get_check_data.cpp | 1 + src/cpp_common/pgdata_getters.cpp | 1 + src/dagShortestPath/dagShortestPath_driver.cpp | 3 +++ src/dijkstra/dijkstraVia_driver.cpp | 1 + src/dijkstra/dijkstra_driver.cpp | 1 + src/driving_distance/drivedist_driver.cpp | 2 ++ src/driving_distance/withPoints_dd_driver.cpp | 2 ++ src/ksp/ksp_driver.cpp | 1 + src/ksp/withPoints_ksp_driver.cpp | 1 + src/lineGraph/lineGraphFull_driver.cpp | 1 + src/lineGraph/lineGraph_driver.cpp | 1 + src/max_flow/edge_disjoint_paths_driver.cpp | 1 + src/max_flow/max_flow_driver.cpp | 1 + src/max_flow/maximum_cardinality_matching_driver.cpp | 1 + src/max_flow/minCostMaxFlow_driver.cpp | 1 + src/mincut/stoerWagner_driver.cpp | 1 + src/spanningTree/randomSpanningTree_driver.cpp | 1 + src/trsp/trspVia_driver.cpp | 1 + src/trsp/trspVia_withPoints_driver.cpp | 1 + src/trsp/trsp_driver.cpp | 1 + src/trsp/trsp_withPoints_driver.cpp | 1 + src/withPoints/withPointsVia_driver.cpp | 1 + src/withPoints/withPoints_driver.cpp | 4 +++- tools/scripts/code_checker.sh | 12 ++++++++---- 42 files changed, 61 insertions(+), 6 deletions(-) diff --git a/.github/workflows/check-files.yml b/.github/workflows/check-files.yml index 284657ee4b..ee47758591 100644 --- a/.github/workflows/check-files.yml +++ b/.github/workflows/check-files.yml @@ -67,7 +67,7 @@ jobs: uses: actions/checkout@v4 with: repository: 'cpplint/cpplint' - ref: "1.6.1" + ref: "develop" path: "code_linter/cpplint" - name: Run linter run: | diff --git a/src/allpairs/floydWarshall_driver.cpp b/src/allpairs/floydWarshall_driver.cpp index 8bd8038dff..6b1e86e034 100644 --- a/src/allpairs/floydWarshall_driver.cpp +++ b/src/allpairs/floydWarshall_driver.cpp @@ -32,6 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include "allpairs/pgr_allpairs.hpp" #include "cpp_common/pgdata_getters.hpp" diff --git a/src/allpairs/johnson_driver.cpp b/src/allpairs/johnson_driver.cpp index b59b787e69..ef7233e159 100644 --- a/src/allpairs/johnson_driver.cpp +++ b/src/allpairs/johnson_driver.cpp @@ -32,6 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include "allpairs/pgr_allpairs.hpp" #include "cpp_common/pgdata_getters.hpp" diff --git a/src/astar/astar_driver.cpp b/src/astar/astar_driver.cpp index 7c0d4faaf5..4f707eda54 100644 --- a/src/astar/astar_driver.cpp +++ b/src/astar/astar_driver.cpp @@ -33,6 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include "astar/astar.hpp" diff --git a/src/bdAstar/bdAstar_driver.cpp b/src/bdAstar/bdAstar_driver.cpp index 7848756f8c..9029ef612b 100644 --- a/src/bdAstar/bdAstar_driver.cpp +++ b/src/bdAstar/bdAstar_driver.cpp @@ -34,6 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include "bdAstar/bdAstar.hpp" diff --git a/src/bdDijkstra/bdDijkstra_driver.cpp b/src/bdDijkstra/bdDijkstra_driver.cpp index 6995d708f0..4fbd9e2492 100644 --- a/src/bdDijkstra/bdDijkstra_driver.cpp +++ b/src/bdDijkstra/bdDijkstra_driver.cpp @@ -33,6 +33,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include +#include +#include #include "cpp_common/combinations.hpp" diff --git a/src/bellman_ford/bellman_ford_driver.cpp b/src/bellman_ford/bellman_ford_driver.cpp index 85af76055c..de2cdf7262 100644 --- a/src/bellman_ford/bellman_ford_driver.cpp +++ b/src/bellman_ford/bellman_ford_driver.cpp @@ -34,6 +34,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include +#include #include "bellman_ford/pgr_bellman_ford.hpp" diff --git a/src/bellman_ford/bellman_ford_neg_driver.cpp b/src/bellman_ford/bellman_ford_neg_driver.cpp index 696cf874e9..fb1b518ba7 100644 --- a/src/bellman_ford/bellman_ford_neg_driver.cpp +++ b/src/bellman_ford/bellman_ford_neg_driver.cpp @@ -34,6 +34,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include +#include #include "bellman_ford/pgr_bellman_ford.hpp" diff --git a/src/bellman_ford/edwardMoore_driver.cpp b/src/bellman_ford/edwardMoore_driver.cpp index 06fdbf74b0..79f7cb6fad 100644 --- a/src/bellman_ford/edwardMoore_driver.cpp +++ b/src/bellman_ford/edwardMoore_driver.cpp @@ -34,6 +34,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include +#include +#include #include "bellman_ford/pgr_edwardMoore.hpp" diff --git a/src/breadthFirstSearch/binaryBreadthFirstSearch_driver.cpp b/src/breadthFirstSearch/binaryBreadthFirstSearch_driver.cpp index 45a8c26c6c..2598bdd2d8 100644 --- a/src/breadthFirstSearch/binaryBreadthFirstSearch_driver.cpp +++ b/src/breadthFirstSearch/binaryBreadthFirstSearch_driver.cpp @@ -36,6 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include "breadthFirstSearch/pgr_binaryBreadthFirstSearch.hpp" diff --git a/src/chinese/chinesePostman_driver.cpp b/src/chinese/chinesePostman_driver.cpp index 1642a5ebc4..cc530f7598 100644 --- a/src/chinese/chinesePostman_driver.cpp +++ b/src/chinese/chinesePostman_driver.cpp @@ -33,6 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include // work for only directed #include "cpp_common/pgdata_getters.hpp" diff --git a/src/coloring/edgeColoring_driver.cpp b/src/coloring/edgeColoring_driver.cpp index b255eac184..2ed8df6f99 100644 --- a/src/coloring/edgeColoring_driver.cpp +++ b/src/coloring/edgeColoring_driver.cpp @@ -29,6 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "drivers/coloring/edgeColoring_driver.h" #include +#include #include "coloring/pgr_edgeColoring.hpp" diff --git a/src/components/articulationPoints_driver.cpp b/src/components/articulationPoints_driver.cpp index c10328d856..47494afd0e 100644 --- a/src/components/articulationPoints_driver.cpp +++ b/src/components/articulationPoints_driver.cpp @@ -32,6 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include "components/pgr_components.hpp" diff --git a/src/components/biconnectedComponents_driver.cpp b/src/components/biconnectedComponents_driver.cpp index 469b08b699..8ac96ebe16 100644 --- a/src/components/biconnectedComponents_driver.cpp +++ b/src/components/biconnectedComponents_driver.cpp @@ -32,6 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include "components/pgr_components.hpp" diff --git a/src/components/bridges_driver.cpp b/src/components/bridges_driver.cpp index 05ec349e3a..66925cfae5 100644 --- a/src/components/bridges_driver.cpp +++ b/src/components/bridges_driver.cpp @@ -32,6 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include "components/pgr_components.hpp" diff --git a/src/components/connectedComponents_driver.cpp b/src/components/connectedComponents_driver.cpp index c9206afb8e..9072cff86d 100644 --- a/src/components/connectedComponents_driver.cpp +++ b/src/components/connectedComponents_driver.cpp @@ -32,6 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" diff --git a/src/components/strongComponents_driver.cpp b/src/components/strongComponents_driver.cpp index 2fa62c4013..b20b23c04c 100644 --- a/src/components/strongComponents_driver.cpp +++ b/src/components/strongComponents_driver.cpp @@ -32,6 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include "cpp_common/pgdata_getters.hpp" diff --git a/src/cpp_common/combinations.cpp b/src/cpp_common/combinations.cpp index 9fdd759a70..cef01eab95 100644 --- a/src/cpp_common/combinations.cpp +++ b/src/cpp_common/combinations.cpp @@ -30,6 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/basePath_SSEC.hpp" diff --git a/src/cpp_common/get_check_data.cpp b/src/cpp_common/get_check_data.cpp index c0de8bc3f3..45348bf071 100644 --- a/src/cpp_common/get_check_data.cpp +++ b/src/cpp_common/get_check_data.cpp @@ -36,6 +36,7 @@ extern "C" { #include #include +#include #include "cpp_common/undefPostgresDefine.hpp" #include "cpp_common/pgr_alloc.hpp" diff --git a/src/cpp_common/pgdata_getters.cpp b/src/cpp_common/pgdata_getters.cpp index 5ad053a543..9f48267a02 100644 --- a/src/cpp_common/pgdata_getters.cpp +++ b/src/cpp_common/pgdata_getters.cpp @@ -41,6 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include "cpp_common/get_data.hpp" #include "cpp_common/get_check_data.hpp" diff --git a/src/dagShortestPath/dagShortestPath_driver.cpp b/src/dagShortestPath/dagShortestPath_driver.cpp index a3452f6715..95f0ebbafa 100644 --- a/src/dagShortestPath/dagShortestPath_driver.cpp +++ b/src/dagShortestPath/dagShortestPath_driver.cpp @@ -33,6 +33,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include +#include +#include #include "dagShortestPath/pgr_dagShortestPath.hpp" diff --git a/src/dijkstra/dijkstraVia_driver.cpp b/src/dijkstra/dijkstraVia_driver.cpp index 9a171c70fa..5ca73e41b6 100644 --- a/src/dijkstra/dijkstraVia_driver.cpp +++ b/src/dijkstra/dijkstraVia_driver.cpp @@ -30,6 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include "c_types/routes_t.h" #include "cpp_common/pgdata_getters.hpp" diff --git a/src/dijkstra/dijkstra_driver.cpp b/src/dijkstra/dijkstra_driver.cpp index 455c66ef67..32c5826cea 100644 --- a/src/dijkstra/dijkstra_driver.cpp +++ b/src/dijkstra/dijkstra_driver.cpp @@ -39,6 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include "cpp_common/pgdata_getters.hpp" diff --git a/src/driving_distance/drivedist_driver.cpp b/src/driving_distance/drivedist_driver.cpp index 954f07005f..3fa126f450 100644 --- a/src/driving_distance/drivedist_driver.cpp +++ b/src/driving_distance/drivedist_driver.cpp @@ -32,6 +32,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include +#include #include "cpp_common/pgdata_getters.hpp" #include "dijkstra/drivingDist.hpp" diff --git a/src/driving_distance/withPoints_dd_driver.cpp b/src/driving_distance/withPoints_dd_driver.cpp index c9916f04f9..883f77348f 100644 --- a/src/driving_distance/withPoints_dd_driver.cpp +++ b/src/driving_distance/withPoints_dd_driver.cpp @@ -36,6 +36,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include +#include #include "cpp_common/pgdata_getters.hpp" #include "dijkstra/drivingDist.hpp" diff --git a/src/ksp/ksp_driver.cpp b/src/ksp/ksp_driver.cpp index 827597f4bf..c2b34645fd 100644 --- a/src/ksp/ksp_driver.cpp +++ b/src/ksp/ksp_driver.cpp @@ -34,6 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include "yen/pgr_ksp.hpp" diff --git a/src/ksp/withPoints_ksp_driver.cpp b/src/ksp/withPoints_ksp_driver.cpp index 4e842c2ca5..0b74256ed6 100644 --- a/src/ksp/withPoints_ksp_driver.cpp +++ b/src/ksp/withPoints_ksp_driver.cpp @@ -36,6 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/combinations.hpp" diff --git a/src/lineGraph/lineGraphFull_driver.cpp b/src/lineGraph/lineGraphFull_driver.cpp index 25fbbca11f..c6e8ad04d5 100644 --- a/src/lineGraph/lineGraphFull_driver.cpp +++ b/src/lineGraph/lineGraphFull_driver.cpp @@ -32,6 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include "c_types/line_graph_full_rt.h" #include "cpp_common/pgdata_getters.hpp" diff --git a/src/lineGraph/lineGraph_driver.cpp b/src/lineGraph/lineGraph_driver.cpp index 2d07aa3f24..19abc8a233 100644 --- a/src/lineGraph/lineGraph_driver.cpp +++ b/src/lineGraph/lineGraph_driver.cpp @@ -33,6 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" diff --git a/src/max_flow/edge_disjoint_paths_driver.cpp b/src/max_flow/edge_disjoint_paths_driver.cpp index 34e09248a9..92ed94ec73 100644 --- a/src/max_flow/edge_disjoint_paths_driver.cpp +++ b/src/max_flow/edge_disjoint_paths_driver.cpp @@ -32,6 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include "max_flow/pgr_maxflow.hpp" diff --git a/src/max_flow/max_flow_driver.cpp b/src/max_flow/max_flow_driver.cpp index e3c804acae..497165a12e 100644 --- a/src/max_flow/max_flow_driver.cpp +++ b/src/max_flow/max_flow_driver.cpp @@ -32,6 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include "max_flow/pgr_maxflow.hpp" diff --git a/src/max_flow/maximum_cardinality_matching_driver.cpp b/src/max_flow/maximum_cardinality_matching_driver.cpp index 5c5299a3ba..0181d52e8c 100644 --- a/src/max_flow/maximum_cardinality_matching_driver.cpp +++ b/src/max_flow/maximum_cardinality_matching_driver.cpp @@ -35,6 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include +#include #include "c_types/edge_bool_t_rt.h" diff --git a/src/max_flow/minCostMaxFlow_driver.cpp b/src/max_flow/minCostMaxFlow_driver.cpp index f24899708f..c6d4af3de7 100644 --- a/src/max_flow/minCostMaxFlow_driver.cpp +++ b/src/max_flow/minCostMaxFlow_driver.cpp @@ -33,6 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include "c_types/costFlow_t.h" diff --git a/src/mincut/stoerWagner_driver.cpp b/src/mincut/stoerWagner_driver.cpp index bc9a04fe7a..26642d46eb 100644 --- a/src/mincut/stoerWagner_driver.cpp +++ b/src/mincut/stoerWagner_driver.cpp @@ -31,6 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include "mincut/pgr_stoerWagner.hpp" diff --git a/src/spanningTree/randomSpanningTree_driver.cpp b/src/spanningTree/randomSpanningTree_driver.cpp index e16b6cb341..f513077a6c 100644 --- a/src/spanningTree/randomSpanningTree_driver.cpp +++ b/src/spanningTree/randomSpanningTree_driver.cpp @@ -31,6 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include "cpp_common/pgdata_getters.hpp" diff --git a/src/trsp/trspVia_driver.cpp b/src/trsp/trspVia_driver.cpp index 8849275f7b..0d25d7b23b 100644 --- a/src/trsp/trspVia_driver.cpp +++ b/src/trsp/trspVia_driver.cpp @@ -31,6 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include "dijkstra/pgr_dijkstraVia.hpp" #include "c_types/routes_t.h" diff --git a/src/trsp/trspVia_withPoints_driver.cpp b/src/trsp/trspVia_withPoints_driver.cpp index 3f30c3642b..d20448ed3a 100644 --- a/src/trsp/trspVia_withPoints_driver.cpp +++ b/src/trsp/trspVia_withPoints_driver.cpp @@ -28,6 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include "c_types/routes_t.h" diff --git a/src/trsp/trsp_driver.cpp b/src/trsp/trsp_driver.cpp index 98cace7a94..ae0c1d7477 100644 --- a/src/trsp/trsp_driver.cpp +++ b/src/trsp/trsp_driver.cpp @@ -38,6 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include "trsp/pgr_trspHandler.h" #include "cpp_common/pgdata_getters.hpp" diff --git a/src/trsp/trsp_withPoints_driver.cpp b/src/trsp/trsp_withPoints_driver.cpp index e7477a66f5..44a28ab633 100644 --- a/src/trsp/trsp_withPoints_driver.cpp +++ b/src/trsp/trsp_withPoints_driver.cpp @@ -38,6 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" diff --git a/src/withPoints/withPointsVia_driver.cpp b/src/withPoints/withPointsVia_driver.cpp index 3efcdb08f0..3f5956b31d 100644 --- a/src/withPoints/withPointsVia_driver.cpp +++ b/src/withPoints/withPointsVia_driver.cpp @@ -30,6 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include "c_types/routes_t.h" diff --git a/src/withPoints/withPoints_driver.cpp b/src/withPoints/withPoints_driver.cpp index b323873e64..cc5dfdb75d 100644 --- a/src/withPoints/withPoints_driver.cpp +++ b/src/withPoints/withPoints_driver.cpp @@ -35,7 +35,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include - +#include +#include +#include #include "withPoints/pgr_withPoints.hpp" #include "cpp_common/pgdata_getters.hpp" diff --git a/tools/scripts/code_checker.sh b/tools/scripts/code_checker.sh index 6d53e18255..0d50e7e9e8 100755 --- a/tools/scripts/code_checker.sh +++ b/tools/scripts/code_checker.sh @@ -33,15 +33,19 @@ if ! test -d code_linter; then # Get our fork of codespell that adds --words-white-list and full filename support for -S option mkdir code_linter pushd code_linter || exit 1 - git clone --branch 1.6.1 https://github.com/cpplint/cpplint + git clone --branch develop https://github.com/cpplint/cpplint # cd styleguide || exit 1 # git checkout gh-pages popd || exit 1 - ls code_linter - ls code_linter/cpplint - echo code_linter installed fi +pushd code_linter || exit 1 +git pull +popd || exit 1 +ls code_linter +ls code_linter/cpplint +echo code_linter installed + DIRECTORY="$1" if test -z "$DIRECTORY"; then From 7a65a1c1af267d2a6ce2729cf3440526361c6a6d Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 8 Feb 2024 12:07:16 -0600 Subject: [PATCH 121/428] (tools) fixing type in script --- tools/scripts/code_checker.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tools/scripts/code_checker.sh b/tools/scripts/code_checker.sh index 0d50e7e9e8..def08ebbad 100755 --- a/tools/scripts/code_checker.sh +++ b/tools/scripts/code_checker.sh @@ -37,15 +37,11 @@ if ! test -d code_linter; then # cd styleguide || exit 1 # git checkout gh-pages popd || exit 1 + ls code_linter + ls code_linter/cpplint + echo code_linter installed fi -pushd code_linter || exit 1 -git pull -popd || exit 1 -ls code_linter -ls code_linter/cpplint -echo code_linter installed - DIRECTORY="$1" if test -z "$DIRECTORY"; then From 3238238cb398a77510163a80dce8466f77d038ba Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 11 Feb 2024 14:09:03 -0600 Subject: [PATCH 122/428] (h -> hpp) moving h files to hpp --- include/c_types/{pickDeliver => }/schedule_rt.h | 0 include/components/{componentsResult.h => componentsResult.hpp} | 0 include/cpp_common/{Dmatrix.h => Dmatrix.hpp} | 0 include/cpp_common/{basic_edge.h => basic_edge.hpp} | 0 include/cpp_common/{basic_vertex.h => basic_vertex.hpp} | 0 include/cpp_common/{ch_edge.h => ch_edge.hpp} | 0 include/cpp_common/{ch_vertex.h => ch_vertex.hpp} | 0 include/cpp_common/{compPaths.h => compPaths.hpp} | 0 include/{c_types/coordinate_t.h => cpp_common/coordinate_t.hpp} | 0 include/{c_types/costFlow_t.h => cpp_common/costFlow_t.hpp} | 0 include/{c_types/delauny_t.h => cpp_common/delauny_t.hpp} | 0 include/{c_types/edge_t.h => cpp_common/edge_t.hpp} | 0 include/{c_types/edge_xy_t.h => cpp_common/edge_xy_t.hpp} | 0 include/{c_types/graph_enum.h => cpp_common/graph_enum.hpp} | 0 include/cpp_common/{identifier.h => identifier.hpp} | 0 include/{c_types => cpp_common}/info_t.hpp | 0 include/cpp_common/{line_vertex.h => line_vertex.hpp} | 0 .../{linear_directed_graph.h => linear_directed_graph.hpp} | 0 .../{c_types/pickDeliver/orders_t.h => cpp_common/orders_t.hpp} | 0 include/cpp_common/{path_t.h => path_t.hpp} | 0 include/cpp_common/{pgr_assert.h => pgr_assert.hpp} | 0 include/cpp_common/{pgr_messages.h => pgr_messages.hpp} | 0 .../{c_types/point_on_edge_t.h => cpp_common/point_on_edge_t.hpp} | 0 include/{c_types/restriction_t.h => cpp_common/restriction_t.hpp} | 0 include/cpp_common/{rule.h => rule.hpp} | 0 include/cpp_common/{signalhandler.h => signalhandler.hpp} | 0 .../{c_types/pickDeliver/vehicle_t.h => cpp_common/vehicle_t.hpp} | 0 include/cpp_common/{xy_vertex.h => xy_vertex.hpp} | 0 include/{ => drivers}/trsp/trsp_core.h | 0 include/trsp/{GraphDefinition.h => GraphDefinition.hpp} | 0 include/trsp/{edgeInfo.h => edgeInfo.hpp} | 0 include/trsp/{pgr_trspHandler.h => pgr_trspHandler.hpp} | 0 include/vrp/{book_keeping.h => book_keeping.hpp} | 0 include/vrp/{dnode.h => dnode.hpp} | 0 include/vrp/{fleet.h => fleet.hpp} | 0 include/vrp/{initial_solution.h => initial_solution.hpp} | 0 include/vrp/{initials_code.h => initials_code.hpp} | 0 include/vrp/{optimize.h => optimize.hpp} | 0 include/vrp/{order.h => order.hpp} | 0 include/vrp/{pd_orders.h => pd_orders.hpp} | 0 include/vrp/{pd_problem.h => pd_problem.hpp} | 0 include/vrp/{pgr_pickDeliver.h => pgr_pickDeliver.hpp} | 0 include/vrp/{solution.h => solution.hpp} | 0 include/vrp/{tw_node.h => tw_node.hpp} | 0 include/vrp/{vehicle.h => vehicle.hpp} | 0 include/vrp/{vehicle_node.h => vehicle_node.hpp} | 0 include/vrp/{vehicle_pickDeliver.h => vehicle_pickDeliver.hpp} | 0 47 files changed, 0 insertions(+), 0 deletions(-) rename include/c_types/{pickDeliver => }/schedule_rt.h (100%) rename include/components/{componentsResult.h => componentsResult.hpp} (100%) rename include/cpp_common/{Dmatrix.h => Dmatrix.hpp} (100%) rename include/cpp_common/{basic_edge.h => basic_edge.hpp} (100%) rename include/cpp_common/{basic_vertex.h => basic_vertex.hpp} (100%) rename include/cpp_common/{ch_edge.h => ch_edge.hpp} (100%) rename include/cpp_common/{ch_vertex.h => ch_vertex.hpp} (100%) rename include/cpp_common/{compPaths.h => compPaths.hpp} (100%) rename include/{c_types/coordinate_t.h => cpp_common/coordinate_t.hpp} (100%) rename include/{c_types/costFlow_t.h => cpp_common/costFlow_t.hpp} (100%) rename include/{c_types/delauny_t.h => cpp_common/delauny_t.hpp} (100%) rename include/{c_types/edge_t.h => cpp_common/edge_t.hpp} (100%) rename include/{c_types/edge_xy_t.h => cpp_common/edge_xy_t.hpp} (100%) rename include/{c_types/graph_enum.h => cpp_common/graph_enum.hpp} (100%) rename include/cpp_common/{identifier.h => identifier.hpp} (100%) rename include/{c_types => cpp_common}/info_t.hpp (100%) rename include/cpp_common/{line_vertex.h => line_vertex.hpp} (100%) rename include/cpp_common/{linear_directed_graph.h => linear_directed_graph.hpp} (100%) rename include/{c_types/pickDeliver/orders_t.h => cpp_common/orders_t.hpp} (100%) rename include/cpp_common/{path_t.h => path_t.hpp} (100%) rename include/cpp_common/{pgr_assert.h => pgr_assert.hpp} (100%) rename include/cpp_common/{pgr_messages.h => pgr_messages.hpp} (100%) rename include/{c_types/point_on_edge_t.h => cpp_common/point_on_edge_t.hpp} (100%) rename include/{c_types/restriction_t.h => cpp_common/restriction_t.hpp} (100%) rename include/cpp_common/{rule.h => rule.hpp} (100%) rename include/cpp_common/{signalhandler.h => signalhandler.hpp} (100%) rename include/{c_types/pickDeliver/vehicle_t.h => cpp_common/vehicle_t.hpp} (100%) rename include/cpp_common/{xy_vertex.h => xy_vertex.hpp} (100%) rename include/{ => drivers}/trsp/trsp_core.h (100%) rename include/trsp/{GraphDefinition.h => GraphDefinition.hpp} (100%) rename include/trsp/{edgeInfo.h => edgeInfo.hpp} (100%) rename include/trsp/{pgr_trspHandler.h => pgr_trspHandler.hpp} (100%) rename include/vrp/{book_keeping.h => book_keeping.hpp} (100%) rename include/vrp/{dnode.h => dnode.hpp} (100%) rename include/vrp/{fleet.h => fleet.hpp} (100%) rename include/vrp/{initial_solution.h => initial_solution.hpp} (100%) rename include/vrp/{initials_code.h => initials_code.hpp} (100%) rename include/vrp/{optimize.h => optimize.hpp} (100%) rename include/vrp/{order.h => order.hpp} (100%) rename include/vrp/{pd_orders.h => pd_orders.hpp} (100%) rename include/vrp/{pd_problem.h => pd_problem.hpp} (100%) rename include/vrp/{pgr_pickDeliver.h => pgr_pickDeliver.hpp} (100%) rename include/vrp/{solution.h => solution.hpp} (100%) rename include/vrp/{tw_node.h => tw_node.hpp} (100%) rename include/vrp/{vehicle.h => vehicle.hpp} (100%) rename include/vrp/{vehicle_node.h => vehicle_node.hpp} (100%) rename include/vrp/{vehicle_pickDeliver.h => vehicle_pickDeliver.hpp} (100%) diff --git a/include/c_types/pickDeliver/schedule_rt.h b/include/c_types/schedule_rt.h similarity index 100% rename from include/c_types/pickDeliver/schedule_rt.h rename to include/c_types/schedule_rt.h diff --git a/include/components/componentsResult.h b/include/components/componentsResult.hpp similarity index 100% rename from include/components/componentsResult.h rename to include/components/componentsResult.hpp diff --git a/include/cpp_common/Dmatrix.h b/include/cpp_common/Dmatrix.hpp similarity index 100% rename from include/cpp_common/Dmatrix.h rename to include/cpp_common/Dmatrix.hpp diff --git a/include/cpp_common/basic_edge.h b/include/cpp_common/basic_edge.hpp similarity index 100% rename from include/cpp_common/basic_edge.h rename to include/cpp_common/basic_edge.hpp diff --git a/include/cpp_common/basic_vertex.h b/include/cpp_common/basic_vertex.hpp similarity index 100% rename from include/cpp_common/basic_vertex.h rename to include/cpp_common/basic_vertex.hpp diff --git a/include/cpp_common/ch_edge.h b/include/cpp_common/ch_edge.hpp similarity index 100% rename from include/cpp_common/ch_edge.h rename to include/cpp_common/ch_edge.hpp diff --git a/include/cpp_common/ch_vertex.h b/include/cpp_common/ch_vertex.hpp similarity index 100% rename from include/cpp_common/ch_vertex.h rename to include/cpp_common/ch_vertex.hpp diff --git a/include/cpp_common/compPaths.h b/include/cpp_common/compPaths.hpp similarity index 100% rename from include/cpp_common/compPaths.h rename to include/cpp_common/compPaths.hpp diff --git a/include/c_types/coordinate_t.h b/include/cpp_common/coordinate_t.hpp similarity index 100% rename from include/c_types/coordinate_t.h rename to include/cpp_common/coordinate_t.hpp diff --git a/include/c_types/costFlow_t.h b/include/cpp_common/costFlow_t.hpp similarity index 100% rename from include/c_types/costFlow_t.h rename to include/cpp_common/costFlow_t.hpp diff --git a/include/c_types/delauny_t.h b/include/cpp_common/delauny_t.hpp similarity index 100% rename from include/c_types/delauny_t.h rename to include/cpp_common/delauny_t.hpp diff --git a/include/c_types/edge_t.h b/include/cpp_common/edge_t.hpp similarity index 100% rename from include/c_types/edge_t.h rename to include/cpp_common/edge_t.hpp diff --git a/include/c_types/edge_xy_t.h b/include/cpp_common/edge_xy_t.hpp similarity index 100% rename from include/c_types/edge_xy_t.h rename to include/cpp_common/edge_xy_t.hpp diff --git a/include/c_types/graph_enum.h b/include/cpp_common/graph_enum.hpp similarity index 100% rename from include/c_types/graph_enum.h rename to include/cpp_common/graph_enum.hpp diff --git a/include/cpp_common/identifier.h b/include/cpp_common/identifier.hpp similarity index 100% rename from include/cpp_common/identifier.h rename to include/cpp_common/identifier.hpp diff --git a/include/c_types/info_t.hpp b/include/cpp_common/info_t.hpp similarity index 100% rename from include/c_types/info_t.hpp rename to include/cpp_common/info_t.hpp diff --git a/include/cpp_common/line_vertex.h b/include/cpp_common/line_vertex.hpp similarity index 100% rename from include/cpp_common/line_vertex.h rename to include/cpp_common/line_vertex.hpp diff --git a/include/cpp_common/linear_directed_graph.h b/include/cpp_common/linear_directed_graph.hpp similarity index 100% rename from include/cpp_common/linear_directed_graph.h rename to include/cpp_common/linear_directed_graph.hpp diff --git a/include/c_types/pickDeliver/orders_t.h b/include/cpp_common/orders_t.hpp similarity index 100% rename from include/c_types/pickDeliver/orders_t.h rename to include/cpp_common/orders_t.hpp diff --git a/include/cpp_common/path_t.h b/include/cpp_common/path_t.hpp similarity index 100% rename from include/cpp_common/path_t.h rename to include/cpp_common/path_t.hpp diff --git a/include/cpp_common/pgr_assert.h b/include/cpp_common/pgr_assert.hpp similarity index 100% rename from include/cpp_common/pgr_assert.h rename to include/cpp_common/pgr_assert.hpp diff --git a/include/cpp_common/pgr_messages.h b/include/cpp_common/pgr_messages.hpp similarity index 100% rename from include/cpp_common/pgr_messages.h rename to include/cpp_common/pgr_messages.hpp diff --git a/include/c_types/point_on_edge_t.h b/include/cpp_common/point_on_edge_t.hpp similarity index 100% rename from include/c_types/point_on_edge_t.h rename to include/cpp_common/point_on_edge_t.hpp diff --git a/include/c_types/restriction_t.h b/include/cpp_common/restriction_t.hpp similarity index 100% rename from include/c_types/restriction_t.h rename to include/cpp_common/restriction_t.hpp diff --git a/include/cpp_common/rule.h b/include/cpp_common/rule.hpp similarity index 100% rename from include/cpp_common/rule.h rename to include/cpp_common/rule.hpp diff --git a/include/cpp_common/signalhandler.h b/include/cpp_common/signalhandler.hpp similarity index 100% rename from include/cpp_common/signalhandler.h rename to include/cpp_common/signalhandler.hpp diff --git a/include/c_types/pickDeliver/vehicle_t.h b/include/cpp_common/vehicle_t.hpp similarity index 100% rename from include/c_types/pickDeliver/vehicle_t.h rename to include/cpp_common/vehicle_t.hpp diff --git a/include/cpp_common/xy_vertex.h b/include/cpp_common/xy_vertex.hpp similarity index 100% rename from include/cpp_common/xy_vertex.h rename to include/cpp_common/xy_vertex.hpp diff --git a/include/trsp/trsp_core.h b/include/drivers/trsp/trsp_core.h similarity index 100% rename from include/trsp/trsp_core.h rename to include/drivers/trsp/trsp_core.h diff --git a/include/trsp/GraphDefinition.h b/include/trsp/GraphDefinition.hpp similarity index 100% rename from include/trsp/GraphDefinition.h rename to include/trsp/GraphDefinition.hpp diff --git a/include/trsp/edgeInfo.h b/include/trsp/edgeInfo.hpp similarity index 100% rename from include/trsp/edgeInfo.h rename to include/trsp/edgeInfo.hpp diff --git a/include/trsp/pgr_trspHandler.h b/include/trsp/pgr_trspHandler.hpp similarity index 100% rename from include/trsp/pgr_trspHandler.h rename to include/trsp/pgr_trspHandler.hpp diff --git a/include/vrp/book_keeping.h b/include/vrp/book_keeping.hpp similarity index 100% rename from include/vrp/book_keeping.h rename to include/vrp/book_keeping.hpp diff --git a/include/vrp/dnode.h b/include/vrp/dnode.hpp similarity index 100% rename from include/vrp/dnode.h rename to include/vrp/dnode.hpp diff --git a/include/vrp/fleet.h b/include/vrp/fleet.hpp similarity index 100% rename from include/vrp/fleet.h rename to include/vrp/fleet.hpp diff --git a/include/vrp/initial_solution.h b/include/vrp/initial_solution.hpp similarity index 100% rename from include/vrp/initial_solution.h rename to include/vrp/initial_solution.hpp diff --git a/include/vrp/initials_code.h b/include/vrp/initials_code.hpp similarity index 100% rename from include/vrp/initials_code.h rename to include/vrp/initials_code.hpp diff --git a/include/vrp/optimize.h b/include/vrp/optimize.hpp similarity index 100% rename from include/vrp/optimize.h rename to include/vrp/optimize.hpp diff --git a/include/vrp/order.h b/include/vrp/order.hpp similarity index 100% rename from include/vrp/order.h rename to include/vrp/order.hpp diff --git a/include/vrp/pd_orders.h b/include/vrp/pd_orders.hpp similarity index 100% rename from include/vrp/pd_orders.h rename to include/vrp/pd_orders.hpp diff --git a/include/vrp/pd_problem.h b/include/vrp/pd_problem.hpp similarity index 100% rename from include/vrp/pd_problem.h rename to include/vrp/pd_problem.hpp diff --git a/include/vrp/pgr_pickDeliver.h b/include/vrp/pgr_pickDeliver.hpp similarity index 100% rename from include/vrp/pgr_pickDeliver.h rename to include/vrp/pgr_pickDeliver.hpp diff --git a/include/vrp/solution.h b/include/vrp/solution.hpp similarity index 100% rename from include/vrp/solution.h rename to include/vrp/solution.hpp diff --git a/include/vrp/tw_node.h b/include/vrp/tw_node.hpp similarity index 100% rename from include/vrp/tw_node.h rename to include/vrp/tw_node.hpp diff --git a/include/vrp/vehicle.h b/include/vrp/vehicle.hpp similarity index 100% rename from include/vrp/vehicle.h rename to include/vrp/vehicle.hpp diff --git a/include/vrp/vehicle_node.h b/include/vrp/vehicle_node.hpp similarity index 100% rename from include/vrp/vehicle_node.h rename to include/vrp/vehicle_node.hpp diff --git a/include/vrp/vehicle_pickDeliver.h b/include/vrp/vehicle_pickDeliver.hpp similarity index 100% rename from include/vrp/vehicle_pickDeliver.h rename to include/vrp/vehicle_pickDeliver.hpp From 9d3b96e1716049e09c842c07a53c4d5dda955674 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 11 Feb 2024 18:55:05 -0600 Subject: [PATCH 123/428] (C) Adding edges_rt.h --- include/c_types/edge_rt.h | 48 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 include/c_types/edge_rt.h diff --git a/include/c_types/edge_rt.h b/include/c_types/edge_rt.h new file mode 100644 index 0000000000..f6ec1519d8 --- /dev/null +++ b/include/c_types/edge_rt.h @@ -0,0 +1,48 @@ +/*PGR-GNU***************************************************************** +File: Edge_rt.h + +Copyright (c) 2017 pgRouting developers +Mail: project@pgrouting.org + +Copyright (c) 2017 Celia Virginia Vergara Castillo +Mail: vicky_vergara@hotmail.com + +------ + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + ********************************************************************PGR-GNU*/ +/*! @file */ + +#ifndef INCLUDE_C_TYPES_EDGE_RT_H_ +#define INCLUDE_C_TYPES_EDGE_RT_H_ +#pragma once + +/* for int64_t */ +#ifdef __cplusplus +# include +#else +# include +#endif + +struct Edge_rt{ + int64_t id; + int64_t source; + int64_t target; + double cost; + double reverse_cost; +}; + +#endif // INCLUDE_C_TYPES_EDGE_RT_H_ From bd8a6df0a5724e7f6a7bf4146ebdf0e6e087f7c4 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 11 Feb 2024 15:25:42 -0600 Subject: [PATCH 124/428] (hpp) updating guards --- include/alphaShape/pgr_alphaShape.h | 6 +++--- include/c_types/schedule_rt.h | 8 ++++---- include/components/componentsResult.hpp | 6 +++--- include/cpp_common/Dmatrix.hpp | 6 +++--- include/cpp_common/basic_edge.hpp | 6 +++--- include/cpp_common/basic_vertex.hpp | 6 +++--- include/cpp_common/ch_edge.hpp | 6 +++--- include/cpp_common/ch_vertex.hpp | 6 +++--- include/cpp_common/compPaths.hpp | 6 +++--- include/cpp_common/coordinate_t.hpp | 6 +++--- include/cpp_common/costFlow_t.hpp | 6 +++--- include/cpp_common/delauny_t.hpp | 6 +++--- include/cpp_common/edge_t.hpp | 6 +++--- include/cpp_common/edge_xy_t.hpp | 6 +++--- include/cpp_common/get_check_data.hpp | 6 +++--- include/cpp_common/graph_enum.hpp | 6 +++--- include/cpp_common/identifier.hpp | 6 +++--- include/cpp_common/info_t.hpp | 6 +++--- include/cpp_common/line_vertex.hpp | 6 +++--- include/cpp_common/linear_directed_graph.hpp | 6 +++--- include/cpp_common/orders_t.hpp | 6 +++--- include/cpp_common/path_t.hpp | 6 +++--- include/cpp_common/pgdata_fetchers.hpp | 6 +++--- include/cpp_common/pgdata_getters.hpp | 6 +++--- include/cpp_common/pgr_assert.hpp | 6 +++--- include/cpp_common/pgr_messages.hpp | 6 +++--- include/cpp_common/point_on_edge_t.hpp | 6 +++--- include/cpp_common/restriction_t.hpp | 6 +++--- include/cpp_common/rule.hpp | 6 +++--- include/cpp_common/signalhandler.hpp | 6 +++--- include/cpp_common/vehicle_t.hpp | 6 +++--- include/cpp_common/xy_vertex.hpp | 6 +++--- include/drivers/trsp/trsp_core.h | 6 +++--- include/trsp/GraphDefinition.hpp | 6 +++--- include/trsp/edgeInfo.hpp | 6 +++--- include/trsp/pgr_trspHandler.hpp | 6 +++--- include/vrp/book_keeping.hpp | 6 +++--- include/vrp/dnode.hpp | 6 +++--- include/vrp/fleet.hpp | 6 +++--- include/vrp/initial_solution.hpp | 6 +++--- include/vrp/initials_code.hpp | 6 +++--- include/vrp/optimize.hpp | 6 +++--- include/vrp/order.hpp | 6 +++--- include/vrp/pd_orders.hpp | 6 +++--- include/vrp/pd_problem.hpp | 6 +++--- include/vrp/pgr_pickDeliver.hpp | 6 +++--- include/vrp/solution.hpp | 6 +++--- include/vrp/tw_node.hpp | 6 +++--- include/vrp/vehicle.hpp | 6 +++--- include/vrp/vehicle_node.hpp | 6 +++--- include/vrp/vehicle_pickDeliver.hpp | 6 +++--- 51 files changed, 154 insertions(+), 154 deletions(-) diff --git a/include/alphaShape/pgr_alphaShape.h b/include/alphaShape/pgr_alphaShape.h index 066b72121e..9005d157c3 100644 --- a/include/alphaShape/pgr_alphaShape.h +++ b/include/alphaShape/pgr_alphaShape.h @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_ALPHASHAPE_PGR_ALPHASHAPE_H_ -#define INCLUDE_ALPHASHAPE_PGR_ALPHASHAPE_H_ +#ifndef INCLUDE_ALPHASHAPE_PGR_ALPHASHAPE_HPP_ +#define INCLUDE_ALPHASHAPE_PGR_ALPHASHAPE_HPP_ #pragma once #ifndef __cplusplus @@ -99,4 +99,4 @@ class Pgr_alphaShape : public Pgr_messages { } // namespace alphashape } // namespace pgrouting -#endif // INCLUDE_ALPHASHAPE_PGR_ALPHASHAPE_H_ +#endif // INCLUDE_ALPHASHAPE_PGR_ALPHASHAPE_HPP_ diff --git a/include/c_types/schedule_rt.h b/include/c_types/schedule_rt.h index 93abeba24a..e9d708e354 100644 --- a/include/c_types/schedule_rt.h +++ b/include/c_types/schedule_rt.h @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: general_vehicle_orders_t.h +File: schedule_rt.h Copyright (c) 2017 pgRouting developers Mail: project@pgrouting.org @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_C_TYPES_PICKDELIVER_SCHEDULE_RT_H_ -#define INCLUDE_C_TYPES_PICKDELIVER_SCHEDULE_RT_H_ +#ifndef INCLUDE_C_TYPES_SCHEDULE_RT_H_ +#define INCLUDE_C_TYPES_SCHEDULE_RT_H_ #pragma once /* for int64_t */ @@ -66,4 +66,4 @@ struct Schedule_rt { /*************************************************************************/ -#endif // INCLUDE_C_TYPES_PICKDELIVER_SCHEDULE_RT_H_ +#endif // INCLUDE_C_TYPES_SCHEDULE_RT_H_ diff --git a/include/components/componentsResult.hpp b/include/components/componentsResult.hpp index 3b4d91c05f..89100a1c67 100644 --- a/include/components/componentsResult.hpp +++ b/include/components/componentsResult.hpp @@ -24,8 +24,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_COMPONENTS_COMPONENTSRESULT_H_ -#define INCLUDE_COMPONENTS_COMPONENTSRESULT_H_ +#ifndef INCLUDE_COMPONENTS_COMPONENTSRESULT_HPP_ +#define INCLUDE_COMPONENTS_COMPONENTSRESULT_HPP_ #pragma once #include @@ -47,4 +47,4 @@ componentsResult( } // namespace algorithms } // namespace pgrouting -#endif // INCLUDE_COMPONENTS_COMPONENTSRESULT_H_ +#endif // INCLUDE_COMPONENTS_COMPONENTSRESULT_HPP_ diff --git a/include/cpp_common/Dmatrix.hpp b/include/cpp_common/Dmatrix.hpp index 1b81153ca0..ea8302f28e 100644 --- a/include/cpp_common/Dmatrix.hpp +++ b/include/cpp_common/Dmatrix.hpp @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_CPP_COMMON_DMATRIX_H_ -#define INCLUDE_CPP_COMMON_DMATRIX_H_ +#ifndef INCLUDE_CPP_COMMON_DMATRIX_HPP_ +#define INCLUDE_CPP_COMMON_DMATRIX_HPP_ #pragma once #include @@ -128,4 +128,4 @@ class Dmatrix { } // namespace tsp } // namespace pgrouting -#endif // INCLUDE_CPP_COMMON_DMATRIX_H_ +#endif // INCLUDE_CPP_COMMON_DMATRIX_HPP_ diff --git a/include/cpp_common/basic_edge.hpp b/include/cpp_common/basic_edge.hpp index 9128b0e9b3..e34d33f3b6 100644 --- a/include/cpp_common/basic_edge.hpp +++ b/include/cpp_common/basic_edge.hpp @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_CPP_COMMON_BASIC_EDGE_H_ -#define INCLUDE_CPP_COMMON_BASIC_EDGE_H_ +#ifndef INCLUDE_CPP_COMMON_BASIC_EDGE_HPP_ +#define INCLUDE_CPP_COMMON_BASIC_EDGE_HPP_ #pragma once #include @@ -49,4 +49,4 @@ class Basic_edge{ } // namespace pgrouting -#endif // INCLUDE_CPP_COMMON_BASIC_EDGE_H_ +#endif // INCLUDE_CPP_COMMON_BASIC_EDGE_HPP_ diff --git a/include/cpp_common/basic_vertex.hpp b/include/cpp_common/basic_vertex.hpp index 8c0ce9fb17..3adaa64875 100644 --- a/include/cpp_common/basic_vertex.hpp +++ b/include/cpp_common/basic_vertex.hpp @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_CPP_COMMON_BASIC_VERTEX_H_ -#define INCLUDE_CPP_COMMON_BASIC_VERTEX_H_ +#ifndef INCLUDE_CPP_COMMON_BASIC_VERTEX_HPP_ +#define INCLUDE_CPP_COMMON_BASIC_VERTEX_HPP_ #pragma once #include @@ -86,4 +86,4 @@ std::vector < Basic_vertex > extract_vertices( } // namespace pgrouting -#endif // INCLUDE_CPP_COMMON_BASIC_VERTEX_H_ +#endif // INCLUDE_CPP_COMMON_BASIC_VERTEX_HPP_ diff --git a/include/cpp_common/ch_edge.hpp b/include/cpp_common/ch_edge.hpp index 0ae7587330..e81853bb0b 100644 --- a/include/cpp_common/ch_edge.hpp +++ b/include/cpp_common/ch_edge.hpp @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_CPP_COMMON_CH_EDGE_H_ -#define INCLUDE_CPP_COMMON_CH_EDGE_H_ +#ifndef INCLUDE_CPP_COMMON_CH_EDGE_HPP_ +#define INCLUDE_CPP_COMMON_CH_EDGE_HPP_ #pragma once #include @@ -70,4 +70,4 @@ class CH_edge { } // namespace pgrouting -#endif // INCLUDE_CPP_COMMON_CH_EDGE_H_ +#endif // INCLUDE_CPP_COMMON_CH_EDGE_HPP_ diff --git a/include/cpp_common/ch_vertex.hpp b/include/cpp_common/ch_vertex.hpp index 2e2ac64d2e..c48ed31b26 100644 --- a/include/cpp_common/ch_vertex.hpp +++ b/include/cpp_common/ch_vertex.hpp @@ -26,8 +26,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_CPP_COMMON_CH_VERTEX_H_ -#define INCLUDE_CPP_COMMON_CH_VERTEX_H_ +#ifndef INCLUDE_CPP_COMMON_CH_VERTEX_HPP_ +#define INCLUDE_CPP_COMMON_CH_VERTEX_HPP_ #include #include #include @@ -73,4 +73,4 @@ extract_vertices( #endif } // namespace pgrouting -#endif // INCLUDE_CPP_COMMON_CH_VERTEX_H_ +#endif // INCLUDE_CPP_COMMON_CH_VERTEX_HPP_ diff --git a/include/cpp_common/compPaths.hpp b/include/cpp_common/compPaths.hpp index 2d102f8488..681fcb780d 100644 --- a/include/cpp_common/compPaths.hpp +++ b/include/cpp_common/compPaths.hpp @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_CPP_COMMON_COMPPATHS_H_ -#define INCLUDE_CPP_COMMON_COMPPATHS_H_ +#ifndef INCLUDE_CPP_COMMON_COMPPATHS_HPP_ +#define INCLUDE_CPP_COMMON_COMPPATHS_HPP_ #pragma once #include "cpp_common/basePath_SSEC.hpp" @@ -54,4 +54,4 @@ class compPathsLess { } // namespace pgrouting -#endif // INCLUDE_CPP_COMMON_COMPPATHS_H_ +#endif // INCLUDE_CPP_COMMON_COMPPATHS_HPP_ diff --git a/include/cpp_common/coordinate_t.hpp b/include/cpp_common/coordinate_t.hpp index 16c3c660a7..82ea05891c 100644 --- a/include/cpp_common/coordinate_t.hpp +++ b/include/cpp_common/coordinate_t.hpp @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_C_TYPES_COORDINATE_T_H_ -#define INCLUDE_C_TYPES_COORDINATE_T_H_ +#ifndef INCLUDE_CPP_COMMON_COORDINATE_T_HPP_ +#define INCLUDE_CPP_COMMON_COORDINATE_T_HPP_ #pragma once /* for int64_t */ @@ -43,4 +43,4 @@ struct Coordinate_t { double y; }; -#endif // INCLUDE_C_TYPES_COORDINATE_T_H_ +#endif // INCLUDE_CPP_COMMON_COORDINATE_T_HPP_ diff --git a/include/cpp_common/costFlow_t.hpp b/include/cpp_common/costFlow_t.hpp index b5ae44f221..6e394671ee 100644 --- a/include/cpp_common/costFlow_t.hpp +++ b/include/cpp_common/costFlow_t.hpp @@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_C_TYPES_COSTFLOW_T_H_ -#define INCLUDE_C_TYPES_COSTFLOW_T_H_ +#ifndef INCLUDE_CPP_COMMON_COSTFLOW_T_HPP_ +#define INCLUDE_CPP_COMMON_COSTFLOW_T_HPP_ #pragma once /* for int64_t */ @@ -45,4 +45,4 @@ struct CostFlow_t { double reverse_cost; }; -#endif // INCLUDE_C_TYPES_COSTFLOW_T_H_ +#endif // INCLUDE_CPP_COMMON_COSTFLOW_T_HPP_ diff --git a/include/cpp_common/delauny_t.hpp b/include/cpp_common/delauny_t.hpp index 80291b5bac..0a333299b7 100644 --- a/include/cpp_common/delauny_t.hpp +++ b/include/cpp_common/delauny_t.hpp @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_C_TYPES_DELAUNY_T_H_ -#define INCLUDE_C_TYPES_DELAUNY_T_H_ +#ifndef INCLUDE_CPP_COMMON_DELAUNY_T_HPP_ +#define INCLUDE_CPP_COMMON_DELAUNY_T_HPP_ #pragma once /* for int64_t */ @@ -44,4 +44,4 @@ struct Delauny_t { double y; }; -#endif // INCLUDE_C_TYPES_DELAUNY_T_H_ +#endif // INCLUDE_CPP_COMMON_DELAUNY_T_HPP_ diff --git a/include/cpp_common/edge_t.hpp b/include/cpp_common/edge_t.hpp index 48875764ac..d79160cf4b 100644 --- a/include/cpp_common/edge_t.hpp +++ b/include/cpp_common/edge_t.hpp @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_C_TYPES_EDGE_T_H_ -#define INCLUDE_C_TYPES_EDGE_T_H_ +#ifndef INCLUDE_CPP_COMMON_EDGE_T_HPP_ +#define INCLUDE_CPP_COMMON_EDGE_T_HPP_ #pragma once /* for int64_t */ @@ -45,4 +45,4 @@ struct Edge_t{ double reverse_cost; }; -#endif // INCLUDE_C_TYPES_EDGE_T_H_ +#endif // INCLUDE_CPP_COMMON_EDGE_T_HPP_ diff --git a/include/cpp_common/edge_xy_t.hpp b/include/cpp_common/edge_xy_t.hpp index ba921ec038..2e84479c5b 100644 --- a/include/cpp_common/edge_xy_t.hpp +++ b/include/cpp_common/edge_xy_t.hpp @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_C_TYPES_EDGE_XY_T_H_ -#define INCLUDE_C_TYPES_EDGE_XY_T_H_ +#ifndef INCLUDE_CPP_COMMON_EDGE_XY_T_HPP_ +#define INCLUDE_CPP_COMMON_EDGE_XY_T_HPP_ #pragma once /* for int64_t */ @@ -50,4 +50,4 @@ struct Edge_xy_t { double y2; }; -#endif // INCLUDE_C_TYPES_EDGE_XY_T_H_ +#endif // INCLUDE_CPP_COMMON_EDGE_XY_T_HPP_ diff --git a/include/cpp_common/get_check_data.hpp b/include/cpp_common/get_check_data.hpp index 4e3a4eb685..0849cce1f3 100644 --- a/include/cpp_common/get_check_data.hpp +++ b/include/cpp_common/get_check_data.hpp @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_C_COMMON_GET_CHECK_DATA_HPP_ -#define INCLUDE_C_COMMON_GET_CHECK_DATA_HPP_ +#ifndef INCLUDE_CPP_COMMON_GET_CHECK_DATA_HPP_ +#define INCLUDE_CPP_COMMON_GET_CHECK_DATA_HPP_ #pragma once @@ -81,4 +81,4 @@ char* getText(const HeapTuple, const TupleDesc&, const Column_info_t&); } // namespace pgrouting -#endif // INCLUDE_C_COMMON_GET_CHECK_DATA_HPP_ +#endif // INCLUDE_CPP_COMMON_GET_CHECK_DATA_HPP_ diff --git a/include/cpp_common/graph_enum.hpp b/include/cpp_common/graph_enum.hpp index 9aeac09a13..ac327b5e51 100644 --- a/include/cpp_common/graph_enum.hpp +++ b/include/cpp_common/graph_enum.hpp @@ -26,11 +26,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_C_TYPES_GRAPH_ENUM_H_ -#define INCLUDE_C_TYPES_GRAPH_ENUM_H_ +#ifndef INCLUDE_CPP_COMMON_GRAPH_ENUM_HPP_ +#define INCLUDE_CPP_COMMON_GRAPH_ENUM_HPP_ #pragma once enum graphType {UNDIRECTED = 0, DIRECTED}; -#endif // INCLUDE_C_TYPES_GRAPH_ENUM_H_ +#endif // INCLUDE_CPP_COMMON_GRAPH_ENUM_HPP_ diff --git a/include/cpp_common/identifier.hpp b/include/cpp_common/identifier.hpp index dd0d743a42..0bfa562b80 100644 --- a/include/cpp_common/identifier.hpp +++ b/include/cpp_common/identifier.hpp @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_CPP_COMMON_IDENTIFIER_H_ -#define INCLUDE_CPP_COMMON_IDENTIFIER_H_ +#ifndef INCLUDE_CPP_COMMON_IDENTIFIER_HPP_ +#define INCLUDE_CPP_COMMON_IDENTIFIER_HPP_ #pragma once #if defined(__MINGW32__) || defined(_MSC_VER) @@ -58,4 +58,4 @@ class Identifier { } // namespace pgrouting -#endif // INCLUDE_CPP_COMMON_IDENTIFIER_H_ +#endif // INCLUDE_CPP_COMMON_IDENTIFIER_HPP_ diff --git a/include/cpp_common/info_t.hpp b/include/cpp_common/info_t.hpp index b4f20301d2..3bb6e71429 100644 --- a/include/cpp_common/info_t.hpp +++ b/include/cpp_common/info_t.hpp @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_C_TYPES_INFO_T_HPP_ -#define INCLUDE_C_TYPES_INFO_T_HPP_ +#ifndef INCLUDE_CPP_COMMON_INFO_T_HPP_ +#define INCLUDE_CPP_COMMON_INFO_T_HPP_ #pragma once #include @@ -54,4 +54,4 @@ struct Column_info_t { } // namespace pgrouting -#endif // INCLUDE_C_TYPES_INFO_T_HPP_ +#endif // INCLUDE_CPP_COMMON_INFO_T_HPP_ diff --git a/include/cpp_common/line_vertex.hpp b/include/cpp_common/line_vertex.hpp index fa5d1ddc9d..43fe164bea 100644 --- a/include/cpp_common/line_vertex.hpp +++ b/include/cpp_common/line_vertex.hpp @@ -29,8 +29,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_CPP_COMMON_LINE_VERTEX_H_ -#define INCLUDE_CPP_COMMON_LINE_VERTEX_H_ +#ifndef INCLUDE_CPP_COMMON_LINE_VERTEX_HPP_ +#define INCLUDE_CPP_COMMON_LINE_VERTEX_HPP_ #pragma once #include @@ -96,4 +96,4 @@ class Line_vertex { } // namespace pgrouting -#endif // INCLUDE_CPP_COMMON_LINE_VERTEX_H_ +#endif // INCLUDE_CPP_COMMON_LINE_VERTEX_HPP_ diff --git a/include/cpp_common/linear_directed_graph.hpp b/include/cpp_common/linear_directed_graph.hpp index 46a0e3007f..daec8f1dae 100644 --- a/include/cpp_common/linear_directed_graph.hpp +++ b/include/cpp_common/linear_directed_graph.hpp @@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_CPP_COMMON_LINEAR_DIRECTED_GRAPH_H_ -#define INCLUDE_CPP_COMMON_LINEAR_DIRECTED_GRAPH_H_ +#ifndef INCLUDE_CPP_COMMON_LINEAR_DIRECTED_GRAPH_HPP_ +#define INCLUDE_CPP_COMMON_LINEAR_DIRECTED_GRAPH_HPP_ #pragma once #include @@ -56,4 +56,4 @@ typedef boost::adjacency_list < boost::vecS, boost::vecS, } // namespace pgrouting -#endif // INCLUDE_CPP_COMMON_LINEAR_DIRECTED_GRAPH_H_ +#endif // INCLUDE_CPP_COMMON_LINEAR_DIRECTED_GRAPH_HPP_ diff --git a/include/cpp_common/orders_t.hpp b/include/cpp_common/orders_t.hpp index 80ad37532e..44af65dba2 100644 --- a/include/cpp_common/orders_t.hpp +++ b/include/cpp_common/orders_t.hpp @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_C_TYPES_PICKDELIVER_ORDERS_T_H_ -#define INCLUDE_C_TYPES_PICKDELIVER_ORDERS_T_H_ +#ifndef INCLUDE_CPP_COMMON_PICKDELIVER_ORDERS_T_HPP_ +#define INCLUDE_CPP_COMMON_PICKDELIVER_ORDERS_T_HPP_ #pragma once /* for int64_t */ @@ -64,4 +64,4 @@ struct Orders_t { double deliver_service_t; }; -#endif // INCLUDE_C_TYPES_PICKDELIVER_ORDERS_T_H_ +#endif // INCLUDE_CPP_COMMON_PICKDELIVER_ORDERS_T_HPP_ diff --git a/include/cpp_common/path_t.hpp b/include/cpp_common/path_t.hpp index 52ecab7884..80789a0e21 100644 --- a/include/cpp_common/path_t.hpp +++ b/include/cpp_common/path_t.hpp @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_CPP_COMMON_PATH_T_H_ -#define INCLUDE_CPP_COMMON_PATH_T_H_ +#ifndef INCLUDE_CPP_COMMON_PATH_T_HPP_ +#define INCLUDE_CPP_COMMON_PATH_T_HPP_ #pragma once #include @@ -41,4 +41,4 @@ struct Path_t { int64_t pred; }; -#endif // INCLUDE_CPP_COMMON_PATH_T_H_ +#endif // INCLUDE_CPP_COMMON_PATH_T_HPP_ diff --git a/include/cpp_common/pgdata_fetchers.hpp b/include/cpp_common/pgdata_fetchers.hpp index cb701765de..1fe94f8517 100644 --- a/include/cpp_common/pgdata_fetchers.hpp +++ b/include/cpp_common/pgdata_fetchers.hpp @@ -34,8 +34,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_C_COMMON_PGDATA_FETCHERS_HPP_ -#define INCLUDE_C_COMMON_PGDATA_FETCHERS_HPP_ +#ifndef INCLUDE_CPP_COMMON_PGDATA_FETCHERS_HPP_ +#define INCLUDE_CPP_COMMON_PGDATA_FETCHERS_HPP_ #pragma once /* for HeapTuple, TupleDesc */ @@ -128,4 +128,4 @@ Vehicle_t fetch_vehicle( } // namespace pgget } // namespace pgrouting -#endif // INCLUDE_C_COMMON_PGDATA_FETCHERS_HPP_ +#endif // INCLUDE_CPP_COMMON_PGDATA_FETCHERS_HPP_ diff --git a/include/cpp_common/pgdata_getters.hpp b/include/cpp_common/pgdata_getters.hpp index 4da365f0c1..0ab29e9ee5 100644 --- a/include/cpp_common/pgdata_getters.hpp +++ b/include/cpp_common/pgdata_getters.hpp @@ -34,8 +34,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_C_COMMON_PGDATA_GETTERS_HPP_ -#define INCLUDE_C_COMMON_PGDATA_GETTERS_HPP_ +#ifndef INCLUDE_CPP_COMMON_PGDATA_GETTERS_HPP_ +#define INCLUDE_CPP_COMMON_PGDATA_GETTERS_HPP_ #pragma once extern "C" { @@ -116,4 +116,4 @@ std::vector get_vehicles(const std::string&, bool); } // namespace pgget } // namespace pgrouting -#endif // INCLUDE_CPP_COMMON_PGGET_H_ +#endif // INCLUDE_CPP_COMMON_PGGET_HPP_ diff --git a/include/cpp_common/pgr_assert.hpp b/include/cpp_common/pgr_assert.hpp index e58aa5144e..28d7cb3d10 100644 --- a/include/cpp_common/pgr_assert.hpp +++ b/include/cpp_common/pgr_assert.hpp @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_CPP_COMMON_PGR_ASSERT_H_ -#define INCLUDE_CPP_COMMON_PGR_ASSERT_H_ +#ifndef INCLUDE_CPP_COMMON_PGR_ASSERT_HPP_ +#define INCLUDE_CPP_COMMON_PGR_ASSERT_HPP_ #pragma once #include @@ -149,4 +149,4 @@ class AssertFailedException : public std::exception { virtual ~AssertFailedException() throw() {} }; -#endif // INCLUDE_CPP_COMMON_PGR_ASSERT_H_ +#endif // INCLUDE_CPP_COMMON_PGR_ASSERT_HPP_ diff --git a/include/cpp_common/pgr_messages.hpp b/include/cpp_common/pgr_messages.hpp index 87d05a69e4..45170e96ec 100644 --- a/include/cpp_common/pgr_messages.hpp +++ b/include/cpp_common/pgr_messages.hpp @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_CPP_COMMON_PGR_MESSAGES_H_ -#define INCLUDE_CPP_COMMON_PGR_MESSAGES_H_ +#ifndef INCLUDE_CPP_COMMON_PGR_MESSAGES_HPP_ +#define INCLUDE_CPP_COMMON_PGR_MESSAGES_HPP_ #pragma once @@ -99,4 +99,4 @@ class Pgr_messages { } // namespace pgrouting -#endif // INCLUDE_CPP_COMMON_PGR_MESSAGES_H_ +#endif // INCLUDE_CPP_COMMON_PGR_MESSAGES_HPP_ diff --git a/include/cpp_common/point_on_edge_t.hpp b/include/cpp_common/point_on_edge_t.hpp index ef6f8701c5..856d98f0e1 100644 --- a/include/cpp_common/point_on_edge_t.hpp +++ b/include/cpp_common/point_on_edge_t.hpp @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_C_TYPES_POINT_ON_EDGE_T_H_ -#define INCLUDE_C_TYPES_POINT_ON_EDGE_T_H_ +#ifndef INCLUDE_CPP_COMMON_POINT_ON_EDGE_T_HPP_ +#define INCLUDE_CPP_COMMON_POINT_ON_EDGE_T_HPP_ #pragma once /* for int64_t */ @@ -45,4 +45,4 @@ struct Point_on_edge_t { int64_t vertex_id; // number is negative and is used for processing }; -#endif // INCLUDE_C_TYPES_POINT_ON_EDGE_T_H_ +#endif // INCLUDE_CPP_COMMON_POINT_ON_EDGE_T_HPP_ diff --git a/include/cpp_common/restriction_t.hpp b/include/cpp_common/restriction_t.hpp index a27a77ace8..e50224d093 100644 --- a/include/cpp_common/restriction_t.hpp +++ b/include/cpp_common/restriction_t.hpp @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_C_TYPES_RESTRICTION_T_H_ -#define INCLUDE_C_TYPES_RESTRICTION_T_H_ +#ifndef INCLUDE_CPP_COMMON_RESTRICTION_T_HPP_ +#define INCLUDE_CPP_COMMON_RESTRICTION_T_HPP_ #pragma once /* for int64_t */ @@ -43,4 +43,4 @@ struct Restriction_t { size_t via_size; }; -#endif // INCLUDE_C_TYPES_RESTRICTION_T_H_ +#endif // INCLUDE_CPP_COMMON_RESTRICTION_T_HPP_ diff --git a/include/cpp_common/rule.hpp b/include/cpp_common/rule.hpp index fa3cfd61b8..d18fdc7cdb 100644 --- a/include/cpp_common/rule.hpp +++ b/include/cpp_common/rule.hpp @@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_CPP_COMMON_RULE_H_ -#define INCLUDE_CPP_COMMON_RULE_H_ +#ifndef INCLUDE_CPP_COMMON_RULE_HPP_ +#define INCLUDE_CPP_COMMON_RULE_HPP_ #include @@ -76,4 +76,4 @@ class Rule { } // namespace trsp } // namespace pgrouting -#endif // INCLUDE_CPP_COMMON_RULE_H_ +#endif // INCLUDE_CPP_COMMON_RULE_HPP_ diff --git a/include/cpp_common/signalhandler.hpp b/include/cpp_common/signalhandler.hpp index b1795cf0c0..49bae64fe5 100644 --- a/include/cpp_common/signalhandler.hpp +++ b/include/cpp_common/signalhandler.hpp @@ -32,8 +32,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * *****************************************************************PGR-MIT*/ -#ifndef INCLUDE_CPP_COMMON_SIGNALHANDLER_H_ -#define INCLUDE_CPP_COMMON_SIGNALHANDLER_H_ +#ifndef INCLUDE_CPP_COMMON_SIGNALHANDLER_HPP_ +#define INCLUDE_CPP_COMMON_SIGNALHANDLER_HPP_ #pragma once // defines NULL @@ -150,5 +150,5 @@ class SIGQUIT_Handler: public EventHandler { throw(UserQuitException("Abort on User Request!")); \ } while (0); -#endif // INCLUDE_CPP_COMMON_SIGNALHANDLER_H_ +#endif // INCLUDE_CPP_COMMON_SIGNALHANDLER_HPP_ diff --git a/include/cpp_common/vehicle_t.hpp b/include/cpp_common/vehicle_t.hpp index 7f2bf1d2d6..e141c2558d 100644 --- a/include/cpp_common/vehicle_t.hpp +++ b/include/cpp_common/vehicle_t.hpp @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_C_TYPES_PICKDELIVER_VEHICLE_T_H_ -#define INCLUDE_C_TYPES_PICKDELIVER_VEHICLE_T_H_ +#ifndef INCLUDE_CPP_COMMON_VEHICLE_T_H_ +#define INCLUDE_CPP_COMMON_VEHICLE_T_H_ #pragma once /* for int64_t */ @@ -65,4 +65,4 @@ struct Vehicle_t { }; -#endif // INCLUDE_C_TYPES_PICKDELIVER_VEHICLE_T_H_ +#endif // INCLUDE_CPP_COMMON_VEHICLE_T_H_ diff --git a/include/cpp_common/xy_vertex.hpp b/include/cpp_common/xy_vertex.hpp index fdacda2798..b50428b11c 100644 --- a/include/cpp_common/xy_vertex.hpp +++ b/include/cpp_common/xy_vertex.hpp @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_CPP_COMMON_XY_VERTEX_H_ -#define INCLUDE_CPP_COMMON_XY_VERTEX_H_ +#ifndef INCLUDE_CPP_COMMON_XY_VERTEX_HPP_ +#define INCLUDE_CPP_COMMON_XY_VERTEX_HPP_ #pragma once @@ -92,4 +92,4 @@ std::vector < XY_vertex > extract_vertices( } // namespace pgrouting -#endif // INCLUDE_CPP_COMMON_XY_VERTEX_H_ +#endif // INCLUDE_CPP_COMMON_XY_VERTEX_HPP_ diff --git a/include/drivers/trsp/trsp_core.h b/include/drivers/trsp/trsp_core.h index 07f5dc9745..15dd9e06a7 100644 --- a/include/drivers/trsp/trsp_core.h +++ b/include/drivers/trsp/trsp_core.h @@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_TRSP_TRSP_CORE_H_ -#define INCLUDE_TRSP_TRSP_CORE_H_ +#ifndef INCLUDE_DRIVERS_TRSP_TRSP_CORE_H_ +#define INCLUDE_DRIVERS_TRSP_TRSP_CORE_H_ #ifdef __cplusplus # include @@ -62,4 +62,4 @@ int trsp_edge_wrapper( } #endif -#endif // INCLUDE_TRSP_TRSP_CORE_H_ +#endif // INCLUDE_DRIVERS_TRSP_TRSP_CORE_H_ diff --git a/include/trsp/GraphDefinition.hpp b/include/trsp/GraphDefinition.hpp index f3a82b71ac..2f9a01e186 100644 --- a/include/trsp/GraphDefinition.hpp +++ b/include/trsp/GraphDefinition.hpp @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_TRSP_GRAPHDEFINITION_H_ -#define INCLUDE_TRSP_GRAPHDEFINITION_H_ +#ifndef INCLUDE_TRSP_GRAPHDEFINITION_HPP_ +#define INCLUDE_TRSP_GRAPHDEFINITION_HPP_ #include @@ -161,4 +161,4 @@ class GraphDefinition { bool m_bIsGraphConstructed; }; -#endif // INCLUDE_TRSP_GRAPHDEFINITION_H_ +#endif // INCLUDE_TRSP_GRAPHDEFINITION_HPP_ diff --git a/include/trsp/edgeInfo.hpp b/include/trsp/edgeInfo.hpp index 7f19c5d6f6..7a52777b77 100644 --- a/include/trsp/edgeInfo.hpp +++ b/include/trsp/edgeInfo.hpp @@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_TRSP_EDGEINFO_H_ -#define INCLUDE_TRSP_EDGEINFO_H_ +#ifndef INCLUDE_TRSP_EDGEINFO_HPP_ +#define INCLUDE_TRSP_EDGEINFO_HPP_ #include @@ -94,4 +94,4 @@ class EdgeInfo { } // namespace trsp } // namespace pgrouting -#endif // INCLUDE_TRSP_EDGEINFO_H_ +#endif // INCLUDE_TRSP_EDGEINFO_HPP_ diff --git a/include/trsp/pgr_trspHandler.hpp b/include/trsp/pgr_trspHandler.hpp index d239280fa6..47ca43eda8 100644 --- a/include/trsp/pgr_trspHandler.hpp +++ b/include/trsp/pgr_trspHandler.hpp @@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_TRSP_PGR_TRSPHANDLER_H_ -#define INCLUDE_TRSP_PGR_TRSPHANDLER_H_ +#ifndef INCLUDE_TRSP_PGR_TRSPHANDLER_HPP_ +#define INCLUDE_TRSP_PGR_TRSPHANDLER_HPP_ #include @@ -246,4 +246,4 @@ class Pgr_trspHandler : public pgrouting::Pgr_messages { } // namespace trsp } // namespace pgrouting -#endif // INCLUDE_TRSP_PGR_TRSPHANDLER_H_ +#endif // INCLUDE_TRSP_PGR_TRSPHANDLER_HPP_ diff --git a/include/vrp/book_keeping.hpp b/include/vrp/book_keeping.hpp index f91c6a43c6..ccce8acab9 100644 --- a/include/vrp/book_keeping.hpp +++ b/include/vrp/book_keeping.hpp @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_VRP_BOOK_KEEPING_H_ -#define INCLUDE_VRP_BOOK_KEEPING_H_ +#ifndef INCLUDE_VRP_BOOK_KEEPING_HPP_ +#define INCLUDE_VRP_BOOK_KEEPING_HPP_ #pragma once #include @@ -112,4 +112,4 @@ class Swap_bk { } // namespace vrp } // namespace pgrouting -#endif // INCLUDE_VRP_BOOK_KEEPING_H_ +#endif // INCLUDE_VRP_BOOK_KEEPING_HPP_ diff --git a/include/vrp/dnode.hpp b/include/vrp/dnode.hpp index 1387fa1037..167b875af5 100644 --- a/include/vrp/dnode.hpp +++ b/include/vrp/dnode.hpp @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file dnode.h */ -#ifndef INCLUDE_VRP_DNODE_H_ -#define INCLUDE_VRP_DNODE_H_ +#ifndef INCLUDE_VRP_DNODE_HPP_ +#define INCLUDE_VRP_DNODE_HPP_ #pragma once #include @@ -73,4 +73,4 @@ class Dnode : public Identifier { } // namespace vrp } // namespace pgrouting -#endif // INCLUDE_VRP_DNODE_H_ +#endif // INCLUDE_VRP_DNODE_HPP_ diff --git a/include/vrp/fleet.hpp b/include/vrp/fleet.hpp index c4760004af..421eb19637 100644 --- a/include/vrp/fleet.hpp +++ b/include/vrp/fleet.hpp @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_VRP_FLEET_H_ -#define INCLUDE_VRP_FLEET_H_ +#ifndef INCLUDE_VRP_FLEET_HPP_ +#define INCLUDE_VRP_FLEET_HPP_ #pragma once #include @@ -109,4 +109,4 @@ class Fleet { } // namespace vrp } // namespace pgrouting -#endif // INCLUDE_VRP_FLEET_H_ +#endif // INCLUDE_VRP_FLEET_HPP_ diff --git a/include/vrp/initial_solution.hpp b/include/vrp/initial_solution.hpp index 9dbfc3fd1c..0605353a3b 100644 --- a/include/vrp/initial_solution.hpp +++ b/include/vrp/initial_solution.hpp @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_VRP_INITIAL_SOLUTION_H_ -#define INCLUDE_VRP_INITIAL_SOLUTION_H_ +#ifndef INCLUDE_VRP_INITIAL_SOLUTION_HPP_ +#define INCLUDE_VRP_INITIAL_SOLUTION_HPP_ #pragma once #include @@ -68,4 +68,4 @@ class Initial_solution : public Solution { } // namespace vrp } // namespace pgrouting -#endif // INCLUDE_VRP_INITIAL_SOLUTION_H_ +#endif // INCLUDE_VRP_INITIAL_SOLUTION_HPP_ diff --git a/include/vrp/initials_code.hpp b/include/vrp/initials_code.hpp index 7b56033a63..4ef59dd30a 100644 --- a/include/vrp/initials_code.hpp +++ b/include/vrp/initials_code.hpp @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_VRP_INITIALS_CODE_H_ -#define INCLUDE_VRP_INITIALS_CODE_H_ +#ifndef INCLUDE_VRP_INITIALS_CODE_HPP_ +#define INCLUDE_VRP_INITIALS_CODE_HPP_ #pragma once namespace pgrouting { @@ -47,4 +47,4 @@ enum Initials_code { } // namespace vrp } // namespace pgrouting -#endif // INCLUDE_VRP_INITIALS_CODE_H_ +#endif // INCLUDE_VRP_INITIALS_CODE_HPP_ diff --git a/include/vrp/optimize.hpp b/include/vrp/optimize.hpp index 5fb67ee5ba..532417b5a3 100644 --- a/include/vrp/optimize.hpp +++ b/include/vrp/optimize.hpp @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_VRP_OPTIMIZE_H_ -#define INCLUDE_VRP_OPTIMIZE_H_ +#ifndef INCLUDE_VRP_OPTIMIZE_HPP_ +#define INCLUDE_VRP_OPTIMIZE_HPP_ #pragma once #include "vrp/optimize.h" @@ -71,4 +71,4 @@ class Optimize : public Solution { } // namespace vrp } // namespace pgrouting -#endif // INCLUDE_VRP_OPTIMIZE_H_ +#endif // INCLUDE_VRP_OPTIMIZE_HPP_ diff --git a/include/vrp/order.hpp b/include/vrp/order.hpp index 789bd65159..52462cfa5e 100644 --- a/include/vrp/order.hpp +++ b/include/vrp/order.hpp @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_VRP_ORDER_H_ -#define INCLUDE_VRP_ORDER_H_ +#ifndef INCLUDE_VRP_ORDER_HPP_ +#define INCLUDE_VRP_ORDER_HPP_ #pragma once @@ -183,4 +183,4 @@ class Order : public Identifier { } // namespace vrp } // namespace pgrouting -#endif // INCLUDE_VRP_ORDER_H_ +#endif // INCLUDE_VRP_ORDER_HPP_ diff --git a/include/vrp/pd_orders.hpp b/include/vrp/pd_orders.hpp index 42978daafa..bb3f502f75 100644 --- a/include/vrp/pd_orders.hpp +++ b/include/vrp/pd_orders.hpp @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_VRP_PD_ORDERS_H_ -#define INCLUDE_VRP_PD_ORDERS_H_ +#ifndef INCLUDE_VRP_PD_ORDERS_HPP_ +#define INCLUDE_VRP_PD_ORDERS_HPP_ #pragma once #include @@ -105,4 +105,4 @@ class PD_Orders { } // namespace vrp } // namespace pgrouting -#endif // INCLUDE_VRP_PD_ORDERS_H_ +#endif // INCLUDE_VRP_PD_ORDERS_HPP_ diff --git a/include/vrp/pd_problem.hpp b/include/vrp/pd_problem.hpp index 5858a537d6..7301726569 100644 --- a/include/vrp/pd_problem.hpp +++ b/include/vrp/pd_problem.hpp @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_VRP_PD_PROBLEM_H_ -#define INCLUDE_VRP_PD_PROBLEM_H_ +#ifndef INCLUDE_VRP_PD_PROBLEM_HPP_ +#define INCLUDE_VRP_PD_PROBLEM_HPP_ #pragma once #include "cpp_common/pgr_messages.h" @@ -54,4 +54,4 @@ class PD_problem { } // namespace vrp } // namespace pgrouting -#endif // INCLUDE_VRP_PD_PROBLEM_H_ +#endif // INCLUDE_VRP_PD_PROBLEM_HPP_ diff --git a/include/vrp/pgr_pickDeliver.hpp b/include/vrp/pgr_pickDeliver.hpp index 385eac4dae..3bd7fc886a 100644 --- a/include/vrp/pgr_pickDeliver.hpp +++ b/include/vrp/pgr_pickDeliver.hpp @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_VRP_PGR_PICKDELIVER_H_ -#define INCLUDE_VRP_PGR_PICKDELIVER_H_ +#ifndef INCLUDE_VRP_PGR_PICKDELIVER_HPP_ +#define INCLUDE_VRP_PGR_PICKDELIVER_HPP_ #pragma once @@ -117,4 +117,4 @@ class Pgr_pickDeliver : public PD_problem { } // namespace vrp } // namespace pgrouting -#endif // INCLUDE_VRP_PGR_PICKDELIVER_H_ +#endif // INCLUDE_VRP_PGR_PICKDELIVER_HPP_ diff --git a/include/vrp/solution.hpp b/include/vrp/solution.hpp index 629f8ba57c..ed94bc277a 100644 --- a/include/vrp/solution.hpp +++ b/include/vrp/solution.hpp @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_VRP_SOLUTION_H_ -#define INCLUDE_VRP_SOLUTION_H_ +#ifndef INCLUDE_VRP_SOLUTION_HPP_ +#define INCLUDE_VRP_SOLUTION_HPP_ #pragma once #include @@ -120,4 +120,4 @@ class Solution { } // namespace vrp } // namespace pgrouting -#endif // INCLUDE_VRP_SOLUTION_H_ +#endif // INCLUDE_VRP_SOLUTION_HPP_ diff --git a/include/vrp/tw_node.hpp b/include/vrp/tw_node.hpp index e2f1f28217..71437df6c2 100644 --- a/include/vrp/tw_node.hpp +++ b/include/vrp/tw_node.hpp @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_VRP_TW_NODE_H_ -#define INCLUDE_VRP_TW_NODE_H_ +#ifndef INCLUDE_VRP_TW_NODE_HPP_ +#define INCLUDE_VRP_TW_NODE_HPP_ #pragma once #include @@ -232,4 +232,4 @@ class Tw_node : public Dnode { } // namespace vrp } // namespace pgrouting -#endif // INCLUDE_VRP_TW_NODE_H_ +#endif // INCLUDE_VRP_TW_NODE_HPP_ diff --git a/include/vrp/vehicle.hpp b/include/vrp/vehicle.hpp index 7e761a5c0f..8467d5ecc6 100644 --- a/include/vrp/vehicle.hpp +++ b/include/vrp/vehicle.hpp @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_VRP_VEHICLE_H_ -#define INCLUDE_VRP_VEHICLE_H_ +#ifndef INCLUDE_VRP_VEHICLE_HPP_ +#define INCLUDE_VRP_VEHICLE_HPP_ #pragma once #include @@ -325,4 +325,4 @@ class Vehicle : public Identifier { } // namespace vrp } // namespace pgrouting -#endif // INCLUDE_VRP_VEHICLE_H_ +#endif // INCLUDE_VRP_VEHICLE_HPP_ diff --git a/include/vrp/vehicle_node.hpp b/include/vrp/vehicle_node.hpp index bb7a4c03ed..8939d4b47c 100644 --- a/include/vrp/vehicle_node.hpp +++ b/include/vrp/vehicle_node.hpp @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_VRP_VEHICLE_NODE_H_ -#define INCLUDE_VRP_VEHICLE_NODE_H_ +#ifndef INCLUDE_VRP_VEHICLE_NODE_HPP_ +#define INCLUDE_VRP_VEHICLE_NODE_HPP_ #pragma once @@ -175,4 +175,4 @@ class Vehicle_node: public Tw_node { } // namespace vrp } // namespace pgrouting -#endif // INCLUDE_VRP_VEHICLE_NODE_H_ +#endif // INCLUDE_VRP_VEHICLE_NODE_HPP_ diff --git a/include/vrp/vehicle_pickDeliver.hpp b/include/vrp/vehicle_pickDeliver.hpp index f9e918e91c..7f1db5358c 100644 --- a/include/vrp/vehicle_pickDeliver.hpp +++ b/include/vrp/vehicle_pickDeliver.hpp @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_VRP_VEHICLE_PICKDELIVER_H_ -#define INCLUDE_VRP_VEHICLE_PICKDELIVER_H_ +#ifndef INCLUDE_VRP_VEHICLE_PICKDELIVER_HPP_ +#define INCLUDE_VRP_VEHICLE_PICKDELIVER_HPP_ #pragma once #include @@ -181,4 +181,4 @@ class Vehicle_pickDeliver : public Vehicle { } // namespace vrp } // namespace pgrouting -#endif // INCLUDE_VRP_VEHICLE_PICKDELIVER_H_ +#endif // INCLUDE_VRP_VEHICLE_PICKDELIVER_HPP_ From 35f951af54dd9195c94cf05431f356f0024cb38c Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 11 Feb 2024 16:11:38 -0600 Subject: [PATCH 125/428] (C++) using the new header names --- include/alphaShape/pgr_alphaShape.h | 4 ++-- include/bellman_ford/pgr_bellman_ford.hpp | 2 +- .../pgr_binaryBreadthFirstSearch.hpp | 2 +- include/c_common/trsp_pgget.h | 4 ++-- include/chinese/pgr_chinesePostman.hpp | 4 ++-- include/circuits/hawickcircuits.hpp | 2 +- include/coloring/pgr_bipartite_driver.hpp | 2 +- include/coloring/pgr_edgeColoring.hpp | 6 ++--- include/components/pgr_components.hpp | 2 +- include/components/pgr_makeConnected.hpp | 2 +- include/contraction/ch_graphs.hpp | 4 ++-- include/contraction/pgr_contract.hpp | 2 +- include/contraction/pgr_contractionGraph.hpp | 4 ++-- include/cpp_common/basePath_SSEC.hpp | 4 ++-- include/cpp_common/basic_vertex.hpp | 2 +- include/cpp_common/ch_edge.hpp | 3 +-- include/cpp_common/ch_vertex.hpp | 2 +- include/cpp_common/combinations.hpp | 2 +- include/cpp_common/get_data.hpp | 2 +- include/cpp_common/line_vertex.hpp | 2 +- include/cpp_common/linear_directed_graph.hpp | 4 ++-- include/cpp_common/pgdata_fetchers.hpp | 20 ++++++++-------- include/cpp_common/pgdata_getters.hpp | 20 ++++++++-------- include/cpp_common/pgr_assert.hpp | 2 +- include/cpp_common/pgr_base_graph.hpp | 10 ++++---- include/cpp_common/pgr_bidirectional.hpp | 2 +- include/cpp_common/signalhandler.hpp | 2 +- include/cpp_common/trsp_pgfetch.hpp | 2 +- include/cpp_common/xy_vertex.hpp | 2 +- include/dijkstra/pgr_dijkstraVia.hpp | 2 +- ...pgr_lengauerTarjanDominatorTree_driver.hpp | 2 +- include/drivers/lineGraph/lineGraph_driver.h | 6 ++--- include/drivers/trsp/trsp_core.h | 2 +- include/lineGraph/pgr_lineGraph.hpp | 14 +++++------ include/lineGraph/pgr_lineGraphFull.hpp | 3 ++- include/max_flow/pgr_maxflow.hpp | 2 +- include/max_flow/pgr_minCostMaxFlow.hpp | 2 +- include/ordering/cuthillMckeeOrdering.hpp | 2 +- include/planar/pgr_boyerMyrvold.hpp | 2 +- .../pgr_transitiveClosure.hpp | 2 +- include/trsp/GraphDefinition.hpp | 2 +- include/trsp/edgeInfo.hpp | 4 ++-- include/trsp/pgr_trspHandler.hpp | 6 ++--- include/tsp/tsp.hpp | 6 ++--- include/vrp/book_keeping.hpp | 2 +- include/vrp/dnode.hpp | 4 ++-- include/vrp/fleet.hpp | 4 ++-- include/vrp/initial_solution.hpp | 6 ++--- include/vrp/optimize.hpp | 2 +- include/vrp/order.hpp | 4 ++-- include/vrp/pd_orders.hpp | 4 ++-- include/vrp/pd_problem.hpp | 4 ++-- include/vrp/pgr_pickDeliver.hpp | 14 +++++------ include/vrp/solution.hpp | 4 ++-- include/vrp/tw_node.hpp | 12 +++++----- include/vrp/vehicle.hpp | 4 ++-- include/vrp/vehicle_node.hpp | 2 +- include/vrp/vehicle_pickDeliver.hpp | 10 ++++---- include/withPoints/pgr_withPoints.hpp | 4 ++-- include/yen/pgr_ksp.hpp | 6 ++--- include/yen/pgr_turnRestrictedPath.hpp | 8 +++---- src/allpairs/floydWarshall_driver.cpp | 2 +- src/allpairs/johnson_driver.cpp | 2 +- src/alpha_shape/alphaShape_driver.cpp | 2 +- src/astar/astar_driver.cpp | 4 ++-- src/bdAstar/bdAstar_driver.cpp | 4 ++-- src/bdDijkstra/bdDijkstra_driver.cpp | 2 +- src/bellman_ford/bellman_ford_driver.cpp | 2 +- src/bellman_ford/bellman_ford_neg_driver.cpp | 2 +- src/bellman_ford/edwardMoore_driver.cpp | 2 +- .../binaryBreadthFirstSearch_driver.cpp | 2 +- .../breadthFirstSearch_driver.cpp | 2 +- src/chinese/chinesePostman_driver.cpp | 2 +- src/circuits/hawickCircuits_driver.cpp | 2 +- src/coloring/edgeColoring_driver.cpp | 4 ++-- src/coloring/pgr_edgeColoring.cpp | 2 +- .../sequentialVertexColoring_driver.cpp | 2 +- src/common/basePath_SSEC.cpp | 2 +- src/common/basic_edge.cpp | 2 +- src/common/basic_vertex.cpp | 4 ++-- src/common/ch_edge.cpp | 2 +- src/common/ch_vertex.cpp | 2 +- src/common/identifier.cpp | 2 +- src/common/pgr_assert.cpp | 2 +- src/common/signalhandler.cpp | 2 +- src/common/xy_vertex.cpp | 4 ++-- src/components/articulationPoints_driver.cpp | 2 +- .../biconnectedComponents_driver.cpp | 2 +- src/components/bridges_driver.cpp | 2 +- src/components/componentsResult.cpp | 2 +- src/components/connectedComponents_driver.cpp | 2 +- src/components/makeConnected_driver.cpp | 2 +- src/components/strongComponents_driver.cpp | 2 +- src/cpp_common/Dmatrix.cpp | 4 ++-- src/cpp_common/compPaths.cpp | 4 ++-- src/cpp_common/get_check_data.cpp | 2 +- src/cpp_common/pgdata_fetchers.cpp | 20 ++++++++-------- src/cpp_common/pgdata_getters.cpp | 21 ++++++++-------- src/cpp_common/pgr_messages.cpp | 2 +- src/cpp_common/rule.cpp | 4 ++-- src/cpp_common/trsp_pgfetch.cpp | 4 ++-- src/cpp_common/trsp_pgget.cpp | 4 ++-- .../dagShortestPath_driver.cpp | 2 +- src/dijkstra/dijkstraVia_driver.cpp | 2 +- src/dijkstra/dijkstra_driver.cpp | 2 +- src/driving_distance/drivedist_driver.cpp | 2 +- src/ksp/ksp_driver.cpp | 2 +- src/ksp/turnRestrictedPath_driver.cpp | 6 ++--- src/ksp/withPoints_ksp_driver.cpp | 2 +- src/lineGraph/lineGraph.c | 8 +++---- src/lineGraph/lineGraphFull_driver.cpp | 4 ++-- src/lineGraph/lineGraph_driver.cpp | 13 +++++----- src/max_flow/edge_disjoint_paths_driver.cpp | 2 +- src/max_flow/max_flow_driver.cpp | 2 +- .../maximum_cardinality_matching_driver.cpp | 2 +- src/max_flow/minCostMaxFlow_driver.cpp | 4 ++-- src/mincut/stoerWagner_driver.cpp | 2 +- src/ordering/cuthillMckeeOrdering_driver.cpp | 2 +- src/pickDeliver/book_keeping.cpp | 2 +- src/pickDeliver/dnode.cpp | 4 ++-- src/pickDeliver/fleet.cpp | 6 ++--- src/pickDeliver/initial_solution.cpp | 8 +++---- src/pickDeliver/optimize.cpp | 8 +++---- src/pickDeliver/order.cpp | 2 +- src/pickDeliver/pd_orders.cpp | 6 ++--- src/pickDeliver/pd_problem.cpp | 14 +++++------ src/pickDeliver/pgr_pickDeliver.cpp | 24 +++++++++---------- src/pickDeliver/pickDeliver.c | 2 +- src/pickDeliver/pickDeliverEuclidean.c | 4 +--- .../pickDeliverEuclidean_driver.cpp | 6 ++--- src/pickDeliver/pickDeliver_driver.cpp | 14 +++++------ src/pickDeliver/solution.cpp | 6 ++--- src/pickDeliver/tw_node.cpp | 6 ++--- src/pickDeliver/vehicle.cpp | 8 +++---- src/pickDeliver/vehicle_node.cpp | 2 +- src/pickDeliver/vehicle_pickDeliver.cpp | 10 ++++---- src/planar/boyerMyrvold_driver.cpp | 2 +- src/planar/isPlanar_driver.cpp | 2 +- src/spanningTree/kruskal_driver.cpp | 2 +- src/spanningTree/mst_common.cpp | 2 +- src/spanningTree/prim_driver.cpp | 2 +- .../randomSpanningTree_driver.cpp | 2 +- .../topologicalSort_driver.cpp | 2 +- src/traversal/depthFirstSearch_driver.cpp | 2 +- src/trsp/GraphDefinition.cpp | 4 ++-- src/trsp/edgeInfo.cpp | 2 +- src/trsp/pgr_trspHandler.cpp | 4 ++-- src/trsp/trsp.c | 10 ++++---- src/trsp/trspVia_driver.cpp | 8 +++---- src/trsp/trspVia_withPoints_driver.cpp | 6 ++--- src/trsp/trsp_core.cpp | 4 ++-- src/trsp/trsp_driver.cpp | 8 +++---- src/trsp/trsp_withPoints.c | 1 - src/trsp/trsp_withPoints_driver.cpp | 6 ++--- src/tsp/TSP_driver.cpp | 2 +- src/tsp/euclideanTSP.c | 1 - src/tsp/euclideanTSP_driver.cpp | 2 +- src/tsp/tsp.cpp | 4 ++-- src/withPoints/pgr_withPoints.cpp | 2 +- src/withPoints/withPointsVia_driver.cpp | 2 +- src/withPoints/withPoints_driver.cpp | 2 +- 161 files changed, 338 insertions(+), 346 deletions(-) diff --git a/include/alphaShape/pgr_alphaShape.h b/include/alphaShape/pgr_alphaShape.h index 9005d157c3..bcacbbf0f9 100644 --- a/include/alphaShape/pgr_alphaShape.h +++ b/include/alphaShape/pgr_alphaShape.h @@ -39,8 +39,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "c_types/edge_xy_t.h" -#include "cpp_common/pgr_messages.h" +#include "cpp_common/edge_xy_t.hpp" +#include "cpp_common/pgr_messages.hpp" #include "cpp_common/pgr_base_graph.hpp" #include "cpp_common/bline.hpp" diff --git a/include/bellman_ford/pgr_bellman_ford.hpp b/include/bellman_ford/pgr_bellman_ford.hpp index bbc6caba5a..f182536e12 100644 --- a/include/bellman_ford/pgr_bellman_ford.hpp +++ b/include/bellman_ford/pgr_bellman_ford.hpp @@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include -#include "cpp_common/pgr_messages.h" +#include "cpp_common/pgr_messages.hpp" #include "cpp_common/basePath_SSEC.hpp" #include "cpp_common/pgr_base_graph.hpp" #include "cpp_common/interruption.hpp" diff --git a/include/breadthFirstSearch/pgr_binaryBreadthFirstSearch.hpp b/include/breadthFirstSearch/pgr_binaryBreadthFirstSearch.hpp index 72752fd498..6fd53e63b4 100644 --- a/include/breadthFirstSearch/pgr_binaryBreadthFirstSearch.hpp +++ b/include/breadthFirstSearch/pgr_binaryBreadthFirstSearch.hpp @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/basePath_SSEC.hpp" #include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "c_types/ii_t_rt.h" diff --git a/include/c_common/trsp_pgget.h b/include/c_common/trsp_pgget.h index 8a0aed4c74..50a48ca771 100644 --- a/include/c_common/trsp_pgget.h +++ b/include/c_common/trsp_pgget.h @@ -78,9 +78,9 @@ extern "C" { #include "cpp_common/undefPostgresDefine.hpp" #ifdef __cplusplus -using Edge_t = struct Edge_t; +using Edge_t = struct Edge_rt; #else -typedef struct Edge_t Edge_t; +typedef struct Edge_rt Edge_t; #endif diff --git a/include/chinese/pgr_chinesePostman.hpp b/include/chinese/pgr_chinesePostman.hpp index 04acc9b1a4..c832ab8b1f 100644 --- a/include/chinese/pgr_chinesePostman.hpp +++ b/include/chinese/pgr_chinesePostman.hpp @@ -37,9 +37,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "max_flow/pgr_minCostMaxFlow.hpp" #include "c_types/path_rt.h" -#include "c_types/edge_t.h" +#include "cpp_common/edge_t.hpp" #include "c_types/flow_t.h" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "cpp_common/identifiers.hpp" diff --git a/include/circuits/hawickcircuits.hpp b/include/circuits/hawickcircuits.hpp index 4d25461f1a..54612e6df2 100644 --- a/include/circuits/hawickcircuits.hpp +++ b/include/circuits/hawickcircuits.hpp @@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/basePath_SSEC.hpp" #include "cpp_common/pgr_base_graph.hpp" #include "cpp_common/interruption.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "c_types/circuits_rt.h" /** diff --git a/include/coloring/pgr_bipartite_driver.hpp b/include/coloring/pgr_bipartite_driver.hpp index 3ede0233b0..fd236a31ae 100644 --- a/include/coloring/pgr_bipartite_driver.hpp +++ b/include/coloring/pgr_bipartite_driver.hpp @@ -42,7 +42,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/pgr_messages.h" +#include "cpp_common/pgr_messages.hpp" #include "cpp_common/interruption.hpp" typedef struct II_t_rt II_t_rt; diff --git a/include/coloring/pgr_edgeColoring.hpp b/include/coloring/pgr_edgeColoring.hpp index 5d5911ac4e..eeb6a53f15 100644 --- a/include/coloring/pgr_edgeColoring.hpp +++ b/include/coloring/pgr_edgeColoring.hpp @@ -34,10 +34,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "c_types/edge_t.h" +#include "cpp_common/edge_t.hpp" #include "c_types/ii_t_rt.h" -#include "cpp_common/pgr_assert.h" -#include "cpp_common/pgr_messages.h" +#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/pgr_messages.hpp" namespace pgrouting { namespace functions { diff --git a/include/components/pgr_components.hpp b/include/components/pgr_components.hpp index 8167b97665..436f9c433f 100644 --- a/include/components/pgr_components.hpp +++ b/include/components/pgr_components.hpp @@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgr_base_graph.hpp" #include "cpp_common/identifiers.hpp" -#include "components/componentsResult.h" +#include "components/componentsResult.hpp" namespace pgrouting { namespace algorithms { diff --git a/include/components/pgr_makeConnected.hpp b/include/components/pgr_makeConnected.hpp index 2583eb7ffa..822d8c2b71 100644 --- a/include/components/pgr_makeConnected.hpp +++ b/include/components/pgr_makeConnected.hpp @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "c_types/ii_t_rt.h" -#include "cpp_common/pgr_messages.h" +#include "cpp_common/pgr_messages.hpp" #include "cpp_common/pgr_base_graph.hpp" #include "cpp_common/interruption.hpp" //****************************************** diff --git a/include/contraction/ch_graphs.hpp b/include/contraction/ch_graphs.hpp index c047d5b6db..70b8bc9cf5 100644 --- a/include/contraction/ch_graphs.hpp +++ b/include/contraction/ch_graphs.hpp @@ -38,8 +38,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "contraction/pgr_contractionGraph.hpp" #include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/ch_vertex.h" -#include "cpp_common/ch_edge.h" +#include "cpp_common/ch_vertex.hpp" +#include "cpp_common/ch_edge.hpp" namespace pgrouting { diff --git a/include/contraction/pgr_contract.hpp b/include/contraction/pgr_contract.hpp index 788396c55f..15daf4274a 100644 --- a/include/contraction/pgr_contract.hpp +++ b/include/contraction/pgr_contract.hpp @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "contraction/pgr_contractionGraph.hpp" #include "contraction/ch_graphs.hpp" diff --git a/include/contraction/pgr_contractionGraph.hpp b/include/contraction/pgr_contractionGraph.hpp index 5f40909f2e..a71ca8a1d4 100644 --- a/include/contraction/pgr_contractionGraph.hpp +++ b/include/contraction/pgr_contractionGraph.hpp @@ -40,8 +40,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/ch_vertex.h" -#include "cpp_common/ch_edge.h" +#include "cpp_common/ch_vertex.hpp" +#include "cpp_common/ch_edge.hpp" namespace pgrouting { diff --git a/include/cpp_common/basePath_SSEC.hpp b/include/cpp_common/basePath_SSEC.hpp index d3823d80bf..995c195ecd 100644 --- a/include/cpp_common/basePath_SSEC.hpp +++ b/include/cpp_common/basePath_SSEC.hpp @@ -45,9 +45,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/path_rt.h" #include "c_types/mst_rt.h" -#include "cpp_common/path_t.h" +#include "cpp_common/path_t.hpp" #include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/rule.h" +#include "cpp_common/rule.hpp" namespace pgrouting { diff --git a/include/cpp_common/basic_vertex.hpp b/include/cpp_common/basic_vertex.hpp index 3adaa64875..9d74edcfe6 100644 --- a/include/cpp_common/basic_vertex.hpp +++ b/include/cpp_common/basic_vertex.hpp @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "c_types/edge_t.h" +#include "cpp_common/edge_t.hpp" diff --git a/include/cpp_common/ch_edge.hpp b/include/cpp_common/ch_edge.hpp index e81853bb0b..f35cb22598 100644 --- a/include/cpp_common/ch_edge.hpp +++ b/include/cpp_common/ch_edge.hpp @@ -33,8 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "./ch_vertex.h" -// #include "./basic_edge.h" +#include "cpp_common/ch_vertex.hpp" namespace pgrouting { diff --git a/include/cpp_common/ch_vertex.hpp b/include/cpp_common/ch_vertex.hpp index c48ed31b26..6397ea463d 100644 --- a/include/cpp_common/ch_vertex.hpp +++ b/include/cpp_common/ch_vertex.hpp @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "c_types/edge_t.h" +#include "cpp_common/edge_t.hpp" #include "cpp_common/identifiers.hpp" namespace pgrouting { diff --git a/include/cpp_common/combinations.hpp b/include/cpp_common/combinations.hpp index 578f72743e..00c422c8c5 100644 --- a/include/cpp_common/combinations.hpp +++ b/include/cpp_common/combinations.hpp @@ -44,7 +44,7 @@ extern "C" { #include "c_types/ii_t_rt.h" #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/rule.h" +#include "cpp_common/rule.hpp" namespace pgrouting { diff --git a/include/cpp_common/get_data.hpp b/include/cpp_common/get_data.hpp index d50e8ac69e..bb352103cf 100644 --- a/include/cpp_common/get_data.hpp +++ b/include/cpp_common/get_data.hpp @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "c_common/postgres_connection.h" -#include "c_types/info_t.hpp" +#include "cpp_common/info_t.hpp" #include "cpp_common/get_check_data.hpp" #include "cpp_common/pgr_alloc.hpp" diff --git a/include/cpp_common/line_vertex.hpp b/include/cpp_common/line_vertex.hpp index 43fe164bea..ee8df60a43 100644 --- a/include/cpp_common/line_vertex.hpp +++ b/include/cpp_common/line_vertex.hpp @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "c_types/edge_t.h" +#include "cpp_common/edge_t.hpp" diff --git a/include/cpp_common/linear_directed_graph.hpp b/include/cpp_common/linear_directed_graph.hpp index daec8f1dae..0752940466 100644 --- a/include/cpp_common/linear_directed_graph.hpp +++ b/include/cpp_common/linear_directed_graph.hpp @@ -29,8 +29,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/basic_edge.h" -#include "cpp_common/line_vertex.h" +#include "cpp_common/basic_edge.hpp" +#include "cpp_common/line_vertex.hpp" namespace pgrouting { diff --git a/include/cpp_common/pgdata_fetchers.hpp b/include/cpp_common/pgdata_fetchers.hpp index 1fe94f8517..5a435476b6 100644 --- a/include/cpp_common/pgdata_fetchers.hpp +++ b/include/cpp_common/pgdata_fetchers.hpp @@ -48,19 +48,19 @@ extern "C" { #include "cpp_common/undefPostgresDefine.hpp" -#include "c_types/info_t.hpp" +#include "cpp_common/info_t.hpp" #include "c_types/ii_t_rt.h" -#include "c_types/coordinate_t.h" -#include "c_types/delauny_t.h" +#include "cpp_common/coordinate_t.hpp" +#include "cpp_common/delauny_t.hpp" #include "c_types/edge_bool_t_rt.h" -#include "c_types/costFlow_t.h" -#include "c_types/edge_xy_t.h" -#include "c_types/edge_t.h" +#include "cpp_common/costFlow_t.hpp" +#include "cpp_common/edge_xy_t.hpp" +#include "cpp_common/edge_t.hpp" #include "c_types/iid_t_rt.h" -#include "c_types/pickDeliver/orders_t.h" -#include "c_types/restriction_t.h" -#include "c_types/point_on_edge_t.h" -#include "c_types/pickDeliver/vehicle_t.h" +#include "cpp_common/orders_t.hpp" +#include "cpp_common/restriction_t.hpp" +#include "cpp_common/point_on_edge_t.hpp" +#include "cpp_common/vehicle_t.hpp" namespace pgrouting { namespace pgget { diff --git a/include/cpp_common/pgdata_getters.hpp b/include/cpp_common/pgdata_getters.hpp index 0ab29e9ee5..9699bbbb5b 100644 --- a/include/cpp_common/pgdata_getters.hpp +++ b/include/cpp_common/pgdata_getters.hpp @@ -51,19 +51,19 @@ extern "C" { #include "cpp_common/undefPostgresDefine.hpp" -#include "c_types/info_t.hpp" +#include "cpp_common/info_t.hpp" #include "c_types/ii_t_rt.h" -#include "c_types/coordinate_t.h" -#include "c_types/delauny_t.h" +#include "cpp_common/coordinate_t.hpp" +#include "cpp_common/delauny_t.hpp" #include "c_types/edge_bool_t_rt.h" -#include "c_types/costFlow_t.h" -#include "c_types/edge_xy_t.h" -#include "c_types/edge_t.h" +#include "cpp_common/costFlow_t.hpp" +#include "cpp_common/edge_xy_t.hpp" +#include "cpp_common/edge_t.hpp" #include "c_types/iid_t_rt.h" -#include "c_types/pickDeliver/orders_t.h" -#include "c_types/restriction_t.h" -#include "c_types/point_on_edge_t.h" -#include "c_types/pickDeliver/vehicle_t.h" +#include "cpp_common/orders_t.hpp" +#include "cpp_common/restriction_t.hpp" +#include "cpp_common/point_on_edge_t.hpp" +#include "cpp_common/vehicle_t.hpp" namespace pgrouting { namespace pgget { diff --git a/include/cpp_common/pgr_assert.hpp b/include/cpp_common/pgr_assert.hpp index 28d7cb3d10..c8c6c8be6a 100644 --- a/include/cpp_common/pgr_assert.hpp +++ b/include/cpp_common/pgr_assert.hpp @@ -70,7 +70,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * Example: * @code #include - #include "pgr_assert.h" + #include "cpp_common/pgr_assert.hpp" int main() { diff --git a/include/cpp_common/pgr_base_graph.hpp b/include/cpp_common/pgr_base_graph.hpp index e0c4edbfd3..3f03a0d0a7 100644 --- a/include/cpp_common/pgr_base_graph.hpp +++ b/include/cpp_common/pgr_base_graph.hpp @@ -40,13 +40,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "c_types/graph_enum.h" +#include "cpp_common/graph_enum.hpp" -#include "cpp_common/basic_vertex.h" -#include "cpp_common/xy_vertex.h" -#include "cpp_common/basic_edge.h" +#include "cpp_common/basic_vertex.hpp" +#include "cpp_common/xy_vertex.hpp" +#include "cpp_common/basic_edge.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" namespace pgrouting { diff --git a/include/cpp_common/pgr_bidirectional.hpp b/include/cpp_common/pgr_bidirectional.hpp index 00c60aa8fa..d5ea79efc9 100644 --- a/include/cpp_common/pgr_bidirectional.hpp +++ b/include/cpp_common/pgr_bidirectional.hpp @@ -46,7 +46,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "cpp_common/basePath_SSEC.hpp" #include "cpp_common/pgr_base_graph.hpp" diff --git a/include/cpp_common/signalhandler.hpp b/include/cpp_common/signalhandler.hpp index 49bae64fe5..51d2ec31b5 100644 --- a/include/cpp_common/signalhandler.hpp +++ b/include/cpp_common/signalhandler.hpp @@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -// #include "./pgr_assert.h" +// #include "./pgr_assert.hpp" class UserQuitException: public std::exception { private: diff --git a/include/cpp_common/trsp_pgfetch.hpp b/include/cpp_common/trsp_pgfetch.hpp index cb2bf83470..cfecff79e0 100644 --- a/include/cpp_common/trsp_pgfetch.hpp +++ b/include/cpp_common/trsp_pgfetch.hpp @@ -59,7 +59,7 @@ extern "C" { #include #include "cpp_common/undefPostgresDefine.hpp" -using Edge_t = struct Edge_t; +using Edge_t = struct Edge_rt; namespace pgrouting { using Column_info_t = struct Column_info_t; diff --git a/include/cpp_common/xy_vertex.hpp b/include/cpp_common/xy_vertex.hpp index b50428b11c..20e4bc10ec 100644 --- a/include/cpp_common/xy_vertex.hpp +++ b/include/cpp_common/xy_vertex.hpp @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/bpoint.hpp" -#include "c_types/edge_xy_t.h" +#include "cpp_common/edge_xy_t.hpp" namespace pgrouting { diff --git a/include/dijkstra/pgr_dijkstraVia.hpp b/include/dijkstra/pgr_dijkstraVia.hpp index 5714b50f53..d00f4da9bb 100644 --- a/include/dijkstra/pgr_dijkstraVia.hpp +++ b/include/dijkstra/pgr_dijkstraVia.hpp @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "dijkstra/dijkstra.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" namespace pgrouting { diff --git a/include/dominator/pgr_lengauerTarjanDominatorTree_driver.hpp b/include/dominator/pgr_lengauerTarjanDominatorTree_driver.hpp index 51d98d28e5..699a208b80 100644 --- a/include/dominator/pgr_lengauerTarjanDominatorTree_driver.hpp +++ b/include/dominator/pgr_lengauerTarjanDominatorTree_driver.hpp @@ -42,7 +42,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/interruption.hpp" -#include "cpp_common/pgr_messages.h" +#include "cpp_common/pgr_messages.hpp" #include "cpp_common/pgr_base_graph.hpp" diff --git a/include/drivers/lineGraph/lineGraph_driver.h b/include/drivers/lineGraph/lineGraph_driver.h index 7f1018ade7..316fc05646 100644 --- a/include/drivers/lineGraph/lineGraph_driver.h +++ b/include/drivers/lineGraph/lineGraph_driver.h @@ -34,10 +34,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /* for size-t */ #ifdef __cplusplus # include -using Edge_t = struct Edge_t; +using Edge_rt = struct Edge_rt; #else # include -typedef struct Edge_t Edge_t; +typedef struct Edge_rt Edge_rt; #endif @@ -50,7 +50,7 @@ void pgr_do_lineGraph( bool, - Edge_t**, size_t*, + Edge_rt**, size_t*, char**, char**, char**); #ifdef __cplusplus diff --git a/include/drivers/trsp/trsp_core.h b/include/drivers/trsp/trsp_core.h index 15dd9e06a7..fb6af543eb 100644 --- a/include/drivers/trsp/trsp_core.h +++ b/include/drivers/trsp/trsp_core.h @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #endif typedef struct restrict_t restrict_t; -typedef struct Edge_t Edge_t; +typedef struct Edge_rt Edge_t; typedef struct path_element_tt path_element_tt; #ifdef __cplusplus diff --git a/include/lineGraph/pgr_lineGraph.hpp b/include/lineGraph/pgr_lineGraph.hpp index f7f6b6b0ec..4352fc3e50 100644 --- a/include/lineGraph/pgr_lineGraph.hpp +++ b/include/lineGraph/pgr_lineGraph.hpp @@ -38,8 +38,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include +#include "c_types/edge_rt.h" #include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/line_vertex.h" +#include "cpp_common/line_vertex.hpp" namespace pgrouting { @@ -87,12 +88,12 @@ class Pgr_lineGraph : public Pgr_base_graph { } - std::vector< Edge_t > + std::vector< Edge_rt > get_postgres_results_directed() { - std::vector< Edge_t > results; + std::vector< Edge_rt > results; typename boost::graph_traits < G >::edge_iterator edgeIt, edgeEnd; - std::map < std::pair, Edge_t > unique; + std::map < std::pair, Edge_rt > unique; int64_t count = 0; for (boost::tie(edgeIt, edgeEnd) = boost::edges(this->graph); @@ -116,7 +117,7 @@ class Pgr_lineGraph : public Pgr_base_graph { e_source *= -1; e_target *= -1; - Edge_t edge = { + Edge_rt edge = { ++count, e_source, e_target, @@ -209,9 +210,6 @@ class Pgr_lineGraph : public Pgr_base_graph { return v; } - private: - std::map < int64_t, Edge_t > m_edges; - public: std::ostringstream log; }; diff --git a/include/lineGraph/pgr_lineGraphFull.hpp b/include/lineGraph/pgr_lineGraphFull.hpp index 786f9dd716..3cb55e9d57 100644 --- a/include/lineGraph/pgr_lineGraphFull.hpp +++ b/include/lineGraph/pgr_lineGraphFull.hpp @@ -37,8 +37,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include +#include"c_types/line_graph_full_rt.h" #include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/line_vertex.h" +#include "cpp_common/line_vertex.hpp" namespace pgrouting { namespace graph { diff --git a/include/max_flow/pgr_maxflow.hpp b/include/max_flow/pgr_maxflow.hpp index fd2c51f6f1..f960983227 100644 --- a/include/max_flow/pgr_maxflow.hpp +++ b/include/max_flow/pgr_maxflow.hpp @@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "c_types/flow_t.h" -#include "c_types/edge_t.h" +#include "cpp_common/edge_t.hpp" #include "c_types/path_rt.h" #include "cpp_common/interruption.hpp" diff --git a/include/max_flow/pgr_minCostMaxFlow.hpp b/include/max_flow/pgr_minCostMaxFlow.hpp index 7d5320da43..45ae8e9bf1 100644 --- a/include/max_flow/pgr_minCostMaxFlow.hpp +++ b/include/max_flow/pgr_minCostMaxFlow.hpp @@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "c_types/flow_t.h" -#include "c_types/costFlow_t.h" +#include "cpp_common/costFlow_t.hpp" #include "max_flow/pgr_costFlowGraph.hpp" namespace pgrouting { diff --git a/include/ordering/cuthillMckeeOrdering.hpp b/include/ordering/cuthillMckeeOrdering.hpp index a41acc54c2..b923031777 100644 --- a/include/ordering/cuthillMckeeOrdering.hpp +++ b/include/ordering/cuthillMckeeOrdering.hpp @@ -44,7 +44,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgr_base_graph.hpp" #include "cpp_common/interruption.hpp" -#include "cpp_common/pgr_messages.h" +#include "cpp_common/pgr_messages.hpp" #include "c_types/ii_t_rt.h" diff --git a/include/planar/pgr_boyerMyrvold.hpp b/include/planar/pgr_boyerMyrvold.hpp index 0e5d2f8a43..35cb8ae985 100644 --- a/include/planar/pgr_boyerMyrvold.hpp +++ b/include/planar/pgr_boyerMyrvold.hpp @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_messages.h" +#include "cpp_common/pgr_messages.hpp" #include "cpp_common/pgr_base_graph.hpp" #include "cpp_common/interruption.hpp" #include "c_types/iid_t_rt.h" diff --git a/include/transitiveClosure/pgr_transitiveClosure.hpp b/include/transitiveClosure/pgr_transitiveClosure.hpp index 0a88925bf1..9c7a57843f 100644 --- a/include/transitiveClosure/pgr_transitiveClosure.hpp +++ b/include/transitiveClosure/pgr_transitiveClosure.hpp @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" template < class G > class Pgr_transitiveClosure; diff --git a/include/trsp/GraphDefinition.hpp b/include/trsp/GraphDefinition.hpp index 2f9a01e186..b27bb50af8 100644 --- a/include/trsp/GraphDefinition.hpp +++ b/include/trsp/GraphDefinition.hpp @@ -43,7 +43,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // using namespace std; -using Edge_t = struct Edge_t; +using Edge_t = struct Edge_rt; typedef std::vector LongVector; typedef std::vector VectorOfLongVector; typedef std::pair PIB; diff --git a/include/trsp/edgeInfo.hpp b/include/trsp/edgeInfo.hpp index 7a52777b77..5064747346 100644 --- a/include/trsp/edgeInfo.hpp +++ b/include/trsp/edgeInfo.hpp @@ -29,8 +29,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include -#include "c_types/edge_t.h" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/edge_t.hpp" +#include "cpp_common/pgr_assert.hpp" namespace pgrouting { namespace trsp { diff --git a/include/trsp/pgr_trspHandler.hpp b/include/trsp/pgr_trspHandler.hpp index 47ca43eda8..7cccb757bc 100644 --- a/include/trsp/pgr_trspHandler.hpp +++ b/include/trsp/pgr_trspHandler.hpp @@ -41,9 +41,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/basePath_SSEC.hpp" -#include "trsp/edgeInfo.h" -#include "cpp_common/rule.h" -#include "cpp_common/pgr_messages.h" +#include "trsp/edgeInfo.hpp" +#include "cpp_common/rule.hpp" +#include "cpp_common/pgr_messages.hpp" namespace pgrouting { namespace trsp { diff --git a/include/tsp/tsp.hpp b/include/tsp/tsp.hpp index 174649eda7..ef9e549c33 100644 --- a/include/tsp/tsp.hpp +++ b/include/tsp/tsp.hpp @@ -39,9 +39,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "c_types/iid_t_rt.h" -#include "c_types/coordinate_t.h" -#include "cpp_common/pgr_messages.h" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/coordinate_t.hpp" +#include "cpp_common/pgr_messages.hpp" +#include "cpp_common/pgr_assert.hpp" namespace pgrouting { diff --git a/include/vrp/book_keeping.hpp b/include/vrp/book_keeping.hpp index ccce8acab9..f22ef84487 100644 --- a/include/vrp/book_keeping.hpp +++ b/include/vrp/book_keeping.hpp @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include -#include "vrp/vehicle_pickDeliver.h" +#include "vrp/vehicle_pickDeliver.hpp" /** * Book keeping class for swapping orders between vehicles */ diff --git a/include/vrp/dnode.hpp b/include/vrp/dnode.hpp index 167b875af5..72c19f6a13 100644 --- a/include/vrp/dnode.hpp +++ b/include/vrp/dnode.hpp @@ -31,8 +31,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/identifier.h" -#include "cpp_common/pgr_messages.h" +#include "cpp_common/identifier.hpp" +#include "cpp_common/pgr_messages.hpp" namespace pgrouting { namespace vrp { diff --git a/include/vrp/fleet.hpp b/include/vrp/fleet.hpp index 421eb19637..933bea00de 100644 --- a/include/vrp/fleet.hpp +++ b/include/vrp/fleet.hpp @@ -35,8 +35,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/identifiers.hpp" -#include "vrp/pd_problem.h" -#include "vrp/vehicle_pickDeliver.h" +#include "vrp/pd_problem.hpp" +#include "vrp/vehicle_pickDeliver.hpp" namespace pgrouting { namespace vrp { diff --git a/include/vrp/initial_solution.hpp b/include/vrp/initial_solution.hpp index 0605353a3b..46be9a5ef9 100644 --- a/include/vrp/initial_solution.hpp +++ b/include/vrp/initial_solution.hpp @@ -31,9 +31,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "vrp/pd_orders.h" -#include "vrp/solution.h" -#include "vrp/initials_code.h" +#include "vrp/pd_orders.hpp" +#include "vrp/solution.hpp" +#include "vrp/initials_code.hpp" #include "cpp_common/identifiers.hpp" namespace pgrouting { diff --git a/include/vrp/optimize.hpp b/include/vrp/optimize.hpp index 532417b5a3..2d3dcfcfdf 100644 --- a/include/vrp/optimize.hpp +++ b/include/vrp/optimize.hpp @@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_VRP_OPTIMIZE_HPP_ #pragma once -#include "vrp/optimize.h" +#include "vrp/optimize.hpp" namespace pgrouting { namespace vrp { diff --git a/include/vrp/order.hpp b/include/vrp/order.hpp index 52462cfa5e..b0e32d36ca 100644 --- a/include/vrp/order.hpp +++ b/include/vrp/order.hpp @@ -31,9 +31,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include -#include "cpp_common/identifier.h" +#include "cpp_common/identifier.hpp" #include "cpp_common/identifiers.hpp" -#include "vrp/vehicle_node.h" +#include "vrp/vehicle_node.hpp" namespace pgrouting { namespace vrp { diff --git a/include/vrp/pd_orders.hpp b/include/vrp/pd_orders.hpp index bb3f502f75..0a94e76657 100644 --- a/include/vrp/pd_orders.hpp +++ b/include/vrp/pd_orders.hpp @@ -33,10 +33,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "c_types/pickDeliver/orders_t.h" +#include "cpp_common/orders_t.hpp" #include "cpp_common/identifiers.hpp" -#include "vrp/pd_problem.h" +#include "vrp/pd_problem.hpp" namespace pgrouting { diff --git a/include/vrp/pd_problem.hpp b/include/vrp/pd_problem.hpp index 7301726569..840f7488a0 100644 --- a/include/vrp/pd_problem.hpp +++ b/include/vrp/pd_problem.hpp @@ -29,8 +29,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_VRP_PD_PROBLEM_HPP_ #pragma once -#include "cpp_common/pgr_messages.h" -#include "vrp/initials_code.h" +#include "cpp_common/pgr_messages.hpp" +#include "vrp/initials_code.hpp" diff --git a/include/vrp/pgr_pickDeliver.hpp b/include/vrp/pgr_pickDeliver.hpp index 3bd7fc886a..6af26d564d 100644 --- a/include/vrp/pgr_pickDeliver.hpp +++ b/include/vrp/pgr_pickDeliver.hpp @@ -35,13 +35,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "c_types/pickDeliver/vehicle_t.h" -#include "c_types/pickDeliver/orders_t.h" -#include "vrp/pd_problem.h" -#include "cpp_common/Dmatrix.h" -#include "vrp/fleet.h" -#include "vrp/pd_orders.h" -#include "vrp/solution.h" +#include "cpp_common/vehicle_t.hpp" +#include "cpp_common/orders_t.hpp" +#include "vrp/pd_problem.hpp" +#include "cpp_common/Dmatrix.hpp" +#include "vrp/fleet.hpp" +#include "vrp/pd_orders.hpp" +#include "vrp/solution.hpp" using Schedule_rt = struct Schedule_rt; diff --git a/include/vrp/solution.hpp b/include/vrp/solution.hpp index ed94bc277a..ed27e7d992 100644 --- a/include/vrp/solution.hpp +++ b/include/vrp/solution.hpp @@ -34,8 +34,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "vrp/vehicle_pickDeliver.h" -#include "vrp/fleet.h" +#include "vrp/vehicle_pickDeliver.hpp" +#include "vrp/fleet.hpp" using Schedule_rt = struct Schedule_rt; diff --git a/include/vrp/tw_node.hpp b/include/vrp/tw_node.hpp index 71437df6c2..afa532bf43 100644 --- a/include/vrp/tw_node.hpp +++ b/include/vrp/tw_node.hpp @@ -31,13 +31,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include -#include "c_types/pickDeliver/orders_t.h" -#include "c_types/pickDeliver/vehicle_t.h" -#include "cpp_common/pgr_assert.h" -#include "cpp_common/identifier.h" +#include "cpp_common/orders_t.hpp" +#include "cpp_common/vehicle_t.hpp" +#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/identifier.hpp" -#include "vrp/pd_problem.h" -#include "vrp/dnode.h" +#include "vrp/pd_problem.hpp" +#include "vrp/dnode.hpp" namespace pgrouting { namespace vrp { diff --git a/include/vrp/vehicle.hpp b/include/vrp/vehicle.hpp index 8467d5ecc6..b6f3f346b5 100644 --- a/include/vrp/vehicle.hpp +++ b/include/vrp/vehicle.hpp @@ -38,8 +38,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include -#include "cpp_common/identifier.h" -#include "vrp/vehicle_node.h" +#include "cpp_common/identifier.hpp" +#include "vrp/vehicle_node.hpp" using Schedule_rt = struct Schedule_rt; namespace pgrouting { diff --git a/include/vrp/vehicle_node.hpp b/include/vrp/vehicle_node.hpp index 8939d4b47c..c99c481f19 100644 --- a/include/vrp/vehicle_node.hpp +++ b/include/vrp/vehicle_node.hpp @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include -#include "vrp/tw_node.h" +#include "vrp/tw_node.hpp" namespace pgrouting { namespace vrp { diff --git a/include/vrp/vehicle_pickDeliver.hpp b/include/vrp/vehicle_pickDeliver.hpp index 7f1db5358c..fb9697f8d4 100644 --- a/include/vrp/vehicle_pickDeliver.hpp +++ b/include/vrp/vehicle_pickDeliver.hpp @@ -30,11 +30,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #pragma once #include -#include "vrp/order.h" -#include "vrp/pd_orders.h" -#include "vrp/tw_node.h" -#include "vrp/vehicle.h" -#include "vrp/initials_code.h" +#include "vrp/order.hpp" +#include "vrp/pd_orders.hpp" +#include "vrp/tw_node.hpp" +#include "vrp/vehicle.hpp" +#include "vrp/initials_code.hpp" #include "cpp_common/identifiers.hpp" namespace pgrouting { diff --git a/include/withPoints/pgr_withPoints.hpp b/include/withPoints/pgr_withPoints.hpp index 7a26c343d5..7be3b263af 100644 --- a/include/withPoints/pgr_withPoints.hpp +++ b/include/withPoints/pgr_withPoints.hpp @@ -31,8 +31,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #pragma once #include -#include "c_types/point_on_edge_t.h" -#include "cpp_common/pgr_messages.h" +#include "cpp_common/point_on_edge_t.hpp" +#include "cpp_common/pgr_messages.hpp" #include "cpp_common/basePath_SSEC.hpp" namespace pgrouting { diff --git a/include/yen/pgr_ksp.hpp b/include/yen/pgr_ksp.hpp index d4bae23698..b2a69363c6 100644 --- a/include/yen/pgr_ksp.hpp +++ b/include/yen/pgr_ksp.hpp @@ -43,9 +43,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "dijkstra/dijkstra.hpp" -#include "cpp_common/pgr_assert.h" -#include "cpp_common/compPaths.h" -#include "cpp_common/pgr_messages.h" +#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/compPaths.hpp" +#include "cpp_common/pgr_messages.hpp" #include "cpp_common/basePath_SSEC.hpp" namespace pgrouting { diff --git a/include/yen/pgr_turnRestrictedPath.hpp b/include/yen/pgr_turnRestrictedPath.hpp index c657c13e8b..1e3e8bdf76 100644 --- a/include/yen/pgr_turnRestrictedPath.hpp +++ b/include/yen/pgr_turnRestrictedPath.hpp @@ -38,11 +38,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/compPaths.h" -#include "cpp_common/pgr_messages.h" -#include "cpp_common/rule.h" +#include "cpp_common/compPaths.hpp" +#include "cpp_common/pgr_messages.hpp" +#include "cpp_common/rule.hpp" namespace pgrouting { namespace yen { diff --git a/src/allpairs/floydWarshall_driver.cpp b/src/allpairs/floydWarshall_driver.cpp index 6b1e86e034..0dc5cfb4c1 100644 --- a/src/allpairs/floydWarshall_driver.cpp +++ b/src/allpairs/floydWarshall_driver.cpp @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "allpairs/pgr_allpairs.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" void diff --git a/src/allpairs/johnson_driver.cpp b/src/allpairs/johnson_driver.cpp index ef7233e159..030a5e1dd3 100644 --- a/src/allpairs/johnson_driver.cpp +++ b/src/allpairs/johnson_driver.cpp @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "allpairs/pgr_allpairs.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" void diff --git a/src/alpha_shape/alphaShape_driver.cpp b/src/alpha_shape/alphaShape_driver.cpp index 6f554fb929..9ddc34ef81 100644 --- a/src/alpha_shape/alphaShape_driver.cpp +++ b/src/alpha_shape/alphaShape_driver.cpp @@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "c_types/geom_text_rt.h" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "cpp_common/pgdata_getters.hpp" #include "alphaShape/pgr_alphaShape.h" diff --git a/src/astar/astar_driver.cpp b/src/astar/astar_driver.cpp index 4f707eda54..e4ac970a43 100644 --- a/src/astar/astar_driver.cpp +++ b/src/astar/astar_driver.cpp @@ -40,9 +40,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" -#include "c_types/edge_xy_t.h" +#include "cpp_common/edge_xy_t.hpp" #include "c_types/ii_t_rt.h" void pgr_do_astar( diff --git a/src/bdAstar/bdAstar_driver.cpp b/src/bdAstar/bdAstar_driver.cpp index 9029ef612b..456c91e2fa 100644 --- a/src/bdAstar/bdAstar_driver.cpp +++ b/src/bdAstar/bdAstar_driver.cpp @@ -41,9 +41,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" -#include "c_types/edge_xy_t.h" +#include "cpp_common/edge_xy_t.hpp" #include "c_types/ii_t_rt.h" void pgr_do_bdAstar( diff --git a/src/bdDijkstra/bdDijkstra_driver.cpp b/src/bdDijkstra/bdDijkstra_driver.cpp index 4fbd9e2492..4d8ed79830 100644 --- a/src/bdDijkstra/bdDijkstra_driver.cpp +++ b/src/bdDijkstra/bdDijkstra_driver.cpp @@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "cpp_common/pgr_base_graph.hpp" #include "bdDijkstra/pgr_bdDijkstra.hpp" diff --git a/src/bellman_ford/bellman_ford_driver.cpp b/src/bellman_ford/bellman_ford_driver.cpp index de2cdf7262..0baf0a191c 100644 --- a/src/bellman_ford/bellman_ford_driver.cpp +++ b/src/bellman_ford/bellman_ford_driver.cpp @@ -42,7 +42,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "c_types/ii_t_rt.h" diff --git a/src/bellman_ford/bellman_ford_neg_driver.cpp b/src/bellman_ford/bellman_ford_neg_driver.cpp index fb1b518ba7..e16251d7f9 100644 --- a/src/bellman_ford/bellman_ford_neg_driver.cpp +++ b/src/bellman_ford/bellman_ford_neg_driver.cpp @@ -43,7 +43,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" namespace { diff --git a/src/bellman_ford/edwardMoore_driver.cpp b/src/bellman_ford/edwardMoore_driver.cpp index 79f7cb6fad..9780a0e730 100644 --- a/src/bellman_ford/edwardMoore_driver.cpp +++ b/src/bellman_ford/edwardMoore_driver.cpp @@ -45,7 +45,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/basePath_SSEC.hpp" #include "cpp_common/pgr_base_graph.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "c_types/ii_t_rt.h" diff --git a/src/breadthFirstSearch/binaryBreadthFirstSearch_driver.cpp b/src/breadthFirstSearch/binaryBreadthFirstSearch_driver.cpp index 2598bdd2d8..edb5a302ee 100644 --- a/src/breadthFirstSearch/binaryBreadthFirstSearch_driver.cpp +++ b/src/breadthFirstSearch/binaryBreadthFirstSearch_driver.cpp @@ -43,7 +43,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" namespace { diff --git a/src/breadthFirstSearch/breadthFirstSearch_driver.cpp b/src/breadthFirstSearch/breadthFirstSearch_driver.cpp index 5763281ef8..abddfad544 100644 --- a/src/breadthFirstSearch/breadthFirstSearch_driver.cpp +++ b/src/breadthFirstSearch/breadthFirstSearch_driver.cpp @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "breadthFirstSearch/pgr_breadthFirstSearch.hpp" diff --git a/src/chinese/chinesePostman_driver.cpp b/src/chinese/chinesePostman_driver.cpp index cc530f7598..9c1b7f01c7 100644 --- a/src/chinese/chinesePostman_driver.cpp +++ b/src/chinese/chinesePostman_driver.cpp @@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "chinese/pgr_chinesePostman.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" void pgr_do_directedChPP( diff --git a/src/circuits/hawickCircuits_driver.cpp b/src/circuits/hawickCircuits_driver.cpp index a85248d4e9..997dc58e6a 100644 --- a/src/circuits/hawickCircuits_driver.cpp +++ b/src/circuits/hawickCircuits_driver.cpp @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "circuits/hawickcircuits.hpp" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" namespace { diff --git a/src/coloring/edgeColoring_driver.cpp b/src/coloring/edgeColoring_driver.cpp index 2ed8df6f99..b75be666a7 100644 --- a/src/coloring/edgeColoring_driver.cpp +++ b/src/coloring/edgeColoring_driver.cpp @@ -34,9 +34,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "coloring/pgr_edgeColoring.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "c_types/graph_enum.h" +#include "cpp_common/graph_enum.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" void pgr_do_edgeColoring( char *edges_sql, diff --git a/src/coloring/pgr_edgeColoring.cpp b/src/coloring/pgr_edgeColoring.cpp index 4ec0b74742..29ac78e3b6 100644 --- a/src/coloring/pgr_edgeColoring.cpp +++ b/src/coloring/pgr_edgeColoring.cpp @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "cpp_common/interruption.hpp" diff --git a/src/coloring/sequentialVertexColoring_driver.cpp b/src/coloring/sequentialVertexColoring_driver.cpp index f3d36f8e32..ced0b5f49c 100644 --- a/src/coloring/sequentialVertexColoring_driver.cpp +++ b/src/coloring/sequentialVertexColoring_driver.cpp @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "coloring/pgr_sequentialVertexColoring.hpp" diff --git a/src/common/basePath_SSEC.cpp b/src/common/basePath_SSEC.cpp index 99636753b6..a0c30ab4eb 100644 --- a/src/common/basePath_SSEC.cpp +++ b/src/common/basePath_SSEC.cpp @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/path_rt.h" #include "c_types/mst_rt.h" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" namespace pgrouting { diff --git a/src/common/basic_edge.cpp b/src/common/basic_edge.cpp index ba33739d95..4a188d629a 100644 --- a/src/common/basic_edge.cpp +++ b/src/common/basic_edge.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "cpp_common/basic_edge.h" +#include "cpp_common/basic_edge.hpp" namespace pgrouting { diff --git a/src/common/basic_vertex.cpp b/src/common/basic_vertex.cpp index 300a3b82a3..662db01959 100644 --- a/src/common/basic_vertex.cpp +++ b/src/common/basic_vertex.cpp @@ -25,14 +25,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "cpp_common/basic_vertex.h" +#include "cpp_common/basic_vertex.hpp" #include #include #include #include -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" namespace pgrouting { diff --git a/src/common/ch_edge.cpp b/src/common/ch_edge.cpp index 62d607132f..50f5ab7201 100644 --- a/src/common/ch_edge.cpp +++ b/src/common/ch_edge.cpp @@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "cpp_common/ch_edge.h" +#include "cpp_common/ch_edge.hpp" namespace pgrouting { diff --git a/src/common/ch_vertex.cpp b/src/common/ch_vertex.cpp index fc5a1bc340..cfc65e418a 100644 --- a/src/common/ch_vertex.cpp +++ b/src/common/ch_vertex.cpp @@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "cpp_common/ch_vertex.h" +#include "cpp_common/ch_vertex.hpp" #include #include diff --git a/src/common/identifier.cpp b/src/common/identifier.cpp index 81d10a9c49..f827235017 100644 --- a/src/common/identifier.cpp +++ b/src/common/identifier.cpp @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "cpp_common/identifier.h" +#include "cpp_common/identifier.hpp" namespace pgrouting { diff --git a/src/common/pgr_assert.cpp b/src/common/pgr_assert.cpp index 4feea9224c..86f94e4f52 100644 --- a/src/common/pgr_assert.cpp +++ b/src/common/pgr_assert.cpp @@ -26,7 +26,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include #include diff --git a/src/common/signalhandler.cpp b/src/common/signalhandler.cpp index f9927427a9..b9d480d1bb 100644 --- a/src/common/signalhandler.cpp +++ b/src/common/signalhandler.cpp @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * *****************************************************************PGR-MIT*/ -#include "cpp_common/signalhandler.h" +#include "cpp_common/signalhandler.hpp" SignalHandler * SignalHandler::instance() { diff --git a/src/common/xy_vertex.cpp b/src/common/xy_vertex.cpp index f8cfee6ecc..1edc85a24a 100644 --- a/src/common/xy_vertex.cpp +++ b/src/common/xy_vertex.cpp @@ -25,14 +25,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "cpp_common/xy_vertex.h" +#include "cpp_common/xy_vertex.hpp" #include #include #include #include -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" namespace { diff --git a/src/components/articulationPoints_driver.cpp b/src/components/articulationPoints_driver.cpp index 47494afd0e..b7edb4beab 100644 --- a/src/components/articulationPoints_driver.cpp +++ b/src/components/articulationPoints_driver.cpp @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "cpp_common/pgr_base_graph.hpp" diff --git a/src/components/biconnectedComponents_driver.cpp b/src/components/biconnectedComponents_driver.cpp index 8ac96ebe16..8e36ec4d23 100644 --- a/src/components/biconnectedComponents_driver.cpp +++ b/src/components/biconnectedComponents_driver.cpp @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "cpp_common/pgr_base_graph.hpp" diff --git a/src/components/bridges_driver.cpp b/src/components/bridges_driver.cpp index 66925cfae5..89100976b4 100644 --- a/src/components/bridges_driver.cpp +++ b/src/components/bridges_driver.cpp @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "cpp_common/pgr_base_graph.hpp" diff --git a/src/components/componentsResult.cpp b/src/components/componentsResult.cpp index 1299fe700e..069c7ff325 100644 --- a/src/components/componentsResult.cpp +++ b/src/components/componentsResult.cpp @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "components/componentsResult.h" +#include "components/componentsResult.hpp" #include #include diff --git a/src/components/connectedComponents_driver.cpp b/src/components/connectedComponents_driver.cpp index 9072cff86d..95ab270593 100644 --- a/src/components/connectedComponents_driver.cpp +++ b/src/components/connectedComponents_driver.cpp @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "cpp_common/pgr_base_graph.hpp" #include "components/pgr_components.hpp" diff --git a/src/components/makeConnected_driver.cpp b/src/components/makeConnected_driver.cpp index be9301899a..6155997daf 100644 --- a/src/components/makeConnected_driver.cpp +++ b/src/components/makeConnected_driver.cpp @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "components/pgr_makeConnected.hpp" #include "cpp_common/pgr_base_graph.hpp" diff --git a/src/components/strongComponents_driver.cpp b/src/components/strongComponents_driver.cpp index b20b23c04c..0d8b0ab13f 100644 --- a/src/components/strongComponents_driver.cpp +++ b/src/components/strongComponents_driver.cpp @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "cpp_common/pgr_base_graph.hpp" #include "components/pgr_components.hpp" diff --git a/src/cpp_common/Dmatrix.cpp b/src/cpp_common/Dmatrix.cpp index a236689a7b..8c34df2305 100644 --- a/src/cpp_common/Dmatrix.cpp +++ b/src/cpp_common/Dmatrix.cpp @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "cpp_common/Dmatrix.h" +#include "cpp_common/Dmatrix.hpp" #include #include @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "c_types/iid_t_rt.h" diff --git a/src/cpp_common/compPaths.cpp b/src/cpp_common/compPaths.cpp index 797b20ae2e..5b805fd11a 100644 --- a/src/cpp_common/compPaths.cpp +++ b/src/cpp_common/compPaths.cpp @@ -30,8 +30,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.h" -#include "cpp_common/compPaths.h" +#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/compPaths.hpp" #include "cpp_common/basePath_SSEC.hpp" diff --git a/src/cpp_common/get_check_data.cpp b/src/cpp_common/get_check_data.cpp index 45348bf071..6386e7ce73 100644 --- a/src/cpp_common/get_check_data.cpp +++ b/src/cpp_common/get_check_data.cpp @@ -40,7 +40,7 @@ extern "C" { #include "cpp_common/undefPostgresDefine.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "c_types/info_t.hpp" +#include "cpp_common/info_t.hpp" namespace { diff --git a/src/cpp_common/pgdata_fetchers.cpp b/src/cpp_common/pgdata_fetchers.cpp index 6ba42e18bf..aaed718226 100644 --- a/src/cpp_common/pgdata_fetchers.cpp +++ b/src/cpp_common/pgdata_fetchers.cpp @@ -43,19 +43,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/get_check_data.hpp" -#include "c_types/info_t.hpp" +#include "cpp_common/info_t.hpp" #include "c_types/ii_t_rt.h" -#include "c_types/coordinate_t.h" -#include "c_types/delauny_t.h" +#include "cpp_common/coordinate_t.hpp" +#include "cpp_common/delauny_t.hpp" #include "c_types/edge_bool_t_rt.h" -#include "c_types/costFlow_t.h" -#include "c_types/edge_xy_t.h" -#include "c_types/edge_t.h" +#include "cpp_common/costFlow_t.hpp" +#include "cpp_common/edge_xy_t.hpp" +#include "cpp_common/edge_t.hpp" #include "c_types/iid_t_rt.h" -#include "c_types/pickDeliver/orders_t.h" -#include "c_types/restriction_t.h" -#include "c_types/point_on_edge_t.h" -#include "c_types/pickDeliver/vehicle_t.h" +#include "cpp_common/orders_t.hpp" +#include "cpp_common/restriction_t.hpp" +#include "cpp_common/point_on_edge_t.hpp" +#include "cpp_common/vehicle_t.hpp" namespace pgrouting { diff --git a/src/cpp_common/pgdata_getters.cpp b/src/cpp_common/pgdata_getters.cpp index 9f48267a02..e5dc8fa714 100644 --- a/src/cpp_common/pgdata_getters.cpp +++ b/src/cpp_common/pgdata_getters.cpp @@ -47,20 +47,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/get_check_data.hpp" #include "cpp_common/pgdata_fetchers.hpp" -#include "c_types/info_t.hpp" -#include "c_types/coordinate_t.h" -#include "c_types/costFlow_t.h" +#include "cpp_common/info_t.hpp" +#include "cpp_common/coordinate_t.hpp" +#include "cpp_common/costFlow_t.hpp" #include "c_types/ii_t_rt.h" #include "c_types/iid_t_rt.h" -#include "c_types/delauny_t.h" -#include "c_types/edge_t.h" +#include "cpp_common/delauny_t.hpp" +#include "cpp_common/edge_t.hpp" #include "c_types/edge_bool_t_rt.h" -#include "c_types/edge_xy_t.h" -#include "c_types/flow_t.h" -#include "c_types/pickDeliver/orders_t.h" -#include "c_types/pickDeliver/vehicle_t.h" -#include "c_types/point_on_edge_t.h" -#include "c_types/restriction_t.h" +#include "cpp_common/edge_xy_t.hpp" +#include "cpp_common/orders_t.hpp" +#include "cpp_common/vehicle_t.hpp" +#include "cpp_common/point_on_edge_t.hpp" +#include "cpp_common/restriction_t.hpp" namespace pgrouting { namespace pgget { diff --git a/src/cpp_common/pgr_messages.cpp b/src/cpp_common/pgr_messages.cpp index 602f5cbffa..1f8a792246 100644 --- a/src/cpp_common/pgr_messages.cpp +++ b/src/cpp_common/pgr_messages.cpp @@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_messages.h" +#include "cpp_common/pgr_messages.hpp" namespace pgrouting { diff --git a/src/cpp_common/rule.cpp b/src/cpp_common/rule.cpp index 1c9beac99e..ead34ff19c 100644 --- a/src/cpp_common/rule.cpp +++ b/src/cpp_common/rule.cpp @@ -23,12 +23,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "cpp_common/rule.h" +#include "cpp_common/rule.hpp" #include #include -#include "c_types/restriction_t.h" +#include "cpp_common/restriction_t.hpp" namespace pgrouting { diff --git a/src/cpp_common/trsp_pgfetch.cpp b/src/cpp_common/trsp_pgfetch.cpp index ddcc37f609..aa4a502860 100644 --- a/src/cpp_common/trsp_pgfetch.cpp +++ b/src/cpp_common/trsp_pgfetch.cpp @@ -57,8 +57,8 @@ Notes #include "cpp_common/get_check_data.hpp" -#include "c_types/info_t.hpp" -#include "c_types/edge_t.h" +#include "cpp_common/info_t.hpp" +#include "c_types/edge_rt.h" namespace pgrouting { diff --git a/src/cpp_common/trsp_pgget.cpp b/src/cpp_common/trsp_pgget.cpp index d3a243bd4d..7d46ebdbeb 100644 --- a/src/cpp_common/trsp_pgget.cpp +++ b/src/cpp_common/trsp_pgget.cpp @@ -60,8 +60,8 @@ The old version of TRSP #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/trsp_pgfetch.hpp" -#include "c_types/info_t.hpp" -#include "c_types/edge_t.h" +#include "cpp_common/info_t.hpp" +#include "c_types/edge_rt.h" /** diff --git a/src/dagShortestPath/dagShortestPath_driver.cpp b/src/dagShortestPath/dagShortestPath_driver.cpp index 95f0ebbafa..4195e37932 100644 --- a/src/dagShortestPath/dagShortestPath_driver.cpp +++ b/src/dagShortestPath/dagShortestPath_driver.cpp @@ -42,7 +42,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" namespace { diff --git a/src/dijkstra/dijkstraVia_driver.cpp b/src/dijkstra/dijkstraVia_driver.cpp index 5ca73e41b6..92d5f48116 100644 --- a/src/dijkstra/dijkstraVia_driver.cpp +++ b/src/dijkstra/dijkstraVia_driver.cpp @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/routes_t.h" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "dijkstra/pgr_dijkstraVia.hpp" diff --git a/src/dijkstra/dijkstra_driver.cpp b/src/dijkstra/dijkstra_driver.cpp index 32c5826cea..b7bff39d02 100644 --- a/src/dijkstra/dijkstra_driver.cpp +++ b/src/dijkstra/dijkstra_driver.cpp @@ -45,7 +45,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/combinations.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "dijkstra/dijkstra.hpp" diff --git a/src/driving_distance/drivedist_driver.cpp b/src/driving_distance/drivedist_driver.cpp index 3fa126f450..0b63fc2f46 100644 --- a/src/driving_distance/drivedist_driver.cpp +++ b/src/driving_distance/drivedist_driver.cpp @@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/mst_rt.h" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" void diff --git a/src/ksp/ksp_driver.cpp b/src/ksp/ksp_driver.cpp index c2b34645fd..4599d1aaa0 100644 --- a/src/ksp/ksp_driver.cpp +++ b/src/ksp/ksp_driver.cpp @@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "c_types/ii_t_rt.h" diff --git a/src/ksp/turnRestrictedPath_driver.cpp b/src/ksp/turnRestrictedPath_driver.cpp index 77917932f3..9c6ffd746b 100644 --- a/src/ksp/turnRestrictedPath_driver.cpp +++ b/src/ksp/turnRestrictedPath_driver.cpp @@ -36,12 +36,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" -#include "cpp_common/rule.h" +#include "cpp_common/rule.hpp" #include "cpp_common/basePath_SSEC.hpp" -#include "c_types/restriction_t.h" +#include "cpp_common/restriction_t.hpp" #include "yen/pgr_turnRestrictedPath.hpp" diff --git a/src/ksp/withPoints_ksp_driver.cpp b/src/ksp/withPoints_ksp_driver.cpp index 0b74256ed6..3f92e3ed9b 100644 --- a/src/ksp/withPoints_ksp_driver.cpp +++ b/src/ksp/withPoints_ksp_driver.cpp @@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/combinations.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "withPoints/pgr_withPoints.hpp" #include "yen/pgr_ksp.hpp" diff --git a/src/lineGraph/lineGraph.c b/src/lineGraph/lineGraph.c index bb4719d127..6f34c7e561 100644 --- a/src/lineGraph/lineGraph.c +++ b/src/lineGraph/lineGraph.c @@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/postgres_connection.h" -#include "c_types/edge_t.h" +#include "c_types/edge_rt.h" #include "c_common/debug_macro.h" #include "c_common/e_report.h" #include "c_common/time_msg.h" @@ -47,7 +47,7 @@ void process( char* edges_sql, bool directed, - Edge_t **result_tuples, + Edge_rt **result_tuples, size_t *result_count) { pgr_SPI_connect(); char* log_msg = NULL; @@ -86,7 +86,7 @@ PGDLLEXPORT Datum _pgr_linegraph(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; - Edge_t *result_tuples = NULL; + Edge_rt *result_tuples = NULL; size_t result_count = 0; if (SRF_IS_FIRSTCALL()) { @@ -117,7 +117,7 @@ PGDLLEXPORT Datum _pgr_linegraph(PG_FUNCTION_ARGS) { funcctx = SRF_PERCALL_SETUP(); tuple_desc = funcctx->tuple_desc; - result_tuples = (Edge_t*) funcctx->user_fctx; + result_tuples = (Edge_rt*) funcctx->user_fctx; if (funcctx->call_cntr < funcctx->max_calls) { HeapTuple tuple; diff --git a/src/lineGraph/lineGraphFull_driver.cpp b/src/lineGraph/lineGraphFull_driver.cpp index c6e8ad04d5..9f71e71ad5 100644 --- a/src/lineGraph/lineGraphFull_driver.cpp +++ b/src/lineGraph/lineGraphFull_driver.cpp @@ -37,10 +37,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/line_graph_full_rt.h" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "lineGraph/pgr_lineGraphFull.hpp" -#include "cpp_common/linear_directed_graph.h" +#include "cpp_common/linear_directed_graph.hpp" #include "dijkstra/dijkstra.hpp" diff --git a/src/lineGraph/lineGraph_driver.cpp b/src/lineGraph/lineGraph_driver.cpp index 19abc8a233..a8221b7dac 100644 --- a/src/lineGraph/lineGraph_driver.cpp +++ b/src/lineGraph/lineGraph_driver.cpp @@ -37,16 +37,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" -#include "cpp_common/linear_directed_graph.h" +#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/linear_directed_graph.hpp" +#include "c_types/edge_rt.h" #include "lineGraph/pgr_lineGraph.hpp" namespace { void get_postgres_result( - std::vector< Edge_t > edge_result, - Edge_t **return_tuples, + std::vector< Edge_rt > edge_result, + Edge_rt **return_tuples, size_t &sequence) { using pgrouting::pgr_alloc; (*return_tuples) = pgr_alloc(edge_result.size(), (*return_tuples)); @@ -64,7 +65,7 @@ pgr_do_lineGraph( char *edges_sql, bool directed, - Edge_t **return_tuples, + Edge_rt **return_tuples, size_t *return_count, char ** log_msg, char ** notice_msg, @@ -104,7 +105,7 @@ pgr_do_lineGraph( pgrouting::LinearDirectedGraph, pgrouting::Line_vertex, pgrouting::Basic_edge> line(digraph); - std::vector< Edge_t > line_graph_edges; + std::vector< Edge_rt > line_graph_edges; line_graph_edges = line.get_postgres_results_directed(); auto count = line_graph_edges.size(); diff --git a/src/max_flow/edge_disjoint_paths_driver.cpp b/src/max_flow/edge_disjoint_paths_driver.cpp index 92ed94ec73..80e968f35a 100644 --- a/src/max_flow/edge_disjoint_paths_driver.cpp +++ b/src/max_flow/edge_disjoint_paths_driver.cpp @@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/combinations.hpp" #include "cpp_common/identifiers.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "cpp_common/pgr_alloc.hpp" #include "c_types/ii_t_rt.h" diff --git a/src/max_flow/max_flow_driver.cpp b/src/max_flow/max_flow_driver.cpp index 497165a12e..d21705a76b 100644 --- a/src/max_flow/max_flow_driver.cpp +++ b/src/max_flow/max_flow_driver.cpp @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "cpp_common/pgr_alloc.hpp" #include "c_types/ii_t_rt.h" diff --git a/src/max_flow/maximum_cardinality_matching_driver.cpp b/src/max_flow/maximum_cardinality_matching_driver.cpp index 0181d52e8c..2e8ea3e139 100644 --- a/src/max_flow/maximum_cardinality_matching_driver.cpp +++ b/src/max_flow/maximum_cardinality_matching_driver.cpp @@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "max_flow/pgr_maximumcardinalitymatching.hpp" diff --git a/src/max_flow/minCostMaxFlow_driver.cpp b/src/max_flow/minCostMaxFlow_driver.cpp index c6d4af3de7..416c978375 100644 --- a/src/max_flow/minCostMaxFlow_driver.cpp +++ b/src/max_flow/minCostMaxFlow_driver.cpp @@ -36,12 +36,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include -#include "c_types/costFlow_t.h" +#include "cpp_common/costFlow_t.hpp" #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "max_flow/pgr_minCostMaxFlow.hpp" diff --git a/src/mincut/stoerWagner_driver.cpp b/src/mincut/stoerWagner_driver.cpp index 26642d46eb..ef933899da 100644 --- a/src/mincut/stoerWagner_driver.cpp +++ b/src/mincut/stoerWagner_driver.cpp @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "c_types/stoerWagner_t.h" namespace { diff --git a/src/ordering/cuthillMckeeOrdering_driver.cpp b/src/ordering/cuthillMckeeOrdering_driver.cpp index e4b53c97dd..d298934e9d 100644 --- a/src/ordering/cuthillMckeeOrdering_driver.cpp +++ b/src/ordering/cuthillMckeeOrdering_driver.cpp @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "c_types/ii_t_rt.h" #include "ordering/cuthillMckeeOrdering.hpp" diff --git a/src/pickDeliver/book_keeping.cpp b/src/pickDeliver/book_keeping.cpp index baabb521be..b77226f886 100644 --- a/src/pickDeliver/book_keeping.cpp +++ b/src/pickDeliver/book_keeping.cpp @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "vrp/book_keeping.h" +#include "vrp/book_keeping.hpp" #include #include diff --git a/src/pickDeliver/dnode.cpp b/src/pickDeliver/dnode.cpp index 3e2a457ef0..baba4c0bf7 100644 --- a/src/pickDeliver/dnode.cpp +++ b/src/pickDeliver/dnode.cpp @@ -23,9 +23,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "vrp/dnode.h" +#include "vrp/dnode.hpp" -#include "vrp/pgr_pickDeliver.h" +#include "vrp/pgr_pickDeliver.hpp" namespace pgrouting { namespace vrp { diff --git a/src/pickDeliver/fleet.cpp b/src/pickDeliver/fleet.cpp index ea97e83907..f477744f60 100644 --- a/src/pickDeliver/fleet.cpp +++ b/src/pickDeliver/fleet.cpp @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "vrp/fleet.h" +#include "vrp/fleet.hpp" #include #include @@ -31,8 +31,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "vrp/dnode.h" -#include "vrp/pgr_pickDeliver.h" +#include "vrp/dnode.hpp" +#include "vrp/pgr_pickDeliver.hpp" namespace pgrouting { namespace vrp { diff --git a/src/pickDeliver/initial_solution.cpp b/src/pickDeliver/initial_solution.cpp index b9fc6ba032..b0318d4deb 100644 --- a/src/pickDeliver/initial_solution.cpp +++ b/src/pickDeliver/initial_solution.cpp @@ -24,13 +24,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "vrp/initial_solution.h" +#include "vrp/initial_solution.hpp" #include #include #include -#include "cpp_common/pgr_assert.h" -#include "vrp/solution.h" -#include "vrp/pgr_pickDeliver.h" +#include "cpp_common/pgr_assert.hpp" +#include "vrp/solution.hpp" +#include "vrp/pgr_pickDeliver.hpp" namespace pgrouting { namespace vrp { diff --git a/src/pickDeliver/optimize.cpp b/src/pickDeliver/optimize.cpp index 8821786cfd..f12eadab4c 100644 --- a/src/pickDeliver/optimize.cpp +++ b/src/pickDeliver/optimize.cpp @@ -28,11 +28,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" -#include "vrp/solution.h" -#include "vrp/optimize.h" -#include "vrp/pgr_pickDeliver.h" +#include "vrp/solution.hpp" +#include "vrp/optimize.hpp" +#include "vrp/pgr_pickDeliver.hpp" namespace pgrouting { namespace vrp { diff --git a/src/pickDeliver/order.cpp b/src/pickDeliver/order.cpp index 61e3226430..a4cf8e6761 100644 --- a/src/pickDeliver/order.cpp +++ b/src/pickDeliver/order.cpp @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "vrp/order.h" +#include "vrp/order.hpp" namespace pgrouting { diff --git a/src/pickDeliver/pd_orders.cpp b/src/pickDeliver/pd_orders.cpp index fdb7c99009..91008c6bea 100644 --- a/src/pickDeliver/pd_orders.cpp +++ b/src/pickDeliver/pd_orders.cpp @@ -23,15 +23,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "vrp/pd_orders.h" +#include "vrp/pd_orders.hpp" #include #include #include #include -#include "vrp/pgr_pickDeliver.h" -#include "vrp/dnode.h" +#include "vrp/pgr_pickDeliver.hpp" +#include "vrp/dnode.hpp" namespace pgrouting { namespace vrp { diff --git a/src/pickDeliver/pd_problem.cpp b/src/pickDeliver/pd_problem.cpp index 40e01fc4dc..6597274e49 100644 --- a/src/pickDeliver/pd_problem.cpp +++ b/src/pickDeliver/pd_problem.cpp @@ -24,13 +24,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "vrp/pd_problem.h" -#include "vrp/dnode.h" -#include "vrp/fleet.h" -#include "vrp/solution.h" -#include "vrp/tw_node.h" -#include "vrp/pd_orders.h" -#include "vrp/vehicle.h" +#include "vrp/pd_problem.hpp" +#include "vrp/dnode.hpp" +#include "vrp/fleet.hpp" +#include "vrp/solution.hpp" +#include "vrp/tw_node.hpp" +#include "vrp/pd_orders.hpp" +#include "vrp/vehicle.hpp" namespace pgrouting { namespace vrp { diff --git a/src/pickDeliver/pgr_pickDeliver.cpp b/src/pickDeliver/pgr_pickDeliver.cpp index 4a30378b67..b9eea39f61 100644 --- a/src/pickDeliver/pgr_pickDeliver.cpp +++ b/src/pickDeliver/pgr_pickDeliver.cpp @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "vrp/pgr_pickDeliver.h" +#include "vrp/pgr_pickDeliver.hpp" #include #include @@ -30,19 +30,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "c_types/pickDeliver/schedule_rt.h" +#include "c_types/schedule_rt.h" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" -#include "vrp/initials_code.h" -#include "vrp/vehicle_node.h" -#include "vrp/vehicle_pickDeliver.h" -#include "vrp/order.h" -#include "vrp/pd_orders.h" -#include "vrp/fleet.h" -#include "vrp/solution.h" -#include "vrp/initial_solution.h" -#include "vrp/optimize.h" +#include "vrp/initials_code.hpp" +#include "vrp/vehicle_node.hpp" +#include "vrp/vehicle_pickDeliver.hpp" +#include "vrp/order.hpp" +#include "vrp/pd_orders.hpp" +#include "vrp/fleet.hpp" +#include "vrp/solution.hpp" +#include "vrp/initial_solution.hpp" +#include "vrp/optimize.hpp" namespace pgrouting { namespace vrp { diff --git a/src/pickDeliver/pickDeliver.c b/src/pickDeliver/pickDeliver.c index 3564d4362d..d050a8e8a2 100644 --- a/src/pickDeliver/pickDeliver.c +++ b/src/pickDeliver/pickDeliver.c @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/time_msg.h" #include "c_types/iid_t_rt.h" -#include "c_types/pickDeliver/schedule_rt.h" +#include "c_types/schedule_rt.h" #include "drivers/pickDeliver/pickDeliver_driver.h" diff --git a/src/pickDeliver/pickDeliverEuclidean.c b/src/pickDeliver/pickDeliverEuclidean.c index 014d8fdb78..a807078233 100644 --- a/src/pickDeliver/pickDeliverEuclidean.c +++ b/src/pickDeliver/pickDeliverEuclidean.c @@ -34,9 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" #include "c_types/iid_t_rt.h" -#include "c_types/pickDeliver/orders_t.h" -#include "c_types/pickDeliver/vehicle_t.h" -#include "c_types/pickDeliver/schedule_rt.h" +#include "c_types/schedule_rt.h" #include "drivers/pickDeliver/pickDeliverEuclidean_driver.h" diff --git a/src/pickDeliver/pickDeliverEuclidean_driver.cpp b/src/pickDeliver/pickDeliverEuclidean_driver.cpp index 4b40409aab..0ef704aa6c 100644 --- a/src/pickDeliver/pickDeliverEuclidean_driver.cpp +++ b/src/pickDeliver/pickDeliverEuclidean_driver.cpp @@ -37,12 +37,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "c_types/pickDeliver/schedule_rt.h" +#include "c_types/schedule_rt.h" -#include "vrp/pgr_pickDeliver.h" +#include "vrp/pgr_pickDeliver.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "cpp_common/pgr_alloc.hpp" void diff --git a/src/pickDeliver/pickDeliver_driver.cpp b/src/pickDeliver/pickDeliver_driver.cpp index 6a47ad0550..720b82dd24 100644 --- a/src/pickDeliver/pickDeliver_driver.cpp +++ b/src/pickDeliver/pickDeliver_driver.cpp @@ -36,18 +36,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "vrp/pgr_pickDeliver.h" -#include "vrp/initials_code.h" +#include "vrp/pgr_pickDeliver.hpp" +#include "vrp/initials_code.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/Dmatrix.h" +#include "cpp_common/Dmatrix.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "cpp_common/pgr_alloc.hpp" #include "c_types/iid_t_rt.h" -#include "c_types/pickDeliver/orders_t.h" -#include "c_types/pickDeliver/vehicle_t.h" -#include "c_types/pickDeliver/schedule_rt.h" +#include "cpp_common/orders_t.hpp" +#include "cpp_common/vehicle_t.hpp" +#include "c_types/schedule_rt.h" void pgr_do_pickDeliver( diff --git a/src/pickDeliver/solution.cpp b/src/pickDeliver/solution.cpp index 3b54fee6ee..63c93259e4 100644 --- a/src/pickDeliver/solution.cpp +++ b/src/pickDeliver/solution.cpp @@ -23,15 +23,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "vrp/solution.h" +#include "vrp/solution.hpp" #include #include #include -#include "c_types/pickDeliver/schedule_rt.h" +#include "c_types/schedule_rt.h" -#include "vrp/pgr_pickDeliver.h" +#include "vrp/pgr_pickDeliver.hpp" namespace pgrouting { diff --git a/src/pickDeliver/tw_node.cpp b/src/pickDeliver/tw_node.cpp index ef80340e3d..1d625274b1 100644 --- a/src/pickDeliver/tw_node.cpp +++ b/src/pickDeliver/tw_node.cpp @@ -23,13 +23,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "vrp/tw_node.h" +#include "vrp/tw_node.hpp" #include #include -#include "cpp_common/pgr_assert.h" -#include "vrp/pgr_pickDeliver.h" +#include "cpp_common/pgr_assert.hpp" +#include "vrp/pgr_pickDeliver.hpp" namespace pgrouting { diff --git a/src/pickDeliver/vehicle.cpp b/src/pickDeliver/vehicle.cpp index 88162551f9..6f257ec32d 100644 --- a/src/pickDeliver/vehicle.cpp +++ b/src/pickDeliver/vehicle.cpp @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "vrp/vehicle.h" +#include "vrp/vehicle.hpp" #include #include @@ -34,11 +34,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "c_types/pickDeliver/schedule_rt.h" +#include "c_types/schedule_rt.h" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" -#include "vrp/pgr_pickDeliver.h" +#include "vrp/pgr_pickDeliver.hpp" namespace pgrouting { diff --git a/src/pickDeliver/vehicle_node.cpp b/src/pickDeliver/vehicle_node.cpp index 44a7daae77..41c24610d7 100644 --- a/src/pickDeliver/vehicle_node.cpp +++ b/src/pickDeliver/vehicle_node.cpp @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "vrp/vehicle_node.h" +#include "vrp/vehicle_node.hpp" namespace pgrouting { diff --git a/src/pickDeliver/vehicle_pickDeliver.cpp b/src/pickDeliver/vehicle_pickDeliver.cpp index 1d3d0fdebb..aa68cba13f 100644 --- a/src/pickDeliver/vehicle_pickDeliver.cpp +++ b/src/pickDeliver/vehicle_pickDeliver.cpp @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "vrp/vehicle_pickDeliver.h" +#include "vrp/vehicle_pickDeliver.hpp" #include #include @@ -33,10 +33,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include -#include "cpp_common/pgr_assert.h" -#include "vrp/order.h" -#include "vrp/vehicle.h" -#include "vrp/pgr_pickDeliver.h" +#include "cpp_common/pgr_assert.hpp" +#include "vrp/order.hpp" +#include "vrp/vehicle.hpp" +#include "vrp/pgr_pickDeliver.hpp" diff --git a/src/planar/boyerMyrvold_driver.cpp b/src/planar/boyerMyrvold_driver.cpp index d68c352811..9c7f5e2dd9 100644 --- a/src/planar/boyerMyrvold_driver.cpp +++ b/src/planar/boyerMyrvold_driver.cpp @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "cpp_common/pgdata_getters.hpp" #include "c_types/iid_t_rt.h" diff --git a/src/planar/isPlanar_driver.cpp b/src/planar/isPlanar_driver.cpp index 21742e8be9..0e3b0cfa10 100644 --- a/src/planar/isPlanar_driver.cpp +++ b/src/planar/isPlanar_driver.cpp @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "cpp_common/pgdata_getters.hpp" #include "planar/pgr_boyerMyrvold.hpp" diff --git a/src/spanningTree/kruskal_driver.cpp b/src/spanningTree/kruskal_driver.cpp index 135eab0b1b..c4d2d856b5 100644 --- a/src/spanningTree/kruskal_driver.cpp +++ b/src/spanningTree/kruskal_driver.cpp @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "spanningTree/pgr_kruskal.hpp" #include "spanningTree/details.hpp" diff --git a/src/spanningTree/mst_common.cpp b/src/spanningTree/mst_common.cpp index 795bf9184f..ba8b2aec3d 100644 --- a/src/spanningTree/mst_common.cpp +++ b/src/spanningTree/mst_common.cpp @@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "cpp_common/pgr_alloc.hpp" int diff --git a/src/spanningTree/prim_driver.cpp b/src/spanningTree/prim_driver.cpp index 895dc3e013..e641f127f0 100644 --- a/src/spanningTree/prim_driver.cpp +++ b/src/spanningTree/prim_driver.cpp @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "c_types/mst_rt.h" diff --git a/src/spanningTree/randomSpanningTree_driver.cpp b/src/spanningTree/randomSpanningTree_driver.cpp index f513077a6c..9acd1ac07b 100644 --- a/src/spanningTree/randomSpanningTree_driver.cpp +++ b/src/spanningTree/randomSpanningTree_driver.cpp @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "spanningTree/pgr_randomSpanningTree.hpp" template < class G > diff --git a/src/topologicalSort/topologicalSort_driver.cpp b/src/topologicalSort/topologicalSort_driver.cpp index edbdc0e4ee..a76ffbfd26 100644 --- a/src/topologicalSort/topologicalSort_driver.cpp +++ b/src/topologicalSort/topologicalSort_driver.cpp @@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/i_rt.h" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" namespace { diff --git a/src/traversal/depthFirstSearch_driver.cpp b/src/traversal/depthFirstSearch_driver.cpp index c3c521ddaf..0534e4b6d8 100644 --- a/src/traversal/depthFirstSearch_driver.cpp +++ b/src/traversal/depthFirstSearch_driver.cpp @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "spanningTree/details.hpp" #include "traversal/pgr_depthFirstSearch.hpp" diff --git a/src/trsp/GraphDefinition.cpp b/src/trsp/GraphDefinition.cpp index c29bc2932c..58c699884f 100644 --- a/src/trsp/GraphDefinition.cpp +++ b/src/trsp/GraphDefinition.cpp @@ -23,14 +23,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "trsp/GraphDefinition.h" +#include "trsp/GraphDefinition.hpp" #include #include #include #include -#include "c_types/edge_t.h" +#include "c_types/edge_rt.h" // ------------------------------------------------------------------------- GraphDefinition::GraphDefinition(void) { diff --git a/src/trsp/edgeInfo.cpp b/src/trsp/edgeInfo.cpp index 1249ea36fe..a78464956e 100644 --- a/src/trsp/edgeInfo.cpp +++ b/src/trsp/edgeInfo.cpp @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "trsp/edgeInfo.h" +#include "trsp/edgeInfo.hpp" namespace pgrouting { diff --git a/src/trsp/pgr_trspHandler.cpp b/src/trsp/pgr_trspHandler.cpp index bf1bb3da7c..3c5a39bf37 100644 --- a/src/trsp/pgr_trspHandler.cpp +++ b/src/trsp/pgr_trspHandler.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "trsp/pgr_trspHandler.h" +#include "trsp/pgr_trspHandler.hpp" #include #include @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" namespace pgrouting { namespace trsp { diff --git a/src/trsp/trsp.c b/src/trsp/trsp.c index 18ab4e3478..0bda902a19 100644 --- a/src/trsp/trsp.c +++ b/src/trsp/trsp.c @@ -27,18 +27,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/postgres_connection.h" #include "catalog/pg_type.h" + #include "c_common/debug_macro.h" #include "c_common/e_report.h" - - #include "c_types/trsp/trsp.h" -#include "c_types/edge_t.h" - +#include "c_types/edge_rt.h" #include "c_common/trsp_pgget.h" +#include "drivers/trsp/trsp_core.h" -#include "trsp/trsp_core.h" typedef struct restrict_t restrict_t; -typedef struct Edge_t Edge_t; +typedef struct Edge_rt Edge_t; typedef struct path_element_tt path_element_tt; PGDLLEXPORT Datum _pgr_trsp(PG_FUNCTION_ARGS); diff --git a/src/trsp/trspVia_driver.cpp b/src/trsp/trspVia_driver.cpp index 0d25d7b23b..d2bb0d5db6 100644 --- a/src/trsp/trspVia_driver.cpp +++ b/src/trsp/trspVia_driver.cpp @@ -35,14 +35,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "dijkstra/pgr_dijkstraVia.hpp" #include "c_types/routes_t.h" -#include "c_types/restriction_t.h" +#include "cpp_common/restriction_t.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/rule.h" +#include "cpp_common/rule.hpp" #include "cpp_common/combinations.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" -#include "trsp/pgr_trspHandler.h" +#include "trsp/pgr_trspHandler.hpp" namespace { diff --git a/src/trsp/trspVia_withPoints_driver.cpp b/src/trsp/trspVia_withPoints_driver.cpp index d20448ed3a..c2ca4cedfc 100644 --- a/src/trsp/trspVia_withPoints_driver.cpp +++ b/src/trsp/trspVia_withPoints_driver.cpp @@ -34,13 +34,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/routes_t.h" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" -#include "cpp_common/rule.h" +#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/rule.hpp" #include "cpp_common/combinations.hpp" #include "dijkstra/pgr_dijkstraVia.hpp" #include "withPoints/pgr_withPoints.hpp" -#include "trsp/pgr_trspHandler.h" +#include "trsp/pgr_trspHandler.hpp" namespace { diff --git a/src/trsp/trsp_core.cpp b/src/trsp/trsp_core.cpp index 61fd6f2c51..6f0a69e9e5 100644 --- a/src/trsp/trsp_core.cpp +++ b/src/trsp/trsp_core.cpp @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "trsp/trsp_core.h" +#include "drivers/trsp/trsp_core.h" #ifdef __MINGW32__ #include @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "trsp/GraphDefinition.h" +#include "trsp/GraphDefinition.hpp" int trsp_edge_wrapper( diff --git a/src/trsp/trsp_driver.cpp b/src/trsp/trsp_driver.cpp index ae0c1d7477..e6d3b4278b 100644 --- a/src/trsp/trsp_driver.cpp +++ b/src/trsp/trsp_driver.cpp @@ -40,13 +40,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "trsp/pgr_trspHandler.h" +#include "trsp/pgr_trspHandler.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/rule.h" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/rule.hpp" +#include "cpp_common/pgr_assert.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/combinations.hpp" -#include "c_types/restriction_t.h" +#include "cpp_common/restriction_t.hpp" #include "c_types/ii_t_rt.h" #include "withPoints/pgr_withPoints.hpp" diff --git a/src/trsp/trsp_withPoints.c b/src/trsp/trsp_withPoints.c index 99dc7df6f5..155ea5ee4a 100644 --- a/src/trsp/trsp_withPoints.c +++ b/src/trsp/trsp_withPoints.c @@ -29,7 +29,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "c_common/postgres_connection.h" -#include "utils/array.h" #include "c_types/path_rt.h" #include "c_common/debug_macro.h" diff --git a/src/trsp/trsp_withPoints_driver.cpp b/src/trsp/trsp_withPoints_driver.cpp index 44a28ab633..fb90757890 100644 --- a/src/trsp/trsp_withPoints_driver.cpp +++ b/src/trsp/trsp_withPoints_driver.cpp @@ -42,11 +42,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" -#include "cpp_common/rule.h" +#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/rule.hpp" #include "cpp_common/combinations.hpp" #include "withPoints/pgr_withPoints.hpp" -#include "trsp/pgr_trspHandler.h" +#include "trsp/pgr_trspHandler.hpp" #include "dijkstra/dijkstra.hpp" diff --git a/src/tsp/TSP_driver.cpp b/src/tsp/TSP_driver.cpp index b54ea8955c..5b8b7ea32f 100644 --- a/src/tsp/TSP_driver.cpp +++ b/src/tsp/TSP_driver.cpp @@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/ii_t_rt.h" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "tsp/tsp.hpp" diff --git a/src/tsp/euclideanTSP.c b/src/tsp/euclideanTSP.c index e40b7c8fa5..e7e090b692 100644 --- a/src/tsp/euclideanTSP.c +++ b/src/tsp/euclideanTSP.c @@ -29,7 +29,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ #include "c_common/postgres_connection.h" -#include "utils/array.h" #include "c_types/path_rt.h" #include "c_common/debug_macro.h" diff --git a/src/tsp/euclideanTSP_driver.cpp b/src/tsp/euclideanTSP_driver.cpp index 1f1476a509..532193b3d5 100644 --- a/src/tsp/euclideanTSP_driver.cpp +++ b/src/tsp/euclideanTSP_driver.cpp @@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/tsp_tour_rt.h" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" void pgr_do_euclideanTSP( diff --git a/src/tsp/tsp.cpp b/src/tsp/tsp.cpp index 20948eee3f..7c81d6d495 100644 --- a/src/tsp/tsp.cpp +++ b/src/tsp/tsp.cpp @@ -40,8 +40,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/identifiers.hpp" -#include "cpp_common/pgr_messages.h" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_messages.hpp" +#include "cpp_common/pgr_assert.hpp" #include "cpp_common/interruption.hpp" #include "visitors/dijkstra_visitors.hpp" diff --git a/src/withPoints/pgr_withPoints.cpp b/src/withPoints/pgr_withPoints.cpp index 84cf9b698a..ba8aab30ae 100644 --- a/src/withPoints/pgr_withPoints.cpp +++ b/src/withPoints/pgr_withPoints.cpp @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" namespace pgrouting { diff --git a/src/withPoints/withPointsVia_driver.cpp b/src/withPoints/withPointsVia_driver.cpp index 3f5956b31d..f2e27d492e 100644 --- a/src/withPoints/withPointsVia_driver.cpp +++ b/src/withPoints/withPointsVia_driver.cpp @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/routes_t.h" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "dijkstra/pgr_dijkstraVia.hpp" #include "withPoints/pgr_withPoints.hpp" diff --git a/src/withPoints/withPoints_driver.cpp b/src/withPoints/withPoints_driver.cpp index cc5dfdb75d..8c64f3877b 100644 --- a/src/withPoints/withPoints_driver.cpp +++ b/src/withPoints/withPoints_driver.cpp @@ -43,7 +43,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/combinations.hpp" #include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.h" +#include "cpp_common/pgr_assert.hpp" #include "dijkstra/dijkstra.hpp" From cc500481f23b978544d4d5c726eae3e2694cf3d2 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 11 Feb 2024 20:02:42 -0600 Subject: [PATCH 126/428] (doc) updating release notes & NEWS --- NEWS.md | 6 ++++++ doc/src/index.rst | 4 +--- doc/src/release_notes.rst | 9 +++++++++ include/vrp/dnode.hpp | 2 +- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/NEWS.md b/NEWS.md index 0cff40508c..70ed5b3e30 100644 --- a/NEWS.md +++ b/NEWS.md @@ -3,6 +3,9 @@ ## pgRouting 3.7 + +.. current + ### pgRouting 3.7.0 Release Notes To see all issues & pull requests closed by this release see the [Git closed @@ -36,6 +39,9 @@ milestone for 3.7.0 cleanup * [#2607](https://github.com/pgRouting/pgrouting/pull/2607) Read postgresql data on C++ +* [#2614](https://github.com/pgRouting/pgrouting/pull/2614) Clang tidy does + not work + **Others** diff --git a/doc/src/index.rst b/doc/src/index.rst index 9da7cd4589..e3f8eee218 100644 --- a/doc/src/index.rst +++ b/doc/src/index.rst @@ -89,10 +89,8 @@ Available Functions but not official pgRouting functions :doc:`release_notes` =============================================================================== -Current release -------------------------------------------------------------------------------- .. include:: release_notes.rst - :start-after: 0%22>`_ + :start-after: current :end-before: pgRouting 3.6 All releases diff --git a/doc/src/release_notes.rst b/doc/src/release_notes.rst index 781bd584f0..5c473162dc 100644 --- a/doc/src/release_notes.rst +++ b/doc/src/release_notes.rst @@ -30,6 +30,12 @@ pgRouting 3 pgRouting 3.7 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +.. contents:: Contents + :local: + :depth: 1 + +.. current + pgRouting 3.7.0 Release Notes ------------------------------------------------------------------------------- @@ -62,6 +68,9 @@ milestone for 3.7.0 cleanup * `#2607 `__ Read postgresql data on C++ +* `#2614 `__ Clang tidy does + not work + .. rubric:: Others diff --git a/include/vrp/dnode.hpp b/include/vrp/dnode.hpp index 72c19f6a13..4dea7659a6 100644 --- a/include/vrp/dnode.hpp +++ b/include/vrp/dnode.hpp @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -/*! @file dnode.h */ +/*! @file dnode.hpp */ #ifndef INCLUDE_VRP_DNODE_HPP_ #define INCLUDE_VRP_DNODE_HPP_ From f52a0176eb3d8b14d089c6e594f3ed056e79ac48 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 11 Feb 2024 21:31:43 -0600 Subject: [PATCH 127/428] (licence) fixing file name on licences --- include/allpairs/pgr_allpairs.hpp | 2 +- include/alphaShape/pgr_alphaShape.h | 2 +- include/astar/astar.hpp | 1 - include/bdAstar/bdAstar.hpp | 2 +- include/bdDijkstra/pgr_bdDijkstra.hpp | 1 - include/c_common/debug_macro.h | 1 - include/c_common/time_msg.h | 3 +-- include/c_types/edge_rt.h | 2 +- include/c_types/routes_t.h | 2 +- include/c_types/stoerWagner_t.h | 2 +- include/c_types/transitiveClosure_rt.h | 2 +- include/chinese/pgr_chinesePostman.hpp | 1 + include/circuits/hawickcircuits.hpp | 1 + include/components/componentsResult.hpp | 1 + include/components/pgr_components.hpp | 1 + include/contraction/ch_graphs.hpp | 2 +- include/contraction/pgr_deadEndContraction.hpp | 2 +- include/contraction/pgr_linearContraction.hpp | 2 +- include/cpp_common/Dmatrix.hpp | 1 + include/cpp_common/basePath_SSEC.hpp | 1 - include/cpp_common/basic_edge.hpp | 2 +- include/cpp_common/basic_vertex.hpp | 2 +- include/cpp_common/ch_edge.hpp | 2 +- include/cpp_common/ch_vertex.hpp | 2 +- include/cpp_common/compPaths.hpp | 2 +- include/cpp_common/coordinate_t.hpp | 2 +- include/cpp_common/costFlow_t.hpp | 2 +- include/cpp_common/delauny_t.hpp | 2 +- include/cpp_common/edge_t.hpp | 2 +- include/cpp_common/edge_xy_t.hpp | 2 +- include/cpp_common/graph_enum.hpp | 2 +- include/cpp_common/identifier.hpp | 2 +- include/cpp_common/identifiers.hpp | 3 +-- include/cpp_common/interruption.hpp | 1 + include/cpp_common/line_vertex.hpp | 2 +- include/cpp_common/linear_directed_graph.hpp | 2 +- include/cpp_common/orders_t.hpp | 2 +- include/cpp_common/path_t.hpp | 2 +- include/cpp_common/pgr_alloc.hpp | 2 +- include/cpp_common/pgr_assert.hpp | 3 +-- include/cpp_common/pgr_base_graph.hpp | 3 ++- include/cpp_common/pgr_bidirectional.hpp | 2 +- include/cpp_common/pgr_messages.hpp | 3 +-- include/cpp_common/point_on_edge_t.hpp | 2 +- include/cpp_common/restriction_t.hpp | 2 +- include/cpp_common/rule.hpp | 3 +-- include/cpp_common/signalhandler.hpp | 1 + include/cpp_common/vehicle_t.hpp | 2 +- include/cpp_common/xy_vertex.hpp | 2 +- include/dagShortestPath/pgr_dagShortestPath.hpp | 1 + include/dijkstra/dijkstra.hpp | 1 - include/dijkstra/drivingDist.hpp | 3 +-- include/max_flow/pgr_flowgraph.hpp | 1 + include/max_flow/pgr_maxflow.hpp | 1 + include/max_flow/pgr_maximumcardinalitymatching.hpp | 1 + include/max_flow/pgr_minCostMaxFlow.hpp | 1 + include/transitiveClosure/pgr_transitiveClosure.hpp | 2 +- include/trsp/GraphDefinition.hpp | 4 +--- include/trsp/edgeInfo.hpp | 3 +-- include/trsp/pgr_trspHandler.hpp | 3 +-- include/visitors/astar_visitors.hpp | 2 +- include/visitors/dfs_visitor.hpp | 2 +- include/visitors/dfs_visitor_with_root.hpp | 2 +- include/visitors/dijkstra_visitors.hpp | 2 +- include/visitors/edges_order_bfs_visitor.hpp | 2 +- include/visitors/found_goals.hpp | 2 +- include/vrp/book_keeping.hpp | 5 ++--- include/vrp/dnode.hpp | 3 +-- include/vrp/fleet.hpp | 3 +-- include/vrp/initial_solution.hpp | 3 +-- include/vrp/initials_code.hpp | 3 +-- include/vrp/optimize.hpp | 3 +-- include/vrp/order.hpp | 3 +-- include/vrp/pd_orders.hpp | 3 +-- include/vrp/pd_problem.hpp | 3 +-- include/vrp/pgr_pickDeliver.hpp | 3 +-- include/vrp/solution.hpp | 3 +-- include/vrp/tw_node.hpp | 3 +-- include/vrp/vehicle.hpp | 3 +-- include/vrp/vehicle_node.hpp | 3 +-- include/vrp/vehicle_pickDeliver.hpp | 3 +-- include/withPoints/pgr_withPoints.hpp | 2 +- include/yen/pgr_turnRestrictedPath.hpp | 2 +- src/alpha_shape/alphaShape.c | 2 +- src/alpha_shape/alphaShape_driver.cpp | 2 +- src/alpha_shape/pgr_alphaShape.cpp | 2 +- src/bellman_ford/bellman_ford_neg.c | 2 +- src/bellman_ford/bellman_ford_neg_driver.cpp | 2 +- src/chinese/chinesePostman_driver.cpp | 2 +- src/common/basic_edge.cpp | 2 +- src/common/basic_vertex.cpp | 2 +- src/common/check_parameters.c | 2 +- src/common/identifier.cpp | 1 + src/common/pgr_alloc.cpp | 2 +- src/common/pgr_assert.cpp | 3 +-- src/common/signalhandler.cpp | 1 + src/common/time_msg.c | 3 +-- src/common/xy_vertex.cpp | 2 +- src/components/componentsResult.cpp | 1 + src/components/pgr_components.cpp | 1 + src/cpp_common/Dmatrix.cpp | 3 +-- src/cpp_common/bpoint.cpp | 2 +- src/cpp_common/pgr_messages.cpp | 3 +-- src/cpp_common/rule.cpp | 3 +-- src/dominator/lengauerTarjanDominatorTree_driver.cpp | 2 +- src/driving_distance/many_to_dist_withPointsDD.c | 2 +- src/ksp/withPoints_ksp_driver.cpp | 2 +- src/max_flow/max_flow.c | 2 +- src/max_flow/max_flow_driver.cpp | 2 +- src/max_flow/pgr_flowgraph.cpp | 1 + src/max_flow/pgr_maxflow.cpp | 1 + src/max_flow/pgr_minCostMaxFlow.cpp | 1 + src/pickDeliver/book_keeping.cpp | 1 + src/pickDeliver/dnode.cpp | 3 +-- src/pickDeliver/fleet.cpp | 3 +-- src/pickDeliver/initial_solution.cpp | 3 +-- src/pickDeliver/optimize.cpp | 3 +-- src/pickDeliver/order.cpp | 3 +-- src/pickDeliver/pd_orders.cpp | 3 +-- src/pickDeliver/pd_problem.cpp | 3 +-- src/pickDeliver/pgr_pickDeliver.cpp | 2 +- src/pickDeliver/pickDeliverEuclidean_driver.cpp | 2 +- src/pickDeliver/solution.cpp | 3 +-- src/pickDeliver/tw_node.cpp | 3 +-- src/pickDeliver/vehicle.cpp | 3 +-- src/pickDeliver/vehicle_node.cpp | 3 +-- src/pickDeliver/vehicle_pickDeliver.cpp | 3 +-- src/spanningTree/details.cpp | 2 +- src/spanningTree/mst_common.cpp | 2 +- src/topologicalSort/topologicalSort.c | 1 - src/trsp/GraphDefinition.cpp | 1 - src/trsp/edgeInfo.cpp | 3 +-- src/trsp/new_trsp.c | 1 - src/trsp/pgr_trspHandler.cpp | 1 - src/trsp/trsp.c | 1 - src/trsp/trsp_core.cpp | 1 - src/tsp/TSP_driver.cpp | 3 +-- src/tsp/euclideanTSP_driver.cpp | 3 +-- src/tsp/tsp.cpp | 3 +-- src/version/version.c | 3 +-- src/version/version.h.in | 3 +-- 141 files changed, 132 insertions(+), 170 deletions(-) diff --git a/include/allpairs/pgr_allpairs.hpp b/include/allpairs/pgr_allpairs.hpp index 96f96842ac..aad39324a0 100644 --- a/include/allpairs/pgr_allpairs.hpp +++ b/include/allpairs/pgr_allpairs.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_allpairs.hpp +File: pgr_allpairs.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/alphaShape/pgr_alphaShape.h b/include/alphaShape/pgr_alphaShape.h index bcacbbf0f9..4f6789432b 100644 --- a/include/alphaShape/pgr_alphaShape.h +++ b/include/alphaShape/pgr_alphaShape.h @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -file: pgr_alphaShape.h +File: pgr_alphaShape.h Copyright (c) 2018 pgRouting developers Mail: project@pgrouting.org diff --git a/include/astar/astar.hpp b/include/astar/astar.hpp index 1f87bfb756..10e466e62e 100644 --- a/include/astar/astar.hpp +++ b/include/astar/astar.hpp @@ -1,5 +1,4 @@ /*PGR-GNU***************************************************************** - File: astar.hpp Copyright (c) 2015 pgRouting developers diff --git a/include/bdAstar/bdAstar.hpp b/include/bdAstar/bdAstar.hpp index 4b51856ddd..3834486b76 100644 --- a/include/bdAstar/bdAstar.hpp +++ b/include/bdAstar/bdAstar.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_bdAstar.hpp +File: bdAstar.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/bdDijkstra/pgr_bdDijkstra.hpp b/include/bdDijkstra/pgr_bdDijkstra.hpp index f6637f55a0..8bd5c444c6 100644 --- a/include/bdDijkstra/pgr_bdDijkstra.hpp +++ b/include/bdDijkstra/pgr_bdDijkstra.hpp @@ -1,5 +1,4 @@ /*PGR-GNU***************************************************************** - File: pgr_bdDijkstra.hpp Copyright (c) 2015 pgRouting developers diff --git a/include/c_common/debug_macro.h b/include/c_common/debug_macro.h index 087d6bc670..e802479d03 100644 --- a/include/c_common/debug_macro.h +++ b/include/c_common/debug_macro.h @@ -1,5 +1,4 @@ /*PGR-GNU***************************************************************** - File: debug_macro.h Copyright (c) 2015 pgRouting developers diff --git a/include/c_common/time_msg.h b/include/c_common/time_msg.h index 04a6b9a560..7e66b0f15b 100644 --- a/include/c_common/time_msg.h +++ b/include/c_common/time_msg.h @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: time_msg.h +File: time_msg.h Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/c_types/edge_rt.h b/include/c_types/edge_rt.h index f6ec1519d8..06f9c050ec 100644 --- a/include/c_types/edge_rt.h +++ b/include/c_types/edge_rt.h @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: Edge_rt.h +File: edge_rt.h Copyright (c) 2017 pgRouting developers Mail: project@pgrouting.org diff --git a/include/c_types/routes_t.h b/include/c_types/routes_t.h index 2f56eb2030..1bfc791d14 100644 --- a/include/c_types/routes_t.h +++ b/include/c_types/routes_t.h @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_types.h +File: routes_t.h Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/c_types/stoerWagner_t.h b/include/c_types/stoerWagner_t.h index 968559bded..67bb43650f 100644 --- a/include/c_types/stoerWagner_t.h +++ b/include/c_types/stoerWagner_t.h @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_stoerWagner_t.h +File: stoerWagner_t.h Copyright (c) 2015 Aditya Pratap Singh Mail: adityapratap.singh28@gmail.com diff --git a/include/c_types/transitiveClosure_rt.h b/include/c_types/transitiveClosure_rt.h index 98f407890d..2b00808c7d 100644 --- a/include/c_types/transitiveClosure_rt.h +++ b/include/c_types/transitiveClosure_rt.h @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: contracted_rt.h +File: transitiveClosure_rt.h Copyright (c) 2017 pgRouting developers Mail: project@pgrouting.org diff --git a/include/chinese/pgr_chinesePostman.hpp b/include/chinese/pgr_chinesePostman.hpp index c832ab8b1f..239b1a61a1 100644 --- a/include/chinese/pgr_chinesePostman.hpp +++ b/include/chinese/pgr_chinesePostman.hpp @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: pgr_chinesePostman.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/circuits/hawickcircuits.hpp b/include/circuits/hawickcircuits.hpp index 54612e6df2..e9c06a427c 100644 --- a/include/circuits/hawickcircuits.hpp +++ b/include/circuits/hawickcircuits.hpp @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: hawickcircuits.hpp Copyright (c) 2022 pgRouting developers Mail: project@pgrouting.org diff --git a/include/components/componentsResult.hpp b/include/components/componentsResult.hpp index 89100a1c67..a91883f0cc 100644 --- a/include/components/componentsResult.hpp +++ b/include/components/componentsResult.hpp @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: componentsResult.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/components/pgr_components.hpp b/include/components/pgr_components.hpp index 436f9c433f..09f500c837 100644 --- a/include/components/pgr_components.hpp +++ b/include/components/pgr_components.hpp @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: pgr_components.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/contraction/ch_graphs.hpp b/include/contraction/ch_graphs.hpp index 70b8bc9cf5..c0a71e1e4b 100644 --- a/include/contraction/ch_graphs.hpp +++ b/include/contraction/ch_graphs.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_CH_graphs.hpp +File: ch_graphs.hpp Generated with Template by: Copyright (c) 2015 pgRouting developers diff --git a/include/contraction/pgr_deadEndContraction.hpp b/include/contraction/pgr_deadEndContraction.hpp index ea234a66a3..5e06e77c89 100644 --- a/include/contraction/pgr_deadEndContraction.hpp +++ b/include/contraction/pgr_deadEndContraction.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_deadend.hpp +File: pgr_deadEndContraction.hpp Generated with Template by: Copyright (c) 2015 pgRouting developers diff --git a/include/contraction/pgr_linearContraction.hpp b/include/contraction/pgr_linearContraction.hpp index 7c1d1fc3c5..54546ae10e 100644 --- a/include/contraction/pgr_linearContraction.hpp +++ b/include/contraction/pgr_linearContraction.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_linear.c +File: pgr_linearContraction.hpp Generated with Template by: Copyright (c) 2015 pgRouting developers diff --git a/include/cpp_common/Dmatrix.hpp b/include/cpp_common/Dmatrix.hpp index ea8302f28e..a4db572b27 100644 --- a/include/cpp_common/Dmatrix.hpp +++ b/include/cpp_common/Dmatrix.hpp @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: Dmatrix.hpp FILE: Dmatrix.h diff --git a/include/cpp_common/basePath_SSEC.hpp b/include/cpp_common/basePath_SSEC.hpp index 995c195ecd..5957deb08f 100644 --- a/include/cpp_common/basePath_SSEC.hpp +++ b/include/cpp_common/basePath_SSEC.hpp @@ -1,5 +1,4 @@ /*PGR-GNU***************************************************************** - File: basePath_SSEC.hpp Copyright (c) 2015 pgRouting developers diff --git a/include/cpp_common/basic_edge.hpp b/include/cpp_common/basic_edge.hpp index e34d33f3b6..5353ebf014 100644 --- a/include/cpp_common/basic_edge.hpp +++ b/include/cpp_common/basic_edge.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** - * +File: basic_edge.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/cpp_common/basic_vertex.hpp b/include/cpp_common/basic_vertex.hpp index 9d74edcfe6..654d251722 100644 --- a/include/cpp_common/basic_vertex.hpp +++ b/include/cpp_common/basic_vertex.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** - * +File: basic_vertex.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/cpp_common/ch_edge.hpp b/include/cpp_common/ch_edge.hpp index f35cb22598..879b9dd7a9 100644 --- a/include/cpp_common/ch_edge.hpp +++ b/include/cpp_common/ch_edge.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: ch_edge.h +File: ch_edge.hpp Generated with Template by: Copyright (c) 2015 pgRouting developers diff --git a/include/cpp_common/ch_vertex.hpp b/include/cpp_common/ch_vertex.hpp index 6397ea463d..f6c7a3a838 100644 --- a/include/cpp_common/ch_vertex.hpp +++ b/include/cpp_common/ch_vertex.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: ch_vertex.h +File: ch_vertex.hpp Generated with Template by: Copyright (c) 2015 pgRouting developers diff --git a/include/cpp_common/compPaths.hpp b/include/cpp_common/compPaths.hpp index 681fcb780d..69fc7db651 100644 --- a/include/cpp_common/compPaths.hpp +++ b/include/cpp_common/compPaths.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: compPaths.h +File: compPaths.hpp Copyright (c) 2018 pgRouting developers Mail: project@pgrouting.org diff --git a/include/cpp_common/coordinate_t.hpp b/include/cpp_common/coordinate_t.hpp index 82ea05891c..36a8c20610 100644 --- a/include/cpp_common/coordinate_t.hpp +++ b/include/cpp_common/coordinate_t.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: coordinate_t.h +File: coordinate_t.hpp Copyright (c) 2017 pgRouting developers Mail: project@pgrouting.org diff --git a/include/cpp_common/costFlow_t.hpp b/include/cpp_common/costFlow_t.hpp index 6e394671ee..bfb211b64d 100644 --- a/include/cpp_common/costFlow_t.hpp +++ b/include/cpp_common/costFlow_t.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: costFlow_t.h +File: costFlow_t.hpp Copyright (c) 2018 Maoguang Wang Mail: xjtumg1007@gmail.com diff --git a/include/cpp_common/delauny_t.hpp b/include/cpp_common/delauny_t.hpp index 0a333299b7..41e17aee3f 100644 --- a/include/cpp_common/delauny_t.hpp +++ b/include/cpp_common/delauny_t.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: delauny_t.h +File: delauny_t.hpp Copyright (c) 2019 pgRouting developers Mail: project@pgrouting.org diff --git a/include/cpp_common/edge_t.hpp b/include/cpp_common/edge_t.hpp index d79160cf4b..e3d2c4fd94 100644 --- a/include/cpp_common/edge_t.hpp +++ b/include/cpp_common/edge_t.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: Edge_t.h +File: edge_t.hpp Copyright (c) 2017 pgRouting developers Mail: project@pgrouting.org diff --git a/include/cpp_common/edge_xy_t.hpp b/include/cpp_common/edge_xy_t.hpp index 2e84479c5b..b8426d1aa2 100644 --- a/include/cpp_common/edge_xy_t.hpp +++ b/include/cpp_common/edge_xy_t.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: edge_xy_t.h +File: edge_xy_t.hpp Copyright (c) 2017 pgRouting developers Mail: project@pgrouting.org diff --git a/include/cpp_common/graph_enum.hpp b/include/cpp_common/graph_enum.hpp index ac327b5e51..c114c8669c 100644 --- a/include/cpp_common/graph_enum.hpp +++ b/include/cpp_common/graph_enum.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_types.h +File: graph_enum.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/cpp_common/identifier.hpp b/include/cpp_common/identifier.hpp index 0bfa562b80..8606a4d556 100644 --- a/include/cpp_common/identifier.hpp +++ b/include/cpp_common/identifier.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** - * +File: identifier.hpp Copyright (c) 2017 pgRouting developers Mail: project@pgrouting.org diff --git a/include/cpp_common/identifiers.hpp b/include/cpp_common/identifiers.hpp index 8d68276372..4cc68806c3 100644 --- a/include/cpp_common/identifiers.hpp +++ b/include/cpp_common/identifiers.hpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: identifiers.hpp +File: identifiers.hpp Generated with Template by: Copyright (c) 2015 pgRouting developers diff --git a/include/cpp_common/interruption.hpp b/include/cpp_common/interruption.hpp index 52c6e7297e..e326fb9da3 100644 --- a/include/cpp_common/interruption.hpp +++ b/include/cpp_common/interruption.hpp @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: interruption.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/cpp_common/line_vertex.hpp b/include/cpp_common/line_vertex.hpp index ee8df60a43..f5f6a3c519 100644 --- a/include/cpp_common/line_vertex.hpp +++ b/include/cpp_common/line_vertex.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: line_vertex.h +File: line_vertex.hpp Generated with Template by: Copyright (c) 2015 pgRouting developers diff --git a/include/cpp_common/linear_directed_graph.hpp b/include/cpp_common/linear_directed_graph.hpp index 0752940466..4597d931f9 100644 --- a/include/cpp_common/linear_directed_graph.hpp +++ b/include/cpp_common/linear_directed_graph.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** - * +File: linear_directed_graph.hpp Copyright (c) 2017 Anthony Nicola Tasca atasca10@gmail.com diff --git a/include/cpp_common/orders_t.hpp b/include/cpp_common/orders_t.hpp index 44af65dba2..a6151e0091 100644 --- a/include/cpp_common/orders_t.hpp +++ b/include/cpp_common/orders_t.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: orders_t.h +File: orders_t.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/cpp_common/path_t.hpp b/include/cpp_common/path_t.hpp index 80789a0e21..5e862bab73 100644 --- a/include/cpp_common/path_t.hpp +++ b/include/cpp_common/path_t.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: path_t.h +File: path_t.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/cpp_common/pgr_alloc.hpp b/include/cpp_common/pgr_alloc.hpp index b5fe731d94..cdc6660332 100644 --- a/include/cpp_common/pgr_alloc.hpp +++ b/include/cpp_common/pgr_alloc.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_palloc.hpp +File: pgr_alloc.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/cpp_common/pgr_assert.hpp b/include/cpp_common/pgr_assert.hpp index c8c6c8be6a..3ec21e8550 100644 --- a/include/cpp_common/pgr_assert.hpp +++ b/include/cpp_common/pgr_assert.hpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: pgr_assert +File: pgr_assert.hpp Copyright (c) 2014 pgRouting developers Mail: project@pgrouting.org diff --git a/include/cpp_common/pgr_base_graph.hpp b/include/cpp_common/pgr_base_graph.hpp index 3f03a0d0a7..a92019bf2c 100644 --- a/include/cpp_common/pgr_base_graph.hpp +++ b/include/cpp_common/pgr_base_graph.hpp @@ -1,5 +1,6 @@ /*PGR-GNU***************************************************************** - * +File: pgr_base_graph.hpp + Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/cpp_common/pgr_bidirectional.hpp b/include/cpp_common/pgr_bidirectional.hpp index d5ea79efc9..aa8a2f9d1f 100644 --- a/include/cpp_common/pgr_bidirectional.hpp +++ b/include/cpp_common/pgr_bidirectional.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_bdAstar.hpp +File: pgr_bidirectional.hpp Generated with Template by: Copyright (c) 2015 pgRouting developers diff --git a/include/cpp_common/pgr_messages.hpp b/include/cpp_common/pgr_messages.hpp index 45170e96ec..f85bdf7978 100644 --- a/include/cpp_common/pgr_messages.hpp +++ b/include/cpp_common/pgr_messages.hpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: pgr_messages.h +File: pgr_messages.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/cpp_common/point_on_edge_t.hpp b/include/cpp_common/point_on_edge_t.hpp index 856d98f0e1..f2ac980bf7 100644 --- a/include/cpp_common/point_on_edge_t.hpp +++ b/include/cpp_common/point_on_edge_t.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: point_on_edge_t.h +File: point_on_edge_t.hpp Copyright (c) 2017 pgRouting developers Mail: project@pgrouting.org diff --git a/include/cpp_common/restriction_t.hpp b/include/cpp_common/restriction_t.hpp index e50224d093..3e1309dfd5 100644 --- a/include/cpp_common/restriction_t.hpp +++ b/include/cpp_common/restriction_t.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: restrict_t.h +File: restriction_t.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/cpp_common/rule.hpp b/include/cpp_common/rule.hpp index d18fdc7cdb..29d414291d 100644 --- a/include/cpp_common/rule.hpp +++ b/include/cpp_common/rule.hpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: rule.h +File: rule.hpp Copyright (c) 2017 pgRouting developers Mail: project@pgrouting.org diff --git a/include/cpp_common/signalhandler.hpp b/include/cpp_common/signalhandler.hpp index 51d2ec31b5..db799ae886 100644 --- a/include/cpp_common/signalhandler.hpp +++ b/include/cpp_common/signalhandler.hpp @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: signalhandler.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/cpp_common/vehicle_t.hpp b/include/cpp_common/vehicle_t.hpp index e141c2558d..cda2ee2691 100644 --- a/include/cpp_common/vehicle_t.hpp +++ b/include/cpp_common/vehicle_t.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: vehicle_t.h +File: vehicle_t.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/cpp_common/xy_vertex.hpp b/include/cpp_common/xy_vertex.hpp index 20e4bc10ec..a9924b7fec 100644 --- a/include/cpp_common/xy_vertex.hpp +++ b/include/cpp_common/xy_vertex.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** - * +File: xy_vertex.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/dagShortestPath/pgr_dagShortestPath.hpp b/include/dagShortestPath/pgr_dagShortestPath.hpp index f26cf56838..a42bc70846 100644 --- a/include/dagShortestPath/pgr_dagShortestPath.hpp +++ b/include/dagShortestPath/pgr_dagShortestPath.hpp @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: pgr_dagShortestPath.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/dijkstra/dijkstra.hpp b/include/dijkstra/dijkstra.hpp index 93d9c4c566..b8330604f5 100644 --- a/include/dijkstra/dijkstra.hpp +++ b/include/dijkstra/dijkstra.hpp @@ -1,5 +1,4 @@ /*PGR-GNU***************************************************************** - File: dijkstra.hpp Copyright (c) 2015 pgRouting developers diff --git a/include/dijkstra/drivingDist.hpp b/include/dijkstra/drivingDist.hpp index aed2081e32..856eddad4d 100644 --- a/include/dijkstra/drivingDist.hpp +++ b/include/dijkstra/drivingDist.hpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -file: drivingDist.hpp +File: drivingDist.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/max_flow/pgr_flowgraph.hpp b/include/max_flow/pgr_flowgraph.hpp index 9d390c354c..316d4de95f 100644 --- a/include/max_flow/pgr_flowgraph.hpp +++ b/include/max_flow/pgr_flowgraph.hpp @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: pgr_flowgraph.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/max_flow/pgr_maxflow.hpp b/include/max_flow/pgr_maxflow.hpp index f960983227..e0d6123a32 100644 --- a/include/max_flow/pgr_maxflow.hpp +++ b/include/max_flow/pgr_maxflow.hpp @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: pgr_maxflow.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/max_flow/pgr_maximumcardinalitymatching.hpp b/include/max_flow/pgr_maximumcardinalitymatching.hpp index e082f44c66..3d8175b7ca 100644 --- a/include/max_flow/pgr_maximumcardinalitymatching.hpp +++ b/include/max_flow/pgr_maximumcardinalitymatching.hpp @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: pgr_maximumcardinalitymatching.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/max_flow/pgr_minCostMaxFlow.hpp b/include/max_flow/pgr_minCostMaxFlow.hpp index 45ae8e9bf1..596e72f96e 100644 --- a/include/max_flow/pgr_minCostMaxFlow.hpp +++ b/include/max_flow/pgr_minCostMaxFlow.hpp @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: pgr_minCostMaxFlow.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/transitiveClosure/pgr_transitiveClosure.hpp b/include/transitiveClosure/pgr_transitiveClosure.hpp index 9c7a57843f..a9e0e9758b 100644 --- a/include/transitiveClosure/pgr_transitiveClosure.hpp +++ b/include/transitiveClosure/pgr_transitiveClosure.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_contract.hpp +File: pgr_transitiveClosure.hpp Generated with Template by: Copyright (c) 2015 pgRouting developers diff --git a/include/trsp/GraphDefinition.hpp b/include/trsp/GraphDefinition.hpp index b27bb50af8..ea10b83d67 100644 --- a/include/trsp/GraphDefinition.hpp +++ b/include/trsp/GraphDefinition.hpp @@ -1,7 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: GraphDefinition.h - +File: GraphDefinition.hpp Copyright (c) 2012 pgRouting developers Mail: project@pgrouting.org diff --git a/include/trsp/edgeInfo.hpp b/include/trsp/edgeInfo.hpp index 5064747346..fea4835fb9 100644 --- a/include/trsp/edgeInfo.hpp +++ b/include/trsp/edgeInfo.hpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: edgeInfo.h +File: edgeInfo.hpp Copyright (c) 2017 pgRouting developers Mail: project@pgrouting.org diff --git a/include/trsp/pgr_trspHandler.hpp b/include/trsp/pgr_trspHandler.hpp index 7cccb757bc..5508e19e0d 100644 --- a/include/trsp/pgr_trspHandler.hpp +++ b/include/trsp/pgr_trspHandler.hpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: pgr_trspHandler.h +File: pgr_trspHandler.hpp Copyright (c) 2017 pgRouting developers Mail: project@pgrouting.org diff --git a/include/visitors/astar_visitors.hpp b/include/visitors/astar_visitors.hpp index 5d24e61627..15ec4b44d0 100644 --- a/include/visitors/astar_visitors.hpp +++ b/include/visitors/astar_visitors.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -file: astar_visitors.hpp +File: astar_visitors.hpp Copyright (c) 2023 Celia Virginia Vergara Castillo Copyright (c) 2015 Celia Virginia Vergara Castillo diff --git a/include/visitors/dfs_visitor.hpp b/include/visitors/dfs_visitor.hpp index 9b1de951f6..3ddd341b75 100644 --- a/include/visitors/dfs_visitor.hpp +++ b/include/visitors/dfs_visitor.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: Dfs_visitor.hpp +File: dfs_visitor.hpp Copyright (c) 2020 pgRouting developers Mail: project@pgrouting.org diff --git a/include/visitors/dfs_visitor_with_root.hpp b/include/visitors/dfs_visitor_with_root.hpp index 26d10a4f9f..19aec846df 100644 --- a/include/visitors/dfs_visitor_with_root.hpp +++ b/include/visitors/dfs_visitor_with_root.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: Dfs_visitor_with_root.hpp +File: dfs_visitor_with_root.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/visitors/dijkstra_visitors.hpp b/include/visitors/dijkstra_visitors.hpp index 35fc1f195b..6b27eea736 100644 --- a/include/visitors/dijkstra_visitors.hpp +++ b/include/visitors/dijkstra_visitors.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -file: dijkstra_visitors.hpp +File: dijkstra_visitors.hpp Copyright (c) 2018 pgRouting developers Mail: project@pgrouting.org diff --git a/include/visitors/edges_order_bfs_visitor.hpp b/include/visitors/edges_order_bfs_visitor.hpp index d779e8761e..2475019b02 100644 --- a/include/visitors/edges_order_bfs_visitor.hpp +++ b/include/visitors/edges_order_bfs_visitor.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File:.edges_order_bfs_visitor.hpp +File: edges_order_bfs_visitor.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/visitors/found_goals.hpp b/include/visitors/found_goals.hpp index 3fadedae4e..e36567a221 100644 --- a/include/visitors/found_goals.hpp +++ b/include/visitors/found_goals.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -file: found_goals.hpp +File: found_goals.hpp Copyright (c) 2018 pgRouting developers Mail: project@pgrouting.org diff --git a/include/vrp/book_keeping.hpp b/include/vrp/book_keeping.hpp index f22ef84487..0f205ad759 100644 --- a/include/vrp/book_keeping.hpp +++ b/include/vrp/book_keeping.hpp @@ -1,7 +1,6 @@ /*PGR-GNU***************************************************************** - * - * FILE: book_keeping.h - * +File: book_keeping.hpp + * Copyright (c) 2017 pgRouting developers * Mail: project@pgrouting.org * diff --git a/include/vrp/dnode.hpp b/include/vrp/dnode.hpp index 4dea7659a6..bc7f0f476f 100644 --- a/include/vrp/dnode.hpp +++ b/include/vrp/dnode.hpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: dnode.h +File: dnode.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/vrp/fleet.hpp b/include/vrp/fleet.hpp index 933bea00de..71c946f094 100644 --- a/include/vrp/fleet.hpp +++ b/include/vrp/fleet.hpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: fleet.h +File: fleet.hpp Copyright (c) 2017 pgRouting developers Mail: project@pgrouting.org diff --git a/include/vrp/initial_solution.hpp b/include/vrp/initial_solution.hpp index 46be9a5ef9..e0099902fa 100644 --- a/include/vrp/initial_solution.hpp +++ b/include/vrp/initial_solution.hpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: initial_solution.h +File: initial_solution.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/vrp/initials_code.hpp b/include/vrp/initials_code.hpp index 4ef59dd30a..466359d39d 100644 --- a/include/vrp/initials_code.hpp +++ b/include/vrp/initials_code.hpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: initials_code.h +File: initials_code.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/vrp/optimize.hpp b/include/vrp/optimize.hpp index 2d3dcfcfdf..bf9f5bfcfb 100644 --- a/include/vrp/optimize.hpp +++ b/include/vrp/optimize.hpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: optimize.cpp +File: optimize.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/vrp/order.hpp b/include/vrp/order.hpp index b0e32d36ca..3d77aaaeb6 100644 --- a/include/vrp/order.hpp +++ b/include/vrp/order.hpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: order.h +File: order.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/vrp/pd_orders.hpp b/include/vrp/pd_orders.hpp index 0a94e76657..d897482ae6 100644 --- a/include/vrp/pd_orders.hpp +++ b/include/vrp/pd_orders.hpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: pd_orders.h +File: pd_orders.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/vrp/pd_problem.hpp b/include/vrp/pd_problem.hpp index 840f7488a0..51bc8241bc 100644 --- a/include/vrp/pd_problem.hpp +++ b/include/vrp/pd_problem.hpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: pd_problem.h +File: pd_problem.hpp Copyright (c) 2017 pgRouting developers Mail: project@pgrouting.org diff --git a/include/vrp/pgr_pickDeliver.hpp b/include/vrp/pgr_pickDeliver.hpp index 6af26d564d..22e5dba71c 100644 --- a/include/vrp/pgr_pickDeliver.hpp +++ b/include/vrp/pgr_pickDeliver.hpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: pgr_pickDeliver.h +File: pgr_pickDeliver.hpp Copyright (c) 2017 pgRouting developers Mail: project@pgrouting.org diff --git a/include/vrp/solution.hpp b/include/vrp/solution.hpp index ed27e7d992..d90ea0af49 100644 --- a/include/vrp/solution.hpp +++ b/include/vrp/solution.hpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: solution.h +File: solution.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/vrp/tw_node.hpp b/include/vrp/tw_node.hpp index afa532bf43..67d2c0db26 100644 --- a/include/vrp/tw_node.hpp +++ b/include/vrp/tw_node.hpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: tw_node.h +File: tw_node.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/vrp/vehicle.hpp b/include/vrp/vehicle.hpp index b6f3f346b5..f35c6af705 100644 --- a/include/vrp/vehicle.hpp +++ b/include/vrp/vehicle.hpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: vehicle.h +File: vehicle.hpp Copyright (c) 2016 pgRouting developers Mail: project@pgrouting.org diff --git a/include/vrp/vehicle_node.hpp b/include/vrp/vehicle_node.hpp index c99c481f19..0845d95d8d 100644 --- a/include/vrp/vehicle_node.hpp +++ b/include/vrp/vehicle_node.hpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: vehicle_node.h +File: vehicle_node.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/vrp/vehicle_pickDeliver.hpp b/include/vrp/vehicle_pickDeliver.hpp index fb9697f8d4..bb6a816e7f 100644 --- a/include/vrp/vehicle_pickDeliver.hpp +++ b/include/vrp/vehicle_pickDeliver.hpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: vehicle_pickDeliver.h +File: vehicle_pickDeliver.hpp Copyright (c) 2016 pgRouting developers Mail: project@pgrouting.org diff --git a/include/withPoints/pgr_withPoints.hpp b/include/withPoints/pgr_withPoints.hpp index 7be3b263af..0c3fd78030 100644 --- a/include/withPoints/pgr_withPoints.hpp +++ b/include/withPoints/pgr_withPoints.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: withPoints.hpp +File: pgr_withPoints.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/include/yen/pgr_turnRestrictedPath.hpp b/include/yen/pgr_turnRestrictedPath.hpp index 1e3e8bdf76..bcc55589ce 100644 --- a/include/yen/pgr_turnRestrictedPath.hpp +++ b/include/yen/pgr_turnRestrictedPath.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_dijkstraTR.hpp +File: pgr_turnRestrictedPath.hpp Generated with Template by: Copyright (c) 2015 pgRouting developers diff --git a/src/alpha_shape/alphaShape.c b/src/alpha_shape/alphaShape.c index 7175cb75bf..2b95e863f7 100644 --- a/src/alpha_shape/alphaShape.c +++ b/src/alpha_shape/alphaShape.c @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -FILE: alphaShape.c +File: alphaShape.c Copyright (c) 2018 pgRouting developers Mail: project@pgrouting.org diff --git a/src/alpha_shape/alphaShape_driver.cpp b/src/alpha_shape/alphaShape_driver.cpp index 9ddc34ef81..ad64ac0b25 100644 --- a/src/alpha_shape/alphaShape_driver.cpp +++ b/src/alpha_shape/alphaShape_driver.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -FILE: alphaShape_driver.cpp +File: alphaShape_driver.cpp Copyright (c) 2018 pgRouting developers Mail: project@pgrouting.org diff --git a/src/alpha_shape/pgr_alphaShape.cpp b/src/alpha_shape/pgr_alphaShape.cpp index e2e1f4d0dc..4b83a2c00a 100644 --- a/src/alpha_shape/pgr_alphaShape.cpp +++ b/src/alpha_shape/pgr_alphaShape.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -file: pgr_alphaShape.cpp +File: pgr_alphaShape.cpp Copyright (c) 2018 pgRouting developers Mail: project@pgrouting.org diff --git a/src/bellman_ford/bellman_ford_neg.c b/src/bellman_ford/bellman_ford_neg.c index 1812301f75..e2c8c3f071 100644 --- a/src/bellman_ford/bellman_ford_neg.c +++ b/src/bellman_ford/bellman_ford_neg.c @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: bellman_ford.c +File: bellman_ford_neg.c Generated with Template by: Copyright (c) 2015 pgRouting developers diff --git a/src/bellman_ford/bellman_ford_neg_driver.cpp b/src/bellman_ford/bellman_ford_neg_driver.cpp index e16251d7f9..c2d752dec1 100644 --- a/src/bellman_ford/bellman_ford_neg_driver.cpp +++ b/src/bellman_ford/bellman_ford_neg_driver.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: bellman_ford_driver.cpp +File: bellman_ford_neg_driver.cpp Generated with Template by: Copyright (c) 2015 pgRouting developers diff --git a/src/chinese/chinesePostman_driver.cpp b/src/chinese/chinesePostman_driver.cpp index 9c1b7f01c7..dab10402e6 100644 --- a/src/chinese/chinesePostman_driver.cpp +++ b/src/chinese/chinesePostman_driver.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: directedChPP_driver.cpp +File: chinesePostman_driver.cpp Generated with Template by: Copyright (c) 2015 pgRouting developers diff --git a/src/common/basic_edge.cpp b/src/common/basic_edge.cpp index 4a188d629a..5c720ab756 100644 --- a/src/common/basic_edge.cpp +++ b/src/common/basic_edge.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** - * +File: basic_edge.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/common/basic_vertex.cpp b/src/common/basic_vertex.cpp index 662db01959..a5bfc39335 100644 --- a/src/common/basic_vertex.cpp +++ b/src/common/basic_vertex.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** - * +File: basic_vertex.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/common/check_parameters.c b/src/common/check_parameters.c index 1f58445787..a66e417b4d 100644 --- a/src/common/check_parameters.c +++ b/src/common/check_parameters.c @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: astarOneToOne.c +File: check_parameters.c Generated with Template by: Copyright (c) 2015 pgRouting developers diff --git a/src/common/identifier.cpp b/src/common/identifier.cpp index f827235017..51c3def466 100644 --- a/src/common/identifier.cpp +++ b/src/common/identifier.cpp @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: identifier.cpp Copyright (c) 2017 pgRouting developers Mail: project@pgrouting.org diff --git a/src/common/pgr_alloc.cpp b/src/common/pgr_alloc.cpp index d7b4a75d87..6081ade658 100644 --- a/src/common/pgr_alloc.cpp +++ b/src/common/pgr_alloc.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_palloc.cpp +File: pgr_alloc.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/common/pgr_assert.cpp b/src/common/pgr_assert.cpp index 86f94e4f52..98e1b41295 100644 --- a/src/common/pgr_assert.cpp +++ b/src/common/pgr_assert.cpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: pgr_assert.cpp +File: pgr_assert.cpp Copyright (c) 2014 pgRouting developers Mail: project@pgrouting.org diff --git a/src/common/signalhandler.cpp b/src/common/signalhandler.cpp index b9d480d1bb..e97e51ca2f 100644 --- a/src/common/signalhandler.cpp +++ b/src/common/signalhandler.cpp @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: signalhandler.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/common/time_msg.c b/src/common/time_msg.c index b96fa9c5f5..b86f045414 100644 --- a/src/common/time_msg.c +++ b/src/common/time_msg.c @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: time_msg.c +File: time_msg.c Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/common/xy_vertex.cpp b/src/common/xy_vertex.cpp index 1edc85a24a..9d27448bac 100644 --- a/src/common/xy_vertex.cpp +++ b/src/common/xy_vertex.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** - * +File: xy_vertex.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/components/componentsResult.cpp b/src/components/componentsResult.cpp index 069c7ff325..5da9b560ff 100644 --- a/src/components/componentsResult.cpp +++ b/src/components/componentsResult.cpp @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: componentsResult.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/components/pgr_components.cpp b/src/components/pgr_components.cpp index 5af64171dc..eced42ed06 100644 --- a/src/components/pgr_components.cpp +++ b/src/components/pgr_components.cpp @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: pgr_components.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/cpp_common/Dmatrix.cpp b/src/cpp_common/Dmatrix.cpp index 8c34df2305..53368bab0c 100644 --- a/src/cpp_common/Dmatrix.cpp +++ b/src/cpp_common/Dmatrix.cpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: Dmatrix.cpp +File: Dmatrix.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/cpp_common/bpoint.cpp b/src/cpp_common/bpoint.cpp index 6766e5744a..41d757a754 100644 --- a/src/cpp_common/bpoint.cpp +++ b/src/cpp_common/bpoint.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -file: bpoint.cpp +File: bpoint.cpp Copyright (c) 2018 pgRouting developers Mail: project@pgrouting.org diff --git a/src/cpp_common/pgr_messages.cpp b/src/cpp_common/pgr_messages.cpp index 1f8a792246..43b13a1f19 100644 --- a/src/cpp_common/pgr_messages.cpp +++ b/src/cpp_common/pgr_messages.cpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: pgr_pickDeliver.h +File: pgr_messages.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/cpp_common/rule.cpp b/src/cpp_common/rule.cpp index ead34ff19c..4f4377b18d 100644 --- a/src/cpp_common/rule.cpp +++ b/src/cpp_common/rule.cpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: rule.cpp +File: rule.cpp Copyright (c) 2017 pgRouting developers Mail: project@pgrouting.org diff --git a/src/dominator/lengauerTarjanDominatorTree_driver.cpp b/src/dominator/lengauerTarjanDominatorTree_driver.cpp index 71b0985ac8..6433e25620 100644 --- a/src/dominator/lengauerTarjanDominatorTree_driver.cpp +++ b/src/dominator/lengauerTarjanDominatorTree_driver.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: lengauerTarjanDominatorTree_driver.pp +File: lengauerTarjanDominatorTree_driver.cpp Generated with Template by: Copyright (c) 2015 pgRouting developers diff --git a/src/driving_distance/many_to_dist_withPointsDD.c b/src/driving_distance/many_to_dist_withPointsDD.c index 92bb0a2429..80db9db19b 100644 --- a/src/driving_distance/many_to_dist_withPointsDD.c +++ b/src/driving_distance/many_to_dist_withPointsDD.c @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: many_to_dist_driving_distance.c +File: many_to_dist_withPointsDD.c Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/ksp/withPoints_ksp_driver.cpp b/src/ksp/withPoints_ksp_driver.cpp index 3f92e3ed9b..4ac9eab0b9 100644 --- a/src/ksp/withPoints_ksp_driver.cpp +++ b/src/ksp/withPoints_ksp_driver.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: withPoints_driver.cpp +File: withPoints_ksp_driver.cpp Generated with Template by: Copyright (c) 2015 pgRouting developers diff --git a/src/max_flow/max_flow.c b/src/max_flow/max_flow.c index 4535dbbb7d..50387d44ae 100644 --- a/src/max_flow/max_flow.c +++ b/src/max_flow/max_flow.c @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: max_flow_many_to_many.c +File: max_flow.c Generated with Template by: Copyright (c) 2015 pgRouting developers diff --git a/src/max_flow/max_flow_driver.cpp b/src/max_flow/max_flow_driver.cpp index d21705a76b..fa4475b21c 100644 --- a/src/max_flow/max_flow_driver.cpp +++ b/src/max_flow/max_flow_driver.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: max_flow_many_to_many_driver.cpp +File: max_flow_driver.cpp Generated with Template by: Copyright (c) 2015 pgRouting developers diff --git a/src/max_flow/pgr_flowgraph.cpp b/src/max_flow/pgr_flowgraph.cpp index d2111f6c58..fd40129885 100644 --- a/src/max_flow/pgr_flowgraph.cpp +++ b/src/max_flow/pgr_flowgraph.cpp @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: pgr_flowgraph.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/max_flow/pgr_maxflow.cpp b/src/max_flow/pgr_maxflow.cpp index 7418459bbb..ac28d6a5c7 100644 --- a/src/max_flow/pgr_maxflow.cpp +++ b/src/max_flow/pgr_maxflow.cpp @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: pgr_maxflow.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/max_flow/pgr_minCostMaxFlow.cpp b/src/max_flow/pgr_minCostMaxFlow.cpp index 23d2e48e38..abcd245279 100644 --- a/src/max_flow/pgr_minCostMaxFlow.cpp +++ b/src/max_flow/pgr_minCostMaxFlow.cpp @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: pgr_minCostMaxFlow.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/pickDeliver/book_keeping.cpp b/src/pickDeliver/book_keeping.cpp index b77226f886..d5cdb05cf0 100644 --- a/src/pickDeliver/book_keeping.cpp +++ b/src/pickDeliver/book_keeping.cpp @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: book_keeping.cpp FILE: book_keeping.cpp diff --git a/src/pickDeliver/dnode.cpp b/src/pickDeliver/dnode.cpp index baba4c0bf7..010e02f772 100644 --- a/src/pickDeliver/dnode.cpp +++ b/src/pickDeliver/dnode.cpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: dnode.cpp +File: dnode.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/pickDeliver/fleet.cpp b/src/pickDeliver/fleet.cpp index f477744f60..fa4165cc3c 100644 --- a/src/pickDeliver/fleet.cpp +++ b/src/pickDeliver/fleet.cpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: solution.cpp +File: fleet.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/pickDeliver/initial_solution.cpp b/src/pickDeliver/initial_solution.cpp index b0318d4deb..b591b84840 100644 --- a/src/pickDeliver/initial_solution.cpp +++ b/src/pickDeliver/initial_solution.cpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: initial_solution.cpp +File: initial_solution.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/pickDeliver/optimize.cpp b/src/pickDeliver/optimize.cpp index f12eadab4c..03160246e9 100644 --- a/src/pickDeliver/optimize.cpp +++ b/src/pickDeliver/optimize.cpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: optimize.cpp +File: optimize.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/pickDeliver/order.cpp b/src/pickDeliver/order.cpp index a4cf8e6761..d68341693e 100644 --- a/src/pickDeliver/order.cpp +++ b/src/pickDeliver/order.cpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: order.cpp +File: order.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/pickDeliver/pd_orders.cpp b/src/pickDeliver/pd_orders.cpp index 91008c6bea..5092a81a06 100644 --- a/src/pickDeliver/pd_orders.cpp +++ b/src/pickDeliver/pd_orders.cpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: solution.cpp +File: pd_orders.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/pickDeliver/pd_problem.cpp b/src/pickDeliver/pd_problem.cpp index 6597274e49..b0409cdad9 100644 --- a/src/pickDeliver/pd_problem.cpp +++ b/src/pickDeliver/pd_problem.cpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: pgr_pickDeliver.h +File: pd_problem.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/pickDeliver/pgr_pickDeliver.cpp b/src/pickDeliver/pgr_pickDeliver.cpp index b9eea39f61..c60ba84a73 100644 --- a/src/pickDeliver/pgr_pickDeliver.cpp +++ b/src/pickDeliver/pgr_pickDeliver.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -FILE: pgr_pickDeliver.cpp +File: pgr_pickDeliver.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/pickDeliver/pickDeliverEuclidean_driver.cpp b/src/pickDeliver/pickDeliverEuclidean_driver.cpp index 0ef704aa6c..862f2c7d03 100644 --- a/src/pickDeliver/pickDeliverEuclidean_driver.cpp +++ b/src/pickDeliver/pickDeliverEuclidean_driver.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pickDeliver_driver.cpp +File: pickDeliverEuclidean_driver.cpp Generated with Template by: Copyright (c) 2015 pgRouting developers diff --git a/src/pickDeliver/solution.cpp b/src/pickDeliver/solution.cpp index 63c93259e4..0bd22c62a0 100644 --- a/src/pickDeliver/solution.cpp +++ b/src/pickDeliver/solution.cpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: solution.cpp +File: solution.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/pickDeliver/tw_node.cpp b/src/pickDeliver/tw_node.cpp index 1d625274b1..52e820e310 100644 --- a/src/pickDeliver/tw_node.cpp +++ b/src/pickDeliver/tw_node.cpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: tw_node.cpp +File: tw_node.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/pickDeliver/vehicle.cpp b/src/pickDeliver/vehicle.cpp index 6f257ec32d..163442071b 100644 --- a/src/pickDeliver/vehicle.cpp +++ b/src/pickDeliver/vehicle.cpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: vehicle.cpp +File: vehicle.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/pickDeliver/vehicle_node.cpp b/src/pickDeliver/vehicle_node.cpp index 41c24610d7..3fdf584db7 100644 --- a/src/pickDeliver/vehicle_node.cpp +++ b/src/pickDeliver/vehicle_node.cpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: vehicle_node.cpp +File: vehicle_node.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/pickDeliver/vehicle_pickDeliver.cpp b/src/pickDeliver/vehicle_pickDeliver.cpp index aa68cba13f..43a94daa68 100644 --- a/src/pickDeliver/vehicle_pickDeliver.cpp +++ b/src/pickDeliver/vehicle_pickDeliver.cpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: vehicle_pickDeliver.cpp +File: vehicle_pickDeliver.cpp Copyright (c) 2016 pgRouting developers Mail: project@pgrouting.org diff --git a/src/spanningTree/details.cpp b/src/spanningTree/details.cpp index e6c16569a1..d6b4dd9b7b 100644 --- a/src/spanningTree/details.cpp +++ b/src/spanningTree/details.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: details.hpp +File: details.cpp Copyright (c) 2018 pgRouting developers Mail: project@pgrouting.org diff --git a/src/spanningTree/mst_common.cpp b/src/spanningTree/mst_common.cpp index ba8b2aec3d..cc1258962c 100644 --- a/src/spanningTree/mst_common.cpp +++ b/src/spanningTree/mst_common.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: mst_common.c +File: mst_common.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/topologicalSort/topologicalSort.c b/src/topologicalSort/topologicalSort.c index 867f632317..a53455e3ed 100644 --- a/src/topologicalSort/topologicalSort.c +++ b/src/topologicalSort/topologicalSort.c @@ -1,5 +1,4 @@ /*PGR-GNU***************************************************************** - File: topologicalSort.c Generated with Template by: diff --git a/src/trsp/GraphDefinition.cpp b/src/trsp/GraphDefinition.cpp index 58c699884f..8c3847ac3e 100644 --- a/src/trsp/GraphDefinition.cpp +++ b/src/trsp/GraphDefinition.cpp @@ -1,5 +1,4 @@ /*PGR-GNU***************************************************************** - File: GraphDefinition.cpp Copyright (c) 2015 pgRouting developers diff --git a/src/trsp/edgeInfo.cpp b/src/trsp/edgeInfo.cpp index a78464956e..2ac944fe8c 100644 --- a/src/trsp/edgeInfo.cpp +++ b/src/trsp/edgeInfo.cpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: edgeInfo.cpp +File: edgeInfo.cpp Copyright (c) 2017 pgRouting developers Mail: project@pgrouting.org diff --git a/src/trsp/new_trsp.c b/src/trsp/new_trsp.c index 45b2c59cbf..727f66c0e1 100644 --- a/src/trsp/new_trsp.c +++ b/src/trsp/new_trsp.c @@ -1,5 +1,4 @@ /*PGR-GNU***************************************************************** - File: new_trsp.c Copyright (c) 2017 pgRouting developers diff --git a/src/trsp/pgr_trspHandler.cpp b/src/trsp/pgr_trspHandler.cpp index 3c5a39bf37..29a822b6dc 100644 --- a/src/trsp/pgr_trspHandler.cpp +++ b/src/trsp/pgr_trspHandler.cpp @@ -1,5 +1,4 @@ /*PGR-GNU***************************************************************** - File: pgr_trspHandler.cpp Copyright (c) 2011 pgRouting developers diff --git a/src/trsp/trsp.c b/src/trsp/trsp.c index 0bda902a19..0404ca265b 100644 --- a/src/trsp/trsp.c +++ b/src/trsp/trsp.c @@ -1,5 +1,4 @@ /*PGR-GNU***************************************************************** - File: trsp.c Generated with Template by: diff --git a/src/trsp/trsp_core.cpp b/src/trsp/trsp_core.cpp index 6f0a69e9e5..8f52c2b2dc 100644 --- a/src/trsp/trsp_core.cpp +++ b/src/trsp/trsp_core.cpp @@ -1,5 +1,4 @@ /*PGR-GNU***************************************************************** - File: trsp_core.cpp Generated with Template by: diff --git a/src/tsp/TSP_driver.cpp b/src/tsp/TSP_driver.cpp index 5b8b7ea32f..f381c8a85d 100644 --- a/src/tsp/TSP_driver.cpp +++ b/src/tsp/TSP_driver.cpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: TSP_driver.cpp +File: TSP_driver.cpp Generated with Template by: Copyright (c) 2015 pgRouting developers diff --git a/src/tsp/euclideanTSP_driver.cpp b/src/tsp/euclideanTSP_driver.cpp index 532193b3d5..5b55eb39a8 100644 --- a/src/tsp/euclideanTSP_driver.cpp +++ b/src/tsp/euclideanTSP_driver.cpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -FILE: euclideanTSP_driver.cpp +File: euclideanTSP_driver.cpp Generated with Template by: Copyright (c) 2015 pgRouting developers diff --git a/src/tsp/tsp.cpp b/src/tsp/tsp.cpp index 7c81d6d495..67f7258a85 100644 --- a/src/tsp/tsp.cpp +++ b/src/tsp/tsp.cpp @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -File: tsp.cc +File: tsp.cpp Copyright (c) 2021 pgRouting developers Mail: project@pgrouting.org diff --git a/src/version/version.c b/src/version/version.c index a6dba0580b..54a69d1220 100644 --- a/src/version/version.c +++ b/src/version/version.c @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -File: _version.c +File: version.c Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/version/version.h.in b/src/version/version.h.in index c023cf01d4..52044cb7a7 100644 --- a/src/version/version.h.in +++ b/src/version/version.h.in @@ -1,6 +1,5 @@ /*PGR-GNU***************************************************************** - -File: _version.h.in +File: version.h.in Function's developer: Copyright (c) 2015 Celia Virginia Vergara Castillo From 51a0dac252cf3dc5b81f3f74a910d5119439d6f5 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 12 Feb 2024 09:42:57 -0600 Subject: [PATCH 128/428] (lint) fixing codacy errors --- src/lineGraph/lineGraph_driver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lineGraph/lineGraph_driver.cpp b/src/lineGraph/lineGraph_driver.cpp index a8221b7dac..d645034428 100644 --- a/src/lineGraph/lineGraph_driver.cpp +++ b/src/lineGraph/lineGraph_driver.cpp @@ -46,7 +46,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. namespace { void get_postgres_result( - std::vector< Edge_rt > edge_result, + const std::vector &edge_result, Edge_rt **return_tuples, size_t &sequence) { using pgrouting::pgr_alloc; From 46081ccf4af8dde7ac1c13fcbacb72c461c2511e Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 12 Feb 2024 14:56:53 -0600 Subject: [PATCH 129/428] include/alphaShape/pgr_alphaShape.h -> include/alphaShape/pgr_alphaShape.hpp --- include/alphaShape/{pgr_alphaShape.h => pgr_alphaShape.hpp} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename include/alphaShape/{pgr_alphaShape.h => pgr_alphaShape.hpp} (100%) diff --git a/include/alphaShape/pgr_alphaShape.h b/include/alphaShape/pgr_alphaShape.hpp similarity index 100% rename from include/alphaShape/pgr_alphaShape.h rename to include/alphaShape/pgr_alphaShape.hpp From cf5cce7ea610605355b1fa565ad1d9475c9d840b Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 12 Feb 2024 14:57:46 -0600 Subject: [PATCH 130/428] (alphashape) using new name --- include/alphaShape/pgr_alphaShape.hpp | 2 +- src/alpha_shape/alphaShape_driver.cpp | 2 +- src/alpha_shape/pgr_alphaShape.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/alphaShape/pgr_alphaShape.hpp b/include/alphaShape/pgr_alphaShape.hpp index 4f6789432b..89aef53b5e 100644 --- a/include/alphaShape/pgr_alphaShape.hpp +++ b/include/alphaShape/pgr_alphaShape.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_alphaShape.h +File: pgr_alphaShape.hpp Copyright (c) 2018 pgRouting developers Mail: project@pgrouting.org diff --git a/src/alpha_shape/alphaShape_driver.cpp b/src/alpha_shape/alphaShape_driver.cpp index ad64ac0b25..c7f2834913 100644 --- a/src/alpha_shape/alphaShape_driver.cpp +++ b/src/alpha_shape/alphaShape_driver.cpp @@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/geom_text_rt.h" #include "cpp_common/pgr_assert.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "alphaShape/pgr_alphaShape.h" +#include "alphaShape/pgr_alphaShape.hpp" #include "cpp_common/pgr_alloc.hpp" diff --git a/src/alpha_shape/pgr_alphaShape.cpp b/src/alpha_shape/pgr_alphaShape.cpp index 4b83a2c00a..c9558424d4 100644 --- a/src/alpha_shape/pgr_alphaShape.cpp +++ b/src/alpha_shape/pgr_alphaShape.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "alphaShape/pgr_alphaShape.h" +#include "alphaShape/pgr_alphaShape.hpp" #include #include From 121b78e5fb59c7744422b711cf198e4faa548d0b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 13 Feb 2024 01:27:38 +0000 Subject: [PATCH 131/428] Update locale: commit cf5cce7ea6 --- .../en/LC_MESSAGES/pgrouting_doc_strings.po | 25 +++++++++---------- locale/pot/pgrouting_doc_strings.pot | 15 +++++------ 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po index d183a0a45e..f5f2e3ac9c 100644 --- a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-06 15:37+0000\n" +"POT-Creation-Date: 2024-02-13 01:27+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -4384,10 +4384,14 @@ msgstr "" msgid ":doc:`release_notes`" msgstr "" -msgid "Current release" +msgid "pgRouting 3.7.0 Release Notes" msgstr "" -msgid "_" +#, python-format +msgid "" +"To see all issues & pull requests closed by this release see the `Git " +"closed milestone for 3.7.0 " +"`__" msgstr "" msgid "Official functions changes" @@ -4438,6 +4442,11 @@ msgid "" "postgresql data on C++" msgstr "" +msgid "" +"`#2614 `__ Clang tidy " +"does not work" +msgstr "" + msgid "Others" msgstr "" @@ -15325,16 +15334,6 @@ msgstr "" msgid "pgRouting 3.7" msgstr "" -msgid "pgRouting 3.7.0 Release Notes" -msgstr "" - -#, python-format -msgid "" -"To see all issues & pull requests closed by this release see the `Git " -"closed milestone for 3.7.0 " -"`__" -msgstr "" - msgid "pgRouting 3.6" msgstr "" diff --git a/locale/pot/pgrouting_doc_strings.pot b/locale/pot/pgrouting_doc_strings.pot index ac72c56009..988dd62534 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-06 15:37+0000\n" +"POT-Creation-Date: 2024-02-13 01:27+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3931,10 +3931,10 @@ msgstr "" msgid ":doc:`release_notes`" msgstr "" -msgid "Current release" +msgid "pgRouting 3.7.0 Release Notes" msgstr "" -msgid "_" +msgid "To see all issues & pull requests closed by this release see the `Git closed milestone for 3.7.0 `__" msgstr "" msgid "Official functions changes" @@ -3979,6 +3979,9 @@ msgstr "" msgid "`#2607 `__ Read postgresql data on C++" msgstr "" +msgid "`#2614 `__ Clang tidy does not work" +msgstr "" + msgid "Others" msgstr "" @@ -13030,12 +13033,6 @@ msgstr "" msgid "pgRouting 3.7" msgstr "" -msgid "pgRouting 3.7.0 Release Notes" -msgstr "" - -msgid "To see all issues & pull requests closed by this release see the `Git closed milestone for 3.7.0 `__" -msgstr "" - msgid "pgRouting 3.6" msgstr "" From 0a67c75afe0cdadd1c1d26b0e9bfcf1be201502d Mon Sep 17 00:00:00 2001 From: Vicky Vergara Date: Tue, 20 Feb 2024 14:23:28 -0600 Subject: [PATCH 132/428] adding a check for clang-tidy (#2620) * adding a check for clang-tidy --- .github/scripts/tidy-vs-commit.sh | 36 +++++++++++++++++++ .github/workflows/tidy-check.yml | 58 +++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100755 .github/scripts/tidy-vs-commit.sh create mode 100644 .github/workflows/tidy-check.yml diff --git a/.github/scripts/tidy-vs-commit.sh b/.github/scripts/tidy-vs-commit.sh new file mode 100755 index 0000000000..f140165e70 --- /dev/null +++ b/.github/scripts/tidy-vs-commit.sh @@ -0,0 +1,36 @@ +#!/usr/bin/env bash +# Runs clang-tidy only on changed files + +readonly BASE=$1 +readonly BUILD_DIR=build + +MODIFIED_FILES=$(git diff-tree --no-commit-id --diff-filter=d --name-only -r "$BASE" HEAD | grep '\.c') +MODIFIED_HEADERS=$(git diff-tree --no-commit-id --diff-filter=d --name-only -r "$BASE" HEAD | grep '\.h') +POSTGRES_SERVER=$(grep -o -m1 '\-isystem .*' "${BUILD_DIR}/compile_commands.json" | head -1 | awk '{print $1" "$2}') + +CHECKS="-checks=clang-analyzer-*" + +if [ -z "${MODIFIED_FILES}" ] && [ -z "${MODIFIED_HEADERS}" ]; then + echo "No paths modified" + exit 0 +fi + +# C/C++ use the compile command +if [ ${#MODIFIED_FILES[@]} != 0 ] ; then + for f in ${MODIFIED_FILES} + do + echo "${f}" + clang-tidy -p "${BUILD_DIR}" "${CHECKS}" -header-filter="^$(pwd).*" "${f}" + done +fi + +# H/HPP do not have a compile command +# workaround: add the includes +if [ ${#MODIFIED_HEADERS[@]} != 0 ] ; then + for f in ${MODIFIED_HEADERS} + do + echo "${f}" + clang-tidy "${CHECKS}" -header-filter=.* "${f}" \ + -- -I./include "${POSTGRES_SERVER}" + done +fi diff --git a/.github/workflows/tidy-check.yml b/.github/workflows/tidy-check.yml new file mode 100644 index 0000000000..0a1f9318a8 --- /dev/null +++ b/.github/workflows/tidy-check.yml @@ -0,0 +1,58 @@ +name: clang-tidy check + +on: + pull_request: + branches-ignore: + - 'gh-pages' + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + check-changelog: + name: Check for changelog entry + runs-on: ubuntu-latest + env: + PR_BASE: ${{ github.base_ref }} + + steps: + + - uses: actions/checkout@v4 + + - name: Get postgres version + run: | + sudo service postgresql start + pgver=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d+ \()') + echo "PGVER=${pgver}" >> $GITHUB_ENV + echo "PGPORT=5432" >> $GITHUB_ENV + + - name: Add PostgreSQL APT repository + run: | + sudo apt-get install curl ca-certificates gnupg + curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - + sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ \ + $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' + + - name: Install dependencies + run: | + sudo apt-get update + sudo apt-get install -y \ + libboost-graph-dev \ + postgresql-${PGVER} \ + postgresql-server-dev-${PGVER} + + - name: Configure + run: | + export PATH=/usr/lib/postgresql/${PGVER}/bin:$PATH + mkdir build + cd build + cmake -DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DWITH_DOC=OFF .. + + - name: Add upstream + run: | + git remote add upstream https://github.com/pgRouting/pgrouting + git fetch upstream ${PR_BASE} + + - name: do clang-tidy + run: .github/scripts/tidy-vs-commit.sh "upstream/${PR_BASE}" From 15cfd5259a8e26ea2d9108fa019f4edb0346cd3a Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 20 Feb 2024 14:27:32 -0600 Subject: [PATCH 133/428] Fixing some problems detected with clang-tidy --- include/c_types/trsp/trsp.h | 9 ++++----- include/coloring/pgr_bipartite_driver.hpp | 3 ++- include/contraction/pgr_deadEndContraction.hpp | 3 +++ include/contraction/pgr_linearContraction.hpp | 2 ++ include/cpp_common/basePath_SSEC.hpp | 2 +- include/cpp_common/bline.hpp | 1 + include/cpp_common/coordinate_t.hpp | 7 +------ include/cpp_common/costFlow_t.hpp | 8 +------- include/cpp_common/delauny_t.hpp | 7 +------ include/cpp_common/edge_t.hpp | 7 +------ include/cpp_common/edge_xy_t.hpp | 8 +------- include/cpp_common/orders_t.hpp | 13 +------------ include/cpp_common/point_on_edge_t.hpp | 7 +------ include/cpp_common/restriction_t.hpp | 8 ++------ include/cpp_common/vehicle_t.hpp | 12 ++---------- .../pgr_lengauerTarjanDominatorTree_driver.hpp | 1 + include/drivers/allpairs/floydWarshall_driver.h | 1 + include/drivers/allpairs/johnson_driver.h | 1 + include/drivers/chinese/chinesePostman_driver.h | 1 + include/drivers/lineGraph/lineGraphFull_driver.h | 2 -- include/drivers/lineGraph/lineGraph_driver.h | 1 + .../max_flow/maximum_cardinality_matching_driver.h | 5 +++-- include/drivers/planar/isPlanar_driver.h | 6 ++---- include/drivers/trsp/trsp_core.h | 1 + include/drivers/tsp/TSP_driver.h | 1 + include/drivers/tsp/euclideanTSP_driver.h | 1 + include/drivers/yen/turnRestrictedPath_driver.h | 1 + include/visitors/dijkstra_visitors.hpp | 1 + include/vrp/optimize.hpp | 6 ++---- include/vrp/pd_orders.hpp | 5 ++--- .../many_to_dist_driving_distance.c | 2 +- 31 files changed, 44 insertions(+), 89 deletions(-) diff --git a/include/c_types/trsp/trsp.h b/include/c_types/trsp/trsp.h index d9925ad7e6..ea047b3cd8 100644 --- a/include/c_types/trsp/trsp.h +++ b/include/c_types/trsp/trsp.h @@ -33,21 +33,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #ifdef __cplusplus # include typedef int64_t int64; -typedef double float8; #else # include #endif struct restrict_t { int target_id; - float8 to_cost; + double to_cost; int via[MAX_RULE_LENGTH]; }; struct path_element_tt { - int64 vertex_id; - int64 edge_id; - float8 cost; + int64_t vertex_id; + int64_t edge_id; + double cost; }; diff --git a/include/coloring/pgr_bipartite_driver.hpp b/include/coloring/pgr_bipartite_driver.hpp index fd236a31ae..50fc21b6e2 100644 --- a/include/coloring/pgr_bipartite_driver.hpp +++ b/include/coloring/pgr_bipartite_driver.hpp @@ -45,6 +45,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgr_messages.hpp" #include "cpp_common/interruption.hpp" typedef struct II_t_rt II_t_rt; +#include "c_types/ii_t_rt.h" namespace pgrouting { namespace functions { @@ -78,7 +79,7 @@ class Pgr_Bipartite : public pgrouting::Pgr_messages { int64_t vid = graph[*v].id; boost::get(partition_map, *v) == boost::color_traits ::white() ? - results.push_back({{vid}, {0}}) :results.push_back({{vid}, {1}}); + results.push_back({{vid}, {0}}) : results.push_back({{vid}, {1}}); } return results; } diff --git a/include/contraction/pgr_deadEndContraction.hpp b/include/contraction/pgr_deadEndContraction.hpp index 5e06e77c89..ca40bbc6ef 100644 --- a/include/contraction/pgr_deadEndContraction.hpp +++ b/include/contraction/pgr_deadEndContraction.hpp @@ -35,6 +35,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include + +#include + #include "cpp_common/identifiers.hpp" #include "cpp_common/interruption.hpp" diff --git a/include/contraction/pgr_linearContraction.hpp b/include/contraction/pgr_linearContraction.hpp index 54546ae10e..55208f3574 100644 --- a/include/contraction/pgr_linearContraction.hpp +++ b/include/contraction/pgr_linearContraction.hpp @@ -38,7 +38,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include +#include +#include "cpp_common/ch_edge.hpp" #include "cpp_common/identifiers.hpp" diff --git a/include/cpp_common/basePath_SSEC.hpp b/include/cpp_common/basePath_SSEC.hpp index 5957deb08f..9423648e71 100644 --- a/include/cpp_common/basePath_SSEC.hpp +++ b/include/cpp_common/basePath_SSEC.hpp @@ -90,7 +90,7 @@ class Path { ConstpthIt end() const {return path.end();} - void erase(pthIt pos) {path.erase(pos);} + void erase(const pthIt &pos) {path.erase(pos);} const Path_t& back() const {return path.back();} Path_t& back() {return path.back();} const Path_t& front() const {return path.front();} diff --git a/include/cpp_common/bline.hpp b/include/cpp_common/bline.hpp index 873730e2ce..4ecf49e1a4 100644 --- a/include/cpp_common/bline.hpp +++ b/include/cpp_common/bline.hpp @@ -31,6 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_CPP_COMMON_BLINE_HPP_ #pragma once +#include #include #include #include diff --git a/include/cpp_common/coordinate_t.hpp b/include/cpp_common/coordinate_t.hpp index 36a8c20610..dd4d111430 100644 --- a/include/cpp_common/coordinate_t.hpp +++ b/include/cpp_common/coordinate_t.hpp @@ -30,12 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_CPP_COMMON_COORDINATE_T_HPP_ #pragma once -/* for int64_t */ -#ifdef __cplusplus -# include -#else -# include -#endif +#include struct Coordinate_t { int64_t id; diff --git a/include/cpp_common/costFlow_t.hpp b/include/cpp_common/costFlow_t.hpp index bfb211b64d..e5d4e1e205 100644 --- a/include/cpp_common/costFlow_t.hpp +++ b/include/cpp_common/costFlow_t.hpp @@ -27,13 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_CPP_COMMON_COSTFLOW_T_HPP_ #pragma once -/* for int64_t */ -#ifdef __cplusplus -# include -#else -# include -#endif - +#include struct CostFlow_t { int64_t edge_id; diff --git a/include/cpp_common/delauny_t.hpp b/include/cpp_common/delauny_t.hpp index 41e17aee3f..dd8d960540 100644 --- a/include/cpp_common/delauny_t.hpp +++ b/include/cpp_common/delauny_t.hpp @@ -30,12 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_CPP_COMMON_DELAUNY_T_HPP_ #pragma once -/* for int64_t */ -#ifdef __cplusplus -# include -#else -# include -#endif +#include struct Delauny_t { int64_t tid; diff --git a/include/cpp_common/edge_t.hpp b/include/cpp_common/edge_t.hpp index e3d2c4fd94..06ffd2ea57 100644 --- a/include/cpp_common/edge_t.hpp +++ b/include/cpp_common/edge_t.hpp @@ -30,12 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_CPP_COMMON_EDGE_T_HPP_ #pragma once -/* for int64_t */ -#ifdef __cplusplus -# include -#else -# include -#endif +#include struct Edge_t{ int64_t id; diff --git a/include/cpp_common/edge_xy_t.hpp b/include/cpp_common/edge_xy_t.hpp index b8426d1aa2..96edc76d1e 100644 --- a/include/cpp_common/edge_xy_t.hpp +++ b/include/cpp_common/edge_xy_t.hpp @@ -30,13 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_CPP_COMMON_EDGE_XY_T_HPP_ #pragma once -/* for int64_t */ -#ifdef __cplusplus -# include -#else -# include -#endif - +#include struct Edge_xy_t { int64_t id; diff --git a/include/cpp_common/orders_t.hpp b/include/cpp_common/orders_t.hpp index a6151e0091..9c124d274f 100644 --- a/include/cpp_common/orders_t.hpp +++ b/include/cpp_common/orders_t.hpp @@ -30,19 +30,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_CPP_COMMON_PICKDELIVER_ORDERS_T_HPP_ #pragma once -/* for int64_t */ -#ifdef __cplusplus -# include -#else -# include -#endif +#include -/************************************************************************** - * pickDelivery types - * ***********************************************************************/ -/* - * its with either (foo_x, foo_y) pairs (for euclidean or with foo_node_id (for matrix) - */ struct Orders_t { int64_t id; double demand; diff --git a/include/cpp_common/point_on_edge_t.hpp b/include/cpp_common/point_on_edge_t.hpp index f2ac980bf7..757be20a99 100644 --- a/include/cpp_common/point_on_edge_t.hpp +++ b/include/cpp_common/point_on_edge_t.hpp @@ -30,12 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_CPP_COMMON_POINT_ON_EDGE_T_HPP_ #pragma once -/* for int64_t */ -#ifdef __cplusplus -# include -#else -# include -#endif +#include struct Point_on_edge_t { int64_t pid; diff --git a/include/cpp_common/restriction_t.hpp b/include/cpp_common/restriction_t.hpp index 3e1309dfd5..0bbd8eb559 100644 --- a/include/cpp_common/restriction_t.hpp +++ b/include/cpp_common/restriction_t.hpp @@ -30,12 +30,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_CPP_COMMON_RESTRICTION_T_HPP_ #pragma once -/* for int64_t */ -#ifdef __cplusplus -# include -#else -# include -#endif +#include +#include struct Restriction_t { double cost; diff --git a/include/cpp_common/vehicle_t.hpp b/include/cpp_common/vehicle_t.hpp index cda2ee2691..7af8224a2c 100644 --- a/include/cpp_common/vehicle_t.hpp +++ b/include/cpp_common/vehicle_t.hpp @@ -30,16 +30,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_CPP_COMMON_VEHICLE_T_H_ #pragma once -/* for int64_t */ -#ifdef __cplusplus -# include -#else -# include -#endif - -/* - * its with either (foo_x, foo_y) pairs for euclidean or with foo_node_id (for matrix) - */ +#include + struct Vehicle_t { int64_t id; double capacity; diff --git a/include/dominator/pgr_lengauerTarjanDominatorTree_driver.hpp b/include/dominator/pgr_lengauerTarjanDominatorTree_driver.hpp index 699a208b80..75f01ae137 100644 --- a/include/dominator/pgr_lengauerTarjanDominatorTree_driver.hpp +++ b/include/dominator/pgr_lengauerTarjanDominatorTree_driver.hpp @@ -44,6 +44,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/interruption.hpp" #include "cpp_common/pgr_messages.hpp" #include "cpp_common/pgr_base_graph.hpp" +#include "c_types/ii_t_rt.h" namespace pgrouting { diff --git a/include/drivers/allpairs/floydWarshall_driver.h b/include/drivers/allpairs/floydWarshall_driver.h index 202a398fab..568923868b 100644 --- a/include/drivers/allpairs/floydWarshall_driver.h +++ b/include/drivers/allpairs/floydWarshall_driver.h @@ -37,6 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. using IID_t_rt = struct IID_t_rt; #else # include +#include typedef struct IID_t_rt IID_t_rt; #endif diff --git a/include/drivers/allpairs/johnson_driver.h b/include/drivers/allpairs/johnson_driver.h index 2602909c12..2d4306ea94 100644 --- a/include/drivers/allpairs/johnson_driver.h +++ b/include/drivers/allpairs/johnson_driver.h @@ -36,6 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. using IID_t_rt = struct IID_t_rt; #else # include +#include typedef struct IID_t_rt IID_t_rt; #endif diff --git a/include/drivers/chinese/chinesePostman_driver.h b/include/drivers/chinese/chinesePostman_driver.h index 945c81fd36..59a6264a9f 100644 --- a/include/drivers/chinese/chinesePostman_driver.h +++ b/include/drivers/chinese/chinesePostman_driver.h @@ -36,6 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. using Path_rt = struct Path_rt; #else # include +#include typedef struct Path_rt Path_rt; #endif diff --git a/include/drivers/lineGraph/lineGraphFull_driver.h b/include/drivers/lineGraph/lineGraphFull_driver.h index fa578e7b59..6498e71b7e 100644 --- a/include/drivers/lineGraph/lineGraphFull_driver.h +++ b/include/drivers/lineGraph/lineGraphFull_driver.h @@ -34,11 +34,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /* for size-t */ #ifdef __cplusplus # include -using Edge_t = struct Edge_t; using Line_graph_full_rt = struct Line_graph_full_rt; #else # include -typedef struct Edge_t Edge_t; typedef struct Line_graph_full_rt Line_graph_full_rt; #endif diff --git a/include/drivers/lineGraph/lineGraph_driver.h b/include/drivers/lineGraph/lineGraph_driver.h index 316fc05646..d77933e5b9 100644 --- a/include/drivers/lineGraph/lineGraph_driver.h +++ b/include/drivers/lineGraph/lineGraph_driver.h @@ -37,6 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. using Edge_rt = struct Edge_rt; #else # include +#include typedef struct Edge_rt Edge_rt; #endif diff --git a/include/drivers/max_flow/maximum_cardinality_matching_driver.h b/include/drivers/max_flow/maximum_cardinality_matching_driver.h index a8e917b89c..c196b61485 100644 --- a/include/drivers/max_flow/maximum_cardinality_matching_driver.h +++ b/include/drivers/max_flow/maximum_cardinality_matching_driver.h @@ -31,11 +31,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_MAX_FLOW_MAXIMUM_CARDINALITY_MATCHING_DRIVER_H_ #pragma once -#include - #ifdef __cplusplus +#include using Only_int_rt = struct Only_int_rt; #else +#include +#include typedef struct Only_int_rt Only_int_rt; #endif diff --git a/include/drivers/planar/isPlanar_driver.h b/include/drivers/planar/isPlanar_driver.h index a17a1f10e9..ac35186132 100644 --- a/include/drivers/planar/isPlanar_driver.h +++ b/include/drivers/planar/isPlanar_driver.h @@ -31,10 +31,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_DRIVERS_PLANAR_ISPLANAR_DRIVER_H_ #pragma once -#ifdef __cplusplus -# include -#else -# include +#ifndef __cplusplus +#include #endif #ifdef __cplusplus diff --git a/include/drivers/trsp/trsp_core.h b/include/drivers/trsp/trsp_core.h index fb6af543eb..39d734b488 100644 --- a/include/drivers/trsp/trsp_core.h +++ b/include/drivers/trsp/trsp_core.h @@ -32,6 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #else # include # include +#include #endif typedef struct restrict_t restrict_t; diff --git a/include/drivers/tsp/TSP_driver.h b/include/drivers/tsp/TSP_driver.h index 2b53a2e7cf..5317c6b3b3 100644 --- a/include/drivers/tsp/TSP_driver.h +++ b/include/drivers/tsp/TSP_driver.h @@ -40,6 +40,7 @@ using TSP_tour_rt = struct TSP_tour_rt; #else # include # include +#include typedef struct TSP_tour_rt TSP_tour_rt; #endif diff --git a/include/drivers/tsp/euclideanTSP_driver.h b/include/drivers/tsp/euclideanTSP_driver.h index 0d942f6e0a..9f578719cc 100644 --- a/include/drivers/tsp/euclideanTSP_driver.h +++ b/include/drivers/tsp/euclideanTSP_driver.h @@ -40,6 +40,7 @@ using TSP_tour_rt = struct TSP_tour_rt; # include # include typedef struct TSP_tour_rt TSP_tour_rt; +#include #endif #ifdef __cplusplus diff --git a/include/drivers/yen/turnRestrictedPath_driver.h b/include/drivers/yen/turnRestrictedPath_driver.h index 4712cd3093..7d50c129d9 100644 --- a/include/drivers/yen/turnRestrictedPath_driver.h +++ b/include/drivers/yen/turnRestrictedPath_driver.h @@ -39,6 +39,7 @@ using Path_rt = struct Path_rt; #else # include # include +#include typedef struct Path_rt Path_rt; #endif diff --git a/include/visitors/dijkstra_visitors.hpp b/include/visitors/dijkstra_visitors.hpp index 6b27eea736..8026bb6fe8 100644 --- a/include/visitors/dijkstra_visitors.hpp +++ b/include/visitors/dijkstra_visitors.hpp @@ -35,6 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include "visitors/found_goals.hpp" +#include "cpp_common/pgr_assert.hpp" namespace pgrouting { namespace visitors { diff --git a/include/vrp/optimize.hpp b/include/vrp/optimize.hpp index bf9f5bfcfb..735f937a1c 100644 --- a/include/vrp/optimize.hpp +++ b/include/vrp/optimize.hpp @@ -28,14 +28,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_VRP_OPTIMIZE_HPP_ #pragma once -#include "vrp/optimize.hpp" +#include "vrp/solution.hpp" +#include "vrp/pgr_pickDeliver.hpp" namespace pgrouting { namespace vrp { -class Solution; -class Pgr_pickDeliver; - class Optimize : public Solution { public: diff --git a/include/vrp/pd_orders.hpp b/include/vrp/pd_orders.hpp index d897482ae6..d8d1b0641f 100644 --- a/include/vrp/pd_orders.hpp +++ b/include/vrp/pd_orders.hpp @@ -36,14 +36,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/identifiers.hpp" #include "vrp/pd_problem.hpp" +#include "vrp/order.hpp" +#include "vrp/vehicle_node.hpp" namespace pgrouting { namespace vrp { -class Order; -class Vehicle_node; - class PD_Orders { /** PD_rpblem needs access to set up the problem pointer */ friend class PD_problem; diff --git a/src/driving_distance/many_to_dist_driving_distance.c b/src/driving_distance/many_to_dist_driving_distance.c index 56132ca110..8beb92f479 100644 --- a/src/driving_distance/many_to_dist_driving_distance.c +++ b/src/driving_distance/many_to_dist_driving_distance.c @@ -48,7 +48,7 @@ static void process( char* edges_sql, ArrayType *starts, - float8 distance, + double distance, bool directed, bool equicost, MST_rt **result_tuples, From c6f5381efe01b9430f4049261d42024bd8ffdefb Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 13 Feb 2023 09:12:20 -0600 Subject: [PATCH 134/428] :wrench: removing seq from Path_rt --- include/c_types/path_rt.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/c_types/path_rt.h b/include/c_types/path_rt.h index bdaf0d2b23..4b94008729 100644 --- a/include/c_types/path_rt.h +++ b/include/c_types/path_rt.h @@ -38,7 +38,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #endif struct Path_rt { - int seq; int64_t start_id; int64_t end_id; int64_t node; From 002087568bc6d1e04ee66bf58b33de54f89738c3 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 13 Feb 2023 10:18:40 -0600 Subject: [PATCH 135/428] [c] :wrench: adjusted to not use seq from structure --- src/astar/astar.c | 5 +++- src/bdAstar/bdAstar.c | 7 ++++-- src/bdDijkstra/bdDijkstra.c | 8 +++++-- src/bellman_ford/bellman_ford.c | 8 +++++-- src/bellman_ford/edwardMoore.c | 8 +++++-- .../binaryBreadthFirstSearch.c | 8 +++++-- src/common/basePath_SSEC.cpp | 4 +--- src/dagShortestPath/dagShortestPath.c | 8 +++++-- src/dijkstra/dijkstra.c | 8 +++++-- src/ksp/ksp.c | 4 +++- src/ksp/turnRestrictedPath.c | 9 +++++--- src/ksp/withPoints_ksp.c | 4 +++- src/trsp/new_trsp.c | 23 ++++++++++--------- src/trsp/trsp_withPoints.c | 10 ++++---- src/withPoints/withPoints.c | 7 ++++-- 15 files changed, 79 insertions(+), 42 deletions(-) diff --git a/src/astar/astar.c b/src/astar/astar.c index d3351e2c84..02832b7033 100644 --- a/src/astar/astar.c +++ b/src/astar/astar.c @@ -185,8 +185,10 @@ _pgr_astar(PG_FUNCTION_ARGS) { nulls[i] = false; } + int64_t seq = call_cntr == 0? 1 : result_tuples[call_cntr - 1].start_id; + values[0] = Int32GetDatum((int32_t)call_cntr + 1); - values[1] = Int32GetDatum(result_tuples[call_cntr].seq); + values[1] = Int32GetDatum(seq); values[2] = Int64GetDatum(result_tuples[call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[call_cntr].node); @@ -194,6 +196,7 @@ _pgr_astar(PG_FUNCTION_ARGS) { values[6] = Float8GetDatum(result_tuples[call_cntr].cost); values[7] = Float8GetDatum(result_tuples[call_cntr].agg_cost); + result_tuples[call_cntr].start_id = result_tuples[call_cntr].edge < 0? 1 : seq + 1; tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); diff --git a/src/bdAstar/bdAstar.c b/src/bdAstar/bdAstar.c index b6fbfaa08d..407456717a 100644 --- a/src/bdAstar/bdAstar.c +++ b/src/bdAstar/bdAstar.c @@ -181,8 +181,10 @@ _pgr_bdastar(PG_FUNCTION_ARGS) { nulls[i] = false; } - values[0] = Int32GetDatum((int32_t)call_cntr + 1); - values[1] = Int32GetDatum(result_tuples[call_cntr].seq); + int64_t seq = call_cntr == 0? 1 : result_tuples[call_cntr - 1].start_id; + + values[0] = Int32GetDatum(call_cntr + 1); + values[1] = Int32GetDatum(seq); values[2] = Int64GetDatum(result_tuples[call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[call_cntr].node); @@ -190,6 +192,7 @@ _pgr_bdastar(PG_FUNCTION_ARGS) { values[6] = Float8GetDatum(result_tuples[call_cntr].cost); values[7] = Float8GetDatum(result_tuples[call_cntr].agg_cost); + result_tuples[call_cntr].start_id = result_tuples[call_cntr].edge < 0? 1 : seq + 1; tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); diff --git a/src/bdDijkstra/bdDijkstra.c b/src/bdDijkstra/bdDijkstra.c index 19274e0130..6ab457ab97 100644 --- a/src/bdDijkstra/bdDijkstra.c +++ b/src/bdDijkstra/bdDijkstra.c @@ -163,8 +163,10 @@ PGDLLEXPORT Datum _pgr_bddijkstra(PG_FUNCTION_ARGS) { nulls[i] = false; } - values[0] = Int32GetDatum((int32_t)call_cntr + 1); - values[1] = Int32GetDatum(result_tuples[call_cntr].seq); + int64_t seq = call_cntr == 0? 1 : result_tuples[call_cntr - 1].start_id; + + values[0] = Int32GetDatum(call_cntr + 1); + values[1] = Int32GetDatum(seq); values[2] = Int64GetDatum(result_tuples[call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[call_cntr].node); @@ -172,6 +174,8 @@ PGDLLEXPORT Datum _pgr_bddijkstra(PG_FUNCTION_ARGS) { values[6] = Float8GetDatum(result_tuples[call_cntr].cost); values[7] = Float8GetDatum(result_tuples[call_cntr].agg_cost); + result_tuples[call_cntr].start_id = result_tuples[call_cntr].edge < 0? 1 : seq + 1; + tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); diff --git a/src/bellman_ford/bellman_ford.c b/src/bellman_ford/bellman_ford.c index bc1f2feef6..253fb21c6d 100644 --- a/src/bellman_ford/bellman_ford.c +++ b/src/bellman_ford/bellman_ford.c @@ -167,8 +167,10 @@ _pgr_bellmanford(PG_FUNCTION_ARGS) { nulls[i] = false; } - values[0] = Int32GetDatum((int32_t)funcctx->call_cntr + 1); - values[1] = Int32GetDatum(result_tuples[funcctx->call_cntr].seq); + int64_t seq = funcctx->call_cntr == 0? 1 : result_tuples[funcctx->call_cntr - 1].start_id; + + values[0] = Int32GetDatum(funcctx->call_cntr + 1); + values[1] = Int32GetDatum(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); @@ -176,6 +178,8 @@ _pgr_bellmanford(PG_FUNCTION_ARGS) { values[6] = Float8GetDatum(result_tuples[funcctx->call_cntr].cost); values[7] = Float8GetDatum(result_tuples[funcctx->call_cntr].agg_cost); + result_tuples[funcctx->call_cntr].start_id = result_tuples[funcctx->call_cntr].edge < 0? 1 : seq + 1; + tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); diff --git a/src/bellman_ford/edwardMoore.c b/src/bellman_ford/edwardMoore.c index fb136ed480..88f192d460 100644 --- a/src/bellman_ford/edwardMoore.c +++ b/src/bellman_ford/edwardMoore.c @@ -160,8 +160,10 @@ PGDLLEXPORT Datum _pgr_edwardmoore(PG_FUNCTION_ARGS) { nulls[i] = false; } - values[0] = Int32GetDatum((int32_t)funcctx->call_cntr + 1); - values[1] = Int32GetDatum(result_tuples[funcctx->call_cntr].seq); + int64_t seq = funcctx->call_cntr == 0? 1 : result_tuples[funcctx->call_cntr - 1].start_id; + + values[0] = Int32GetDatum(funcctx->call_cntr + 1); + values[1] = Int32GetDatum(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); @@ -169,6 +171,8 @@ PGDLLEXPORT Datum _pgr_edwardmoore(PG_FUNCTION_ARGS) { values[6] = Float8GetDatum(result_tuples[funcctx->call_cntr].cost); values[7] = Float8GetDatum(result_tuples[funcctx->call_cntr].agg_cost); + result_tuples[funcctx->call_cntr].start_id = result_tuples[funcctx->call_cntr].edge < 0? 1 : seq + 1; + tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); diff --git a/src/breadthFirstSearch/binaryBreadthFirstSearch.c b/src/breadthFirstSearch/binaryBreadthFirstSearch.c index 3122967287..718c160c1e 100644 --- a/src/breadthFirstSearch/binaryBreadthFirstSearch.c +++ b/src/breadthFirstSearch/binaryBreadthFirstSearch.c @@ -160,8 +160,10 @@ PGDLLEXPORT Datum _pgr_binarybreadthfirstsearch(PG_FUNCTION_ARGS) { nulls[i] = false; } - values[0] = Int32GetDatum((int32_t)funcctx->call_cntr + 1); - values[1] = Int32GetDatum(result_tuples[funcctx->call_cntr].seq); + int64_t seq = funcctx->call_cntr == 0? 1 : result_tuples[funcctx->call_cntr - 1].start_id; + + values[0] = Int32GetDatum(funcctx->call_cntr + 1); + values[1] = Int32GetDatum(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); @@ -169,6 +171,8 @@ PGDLLEXPORT Datum _pgr_binarybreadthfirstsearch(PG_FUNCTION_ARGS) { values[6] = Float8GetDatum(result_tuples[funcctx->call_cntr].cost); values[7] = Float8GetDatum(result_tuples[funcctx->call_cntr].agg_cost); + result_tuples[funcctx->call_cntr].start_id = result_tuples[funcctx->call_cntr].edge < 0? 1 : seq + 1; + tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); diff --git a/src/common/basePath_SSEC.cpp b/src/common/basePath_SSEC.cpp index a0c30ab4eb..7e99667e5f 100644 --- a/src/common/basePath_SSEC.cpp +++ b/src/common/basePath_SSEC.cpp @@ -245,7 +245,7 @@ void Path::generate_postgres_data( auto cost = std::fabs(e.cost - (std::numeric_limits::max)()) < 1? std::numeric_limits::infinity() : e.cost; - (*postgres_data)[sequence] = {i, start_id(), end_id(), e.node, e.edge, cost, agg_cost}; + (*postgres_data)[sequence] = {start_id(), end_id(), e.node, e.edge, cost, agg_cost}; ++i; ++sequence; } @@ -272,7 +272,6 @@ void Path::get_pg_nksp_path( Path_rt **ret_path, size_t &sequence) const { for (unsigned int i = 0; i < path.size(); i++) { - (*ret_path)[sequence].seq = static_cast(i + 1); (*ret_path)[sequence].start_id = start_id(); (*ret_path)[sequence].end_id = end_id(); (*ret_path)[sequence].node = path[i].node; @@ -290,7 +289,6 @@ void Path::get_pg_turn_restricted_path( Path_rt **ret_path, size_t &sequence, int routeId) const { for (unsigned int i = 0; i < path.size(); i++) { - (*ret_path)[sequence].seq = static_cast(i + 1); (*ret_path)[sequence].start_id = routeId; (*ret_path)[sequence].end_id = end_id(); (*ret_path)[sequence].node = path[i].node; diff --git a/src/dagShortestPath/dagShortestPath.c b/src/dagShortestPath/dagShortestPath.c index 937ffc15e4..1741b7982b 100644 --- a/src/dagShortestPath/dagShortestPath.c +++ b/src/dagShortestPath/dagShortestPath.c @@ -167,13 +167,17 @@ PGDLLEXPORT Datum _pgr_dagshortestpath(PG_FUNCTION_ARGS) { nulls[i] = false; } - values[0] = Int32GetDatum((int32_t)funcctx->call_cntr + 1); - values[1] = Int32GetDatum(result_tuples[funcctx->call_cntr].seq); + int64_t seq = funcctx->call_cntr == 0? 1 : result_tuples[funcctx->call_cntr - 1].start_id; + + values[0] = Int32GetDatum(funcctx->call_cntr + 1); + values[1] = Int32GetDatum(seq); values[2] = Int64GetDatum(result_tuples[funcctx->call_cntr].node); values[3] = Int64GetDatum(result_tuples[funcctx->call_cntr].edge); values[4] = Float8GetDatum(result_tuples[funcctx->call_cntr].cost); values[5] = Float8GetDatum(result_tuples[funcctx->call_cntr].agg_cost); + result_tuples[funcctx->call_cntr].start_id = result_tuples[funcctx->call_cntr].edge < 0? 1 : seq + 1; + tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); diff --git a/src/dijkstra/dijkstra.c b/src/dijkstra/dijkstra.c index fef5bc0444..18581520db 100644 --- a/src/dijkstra/dijkstra.c +++ b/src/dijkstra/dijkstra.c @@ -220,8 +220,10 @@ _pgr_dijkstra(PG_FUNCTION_ARGS) { nulls[i] = false; } - values[0] = Int32GetDatum((int32_t)call_cntr + 1); - values[1] = Int32GetDatum(result_tuples[call_cntr].seq); + int64_t seq = call_cntr == 0? 1 : result_tuples[call_cntr - 1].start_id; + + values[0] = Int32GetDatum(call_cntr + 1); + values[1] = Int32GetDatum(seq); values[2] = Int64GetDatum(result_tuples[call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[call_cntr].node); @@ -229,6 +231,8 @@ _pgr_dijkstra(PG_FUNCTION_ARGS) { values[6] = Float8GetDatum(result_tuples[call_cntr].cost); values[7] = Float8GetDatum(result_tuples[call_cntr].agg_cost); + result_tuples[call_cntr].start_id = result_tuples[call_cntr].edge < 0? 1 : seq + 1; + tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); diff --git a/src/ksp/ksp.c b/src/ksp/ksp.c index 45af7fa1c8..6420d9b985 100644 --- a/src/ksp/ksp.c +++ b/src/ksp/ksp.c @@ -199,10 +199,11 @@ _pgr_ksp(PG_FUNCTION_ARGS) { path_id = path[funcctx->call_cntr - 1].start_id; } } + int64_t seq = funcctx->call_cntr == 0? 1 : path[funcctx->call_cntr - 1].end_id; values[0] = Int32GetDatum(funcctx->call_cntr + 1); values[1] = Int32GetDatum(path_id); - values[2] = Int32GetDatum(path[funcctx->call_cntr].seq); + values[2] = Int32GetDatum(seq); if (PG_NARGS() != 6) { values[3] = Int64GetDatum(path[funcctx->call_cntr].start_id); values[4] = Int64GetDatum(path[funcctx->call_cntr].end_id); @@ -213,6 +214,7 @@ _pgr_ksp(PG_FUNCTION_ARGS) { values[n - 1] = Float8GetDatum(path[funcctx->call_cntr].agg_cost); path[funcctx->call_cntr].start_id = path_id; + path[funcctx->call_cntr].end_id = path[funcctx->call_cntr].edge < 0? 1 : seq + 1; tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); diff --git a/src/ksp/turnRestrictedPath.c b/src/ksp/turnRestrictedPath.c index ea5794f679..d3bf8e07c8 100644 --- a/src/ksp/turnRestrictedPath.c +++ b/src/ksp/turnRestrictedPath.c @@ -177,14 +177,17 @@ _pgr_turnrestrictedpath(PG_FUNCTION_ARGS) { nulls[i] = false; } - values[0] = Int32GetDatum((int32_t)funcctx->call_cntr + 1); - values[1] = Int32GetDatum((int32_t)path[funcctx->call_cntr].start_id + 1); - values[2] = Int32GetDatum(path[funcctx->call_cntr].seq); + int64_t seq = funcctx->call_cntr == 0? 1 : path[funcctx->call_cntr - 1].start_id; + + values[0] = Int32GetDatum(funcctx->call_cntr + 1); + values[1] = Int32GetDatum(path[funcctx->call_cntr].start_id + 1); + values[2] = Int32GetDatum(seq); values[3] = Int64GetDatum(path[funcctx->call_cntr].node); values[4] = Int64GetDatum(path[funcctx->call_cntr].edge); values[5] = Float8GetDatum(path[funcctx->call_cntr].cost); values[6] = Float8GetDatum(path[funcctx->call_cntr].agg_cost); + path[funcctx->call_cntr].start_id = path[funcctx->call_cntr].edge < 0? 1 : seq + 1; tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); diff --git a/src/ksp/withPoints_ksp.c b/src/ksp/withPoints_ksp.c index 2bd66b4df3..fefa03b56b 100644 --- a/src/ksp/withPoints_ksp.c +++ b/src/ksp/withPoints_ksp.c @@ -251,10 +251,11 @@ PGDLLEXPORT Datum _pgr_withpointsksp(PG_FUNCTION_ARGS) { path_id = result_tuples[funcctx->call_cntr - 1].start_id; } } + int64_t seq = funcctx->call_cntr == 0? 1 : result_tuples[funcctx->call_cntr - 1].end_id; values[0] = Int32GetDatum(funcctx->call_cntr + 1); values[1] = Int32GetDatum(path_id); - values[2] = Int32GetDatum(result_tuples[funcctx->call_cntr].seq); + values[2] = Int32GetDatum(seq); if (PG_NARGS() != 9) { values[3] = Int64GetDatum(result_tuples[funcctx->call_cntr].start_id); values[4] = Int64GetDatum(result_tuples[funcctx->call_cntr].end_id); @@ -265,6 +266,7 @@ PGDLLEXPORT Datum _pgr_withpointsksp(PG_FUNCTION_ARGS) { values[n - 1] = Float8GetDatum(result_tuples[funcctx->call_cntr].agg_cost); result_tuples[funcctx->call_cntr].start_id = path_id; + result_tuples[funcctx->call_cntr].end_id = result_tuples[funcctx->call_cntr].edge < 0? 1 : seq + 1; tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); diff --git a/src/trsp/new_trsp.c b/src/trsp/new_trsp.c index 727f66c0e1..684c95d2b0 100644 --- a/src/trsp/new_trsp.c +++ b/src/trsp/new_trsp.c @@ -161,11 +161,10 @@ _pgr_trspv4(PG_FUNCTION_ARGS) { 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; + int64_t path_seq = call_cntr == 0? 1 : result_tuples[call_cntr - 1].start_id; values[0] = Int32GetDatum((int32_t)call_cntr + 1); - values[1] = Int32GetDatum(result_tuples[call_cntr].seq); + values[1] = Int32GetDatum(path_seq); values[2] = Int64GetDatum(result_tuples[call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[call_cntr].node); @@ -173,7 +172,7 @@ _pgr_trspv4(PG_FUNCTION_ARGS) { values[6] = Float8GetDatum(result_tuples[call_cntr].cost); values[7] = Float8GetDatum(result_tuples[call_cntr].agg_cost); - result_tuples[call_cntr].seq = path_id; + result_tuples[call_cntr].start_id = result_tuples[call_cntr].edge < 0? 1 : path_seq + 1; tuple = heap_form_tuple(tuple_desc, values, nulls); @@ -258,11 +257,10 @@ _v4trsp(PG_FUNCTION_ARGS) { 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; + int64_t path_seq = call_cntr == 0? 1 : result_tuples[call_cntr - 1].start_id; values[0] = Int32GetDatum((int32_t)call_cntr + 1); - values[1] = Int32GetDatum(result_tuples[call_cntr].seq); + values[1] = Int32GetDatum(path_seq); values[2] = Int64GetDatum(result_tuples[call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[call_cntr].node); @@ -270,7 +268,7 @@ _v4trsp(PG_FUNCTION_ARGS) { values[6] = Float8GetDatum(result_tuples[call_cntr].cost); values[7] = Float8GetDatum(result_tuples[call_cntr].agg_cost); - result_tuples[call_cntr].seq = path_id; + result_tuples[call_cntr].start_id = result_tuples[call_cntr].edge < 0? 1 : path_seq + 1; tuple = heap_form_tuple(tuple_desc, values, nulls); @@ -344,8 +342,10 @@ _trsp(PG_FUNCTION_ARGS) { nulls[i] = false; } - values[0] = Int64GetDatum((int64_t)call_cntr + 1); - values[1] = Int32GetDatum(result_tuples[call_cntr].seq); + int64_t path_seq = call_cntr == 0? 1 : result_tuples[call_cntr - 1].start_id; + + values[0] = Int32GetDatum(call_cntr + 1); + values[1] = Int32GetDatum(path_seq); values[2] = Int64GetDatum(result_tuples[call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[call_cntr].node); @@ -353,8 +353,9 @@ _trsp(PG_FUNCTION_ARGS) { values[6] = Float8GetDatum(result_tuples[call_cntr].cost); values[7] = Float8GetDatum(result_tuples[call_cntr].agg_cost); - tuple = heap_form_tuple(tuple_desc, values, nulls); + result_tuples[call_cntr].start_id = result_tuples[call_cntr].edge < 0? 1 : path_seq + 1; + tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); pfree(values); diff --git a/src/trsp/trsp_withPoints.c b/src/trsp/trsp_withPoints.c index 155ea5ee4a..efa06c258f 100644 --- a/src/trsp/trsp_withPoints.c +++ b/src/trsp/trsp_withPoints.c @@ -204,11 +204,9 @@ _pgr_trsp_withpoints(PG_FUNCTION_ARGS) { 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((int32_t)call_cntr + 1); - values[1] = Int32GetDatum(result_tuples[call_cntr].seq); + int64_t seq = call_cntr == 0? 1 : result_tuples[call_cntr - 1].start_id; + values[0] = Int32GetDatum(call_cntr + 1); + values[1] = Int32GetDatum(seq); values[2] = Int64GetDatum(result_tuples[call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[call_cntr].node); @@ -216,7 +214,7 @@ _pgr_trsp_withpoints(PG_FUNCTION_ARGS) { values[6] = Float8GetDatum(result_tuples[call_cntr].cost); values[7] = Float8GetDatum(result_tuples[call_cntr].agg_cost); - result_tuples[call_cntr].seq = path_id; + result_tuples[call_cntr].start_id = result_tuples[call_cntr].edge < 0? 1 : seq + 1; tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); diff --git a/src/withPoints/withPoints.c b/src/withPoints/withPoints.c index bef63f3595..d60eb59a5a 100644 --- a/src/withPoints/withPoints.c +++ b/src/withPoints/withPoints.c @@ -202,9 +202,10 @@ _pgr_withpoints(PG_FUNCTION_ARGS) { nulls[i] = false; } + int64_t seq = funcctx->call_cntr == 0? 1 : result_tuples[funcctx->call_cntr - 1].start_id; - values[0] = Int32GetDatum((int32_t)funcctx->call_cntr + 1); - values[1] = Int32GetDatum(result_tuples[funcctx->call_cntr].seq); + values[0] = Int32GetDatum(funcctx->call_cntr + 1); + values[1] = Int32GetDatum(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); @@ -212,6 +213,8 @@ _pgr_withpoints(PG_FUNCTION_ARGS) { values[6] = Float8GetDatum(result_tuples[funcctx->call_cntr].cost); values[7] = Float8GetDatum(result_tuples[funcctx->call_cntr].agg_cost); + result_tuples[funcctx->call_cntr].start_id = result_tuples[funcctx->call_cntr].edge < 0? 1 : seq + 1; + tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); From 9d6d6bed10c15dbad0bd3a3bad89ec2dbee760ea Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 13 Feb 2023 10:43:47 -0600 Subject: [PATCH 136/428] [c++] :wrench: adjusted to not use seq from structure --- include/chinese/pgr_chinesePostman.hpp | 4 ---- src/chinese/chinesePostman_driver.cpp | 1 - src/max_flow/edge_disjoint_paths_driver.cpp | 2 +- src/max_flow/pgr_maxflow.cpp | 2 -- 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/include/chinese/pgr_chinesePostman.hpp b/include/chinese/pgr_chinesePostman.hpp index 239b1a61a1..274407d203 100644 --- a/include/chinese/pgr_chinesePostman.hpp +++ b/include/chinese/pgr_chinesePostman.hpp @@ -274,10 +274,8 @@ PgrDirectedChPPGraph::BuildResultPath() { newElement.cost = edge_t.cost; if (resultPath.empty()) { /* adding the first row because is a cycle */ - newElement.seq = 1; newElement.agg_cost = 0.0; } else { - newElement.seq = resultPath.back().seq + 1; newElement.agg_cost = resultPath.back().agg_cost + resultPath.back().cost; } resultPath.push_back(newElement); @@ -287,10 +285,8 @@ PgrDirectedChPPGraph::BuildResultPath() { newElement.edge = -1; newElement.cost = 0; if (resultPath.empty()) { - newElement.seq = 1; newElement.agg_cost = 0.0; } else { - newElement.seq = resultPath.back().seq + 1; newElement.agg_cost = resultPath.back().agg_cost + resultPath.back().cost; } diff --git a/src/chinese/chinesePostman_driver.cpp b/src/chinese/chinesePostman_driver.cpp index dab10402e6..742716ed49 100644 --- a/src/chinese/chinesePostman_driver.cpp +++ b/src/chinese/chinesePostman_driver.cpp @@ -86,7 +86,6 @@ pgr_do_directedChPP( if (only_cost) { if (minCost >= 0.0) { Path_rt edge = {}; - edge.seq = -1; edge.node = edge.edge = -1; edge.cost = edge.agg_cost = minCost; pathEdges.push_back(edge); diff --git a/src/max_flow/edge_disjoint_paths_driver.cpp b/src/max_flow/edge_disjoint_paths_driver.cpp index 80e968f35a..0f301a174d 100644 --- a/src/max_flow/edge_disjoint_paths_driver.cpp +++ b/src/max_flow/edge_disjoint_paths_driver.cpp @@ -169,7 +169,7 @@ pgr_do_edge_disjoint_paths( */ auto prev = paths[0]; for (auto &r : paths) { - if (r.seq == 1) { + if (&r == &paths[0] || prev.edge < 0) { r.agg_cost = 0; } else { r.agg_cost = prev.agg_cost + prev.cost; diff --git a/src/max_flow/pgr_maxflow.cpp b/src/max_flow/pgr_maxflow.cpp index ac28d6a5c7..c44d5559ef 100644 --- a/src/max_flow/pgr_maxflow.cpp +++ b/src/max_flow/pgr_maxflow.cpp @@ -282,7 +282,6 @@ PgrFlowGraph::get_edge_disjoint_paths( size_t j; for (j = 0; j < size - 1; j++) { Path_rt edge = {}; - edge.seq = static_cast(j + 1); edge.start_id = paths[i][0]; edge.end_id = paths[i][size - 1]; edge.node = paths[i][j]; @@ -293,7 +292,6 @@ PgrFlowGraph::get_edge_disjoint_paths( path_elements.push_back(edge); } Path_rt edge = {}; - edge.seq = static_cast(j + 1); edge.start_id = paths[i][0]; edge.end_id = paths[i][size - 1]; edge.node = paths[i][j]; From e87c26b136d42949bd1965bf5522ede9784d835b Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 11 Feb 2024 13:27:21 -0600 Subject: [PATCH 137/428] (pgtap) fixing sql error --- pgtap/mincut/stoerWagner/compare_components.pg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pgtap/mincut/stoerWagner/compare_components.pg b/pgtap/mincut/stoerWagner/compare_components.pg index c67c96c407..69062167ea 100644 --- a/pgtap/mincut/stoerWagner/compare_components.pg +++ b/pgtap/mincut/stoerWagner/compare_components.pg @@ -98,7 +98,7 @@ SELECT CASE WHEN (SELECT boost FROM pgr_full_version()) < '1.80' THEN collect_tap(set_eq('stoerWagner7', 'VALUES (1, 1, 1, 1)', '6: Compare the mincut of subgraph with actual result')) ELSE collect_tap(set_eq('stoerWagner7', 'VALUES (1, 14, 1, 1)', '6: Compare the mincut of subgraph with actual result')) -END CASE; +END; SELECT * FROM finish(); ROLLBACK; From 068032071297b40572e7c85d63785109a17b58bd Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 20 Feb 2024 15:22:39 -0600 Subject: [PATCH 138/428] Removing enum file --- include/cpp_common/graph_enum.hpp | 36 ------------------------------- 1 file changed, 36 deletions(-) delete mode 100644 include/cpp_common/graph_enum.hpp diff --git a/include/cpp_common/graph_enum.hpp b/include/cpp_common/graph_enum.hpp deleted file mode 100644 index c114c8669c..0000000000 --- a/include/cpp_common/graph_enum.hpp +++ /dev/null @@ -1,36 +0,0 @@ -/*PGR-GNU***************************************************************** -File: graph_enum.hpp - -Copyright (c) 2015 pgRouting developers -Mail: project@pgrouting.org - -Copyright (c) 2015 Celia Virginia Vergara Castillo -Mail: vicky_vergara@hotmail.com - ------- - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - ********************************************************************PGR-GNU*/ -/*! @file */ - -#ifndef INCLUDE_CPP_COMMON_GRAPH_ENUM_HPP_ -#define INCLUDE_CPP_COMMON_GRAPH_ENUM_HPP_ -#pragma once - -enum graphType {UNDIRECTED = 0, DIRECTED}; - - -#endif // INCLUDE_CPP_COMMON_GRAPH_ENUM_HPP_ From 8b8957042ba810bd2903cbfe504b52000619916f Mon Sep 17 00:00:00 2001 From: cvvergara Date: Fri, 26 Jan 2024 13:10:58 -0600 Subject: [PATCH 139/428] Using boolean instead of enumeration --- include/contraction/pgr_contractionGraph.hpp | 6 ++-- include/cpp_common/pgr_base_graph.hpp | 36 +++++++++---------- include/lineGraph/pgr_lineGraph.hpp | 6 ++-- include/lineGraph/pgr_lineGraphFull.hpp | 6 ++-- src/allpairs/floydWarshall_driver.cpp | 10 +++--- src/allpairs/johnson_driver.cpp | 6 ++-- src/alpha_shape/pgr_alphaShape.cpp | 2 +- src/astar/astar_driver.cpp | 6 ++-- src/bdAstar/bdAstar_driver.cpp | 6 ++-- src/bdDijkstra/bdDijkstra_driver.cpp | 6 ++-- src/bellman_ford/bellman_ford_driver.cpp | 6 ++-- src/bellman_ford/bellman_ford_neg_driver.cpp | 6 ++-- src/bellman_ford/edwardMoore_driver.cpp | 6 ++-- .../binaryBreadthFirstSearch_driver.cpp | 6 ++-- .../breadthFirstSearch_driver.cpp | 6 ++-- src/circuits/hawickCircuits_driver.cpp | 3 +- src/coloring/bipartite_driver.cpp | 3 +- src/coloring/edgeColoring_driver.cpp | 1 - .../sequentialVertexColoring_driver.cpp | 3 +- src/components/articulationPoints_driver.cpp | 4 +-- .../biconnectedComponents_driver.cpp | 5 +-- src/components/bridges_driver.cpp | 5 +-- src/components/connectedComponents_driver.cpp | 4 +-- src/components/makeConnected_driver.cpp | 3 +- src/components/strongComponents_driver.cpp | 6 +--- src/contraction/contractGraph_driver.cpp | 6 ++-- .../dagShortestPath_driver.cpp | 6 ++-- src/dijkstra/dijkstraVia_driver.cpp | 6 ++-- src/dijkstra/dijkstra_driver.cpp | 6 ++-- .../lengauerTarjanDominatorTree_driver.cpp | 3 +- src/driving_distance/drivedist_driver.cpp | 10 +++--- src/driving_distance/withPoints_dd_driver.cpp | 6 ++-- src/ksp/ksp_driver.cpp | 6 ++-- src/ksp/turnRestrictedPath_driver.cpp | 6 ++-- src/ksp/withPoints_ksp_driver.cpp | 12 ++----- src/lineGraph/lineGraphFull_driver.cpp | 4 +-- src/lineGraph/lineGraph_driver.cpp | 4 +-- src/mincut/stoerWagner_driver.cpp | 6 +--- src/ordering/cuthillMckeeOrdering_driver.cpp | 5 +-- src/planar/boyerMyrvold_driver.cpp | 2 +- src/planar/isPlanar_driver.cpp | 4 +-- src/spanningTree/kruskal_driver.cpp | 2 +- src/spanningTree/prim_driver.cpp | 2 +- .../randomSpanningTree_driver.cpp | 6 ++-- .../topologicalSort_driver.cpp | 5 +-- .../transitiveClosure_driver.cpp | 3 +- src/traversal/depthFirstSearch_driver.cpp | 5 ++- src/trsp/trspVia_driver.cpp | 6 ++-- src/trsp/trspVia_withPoints_driver.cpp | 7 ++-- src/trsp/trsp_driver.cpp | 6 ++-- src/trsp/trsp_withPoints_driver.cpp | 6 ++-- src/withPoints/withPointsVia_driver.cpp | 6 ++-- src/withPoints/withPoints_driver.cpp | 6 ++-- 53 files changed, 126 insertions(+), 183 deletions(-) diff --git a/include/contraction/pgr_contractionGraph.hpp b/include/contraction/pgr_contractionGraph.hpp index a71ca8a1d4..56b3e20b33 100644 --- a/include/contraction/pgr_contractionGraph.hpp +++ b/include/contraction/pgr_contractionGraph.hpp @@ -56,10 +56,10 @@ class Pgr_contractionGraph : public Pgr_base_graph { typedef typename boost::graph_traits < G >::in_edge_iterator EI_i; /*! - Prepares the _graph_ to be of type *gtype* + Prepares the _graph_ to be of type *directed* */ - explicit Pgr_contractionGraph(graphType gtype) - : Pgr_base_graph(gtype) { + explicit Pgr_contractionGraph(bool directed) + : Pgr_base_graph(directed) { } /*! @brief get the vertex descriptors of adjacent vertices of *v* diff --git a/include/cpp_common/pgr_base_graph.hpp b/include/cpp_common/pgr_base_graph.hpp index a92019bf2c..0569ffaf81 100644 --- a/include/cpp_common/pgr_base_graph.hpp +++ b/include/cpp_common/pgr_base_graph.hpp @@ -41,8 +41,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/graph_enum.hpp" - #include "cpp_common/basic_vertex.hpp" #include "cpp_common/xy_vertex.hpp" #include "cpp_common/basic_edge.hpp" @@ -129,20 +127,20 @@ std::vector< Basic_Vertex > vertices(pgrouting::extract_vertices(my_edges)); There are several ways to initialize the graph ~~~~{.c} // 1. Initializes an empty graph -pgrouting::DirectedGraph digraph(gType); +pgrouting::DirectedGraph digraph(true); // 2. Initializes a graph based on the vertices pgrouting::DirectedGraph digraph( verices, - gType); + true); vertices.clear(); 3. Initializes a graph based on the extracted vertices pgrouting::DirectedGraph digraph( pgrouting::extract_vertices(my_edges, total_edges); - gType); + true); 4. Initializes a graph based on the extracted vertices pgrouting::DirectedGraph digraph( pgrouting::extract_vertices(my_edges); - gType); + true); ~~~~ 1. Initializes an empty graph - vertices vector size is 0 @@ -262,7 +260,7 @@ class Pgr_base_graph { //! @name The Graph //@{ G graph; //!< The graph - graphType m_gType; //!< type (DIRECTED or UNDIRECTED) + bool m_is_directed; //!< type (DIRECTED or UNDIRECTED) //@} //! @name Id mapping handling @@ -297,12 +295,12 @@ class Pgr_base_graph { - The vertices must be checked (if necessary) before calling the constructor */ Pgr_base_graph< G , T_V, T_E >( - const std::vector< T_V > &vertices, graphType gtype) + const std::vector< T_V > &vertices, bool directed) : graph(vertices.size()), #if 0 m_num_vertices(vertices.size()), #endif - m_gType(gtype), + m_is_directed(directed), vertIndex(boost::get(boost::vertex_index, graph)), propmapIndex(mapIndex) { // add_vertices(vertices); @@ -339,12 +337,12 @@ class Pgr_base_graph { /*! Prepares the _graph_ to be of type gtype with 0 vertices */ - explicit Pgr_base_graph< G , T_V, T_E >(graphType gtype) + explicit Pgr_base_graph< G , T_V, T_E >(bool directed) : graph(0), #if 0 m_num_vertices(0), #endif - m_gType(gtype), + m_is_directed(directed), vertIndex(boost::get(boost::vertex_index, graph)), propmapIndex(mapIndex) { } @@ -552,8 +550,8 @@ class Pgr_base_graph { //! @name to be or not to be //@{ - bool is_directed() const {return m_gType == DIRECTED;} - bool is_undirected() const {return m_gType == UNDIRECTED;} + bool is_directed() const {return m_is_directed;} + bool is_undirected() const {return !m_is_directed;} bool is_source(V v_idx, E e_idx) const {return v_idx == source(e_idx);} bool is_target(V v_idx, E e_idx) const {return v_idx == target(e_idx);} @@ -857,7 +855,7 @@ Pgr_base_graph< G, T_V, T_E >::disconnect_vertex(V vertex) { } // special case - if (m_gType == DIRECTED) { + if (m_is_directed) { EI_i in, in_end; for (boost::tie(in, in_end) = in_edges(vertex, graph); in != in_end; ++in) { @@ -968,8 +966,7 @@ Pgr_base_graph< G, T_V, T_E >::graph_add_edge(const T &edge, bool normal) { } if (edge.reverse_cost >= 0 - && (m_gType == DIRECTED - || (m_gType == UNDIRECTED && edge.cost != edge.reverse_cost))) { + && (m_is_directed || (!m_is_directed && edge.cost != edge.reverse_cost))) { boost::tie(e, inserted) = boost::add_edge(vm_t, vm_s, graph); @@ -1014,8 +1011,7 @@ Pgr_base_graph< G, T_V, T_E >::graph_add_min_edge_no_parallel(const T &edge) { } if (edge.reverse_cost >= 0 - && (m_gType == DIRECTED - || (m_gType == UNDIRECTED && edge.cost != edge.reverse_cost))) { + && (m_is_directed || (!m_is_directed && edge.cost != edge.reverse_cost))) { E e1; bool found; boost::tie(e1, found) = boost::edge(vm_t, vm_s, graph); @@ -1064,8 +1060,8 @@ Pgr_base_graph< G, T_V, T_E >::graph_add_neg_edge(const T &edge, bool normal) { } graph[e].id = edge.id; - if (m_gType == DIRECTED - || (m_gType == UNDIRECTED && edge.cost > edge.reverse_cost)) { + if (m_is_directed + || (!m_is_directed && edge.cost > edge.reverse_cost)) { boost::tie(e, inserted) = boost::add_edge(vm_t, vm_s, graph); if (edge.reverse_cost < 0) { diff --git a/include/lineGraph/pgr_lineGraph.hpp b/include/lineGraph/pgr_lineGraph.hpp index 4352fc3e50..d0c1a6e187 100644 --- a/include/lineGraph/pgr_lineGraph.hpp +++ b/include/lineGraph/pgr_lineGraph.hpp @@ -56,12 +56,12 @@ class Pgr_lineGraph : public Pgr_base_graph { typedef typename boost::graph_traits < G >::in_edge_iterator EI_i; - explicit Pgr_lineGraph< G, T_V, T_E >(graphType gtype) - : Pgr_base_graph< G, T_V, T_E >(gtype) { + explicit Pgr_lineGraph< G, T_V, T_E >(bool directed) + : Pgr_base_graph< G, T_V, T_E >(directed) { } explicit Pgr_lineGraph< G, T_V, T_E >(const pgrouting::DirectedGraph &digraph) - : Pgr_base_graph< G, T_V, T_E >(graphType::DIRECTED) { + : Pgr_base_graph< G, T_V, T_E >(true) { insert_vertices(digraph); create_edges(digraph); } diff --git a/include/lineGraph/pgr_lineGraphFull.hpp b/include/lineGraph/pgr_lineGraphFull.hpp index 3cb55e9d57..c782aa4ca4 100644 --- a/include/lineGraph/pgr_lineGraphFull.hpp +++ b/include/lineGraph/pgr_lineGraphFull.hpp @@ -55,13 +55,13 @@ class Pgr_lineGraphFull : public Pgr_base_graph { typedef typename boost::graph_traits < G >::in_edge_iterator EI_i; - explicit Pgr_lineGraphFull< G, T_V, T_E >(const graphType >ype) - : Pgr_base_graph< G, T_V, T_E >(gtype), + explicit Pgr_lineGraphFull< G, T_V, T_E >(bool directed) + : Pgr_base_graph< G, T_V, T_E >(directed), m_num_edges(0) { } explicit Pgr_lineGraphFull< G, T_V, T_E >(const pgrouting::DirectedGraph &digraph) - : Pgr_base_graph< G, T_V, T_E >(graphType::DIRECTED) { + : Pgr_base_graph< G, T_V, T_E >(true) { apply_transformation(digraph); store_edge_costs(digraph); } diff --git a/src/allpairs/floydWarshall_driver.cpp b/src/allpairs/floydWarshall_driver.cpp index 0dc5cfb4c1..f43f3ad454 100644 --- a/src/allpairs/floydWarshall_driver.cpp +++ b/src/allpairs/floydWarshall_driver.cpp @@ -43,7 +43,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. void pgr_do_floydWarshall( char *edges_sql, - bool directedFlag, + bool directed, IID_t_rt **return_tuples, size_t *return_count, @@ -62,8 +62,6 @@ pgr_do_floydWarshall( pgassert(!(*return_tuples)); pgassert(*return_count == 0); - graphType gType = directedFlag? DIRECTED: UNDIRECTED; - hint = edges_sql; auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, true); @@ -72,14 +70,14 @@ pgr_do_floydWarshall( } hint = nullptr; - if (directedFlag) { + if (directed) { log << "Processing Directed graph\n"; - pgrouting::DirectedGraph digraph(gType); + pgrouting::DirectedGraph digraph(directed); digraph.insert_edges(edges); pgr_floydWarshall(digraph, *return_count, return_tuples); } else { log << "Processing Undirected graph\n"; - pgrouting::UndirectedGraph undigraph(gType); + pgrouting::UndirectedGraph undigraph(directed); undigraph.insert_edges(edges); pgr_floydWarshall(undigraph, *return_count, return_tuples); } diff --git a/src/allpairs/johnson_driver.cpp b/src/allpairs/johnson_driver.cpp index 030a5e1dd3..d9b3070116 100644 --- a/src/allpairs/johnson_driver.cpp +++ b/src/allpairs/johnson_driver.cpp @@ -61,8 +61,6 @@ pgr_do_johnson( pgassert(!(*return_tuples)); pgassert(*return_count == 0); - graphType gType = directed? DIRECTED: UNDIRECTED; - hint = edges_sql; auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, true); @@ -73,12 +71,12 @@ pgr_do_johnson( if (directed) { log << "Processing Directed graph\n"; - pgrouting::DirectedGraph digraph(gType); + pgrouting::DirectedGraph digraph(directed); digraph.insert_edges(edges); pgr_johnson(digraph, *return_count, return_tuples); } else { log << "Processing Undirected graph\n"; - pgrouting::UndirectedGraph undigraph(gType); + pgrouting::UndirectedGraph undigraph(directed); undigraph.insert_edges(edges); pgr_johnson(undigraph, *return_count, return_tuples); } diff --git a/src/alpha_shape/pgr_alphaShape.cpp b/src/alpha_shape/pgr_alphaShape.cpp index c9558424d4..925ea0cc4a 100644 --- a/src/alpha_shape/pgr_alphaShape.cpp +++ b/src/alpha_shape/pgr_alphaShape.cpp @@ -166,7 +166,7 @@ struct CompareRadius { * Constructor */ Pgr_alphaShape::Pgr_alphaShape(const std::vector &edges) : -graph(UNDIRECTED) { +graph(false) { graph.insert_edges(edges); make_triangles(); } diff --git a/src/astar/astar_driver.cpp b/src/astar/astar_driver.cpp index e4ac970a43..183760495c 100644 --- a/src/astar/astar_driver.cpp +++ b/src/astar/astar_driver.cpp @@ -102,15 +102,15 @@ void pgr_do_astar( } - graphType gType = directed? DIRECTED: UNDIRECTED; + std::deque paths; if (directed) { - pgrouting::xyDirectedGraph graph(gType); + pgrouting::xyDirectedGraph graph(directed); graph.insert_edges(edges); paths = pgrouting::algorithms::astar(graph, combinations, heuristic, factor, epsilon, only_cost); } else { - pgrouting::xyUndirectedGraph graph(gType); + pgrouting::xyUndirectedGraph graph(directed); graph.insert_edges(edges); paths = pgrouting::algorithms::astar(graph, combinations, heuristic, factor, epsilon, only_cost); } diff --git a/src/bdAstar/bdAstar_driver.cpp b/src/bdAstar/bdAstar_driver.cpp index 456c91e2fa..4b8745f2e0 100644 --- a/src/bdAstar/bdAstar_driver.cpp +++ b/src/bdAstar/bdAstar_driver.cpp @@ -98,15 +98,15 @@ void pgr_do_bdAstar( } hint = nullptr; - graphType gType = directed? DIRECTED: UNDIRECTED; + std::deque paths; if (directed) { - pgrouting::xyDirectedGraph graph(gType); + pgrouting::xyDirectedGraph graph(directed); graph.insert_edges(edges); paths = pgrouting::algorithms::bdastar(graph, combinations, heuristic, factor, epsilon, only_cost); } else { - pgrouting::xyUndirectedGraph graph(gType); + pgrouting::xyUndirectedGraph graph(directed); graph.insert_edges(edges); paths = pgrouting::algorithms::bdastar(graph, combinations, heuristic, factor, epsilon, only_cost); } diff --git a/src/bdDijkstra/bdDijkstra_driver.cpp b/src/bdDijkstra/bdDijkstra_driver.cpp index 4d8ed79830..30aa75d2cd 100644 --- a/src/bdDijkstra/bdDijkstra_driver.cpp +++ b/src/bdDijkstra/bdDijkstra_driver.cpp @@ -121,7 +121,7 @@ pgr_do_bdDijkstra( return; } - graphType gType = directed? DIRECTED: UNDIRECTED; + hint = edges_sql; auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); @@ -136,11 +136,11 @@ pgr_do_bdDijkstra( std::deque paths; if (directed) { - pgrouting::DirectedGraph graph(gType); + pgrouting::DirectedGraph graph(directed); graph.insert_edges(edges); paths = pgr_bdDijkstra(graph, combinations, only_cost); } else { - pgrouting::UndirectedGraph graph(gType); + pgrouting::UndirectedGraph graph(directed); graph.insert_edges(edges); paths = pgr_bdDijkstra(graph, combinations, only_cost); } diff --git a/src/bellman_ford/bellman_ford_driver.cpp b/src/bellman_ford/bellman_ford_driver.cpp index 0baf0a191c..4775089e48 100644 --- a/src/bellman_ford/bellman_ford_driver.cpp +++ b/src/bellman_ford/bellman_ford_driver.cpp @@ -127,7 +127,7 @@ pgr_do_bellman_ford( pgassert(!(*return_tuples)); pgassert(*return_count == 0); - graphType gType = directed? DIRECTED: UNDIRECTED; + hint = combinations_sql; auto combinations = get_combinations(combinations_sql, starts, ends, true); @@ -151,11 +151,11 @@ pgr_do_bellman_ford( std::deque paths; if (directed) { - pgrouting::DirectedGraph digraph(gType); + pgrouting::DirectedGraph digraph(directed); digraph.insert_edges(edges); paths = bellman_ford(digraph, combinations, only_cost); } else { - pgrouting::UndirectedGraph undigraph(gType); + pgrouting::UndirectedGraph undigraph(directed); undigraph.insert_edges(edges); paths = bellman_ford(undigraph, combinations, only_cost); } diff --git a/src/bellman_ford/bellman_ford_neg_driver.cpp b/src/bellman_ford/bellman_ford_neg_driver.cpp index c2d752dec1..9b97b980bf 100644 --- a/src/bellman_ford/bellman_ford_neg_driver.cpp +++ b/src/bellman_ford/bellman_ford_neg_driver.cpp @@ -125,7 +125,7 @@ pgr_do_bellman_ford_neg( pgassert(!(*return_tuples)); pgassert(*return_count == 0); - graphType gType = directed? DIRECTED: UNDIRECTED; + hint = combinations_sql; auto combinations = get_combinations(combinations_sql, starts, ends, normal); @@ -154,12 +154,12 @@ pgr_do_bellman_ford_neg( std::deque paths; if (directed) { - pgrouting::DirectedGraph digraph(gType); + pgrouting::DirectedGraph digraph(directed); digraph.insert_edges(edges); digraph.insert_negative_edges(neg_edges); paths = bellman_ford(digraph, combinations, only_cost); } else { - pgrouting::UndirectedGraph undigraph(gType); + pgrouting::UndirectedGraph undigraph(directed); undigraph.insert_edges(edges); undigraph.insert_negative_edges(neg_edges); paths = pgr_bellman_ford(undigraph, combinations, only_cost); diff --git a/src/bellman_ford/edwardMoore_driver.cpp b/src/bellman_ford/edwardMoore_driver.cpp index 9780a0e730..3b8e55e8c9 100644 --- a/src/bellman_ford/edwardMoore_driver.cpp +++ b/src/bellman_ford/edwardMoore_driver.cpp @@ -122,7 +122,7 @@ pgr_do_edwardMoore( pgassert(!(*return_tuples)); pgassert(*return_count == 0); - graphType gType = directed? DIRECTED: UNDIRECTED; + hint = combinations_sql; auto combinations = get_combinations(combinations_sql, starts, ends, true); @@ -146,11 +146,11 @@ pgr_do_edwardMoore( std::deque paths; if (directed) { - pgrouting::DirectedGraph digraph(gType); + pgrouting::DirectedGraph digraph(directed); digraph.insert_edges(edges); paths = edwardMoore(digraph, combinations); } else { - pgrouting::UndirectedGraph undigraph(gType); + pgrouting::UndirectedGraph undigraph(directed); undigraph.insert_edges(edges); paths = edwardMoore(undigraph, combinations); } diff --git a/src/breadthFirstSearch/binaryBreadthFirstSearch_driver.cpp b/src/breadthFirstSearch/binaryBreadthFirstSearch_driver.cpp index edb5a302ee..a088917ccb 100644 --- a/src/breadthFirstSearch/binaryBreadthFirstSearch_driver.cpp +++ b/src/breadthFirstSearch/binaryBreadthFirstSearch_driver.cpp @@ -155,7 +155,7 @@ pgr_do_binaryBreadthFirstSearch( pgassert(!(*return_tuples)); pgassert(*return_count == 0); - graphType gType = directed? DIRECTED: UNDIRECTED; + hint = combinations_sql; auto combinations = get_combinations(combinations_sql, starts, ends, true); @@ -179,7 +179,7 @@ pgr_do_binaryBreadthFirstSearch( std::deque< Path >paths; if (directed) { - pgrouting::DirectedGraph digraph(gType); + pgrouting::DirectedGraph digraph(directed); digraph.insert_edges(edges); if (!(costCheck(digraph))) { @@ -190,7 +190,7 @@ pgr_do_binaryBreadthFirstSearch( paths = binaryBreadthFirstSearch(digraph, combinations); } else { - pgrouting::UndirectedGraph undigraph(gType); + pgrouting::UndirectedGraph undigraph(directed); undigraph.insert_edges(edges); if (!(costCheck(undigraph))) { diff --git a/src/breadthFirstSearch/breadthFirstSearch_driver.cpp b/src/breadthFirstSearch/breadthFirstSearch_driver.cpp index abddfad544..18dc938de6 100644 --- a/src/breadthFirstSearch/breadthFirstSearch_driver.cpp +++ b/src/breadthFirstSearch/breadthFirstSearch_driver.cpp @@ -102,7 +102,7 @@ pgr_do_breadthFirstSearch( pgassert(!(*return_tuples)); pgassert(*return_count == 0); - graphType gType = directed? DIRECTED: UNDIRECTED; + hint = edges_sql; auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); @@ -118,12 +118,12 @@ pgr_do_breadthFirstSearch( std::vector results; if (directed) { - pgrouting::DirectedGraph digraph(gType); + pgrouting::DirectedGraph digraph(directed); digraph.insert_edges(edges); results = breadthFirstSearch(digraph, roots, max_depth); } else { - pgrouting::UndirectedGraph undigraph(gType); + pgrouting::UndirectedGraph undigraph(directed); undigraph.insert_edges(edges); results = breadthFirstSearch(undigraph, roots, max_depth); } diff --git a/src/circuits/hawickCircuits_driver.cpp b/src/circuits/hawickCircuits_driver.cpp index 997dc58e6a..6af9c0413c 100644 --- a/src/circuits/hawickCircuits_driver.cpp +++ b/src/circuits/hawickCircuits_driver.cpp @@ -96,8 +96,7 @@ pgr_do_hawickCircuits( std::deque results; - graphType gType = DIRECTED; - pgrouting::DirectedGraph digraph(gType); + pgrouting::DirectedGraph digraph(true); digraph.insert_edges(edges); results = pgr_hawickCircuits(digraph); diff --git a/src/coloring/bipartite_driver.cpp b/src/coloring/bipartite_driver.cpp index 3d80b8b734..5b09db02a2 100644 --- a/src/coloring/bipartite_driver.cpp +++ b/src/coloring/bipartite_driver.cpp @@ -79,8 +79,7 @@ pgr_do_bipartite( hint = nullptr; std::string logstr; - graphType gType = UNDIRECTED; - pgrouting::UndirectedGraph undigraph(gType); + pgrouting::UndirectedGraph undigraph(false); undigraph.insert_edges(edges); std::vector results; pgrouting::functions::Pgr_Bipartite fn_Bipartite; diff --git a/src/coloring/edgeColoring_driver.cpp b/src/coloring/edgeColoring_driver.cpp index b75be666a7..0172463296 100644 --- a/src/coloring/edgeColoring_driver.cpp +++ b/src/coloring/edgeColoring_driver.cpp @@ -34,7 +34,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "coloring/pgr_edgeColoring.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/graph_enum.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.hpp" diff --git a/src/coloring/sequentialVertexColoring_driver.cpp b/src/coloring/sequentialVertexColoring_driver.cpp index ced0b5f49c..96edde0543 100644 --- a/src/coloring/sequentialVertexColoring_driver.cpp +++ b/src/coloring/sequentialVertexColoring_driver.cpp @@ -91,8 +91,7 @@ pgr_do_sequentialVertexColoring( std::vector results; - graphType gType = UNDIRECTED; - pgrouting::UndirectedGraph undigraph(gType); + pgrouting::UndirectedGraph undigraph(false); undigraph.insert_edges(edges); diff --git a/src/components/articulationPoints_driver.cpp b/src/components/articulationPoints_driver.cpp index b7edb4beab..a6ed877cac 100644 --- a/src/components/articulationPoints_driver.cpp +++ b/src/components/articulationPoints_driver.cpp @@ -77,9 +77,7 @@ pgr_do_articulationPoints( } hint = nullptr; - graphType gType = UNDIRECTED; - - pgrouting::UndirectedGraph undigraph(gType); + pgrouting::UndirectedGraph undigraph(false); undigraph.insert_edges(edges); auto results(pgrouting::algorithms::articulationPoints(undigraph)); diff --git a/src/components/biconnectedComponents_driver.cpp b/src/components/biconnectedComponents_driver.cpp index 8e36ec4d23..117d2d7e3c 100644 --- a/src/components/biconnectedComponents_driver.cpp +++ b/src/components/biconnectedComponents_driver.cpp @@ -78,10 +78,7 @@ pgr_do_biconnectedComponents( } hint = nullptr; - graphType gType = UNDIRECTED; - - log << "Working with Undirected Graph\n"; - pgrouting::UndirectedGraph undigraph(gType); + pgrouting::UndirectedGraph undigraph(false); undigraph.insert_edges(edges); auto results(pgrouting::algorithms::biconnectedComponents(undigraph)); diff --git a/src/components/bridges_driver.cpp b/src/components/bridges_driver.cpp index 89100976b4..1538e8f808 100644 --- a/src/components/bridges_driver.cpp +++ b/src/components/bridges_driver.cpp @@ -76,10 +76,7 @@ pgr_do_bridges( } hint = nullptr; - graphType gType = UNDIRECTED; - - - pgrouting::UndirectedGraph undigraph(gType); + pgrouting::UndirectedGraph undigraph(false); undigraph.insert_edges(edges); auto results = pgrouting::algorithms::bridges(undigraph); diff --git a/src/components/connectedComponents_driver.cpp b/src/components/connectedComponents_driver.cpp index 95ab270593..79d5623857 100644 --- a/src/components/connectedComponents_driver.cpp +++ b/src/components/connectedComponents_driver.cpp @@ -77,9 +77,7 @@ pgr_do_connectedComponents( } hint = nullptr; - graphType gType = UNDIRECTED; - - pgrouting::UndirectedGraph undigraph(gType); + pgrouting::UndirectedGraph undigraph(false); undigraph.insert_edges(edges); auto results(pgrouting::algorithms::pgr_connectedComponents(undigraph)); diff --git a/src/components/makeConnected_driver.cpp b/src/components/makeConnected_driver.cpp index 6155997daf..27712ef043 100644 --- a/src/components/makeConnected_driver.cpp +++ b/src/components/makeConnected_driver.cpp @@ -79,8 +79,7 @@ pgr_do_makeConnected( } hint = nullptr; - graphType gType = UNDIRECTED; - pgrouting::UndirectedGraph undigraph(gType); + pgrouting::UndirectedGraph undigraph(false); undigraph.insert_edges(edges); pgrouting::functions::Pgr_makeConnected fn_makeConnected; results = fn_makeConnected.makeConnected(undigraph); diff --git a/src/components/strongComponents_driver.cpp b/src/components/strongComponents_driver.cpp index 0d8b0ab13f..7e42dd83c0 100644 --- a/src/components/strongComponents_driver.cpp +++ b/src/components/strongComponents_driver.cpp @@ -69,8 +69,6 @@ pgr_do_strongComponents( pgassert(!(*return_tuples)); pgassert(*return_count == 0); - graphType gType = DIRECTED; - hint = edges_sql; auto edges = get_edges(std::string(edges_sql), true, false); if (edges.empty()) { @@ -80,9 +78,7 @@ pgr_do_strongComponents( } hint = nullptr; - - - pgrouting::DirectedGraph digraph(gType); + pgrouting::DirectedGraph digraph(true); digraph.insert_edges(edges); auto results(pgrouting::algorithms::strongComponents(digraph)); diff --git a/src/contraction/contractGraph_driver.cpp b/src/contraction/contractGraph_driver.cpp index 6488f0dc33..b11ed1fd8f 100644 --- a/src/contraction/contractGraph_driver.cpp +++ b/src/contraction/contractGraph_driver.cpp @@ -224,10 +224,10 @@ pgr_do_contractGraph( } - graphType gType = directed? DIRECTED: UNDIRECTED; + if (directed) { using DirectedGraph = pgrouting::graph::CHDirectedGraph; - DirectedGraph digraph(gType); + DirectedGraph digraph(directed); process_contraction(digraph, edges, forbid, ordering, max_cycles); @@ -238,7 +238,7 @@ pgr_do_contractGraph( return_count); } else { using UndirectedGraph = pgrouting::graph::CHUndirectedGraph; - UndirectedGraph undigraph(gType); + UndirectedGraph undigraph(directed); process_contraction(undigraph, edges, forbid, ordering, max_cycles); diff --git a/src/dagShortestPath/dagShortestPath_driver.cpp b/src/dagShortestPath/dagShortestPath_driver.cpp index 4195e37932..235d34fc35 100644 --- a/src/dagShortestPath/dagShortestPath_driver.cpp +++ b/src/dagShortestPath/dagShortestPath_driver.cpp @@ -105,7 +105,7 @@ pgr_do_dagShortestPath( return; } - graphType gType = directed? DIRECTED: UNDIRECTED; + hint = edges_sql; auto edges = get_edges(std::string(edges_sql), true, false); @@ -119,11 +119,11 @@ pgr_do_dagShortestPath( std::deque paths; if (directed) { - pgrouting::DirectedGraph graph(gType); + pgrouting::DirectedGraph graph(directed); graph.insert_edges(edges); paths = pgr_dagShortestPath(graph, combinations, only_cost); } else { - pgrouting::UndirectedGraph graph(gType); + pgrouting::UndirectedGraph graph(directed); graph.insert_edges(edges); paths = pgr_dagShortestPath(graph, combinations, only_cost); } diff --git a/src/dijkstra/dijkstraVia_driver.cpp b/src/dijkstra/dijkstraVia_driver.cpp index 92d5f48116..636e29bb6e 100644 --- a/src/dijkstra/dijkstraVia_driver.cpp +++ b/src/dijkstra/dijkstraVia_driver.cpp @@ -120,7 +120,7 @@ pgr_do_dijkstraVia( pgassert(!(*return_tuples)); pgassert(*return_count == 0); - graphType gType = directed? DIRECTED: UNDIRECTED; + auto via = get_intArray(viaArr, false); @@ -136,7 +136,7 @@ pgr_do_dijkstraVia( std::dequepaths; if (directed) { - pgrouting::DirectedGraph digraph(gType); + pgrouting::DirectedGraph digraph(directed); digraph.insert_edges(edges); pgrouting::pgr_dijkstraVia( digraph, @@ -146,7 +146,7 @@ pgr_do_dijkstraVia( U_turn_on_edge, log); } else { - pgrouting::UndirectedGraph undigraph(gType); + pgrouting::UndirectedGraph undigraph(directed); undigraph.insert_edges(edges); pgrouting::pgr_dijkstraVia( undigraph, diff --git a/src/dijkstra/dijkstra_driver.cpp b/src/dijkstra/dijkstra_driver.cpp index b7bff39d02..cf2ff256eb 100644 --- a/src/dijkstra/dijkstra_driver.cpp +++ b/src/dijkstra/dijkstra_driver.cpp @@ -149,7 +149,7 @@ pgr_do_dijkstra( return; } - graphType gType = directed? DIRECTED: UNDIRECTED; + hint = edges_sql; auto edges = get_edges(std::string(edges_sql), normal, false); @@ -165,11 +165,11 @@ pgr_do_dijkstra( std::dequepaths; if (directed) { - pgrouting::DirectedGraph graph(gType); + pgrouting::DirectedGraph graph(directed); graph.insert_edges(edges); paths = pgrouting::algorithms::dijkstra(graph, combinations, only_cost, n); } else { - pgrouting::UndirectedGraph graph(gType); + pgrouting::UndirectedGraph graph(directed); graph.insert_edges(edges); paths = pgrouting::algorithms::dijkstra(graph, combinations, only_cost, n); } diff --git a/src/dominator/lengauerTarjanDominatorTree_driver.cpp b/src/dominator/lengauerTarjanDominatorTree_driver.cpp index 6433e25620..1538a25ec2 100644 --- a/src/dominator/lengauerTarjanDominatorTree_driver.cpp +++ b/src/dominator/lengauerTarjanDominatorTree_driver.cpp @@ -82,8 +82,7 @@ pgr_do_LTDTree( std::string logstr; - graphType gType = DIRECTED; - pgrouting::DirectedGraph digraph(gType); + pgrouting::DirectedGraph digraph(true); digraph.insert_edges(edges); std::vector results; pgrouting::functions::Pgr_LTDTree fn_LTDTree; diff --git a/src/driving_distance/drivedist_driver.cpp b/src/driving_distance/drivedist_driver.cpp index 0b63fc2f46..c34728880a 100644 --- a/src/driving_distance/drivedist_driver.cpp +++ b/src/driving_distance/drivedist_driver.cpp @@ -48,7 +48,7 @@ pgr_do_drivingDistance( char *edges_sql, ArrayType* starts, double distance, - bool directedFlag, + bool directed, bool equiCostFlag, MST_rt **return_tuples, size_t *return_count, char **log_msg, @@ -86,17 +86,15 @@ pgr_do_drivingDistance( } hint = nullptr; - graphType gType = directedFlag? DIRECTED: UNDIRECTED; - std::deque paths; std::vector> depths; - if (directedFlag) { - pgrouting::DirectedGraph digraph(gType); + if (directed) { + pgrouting::DirectedGraph digraph(directed); digraph.insert_edges(edges); paths = drivingDistance(digraph, roots, distance, equiCostFlag, depths, true); } else { - pgrouting::UndirectedGraph undigraph(gType); + pgrouting::UndirectedGraph undigraph(directed); undigraph.insert_edges(edges); paths = drivingDistance(undigraph, roots, distance, equiCostFlag, depths, true); } diff --git a/src/driving_distance/withPoints_dd_driver.cpp b/src/driving_distance/withPoints_dd_driver.cpp index 883f77348f..dc68f8689c 100644 --- a/src/driving_distance/withPoints_dd_driver.cpp +++ b/src/driving_distance/withPoints_dd_driver.cpp @@ -119,18 +119,18 @@ pgr_do_withPointsDD( return; } - graphType gType = directed? DIRECTED: UNDIRECTED; + std::deque paths; std::vector> depths; if (directed) { - pgrouting::DirectedGraph digraph(gType); + pgrouting::DirectedGraph digraph(directed); digraph.insert_edges(edges); digraph.insert_edges(pg_graph.new_edges()); paths = drivingDistance(digraph, roots, distance, equiCost, depths, details); } else { - pgrouting::UndirectedGraph undigraph(gType); + pgrouting::UndirectedGraph undigraph(directed); undigraph.insert_edges(edges); undigraph.insert_edges(pg_graph.new_edges()); paths = drivingDistance(undigraph, roots, distance, equiCost, depths, details); diff --git a/src/ksp/ksp_driver.cpp b/src/ksp/ksp_driver.cpp index 4599d1aaa0..63cd97539c 100644 --- a/src/ksp/ksp_driver.cpp +++ b/src/ksp/ksp_driver.cpp @@ -81,7 +81,7 @@ void pgr_do_ksp( pgassert(!(*return_tuples)); pgassert(*return_count == 0); - graphType gType = directed? DIRECTED: UNDIRECTED; + hint = combinations_sql; auto combinations = get_combinations(combinations_sql, starts, ends, true); @@ -110,11 +110,11 @@ void pgr_do_ksp( std::dequepaths; if (directed) { - pgrouting::DirectedGraph graph(gType); + pgrouting::DirectedGraph graph(directed); graph.insert_edges(edges); paths = pgrouting::algorithms::Yen(graph, combinations, k, heap_paths); } else { - pgrouting::UndirectedGraph graph(gType); + pgrouting::UndirectedGraph graph(directed); graph.insert_edges(edges); paths = pgrouting::algorithms::Yen(graph, combinations, k, heap_paths); } diff --git a/src/ksp/turnRestrictedPath_driver.cpp b/src/ksp/turnRestrictedPath_driver.cpp index 9c6ffd746b..8d64c4aa68 100644 --- a/src/ksp/turnRestrictedPath_driver.cpp +++ b/src/ksp/turnRestrictedPath_driver.cpp @@ -117,7 +117,7 @@ pgr_do_turnRestrictedPath( pgassert(!(*return_tuples)); pgassert(*return_count == 0); - graphType gType = directed? DIRECTED: UNDIRECTED; + hint = edges_sql; auto edges = get_edges(std::string(edges_sql), true, false); @@ -145,7 +145,7 @@ pgr_do_turnRestrictedPath( std::string logstr; if (directed) { log << "Working with directed Graph\n"; - pgrouting::DirectedGraph digraph(gType); + pgrouting::DirectedGraph digraph(directed); Pgr_turnRestrictedPath < pgrouting::DirectedGraph > fn_TRSP; digraph.insert_edges(edges); log << digraph; @@ -162,7 +162,7 @@ pgr_do_turnRestrictedPath( strict); } else { log << "TODO Working with Undirected Graph\n"; - pgrouting::UndirectedGraph undigraph(gType); + pgrouting::UndirectedGraph undigraph(directed); Pgr_turnRestrictedPath < pgrouting::UndirectedGraph > fn_TRSP; undigraph.insert_edges(edges); paths = pgr_dijkstraTR(undigraph, diff --git a/src/ksp/withPoints_ksp_driver.cpp b/src/ksp/withPoints_ksp_driver.cpp index 4ac9eab0b9..1943312f1d 100644 --- a/src/ksp/withPoints_ksp_driver.cpp +++ b/src/ksp/withPoints_ksp_driver.cpp @@ -135,23 +135,15 @@ pgr_do_withPointsKsp( return; } - - graphType gType = directed? DIRECTED: UNDIRECTED; - std::deque paths; - - auto vertices(pgrouting::extract_vertices(edges)); - vertices = pgrouting::extract_vertices(vertices, pg_graph.new_edges()); - - if (directed) { - pgrouting::DirectedGraph digraph(vertices, gType); + pgrouting::DirectedGraph digraph(directed); digraph.insert_edges(edges); digraph.insert_edges(pg_graph.new_edges()); paths = pgrouting::algorithms::Yen(digraph, combinations, k, heap_paths); } else { - pgrouting::UndirectedGraph undigraph(gType); + pgrouting::UndirectedGraph undigraph(directed); undigraph.insert_edges(edges); undigraph.insert_edges(pg_graph.new_edges()); diff --git a/src/lineGraph/lineGraphFull_driver.cpp b/src/lineGraph/lineGraphFull_driver.cpp index 9f71e71ad5..018ef48a9f 100644 --- a/src/lineGraph/lineGraphFull_driver.cpp +++ b/src/lineGraph/lineGraphFull_driver.cpp @@ -99,9 +99,7 @@ pgr_do_lineGraphFull( } hint = nullptr; - graphType gType = DIRECTED; - - pgrouting::DirectedGraph digraph(gType); + pgrouting::DirectedGraph digraph(true); digraph.insert_edges_neg(edges); pgrouting::graph::Pgr_lineGraphFull< diff --git a/src/lineGraph/lineGraph_driver.cpp b/src/lineGraph/lineGraph_driver.cpp index d645034428..730173bf6d 100644 --- a/src/lineGraph/lineGraph_driver.cpp +++ b/src/lineGraph/lineGraph_driver.cpp @@ -95,9 +95,9 @@ pgr_do_lineGraph( } hint = nullptr; - graphType gType = directed? DIRECTED: UNDIRECTED; - pgrouting::DirectedGraph digraph(gType); + + pgrouting::DirectedGraph digraph(directed); digraph.insert_edges_neg(edges); log << digraph << "\n"; diff --git a/src/mincut/stoerWagner_driver.cpp b/src/mincut/stoerWagner_driver.cpp index ef933899da..df66e189ed 100644 --- a/src/mincut/stoerWagner_driver.cpp +++ b/src/mincut/stoerWagner_driver.cpp @@ -85,13 +85,9 @@ pgr_do_stoerWagner( } hint = nullptr; - graphType gType = UNDIRECTED; - std::vector results; - log << "Working with Undirected Graph\n"; - - pgrouting::UndirectedGraph undigraph(gType); + pgrouting::UndirectedGraph undigraph(false); undigraph.insert_edges(edges); results = pgr_stoerWagner( undigraph); diff --git a/src/ordering/cuthillMckeeOrdering_driver.cpp b/src/ordering/cuthillMckeeOrdering_driver.cpp index d298934e9d..d74331a8b6 100644 --- a/src/ordering/cuthillMckeeOrdering_driver.cpp +++ b/src/ordering/cuthillMckeeOrdering_driver.cpp @@ -103,11 +103,8 @@ void pgr_do_cuthillMckeeOrdering( } hint = nullptr; - graphType gType = UNDIRECTED; - std::vectorresults; - - pgrouting::UndirectedGraph undigraph(gType); + pgrouting::UndirectedGraph undigraph(false); undigraph.insert_edges(edges); results = cuthillMckeeOrdering(undigraph); diff --git a/src/planar/boyerMyrvold_driver.cpp b/src/planar/boyerMyrvold_driver.cpp index 9c7f5e2dd9..dea82dfb12 100644 --- a/src/planar/boyerMyrvold_driver.cpp +++ b/src/planar/boyerMyrvold_driver.cpp @@ -82,7 +82,7 @@ pgr_do_boyerMyrvold( hint = nullptr; log << "Working with Undirected Graph\n"; - pgrouting::UndirectedGraph undigraph(gType); + pgrouting::UndirectedGraph undigraph(directed); undigraph.insert_edges(edges); pgrouting::functions::Pgr_boyerMyrvold fn_boyerMyrvold; results = fn_boyerMyrvold.boyerMyrvold(undigraph); diff --git a/src/planar/isPlanar_driver.cpp b/src/planar/isPlanar_driver.cpp index 0e3b0cfa10..0074935a03 100644 --- a/src/planar/isPlanar_driver.cpp +++ b/src/planar/isPlanar_driver.cpp @@ -64,7 +64,6 @@ pgr_do_isPlanar( pgassert(!(*err_msg)); bool result = false; - graphType gType = UNDIRECTED; hint = edges_sql; auto edges = get_edges(std::string(edges_sql), true, true); @@ -74,8 +73,7 @@ pgr_do_isPlanar( } hint = nullptr; - log << "Working with Undirected Graph\n"; - pgrouting::UndirectedGraph undigraph(gType); + pgrouting::UndirectedGraph undigraph(false); undigraph.insert_edges(edges); pgrouting::functions::Pgr_boyerMyrvold fn_isPlanar; result = fn_isPlanar.isPlanar(undigraph); diff --git a/src/spanningTree/kruskal_driver.cpp b/src/spanningTree/kruskal_driver.cpp index c4d2d856b5..887027d815 100644 --- a/src/spanningTree/kruskal_driver.cpp +++ b/src/spanningTree/kruskal_driver.cpp @@ -84,7 +84,7 @@ pgr_do_kruskal( std::vector results; - pgrouting::UndirectedGraph undigraph(UNDIRECTED); + pgrouting::UndirectedGraph undigraph(false); undigraph.insert_edges(edges); pgrouting::functions::Pgr_kruskal kruskal; diff --git a/src/spanningTree/prim_driver.cpp b/src/spanningTree/prim_driver.cpp index e641f127f0..a25cbc07e9 100644 --- a/src/spanningTree/prim_driver.cpp +++ b/src/spanningTree/prim_driver.cpp @@ -86,7 +86,7 @@ pgr_do_prim( std::vector results; - pgrouting::UndirectedGraph undigraph(UNDIRECTED); + pgrouting::UndirectedGraph undigraph(false); undigraph.insert_min_edges_no_parallel(edges); pgrouting::functions::Pgr_prim prim; diff --git a/src/spanningTree/randomSpanningTree_driver.cpp b/src/spanningTree/randomSpanningTree_driver.cpp index 9acd1ac07b..e3161bbb4e 100644 --- a/src/spanningTree/randomSpanningTree_driver.cpp +++ b/src/spanningTree/randomSpanningTree_driver.cpp @@ -87,20 +87,20 @@ pgr_do_randomSpanningTree( } hint = nullptr; - graphType gType = directed? DIRECTED: UNDIRECTED; + std::vector results; if (directed) { log << "Working with directed Graph\n"; - pgrouting::DirectedGraph digraph(gType); + pgrouting::DirectedGraph digraph(directed); digraph.insert_edges(data_edges, total_edges); results = pgr_randomSpanningTree( digraph, root_vertex); } else { log << "Working with Undirected Graph\n"; - pgrouting::UndirectedGraph undigraph(gType); + pgrouting::UndirectedGraph undigraph(directed); undigraph.insert_edges(data_edges, total_edges); results = pgr_randomSpanningTree( undigraph, diff --git a/src/topologicalSort/topologicalSort_driver.cpp b/src/topologicalSort/topologicalSort_driver.cpp index a76ffbfd26..cf1aa75acc 100644 --- a/src/topologicalSort/topologicalSort_driver.cpp +++ b/src/topologicalSort/topologicalSort_driver.cpp @@ -90,11 +90,8 @@ pgr_do_topologicalSort( } hint = nullptr; - graphType gType = DIRECTED; - std::vector results; - - pgrouting::DirectedGraph digraph(gType); + pgrouting::DirectedGraph digraph(true); digraph.insert_edges(edges); results = pgr_topologicalSort( digraph); diff --git a/src/transitiveClosure/transitiveClosure_driver.cpp b/src/transitiveClosure/transitiveClosure_driver.cpp index 7232bc74b8..fa032438d3 100644 --- a/src/transitiveClosure/transitiveClosure_driver.cpp +++ b/src/transitiveClosure/transitiveClosure_driver.cpp @@ -126,8 +126,7 @@ pgr_do_transitiveClosure( } hint = nullptr; - graphType gType = DIRECTED; - pgrouting::DirectedGraph digraph(gType); + pgrouting::DirectedGraph digraph(true); digraph.insert_edges(edges); get_postgres_result( diff --git a/src/traversal/depthFirstSearch_driver.cpp b/src/traversal/depthFirstSearch_driver.cpp index 0534e4b6d8..9cd3174150 100644 --- a/src/traversal/depthFirstSearch_driver.cpp +++ b/src/traversal/depthFirstSearch_driver.cpp @@ -112,7 +112,6 @@ pgr_do_depthFirstSearch( auto roots = get_intArray(starts, false); std::vector results; - graphType gType = directed ? DIRECTED : UNDIRECTED; hint = edges_sql; auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); @@ -124,7 +123,7 @@ pgr_do_depthFirstSearch( *log_msg = pgr_msg(edges_sql); } else { if (directed) { - pgrouting::DirectedGraph digraph(gType); + pgrouting::DirectedGraph digraph(directed); digraph.insert_edges(edges); results = pgr_depthFirstSearch( @@ -133,7 +132,7 @@ pgr_do_depthFirstSearch( directed, max_depth); } else { - pgrouting::UndirectedGraph undigraph(gType); + pgrouting::UndirectedGraph undigraph(directed); undigraph.insert_edges(edges); results = pgr_depthFirstSearch( diff --git a/src/trsp/trspVia_driver.cpp b/src/trsp/trspVia_driver.cpp index d2bb0d5db6..9c42334fb5 100644 --- a/src/trsp/trspVia_driver.cpp +++ b/src/trsp/trspVia_driver.cpp @@ -176,11 +176,11 @@ pgr_do_trspVia( hint = nullptr; - graphType gType = directed? DIRECTED: UNDIRECTED; + std::deque paths; if (directed) { - pgrouting::DirectedGraph digraph(gType); + pgrouting::DirectedGraph digraph(directed); digraph.insert_edges(edges); pgrouting::pgr_dijkstraVia( digraph, @@ -190,7 +190,7 @@ pgr_do_trspVia( U_turn_on_edge, log); } else { - pgrouting::UndirectedGraph undigraph(gType); + pgrouting::UndirectedGraph undigraph(directed); undigraph.insert_edges(edges); pgrouting::pgr_dijkstraVia( undigraph, diff --git a/src/trsp/trspVia_withPoints_driver.cpp b/src/trsp/trspVia_withPoints_driver.cpp index c2ca4cedfc..f2553ad3c0 100644 --- a/src/trsp/trspVia_withPoints_driver.cpp +++ b/src/trsp/trspVia_withPoints_driver.cpp @@ -186,9 +186,6 @@ pgr_do_trspVia_withPoints( auto restrictions = restrictions_sql? pgrouting::pgget::get_restrictions(std::string(restrictions_sql)) : std::vector(); - - graphType gType = directed? DIRECTED: UNDIRECTED; - /* Dealing with points */ pgrouting::Pg_points_graph pg_graph( points, edges_of_points, @@ -210,7 +207,7 @@ pgr_do_trspVia_withPoints( std::deque paths; if (directed) { - pgrouting::DirectedGraph digraph(vertices, gType); + pgrouting::DirectedGraph digraph(vertices, directed); digraph.insert_edges(edges); digraph.insert_edges(pg_graph.new_edges()); pgrouting::pgr_dijkstraVia( @@ -221,7 +218,7 @@ pgr_do_trspVia_withPoints( U_turn_on_edge, log); } else { - pgrouting::UndirectedGraph undigraph(vertices, gType); + pgrouting::UndirectedGraph undigraph(vertices, directed); undigraph.insert_edges(edges); undigraph.insert_edges(pg_graph.new_edges()); pgrouting::pgr_dijkstraVia( diff --git a/src/trsp/trsp_driver.cpp b/src/trsp/trsp_driver.cpp index e6d3b4278b..bcb7f0fcdb 100644 --- a/src/trsp/trsp_driver.cpp +++ b/src/trsp/trsp_driver.cpp @@ -147,18 +147,18 @@ pgr_do_trsp( return; } - graphType gType = directed? DIRECTED: UNDIRECTED; + std::deque paths; if (directed) { - pgrouting::DirectedGraph digraph(gType); + pgrouting::DirectedGraph digraph(directed); digraph.insert_edges(edges); paths = pgr_dijkstra( digraph, combinations); } else { - pgrouting::UndirectedGraph undigraph(gType); + pgrouting::UndirectedGraph undigraph(directed); undigraph.insert_edges(edges); paths = pgr_dijkstra( diff --git a/src/trsp/trsp_withPoints_driver.cpp b/src/trsp/trsp_withPoints_driver.cpp index fb90757890..4dabdfadd9 100644 --- a/src/trsp/trsp_withPoints_driver.cpp +++ b/src/trsp/trsp_withPoints_driver.cpp @@ -142,7 +142,7 @@ pgr_do_trsp_withPoints( pgrouting::pgget::get_restrictions(std::string(restrictions_sql)) : std::vector(); - graphType gType = directed? DIRECTED: UNDIRECTED; + /* Dealing with points */ pgrouting::Pg_points_graph pg_graph( @@ -165,7 +165,7 @@ pgr_do_trsp_withPoints( std::deque paths; if (directed) { - pgrouting::DirectedGraph digraph(vertices, gType); + pgrouting::DirectedGraph digraph(vertices, directed); digraph.insert_edges(edges); digraph.insert_edges(pg_graph.new_edges()); @@ -174,7 +174,7 @@ pgr_do_trsp_withPoints( combinations, false, (std::numeric_limits::max)()); } else { - pgrouting::UndirectedGraph undigraph(vertices, gType); + pgrouting::UndirectedGraph undigraph(vertices, directed); undigraph.insert_edges(edges); undigraph.insert_edges(pg_graph.new_edges()); diff --git a/src/withPoints/withPointsVia_driver.cpp b/src/withPoints/withPointsVia_driver.cpp index f2e27d492e..3107441008 100644 --- a/src/withPoints/withPointsVia_driver.cpp +++ b/src/withPoints/withPointsVia_driver.cpp @@ -129,7 +129,7 @@ pgr_do_withPointsVia( auto via_vertices = get_intArray(starts, false); - graphType gType = directed? DIRECTED: UNDIRECTED; + hint = points_sql; auto points = pgrouting::pgget::get_points(std::string(points_sql)); @@ -169,7 +169,7 @@ pgr_do_withPointsVia( std::deque paths; if (directed) { - pgrouting::DirectedGraph digraph(vertices, gType); + pgrouting::DirectedGraph digraph(vertices, directed); digraph.insert_edges(edges); digraph.insert_edges(pg_graph.new_edges()); pgrouting::pgr_dijkstraVia( @@ -180,7 +180,7 @@ pgr_do_withPointsVia( U_turn_on_edge, log); } else { - pgrouting::UndirectedGraph undigraph(vertices, gType); + pgrouting::UndirectedGraph undigraph(vertices, directed); undigraph.insert_edges(edges); undigraph.insert_edges(pg_graph.new_edges()); pgrouting::pgr_dijkstraVia( diff --git a/src/withPoints/withPoints_driver.cpp b/src/withPoints/withPoints_driver.cpp index 8c64f3877b..20e79c5878 100644 --- a/src/withPoints/withPoints_driver.cpp +++ b/src/withPoints/withPoints_driver.cpp @@ -114,7 +114,7 @@ pgr_do_withPoints( pgassert(!(*return_tuples)); pgassert(*return_count == 0); - graphType gType = directed? DIRECTED: UNDIRECTED; + hint = combinations_sql; auto combinations = get_combinations(combinations_sql, starts, ends, normal); @@ -164,7 +164,7 @@ pgr_do_withPoints( std::deque paths; if (directed) { - pgrouting::DirectedGraph digraph(vertices, gType); + pgrouting::DirectedGraph digraph(vertices, directed); digraph.insert_edges(edges); digraph.insert_edges(pg_graph.new_edges()); @@ -173,7 +173,7 @@ pgr_do_withPoints( combinations, only_cost, normal); } else { - pgrouting::UndirectedGraph undigraph(vertices, gType); + pgrouting::UndirectedGraph undigraph(vertices, directed); undigraph.insert_edges(edges); undigraph.insert_edges(pg_graph.new_edges()); paths = pgr_dijkstra( From 0a2fa0fc8954187a1d720216ab563c5e77995a56 Mon Sep 17 00:00:00 2001 From: Vicky Vergara Date: Mon, 26 Feb 2024 12:10:07 -0600 Subject: [PATCH 140/428] Cleanup pgr_base_graph (#2624) pgr-pase-graph cleanup * marking for removal forward declarations * Removing unused code * Using C++ comment style * typedef -> using * moving data to end of class * Doing some formatting * Reorganizing * fixing lint errors --- include/cpp_common/pgr_base_graph.hpp | 1078 ++++++++++--------------- 1 file changed, 436 insertions(+), 642 deletions(-) diff --git a/include/cpp_common/pgr_base_graph.hpp b/include/cpp_common/pgr_base_graph.hpp index 0569ffaf81..b380580a57 100644 --- a/include/cpp_common/pgr_base_graph.hpp +++ b/include/cpp_common/pgr_base_graph.hpp @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -/*! @file */ +/** @file */ #ifndef INCLUDE_CPP_COMMON_PGR_BASE_GRAPH_HPP_ #define INCLUDE_CPP_COMMON_PGR_BASE_GRAPH_HPP_ @@ -35,6 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include #include @@ -49,7 +50,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. namespace pgrouting { -/*! @brief boost::graph simplified to pgRouting needs +/** @brief boost::graph simplified to pgRouting needs This class gives the handling basics of a boost::graph of kind G where G: can be an undirected graph or a directed graph. @@ -88,7 +89,7 @@ The code is prepared to be used for: boost::adjacency_list < boost::vecS, // not tested with other values boost::vecS, // not tested with other values -boost::undirectedS, // USinG UNDIRECTED +boost::undirectedS, // Using UNDIRECTED Basic_vertex, // the vertex class Basic_edge > // the edge class ~~~~ @@ -180,7 +181,7 @@ class Pgr_base_graph; xyUndirectedGraph | X & Y values stored on the vertex xyDirectedGraph | X & Y values stored on the vertex */ -//@{ +/**@{*/ typedef graph::Pgr_base_graph < boost::adjacency_list < boost::vecS, boost::vecS, boost::undirectedS, @@ -205,7 +206,7 @@ boost::adjacency_list < boost::listS, boost::vecS, XY_vertex, Basic_edge >, XY_vertex, Basic_edge > xyDirectedGraph; -//@} +/**@}*/ namespace graph { @@ -224,90 +225,53 @@ class Pgr_base_graph { EO_i | out_edge_iterator | To cycle the out going edges of a vertex EI_i | in_edge_iterator | To cycle the in coming edges of a vertex (only in bidirectional graphs) */ - //@{ - typedef G B_G; - typedef T_E G_T_E; - typedef T_V G_T_V; - typedef typename boost::graph_traits < G >::vertex_descriptor V; - typedef typename boost::graph_traits < G >::edge_descriptor E; - typedef typename boost::graph_traits < G >::vertex_iterator V_i; - typedef typename boost::graph_traits < G >::edge_iterator E_i; - typedef typename boost::graph_traits < G >::out_edge_iterator EO_i; - typedef typename boost::graph_traits < G >::in_edge_iterator EI_i; - - typedef typename boost::graph_traits < G >::vertices_size_type - vertices_size_type; - typedef typename boost::graph_traits < G >::edges_size_type - edges_size_type; - typedef typename boost::graph_traits < G >::degree_size_type - degree_size_type; - - //@} - - /** @name Id handling related types + /**@{*/ + using B_G = G; + using G_T_E = T_E; + using G_T_V = T_V; + using V = typename boost::graph_traits::vertex_descriptor; + using E = typename boost::graph_traits::edge_descriptor; + using V_i = typename boost::graph_traits::vertex_iterator; + using E_i = typename boost::graph_traits::edge_iterator; + using EO_i = typename boost::graph_traits::out_edge_iterator; + using EI_i = typename boost::graph_traits::in_edge_iterator; + + using vertices_size_type = typename boost::graph_traits::vertices_size_type; + using edges_size_type = typename boost::graph_traits::edges_size_type; + using degree_size_type = typename boost::graph_traits::degree_size_type; + using vertex_index_t = typename boost::property_map::type; + + /**@}*/ + + /** @name Other types Type | Meaning | pgRouting Meaning :---------: | :------------- | :---------------------- + IndexMap | maps V -> id | given a V store the id id_to_V | maps id -> V | given an id store the V - LI | Left Iterator | iterates over id_to_V */ - //@{ + /**@{*/ - typedef typename std::map< int64_t, V > id_to_V; - typedef typename id_to_V::const_iterator LI; + using IndexMap = std::map; + using id_to_V = typename std::map; - //@} + /**@}*/ - //! @name The Graph - //@{ - G graph; //!< The graph - bool m_is_directed; //!< type (DIRECTED or UNDIRECTED) - //@} - //! @name Id mapping handling - //@{ - - id_to_V vertices_map; //!< id -> graph id - - typename boost::property_map::type vertIndex; - - typedef std::map IndexMap; - IndexMap mapIndex; - boost::associative_property_map propmapIndex; - - //@} - - //! @name Graph Modification - //@{ - //! Used for storing the removed_edges - - std::deque< T_E > removed_edges; - - //@} - - - - //! @name The Graph - //@{ - //! @brief Constructor - /*! + /** @name Graph constructors */ + /**@{*/ + /** @brief Constructor */ + /** - Prepares the graph to be of type gtype - inserts the vertices - The vertices must be checked (if necessary) before calling the constructor */ - Pgr_base_graph< G , T_V, T_E >( + Pgr_base_graph( const std::vector< T_V > &vertices, bool directed) : graph(vertices.size()), -#if 0 - m_num_vertices(vertices.size()), -#endif m_is_directed(directed), vertIndex(boost::get(boost::vertex_index, graph)), propmapIndex(mapIndex) { - // add_vertices(vertices); // This code does not work with contraction -#if 0 - pgassert(pgrouting::check_vertices(vertices) == 0); -#endif size_t i = 0; for (auto vi = boost::vertices(graph).first; vi != boost::vertices(graph).second; ++vi) { @@ -325,69 +289,28 @@ class Pgr_base_graph { log << "Key: " << iter->first <<"\tValue:" << iter->second << "\n"; } -#if 0 - /* expensive assertion */ - for (const auto vertex : vertices) { - pgassert(has_vertex(vertex.id)); - } -#endif // pgassert(mapIndex.size() == vertices.size()); } - /*! + /** Prepares the _graph_ to be of type gtype with 0 vertices */ - explicit Pgr_base_graph< G , T_V, T_E >(bool directed) + explicit Pgr_base_graph(bool directed) : graph(0), -#if 0 - m_num_vertices(0), -#endif m_is_directed(directed), vertIndex(boost::get(boost::vertex_index, graph)), propmapIndex(mapIndex) { } + /**@}*/ + /** @name Edges inserters */ + /**@{*/ + template void insert_edges_neg(const std::vector &edges) { + insert_edges(edges, false); + } - //! @name Insert edges - //@{ - /*! @brief Inserts *count* edges of type *T* into the graph - * - * Converts the edges to a std::vector & calls the overloaded - * twin function. - * - * @param edges - * @param count - */ - template < typename T > - void insert_edges(const T *edges, size_t count) { - insert_edges(std::vector < T >(edges, edges + count)); - } - - template - void insert_edges_neg(const std::vector &edges) { - insert_edges(edges, false); - } - - template < typename T > - void insert_edges_neg(const T *edges, size_t count) { - insert_edges(std::vector < T >(edges, edges + count), false); - } - - template < typename T> - void insert_edges(T *edges, size_t count, bool) { - for (size_t i = 0; i < count; ++i) { - pgassert(has_vertex(edges[i].source)); - pgassert(has_vertex(edges[i].target)); - graph_add_edge_no_create_vertex(edges[i]); - } - } - - template < typename T > - void insert_negative_edges(const T *edges, int64_t count) { - insert_negative_edges(std::vector < T >(edges, edges + count)); - } - /*! @brief Inserts *count* edges of type *Edge_t* into the graph + /** @brief Inserts *count* edges of type *Edge_t* into the graph The set of edges should not have an illegal vertex defined When the graph is empty calls: - @b extract_vertices @@ -401,101 +324,32 @@ class Pgr_base_graph { @param normal */ template - void - insert_edges(const std::vector &edges, bool normal = true) { -#if 0 - // This code does not work with contraction - if (num_vertices() == 0) { - auto vertices = pgrouting::extract_vertices(edges); - pgassert(pgrouting::check_vertices(vertices) == 0); - add_vertices(vertices); - } -#endif + void insert_edges(const std::vector &edges, bool normal = true) { for (const auto &edge : edges) { graph_add_edge(edge, normal); } } - template - void insert_min_edges_no_parallel(const T *edges, size_t count) { - insert_edges(std::vector(edges, edges + count)); - } - template - void - insert_min_edges_no_parallel(const std::vector &edges) { + template void insert_min_edges_no_parallel(const std::vector &edges) { for (const auto edge : edges) { graph_add_min_edge_no_parallel(edge); } } - template < typename T > - void insert_negative_edges( - const std::vector &edges, - bool normal = true) { + template void insert_negative_edges(const std::vector &edges, bool normal = true) { for (const auto edge : edges) { graph_add_neg_edge(edge, normal); } } - //@} - - private: - /*! @brief adds the vertices into the graph - * - * PRECONDITIONS: - * - The graph has not being initialized before - * - There are no dupicated vertices - * - * ~~~~~{.c} - * precondition(boost::num_vertices(graph) == 0); - * for (vertex : vertices) - * precondition(!has_vertex(vertex.id)); - * ~~~~~ - * - * - * POSTCONDITIONS: - * ~~~~~{.c} - * postcondition(boost::num_vertices(graph) == vertices.size()); - * for (vertex : vertices) - * postcondition(has_vertex(vertex.id)); - * ~~~~~ - * - * Example use: - * - * ~~~~~{.c} - * pgrouting::DirectedGraph digraph(gType); - * auto vertices(pgrouting::extract_vertices(data_edges, total_edges)); - * digraph.add_vertices(vertices); - * ~~~~~ - * - */ - void add_vertices( - std::vector< T_V > vertices) { - pgassert(num_vertices() == 0); - for (const auto vertex : vertices) { - pgassert(!has_vertex(vertex.id)); - - auto v = add_vertex(graph); - vertices_map[vertex.id] = v; - graph[v].cp_members(vertex); - // put(propmapIndex, v, num_vertices()); - - pgassert(has_vertex(vertex.id)); - } - // pgassert(mapIndex.size() == vertices.size()); - pgassert(num_vertices() == vertices.size()); - } + /**@}*/ - - public: - //! @name boost wrappers with original id - //@{ - //! @brief get the out-degree of a vertex - - /*! + /** @name in & out degree */ + /**@{*/ + /** @brief get the out-degree of a vertex @returns 0: The out degree of a vertex that its not in the graph @param [in] vertex_id original vertex id - */ + */ degree_size_type out_degree(int64_t vertex_id) const { if (!has_vertex(vertex_id)) { return 0; @@ -504,6 +358,7 @@ class Pgr_base_graph { auto d = out_degree(v); return d; } + degree_size_type in_degree(int64_t vertex_id) const { if (!has_vertex(vertex_id)) { return 0; @@ -513,8 +368,33 @@ class Pgr_base_graph { : out_degree(get_V(vertex_id)); } + /** @brief in degree of a vertex + * + * - when its undirected there is no "concept" of in degree + * - out degree is returned + * - on directed in degree of vertex is returned + * @param [in] v vertex descriptor + */ + degree_size_type in_degree(V &v) const { + return is_directed()? + boost::in_degree(v, graph) : + boost::out_degree(v, graph); + } + + /** @brief out degree of a vertex + * + * regardles of undirected or directed graph + * - out degree is returned + */ + degree_size_type out_degree(V &v) const { + return boost::out_degree(v, graph); + } + /**@}*/ + - /*! @brief get the vertex descriptor of the vertex + /** @name Get vertex descriptor */ + /**@{*/ + /** @brief get the vertex descriptor of the vertex When the vertex does not exist - creates a new vetex @return V: The vertex descriptor of the vertex @@ -531,127 +411,133 @@ class Pgr_base_graph { return vm_s->second; } - /*! @brief get the vertex descriptor of the vid + /** @brief get the vertex descriptor of the vid Call has_vertex(vid) before calling this function + @param[in] vid vertex identifier @return V: The vertex descriptor of the vertex */ V get_V(int64_t vid) const { - pgassert(has_vertex(vid)); + if (!has_vertex(vid)) throw std::string("Call to ") + __PRETTY_FUNCTION__ + "without checking with has_vertex"; return vertices_map.find(vid)->second; } - //! @brief True when vid is in the graph - bool has_vertex(int64_t vid) const { - return vertices_map.find(vid) != vertices_map.end(); - } + /** @brief get source edge + @param[in] e edge descriptor + @return V vertex descriptor + */ + V source(E e) const {return boost::source(e, graph);} + /** @brief get source edge + @param[in] e edge descriptor + @return V vertex descriptor + */ + V target(E e) const {return boost::target(e, graph);} + /** @brief get source edge + @param[in] v vertex descriptor + @param[in] e edge descriptor + @return V vertex descriptor + */ + V adjacent(V v, E e) const { + pgassert(is_source(v, e) || is_target(v, e)); + return is_source(v, e)? target(e) : source(e); + } + /**@}*/ - //! @name to be or not to be - //@{ + /** @name to be or not to be */ + /**@{*/ + /** @brief does vertex exist in the graph? + @param[in] vid vertex identifier + @return true: when vid is in the graph + @return false: when vid is not in the graph + */ + bool has_vertex(int64_t vid) const { + return vertices_map.find(vid) != vertices_map.end(); + } + /** @brief is the graph directed? + @return true: when the graph is directed + @return false: when the graph is not directed + */ bool is_directed() const {return m_is_directed;} + /** @brief is the graph undirected? + @return true: when the graph is undirected + @return false: when the graph is not undirected + */ bool is_undirected() const {return !m_is_directed;} - bool is_source(V v_idx, E e_idx) const {return v_idx == source(e_idx);} - bool is_target(V v_idx, E e_idx) const {return v_idx == target(e_idx);} - - //@} - - //! @name boost wrappers with V - //@{ - - - T_E& operator[](E e_idx) {return graph[e_idx];} - const T_E& operator[](E e_idx) const {return graph[e_idx];} + /** @brief is v a source in the edge? + @param[in] v vertex descriptor + @param[in] e edge descriptor + @return true: when v is source on the edge + @return false: when v is not source on the edge + */ + bool is_source(V v, E e) const {return v == source(e);} + /** @brief is v a target in the edge? + @param[in] v vertex descriptor + @param[in] e edge descriptor + @return true: when v is target on the edge + @return false: when v is not target on the edge + */ + bool is_target(V v, E e) const {return v == target(e);} - T_V& operator[](V v_idx) {return graph[v_idx];} - const T_V& operator[](V v_idx) const {return graph[v_idx];} + /**@}*/ - V source(E e_idx) const {return boost::source(e_idx, graph);} - V target(E e_idx) const {return boost::target(e_idx, graph);} - V adjacent(V v_idx, E e_idx) const { - pgassert(is_source(v_idx, e_idx) || is_target(v_idx, e_idx)); - return is_source(v_idx, e_idx)? - target(e_idx) : - source(e_idx); - } + /** @name get original edge/vertex data */ + /**@{*/ + /** @brief get the edge + @param[in] e edge descriptor + @return The edge information (allows modification) + */ + T_E& operator[](E e) {return graph[e];} + /** @brief get the edge + @param[in] e edge descriptor + @return The edge information (does not allow modification) + */ + const T_E& operator[](E e) const {return graph[e];} - /*! @brief in degree of a vertex - * - * - when its undirected there is no "concept" of in degree - * - out degree is returned - * - on directed in degree of vertex is returned + /** @brief get the vertex + @param[in] v vertex descriptor + @return The vertex information (allows modification) */ - degree_size_type in_degree(V &v) const { - return is_directed()? - boost::in_degree(v, graph) : - boost::out_degree(v, graph); - } + T_V& operator[](V v) {return graph[v];} - /*! @brief out degree of a vertex - * - * regardles of undirected or directed graph - * - out degree is returned + /** @brief get the vertex + @param[in] v vertex descriptor + @return The vertex information (does not allow modification) */ - degree_size_type out_degree(V &v) const { - return boost::out_degree(v, graph); + const T_V& operator[](V v) const {return graph[v];} + + /** @brief get the edge id of from--to with the indicated distance + @param[in] from vertex descriptor + @param[in] to vertex descriptor + @param[in] weight edge's weight to match when several options are found + @return The edge identifier of edge from--to with @b weight + @return OR the edge identifier of edge from--to with @b min weight + */ + int64_t get_edge_id(V from, V to, double &weight) const { + EO_i out_i, out_end; + double minCost = (std::numeric_limits::max)(); + int64_t minEdge = -1; + for (boost::tie(out_i, out_end) = boost::out_edges(from, graph); out_i != out_end; ++out_i) { + auto e = *out_i; + auto v_target = target(e); + auto v_source = source(e); + if ((from == v_source) && (to == v_target) && (weight == graph[e].cost)) return graph[e].id; + if ((from == v_source) && (to == v_target) && (minCost > graph[e].cost)) { + minCost = graph[e].cost; + minEdge = graph[e].id; + } + } + weight = minEdge == -1? 0: minCost; + return minEdge; } + /**@}*/ - //@} - - - //! @name edge disconection/reconnection - //@{ - //! @brief Disconnects all edges from p_from to p_to - /*! - - No edge is disconnected if the vertices id's do not exist in the graph - - All removed edges are stored for future reinsertion - - All parallel edges are disconnected (automatically by boost) - ![disconnect_edge(2,3) on an UNDIRECTED graph](disconnectEdgeUndirected.png) - ![disconnect_edge(2,3) on a DIRECTED graph](disconnectEdgeDirected.png) - @param [in] p_from original vertex id of the starting point of the edge - @param [in] p_to original vertex id of the ending point of the edge - */ - void disconnect_edge(int64_t p_from, int64_t p_to); - - - //! @brief Disconnects the outgoing edges of a vertex - /*! - - No edge is disconnected if it doesn't exist in the graph - - Removed edges are stored for future reinsertion - - all outgoing edges with the edge_id are removed if they exist - @param [in] vertex_id original vertex - @param [in] edge_id original edge_id - */ - void disconnect_out_going_edge(int64_t vertex_id, int64_t edge_id); - - - - - //! @brief Disconnects all incoming and outgoing edges from the vertex - /*! - boost::graph doesn't recommend th to insert/remove vertices, so a vertex removal is - simulated by disconnecting the vertex from the graph - - No edge is disconnected if the vertices id's do not exist in the graph - - All removed edges are stored for future reinsertion - - All parallel edges are disconnected (automatically by boost) - ![disconnect_vertex(2) on an UNDIRECTED graph](disconnectVertexUndirected.png) - ![disconnect_vertex(2) on a DIRECTED graph](disconnectVertexDirected.png) - @param [in] p_vertex original vertex id of the starting point of the edge - */ - void disconnect_vertex(int64_t p_vertex); - void disconnect_vertex(V vertex); - - - //! @brief Reconnects all edges that were removed - void restore_graph(); - - //@} - //! @name only for stand by program - //@{ + /** @name only for debug */ + /**@{*/ friend std::ostream& operator<<( std::ostream &log, const Pgr_base_graph< G, T_V, T_E > &g) { typename Pgr_base_graph< G, T_V, T_E >::EO_i out, out_end; @@ -672,16 +558,12 @@ class Pgr_base_graph { } return log; } + /**@}*/ - //@} - - int64_t get_edge_id(V from, V to, double &distance) const; - - E get_edge( - V from, - V to, - double &distance) const { + /** @name Get edge descriptor */ + /**@{*/ + E get_edge(V from, V to, double &distance) const { E e; EO_i out_i, out_end; V v_source, v_target; @@ -709,46 +591,157 @@ class Pgr_base_graph { } return minEdge; } + /**@}*/ + /** @name How big */ + /**@{*/ size_t num_vertices() const { return boost::num_vertices(graph);} size_t num_edges() const { return boost::num_edges(graph);} + /**@}*/ + /** @name edge disconection/reconnection */ + /**@{*/ + /** @brief Disconnects all edges from p_from to p_to + - No edge is disconnected if the vertices id's do not exist in the graph + - All removed edges are stored for future reinsertion + - All parallel edges are disconnected (automatically by boost) + ![disconnect_edge(2,3) on an UNDIRECTED graph](disconnectEdgeUndirected.png) + ![disconnect_edge(2,3) on a DIRECTED graph](disconnectEdgeDirected.png) + @param [in] p_from vertex identifier of the starting point of the edge + @param [in] p_to vertex identifier of the ending point of the edge + */ + void disconnect_edge(int64_t p_from, int64_t p_to) { + /* nothing to do, a vertex doesn't exist */ + if (!has_vertex(p_from) || !has_vertex(p_to)) return; + + EO_i out, out_end; + auto u(get_V(p_from)); + auto v(get_V(p_to)); + + for (boost::tie(out, out_end) = out_edges(u, graph); out != out_end; ++out) { + if (target(*out) == v) { + removed_edges.push_back(get_edge_info(*out)); + break; + } + } + boost::remove_edge(u, v, graph); + } + + /** @brief Disconnects the outgoing edges of a vertex - void graph_add_edge(const T_E &edge); + - No edge is disconnected if it doesn't exist in the graph + - Removed edges are stored for future reinsertion + - all outgoing edges with the edge_id are removed if they exist + @param [in] vid original vertex + @param [in] eid original edge_id + */ + void disconnect_out_going_edge(int64_t vid, int64_t eid) { + /* nothing to do, the vertex doesn't exist */ + if (!has_vertex(vid)) return; + + auto v(get_V(vid)); + EO_i out, out_end; + bool change = true; + while (change) { + change = false; + for (boost::tie(out, out_end) = out_edges(v, graph); out != out_end; ++out) { + if (graph[*out].id == eid) { + removed_edges.push_back(get_edge_info(*out)); + boost::remove_edge((*out), graph); + change = true; + break; + } + } + } + } - template < typename T > - void graph_add_edge(const T &edge, bool normal = true); + /** @brief Disconnects all incoming and outgoing edges from @b vertex + @param [in] vid vertex identifier + */ + void disconnect_vertex(int64_t vid) { + if (!has_vertex(vid)) return; + disconnect_vertex(get_V(vid)); + } - template < typename T > - void graph_add_min_edge_no_parallel(const T &edge); + /** @brief Disconnects all incoming and outgoing edges from the vertex - template < typename T > - void graph_add_neg_edge(const T &edge, bool normal = true); - /** - * Use this function when the vertices are already inserted in the graph - */ - template < typename T> - void graph_add_edge_no_create_vertex(const T &edge) { - bool inserted; + boost::graph doesn't recommend th to insert/remove vertices, so a vertex removal is + simulated by disconnecting the vertex from the graph + - No edge is disconnected if the vertices id's do not exist in the graph + - All removed edges are stored for future reinsertion + - All parallel edges are disconnected (automatically by boost) + ![disconnect_vertex(2) on an UNDIRECTED graph](disconnectVertexUndirected.png) + ![disconnect_vertex(2) on a DIRECTED graph](disconnectVertexDirected.png) + @param [in] v vertex descriptor + */ + void disconnect_vertex(V v) { + EO_i out, out_end; + for (boost::tie(out, out_end) = out_edges(v, graph); out != out_end; ++out) { + removed_edges.push_back(get_edge_info(*out)); + } + + /* special case */ + if (m_is_directed) { + EI_i in, in_end; + for (boost::tie(in, in_end) = in_edges(v, graph); in != in_end; ++in) { + removed_edges.push_back(get_edge_info(*in)); + } + } + + /* delete incoming and outgoing edges from the vertex */ + boost::clear_vertex(v, graph); + } + + /** @brief Reconnects all edges that were removed */ + void + restore_graph() { + while (removed_edges.size() != 0) { + restore_edge(removed_edges[0]); + removed_edges.pop_front(); + } + } + + private: + void restore_edge(const T_E &edge) { E e; - if ((edge.cost < 0) && (edge.reverse_cost < 0)) - return; - -#if 0 - std::ostringstream log; - for (auto iter = vertices_map.begin(); - iter != vertices_map.end(); - iter++) { - log << "Key: " << iter->first <<"\tValue:" << iter->second << "\n"; + + auto u = get_V(edge.source); + auto v = get_V(edge.target); + if (edge.cost >= 0) { + bool inserted; + boost::tie(e, inserted) = boost::add_edge(u, v, graph); + graph[e].cp_members(edge); } - pgassertwm(has_vertex(edge.source), log.str().c_str()); - pgassert(has_vertex(edge.target)); -#endif + } + + /* @brief builds up info that will be deleted + * @param[in] e edge descriptor + * @return edge data + */ + T_E get_edge_info(const E &e) const { + T_E d_edge; + d_edge.id = graph[e].id; + d_edge.source = graph[source(e)].id; + d_edge.target = graph[target(e)].id; + d_edge.cost = graph[e].cost; + return d_edge; + } + /**@}*/ - auto vm_s = get_V(edge.source); - auto vm_t = get_V(edge.target); + template void graph_add_edge(const T &edge, bool normal) { + bool inserted; + E e; + if ((edge.cost < 0) && (edge.reverse_cost < 0)) return; + /* + * true: for source + * false: for target + */ + auto vm_s = get_V(T_V(edge, true)); + auto vm_t = get_V(T_V(edge, false)); + pgassert(vertices_map.find(edge.source) != vertices_map.end()); + pgassert(vertices_map.find(edge.target) != vertices_map.end()); if (edge.cost >= 0) { boost::tie(e, inserted) = boost::add_edge(vm_s, vm_t, graph); @@ -756,327 +749,128 @@ class Pgr_base_graph { graph[e].id = edge.id; } - - if (edge.reverse_cost >= 0 && (is_directed() - || (is_undirected() && edge.cost != edge.reverse_cost))) { + if (edge.reverse_cost >= 0 + && (m_is_directed || (!m_is_directed && edge.cost != edge.reverse_cost))) { boost::tie(e, inserted) = boost::add_edge(vm_t, vm_s, graph); + graph[e].cost = edge.reverse_cost; - graph[e].id = edge.id; + graph[e].id = normal? edge.id : -edge.id; } } -}; + template void graph_add_min_edge_no_parallel(const T &edge) { + bool inserted; + E e; + if ((edge.cost < 0) && (edge.reverse_cost < 0)) return; + + /* + * true: for source + * false: for target + */ + auto vm_s = get_V(T_V(edge, true)); + auto vm_t = get_V(T_V(edge, false)); + + pgassert(vertices_map.find(edge.source) != vertices_map.end()); + pgassert(vertices_map.find(edge.target) != vertices_map.end()); + if (edge.cost >= 0) { + E e1; + bool found; + boost::tie(e1, found) = boost::edge(vm_s, vm_t, graph); + if (found) { + if (edge.cost < graph[e1].cost) { + graph[e1].cost = edge.cost; + graph[e1].id = edge.id; + } + } else { + boost::tie(e, inserted) = boost::add_edge(vm_s, vm_t, graph); + graph[e].cost = edge.cost; + graph[e].id = edge.id; + } + } + if (edge.reverse_cost >= 0 + && (m_is_directed || (!m_is_directed && edge.cost != edge.reverse_cost))) { + E e1; + bool found; + boost::tie(e1, found) = boost::edge(vm_t, vm_s, graph); + if (found) { + if (edge.reverse_cost < graph[e1].cost) { + graph[e1].cost = edge.reverse_cost; + graph[e1].id = edge.id; + } + } else { + boost::tie(e, inserted) = + boost::add_edge(vm_t, vm_s, graph); + + graph[e].cost = edge.reverse_cost; + graph[e].id = edge.id; + } + } + } + /** + Add edges with negative cost(either cost or reverse_cost or both) + Reading them into graph as positive cost ( edge_cost = (-1)* edge_negative_cost) [L931 & L941] + To Do: Read and apply edges with negative cost in function as it is + */ + template void graph_add_neg_edge(const T &edge, bool normal = true) { + bool inserted; + E e; -template < class G, typename T_V, typename T_E > -void -Pgr_base_graph< G, T_V, T_E >::disconnect_edge(int64_t p_from, int64_t p_to) { - T_E d_edge; - - // nothing to do, the vertex doesn't exist - if (!has_vertex(p_from) || !has_vertex(p_to)) return; - - EO_i out, out_end; - V g_from(get_V(p_from)); - V g_to(get_V(p_to)); - - // store the edges that are going to be removed - for (boost::tie(out, out_end) = out_edges(g_from, graph); - out != out_end; ++out) { - if (target(*out) == g_to) { - d_edge.id = graph[*out].id; - d_edge.source = graph[source(*out)].id; - d_edge.target = graph[target(*out)].id; - d_edge.cost = graph[*out].cost; - removed_edges.push_back(d_edge); - } - } - // the actual removal - boost::remove_edge(g_from, g_to, graph); -} - - - -template < class G, typename T_V, typename T_E > -void -Pgr_base_graph< G, T_V, T_E >::disconnect_out_going_edge( - int64_t vertex_id, int64_t edge_id) { - T_E d_edge; - - // nothing to do, the vertex doesn't exist - if (!has_vertex(vertex_id)) return; - auto v_from(get_V(vertex_id)); - - EO_i out, out_end; - bool change = true; - // store the edge that are going to be removed - while (change) { - change = false; - for (boost::tie(out, out_end) = out_edges(v_from, graph); - out != out_end; ++out) { - if (graph[*out].id == edge_id) { - d_edge.id = graph[*out].id; - d_edge.source = graph[source(*out)].id; - d_edge.target = graph[target(*out)].id; - d_edge.cost = graph[*out].cost; - removed_edges.push_back(d_edge); - boost::remove_edge((*out), graph); - change = true; - break; - } - } - } -} - - -template < class G, typename T_V, typename T_E > -void -Pgr_base_graph< G, T_V, T_E >::disconnect_vertex(int64_t vertex) { - if (!has_vertex(vertex)) return; - disconnect_vertex(get_V(vertex)); -} - -template < class G, typename T_V, typename T_E > -void -Pgr_base_graph< G, T_V, T_E >::disconnect_vertex(V vertex) { - T_E d_edge; - - EO_i out, out_end; - // store the edges that are going to be removed - for (boost::tie(out, out_end) = out_edges(vertex, graph); - out != out_end; ++out) { - d_edge.id = graph[*out].id; - d_edge.source = graph[source(*out)].id; - d_edge.target = graph[target(*out)].id; - d_edge.cost = graph[*out].cost; - removed_edges.push_back(d_edge); - } - - // special case - if (m_is_directed) { - EI_i in, in_end; - for (boost::tie(in, in_end) = in_edges(vertex, graph); - in != in_end; ++in) { - d_edge.id = graph[*in].id; - d_edge.source = graph[source(*in)].id; - d_edge.target = graph[target(*in)].id; - d_edge.cost = graph[*in].cost; - removed_edges.push_back(d_edge); - } - } - - // delete incoming and outgoing edges from the vertex - boost::clear_vertex(vertex, graph); -} - -template < class G, typename T_V, typename T_E > -void -Pgr_base_graph< G, T_V, T_E >::restore_graph() { - while (removed_edges.size() != 0) { - graph_add_edge(removed_edges[0]); - removed_edges.pop_front(); - } -} - - - - -template < class G, typename T_V, typename T_E > -int64_t -Pgr_base_graph< G, T_V, T_E >::get_edge_id( - V from, - V to, - double &distance) const { - E e; - EO_i out_i, out_end; - V v_source, v_target; - double minCost = (std::numeric_limits::max)(); - int64_t minEdge = -1; - for (boost::tie(out_i, out_end) = boost::out_edges(from, graph); - out_i != out_end; ++out_i) { - e = *out_i; - v_target = target(e); - v_source = source(e); - if ((from == v_source) && (to == v_target) - && (distance == graph[e].cost)) - return graph[e].id; - if ((from == v_source) && (to == v_target) - && (minCost > graph[e].cost)) { - minCost = graph[e].cost; - minEdge = graph[e].id; - } - } - distance = minEdge == -1? 0: minCost; - return minEdge; -} - - -template < class G, typename T_V, typename T_E > -void -Pgr_base_graph< G, T_V, T_E >::graph_add_edge(const T_E &edge ) { - typename Pgr_base_graph< G, T_V, T_E >::LI vm_s, vm_t; - typename Pgr_base_graph< G, T_V, T_E >::E e; - - vm_s = vertices_map.find(edge.source); - if (vm_s == vertices_map.end()) { - vertices_map[edge.source]= num_vertices(); - vm_s = vertices_map.find(edge.source); - } - - vm_t = vertices_map.find(edge.target); - if (vm_t == vertices_map.end()) { - vertices_map[edge.target]= num_vertices(); - vm_t = vertices_map.find(edge.target); - } - - if (edge.cost >= 0) { - bool inserted; - boost::tie(e, inserted) = - boost::add_edge(vm_s->second, vm_t->second, graph); - graph[e].cp_members(edge); - } -} - - -template < class G, typename T_V, typename T_E > -template < typename T> -void -Pgr_base_graph< G, T_V, T_E >::graph_add_edge(const T &edge, bool normal) { - bool inserted; - typename Pgr_base_graph< G, T_V, T_E >::E e; - if ((edge.cost < 0) && (edge.reverse_cost < 0)) - return; - - /* - * true: for source - * false: for target - */ - auto vm_s = get_V(T_V(edge, true)); - auto vm_t = get_V(T_V(edge, false)); - - pgassert(vertices_map.find(edge.source) != vertices_map.end()); - pgassert(vertices_map.find(edge.target) != vertices_map.end()); - if (edge.cost >= 0) { - boost::tie(e, inserted) = - boost::add_edge(vm_s, vm_t, graph); - graph[e].cost = edge.cost; - graph[e].id = edge.id; - } - - if (edge.reverse_cost >= 0 - && (m_is_directed || (!m_is_directed && edge.cost != edge.reverse_cost))) { - boost::tie(e, inserted) = - boost::add_edge(vm_t, vm_s, graph); - - graph[e].cost = edge.reverse_cost; - graph[e].id = normal? edge.id : -edge.id; - } -} - -template < class G, typename T_V, typename T_E > -template < typename T> -void -Pgr_base_graph< G, T_V, T_E >::graph_add_min_edge_no_parallel(const T &edge) { - bool inserted; - typename Pgr_base_graph< G, T_V, T_E >::E e; - if ((edge.cost < 0) && (edge.reverse_cost < 0)) - return; - - /* - * true: for source - * false: for target - */ - auto vm_s = get_V(T_V(edge, true)); - auto vm_t = get_V(T_V(edge, false)); - - pgassert(vertices_map.find(edge.source) != vertices_map.end()); - pgassert(vertices_map.find(edge.target) != vertices_map.end()); - if (edge.cost >= 0) { - E e1; - bool found; - boost::tie(e1, found) = boost::edge(vm_s, vm_t, graph); - if (found) { - if (edge.cost < graph[e1].cost) { - graph[e1].cost = edge.cost; - graph[e1].id = edge.id; - } - } else { - boost::tie(e, inserted) = - boost::add_edge(vm_s, vm_t, graph); - graph[e].cost = edge.cost; - graph[e].id = edge.id; - } - } - - if (edge.reverse_cost >= 0 - && (m_is_directed || (!m_is_directed && edge.cost != edge.reverse_cost))) { - E e1; - bool found; - boost::tie(e1, found) = boost::edge(vm_t, vm_s, graph); - if (found) { - if (edge.reverse_cost < graph[e1].cost) { - graph[e1].cost = edge.reverse_cost; - graph[e1].id = edge.id; - } - } else { - boost::tie(e, inserted) = - boost::add_edge(vm_t, vm_s, graph); - - graph[e].cost = edge.reverse_cost; - graph[e].id = edge.id; - } - } -} - -#if 1 -/* -Add edges with negative cost(either cost or reverse_cost or both) -Reading them into graph as positive cost ( edge_cost = (-1)* edge_negative_cost) [L931 & L941] -To Do: Read and apply edges with negative cost in function as it is -*/ + auto vm_s = get_V(T_V(edge, true)); + auto vm_t = get_V(T_V(edge, false)); + + pgassert(vertices_map.find(edge.source) != vertices_map.end()); + pgassert(vertices_map.find(edge.target) != vertices_map.end()); + + boost::tie(e, inserted) = boost::add_edge(vm_s, vm_t, graph); + if (edge.cost < 0) { + /* reading negative edges as positive */ + graph[e].cost = (-0.5)*edge.cost; + } else { + graph[e].cost = edge.cost; + } + graph[e].id = edge.id; -template < class G, typename T_V, typename T_E > -template < typename T> -void -Pgr_base_graph< G, T_V, T_E >::graph_add_neg_edge(const T &edge, bool normal) { - bool inserted; - typename Pgr_base_graph< G, T_V, T_E >::E e; - - auto vm_s = get_V(T_V(edge, true)); - auto vm_t = get_V(T_V(edge, false)); - - pgassert(vertices_map.find(edge.source) != vertices_map.end()); - pgassert(vertices_map.find(edge.target) != vertices_map.end()); - - boost::tie(e, inserted) = - boost::add_edge(vm_s, vm_t, graph); - if (edge.cost < 0) { - // reading negative edges as positive - graph[e].cost = (-0.5)*edge.cost; - } else { - graph[e].cost = edge.cost; - } - graph[e].id = edge.id; - - if (m_is_directed - || (!m_is_directed && edge.cost > edge.reverse_cost)) { - boost::tie(e, inserted) = - boost::add_edge(vm_t, vm_s, graph); - if (edge.reverse_cost < 0) { - // reading negative edges as positive - graph[e].cost = (-0.5)*edge.reverse_cost; - } else { - graph[e].cost = edge.reverse_cost; - } - - graph[e].id = normal? edge.id : -edge.id; - } -} -#endif - -/****************** PRIVATE *******************/ + if (m_is_directed + || (!m_is_directed && edge.cost > edge.reverse_cost)) { + boost::tie(e, inserted) = + boost::add_edge(vm_t, vm_s, graph); + if (edge.reverse_cost < 0) { + /* reading negative edges as positive */ + graph[e].cost = (-0.5)*edge.reverse_cost; + } else { + graph[e].cost = edge.reverse_cost; + } + + graph[e].id = normal? edge.id : -edge.id; + } + } + + public: + /** @name The Graph */ + /**@{*/ + G graph; /**< The graph */ + id_to_V vertices_map; /**< id -> graph id */ + + private: + bool m_is_directed; /**< type (DIRECTED or UNDIRECTED) */ + /**@}*/ + + /** @name Id mapping handling */ + /**@{*/ + vertex_index_t vertIndex; + IndexMap mapIndex; + boost::associative_property_map propmapIndex; + /**@}*/ + + /** @name Graph Modification */ + /**@{*/ + /** Used for storing the removed_edges */ + std::deque removed_edges; + /**@}*/ +}; } // namespace graph } // namespace pgrouting From ec55caefa58d3f6b88bb6d1cf7ebdff820cb3399 Mon Sep 17 00:00:00 2001 From: Ko Nagase Date: Sat, 16 Mar 2024 02:06:33 +0900 Subject: [PATCH 141/428] Add macos-14 to macos CI (#2619) --- .github/workflows/macos.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 5887eeee78..2386333f2b 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -41,7 +41,12 @@ permissions: jobs: build: name: macos - runs-on: macos-latest + runs-on: ${{ matrix.os }} + + strategy: + fail-fast: false + matrix: + os: [macos-latest, macos-14] steps: - name: Checkout repository From 5d38abd324a206f71a4ccdbb19cf327be749b074 Mon Sep 17 00:00:00 2001 From: Ko Nagase Date: Sat, 16 Mar 2024 11:01:57 +0900 Subject: [PATCH 142/428] Fix macos-14 build error --- src/cpp_common/combinations.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/cpp_common/combinations.cpp b/src/cpp_common/combinations.cpp index cef01eab95..41908adf4d 100644 --- a/src/cpp_common/combinations.cpp +++ b/src/cpp_common/combinations.cpp @@ -24,13 +24,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "cpp_common/combinations.hpp" - #include #include #include #include #include +#include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/basePath_SSEC.hpp" From c1ae1f2cb105738f7aad007fc617363e1f069335 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Date: Sun, 31 Mar 2024 05:56:48 +0200 Subject: [PATCH 143/428] [actions] Update release script to use NEWS.md --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8c439e7e57..f4c79c9b65 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -153,7 +153,7 @@ jobs: tar -zcvf doc-v${PGROUTING_VERSION}-es.tar.gz doc-v${PGROUTING_VERSION}-es cd ../.. - grep -Pzo "(?s)pgRouting ${PGROUTING_VERSION//./\\.} Release Notes.*?(?=pgRouting .\..\.. Release Notes)" NEWS | tr '\0' '\n' > release_body.txt + grep -Pzo "(?s)pgRouting ${PGROUTING_VERSION//./\\.} Release Notes.*?(?=pgRouting .\..\.. Release Notes)" NEWS.md | tr '\0' '\n' > release_body.txt echo "**Attachments**" >> release_body.txt echo "File | Contents" >> release_body.txt echo "| --- | --- |" >> release_body.txt From edb59c1d70a0f3491b8723a5eb884f5acc92a9dd Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 28 Apr 2024 10:38:36 -0600 Subject: [PATCH 144/428] add 3.6.2 info to notes, news, build and upgrade test --- .github/workflows/update.yml | 2 +- CMakeLists.txt | 1 + NEWS.md | 19 ++++++++++++++++--- doc/src/release_notes.rst | 28 +++++++++++++++++++++------- 4 files changed, 39 insertions(+), 11 deletions(-) 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/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 ------------------------------------------------------------------------------- From 92c9ef6c45071b3cc323e551c3fe1e61ea4b797b Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 28 Apr 2024 11:28:53 -0600 Subject: [PATCH 145/428] (CI/cpp_lint) ignoring faulty check -whitespace/indent_namespace --- tools/scripts/code_checker.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 "--------------------" From 4b7866ddafb3b6391b3020c3cafdcd9d13d48b91 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 28 Apr 2024 12:06:49 -0600 Subject: [PATCH 146/428] (CI/doc) only process chinese on pgRouting repo --- .github/workflows/doc-check.yml | 2 ++ 1 file changed, 2 insertions(+) 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 From 356233e2f91f860a5cbbdece5de024ab878d41ec Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 28 Apr 2024 12:28:02 -0600 Subject: [PATCH 147/428] (isPlanar) should not throw --- pgtap/planar/isPlanar/edge_cases.pg | 4 ++-- src/planar/isPlanar_driver.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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; From fcc5dc9d52c4a74e92caf30583dd320462747c86 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 28 Apr 2024 19:07:37 -0600 Subject: [PATCH 148/428] (locale) updating the locale --- doc/dijkstra/dijkstra-family.rst | 22 ++--- doc/pickDeliver/VRP-category.rst | 4 +- doc/src/costMatrix-category.rst | 3 +- doc/topology/pgr_nodeNetwork.rst | 6 +- .../en/LC_MESSAGES/pgrouting_doc_strings.po | 95 +++++++++++-------- locale/pot/index.pot | 8 +- locale/pot/pgrouting_doc_strings.pot | 59 +++++++----- 7 files changed, 115 insertions(+), 82 deletions(-) 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/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 "" From 7b87bce960a7e189e346909be0dc07e9fa3c96d9 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 09:26:42 -0600 Subject: [PATCH 149/428] Adding a bool template parameter --- include/cpp_common/pgr_base_graph.hpp | 32 +++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/include/cpp_common/pgr_base_graph.hpp b/include/cpp_common/pgr_base_graph.hpp index b380580a57..72b4331045 100644 --- a/include/cpp_common/pgr_base_graph.hpp +++ b/include/cpp_common/pgr_base_graph.hpp @@ -167,7 +167,7 @@ digraph.insert_edges(new_edges); */ namespace graph { -template +template class Pgr_base_graph; } // namespace graph @@ -186,32 +186,32 @@ typedef graph::Pgr_base_graph < boost::adjacency_list < boost::vecS, boost::vecS, boost::undirectedS, Basic_vertex, Basic_edge >, - Basic_vertex, Basic_edge > UndirectedGraph; + Basic_vertex, Basic_edge, false > UndirectedGraph; typedef graph::Pgr_base_graph < boost::adjacency_list < boost::vecS, boost::vecS, boost::bidirectionalS, Basic_vertex, Basic_edge >, - Basic_vertex, Basic_edge > DirectedGraph; + Basic_vertex, Basic_edge , true> DirectedGraph; typedef graph::Pgr_base_graph < boost::adjacency_list < boost::listS, boost::vecS, boost::undirectedS, XY_vertex, Basic_edge >, - XY_vertex, Basic_edge > xyUndirectedGraph; + XY_vertex, Basic_edge , false> xyUndirectedGraph; typedef graph::Pgr_base_graph < boost::adjacency_list < boost::listS, boost::vecS, boost::bidirectionalS, XY_vertex, Basic_edge >, - XY_vertex, Basic_edge > xyDirectedGraph; + XY_vertex, Basic_edge , true> xyDirectedGraph; /**@}*/ namespace graph { -template +template class Pgr_base_graph { public: /** @name Graph related types @@ -265,10 +265,10 @@ class Pgr_base_graph { - inserts the vertices - The vertices must be checked (if necessary) before calling the constructor */ - Pgr_base_graph( + Pgr_base_graph( const std::vector< T_V > &vertices, bool directed) : graph(vertices.size()), - m_is_directed(directed), + m_is_directed(t_directed), vertIndex(boost::get(boost::vertex_index, graph)), propmapIndex(mapIndex) { // This code does not work with contraction @@ -295,9 +295,9 @@ class Pgr_base_graph { /** Prepares the _graph_ to be of type gtype with 0 vertices */ - explicit Pgr_base_graph(bool directed) + explicit Pgr_base_graph(bool directed) : graph(0), - m_is_directed(directed), + m_is_directed(t_directed), vertIndex(boost::get(boost::vertex_index, graph)), propmapIndex(mapIndex) { } @@ -539,15 +539,15 @@ class Pgr_base_graph { /** @name only for debug */ /**@{*/ friend std::ostream& operator<<( - std::ostream &log, const Pgr_base_graph< G, T_V, T_E > &g) { - typename Pgr_base_graph< G, T_V, T_E >::EO_i out, out_end; + std::ostream &log, const Pgr_base_graph &g) { + typename Pgr_base_graph::EO_i out, out_end; - for (auto vi = vertices(g.graph).first; - vi != vertices(g.graph).second; ++vi) { + auto vs = boost::vertices(g.graph); + for (auto vi = vs.first; vi != vs.second; ++vi) { if ((*vi) >= g.num_vertices()) break; log << (*vi) << ": " << " out_edges_of(" << g.graph[(*vi)] << "):"; - for (boost::tie(out, out_end) = out_edges(*vi, g.graph); - out != out_end; ++out) { + auto es = boost::out_edges(*vi, g.graph); + for (auto out = es.first; out != es.second; ++out) { log << ' ' << g.graph[*out].id << "=(" << g[g.source(*out)].id << ", " From 2854b15d8cc8f4dc3a7005de9527034a4e7d768e Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 10:12:58 -0600 Subject: [PATCH 150/428] (pgr_base_graph.hpp) removing unused parameter --- include/cpp_common/pgr_base_graph.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/cpp_common/pgr_base_graph.hpp b/include/cpp_common/pgr_base_graph.hpp index 72b4331045..cf852a9b8d 100644 --- a/include/cpp_common/pgr_base_graph.hpp +++ b/include/cpp_common/pgr_base_graph.hpp @@ -266,7 +266,7 @@ class Pgr_base_graph { - The vertices must be checked (if necessary) before calling the constructor */ Pgr_base_graph( - const std::vector< T_V > &vertices, bool directed) + const std::vector &vertices) : graph(vertices.size()), m_is_directed(t_directed), vertIndex(boost::get(boost::vertex_index, graph)), @@ -295,7 +295,7 @@ class Pgr_base_graph { /** Prepares the _graph_ to be of type gtype with 0 vertices */ - explicit Pgr_base_graph(bool directed) + explicit Pgr_base_graph() : graph(0), m_is_directed(t_directed), vertIndex(boost::get(boost::vertex_index, graph)), From ce89318a28d40e36bfc4511ecc20b5680886871c Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 10:23:17 -0600 Subject: [PATCH 151/428] (alphaShape) Adjusting code to pgr_base_graph_changes --- include/alphaShape/pgr_alphaShape.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/alphaShape/pgr_alphaShape.hpp b/include/alphaShape/pgr_alphaShape.hpp index 89aef53b5e..ba79bb3c27 100644 --- a/include/alphaShape/pgr_alphaShape.hpp +++ b/include/alphaShape/pgr_alphaShape.hpp @@ -53,7 +53,7 @@ using BG = boost::adjacency_list< boost::setS, boost::vecS, boost::undirectedS, XY_vertex, Basic_edge >; -using G = graph::Pgr_base_graph ; +using G = graph::Pgr_base_graph ; using E = boost::graph_traits::edge_descriptor; using V = boost::graph_traits::vertex_descriptor; From c79f34a710e7ab7409b899bc1bc868167d76a5f3 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 10:23:17 -0600 Subject: [PATCH 152/428] (contraction) Adjusting code to pgr_base_graph_changes --- include/contraction/ch_graphs.hpp | 4 ++-- include/contraction/pgr_contractionGraph.hpp | 8 ++++---- src/contraction/contractGraph_driver.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/contraction/ch_graphs.hpp b/include/contraction/ch_graphs.hpp index c0a71e1e4b..8d22a4b12d 100644 --- a/include/contraction/ch_graphs.hpp +++ b/include/contraction/ch_graphs.hpp @@ -48,12 +48,12 @@ namespace graph { using CHUndirectedGraph = Pgr_contractionGraph < boost::adjacency_list < boost::listS, boost::vecS, boost::undirectedS, - CH_vertex, CH_edge>>; + CH_vertex, CH_edge>, false>; using CHDirectedGraph = Pgr_contractionGraph< boost::adjacency_list < boost::listS, boost::vecS, boost::bidirectionalS, - CH_vertex, CH_edge>>; + CH_vertex, CH_edge>, true>; } // namespace graph diff --git a/include/contraction/pgr_contractionGraph.hpp b/include/contraction/pgr_contractionGraph.hpp index 56b3e20b33..6c7df2d658 100644 --- a/include/contraction/pgr_contractionGraph.hpp +++ b/include/contraction/pgr_contractionGraph.hpp @@ -47,8 +47,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. namespace pgrouting { namespace graph { -template -class Pgr_contractionGraph : public Pgr_base_graph { +template +class Pgr_contractionGraph : public Pgr_base_graph { public: typedef typename boost::graph_traits < G >::vertex_descriptor V; typedef typename boost::graph_traits < G >::edge_descriptor E; @@ -58,8 +58,8 @@ class Pgr_contractionGraph : public Pgr_base_graph { /*! Prepares the _graph_ to be of type *directed* */ - explicit Pgr_contractionGraph(bool directed) - : Pgr_base_graph(directed) { + explicit Pgr_contractionGraph() + : Pgr_base_graph() { } /*! @brief get the vertex descriptors of adjacent vertices of *v* diff --git a/src/contraction/contractGraph_driver.cpp b/src/contraction/contractGraph_driver.cpp index b11ed1fd8f..ceabccdf9b 100644 --- a/src/contraction/contractGraph_driver.cpp +++ b/src/contraction/contractGraph_driver.cpp @@ -227,7 +227,7 @@ pgr_do_contractGraph( if (directed) { using DirectedGraph = pgrouting::graph::CHDirectedGraph; - DirectedGraph digraph(directed); + DirectedGraph digraph; process_contraction(digraph, edges, forbid, ordering, max_cycles); @@ -238,7 +238,7 @@ pgr_do_contractGraph( return_count); } else { using UndirectedGraph = pgrouting::graph::CHUndirectedGraph; - UndirectedGraph undigraph(directed); + UndirectedGraph undigraph; process_contraction(undigraph, edges, forbid, ordering, max_cycles); From ad85f40f465ce5e53070d388229bb20dd9671339 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 10:23:17 -0600 Subject: [PATCH 153/428] (lineGraph) Adjusting code to pgr_base_graph_changes --- include/lineGraph/pgr_lineGraph.hpp | 16 ++++++++-------- include/lineGraph/pgr_lineGraphFull.hpp | 16 ++++++++-------- src/lineGraph/lineGraphFull_driver.cpp | 4 ++-- src/lineGraph/lineGraph_driver.cpp | 4 ++-- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/include/lineGraph/pgr_lineGraph.hpp b/include/lineGraph/pgr_lineGraph.hpp index d0c1a6e187..65dad9a2cf 100644 --- a/include/lineGraph/pgr_lineGraph.hpp +++ b/include/lineGraph/pgr_lineGraph.hpp @@ -46,8 +46,8 @@ namespace pgrouting { namespace graph { -template -class Pgr_lineGraph : public Pgr_base_graph { +template +class Pgr_lineGraph : public Pgr_base_graph { public: typedef typename boost::graph_traits < G >::vertex_descriptor V; typedef typename boost::graph_traits < G >::edge_descriptor E; @@ -56,20 +56,20 @@ class Pgr_lineGraph : public Pgr_base_graph { typedef typename boost::graph_traits < G >::in_edge_iterator EI_i; - explicit Pgr_lineGraph< G, T_V, T_E >(bool directed) - : Pgr_base_graph< G, T_V, T_E >(directed) { + explicit Pgr_lineGraph(bool directed) + : Pgr_base_graph() { } - explicit Pgr_lineGraph< G, T_V, T_E >(const pgrouting::DirectedGraph &digraph) - : Pgr_base_graph< G, T_V, T_E >(true) { + explicit Pgr_lineGraph(const pgrouting::DirectedGraph &digraph) + : Pgr_base_graph() { insert_vertices(digraph); create_edges(digraph); } friend std::ostream& operator<<( - std::ostream &log, const Pgr_lineGraph< G, T_V, T_E > &g) { - typename Pgr_base_graph< G, T_V, T_E >::EO_i out, out_end; + std::ostream &log, const Pgr_lineGraph &g) { + typename Pgr_base_graph::EO_i out, out_end; for (auto vi = vertices(g.graph).first; vi != vertices(g.graph).second; ++vi) { diff --git a/include/lineGraph/pgr_lineGraphFull.hpp b/include/lineGraph/pgr_lineGraphFull.hpp index c782aa4ca4..01a9bb87a0 100644 --- a/include/lineGraph/pgr_lineGraphFull.hpp +++ b/include/lineGraph/pgr_lineGraphFull.hpp @@ -44,8 +44,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. namespace pgrouting { namespace graph { -template -class Pgr_lineGraphFull : public Pgr_base_graph { +template +class Pgr_lineGraphFull : public Pgr_base_graph { public: typedef typename boost::graph_traits < G >::vertex_descriptor V; typedef typename boost::graph_traits < G >::edge_descriptor E; @@ -55,20 +55,20 @@ class Pgr_lineGraphFull : public Pgr_base_graph { typedef typename boost::graph_traits < G >::in_edge_iterator EI_i; - explicit Pgr_lineGraphFull< G, T_V, T_E >(bool directed) - : Pgr_base_graph< G, T_V, T_E >(directed), + explicit Pgr_lineGraphFull< G, T_V, T_E, t_directed>(bool directed) + : Pgr_base_graph(), m_num_edges(0) { } - explicit Pgr_lineGraphFull< G, T_V, T_E >(const pgrouting::DirectedGraph &digraph) - : Pgr_base_graph< G, T_V, T_E >(true) { + explicit Pgr_lineGraphFull(const pgrouting::DirectedGraph &digraph) + : Pgr_base_graph() { apply_transformation(digraph); store_edge_costs(digraph); } friend std::ostream& operator<<( - std::ostream &log, const Pgr_lineGraphFull< G, T_V, T_E > &g) { - typename Pgr_base_graph< G, T_V, T_E >::EO_i out, out_end; + std::ostream &log, const Pgr_lineGraphFull &g) { + typename Pgr_base_graph::EO_i out, out_end; for (auto vi = vertices(g.graph).first; vi != vertices(g.graph).second; ++vi) { diff --git a/src/lineGraph/lineGraphFull_driver.cpp b/src/lineGraph/lineGraphFull_driver.cpp index 018ef48a9f..26dd1ffb08 100644 --- a/src/lineGraph/lineGraphFull_driver.cpp +++ b/src/lineGraph/lineGraphFull_driver.cpp @@ -99,13 +99,13 @@ pgr_do_lineGraphFull( } hint = nullptr; - pgrouting::DirectedGraph digraph(true); + pgrouting::DirectedGraph digraph; digraph.insert_edges_neg(edges); pgrouting::graph::Pgr_lineGraphFull< pgrouting::LinearDirectedGraph, pgrouting::Line_vertex, - pgrouting::Basic_edge > line(digraph); + pgrouting::Basic_edge, true> line(digraph); std::vector< Line_graph_full_rt > line_graph_edges; line_graph_edges = line.get_postgres_results_directed(); diff --git a/src/lineGraph/lineGraph_driver.cpp b/src/lineGraph/lineGraph_driver.cpp index 730173bf6d..792b0a4be4 100644 --- a/src/lineGraph/lineGraph_driver.cpp +++ b/src/lineGraph/lineGraph_driver.cpp @@ -97,14 +97,14 @@ pgr_do_lineGraph( - pgrouting::DirectedGraph digraph(directed); + pgrouting::DirectedGraph digraph; digraph.insert_edges_neg(edges); log << digraph << "\n"; pgrouting::graph::Pgr_lineGraph< pgrouting::LinearDirectedGraph, pgrouting::Line_vertex, - pgrouting::Basic_edge> line(digraph); + pgrouting::Basic_edge, true> line(digraph); std::vector< Edge_rt > line_graph_edges; line_graph_edges = line.get_postgres_results_directed(); auto count = line_graph_edges.size(); From 364e14c564648d7f351baab5c4d224e096f05b5d Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 10:23:17 -0600 Subject: [PATCH 154/428] (allpairs) Adjusting code to pgr_base_graph_changes --- src/allpairs/floydWarshall_driver.cpp | 4 ++-- src/allpairs/johnson_driver.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/allpairs/floydWarshall_driver.cpp b/src/allpairs/floydWarshall_driver.cpp index f43f3ad454..5fb330bccb 100644 --- a/src/allpairs/floydWarshall_driver.cpp +++ b/src/allpairs/floydWarshall_driver.cpp @@ -72,12 +72,12 @@ pgr_do_floydWarshall( if (directed) { log << "Processing Directed graph\n"; - pgrouting::DirectedGraph digraph(directed); + pgrouting::DirectedGraph digraph; digraph.insert_edges(edges); pgr_floydWarshall(digraph, *return_count, return_tuples); } else { log << "Processing Undirected graph\n"; - pgrouting::UndirectedGraph undigraph(directed); + pgrouting::UndirectedGraph undigraph; undigraph.insert_edges(edges); pgr_floydWarshall(undigraph, *return_count, return_tuples); } diff --git a/src/allpairs/johnson_driver.cpp b/src/allpairs/johnson_driver.cpp index d9b3070116..ff9337a977 100644 --- a/src/allpairs/johnson_driver.cpp +++ b/src/allpairs/johnson_driver.cpp @@ -71,12 +71,12 @@ pgr_do_johnson( if (directed) { log << "Processing Directed graph\n"; - pgrouting::DirectedGraph digraph(directed); + pgrouting::DirectedGraph digraph; digraph.insert_edges(edges); pgr_johnson(digraph, *return_count, return_tuples); } else { log << "Processing Undirected graph\n"; - pgrouting::UndirectedGraph undigraph(directed); + pgrouting::UndirectedGraph undigraph; undigraph.insert_edges(edges); pgr_johnson(undigraph, *return_count, return_tuples); } From 6d126d932f3c2afdc734f6726c88ac7a59508a72 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 10:23:17 -0600 Subject: [PATCH 155/428] (alpha_shape) Adjusting code to pgr_base_graph_changes --- src/alpha_shape/pgr_alphaShape.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/alpha_shape/pgr_alphaShape.cpp b/src/alpha_shape/pgr_alphaShape.cpp index 925ea0cc4a..b6bad91ee2 100644 --- a/src/alpha_shape/pgr_alphaShape.cpp +++ b/src/alpha_shape/pgr_alphaShape.cpp @@ -165,8 +165,7 @@ struct CompareRadius { /* * Constructor */ -Pgr_alphaShape::Pgr_alphaShape(const std::vector &edges) : -graph(false) { +Pgr_alphaShape::Pgr_alphaShape(const std::vector &edges) { graph.insert_edges(edges); make_triangles(); } From c9b73929c37d05226950602ed79a3c4cb5d28ee9 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 10:23:17 -0600 Subject: [PATCH 156/428] (astar) Adjusting code to pgr_base_graph_changes --- src/astar/astar_driver.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/astar/astar_driver.cpp b/src/astar/astar_driver.cpp index 183760495c..1eb607ceb3 100644 --- a/src/astar/astar_driver.cpp +++ b/src/astar/astar_driver.cpp @@ -106,11 +106,11 @@ void pgr_do_astar( std::deque paths; if (directed) { - pgrouting::xyDirectedGraph graph(directed); + pgrouting::xyDirectedGraph graph; graph.insert_edges(edges); paths = pgrouting::algorithms::astar(graph, combinations, heuristic, factor, epsilon, only_cost); } else { - pgrouting::xyUndirectedGraph graph(directed); + pgrouting::xyUndirectedGraph graph; graph.insert_edges(edges); paths = pgrouting::algorithms::astar(graph, combinations, heuristic, factor, epsilon, only_cost); } From ebc5a9113987c1265af6a1e759f6ee45b8dc4352 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 10:23:17 -0600 Subject: [PATCH 157/428] (bdAstar) Adjusting code to pgr_base_graph_changes --- src/bdAstar/bdAstar_driver.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bdAstar/bdAstar_driver.cpp b/src/bdAstar/bdAstar_driver.cpp index 4b8745f2e0..d478193b17 100644 --- a/src/bdAstar/bdAstar_driver.cpp +++ b/src/bdAstar/bdAstar_driver.cpp @@ -102,11 +102,11 @@ void pgr_do_bdAstar( std::deque paths; if (directed) { - pgrouting::xyDirectedGraph graph(directed); + pgrouting::xyDirectedGraph graph; graph.insert_edges(edges); paths = pgrouting::algorithms::bdastar(graph, combinations, heuristic, factor, epsilon, only_cost); } else { - pgrouting::xyUndirectedGraph graph(directed); + pgrouting::xyUndirectedGraph graph; graph.insert_edges(edges); paths = pgrouting::algorithms::bdastar(graph, combinations, heuristic, factor, epsilon, only_cost); } From a1d0e57477754047e00d39e6c8bc71a7ebc87182 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 10:23:17 -0600 Subject: [PATCH 158/428] (bdDijkstra) Adjusting code to pgr_base_graph_changes --- src/bdDijkstra/bdDijkstra_driver.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bdDijkstra/bdDijkstra_driver.cpp b/src/bdDijkstra/bdDijkstra_driver.cpp index 30aa75d2cd..7943d58a52 100644 --- a/src/bdDijkstra/bdDijkstra_driver.cpp +++ b/src/bdDijkstra/bdDijkstra_driver.cpp @@ -136,11 +136,11 @@ pgr_do_bdDijkstra( std::deque paths; if (directed) { - pgrouting::DirectedGraph graph(directed); + pgrouting::DirectedGraph graph; graph.insert_edges(edges); paths = pgr_bdDijkstra(graph, combinations, only_cost); } else { - pgrouting::UndirectedGraph graph(directed); + pgrouting::UndirectedGraph graph; graph.insert_edges(edges); paths = pgr_bdDijkstra(graph, combinations, only_cost); } From 41367e09719d2c0b2abd3697dc05a64c43df4a26 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 10:23:17 -0600 Subject: [PATCH 159/428] (breadthFirstSearch) Adjusting code to pgr_base_graph_changes --- src/breadthFirstSearch/binaryBreadthFirstSearch_driver.cpp | 4 ++-- src/breadthFirstSearch/breadthFirstSearch_driver.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/breadthFirstSearch/binaryBreadthFirstSearch_driver.cpp b/src/breadthFirstSearch/binaryBreadthFirstSearch_driver.cpp index a088917ccb..cb0afaed83 100644 --- a/src/breadthFirstSearch/binaryBreadthFirstSearch_driver.cpp +++ b/src/breadthFirstSearch/binaryBreadthFirstSearch_driver.cpp @@ -179,7 +179,7 @@ pgr_do_binaryBreadthFirstSearch( std::deque< Path >paths; if (directed) { - pgrouting::DirectedGraph digraph(directed); + pgrouting::DirectedGraph digraph; digraph.insert_edges(edges); if (!(costCheck(digraph))) { @@ -190,7 +190,7 @@ pgr_do_binaryBreadthFirstSearch( paths = binaryBreadthFirstSearch(digraph, combinations); } else { - pgrouting::UndirectedGraph undigraph(directed); + pgrouting::UndirectedGraph undigraph; undigraph.insert_edges(edges); if (!(costCheck(undigraph))) { diff --git a/src/breadthFirstSearch/breadthFirstSearch_driver.cpp b/src/breadthFirstSearch/breadthFirstSearch_driver.cpp index 18dc938de6..0e6a3e8921 100644 --- a/src/breadthFirstSearch/breadthFirstSearch_driver.cpp +++ b/src/breadthFirstSearch/breadthFirstSearch_driver.cpp @@ -118,12 +118,12 @@ pgr_do_breadthFirstSearch( std::vector results; if (directed) { - pgrouting::DirectedGraph digraph(directed); + pgrouting::DirectedGraph digraph; digraph.insert_edges(edges); results = breadthFirstSearch(digraph, roots, max_depth); } else { - pgrouting::UndirectedGraph undigraph(directed); + pgrouting::UndirectedGraph undigraph; undigraph.insert_edges(edges); results = breadthFirstSearch(undigraph, roots, max_depth); } From d9e7f97b5b73c9bef11041e2d03658fef8640fe3 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 10:23:18 -0600 Subject: [PATCH 160/428] (circuits) Adjusting code to pgr_base_graph_changes --- src/circuits/hawickCircuits_driver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/circuits/hawickCircuits_driver.cpp b/src/circuits/hawickCircuits_driver.cpp index 6af9c0413c..e9a504ffb2 100644 --- a/src/circuits/hawickCircuits_driver.cpp +++ b/src/circuits/hawickCircuits_driver.cpp @@ -96,7 +96,7 @@ pgr_do_hawickCircuits( std::deque results; - pgrouting::DirectedGraph digraph(true); + pgrouting::DirectedGraph digraph; digraph.insert_edges(edges); results = pgr_hawickCircuits(digraph); From 7230df086ae9e3d2794093db3b0df7961ff9545d Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 10:23:18 -0600 Subject: [PATCH 161/428] (coloring) Adjusting code to pgr_base_graph_changes --- src/coloring/bipartite_driver.cpp | 2 +- src/coloring/sequentialVertexColoring_driver.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/coloring/bipartite_driver.cpp b/src/coloring/bipartite_driver.cpp index 5b09db02a2..90f01dfcdb 100644 --- a/src/coloring/bipartite_driver.cpp +++ b/src/coloring/bipartite_driver.cpp @@ -79,7 +79,7 @@ pgr_do_bipartite( hint = nullptr; std::string logstr; - pgrouting::UndirectedGraph undigraph(false); + pgrouting::UndirectedGraph undigraph; undigraph.insert_edges(edges); std::vector results; pgrouting::functions::Pgr_Bipartite fn_Bipartite; diff --git a/src/coloring/sequentialVertexColoring_driver.cpp b/src/coloring/sequentialVertexColoring_driver.cpp index 96edde0543..1f24d0f078 100644 --- a/src/coloring/sequentialVertexColoring_driver.cpp +++ b/src/coloring/sequentialVertexColoring_driver.cpp @@ -91,7 +91,7 @@ pgr_do_sequentialVertexColoring( std::vector results; - pgrouting::UndirectedGraph undigraph(false); + pgrouting::UndirectedGraph undigraph; undigraph.insert_edges(edges); From bbfca024010538f0add992401f11a35bdf75658f Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 10:23:18 -0600 Subject: [PATCH 162/428] (components) Adjusting code to pgr_base_graph_changes --- src/components/articulationPoints_driver.cpp | 2 +- src/components/biconnectedComponents_driver.cpp | 2 +- src/components/bridges_driver.cpp | 2 +- src/components/connectedComponents_driver.cpp | 2 +- src/components/makeConnected_driver.cpp | 2 +- src/components/strongComponents_driver.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/articulationPoints_driver.cpp b/src/components/articulationPoints_driver.cpp index a6ed877cac..649891eceb 100644 --- a/src/components/articulationPoints_driver.cpp +++ b/src/components/articulationPoints_driver.cpp @@ -77,7 +77,7 @@ pgr_do_articulationPoints( } hint = nullptr; - pgrouting::UndirectedGraph undigraph(false); + pgrouting::UndirectedGraph undigraph; undigraph.insert_edges(edges); auto results(pgrouting::algorithms::articulationPoints(undigraph)); diff --git a/src/components/biconnectedComponents_driver.cpp b/src/components/biconnectedComponents_driver.cpp index 117d2d7e3c..ab18531c84 100644 --- a/src/components/biconnectedComponents_driver.cpp +++ b/src/components/biconnectedComponents_driver.cpp @@ -78,7 +78,7 @@ pgr_do_biconnectedComponents( } hint = nullptr; - pgrouting::UndirectedGraph undigraph(false); + pgrouting::UndirectedGraph undigraph; undigraph.insert_edges(edges); auto results(pgrouting::algorithms::biconnectedComponents(undigraph)); diff --git a/src/components/bridges_driver.cpp b/src/components/bridges_driver.cpp index 1538e8f808..07660042ca 100644 --- a/src/components/bridges_driver.cpp +++ b/src/components/bridges_driver.cpp @@ -76,7 +76,7 @@ pgr_do_bridges( } hint = nullptr; - pgrouting::UndirectedGraph undigraph(false); + pgrouting::UndirectedGraph undigraph; undigraph.insert_edges(edges); auto results = pgrouting::algorithms::bridges(undigraph); diff --git a/src/components/connectedComponents_driver.cpp b/src/components/connectedComponents_driver.cpp index 79d5623857..ac0590bbb9 100644 --- a/src/components/connectedComponents_driver.cpp +++ b/src/components/connectedComponents_driver.cpp @@ -77,7 +77,7 @@ pgr_do_connectedComponents( } hint = nullptr; - pgrouting::UndirectedGraph undigraph(false); + pgrouting::UndirectedGraph undigraph; undigraph.insert_edges(edges); auto results(pgrouting::algorithms::pgr_connectedComponents(undigraph)); diff --git a/src/components/makeConnected_driver.cpp b/src/components/makeConnected_driver.cpp index 27712ef043..0a103b9f57 100644 --- a/src/components/makeConnected_driver.cpp +++ b/src/components/makeConnected_driver.cpp @@ -79,7 +79,7 @@ pgr_do_makeConnected( } hint = nullptr; - pgrouting::UndirectedGraph undigraph(false); + pgrouting::UndirectedGraph undigraph; undigraph.insert_edges(edges); pgrouting::functions::Pgr_makeConnected fn_makeConnected; results = fn_makeConnected.makeConnected(undigraph); diff --git a/src/components/strongComponents_driver.cpp b/src/components/strongComponents_driver.cpp index 7e42dd83c0..c88e8a433a 100644 --- a/src/components/strongComponents_driver.cpp +++ b/src/components/strongComponents_driver.cpp @@ -78,7 +78,7 @@ pgr_do_strongComponents( } hint = nullptr; - pgrouting::DirectedGraph digraph(true); + pgrouting::DirectedGraph digraph; digraph.insert_edges(edges); auto results(pgrouting::algorithms::strongComponents(digraph)); From 81cab862acb3d746bf25f12ad86b561a5cdebc81 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 10:23:18 -0600 Subject: [PATCH 163/428] (dagShortestPath) Adjusting code to pgr_base_graph_changes --- src/dagShortestPath/dagShortestPath_driver.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dagShortestPath/dagShortestPath_driver.cpp b/src/dagShortestPath/dagShortestPath_driver.cpp index 235d34fc35..a71700e08c 100644 --- a/src/dagShortestPath/dagShortestPath_driver.cpp +++ b/src/dagShortestPath/dagShortestPath_driver.cpp @@ -119,11 +119,11 @@ pgr_do_dagShortestPath( std::deque paths; if (directed) { - pgrouting::DirectedGraph graph(directed); + pgrouting::DirectedGraph graph; graph.insert_edges(edges); paths = pgr_dagShortestPath(graph, combinations, only_cost); } else { - pgrouting::UndirectedGraph graph(directed); + pgrouting::UndirectedGraph graph; graph.insert_edges(edges); paths = pgr_dagShortestPath(graph, combinations, only_cost); } From 6beb2da9a7debf06d8091e8dc0a4e97deb76c9c1 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 10:23:18 -0600 Subject: [PATCH 164/428] (dijkstra) Adjusting code to pgr_base_graph_changes --- src/dijkstra/dijkstraVia_driver.cpp | 4 ++-- src/dijkstra/dijkstra_driver.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dijkstra/dijkstraVia_driver.cpp b/src/dijkstra/dijkstraVia_driver.cpp index 636e29bb6e..e73f6e3556 100644 --- a/src/dijkstra/dijkstraVia_driver.cpp +++ b/src/dijkstra/dijkstraVia_driver.cpp @@ -136,7 +136,7 @@ pgr_do_dijkstraVia( std::dequepaths; if (directed) { - pgrouting::DirectedGraph digraph(directed); + pgrouting::DirectedGraph digraph; digraph.insert_edges(edges); pgrouting::pgr_dijkstraVia( digraph, @@ -146,7 +146,7 @@ pgr_do_dijkstraVia( U_turn_on_edge, log); } else { - pgrouting::UndirectedGraph undigraph(directed); + pgrouting::UndirectedGraph undigraph; undigraph.insert_edges(edges); pgrouting::pgr_dijkstraVia( undigraph, diff --git a/src/dijkstra/dijkstra_driver.cpp b/src/dijkstra/dijkstra_driver.cpp index cf2ff256eb..6f294173f7 100644 --- a/src/dijkstra/dijkstra_driver.cpp +++ b/src/dijkstra/dijkstra_driver.cpp @@ -165,11 +165,11 @@ pgr_do_dijkstra( std::dequepaths; if (directed) { - pgrouting::DirectedGraph graph(directed); + pgrouting::DirectedGraph graph; graph.insert_edges(edges); paths = pgrouting::algorithms::dijkstra(graph, combinations, only_cost, n); } else { - pgrouting::UndirectedGraph graph(directed); + pgrouting::UndirectedGraph graph; graph.insert_edges(edges); paths = pgrouting::algorithms::dijkstra(graph, combinations, only_cost, n); } From 11013af524cb87495b2107e73e44149d756a18e0 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 10:23:18 -0600 Subject: [PATCH 165/428] (dominator) Adjusting code to pgr_base_graph_changes --- src/dominator/lengauerTarjanDominatorTree_driver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dominator/lengauerTarjanDominatorTree_driver.cpp b/src/dominator/lengauerTarjanDominatorTree_driver.cpp index 1538a25ec2..4c4f9a11d0 100644 --- a/src/dominator/lengauerTarjanDominatorTree_driver.cpp +++ b/src/dominator/lengauerTarjanDominatorTree_driver.cpp @@ -82,7 +82,7 @@ pgr_do_LTDTree( std::string logstr; - pgrouting::DirectedGraph digraph(true); + pgrouting::DirectedGraph digraph; digraph.insert_edges(edges); std::vector results; pgrouting::functions::Pgr_LTDTree fn_LTDTree; From 904a51dbe0dffeba6ce1744afb441692a5b45196 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 10:23:18 -0600 Subject: [PATCH 166/428] (driving_distance) Adjusting code to pgr_base_graph_changes --- src/driving_distance/drivedist_driver.cpp | 4 ++-- src/driving_distance/withPoints_dd_driver.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/driving_distance/drivedist_driver.cpp b/src/driving_distance/drivedist_driver.cpp index c34728880a..b6fa1b4521 100644 --- a/src/driving_distance/drivedist_driver.cpp +++ b/src/driving_distance/drivedist_driver.cpp @@ -90,11 +90,11 @@ pgr_do_drivingDistance( std::vector> depths; if (directed) { - pgrouting::DirectedGraph digraph(directed); + pgrouting::DirectedGraph digraph; digraph.insert_edges(edges); paths = drivingDistance(digraph, roots, distance, equiCostFlag, depths, true); } else { - pgrouting::UndirectedGraph undigraph(directed); + pgrouting::UndirectedGraph undigraph; undigraph.insert_edges(edges); paths = drivingDistance(undigraph, roots, distance, equiCostFlag, depths, true); } diff --git a/src/driving_distance/withPoints_dd_driver.cpp b/src/driving_distance/withPoints_dd_driver.cpp index dc68f8689c..d8101d738f 100644 --- a/src/driving_distance/withPoints_dd_driver.cpp +++ b/src/driving_distance/withPoints_dd_driver.cpp @@ -125,12 +125,12 @@ pgr_do_withPointsDD( std::vector> depths; if (directed) { - pgrouting::DirectedGraph digraph(directed); + pgrouting::DirectedGraph digraph; digraph.insert_edges(edges); digraph.insert_edges(pg_graph.new_edges()); paths = drivingDistance(digraph, roots, distance, equiCost, depths, details); } else { - pgrouting::UndirectedGraph undigraph(directed); + pgrouting::UndirectedGraph undigraph; undigraph.insert_edges(edges); undigraph.insert_edges(pg_graph.new_edges()); paths = drivingDistance(undigraph, roots, distance, equiCost, depths, details); From 1459e7d90b304da9e883804a7483b8a63e5b4637 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 10:23:18 -0600 Subject: [PATCH 167/428] (ksp) Adjusting code to pgr_base_graph_changes --- src/ksp/ksp_driver.cpp | 4 ++-- src/ksp/turnRestrictedPath_driver.cpp | 4 ++-- src/ksp/withPoints_ksp_driver.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ksp/ksp_driver.cpp b/src/ksp/ksp_driver.cpp index 63cd97539c..9376cf311d 100644 --- a/src/ksp/ksp_driver.cpp +++ b/src/ksp/ksp_driver.cpp @@ -110,11 +110,11 @@ void pgr_do_ksp( std::dequepaths; if (directed) { - pgrouting::DirectedGraph graph(directed); + pgrouting::DirectedGraph graph; graph.insert_edges(edges); paths = pgrouting::algorithms::Yen(graph, combinations, k, heap_paths); } else { - pgrouting::UndirectedGraph graph(directed); + pgrouting::UndirectedGraph graph; graph.insert_edges(edges); paths = pgrouting::algorithms::Yen(graph, combinations, k, heap_paths); } diff --git a/src/ksp/turnRestrictedPath_driver.cpp b/src/ksp/turnRestrictedPath_driver.cpp index 8d64c4aa68..ef52b11dc4 100644 --- a/src/ksp/turnRestrictedPath_driver.cpp +++ b/src/ksp/turnRestrictedPath_driver.cpp @@ -145,7 +145,7 @@ pgr_do_turnRestrictedPath( std::string logstr; if (directed) { log << "Working with directed Graph\n"; - pgrouting::DirectedGraph digraph(directed); + pgrouting::DirectedGraph digraph; Pgr_turnRestrictedPath < pgrouting::DirectedGraph > fn_TRSP; digraph.insert_edges(edges); log << digraph; @@ -162,7 +162,7 @@ pgr_do_turnRestrictedPath( strict); } else { log << "TODO Working with Undirected Graph\n"; - pgrouting::UndirectedGraph undigraph(directed); + pgrouting::UndirectedGraph undigraph; Pgr_turnRestrictedPath < pgrouting::UndirectedGraph > fn_TRSP; undigraph.insert_edges(edges); paths = pgr_dijkstraTR(undigraph, diff --git a/src/ksp/withPoints_ksp_driver.cpp b/src/ksp/withPoints_ksp_driver.cpp index 1943312f1d..180b3fdf4e 100644 --- a/src/ksp/withPoints_ksp_driver.cpp +++ b/src/ksp/withPoints_ksp_driver.cpp @@ -137,13 +137,13 @@ pgr_do_withPointsKsp( std::deque paths; if (directed) { - pgrouting::DirectedGraph digraph(directed); + pgrouting::DirectedGraph digraph; digraph.insert_edges(edges); digraph.insert_edges(pg_graph.new_edges()); paths = pgrouting::algorithms::Yen(digraph, combinations, k, heap_paths); } else { - pgrouting::UndirectedGraph undigraph(directed); + pgrouting::UndirectedGraph undigraph; undigraph.insert_edges(edges); undigraph.insert_edges(pg_graph.new_edges()); From 70887bc6e6f6b024ad12fa944b245932f96cc3cc Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 10:23:18 -0600 Subject: [PATCH 168/428] (mincut) Adjusting code to pgr_base_graph_changes --- src/mincut/stoerWagner_driver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mincut/stoerWagner_driver.cpp b/src/mincut/stoerWagner_driver.cpp index df66e189ed..e27120b08e 100644 --- a/src/mincut/stoerWagner_driver.cpp +++ b/src/mincut/stoerWagner_driver.cpp @@ -87,7 +87,7 @@ pgr_do_stoerWagner( std::vector results; - pgrouting::UndirectedGraph undigraph(false); + pgrouting::UndirectedGraph undigraph; undigraph.insert_edges(edges); results = pgr_stoerWagner( undigraph); From dbbf2170e319b371d97a74d72d54faad4fa75fb9 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 10:23:18 -0600 Subject: [PATCH 169/428] (ordering) Adjusting code to pgr_base_graph_changes --- src/ordering/cuthillMckeeOrdering_driver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ordering/cuthillMckeeOrdering_driver.cpp b/src/ordering/cuthillMckeeOrdering_driver.cpp index d74331a8b6..d36480cf9a 100644 --- a/src/ordering/cuthillMckeeOrdering_driver.cpp +++ b/src/ordering/cuthillMckeeOrdering_driver.cpp @@ -104,7 +104,7 @@ void pgr_do_cuthillMckeeOrdering( hint = nullptr; std::vectorresults; - pgrouting::UndirectedGraph undigraph(false); + pgrouting::UndirectedGraph undigraph; undigraph.insert_edges(edges); results = cuthillMckeeOrdering(undigraph); From 242888929f507a3c94f987ddcda7092828aee3a0 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 10:23:18 -0600 Subject: [PATCH 170/428] (planar) Adjusting code to pgr_base_graph_changes --- src/planar/isPlanar_driver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/planar/isPlanar_driver.cpp b/src/planar/isPlanar_driver.cpp index 504608e1a9..d1401570d6 100644 --- a/src/planar/isPlanar_driver.cpp +++ b/src/planar/isPlanar_driver.cpp @@ -73,7 +73,7 @@ pgr_do_isPlanar( } hint = nullptr; - pgrouting::UndirectedGraph undigraph(false); + pgrouting::UndirectedGraph undigraph; undigraph.insert_edges(edges); pgrouting::functions::Pgr_boyerMyrvold fn_isPlanar; result = fn_isPlanar.isPlanar(undigraph); From b424464e45d2002f1b72c376e859f125c919683c Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 10:23:18 -0600 Subject: [PATCH 171/428] (spanningTree) Adjusting code to pgr_base_graph_changes --- src/spanningTree/kruskal_driver.cpp | 2 +- src/spanningTree/prim_driver.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/spanningTree/kruskal_driver.cpp b/src/spanningTree/kruskal_driver.cpp index 887027d815..9ca1691934 100644 --- a/src/spanningTree/kruskal_driver.cpp +++ b/src/spanningTree/kruskal_driver.cpp @@ -84,7 +84,7 @@ pgr_do_kruskal( std::vector results; - pgrouting::UndirectedGraph undigraph(false); + pgrouting::UndirectedGraph undigraph; undigraph.insert_edges(edges); pgrouting::functions::Pgr_kruskal kruskal; diff --git a/src/spanningTree/prim_driver.cpp b/src/spanningTree/prim_driver.cpp index a25cbc07e9..4a7eb2f12d 100644 --- a/src/spanningTree/prim_driver.cpp +++ b/src/spanningTree/prim_driver.cpp @@ -86,7 +86,7 @@ pgr_do_prim( std::vector results; - pgrouting::UndirectedGraph undigraph(false); + pgrouting::UndirectedGraph undigraph; undigraph.insert_min_edges_no_parallel(edges); pgrouting::functions::Pgr_prim prim; From 47c549e710a3f38695454f2db532954fb8b4ffa8 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 10:23:18 -0600 Subject: [PATCH 172/428] (topologicalSort) Adjusting code to pgr_base_graph_changes --- src/topologicalSort/topologicalSort_driver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/topologicalSort/topologicalSort_driver.cpp b/src/topologicalSort/topologicalSort_driver.cpp index cf1aa75acc..8cf0b7013d 100644 --- a/src/topologicalSort/topologicalSort_driver.cpp +++ b/src/topologicalSort/topologicalSort_driver.cpp @@ -91,7 +91,7 @@ pgr_do_topologicalSort( hint = nullptr; std::vector results; - pgrouting::DirectedGraph digraph(true); + pgrouting::DirectedGraph digraph; digraph.insert_edges(edges); results = pgr_topologicalSort( digraph); From 11f0a8bf85485d7529dc45584d09c81bcef2e105 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 10:23:18 -0600 Subject: [PATCH 173/428] (transitiveClosure) Adjusting code to pgr_base_graph_changes --- src/transitiveClosure/transitiveClosure_driver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/transitiveClosure/transitiveClosure_driver.cpp b/src/transitiveClosure/transitiveClosure_driver.cpp index fa032438d3..13a13ba072 100644 --- a/src/transitiveClosure/transitiveClosure_driver.cpp +++ b/src/transitiveClosure/transitiveClosure_driver.cpp @@ -126,7 +126,7 @@ pgr_do_transitiveClosure( } hint = nullptr; - pgrouting::DirectedGraph digraph(true); + pgrouting::DirectedGraph digraph; digraph.insert_edges(edges); get_postgres_result( From e086ab9da77162ae3a0a0e8d7ffe4843806de529 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 10:23:18 -0600 Subject: [PATCH 174/428] (traversal) Adjusting code to pgr_base_graph_changes --- src/traversal/depthFirstSearch_driver.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/traversal/depthFirstSearch_driver.cpp b/src/traversal/depthFirstSearch_driver.cpp index 9cd3174150..8068f2084e 100644 --- a/src/traversal/depthFirstSearch_driver.cpp +++ b/src/traversal/depthFirstSearch_driver.cpp @@ -123,7 +123,7 @@ pgr_do_depthFirstSearch( *log_msg = pgr_msg(edges_sql); } else { if (directed) { - pgrouting::DirectedGraph digraph(directed); + pgrouting::DirectedGraph digraph; digraph.insert_edges(edges); results = pgr_depthFirstSearch( @@ -132,7 +132,7 @@ pgr_do_depthFirstSearch( directed, max_depth); } else { - pgrouting::UndirectedGraph undigraph(directed); + pgrouting::UndirectedGraph undigraph; undigraph.insert_edges(edges); results = pgr_depthFirstSearch( From 59c257a2fcea107f373d529bef4e490c8a6b380b Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 10:23:18 -0600 Subject: [PATCH 175/428] (trsp) Adjusting code to pgr_base_graph_changes --- src/trsp/trspVia_driver.cpp | 4 ++-- src/trsp/trspVia_withPoints_driver.cpp | 4 ++-- src/trsp/trsp_driver.cpp | 4 ++-- src/trsp/trsp_withPoints_driver.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/trsp/trspVia_driver.cpp b/src/trsp/trspVia_driver.cpp index 9c42334fb5..8f9043e655 100644 --- a/src/trsp/trspVia_driver.cpp +++ b/src/trsp/trspVia_driver.cpp @@ -180,7 +180,7 @@ pgr_do_trspVia( std::deque paths; if (directed) { - pgrouting::DirectedGraph digraph(directed); + pgrouting::DirectedGraph digraph; digraph.insert_edges(edges); pgrouting::pgr_dijkstraVia( digraph, @@ -190,7 +190,7 @@ pgr_do_trspVia( U_turn_on_edge, log); } else { - pgrouting::UndirectedGraph undigraph(directed); + pgrouting::UndirectedGraph undigraph; undigraph.insert_edges(edges); pgrouting::pgr_dijkstraVia( undigraph, diff --git a/src/trsp/trspVia_withPoints_driver.cpp b/src/trsp/trspVia_withPoints_driver.cpp index f2553ad3c0..1dd7b70240 100644 --- a/src/trsp/trspVia_withPoints_driver.cpp +++ b/src/trsp/trspVia_withPoints_driver.cpp @@ -207,7 +207,7 @@ pgr_do_trspVia_withPoints( std::deque paths; if (directed) { - pgrouting::DirectedGraph digraph(vertices, directed); + pgrouting::DirectedGraph digraph; digraph.insert_edges(edges); digraph.insert_edges(pg_graph.new_edges()); pgrouting::pgr_dijkstraVia( @@ -218,7 +218,7 @@ pgr_do_trspVia_withPoints( U_turn_on_edge, log); } else { - pgrouting::UndirectedGraph undigraph(vertices, directed); + pgrouting::UndirectedGraph undigraph; undigraph.insert_edges(edges); undigraph.insert_edges(pg_graph.new_edges()); pgrouting::pgr_dijkstraVia( diff --git a/src/trsp/trsp_driver.cpp b/src/trsp/trsp_driver.cpp index bcb7f0fcdb..6f79f480c4 100644 --- a/src/trsp/trsp_driver.cpp +++ b/src/trsp/trsp_driver.cpp @@ -151,14 +151,14 @@ pgr_do_trsp( std::deque paths; if (directed) { - pgrouting::DirectedGraph digraph(directed); + pgrouting::DirectedGraph digraph; digraph.insert_edges(edges); paths = pgr_dijkstra( digraph, combinations); } else { - pgrouting::UndirectedGraph undigraph(directed); + pgrouting::UndirectedGraph undigraph; undigraph.insert_edges(edges); paths = pgr_dijkstra( diff --git a/src/trsp/trsp_withPoints_driver.cpp b/src/trsp/trsp_withPoints_driver.cpp index 4dabdfadd9..cec7757748 100644 --- a/src/trsp/trsp_withPoints_driver.cpp +++ b/src/trsp/trsp_withPoints_driver.cpp @@ -165,7 +165,7 @@ pgr_do_trsp_withPoints( std::deque paths; if (directed) { - pgrouting::DirectedGraph digraph(vertices, directed); + pgrouting::DirectedGraph digraph; digraph.insert_edges(edges); digraph.insert_edges(pg_graph.new_edges()); @@ -174,7 +174,7 @@ pgr_do_trsp_withPoints( combinations, false, (std::numeric_limits::max)()); } else { - pgrouting::UndirectedGraph undigraph(vertices, directed); + pgrouting::UndirectedGraph undigraph; undigraph.insert_edges(edges); undigraph.insert_edges(pg_graph.new_edges()); From 840cdb610d33f663d8e1d7d92f9b2c60dff598cf Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 10:23:18 -0600 Subject: [PATCH 176/428] (withPoints) Adjusting code to pgr_base_graph_changes --- src/withPoints/withPointsVia_driver.cpp | 4 ++-- src/withPoints/withPoints_driver.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/withPoints/withPointsVia_driver.cpp b/src/withPoints/withPointsVia_driver.cpp index 3107441008..b02c33c82c 100644 --- a/src/withPoints/withPointsVia_driver.cpp +++ b/src/withPoints/withPointsVia_driver.cpp @@ -169,7 +169,7 @@ pgr_do_withPointsVia( std::deque paths; if (directed) { - pgrouting::DirectedGraph digraph(vertices, directed); + pgrouting::DirectedGraph digraph(vertices); digraph.insert_edges(edges); digraph.insert_edges(pg_graph.new_edges()); pgrouting::pgr_dijkstraVia( @@ -180,7 +180,7 @@ pgr_do_withPointsVia( U_turn_on_edge, log); } else { - pgrouting::UndirectedGraph undigraph(vertices, directed); + pgrouting::UndirectedGraph undigraph(vertices); undigraph.insert_edges(edges); undigraph.insert_edges(pg_graph.new_edges()); pgrouting::pgr_dijkstraVia( diff --git a/src/withPoints/withPoints_driver.cpp b/src/withPoints/withPoints_driver.cpp index 20e79c5878..46774782d8 100644 --- a/src/withPoints/withPoints_driver.cpp +++ b/src/withPoints/withPoints_driver.cpp @@ -164,7 +164,7 @@ pgr_do_withPoints( std::deque paths; if (directed) { - pgrouting::DirectedGraph digraph(vertices, directed); + pgrouting::DirectedGraph digraph(vertices); digraph.insert_edges(edges); digraph.insert_edges(pg_graph.new_edges()); @@ -173,7 +173,7 @@ pgr_do_withPoints( combinations, only_cost, normal); } else { - pgrouting::UndirectedGraph undigraph(vertices, directed); + pgrouting::UndirectedGraph undigraph(vertices); undigraph.insert_edges(edges); undigraph.insert_edges(pg_graph.new_edges()); paths = pgr_dijkstra( From c8c3502b456a028e2a4c32aa33801e299ae5eafc Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 10:33:02 -0600 Subject: [PATCH 177/428] (bellman_ford) Adjusting code to pgr_base_graph_changes --- src/bellman_ford/bellman_ford_driver.cpp | 4 ++-- src/bellman_ford/edwardMoore_driver.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bellman_ford/bellman_ford_driver.cpp b/src/bellman_ford/bellman_ford_driver.cpp index 4775089e48..2e31ebc781 100644 --- a/src/bellman_ford/bellman_ford_driver.cpp +++ b/src/bellman_ford/bellman_ford_driver.cpp @@ -151,11 +151,11 @@ pgr_do_bellman_ford( std::deque paths; if (directed) { - pgrouting::DirectedGraph digraph(directed); + pgrouting::DirectedGraph digraph; digraph.insert_edges(edges); paths = bellman_ford(digraph, combinations, only_cost); } else { - pgrouting::UndirectedGraph undigraph(directed); + pgrouting::UndirectedGraph undigraph; undigraph.insert_edges(edges); paths = bellman_ford(undigraph, combinations, only_cost); } diff --git a/src/bellman_ford/edwardMoore_driver.cpp b/src/bellman_ford/edwardMoore_driver.cpp index 3b8e55e8c9..196c4c6fa5 100644 --- a/src/bellman_ford/edwardMoore_driver.cpp +++ b/src/bellman_ford/edwardMoore_driver.cpp @@ -146,11 +146,11 @@ pgr_do_edwardMoore( std::deque paths; if (directed) { - pgrouting::DirectedGraph digraph(directed); + pgrouting::DirectedGraph digraph; digraph.insert_edges(edges); paths = edwardMoore(digraph, combinations); } else { - pgrouting::UndirectedGraph undigraph(directed); + pgrouting::UndirectedGraph undigraph; undigraph.insert_edges(edges); paths = edwardMoore(undigraph, combinations); } From fa60d0ba7660c9fdfb6d19f92a6d1718882fe608 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 27 Feb 2024 13:20:50 -0600 Subject: [PATCH 178/428] Fixing clang tidy issue --- include/cpp_common/basic_vertex.hpp | 1 - 1 file changed, 1 deletion(-) diff --git a/include/cpp_common/basic_vertex.hpp b/include/cpp_common/basic_vertex.hpp index 654d251722..e4300311e2 100644 --- a/include/cpp_common/basic_vertex.hpp +++ b/include/cpp_common/basic_vertex.hpp @@ -63,7 +63,6 @@ class Basic_vertex { friend std::ostream& operator<<(std::ostream& log, const Basic_vertex &v); public: int64_t id; - size_t vertex_index; }; size_t check_vertices(std::vector < Basic_vertex > vertices); From 14e04b21d97eae3a56b58a44b92c3f3f6c0b8731 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 23 Apr 2024 09:22:59 -0600 Subject: [PATCH 179/428] (linegraph) flag not really used --- src/lineGraph/lineGraph_driver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lineGraph/lineGraph_driver.cpp b/src/lineGraph/lineGraph_driver.cpp index 792b0a4be4..4d864e1e5e 100644 --- a/src/lineGraph/lineGraph_driver.cpp +++ b/src/lineGraph/lineGraph_driver.cpp @@ -64,7 +64,7 @@ void pgr_do_lineGraph( char *edges_sql, - bool directed, + bool, Edge_rt **return_tuples, size_t *return_count, char ** log_msg, From 83608a3891022db9f5c130ee1166e1ee808b5aae Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 7 May 2024 14:55:49 -0600 Subject: [PATCH 180/428] Fixing codacy error --- doc/lineGraph/pgr_lineGraph.rst | 3 ++- doc/src/release_notes.rst | 6 +++--- include/cpp_common/pgr_base_graph.hpp | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/lineGraph/pgr_lineGraph.rst b/doc/lineGraph/pgr_lineGraph.rst index 5a3ed71270..34e98837b9 100644 --- a/doc/lineGraph/pgr_lineGraph.rst +++ b/doc/lineGraph/pgr_lineGraph.rst @@ -40,6 +40,7 @@ Given a graph G, its line graph L(G) is a graph such that: - Each vertex of L(G) represents an edge of G - Two vertices of L(G) are adjacent if and only if their corresponding edges share a common endpoint in G. +- Currently works for undirected graph. .. index:: single: lineGraph - Experimental on v2.5 @@ -55,7 +56,7 @@ Signatures | Returns set of |result-lineg| | OR EMPTY SET -:Example: For a **directed** graph +:Example: For an **undirected** graph .. literalinclude:: doc-pgr_lineGraph.queries :start-after: -- q1 diff --git a/doc/src/release_notes.rst b/doc/src/release_notes.rst index ea94ef5bb1..aafc68d981 100644 --- a/doc/src/release_notes.rst +++ b/doc/src/release_notes.rst @@ -64,11 +64,11 @@ milestone for 3.7.0 .. rubric:: Code enhancement -* `#2599 `__ Driving distance +* `#2599 `__ Driving distance cleanup -* `#2607 `__ Read postgresql +* `#2607 `__ Read postgresql data on C++ -* `#2614 `__ Clang tidy does +* `#2614 `__ Clang tidy does not work pgRouting 3.6 diff --git a/include/cpp_common/pgr_base_graph.hpp b/include/cpp_common/pgr_base_graph.hpp index cf852a9b8d..bfad93febc 100644 --- a/include/cpp_common/pgr_base_graph.hpp +++ b/include/cpp_common/pgr_base_graph.hpp @@ -265,7 +265,7 @@ class Pgr_base_graph { - inserts the vertices - The vertices must be checked (if necessary) before calling the constructor */ - Pgr_base_graph( + explicit Pgr_base_graph( const std::vector &vertices) : graph(vertices.size()), m_is_directed(t_directed), From 6afe2ca1c6c9404da4b0eda5e8836d55c6d8ac30 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 7 May 2024 14:57:38 -0600 Subject: [PATCH 181/428] fixing NEWS.md --- NEWS.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NEWS.md b/NEWS.md index f97b3ae1c4..1e5a4ec621 100644 --- a/NEWS.md +++ b/NEWS.md @@ -35,11 +35,11 @@ milestone for 3.7.0 **Code enhancement** -* [#2599](https://github.com/pgRouting/pgrouting/pull/2599) Driving distance +* [#2599](https://github.com/pgRouting/pgrouting/pull/2599) Driving distance cleanup -* [#2607](https://github.com/pgRouting/pgrouting/pull/2607) Read postgresql +* [#2607](https://github.com/pgRouting/pgrouting/pull/2607) Read postgresql data on C++ -* [#2614](https://github.com/pgRouting/pgrouting/pull/2614) Clang tidy does +* [#2614](https://github.com/pgRouting/pgrouting/pull/2614) Clang tidy does not work ## pgRouting 3.6 From 792c9fbdf9dcb6eaf0f2ecaea2be47b7a3161a94 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 21:32:08 +0000 Subject: [PATCH 182/428] Update locale: commit 6afe2ca1c6 --- locale/en/LC_MESSAGES/pgrouting_doc_strings.po | 15 +++++++++------ locale/pot/pgrouting_doc_strings.pot | 13 ++++++++----- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po index d9d37c326e..534c127aad 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-04-28 19:05-0600\n" +"POT-Creation-Date: 2024-05-07 21:31+0000\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.12.1\n" +"Generated-By: Babel 2.15.0\n" msgid "BFS - Category" msgstr "" @@ -4433,17 +4433,17 @@ msgid "Code enhancement" msgstr "" msgid "" -"`#2599 `__ Driving " +"`#2599 `__ Driving " "distance cleanup" msgstr "" msgid "" -"`#2607 `__ Read " +"`#2607 `__ Read " "postgresql data on C++" msgstr "" msgid "" -"`#2614 `__ Clang tidy " +"`#2614 `__ Clang tidy " "does not work" msgstr "" @@ -12537,13 +12537,16 @@ msgid "" "edges share a common endpoint in G." msgstr "" +msgid "Currently works for undirected graph." +msgstr "" + msgid "pgr_lineGraph(`Edges SQL`_, [``directed``])" msgstr "" msgid "Returns set of |result-lineg|" msgstr "" -msgid "For a **directed** graph" +msgid "For an **undirected** graph" msgstr "" msgid "Gives a local identifier for the edge" diff --git a/locale/pot/pgrouting_doc_strings.pot b/locale/pot/pgrouting_doc_strings.pot index a333b9f88c..d0cde1910d 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-04-28 19:05-0600\n" +"POT-Creation-Date: 2024-05-07 21:31+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3973,13 +3973,13 @@ msgstr "" msgid "Code enhancement" msgstr "" -msgid "`#2599 `__ Driving distance cleanup" +msgid "`#2599 `__ Driving distance cleanup" msgstr "" -msgid "`#2607 `__ Read postgresql data on C++" +msgid "`#2607 `__ Read postgresql data on C++" msgstr "" -msgid "`#2614 `__ Clang tidy does not work" +msgid "`#2614 `__ Clang tidy does not work" msgstr "" msgid "All releases" @@ -10762,13 +10762,16 @@ msgstr "" msgid "Two vertices of L(G) are adjacent if and only if their corresponding edges share a common endpoint in G." msgstr "" +msgid "Currently works for undirected graph." +msgstr "" + msgid "pgr_lineGraph(`Edges SQL`_, [``directed``])" msgstr "" msgid "Returns set of |result-lineg|" msgstr "" -msgid "For a **directed** graph" +msgid "For an **undirected** graph" msgstr "" msgid "Gives a local identifier for the edge" From 996e7ca7619814fd40bdb793ff8f3c804d3a116f Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 26 Feb 2024 13:07:14 -0600 Subject: [PATCH 183/428] (lineGraph)(pgtap) tests from wiki and mathworld --- .../lineGraph/lineGraph/edge_cases/mathw_1.pg | 66 ++++++++++ .../lineGraph/lineGraph/edge_cases/mathw_2.pg | 113 ++++++++++++++++++ .../lineGraph/lineGraph/edge_cases/wiki_1.pg | 68 +++++++++++ 3 files changed, 247 insertions(+) create mode 100644 pgtap/lineGraph/lineGraph/edge_cases/mathw_1.pg create mode 100644 pgtap/lineGraph/lineGraph/edge_cases/mathw_2.pg create mode 100644 pgtap/lineGraph/lineGraph/edge_cases/wiki_1.pg diff --git a/pgtap/lineGraph/lineGraph/edge_cases/mathw_1.pg b/pgtap/lineGraph/lineGraph/edge_cases/mathw_1.pg new file mode 100644 index 0000000000..3cbabc000c --- /dev/null +++ b/pgtap/lineGraph/lineGraph/edge_cases/mathw_1.pg @@ -0,0 +1,66 @@ +/*PGR-GNU***************************************************************** + +Copyright (c) 2024 pgRouting developers +Mail: project@pgrouting.org + +------ +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + ********************************************************************PGR-GNU*/ +BEGIN; + +SELECT plan(3); + +/* example from https://mathworld.wolfram.com/LineGraph.html */ +CREATE TABLE mathw_1 ( + id BIGINT, + source BIGINT, + target BIGINT, + cost FLOAT, + geom geometry +); + +INSERT INTO mathw_1 (id, source, target, cost, geom) VALUES + (102, 10, 20 , 1, ST_MakeLine(ST_POINT(0, 2), ST_POINT( 2, 2))), + (104, 10, 40 , 1, ST_MakeLine(ST_POINT(0, 2), ST_POINT( 0, 0))), + (203, 20, 30 , 1, ST_MakeLine(ST_POINT(2, 2), ST_POINT( 2, 0))), + (304, 30, 40 , 1, ST_MakeLine(ST_POINT(2, 0), ST_POINT( 0, 0))), + (204, 20, 40 , 1, ST_MakeLine(ST_POINT(2, 2), ST_POINT( 0, 0))); + +PREPARE mathw_lg_1 AS +SELECT source, target +FROM pgr_lineGraph('SELECT id, source, target, cost FROM mathw_1', false); + +SELECT lives_ok($$ + SELECT * + FROM pgr_lineGraph('SELECT id, source, target, cost FROM mathw_1', false); + $$, 'Expected to live the main query'); + +SELECT lives_ok('mathw_lg_1', 'Expected to live the prepared statatment'); + +PREPARE expected_mathw_lg_1 AS +SELECT source, target +FROM (VALUES + (1, 102, 104, 1, -1), + (2, 102, 203, 1, -1), + (3, 102, 204, 1, -1), + (4, 104, 204, 1, -1), + (5, 104, 304, 1, -1), + (6, 203, 204, 1, -1), + (7, 203, 304, 1, -1), + (8, 304, 204, 1, -1)) +AS t(id, source, target, cost, reverse_cost); + +SELECT set_eq('mathw_lg_1', 'expected_mathw_lg_1'); + +SELECT finish(); +ROLLBACK; diff --git a/pgtap/lineGraph/lineGraph/edge_cases/mathw_2.pg b/pgtap/lineGraph/lineGraph/edge_cases/mathw_2.pg new file mode 100644 index 0000000000..fe5867bb57 --- /dev/null +++ b/pgtap/lineGraph/lineGraph/edge_cases/mathw_2.pg @@ -0,0 +1,113 @@ +/*PGR-GNU***************************************************************** + +Copyright (c) 2024 pgRouting developers +Mail: project@pgrouting.org + +------ +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + ********************************************************************PGR-GNU*/ +BEGIN; + +SELECT plan(6); + +/* example from https://mathworld.wolfram.com/LineGraph.html */ +CREATE TABLE mathw_2 ( + id BIGINT, + source BIGINT, + target BIGINT, + cost FLOAT, + reverse_cost FLOAT, + geom geometry +); + +INSERT INTO mathw_2 (id, source, target, cost, reverse_cost, geom) VALUES + (102, 10, 20 , 1, -1, ST_MakeLine(ST_POINT(0, 2), ST_POINT(2, 2))), + (104, 10, 40 , 1, -1, ST_MakeLine(ST_POINT(0, 2), ST_POINT(0, 0))), + (301, 30, 10 , 1, -1, ST_MakeLine(ST_POINT(2, 0), ST_POINT(0, 2))), + (203, 20, 30 , 1, 1, ST_MakeLine(ST_POINT(2, 2), ST_POINT(2, 0))), + (304, 30, 40 , 1, 1, ST_MakeLine(ST_POINT(0, 0), ST_POINT(2, 0))); + +PREPARE mathw_lg_2 AS +SELECT * +FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM mathw_2', true); + +SELECT lives_ok($$ + SELECT * + FROM pgr_lineGraph('SELECT id, source, target, cost FROM mathw_2', false); + $$, 'Expected to live the main query'); + +SELECT lives_ok('mathw_lg_2', 'Expected to live the prepared statatment'); + +PREPARE expected_mathw_lg_2 AS +SELECT id, source, target, cost, reverse_cost +FROM (VALUES + (1, 102, 203, 1, -1), + (2, 104, 304, 1, -1), + (3, 203, 301, 1, -1), + (4, 203, 304, 1, 1), + (5, 301, 102, 1, -1), + (6, 301, 104, 1, -1), + (7, 304, 301, 1, -1)) +AS t(id, source, target, cost, reverse_cost); + +SELECT set_eq('mathw_lg_2', 'expected_mathw_lg_2'); + +/* same example with expanded edges */ +CREATE TABLE mathw_3 ( + id BIGINT, + source BIGINT, + target BIGINT, + cost FLOAT, + reverse_cost FLOAT, + geom geometry +); + +INSERT INTO mathw_3 (id, source, target, cost, reverse_cost, geom) VALUES + (102, 10, 20 , 1, -1, ST_MakeLine(ST_POINT(0, 2), ST_POINT(2, 2))), + (104, 10, 40 , 1, -1, ST_MakeLine(ST_POINT(0, 2), ST_POINT(0, 0))), + (301, 30, 10 , 1, -1, ST_MakeLine(ST_POINT(2, 0), ST_POINT(0, 2))), + (203, 20, 30 , 1, -1, ST_MakeLine(ST_POINT(2, 2), ST_POINT(2, 0))), + (304, 30, 40 , 1, -1, ST_MakeLine(ST_POINT(2, 0), ST_POINT(0, 0))), + (302, 30, 20 , 1, -1, ST_MakeLine(ST_POINT(2, 0), ST_POINT(2, 2))), + (403, 40, 30 , 1, -1, ST_MakeLine(ST_POINT(0, 0), ST_POINT(2, 0))); + +PREPARE mathw_lg_3 AS +SELECT * +FROM pgr_lineGraph('SELECT id, source, target, cost FROM mathw_3', true); + +SELECT lives_ok($$ + SELECT * + FROM pgr_lineGraph('SELECT id, source, target, cost FROM mathw_3', false); + $$, 'Expected to live the main query'); + +SELECT lives_ok('mathw_lg_3', 'Expected to live the prepared statatment'); + +PREPARE expected_mathw_lg_3 AS +SELECT id, source, target, cost, reverse_cost +FROM (VALUES + (1, 102, 203, 1, -1), + (2, 104, 403, 1, -1), + (3, 203, 301, 1, -1), + (4, 203, 304, 1, -1), + (5, 301, 102, 1, -1), + (6, 301, 104, 1, -1), + (7, 302, 203, 1, 1), + (8, 304, 403, 1, 1), + (9, 403, 301, 1, -1), + (10, 403, 302, 1, -1)) +AS t(id, source, target, cost, reverse_cost); + +SELECT set_eq('mathw_lg_3', 'expected_mathw_lg_3'); + +SELECT finish(); +ROLLBACK; diff --git a/pgtap/lineGraph/lineGraph/edge_cases/wiki_1.pg b/pgtap/lineGraph/lineGraph/edge_cases/wiki_1.pg new file mode 100644 index 0000000000..853afb275a --- /dev/null +++ b/pgtap/lineGraph/lineGraph/edge_cases/wiki_1.pg @@ -0,0 +1,68 @@ +/*PGR-GNU***************************************************************** + +Copyright (c) 2024 pgRouting developers +Mail: project@pgrouting.org + +------ +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + ********************************************************************PGR-GNU*/ +BEGIN; + +SELECT plan(3); + +/* example from wikipedia */ +CREATE TABLE wiki_1 ( + id BIGINT, + source BIGINT, + target BIGINT, + cost FLOAT, + geom geometry +); + +INSERT INTO wiki_1 (id, source, target, cost, geom) VALUES + (405, 40, 50 , 1, ST_MakeLine(ST_POINT(0, 0), ST_POINT( 2, 0))), + (304, 30, 40 , 1, ST_MakeLine(ST_POINT(0, 0), ST_POINT( 1, 1))), + (104, 10, 40 , 1, ST_MakeLine(ST_POINT(0, 2), ST_POINT( 0, 0))), + (103, 10, 30 , 1, ST_MakeLine(ST_POINT(0, 2), ST_POINT( 1, 1))), + (205, 20, 50 , 1, ST_MakeLine(ST_POINT(2, 0), ST_POINT( 2, 2))), + (102, 10, 20 , 1, ST_MakeLine(ST_POINT(0, 2), ST_POINT( 2, 2))); + +PREPARE wiki_lg_1 AS +SELECT source, target +FROM pgr_lineGraph('SELECT id, source, target, cost FROM wiki_1', false); + +SELECT lives_ok($$ + SELECT * + FROM pgr_lineGraph('SELECT id, source, target, cost FROM wiki_1', false); + $$, 'Expected to live the main query'); + +SELECT lives_ok('wiki_lg_1', 'Expected to live the prepared statatment'); + +PREPARE expected_wiki_lg_1 AS +SELECT source, target +FROM (VALUES + (1, 103, 102, 1, -1), + (2, 104, 102, 1, -1), + (3, 104, 103, 1, -1), + (4, 205, 102, 1, -1), + (5, 304, 103, 1, -1), + (6, 304, 104, 1, -1), + (7, 405, 104, 1, -1), + (8, 405, 205, 1, -1), + (9, 405, 304, 1, -1)) +AS t(id, source, target, cost, reverse_cost); + +SELECT set_eq('wiki_lg_1', 'expected_wiki_lg_1'); + +SELECT finish(); +ROLLBACK; From 5acff54b2b399d04aa7ca5804d372e2f11907cf6 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 26 Feb 2024 13:08:18 -0600 Subject: [PATCH 184/428] (lineGraph)(pgtap) design test rewritten on pgtap --- docqueries/lineGraph/pgtap_design.result | 58 ------------- docqueries/lineGraph/pgtap_design.test.sql | 29 ------- docqueries/lineGraph/test.conf | 1 - .../lineGraph/edge_cases/edge_cases.pg | 85 +++++++++++++++++++ 4 files changed, 85 insertions(+), 88 deletions(-) delete mode 100644 docqueries/lineGraph/pgtap_design.result delete mode 100644 docqueries/lineGraph/pgtap_design.test.sql create mode 100644 pgtap/lineGraph/lineGraph/edge_cases/edge_cases.pg diff --git a/docqueries/lineGraph/pgtap_design.result b/docqueries/lineGraph/pgtap_design.result deleted file mode 100644 index 2f8d738698..0000000000 --- a/docqueries/lineGraph/pgtap_design.result +++ /dev/null @@ -1,58 +0,0 @@ -BEGIN; -BEGIN -SET client_min_messages TO NOTICE; -SET -/* -- one edge graph */ -SELECT * FROM pgr_lineGraph( - 'SELECT id, source, target, cost FROM edges WHERE id = 1' -); -NOTICE: Only vertices graph -HINT: 0: out_edges_of(5): 1=(5, 6) = 1 -1: out_edges_of(6): - - - seq | source | target | cost | reverse_cost ------+--------+--------+------+-------------- -(0 rows) - -/* -- two edge graphs */ -SELECT * FROM pgr_lineGraph($$ - SELECT -id AS id, target, source, reverse_cost AS cost FROM edges WHERE id = 1 - UNION - SELECT id, source, target, cost FROM edges WHERE id = 1 - $$ -); - seq | source | target | cost | reverse_cost ------+--------+--------+------+-------------- - 1 | 1 | -1 | 1 | 1 -(1 row) - -SELECT * FROM pgr_lineGraph($$ - SELECT id, target, source, reverse_cost AS cost FROM edges WHERE id = 1 - UNION - SELECT -id AS id, source, target, cost FROM edges WHERE id = 1 - $$ -); - seq | source | target | cost | reverse_cost ------+--------+--------+------+-------------- - 1 | 1 | -1 | 1 | 1 -(1 row) - -SELECT * FROM pgr_lineGraph( - 'SELECT id, source, target, cost, reverse_cost FROM edges WHERE id = 1' -); - seq | source | target | cost | reverse_cost ------+--------+--------+------+-------------- - 1 | -1 | 1 | 1 | 1 -(1 row) - -SELECT * FROM pgr_lineGraph( - 'SELECT id, source, target, cost, reverse_cost FROM edges WHERE id = 17' -); - seq | source | target | cost | reverse_cost ------+--------+--------+------+-------------- - 1 | -17 | 17 | 1 | 1 -(1 row) - -ROLLBACK; -ROLLBACK diff --git a/docqueries/lineGraph/pgtap_design.test.sql b/docqueries/lineGraph/pgtap_design.test.sql deleted file mode 100644 index 923163d590..0000000000 --- a/docqueries/lineGraph/pgtap_design.test.sql +++ /dev/null @@ -1,29 +0,0 @@ --- CopyRight(c) pgRouting developers --- Creative Commons Attribution-Share Alike 3.0 License : https://creativecommons.org/licenses/by-sa/3.0/ --- TODO move to pgtap - -/* -- one edge graph */ -SELECT * FROM pgr_lineGraph( - 'SELECT id, source, target, cost FROM edges WHERE id = 1' -); - -/* -- two edge graphs */ -SELECT * FROM pgr_lineGraph($$ - SELECT -id AS id, target, source, reverse_cost AS cost FROM edges WHERE id = 1 - UNION - SELECT id, source, target, cost FROM edges WHERE id = 1 - $$ -); -SELECT * FROM pgr_lineGraph($$ - SELECT id, target, source, reverse_cost AS cost FROM edges WHERE id = 1 - UNION - SELECT -id AS id, source, target, cost FROM edges WHERE id = 1 - $$ -); -SELECT * FROM pgr_lineGraph( - 'SELECT id, source, target, cost, reverse_cost FROM edges WHERE id = 1' -); -SELECT * FROM pgr_lineGraph( - 'SELECT id, source, target, cost, reverse_cost FROM edges WHERE id = 17' -); - diff --git a/docqueries/lineGraph/test.conf b/docqueries/lineGraph/test.conf index e587df4258..9a89f675e5 100644 --- a/docqueries/lineGraph/test.conf +++ b/docqueries/lineGraph/test.conf @@ -8,7 +8,6 @@ doc-pgr_lineGraphFull doc-pgr_lineGraph pgtap_design_lineGraphFull - pgtap_design proofOfConcept1 proofOfConcept2 )], diff --git a/pgtap/lineGraph/lineGraph/edge_cases/edge_cases.pg b/pgtap/lineGraph/lineGraph/edge_cases/edge_cases.pg new file mode 100644 index 0000000000..7b895f5a81 --- /dev/null +++ b/pgtap/lineGraph/lineGraph/edge_cases/edge_cases.pg @@ -0,0 +1,85 @@ +/*PGR-GNU***************************************************************** + +Copyright (c) 2024 pgRouting developers +Mail: project@pgrouting.org + +------ +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + ********************************************************************PGR-GNU*/ +BEGIN; + +SELECT plan(16); + +/* -- 0 edge graph */ +SELECT lives_ok($$ + SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id = 20') + $$, '0-lives: one bi-edge directed'); +SELECT is_empty($$ + SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id = 20') + $$, '0-empty: one bi-edge directed'); + +/* -- one edge graph */ +SELECT lives_ok($$ + SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id = 17') + $$, '1-lives: one bi-edge directed'); +SELECT is_empty($$ + SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id = 17') + $$, '1-empty: one bi-edge directed'); + +SELECT lives_ok($$ + SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id = 17', false) + $$, '2-lives: one bi-edge undirected'); +SELECT is_empty($$ + SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id = 17', false) + $$, '2-empty: one bi-edge undirected'); + +SELECT lives_ok($$ + SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id = 12') + $$, '3-lives: one edge directed'); +SELECT is_empty($$ + SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id = 12') + $$, '3-empty: one edge directed'); + +SELECT lives_ok($$ + SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id = 12', false) + $$, '4-lives: one edge undirected'); +SELECT is_empty($$ + SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id = 12', false) + $$, '4-empty: one edge undirected'); + + +/* -- two edge graphs */ +SELECT lives_ok($$ + SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id IN (6,7)') + $$, '5-lives: one bi-edge directed'); +SELECT isnt_empty($$ + SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id IN (6,7)') + $$, '5-not_empty: two bi-edge directed'); +SELECT set_eq($$ + SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id IN (6,7)') + $$, $$VALUES (1,6,7,1,1)$$, + '5-set_eq: two bi-edge directed'); + +SELECT lives_ok($$ + SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id IN (6,7)', false) + $$, '6-lives: two bi-edge undirected'); +SELECT isnt_empty($$ + SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id IN (6,7)', false) + $$, '6-not_empty: two bi-edge undirected'); +SELECT set_eq($$ + SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id IN (6,7)', false) + $$, $$VALUES (1,6,7,1,-1)$$, + '6-set_eq: two bi-edge undirected'); + +SELECT finish(); +ROLLBACK; From 3e1f3af5112210cfdcaba8358a8055f6747c9b19 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 26 Feb 2024 13:10:17 -0600 Subject: [PATCH 185/428] (CI) refining tidy-vs-commit to not process .conf files --- .github/scripts/tidy-vs-commit.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/scripts/tidy-vs-commit.sh b/.github/scripts/tidy-vs-commit.sh index f140165e70..2b0db9f07b 100755 --- a/.github/scripts/tidy-vs-commit.sh +++ b/.github/scripts/tidy-vs-commit.sh @@ -8,6 +8,8 @@ MODIFIED_FILES=$(git diff-tree --no-commit-id --diff-filter=d --name-only -r "$B MODIFIED_HEADERS=$(git diff-tree --no-commit-id --diff-filter=d --name-only -r "$BASE" HEAD | grep '\.h') POSTGRES_SERVER=$(grep -o -m1 '\-isystem .*' "${BUILD_DIR}/compile_commands.json" | head -1 | awk '{print $1" "$2}') +echo "POSTGRES_SERVER ${POSTGRES_SERVER}" + CHECKS="-checks=clang-analyzer-*" if [ -z "${MODIFIED_FILES}" ] && [ -z "${MODIFIED_HEADERS}" ]; then @@ -19,6 +21,7 @@ fi if [ ${#MODIFIED_FILES[@]} != 0 ] ; then for f in ${MODIFIED_FILES} do + if [ "${f##*.}" == 'conf' ]; then continue; fi echo "${f}" clang-tidy -p "${BUILD_DIR}" "${CHECKS}" -header-filter="^$(pwd).*" "${f}" done From dc1996fa8bec47f3172f3a7bd6acde59861e985a Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 26 Feb 2024 13:15:11 -0600 Subject: [PATCH 186/428] (lineGraph) wrong code -> good code --- include/bgraph/graph_to_edges.hpp | 85 +++++++++++ include/bgraph/line_graph.hpp | 90 ++++++++++++ include/lineGraph/pgr_lineGraph.hpp | 219 ---------------------------- 3 files changed, 175 insertions(+), 219 deletions(-) create mode 100644 include/bgraph/graph_to_edges.hpp create mode 100644 include/bgraph/line_graph.hpp delete mode 100644 include/lineGraph/pgr_lineGraph.hpp diff --git a/include/bgraph/graph_to_edges.hpp b/include/bgraph/graph_to_edges.hpp new file mode 100644 index 0000000000..d827b8a752 --- /dev/null +++ b/include/bgraph/graph_to_edges.hpp @@ -0,0 +1,85 @@ +/*PGR-GNU***************************************************************** +File: graph_to_edges.hpp + +Function's developer: +Copyright (c) 2024 Vicky Vergara +Mail: vicky at gmail.com + +------ + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + ********************************************************************PGR-GNU*/ + +#ifndef INCLUDE_BGRAPH_GRAPH_TO_EDGES_HPP_ +#define INCLUDE_BGRAPH_GRAPH_TO_EDGES_HPP_ + +#include +#include +#include + +#include +#include + +#include "cpp_common/edge_t.hpp" +#include "c_types/edge_rt.h" + +namespace pgrouting { +namespace b_g { + +/** @brief converts a bg to Edges_t + * @param[in] bg the boost grah + * @returns a set of Edges_t that exist on the graph + * id, source, target, cost, reverse_cost + * source < target + */ +template +std::vector graph_to_existing_edges(const G &bg) { + std::vector results; + + std::map, Edge_t> st_to_edge; + int64_t count = 0; + + auto bg_edges = boost::edges(bg); + for (auto e = bg_edges.first; e != bg_edges.second; ++e) { + auto s = bg[boost::source(*e, bg)].id; + auto t = bg[boost::target(*e, bg)].id; + + /* + * Reverse edge already been added + */ + if (st_to_edge.find({t, s}) != st_to_edge.end()) { + st_to_edge[std::pair(t, s)].reverse_cost = 1.0; + continue; + } + + /* + * Already been added + */ + if (st_to_edge.find({s, t}) != st_to_edge.end()) continue; + + st_to_edge[std::pair(s, t)] = {++count, s, t, 1, -1}; + } + + for (const auto &st : st_to_edge) { + results.push_back(st.second); + } + return results; +} + +} // namespace b_g +} // namespace pgrouting + +#endif // INCLUDE_BGRAPH_GRAPH_TO_EDGES_HPP_ diff --git a/include/bgraph/line_graph.hpp b/include/bgraph/line_graph.hpp new file mode 100644 index 0000000000..37f5d3b7a4 --- /dev/null +++ b/include/bgraph/line_graph.hpp @@ -0,0 +1,90 @@ +/*PGR-GNU***************************************************************** +File: line_graph.hpp + +Function's developer: +Copyright (c) 2024 Vicky Vergara +Mail: vicky at gmail.com + +------ + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + ********************************************************************PGR-GNU*/ + +#ifndef INCLUDE_BGRAPH_LINE_GRAPH_HPP_ +#define INCLUDE_BGRAPH_LINE_GRAPH_HPP_ + +#include + +#include +#include + +#include "cpp_common/basic_vertex.hpp" +#include "cpp_common/basic_edge.hpp" + +namespace pgrouting { +namespace b_g { + +using B_G_R = boost::adjacency_list< + boost::vecS, boost::vecS, boost::undirectedS, + pgrouting::Basic_vertex, pgrouting::Basic_edge>; + +template +B_G_R line_graph(const B_G& original) { + using V = typename boost::graph_traits::vertex_descriptor; + using IndexMap = std::map; + + B_G_R result; + IndexMap id_to_descriptor; + + auto o_edges = boost::edges(original); + for (auto e = o_edges.first; e != o_edges.second; ++e) { + auto v = add_vertex(result); + result[v].id = original[*e].id; + id_to_descriptor[original[*e].id] = v; + } + + /* for (each vertex v in original graph) */ + auto vs = boost::vertices(original); + for (auto vertexIt = vs.first; vertexIt != vs.second; vertexIt++) { + auto vertex = *vertexIt; + + /* for( all incoming edges in to vertex v) */ + auto o_inedges = boost::in_edges(vertex, original); + for (auto ine = o_inedges.first; ine != o_inedges.second; ++ine) { + auto s = original[*ine].id; + + auto o_out_edges = boost::out_edges(vertex, original); + for (auto eout = o_out_edges.first; eout != o_out_edges.second; ++eout) { + /* for( all outgoing edges out from vertex v) */ + auto t = original[*eout].id; + /* + * Prevent self-edges from being created in the Line Graph + */ + if (s == t) continue; + auto rs = id_to_descriptor[s]; + auto rt = id_to_descriptor[t]; + auto e = boost::add_edge(rs, rt, result); + result[e.first].id = static_cast(num_edges(result)); + } + } + } + return result; +} + +} // namespace b_g +} // namespace pgrouting + +#endif // INCLUDE_BGRAPH_LINE_GRAPH_HPP_ diff --git a/include/lineGraph/pgr_lineGraph.hpp b/include/lineGraph/pgr_lineGraph.hpp deleted file mode 100644 index 65dad9a2cf..0000000000 --- a/include/lineGraph/pgr_lineGraph.hpp +++ /dev/null @@ -1,219 +0,0 @@ -/*PGR-GNU***************************************************************** -File: pgr_lineGraph.hpp - -Generated with Template by: -Copyright (c) 2015 pgRouting developers -Mail: project@pgrouting.org - -Function's developer: -Copyright (c) 2017 Vidhan Jain -Mail: vidhanj1307@gmail.com - ------- - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - ********************************************************************PGR-GNU*/ - -#ifndef INCLUDE_LINEGRAPH_PGR_LINEGRAPH_HPP_ -#define INCLUDE_LINEGRAPH_PGR_LINEGRAPH_HPP_ -#pragma once - - -#include -#include -#include -#include -#include - -#include "c_types/edge_rt.h" -#include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/line_vertex.hpp" - -namespace pgrouting { - -namespace graph { - -template -class Pgr_lineGraph : public Pgr_base_graph { - public: - typedef typename boost::graph_traits < G >::vertex_descriptor V; - typedef typename boost::graph_traits < G >::edge_descriptor E; - typedef typename boost::graph_traits < G >::vertex_iterator V_i; - typedef typename boost::graph_traits < G >::out_edge_iterator EO_i; - typedef typename boost::graph_traits < G >::in_edge_iterator EI_i; - - - explicit Pgr_lineGraph(bool directed) - : Pgr_base_graph() { - } - - explicit Pgr_lineGraph(const pgrouting::DirectedGraph &digraph) - : Pgr_base_graph() { - insert_vertices(digraph); - create_edges(digraph); - } - - - friend std::ostream& operator<<( - std::ostream &log, const Pgr_lineGraph &g) { - typename Pgr_base_graph::EO_i out, out_end; - - for (auto vi = vertices(g.graph).first; - vi != vertices(g.graph).second; ++vi) { - if ((*vi) >= g.num_vertices()) break; - log << (*vi) << ": " << " out_edges_of(" << g.graph[(*vi)] << "):"; - for (boost::tie(out, out_end) = out_edges(*vi, g.graph); - out != out_end; ++out) { - log << ' ' - << g.graph[*out].id << "=(" - << g[g.source(*out)].id << ", " - << g[g.target(*out)].id << ")\t"; - } - log << std::endl; - } - return log; - } - - - std::vector< Edge_rt > - get_postgres_results_directed() { - std::vector< Edge_rt > results; - - typename boost::graph_traits < G >::edge_iterator edgeIt, edgeEnd; - std::map < std::pair, Edge_rt > unique; - int64_t count = 0; - - for (boost::tie(edgeIt, edgeEnd) = boost::edges(this->graph); - edgeIt != edgeEnd; edgeIt++) { - E e = *edgeIt; - auto e_source = this->graph[this->source(e)].vertex_id; - auto e_target = this->graph[this->target(e)].vertex_id; - - if (unique.find({e_target, e_source}) != unique.end()) { - unique[std::pair(e_target, - e_source)].reverse_cost = 1.0; - continue; - } - e_source *= -1; - e_target *= -1; - if (unique.find({e_target, e_source}) != unique.end()) { - unique[std::pair(e_target, - e_source)].reverse_cost = 1.0; - continue; - } - e_source *= -1; - e_target *= -1; - - Edge_rt edge = { - ++count, - e_source, - e_target, - 1.0, - -1.0 - }; - unique[std::pair(e_source, e_target)] = edge; - } - for (const auto &edge : unique) { - results.push_back(edge.second); - } - return results; - } - - void insert_vertices( - const pgrouting::DirectedGraph& digraph) { - auto es = boost::edges(digraph.graph); - for (auto eit = es.first; eit != es.second; ++eit) { - auto edge = *eit; - Line_vertex vertex({ - digraph[edge].id, - digraph[boost::source(edge, digraph.graph)].id, - digraph[boost::target(edge, digraph.graph)].id, - digraph[edge].cost, - -1}); - add_one_vertex(vertex); - } - } - - - - private: - template < typename T> - void - graph_add_edge( - const T &source, - const T &target) { - bool inserted; - E e; - - auto vm_s = this->get_V(source); - auto vm_t = this->get_V(target); - - boost::tie(e, inserted) = - boost::add_edge(vm_s, vm_t, this->graph); - - this->graph[e].id = static_cast(this->num_edges()); - } - - void create_edges( - const pgrouting::DirectedGraph& digraph) { - V_i vertexIt, vertexEnd; - EO_i e_outIt, e_outEnd; - EI_i e_inIt, e_inEnd; - - - /* for (each vertex v in original graph) */ - for (boost::tie(vertexIt, vertexEnd) = boost::vertices(digraph.graph); - vertexIt != vertexEnd; vertexIt++) { - auto vertex = *vertexIt; - - /* for( all incoming edges in to vertex v) */ - for (boost::tie(e_outIt, e_outEnd) = - boost::out_edges(vertex, digraph.graph); - e_outIt != e_outEnd; - e_outIt++) { - /* for( all outgoing edges out from vertex v) */ - for (boost::tie(e_inIt, e_inEnd) = - boost::in_edges(vertex, digraph.graph); - e_inIt != e_inEnd; e_inIt++) { - /* - Prevent self-edges from being created in the Line Graph - */ - - graph_add_edge( - (digraph.graph[*e_inIt]).id, - (digraph.graph[*e_outIt]).id); - } - } - } - } - - V add_one_vertex( - T_V vertex) { - auto v = add_vertex(this->graph); - this->vertices_map[vertex.id] = v; - this->graph[v].cp_members(vertex); - - pgassert(boost::num_vertices(this->graph) == this->num_vertices()); - return v; - } - - public: - std::ostringstream log; -}; -} // namespace graph -} // namespace pgrouting - -#endif // INCLUDE_LINEGRAPH_PGR_LINEGRAPH_HPP_ From 7e3338f5c3d0bfc740dcd84638d8090bd2aaee2a Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 26 Feb 2024 13:16:15 -0600 Subject: [PATCH 187/428] (lineGraph) Using fixed code --- src/lineGraph/lineGraph.c | 3 +- src/lineGraph/lineGraph_driver.cpp | 77 ++++++++++++++---------------- 2 files changed, 36 insertions(+), 44 deletions(-) diff --git a/src/lineGraph/lineGraph.c b/src/lineGraph/lineGraph.c index 6f34c7e561..addc3e640d 100644 --- a/src/lineGraph/lineGraph.c +++ b/src/lineGraph/lineGraph.c @@ -138,8 +138,7 @@ PGDLLEXPORT Datum _pgr_linegraph(PG_FUNCTION_ARGS) { values[1] = Int64GetDatum(result_tuples[funcctx->call_cntr].source); values[2] = Int64GetDatum(result_tuples[funcctx->call_cntr].target); values[3] = Float8GetDatum(result_tuples[funcctx->call_cntr].cost); - values[4] = Float8GetDatum(result_tuples[ - funcctx->call_cntr].reverse_cost); + values[4] = Float8GetDatum(result_tuples[funcctx->call_cntr].reverse_cost); tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); diff --git a/src/lineGraph/lineGraph_driver.cpp b/src/lineGraph/lineGraph_driver.cpp index 4d864e1e5e..df3b5258c5 100644 --- a/src/lineGraph/lineGraph_driver.cpp +++ b/src/lineGraph/lineGraph_driver.cpp @@ -35,38 +35,33 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include +#include "bgraph/line_graph.hpp" +#include "bgraph/graph_to_edges.hpp" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/pgr_alloc.hpp" #include "cpp_common/pgr_assert.hpp" -#include "cpp_common/linear_directed_graph.hpp" +#include "cpp_common/pgr_base_graph.hpp" #include "c_types/edge_rt.h" -#include "lineGraph/pgr_lineGraph.hpp" - namespace { -void get_postgres_result( - const std::vector &edge_result, - Edge_rt **return_tuples, - size_t &sequence) { - using pgrouting::pgr_alloc; - (*return_tuples) = pgr_alloc(edge_result.size(), (*return_tuples)); - - for (const auto &edge : edge_result) { - (*return_tuples)[sequence] = {edge.id, edge.source, edge.target, - edge.cost, edge.reverse_cost}; - sequence++; - } +template +std::vector line_graph(const G& original) { + auto lg_result = pgrouting::b_g::line_graph(original.graph); + + return pgrouting::b_g::graph_to_existing_edges(lg_result); } + } // namespace void pgr_do_lineGraph( char *edges_sql, + bool directed, - bool, Edge_rt **return_tuples, size_t *return_count, + char ** log_msg, char ** notice_msg, char ** err_msg) { @@ -95,42 +90,40 @@ pgr_do_lineGraph( } hint = nullptr; + std::vector line_graph_edges; + if (directed) { + pgrouting::DirectedGraph ograph(directed); + ograph.insert_edges(edges); + line_graph_edges = line_graph(ograph); + } else { + pgrouting::UndirectedGraph ograph(directed); + ograph.insert_edges(edges); + line_graph_edges = line_graph(ograph); + } - - pgrouting::DirectedGraph digraph; - digraph.insert_edges_neg(edges); - - log << digraph << "\n"; - pgrouting::graph::Pgr_lineGraph< - pgrouting::LinearDirectedGraph, - pgrouting::Line_vertex, - pgrouting::Basic_edge, true> line(digraph); - std::vector< Edge_rt > line_graph_edges; - line_graph_edges = line.get_postgres_results_directed(); auto count = line_graph_edges.size(); if (count == 0) { (*return_tuples) = NULL; (*return_count) = 0; - notice << - "Only vertices graph"; - } else { - size_t sequence = 0; + *log_msg = pgr_msg(log.str().c_str()); + return; + } + + size_t sequence = 0; + using pgrouting::pgr_alloc; + (*return_tuples) = pgr_alloc(line_graph_edges.size(), (*return_tuples)); - get_postgres_result( - line_graph_edges, - return_tuples, - sequence); - (*return_count) = sequence; + for (const auto &e : line_graph_edges) { + auto rev_c = directed? e.reverse_cost : -1; + (*return_tuples)[sequence] = {e.id, e.source, e.target, e.cost, rev_c}; + sequence++; } + (*return_count) = sequence; pgassert(*err_msg == NULL); - *log_msg = log.str().empty()? - *log_msg : - pgr_msg(log.str().c_str()); - *notice_msg = notice.str().empty()? - *notice_msg : - pgr_msg(notice.str().c_str()); + *log_msg = log.str().empty()? *log_msg : pgr_msg(log.str().c_str()); + *notice_msg = notice.str().empty()? *notice_msg : pgr_msg(notice.str().c_str()); } catch (AssertFailedException &except) { (*return_tuples) = pgr_free(*return_tuples); (*return_count) = 0; From a0c6e6480870376e8e6e150863155e8075ce06e1 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 26 Feb 2024 13:18:17 -0600 Subject: [PATCH 188/428] (lineGraph)(docq) Updating to new results --- docqueries/lineGraph/doc-pgr_lineGraph.result | 70 ++++++++----------- 1 file changed, 29 insertions(+), 41 deletions(-) diff --git a/docqueries/lineGraph/doc-pgr_lineGraph.result b/docqueries/lineGraph/doc-pgr_lineGraph.result index 6093f485d5..61a3057679 100644 --- a/docqueries/lineGraph/doc-pgr_lineGraph.result +++ b/docqueries/lineGraph/doc-pgr_lineGraph.result @@ -8,47 +8,35 @@ SELECT * FROM pgr_lineGraph( ); seq | source | target | cost | reverse_cost -----+--------+--------+------+-------------- - 1 | -18 | 18 | 1 | 1 - 2 | -17 | 17 | 1 | 1 - 3 | -16 | -3 | 1 | -1 - 4 | -14 | -10 | 1 | 1 - 5 | -14 | 12 | 1 | -1 - 6 | -14 | 14 | 1 | 1 - 7 | -10 | -7 | 1 | 1 - 8 | -10 | -4 | 1 | 1 - 9 | -10 | 8 | 1 | 1 - 10 | -10 | 10 | 1 | 1 - 11 | -9 | -8 | 1 | 1 - 12 | -9 | 9 | 1 | 1 - 13 | -9 | 11 | 1 | -1 - 14 | -8 | -7 | 1 | 1 - 15 | -8 | -4 | 1 | 1 - 16 | -8 | 8 | 1 | 1 - 17 | -7 | -6 | 1 | 1 - 18 | -7 | 7 | 1 | 1 - 19 | -6 | 6 | 1 | 1 - 20 | -3 | -2 | 1 | -1 - 21 | -3 | 5 | 1 | -1 - 22 | -2 | -1 | 1 | -1 - 23 | -2 | 4 | 1 | -1 - 24 | 1 | -1 | 1 | 1 - 25 | 1 | 4 | 1 | 1 - 26 | 4 | -7 | 1 | 1 - 27 | 4 | -4 | 1 | 1 - 28 | 5 | -8 | 1 | -1 - 29 | 5 | 9 | 1 | -1 - 30 | 5 | 11 | 1 | -1 - 31 | 8 | 11 | 1 | -1 - 32 | 9 | -16 | 1 | 1 - 33 | 9 | 15 | 1 | 1 - 34 | 10 | 12 | 1 | -1 - 35 | 11 | 13 | 1 | -1 - 36 | 12 | 13 | 1 | -1 - 37 | 13 | -15 | 1 | -1 - 38 | 15 | -15 | 1 | 1 - 39 | 16 | -16 | 1 | 1 - 40 | 16 | 15 | 1 | 1 -(40 rows) + 1 | 2 | 1 | 1 | -1 + 2 | 2 | 4 | 1 | -1 + 3 | 3 | 2 | 1 | -1 + 4 | 3 | 5 | 1 | -1 + 5 | 4 | 1 | 1 | 1 + 6 | 4 | 8 | 1 | 1 + 7 | 4 | 10 | 1 | 1 + 8 | 5 | 8 | 1 | -1 + 9 | 5 | 9 | 1 | -1 + 10 | 5 | 11 | 1 | -1 + 11 | 6 | 7 | 1 | 1 + 12 | 7 | 4 | 1 | 1 + 13 | 7 | 8 | 1 | 1 + 14 | 7 | 10 | 1 | 1 + 15 | 8 | 9 | 1 | 1 + 16 | 8 | 10 | 1 | 1 + 17 | 8 | 11 | 1 | -1 + 18 | 9 | 11 | 1 | -1 + 19 | 10 | 12 | 1 | -1 + 20 | 10 | 14 | 1 | 1 + 21 | 11 | 13 | 1 | -1 + 22 | 12 | 13 | 1 | -1 + 23 | 13 | 15 | 1 | -1 + 24 | 14 | 12 | 1 | -1 + 25 | 15 | 9 | 1 | 1 + 26 | 15 | 16 | 1 | 1 + 27 | 16 | 3 | 1 | -1 + 28 | 16 | 9 | 1 | 1 +(28 rows) /* -- q2 */ ROLLBACK; From 771c3c0e756d3438b8cc89cb5dc02ad992f55af3 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 8 May 2024 20:14:34 -0600 Subject: [PATCH 189/428] (docqueries/pgr_lineGraph) adding additional examples --- docqueries/lineGraph/doc-pgr_lineGraph.result | 107 +++++++++++++----- .../lineGraph/doc-pgr_lineGraph.test.sql | 48 +++++++- docqueries/lineGraph/test.conf | 3 +- 3 files changed, 123 insertions(+), 35 deletions(-) diff --git a/docqueries/lineGraph/doc-pgr_lineGraph.result b/docqueries/lineGraph/doc-pgr_lineGraph.result index 61a3057679..f018d270c2 100644 --- a/docqueries/lineGraph/doc-pgr_lineGraph.result +++ b/docqueries/lineGraph/doc-pgr_lineGraph.result @@ -4,40 +4,85 @@ SET client_min_messages TO NOTICE; SET /* -- q1 */ SELECT * FROM pgr_lineGraph( - 'SELECT id, source, target, cost, reverse_cost FROM edges' -); + 'SELECT id, source, target, cost, reverse_cost + FROM edges WHERE id IN (2,4,5,8)', + false); seq | source | target | cost | reverse_cost -----+--------+--------+------+-------------- - 1 | 2 | 1 | 1 | -1 - 2 | 2 | 4 | 1 | -1 - 3 | 3 | 2 | 1 | -1 - 4 | 3 | 5 | 1 | -1 - 5 | 4 | 1 | 1 | 1 - 6 | 4 | 8 | 1 | 1 - 7 | 4 | 10 | 1 | 1 - 8 | 5 | 8 | 1 | -1 - 9 | 5 | 9 | 1 | -1 - 10 | 5 | 11 | 1 | -1 - 11 | 6 | 7 | 1 | 1 - 12 | 7 | 4 | 1 | 1 - 13 | 7 | 8 | 1 | 1 - 14 | 7 | 10 | 1 | 1 - 15 | 8 | 9 | 1 | 1 - 16 | 8 | 10 | 1 | 1 - 17 | 8 | 11 | 1 | -1 - 18 | 9 | 11 | 1 | -1 - 19 | 10 | 12 | 1 | -1 - 20 | 10 | 14 | 1 | 1 - 21 | 11 | 13 | 1 | -1 - 22 | 12 | 13 | 1 | -1 - 23 | 13 | 15 | 1 | -1 - 24 | 14 | 12 | 1 | -1 - 25 | 15 | 9 | 1 | 1 - 26 | 15 | 16 | 1 | 1 - 27 | 16 | 3 | 1 | -1 - 28 | 16 | 9 | 1 | 1 -(28 rows) + 1 | 2 | 4 | 1 | -1 + 2 | 2 | 5 | 1 | -1 + 3 | 4 | 8 | 1 | -1 + 4 | 5 | 8 | 1 | -1 +(4 rows) /* -- q2 */ +CREATE TABLE edges_shared ( + id BIGINT, + source BIGINT, + target BIGINT, + cost FLOAT, + reverse_cost FLOAT, + geom geometry +); +CREATE TABLE +INSERT INTO edges_shared (id, source, target, cost, reverse_cost, geom) VALUES + (102, 1, 2, 1, -1, ST_MakeLine(ST_POINT(0, 2), ST_POINT(2, 2))), + (104, 1, 4, 1, -1, ST_MakeLine(ST_POINT(0, 2), ST_POINT(0, 0))), + (301, 3, 1, 1, -1, ST_MakeLine(ST_POINT(2, 0), ST_POINT(0, 2))), + (203, 2, 3, 1, 1, ST_MakeLine(ST_POINT(2, 2), ST_POINT(2, 0))), + (304, 3, 4, 1, 1, ST_MakeLine(ST_POINT(0, 0), ST_POINT(2, 0))); +INSERT 0 5 +SELECT seq, source, target, cost, reverse_cost +FROM pgr_lineGraph( + 'SELECT id, source, target, cost, reverse_cost FROM edges_shared', + true); + seq | source | target | cost | reverse_cost +-----+--------+--------+------+-------------- + 1 | 102 | 203 | 1 | -1 + 2 | 104 | 304 | 1 | -1 + 3 | 203 | 301 | 1 | -1 + 4 | 203 | 304 | 1 | 1 + 5 | 301 | 102 | 1 | -1 + 6 | 301 | 104 | 1 | -1 + 7 | 304 | 301 | 1 | -1 +(7 rows) + +/* -- q3 */ +CREATE TABLE edges_unique ( + id BIGINT, + source BIGINT, + target BIGINT, + cost FLOAT, + geom geometry +); +CREATE TABLE +INSERT INTO edges_unique (id, source, target, cost, geom) VALUES + (102, 1, 2, 1, ST_MakeLine(ST_POINT(0, 2), ST_POINT(2, 2))), + (104, 1, 4, 1, ST_MakeLine(ST_POINT(0, 2), ST_POINT(0, 0))), + (301, 3, 1, 1, ST_MakeLine(ST_POINT(2, 0), ST_POINT(0, 2))), + (203, 2, 3, 1, ST_MakeLine(ST_POINT(2, 2), ST_POINT(2, 0))), + (304, 3, 4, 1, ST_MakeLine(ST_POINT(2, 0), ST_POINT(0, 0))), + (302, 3, 2, 1, ST_MakeLine(ST_POINT(2, 0), ST_POINT(2, 2))), + (403, 4, 3, 1, ST_MakeLine(ST_POINT(0, 0), ST_POINT(2, 0))); +INSERT 0 7 +SELECT seq, source, target, cost, reverse_cost +FROM pgr_lineGraph( + 'SELECT id, source, target, cost FROM edges_unique', + true); + seq | source | target | cost | reverse_cost +-----+--------+--------+------+-------------- + 1 | 102 | 203 | 1 | -1 + 2 | 104 | 403 | 1 | -1 + 3 | 203 | 301 | 1 | -1 + 4 | 203 | 304 | 1 | -1 + 5 | 301 | 102 | 1 | -1 + 6 | 301 | 104 | 1 | -1 + 7 | 302 | 203 | 1 | 1 + 8 | 304 | 403 | 1 | 1 + 9 | 403 | 301 | 1 | -1 + 10 | 403 | 302 | 1 | -1 +(10 rows) + +/* -- q4 */ ROLLBACK; ROLLBACK diff --git a/docqueries/lineGraph/doc-pgr_lineGraph.test.sql b/docqueries/lineGraph/doc-pgr_lineGraph.test.sql index c18e68cfe3..551382e7c5 100644 --- a/docqueries/lineGraph/doc-pgr_lineGraph.test.sql +++ b/docqueries/lineGraph/doc-pgr_lineGraph.test.sql @@ -2,6 +2,50 @@ -- Creative Commons Attribution-Share Alike 3.0 License : https://creativecommons.org/licenses/by-sa/3.0/ /* -- q1 */ SELECT * FROM pgr_lineGraph( - 'SELECT id, source, target, cost, reverse_cost FROM edges' -); + 'SELECT id, source, target, cost, reverse_cost + FROM edges WHERE id IN (2,4,5,8)', + false); /* -- q2 */ +CREATE TABLE edges_shared ( + id BIGINT, + source BIGINT, + target BIGINT, + cost FLOAT, + reverse_cost FLOAT, + geom geometry +); + +INSERT INTO edges_shared (id, source, target, cost, reverse_cost, geom) VALUES + (102, 1, 2, 1, -1, ST_MakeLine(ST_POINT(0, 2), ST_POINT(2, 2))), + (104, 1, 4, 1, -1, ST_MakeLine(ST_POINT(0, 2), ST_POINT(0, 0))), + (301, 3, 1, 1, -1, ST_MakeLine(ST_POINT(2, 0), ST_POINT(0, 2))), + (203, 2, 3, 1, 1, ST_MakeLine(ST_POINT(2, 2), ST_POINT(2, 0))), + (304, 3, 4, 1, 1, ST_MakeLine(ST_POINT(0, 0), ST_POINT(2, 0))); + +SELECT seq, source, target, cost, reverse_cost +FROM pgr_lineGraph( + 'SELECT id, source, target, cost, reverse_cost FROM edges_shared', + true); +/* -- q3 */ +CREATE TABLE edges_unique ( + id BIGINT, + source BIGINT, + target BIGINT, + cost FLOAT, + geom geometry +); + +INSERT INTO edges_unique (id, source, target, cost, geom) VALUES + (102, 1, 2, 1, ST_MakeLine(ST_POINT(0, 2), ST_POINT(2, 2))), + (104, 1, 4, 1, ST_MakeLine(ST_POINT(0, 2), ST_POINT(0, 0))), + (301, 3, 1, 1, ST_MakeLine(ST_POINT(2, 0), ST_POINT(0, 2))), + (203, 2, 3, 1, ST_MakeLine(ST_POINT(2, 2), ST_POINT(2, 0))), + (304, 3, 4, 1, ST_MakeLine(ST_POINT(2, 0), ST_POINT(0, 0))), + (302, 3, 2, 1, ST_MakeLine(ST_POINT(2, 0), ST_POINT(2, 2))), + (403, 4, 3, 1, ST_MakeLine(ST_POINT(0, 0), ST_POINT(2, 0))); + +SELECT seq, source, target, cost, reverse_cost +FROM pgr_lineGraph( + 'SELECT id, source, target, cost FROM edges_unique', + true); +/* -- q4 */ diff --git a/docqueries/lineGraph/test.conf b/docqueries/lineGraph/test.conf index 9a89f675e5..4f4763dad9 100644 --- a/docqueries/lineGraph/test.conf +++ b/docqueries/lineGraph/test.conf @@ -2,7 +2,7 @@ %main::tests = ( 'any' => { - 'comment' => 'LineGrpah test for any versions.', + 'comment' => 'LineGraph test for any versions.', 'data' => [ ], 'tests' => [qw( doc-pgr_lineGraphFull @@ -16,7 +16,6 @@ doc-pgr_lineGraph )] }, - ); 1; From c859e24df39fe6affc4d38ed595db9bb9f718b36 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 8 May 2024 20:15:06 -0600 Subject: [PATCH 190/428] (doc/pgr_lineGraph) adding additional examples --- doc/conf.py.in | 2 + doc/lineGraph/pgr_lineGraph.rst | 349 +++++++++++++++++++++++- doc/lineGraph/transformation-family.rst | 19 +- doc/src/experimental.rst | 4 +- doc/src/proposed.rst | 6 + 5 files changed, 360 insertions(+), 20 deletions(-) diff --git a/doc/conf.py.in b/doc/conf.py.in index 14816fa941..f7848e052d 100644 --- a/doc/conf.py.in +++ b/doc/conf.py.in @@ -57,6 +57,8 @@ extensions = [ ] autosectionlabel_prefix_document = True +graphviz_dot='neato' + # Add any paths that contain templates here, relative to this directory. templates_path = ["_templates"] diff --git a/doc/lineGraph/pgr_lineGraph.rst b/doc/lineGraph/pgr_lineGraph.rst index 34e98837b9..f9bd31bf79 100644 --- a/doc/lineGraph/pgr_lineGraph.rst +++ b/doc/lineGraph/pgr_lineGraph.rst @@ -10,7 +10,7 @@ | -``pgr_lineGraph`` - Experimental +pgr_lineGraph - Proposed =============================================================================== ``pgr_lineGraph`` — Transforms the given graph into its corresponding edge-based @@ -21,12 +21,17 @@ graph. Boost Graph Inside -.. include:: experimental.rst - :start-after: begin-warn-expr - :end-before: end-warn-expr +.. include:: proposed.rst + :start-after: stable-begin-warning + :end-before: stable-end-warning .. rubric:: Availability +* Version 3.7.0 + + * Promoted to **proposed** signature. + * Works for directed and undirected graphs. + * Version 2.5.0 * New **Experimental** function @@ -35,15 +40,28 @@ graph. Description ------------------------------------------------------------------------------- -Given a graph G, its line graph L(G) is a graph such that: +Given a graph :math:`G`, its line graph :math:`L(G)` is a graph such that: + +- Each vertex of :math:`L(G)` represents an edge of :math:`G`. +- Two vertices of :math:`L(G)` are adjacent if and only if their corresponding + edges share a common endpoint in :math:`G` + +**The main characteristics are:** + +- Works for directed and undirected graphs. +- The ``cost`` and ``reverse_cost`` columns of the result represent existence of + the edge. +- When the graph is directed the result is directed. -- Each vertex of L(G) represents an edge of G -- Two vertices of L(G) are adjacent if and only if their corresponding edges - share a common endpoint in G. -- Currently works for undirected graph. + - To get the complete Line Graph use unique identifiers on the double way + edges (See `Additional Examples`_). + +- When the graph is undirected the result is undirected. + + - The ``reverse_cost`` is always :math:`-1`. .. index:: - single: lineGraph - Experimental on v2.5 + single: lineGraph - Proposed on v3.7 Signatures ------------------------------------------------------------------------------- @@ -56,12 +74,39 @@ Signatures | Returns set of |result-lineg| | OR EMPTY SET -:Example: For an **undirected** graph +:Example: For an undirected graph with edges :math:'{2,4,5,8}' .. literalinclude:: doc-pgr_lineGraph.queries :start-after: -- q1 :end-before: -- q2 +.. graphviz:: + + graph G { + + v6 [label=6,shape=circle;style=filled;fixedsize=true;width=.4;color=deepskyblue,pos="0,0!"]; + v7 [label=7,shape=circle;style=filled;fixedsize=true;width=.4;color=deepskyblue,pos="0,2!"]; + v10 [label=10,shape=circle;style=filled;fixedsize=true;width=.4;color=deepskyblue,pos="2,0!"]; + v11 [label=11,shape=circle;style=filled;fixedsize=true;width=.4;color=deepskyblue,pos="2,2!"]; + + v7--v6 [color=blue]; + v7--v11 [color=blue]; + v10--v6 [color=blue]; + v10--v11 [color=blue]; + + s2 [label="2",shape=circle;style=filled;width=.4;color=yellow,pos="1,0!"]; + s4 [label="4",shape=circle;style=filled;width=.4;color=yellow,pos="0,1!"]; + s5 [label="5",shape=circle;style=filled;width=.4;color=yellow,pos="2,1!"]; + s8 [label="8",shape=circle;style=filled;width=.4;color=yellow,pos="1,2!"]; + + s2--s4 [color=red]; + s2--s5 [color=red]; + s4--s8 [color=red]; + s5--s8 [color=red]; + } + + + Parameters ------------------------------------------------------------------------------- @@ -127,11 +172,289 @@ Returns set of |result-lineg| * When `negative`: edge (``target``, ``source``) does not exist, therefore it’s not part of the graph. + +Additional Examples +------------------------------------------------------------------------------- + +.. contents:: + :local: + +Given the following directed graph + +:math:`G(V,E) = G(\{1,2,3,4\},\{ +1 \rightarrow 2, +1 \rightarrow 4, +2 \rightarrow 3, +3 \rightarrow 1, +3 \rightarrow 2, +3 \rightarrow 4, +4 \rightarrow 3\})` + +.. graphviz:: + + digraph G { + + subgraph clusterA { + style=invis; + edge [arrowsize=0.5,color=blue]; + node [shape=circle;style=filled;fontsize=8;fixedsize=true;width=.4;color=deepskyblue]; + v1 [label=1,pos="0,2!"]; + v2 [label=2,pos="2,2!"]; + v3 [label=3,pos="2,0!"]; + v4 [label=4,pos="0,0!"]; + + v1->{v2,v4} [color=blue]; + v3->{v2,v4} [dir=both,color=blue]; + v3->v1 [arrowsize=0.5,color=blue ]; + } + } + + +Representation as directed with shared edge identifiers +............................................................................... + +For the simplicity, the design of the edges table on the database, has the +edge's identifiers are represented with 3 digits: + +:hundreds: the source vertex +:tens: always 0, acts as a separator +:units: the target vertex + +In this image, + +* Single or double head arrows represent one edge (row) on the edges table. +* The numbers in the yellow shadow are the edge identifiers. + +.. graphviz:: + + digraph G { + + subgraph clusterA { + style=invis; + edge [arrowsize=0.5,color=blue]; + node [shape=circle;style=filled;fontsize=8;fixedsize=true;width=.4;color=deepskyblue]; + v1 [label=1,pos="0,2!"]; + v2 [label=2,pos="2,2!"]; + v3 [label=3,pos="2,0!"]; + v4 [label=4,pos="0,0!"]; + + v1->{v2,v4} [color=blue]; + v3->{v2,v4} [dir=both,color=blue]; + v3->v1 [arrowsize=0.5,color=blue ]; + } + + subgraph clusterB { + style=invis; + edge [arrowsize=0.5,color=red,fontsize=10,fontcolor=red]; + node [shape=circle;style=filled;fontsize=8;fixedsize=true;width=.4;color=yellow] + + s102 [label="102",pos="1,2!"]; + s104 [label="104",pos="0,1!"]; + s301 [label="301",pos="1,1!"]; + s203 [label="203",pos="2,1!"]; + s304 [label="304",pos="1,0!"]; + } + } + +Two pair of edges share the same identifier when the ``reverse_cost`` column is +used. + +* Edges :math:`{2 \rightarrow 3, 3 \rightarrow 2}` are represented with one edge + row with :math:`id=203`. +* Edges :math:`{3 \rightarrow 4, 4 \rightarrow 3}` are represented with one edge + row with :math:`id=304`. + +The graph can be created as follows: + +.. literalinclude:: doc-pgr_lineGraph.queries + :start-after: -- q2 + :end-before: INSERT 0 5 + + +Line Graph of a directed graph represented with shared edges ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +.. literalinclude:: doc-pgr_lineGraph.queries + :start-after: INSERT 0 5 + :end-before: -- q3 + +* The result is a directed graph. +* For :math:`seq=4` from :math:`203 \leftrightarrow 304` represent two edges +* For all the other values of ``seq`` represent one edge. +* The ``cost`` and ``reverse_cost`` values represent the existence of the edge. + + * When positive: the edge exists. + * When negative: the edge does not exist. + +.. graphviz:: + + digraph G { + + subgraph clusterA { + style=invis; + edge [arrowsize=0.5,color=blue]; + node [shape=circle;style=filled;fontsize=8;fixedsize=true;width=.4;color=deepskyblue]; + v1 [label=1,pos="0,4!"]; + v2 [label=2,pos="4,4!"]; + v3 [label=3,pos="4,0!"]; + v4 [label=4,pos="0,0!"]; + + v1->{v2,v4} [color=blue]; + v3->{v2,v4} [dir=both,color=blue]; + v3->v1 [arrowsize=0.5,color=blue ]; + } + + subgraph clusterB { + style=invis; + edge [arrowsize=0.5,labelfloat=true,color=red,fontsize=14,fontcolor=red]; + node [shape=circle;style=filled;fontsize=8;fixedsize=true;width=.4;color=yellow] + + s102 [label="102",pos="2,4!"]; + s104 [label="104",pos="0,2!"]; + s301 [label="301",pos="2,2!"]; + s203 [label="203",pos="4,2!"]; + s304 [label="304",pos="2,0!"]; + + s102 -> s203 [label=1]; + s104 -> s304 [label=2]; + s203 -> s301 [label=3]; + s203 -> s304 [label=4,dir=both]; + s301 -> s102[label=5]; + s301 -> s104[label=6]; + s304 -> s301[label=7]; + } + } + +Representation as directed with unique edge identifiers +............................................................................... + +For the simplicity, the design of the edges table on the database, has the +edge's identifiers are represented with 3 digits: + +:hundreds: the source vertex +:tens: always 0, acts as a separator +:units: the target vertex + +In this image, + +* Single head arrows represent one edge (row) on the edges table. +* There are no double head arrows +* The numbers in the yellow shadow are the edge identifiers. + +.. graphviz:: + + digraph G { + + subgraph clusterA { + style=invis; + edge [arrowsize=0.5,color=blue]; + node [shape=circle;style=filled;fontsize=8;fixedsize=true;width=.4;color=deepskyblue] + v1 [label=1,pos="0,2!"]; + v2 [label=2,pos="2,2!"]; + v3 [label=3,pos="2,0!"]; + v4 [label=4,pos="0,0!"]; + + v1->{v2,v4}; + v3->{v1,v2,v4}; + {v4,v2}->v3; + } + + subgraph clusterB { + style=invis; + edge [arrowsize=0.5,color=red,fontsize=6,fontcolor=red]; + node [shape=circle;style=filled;fontsize=8;fixedsize=true;width=.4;color=yellow] + + sa [label="102",pos="1,2!"]; + sb [label="203",pos="2.2,1!"]; + sc [label="302",pos="1.8,1!"]; + sd [label="104",pos="0,1!"]; + se [label="403",pos="1,0.2!"]; + sf [label="304",pos="1,-0.2!"]; + sg [label="301",pos="1,1!"]; + } + } + +Two pair of edges share the same ending nodes and the ``reverse_cost`` column is +not used. + +* Edges :math:`{2 \rightarrow 3, 3 \rightarrow 2}` are represented with two + edges :math:`id=203` and :math:`id=302` respectively. +* Edges :math:`{3 \rightarrow 4, 4 \rightarrow 3}` are represented with two + edges :math:`id=304` and :math:`id=403` respectively. + +The graph can be created as follows: + +.. literalinclude:: doc-pgr_lineGraph.queries + :start-after: -- q3 + :end-before: INSERT 0 7 + +Line Graph of a directed graph represented with unique edges ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +.. literalinclude:: doc-pgr_lineGraph.queries + :start-after: INSERT 0 7 + :end-before: -- q4 + +* The result is a directed graph. +* For :math:`seq=7` from :math:`203 \leftrightarrow 302` represent two edges. +* For :math:`seq=8` from :math:`304 \leftrightarrow 403` represent two edges. +* For all the other values of ``seq`` represent one edge. +* The ``cost`` and ``reverse_cost`` values represent the existence of the edge. + + * When positive: the edge exists. + * When negative: the edge does not exist. + +.. graphviz:: + + digraph G { + + subgraph clusterA { + style=invis; + edge [arrowsize=0.5,color=blue]; + node [shape=circle;style=filled;fontsize=10;fixedsize=true;width=.4;color=deepskyblue] + v1 [label=1,pos="0,4!"]; + v2 [label=2,pos="4,4!"]; + v3 [label=3,pos="4,0!"]; + v4 [label=4,pos="0,0!"]; + + v1->{v2,v4}; + v3->{v1,v2,v4}; + {v4,v2}->v3; + } + + subgraph clusterB { + style=invis; + edge [arrowsize=0.5,labelfloat=true,color=red,fontsize=14,fontcolor=red]; + node [shape=circle;style=filled;fontsize=8;fixedsize=true;width=.4;color=yellow] + + sa [label="102",pos="2,4!"]; + sb [label="203",pos="4.4,2!"]; + sc [label="302",pos="3.6,2!"]; + sd [label="104",pos="0,2!"]; + se [label="403",pos="2,0.4!"]; + sf [label="304",pos="2,-0.4!"]; + sg [label="301",pos="2,2!"]; + + sa -> sb [label=1]; + sd -> se [label=2]; + sb -> sg [label=3]; + sb -> sf [label=4]; + sg -> sa [label=5]; + sg -> sd [label=6]; + sc -> sb [dir=both,label=7]; + sf -> se [dir=both,label=8]; + se -> sg [label=9]; + se -> sc [label=10]; + } + } + + See Also ------------------------------------------------------------------------------- -* https://en.wikipedia.org/wiki/Line_graph -* The queries use the :doc:`sampledata` network. +* wikipedia: `Line Graph `__ +* mathworld: `Line Graph `__ +* :doc:`sampledata` .. rubric:: Indices and tables diff --git a/doc/lineGraph/transformation-family.rst b/doc/lineGraph/transformation-family.rst index ca4eed4127..393329caca 100644 --- a/doc/lineGraph/transformation-family.rst +++ b/doc/lineGraph/transformation-family.rst @@ -9,20 +9,29 @@ -Transformation - Family of functions (Experimental) +Transformation - Family of functions =============================================================================== +.. include:: proposed.rst + :start-after: stable-begin-warning + :end-before: stable-end-warning + +.. index proposed from here + +* :doc:`pgr_lineGraph` - Transformation algorithm for generating a Line Graph. + +.. index proposed to here + .. include:: experimental.rst :start-after: begin-warn-expr :end-before: end-warn-expr -.. index from here +.. index experimental from here -* :doc:`pgr_lineGraph` - Transformation algorithm for generating a Line Graph. * :doc:`pgr_lineGraphFull` - Transformation algorithm for generating a Line Graph out of each vertex in the input graph. -.. index to here +.. index experimental to here .. toctree:: @@ -33,7 +42,7 @@ Transformation - Family of functions (Experimental) Introduction ------------------------- +------------------------------------------------------------------------------- This family of functions is used for transforming a given input graph :math:`G(V,E)` into a new graph :math:`G'(V',E')`. diff --git a/doc/src/experimental.rst b/doc/src/experimental.rst index 9a3aace837..7277a28067 100644 --- a/doc/src/experimental.rst +++ b/doc/src/experimental.rst @@ -62,8 +62,8 @@ Experimental Functions :doc:`transformation-family` .. include:: transformation-family.rst - :start-after: index from here - :end-before: index to here + :start-after: index experimental from here + :end-before: index experimental to here :doc:`traversal-family` diff --git a/doc/src/proposed.rst b/doc/src/proposed.rst index 3ee938696b..98cadbc726 100644 --- a/doc/src/proposed.rst +++ b/doc/src/proposed.rst @@ -60,6 +60,12 @@ Proposed Functions :start-after: topology_proposed_start :end-before: topology_proposed_end +:doc:`transformation-family` + +.. include:: transformation-family.rst + :start-after: index experimental from here + :end-before: index experimental to here + :doc:`coloring-family` .. include:: coloring-family.rst From 096739cd16101bb87bd5597bb66ca9de69acd942 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 8 May 2024 20:16:11 -0600 Subject: [PATCH 191/428] (pgtap/pgr_lineGraph) adjusting mathworld unit test --- .../lineGraph/lineGraph/edge_cases/mathw_2.pg | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pgtap/lineGraph/lineGraph/edge_cases/mathw_2.pg b/pgtap/lineGraph/lineGraph/edge_cases/mathw_2.pg index fe5867bb57..b403932bee 100644 --- a/pgtap/lineGraph/lineGraph/edge_cases/mathw_2.pg +++ b/pgtap/lineGraph/lineGraph/edge_cases/mathw_2.pg @@ -31,11 +31,11 @@ CREATE TABLE mathw_2 ( ); INSERT INTO mathw_2 (id, source, target, cost, reverse_cost, geom) VALUES - (102, 10, 20 , 1, -1, ST_MakeLine(ST_POINT(0, 2), ST_POINT(2, 2))), - (104, 10, 40 , 1, -1, ST_MakeLine(ST_POINT(0, 2), ST_POINT(0, 0))), - (301, 30, 10 , 1, -1, ST_MakeLine(ST_POINT(2, 0), ST_POINT(0, 2))), - (203, 20, 30 , 1, 1, ST_MakeLine(ST_POINT(2, 2), ST_POINT(2, 0))), - (304, 30, 40 , 1, 1, ST_MakeLine(ST_POINT(0, 0), ST_POINT(2, 0))); + (102, 1, 2, 1, -1, ST_MakeLine(ST_POINT(0, 2), ST_POINT(2, 2))), + (104, 1, 4, 1, -1, ST_MakeLine(ST_POINT(0, 2), ST_POINT(0, 0))), + (301, 3, 1, 1, -1, ST_MakeLine(ST_POINT(2, 0), ST_POINT(0, 2))), + (203, 2, 3, 1, 1, ST_MakeLine(ST_POINT(2, 2), ST_POINT(2, 0))), + (304, 3, 4, 1, 1, ST_MakeLine(ST_POINT(0, 0), ST_POINT(2, 0))); PREPARE mathw_lg_2 AS SELECT * @@ -73,13 +73,13 @@ CREATE TABLE mathw_3 ( ); INSERT INTO mathw_3 (id, source, target, cost, reverse_cost, geom) VALUES - (102, 10, 20 , 1, -1, ST_MakeLine(ST_POINT(0, 2), ST_POINT(2, 2))), - (104, 10, 40 , 1, -1, ST_MakeLine(ST_POINT(0, 2), ST_POINT(0, 0))), - (301, 30, 10 , 1, -1, ST_MakeLine(ST_POINT(2, 0), ST_POINT(0, 2))), - (203, 20, 30 , 1, -1, ST_MakeLine(ST_POINT(2, 2), ST_POINT(2, 0))), - (304, 30, 40 , 1, -1, ST_MakeLine(ST_POINT(2, 0), ST_POINT(0, 0))), - (302, 30, 20 , 1, -1, ST_MakeLine(ST_POINT(2, 0), ST_POINT(2, 2))), - (403, 40, 30 , 1, -1, ST_MakeLine(ST_POINT(0, 0), ST_POINT(2, 0))); + (102, 1, 2, 1, -1, ST_MakeLine(ST_POINT(0, 2), ST_POINT(2, 2))), + (104, 1, 4, 1, -1, ST_MakeLine(ST_POINT(0, 2), ST_POINT(0, 0))), + (301, 3, 1, 1, -1, ST_MakeLine(ST_POINT(2, 0), ST_POINT(0, 2))), + (203, 2, 3, 1, -1, ST_MakeLine(ST_POINT(2, 2), ST_POINT(2, 0))), + (304, 3, 4, 1, -1, ST_MakeLine(ST_POINT(2, 0), ST_POINT(0, 0))), + (302, 3, 2, 1, -1, ST_MakeLine(ST_POINT(2, 0), ST_POINT(2, 2))), + (403, 4, 3, 1, -1, ST_MakeLine(ST_POINT(0, 0), ST_POINT(2, 0))); PREPARE mathw_lg_3 AS SELECT * @@ -87,7 +87,7 @@ FROM pgr_lineGraph('SELECT id, source, target, cost FROM mathw_3', true); SELECT lives_ok($$ SELECT * - FROM pgr_lineGraph('SELECT id, source, target, cost FROM mathw_3', false); + FROM pgr_lineGraph('SELECT id, source, target, cost FROM mathw_3', true); $$, 'Expected to live the main query'); SELECT lives_ok('mathw_lg_3', 'Expected to live the prepared statatment'); From a1c5f412508b3331f2de0cee1430af18aa21a615 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 8 May 2024 21:47:23 -0600 Subject: [PATCH 192/428] Adding self loops on directed graphs --- doc/lineGraph/pgr_lineGraph.rst | 12 +++++---- docqueries/lineGraph/doc-pgr_lineGraph.result | 14 +++++----- include/bgraph/graph_to_edges.hpp | 4 ++- include/bgraph/line_graph.hpp | 4 --- .../lineGraph/edge_cases/edge_cases.pg | 27 ++++++++++++------- .../lineGraph/lineGraph/edge_cases/mathw_2.pg | 12 +++++---- src/lineGraph/lineGraph_driver.cpp | 8 +++--- 7 files changed, 46 insertions(+), 35 deletions(-) diff --git a/doc/lineGraph/pgr_lineGraph.rst b/doc/lineGraph/pgr_lineGraph.rst index f9bd31bf79..e9568024b8 100644 --- a/doc/lineGraph/pgr_lineGraph.rst +++ b/doc/lineGraph/pgr_lineGraph.rst @@ -317,11 +317,13 @@ Line Graph of a directed graph represented with shared edges s102 -> s203 [label=1]; s104 -> s304 [label=2]; - s203 -> s301 [label=3]; - s203 -> s304 [label=4,dir=both]; - s301 -> s102[label=5]; - s301 -> s104[label=6]; - s304 -> s301[label=7]; + s203 -> s203 [label=3,dir=both]; + s203 -> s301 [label=4]; + s203 -> s304 [label=5,dir=both]; + s301 -> s102 [label=6]; + s301 -> s104 [label=7]; + s304 -> s301 [label=8]; + s304 -> s304 [label=9,dir=both]; } } diff --git a/docqueries/lineGraph/doc-pgr_lineGraph.result b/docqueries/lineGraph/doc-pgr_lineGraph.result index f018d270c2..ff183405ae 100644 --- a/docqueries/lineGraph/doc-pgr_lineGraph.result +++ b/docqueries/lineGraph/doc-pgr_lineGraph.result @@ -40,12 +40,14 @@ FROM pgr_lineGraph( -----+--------+--------+------+-------------- 1 | 102 | 203 | 1 | -1 2 | 104 | 304 | 1 | -1 - 3 | 203 | 301 | 1 | -1 - 4 | 203 | 304 | 1 | 1 - 5 | 301 | 102 | 1 | -1 - 6 | 301 | 104 | 1 | -1 - 7 | 304 | 301 | 1 | -1 -(7 rows) + 3 | 203 | 203 | 1 | 1 + 4 | 203 | 301 | 1 | -1 + 5 | 203 | 304 | 1 | 1 + 6 | 301 | 102 | 1 | -1 + 7 | 301 | 104 | 1 | -1 + 8 | 304 | 301 | 1 | -1 + 9 | 304 | 304 | 1 | 1 +(9 rows) /* -- q3 */ CREATE TABLE edges_unique ( diff --git a/include/bgraph/graph_to_edges.hpp b/include/bgraph/graph_to_edges.hpp index d827b8a752..9fa6ad7378 100644 --- a/include/bgraph/graph_to_edges.hpp +++ b/include/bgraph/graph_to_edges.hpp @@ -46,7 +46,7 @@ namespace b_g { * source < target */ template -std::vector graph_to_existing_edges(const G &bg) { +std::vector graph_to_existing_edges(const G &bg, bool add_self_loop) { std::vector results; std::map, Edge_t> st_to_edge; @@ -57,6 +57,8 @@ std::vector graph_to_existing_edges(const G &bg) { auto s = bg[boost::source(*e, bg)].id; auto t = bg[boost::target(*e, bg)].id; + if (s == t && !add_self_loop) continue; + /* * Reverse edge already been added */ diff --git a/include/bgraph/line_graph.hpp b/include/bgraph/line_graph.hpp index 37f5d3b7a4..4d6435e517 100644 --- a/include/bgraph/line_graph.hpp +++ b/include/bgraph/line_graph.hpp @@ -70,10 +70,6 @@ B_G_R line_graph(const B_G& original) { for (auto eout = o_out_edges.first; eout != o_out_edges.second; ++eout) { /* for( all outgoing edges out from vertex v) */ auto t = original[*eout].id; - /* - * Prevent self-edges from being created in the Line Graph - */ - if (s == t) continue; auto rs = id_to_descriptor[s]; auto rt = id_to_descriptor[t]; auto e = boost::add_edge(rs, rt, result); diff --git a/pgtap/lineGraph/lineGraph/edge_cases/edge_cases.pg b/pgtap/lineGraph/lineGraph/edge_cases/edge_cases.pg index 7b895f5a81..f373240800 100644 --- a/pgtap/lineGraph/lineGraph/edge_cases/edge_cases.pg +++ b/pgtap/lineGraph/lineGraph/edge_cases/edge_cases.pg @@ -18,30 +18,36 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ BEGIN; -SELECT plan(16); +SELECT plan(18); /* -- 0 edge graph */ SELECT lives_ok($$ SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id = 20') - $$, '0-lives: one bi-edge directed'); + $$, '00-lives: No edge on graph'); SELECT is_empty($$ SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id = 20') - $$, '0-empty: one bi-edge directed'); + $$, '01-empty: No edge on graph'); +SELECT lives_ok($$ + SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id = 20', false) + $$, '02-lives: No edge on graph undi'); +SELECT is_empty($$ + SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id = 20', false) + $$, '03-empty: No edge on graph undi'); /* -- one edge graph */ SELECT lives_ok($$ SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id = 17') - $$, '1-lives: one bi-edge directed'); -SELECT is_empty($$ + $$, '11-lives: one bi-edge directed'); +SELECT set_eq($$ SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id = 17') - $$, '1-empty: one bi-edge directed'); - + $$, $$VALUES (1,17,17,1,1)$$, + '12-non empty: one bi-edge directed'); SELECT lives_ok($$ SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id = 17', false) - $$, '2-lives: one bi-edge undirected'); + $$, '13-lives: one bi-edge undirected'); SELECT is_empty($$ SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id = 17', false) - $$, '2-empty: one bi-edge undirected'); + $$, '14-empty: one bi-edge undirected'); SELECT lives_ok($$ SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id = 12') @@ -67,7 +73,8 @@ SELECT isnt_empty($$ $$, '5-not_empty: two bi-edge directed'); SELECT set_eq($$ SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id IN (6,7)') - $$, $$VALUES (1,6,7,1,1)$$, + $$, + $$VALUES (1,6,6,1,1),(2,6,7,1,1),(3,7,7,1,1)$$, '5-set_eq: two bi-edge directed'); SELECT lives_ok($$ diff --git a/pgtap/lineGraph/lineGraph/edge_cases/mathw_2.pg b/pgtap/lineGraph/lineGraph/edge_cases/mathw_2.pg index b403932bee..70c0f26ecf 100644 --- a/pgtap/lineGraph/lineGraph/edge_cases/mathw_2.pg +++ b/pgtap/lineGraph/lineGraph/edge_cases/mathw_2.pg @@ -53,11 +53,13 @@ SELECT id, source, target, cost, reverse_cost FROM (VALUES (1, 102, 203, 1, -1), (2, 104, 304, 1, -1), - (3, 203, 301, 1, -1), - (4, 203, 304, 1, 1), - (5, 301, 102, 1, -1), - (6, 301, 104, 1, -1), - (7, 304, 301, 1, -1)) + (3, 203, 203, 1, 1), + (4, 203, 301, 1, -1), + (5, 203, 304, 1, 1), + (6, 301, 102, 1, -1), + (7, 301, 104, 1, -1), + (8, 304, 301, 1, -1), + (9, 304, 304, 1, 1)) AS t(id, source, target, cost, reverse_cost); SELECT set_eq('mathw_lg_2', 'expected_mathw_lg_2'); diff --git a/src/lineGraph/lineGraph_driver.cpp b/src/lineGraph/lineGraph_driver.cpp index df3b5258c5..c4ff08bb8f 100644 --- a/src/lineGraph/lineGraph_driver.cpp +++ b/src/lineGraph/lineGraph_driver.cpp @@ -46,10 +46,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. namespace { template -std::vector line_graph(const G& original) { +std::vector line_graph(const G& original, bool add_self_loop) { auto lg_result = pgrouting::b_g::line_graph(original.graph); - return pgrouting::b_g::graph_to_existing_edges(lg_result); + return pgrouting::b_g::graph_to_existing_edges(lg_result, add_self_loop); } } // namespace @@ -94,11 +94,11 @@ pgr_do_lineGraph( if (directed) { pgrouting::DirectedGraph ograph(directed); ograph.insert_edges(edges); - line_graph_edges = line_graph(ograph); + line_graph_edges = line_graph(ograph, directed); } else { pgrouting::UndirectedGraph ograph(directed); ograph.insert_edges(edges); - line_graph_edges = line_graph(ograph); + line_graph_edges = line_graph(ograph, directed); } auto count = line_graph_edges.size(); From db2b66e964d8ee06b3a7ea0579771703387754f1 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 9 May 2024 09:34:12 -0600 Subject: [PATCH 193/428] updating NEWS and release notes --- NEWS.md | 11 +++++++++++ doc/src/proposed.rst | 4 ++-- doc/src/release_notes.rst | 10 ++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index 1e5a4ec621..205430b7db 100644 --- a/NEWS.md +++ b/NEWS.md @@ -32,6 +32,17 @@ milestone for 3.7.0 * Added ``pred`` result columns. +**Experimental promoted to proposed.** + +* [#2635](https://github.com/pgRouting/pgrouting/pull/2635) pgr_LineGraph + ignores directed flag and use negative values for identifiers. + + * ``pgr_lineGraph`` + + + * Promoted to **proposed** signature. + * Works for directed and undirected graphs. + **Code enhancement** diff --git a/doc/src/proposed.rst b/doc/src/proposed.rst index 98cadbc726..b18137967e 100644 --- a/doc/src/proposed.rst +++ b/doc/src/proposed.rst @@ -63,8 +63,8 @@ Proposed Functions :doc:`transformation-family` .. include:: transformation-family.rst - :start-after: index experimental from here - :end-before: index experimental to here + :start-after: index proposed from here + :end-before: index proposed to here :doc:`coloring-family` diff --git a/doc/src/release_notes.rst b/doc/src/release_notes.rst index aafc68d981..fd4a98899d 100644 --- a/doc/src/release_notes.rst +++ b/doc/src/release_notes.rst @@ -61,6 +61,16 @@ milestone for 3.7.0 :start-after: Version 3.7.0 :end-before: .. rubric +.. rubric:: Experimental promoted to proposed. + +* `#2635 `__ pgr_LineGraph + ignores directed flag and use negative values for identifiers. + + * ``pgr_lineGraph`` + + .. include:: pgr_lineGraph.rst + :start-after: Version 3.7.0 + :end-before: Version 2.5.0 .. rubric:: Code enhancement From 8582944d03f2bf728c8115a14eb12f063783aafd Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 9 May 2024 09:56:37 -0600 Subject: [PATCH 194/428] Fixing conflicts --- src/lineGraph/lineGraph_driver.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lineGraph/lineGraph_driver.cpp b/src/lineGraph/lineGraph_driver.cpp index c4ff08bb8f..ad19950ff3 100644 --- a/src/lineGraph/lineGraph_driver.cpp +++ b/src/lineGraph/lineGraph_driver.cpp @@ -92,11 +92,11 @@ pgr_do_lineGraph( std::vector line_graph_edges; if (directed) { - pgrouting::DirectedGraph ograph(directed); + pgrouting::DirectedGraph ograph; ograph.insert_edges(edges); line_graph_edges = line_graph(ograph, directed); } else { - pgrouting::UndirectedGraph ograph(directed); + pgrouting::UndirectedGraph ograph; ograph.insert_edges(edges); line_graph_edges = line_graph(ograph, directed); } From 78df7388ea4fc4d7701e0d56997f5bde9ded98ea Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 17:23:44 +0000 Subject: [PATCH 195/428] Update locale: commit 8582944d03 --- .../en/LC_MESSAGES/pgrouting_doc_strings.po | 194 ++++++++++++++++-- locale/pot/pgrouting_doc_strings.pot | 156 ++++++++++++-- 2 files changed, 323 insertions(+), 27 deletions(-) diff --git a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po index 534c127aad..c0fecff321 100644 --- a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-05-07 21:31+0000\n" +"POT-Creation-Date: 2024-05-13 17:23+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3889,11 +3889,6 @@ msgstr "" msgid ":doc:`transformation-family`" msgstr "" -msgid "" -":doc:`pgr_lineGraph` - Transformation algorithm for generating a Line " -"Graph." -msgstr "" - msgid "" ":doc:`pgr_lineGraphFull` - Transformation algorithm for generating a Line" " Graph out of each vertex in the input graph." @@ -4429,6 +4424,24 @@ msgstr "" msgid "Added ``pred`` result columns." msgstr "" +msgid "Experimental promoted to proposed." +msgstr "" + +msgid "" +"`#2635 `__ " +"pgr_LineGraph ignores directed flag and use negative values for " +"identifiers." +msgstr "" + +msgid "``pgr_lineGraph``" +msgstr "" + +msgid "Promoted to **proposed** signature." +msgstr "" + +msgid "Works for directed and undirected graphs." +msgstr "" + msgid "Code enhancement" msgstr "" @@ -12518,7 +12531,7 @@ msgid "" "`__" msgstr "" -msgid "``pgr_lineGraph`` - Experimental" +msgid "pgr_lineGraph - Proposed" msgstr "" msgid "" @@ -12526,18 +12539,34 @@ msgid "" "edge-based graph." msgstr "" -msgid "Given a graph G, its line graph L(G) is a graph such that:" +msgid "Given a graph :math:`G`, its line graph :math:`L(G)` is a graph such that:" +msgstr "" + +msgid "Each vertex of :math:`L(G)` represents an edge of :math:`G`." msgstr "" -msgid "Each vertex of L(G) represents an edge of G" +msgid "" +"Two vertices of :math:`L(G)` are adjacent if and only if their " +"corresponding edges share a common endpoint in :math:`G`" msgstr "" msgid "" -"Two vertices of L(G) are adjacent if and only if their corresponding " -"edges share a common endpoint in G." +"The ``cost`` and ``reverse_cost`` columns of the result represent " +"existence of the edge." +msgstr "" + +msgid "When the graph is directed the result is directed." msgstr "" -msgid "Currently works for undirected graph." +msgid "" +"To get the complete Line Graph use unique identifiers on the double way " +"edges (See `Additional Examples`_)." +msgstr "" + +msgid "When the graph is undirected the result is undirected." +msgstr "" + +msgid "The ``reverse_cost`` is always :math:`-1`." msgstr "" msgid "pgr_lineGraph(`Edges SQL`_, [``directed``])" @@ -12546,7 +12575,7 @@ msgstr "" msgid "Returns set of |result-lineg|" msgstr "" -msgid "For an **undirected** graph" +msgid "For an undirected graph with edges :math:'{2,4,5,8}'" msgstr "" msgid "Gives a local identifier for the edge" @@ -12580,7 +12609,134 @@ msgid "" "it’s not part of the graph." msgstr "" -msgid "https://en.wikipedia.org/wiki/Line_graph" +msgid "Given the following directed graph" +msgstr "" + +msgid "" +":math:`G(V,E) = G(\\{1,2,3,4\\},\\{ 1 \\rightarrow 2, 1 \\rightarrow 4, 2" +" \\rightarrow 3, 3 \\rightarrow 1, 3 \\rightarrow 2, 3 \\rightarrow 4, 4 " +"\\rightarrow 3\\})`" +msgstr "" + +msgid "Representation as directed with shared edge identifiers" +msgstr "" + +msgid "" +"For the simplicity, the design of the edges table on the database, has " +"the edge's identifiers are represented with 3 digits:" +msgstr "" + +msgid "hundreds" +msgstr "" + +msgid "the source vertex" +msgstr "" + +msgid "tens" +msgstr "" + +msgid "always 0, acts as a separator" +msgstr "" + +msgid "units" +msgstr "" + +msgid "the target vertex" +msgstr "" + +msgid "In this image," +msgstr "" + +msgid "Single or double head arrows represent one edge (row) on the edges table." +msgstr "" + +msgid "The numbers in the yellow shadow are the edge identifiers." +msgstr "" + +msgid "" +"Two pair of edges share the same identifier when the ``reverse_cost`` " +"column is used." +msgstr "" + +msgid "" +"Edges :math:`{2 \\rightarrow 3, 3 \\rightarrow 2}` are represented with " +"one edge row with :math:`id=203`." +msgstr "" + +msgid "" +"Edges :math:`{3 \\rightarrow 4, 4 \\rightarrow 3}` are represented with " +"one edge row with :math:`id=304`." +msgstr "" + +msgid "The graph can be created as follows:" +msgstr "" + +msgid "Line Graph of a directed graph represented with shared edges" +msgstr "" + +msgid "The result is a directed graph." +msgstr "" + +msgid "" +"For :math:`seq=4` from :math:`203 \\leftrightarrow 304` represent two " +"edges" +msgstr "" + +msgid "For all the other values of ``seq`` represent one edge." +msgstr "" + +msgid "" +"The ``cost`` and ``reverse_cost`` values represent the existence of the " +"edge." +msgstr "" + +msgid "When positive: the edge exists." +msgstr "" + +msgid "When negative: the edge does not exist." +msgstr "" + +msgid "Representation as directed with unique edge identifiers" +msgstr "" + +msgid "Single head arrows represent one edge (row) on the edges table." +msgstr "" + +msgid "There are no double head arrows" +msgstr "" + +msgid "" +"Two pair of edges share the same ending nodes and the ``reverse_cost`` " +"column is not used." +msgstr "" + +msgid "" +"Edges :math:`{2 \\rightarrow 3, 3 \\rightarrow 2}` are represented with " +"two edges :math:`id=203` and :math:`id=302` respectively." +msgstr "" + +msgid "" +"Edges :math:`{3 \\rightarrow 4, 4 \\rightarrow 3}` are represented with " +"two edges :math:`id=304` and :math:`id=403` respectively." +msgstr "" + +msgid "Line Graph of a directed graph represented with unique edges" +msgstr "" + +msgid "" +"For :math:`seq=7` from :math:`203 \\leftrightarrow 302` represent two " +"edges." +msgstr "" + +msgid "" +"For :math:`seq=8` from :math:`304 \\leftrightarrow 403` represent two " +"edges." +msgstr "" + +msgid "wikipedia: `Line Graph `__" +msgstr "" + +msgid "mathworld: `Line Graph `__" msgstr "" msgid "``pgr_lineGraphFull`` - Experimental" @@ -12829,6 +12985,9 @@ msgstr "" msgid "Routing from :math:`5` to :math:`1`" msgstr "" +msgid "https://en.wikipedia.org/wiki/Line_graph" +msgstr "" + msgid "https://en.wikipedia.org/wiki/Complete_graph" msgstr "" @@ -15284,6 +15443,11 @@ msgid "" "edge table information." msgstr "" +msgid "" +":doc:`pgr_lineGraph` - Transformation algorithm for generating a Line " +"Graph." +msgstr "" + msgid ":doc:`pgr_withPointsVia`" msgstr "" @@ -18169,7 +18333,7 @@ msgstr "" msgid "Additional functions to analyze a graph:" msgstr "" -msgid "Transformation - Family of functions (Experimental)" +msgid "Transformation - Family of functions" msgstr "" msgid "" diff --git a/locale/pot/pgrouting_doc_strings.pot b/locale/pot/pgrouting_doc_strings.pot index d0cde1910d..61964b7e90 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-05-07 21:31+0000\n" +"POT-Creation-Date: 2024-05-13 17:23+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3514,9 +3514,6 @@ msgstr "" msgid ":doc:`transformation-family`" msgstr "" -msgid ":doc:`pgr_lineGraph` - Transformation algorithm for generating a Line Graph." -msgstr "" - msgid ":doc:`pgr_lineGraphFull` - Transformation algorithm for generating a Line Graph out of each vertex in the input graph." msgstr "" @@ -3970,6 +3967,21 @@ msgstr "" msgid "Added ``pred`` result columns." msgstr "" +msgid "Experimental promoted to proposed." +msgstr "" + +msgid "`#2635 `__ pgr_LineGraph ignores directed flag and use negative values for identifiers." +msgstr "" + +msgid "``pgr_lineGraph``" +msgstr "" + +msgid "Promoted to **proposed** signature." +msgstr "" + +msgid "Works for directed and undirected graphs." +msgstr "" + msgid "Code enhancement" msgstr "" @@ -10747,22 +10759,34 @@ msgstr "" msgid "`Wikipedia: dominator tree `__" msgstr "" -msgid "``pgr_lineGraph`` - Experimental" +msgid "pgr_lineGraph - Proposed" msgstr "" msgid "``pgr_lineGraph`` — Transforms the given graph into its corresponding edge-based graph." msgstr "" -msgid "Given a graph G, its line graph L(G) is a graph such that:" +msgid "Given a graph :math:`G`, its line graph :math:`L(G)` is a graph such that:" +msgstr "" + +msgid "Each vertex of :math:`L(G)` represents an edge of :math:`G`." +msgstr "" + +msgid "Two vertices of :math:`L(G)` are adjacent if and only if their corresponding edges share a common endpoint in :math:`G`" +msgstr "" + +msgid "The ``cost`` and ``reverse_cost`` columns of the result represent existence of the edge." +msgstr "" + +msgid "When the graph is directed the result is directed." msgstr "" -msgid "Each vertex of L(G) represents an edge of G" +msgid "To get the complete Line Graph use unique identifiers on the double way edges (See `Additional Examples`_)." msgstr "" -msgid "Two vertices of L(G) are adjacent if and only if their corresponding edges share a common endpoint in G." +msgid "When the graph is undirected the result is undirected." msgstr "" -msgid "Currently works for undirected graph." +msgid "The ``reverse_cost`` is always :math:`-1`." msgstr "" msgid "pgr_lineGraph(`Edges SQL`_, [``directed``])" @@ -10771,7 +10795,7 @@ msgstr "" msgid "Returns set of |result-lineg|" msgstr "" -msgid "For an **undirected** graph" +msgid "For an undirected graph with edges :math:'{2,4,5,8}'" msgstr "" msgid "Gives a local identifier for the edge" @@ -10801,7 +10825,109 @@ msgstr "" msgid "When `negative`: edge (``target``, ``source``) does not exist, therefore it’s not part of the graph." msgstr "" -msgid "https://en.wikipedia.org/wiki/Line_graph" +msgid "Given the following directed graph" +msgstr "" + +msgid ":math:`G(V,E) = G(\\{1,2,3,4\\},\\{ 1 \\rightarrow 2, 1 \\rightarrow 4, 2 \\rightarrow 3, 3 \\rightarrow 1, 3 \\rightarrow 2, 3 \\rightarrow 4, 4 \\rightarrow 3\\})`" +msgstr "" + +msgid "Representation as directed with shared edge identifiers" +msgstr "" + +msgid "For the simplicity, the design of the edges table on the database, has the edge's identifiers are represented with 3 digits:" +msgstr "" + +msgid "hundreds" +msgstr "" + +msgid "the source vertex" +msgstr "" + +msgid "tens" +msgstr "" + +msgid "always 0, acts as a separator" +msgstr "" + +msgid "units" +msgstr "" + +msgid "the target vertex" +msgstr "" + +msgid "In this image," +msgstr "" + +msgid "Single or double head arrows represent one edge (row) on the edges table." +msgstr "" + +msgid "The numbers in the yellow shadow are the edge identifiers." +msgstr "" + +msgid "Two pair of edges share the same identifier when the ``reverse_cost`` column is used." +msgstr "" + +msgid "Edges :math:`{2 \\rightarrow 3, 3 \\rightarrow 2}` are represented with one edge row with :math:`id=203`." +msgstr "" + +msgid "Edges :math:`{3 \\rightarrow 4, 4 \\rightarrow 3}` are represented with one edge row with :math:`id=304`." +msgstr "" + +msgid "The graph can be created as follows:" +msgstr "" + +msgid "Line Graph of a directed graph represented with shared edges" +msgstr "" + +msgid "The result is a directed graph." +msgstr "" + +msgid "For :math:`seq=4` from :math:`203 \\leftrightarrow 304` represent two edges" +msgstr "" + +msgid "For all the other values of ``seq`` represent one edge." +msgstr "" + +msgid "The ``cost`` and ``reverse_cost`` values represent the existence of the edge." +msgstr "" + +msgid "When positive: the edge exists." +msgstr "" + +msgid "When negative: the edge does not exist." +msgstr "" + +msgid "Representation as directed with unique edge identifiers" +msgstr "" + +msgid "Single head arrows represent one edge (row) on the edges table." +msgstr "" + +msgid "There are no double head arrows" +msgstr "" + +msgid "Two pair of edges share the same ending nodes and the ``reverse_cost`` column is not used." +msgstr "" + +msgid "Edges :math:`{2 \\rightarrow 3, 3 \\rightarrow 2}` are represented with two edges :math:`id=203` and :math:`id=302` respectively." +msgstr "" + +msgid "Edges :math:`{3 \\rightarrow 4, 4 \\rightarrow 3}` are represented with two edges :math:`id=304` and :math:`id=403` respectively." +msgstr "" + +msgid "Line Graph of a directed graph represented with unique edges" +msgstr "" + +msgid "For :math:`seq=7` from :math:`203 \\leftrightarrow 302` represent two edges." +msgstr "" + +msgid "For :math:`seq=8` from :math:`304 \\leftrightarrow 403` represent two edges." +msgstr "" + +msgid "wikipedia: `Line Graph `__" +msgstr "" + +msgid "mathworld: `Line Graph `__" msgstr "" msgid "``pgr_lineGraphFull`` - Experimental" @@ -10999,6 +11125,9 @@ msgstr "" msgid "Routing from :math:`5` to :math:`1`" msgstr "" +msgid "https://en.wikipedia.org/wiki/Line_graph" +msgstr "" + msgid "https://en.wikipedia.org/wiki/Complete_graph" msgstr "" @@ -12985,6 +13114,9 @@ msgstr "" msgid ":doc:`pgr_extractVertices` - Extracts vertex information based on the edge table information." msgstr "" +msgid ":doc:`pgr_lineGraph` - Transformation algorithm for generating a Line Graph." +msgstr "" + msgid ":doc:`pgr_withPointsVia`" msgstr "" @@ -15367,7 +15499,7 @@ msgstr "" msgid "Additional functions to analyze a graph:" msgstr "" -msgid "Transformation - Family of functions (Experimental)" +msgid "Transformation - Family of functions" msgstr "" msgid "This family of functions is used for transforming a given input graph :math:`G(V,E)` into a new graph :math:`G'(V',E')`." From 373f9d9a3d6dc058a78e360765aea77e7d8a4847 Mon Sep 17 00:00:00 2001 From: Weblate Date: Fri, 5 Jan 2024 02:56:42 +0000 Subject: [PATCH 196/428] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Co-authored-by: Weblate Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/ Translation: pgRouting/pgRouting --- .../de/LC_MESSAGES/pgrouting_doc_strings.po | 310 +- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 2981 ++++++++-------- .../ja/LC_MESSAGES/pgrouting_doc_strings.po | 330 +- .../ko/LC_MESSAGES/pgrouting_doc_strings.po | 312 +- .../LC_MESSAGES/pgrouting_doc_strings.po | 3081 +++++++++-------- 5 files changed, 3622 insertions(+), 3392 deletions(-) diff --git a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po index 5d674bbd85..ce8e41bb3d 100644 --- a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-19 19:56+0000\n" +"POT-Creation-Date: 2024-01-04 04:09+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -261,8 +261,8 @@ msgid "" msgstr "" msgid "" -"`Wikipedia: Prim's algorithm `__" +"`Wikipedia: Prim's algorithm `__" msgstr "" msgid "" @@ -2644,8 +2644,8 @@ msgid "" msgstr "" msgid "" -"The **aggregate cost** the non included values :math:`(u, v)` is :math:`" -"\\infty`" +"The **aggregate cost** the non included values :math:`(u, v)` is :math:" +"`\\infty`" msgstr "" msgid "" @@ -3401,8 +3401,8 @@ msgid "Can be used as input to :doc:`pgr_TSP`." msgstr "" msgid "" -"Use directly when the resulting matrix is symmetric and there is no :math:`" -"\\infty` value." +"Use directly when the resulting matrix is symmetric and there is no :math:" +"`\\infty` value." msgstr "" msgid "It will be the users responsibility to make the matrix symmetric." @@ -3686,9 +3686,9 @@ msgid "" "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}`" +"\\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" @@ -3712,8 +3712,8 @@ msgid "Then:" msgstr "" msgid "" -":math:`\\boldsymbol{\\pi} = \\{(path\\_seq_i, node_i, edge_i, cost_i, agg" -"\\_cost_i)\\}`" +":math:`\\boldsymbol{\\pi} = \\{(path\\_seq_i, node_i, edge_i, cost_i, " +"agg\\_cost_i)\\}`" msgstr "" msgid "where:" @@ -4172,8 +4172,8 @@ msgid "pgr_maxFlow :math:`(edges\\_sql, source\\_vertex, sink\\_vertex)`" msgstr "" msgid "" -"where :math:`edges\\_sql = \\{(id_i, source_i, target_i, capacity_i, reverse" -"\\_capacity_i)\\}`" +"where :math:`edges\\_sql = \\{(id_i, source_i, target_i, capacity_i, " +"reverse\\_capacity_i)\\}`" msgstr "" msgid "Graph definition" @@ -4195,8 +4195,8 @@ msgid "" "\\text{ when } capacity > 0 \\} & \\quad \\text{ if } reverse\\_capacity = " "\\varnothing \\\\ \\text{ } & \\quad \\text{ } \\\\ \\{(source_i, target_i, " "capacity_i) \\text{ when } capacity > 0 \\} & \\text{ } \\\\ \\cup " -"\\{(target_i, source_i, reverse\\_capacity_i) \\text{ when } reverse" -"\\_capacity_i > 0)\\} & \\quad \\text{ if } reverse\\_capacity \\neq " +"\\{(target_i, source_i, reverse\\_capacity_i) \\text{ when } " +"reverse\\_capacity_i > 0)\\} & \\quad \\text{ if } reverse\\_capacity \\neq " "\\varnothing \\\\ \\end{cases}`" msgstr "" @@ -5473,8 +5473,8 @@ msgstr "" msgid "" ":math:`E = \\begin{split} \\begin{align} & {\\{(source_{id}, target_{id}, " "cost_{id}) \\text{ when } cost_{id} >=0 \\}} \\\\ & \\cup \\\\ & " -"{\\{(target_{id}, source_{id}, reverse\\_cost_{id}) \\text{ when } reverse" -"\\_cost_{id} >=0 \\}} \\end{align} \\end{split}`" +"{\\{(target_{id}, source_{id}, reverse\\_cost_{id}) \\text{ when } " +"reverse\\_cost_{id} >=0 \\}} \\end{align} \\end{split}`" msgstr "" msgid "" @@ -6819,7 +6819,7 @@ msgid "Upgrading the database" msgstr "" msgid "" -"To upgrade pgRouting in the database to version 3.6.0 use the following " +"To upgrade pgRouting in the database to version 3.7.0 use the following " "command:" msgstr "" @@ -7153,13 +7153,13 @@ msgstr "" msgid "This Release Contributors" msgstr "" -msgid "Individuals in this release (in alphabetical order)" +msgid "Individuals in this release v3.7.x (in alphabetical order)" msgstr "" -msgid "" -"Aniket Agarwal, Aryan Gupta, Ashish Kumar, Cayetano Benavent, Daniel Kastl, " -"Nitish Chauhan, Rajat Shinde, Regina Obe, Shobhit Chaurasia, Swapnil Joshi, " -"Virginia Vergara, Yige Huang" +msgid "(Alphabetical order)" +msgstr "" + +msgid "Regina Obe, Vicky Vergara" msgstr "" msgid "" @@ -7176,7 +7176,10 @@ msgid "" "or direct monetary funding to the pgRouting project:" msgstr "" -msgid "`Georepublic `__" +msgid "`OSGeo `__" +msgstr "" + +msgid "`OSGeo UK `__" msgstr "" msgid "`Google Summer of Code `__" @@ -7230,6 +7233,12 @@ msgstr "" msgid "Orkney" msgstr "" +msgid "OSGeo" +msgstr "" + +msgid "OSGeo UK" +msgstr "" + msgid "Paragon Corporation" msgstr "" @@ -7255,9 +7264,7 @@ msgstr "" msgid "Boost C++ source libraries at https://www.boost.org." msgstr "" -msgid "" -"The Migration guide from 2.6 can be found at https://github.com/pgRouting/" -"pgrouting/wiki/Migration-Guide." +msgid ":doc:`migration`" msgstr "" msgid "pgr_KSP" @@ -8737,8 +8744,8 @@ msgid "Using a combinations table on an **undirected** graph" msgstr "" msgid "" -"https://www.cs.princeton.edu/courses/archive/spr06/cos423/Handouts/EPP" -"%20shortest%20path%20algorithms.pdf" +"https://www.cs.princeton.edu/courses/archive/spr06/cos423/Handouts/" +"EPP%20shortest%20path%20algorithms.pdf" msgstr "" msgid "https://en.wikipedia.org/wiki/Bidirectional_search" @@ -9113,8 +9120,9 @@ msgid "The odd length cyclic graph can not be bipartite." msgstr "" msgid "" -"The edge :math:`5 \\rightarrow 1` will make subgraph with vertices :math:`" -"\\{1, 3, 7, 6, 5\\}` an odd length cyclic graph, as the cycle has 5 vertices." +"The edge :math:`5 \\rightarrow 1` will make subgraph with vertices :math:" +"`\\{1, 3, 7, 6, 5\\}` an odd length cyclic graph, as the cycle has 5 " +"vertices." msgstr "" msgid "Edges in blue represent odd length cycle subgraph." @@ -10005,8 +10013,8 @@ msgid "" msgstr "" msgid "" -"`Wikipedia: Cuthill-McKee Ordering `__" +"`Wikipedia: Cuthill-McKee Ordering `__" msgstr "" msgid "pgr_dagShortestPath - Experimental" @@ -12758,9 +12766,6 @@ msgstr "" msgid "Identifier of the edge in the original query." msgstr "" -msgid ":doc:`migration`" -msgstr "" - msgid "https://www.boost.org/libs/graph/doc/maximum_matching.html" msgstr "" @@ -15066,8 +15071,8 @@ msgid "" msgstr "" msgid "" -"Wikipedia: `Prim's algorithm `__" +"Wikipedia: `Prim's algorithm `__" msgstr "" msgid "Proposed Functions" @@ -15136,13 +15141,44 @@ msgid "" "github.com/pgRouting/pgrouting/commits>`_ on Github." msgstr "" +msgid "pgRouting 3.7.0 Release Notes" +msgstr "" + +msgid "" +"To see all issues & pull requests closed by this release see the `Git closed " +"milestone for 3.7.0 `_" +msgstr "" + +msgid "Code enhancement" +msgstr "" + +msgid "" +"`#2599 `__ Driving " +"distance cleanup" +msgstr "" + +msgid "pgRouting 3.6.1 Release Notes" +msgstr "" + +msgid "" +"To see all issues & pull requests closed by this release see the `Git closed " +"milestone for 3.6.1 `_" +msgstr "" + +msgid "" +"`#2588 `__ pgrouting 3.6.0 " +"fails to build on OSX" +msgstr "" + msgid "pgRouting 3.6.0 Release Notes" msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.6.0 `_" +"milestone for 3.6.0 `_" msgstr "" msgid "Official functions changes" @@ -15261,8 +15297,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.5.1 `_" +"milestone for 3.5.1 `_" msgstr "" msgid "Documentation fixes" @@ -15330,8 +15366,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.5.0 `_" +"milestone for 3.5.0 `_" msgstr "" msgid "Dijkstra" @@ -15352,8 +15388,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.4.2 `_" +"milestone for 3.4.2 `_" msgstr "" msgid "" @@ -15372,8 +15408,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.4.1 `_" +"milestone for 3.4.1 `_" msgstr "" msgid "" @@ -15391,8 +15427,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.4.0 `_" +"milestone for 3.4.0 `_" msgstr "" msgid "" @@ -15504,8 +15540,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.3.4 `_" +"milestone for 3.3.4 `_" msgstr "" msgid "" @@ -15518,8 +15554,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.3.3 `_" +"milestone for 3.3.3 `_" msgstr "" msgid "" @@ -15532,8 +15568,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.3.2 `_" +"milestone for 3.3.2 `_" msgstr "" msgid "Revised documentation" @@ -15586,8 +15622,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.3.1 `_ on Github." +"milestone for 3.3.1 `_ on Github." msgstr "" msgid "" @@ -15605,8 +15641,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.3.0 `_ on Github." +"milestone for 3.3.0 `_ on Github." msgstr "" msgid "" @@ -15693,8 +15729,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.2.2 `_ on Github." +"milestone for 3.2.2 `_ on Github." msgstr "" msgid "" @@ -15712,8 +15748,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.2.1 `_ on Github." +"milestone for 3.2.1 `_ on Github." msgstr "" msgid "" @@ -15737,8 +15773,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.2.0 `_ on Github." +"milestone for 3.2.0 `_ on Github." msgstr "" msgid "Build" @@ -15829,8 +15865,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.1.4 `_ on Github." +"milestone for 3.1.4 `_ on Github." msgstr "" msgid "Issues fixes" @@ -15841,8 +15877,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.1.3 `_ on Github." +"milestone for 3.1.3 `_ on Github." msgstr "" msgid "" @@ -15865,8 +15901,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.1.2 `_ on Github." +"milestone for 3.1.2 `_ on Github." msgstr "" msgid "" @@ -15899,8 +15935,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.1.1 `_ on Github." +"milestone for 3.1.1 `_ on Github." msgstr "" msgid "" @@ -15933,8 +15969,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.1.0 `_ on Github." +"milestone for 3.1.0 `_ on Github." msgstr "" msgid "pgr_dijkstra(combinations)" @@ -15954,8 +15990,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.0.6 `_ on Github." +"milestone for 3.0.6 `_ on Github." msgstr "" msgid "pgRouting 3.0.5 Release Notes" @@ -15963,8 +15999,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.0.5 `_ on Github." +"milestone for 3.0.5 `_ on Github." msgstr "" msgid "Backport issue fixes" @@ -15975,8 +16011,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.0.4 `_ on Github." +"milestone for 3.0.4 `_ on Github." msgstr "" msgid "pgRouting 3.0.3 Release Notes" @@ -15987,8 +16023,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.0.2 `_ on Github." +"milestone for 3.0.2 `_ on Github." msgstr "" msgid "" @@ -16001,8 +16037,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.0.1 `_ on Github." +"milestone for 3.0.1 `_ on Github." msgstr "" msgid "" @@ -16015,8 +16051,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.0.0 `_ on Github." +"milestone for 3.0.0 `_ on Github." msgstr "" msgid "Fixed Issues" @@ -16375,8 +16411,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.6.3 `_ on Github." +"2.6.3 `_ on Github." msgstr "" msgid "" @@ -16399,8 +16435,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.6.2 `_ on Github." +"2.6.2 `_ on Github." msgstr "" msgid "" @@ -16423,8 +16459,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.6.1 `_ on Github." +"2.6.1 `_ on Github." msgstr "" msgid "Fixes server crash on several functions." @@ -16516,8 +16552,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.6.0 `_ on Github." +"2.6.0 `_ on Github." msgstr "" msgid "pgr_lineGraphFull" @@ -16565,8 +16601,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.5.5 `_ on Github." +"2.5.5 `_ on Github." msgstr "" msgid "Fixes driving distance when vertex is not part of the graph" @@ -16583,8 +16619,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.5.4 `_ on Github." +"2.5.4 `_ on Github." msgstr "" msgid "pgRouting 2.5.3 Release Notes" @@ -16592,8 +16628,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.5.3 `_ on Github." +"2.5.3 `_ on Github." msgstr "" msgid "" @@ -16606,8 +16642,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.5.2 `_ on Github." +"2.5.2 `_ on Github." msgstr "" msgid "Fix for postgresql 10.1: Removed a compiler condition" @@ -16618,8 +16654,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.5.1 `_ on Github." +"2.5.1 `_ on Github." msgstr "" msgid "Fixed prerequisite minimum version of: cmake" @@ -16630,8 +16666,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.5.0 `_ on Github." +"2.5.0 `_ on Github." msgstr "" msgid "enhancement:" @@ -16702,8 +16738,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.4.2 `_ on Github." +"2.4.2 `_ on Github." msgstr "" msgid "Improvement" @@ -16724,8 +16760,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.4.1 `_ on Github." +"2.4.1 `_ on Github." msgstr "" msgid "Fixed compiling error on macOS" @@ -16739,8 +16775,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.4.0 `_ on Github." +"2.4.0 `_ on Github." msgstr "" msgid "pgr_bdDijkstra" @@ -16793,8 +16829,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.3.2 `_ on Github." +"2.3.2 `_ on Github." msgstr "" msgid "Fixed pgr_gsoc_vrppdtw crash when all orders fit on one truck." @@ -16814,8 +16850,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.3.1 `_ on Github." +"2.3.1 `_ on Github." msgstr "" msgid "Leaks on proposed max_flow functions" @@ -16832,8 +16868,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.3.0 `_ on Github." +"2.3.0 `_ on Github." msgstr "" msgid "pgr_TSP" @@ -16916,8 +16952,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.2.4 `_ on Github." +"2.2.4 `_ on Github." msgstr "" msgid "Bogus uses of extern \"C\"" @@ -16934,8 +16970,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.2.3 `_ on Github." +"2.2.3 `_ on Github." msgstr "" msgid "Fixed compatibility issues with PostgreSQL 9.6." @@ -16946,8 +16982,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.2.2 `_ on Github." +"2.2.2 `_ on Github." msgstr "" msgid "Fixed regression error on pgr_drivingDistance" @@ -16958,8 +16994,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.2.1 `_ on Github." +"2.2.1 `_ on Github." msgstr "" msgid "Server crash fix on pgr_alphaShape" @@ -16973,8 +17009,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.2.0 `_ on Github." +"2.2.0 `_ on Github." msgstr "" msgid "Improvements" @@ -17066,8 +17102,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.1.0 `_ on Github." +"2.1.0 `_ on Github." msgstr "" msgid "pgr_dijkstra(one to many)" @@ -17215,8 +17251,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.0.0 `_ on Github." +"2.0.0 `_ on Github." msgstr "" msgid "" @@ -17341,8 +17377,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for 1.x " -"`_ on Github. The following release notes have been copied " +"`_ on Github. The following release notes have been copied " "from the previous ``RELEASE_NOTES`` file and are kept as a reference." msgstr "" diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index a36a6da29c..d3b129a9db 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-13 18:09+0000\n" +"POT-Creation-Date: 2024-01-04 04:09+0000\n" "PO-Revision-Date: 2023-10-21 03:23+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish `__" msgid "" -"`Wikipedia: Prim's algorithm `__" +"`Wikipedia: Prim's algorithm `__" msgstr "" -"`Wikipedia: algoritmo de Prim `__" +"`Wikipedia: algoritmo de Prim `__" msgid "" "`Wikipedia: Kruskal's algorithm =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}`" +"\\cup \\{(source_i, target_i, reverse\\_cost_i) \\text{ when } " +"reverse\\_cost_i >=0)\\} & \\quad \\text{ if } reverse\\_cost \\neq " +"\\varnothing \\\\ \\end{cases}`" msgstr "" ":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) " +"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}`" @@ -4160,11 +4156,11 @@ msgid "Then:" msgstr "Entonces:" msgid "" -":math:`\\boldsymbol{\\pi} = \\{(path\\_seq_i, node_i, edge_i, cost_i, agg" -"\\_cost_i)\\}`" +":math:`\\boldsymbol{\\pi} = \\{(path\\_seq_i, node_i, edge_i, cost_i, " +"agg\\_cost_i)\\}`" msgstr "" -":math:`\\boldsymbol{\\pi} = \\{(path\\_seq_i, node_i, edge_i, cost_i, agg" -"\\_cost_i)\\}`" +":math:`\\boldsymbol{\\pi} = \\{(path\\_seq_i, node_i, edge_i, cost_i, " +"agg\\_cost_i)\\}`" msgid "where:" msgstr "donde:" @@ -4213,7 +4209,7 @@ msgstr "" msgid "" "In other words: The algorithm returns a the shortest path between :math:" "`start_{vid}` and :math:`end_{vid}`, if it exists, in terms of a sequence of " -"nodes and of edges," +"nodes and of edges," msgstr "" "En otras palabras: El algoritmo devuelve la ruta más corta entre :math:" "`start_{vid}` y :math:`end_{vid}`, si es que existe, en términos de una " @@ -4313,6 +4309,33 @@ msgstr "**distancia**" msgid "Upper limit for the inclusion of a node in the result." msgstr "Límite superior para la inclusión del nodo en el resultado." +msgid "Returns set of |result-spantree|" +msgstr "Regresa el conjunto de |result-spantree|" + +msgid ":math:`depth-1` is the depth of ``pred``" +msgstr ":math:`depth-1` es la profundidad de ``pred``" + +msgid "``pred``" +msgstr "``pred``" + +msgid "Predecessor of ``node``." +msgstr "Presdecesor de ``node``." + +msgid "When ``node`` = ``start_vid`` then has the value ``node``." +msgstr "Cuando ``node`` = ``start_vid`` entonces tiene el valor ``node``." + +msgid "Identifier of the ``edge`` used to arrive from ``pred`` to ``node``." +msgstr "" +"Identificador del ``edge`` utilizado para llegar desde ``pred`` hasta " +"``node``." + +msgid "" +"Column ``pred`` only applies to :doc:`pgr_drivingDistance` and :doc:" +"`pgr_withPointsDD`." +msgstr "" +"La columna ``pred`` sólo se aplica a :doc:`pgr_drivingDistance` y :doc:" +"`pgr_withPointsDD`." + msgid "Experimental Functions" msgstr "Funciones Experimentales" @@ -4388,7 +4411,7 @@ msgstr "Categorías" msgid ":doc:`VRP-category`" msgstr ":doc:`VRP-category`" -msgid "Not classified" +msgid "Unclassified" msgstr "No clasificado" msgid ":doc:`pgr_bellmanFord`" @@ -4552,13 +4575,13 @@ msgstr ":doc:`pgr_maxFlowMinCost`" msgid ":doc:`pgr_maxFlowMinCost_Cost`" msgstr ":doc:`pgr_maxFlowMinCost_Cost`" -msgid "Capacity of the edge (``source``, ``target``)" +msgid "Capacity of the edge (``source``, ``target``)" msgstr "Capacidad de la arista (``source``, ``target``)" msgid "Capacity of the edge (``target``, ``source``)" msgstr "Capacidad de la arista (``target``, ``source``)" -msgid "Weight of the edge (``source``, ``target``) if it exist" +msgid "Weight of the edge (``source``, ``target``) if it exist" msgstr "Peso de la arista (``source``, ``target``) si existe" msgid "Weight of the edge (``target``, ``source``) if it exist" @@ -4672,11 +4695,11 @@ msgid "pgr_maxFlow :math:`(edges\\_sql, source\\_vertex, sink\\_vertex)`" msgstr "pgr_maxFlow :math:`(edges\\_sql, source\\_vertex, sink\\_vertex)`" msgid "" -"where :math:`edges\\_sql = \\{(id_i, source_i, target_i, capacity_i, reverse" -"\\_capacity_i)\\}`" +"where :math:`edges\\_sql = \\{(id_i, source_i, target_i, capacity_i, " +"reverse\\_capacity_i)\\}`" msgstr "" -"donde: :math:`edges\\_sql = \\{(id_i, source_i, target_i, capacity_i, reverse" -"\\_capacity_i)\\}`" +"donde: :math:`edges\\_sql = \\{(id_i, source_i, target_i, capacity_i, " +"reverse\\_capacity_i)\\}`" msgid "Graph definition" msgstr "Definición de grafo" @@ -4684,6 +4707,9 @@ msgstr "Definición de grafo" msgid "The weighted directed graph, :math:`G(V,E)`, is defined as:" msgstr "El grafo ponderado dirigido, :math:`G(V,E)`, se define como:" +msgid "the set of vertices :math:`V`" +msgstr "Conjunto de vértices :math:`V`" + msgid "" ":math:`source\\_vertex \\cup sink\\_vertex \\bigcup source_i \\bigcup " "target_i`" @@ -4696,16 +4722,16 @@ msgid "" "\\text{ when } capacity > 0 \\} & \\quad \\text{ if } reverse\\_capacity = " "\\varnothing \\\\ \\text{ } & \\quad \\text{ } \\\\ \\{(source_i, target_i, " "capacity_i) \\text{ when } capacity > 0 \\} & \\text{ } \\\\ \\cup " -"\\{(target_i, source_i, reverse\\_capacity_i) \\text{ when } reverse" -"\\_capacity_i > 0)\\} & \\quad \\text{ if } reverse\\_capacity \\neq " +"\\{(target_i, source_i, reverse\\_capacity_i) \\text{ when } " +"reverse\\_capacity_i > 0)\\} & \\quad \\text{ if } reverse\\_capacity \\neq " "\\varnothing \\\\ \\end{cases}`" msgstr "" ":math:`E = \\begin{cases} \\text{ } \\{(source_i, target_i, capacity_i) " "\\text{ when } capacity > 0 \\} & \\quad \\text{ if } reverse\\_capacity = " "\\varnothing \\\\ \\text{ } & \\quad \\text{ } \\\\ \\{(source_i, target_i, " "capacity_i) \\text{ when } capacity > 0 \\} & \\text{ } \\\\ \\cup " -"\\{(target_i, source_i, reverse\\_capacity_i) \\text{ when } reverse" -"\\_capacity_i > 0)\\} & \\quad \\text{ if } reverse\\_capacity \\neq " +"\\{(target_i, source_i, reverse\\_capacity_i) \\text{ when } " +"reverse\\_capacity_i > 0)\\} & \\quad \\text{ if } reverse\\_capacity \\neq " "\\varnothing \\\\ \\end{cases}`" msgid "Maximum flow problem" @@ -4845,9 +4871,9 @@ msgstr "" "el usuario debe tener permisos especiales otorgados por un administrador " "para usarlos." -msgid ":doc:`pgr_createTopology` - create a topology based on the geometry." +msgid ":doc:`pgr_createTopology` - create a topology based on the geometry." msgstr "" -":doc:`pgr_createTopology` - para crear una topología basada en la geometría." +":doc:`pgr_createTopology` - crear una topología basada en la geometría." msgid "" ":doc:`pgr_createVerticesTable` - reconstruct the vertices table based on the " @@ -4857,7 +4883,7 @@ msgstr "" "la información de origen y destino." msgid "" -":doc:`pgr_analyzeGraph` - to analyze the edges and vertices of the edge " +":doc:`pgr_analyzeGraph` - to analyze the edges and vertices of the edge " "table." msgstr "" ":doc:`pgr_analyzeGraph` - para analizar los bordes y vértices de la tabla de " @@ -4867,8 +4893,9 @@ msgid ":doc:`pgr_analyzeOneWay` - to analyze directionality of the edges." msgstr "" ":doc:`pgr_analyzeOneWay` - para analizar la direccionalidad de las aristas." -msgid ":doc:`pgr_nodeNetwork` -to create nodes to a not noded edge table." -msgstr ":doc:`pgr_nodeNetwork` - para crear nodos en una tabla de aristas." +msgid ":doc:`pgr_nodeNetwork` - to create nodes to a not noded edge table." +msgstr "" +":doc:`pgr_nodeNetwork` - para crear nodos a una tabla de aristas sin nodos." msgid ":doc:`pgr_trsp` - Turn Restriction Shortest Path (TRSP)" msgstr ":doc:`pgr_trsp` - Camino más corto con restricción de giros (TRSP)" @@ -5142,9 +5169,8 @@ msgstr "|result-dij-dd|" msgid "to" msgstr "a" -#, fuzzy -msgid "|result-bfs|" -msgstr "Resultados" +msgid "|result-spantree|" +msgstr "|result-spantree|" msgid "``pgr_drivingdistance`` (Single vertex)" msgstr "``pgr_drivingDistance`` (Vértice único)" @@ -5179,6 +5205,9 @@ msgstr "" msgid "``depth`` contains the depth of the ``node``." msgstr "``depth`` contiene la profundidad del ``node``." +msgid "``pred`` contains the predecessor of the ``node``." +msgstr "``pred`` contiene el predecesor del ``nodo``." + msgid "" "If needed filter out the added columns, for example, to return the original " "columns" @@ -5357,6 +5386,9 @@ msgstr "``pgr_withPointsDD`` (Múltiples vértices)" msgid "Output columns were |result-1-1-no-seq|" msgstr "Las columnas de resultados eran |result-1-1-no-seq|" +msgid "Does not have ``start_vid``, ``pred`` and ``depth`` result columns." +msgstr "No tiene columnas de resultados ``start_vid``, ``pred`` y ``depth``." + msgid "" "``driving_side`` parameter was named optional now it is compulsory unamed." msgstr "" @@ -5368,9 +5400,8 @@ msgstr "``pgr_withPointsDD`` (`Vértices múltiples`)" msgid "Output columns were |result-m-1-no-seq|" msgstr "Las columnas de salida eran |result-m-1-no-seq|" -#, fuzzy -msgid "Does not have ``depth`` result column." -msgstr "No tiene un valor de facto." +msgid "Does not have ``depth`` and ``pred`` result columns." +msgstr "No tiene columnas de resultados ``depth`` y ``pred``." msgid "Driving side was optional" msgstr "El lado de manejo era opcional" @@ -5405,20 +5436,18 @@ msgstr "En un grafo dirigido ``b`` podía usarse como **lado de manejo**" msgid "On undirected graph ``r`` could be used as **driving side**" msgstr "En un grafo no dirigido ``r`` podía usarse como **lado de manejo**" -#, fuzzy -msgid "Also ``l`` could be used as **driving side**" -msgstr "``l`` para el manejo del lado izquierdo" +msgid "Also ``l`` could be used as **driving side**" +msgstr "También `` l`` podía usarse como \"lado de manejo\"" msgid "After Migration" msgstr "Después de la migración" -msgid "Be aware of the existance of the additional return columns." +msgid "Be aware of the existance of the additional result Columns." msgstr "" "Tener en cuenta la existencia de las columnas de adicionales de resultados." -#, fuzzy -msgid "New output columns are |result-bfs|" -msgstr "REGRESA CONJUNTO DE |old-generic-result|" +msgid "New output columns are |result-spantree|" +msgstr "Las nuevas columnas de salida son |result-spantree|" msgid "" "**driving side** parameter is unnamed compulsory, and valid values differ " @@ -6108,10 +6137,10 @@ msgstr "" "`source_{id} \\leftrightarrow target_{id}`" msgid "" -"Edge :math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`) is not part of the " +"Edge :math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`) is not part of the " "graph." msgstr "" -"Arista :math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`) no es parte del " +"Arista :math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`) no es parte del " "grafo." msgid "Graph with ``cost`` and ``reverse_cost``" @@ -6129,13 +6158,13 @@ msgstr "El conjunto de aristas :math:`E`:" msgid "" ":math:`E = \\begin{split} \\begin{align} & {\\{(source_{id}, target_{id}, " "cost_{id}) \\text{ when } cost_{id} >=0 \\}} \\\\ & \\cup \\\\ & " -"{\\{(target_{id}, source_{id}, reverse\\_cost_{id}) \\text{ when } reverse" -"\\_cost_{id} >=0 \\}} \\end{align} \\end{split}`" +"{\\{(target_{id}, source_{id}, reverse\\_cost_{id}) \\text{ when } " +"reverse\\_cost_{id} >=0 \\}} \\end{align} \\end{split}`" msgstr "" ":math:`E = \\begin{split} \\begin{align} & {\\{(source_{id}, target_{id}, " "cost_{id}) \\text{ when } cost_{id} >=0 \\}} \\\\ & \\cup \\\\ & " -"{\\{(target_{id}, source_{id}, reverse\\_cost_{id}) \\text{ when } reverse" -"\\_cost_{id} >=0 \\}} \\end{align} \\end{split}`" +"{\\{(target_{id}, source_{id}, reverse\\_cost_{id}) \\text{ when } " +"reverse\\_cost_{id} >=0 \\}} \\end{align} \\end{split}`" msgid "" "Edges :math:`(source \\rightarrow target)` where ``cost`` is non negative " @@ -6151,8 +6180,8 @@ msgstr "" "Aristas :math:`(target \\rightarrow source)` donde ``reverse_cost`` es no " "negativo son parte del grafo." -msgid "The set of vertices :math:`V`:" -msgstr "El conjunto de aristas :math:`V`:" +msgid "The set of vertices :math:`V`:" +msgstr "El conjunto de vértices :math:`V`:" msgid "In a directed graph both edges have directionality" msgstr "En un grafo dirigido ambas aristas tiene direccionalidad" @@ -6174,10 +6203,10 @@ msgstr "" msgid "Edges not part of the graph:" msgstr "Aristas no son parte del grafo:" -msgid ":math:`2` (:math:`1 \\rightarrow 3`)" +msgid ":math:`2` (:math:`1 \\rightarrow 3`)" msgstr ":math:`2` (:math:`1 \\rightarrow 3`)" -msgid ":math:`3` (:math:`3 \\rightarrow 2`)" +msgid ":math:`3` (:math:`3 \\rightarrow 2`)" msgstr ":math:`3` (:math:`3 \\rightarrow 2`)" msgid "In a directed graph both edges do not have directionality" @@ -6206,18 +6235,18 @@ msgstr ":math:`source_i \\leftrightarrow target_i`" msgid ":math:`target_i \\leftrightarrow source_i`" msgstr ":math:`target_i \\leftrightarrow source_i`" -msgid ":math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`)" -msgstr ":math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`)" +msgid ":math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`)" +msgstr ":math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`)" -msgid ":math:`3` (:math:`3 \\frac{\\;\\;\\;\\;\\;}{} 2`)" -msgstr ":math:`3` (:math:`3 \\frac{\\;\\;\\;\\;\\;}{} 2`)" +msgid ":math:`3` (:math:`3 \\frac{\\;\\;\\;\\;\\;}{} 2`)" +msgstr ":math:`3` (:math:`3 \\frac{\\;\\;\\;\\;\\;}{} 2`)" msgid "Graphs without geometries" msgstr "Grafos sin geometrías" msgid "" "Personal relationships, genealogy, file dependency problems can be solved " -"using pgRouting. Those problems, normally, do not come with geometries " +"using pgRouting. Those problems, normally, do not come with geometries " "associated with the graph." msgstr "" "Relaciones personales, genealogía, problemas de dependencia de archivos " @@ -6348,8 +6377,10 @@ msgstr "Creando manualmente la base de datos." msgid "`Graphs without geometries`_" msgstr "`Grafos sin geometrías`_" -msgid ":doc:`sampledata`: a small graph used on the documentation examples" -msgstr ":doc:`sampledata`: un grafo chico usado para ejemplos de documentación" +msgid ":doc:`sampledata`: a small graph used in the documentation examples" +msgstr "" +":doc:`sampledata`: un pequeño grafo utilizado en los ejemplos de la " +"documentación" msgid "" "Using `osm2pgrouting `__ page." msgstr "" "Edita una página existente `Wiki de pgRouting `__" -msgstr "`Georepublic `__" +msgid "`OSGeo `__" +msgstr "" + +msgid "`OSGeo UK `__" +msgstr "" msgid "`Google Summer of Code `__" msgstr "`Google Summer of Code `__" @@ -8147,6 +8183,12 @@ msgstr "Leopark" msgid "Orkney" msgstr "Orkney" +msgid "OSGeo" +msgstr "" + +msgid "OSGeo UK" +msgstr "" + msgid "Paragon Corporation" msgstr "Paragon Corporation" @@ -8177,12 +8219,8 @@ msgstr "" msgid "Boost C++ source libraries at https://www.boost.org." msgstr "Bibliotecas de código Boost C++ en https://www.boost.org." -msgid "" -"The Migration guide from 2.6 can be found at https://github.com/pgRouting/" -"pgrouting/wiki/Migration-Guide." +msgid ":doc:`migration`" msgstr "" -"La guía de Migración de 2.6 se puede encontrar en https://github.com/" -"pgRouting/pgrouting/wiki/Migration-Guide." msgid "pgr_KSP" msgstr "pgr_KSP" @@ -8196,8 +8234,8 @@ msgstr "Disponibilidad" msgid "Version 3.6.0" msgstr "Versión 3.6.0" -msgid "Return columns standarized to: |nksp-result|" -msgstr "Devolver columnas estandarizadas a: |nksp-result|" +msgid "Result columns standarized to: |nksp-result|" +msgstr "Columnas de resultados estandarizadas a: |nksp-result|" msgid "``pgr_ksp`` (One to One)" msgstr "``pgr_ksp`` (Uno a Uno)" @@ -8274,7 +8312,7 @@ msgstr "" msgid "**options:** ``[directed, heap_paths]``" msgstr "**opcionales:** ``[directed, heap_paths]``" -msgid "RETURNS SET OF |nksp-result|" +msgid "Returns set of |nksp-result|" msgstr "Regresa conjunto de |nksp-result|" msgid "OR EMPTY SET" @@ -8347,9 +8385,6 @@ msgstr "" "contendrán aproximadamente ``N * K`` rutas para valores pequeños de ``K`` y " "``K > 5``." -msgid "Returns set of |nksp-result|" -msgstr "Regresa conjunto de |nksp-result|" - msgid "" "Has value **1** for the first of a path from ``start_vid`` to ``end_vid``" msgstr "" @@ -8511,9 +8546,9 @@ msgstr "" msgid "" "The minimum value of the ``agg_cost`` all instances of edge `(u, v)` is " -"going to be considered as the ``agg_cost`` of edge `(u, v)`" +"going to be considered as the ``agg_cost`` of edge `(u, v)`" msgstr "" -"El valor mínimo de ``agg_cost`` en todas las instancias del segmento `(u, " +"El valor mínimo de ``agg_cost`` en todas las instancias de la arista `(u, " "v)` se considera como el ``agg_cost`` de la arista `(u, v)`" msgid "" @@ -8533,8 +8568,8 @@ msgstr "" msgid "pgr_TSP(`Matrix SQL`_, ``[start_id, end_id]``)" msgstr "pgr_TSP(`SQL de martiz`_, ``[start_id, end_id]``)" -msgid "RETURNS SET OF |tsp-result|" -msgstr "REGRESA CONJUNTO DE |tsp-result|" +msgid "Returns set of |tsp-result|" +msgstr "Regresa el conjunto de |nksp-result|" msgid "OR EMTPY SET" msgstr "" @@ -8762,11 +8797,11 @@ msgstr "Resultados visuales" msgid "" "Visualy, The first image is the `optimal solution `__ and the second image is the solution " +"uwaterloo.ca/tsp/world/witour.html>`__ and the second image is the solution " "obtained with ``pgr_TSPeuclidean``." msgstr "" -"Visualmente, la primera imagen es la 'solución óptima'`__ y la segunda imagen es la solución " +"Visualmente, la primera imagen es la `solución óptima `__ y la segunda imagen es la solución " "obtenida con ``pgr_TSPeuclidean``." msgid ":doc:`sampledata` network." @@ -8830,18 +8865,6 @@ msgstr "" "Los resultados son equivalentes a la unión de los resultados de " "pgr_aStar( `Uno a Uno`_ ) en:" -msgid "`pgr_aStar(` `One to Many`_ `)`" -msgstr "`pgr_aStar(` `Uno a Muchos`_ `)`" - -msgid "`pgr_aStar(` `Many to One`_ `)`" -msgstr "`pgr_aStar(` `Muchos a Uno`_ `)`" - -msgid "`pgr_aStar(` `Many to Many`_ `)`" -msgstr "`pgr_aStar(` `Muchos a Muchos`_ `)`" - -msgid "`pgr_aStar(` `Combinations`_ `)`" -msgstr "``pgr_aStar`` (`Combinaciones`_)" - msgid "pgr_aStar(`Edges SQL`_, **start vid**, **end vid**, [**options**])" msgstr "" "pgr_aStar(`SQL de aristas`_, **salida**, **destino**, **K**, [**opciones**])" @@ -8865,8 +8888,8 @@ msgstr "pgr_aStar(`SQL de aristas`_, `SQL de combinaciones`_, [**opciones**])" msgid "**options:** ``[directed, heuristic, factor, epsilon]``" msgstr "**opcionales:** ``[directed, heuristic, factor, epsilon]``" -msgid "RETURNS SET OF |short-generic-result|" -msgstr "" +msgid "Returns set of |short-generic-result|" +msgstr "Regresa el conjunto de |short-generic-result|" msgid "Optional parameters are `named parameters` and have a default value." msgstr "" @@ -8987,8 +9010,8 @@ msgid "pgr_aStarCost(`Edges SQL`_, `Combinations SQL`_, [**options**])" msgstr "" "pgr_aStarCost(`SQL de aristas`_, `SQL de combinaciones`_, [**opciones**])" -msgid "RETURNS SET OF |matrix-result|" -msgstr "Regresa conjunto de |matrix-result|" +msgid "Returns set of |matrix-result|" +msgstr "Regresa el conjunto de |matrix-result|" msgid "pgr_aStarCost(`Edges SQL`_, **start vids**, **end vids**, [options])" msgstr "" @@ -9182,15 +9205,15 @@ msgid "Prerequisites" msgstr "Pre-requisitos" msgid "" -"The edge table to be analyzed must contain a source column and a target " +"The edge table to be analyzed must contain a source column and a target " "column filled with id's of the vertices of the segments and the " "corresponding vertices table _vertices_pgr that stores the " "vertices information." msgstr "" -"La tabla de bordes debe ser analizada debe contener una columna de origen y " -"una columna de destino llena con los identificadores de los vértices de los " -"segmentos y los vértices correspondientes de la tabla " -"_vertices_pgr que almacena la información de los vértices." +"La tabla de aristas a analizar debe contener una columna origen y una " +"columna destino rellenas con identificadores de los vértices de los " +"segmentos y la correspondiente tabla de vértices _vertices_pgr " +"que almacena la información de los vértices." msgid "Use :doc:`pgr_createVerticesTable` to create the vertices table." msgstr "Use :doc:`pgr_createVerticesTable` para crear la tabla de vértices." @@ -9221,21 +9244,21 @@ msgid "the_geom" msgstr "the_geom" msgid "" -"``text`` Geometry column name of the network table. Default value is " +"``text`` Geometry column name of the network table. Default value is " "``the_geom``." msgstr "" -"``text`` nombre de la columna de la geometría en la tabla de la red. El " -"valor por defecto es ``the_geom``." +"``text`` nombre de la columna de la geometría en la tabla de la red. El " +"valor por defecto es `the_geom``." msgid "id" msgstr "id" msgid "" -"``text`` Primary key column name of the network table. Default value is " +"``text`` Primary key column name of the network table. Default value is " "``id``." msgstr "" "``text``Nombre de la columna de la clave principal de la tabla de red. Valor " -"por defecto es ``id``." +"por defecto es ``id``'." msgid "source" msgstr "source" @@ -9251,20 +9274,20 @@ msgid "target" msgstr "target" msgid "" -"``text`` Target column name of the network table. Default value is " +"``text`` Target column name of the network table. Default value is " "``target``." msgstr "" -"``text`` El nombre de la columna del nodo de llegada del segmento. El valor " -"por defecto es ``target``." +"``text`` El nombre de la columna del destino del segmento. El valor por " +"defecto es ``target``." msgid "rows_where" msgstr "rows_where" msgid "" -"``text`` Condition to select a subset or rows. Default value is ``true`` " -"to indicate all rows." +"``text`` Condition to select a subset or rows. Default value is ``true`` to " +"indicate all rows." msgstr "" -"``text`` condición para seleccionar un subconjunto o filas. Valor " +"``text`` Condición para seleccionar un subconjunto o filas. Valor " "predeterminado es ``true`` para indicar todas las filas." msgid "Uses the vertices table: _vertices_pgr." @@ -9275,7 +9298,7 @@ msgstr "" "Llena totalmente las columnas ``cnt`` y ``chk`` de la tabla de vértices." msgid "" -"Returns the analysis of the section of the network defined by ``rows_where``" +"Returns the analysis of the section of the network defined by ``rows_where``" msgstr "" "Devuelve el análisis de la sección de la red definida por ``rows_where``" @@ -9326,8 +9349,8 @@ msgstr "" msgid "chk" msgstr "chk" -msgid "``integer`` Indicator that the vertex might have a problem." -msgstr "``integer`` indicador que el vértice podría tener un problema." +msgid "``integer`` Indicator that the vertex might have a problem." +msgstr "``integer`` Indicador de que el vértice puede tener un problema." msgid "ein" msgstr "ein" @@ -9598,11 +9621,11 @@ msgid "two_way_if_null" msgstr "two_way_if_null" msgid "" -"``boolean`` flag to treat oneway NULL values as bi-directional. Default " +"``boolean`` flag to treat oneway NULL values as bi-directional. Default " "value is ``true``." msgstr "" "``boolean`` bandera para tratar los valores NULL de oneway como " -"bidireccional. Valor predeterminado es``true``." +"bidireccional. Valor predeterminado es``true``." msgid "" "It is strongly recommended to use the named notation. See :doc:" @@ -9644,10 +9667,10 @@ msgstr "" "vértice. Consulte :doc:`pgr_analyzeGgraph `." msgid "" -"``integer`` Indicator that the vertex might have a problem. See :doc:" +"``integer`` Indicator that the vertex might have a problem. See :doc:" "`pgr_analyzeGraph `." msgstr "" -"``integer`` Indicador de que el vértice podría tener un problema. Consulte :" +"``integer`` Indicador de que el vértice podría tener un problema. Consulte :" "doc:`pgr_analyzeGraph `." msgid "" @@ -9677,8 +9700,8 @@ msgstr "" "``pgr_articulationPoints`` - Devuelve los puntos de articulación de un grafo " "no dirigido." -msgid "Return columns change: ``seq`` is removed" -msgstr "Cambio de columnas de retorno: ``seq`` se elimina" +msgid "Result columns change: ``seq`` is removed" +msgstr "Cambio de columnas de resultados: ``seq`` se elimina" msgid "Version 2.5.0" msgstr "Versión 2.5.0" @@ -9710,8 +9733,8 @@ msgstr "Tiempo de ejecución: :math:`O(V + E)`" msgid "pgr_articulationPoints(`Edges SQL`_)" msgstr "pgr_articulationPoints(`SQL de aristas`_)" -msgid "RETURNS SET OF |result-node|" -msgstr "REGRESA CONJUNTO DE |result-node|" +msgid "Returns set of |result-node|" +msgstr "Regresa conjunto de |result-node|" msgid "The articulation points of the graph" msgstr "Los puntos de articulación del grafo" @@ -9719,9 +9742,6 @@ msgstr "Los puntos de articulación del grafo" msgid "Nodes in red are the articulation points." msgstr "Nodos en rojo son los puntos de articulación." -msgid "Returns set of |result-node|" -msgstr "Regresa conjunto de |result-node|" - msgid "" "Boost: `Biconnected components & articulation points `__" @@ -9781,18 +9801,6 @@ msgstr "" "Los resultados son equivalentes a la unión de los resultados de " "`pgr_bdAStar(` `Uno a Uno`_ `)` en:" -msgid "`pgr_bdAstar(` `One to Many`_ `)`" -msgstr "`pgr_bdAstar(` `Uno a Muchos`_ `)`" - -msgid "`pgr_bdAstar(` `Many to One`_ `)`" -msgstr "`pgr_bdAstar(` `Muchos a Uno`_ `)`" - -msgid "`pgr_bdAstar(` `Many to Many`_ `)`" -msgstr "`pgr_bdAstar(` `Muchos a Muchos`_ `)`" - -msgid "`pgr_bdAstar(` `Combinations`_ `)`" -msgstr "``pgr_bdAstar`` (`Combinaciones`_)" - msgid "pgr_bdAstar(`Edges SQL`_, **start vid**, **end vid**, [**options**])" msgstr "" "pgr_bdAstar(`SQL de aristas`_, **salida**, **destino**, [**opciones**])" @@ -9928,17 +9936,17 @@ msgid "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_ , [``directed``])" msgstr "" "pgr_bdDijkstra(`SQL de aristas`_, `SQL de combinaciones`_, [``directed``])" -msgid "RETURNS SET OF |old-generic-result|" -msgstr "REGRESA CONJUNTO DE |old-generic-result|" +msgid "Returns set of |old-generic-result|" +msgstr "Regresa el conjunto de |old-generic-result|" -msgid "RETURNS SET OF |result-1-1|" -msgstr "REGRESA CONJUNTO DE |result-1-1|" +msgid "Returns set of |result-1-1|" +msgstr "Regresa el conjunto de |result-1-1|" -msgid "From vertex :math:`6` to vertex :math:`10` on a **directed** graph" +msgid "From vertex :math:`6` to vertex :math:`10` on a **directed** graph" msgstr "Del vértice :math:`6` al vértice :math:`10` en un grafo **dirigido**" -msgid "RETURNS SET OF |result-1-m|" -msgstr "REGRESA CONJUNTO DE |result-1-m|" +msgid "Returns set of |result-1-m|" +msgstr "Regresa el conjunto de |result-1-m|" msgid "" "From vertex :math:`6` to vertices :math:`\\{10, 17\\}` on a **directed** " @@ -9947,8 +9955,8 @@ msgstr "" "Del vértice :math:`6` a los vértices :math:`\\{10, 17\\}` en un grafo " "**dirigido**" -msgid "RETURNS SET OF |result-m-1|" -msgstr "REGRESA CONJUNTO DE |result-m-1|" +msgid "Returns set of |result-m-1|" +msgstr "Regresa el conjunto de |result-m-1|" msgid "" "From vertices :math:`\\{6, 1\\}` to vertex :math:`17` on a **directed** graph" @@ -9971,11 +9979,11 @@ msgid "Using a combinations table on an **undirected** graph" msgstr "Usando una tabla de combinaciones en un grafo **no dirigido**" msgid "" -"https://www.cs.princeton.edu/courses/archive/spr06/cos423/Handouts/EPP" -"%20shortest%20path%20algorithms.pdf" +"https://www.cs.princeton.edu/courses/archive/spr06/cos423/Handouts/" +"EPP%20shortest%20path%20algorithms.pdf" msgstr "" -"https://www.cs.princeton.edu/courses/archive/spr06/cos423/Handouts/EPP" -"%20shortest%20path%20algorithms.pdf" +"https://www.cs.princeton.edu/courses/archive/spr06/cos423/Handouts/" +"EPP%20shortest%20path%20algorithms.pdf" msgid "https://en.wikipedia.org/wiki/Bidirectional_search" msgstr "https://en.wikipedia.org/wiki/Bidirectional_search" @@ -10173,7 +10181,7 @@ msgstr "" "pgr_bellmanFord(`SQL de aristas`_, **salida**, **destinos**, [``directed``])" msgid "" -"pgr_bellmanFord(`Edges SQL`_, **start vids**, **end vid** , [``directed``])" +"pgr_bellmanFord(`Edges SQL`_, **start vids**, **end vid**, [``directed``])" msgstr "" "pgr_bellmanFord(`SQL de aristas`_, **salidas**, **destino**, [``directed``])" @@ -10186,9 +10194,6 @@ msgid "pgr_bellmanFord(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgstr "" "pgr_bellmanFord(`SQL de aristas`_, `SQL de combinaciones`_, [``directed``])" -msgid "From vertex :math:`6` to vertex :math:`10` on a **directed** graph" -msgstr "Del vértice :math:`6` al vértice :math:`10` en un grafo **dirigido**" - msgid "" "From vertex :math:`6` to vertices :math:`\\{ 10, 17\\}` on a **directed** " "graph" @@ -10196,11 +10201,6 @@ msgstr "" "Desde el vértice :math:`6` a los vértices :math:`\\{ 10, 17\\}` en un grafo " "**dirigido**" -msgid "" -"pgr_bellmanFord(`Edges SQL`_, **start vids**, **end vid**, [``directed``])" -msgstr "" -"pgr_bellmanFord(`SQL de aristas`_, **salidas**, **destino**, [``directed``])" - msgid "Using a combinations table on an **undirected** graph." msgstr "Uso de una tabla de combinaciones en un grafo **no dirigido**." @@ -10217,8 +10217,8 @@ msgstr "" "``pgr_biconnectedComponents`` — Componentes biconectados de un grafo no " "dirigido." -msgid "Return columns change:" -msgstr "Las columnas de retorno cambian:" +msgid "Result columns change:" +msgstr "Las columnas de resultados cambian:" msgid "``n_seq`` is removed" msgstr "``n_seq`` se elimina" @@ -10254,15 +10254,12 @@ msgstr "``edge`` ascendente." msgid "pgr_biconnectedComponents(`Edges SQL`_)" msgstr "pgr_biconnectedComponents(`SQL de aristas`_)" -msgid "RETURNS SET OF |result-component-E|" -msgstr "REGRESA CONJUNTO DE |result-component-E|" +msgid "Returns set of |result-component-E|" +msgstr "Regresa conjunto de |result-component-E|" msgid "The biconnected components of the graph" msgstr "Los componentes biconectados del grafo" -msgid "Returns set of |result-component-E|" -msgstr "Regresa conjunto de |result-component-E|" - msgid "``component``" msgstr "``component``" @@ -10321,17 +10318,17 @@ msgid "" "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:" "`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|" +"general algorithm, like Dijkstra's Algorithm which runs in :math:`O(|E|log|" "V|)` time." msgstr "" -"Es bien sabido que las rutas más cortas entre una sola fuente y todos los " -"demás vértices se pueden encontrar usando Breadth First Search en :math:`O(|" -"E|)` en un grafo no ponderado, es decir, la distancia es el número mínimo de " -"aristas que necesita atravesar desde el origen a otro vértice. Podemos " -"interpretar tal grafo también como un grafo ponderado, donde cada arista " -"tiene el peso 1. Si no todas las aristas del grafo tienen el mismo peso, que " -"necesitamos un algoritmo más general, como el Algoritmo de Dijkstra que se " -"ejecuta en :math:`O(|E|log|V|)` tiempo." +"Es bien sabido que los caminos más cortos entre un único origen y todos los " +"demás vértices se pueden encontrar utilizando la búsqueda rápida en :math:" +"`O(|E|)` en un grafo no ponderado, es decir, la distancia es el número " +"mínimo de aristas que hay que recorrer desde el origen hasta otro vértice. " +"Podemos interpretar este grafo también como un grafo ponderado, en el que " +"cada arista tiene el peso :math:`1`. Si no todas las aristas del grafo " +"tienen el mismo peso, necesitaremos un algoritmo más general, como el " +"Algoritmo de Dijkstra, que se ejecuta en tiempo :math:`O(|E|log|V|)`." msgid "" "However if the weights are more constrained, we can use a faster algorithm. " @@ -10403,9 +10400,6 @@ msgstr "" "**Nota:** Usando la red de :doc:`sampledata` como todos los pesos son los " "mismos (i.e :math:`1``)" -msgid "Optional Parameters" -msgstr "Parámetros Opcionales" - msgid "https://cp-algorithms.com/graph/01_bfs.html" msgstr "https://cp-algorithms.com/graph/01_bfs.html" @@ -10446,12 +10440,12 @@ msgstr "Los valores devueltos no están ordenados." msgid "" "The algorithm checks graph is bipartite or not. If it is bipartite then it " -"returns the node along with two colors `0` and `1` which represents two " +"returns the node along with two colors `0` and `1` which represents two " "different sets." msgstr "" -"El algoritmo comprueba si el grafo es bi-partido o no. Si es bipartido, " -"devuelve el nodo junto con dos colores `0` y `1` que representan dos " -"conjuntos diferentes." +"El algoritmo comprueba si el grafo es bipartito o no. Si es bipartito " +"entonces devuelve el nodo junto con dos colores `0` y `1` que representan " +"dos conjuntos diferentes." msgid "If graph is not bipartite then algorithm returns empty set." msgstr "Si el grafo no es bipartito, el algoritmo devuelve un conjunto vacío." @@ -10459,8 +10453,8 @@ msgstr "Si el grafo no es bipartito, el algoritmo devuelve un conjunto vacío." msgid "pgr_bipartite(`Edges SQL`_)" msgstr "pgr_bipartite(`SQL de aristas`_)" -msgid "RETURNS SET OF |result-node-color|" -msgstr "REGRESA CONJUNTO DE |result-node-color|" +msgid "Returns set of |result-node-color|" +msgstr "Regresa el conjunto de |result-node-color|" msgid "When the graph is bipartite" msgstr "Cuando el grafo es bi-partido" @@ -10472,11 +10466,12 @@ msgid "The odd length cyclic graph can not be bipartite." msgstr "El gráfico cíclico de longitud impar no puede ser bipartito." msgid "" -"The edge :math:`5 \\rightarrow 1` will make subgraph with vertices :math:`" -"\\{1, 3, 7, 6, 5\\}` an odd length cyclic graph, as the cycle has 5 vertices." +"The edge :math:`5 \\rightarrow 1` will make subgraph with vertices :math:" +"`\\{1, 3, 7, 6, 5\\}` an odd length cyclic graph, as the cycle has 5 " +"vertices." msgstr "" -"La arista :math:`5 \\rightarrow 1` hace que el sub-grafo con vértices:math:`" -"\\{1, 3, 7, 6, 5\\}` se un grafo de ciclo impar, ya que ciclo tiene 5 " +"La arista :math:`5 \\rightarrow 1` hace que el sub-grafo con vértices:math:" +"`\\{1, 3, 7, 6, 5\\}` se un grafo de ciclo impar, ya que ciclo tiene 5 " "vértices." msgid "Edges in blue represent odd length cycle subgraph." @@ -10527,8 +10522,8 @@ msgstr "pgr_boykovKolmogorov(`SQL de aristas`_, **salidas**, **destinos**)" msgid "pgr_boykovKolmogorov(`Edges SQL`_, `Combinations SQL`_)" msgstr "pgr_boykovKolmogorov(`SQL de aristas`_, `SQL de combinaciones`_)" -msgid "RETURNS SET OF |result-flow|" -msgstr "REGRESA CONJUNTO DE |result-flow|" +msgid "Returns set of |result-flow|" +msgstr "Regresa el conjunto de |result-flow|" msgid "From vertex :math:`11` to vertex :math:`12`" msgstr "Del vértice :math:`11` al vértice :math:`12`" @@ -10600,8 +10595,8 @@ msgstr "pgr_breadthFirstSearch(`SQL de aristas`_, **raices**, [**options**])" msgid "**options:** ``[max_depth, directed]``" msgstr "**opcionales:** ``[max_depth, directed]``" -msgid "RETURNS SET OF |result-bfs|" -msgstr "REGRESA CONJUNTO DE |result-bfs|" +msgid "Returns set of |result-bfs|" +msgstr "Regresa el conjunto de |result-bfs|" msgid "Single vertex" msgstr "Vértice único" @@ -10691,15 +10686,12 @@ msgstr "Tiempo de ejecución: :math:`O(E * (V + E))`" msgid "pgr_bridges(`Edges SQL`_)" msgstr "pgr_bridges(`SQL de aristas`_)" -msgid "RETURNS SET OF |result-edge|" -msgstr "REGRESA CONJUNTO DE |result-edge|" +msgid "Returns set of |result-edge|" +msgstr "Regresa conjunto de |result-edge|" msgid "The bridges of the graph" msgstr "Los puentes del grafo" -msgid "Returns set of |result-edge|" -msgstr "Regresa conjunto de |result-edge|" - msgid "Identifier of the edge that is a bridge." msgstr "Identificador del borde que es un puente." @@ -10725,8 +10717,8 @@ msgstr "Devuelve ``EMPTY SET`` en un grafo desconectado" msgid "pgr_chinesePostman(`Edges SQL`_)" msgstr "pgr_chinesePostman(`SQL de aristas`_)" -msgid "RETURNS SET OF |result-1-1-no-seq|" -msgstr "REGRESA CONJUNTO DE |result-1-1-no-seq|" +msgid "Returns set of |result-1-1-no-seq|" +msgstr "Regresa el conjunto de |result-1-1-no-seq|" msgid "Returns set of ``(seq, node, edge, cost, agg_cost)``" msgstr "Devuelve un conjunto de ``(seq, node, edge, cost, agg_cost)``" @@ -10797,15 +10789,12 @@ msgstr "``component`` ascendente" msgid "pgr_connectedComponents(`Edges SQL`_)" msgstr "pgr_connectedComponents(`SQL de aristas`_)" -msgid "RETURNS SET OF |result-component-V|" -msgstr "REGRESA CONJUNTO DE |result-component-V|" +msgid "Returns set of |result-component-V|" +msgstr "Regresa conjunto de |result-component-V|" msgid "The connected components of the graph" msgstr "Los componentes conectados del grafo" -msgid "Returns set of |result-component-V|" -msgstr "Regresa conjunto de |result-component-V|" - msgid "Has the value of the minimum node identifier in the component." msgstr "Continene le valor mínimo de identificador de nodo en el componente." @@ -10898,8 +10887,8 @@ msgstr "" msgid "**options:** ``[ max_cycles, forbidden_vertices, directed]``" msgstr "**opcionales:** ``[ max_cycles, forbidden_vertices, directed]``" -msgid "RETURNS SET OF |result-contract|" -msgstr "REGRESA CONJUNTO DE |result-contract|" +msgid "Returns set of |result-contract|" +msgstr "Regresa conjunto de |result-contract|" msgid "" "Making a dead end and linear contraction in that order on an undirected " @@ -10942,9 +10931,6 @@ msgstr "" "Número de veces que se realizarán las operaciones de contracción en el orden " "``contraction_order``." -msgid "Returns set of |result-contract|" -msgstr "" - msgid "The function returns a single row. The columns of the row are:" msgstr "La función devuelve una sola fila. Las columnas de la fila son:" @@ -11051,24 +11037,21 @@ msgid "The topology creation function accepts the following parameters:" msgstr "" "La función de creación de topología requiere los siguientes parámetros:" -msgid "``text`` Network table name. (may contain the schema name AS well)" -msgstr "``text`` La tabla de la red. (puede contener el nombre del esquema)" - msgid "" -"``text`` Condition to SELECT a subset or rows. Default value is ``true`` " -"to indicate all rows that where ``source`` or ``target`` have a null value, " +"``text`` Condition to SELECT a subset or rows. Default value is ``true`` to " +"indicate all rows that where ``source`` or ``target`` have a null value, " "otherwise the condition is used." msgstr "" -"``text`` Condición para SELECCIONAR un subconjunto de filas. El valor " +"``text`` Condición para SELECCIONAR un subconjunto de filas. El valor " "predeterminado es ``true`` para indicar todas las filas donde ``source`` o " "``target`` tienen un valor nulo, de lo contrario se utiliza la condición." msgid "clean" msgstr "limpio" -msgid "``boolean`` Clean any previous topology. Default value is ``false``." +msgid "``boolean`` Clean any previous topology. Default value is ``false``." msgstr "" -"``boolean`` Limpie cualquier topología previa. El valor predeterminado es " +"``boolean`` Limpia cualquier topología anterior. El valor por defecto es " "``false``." msgid "The ``edge_table`` will be affected" @@ -11124,11 +11107,11 @@ msgstr "" "vértice. Ver :doc:`pgr_analyzeGraph`." msgid "" -"``integer`` Indicator that the vertex might have a problem. See :doc:" +"``integer`` Indicator that the vertex might have a problem. See :doc:" "`pgr_analyzeGraph`." msgstr "" -"``integer`` Indicador de que el vértice podría tener un problema. Consulte :" -"doc:`pgr_analyzeGraph`." +"``integer`` Indicador de que el vértice puede tener un problema. Véase :doc:" +"`pgr_analyzeGraph`." msgid "" "``integer`` Number of vertices in the edge_table that reference this vertex " @@ -11147,13 +11130,13 @@ msgstr "" msgid "The simplest way to use pgr_createTopology is:" msgstr "La forma más sencilla de utilizar pgr_createTopology es:" -msgid "When the arguments are given in the order described:" +msgid "When the arguments are given in the order described in the parameters:" msgstr "" "Cuando los argumentos se escriben en el orden descrito en los parámetros:" -msgid "We get the same result AS the simplest way to use the function." +msgid "We get the sameresult as the simplest way to use the function." msgstr "" -"Obtenemos el mismo resultado que la forma más sencilla de utilizar la " +"Se obtiene el mismo resultado que la forma más sencilla de utilizar la " "función." msgid "" @@ -11300,17 +11283,17 @@ msgid "" msgstr "" msgid "" -"The reconstruction of the vertices table function accepts the following " +"The reconstruction of the vertices table function accepts the following " "parameters:" msgstr "" -"La función para la reconstrucción de la tabla mesa vértices acepta los " -"siguientes parámetros:" +"La función de reconstrucción de la tabla de vértices acepta los siguientes " +"parámetros:" msgid "" -"``text`` Condition to SELECT a subset or rows. Default value is ``true`` " -"to indicate all rows." +"``text`` Condition to SELECT a subset or rows. Default value is ``true`` to " +"indicate all rows." msgstr "" -"``text`` condición para seleccionar un subconjunto o filas. Valor " +"``text`` condición para seleccionar un subconjunto o filas. Valor " "predeterminado es ``true`` para indicar todas las filas." msgid "" @@ -11323,13 +11306,6 @@ msgstr "" msgid "The names of source, target are the same." msgstr "Los nombres de los campos de origen y destino son las mismos." -msgid "" -"The vertices table is a requierment of the :doc:`pgr_analyzeGraph` and the :" -"doc:`pgr_analyzeOneWay` functions." -msgstr "" -"La tabla de vértices es un requerimiento de las funciones :doc:" -"`pgr_analyzeGraph` y :doc:`pgr_analyzeOneWay`." - msgid "" "``integer`` Number of vertices in the edge_table that reference this vertex " "as incoming. See :doc:`pgr_analyzeOneWay`." @@ -11347,10 +11323,6 @@ msgstr "" msgid "The simplest way to use pgr_createVerticesTable" msgstr "La forma más sencilla de utilizar pgr_createVerticesTable" -msgid "When the arguments are given in the order described in the parameters:" -msgstr "" -"Cuando los argumentos se escriben en el orden descrito en los parámetros:" - msgid "" "An error would occur when the arguments are not given in the appropriate " "order: In this example, the column source column ``source`` of the table " @@ -11446,11 +11418,11 @@ msgid "Example 17" msgstr "Ejemplo 17" msgid "" -":doc:`topology-functions` for an overview of a topology for routing " +":doc:`topology-functions` for an overview of a topology for routing " "algorithms." msgstr "" -":doc:`topology-functions` para obtener una visión general de una topología " -"para algoritmos de ruteo." +":doc:`topology-functions` para una visión general de una topología para " +"algoritmos de enrutamiento." msgid "" ":doc:`pgr_createTopology` ` to create a topology based " @@ -11514,14 +11486,14 @@ msgstr ":math:`m` es el grado máximo de los vértices en el grafo." msgid "pgr_cuthillMckeeOrdering(`Edges SQL`_)" msgstr "pgr_cuthillMckeeOrdering(`SQL de aristas`_)" -msgid "RETURNS SET OF |result-node-order|" -msgstr "REGRESA CONJUNTO DE |result-node-order|" +msgid "Returns set of |result-node-order|" +msgstr "Regresa el conjunto de |result-node-order|" msgid "Graph ordering of pgRouting :doc:`sampledata`" msgstr "Ordenamiento del grafo de los :doc:`sampledata` de pgRouting" -msgid "Returns SET OF ``(seq, node)``" -msgstr "Regresa conjunto de ``(seq, node)``" +msgid "Returns set of ``(seq, node)``" +msgstr "Regresa el conjunto de ``(seq, node)``" msgid "Sequence of the order starting from 1." msgstr "Valor secuencial a partir de 1." @@ -11537,11 +11509,11 @@ msgstr "" "cuthill_mckee_ordering.html>`__" msgid "" -"`Wikipedia: Cuthill-McKee Ordering `__" +"`Wikipedia: Cuthill-McKee Ordering `__" msgstr "" -"`Wikipedia: Ordenamiento Cuthill-McKee `__" +"`Wikipedia: Ordenamiento Cuthill-McKee `__" msgid "pgr_dagShortestPath - Experimental" msgstr "pgr_dagShortestPath - Experimental" @@ -11605,10 +11577,10 @@ msgstr "" msgid "Running time: :math:`O(| start\\_vids | * (V + E))`" msgstr "Tiempo de ejecución: :math:`O(| start\\_vids | * (V + E))`" -msgid "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vid**)" +msgid "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vid**)" msgstr "pgr_dagShortestPath(`SQL de aristas`_, **salida**, **destino**)" -msgid "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vids**)" +msgid "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vids**)" msgstr "pgr_dagShortestPath(`SQL de aristas`_, **salida**, **destinos**)" msgid "pgr_dagShortestPath(`Edges SQL`_, **start vids**, **end vid**)" @@ -11620,9 +11592,8 @@ msgstr "pgr_dagShortestPath(`SQL de aristas`_, **salidas**, **destinos**)" msgid "pgr_dagShortestPath(`Edges SQL`_, `Combinations SQL`_)" msgstr "pgr_dagShortestPath(`SQL de aristas`_, `SQL de combinaciones`_)" -msgid "From vertex :math:`5` to vertex :math:`11` on a **directed** graph" -msgstr "" -"Desde el vértice :math:`5` al vértice :math:`11` en un grafo **dirigido**" +msgid "From vertex :math:`5` to vertex :math:`11` on a **directed** graph" +msgstr "Del vértice :math:`5` al vértice :math:`11` en un grafo **dirigido**" msgid "From vertex :math:`5` to vertices :math:`\\{7, 11\\}`" msgstr "Desde el vértice :math:`5` a los vértices :math:`\\{ 7, 11\\}`" @@ -11637,8 +11608,8 @@ msgstr "" "Desde los vértices :math:`\\{5, 15\\}` a los vértices :math:`\\{11, 17\\}` " "en un grafo **no dirigido**" -msgid "Resturn Columns" -msgstr "Columnas de resultados" +msgid "Return columns" +msgstr "Columnas de Resultados" msgid "Making **start_vids** the same as **end_vids**" msgstr "Haciendo **vértices de salida** igual que **vértices destino**" @@ -11741,8 +11712,8 @@ msgstr "" "vértices, utilizar ``dryrun := true``." msgid "" -"The results can be used as base code to make a refinement based on the back " -"end development needs." +"The results can be used as base code to make a refinement based on the " +"backend development needs." msgstr "" "Los resultados se pueden usar como código base para realizar un refinamiento " "basado en las necesidades de desarrollo de back-end." @@ -11934,11 +11905,6 @@ msgid "pgr_dijkstra(`Edges SQL`_, **start vids**, **end vid**, [``directed``])" msgstr "" "pgr_dijkstra(`SQL de aristas`_, **salidas**, **destino**, [``directed``])" -msgid "" -"pgr_dijkstra(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" -msgstr "" -"pgr_dijkstra(`SQL de aristas`_, **salidas**, **destinos**, [``directed``])" - msgid "pgr_dijkstra(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgstr "" "pgr_dijkstra(`SQL de aristas`_, `SQL de combinaciones`_, [``directed``])" @@ -12317,8 +12283,8 @@ msgstr "Usando un grafo **dirigido** para el ruteo de automóviles." msgid "" "The subway stations are on the following vertices :math:`\\{1, 10, 11\\}`" msgstr "" -"Las estaciones de metro se encuentran en los siguientes vértices :math:`" -"\\{1, 10, 11\\}`" +"Las estaciones de metro se encuentran en los siguientes vértices :math:" +"`\\{1, 10, 11\\}`" msgid "The defaults used:" msgstr "Los valores predeterminados utilizados:" @@ -12346,12 +12312,6 @@ msgstr "" "Saliendo en coche desde una estación de metro encontrar las **dos** " "estaciones más cercanas al vértice :math:`2`" -msgid "" -"The subway stations are on the following vertices :math:`\\{ 1, 10, 11\\}`" -msgstr "" -"Las estaciones de metro se encuentran en los siguientes vértices :math:`" -"\\{1, 10, 11\\}`" - msgid "On line `4`: using the positional parameter: `directed` set to ``true``" msgstr "" "En la línea `4`: utilizando el parámetro posicional: `directed` configurado " @@ -12645,8 +12605,8 @@ msgstr "pgr_dijkstraVia(`SQL de aristas`_, **vértices**, [**opciones**])" msgid "**options:** ``[directed, strict, U_turn_on_edge]``" msgstr "**opcionales:** ``[directed, strict, U_turn_on_edge]``" -msgid "RETURNS SET OF |via-result|" -msgstr "REGRESA CONJUNTO DE |via-result|" +msgid "Returns set of |via-result|" +msgstr "Regresa el conjunto de |via-result|" msgid "" "Find the route that visits the vertices :math:`\\{5, 1, 8\\}` in that order " @@ -12719,8 +12679,8 @@ msgstr "" "``pgr_drivingDistance`` - Devuelve la distancia de manejo desde un nodo de " "inicio." -msgid "Standarizing output columns to |result-bfs|" -msgstr "" +msgid "Standarizing output columns to |result-spantree|" +msgstr "Estandarización de columnas de resultados a |result-spantree|" msgid "Added ``depth`` and ``start_vid`` result columns." msgstr "Agregado las columnas de resultados``depth`` y ``start_vid``." @@ -12728,8 +12688,8 @@ msgstr "Agregado las columnas de resultados``depth`` y ``start_vid``." msgid "Result column name change: ``from_v`` to ``start_vid``." msgstr "" -msgid "Added ``depth`` result column." -msgstr "" +msgid "Added ``depth`` and ``pred`` result columns." +msgstr "Agregado las columnas de resultados``depth`` y ``pred``." msgid "Signature change pgr_drivingDistance(single vertex)" msgstr "Cambio de firma pgr_drivingDistance(vértice único)" @@ -12743,15 +12703,14 @@ msgstr "Oficial:: pgr_drivingDistance(vértice único)" msgid "" "Using the Dijkstra algorithm, 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." +"the corresponding spaning tree." msgstr "" "Usando el algoritmo Dijkstra, se extraen todos los nodos que tienen costes " "menores o iguales al valor ``distance``. Los bordes extraídos se ajustarán " "al árbol de expansión correspondiente." msgid "" -"pgr_drivingDistance(`Edges SQL`_, **Root vid**, **distance**, " -"[``directed``])" +"pgr_drivingDistance(`Edges SQL`_, **Root vid**, **distance**, [``directed``])" msgstr "" "pgr_drivingDistance(`SQL de aristas`_, **Raíz**, **distancia**, " "[``directed``])" @@ -12855,12 +12814,12 @@ msgstr "" msgid "" "the chromatic number :math:`x'(G)` (minimum number of colors needed for " -"proper edge coloring of graph) is equal to the degree :math:`\\Delta + 1` " -"of the graph, (:math:`x'(G) = \\Delta`)" +"proper edge coloring of graph) is equal to the degree :math:`\\Delta + 1` of " +"the graph, (:math:`x'(G) = \\Delta`)" msgstr "" -"El número cromático :math:`x'(G)` (mínima cantidad de colores necesitados " -"para colorear apropiadamentnte las aristas de un grafo) es igual al grado :" -"math:`\\Delta + 1` del grafo, (:math:`x'(G) = \\Delta`)" +"el número cromático :math:`x'(G)` (número mínimo de colores necesarios para " +"colorear correctamente las aristas del grafo) es igual al grado :math:" +"`\\Delta + 1` del grafo, (:math:`x'(G) = \\Delta`)" msgid "The algorithm tries to assign the least possible color to every edge." msgstr "El algoritmo trata de asignar el menor color a cada arista." @@ -12889,8 +12848,8 @@ msgstr ":math:`|V|` es la cantidad de vertices del grafo." msgid "pgr_edgeColoring(`Edges SQL`_)" msgstr "pgr_edgeColoring(`SQL de aristas`_)" -msgid "RETURNS SET OF |result-edge-color|" -msgstr "Regresa conjunto de |result-edge-color|" +msgid "Returns set of |result-edge-color|" +msgstr "Regresa el conjunto de |result-edge-color|" msgid "Graph coloring of pgRouting :doc:`sampledata`" msgstr "Coloración de grafos de pgRouting :doc:`sampledata`" @@ -12973,20 +12932,20 @@ msgstr "" "pgr_edgeDisjointPaths(`SQL de aristas`_, `SQL de combinaciones`_, " "[``directed``])" -msgid "RETURNS SET OF |result-disjoint|" -msgstr "" +msgid "Returns set of |result-disjoint|" +msgstr "Regresa el conjunto de |result-disjoint|" -msgid "RETURNS SET OF |result-disjoint-1-1|" -msgstr "" +msgid "Returns set of |result-disjoint-1-1|" +msgstr "Regresa el conjunto de |result-disjoint-1-1|" -msgid "RETURNS SET OF |result-disjoint-1-m|" -msgstr "" +msgid "Returns set of |result-disjoint-1-m|" +msgstr "Regresa el conjunto de |result-disjoint-1-m|" -msgid "RETURNS SET OF |result-disjoint-m-1|" -msgstr "" +msgid "Returns set of |result-disjoint-m-1|" +msgstr "Regresa el conjunto de |result-disjoint-m-1|" -msgid "RETURNS SET OF |result-disjoint-m-m|" -msgstr "" +msgid "Returns set of |result-disjoint-m-m|" +msgstr "Regresa el conjunto de |result-disjoint-m-m|" msgid "" "Using a combinations table, equivalent to calculating result from vertices :" @@ -13046,8 +13005,7 @@ msgid "``pgr_edwardMoore - Experimental``" msgstr "``pgr_edwardMoore`` - Experimental" msgid "" -"``pgr_edwardMoore`` — Returns the shortest path using Edward-Moore " -"algorithm." +"``pgr_edwardMoore`` — Returns the shortest path using Edward-Moore algorithm." msgstr "" "``pgr_edwardMoore`` — Devuelve la ruta más cortas usando el algoritmo Edward-" "Moore." @@ -13111,12 +13069,6 @@ msgstr "" "Para fines de optimización, se omite cualquier valor duplicado en " "`start_vids` o `end_vids`." -msgid "`start vid` ascending" -msgstr "`start vid` ascendente" - -msgid "`end vid` ascending" -msgstr "`end_vid` ascendente" - msgid "Running time:" msgstr "" @@ -13263,9 +13215,6 @@ msgstr "``NULL`` Cuando no se proporciona geometría" msgid "Geometry of the point" msgstr "Geometría del punto" -msgid "Dryrun execution" -msgstr "Ejecución de prueba" - msgid "" "To get the query generated used to get the vertex information, use ``dryrun :" "= true``." @@ -13273,13 +13222,6 @@ msgstr "" "Para obtener la consulta generada que se usa para obtener la información de " "vértices, utilice ``dryrun := true``." -msgid "" -"The results can be used as base code to make a refinement based on the " -"backend development needs." -msgstr "" -"Los resultados se pueden usar como código base para realizar un refinamiento " -"basado en las necesidades de desarrollo de back-end." - msgid "``pgr_findCloseEdges``" msgstr "" @@ -13325,8 +13267,8 @@ msgstr "" msgid "**options:** ``[cap, partial, dryrun]``" msgstr "**opcionales:** ``[cap, partial, dryrun]``" -msgid "RETURNS SET OF |result-find|" -msgstr "REGRESA CONJUNTO DE |result-find|" +msgid "Returns set of |result-find|" +msgstr "Regresa conjunto de |result-find|" msgid "One point" msgstr "" @@ -13425,9 +13367,6 @@ msgstr "" msgid "The ``LINESTRING`` geometry of the edge." msgstr "" -msgid "Returns set of |result-find|" -msgstr "Regresa conjunto de |result-find|" - msgid "When :math:`cap = 1`, it is the closest edge." msgstr "" @@ -13495,7 +13434,7 @@ msgid "The green nodes are the **original points**" msgstr "" msgid "" -"The geometry ``geom``, marked as **g1** and **g2** are the **original " +"The geometry ``geom``, marked as **g1** and **g2** are the **original " "points**" msgstr "" @@ -13747,26 +13686,9 @@ msgstr "" msgid "The geometry of the points moved on top of the segment." msgstr "" -msgid "Points of interest geometry" -msgstr "Geometría de los puntos de interés" - -msgid "Inserting the data of the points of interest:" -msgstr "" - msgid "Points of interest fillup" msgstr "LLenado de puntos de interés" -msgid "" -"Using :doc:`pgr_findCloseEdges` Calculating for visual purposes the points " -"over the graph." -msgstr "" - -msgid "A special case to arrive from both sides of the edge." -msgstr "" - -msgid "Points of interest data" -msgstr "Datos de puntos de interés" - msgid "``pgr_floydWarshall``" msgstr "``pgr_floydWarshall``" @@ -13886,7 +13808,7 @@ msgid "``pgr_hawickCircuits - Experimental``" msgstr "``pgr_hawickCircuits - Experimental``" msgid "" -"``pgr_hawickCircuits`` — Returns the list of cirucits using hawick circuits " +"``pgr_hawickCircuits`` — Returns the list of cirucits using hawick circuits " "algorithm." msgstr "" "``pgr_hawickCircuits`` — Enumeración de los circuitos usando el algoritmo de " @@ -13931,8 +13853,8 @@ msgstr ":math:`|c|` es la cantidad de vertices del grafo." msgid "pgr_hawickCircuits(`Edges SQL`_)" msgstr "pgr_hawickCircuits(`SQL de aristas`_)" -msgid "RETURNS SET OF |generic-result|" -msgstr "" +msgid "Returns set of |generic-result|" +msgstr "Regresa el conjunto de |generic-result|" msgid "Circuits present in the pgRouting :doc:`sampledata`" msgstr "Circuitos dentro de los :doc:`sampledata` de pgRouting" @@ -14089,8 +14011,8 @@ msgstr "EMPTY SET es regresado cuando no hay aristas en el grafo." msgid "pgr_kruskal(`Edges SQL`_)" msgstr "pgr_kruskal(`SQL de aristas`_)" -msgid "RETURNS SET OF |result-mst|" -msgstr "" +msgid "Returns set of |result-mst|" +msgstr "Regresa el conjunto de |result-mst|" msgid "Minimum spanning forest" msgstr "Bosque de expansión mínimo" @@ -14248,8 +14170,8 @@ msgstr "Tiempo de ejecución: :math:`O((V+E)log(V+E))`" msgid "pgr_lengauerTarjanDominatorTree(`Edges SQL`_, **root vertex**)" msgstr "pgr_lengauerTarjanDominatorTree(`SQL de aristas`_, **raíz**)" -msgid "RETURNS SET OF |result-idom|" -msgstr "REGRESA CONJUNTO DE |result-idom|" +msgid "Returns set of |result-idom|" +msgstr "Regresa el conjunto de |result-idom|" msgid "The dominator tree with root vertex :math:`5`" msgstr "El árbol dominante con vértice raíz :math:`5`" @@ -14315,8 +14237,8 @@ msgstr "" msgid "pgr_lineGraph(`Edges SQL`_, [``directed``])" msgstr "pgr_lineGraph(`SQL de aristas`_, [``directed``])" -msgid "RETURNS SET OF |result-lineg|" -msgstr "" +msgid "Returns set of |result-lineg|" +msgstr "Regresa el conjunto de |result-lineg|" msgid "For a **directed** graph" msgstr "Para un grafo **dirigido**" @@ -14432,8 +14354,8 @@ msgstr "Tiempo de ejecución: TBD" msgid "pgr_lineGraphFull(`Edges SQL`_)" msgstr "pgr_lineGraphFull(`SQL de aristas`_)" -msgid "RETURNS SET OF |result-linegf|" -msgstr "" +msgid "Returns set of |result-linegf|" +msgstr "Regresa el conjunto de |result-linegf|" msgid "Full line graph of subgraph of edges :math:`\\{4, 7, 8, 10\\}`" msgstr "" @@ -14678,8 +14600,8 @@ msgstr "El algoritmo no considera la topología geométrica en los cálculos." msgid "pgr_makeConnected(`Edges SQL`_)" msgstr "pgr_makeConnected(`SQL de aristas`_)" -msgid "RETURNS SET OF |result-component-make|" -msgstr "REGRESA CONJUNTO DE |result-component-make|" +msgid "Returns set of |result-component-make|" +msgstr "Regresa conjunto de |result-component-make|" msgid "" "Query done on :doc:`sampledata` network gives the list of edges that are " @@ -14688,9 +14610,6 @@ msgstr "" "La consulta realizada en la red de :doc:`sampledata` proporciona la lista de " "aristas que se necesitan en el grafo para conectarlo." -msgid "Returns set of |result-component-make|" -msgstr "Regresa conjunto de |result-component-make|" - msgid "https://www.boost.org/libs/graph/doc/make_connected.html" msgstr "https://www.boost.org/libs/graph/doc/make_connected.html" @@ -14771,9 +14690,6 @@ msgstr "" msgid "Identifier of the edge in the original query." msgstr "Identificador de la arista en la consulta original." -msgid ":doc:`migration`" -msgstr "" - msgid "https://www.boost.org/libs/graph/doc/maximum_matching.html" msgstr "https://www.boost.org/libs/graph/doc/maximum_matching.html" @@ -14899,8 +14815,8 @@ msgstr "pgr_maxFlowMinCost(`SQL de aristas`_, **salidas** , **destinos**)" msgid "pgr_maxFlowMinCost(`Edges SQL`_, `Combinations SQL`_)" msgstr "pgr_maxFlowMinCost(`SQL de aristas`_, `SQL de combinaciones`_)" -msgid "RETURNS SET OF |result-flow-mincost|" -msgstr "" +msgid "Returns set of |result-flow-mincost|" +msgstr "Regresa el conjunto de |result-flow-mincost|" msgid "" "https://www.boost.org/libs/graph/doc/" @@ -15022,20 +14938,6 @@ msgstr "" "``float8`` tolerancia para puntos de coincidencia (en la unidad de " "proyección)" -msgid "" -"``text`` Primary key column name of the network table. Default value is " -"``id``." -msgstr "" -"``text``Nombre de la columna de la clave principal de la tabla de red. Valor " -"por defecto es ``id``'." - -msgid "" -"``text`` Geometry column name of the network table. Default value is " -"``the_geom``." -msgstr "" -"``text`` nombre de la columna de la geometría en la tabla de la red. El " -"valor por defecto es `the_geom``." - msgid "table_ending" msgstr "table_ending" @@ -15043,8 +14945,8 @@ msgid "``text`` Suffix for the new table's. Default value is ``noded``." msgstr "" "``text`` sufijo para la nueva tabla. El valor predeterminado es ``noded``." -msgid "The output table will have for ``edge_table_noded``" -msgstr "La tabla de salida tendrá para ``edge_table_noded``" +msgid "The output table will have for ``edge_table_noded``" +msgstr "La tabla de salida que tendrá para ``edge_table_noded``" msgid "``bigint`` Unique identifier for the table" msgstr "``bigint`` identificador único del vértice" @@ -15116,14 +15018,14 @@ msgstr "Imágenes" msgid "Before Image" msgstr "Imágen del Antes" -msgid "before image" -msgstr "Imágen del Antes" +msgid "Before image" +msgstr "Imágen del antes" msgid "After Image" msgstr "Imágen del Después" -msgid "after image" -msgstr "Imágen del Después" +msgid "After image" +msgstr "Imágen del después" msgid "Comparing the results" msgstr "Comparando los resultados" @@ -15359,8 +15261,8 @@ msgstr "" msgid "**options:** ``[factor, max_cycles, initial_sol]``" msgstr "**opcionales:** ``[factor, max_cycles, initial_sol]``" -msgid "RETURNS SET OF |result-pickdrop|" -msgstr "REGRESA CONJUNTO DE |result-pickdrop|" +msgid "Returns set of |result-pickdrop|" +msgstr "Regresa el conjunto de |result-pickdrop|" msgid "Solve the following problem" msgstr "" @@ -15772,8 +15674,8 @@ msgstr "Tiempo de ejecución: :math:`O(V*E + V^2*log V)`." msgid "pgr_stoerWagner(`Edges SQL`_)" msgstr "pgr_stoerWagner(`SQL de aristas`_)" -msgid "RETURNS SET OF |result-mincut|" -msgstr "" +msgid "Returns set of |result-mincut|" +msgstr "Regresa el conjunto de |result-mincut|" msgid "min cut of the main subgraph" msgstr "corte mínimo de el subgrafo principal" @@ -15887,15 +15789,12 @@ msgstr "Los valores devueltos se ordenan en orden topológico:" msgid "pgr_topologicalSort(`Edges SQL`_)" msgstr "pgr_topologicalSort(`SQL de aristas`_)" -msgid "RETURNS SET OF |result-toposort|" +msgid "Returns set of |result-toposort|" msgstr "" msgid "Topologically sorting the graph" msgstr "" -msgid "Returns set of |result-toposort|" -msgstr "" - msgid "Sequential value starting from :math:`1`" msgstr "Valor secuencial a partir de :math:`1`" @@ -15951,8 +15850,8 @@ msgstr "La función pgr_transitiveClosure tiene la siguiente firma:" msgid "pgr_transitiveClosure(`Edges SQL`_)" msgstr "pgr_transitiveClosure(`SQL de aristas`_)" -msgid "RETURNS SET OF |result-closure|" -msgstr "REGRESA CONJUNTO DE |result-closure|" +msgid "Returns set of |result-closure|" +msgstr "Regresa el conjunto de |result-closure|" msgid "Rechability of a subgraph" msgstr "" @@ -15982,8 +15881,8 @@ msgstr "" msgid "``pgr_trsp`` - routing vertices with restrictions." msgstr "``pgr_trsp`` - Ruteo con restricciones." -msgid "New proposed signatures:" -msgstr "" +msgid "New proposed signatures" +msgstr "Nuevas firmas propuestas" msgid "``pgr_trsp`` (`One to One`_)" msgstr "``pgr_trsp`` (`Uno a Uno`_)" @@ -16000,8 +15899,8 @@ msgstr "" msgid "``pgr_trsp`` (`Combinations`_)" msgstr "" -msgid "Deprecated signatures:" -msgstr "" +msgid "Deprecated signatures" +msgstr "Firmas obsoletas" msgid "``pgr_trsp(text,integer,integer,boolean,boolean,text)``" msgstr "``pgr_trsp(text,integer,integer,boolean,boolean,text)``" @@ -16016,8 +15915,8 @@ msgid "" "``pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)``" msgstr "" -msgid "New prototypes:" -msgstr "Nuevos prototipos:" +msgid "New prototypes" +msgstr "Nuevos prototipos" msgid "``pgr_trspViaVertices``" msgstr "``pgr_trspViaVertices``" @@ -16082,8 +15981,8 @@ msgstr "" "pgr_trsp(`SQL de aristas`_, `SQL de restricciones`_, `SQL de " "combinaciones`_, [``directed``])" -msgid "From vertex :math:`6` to vertex :math:`10` on an undirected graph." -msgstr "" +msgid "From vertex :math:`6` to vertex :math:`10` on an undirected graph." +msgstr "Del vértice :math:`6` al vértice :math:`10` en un grafo no dirigido." msgid "" "From vertex :math:`6` to vertices :math:`\\{10, 1\\}` on an undirected graph." @@ -16321,12 +16220,12 @@ msgid "" msgstr "" msgid "" -"Point :math:`-1` corresponds to the closest edge from point `(2.9,1.8)`." +"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)`." 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)`." @@ -16392,6 +16291,9 @@ msgstr "" msgid "``pgr_trsp_withPoints`` Routing Vertex/Point with restrictions." msgstr "" +msgid "New proposed signatures:" +msgstr "" + msgid "``pgr_trsp_withPoints`` (`One to One`_)" msgstr "``pgr_trsp_withPoints`` (`Uno a Uno`_)" @@ -16529,17 +16431,6 @@ 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)`." -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)`." - -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, " -"1.8)`." - msgid "Pass in front or visits." msgstr "" @@ -16587,11 +16478,11 @@ msgstr "" msgid "**options:** ``[directed, heap_paths, stop_on_first, strict]``" msgstr "**opcionales:** ``[directed, heap_paths, stop_on_first, strict]``" -msgid "RETURNS SET OF |ksp-result|" -msgstr "REGRESA CONJUNTO DE |ksp-result|" +msgid "Returns set of |ksp-result|" +msgstr "Regresa el conjunto de |ksp-result|" -msgid "From vertex :math:`3` to vertex :math:`8` on a directed graph" -msgstr "" +msgid "From vertex :math:`3` to vertex :math:`8` on a directed graph" +msgstr "Del vértice :math:`3` al vértice :math:`8` en un grafo dirigido" msgid "Special optional parameters" msgstr "" @@ -16618,11 +16509,11 @@ msgstr "" msgid "No results because the only path available follows a restriction." msgstr "" -msgid "From vertex :math:`3` to vertex :math:`8` on an undirected graph" -msgstr "" +msgid "From vertex :math:`3` to vertex :math:`8` on an undirected graph" +msgstr "Del vértice :math:`3` al vértice :math:`8` en un grafo no dirigido" -msgid "From vertex :math:`3` to vertex :math:`8` with more alternatives" -msgstr "" +msgid "From vertex :math:`3` to vertex :math:`8` with more alternatives" +msgstr "Del vértice :math:`3` al vértice :math:`8` con más alternativas" msgid "``pgr_version``" msgstr "``pgr_version``" @@ -16726,8 +16617,8 @@ msgstr "" msgid "**options:** ``[directed, driving_side, details])``" msgstr "**opcionales:** ``[directed, driving_side, details])``" -msgid "RETURNS SET OF |old-pid-result|" -msgstr "REGRESA CONJUNTO DE |old-pid-result|" +msgid "Returns set of |old-pid-result|" +msgstr "Regresa el conjunto de |old-pid-result|" msgid "**options:** [directed, driving_side, details])" msgstr "**opcionales:** [directed, driving_side, details])" @@ -16735,8 +16626,8 @@ msgstr "**opcionales:** [directed, driving_side, details])" msgid "From point :math:`1` to vertex :math:`10` with details" msgstr "Del punto :math:`1` al vértice :math:`10` con detalles" -msgid "RETURNS SET OF |pid-1-m|" -msgstr "REGRESA CONJUNTO DE |pid-1-m|" +msgid "Returns set of |pid-1-m|" +msgstr "Regresa el conjunto de |pid-1-m|" msgid "" "From point :math:`1` to point :math:`3` and vertex :math:`7` on an " @@ -16745,21 +16636,22 @@ msgstr "" "Desde el punto :math:`1` al punto :math:`3` y al vértice :math:`7` en un " "grafo no dirigido" -msgid "RETURNS SET OF |pid-m-1|" -msgstr "REGRESA CONJUNTO DE |pid-m-1|" +msgid "Returns set of |pid-m-1|" +msgstr "Regresa el conjunto de |pid-m-1|" msgid "From point :math:`1` and vertex :math:`6` to point :math:`3`" msgstr "Desde el punto :math:`1` y el vértice :math:`6` al punto :math:`3`" -msgid "RETURNS SET OF |pid-m-m|" -msgstr "REGRESA CONJUNTO DE |pid-m-m|" +msgid "Returns set of |pid-m-m|" +msgstr "Regresa el conjunto de |pid-m-m|" +# | 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 :" +"From point :math:`1` and vertex :math:`6` to point :math:`3` and vertex :" "math:`1`" msgstr "" -"Desde el punto :math:`1` y el vértice :math:`6` al punto :math:`3` y al " -"vértice :math:`1`" +"Desde el punto :math:`1` y vértice :math:`6` al punto :math:`3` y vértice :" +"math:`1`" msgid "Two combinations" msgstr "Dos combinaciones" @@ -16890,9 +16782,6 @@ msgstr "" "Para fines de optimización, se omite cualquier valor duplicado en " "`start_vids` o `end_vids` ." -msgid "Running time: :math:`O(| start\\_vids | * (V \\log V + E))`" -msgstr "Tiempo de ejecución: :math:`O(| start\\_vids | * (V \\log V + E))`" - msgid "" "pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vid**, **end vid**, " "[**options**])" @@ -16928,11 +16817,11 @@ msgstr "" "pgr_withPointsCost(`SQL de aristas`_, 'SQL de puntos`_, `SQL de " "combinaciones`_, [**opciones**])" -msgid "**options:** ``[directed, driving_side]``" -msgstr "**opcionales:** ``[directed, driving_side]``" +msgid "**options:** ``[directed, driving_side]``" +msgstr "**opciones:** ``[directed, driving_side]``" -msgid "RETURNS SET OF |matrix-pid|" -msgstr "REGRESA CONJUNTO DE |matrix-pid|" +msgid "Returns set of |matrix-pid|" +msgstr "Regresa el conjunto de |matrix-pid|" msgid "" "There is no **details** flag, unlike the other members of the withPoints " @@ -16966,11 +16855,11 @@ msgstr "" "**destinos**, [**opciones**])" msgid "" -"From point :math:`15` and vertex :math:`6` to point :math:`3` and vertex :" +"From point :math:`15` and vertex :math:`6` to point :math:`3` and vertex :" "math:`1`" msgstr "" -"Desde el punto :math:`15` y vértice :math:`6` al punto :math:`3` y vértice :" -"math:`1`" +"Del punto :math:`15` y vértice :math:`6` al punto :math:`3` y vértice :math:" +"`1`" msgid "" "pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, `Combinations SQL`_, " @@ -17075,12 +16964,11 @@ msgstr "" msgid "``pgr_withPointsDD`` (`Single vertex`)" msgstr "``pgr_withPointsDD`` (`Vértice único`)" -#, fuzzy -msgid "Added ``depth`` and ``start_vid`` column." -msgstr "``pgr_dijkstra`` (`Uno a Muchos`) no tiene ``start_vid``." +msgid "Added ``depth``, ``pred`` and ``start_vid`` column." +msgstr "Agregado las columnas ``depth``, ``pred`` y ``start_vid``." -msgid "Added ``depth`` column." -msgstr "" +msgid "Added ``depth``, ``pred`` columns." +msgstr "Agregado las columnas ``depth`` y ``pred``." msgid "When ``details`` is ``false``:" msgstr "Cuando ``details`` es ``false``:" @@ -17208,15 +17096,15 @@ msgstr "" "grafo del punto `(2.8, 1.8)`." msgid "" -"Point :math:`-1` corresponds to the closest edge from point :math:" -"`(2.9,1.8)`." +"Point :math:`-1` corresponds to the closest edge from point :math:`(2.9, " +"1.8)`." msgstr "" "El punto :math:`-1` corresponde a la arista más cercana al punto `(2.9, " "1.8)`." msgid "" -"Point :math:`-2` corresponds to the next close edge from point :math:" -"`(2.9,1.8)`." +"Point :math:`-2` corresponds to the next close edge from point :math:`(2.9, " +"1.8)`." msgstr "" "El punto :math:`-2` corresponde a la segunda arista más cercana al punto " "`(2.9, 1.8)`." @@ -17249,6 +17137,9 @@ msgstr "" msgid "``pgr_withPointsKSP`` (One to One)" msgstr "``pgr_withPointsKSP`` (Uno a Uno)" +msgid "New overload functions" +msgstr "Nuevas funciones de sobrecarga" + msgid "``pgr_withPointsKSP`` (One to Many)" msgstr "``pgr_withPointsKSP`` (Uno a Muchos)" @@ -17261,9 +17152,6 @@ msgstr "``pgr_withPointsKSP`` (Muchos a Muchos)" msgid "``pgr_withPointsKSP`` (Combinations)" msgstr "``pgr_withPointsKSP`` (Combinaciones)" -msgid "Deprecated signature:" -msgstr "Firma obsoleta:" - msgid "" "``pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,char," "boolean)``" @@ -17313,8 +17201,8 @@ msgstr "" "pgr_withPointsKSP(`SQL de aristas`_, `SQL de puntos`_, `SQL de " "combinaciones`_, **K**, **lado de manejo**, [**opciones**])" -msgid "**options:** ``[directed, heap_paths, details]``" -msgstr "**opcionales:** ``[directed, heap_paths, details]``" +msgid "**options:** ``[directed, heap_paths, details]``" +msgstr "**opciones:** ``[directed, heap_paths, details]``" msgid "" "Get 2 paths from Point :math:`1` to point :math:`2` on a directed graph with " @@ -17508,11 +17396,11 @@ msgstr "" "prim_minimum_spanning_tree.html>`__" msgid "" -"Wikipedia: `Prim's algorithm `__" +"Wikipedia: `Prim's algorithm `__" msgstr "" -"Wikipedia: `Algoritmo de Prim `__" +"Wikipedia: `Algoritmo de Prim `__" msgid "Proposed Functions" msgstr "Funciones propuestas" @@ -17585,13 +17473,61 @@ msgstr "" "Para ver la lista completa de cambios, consulte la lista de `Git commits " "`_ en Github." +#, fuzzy +msgid "pgRouting 3.7.0 Release Notes" +msgstr "Notas de la versión 3.6.0 de pgRouting" + +#, fuzzy +msgid "" +"To see all issues & pull requests closed by this release see the `Git closed " +"milestone for 3.7.0 `_" +msgstr "" +"Para ver todos los problemas y solicitudes de extracción cerrados para ésta " +"versión, consulte la `meta cerrada 3.6.0 `_" + +#, fuzzy +msgid "Code enhancement" +msgstr "Mejora de código C/C++" + +#, fuzzy +msgid "" +"`#2599 `__ Driving " +"distance cleanup" +msgstr "" +"`#2505 `__ Usando " +"namespace." + +#, fuzzy +msgid "pgRouting 3.6.1 Release Notes" +msgstr "Notas de la versión 3.6.0 de pgRouting" + +#, fuzzy +msgid "" +"To see all issues & pull requests closed by this release see the `Git closed " +"milestone for 3.6.1 `_" +msgstr "" +"Para ver todos los problemas y solicitudes de extracción cerrados para ésta " +"versión, consulte la `meta cerrada 3.6.0 `_" + +#, fuzzy +msgid "" +"`#2588 `__ pgrouting 3.6.0 " +"fails to build on OSX" +msgstr "" +"`#2400 `__: pgRouting " +"3.3.3 no es construido en focal" + msgid "pgRouting 3.6.0 Release Notes" msgstr "Notas de la versión 3.6.0 de pgRouting" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.6.0 `_" +"milestone for 3.6.0 `_" msgstr "" "Para ver todos los problemas y solicitudes de extracción cerrados para ésta " "versión, consulte la `meta cerrada 3.6.0 `__ Estandarización " "de mesajes de depreciación" +msgid "" +"On new internal function: do not use named parameters and default parameters." +msgstr "" + msgid "pgRouting 3.5.1 Release Notes" msgstr "Notas de la versión 3.5.1 de pgRouting" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.5.1 `_" +"milestone for 3.5.1 `_" msgstr "" "Para ver todos los problemas y solicitudes de extracción cerrados para ésta " "versión, consulte la `meta cerrada 3.5.1 `__ " +"pgr_pgr_lengauerTarjanDominatorTree triggers an assertion" +msgstr "" +"`#2565 `__ " +"pgr_pgr_lengauerTarjanDominatorTree genera un error de afirmación" + +msgid "SQL enhancements" +msgstr "Mejoras SQL" + +msgid "" +"`#2561 `__ Not use " +"wildcards on SQL" +msgstr "" +"`#2561 `__ No usar " +"comodines en SQL" + +msgid "pgtap tests" +msgstr "Pruebas pgtap" + +msgid "" +"`#2559 `__ pgtap test " +"using sampledata" +msgstr "" +"`#2559 `__ pruebas pgtap " +"test usando datos muestra" + msgid "Build fixes" msgstr "Correcciones de construcción" @@ -17789,8 +17759,8 @@ msgstr "Notas de la versión 3.5.0 de pgRouting" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.5.0 `_" +"milestone for 3.5.0 `_" msgstr "" "Para ver todos los problemas y solicitudes de extracción cerrados para ésta " "versión, consulte la `meta cerrada 3.5.0 `_" +"milestone for 3.4.2 `_" msgstr "" "Para ver todos los problemas y solicitudes de extracción cerrados para esta " "versión, consulte la `meta cerrada 3.4.2 `_" -msgid "Issue fixes" -msgstr "Corrección de problemas" - msgid "" "`#2394 `__: pgr_bdAstar " "accumulates heuristic cost in visited node cost." @@ -17847,8 +17814,8 @@ msgstr "Notas de la versión 3.4.1 de pgRouting" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.4.1 `_" +"milestone for 3.4.1 `_" msgstr "" "Para ver todos los problemas y solicitudes de extracción cerrados pora ésta " "versión, consulte la `meta cerrada 3.4.1 `_" +"milestone for 3.4.0 `_" msgstr "" "Para ver todos los problemas y solicitudes de extracción cerrados para ésta " "versión, consulte la `meta cerrada 3.3.0 `_" +"milestone for 3.3.4 `_" msgstr "" "Para ver todos los problemas y solicitudes de extracción cerrados pora ésta " "versión, consulte la `meta cerrada de 3.3.4 `_" +"milestone for 3.3.3 `_" msgstr "" "Para ver todos los problemas y solicitudes de extracción cerrados pora ésta " "versión, consulte la `meta cerrada 3.3.3 `_" +"milestone for 3.3.2 `_" msgstr "" "Para ver todos los problemas y solicitudes de extracción cerrados pora ésta " "versión, consulte la `meta cerrada de 3.3.2 `_ on Github." +"milestone for 3.3.1 `_ on Github." msgstr "" "Para ver todos los problemas y solicitudes de extracción cerrados pora ésta " "versión, consulte la `meta cerrada para 3.3.1 `_ on Github." +"milestone for 3.3.0 `_ on Github." msgstr "" "Para ver todos los problemas y solicitudes de extracción cerrados pora ésta " "versión, consulte la `meta cerrada de 3.3.0 `_ on Github." +"milestone for 3.2.2 `_ on Github." msgstr "" "Para ver todos los problemas y solicitudes de extracción cerrados pora ésta " "versión, consulte la `meta cerrada 3.2.2 `_ en " "Github." -msgid "Issues" -msgstr "Corrección de problemas" - msgid "" "`#2093 `__: Compilation " "on Visual Studio" @@ -18244,8 +18205,8 @@ msgstr "Notas de la Versión 3.2.1 de pgRouting" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.2.1 `_ on Github." +"milestone for 3.2.1 `_ on Github." msgstr "" "Para ver todos los problemas y solicitudes de extracción cerrados pora ésta " "versión, consulte la `meta cerrada 3.2.1 `_ on Github." +"milestone for 3.2.0 `_ on Github." msgstr "" "Para ver todos los problemas y solicitudes de extracción cerradas por esta " "versión, consulte el hito de cierre de Git para 3.2.0 `_ en Github." +"pgRouting/pgrouting/issues?" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.2.0%22>`_ en Github." msgid "Build" msgstr "Construir" @@ -18377,8 +18338,8 @@ msgstr "Notas de la Versión 3.1.4 de pgRouting" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.1.4 `_ on Github." +"milestone for 3.1.4 `_ on Github." msgstr "" "Para ver todos los problemas y solicitudes de extracción cerrados pora ésta " "versión, consulte la `meta cerrada de 3.1.4 `_ on Github." +"milestone for 3.1.3 `_ on Github." msgstr "" "Para ver todos los problemas y solicitudes de extracción cerradas por esta " "versión, consulte el hito de cierre de Git para 3.1.3 `_ en Github." +"pgRouting/pgrouting/issues?" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.1.3%22>`_ en Github." msgid "" "`#1825 `__: Boost " @@ -18428,13 +18389,13 @@ msgstr "Notas de la Versión pgRouting 3.1.2" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.1.2 `_ on Github." +"milestone for 3.1.2 `_ on Github." msgstr "" "Para ver todos los problemas y solicitudes de extracción cerradas por esta " "versión, consulte el `hito cerrado de Git para 3.1.2 `_ en Github." +"pgRouting/pgrouting/issues?" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.1.2%22>`_ en Github." msgid "" "`#1304 `__: FreeBSD 12 " @@ -18476,12 +18437,12 @@ msgstr "pgRouting 3.1.1 Notas de la Versión" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.1.1 `_ on Github." +"milestone for 3.1.1 `_ on Github." msgstr "" "Para ver los problemas cerrados por esta vers 3.1.1 `_ on Github." +"pgRouting/pgrouting/issues?" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.1.1%22>`_ on Github." msgid "" "`#1733 `__: pgr_bdAstar " @@ -18524,12 +18485,12 @@ msgstr "Notas de la Versión pgRouting 3.1.0" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.1.0 `_ on Github." +"milestone for 3.1.0 `_ on Github." msgstr "" "Para ver los problemas cerrados por esta versión, consulte el `hito cerrado " -"de Git para 3.1.0 `_ en Github." +"de Git para 3.1.0 `_ en Github." msgid "pgr_dijkstra(combinations)" msgstr "pgr_dijkstra(combinaciones)" @@ -18548,8 +18509,8 @@ msgstr "Notas de la Versión 3.0.6 de pgRouting" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.0.6 `_ on Github." +"milestone for 3.0.6 `_ on Github." msgstr "" "Para ver todos los problemas y solicitudes de extracción cerrados pora ésta " "versión, consulte la `meta cerrada de 3.0.6 `_ on Github." +"milestone for 3.0.5 `_ on Github." msgstr "" "Para ver todos los problemas y solicitudes de extracción cerradas por esta " "versión, consulte el hito de cierre de Git para 3.0.5 `_ en Github." +"pgRouting/pgrouting/issues?" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.0.5%22>`_ en Github." -msgid "Backport issues fixes" -msgstr "Corrección de problemas de Backport" +msgid "Backport issue fixes" +msgstr "Corrección de problemas atrasados" msgid "pgRouting 3.0.4 Release Notes" msgstr "Notas de la Versión pgRouting 3.0.4" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.0.4 `_ on Github." +"milestone for 3.0.4 `_ on Github." msgstr "" "Para ver todos los problemas y solicitudes de extracción cerradas por esta " "versión, consulte la `meta cerrada para 3.0.4 `_ on Github." +"milestone for 3.0.2 `_ on Github." msgstr "" "Para ver los problemas cerrados por esta versión, consulte en Github la " -"`meta cerrada para 3.0.2 `_ en Github." +"`meta cerrada para 3.0.2 `_ en Github." msgid "" "`#1378 `__: Visual " @@ -18612,31 +18573,31 @@ msgstr "Notas de la versión 3.0.1 de pgRouting" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.0.1 `_ on Github." +"milestone for 3.0.1 `_ on Github." msgstr "" "Para ver los problemas cerrados por esta versión, consulte el `Hito cerrado " -"de Git para 3.0.1 `_ en Github." +"de Git para 3.0.1 `_ en Github." msgid "" -"`#232 `__: Honor client " +"`#232 `__: Honor client " "cancel requests in C /C++ code" msgstr "" -"`#232 `__: Cliente " -"honorable cliente cancela las solicitudes de código C /C++" +"`#232 `__: Honrar " +"cancelación de las solicitudes de código C /C++" msgid "pgRouting 3.0.0 Release Notes" msgstr "Notas de la versión de pgRouting 3.0.0" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.0.0 `_ on Github." +"milestone for 3.0.0 `_ on Github." msgstr "" "Para ver los problemas cerrados por esta versión, consulte el `hito cerrado " -"de Git para 3.0.0 `_ en Github." +"de Git para 3.0.0 `_ en Github." msgid "Fixed Issues" msgstr "Problemas solucionados" @@ -18908,9 +18869,6 @@ msgstr "Se ha eliminado la innecesaria columna seq" msgid "Bug Fixes" msgstr "Corrección de errores" -msgid "New Experimental functions" -msgstr "Nuevas funciones experimentales" - msgid "pgr_maxFlowMinCost" msgstr "pgr_maxFlowMinCost" @@ -18971,9 +18929,8 @@ msgstr "pgr_edwardMoore" msgid "Moved to legacy" msgstr "Se trasladó al legado" -msgid "pgr_labelGraph - Use the components family of functions instead." -msgstr "" -"pgr_labelGraph - Utilice la familia de componentes de funciones en su lugar." +msgid "pgr_labelGraph - Use the components family of functions instead." +msgstr "pgr_labelGraph - Utilizar la familia de componentes en su lugar." msgid "Max flow - functions were renamed on v2.5.0" msgstr "Max flow - las funciones fueron renombradas en v2.5.0" @@ -19010,12 +18967,12 @@ msgstr "pgRouting 2.6.3 Notas de la Versión" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.6.3 `_ on Github." +"2.6.3 `_ on Github." msgstr "" "Para ver los problemas cerrados por esta versión, consulte `Git closed " -"milestone for 2.6.3 `_ en Github." +"milestone for 2.6.3 `_ en Github." msgid "" "`#1219 `__ Implicit cast " @@ -19039,12 +18996,12 @@ msgstr "pgRouting 2.6.2 Notas de la versión" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.6.2 `_ on Github." +"2.6.2 `_ on Github." msgstr "" "Para ver los problemas cerrados por esta versión, consulte en Github la " -"`meta cerrada para 2.6.2 `_." +"`meta cerrada para 2.6.2 `_." msgid "" "`#1152 `__ Fixes driving " @@ -19072,12 +19029,12 @@ msgstr "Notas de la versión de pgRouting 2.6.1" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.6.1 `_ on Github." +"2.6.1 `_ on Github." msgstr "" "Para ver los problemas cerrados por esta versión, consulte el `Git closed " -"milestone for 2.6.1 `_ en Github." +"milestone for 2.6.1 `_ en Github." msgid "Fixes server crash on several functions." msgstr "Corrige el bloqueo del servidor en varias funciones." @@ -19170,12 +19127,12 @@ msgstr "Notas de la versión de pgRouting 2.6.0" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.6.0 `_ on Github." +"2.6.0 `_ on Github." msgstr "" "Para ver los problemas cerrados por esta versión, consulte la `meta cerrada " -"para 2.6.0 `_ en Github." +"para 2.6.0 `_ en Github." msgid "pgr_lineGraphFull" msgstr "pgr_lineGraphFull" @@ -19227,12 +19184,12 @@ msgstr "Notas de la versión de PgRouting 2.5.5" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.5.5 `_ on Github." +"2.5.5 `_ on Github." msgstr "" "Para ver los problemas cerrados por esta versión, consulte el `Git closed " -"milestone for 2.5.5 `_ en Github." +"milestone for 2.5.5 `_ en Github." msgid "Fixes driving distance when vertex is not part of the graph" msgstr "" @@ -19249,24 +19206,24 @@ msgstr "Notas de la versión de pgRouting 2.5.4" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.5.4 `_ on Github." +"2.5.4 `_ on Github." msgstr "" "Para ver los problemas cerrados por esta versión, consulte el `Git closed " -"milestone for 2.5.4 `_ en Github." +"milestone for 2.5.4 `_ en Github." msgid "pgRouting 2.5.3 Release Notes" msgstr "Notas de la versión de pgRouting 2.5.3" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.5.3 `_ on Github." +"2.5.3 `_ on Github." msgstr "" "Para ver los problemas cerrados por esta versión, consulte el `Git closed " -"milestone for 2.5.3 `_ en Github." +"milestone for 2.5.3 `_ en Github." msgid "" "Fix for postgresql 11: Removed a compilation error when compiling with " @@ -19280,12 +19237,12 @@ msgstr "Notas de la versión de pgRouting 2.5.2" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.5.2 `_ on Github." +"2.5.2 `_ on Github." msgstr "" "Para ver los problemas cerrados por esta versión, consulte el`Git closed " -"milestone for 2.5.2 `_ en Github." +"milestone for 2.5.2 `_ en Github." msgid "Fix for postgresql 10.1: Removed a compiler condition" msgstr "" @@ -19296,12 +19253,12 @@ msgstr "Notas de la versión de pgRouting 2.5.1" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.5.1 `_ on Github." +"2.5.1 `_ on Github." msgstr "" "Para ver los problemas cerrados por esta versión, consulte el `Git closed " -"milestone for 2.5.1 `_ en Github." +"milestone for 2.5.1 `_ en Github." msgid "Fixed prerequisite minimum version of: cmake" msgstr "Prerrequisito fijo versión mínima de: cmake" @@ -19311,12 +19268,12 @@ msgstr "Notas de la versión de pgRouting 2.5.0" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.5.0 `_ on Github." +"2.5.0 `_ on Github." msgstr "" "Para ver los problemas cerrados por esta versión, consulte los `Git closed " -"issues for 2.5.0 `_ en Github." +"issues for 2.5.0 `_ en Github." msgid "enhancement:" msgstr "mejora:" @@ -19340,8 +19297,8 @@ msgid "The many version results are the union of the one to one version" msgstr "" "Los muchos resultados de la versión son la unión de la versión uno a uno" -msgid "New Signatures:" -msgstr "Nuevas Firmas:" +msgid "New Signatures" +msgstr "Nuevas Firmas" msgid "pgr_bdAstar(one to one)" msgstr "pgr_bdAstar(Uno a Uno)" @@ -19358,14 +19315,11 @@ msgstr "pgr_bdDijkstraCostMatrix" msgid "pgr_lineGraph" msgstr "pgr_lineGraph" -msgid "Deprecated Signatures" -msgstr "Firmas Obsoletas" - msgid "pgr_bdastar - use pgr_bdAstar instead" msgstr "pgr_bdastar - utilice pgr_bdAstar en su lugar" -msgid "Renamed Functions" -msgstr "Funciones Renombradas" +msgid "Renamed functions" +msgstr "Funciones renombradas" msgid "pgr_maxFlowPushRelabel - use pgr_pushRelabel instead" msgstr "pgr_maxFlowPushRelabel - utilice pgr_pushRelabel en su lugar" @@ -19380,8 +19334,8 @@ msgid "pgr_maximumCardinalityMatching - use pgr_maxCardinalityMatch instead" msgstr "" "pgr_maximumCardinalityMatching - utilice pgr_maxCardinalityMatch en su lugar" -msgid "Deprecated function" -msgstr "Función Obsoleta" +msgid "Deprecated Function" +msgstr "Funcion Obsoleta" msgid "pgr_pointToEdgeNode" msgstr "pgr_pointToEdgeNode" @@ -19391,12 +19345,12 @@ msgstr "Notas de la versión de pgRouting 2.4.2" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.4.2 `_ on Github." +"2.4.2 `_ on Github." msgstr "" "Para ver los problemas cerrados por esta versión, consulte el `Git closed " -"milestone for 2.4.2 `_ en Github." +"milestone for 2.4.2 `_ en Github." msgid "Improvement" msgstr "Mejora" @@ -19418,12 +19372,12 @@ msgstr "Notas de la versión de pgRouting 2.4.1" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.4.1 `_ on Github." +"2.4.1 `_ on Github." msgstr "" "Para ver los problemas cerrados por esta versión, consulte el `Git closed " -"milestone for 2.4.1 `_ on Github." +"milestone for 2.4.1 `_ on Github." msgid "Fixed compiling error on macOS" msgstr "Corregido error de compilación en macOS" @@ -19436,15 +19390,12 @@ msgstr "Notas de la versión de pgRouting 2.4.0" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.4.0 `_ on Github." +"2.4.0 `_ on Github." msgstr "" "Para ver los problemas cerrados por esta versión, consulte el `Git closed " -"issues for 2.4.0 `_ on Github." - -msgid "New Signatures" -msgstr "Nuevas Firmas" +"issues for 2.4.0 `_ on Github." msgid "pgr_bdDijkstra" msgstr "pgr_bdDijkstra" @@ -19479,9 +19430,6 @@ msgstr "pgr_astarCostMatrix" msgid "pgr_bddijkstra - use pgr_bdDijkstra instead" msgstr "pgr_bddijkstra - utilice pgr_bdDijkstra en su lugar" -msgid "Deprecated Functions" -msgstr "Funciones obsoletas" - msgid "pgr_pointsToVids" msgstr "pgr_pointsToVids" @@ -19501,12 +19449,12 @@ msgstr "Notas de la versión de pgRouting 2.3.2" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.3.2 `_ on Github." +"2.3.2 `_ on Github." msgstr "" "Para ver los problemas cerrados por esta versión, consulte los `Git closed " -"issues for 2.3.2 `_ en Github." +"issues for 2.3.2 `_ en Github." msgid "Fixed pgr_gsoc_vrppdtw crash when all orders fit on one truck." msgstr "" @@ -19528,12 +19476,12 @@ msgstr "Notas de la versión de pgRouting 2.3.1" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.3.1 `_ on Github." +"2.3.1 `_ on Github." msgstr "" "Para ver los problemas cerrados por esta versión, consulte los `Git closed " -"issues for 2.3.1 `_ on Github." +"issues for 2.3.1 `_ on Github." msgid "Leaks on proposed max_flow functions" msgstr "Fugas en las funciones max_flow propuestas" @@ -19549,12 +19497,12 @@ msgstr "Notas de la versión de pgRouting 2.3.0" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.3.0 `_ on Github." +"2.3.0 `_ on Github." msgstr "" "Para ver los problemas cerrados por esta versión, consulte los `Git closed " -"issues for 2.3.0 `_ en Github." +"issues for 2.3.0 `_ en Github." msgid "pgr_TSP" msgstr "pgr_TSP" @@ -19636,12 +19584,12 @@ msgstr "Notas de la versión de pgRouting 2.2.4" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.2.4 `_ on Github." +"2.2.4 `_ on Github." msgstr "" "Para ver los problemas cerrados por esta versión, consulte los `Git closed " -"issues for 2.2.4 `_ on Github." +"issues for 2.2.4 `_ on Github." msgid "Bogus uses of extern \"C\"" msgstr "Bogus usos de extern \"C\"" @@ -19657,12 +19605,12 @@ msgstr "Notas de la versión de pgRouting 2.2.3" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.2.3 `_ on Github." +"2.2.3 `_ on Github." msgstr "" "Para ver los problemas cerrados por esta versión, consulte los `Git closed " -"issues for 2.2.3 `_ en Github." +"issues for 2.2.3 `_ en Github." msgid "Fixed compatibility issues with PostgreSQL 9.6." msgstr "Problemas de compatibilidad con PostgreSQL 9.6 corregidos." @@ -19672,12 +19620,12 @@ msgstr "Notas de la versión de pgRouting 2.2.2" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.2.2 `_ on Github." +"2.2.2 `_ on Github." msgstr "" "Para ver los problemas cerrados por esta versión, consulte la `meta cerrada " -"para 2.2.2 `_ en Github." +"para 2.2.2 `_ en Github." msgid "Fixed regression error on pgr_drivingDistance" msgstr "Corregido error de regresión en pgr_drivingDistance" @@ -19687,12 +19635,12 @@ msgstr "Notas de la versión de pgRouting 2.2.1" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.2.1 `_ on Github." +"2.2.1 `_ on Github." msgstr "" "Para ver los problemas cerrados por esta versión, consulte los `Git closed " -"issues for 2.2.1 `_ en Github." +"issues for 2.2.1 `_ en Github." msgid "Server crash fix on pgr_alphaShape" msgstr "Corrección de bloqueo del servidor en pgr_alphaShape" @@ -19705,12 +19653,12 @@ msgstr "Notas de la versión de pgRouting 2.2.0" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.2.0 `_ on Github." +"2.2.0 `_ on Github." msgstr "" "Para ver los problemas cerrados por esta versión, consulte los `Git closed " -"issues for 2.2.0 `_ on Github." +"issues for 2.2.0 `_ on Github." msgid "Improvements" msgstr "Mejoras" @@ -19721,8 +19669,8 @@ msgstr "Adición de un row_where y todos los parámetros opcionales" msgid "Signature fix" msgstr "Corrección de firma" -msgid "pgr_dijkstra -- to match what is documented" -msgstr "pgr_dijkstra - para que coincida con lo que está documentado" +msgid "pgr_dijkstra -- to match what is documented" +msgstr "pgr_dijkstra -- para que coincida con lo documentado" msgid "pgr_Johnson" msgstr "pgr_Johnson" @@ -19739,8 +19687,8 @@ msgstr "pgr_dijkstraCost(muchos a uno)" msgid "pgr_dijkstraCost(many to many)" msgstr "pgr_dijkstraCost(muchos a muchos)" -msgid "Proposed functionality" -msgstr "Funcionalidad propuesta" +msgid "Proposed Functionality" +msgstr "Funcionalidad Propuesta" msgid "pgr_withPoints(one to one)" msgstr "pgr_withPoints(Uno a Uno)" @@ -19778,14 +19726,11 @@ msgstr "pgr_withPointsKSP" msgid "pgr_dijkstraVia" msgstr "pgr_dijkstraVia" -msgid "Deprecated functions:" -msgstr "Funciones obsoletas:" - -msgid "pgr_apspWarshall use pgr_floydWarshall instead" -msgstr "pgr_apspWarshall utilice pgr_floydWarshall en su lugar" +msgid "pgr_apspWarshall use pgr_floydWarshall instead" +msgstr "pgr_apspWarshall utilizar pgr_floydWarshall en su lugar" -msgid "pgr_apspJohnson use pgr_Johnson instead" -msgstr "pgr_apspJohnson utilice pgr_Johnson en su lugar" +msgid "pgr_apspJohnson use pgr_Johnson instead" +msgstr "pgr_apspJohnson utilizar pgr_Johnson en su lugar" msgid "pgr_kDijkstraCost use pgr_dijkstraCost instead" msgstr "pgr_kDijkstraCost utilice pgr_dijkstraCost en su lugar" @@ -19793,8 +19738,8 @@ msgstr "pgr_kDijkstraCost utilice pgr_dijkstraCost en su lugar" msgid "pgr_kDijkstraPath use pgr_dijkstra instead" msgstr "pgr_kDijkstraPath utilice pgr_dijkstra en su lugar" -msgid "Renamed and deprecated function" -msgstr "Función renombrada y obsoleta" +msgid "Renamed and Deprecated Function" +msgstr "Función Renombrada y Obsoleta" msgid "pgr_makeDistanceMatrix renamed to _pgr_makeDistanceMatrix" msgstr "pgr_makeDistanceMatrix renombrado a _pgr_makeDistanceMatrix" @@ -19804,12 +19749,12 @@ msgstr "Notas de la versión de pgRouting 2.1.0" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.1.0 `_ on Github." +"2.1.0 `_ on Github." msgstr "" "Para ver los problemas cerrados por esta versión, consulte los `Git closed " -"issues for 2.1.0 `_ en Github." +"issues for 2.1.0 `_ en Github." msgid "pgr_dijkstra(one to many)" msgstr "pgr_dijkstra(uno a muchos)" @@ -19975,12 +19920,12 @@ msgstr "Notas de la versión de pgRouting 2.0.0" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.0.0 `_ on Github." +"2.0.0 `_ on Github." msgstr "" "Para ver los problemas cerrados por esta versión, consulte los `Git closed " -"issues for 2.0.0 `_ on Github." +"issues for 2.0.0 `_ on Github." msgid "" "With the release of pgRouting 2.0.0 the library has abandoned backwards " @@ -20123,15 +20068,15 @@ msgstr "Notas de versión de pgRouting 1.x" msgid "" "To see the issues closed by this release see the `Git closed issues for 1.x " -"`_ on Github. The following release notes have been copied " +"`_ on Github. The following release notes have been copied " "from the previous ``RELEASE_NOTES`` file and are kept as a reference." msgstr "" "Para ver los problemas cerrados por esta versión, consulte los `Git closed " -"issues for 1.x `_ on Github. The following release notes have " -"been copied from the previous ``RELEASE_NOTES`` file and are kept as a " -"reference." +"issues for 1.x `_ on Github. The following " +"release notes have been copied from the previous ``RELEASE_NOTES`` file and " +"are kept as a reference." msgid "Changes for release 1.05" msgstr "Cambios para la versión 1.05" @@ -20293,8 +20238,8 @@ msgstr "" msgid "The geometry of the segments." msgstr "" -msgid "Starting on PostgreSQL 12::" -msgstr "" +msgid "Starting on PostgreSQL 12::" +msgstr "A partir de PostgreSQL 12::" msgid "" "Optionally indexes on different columns can be created. The recomendation is " @@ -20697,7 +20642,7 @@ msgstr "ruta" msgid "is a sequence of **paths**" msgstr "es una secuencia de **caminos**" -msgid "**Used on:**" +msgid "**Used in:**" msgstr "**Usado en:**" msgid "" @@ -20707,16 +20652,13 @@ msgstr "" "Ademas de los parámetros obligatorios que tiene cada función, hay parámetros " "opcionales que existen dado el tipo de función." -msgid "Used on all Via functions" +msgid "Used in all Via functions" msgstr "Usado en todas las funciones Via" msgid "Depending on the function one or more inner queries are needed." msgstr "" "Dependiendo de la función, serán necesarias una o mas consultas internas." -msgid "Used on" -msgstr "Usado en" - msgid "withPoints - Category" msgstr "withPoints- Categoría" @@ -21095,761 +21037,804 @@ msgstr "pgr_withPointsDD es pgr_drivingDistance **con puntos**" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "pgr_withPoints es pgr_dijkstraVia **con puntos**" -msgid "Returns SET OF |result-spantree|" -msgstr "Regresa conjunto de |result-spantree|" +#~ msgid "" +#~ "Aniket Agarwal, Aryan Gupta, Ashish Kumar, Cayetano Benavent, Daniel " +#~ "Kastl, Nitish Chauhan, Rajat Shinde, Regina Obe, Shobhit Chaurasia, " +#~ "Swapnil Joshi, Virginia Vergara, Yige Huang" +#~ msgstr "" +#~ "Aniket Agarwal, Aryan Gupta, Ashish Kumar, Cayetano Benavent, Daniel " +#~ "Kastl, Nitish Chauhan, Rajat Shinde, Regina Obe, Shobhit Chaurasia, " +#~ "Swapnil Joshi, Virginia Vergara, Yige Huang" + +#~ msgid "`Georepublic `__" +#~ msgstr "`Georepublic `__" + +#~ msgid "" +#~ "The Migration guide from 2.6 can be found at https://github.com/pgRouting/" +#~ "pgrouting/wiki/Migration-Guide." +#~ msgstr "" +#~ "La guía de Migración de 2.6 se puede encontrar en https://github.com/" +#~ "pgRouting/pgrouting/wiki/Migration-Guide." + +#~ msgid "Result Columns" +#~ msgstr "Columnas de Resultados" + +#~ msgid "" +#~ "Returns SET OF ``(seq, depth, start_vid, node, edge, cost, agg_cost)``" +#~ msgstr "" +#~ "Regresa ``SET OF (seq, depth, start_vid, node, edge, cost, agg_cost)``" + +#~ msgid "" +#~ "A discussion about the work of Hamilton & Kirkman can be found in the " +#~ "book **Graph Theory (Biggs et al. 1976)**." +#~ msgstr "" +#~ "Una discusión sobre el trabajo de Hamilton & Kirkman se puede encontrar " +#~ "en el libro **Graph Theory (Biggs et al. 1976)**." + +#~ msgid "And :math:`n-2` choices for the third city, etc." +#~ msgstr "Y :math:`n-2` opciones para la tercera ciudad, etc." + +#~ msgid "" +#~ "Multiplying these together we get :math:`(n-1)! = (n-1) (n-2) . . 1`." +#~ msgstr "" +#~ "Multiplicando estos juntos obtenemos :math:`(n-1)! = (n-1) (n-2) . . 1`." + +#~ msgid "" +#~ "To handle problems like: 10 (equal dimension) boxes of apples and 5 kg " +#~ "of feathers that are to be transported (not packed in boxes)." +#~ msgstr "" +#~ "Para manejar problemas como: 10 (dimensión igual) cajas de manzanas y 5 " +#~ "kg de plumas que se van a transportar (no embaladas en cajas)." + +#~ msgid "aStar optional Parameters" +#~ msgstr "Parámetros opcionales de aStar" + +#~ msgid "" +#~ "Working with cost/reverse_cost as length in degrees, x/y in lat/lon: " +#~ "Factor = 1 (no need to change units)" +#~ msgstr "" +#~ "Trabajando con cost/reverse_cost como longitud en grados, x / y en lat/" +#~ "lon: Factor = 1 (sin necesidad de cambiar unidades)" + +#~ msgid "" +#~ "Working with cost/reverse_cost as length in meters, x/y in lat/lon: " +#~ "Factor = would depend on the location of the points:" +#~ msgstr "" +#~ "Trabajando con cost/reverse_cost donde la longitud es en metros, x / y es " +#~ "lat/lon: Factor dependere de la ubicación de los puntos:" + +#~ msgid "1 longitude degree is 78846.81 m" +#~ msgstr "1 grado de longitud es 78846,81 m" + +#~ msgid "The `agg_cost` of `(u, v)` is the same as for `(v, u)`." +#~ msgstr "El `agg_cost` de `(u, v)` es el mismo que para `(v, u)`." + +#~ msgid "When `start_vid` = `end_vid`, the `agg_cost` = 0." +#~ msgstr "En caso de `start_vid` = `end_vid`, el `agg_cost` = 0." + +#~ msgid "Weight of the edge (``source``, ``target``)" +#~ msgstr "Peso de la arista (``source``, ``target``)" + +#~ msgid "" +#~ ":doc:`pgr_bdDijkstraCostMatrix` - Bidirectional Dijkstra algorithm to " +#~ "create a matrix of costs of the shortest paths." +#~ msgstr "" +#~ ":doc:`pgr_bdDijkstraCostMatrix` - Algoritmo Dijkstra bidireccional para " +#~ "crear una matriz de costes de las rutas más cortas." + +#~ msgid "Returns SET OF ``(vertex_id, color_id)``" +#~ msgstr "Devuelve SET OF ``(vertex_id, color_id)``" + +#~ msgid "Returns SET OF ``(edge_id, color_id)``" +#~ msgstr "Devuelve SET OF ``((edge_id, color_id)``" + +#~ msgid "" +#~ "The edges :math:`v \\rightarrow w` and :math:`w \\rightarrow z` are " +#~ "removed from the graph." +#~ msgstr "" +#~ "Los aristas :math:`v \\rightarrow w` y :math:`w \\rightarrow z` fueron " +#~ "eliminados del grafo." + +#~ msgid "" +#~ "The edges :math:`u \\rightarrow v` and :math:`v \\rightarrow z` are " +#~ "removed from the graph." +#~ msgstr "" +#~ "Los aristas :math:`u \\rightarrow v` y :math:`v \\rightarrow z` son " +#~ "removidos del grafo." + +#~ msgid "" +#~ "The **aggregate cost** of :math:`(u, v)` is the same as for :math:`(v, " +#~ "u)`." +#~ msgstr "El **costo agregado** de `(u, v)` es el mismo que para `(v, u)`." + +#~ msgid "" +#~ "where :math:`sql = \\{(id_i, source_i, target_i, cost_i, " +#~ "reverse\\_cost_i)\\}`" +#~ msgstr "" +#~ "Donde :math:`sql = \\{(id_i, source_i, target_i, cost_i, " +#~ "reverse\\_cost_i)\\}`" + +#~ msgid "" +#~ "In other words: The algorithm returns a the shortest path between :math:" +#~ "`start_{vid}` and :math:`end_{vid}`, if it exists, in terms of a sequence " +#~ "of nodes and of edges," +#~ msgstr "" +#~ "En otras palabras: El algoritmo devuelve la ruta más corta entre :math:" +#~ "`start_{vid}` y :math:`end_{vid}`, si es que existe, en términos de una " +#~ "secuencia de nodos y de aristas," + +#~ msgid "Not classified" +#~ msgstr "No clasificado" + +#~ msgid "Capacity of the edge (``source``, ``target``)" +#~ msgstr "Capacidad de la arista (``source``, ``target``)" + +#~ msgid "Weight of the edge (``source``, ``target``) if it exist" +#~ msgstr "Peso de la arista (``source``, ``target``) si existe" + +#~ msgid "" +#~ ":doc:`pgr_createTopology` - create a topology based on the geometry." +#~ msgstr "" +#~ ":doc:`pgr_createTopology` - para crear una topología basada en la " +#~ "geometría." + +#~ msgid "" +#~ ":doc:`pgr_analyzeGraph` - to analyze the edges and vertices of the edge " +#~ "table." +#~ msgstr "" +#~ ":doc:`pgr_analyzeGraph` - para analizar los bordes y vértices de la tabla " +#~ "de aristas." + +#~ msgid ":doc:`pgr_nodeNetwork` -to create nodes to a not noded edge table." +#~ msgstr ":doc:`pgr_nodeNetwork` - para crear nodos en una tabla de aristas." -msgid ":math:`depth-1` is the depth of ``pred``" -msgstr ":math:`depth-1` es la profundidad de ``pred``" +#, fuzzy +#~ msgid "|result-bfs|" +#~ msgstr "Resultados" -msgid "``pred``" -msgstr "``pred``" +#, fuzzy +#~ msgid "Does not have ``depth`` result column." +#~ msgstr "No tiene un valor de facto." -msgid "Predecessor of ``node``." -msgstr "Presdecesor de ``node``." +#, fuzzy +#~ msgid "Also ``l`` could be used as **driving side**" +#~ msgstr "``l`` para el manejo del lado izquierdo" -msgid "When ``node`` = ``start_vid`` then has the value ``node``." -msgstr "Cuando ``node`` = ``start_vid`` entonces tiene el valor ``node``." +#~ msgid "Be aware of the existance of the additional return columns." +#~ msgstr "" +#~ "Tener en cuenta la existencia de las columnas de adicionales de " +#~ "resultados." -msgid "Identifier of the ``edge`` used to arrive from ``pred`` to ``node``." -msgstr "" -"Identificador del ``edge`` utilizado para llegar desde ``pred`` hasta " -"``node``." +#, fuzzy +#~ msgid "New output columns are |result-bfs|" +#~ msgstr "REGRESA CONJUNTO DE |old-generic-result|" + +#~ msgid "" +#~ "Edge :math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`) is not part of " +#~ "the graph." +#~ msgstr "" +#~ "Arista :math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`) no es parte del " +#~ "grafo." + +#~ msgid "The set of vertices :math:`V`:" +#~ msgstr "El conjunto de aristas :math:`V`:" + +#~ msgid ":math:`2` (:math:`1 \\rightarrow 3`)" +#~ msgstr ":math:`2` (:math:`1 \\rightarrow 3`)" + +#~ msgid ":math:`3` (:math:`3 \\rightarrow 2`)" +#~ msgstr ":math:`3` (:math:`3 \\rightarrow 2`)" + +#~ msgid ":math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`)" +#~ msgstr ":math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`)" + +#~ msgid ":math:`3` (:math:`3 \\frac{\\;\\;\\;\\;\\;}{} 2`)" +#~ msgstr ":math:`3` (:math:`3 \\frac{\\;\\;\\;\\;\\;}{} 2`)" + +#~ msgid "" +#~ "Personal relationships, genealogy, file dependency problems can be solved " +#~ "using pgRouting. Those problems, normally, do not come with geometries " +#~ "associated with the graph." +#~ msgstr "" +#~ "Relaciones personales, genealogía, problemas de dependencia de archivos " +#~ "puede ser resueltos usando pgRouting. Esos problemas, normalmente, no " +#~ "vienen con las geometrías asociadas con el grafo." + +#~ msgid ":doc:`sampledata`: a small graph used on the documentation examples" +#~ msgstr "" +#~ ":doc:`sampledata`: un grafo chico usado para ejemplos de documentación" + +#~ msgid "" +#~ "That information is correct, for example, when in terms of vehicles, is " +#~ "it a tunnel or bride crossing over another road." +#~ msgstr "" +#~ "Esa información es correcta, por ejemplo, cuando en términos de " +#~ "vehículos, es un túnel o puente cruczando sobre otra carretera." + +#~ msgid "" +#~ "pgr_dijkstra(`Edges SQL`_, **start vid**, **end vid** [, ``directed``])" +#~ msgstr "" +#~ "pgr_dijkstra(`SQL de aristas`_, **salida**, **destino**, [``directed``])" + +#~ msgid "" +#~ "When ``true`` departing from a visited vertex will not try to avoid using " +#~ "the edge used to reach it. In other words, U turn using the edge with " +#~ "same identifier is allowed." +#~ msgstr "" +#~ "Cuando ``true`` saliendo de un vértice visitado no intentará evitar el " +#~ "uso de la arista utilizada para alcanzarlo. En otras palabras, se permite " +#~ "la vuelta en U usando la arista con el mismo identificador." + +#~ msgid "" +#~ "When ``false`` when a departing from a visited vertex tries to avoid " +#~ "using the edge used to reach it. In other words, U turn using the edge " +#~ "with same identifier is used when no other path is found." +#~ msgstr "" +#~ "Cuando ``false`` al salir de un vértice visitado intenta evitar el uso de " +#~ "la arista utilizada para alcanzarlo. En otras palabras, se utiliza la " +#~ "vuelta en U utilizando la arista con el mismo identificador cuando no se " +#~ "encuentra ninguna otra ruta." + +#~ msgid "Return columns for a path" +#~ msgstr "Columnas devueltas para una trayectoria" + +#~ msgid "Returned on `Many to One`_ and `Many to Many`_" +#~ msgstr "Regresado en `Muchos a Uno`_ y `Muchos a Muchos`_" + +#~ msgid "Return columns for cost functions" +#~ msgstr "Columnas devueltas para funciones de costo" + +#~ msgid "Return columns for flow functions" +#~ msgstr "Columnas devueltas para funciones de flujo" + +#~ msgid "Returns SET OF ``(edge, cost)``" +#~ msgstr "Devuelve CONJUNTO DE ``(edge, cost)``" + +#~ msgid "" +#~ "Edit an existing `pgRouting Wiki `__ page." +#~ msgstr "" +#~ "Edita una página existente `Wiki de pgRouting `_." + +#~ msgid "" +#~ "And all the people that give us a little of their time making comments, " +#~ "finding issues, making pull requests etc. in any of our products: " +#~ "osm2pgrouting, pgRouting, pgRoutingLayer, workshop." +#~ msgstr "" +#~ "Y todas las personas que nos dan un poco de su tiempo haciendo " +#~ "comentarios, encontrando problemas, haciendo pull request, etc. en " +#~ "cualquiera de nuestros productos: osm2pgrouting, pgRouting, " +#~ "pgRoutingLayer, workshop." + +#~ msgid "Return columns standarized to: |nksp-result|" +#~ msgstr "Devolver columnas estandarizadas a: |nksp-result|" + +#~ msgid "RETURNS SET OF |nksp-result|" +#~ msgstr "Regresa conjunto de |nksp-result|" + +#~ msgid "" +#~ "The minimum value of the ``agg_cost`` all instances of edge `(u, v)` is " +#~ "going to be considered as the ``agg_cost`` of edge `(u, v)`" +#~ msgstr "" +#~ "El valor mínimo de ``agg_cost`` en todas las instancias del segmento " +#~ "`(u, v)` se considera como el ``agg_cost`` de la arista `(u, v)`" + +#~ msgid "RETURNS SET OF |tsp-result|" +#~ msgstr "REGRESA CONJUNTO DE |tsp-result|" + +#~ msgid "" +#~ "Visualy, The first image is the `optimal solution `__ and the second image is the " +#~ "solution obtained with ``pgr_TSPeuclidean``." +#~ msgstr "" +#~ "Visualmente, la primera imagen es la 'solución óptima'`__ y la segunda imagen es la " +#~ "solución obtenida con ``pgr_TSPeuclidean``." + +#~ msgid "`pgr_aStar(` `One to Many`_ `)`" +#~ msgstr "`pgr_aStar(` `Uno a Muchos`_ `)`" + +#~ msgid "`pgr_aStar(` `Many to One`_ `)`" +#~ msgstr "`pgr_aStar(` `Muchos a Uno`_ `)`" + +#~ msgid "`pgr_aStar(` `Many to Many`_ `)`" +#~ msgstr "`pgr_aStar(` `Muchos a Muchos`_ `)`" + +#~ msgid "`pgr_aStar(` `Combinations`_ `)`" +#~ msgstr "``pgr_aStar`` (`Combinaciones`_)" + +#~ msgid "RETURNS SET OF |matrix-result|" +#~ msgstr "Regresa conjunto de |matrix-result|" + +#~ msgid "" +#~ "The edge table to be analyzed must contain a source column and a target " +#~ "column filled with id's of the vertices of the segments and the " +#~ "corresponding vertices table _vertices_pgr that stores the " +#~ "vertices information." +#~ msgstr "" +#~ "La tabla de bordes debe ser analizada debe contener una columna de origen " +#~ "y una columna de destino llena con los identificadores de los vértices de " +#~ "los segmentos y los vértices correspondientes de la tabla " +#~ "_vertices_pgr que almacena la información de los vértices." + +#~ msgid "" +#~ "``text`` Geometry column name of the network table. Default value is " +#~ "``the_geom``." +#~ msgstr "" +#~ "``text`` nombre de la columna de la geometría en la tabla de la red. El " +#~ "valor por defecto es ``the_geom``." + +#~ msgid "" +#~ "``text`` Primary key column name of the network table. Default value is " +#~ "``id``." +#~ msgstr "" +#~ "``text``Nombre de la columna de la clave principal de la tabla de red. " +#~ "Valor por defecto es ``id``." + +#~ msgid "" +#~ "``text`` Target column name of the network table. Default value is " +#~ "``target``." +#~ msgstr "" +#~ "``text`` El nombre de la columna del nodo de llegada del segmento. El " +#~ "valor por defecto es ``target``." + +#~ msgid "" +#~ "``text`` Condition to select a subset or rows. Default value is " +#~ "``true`` to indicate all rows." +#~ msgstr "" +#~ "``text`` condición para seleccionar un subconjunto o filas. Valor " +#~ "predeterminado es ``true`` para indicar todas las filas." + +#~ msgid "" +#~ "Returns the analysis of the section of the network defined by " +#~ "``rows_where``" +#~ msgstr "" +#~ "Devuelve el análisis de la sección de la red definida por ``rows_where``" + +#~ msgid "``integer`` Indicator that the vertex might have a problem." +#~ msgstr "``integer`` indicador que el vértice podría tener un problema." + +#~ msgid "" +#~ "``boolean`` flag to treat oneway NULL values as bi-directional. Default " +#~ "value is ``true``." +#~ msgstr "" +#~ "``boolean`` bandera para tratar los valores NULL de oneway como " +#~ "bidireccional. Valor predeterminado es``true``." + +#~ msgid "" +#~ "``integer`` Indicator that the vertex might have a problem. See :doc:" +#~ "`pgr_analyzeGraph `." +#~ msgstr "" +#~ "``integer`` Indicador de que el vértice podría tener un problema. " +#~ "Consulte :doc:`pgr_analyzeGraph `." + +#~ msgid "Return columns change: ``seq`` is removed" +#~ msgstr "Cambio de columnas de retorno: ``seq`` se elimina" + +#~ msgid "RETURNS SET OF |result-node|" +#~ msgstr "REGRESA CONJUNTO DE |result-node|" + +#~ msgid "`pgr_bdAstar(` `One to Many`_ `)`" +#~ msgstr "`pgr_bdAstar(` `Uno a Muchos`_ `)`" + +#~ msgid "`pgr_bdAstar(` `Many to One`_ `)`" +#~ msgstr "`pgr_bdAstar(` `Muchos a Uno`_ `)`" + +#~ msgid "`pgr_bdAstar(` `Many to Many`_ `)`" +#~ msgstr "`pgr_bdAstar(` `Muchos a Muchos`_ `)`" + +#~ msgid "`pgr_bdAstar(` `Combinations`_ `)`" +#~ msgstr "``pgr_bdAstar`` (`Combinaciones`_)" + +#~ msgid "RETURNS SET OF |old-generic-result|" +#~ msgstr "REGRESA CONJUNTO DE |old-generic-result|" + +#~ msgid "RETURNS SET OF |result-1-1|" +#~ msgstr "REGRESA CONJUNTO DE |result-1-1|" + +#~ msgid "From vertex :math:`6` to vertex :math:`10` on a **directed** graph" +#~ msgstr "" +#~ "Del vértice :math:`6` al vértice :math:`10` en un grafo **dirigido**" + +#~ msgid "RETURNS SET OF |result-1-m|" +#~ msgstr "REGRESA CONJUNTO DE |result-1-m|" + +#~ msgid "RETURNS SET OF |result-m-1|" +#~ msgstr "REGRESA CONJUNTO DE |result-m-1|" + +#~ msgid "" +#~ "pgr_bellmanFord(`Edges SQL`_, **start vids**, **end vid** , " +#~ "[``directed``])" +#~ msgstr "" +#~ "pgr_bellmanFord(`SQL de aristas`_, **salidas**, **destino**, " +#~ "[``directed``])" + +#~ msgid "Return columns change:" +#~ msgstr "Las columnas de retorno cambian:" + +#~ msgid "RETURNS SET OF |result-component-E|" +#~ msgstr "REGRESA CONJUNTO DE |result-component-E|" + +#~ msgid "" +#~ "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:`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." +#~ msgstr "" +#~ "Es bien sabido que las rutas más cortas entre una sola fuente y todos los " +#~ "demás vértices se pueden encontrar usando Breadth First Search en :math:" +#~ "`O(|E|)` en un grafo no ponderado, es decir, la distancia es el número " +#~ "mínimo de aristas que necesita atravesar desde el origen a otro vértice. " +#~ "Podemos interpretar tal grafo también como un grafo ponderado, donde cada " +#~ "arista tiene el peso 1. Si no todas las aristas del grafo tienen el mismo " +#~ "peso, que necesitamos un algoritmo más general, como el Algoritmo de " +#~ "Dijkstra que se ejecuta en :math:`O(|E|log|V|)` tiempo." + +#~ msgid "Optional Parameters" +#~ msgstr "Parámetros Opcionales" + +#~ msgid "" +#~ "The algorithm checks graph is bipartite or not. If it is bipartite then " +#~ "it returns the node along with two colors `0` and `1` which represents " +#~ "two different sets." +#~ msgstr "" +#~ "El algoritmo comprueba si el grafo es bi-partido o no. Si es bipartido, " +#~ "devuelve el nodo junto con dos colores `0` y `1` que representan dos " +#~ "conjuntos diferentes." + +#~ msgid "RETURNS SET OF |result-node-color|" +#~ msgstr "REGRESA CONJUNTO DE |result-node-color|" + +#~ msgid "RETURNS SET OF |result-flow|" +#~ msgstr "REGRESA CONJUNTO DE |result-flow|" + +#~ msgid "RETURNS SET OF |result-bfs|" +#~ msgstr "REGRESA CONJUNTO DE |result-bfs|" + +#~ msgid "RETURNS SET OF |result-edge|" +#~ msgstr "REGRESA CONJUNTO DE |result-edge|" + +#~ msgid "RETURNS SET OF |result-1-1-no-seq|" +#~ msgstr "REGRESA CONJUNTO DE |result-1-1-no-seq|" + +#~ msgid "RETURNS SET OF |result-component-V|" +#~ msgstr "REGRESA CONJUNTO DE |result-component-V|" + +#~ msgid "RETURNS SET OF |result-contract|" +#~ msgstr "REGRESA CONJUNTO DE |result-contract|" + +#~ msgid "``text`` Network table name. (may contain the schema name AS well)" +#~ msgstr "``text`` La tabla de la red. (puede contener el nombre del esquema)" + +#~ msgid "" +#~ "``text`` Condition to SELECT a subset or rows. Default value is " +#~ "``true`` to indicate all rows that where ``source`` or ``target`` have a " +#~ "null value, otherwise the condition is used." +#~ msgstr "" +#~ "``text`` Condición para SELECCIONAR un subconjunto de filas. El valor " +#~ "predeterminado es ``true`` para indicar todas las filas donde ``source`` " +#~ "o ``target`` tienen un valor nulo, de lo contrario se utiliza la " +#~ "condición." + +#~ msgid "" +#~ "``boolean`` Clean any previous topology. Default value is ``false``." +#~ msgstr "" +#~ "``boolean`` Limpie cualquier topología previa. El valor predeterminado es " +#~ "``false``." + +#~ msgid "" +#~ "``integer`` Indicator that the vertex might have a problem. See :doc:" +#~ "`pgr_analyzeGraph`." +#~ msgstr "" +#~ "``integer`` Indicador de que el vértice podría tener un problema. " +#~ "Consulte :doc:`pgr_analyzeGraph`." + +#~ msgid "When the arguments are given in the order described:" +#~ msgstr "" +#~ "Cuando los argumentos se escriben en el orden descrito en los parámetros:" + +#~ msgid "We get the same result AS the simplest way to use the function." +#~ msgstr "" +#~ "Obtenemos el mismo resultado que la forma más sencilla de utilizar la " +#~ "función." + +#~ msgid "" +#~ "The reconstruction of the vertices table function accepts the following " +#~ "parameters:" +#~ msgstr "" +#~ "La función para la reconstrucción de la tabla mesa vértices acepta los " +#~ "siguientes parámetros:" + +#~ msgid "" +#~ "``text`` Condition to SELECT a subset or rows. Default value is " +#~ "``true`` to indicate all rows." +#~ msgstr "" +#~ "``text`` condición para seleccionar un subconjunto o filas. Valor " +#~ "predeterminado es ``true`` para indicar todas las filas." + +#~ msgid "" +#~ "The vertices table is a requierment of the :doc:`pgr_analyzeGraph` and " +#~ "the :doc:`pgr_analyzeOneWay` functions." +#~ msgstr "" +#~ "La tabla de vértices es un requerimiento de las funciones :doc:" +#~ "`pgr_analyzeGraph` y :doc:`pgr_analyzeOneWay`." + +#~ msgid "" +#~ ":doc:`topology-functions` for an overview of a topology for routing " +#~ "algorithms." +#~ msgstr "" +#~ ":doc:`topology-functions` para obtener una visión general de una " +#~ "topología para algoritmos de ruteo." + +#~ msgid "RETURNS SET OF |result-node-order|" +#~ msgstr "REGRESA CONJUNTO DE |result-node-order|" + +#~ msgid "Returns SET OF ``(seq, node)``" +#~ msgstr "Regresa conjunto de ``(seq, node)``" + +#~ msgid "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vid**)" +#~ msgstr "pgr_dagShortestPath(`SQL de aristas`_, **salida**, **destino**)" + +#~ msgid "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vids**)" +#~ msgstr "pgr_dagShortestPath(`SQL de aristas`_, **salida**, **destinos**)" + +#~ msgid "From vertex :math:`5` to vertex :math:`11` on a **directed** graph" +#~ msgstr "" +#~ "Desde el vértice :math:`5` al vértice :math:`11` en un grafo **dirigido**" + +#~ msgid "Resturn Columns" +#~ msgstr "Columnas de resultados" + +#~ msgid "" +#~ "The results can be used as base code to make a refinement based on the " +#~ "back end development needs." +#~ msgstr "" +#~ "Los resultados se pueden usar como código base para realizar un " +#~ "refinamiento basado en las necesidades de desarrollo de back-end." + +#~ msgid "" +#~ "The subway stations are on the following vertices :math:`\\{ 1, 10, 11\\}`" +#~ msgstr "" +#~ "Las estaciones de metro se encuentran en los siguientes vértices :math:" +#~ "`\\{1, 10, 11\\}`" + +#~ msgid "RETURNS SET OF |via-result|" +#~ msgstr "REGRESA CONJUNTO DE |via-result|" + +#~ msgid "" +#~ "Using the Dijkstra algorithm, 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." +#~ msgstr "" +#~ "Usando el algoritmo Dijkstra, se extraen todos los nodos que tienen " +#~ "costes menores o iguales al valor ``distance``. Los bordes extraídos se " +#~ "ajustarán al árbol de expansión correspondiente." + +#~ msgid "" +#~ "pgr_drivingDistance(`Edges SQL`_, **Root vid**, **distance**, " +#~ "[``directed``])" +#~ msgstr "" +#~ "pgr_drivingDistance(`SQL de aristas`_, **Raíz**, **distancia**, " +#~ "[``directed``])" + +#~ msgid "" +#~ "the chromatic number :math:`x'(G)` (minimum number of colors needed for " +#~ "proper edge coloring of graph) is equal to the degree :math:`\\Delta + " +#~ "1` of the graph, (:math:`x'(G) = \\Delta`)" +#~ msgstr "" +#~ "El número cromático :math:`x'(G)` (mínima cantidad de colores necesitados " +#~ "para colorear apropiadamentnte las aristas de un grafo) es igual al " +#~ "grado :math:`\\Delta + 1` del grafo, (:math:`x'(G) = \\Delta`)" + +#~ msgid "RETURNS SET OF |result-edge-color|" +#~ msgstr "Regresa conjunto de |result-edge-color|" + +#~ msgid "" +#~ "``pgr_edwardMoore`` — Returns the shortest path using Edward-Moore " +#~ "algorithm." +#~ msgstr "" +#~ "``pgr_edwardMoore`` — Devuelve la ruta más cortas usando el algoritmo " +#~ "Edward-Moore." + +#~ msgid "`start vid` ascending" +#~ msgstr "`start vid` ascendente" + +#~ msgid "`end vid` ascending" +#~ msgstr "`end_vid` ascendente" + +#~ msgid "Dryrun execution" +#~ msgstr "Ejecución de prueba" + +#~ msgid "RETURNS SET OF |result-find|" +#~ msgstr "REGRESA CONJUNTO DE |result-find|" + +#~ msgid "Points of interest geometry" +#~ msgstr "Geometría de los puntos de interés" + +#~ msgid "Points of interest data" +#~ msgstr "Datos de puntos de interés" + +#~ msgid "" +#~ "``pgr_hawickCircuits`` — Returns the list of cirucits using hawick " +#~ "circuits algorithm." +#~ msgstr "" +#~ "``pgr_hawickCircuits`` — Enumeración de los circuitos usando el algoritmo " +#~ "de circutos de Hawick." + +#~ msgid "RETURNS SET OF |result-idom|" +#~ msgstr "REGRESA CONJUNTO DE |result-idom|" + +#~ msgid "RETURNS SET OF |result-component-make|" +#~ msgstr "REGRESA CONJUNTO DE |result-component-make|" + +#~ msgid "The output table will have for ``edge_table_noded``" +#~ msgstr "La tabla de salida tendrá para ``edge_table_noded``" + +#~ msgid "before image" +#~ msgstr "Imágen del Antes" + +#~ msgid "after image" +#~ msgstr "Imágen del Después" + +#~ msgid "RETURNS SET OF |result-pickdrop|" +#~ msgstr "REGRESA CONJUNTO DE |result-pickdrop|" + +#~ msgid "RETURNS SET OF |result-closure|" +#~ msgstr "REGRESA CONJUNTO DE |result-closure|" + +#~ msgid "New prototypes:" +#~ msgstr "Nuevos prototipos:" + +#~ 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)`." + +#~ 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, 1.8)`." -msgid "" -"Column ``pred`` only applies to :doc:`pgr_drivingDistance` and :doc:" -"`pgr_withPointsDD`." -msgstr "" -"La columna ``pred`` sólo se aplica a :doc:`pgr_drivingDistance` y :doc:" -"`pgr_withPointsDD`." +#~ msgid "RETURNS SET OF |ksp-result|" +#~ msgstr "REGRESA CONJUNTO DE |ksp-result|" + +#~ msgid "RETURNS SET OF |old-pid-result|" +#~ msgstr "REGRESA CONJUNTO DE |old-pid-result|" + +#~ msgid "RETURNS SET OF |pid-1-m|" +#~ msgstr "REGRESA CONJUNTO DE |pid-1-m|" -msgid "|result-spantree|" -msgstr "|result-spantree|" +#~ msgid "RETURNS SET OF |pid-m-1|" +#~ msgstr "REGRESA CONJUNTO DE |pid-m-1|" -msgid "``pred`` contains the predecessor of the ``node``." -msgstr "``pred`` contiene el predecesor del ``nodo``." +#~ msgid "RETURNS SET OF |pid-m-m|" +#~ msgstr "REGRESA CONJUNTO DE |pid-m-m|" -msgid "Does not have ``start_vid``, ``pred`` and ``depth`` result columns." -msgstr "No tiene columnas de resultados ``start_vid``, ``pred`` y ``depth``." +#~ msgid "" +#~ "From point :math:`1` and vertex :math:`6` to point :math:`3` and vertex :" +#~ "math:`1`" +#~ msgstr "" +#~ "Desde el punto :math:`1` y el vértice :math:`6` al punto :math:`3` y al " +#~ "vértice :math:`1`" -msgid "Does not have ``depth`` and ``pred`` result columns." -msgstr "No tiene columnas de resultados ``depth`` y ``pred``." +#~ msgid "Running time: :math:`O(| start\\_vids | * (V \\log V + E))`" +#~ msgstr "Tiempo de ejecución: :math:`O(| start\\_vids | * (V \\log V + E))`" -msgid "New output columns are |result-spantree|" -msgstr "Las nuevas columnas de salida son |result-spantree|" +#~ msgid "**options:** ``[directed, driving_side]``" +#~ msgstr "**opcionales:** ``[directed, driving_side]``" -msgid "Standarizing output columns to |result-spantree|" -msgstr "Estandarización de columnas de resultados a |result-spantree|" +#~ msgid "RETURNS SET OF |matrix-pid|" +#~ msgstr "REGRESA CONJUNTO DE |matrix-pid|" -msgid "Added ``depth`` and ``pred`` result columns." -msgstr "Agregado las columnas de resultados``depth`` y ``pred``." +#~ msgid "" +#~ "From point :math:`15` and vertex :math:`6` to point :math:`3` and " +#~ "vertex :math:`1`" +#~ msgstr "" +#~ "Desde el punto :math:`15` y vértice :math:`6` al punto :math:`3` y " +#~ "vértice :math:`1`" -msgid "" -"Using the Dijkstra algorithm, extracts all the nodes that have costs less " -"than or equal to the value ``distance``. The edges extracted will conform to " -"the corresponding spaning tree." -msgstr "" -"Usando el algoritmo Dijkstra, se extraen todos los nodos que tienen costes " -"menores o iguales al valor ``distance``. Los bordes extraídos se ajustarán " -"al árbol de expansión correspondiente." +#, fuzzy +#~ msgid "Added ``depth`` and ``start_vid`` column." +#~ msgstr "``pgr_dijkstra`` (`Uno a Muchos`) no tiene ``start_vid``." -msgid "RETURNS SET OF |result-spantree|" -msgstr "Regresa conjunto de |result-spantree|" +#~ msgid "" +#~ "Point :math:`-1` corresponds to the closest edge from point :math:" +#~ "`(2.9,1.8)`." +#~ msgstr "" +#~ "El punto :math:`-1` corresponde a la arista más cercana al punto `(2.9, " +#~ "1.8)`." -msgid "Added ``depth``, ``pred`` and ``start_vid`` column." -msgstr "Agregado las columnas ``depth``, ``pred`` y ``start_vid``." +#~ msgid "" +#~ "Point :math:`-2` corresponds to the next close edge from point :math:" +#~ "`(2.9,1.8)`." +#~ msgstr "" +#~ "El punto :math:`-2` corresponde a la segunda arista más cercana al punto " +#~ "`(2.9, 1.8)`." -msgid "Added ``depth``, ``pred`` columns." -msgstr "Agregado las columnas ``depth`` y ``pred``." +#~ msgid "Deprecated signature:" +#~ msgstr "Firma obsoleta:" -msgid "" -"On new internal function: do not use named parameters and default parameters." -msgstr "" +#~ msgid "**options:** ``[directed, heap_paths, details]``" +#~ msgstr "**opcionales:** ``[directed, heap_paths, details]``" -msgid "" -"`#2565 `__ " -"pgr_pgr_lengauerTarjanDominatorTree triggers an assertion" -msgstr "" -"`#2565 `__ " -"pgr_pgr_lengauerTarjanDominatorTree genera un error de afirmación" +#~ msgid "Deprecated functions" +#~ msgstr "Funciones obsoletas" -msgid "SQL enhancements" -msgstr "Mejoras SQL" +#~ msgid "Issues" +#~ msgstr "Corrección de problemas" -msgid "" -"`#2561 `__ Not use " -"wildcards on SQL" -msgstr "" -"`#2561 `__ No usar " -"comodines en SQL" +#~ msgid "Backport issues fixes" +#~ msgstr "Corrección de problemas de Backport" -msgid "pgtap tests" -msgstr "Pruebas pgtap" +#~ msgid "" +#~ "`#232 `__: Honor " +#~ "client cancel requests in C /C++ code" +#~ msgstr "" +#~ "`#232 `__: Cliente " +#~ "honorable cliente cancela las solicitudes de código C /C++" -msgid "" -"`#2559 `__ pgtap test " -"using sampledata" -msgstr "" -"`#2559 `__ pruebas pgtap " -"test usando datos muestra" +#~ msgid "New Experimental functions" +#~ msgstr "Nuevas funciones experimentales" -msgid "" -"A discussion about the work of Hamilton & Kirkman can be found in the book " -"**Graph Theory (Biggs et al. 1976)**." -msgstr "" -"Una discusión sobre el trabajo de Hamilton & Kirkman se puede encontrar en " -"el libro **Graph Theory (Biggs et al. 1976)**." +#~ msgid "pgr_labelGraph - Use the components family of functions instead." +#~ msgstr "" +#~ "pgr_labelGraph - Utilice la familia de componentes de funciones en su " +#~ "lugar." -msgid "And :math:`n-2` choices for the third city, etc." -msgstr "Y :math:`n-2` opciones para la tercera ciudad, etc." +#~ msgid "New Signatures:" +#~ msgstr "Nuevas Firmas:" -msgid "Multiplying these together we get :math:`(n-1)! = (n-1) (n-2) . . 1`." -msgstr "Al multiplicarlas obtenemos :math:`(n-1)! = (n-1) (n-2) . . 1`." +#~ msgid "Deprecated Signatures" +#~ msgstr "Firmas Obsoletas" -msgid "" -"To handle problems like: 10 (equal dimension) boxes of apples and 5 kg of " -"feathers that are to be transported (not packed in boxes)." -msgstr "" -"Para manejar problemas como: 10 cajas de manzanas de dimesiones iguales y 5 " -"kg de plumas que se van a transportar (no embaladas en cajas)." +#~ msgid "Renamed Functions" +#~ msgstr "Funciones Renombradas" -msgid "" -"Working with cost/reverse_cost as length in degrees, x/y in lat/lon: Factor " -"= 1 (no need to change units)" -msgstr "" -"Trabajando con coste/coste_inverso como longitud en grados, x/y en lat/lon: " -"Factor = 1 (no es necesario cambiar las unidades)" - -msgid "" -"Working with cost/reverse_cost as length in meters, x/y in lat/lon: Factor = " -"would depend on the location of the points:" -msgstr "" -"Trabajando con coste/coste_inverso como longitud en metros, x/y en lat/lon: " -"Factor = dependería de la ubicación de los puntos:" - -msgid "1 longitude degree is 78846.81 m" -msgstr "1 grado de longitud son 78846.81 m" - -msgid "The `agg_cost` of `(u, v)` is the same as for `(v, u)`." -msgstr "El `agg_cost` de `(u, v)` es el mismo que para `(v, u)`." - -msgid "When `start_vid` = `end_vid`, the `agg_cost` = 0." -msgstr "Cuando `start_vid` = `end_vid`, el `agg_cost` = 0." - -msgid "" -":doc:`pgr_bdDijkstraCostMatrix` - Bidirectional Dijkstra algorithm to create " -"a matrix of costs of the shortest paths." -msgstr "" -":doc:`pgr_bdDijkstraCostMatrix` - Algoritmo bidireccional de Dijkstra para " -"crear una matriz de costes de las rutas más cortas." - -msgid "" -"The edges :math:`v \\rightarrow w` and :math:`w \\rightarrow z` are removed " -"from the graph." -msgstr "" -"Los aristas :math:`v \\rightarrow w` y :math:`w \\rightarrow z` fueron " -"eliminados del grafo." - -msgid "" -"The edges :math:`u \\rightarrow v` and :math:`v \\rightarrow z` are removed " -"from the graph." -msgstr "" -"Los aristas :math:`u \\rightarrow v` y :math:`v \\rightarrow z` son " -"removidos del grafo." - -msgid "" -"The **aggregate cost** of :math:`(u, v)` is the same as for :math:`(v, u)`." -msgstr "" -"El **costo agregado** de :math:`(u, v)` es el mismo que para :math:`(v, u)`." - -msgid "" -"where :math:`sql = \\{(id_i, source_i, target_i, cost_i, reverse\\_cost_i)\\}" -"`" -msgstr "" -"Donde :math:`sql = \\{(id_i, source_i, target_i, cost_i, reverse\\_cost_i)\\}" -"`" - -msgid "the set of vertices :math:`V`" -msgstr "El conjunto de vértices :math:`V`" - -msgid "" -"In other words: The algorithm returns a the shortest path between :math:" -"`start_{vid}` and :math:`end_{vid}`, if it exists, in terms of a sequence of " -"nodes and of edges," -msgstr "" -"En otras palabras: El algoritmo devuelve la ruta más corta entre :math:" -"`start_{vid}` y :math:`end_{vid}`, si es que existe, en términos de una " -"secuencia de nodos y de aristas," - -msgid "Capacity of the edge (``source``, ``target``)" -msgstr "Capacidad de la arista (``source``, ``target``)" - -msgid "Weight of the edge (``source``, ``target``) if it exist" -msgstr "Peso de la arista (``source``, ``target``) si existe" - -msgid ":doc:`pgr_createTopology` - create a topology based on the geometry." -msgstr "" -":doc:`pgr_createTopology` - crear una topología basada en la geometría." - -msgid "" -":doc:`pgr_analyzeGraph` - to analyze the edges and vertices of the edge " -"table." -msgstr "" -":doc:`pgr_analyzeGraph` - para analizar los bordes y vértices de la tabla de " -"aristas." - -msgid ":doc:`pgr_nodeNetwork` - to create nodes to a not noded edge table." -msgstr "" -":doc:`pgr_nodeNetwork` - para crear nodos a una tabla de aristas sin nodos." - -msgid "Also ``l`` could be used as **driving side**" -msgstr "También `` l`` podía usarse como \"lado de manejo\"" - -msgid "" -"Edge :math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`) is not part of the " -"graph." -msgstr "" -"Arista :math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`) no es parte del " -"grafo." - -msgid "The set of vertices :math:`V`:" -msgstr "El conjunto de vértices :math:`V`:" - -msgid ":math:`2` (:math:`1 \\rightarrow 3`)" -msgstr ":math:`2` (:math:`1 \\rightarrow 3`)" - -msgid ":math:`3` (:math:`3 \\rightarrow 2`)" -msgstr ":math:`3` (:math:`3 \\rightarrow 2`)" - -msgid ":math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`)" -msgstr ":math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`)" - -msgid ":math:`3` (:math:`3 \\frac{\\;\\;\\;\\;\\;}{} 2`)" -msgstr ":math:`3` (:math:`3 \\frac{\\;\\;\\;\\;\\;}{} 2`)" - -msgid "" -"Personal relationships, genealogy, file dependency problems can be solved " -"using pgRouting. Those problems, normally, do not come with geometries " -"associated with the graph." -msgstr "" -"Relaciones personales, genealogía, problemas de dependencia de archivos " -"puede ser resueltos usando pgRouting. Esos problemas, normalmente, no vienen " -"con las geometrías asociadas con el grafo." - -msgid "pgr_dijkstra(`Edges SQL`_, **start vid**, **end vid** [, ``directed``])" -msgstr "" -"pgr_dijkstra(`SQL de aristas`_, **salida**, **destino**, [``directed``])" - -msgid "" -"When ``true`` departing from a visited vertex will not try to avoid using " -"the edge used to reach it. In other words, U turn using the edge with same " -"identifier is allowed." -msgstr "" -"Cuando ``true`` saliendo de un vértice visitado no intentará evitar el uso " -"de la arista utilizada para alcanzarlo. En otras palabras, se permite la " -"vuelta en U usando la arista con el mismo identificador." - -msgid "" -"When ``false`` when a departing from a visited vertex tries to avoid using " -"the edge used to reach it. In other words, U turn using the edge with same " -"identifier is used when no other path is found." -msgstr "" -"Cuando ``false`` al salir de un vértice visitado intenta evitar el uso de la " -"arista utilizada para alcanzarlo. En otras palabras, se utiliza la vuelta en " -"U utilizando la arista con el mismo identificador cuando no se encuentra " -"ninguna otra ruta." - -msgid "Returned on `Many to One`_ and `Many to Many`_" -msgstr "Regresado en `Muchos a Uno`_ y `Muchos a Muchos`_" - -msgid "" -"Edit an existing `pgRouting Wiki `__ page." -msgstr "" -"Edita una página existente `Wiki de pgRouting `_." - -msgid "" -"And all the people that give us a little of their time making comments, " -"finding issues, making pull requests etc. in any of our products: " -"osm2pgrouting, pgRouting, pgRoutingLayer, workshop." -msgstr "" -"Y a toda la gente que nos regala un poco de su tiempo haciendo comentarios, " -"encontrando problemas, haciendo pull requests etc. en cualquiera de nuestros " -"productos: osm2pgrouting, pgRouting, pgRoutingLayer, workshop." - -msgid "" -"The minimum value of the ``agg_cost`` all instances of edge `(u, v)` is " -"going to be considered as the ``agg_cost`` of edge `(u, v)`" -msgstr "" -"El valor mínimo de ``agg_cost`` en todas las instancias de la arista `(u, " -"v)` se considera como el ``agg_cost`` de la arista `(u, v)`" - -msgid "" -"Visualy, The first image is the `optimal solution `__ and the second image is the solution " -"obtained with ``pgr_TSPeuclidean``." -msgstr "" -"Visualmente, la primera imagen es la `solución óptima `__ y la segunda imagen es la solución " -"obtenida con ``pgr_TSPeuclidean``." - -msgid "" -"The edge table to be analyzed must contain a source column and a target " -"column filled with id's of the vertices of the segments and the " -"corresponding vertices table _vertices_pgr that stores the " -"vertices information." -msgstr "" -"La tabla de aristas a analizar debe contener una columna origen y una " -"columna destino rellenas con identificadores de los vértices de los " -"segmentos y la correspondiente tabla de vértices _vertices_pgr " -"que almacena la información de los vértices." - -msgid "" -"``text`` Target column name of the network table. Default value is " -"``target``." -msgstr "" -"``text`` El nombre de la columna del destino del segmento. El valor por " -"defecto es ``target``." - -msgid "" -"``text`` Condition to select a subset or rows. Default value is ``true`` to " -"indicate all rows." -msgstr "" -"``text`` Condición para seleccionar un subconjunto o filas. Valor " -"predeterminado es ``true`` para indicar todas las filas." - -msgid "" -"Returns the analysis of the section of the network defined by ``rows_where``" -msgstr "" -"Devuelve el análisis de la sección de la red definida por ``rows_where``" - -msgid "``integer`` Indicator that the vertex might have a problem." -msgstr "``integer`` Indicador de que el vértice puede tener un problema." - -msgid "" -"``boolean`` flag to treat oneway NULL values as bi-directional. Default " -"value is ``true``." -msgstr "" -"``boolean`` bandera para tratar los valores NULL de oneway como " -"bidireccional. Valor predeterminado es``true``." - -msgid "" -"``integer`` Indicator that the vertex might have a problem. See :doc:" -"`pgr_analyzeGraph `." -msgstr "" -"``integer`` Indicador de que el vértice podría tener un problema. Consulte :" -"doc:`pgr_analyzeGraph `." - -msgid "" -"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:" -"`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." -msgstr "" -"Es bien sabido que los caminos más cortos entre un único origen y todos los " -"demás vértices se pueden encontrar utilizando la búsqueda rápida en :math:" -"`O(|E|)` en un grafo no ponderado, es decir, la distancia es el número " -"mínimo de aristas que hay que recorrer desde el origen hasta otro vértice. " -"Podemos interpretar este grafo también como un grafo ponderado, en el que " -"cada arista tiene el peso :math:`1`. Si no todas las aristas del grafo " -"tienen el mismo peso, necesitaremos un algoritmo más general, como el " -"Algoritmo de Dijkstra, que se ejecuta en tiempo :math:`O(|E|log|V|)`." - -msgid "" -"The algorithm checks graph is bipartite or not. If it is bipartite then it " -"returns the node along with two colors `0` and `1` which represents two " -"different sets." -msgstr "" -"El algoritmo comprueba si el grafo es bipartito o no. Si es bipartito " -"entonces devuelve el nodo junto con dos colores `0` y `1` que representan " -"dos conjuntos diferentes." - -msgid "Returns set of |result-contract|" -msgstr "Regresa conjunto de |result-contract|" - -msgid "" -"``text`` Condition to SELECT a subset or rows. Default value is ``true`` to " -"indicate all rows that where ``source`` or ``target`` have a null value, " -"otherwise the condition is used." -msgstr "" -"``text`` Condición para SELECCIONAR un subconjunto de filas. El valor " -"predeterminado es ``true`` para indicar todas las filas donde ``source`` o " -"``target`` tienen un valor nulo, de lo contrario se utiliza la condición." - -msgid "``boolean`` Clean any previous topology. Default value is ``false``." -msgstr "" -"``boolean`` Limpia cualquier topología anterior. El valor por defecto es " -"``false``." - -msgid "" -"``integer`` Indicator that the vertex might have a problem. See :doc:" -"`pgr_analyzeGraph`." -msgstr "" -"``integer`` Indicador de que el vértice puede tener un problema. Véase :doc:" -"`pgr_analyzeGraph`." - -msgid "" -"The reconstruction of the vertices table function accepts the following " -"parameters:" -msgstr "" -"La función de reconstrucción de la tabla de vértices acepta los siguientes " -"parámetros:" - -msgid "" -"``text`` Condition to SELECT a subset or rows. Default value is ``true`` to " -"indicate all rows." -msgstr "" -"``text`` condición para seleccionar un subconjunto o filas. Valor " -"predeterminado es ``true`` para indicar todas las filas." - -msgid "" -":doc:`topology-functions` for an overview of a topology for routing " -"algorithms." -msgstr "" -":doc:`topology-functions` para una visión general de una topología para " -"algoritmos de enrutamiento." - -msgid "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vid**)" -msgstr "pgr_dagShortestPath(`SQL de aristas`_, **salida**, **destino**)" - -msgid "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vids**)" -msgstr "pgr_dagShortestPath(`SQL de aristas`_, **salida**, **destinos**)" - -msgid "From vertex :math:`5` to vertex :math:`11` on a **directed** graph" -msgstr "Del vértice :math:`5` al vértice :math:`11` en un grafo **dirigido**" - -msgid "" -"pgr_drivingDistance(`Edges SQL`_, **Root vid**, **distance**, [``directed``])" -msgstr "" -"pgr_drivingDistance(`SQL de aristas`_, **Raíz**, **distancia**, " -"[``directed``])" - -msgid "" -"the chromatic number :math:`x'(G)` (minimum number of colors needed for " -"proper edge coloring of graph) is equal to the degree :math:`\\Delta + 1` of " -"the graph, (:math:`x'(G) = \\Delta`)" -msgstr "" -"el número cromático :math:`x'(G)` (número mínimo de colores necesarios para " -"colorear correctamente las aristas del grafo) es igual al grado :math:`" -"\\Delta + 1` del grafo, (:math:`x'(G) = \\Delta`)" - -msgid "" -"``pgr_edwardMoore`` — Returns the shortest path using Edward-Moore algorithm." -msgstr "" -"``pgr_edwardMoore`` — Devuelve la ruta más cortas usando el algoritmo Edward-" -"Moore." - -msgid "" -"The geometry ``geom``, marked as **g1** and **g2** are the **original " -"points**" -msgstr "" - -msgid "" -"``pgr_hawickCircuits`` — Returns the list of cirucits using hawick circuits " -"algorithm." -msgstr "" -"``pgr_hawickCircuits`` — Enumeración de los circuitos usando el algoritmo de " -"circutos de Hawick." - -msgid "The output table will have for ``edge_table_noded``" -msgstr "La tabla de salida que tendrá para ``edge_table_noded``" - -msgid "From vertex :math:`6` to vertex :math:`10` on an undirected graph." -msgstr "Del vértice :math:`6` al vértice :math:`10` en un grafo no dirigido." - -msgid "From vertex :math:`3` to vertex :math:`8` on a directed graph" -msgstr "Del vértice :math:`3` al vértice :math:`8` en un grafo dirigido" - -msgid "From vertex :math:`3` to vertex :math:`8` on an undirected graph" -msgstr "Del vértice :math:`3` al vértice :math:`8` en un grafo no dirigido" - -msgid "From vertex :math:`3` to vertex :math:`8` with more alternatives" -msgstr "Del vértice :math:`3` al vértice :math:`8` con más alternativas" - -# | 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`" -msgstr "" -"Desde el punto :math:`1` y vértice :math:`6` al punto :math:`3` y vértice :" -"math:`1`" - -msgid "**options:** ``[directed, driving_side]``" -msgstr "**opciones:** ``[directed, driving_side]``" - -msgid "" -"From point :math:`15` and vertex :math:`6` to point :math:`3` and vertex :" -"math:`1`" -msgstr "" -"Del punto :math:`15` y vértice :math:`6` al punto :math:`3` y vértice :math:" -"`1`" - -msgid "**options:** ``[directed, heap_paths, details]``" -msgstr "**opciones:** ``[directed, heap_paths, details]``" - -msgid "" -"`#232 `__: Honor client " -"cancel requests in C /C++ code" -msgstr "" -"`#232 `__: Honrar " -"cancelación de las solicitudes de código C /C++" - -msgid "pgr_labelGraph - Use the components family of functions instead." -msgstr "pgr_labelGraph - Utilizar la familia de componentes en su lugar." - -msgid "pgr_dijkstra -- to match what is documented" -msgstr "pgr_dijkstra -- para que coincida con lo documentado" - -msgid "pgr_apspWarshall use pgr_floydWarshall instead" -msgstr "pgr_apspWarshall utilizar pgr_floydWarshall en su lugar" - -msgid "pgr_apspJohnson use pgr_Johnson instead" -msgstr "pgr_apspJohnson utilizar pgr_Johnson en su lugar" - -msgid "Starting on PostgreSQL 12::" -msgstr "A partir de PostgreSQL 12::" - -msgid "Result columns" -msgstr "Columnas de resultados" - -msgid "Returns set of ``(seq, depth, start_vid, node, edge, cost, agg_cost)``" -msgstr "" -"Devuelve el conjunto de ``(seq, depth, start_vid, node, edge, cost, " -"agg_cost)``" - -msgid "aStar optional parameters" -msgstr "Parámetros opcionales de aStar" - -msgid "Returns set of ``(vertex_id, color_id)``" -msgstr "Regresa el conjunto de ``(vertex_id, color_id)``" - -msgid "Returns set of ``(edge_id, color_id)``" -msgstr "Regresa el conjunto de ``(edge_id, color_id)``" - -msgid "Returns set of |result-spantree|" -msgstr "Regresa el conjunto de |result-spantree|" - -msgid "Be aware of the existance of the additional result Columns." -msgstr "" -"Tener en cuenta la existencia de las columnas de adicionales de resultados." - -msgid ":doc:`sampledata`: a small graph used in the documentation examples" -msgstr "" -":doc:`sampledata`: un pequeño grafo utilizado en los ejemplos de la " -"documentación" - -msgid "" -"Capacity information, used in the :doc:`flow-family` functions does not need " -"to change when splitting edges." -msgstr "" -"La información de capacidad, utilizada en las funciones :doc:`flow-family` " -"no necesita cambiar al dividir aristas." - -msgid "Used in combination signatures" -msgstr "Utilizado en combinación firmas" - -msgid "Result columns for a path" -msgstr "Columnas de resultados para una ruta" - -msgid "Used in functions that return one path solution" -msgstr "" - -msgid "Used in functions the following:" -msgstr "Se utiliza en las funciones siguientes:" - -msgid "Result columns for cost functions" -msgstr "Columnas de resultados de las funciones de costes" - -msgid "Result columns for flow functions" -msgstr "Columnas de resultados para funciones de flujo" - -msgid "Result columns for spanning tree functions" -msgstr "Columnas de resultados para funciones de árbol de expansión" - -msgid "Returns set of ``(edge, cost)``" -msgstr "Regresa el conjunto de ``(edge, cost)``" - -msgid "Result columns standarized to: |nksp-result|" -msgstr "Columnas de resultados estandarizadas a: |nksp-result|" - -msgid "Returns set of |tsp-result|" -msgstr "Regresa el conjunto de |nksp-result|" - -msgid "Returns set of |short-generic-result|" -msgstr "Regresa el conjunto de |short-generic-result|" - -msgid "Returns set of |matrix-result|" -msgstr "Regresa el conjunto de |matrix-result|" - -msgid "Result columns change: ``seq`` is removed" -msgstr "Cambio de columnas de resultados: ``seq`` se elimina" - -msgid "Returns set of |old-generic-result|" -msgstr "Regresa el conjunto de |old-generic-result|" - -msgid "Returns set of |result-1-1|" -msgstr "Regresa el conjunto de |result-1-1|" - -msgid "Returns set of |result-1-m|" -msgstr "Regresa el conjunto de |result-1-m|" - -msgid "Returns set of |result-m-1|" -msgstr "Regresa el conjunto de |result-m-1|" - -msgid "Result columns change:" -msgstr "Las columnas de resultados cambian:" - -msgid "Returns set of |result-node-color|" -msgstr "Regresa el conjunto de |result-node-color|" - -msgid "Returns set of |result-flow|" -msgstr "Regresa el conjunto de |result-flow|" - -msgid "Returns set of |result-bfs|" -msgstr "Regresa el conjunto de |result-bfs|" - -msgid "Returns set of |result-1-1-no-seq|" -msgstr "Regresa el conjunto de |result-1-1-no-seq|" - -msgid "We get the sameresult as the simplest way to use the function." -msgstr "" -"Se obtiene el mismo resultado que la forma más sencilla de utilizar la " -"función." - -msgid "Returns set of |result-node-order|" -msgstr "Regresa el conjunto de |result-node-order|" - -msgid "Returns set of ``(seq, node)``" -msgstr "Regresa el conjunto de ``(seq, node)``" - -msgid "Returns set of |via-result|" -msgstr "Regresa el conjunto de |via-result|" - -msgid "Returns set of |result-edge-color|" -msgstr "Regresa el conjunto de |result-edge-color|" - -msgid "Returns set of |result-disjoint|" -msgstr "Regresa el conjunto de |result-disjoint|" - -msgid "Returns set of |result-disjoint-1-1|" -msgstr "Regresa el conjunto de |result-disjoint-1-1|" - -msgid "Returns set of |result-disjoint-1-m|" -msgstr "Regresa el conjunto de |result-disjoint-1-m|" - -msgid "Returns set of |result-disjoint-m-1|" -msgstr "Regresa el conjunto de |result-disjoint-m-1|" - -msgid "Returns set of |result-disjoint-m-m|" -msgstr "Regresa el conjunto de |result-disjoint-m-m|" - -msgid "Returns set of |generic-result|" -msgstr "Regresa el conjunto de |generic-result|" - -msgid "Returns set of |result-mst|" -msgstr "Regresa el conjunto de |result-mst|" - -msgid "Returns set of |result-idom|" -msgstr "Regresa el conjunto de |result-idom|" - -msgid "Returns set of |result-lineg|" -msgstr "Regresa el conjunto de |result-lineg|" - -msgid "Returns set of |result-linegf|" -msgstr "Regresa el conjunto de |result-linegf|" - -msgid "Returns set of |result-flow-mincost|" -msgstr "Regresa el conjunto de |result-flow-mincost|" - -msgid "Before image" -msgstr "Imágen del antes" - -msgid "After image" -msgstr "Imágen del después" - -msgid "Returns set of |result-pickdrop|" -msgstr "Regresa el conjunto de |result-pickdrop|" - -msgid "Returns set of |result-mincut|" -msgstr "Regresa el conjunto de |result-mincut|" - -msgid "Returns set of |result-closure|" -msgstr "Regresa el conjunto de |result-closure|" - -msgid "New proposed signatures" -msgstr "Nuevas firmas propuestas" - -msgid "Deprecated signatures" -msgstr "Firmas obsoletas" - -msgid "New prototypes" -msgstr "Nuevos prototipos" - -msgid "Returns set of |ksp-result|" -msgstr "Regresa el conjunto de |ksp-result|" - -msgid "Returns set of |old-pid-result|" -msgstr "Regresa el conjunto de |old-pid-result|" - -msgid "Returns set of |pid-1-m|" -msgstr "Regresa el conjunto de |pid-1-m|" - -msgid "Returns set of |pid-m-1|" -msgstr "Regresa el conjunto de |pid-m-1|" - -msgid "Returns set of |pid-m-m|" -msgstr "Regresa el conjunto de |pid-m-m|" - -msgid "Returns set of |matrix-pid|" -msgstr "Regresa el conjunto de |matrix-pid|" +#~ msgid "Deprecated function" +#~ msgstr "Función Obsoleta" -msgid "" -"Point :math:`-1` corresponds to the closest edge from point :math:`(2.9, " -"1.8)`." -msgstr "" -"El punto :math:`-1` corresponde a la arista más cercana al punto `(2.9, " -"1.8)`." +#~ msgid "pgr_dijkstra -- to match what is documented" +#~ msgstr "pgr_dijkstra - para que coincida con lo que está documentado" -msgid "" -"Point :math:`-2` corresponds to the next close edge from point :math:`(2.9, " -"1.8)`." -msgstr "" -"El punto :math:`-2` corresponde a la segunda arista más cercana al punto " -"`(2.9, 1.8)`." +#~ msgid "Proposed functionality" +#~ msgstr "Funcionalidad propuesta" -msgid "New overload functions" -msgstr "Nuevas funciones de sobrecarga" +#~ msgid "Deprecated functions:" +#~ msgstr "Funciones obsoletas:" -msgid "Backport issue fixes" -msgstr "Corrección de problemas atrasados" +#~ msgid "pgr_apspWarshall use pgr_floydWarshall instead" +#~ msgstr "pgr_apspWarshall utilice pgr_floydWarshall en su lugar" -msgid "Renamed functions" -msgstr "Funciones renombradas" +#~ msgid "pgr_apspJohnson use pgr_Johnson instead" +#~ msgstr "pgr_apspJohnson utilice pgr_Johnson en su lugar" -msgid "Deprecated Function" -msgstr "Funcion Obsoleta" +#~ msgid "Renamed and deprecated function" +#~ msgstr "Función renombrada y obsoleta" -msgid "Proposed Functionality" -msgstr "Funcionalidad Propuesta" +#~ msgid "**Used on:**" +#~ msgstr "**Usado en:**" -msgid "Renamed and Deprecated Function" -msgstr "Función Renombrada y Obsoleta" +#~ msgid "Used on all Via functions" +#~ msgstr "Usado en todas las funciones Via" -msgid "**Used in:**" -msgstr "**Usado en:**" +#~ msgid "Used on" +#~ msgstr "Usado en" -msgid "Used in all Via functions" -msgstr "Usado en todas las funciones Via" +#~ msgid "Returns SET OF |result-spantree|" +#~ msgstr "Regresa conjunto de |result-spantree|" -msgid "" -"That information is correct, for example, when in terms of vehicles, is it a " -"tunnel or bridge crossing over another road." -msgstr "" -"Esa información es correcta, por ejemplo, cuando en términos de vehículos, " -"es un túnel o puente cruczando sobre otra carretera." +#~ msgid "RETURNS SET OF |result-spantree|" +#~ msgstr "Regresa conjunto de |result-spantree|" -#, fuzzy +#~ msgid "" +#~ "pgr_dijkstra(`Edges SQL`_, **start vid**, **end vid** [, ``directed``])" +#~ msgstr "" +#~ "pgr_dijkstra(`SQL de aristas`_, **salida**, **destino**, [``directed``])" diff --git a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po index ea520de670..ddff223e7e 100644 --- a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-19 19:56+0000\n" +"POT-Creation-Date: 2024-01-04 04:09+0000\n" "PO-Revision-Date: 2022-09-29 19:13+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Japanese `__" +"`Wikipedia: Prim's algorithm `__" msgstr "" msgid "" @@ -2681,8 +2681,8 @@ msgid "" msgstr "" msgid "" -"The **aggregate cost** the non included values :math:`(u, v)` is :math:`" -"\\infty`" +"The **aggregate cost** the non included values :math:`(u, v)` is :math:" +"`\\infty`" msgstr "" msgid "" @@ -3438,8 +3438,8 @@ msgid "Can be used as input to :doc:`pgr_TSP`." msgstr "" msgid "" -"Use directly when the resulting matrix is symmetric and there is no :math:`" -"\\infty` value." +"Use directly when the resulting matrix is symmetric and there is no :math:" +"`\\infty` value." msgstr "" msgid "It will be the users responsibility to make the matrix symmetric." @@ -3741,17 +3741,17 @@ msgid "" "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}`" +"\\cup \\{(source_i, target_i, reverse\\_cost_i) \\text{ when } " +"reverse\\_cost_i >=0)\\} & \\quad \\text{ if } reverse\\_cost \\neq " +"\\varnothing \\\\ \\end{cases}`" msgstr "" ":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) " +"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}`" @@ -3779,11 +3779,11 @@ msgid "Then:" msgstr "その次に：" msgid "" -":math:`\\boldsymbol{\\pi} = \\{(path\\_seq_i, node_i, edge_i, cost_i, agg" -"\\_cost_i)\\}`" +":math:`\\boldsymbol{\\pi} = \\{(path\\_seq_i, node_i, edge_i, cost_i, " +"agg\\_cost_i)\\}`" msgstr "" -":math:`\\boldsymbol{\\pi} = \\{(path\\_seq_i, node_i, edge_i, cost_i, agg" -"\\_cost_i)\\}`" +":math:`\\boldsymbol{\\pi} = \\{(path\\_seq_i, node_i, edge_i, cost_i, " +"agg\\_cost_i)\\}`" msgid "where:" msgstr "どこに：" @@ -4253,8 +4253,8 @@ msgid "pgr_maxFlow :math:`(edges\\_sql, source\\_vertex, sink\\_vertex)`" msgstr "" msgid "" -"where :math:`edges\\_sql = \\{(id_i, source_i, target_i, capacity_i, reverse" -"\\_capacity_i)\\}`" +"where :math:`edges\\_sql = \\{(id_i, source_i, target_i, capacity_i, " +"reverse\\_capacity_i)\\}`" msgstr "" msgid "Graph definition" @@ -4276,8 +4276,8 @@ msgid "" "\\text{ when } capacity > 0 \\} & \\quad \\text{ if } reverse\\_capacity = " "\\varnothing \\\\ \\text{ } & \\quad \\text{ } \\\\ \\{(source_i, target_i, " "capacity_i) \\text{ when } capacity > 0 \\} & \\text{ } \\\\ \\cup " -"\\{(target_i, source_i, reverse\\_capacity_i) \\text{ when } reverse" -"\\_capacity_i > 0)\\} & \\quad \\text{ if } reverse\\_capacity \\neq " +"\\{(target_i, source_i, reverse\\_capacity_i) \\text{ when } " +"reverse\\_capacity_i > 0)\\} & \\quad \\text{ if } reverse\\_capacity \\neq " "\\varnothing \\\\ \\end{cases}`" msgstr "" @@ -5565,8 +5565,8 @@ msgstr "" msgid "" ":math:`E = \\begin{split} \\begin{align} & {\\{(source_{id}, target_{id}, " "cost_{id}) \\text{ when } cost_{id} >=0 \\}} \\\\ & \\cup \\\\ & " -"{\\{(target_{id}, source_{id}, reverse\\_cost_{id}) \\text{ when } reverse" -"\\_cost_{id} >=0 \\}} \\end{align} \\end{split}`" +"{\\{(target_{id}, source_{id}, reverse\\_cost_{id}) \\text{ when } " +"reverse\\_cost_{id} >=0 \\}} \\end{align} \\end{split}`" msgstr "" msgid "" @@ -6915,7 +6915,7 @@ msgid "Upgrading the database" msgstr "" msgid "" -"To upgrade pgRouting in the database to version 3.6.0 use the following " +"To upgrade pgRouting in the database to version 3.7.0 use the following " "command:" msgstr "" @@ -7250,13 +7250,15 @@ msgstr "貢献者" msgid "This Release Contributors" msgstr "このリリースに対する貢献者" -msgid "Individuals in this release (in alphabetical order)" -msgstr "" +#, fuzzy +msgid "Individuals in this release v3.7.x (in alphabetical order)" +msgstr "個人(アルファベット順)" -msgid "" -"Aniket Agarwal, Aryan Gupta, Ashish Kumar, Cayetano Benavent, Daniel Kastl, " -"Nitish Chauhan, Rajat Shinde, Regina Obe, Shobhit Chaurasia, Swapnil Joshi, " -"Virginia Vergara, Yige Huang" +#, fuzzy +msgid "(Alphabetical order)" +msgstr "個人(アルファベット順)" + +msgid "Regina Obe, Vicky Vergara" msgstr "" msgid "" @@ -7275,7 +7277,10 @@ msgstr "" "これらは、デベロッパーが開発に要する時間、ホスティング、また pgRoutingプロ" "ジェクトへ直接資金を支援してくださっているスポンサー企業です。" -msgid "`Georepublic `__" +msgid "`OSGeo `__" +msgstr "" + +msgid "`OSGeo UK `__" msgstr "" msgid "`Google Summer of Code `__" @@ -7329,6 +7334,12 @@ msgstr "" msgid "Orkney" msgstr "" +msgid "OSGeo" +msgstr "" + +msgid "OSGeo UK" +msgstr "" + msgid "Paragon Corporation" msgstr "" @@ -7356,9 +7367,7 @@ msgstr "" msgid "Boost C++ source libraries at https://www.boost.org." msgstr "" -msgid "" -"The Migration guide from 2.6 can be found at https://github.com/pgRouting/" -"pgrouting/wiki/Migration-Guide." +msgid ":doc:`migration`" msgstr "" msgid "pgr_KSP" @@ -8848,8 +8857,8 @@ msgid "Using a combinations table on an **undirected** graph" msgstr "" msgid "" -"https://www.cs.princeton.edu/courses/archive/spr06/cos423/Handouts/EPP" -"%20shortest%20path%20algorithms.pdf" +"https://www.cs.princeton.edu/courses/archive/spr06/cos423/Handouts/" +"EPP%20shortest%20path%20algorithms.pdf" msgstr "" msgid "https://en.wikipedia.org/wiki/Bidirectional_search" @@ -9225,8 +9234,9 @@ msgid "The odd length cyclic graph can not be bipartite." msgstr "" msgid "" -"The edge :math:`5 \\rightarrow 1` will make subgraph with vertices :math:`" -"\\{1, 3, 7, 6, 5\\}` an odd length cyclic graph, as the cycle has 5 vertices." +"The edge :math:`5 \\rightarrow 1` will make subgraph with vertices :math:" +"`\\{1, 3, 7, 6, 5\\}` an odd length cyclic graph, as the cycle has 5 " +"vertices." msgstr "" msgid "Edges in blue represent odd length cycle subgraph." @@ -10119,8 +10129,8 @@ msgid "" msgstr "" msgid "" -"`Wikipedia: Cuthill-McKee Ordering `__" +"`Wikipedia: Cuthill-McKee Ordering `__" msgstr "" msgid "pgr_dagShortestPath - Experimental" @@ -12885,9 +12895,6 @@ msgstr "" msgid "Identifier of the edge in the original query." msgstr "" -msgid ":doc:`migration`" -msgstr "" - msgid "https://www.boost.org/libs/graph/doc/maximum_matching.html" msgstr "" @@ -15209,8 +15216,8 @@ msgid "" msgstr "" msgid "" -"Wikipedia: `Prim's algorithm `__" +"Wikipedia: `Prim's algorithm `__" msgstr "" msgid "Proposed Functions" @@ -15280,13 +15287,44 @@ msgid "" "github.com/pgRouting/pgrouting/commits>`_ on Github." msgstr "" +msgid "pgRouting 3.7.0 Release Notes" +msgstr "" + +msgid "" +"To see all issues & pull requests closed by this release see the `Git closed " +"milestone for 3.7.0 `_" +msgstr "" + +msgid "Code enhancement" +msgstr "" + +msgid "" +"`#2599 `__ Driving " +"distance cleanup" +msgstr "" + +msgid "pgRouting 3.6.1 Release Notes" +msgstr "" + +msgid "" +"To see all issues & pull requests closed by this release see the `Git closed " +"milestone for 3.6.1 `_" +msgstr "" + +msgid "" +"`#2588 `__ pgrouting 3.6.0 " +"fails to build on OSX" +msgstr "" + msgid "pgRouting 3.6.0 Release Notes" msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.6.0 `_" +"milestone for 3.6.0 `_" msgstr "" msgid "Official functions changes" @@ -15406,8 +15444,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.5.1 `_" +"milestone for 3.5.1 `_" msgstr "" #, fuzzy @@ -15476,8 +15514,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.5.0 `_" +"milestone for 3.5.0 `_" msgstr "" msgid "Dijkstra" @@ -15498,8 +15536,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.4.2 `_" +"milestone for 3.4.2 `_" msgstr "" msgid "" @@ -15518,8 +15556,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.4.1 `_" +"milestone for 3.4.1 `_" msgstr "" msgid "" @@ -15537,8 +15575,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.4.0 `_" +"milestone for 3.4.0 `_" msgstr "" msgid "" @@ -15650,8 +15688,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.3.4 `_" +"milestone for 3.3.4 `_" msgstr "" msgid "" @@ -15664,8 +15702,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.3.3 `_" +"milestone for 3.3.3 `_" msgstr "" msgid "" @@ -15678,8 +15716,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.3.2 `_" +"milestone for 3.3.2 `_" msgstr "" msgid "Revised documentation" @@ -15732,8 +15770,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.3.1 `_ on Github." +"milestone for 3.3.1 `_ on Github." msgstr "" msgid "" @@ -15751,8 +15789,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.3.0 `_ on Github." +"milestone for 3.3.0 `_ on Github." msgstr "" msgid "" @@ -15839,8 +15877,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.2.2 `_ on Github." +"milestone for 3.2.2 `_ on Github." msgstr "" msgid "" @@ -15858,8 +15896,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.2.1 `_ on Github." +"milestone for 3.2.1 `_ on Github." msgstr "" msgid "" @@ -15883,8 +15921,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.2.0 `_ on Github." +"milestone for 3.2.0 `_ on Github." msgstr "" msgid "Build" @@ -15975,8 +16013,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.1.4 `_ on Github." +"milestone for 3.1.4 `_ on Github." msgstr "" msgid "Issues fixes" @@ -15987,8 +16025,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.1.3 `_ on Github." +"milestone for 3.1.3 `_ on Github." msgstr "" msgid "" @@ -16011,8 +16049,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.1.2 `_ on Github." +"milestone for 3.1.2 `_ on Github." msgstr "" msgid "" @@ -16045,8 +16083,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.1.1 `_ on Github." +"milestone for 3.1.1 `_ on Github." msgstr "" msgid "" @@ -16079,8 +16117,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.1.0 `_ on Github." +"milestone for 3.1.0 `_ on Github." msgstr "" msgid "pgr_dijkstra(combinations)" @@ -16100,8 +16138,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.0.6 `_ on Github." +"milestone for 3.0.6 `_ on Github." msgstr "" msgid "pgRouting 3.0.5 Release Notes" @@ -16109,8 +16147,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.0.5 `_ on Github." +"milestone for 3.0.5 `_ on Github." msgstr "" msgid "Backport issue fixes" @@ -16121,8 +16159,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.0.4 `_ on Github." +"milestone for 3.0.4 `_ on Github." msgstr "" msgid "pgRouting 3.0.3 Release Notes" @@ -16133,8 +16171,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.0.2 `_ on Github." +"milestone for 3.0.2 `_ on Github." msgstr "" msgid "" @@ -16147,8 +16185,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.0.1 `_ on Github." +"milestone for 3.0.1 `_ on Github." msgstr "" msgid "" @@ -16161,8 +16199,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.0.0 `_ on Github." +"milestone for 3.0.0 `_ on Github." msgstr "" msgid "Fixed Issues" @@ -16521,8 +16559,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.6.3 `_ on Github." +"2.6.3 `_ on Github." msgstr "" msgid "" @@ -16545,8 +16583,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.6.2 `_ on Github." +"2.6.2 `_ on Github." msgstr "" msgid "" @@ -16569,8 +16607,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.6.1 `_ on Github." +"2.6.1 `_ on Github." msgstr "" msgid "Fixes server crash on several functions." @@ -16662,8 +16700,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.6.0 `_ on Github." +"2.6.0 `_ on Github." msgstr "" msgid "pgr_lineGraphFull" @@ -16711,8 +16749,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.5.5 `_ on Github." +"2.5.5 `_ on Github." msgstr "" msgid "Fixes driving distance when vertex is not part of the graph" @@ -16729,8 +16767,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.5.4 `_ on Github." +"2.5.4 `_ on Github." msgstr "" msgid "pgRouting 2.5.3 Release Notes" @@ -16738,8 +16776,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.5.3 `_ on Github." +"2.5.3 `_ on Github." msgstr "" msgid "" @@ -16752,8 +16790,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.5.2 `_ on Github." +"2.5.2 `_ on Github." msgstr "" msgid "Fix for postgresql 10.1: Removed a compiler condition" @@ -16764,8 +16802,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.5.1 `_ on Github." +"2.5.1 `_ on Github." msgstr "" msgid "Fixed prerequisite minimum version of: cmake" @@ -16776,8 +16814,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.5.0 `_ on Github." +"2.5.0 `_ on Github." msgstr "" msgid "enhancement:" @@ -16849,8 +16887,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.4.2 `_ on Github." +"2.4.2 `_ on Github." msgstr "" msgid "Improvement" @@ -16871,8 +16909,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.4.1 `_ on Github." +"2.4.1 `_ on Github." msgstr "" msgid "Fixed compiling error on macOS" @@ -16886,8 +16924,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.4.0 `_ on Github." +"2.4.0 `_ on Github." msgstr "" msgid "pgr_bdDijkstra" @@ -16940,8 +16978,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.3.2 `_ on Github." +"2.3.2 `_ on Github." msgstr "" msgid "Fixed pgr_gsoc_vrppdtw crash when all orders fit on one truck." @@ -16961,8 +16999,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.3.1 `_ on Github." +"2.3.1 `_ on Github." msgstr "" msgid "Leaks on proposed max_flow functions" @@ -16979,8 +17017,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.3.0 `_ on Github." +"2.3.0 `_ on Github." msgstr "" msgid "pgr_TSP" @@ -17063,8 +17101,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.2.4 `_ on Github." +"2.2.4 `_ on Github." msgstr "" msgid "Bogus uses of extern \"C\"" @@ -17081,8 +17119,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.2.3 `_ on Github." +"2.2.3 `_ on Github." msgstr "" msgid "Fixed compatibility issues with PostgreSQL 9.6." @@ -17093,8 +17131,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.2.2 `_ on Github." +"2.2.2 `_ on Github." msgstr "" msgid "Fixed regression error on pgr_drivingDistance" @@ -17105,8 +17143,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.2.1 `_ on Github." +"2.2.1 `_ on Github." msgstr "" msgid "Server crash fix on pgr_alphaShape" @@ -17120,8 +17158,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.2.0 `_ on Github." +"2.2.0 `_ on Github." msgstr "" msgid "Improvements" @@ -17214,8 +17252,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.1.0 `_ on Github." +"2.1.0 `_ on Github." msgstr "" msgid "pgr_dijkstra(one to many)" @@ -17363,8 +17401,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.0.0 `_ on Github." +"2.0.0 `_ on Github." msgstr "" msgid "" @@ -17489,8 +17527,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for 1.x " -"`_ on Github. The following release notes have been copied " +"`_ on Github. The following release notes have been copied " "from the previous ``RELEASE_NOTES`` file and are kept as a reference." msgstr "" @@ -18347,5 +18385,3 @@ msgstr "" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "" - -#, fuzzy diff --git a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po index d555c09496..c9969cf4f8 100644 --- a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-19 19:56+0000\n" +"POT-Creation-Date: 2024-01-04 04:09+0000\n" "PO-Revision-Date: 2022-12-13 12:30+0000\n" "Last-Translator: Hyung-Gyu Ryoo \n" "Language-Team: Korean `__" +"`Wikipedia: Prim's algorithm `__" msgstr "" msgid "" @@ -2657,8 +2657,8 @@ msgid "" msgstr "" msgid "" -"The **aggregate cost** the non included values :math:`(u, v)` is :math:`" -"\\infty`" +"The **aggregate cost** the non included values :math:`(u, v)` is :math:" +"`\\infty`" msgstr "" msgid "" @@ -3414,8 +3414,8 @@ msgid "Can be used as input to :doc:`pgr_TSP`." msgstr "" msgid "" -"Use directly when the resulting matrix is symmetric and there is no :math:`" -"\\infty` value." +"Use directly when the resulting matrix is symmetric and there is no :math:" +"`\\infty` value." msgstr "" msgid "It will be the users responsibility to make the matrix symmetric." @@ -3700,9 +3700,9 @@ msgid "" "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}`" +"\\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" @@ -3726,8 +3726,8 @@ msgid "Then:" msgstr "" msgid "" -":math:`\\boldsymbol{\\pi} = \\{(path\\_seq_i, node_i, edge_i, cost_i, agg" -"\\_cost_i)\\}`" +":math:`\\boldsymbol{\\pi} = \\{(path\\_seq_i, node_i, edge_i, cost_i, " +"agg\\_cost_i)\\}`" msgstr "" msgid "where:" @@ -4186,8 +4186,8 @@ msgid "pgr_maxFlow :math:`(edges\\_sql, source\\_vertex, sink\\_vertex)`" msgstr "" msgid "" -"where :math:`edges\\_sql = \\{(id_i, source_i, target_i, capacity_i, reverse" -"\\_capacity_i)\\}`" +"where :math:`edges\\_sql = \\{(id_i, source_i, target_i, capacity_i, " +"reverse\\_capacity_i)\\}`" msgstr "" msgid "Graph definition" @@ -4209,8 +4209,8 @@ msgid "" "\\text{ when } capacity > 0 \\} & \\quad \\text{ if } reverse\\_capacity = " "\\varnothing \\\\ \\text{ } & \\quad \\text{ } \\\\ \\{(source_i, target_i, " "capacity_i) \\text{ when } capacity > 0 \\} & \\text{ } \\\\ \\cup " -"\\{(target_i, source_i, reverse\\_capacity_i) \\text{ when } reverse" -"\\_capacity_i > 0)\\} & \\quad \\text{ if } reverse\\_capacity \\neq " +"\\{(target_i, source_i, reverse\\_capacity_i) \\text{ when } " +"reverse\\_capacity_i > 0)\\} & \\quad \\text{ if } reverse\\_capacity \\neq " "\\varnothing \\\\ \\end{cases}`" msgstr "" @@ -5502,8 +5502,8 @@ msgstr "" msgid "" ":math:`E = \\begin{split} \\begin{align} & {\\{(source_{id}, target_{id}, " "cost_{id}) \\text{ when } cost_{id} >=0 \\}} \\\\ & \\cup \\\\ & " -"{\\{(target_{id}, source_{id}, reverse\\_cost_{id}) \\text{ when } reverse" -"\\_cost_{id} >=0 \\}} \\end{align} \\end{split}`" +"{\\{(target_{id}, source_{id}, reverse\\_cost_{id}) \\text{ when } " +"reverse\\_cost_{id} >=0 \\}} \\end{align} \\end{split}`" msgstr "" msgid "" @@ -6850,7 +6850,7 @@ msgid "Upgrading the database" msgstr "데이터베이스 업그레이드" msgid "" -"To upgrade pgRouting in the database to version 3.6.0 use the following " +"To upgrade pgRouting in the database to version 3.7.0 use the following " "command:" msgstr "" @@ -7184,13 +7184,13 @@ msgstr "" msgid "This Release Contributors" msgstr "" -msgid "Individuals in this release (in alphabetical order)" +msgid "Individuals in this release v3.7.x (in alphabetical order)" msgstr "" -msgid "" -"Aniket Agarwal, Aryan Gupta, Ashish Kumar, Cayetano Benavent, Daniel Kastl, " -"Nitish Chauhan, Rajat Shinde, Regina Obe, Shobhit Chaurasia, Swapnil Joshi, " -"Virginia Vergara, Yige Huang" +msgid "(Alphabetical order)" +msgstr "" + +msgid "Regina Obe, Vicky Vergara" msgstr "" msgid "" @@ -7207,7 +7207,10 @@ msgid "" "or direct monetary funding to the pgRouting project:" msgstr "" -msgid "`Georepublic `__" +msgid "`OSGeo `__" +msgstr "" + +msgid "`OSGeo UK `__" msgstr "" msgid "`Google Summer of Code `__" @@ -7261,6 +7264,12 @@ msgstr "" msgid "Orkney" msgstr "" +msgid "OSGeo" +msgstr "" + +msgid "OSGeo UK" +msgstr "" + msgid "Paragon Corporation" msgstr "" @@ -7286,10 +7295,8 @@ msgstr "" msgid "Boost C++ source libraries at https://www.boost.org." msgstr "" -msgid "" -"The Migration guide from 2.6 can be found at https://github.com/pgRouting/" -"pgrouting/wiki/Migration-Guide." -msgstr "" +msgid ":doc:`migration`" +msgstr ":doc:`migration`" msgid "pgr_KSP" msgstr "" @@ -8773,8 +8780,8 @@ msgid "Using a combinations table on an **undirected** graph" msgstr "" msgid "" -"https://www.cs.princeton.edu/courses/archive/spr06/cos423/Handouts/EPP" -"%20shortest%20path%20algorithms.pdf" +"https://www.cs.princeton.edu/courses/archive/spr06/cos423/Handouts/" +"EPP%20shortest%20path%20algorithms.pdf" msgstr "" msgid "https://en.wikipedia.org/wiki/Bidirectional_search" @@ -9150,8 +9157,9 @@ msgid "The odd length cyclic graph can not be bipartite." msgstr "" msgid "" -"The edge :math:`5 \\rightarrow 1` will make subgraph with vertices :math:`" -"\\{1, 3, 7, 6, 5\\}` an odd length cyclic graph, as the cycle has 5 vertices." +"The edge :math:`5 \\rightarrow 1` will make subgraph with vertices :math:" +"`\\{1, 3, 7, 6, 5\\}` an odd length cyclic graph, as the cycle has 5 " +"vertices." msgstr "" msgid "Edges in blue represent odd length cycle subgraph." @@ -10043,8 +10051,8 @@ msgid "" msgstr "" msgid "" -"`Wikipedia: Cuthill-McKee Ordering `__" +"`Wikipedia: Cuthill-McKee Ordering `__" msgstr "" msgid "pgr_dagShortestPath - Experimental" @@ -12797,9 +12805,6 @@ msgstr "" msgid "Identifier of the edge in the original query." msgstr "" -msgid ":doc:`migration`" -msgstr ":doc:`migration`" - msgid "https://www.boost.org/libs/graph/doc/maximum_matching.html" msgstr "" @@ -15110,8 +15115,8 @@ msgid "" msgstr "" msgid "" -"Wikipedia: `Prim's algorithm `__" +"Wikipedia: `Prim's algorithm `__" msgstr "" msgid "Proposed Functions" @@ -15180,13 +15185,44 @@ msgid "" "github.com/pgRouting/pgrouting/commits>`_ on Github." msgstr "" +msgid "pgRouting 3.7.0 Release Notes" +msgstr "" + +msgid "" +"To see all issues & pull requests closed by this release see the `Git closed " +"milestone for 3.7.0 `_" +msgstr "" + +msgid "Code enhancement" +msgstr "" + +msgid "" +"`#2599 `__ Driving " +"distance cleanup" +msgstr "" + +msgid "pgRouting 3.6.1 Release Notes" +msgstr "" + +msgid "" +"To see all issues & pull requests closed by this release see the `Git closed " +"milestone for 3.6.1 `_" +msgstr "" + +msgid "" +"`#2588 `__ pgrouting 3.6.0 " +"fails to build on OSX" +msgstr "" + msgid "pgRouting 3.6.0 Release Notes" msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.6.0 `_" +"milestone for 3.6.0 `_" msgstr "" msgid "Official functions changes" @@ -15305,8 +15341,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.5.1 `_" +"milestone for 3.5.1 `_" msgstr "" msgid "Documentation fixes" @@ -15375,8 +15411,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.5.0 `_" +"milestone for 3.5.0 `_" msgstr "" msgid "Dijkstra" @@ -15397,8 +15433,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.4.2 `_" +"milestone for 3.4.2 `_" msgstr "" msgid "" @@ -15417,8 +15453,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.4.1 `_" +"milestone for 3.4.1 `_" msgstr "" msgid "" @@ -15436,8 +15472,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.4.0 `_" +"milestone for 3.4.0 `_" msgstr "" msgid "" @@ -15549,8 +15585,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.3.4 `_" +"milestone for 3.3.4 `_" msgstr "" msgid "" @@ -15563,8 +15599,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.3.3 `_" +"milestone for 3.3.3 `_" msgstr "" msgid "" @@ -15577,8 +15613,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.3.2 `_" +"milestone for 3.3.2 `_" msgstr "" msgid "Revised documentation" @@ -15631,8 +15667,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.3.1 `_ on Github." +"milestone for 3.3.1 `_ on Github." msgstr "" msgid "" @@ -15650,8 +15686,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.3.0 `_ on Github." +"milestone for 3.3.0 `_ on Github." msgstr "" msgid "" @@ -15738,8 +15774,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.2.2 `_ on Github." +"milestone for 3.2.2 `_ on Github." msgstr "" msgid "" @@ -15757,8 +15793,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.2.1 `_ on Github." +"milestone for 3.2.1 `_ on Github." msgstr "" msgid "" @@ -15782,8 +15818,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.2.0 `_ on Github." +"milestone for 3.2.0 `_ on Github." msgstr "" msgid "Build" @@ -15874,8 +15910,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.1.4 `_ on Github." +"milestone for 3.1.4 `_ on Github." msgstr "" msgid "Issues fixes" @@ -15886,8 +15922,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.1.3 `_ on Github." +"milestone for 3.1.3 `_ on Github." msgstr "" msgid "" @@ -15910,8 +15946,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.1.2 `_ on Github." +"milestone for 3.1.2 `_ on Github." msgstr "" msgid "" @@ -15944,8 +15980,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.1.1 `_ on Github." +"milestone for 3.1.1 `_ on Github." msgstr "" msgid "" @@ -15978,8 +16014,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.1.0 `_ on Github." +"milestone for 3.1.0 `_ on Github." msgstr "" msgid "pgr_dijkstra(combinations)" @@ -15999,8 +16035,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.0.6 `_ on Github." +"milestone for 3.0.6 `_ on Github." msgstr "" msgid "pgRouting 3.0.5 Release Notes" @@ -16008,8 +16044,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.0.5 `_ on Github." +"milestone for 3.0.5 `_ on Github." msgstr "" msgid "Backport issue fixes" @@ -16020,8 +16056,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.0.4 `_ on Github." +"milestone for 3.0.4 `_ on Github." msgstr "" msgid "pgRouting 3.0.3 Release Notes" @@ -16032,8 +16068,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.0.2 `_ on Github." +"milestone for 3.0.2 `_ on Github." msgstr "" msgid "" @@ -16046,8 +16082,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.0.1 `_ on Github." +"milestone for 3.0.1 `_ on Github." msgstr "" msgid "" @@ -16060,8 +16096,8 @@ msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.0.0 `_ on Github." +"milestone for 3.0.0 `_ on Github." msgstr "" msgid "Fixed Issues" @@ -16420,8 +16456,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.6.3 `_ on Github." +"2.6.3 `_ on Github." msgstr "" msgid "" @@ -16444,8 +16480,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.6.2 `_ on Github." +"2.6.2 `_ on Github." msgstr "" msgid "" @@ -16468,8 +16504,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.6.1 `_ on Github." +"2.6.1 `_ on Github." msgstr "" msgid "Fixes server crash on several functions." @@ -16561,8 +16597,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.6.0 `_ on Github." +"2.6.0 `_ on Github." msgstr "" msgid "pgr_lineGraphFull" @@ -16610,8 +16646,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.5.5 `_ on Github." +"2.5.5 `_ on Github." msgstr "" msgid "Fixes driving distance when vertex is not part of the graph" @@ -16628,8 +16664,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.5.4 `_ on Github." +"2.5.4 `_ on Github." msgstr "" msgid "pgRouting 2.5.3 Release Notes" @@ -16637,8 +16673,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.5.3 `_ on Github." +"2.5.3 `_ on Github." msgstr "" msgid "" @@ -16651,8 +16687,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.5.2 `_ on Github." +"2.5.2 `_ on Github." msgstr "" msgid "Fix for postgresql 10.1: Removed a compiler condition" @@ -16663,8 +16699,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.5.1 `_ on Github." +"2.5.1 `_ on Github." msgstr "" msgid "Fixed prerequisite minimum version of: cmake" @@ -16675,8 +16711,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.5.0 `_ on Github." +"2.5.0 `_ on Github." msgstr "" msgid "enhancement:" @@ -16748,8 +16784,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.4.2 `_ on Github." +"2.4.2 `_ on Github." msgstr "" msgid "Improvement" @@ -16770,8 +16806,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.4.1 `_ on Github." +"2.4.1 `_ on Github." msgstr "" msgid "Fixed compiling error on macOS" @@ -16785,8 +16821,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.4.0 `_ on Github." +"2.4.0 `_ on Github." msgstr "" msgid "pgr_bdDijkstra" @@ -16839,8 +16875,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.3.2 `_ on Github." +"2.3.2 `_ on Github." msgstr "" msgid "Fixed pgr_gsoc_vrppdtw crash when all orders fit on one truck." @@ -16860,8 +16896,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.3.1 `_ on Github." +"2.3.1 `_ on Github." msgstr "" msgid "Leaks on proposed max_flow functions" @@ -16878,8 +16914,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.3.0 `_ on Github." +"2.3.0 `_ on Github." msgstr "" msgid "pgr_TSP" @@ -16962,8 +16998,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.2.4 `_ on Github." +"2.2.4 `_ on Github." msgstr "" msgid "Bogus uses of extern \"C\"" @@ -16980,8 +17016,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.2.3 `_ on Github." +"2.2.3 `_ on Github." msgstr "" msgid "Fixed compatibility issues with PostgreSQL 9.6." @@ -16992,8 +17028,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.2.2 `_ on Github." +"2.2.2 `_ on Github." msgstr "" msgid "Fixed regression error on pgr_drivingDistance" @@ -17004,8 +17040,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.2.1 `_ on Github." +"2.2.1 `_ on Github." msgstr "" msgid "Server crash fix on pgr_alphaShape" @@ -17019,8 +17055,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.2.0 `_ on Github." +"2.2.0 `_ on Github." msgstr "" msgid "Improvements" @@ -17112,8 +17148,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.1.0 `_ on Github." +"2.1.0 `_ on Github." msgstr "" msgid "pgr_dijkstra(one to many)" @@ -17261,8 +17297,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.0.0 `_ on Github." +"2.0.0 `_ on Github." msgstr "" msgid "" @@ -17387,8 +17423,8 @@ msgstr "" msgid "" "To see the issues closed by this release see the `Git closed issues for 1.x " -"`_ on Github. The following release notes have been copied " +"`_ on Github. The following release notes have been copied " "from the previous ``RELEASE_NOTES`` file and are kept as a reference." msgstr "" diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 20785845ff..5ada8245b9 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-28 18:11+0000\n" +"POT-Creation-Date: 2024-01-04 04:09+0000\n" "PO-Revision-Date: 2023-10-27 06:23+0000\n" "Last-Translator: Zuochenwei \n" "Language-Team: Chinese (Simplified) `__" msgid "" -"`Wikipedia: Prim's algorithm `__" -msgstr "`维基百科: Prim算法 `__" +"`Wikipedia: Prim's algorithm `__" +msgstr "" +"`维基百科: Prim算法 `__" msgid "" "`Wikipedia: Kruskal's algorithm `__" -msgstr "`维基百科: Kruskal算法 `__" +msgstr "" +"`维基百科: Kruskal算法 `__" msgid "Indices and tables" msgstr "索引和表格" @@ -440,9 +442,9 @@ msgid "" "graph. But normally on turns like no left turn or no right turn, hence the " "name turn restrictions, there are sometimes restrictions." msgstr "" -"道路限制是一系列不能按顺序采取的路段。 " -"有向图上隐含了一些限制，例如单向道路，其中错误的边甚至不会插入到图上。 " -"但通常在转弯时如不许左转或不许右转，因此得名转弯限制，这儿是一些常见限制。" +"道路限制是一系列不能按顺序采取的路段。 有向图上隐含了一些限制，例如单向道路，" +"其中错误的边甚至不会插入到图上。 但通常在转弯时如不许左转或不许右转，因此得名" +"转弯限制，这儿是一些常见限制。" msgid "TRSP algorithm" msgstr "TRSP算法" @@ -451,8 +453,9 @@ 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." -msgstr "内部 TRSP 算法对 dijkstra 算法执行前瞻，以查明尝试的路径是否有限制。 " -"这允许算法在同一顶点上传递两次。" +msgstr "" +"内部 TRSP 算法对 dijkstra 算法执行前瞻，以查明尝试的路径是否有限制。 这允许算" +"法在同一顶点上传递两次。" msgid "`Edges SQL`_ query as described." msgstr "`Edges SQL`_按描述查询。" @@ -564,10 +567,9 @@ msgstr "" msgid "" "A discussion about the work of Hamilton & Kirkman can be found in the book " -"**Graph Theory (Biggs et al. 1976)**." +"**Graph Theory (Biggs et al. 1976)**." msgstr "" -"关于Hamilton和Kirkman的工作的讨论可以在**《图论》（Biggs等人，1976年）**一书" -"中找到。" +"关于汉密尔顿和柯克曼工作的讨论可参见《**图论》（比格斯等人，1976 年）一书**。" msgid "ISBN-13: 978-0198539162" msgstr "ISBN-13: 978-0198539162" @@ -584,9 +586,10 @@ msgid "" "homepages.cwi.nl/~lex/files/histco.ps>`__" msgstr "" "人们认为旅行推销员问题（TSP）的一般形式最早由维也纳和哈佛的卡尔·门格尔（Karl " -"Menger）研究。后来，普林斯顿的哈斯勒、惠特尼和梅里尔（Hassler, Whitney & Merr" -"ill）进一步推动了这个问题。关于门格尔和惠特尼之间的联系以及TSP的发展，可以在`" -"组合优化的历史(直到1960年) `__" +"Menger）研究。后来，普林斯顿的哈斯勒、惠特尼和梅里尔（Hassler, Whitney & " +"Merrill）进一步推动了这个问题。关于门格尔和惠特尼之间的联系以及TSP的发展，可" +"以在`组合优化的历史(直到1960年) `__" msgid "To calculate the number of different tours through :math:`n` cities:" msgstr "计算经过:math:`n` 城市的不同旅行次数：" @@ -597,11 +600,11 @@ msgstr "给定一个起始城市，" msgid "There are :math:`n-1` choices for the second city," msgstr "第二个城市还有:math:`n-1`个选择，" -msgid "And :math:`n-2` choices for the third city, etc." -msgstr "以及第三个城市有:math:`n-2`个选择等。" +msgid "And :math:`n-2` choices for the third city, etc." +msgstr "第三个城市的 :math:`n-2` 选项等。" -msgid "Multiplying these together we get :math:`(n-1)! = (n-1) (n-2) . . 1`." -msgstr "将它们相乘我们得到:math:`(n-1)! = (n-1) (n-2) . . 1`。" +msgid "Multiplying these together we get :math:`(n-1)! = (n-1) (n-2) . . 1`." +msgstr "相乘得到 :math:`(n-1)！= (n-1) (n-2) ..1`." msgid "" "Now since the travel costs do not depend on the direction taken around the " @@ -1151,9 +1154,6 @@ msgstr "结束顶点的标识符。" msgid "Aggregate cost from ``start_vid`` to ``end_vid``." msgstr "从 ``start_vid`` 到 ``end_vid`` 的总成本。" -msgid "Return columns" -msgstr "返回列" - msgid "Sequential value starting from **1**." msgstr "从**1**开始的顺序值。" @@ -1382,9 +1382,9 @@ msgid "" msgstr "取货-送货订单的`需求`请求必须使用与车辆`容量`中使用的单位相同的单位。" msgid "" -"To handle problems like: 10 (equal dimension) boxes of apples and 5 kg of " +"To handle problems like: 10 (equal dimension) boxes of apples and 5 kg of " "feathers that are to be transported (not packed in boxes)." -msgstr "处理这样的问题：10箱（等尺寸）苹果和5公斤羽毛需要运输（不装箱）。" +msgstr "处理以下问题：10 箱（尺寸相等）苹果和 5 千克羽毛的运输（不装箱）。" msgid "" "If the vehicle's **capacity** is measured in `boxes`, a conversion of `kg of " @@ -1737,8 +1737,8 @@ msgstr "使用随机选择的顶点的:math:`(x,y)`坐标。" msgid "Running time: :math:`O((E + V) * \\log V)`" msgstr "运行时间：:math:`O((E + V) * \\log V)`" -msgid "aStar optional Parameters" -msgstr "aStar可选参数" +msgid "aStar optional parameters" +msgstr "aStar 可选参数" msgid "``heuristic``" msgstr "``heuristic``" @@ -1800,7 +1800,7 @@ msgstr "分析1" msgid "" "Working with cost/reverse_cost as length in degrees, x/y in lat/lon: Factor " -"= 1 (no need to change units)" +"= 1 (no need to change units)" msgstr "" "使用 cost/reverse_cost 作为长度（以度为单位），x/y 以纬度/经度为单位：因子 = " "1（无需更改单位）" @@ -1809,14 +1809,14 @@ msgid "Analysis 2" msgstr "分析2" msgid "" -"Working with cost/reverse_cost as length in meters, x/y in lat/lon: Factor " -"= would depend on the location of the points:" +"Working with cost/reverse_cost as length in meters, x/y in lat/lon: Factor = " +"would depend on the location of the points:" msgstr "" "使用 cost/reverse_cost 作为以米为单位的长度，以纬度/经度为单位的 x/y： " "Factor = 将取决于点的位置：" -msgid "1 longitude degree is 78846.81 m" -msgstr "1经度为78846.81 m" +msgid "1 longitude degree is 78846.81 m" +msgstr "1 经度为 78846.81 米" msgid "78846" msgstr "78846" @@ -1890,10 +1890,10 @@ msgstr "假设返回的值存储在表中，因此唯一索引将是一对：`(s msgid "For the undirected graph, the results are symmetric." msgstr "对于无向图，结果是对称的。" -msgid "The `agg_cost` of `(u, v)` is the same as for `(v, u)`." -msgstr "`(u, v)` 的 `agg_cost` 与 `(v, u)`相同。" +msgid "The `agg_cost` of `(u, v)` is the same as for `(v, u)`." +msgstr "`(u, v)` 的 `agg_cost` 与 `(v, u)`相同。" -msgid "When `start_vid` = `end_vid`, the `agg_cost` = 0." +msgid "When `start_vid` = `end_vid`, the `agg_cost` = 0." msgstr "当`start_vid` = `end_vid`时，`agg_cost`= 0。" msgid "**Recommended, use a bounding box of no more than 3500 edges.**" @@ -2680,10 +2680,10 @@ msgid "" msgstr ":doc:`pgr_bdDijkstraCost` - 双向 Dijkstra 计算最短路径的成本" msgid "" -":doc:`pgr_bdDijkstraCostMatrix` - Bidirectional Dijkstra algorithm to " -"create a matrix of costs of the shortest paths." +":doc:`pgr_bdDijkstraCostMatrix` - Bidirectional Dijkstra algorithm to create " +"a matrix of costs of the shortest paths." msgstr "" -":doc:`pgr_bdDijkstraCostMatrix` - 双向 Dijkstra 算法创建最短路径成本矩阵。" +":doc:`pgr_bdDijkstraCostMatrix` - 创建最短路径成本矩阵的双向 Dijkstra 算法。" msgid "Synopsis" msgstr "概要" @@ -2725,8 +2725,8 @@ msgid "" msgstr "当起始顶点和结束顶点不同且不存在路径时：" msgid "" -"The **aggregate cost** the non included values :math:`(u, v)` is :math:`" -"\\infty`" +"The **aggregate cost** the non included values :math:`(u, v)` is :math:" +"`\\infty`" msgstr "未包含值:math:`(u, v)`的**aggregate cost**是:math:`\\infty`" msgid "" @@ -2782,8 +2782,8 @@ msgid "" ":doc:`pgr_edgeColoring` - Edge Coloring algorithm using Vizing's theorem." msgstr ":doc:`pgr_edgeColoring` - 使用 Vizing 定理的边缘着色算法。" -msgid "Returns SET OF ``(vertex_id, color_id)``" -msgstr "返回``(vertex_id, color_id)``的集合" +msgid "Returns set of ``(vertex_id, color_id)``" +msgstr "返回集合``(vertex_id, color_id)``" msgid "``vertex_id``" msgstr "``vertex_id``" @@ -2800,8 +2800,8 @@ msgstr "顶点颜色的标识符。" msgid "The minimum value of color is 1." msgstr "颜色的最小值为 1。" -msgid "Returns SET OF ``(edge_id, color_id)``" -msgstr "返回``(edge_id, color_id)``的集合" +msgid "Returns set of ``(edge_id, color_id)``" +msgstr "返回 ``(edge_id, color_id)`` 的集合" msgid "``edge_id``" msgstr "``edge_id``" @@ -3122,9 +3122,9 @@ msgid "The vertex :math:`w` is removed from the graph" msgstr "顶点 :math:`w`已从图中移除" msgid "" -"The edges :math:`v \\rightarrow w` and :math:`w \\rightarrow z` are removed " +"The edges :math:`v \\rightarrow w` and :math:`w \\rightarrow z` are removed " "from the graph." -msgstr "边:math:`v \\rightarrow w`和:math:`w \\rightarrow z`已从图中移除。" +msgstr "从图中删除边 :math:`v \\rightarrow w` 和 :math:`w \\rightarrow z`。" msgid "" "A new edge :math:`v \\rightarrow z` is inserted represented with red color." @@ -3137,9 +3137,9 @@ msgid "The vertex :math:`v` is removed from the graph" msgstr "顶点:math:`v`已从图中移除" msgid "" -"The edges :math:`u \\rightarrow v` and :math:`v \\rightarrow z` are removed " +"The edges :math:`u \\rightarrow v` and :math:`v \\rightarrow z` are removed " "from the graph." -msgstr "边:math:`u \\rightarrow v`和 :math:`v \\rightarrow z`已从图中移除。" +msgstr "从图中删除边 :math:`u \\rightarrow v` 和 :math:`v \\rightarrow z`。" msgid "" "A new edge :math:`u \\rightarrow z` is inserted represented with red color." @@ -3454,7 +3454,7 @@ msgid "" msgstr "根据函数及其参数，结果可能是对称的。" msgid "" -"The **aggregate cost** of :math:`(u, v)` is the same as for :math:`(v, u)`." +"The **aggregate cost** of :math:`(u, v)` is the same as for :math:`(v, u)`." msgstr ":math:`(u, v)`的**总成本**与 :math:`(v, u)`的相同。" msgid "" @@ -3506,8 +3506,8 @@ msgid "Can be used as input to :doc:`pgr_TSP`." msgstr "可用作 :doc:`pgr_TSP` 的输入。" msgid "" -"Use directly when the resulting matrix is symmetric and there is no :math:`" -"\\infty` value." +"Use directly when the resulting matrix is symmetric and there is no :math:" +"`\\infty` value." msgstr "当得到的矩阵是对称且没有 :math:`\\infty`值时直接使用。" msgid "It will be the users responsibility to make the matrix symmetric." @@ -3735,11 +3735,10 @@ msgid "pgr_dijkstra(:math:`sql, start_{vid}, end_{vid}, directed`)" msgstr "pgr_dijkstra(:math:`sql, start_{vid}, end_{vid}, directed`)" msgid "" -"where :math:`sql = \\{(id_i, source_i, target_i, cost_i, reverse" -"\\_cost_i)\\}`" +"where :math:`sql = \\{(id_i, source_i, target_i, cost_i, reverse\\_cost_i)\\}" +"`" msgstr "" -"其中 :math:`sql = \\{(id_i, source_i, target_i, cost_i, reverse\\_cost_i)\\" -"}`" +"其中 :math:`sql =\\{(id_i, source_i, target_i, cost_i, reverse\\_cost_i)\\}`" msgid "and" msgstr "和" @@ -3759,7 +3758,7 @@ msgstr "有向图" msgid "The weighted directed graph, :math:`G_d(V,E)`, is definied by:" msgstr "加权有向图， :math:`G_d(V,E)`的定义如下：" -msgid "the set of vertices :math:`V`" +msgid "the set of vertices :math:`V`" msgstr "顶点集:math:`V`" msgid ":math:`V = source \\cup target \\cup {start_{vid}} \\cup {end_{vid}}`" @@ -3804,9 +3803,9 @@ msgid "" "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}`" +"\\cup \\{(source_i, target_i, reverse\\_cost_i) \\text{ when } " +"reverse\\_cost_i >=0)\\} & \\quad \\text{ if } reverse\\_cost \\neq " +"\\varnothing \\\\ \\end{cases}`" msgstr "" ":math:`E = \\begin{cases} \\text{ } \\{(source_i, target_i, cost_i) " "\\text{ when } cost >=0 \\} & \\quad \\text{ } \\\\ \\cup " @@ -3816,9 +3815,9 @@ msgstr "" "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}`" +"\\cup \\{(source_i, target_i, reverse\\_cost_i) \\text{ when } " +"reverse\\_cost_i >=0)\\} & \\quad \\text{ if } reverse\\_cost \\neq " +"\\varnothing \\\\ \\end{cases}`" msgid "The problem" msgstr "问题" @@ -3843,11 +3842,11 @@ msgid "Then:" msgstr "然后：" msgid "" -":math:`\\boldsymbol{\\pi} = \\{(path\\_seq_i, node_i, edge_i, cost_i, agg" -"\\_cost_i)\\}`" +":math:`\\boldsymbol{\\pi} = \\{(path\\_seq_i, node_i, edge_i, cost_i, " +"agg\\_cost_i)\\}`" msgstr "" -":math:`\\boldsymbol{\\pi} = \\{(path\\_seq_i, node_i, edge_i, cost_i, agg" -"\\_cost_i)\\}`" +":math:`\\boldsymbol{\\pi} = \\{(path\\_seq_i, node_i, edge_i, cost_i, " +"agg\\_cost_i)\\}`" msgid "where:" msgstr "其中：" @@ -3896,10 +3895,10 @@ msgstr "" msgid "" "In other words: The algorithm returns a the shortest path between :math:" "`start_{vid}` and :math:`end_{vid}`, if it exists, in terms of a sequence of " -"nodes and of edges," +"nodes and of edges," msgstr "" -"换句话说：该算法返回 :math:`start_{vid}` 和:math:`end_{vid}` 之间的最短路径" -"（如果存在），以节点和边的序列表示，" +"换句话说：如果:math:`start_{vid}`和:math:`end_{vid}`之间存在最短路径，算法会" +"根据节点和边的序列返回该路径、" msgid "" ":math:`path\\_seq` indicates the relative position in the path of the :math:" @@ -3981,8 +3980,8 @@ msgstr "**distance**" msgid "Upper limit for the inclusion of a node in the result." msgstr "结果中包含节点的上限。" -msgid "Returns SET OF |result-spantree|" -msgstr "返回 |result-spantree| 的一组结果" +msgid "Returns set of |result-spantree|" +msgstr "Returns set of |result-spantree|" msgid ":math:`depth-1` is the depth of ``pred``" msgstr ":math:`depth-1` is the depth of ``pred``" @@ -4071,7 +4070,7 @@ msgstr "类别" msgid ":doc:`VRP-category`" msgstr ":doc:`VRP-category`" -msgid "Not classified" +msgid "Unclassified" msgstr "未分类" msgid ":doc:`pgr_bellmanFord`" @@ -4216,13 +4215,13 @@ msgstr ":doc:`pgr_maxFlowMinCost`" msgid ":doc:`pgr_maxFlowMinCost_Cost`" msgstr ":doc:`pgr_maxFlowMinCost_Cost`" -msgid "Capacity of the edge (``source``, ``target``)" +msgid "Capacity of the edge (``source``, ``target``)" msgstr "边 (``source``, ``target``)的容量" msgid "Capacity of the edge (``target``, ``source``)" msgstr "边 (``target``, ``source``)的容量" -msgid "Weight of the edge (``source``, ``target``) if it exist" +msgid "Weight of the edge (``source``, ``target``) if it exist" msgstr "边 (``source``, ``target``)的权重（如果存在）" msgid "Weight of the edge (``target``, ``source``) if it exist" @@ -4326,11 +4325,11 @@ msgid "pgr_maxFlow :math:`(edges\\_sql, source\\_vertex, sink\\_vertex)`" msgstr "pgr_maxFlow:math:`(edges\\_sql, source\\_vertex, sink\\_vertex)`" msgid "" -"where :math:`edges\\_sql = \\{(id_i, source_i, target_i, capacity_i, reverse" -"\\_capacity_i)\\}`" +"where :math:`edges\\_sql = \\{(id_i, source_i, target_i, capacity_i, " +"reverse\\_capacity_i)\\}`" msgstr "" -"其中:math:`edges\\_sql = \\{(id_i, source_i, target_i, capacity_i, reverse" -"\\_capacity_i)\\}`" +"其中:math:`edges\\_sql = \\{(id_i, source_i, target_i, capacity_i, " +"reverse\\_capacity_i)\\}`" msgid "Graph definition" msgstr "图定义" @@ -4338,6 +4337,9 @@ msgstr "图定义" msgid "The weighted directed graph, :math:`G(V,E)`, is defined as:" msgstr "加权有向图， :math:`G(V,E)` 定义为：" +msgid "the set of vertices :math:`V`" +msgstr "顶点集:math:`V`" + msgid "" ":math:`source\\_vertex \\cup sink\\_vertex \\bigcup source_i \\bigcup " "target_i`" @@ -4350,16 +4352,16 @@ msgid "" "\\text{ when } capacity > 0 \\} & \\quad \\text{ if } reverse\\_capacity = " "\\varnothing \\\\ \\text{ } & \\quad \\text{ } \\\\ \\{(source_i, target_i, " "capacity_i) \\text{ when } capacity > 0 \\} & \\text{ } \\\\ \\cup " -"\\{(target_i, source_i, reverse\\_capacity_i) \\text{ when } reverse" -"\\_capacity_i > 0)\\} & \\quad \\text{ if } reverse\\_capacity \\neq " +"\\{(target_i, source_i, reverse\\_capacity_i) \\text{ when } " +"reverse\\_capacity_i > 0)\\} & \\quad \\text{ if } reverse\\_capacity \\neq " "\\varnothing \\\\ \\end{cases}`" msgstr "" ":math:`E = \\begin{cases} \\text{ } \\{(source_i, target_i, capacity_i) " "\\text{ when } capacity > 0 \\} & \\quad \\text{ if } reverse\\_capacity = " "\\varnothing \\\\ \\text{ } & \\quad \\text{ } \\\\ \\{(source_i, target_i, " "capacity_i) \\text{ when } capacity > 0 \\} & \\text{ } \\\\ \\cup " -"\\{(target_i, source_i, reverse\\_capacity_i) \\text{ when } reverse" -"\\_capacity_i > 0)\\} & \\quad \\text{ if } reverse\\_capacity \\neq " +"\\{(target_i, source_i, reverse\\_capacity_i) \\text{ when } " +"reverse\\_capacity_i > 0)\\} & \\quad \\text{ if } reverse\\_capacity \\neq " "\\varnothing \\\\ \\end{cases}`" msgid "Maximum flow problem" @@ -4492,7 +4494,7 @@ msgid "" msgstr "" "以下函数直接修改数据库，因此用户必须具有管理员授予的特殊权限才能使用它们。" -msgid ":doc:`pgr_createTopology` - create a topology based on the geometry." +msgid ":doc:`pgr_createTopology` - create a topology based on the geometry." msgstr ":doc:`pgr_createTopology` - 根据几何形状创建拓扑。" msgid "" @@ -4501,15 +4503,15 @@ msgid "" msgstr ":doc:`pgr_createVerticesTable` - 根据源和目标信息重建顶点表。" msgid "" -":doc:`pgr_analyzeGraph` - to analyze the edges and vertices of the edge " +":doc:`pgr_analyzeGraph` - to analyze the edges and vertices of the edge " "table." msgstr ":doc:`pgr_analyzeGraph` - 分析边表的边和顶点。" msgid ":doc:`pgr_analyzeOneWay` - to analyze directionality of the edges." msgstr ":doc:`pgr_analyzeOneWay` - 分析边的方向性。" -msgid ":doc:`pgr_nodeNetwork` -to create nodes to a not noded edge table." -msgstr ":doc:`pgr_nodeNetwork` -为无节点边表创建节点。" +msgid ":doc:`pgr_nodeNetwork` - to create nodes to a not noded edge table." +msgstr ":doc:`pgr_nodeNetwork` - 为无节点边表创建节点。" msgid ":doc:`pgr_trsp` - Turn Restriction Shortest Path (TRSP)" msgstr ":doc:`pgr_trsp` - 转弯限制最短路径 (TRSP)" @@ -5017,14 +5019,14 @@ msgstr "在有向图上 ``b``可以用作 **行驶方向**" msgid "On undirected graph ``r`` could be used as **driving side**" msgstr "在无向图上``r``可以用作**行驶方向**" -msgid "Also ``l`` could be used as **driving side**" -msgstr "``l`` 也可用作**行驶方向**" +msgid "Also ``l`` could be used as **driving side**" +msgstr "此外，``l``也可用作**驾驶侧**" msgid "After Migration" msgstr "迁移后" -msgid "Be aware of the existance of the additional return columns." -msgstr "请注意附加返回列的存在。" +msgid "Be aware of the existance of the additional result Columns." +msgstr "注意附加结果列的存在。" msgid "New output columns are |result-spantree|" msgstr "新的输出列是 |result-spantree|" @@ -5678,9 +5680,9 @@ msgstr "" "target_{id}`" msgid "" -"Edge :math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`) is not part of the " +"Edge :math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`) is not part of the " "graph." -msgstr "边 :math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`) 不是图的一部分。" +msgstr "边 :math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`) 不是图的一部分。" msgid "Graph with ``cost`` and ``reverse_cost``" msgstr "带有 ``cost``和``reverse_cost``的图" @@ -5697,13 +5699,13 @@ msgstr "边的集合 :math:`E`：" msgid "" ":math:`E = \\begin{split} \\begin{align} & {\\{(source_{id}, target_{id}, " "cost_{id}) \\text{ when } cost_{id} >=0 \\}} \\\\ & \\cup \\\\ & " -"{\\{(target_{id}, source_{id}, reverse\\_cost_{id}) \\text{ when } reverse" -"\\_cost_{id} >=0 \\}} \\end{align} \\end{split}`" +"{\\{(target_{id}, source_{id}, reverse\\_cost_{id}) \\text{ when } " +"reverse\\_cost_{id} >=0 \\}} \\end{align} \\end{split}`" msgstr "" ":math:`E = \\begin{split} \\begin{align} & {\\{(source_{id}, target_{id}, " "cost_{id}) \\text{ when } cost_{id} >=0 \\}} \\\\ & \\cup \\\\ & " -"{\\{(target_{id}, source_{id}, reverse\\_cost_{id}) \\text{ when } reverse" -"\\_cost_{id} >=0 \\}} \\end{align} \\end{split}`" +"{\\{(target_{id}, source_{id}, reverse\\_cost_{id}) \\text{ when } " +"reverse\\_cost_{id} >=0 \\}} \\end{align} \\end{split}`" msgid "" "Edges :math:`(source \\rightarrow target)` where ``cost`` is non negative " @@ -5719,8 +5721,8 @@ msgstr "" "边 :math:`(target \\rightarrow source)` 中的 ``reverse_cost`` 是非负数的都属" "于图的一部分。" -msgid "The set of vertices :math:`V`:" -msgstr "顶点 :math:`V`的集合：" +msgid "The set of vertices :math:`V`:" +msgstr "顶点集 :math:`V`：" msgid "In a directed graph both edges have directionality" msgstr "在有向图中，两条边都有方向性" @@ -5742,11 +5744,11 @@ msgstr "" msgid "Edges not part of the graph:" msgstr "边不是图的一部分：" -msgid ":math:`2` (:math:`1 \\rightarrow 3`)" -msgstr ":math:`2` (:math:`1 \\rightarrow 3`)" +msgid ":math:`2` (:math:`1 \\rightarrow 3`)" +msgstr ":math:`2` (:math:`1\\rightarrow 3`)" -msgid ":math:`3` (:math:`3 \\rightarrow 2`)" -msgstr ":math:`3` (:math:`3 \\rightarrow 2`)" +msgid ":math:`3` (:math:`3 \\rightarrow 2`)" +msgstr ":math:`3` (:math:`3\\rightarrow 2`)" msgid "In a directed graph both edges do not have directionality" msgstr "在有向图中，两条边都没有方向性" @@ -5774,22 +5776,22 @@ msgstr ":math:`source_i \\leftrightarrow target_i`" msgid ":math:`target_i \\leftrightarrow source_i`" msgstr ":math:`target_i \\leftrightarrow source_i`" -msgid ":math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`)" -msgstr ":math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`)" +msgid ":math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`)" +msgstr ":math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`)" -msgid ":math:`3` (:math:`3 \\frac{\\;\\;\\;\\;\\;}{} 2`)" -msgstr ":math:`3` (:math:`3 \\frac{\\;\\;\\;\\;\\;}{} 2`)" +msgid ":math:`3` (:math:`3 \\frac{\\;\\;\\;\\;\\;}{} 2`)" +msgstr ":math:`3` (:math:`3 \\frac{\\;\\;\\;\\;\\;}{} 2`)" msgid "Graphs without geometries" msgstr "没有几何信息的图" msgid "" "Personal relationships, genealogy, file dependency problems can be solved " -"using pgRouting. Those problems, normally, do not come with geometries " +"using pgRouting. Those problems, normally, do not come with geometries " "associated with the graph." msgstr "" -"人际关系、家谱、文件依赖问题都可以使用pgRouting来解决。 通常，这些问题不会与" -"与图形相关的几何图形相关。" +"使用 pgRouting 可以解决个人关系、家谱和文件依赖性问题。这些问题通常不会与图形" +"相关的几何图形一起出现。" msgid "Wiki example" msgstr "维基示例" @@ -5906,8 +5908,8 @@ msgstr "手动创建数据库。" msgid "`Graphs without geometries`_" msgstr "`没有几何形状的图`_" -msgid ":doc:`sampledata`: a small graph used on the documentation examples" -msgstr ":doc:`sampledata`: 文档示例中使用的小图" +msgid ":doc:`sampledata`: a small graph used in the documentation examples" +msgstr ":doc:`sampledata`: 文档示例中使用的小图形" msgid "" "Using `osm2pgrouting `__ page." msgstr "" "编辑现有的 `pgRouting 维基 `__ " @@ -7161,8 +7162,9 @@ msgstr "在数据库中启用 PostGIS 和 pgRouting 后检查它们的版本。" msgid "Upgrading the database" msgstr "升级数据库" +#, fuzzy msgid "" -"To upgrade pgRouting in the database to version 3.6.0 use the following " +"To upgrade pgRouting in the database to version 3.7.0 use the following " "command:" msgstr "要将数据库中的 pgRouting 升级到版本 3.5.1，请使用以下命令：" @@ -7519,25 +7521,24 @@ msgstr "贡献者" msgid "This Release Contributors" msgstr "此版本贡献者" -msgid "Individuals in this release (in alphabetical order)" +#, fuzzy +msgid "Individuals in this release v3.7.x (in alphabetical order)" msgstr "本版本的个人贡献者 (按字母顺序)" -msgid "" -"Aniket Agarwal, Aryan Gupta, Ashish Kumar, Cayetano Benavent, Daniel Kastl, " -"Nitish Chauhan, Rajat Shinde, Regina Obe, Shobhit Chaurasia, Swapnil Joshi, " -"Virginia Vergara, Yige Huang" +#, fuzzy +msgid "(Alphabetical order)" +msgstr "个人贡献者（按字母排序）" + +msgid "Regina Obe, Vicky Vergara" msgstr "" -"Aniket Agarwal, Aryan Gupta, Ashish Kumar, Cayetano Benavent, Daniel Kastl, " -"Nitish Chauhan, Rajat Shinde, Regina Obe, Shobhit Chaurasia, Swapnil Joshi, " -"Virginia Vergara, Yige Huang" msgid "" "And all the people that give us a little of their time making comments, " -"finding issues, making pull requests etc. in any of our products: " +"finding issues, making pull requests etc. in any of our products: " "osm2pgrouting, pgRouting, pgRoutingLayer, workshop." msgstr "" -"并且所有那些花一点时间为我们的任何产品提供评论、发现问题、提交请求等的人们，" -"包括 osm2pgrouting、pgRouting、pgRoutingLayer 和 workshop。" +"还有所有为我们的产品（osm2pgrouting、pgRouting、pgRoutingLayer、workshop）提" +"供意见、发现问题、提出拉取请求等的人们。" msgid "Corporate Sponsors in this release (in alphabetical order)" msgstr "本次发布中的企业赞助商（按字母顺序排列）" @@ -7548,8 +7549,11 @@ msgid "" msgstr "" "这些是为 pgRouting 项目贡献了开发人员时间、托管或直接货币资金的公司实体：" -msgid "`Georepublic `__" -msgstr "`Georepublic `__" +msgid "`OSGeo `__" +msgstr "" + +msgid "`OSGeo UK `__" +msgstr "" msgid "`Google Summer of Code `__" msgstr "`Google Summer of Code `__" @@ -7614,6 +7618,12 @@ msgstr "Leopark" msgid "Orkney" msgstr "Orkney" +msgid "OSGeo" +msgstr "" + +msgid "OSGeo UK" +msgstr "" + msgid "Paragon Corporation" msgstr "Paragon Corporation" @@ -7641,12 +7651,8 @@ msgstr "PostGIS 项目网站 https://postgis.net 上的 PostGIS 扩展。" msgid "Boost C++ source libraries at https://www.boost.org." msgstr "Boost C++ 源库位于 https://www.boost.org。" -msgid "" -"The Migration guide from 2.6 can be found at https://github.com/pgRouting/" -"pgrouting/wiki/Migration-Guide." -msgstr "" -"2.6 版的迁移指南可以在 https://github.com/pgRouting/pgrouting/wiki/Migration-" -"Guide 找到。" +msgid ":doc:`migration`" +msgstr ":doc:`migration`" msgid "pgr_KSP" msgstr "pgr_KSP" @@ -7660,8 +7666,8 @@ msgstr "可用性" msgid "Version 3.6.0" msgstr "版本3.6.0" -msgid "Return columns standarized to: |nksp-result|" -msgstr "返回标准化后的列：|nksp-result|" +msgid "Result columns standarized to: |nksp-result|" +msgstr "结果列标准化为|nksp-result|" msgid "``pgr_ksp`` (One to One)" msgstr "``pgr_ksp`` (一对一)" @@ -7735,8 +7741,8 @@ msgstr "pgr_KSP(`Edges SQL`_, `Combinations SQL`_, **K**, [**options**])" msgid "**options:** ``[directed, heap_paths]``" msgstr "**options:** ``[directed, heap_paths]``" -msgid "RETURNS SET OF |nksp-result|" -msgstr "RETURNS SET OF |nksp-result|" +msgid "Returns set of |nksp-result|" +msgstr "返回集合|nksp-result|" msgid "OR EMPTY SET" msgstr "OR EMPTY SET" @@ -7800,9 +7806,6 @@ msgstr "" "粗略地说，当最短路径有 ``N`` 个边时，对于``K``值较小且``K > 5``，堆将包含大" "约 ``N * K`` 条路径。" -msgid "Returns set of |nksp-result|" -msgstr "返回集合|nksp-result|" - msgid "" "Has value **1** for the first of a path from ``start_vid`` to ``end_vid``" msgstr "从``start_vid``到 ``end_vid``的第一个路径的值为 **1**" @@ -7942,9 +7945,9 @@ msgstr "如果 ``agg_cost`` 在边`(u, v)` 的一个或多个实例之间不同" msgid "" "The minimum value of the ``agg_cost`` all instances of edge `(u, v)` is " -"going to be considered as the ``agg_cost`` of edge `(u, v)`" +"going to be considered as the ``agg_cost`` of edge `(u, v)`" msgstr "" -"边 `(u, v)` 的所有实例的 ``agg_cost`` 最小值将被视为边`(u, v)`的 " +"边 `(u, v)` 的所有实例的 ``agg_cost`` 最小值将被视为边 `(u, v)` 的 " "``agg_cost``" msgid "" @@ -7961,8 +7964,8 @@ msgstr "缺失值将使用 dijkstra 算法计算。" msgid "pgr_TSP(`Matrix SQL`_, ``[start_id, end_id]``)" msgstr "pgr_TSP(`Matrix SQL`_, ``[start_id, end_id]``)" -msgid "RETURNS SET OF |tsp-result|" -msgstr "RETURNS SET OF |tsp-result|" +msgid "Returns set of |tsp-result|" +msgstr "返回 |tsp-result| 的集合" msgid "OR EMTPY SET" msgstr "OR EMTPY SET" @@ -8169,7 +8172,7 @@ msgstr "视觉效果" msgid "" "Visualy, The first image is the `optimal solution `__ and the second image is the solution " +"uwaterloo.ca/tsp/world/witour.html>`__ and the second image is the solution " "obtained with ``pgr_TSPeuclidean``." msgstr "" "从视觉上看，第一幅图像是 `最优解 _vertices_pgr that stores the " "vertices information." @@ -8592,9 +8583,19 @@ msgstr "``float8``断开边的捕捉容差。 （以投影单位表示）" msgid "the_geom" msgstr "the_geom" +msgid "" +"``text`` Geometry column name of the network table. Default value is " +"``the_geom``." +msgstr "``text``网络表的几何列名称。 默认值为``the_geom``。" + msgid "id" msgstr "id" +msgid "" +"``text`` Primary key column name of the network table. Default value is " +"``id``." +msgstr "``text`` 网络表的主键列名称。 默认值为``id``。" + msgid "source" msgstr "source" @@ -8607,7 +8608,7 @@ msgid "target" msgstr "target" msgid "" -"``text`` Target column name of the network table. Default value is " +"``text`` Target column name of the network table. Default value is " "``target``." msgstr "``text``网络表的Target列名称。 默认值为 ``target``。" @@ -8615,9 +8616,9 @@ msgid "rows_where" msgstr "rows_where" msgid "" -"``text`` Condition to select a subset or rows. Default value is ``true`` " -"to indicate all rows." -msgstr "``text``选择子集或行的条件。 默认值为``true`` t表示所有行。" +"``text`` Condition to select a subset or rows. Default value is ``true`` to " +"indicate all rows." +msgstr "``text`` 用于选择子集或行的条件。默认值为``true``，表示选择所有行。" msgid "Uses the vertices table: _vertices_pgr." msgstr "使用这个顶点表：_vertices_pgr。" @@ -8626,7 +8627,7 @@ msgid "Fills completely the ``cnt`` and ``chk`` columns of the vertices table." msgstr "完全填充顶点表的``cnt`` 和``chk`` 列。" msgid "" -"Returns the analysis of the section of the network defined by ``rows_where``" +"Returns the analysis of the section of the network defined by ``rows_where``" msgstr "返回由``rows_where`` 定义的网络部分的分析结果" msgid "The vertices table is not found." @@ -8672,7 +8673,7 @@ msgstr "``integer``edge_table 中引用该顶点的顶点数。" msgid "chk" msgstr "chk" -msgid "``integer`` Indicator that the vertex might have a problem." +msgid "``integer`` Indicator that the vertex might have a problem." msgstr "``integer``指示顶点可能有问题。" msgid "ein" @@ -8910,9 +8911,9 @@ msgid "two_way_if_null" msgstr "two_way_if_null" msgid "" -"``boolean`` flag to treat oneway NULL values as bi-directional. Default " +"``boolean`` flag to treat oneway NULL values as bi-directional. Default " "value is ``true``." -msgstr "``boolean``将单向 NULL 值视为双向的标志。 默认值为 ``true``。" +msgstr "``boolean``将单向 NULL 值视为双向的标志。 默认值为 ``true``。" msgid "" "It is strongly recommended to use the named notation. See :doc:" @@ -8951,7 +8952,7 @@ msgstr "" "`。" msgid "" -"``integer`` Indicator that the vertex might have a problem. See :doc:" +"``integer`` Indicator that the vertex might have a problem. See :doc:" "`pgr_analyzeGraph `." msgstr "" "``integer``指示顶点可能有问题。 请参阅 :doc:`pgr_analyzeGraph " @@ -8978,8 +8979,8 @@ msgid "" "graph." msgstr "``pgr_articulationPoints`` - 返回无向图的连接点。" -msgid "Return columns change: ``seq`` is removed" -msgstr "返回列更改：``seq``被删除" +msgid "Result columns change: ``seq`` is removed" +msgstr "结果列更改：删除了 ``seq``" msgid "Version 2.5.0" msgstr "版本2.5.0" @@ -9008,8 +9009,8 @@ msgstr "运行时间：:math:`O(V + E)`" msgid "pgr_articulationPoints(`Edges SQL`_)" msgstr "pgr_articulationPoints(`Edges SQL`_)" -msgid "RETURNS SET OF |result-node|" -msgstr "RETURNS SET OF |result-node|" +msgid "Returns set of |result-node|" +msgstr "Returns set of |result-node|" msgid "The articulation points of the graph" msgstr "图表的连接点" @@ -9017,9 +9018,6 @@ msgstr "图表的连接点" msgid "Nodes in red are the articulation points." msgstr "红色节点是关节点。" -msgid "Returns set of |result-node|" -msgstr "Returns set of |result-node|" - msgid "" "Boost: `Biconnected components & articulation points `__" @@ -9073,18 +9071,6 @@ msgid "" "`One to One`_ `)` on the:" msgstr "结果相当于`pgr_bdAStar(` `一对一`_ `)` 结果的并集：" -msgid "`pgr_bdAstar(` `One to Many`_ `)`" -msgstr "`pgr_bdAstar(` `一对多`_ `)`" - -msgid "`pgr_bdAstar(` `Many to One`_ `)`" -msgstr "`pgr_bdAstar(` `多对一`_ `)`" - -msgid "`pgr_bdAstar(` `Many to Many`_ `)`" -msgstr "`pgr_bdAstar(` `多对多`_ `)`" - -msgid "`pgr_bdAstar(` `Combinations`_ `)`" -msgstr "`pgr_bdAstar(` `组合`_ `)`" - msgid "pgr_bdAstar(`Edges SQL`_, **start vid**, **end vid**, [**options**])" msgstr "pgr_bdAstar(`Edges SQL`_, **start vid**, **end vid**, [**options**])" @@ -9205,22 +9191,25 @@ msgstr "" msgid "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_ , [``directed``])" msgstr "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_ , [``directed``])" -msgid "RETURNS SET OF |old-generic-result|" -msgstr "RETURNS SET OF |old-generic-result|" +msgid "Returns set of |old-generic-result|" +msgstr "返回 |old-generic-result| 的集合" + +msgid "Returns set of |result-1-1|" +msgstr "返回 |result-1-1| 的集合" -msgid "RETURNS SET OF |result-1-1|" -msgstr "RETURNS SET OF |result-1-1|" +msgid "From vertex :math:`6` to vertex :math:`10` on a **directed** graph" +msgstr "在**有向**图上从顶点 :math:`6`到顶点 :math:`10`" -msgid "RETURNS SET OF |result-1-m|" -msgstr "RETURNS SET OF |result-1-m|" +msgid "Returns set of |result-1-m|" +msgstr "返回 |result-1-m| 的集合" msgid "" "From vertex :math:`6` to vertices :math:`\\{10, 17\\}` on a **directed** " "graph" msgstr "在**有向**图上从顶点:math:`6`到顶点:math:`\\{10, 17\\}`" -msgid "RETURNS SET OF |result-m-1|" -msgstr "RETURNS SET OF |result-m-1|" +msgid "Returns set of |result-m-1|" +msgstr "返回 |result-m-1| 的集合" msgid "" "From vertices :math:`\\{6, 1\\}` to vertex :math:`17` on a **directed** graph" @@ -9238,11 +9227,11 @@ msgid "Using a combinations table on an **undirected** graph" msgstr "在**无向**图上使用组合表" msgid "" -"https://www.cs.princeton.edu/courses/archive/spr06/cos423/Handouts/EPP" -"%20shortest%20path%20algorithms.pdf" +"https://www.cs.princeton.edu/courses/archive/spr06/cos423/Handouts/" +"EPP%20shortest%20path%20algorithms.pdf" msgstr "" -"https://www.cs.princeton.edu/courses/archive/spr06/cos423/Handouts/EPP" -"%20shortest%20path%20algorithms.pdf" +"https://www.cs.princeton.edu/courses/archive/spr06/cos423/Handouts/" +"EPP%20shortest%20path%20algorithms.pdf" msgid "https://en.wikipedia.org/wiki/Bidirectional_search" msgstr "https://en.wikipedia.org/wiki/Bidirectional_search" @@ -9389,8 +9378,8 @@ msgid "" "When the start vertex and the end vertex are different, and there is no " "path. The agg_cost is :math:`\\infty`." msgstr "" -"当起始顶点和结束顶点不同且不存在路径时，聚合成本（agg_cost）为:math:`" -"\\infty`。" +"当起始顶点和结束顶点不同且不存在路径时，聚合成本（agg_cost）为:math:" +"`\\infty`。" msgid "" "For optimization purposes, any duplicated value in the `start_vids` or " @@ -9411,9 +9400,9 @@ msgstr "" "pgr_bellmanFord(`Edges SQL`_, **start vid**, **end vids**, [``directed``])" msgid "" -"pgr_bellmanFord(`Edges SQL`_, **start vids**, **end vid** , [``directed``])" +"pgr_bellmanFord(`Edges SQL`_, **start vids**, **end vid**, [``directed``])" msgstr "" -"pgr_bellmanFord(`Edges SQL`_, **start vids**, **end vid** , [``directed``])" +"pgr_bellmanFord(`Edges SQL`_, **start vids**, **end vid**, [``directed``])" msgid "" "pgr_bellmanFord(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" @@ -9423,19 +9412,11 @@ msgstr "" msgid "pgr_bellmanFord(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgstr "pgr_bellmanFord(`Edges SQL`_, `Combinations SQL`_, [``directed``])" -msgid "From vertex :math:`6` to vertex :math:`10` on a **directed** graph" -msgstr "在**有向**图上从顶点 :math:`6`到顶点 :math:`10`" - msgid "" "From vertex :math:`6` to vertices :math:`\\{ 10, 17\\}` on a **directed** " "graph" msgstr "在**有向**图上从顶点 :math:`6` 到顶点 :math:`\\{ 10, 17\\}`" -msgid "" -"pgr_bellmanFord(`Edges SQL`_, **start vids**, **end vid**, [``directed``])" -msgstr "" -"pgr_bellmanFord(`Edges SQL`_, **start vids**, **end vid**, [``directed``])" - msgid "Using a combinations table on an **undirected** graph." msgstr "在**无向**图上使用组合表。" @@ -9450,8 +9431,8 @@ msgid "" "graph." msgstr "``pgr_biconnectedComponents`` — 无向图的双连通分量。" -msgid "Return columns change:" -msgstr "返回列更改：" +msgid "Result columns change:" +msgstr "结果列发生变化：" msgid "``n_seq`` is removed" msgstr "``n_seq``被删除" @@ -9483,15 +9464,12 @@ msgstr "``edge``升序。" msgid "pgr_biconnectedComponents(`Edges SQL`_)" msgstr "pgr_biconnectedComponents(`Edges SQL`_)" -msgid "RETURNS SET OF |result-component-E|" -msgstr "RETURNS SET OF |result-component-E|" +msgid "Returns set of |result-component-E|" +msgstr "Returns set of |result-component-E|" msgid "The biconnected components of the graph" msgstr "图的双连通分量" -msgid "Returns set of |result-component-E|" -msgstr "Returns set of |result-component-E|" - msgid "``component``" msgstr "``component``" @@ -9546,16 +9524,14 @@ msgid "" "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:" "`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|" +"general algorithm, like Dijkstra's Algorithm which runs in :math:`O(|E|log|" "V|)` time." msgstr "" -"众所周知，在无权图中，可以使用广度优先搜索（Breadth First Search）找到从单一" -"源点到所有其他顶点的最短路径，其时间复杂度为 :math:`O(|E|)`，其中 |E| 表示图" -"中的边数。也就是说，这里的距离是指从源点到另一个顶点所需穿越的最小边数。我们" -"也可以将这样的图解释为一个带权图，其中每条边的权重都为 :math:`1`。如果图中的" -"边不都具有相同的权重，那么我们就需要使用更通用的算法，比如Dijkstra算法，它的" -"时间复杂度为 :math:`O(|E|log|V|)`，其中 |E| 表示图中的边数，|V| 表示图中的顶" -"点数。" +"众所周知，在无权重图中，使用广度优先搜索（Breadth First Search）可以在 :math:" +"`O(|E|)`内找到单个源点与所有其他顶点之间的最短路径，也就是说，距离是指从源点" +"到另一个顶点所需的最少边数。我们也可以把这样的图解释为加权图，其中每条边的权" +"重为 :math:`1`。如果图中不是所有边的权重都相同，我们就需要一种更通用的算法，" +"比如 Dijkstra 算法，它的运行时间为 :math:`O(|E|log|V||)`。" msgid "" "However if the weights are more constrained, we can use a faster algorithm. " @@ -9622,9 +9598,6 @@ msgid "" msgstr "" "**注意:** 使用 :doc:`示例数据`网络，因为所有权重都相同（即为 :math:`1``）" -msgid "Optional Parameters" -msgstr "可选参数" - msgid "https://cp-algorithms.com/graph/01_bfs.html" msgstr "https://cp-algorithms.com/graph/01_bfs.html" @@ -9662,10 +9635,11 @@ msgstr "返回值没有排序。" msgid "" "The algorithm checks graph is bipartite or not. If it is bipartite then it " -"returns the node along with two colors `0` and `1` which represents two " +"returns the node along with two colors `0` and `1` which represents two " "different sets." -msgstr "该算法检查图是否是二分图。如果是二分图，它将返回节点以及分别代表两个不同集合" -"的两种颜色，分别为 `0` 和 `1`。" +msgstr "" +"该算法检查图是否是二分图。 如果它是二分的，那么它返回节点以及代表两个不同集合" +"的两种颜色 `0` 和`1`。" msgid "If graph is not bipartite then algorithm returns empty set." msgstr "如果图不是两部分的，那么算法会返回空集。" @@ -9673,6 +9647,9 @@ msgstr "如果图不是两部分的，那么算法会返回空集。" msgid "pgr_bipartite(`Edges SQL`_)" msgstr "pgr_bipartite(`Edges SQL`_)" +msgid "Returns set of |result-node-color|" +msgstr "Returns set of |result-node-color|" + msgid "When the graph is bipartite" msgstr "当图形为两方时" @@ -9683,11 +9660,12 @@ msgid "The odd length cyclic graph can not be bipartite." msgstr "奇长循环图不可能是两部分的。" msgid "" -"The edge :math:`5 \\rightarrow 1` will make subgraph with vertices :math:`" -"\\{1, 3, 7, 6, 5\\}` an odd length cyclic graph, as the cycle has 5 vertices." +"The edge :math:`5 \\rightarrow 1` will make subgraph with vertices :math:" +"`\\{1, 3, 7, 6, 5\\}` an odd length cyclic graph, as the cycle has 5 " +"vertices." msgstr "" -"边 :math:`5 \\rightarrow 1` 将使顶点为 :math:`\\{1, 3, 7, 6, 5\\}` " -"的子图成为奇数长度的循环图，因为循环有 5 个顶点。" +"边 :math:`5 \\rightarrow 1` 将使顶点为 :math:`\\{1, 3, 7, 6, 5\\}` 的子图成为" +"奇数长度的循环图，因为循环有 5 个顶点。" msgid "Edges in blue represent odd length cycle subgraph." msgstr "蓝色边代表奇数长度循环子图。" @@ -9699,8 +9677,9 @@ msgid "" "``pgr_boykovKolmogorov`` — Calculates the flow on the graph edges that " "maximizes the flow from the sources to the targets using Boykov Kolmogorov " "algorithm." -msgstr "`pgr_boykovKolmogorov`` - 使用 Boykov Kolmogorov " -"算法计算图边的流量，使从源到目标的流量最大。" +msgstr "" +"`pgr_boykovKolmogorov`` - 使用 Boykov Kolmogorov 算法计算图边的流量，使从源到" +"目标的流量最大。" msgid "New **proposed** signature" msgstr "新的**拟议**签名" @@ -9735,6 +9714,9 @@ msgstr "pgr_boykovKolmogorov(`Edges SQL`_, **start vids**, **end vids**)" msgid "pgr_boykovKolmogorov(`Edges SQL`_, `Combinations SQL`_)" msgstr "pgr_boykovKolmogorov(`Edges SQL`_, `Combinations SQL`_)" +msgid "Returns set of |result-flow|" +msgstr "Returns set of |result-flow|" + msgid "From vertex :math:`11` to vertex :math:`12`" msgstr "从顶点 :math:`11` 到顶点 :math:`12`" @@ -9797,6 +9779,9 @@ msgstr "pgr_breadthFirstSearch(`Edges SQL`_, **root vids**, [**options**])" msgid "**options:** ``[max_depth, directed]``" msgstr "**options:** ``[max_depth, directed]``" +msgid "Returns set of |result-bfs|" +msgstr "返回 |result-bfs| 的集合" + msgid "Single vertex" msgstr "单顶点" @@ -9812,8 +9797,9 @@ msgstr "多个顶点" msgid "" "From root vertices :math:`\\{12, 6\\}` on an **undirected** graph with " "**depth** :math:`<= 2` and edges in ascending order of ``id``" -msgstr "从根顶点开始 :math:`{12, 6\\}` 在一个**无向**图上，**depth** " -":math:`<=2`，边按``id``升序排列" +msgstr "" +"从根顶点开始 :math:`{12, 6\\}` 在一个**无向**图上，**depth** :math:`<=2`，边" +"按``id``升序排列" msgid "DFS optional parameters" msgstr "DFS 可选参数" @@ -9830,7 +9816,8 @@ msgstr "由此产生的遍历是不同的。" msgid "" "The left image shows the result with ascending order of ids and the right " "image shows with descending order of the edge identifiers." -msgstr "左图显示的是按 ID 升序排列的结果，右图显示的是按边缘标识符降序排列的结果。" +msgstr "" +"左图显示的是按 ID 升序排列的结果，右图显示的是按边缘标识符降序排列的结果。" msgid "|ascending| |descending|" msgstr "|ascending| |descending|" @@ -9851,7 +9838,8 @@ msgstr "" msgid "" "`Wikipedia: Breadth First Search algorithm `__" -msgstr "`维基百科：广度优先搜索算法 `__" msgid "``pgr_bridges``" @@ -9877,12 +9865,12 @@ msgstr "运行时间： :math:`O(E * (V + E))`" msgid "pgr_bridges(`Edges SQL`_)" msgstr "pgr_bridges(`Edges SQL`_)" -msgid "The bridges of the graph" -msgstr "图的桥" - msgid "Returns set of |result-edge|" msgstr "返回集合 |result-edge|" +msgid "The bridges of the graph" +msgstr "图的桥" + msgid "Identifier of the edge that is a bridge." msgstr "作为桥的边的标识符。" @@ -9898,8 +9886,9 @@ msgstr "``pgr_chinesePostman`` - 实验" msgid "" "``pgr_chinesePostman`` — Calculates the shortest circuit path which contains " "every edge in a directed graph and starts and ends on the same vertex." -msgstr "``pgr_chinesePostman`` — " -"计算包含有向图中的每条边并从同一顶点开始和结束的最短回路路径。" +msgstr "" +"``pgr_chinesePostman`` — 计算包含有向图中的每条边并从同一顶点开始和结束的最短" +"回路路径。" msgid "Returns ``EMPTY SET`` on a disconnected graph" msgstr "在一个不连通的图上返回 ``EMPTY SET``" @@ -9907,6 +9896,9 @@ msgstr "在一个不连通的图上返回 ``EMPTY SET``" msgid "pgr_chinesePostman(`Edges SQL`_)" msgstr "pgr_chinesePostman(`Edges SQL`_)" +msgid "Returns set of |result-1-1-no-seq|" +msgstr "返回|result-1-1-no-seq|的集合" + msgid "Returns set of ``(seq, node, edge, cost, agg_cost)``" msgstr "Returns set of ``(seq, node, edge, cost, agg_cost)``" @@ -9973,12 +9965,12 @@ msgstr "``component`` 升序" msgid "pgr_connectedComponents(`Edges SQL`_)" msgstr "pgr_connectedComponents(`Edges SQL`_)" -msgid "The connected components of the graph" -msgstr "图的连通分量" - msgid "Returns set of |result-component-V|" msgstr "返回集合|result-component-V|" +msgid "The connected components of the graph" +msgstr "图的连通分量" + msgid "Has the value of the minimum node identifier in the component." msgstr "具有组件中最小节点标识符的值。" @@ -9992,8 +9984,8 @@ msgid "" "Boost: `Connected components `__" msgstr "" -"Boost: `已连接组件 `__" +"Boost: `已连接组件 `__" msgid "" "wikipedia: `Connected component ` to create a topology based " @@ -10580,7 +10577,8 @@ msgid "" "The vertices are basically assigned a breadth-first search order, except " "that at each step, the adjacent vertices are placed in the queue in order of " "increasing degree." -msgstr "顶点的搜索顺序基本上是广度优先，只不过在每一步中，相邻的顶点会按照度数递增的" +msgstr "" +"顶点的搜索顺序基本上是广度优先，只不过在每一步中，相邻的顶点会按照度数递增的" "顺序排列在队列中。" msgid "The implementation is for **undirected** graphs." @@ -10602,11 +10600,14 @@ msgstr ":math:`m` 是图中顶点的最大度数。" msgid "pgr_cuthillMckeeOrdering(`Edges SQL`_)" msgstr "pgr_cuthillMckeeOrdering(`Edges SQL`_)" +msgid "Returns set of |result-node-order|" +msgstr "Returns set of |result-node-order|" + msgid "Graph ordering of pgRouting :doc:`sampledata`" msgstr "pgRouting :doc:`sampledata` 的图形排序" -msgid "Returns SET OF ``(seq, node)``" -msgstr "Returns SET OF ``(seq, node)``" +msgid "Returns set of ``(seq, node)``" +msgstr "返回 ``(seq, node)`` 的集合" msgid "Sequence of the order starting from 1." msgstr "从1开始的顺序序列。" @@ -10622,11 +10623,11 @@ msgstr "" "cuthill_mckee_ordering.html>`__" msgid "" -"`Wikipedia: Cuthill-McKee Ordering `__" +"`Wikipedia: Cuthill-McKee Ordering `__" msgstr "" -"`Wikipedia: Cuthill-McKee 排序 `__" +"`Wikipedia: Cuthill-McKee 排序 `__" msgid "pgr_dagShortestPath - Experimental" msgstr "pgr_dagShortestPath - 实验" @@ -10663,7 +10664,8 @@ msgid "" "The algorithm relies on topological sorting the dag to impose a linear " "ordering on the vertices, and thus is more efficient for DAG's than either " "the Dijkstra or Bellman-Ford algorithm." -msgstr "该算法依靠对 DAG 进行拓扑排序来对顶点进行线性排序，因此比 Dijkstra 或 " +msgstr "" +"该算法依靠对 DAG 进行拓扑排序来对顶点进行线性排序，因此比 Dijkstra 或 " "Bellman-Ford 算法更有效率。" msgid "" @@ -10680,11 +10682,11 @@ msgstr "`agg_cost`中未包括的值 `(u, v)`是数学符号中的:math:`\\infty msgid "Running time: :math:`O(| start\\_vids | * (V + E))`" msgstr "运行时间：:math:`O(| start\\_vids | * (V + E))`" -msgid "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vid**)" -msgstr "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vid**)" +msgid "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vid**)" +msgstr "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vid**)" -msgid "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vids**)" -msgstr "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vids**)" +msgid "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vids**)" +msgstr "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vids**)" msgid "pgr_dagShortestPath(`Edges SQL`_, **start vids**, **end vid**)" msgstr "pgr_dagShortestPath(`Edges SQL`_, **start vids**, **end vid**)" @@ -10695,7 +10697,7 @@ msgstr "pgr_dagShortestPath(`Edges SQL`_, **start vids**, **end vids**)" msgid "pgr_dagShortestPath(`Edges SQL`_, `Combinations SQL`_)" msgstr "pgr_dagShortestPath(`Edges SQL`_, `Combinations SQL`_)" -msgid "From vertex :math:`5` to vertex :math:`11` on a **directed** graph" +msgid "From vertex :math:`5` to vertex :math:`11` on a **directed** graph" msgstr "在**有向**图上，从顶点:math:`5`到顶点 :math:`11`" msgid "From vertex :math:`5` to vertices :math:`\\{7, 11\\}`" @@ -10709,7 +10711,7 @@ msgid "" "**undirected** graph" msgstr "在**无向**图上，从顶点:math:`\\{5, 15\\}`到顶点:math:`\\{11, 17\\}`" -msgid "Resturn Columns" +msgid "Return columns" msgstr "返回列" msgid "Making **start_vids** the same as **end_vids**" @@ -10808,6 +10810,11 @@ msgid "" "=> true``." msgstr "要获取用于生成顶点信息的查询，请使用 ``dryrun => true``。" +msgid "" +"The results can be used as base code to make a refinement based on the " +"backend development needs." +msgstr "结果可作为基础代码，根据后台开发需要进行改进。" + msgid "Degree from an existing table" msgstr "来自现有表的度数" @@ -10980,11 +10987,6 @@ msgstr "" msgid "pgr_dijkstra(`Edges SQL`_, **start vids**, **end vid**, [``directed``])" msgstr "pgr_dijkstra(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" -msgid "" -"pgr_dijkstra(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" -msgstr "" -"pgr_dijkstra(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" - msgid "pgr_dijkstra(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgstr "pgr_dijkstra(`Edges SQL`_,`Combinations SQL`_, [``directed`])" @@ -11601,6 +11603,9 @@ msgstr "pgr_dijkstraVia(`Edges SQL`_, **via vertices**, [**options**])" msgid "**options:** ``[directed, strict, U_turn_on_edge]``" msgstr "**选项：** ``[directed, strict, U_turn_on_edge]``" +msgid "Returns set of |via-result|" +msgstr "返回 |via-result| 的集合" + msgid "" "Find the route that visits the vertices :math:`\\{5, 1, 8\\}` in that order " "on an **directed** graph." @@ -11698,11 +11703,9 @@ msgstr "" "相应的生成树。" msgid "" -"pgr_drivingDistance(`Edges SQL`_, **Root vid**, **distance**, " -"[``directed``])" +"pgr_drivingDistance(`Edges SQL`_, **Root vid**, **distance**, [``directed``])" msgstr "" -"pgr_drivingDistance(`Edges SQL`_, **Root vid**, **distance**, " -"[``directed``])" +"pgr_drivingDistance(`Edges SQL`_, **Root vid**, **distance**, [``directed``])" msgid "" "pgr_drivingDistance(`Edges SQL`_, **Root vids**, **distance**, [**options**])" @@ -11792,11 +11795,11 @@ msgstr "" msgid "" "the chromatic number :math:`x'(G)` (minimum number of colors needed for " -"proper edge coloring of graph) is equal to the degree :math:`\\Delta + 1` " -"of the graph, (:math:`x'(G) = \\Delta`)" +"proper edge coloring of graph) is equal to the degree :math:`\\Delta + 1` of " +"the graph, (:math:`x'(G) = \\Delta`)" msgstr "" -"色数 :math:`x'(G)`（适当的图边着色所需的最小颜色数）等于图的度 :math:`\\Delta" -" + 1`，即 :math:`x'(G) = \\Delta`" +"色数（chromatic number）:math:`x'(G)`（用于图的适当边着色所需的最小颜色数）等" +"于图的度:math:`\\Delta + 1`（:math:`x'(G) = \\Delta`）" msgid "The algorithm tries to assign the least possible color to every edge." msgstr "该算法尝试为每条边分配尽可能少的颜色。" @@ -11823,8 +11826,8 @@ msgstr ":math:`|V|` 是图中的顶点数。" msgid "pgr_edgeColoring(`Edges SQL`_)" msgstr "pgr_edgeColoring(`Edges SQL`_)" -msgid "RETURNS SET OF |result-edge-color|" -msgstr "RETURNS SET OF |result-edge-color|" +msgid "Returns set of |result-edge-color|" +msgstr "Returns set of |result-edge-color|" msgid "Graph coloring of pgRouting :doc:`sampledata`" msgstr "pgRouting :doc:`示例数据`的图着色" @@ -11897,26 +11900,27 @@ msgid "" "pgr_edgeDisjointPaths(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgstr "pgr_edgeDisjointPaths(`Edges SQL`_,`Combinations SQL`_, [``directed`])" -msgid "RETURNS SET OF |result-disjoint|" -msgstr "返回 |result-disjoint| 的集合" +msgid "Returns set of |result-disjoint|" +msgstr "Returns set of |result-disjoint|" -msgid "RETURNS SET OF |result-disjoint-1-1|" -msgstr "返回|result-disjoint-1-1|集合" +msgid "Returns set of |result-disjoint-1-1|" +msgstr "返回 |result-disjoint-1-1|的集合" -msgid "RETURNS SET OF |result-disjoint-1-m|" -msgstr "返回 |result-disjoint-1-m|集合" +msgid "Returns set of |result-disjoint-1-m|" +msgstr "返回|result-disjoint-1-m|的集合" -msgid "RETURNS SET OF |result-disjoint-m-1|" -msgstr "返回|result-disjoint-m-1|集合" +msgid "Returns set of |result-disjoint-m-1|" +msgstr "Returns set of |result-disjoint-m-1|" -msgid "RETURNS SET OF |result-disjoint-m-m|" -msgstr "返回 |result-disjoint-m-m|集合" +msgid "Returns set of |result-disjoint-m-m|" +msgstr "返回|result-disjoint-m-m|的集合" msgid "" "Using a combinations table, equivalent to calculating result from vertices :" "math:`\\{5, 6\\}` to vertices :math:`\\{10, 15, 14\\}` on an undirected " "graph." -msgstr "使用组合表，相当于计算无向图上从顶点 :math:`\\{5, 6\\}`到顶点 :math:`\\{10, " +msgstr "" +"使用组合表，相当于计算无向图上从顶点 :math:`\\{5, 6\\}`到顶点 :math:`\\{10, " "15, 14\\}`的结果。" msgid "Manually assigned vertex combinations on an undirected graph." @@ -11928,8 +11932,9 @@ msgstr "``pgr_edmondsKarp``" msgid "" "``pgr_edmondsKarp`` — Calculates the flow on the graph edges that maximizes " "the flow from the sources to the targets using Edmonds Karp Algorithm." -msgstr "``pgr_edmondsKarp`` —使用 Edmonds Karp " -"算法计算图边上的流量，以最大化从源到目标的流量。" +msgstr "" +"``pgr_edmondsKarp`` —使用 Edmonds Karp 算法计算图边上的流量，以最大化从源到目" +"标的流量。" msgid "``pgr_edmondsKarp`` (`Combinations`_)" msgstr "``pgr_edmondsKarp`` (`组合`_)" @@ -11965,9 +11970,8 @@ msgid "``pgr_edwardMoore - Experimental``" msgstr "``pgr_edwardMoore -实验``" msgid "" -"``pgr_edwardMoore`` — Returns the shortest path using Edward-Moore " -"algorithm." -msgstr "``pgr_edwardMoore`` - 使用 Edward-Moore 算法返回最短路径。" +"``pgr_edwardMoore`` — Returns the shortest path using Edward-Moore algorithm." +msgstr "`pgr_edwardMoore`` - 使用 Edward-Moore 算法返回最短路径。" msgid "``pgr_edwardMoore`` (`Combinations`_)" msgstr "``pgr_edwardMoore`` (`组合`_)" @@ -11990,9 +11994,9 @@ msgid "" "vertices in a weighted directed graph. The main difference between Edward " "Moore's Algorithm and Bellman Ford's Algorithm lies in the run time." msgstr "" -"Edward Moore算法是Bellman-Ford算法的改进。 " -"它可以计算加权有向图中从单个源顶点到所有其他顶点的最短路径。 Edward " -"Moore算法和Bellman-Ford算法之间的主要区别在于运行时间。" +"Edward Moore算法是Bellman-Ford算法的改进。 它可以计算加权有向图中从单个源顶点" +"到所有其他顶点的最短路径。 Edward Moore算法和Bellman-Ford算法之间的主要区别在" +"于运行时间。" msgid "" "The worst-case running time of the algorithm is :math:`O(| V | * | E |)` " @@ -12001,14 +12005,15 @@ msgid "" "complexity of :math:`O( | E | )` for random graphs. This is significantly " "faster in terms of computation speed." msgstr "" -"该算法的最坏运行时间为:math:`O(| V | * | E |)` ，类似于Bellman-" -"Ford算法的时间复杂度。然而，实验表明，对于随机图，" -"该算法的平均运行时间复杂度为 :math:`O( | E | )`。这在计算速度上明显更快。" +"该算法的最坏运行时间为:math:`O(| V | * | E |)` ，类似于Bellman-Ford算法的时间" +"复杂度。然而，实验表明，对于随机图，该算法的平均运行时间复杂度为 :math:`O( | " +"E | )`。这在计算速度上明显更快。" msgid "" "Thus, the algorithm is at-best, significantly faster than Bellman-Ford " "algorithm and is at-worst,as good as Bellman-Ford algorithm" -msgstr "因此，该算法在最好的情况下，明显快于 Bellman-Ford 算法，在最差的情况下，与 " +msgstr "" +"因此，该算法在最好的情况下，明显快于 Bellman-Ford 算法，在最差的情况下，与 " "Bellman-Ford 算法一样好" msgid "The `agg_cost` the non included values `(v, v)` is :math:`0`" @@ -12019,12 +12024,6 @@ msgid "" "vids` are ignored." msgstr "出于优化目的， `start vids` 或`end vids`中的任何重复值都将被忽略。" -msgid "`start vid` ascending" -msgstr "`start vid`升序" - -msgid "`end vid` ascending" -msgstr "`end vid`升序" - msgid "Running time:" msgstr "运行时间：" @@ -12103,8 +12102,9 @@ msgstr "边的几何形状。" msgid "" "This inner query takes precedence over the next two inner query, therefore " "other columns are ignored when ``geom`` column appears." -msgstr "该内部查询优先于接下来的两个内部查询，因此当``geom`` " -"列出现时，其他列将被忽略。" +msgstr "" +"该内部查询优先于接下来的两个内部查询，因此当``geom`` 列出现时，其他列将被忽" +"略。" msgid "Ignored columns:" msgstr "忽略的列：" @@ -12135,8 +12135,9 @@ msgstr "结束顶点POINT的几何图形。" msgid "" "This inner query takes precedence over the next inner query, therefore other " "columns are ignored when ``startpoint`` and ``endpoint`` columns appears." -msgstr "此内部查询优先于下一个内部查询，因此当出现``startpoint`` 和 " -"``endpoint``列时，其他列将被忽略。" +msgstr "" +"此内部查询优先于下一个内部查询，因此当出现``startpoint`` 和 ``endpoint``列" +"时，其他列将被忽略。" msgid "When identifiers of vertices are known" msgstr "当顶点的标识符已知时" @@ -12144,8 +12145,9 @@ msgstr "当顶点的标识符已知时" msgid "" "To use this inner query the columns ``geom``, ``startpoint`` and " "``endpoint`` should not be part of the set of columns." -msgstr "要使用此内部查询，列 " -"``geom``、``startpoint``和``endpoint``不应成为列集的一部分。" +msgstr "" +"要使用此内部查询，列 ``geom``、``startpoint``和``endpoint``不应成为列集的一部" +"分。" msgid "``NULL`` When the ``id`` is not part of the inner query" msgstr "``NULL`` 当 ``id``不是内部查询的一部分时" @@ -12159,19 +12161,11 @@ msgstr "``NULL``当没有提供几何图形时" msgid "Geometry of the point" msgstr "点几何" -msgid "Dryrun execution" -msgstr "试运行执行" - msgid "" "To get the query generated used to get the vertex information, use ``dryrun :" "= true``." msgstr "要获取用于生成顶点信息的查询，请使用 ``dryrun := true``。" -msgid "" -"The results can be used as base code to make a refinement based on the " -"backend development needs." -msgstr "结果可作为基础代码，根据后台开发需要进行改进。" - msgid "``pgr_findCloseEdges``" msgstr "``pgr_findCloseEdges``" @@ -12217,8 +12211,8 @@ msgstr "" msgid "**options:** ``[cap, partial, dryrun]``" msgstr "**options:** ``[cap, partial, dryrun]``" -msgid "RETURNS SET OF |result-find|" -msgstr "RETURNS SET OF |result-find|" +msgid "Returns set of |result-find|" +msgstr "返回集合 |result-find|" msgid "One point" msgstr "一个点" @@ -12312,15 +12306,13 @@ msgstr "当为 ``false`` 时，执行计算。" msgid "" "When ``true`` calculations are not performed and the query to do the " "calculations is exposed in a PostgreSQL ``NOTICE``." -msgstr "当为``true`` 时，不执行计算，并在 PostgreSQL 的 " -"``NOTICE``中显示执行计算的查询。" +msgstr "" +"当为``true`` 时，不执行计算，并在 PostgreSQL 的 ``NOTICE``中显示执行计算的查" +"询。" msgid "The ``LINESTRING`` geometry of the edge." msgstr "边的 ``LINESTRING``几何。" -msgid "Returns set of |result-find|" -msgstr "返回集合 |result-find|" - msgid "When :math:`cap = 1`, it is the closest edge." msgstr "当 :math:`cap = 1` 时，它是最近的边。" @@ -12364,7 +12356,8 @@ msgstr "`多个点`_：包含对应的**原始点**" msgid "" "``LINESTRING`` geometry from the **original point** to the closest point of " "the edge with identifier ``edge_id``" -msgstr "从**原始点**到具有标识符``edge_id``的边的最近点的``LINESTRING``几何图形" +msgstr "" +"从**原始点**到具有标识符``edge_id``的边的最近点的``LINESTRING``几何图形" msgid "One point results" msgstr "单一点的结果" @@ -12388,17 +12381,17 @@ msgid "The green nodes are the **original points**" msgstr "绿色节点为**原始点**" msgid "" -"The geometry ``geom``, marked as **g1** and **g2** are the **original " +"The geometry ``geom``, marked as **g1** and **g2** are the **original " "points**" -msgstr "几何体 ``geom``，标记 **g1** 和**g2**是**原始点**" +msgstr "标为**g1**和**g2**的几何体``geom``是**原始点**" msgid "" "The geometry ``edge``, marked as **edge1** and **edge2** is a line that " "connects the **original point** with the closest point on the :math:`sp " "\\rightarrow ep` edge." msgstr "" -"标为 **edge1** 和 **edge2** 的几何图形 ``edge`` 是一条连接 ** 原始点** 和 " -":math:`sp \\rightarrow ep` 边上最近点的线。" +"标为 **edge1** 和 **edge2** 的几何图形 ``edge`` 是一条连接 ** 原始点** 和 :" +"math:`sp \\rightarrow ep` 边上最近点的线。" msgid "One point examples" msgstr "单点示例" @@ -12432,8 +12425,9 @@ msgstr "对于边 :math:`5`:" msgid "" "``fraction``: The closest point from the **original point** is at the :math:" "`0.8` fraction of the edge :math:`5`." -msgstr "``fraction``：离 **原始点** 最近的点位于边 :math:`5` 处的 :math:`0.8` " -"分数位置。" +msgstr "" +"``fraction``：离 **原始点** 最近的点位于边 :math:`5` 处的 :math:`0.8` 分数位" +"置。" msgid "" "``side``: The **original point** is located to the left side of edge :math:" @@ -12451,8 +12445,9 @@ msgstr "对于边 :math:`8`：" msgid "" "``fraction``: The closest point from the **original point** is at the :math:" "`0.89..` fraction of the edge :math:`8`." -msgstr "``fraction``：离 **原始点** 最近的点位于边 :math:`8` 的 :math:`0.89..` " -"分数位置。" +msgstr "" +"``fraction``：离 **原始点** 最近的点位于边 :math:`8` 的 :math:`0.89..` 分数位" +"置。" msgid "" "``side``: The **original point** is located to the right side of edge :math:" @@ -12480,8 +12475,9 @@ msgstr "``edge_id``与**原始点**最**接近**的边的标识符" msgid "" "From all edges within :math:`0.5` distance units from the **original " "point**: :math:`{5}` is the closest one." -msgstr "从距离**原始点**不超过 :math:`0.5` 距离单位的所有边中，边 :math:`{5}` " -"是最近的一条。" +msgstr "" +"从距离**原始点**不超过 :math:`0.5` 距离单位的所有边中，边 :math:`{5}` 是最近" +"的一条。" msgid "" "``geom``: Contains the geometry of the closest point on edge :math:`5` from " @@ -12491,8 +12487,9 @@ msgstr "``geom``:包含了从**原始点**到边 :math:`5` 上最近点的几何 msgid "" "``edge``: Contains the ``LINESTRING`` geometry of the **original point** to " "the closest point on on edge :math:`5` ``geom``" -msgstr "``edge``：包含了从**原始点**到边 :math:`5```geom`` " -"上最近点的``LINESTRING``几何形状" +msgstr "" +"``edge``：包含了从**原始点**到边 :math:`5```geom`` 上最近点的``LINESTRING``几" +"何形状" msgid "At most two answers with all columns" msgstr "所有列最多有两个答案" @@ -12508,8 +12505,9 @@ msgstr "``geom``：包含了从**原始点**到边 :math:`8` 上最近点的几 msgid "" "``edge``: Contains the ``LINESTRING`` geometry of the **original point** to " "the closest point on on edge :math:`8` ``geom``" -msgstr "``edge``：包含了从**原始点**到边 :math:`8` " -"``geom``上最近点的``LINESTRING``几何形状" +msgstr "" +"``edge``：包含了从**原始点**到边 :math:`8` ``geom``上最近点的``LINESTRING``几" +"何形状" msgid "One point dry run execution" msgstr "单点模拟执行" @@ -12526,8 +12524,9 @@ msgstr "被忽略" msgid "" "Because it is a **dry run** excecution, the code for all calculations are " "shown on the PostgreSQL ``NOTICE``." -msgstr "由于这是一次 **模拟** 执行，所有计算的代码都显示在 PostgreSQL 的 " -"``NOTICE``中。" +msgstr "" +"由于这是一次 **模拟** 执行，所有计算的代码都显示在 PostgreSQL 的 ``NOTICE``" +"中。" msgid "``dryrun => true``" msgstr "``dryrun => true``" @@ -12558,7 +12557,8 @@ msgstr "``edge_id``是与一个**原始点**（``geom``）靠近的边的标识 msgid "" "Two edges at most withing :math:`0.5` distance units from each of the " "**original points**:" -msgstr "每个**原始点**中，最多有两条边位于距离不超过 :math:`0.5`距离单位的范围内：" +msgstr "" +"每个**原始点**中，最多有两条边位于距离不超过 :math:`0.5`距离单位的范围内：" msgid "For ``POINT(1.8 0.4)`` and ``POINT(0.3 1.8)`` only one edge was found." msgstr "对于 ``POINT(1.8 0.4)`` 和 ``POINT(0.3 1.8)`` ，只找到一条边。" @@ -12572,8 +12572,9 @@ msgstr "对于点 ``POINT(2.9 1.8)``" msgid "" "Edge :math:`5` is before :math:`8` therefore edge :math:`5` has the shortest " "distance to ``POINT(2.9 1.8)``." -msgstr "边 :math:`5` 在:math:`8` 之前，因此边 :math:`5` 到``POINT(2.9 1." -"8)``的距离最短。" +msgstr "" +"边 :math:`5` 在:math:`8` 之前，因此边 :math:`5` 到``POINT(2.9 1.8)``的距离最" +"短。" msgid "One answer per point, all columns" msgstr "每点一个答案，所有列" @@ -12591,8 +12592,9 @@ msgstr "``geom``：包含了**原始点**的几何形状，即 ``POINT(2.9 1.8)` msgid "" "``edge``: Contains the ``LINESTRING`` geometry of the **original point** " "(``geom``) to the closest point on on edge." -msgstr "``edge``：包含了**原始点**（``geom``）到最接近的边上的``LINESTRING``几何形状" -"。" +msgstr "" +"``edge``：包含了**原始点**（``geom``）到最接近的边上的``LINESTRING``几何形" +"状。" msgid "Many points dry run execution" msgstr "多点模拟执行" @@ -12616,7 +12618,8 @@ msgid "" "Some times the applications work \"on the fly\" starting from a location " "that is not a vertex in the graph. Those locations, in pgRrouting are called " "points of interest." -msgstr "有时应用程序会“即时执行”，从不是图中顶点的位置开始。在pgRouting中，这些位置被" +msgstr "" +"有时应用程序会“即时执行”，从不是图中顶点的位置开始。在pgRouting中，这些位置被" "称为兴趣点。" msgid "" @@ -12770,9 +12773,9 @@ msgid "``pgr_hawickCircuits - Experimental``" msgstr "``pgr_hawickCircuits - 实验``" msgid "" -"``pgr_hawickCircuits`` — Returns the list of cirucits using hawick circuits " +"``pgr_hawickCircuits`` — Returns the list of cirucits using hawick circuits " "algorithm." -msgstr "``pgr_hawickCircuits`` — 使用 Hawick 回路算法返回回路列表。" +msgstr "``pgr_hawickCircuits`` — 使用 Hawick 回路算法返回回路列表。" msgid "``pgr_hawickCircuits``" msgstr "``pgr_hawickCircuits``" @@ -12821,8 +12824,8 @@ msgstr ":math:`|c|`是图中的电路数量。" msgid "pgr_hawickCircuits(`Edges SQL`_)" msgstr "pgr_hawickCircuits(`Edges SQL`_)" -msgid "RETURNS SET OF |generic-result|" -msgstr "RETURNS SET OF |generic-result|" +msgid "Returns set of |generic-result|" +msgstr "返回 |eneric-result| 的集合" msgid "Circuits present in the pgRouting :doc:`sampledata`" msgstr "pgRouting :doc:`示例数据`中存在的电路" @@ -12967,8 +12970,8 @@ msgstr "当图中没有边时，返回 EMPTY SET。" msgid "pgr_kruskal(`Edges SQL`_)" msgstr "pgr_kruskal(`Edges SQL`_)" -msgid "RETURNS SET OF |result-mst|" -msgstr "RETURNS SET OF |result-mst|" +msgid "Returns set of |result-mst|" +msgstr "返回 |result-mst| 的集合" msgid "Minimum spanning forest" msgstr "最小生成森林" @@ -13101,8 +13104,8 @@ msgstr "运行时间：:math:`O((V+E)log(V+E))`" msgid "pgr_lengauerTarjanDominatorTree(`Edges SQL`_, **root vertex**)" msgstr "pgr_lengauerTarjanDominatorTree(`Edges SQL`_, **root vertex**)" -msgid "RETURNS SET OF |result-idom|" -msgstr "RETURNS SET OF |result-idom|" +msgid "Returns set of |result-idom|" +msgstr "返回 |result-idom| 的集合" msgid "The dominator tree with root vertex :math:`5`" msgstr "具有根顶点 :math:`5`的支配树" @@ -13163,8 +13166,8 @@ msgstr "L(G) 的两个顶点相邻当且仅当它们对应的边共享 G 中的 msgid "pgr_lineGraph(`Edges SQL`_, [``directed``])" msgstr "pgr_lineGraph(`Edges SQL`_, [``directed``])" -msgid "RETURNS SET OF |result-lineg|" -msgstr "RETURNS SET OF |result-lineg|" +msgid "Returns set of |result-lineg|" +msgstr "Returns set of |result-lineg|" msgid "For a **directed** graph" msgstr "对于**有向**图" @@ -13262,8 +13265,8 @@ msgstr "运行时间：TBD（待定）" msgid "pgr_lineGraphFull(`Edges SQL`_)" msgstr "pgr_lineGraphFull(`Edges SQL`_)" -msgid "RETURNS SET OF |result-linegf|" -msgstr "RETURNS SET OF |result-linegf|" +msgid "Returns set of |result-linegf|" +msgstr "返回 |result-linegf| 的集合" msgid "Full line graph of subgraph of edges :math:`\\{4, 7, 8, 10\\}`" msgstr "边:math:`\\{4, 7, 8, 10\\}`子图的全线图" @@ -13498,17 +13501,14 @@ msgstr "该算法在计算中不考虑遍历成本。" msgid "pgr_makeConnected(`Edges SQL`_)" msgstr "pgr_makeConnected(`Edges SQL`_)" -msgid "RETURNS SET OF |result-component-make|" -msgstr "RETURNS SET OF |result-component-make|" +msgid "Returns set of |result-component-make|" +msgstr "Returns set of |result-component-make|" msgid "" "Query done on :doc:`sampledata` network gives the list of edges that are " "needed to connect the graph." msgstr "在:doc:`示例数据`网络上完成的查询给出了连接图所需的边列表。" -msgid "Returns set of |result-component-make|" -msgstr "Returns set of |result-component-make|" - msgid "https://www.boost.org/libs/graph/doc/make_connected.html" msgstr "https://www.boost.org/libs/graph/doc/make_connected.html" @@ -13577,9 +13577,6 @@ msgstr "正值表示存在边(``target``, ``source``)" msgid "Identifier of the edge in the original query." msgstr "原始查询中边的标识符。" -msgid ":doc:`migration`" -msgstr ":doc:`migration`" - msgid "https://www.boost.org/libs/graph/doc/maximum_matching.html" msgstr "https://www.boost.org/libs/graph/doc/maximum_matching.html" @@ -13697,8 +13694,8 @@ msgstr "pgr_maxFlowMinCost(`Edges SQL`_, **start vids**, **end vids**)" msgid "pgr_maxFlowMinCost(`Edges SQL`_, `Combinations SQL`_)" msgstr "pgr_maxFlowMinCost(`Edges SQL`_, `Combinations SQL`_)" -msgid "RETURNS SET OF |result-flow-mincost|" -msgstr "RETURNS SET OF |result-flow-mincost|" +msgid "Returns set of |result-flow-mincost|" +msgstr "返回 |result-flow-mincost| 的集合" msgid "" "https://www.boost.org/libs/graph/doc/" @@ -13804,24 +13801,14 @@ msgstr "" msgid "``float8`` tolerance for coincident points (in projection unit)dd" msgstr "``float8`` 重合点公差（以投影单位表示）dd" -msgid "" -"``text`` Primary key column name of the network table. Default value is " -"``id``." -msgstr "``text`` 网络表的主键列名称。 默认值为``id``。" - -msgid "" -"``text`` Geometry column name of the network table. Default value is " -"``the_geom``." -msgstr "``text``网络表的几何列名称。 默认值为``the_geom``。" - msgid "table_ending" msgstr "table_ending" msgid "``text`` Suffix for the new table's. Default value is ``noded``." msgstr "``text``新表的后缀。 默认值是``noded``。" -msgid "The output table will have for ``edge_table_noded``" -msgstr "输出表将具有``edge_table_noded``" +msgid "The output table will have for ``edge_table_noded``" +msgstr "输出表中将包含``edge_table_noded``内容" msgid "``bigint`` Unique identifier for the table" msgstr "``bigint`` 表的唯一标识符" @@ -13885,14 +13872,14 @@ msgstr "图片" msgid "Before Image" msgstr "之前的图像" -msgid "before image" -msgstr "之前的图像" +msgid "Before image" +msgstr "图片前" msgid "After Image" msgstr "后面的图像" -msgid "after image" -msgstr "后面的图像" +msgid "After image" +msgstr "图像后" msgid "Comparing the results" msgstr "比较结果" @@ -14106,8 +14093,8 @@ msgstr "" msgid "**options:** ``[factor, max_cycles, initial_sol]``" msgstr "**options:** ``[factor, max_cycles, initial_sol]``" -msgid "RETURNS SET OF |result-pickdrop|" -msgstr "RETURNS SET OF |result-pickdrop|" +msgid "Returns set of |result-pickdrop|" +msgstr "返回 |result-pickdrop| 的集合" msgid "Solve the following problem" msgstr "解决以下问题" @@ -14478,8 +14465,8 @@ msgstr "运行时间： :math:`O(V*E + V^2*log V)`。" msgid "pgr_stoerWagner(`Edges SQL`_)" msgstr "pgr_stoerWagner(`Edges SQL`_)" -msgid "RETURNS SET OF |result-mincut|" -msgstr "RETURNS SET OF |result-mincut|" +msgid "Returns set of |result-mincut|" +msgstr "返回|result-mincut|的集合" msgid "min cut of the main subgraph" msgstr "主子图的最小割" @@ -14586,15 +14573,12 @@ msgstr "返回的值按拓扑顺序排序：" msgid "pgr_topologicalSort(`Edges SQL`_)" msgstr "pgr_topologicalSort(`Edges SQL`_)" -msgid "RETURNS SET OF |result-toposort|" -msgstr "RETURNS SET OF |result-toposort|" +msgid "Returns set of |result-toposort|" +msgstr "Returns set of |result-toposort|" msgid "Topologically sorting the graph" msgstr "对图进行拓扑排序" -msgid "Returns set of |result-toposort|" -msgstr "Returns set of |result-toposort|" - msgid "Sequential value starting from :math:`1`" msgstr "从 :math:`1` 开始的连续数值" @@ -14652,8 +14636,8 @@ msgstr "pgr_transitiveClosure 函数具有以下签名：" msgid "pgr_transitiveClosure(`Edges SQL`_)" msgstr "pgr_transitiveClosure(`Edges SQL`_)" -msgid "RETURNS SET OF |result-closure|" -msgstr "RETURNS SET OF |result-closure|" +msgid "Returns set of |result-closure|" +msgstr "Returns set of |result-closure|" msgid "Rechability of a subgraph" msgstr "子图的可达性" @@ -14682,8 +14666,8 @@ msgstr "pgr_trsp - 拟议" msgid "``pgr_trsp`` - routing vertices with restrictions." msgstr "``pgr_trsp`` -有限制的路由顶点。" -msgid "New proposed signatures:" -msgstr "新拟议的签名：" +msgid "New proposed signatures" +msgstr "新拟议的签名" msgid "``pgr_trsp`` (`One to One`_)" msgstr "``pgr_trsp`` (`一对一`_)" @@ -14700,8 +14684,8 @@ msgstr "``pgr_trsp`` (`多对多`_)" msgid "``pgr_trsp`` (`Combinations`_)" msgstr "``pgr_trsp`` (`组合`_)" -msgid "Deprecated signatures:" -msgstr "弃用签名：" +msgid "Deprecated signatures" +msgstr "弃用签名" msgid "``pgr_trsp(text,integer,integer,boolean,boolean,text)``" msgstr "``pgr_trsp(text,integer,integer,boolean,boolean,text)``" @@ -14717,8 +14701,8 @@ msgid "" msgstr "" "``pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)``" -msgid "New prototypes:" -msgstr "新原型：" +msgid "New prototypes" +msgstr "新原型" msgid "``pgr_trspViaVertices``" msgstr "``pgr_trspViaVertices``" @@ -14785,8 +14769,8 @@ msgstr "" "pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, `Combinations SQL`_, " "[``directed``])" -msgid "From vertex :math:`6` to vertex :math:`10` on an undirected graph." -msgstr "无向图上从一个顶点 :math:`6`到另一个顶点:math:`10`。" +msgid "From vertex :math:`6` to vertex :math:`10` on an undirected graph." +msgstr "从无向图上的顶点 :math:`6` 到顶点 :math:`10`." msgid "" "From vertex :math:`6` to vertices :math:`\\{10, 1\\}` on an undirected graph." @@ -15035,12 +15019,12 @@ msgstr "" "置。" msgid "" -"Point :math:`-1` corresponds to the closest edge from point `(2.9,1.8)`." -msgstr "点 :math:`-1`对应于距离点 `(2.9,1.8)`最近的边。" +"Point :math:`-1` corresponds to the closest edge from point `(2.9, 1.8)`." +msgstr "点:math:`-1`对应于距离点`(2.9, 1.8)` 最近的边。" msgid "" -"Point :math:`-2` corresponds to the next close edge from point `(2.9,1.8)`." -msgstr "点 :math:`-2`对应于点`(2.9,1.8)` 的下一个闭合边。" +"Point :math:`-2` corresponds to the next close edge from point `(2.9, 1.8)`." +msgstr "点 :math:`-2`对应于点`(2.9, 1.8)` 的下一个闭合边。" msgid "" "Point :math:`-2` is visited on the route to from vertex :math:`1` to Point :" @@ -15080,8 +15064,9 @@ msgstr "对冲突路径执行 :ref:`TRSP-family:TRSP 算法`。" 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 "从 :doc:`pgr_withPointsVia` 的结果中移除冲突的路径，并使用 :doc:`pgr_trsp` " -"算法的结果构建解决方案：" +msgstr "" +"从 :doc:`pgr_withPointsVia` 的结果中移除冲突的路径，并使用 :doc:`pgr_trsp` 算" +"法的结果构建解决方案：" msgid "Getting the same result as ``pgr_trspVia_withPoints``:" msgstr "得到与 ``pgr_trspVia_withPoints``相同的结果：" @@ -15091,8 +15076,8 @@ msgid "" "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 "" -"第一步，执行 :doc:`pgr_withPointsVia` 不考虑在同一条边上进行掉头。但是路径 " -":math:`9 \\rightarrow 16`（第4行和第5行）受到限制，结果中使用了它。" +"第一步，执行 :doc:`pgr_withPointsVia` 不考虑在同一条边上进行掉头。但是路径 :" +"math:`9 \\rightarrow 16`（第4行和第5行）受到限制，结果中使用了它。" msgid "" "When executing the :doc:`pgr_trsp_withPoints` algorithm for the conflicting " @@ -15107,9 +15092,9 @@ msgid "" "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 "" -"因此，当设置为 ``false`` 时，结果会忽略 ``U_turn_on_edge`` 标志。 从 " -":doc:`pgr_withPointsVia`结果中，它删除了冲突路径，并使用 :doc:`pgr_trsp` " -"算法的结果构建解决方案。 在这种情况下，使用相同的边缘完成 U 形转弯。" +"因此，当设置为 ``false`` 时，结果会忽略 ``U_turn_on_edge`` 标志。 从 :doc:" +"`pgr_withPointsVia`结果中，它删除了冲突路径，并使用 :doc:`pgr_trsp` 算法的结" +"果构建解决方案。 在这种情况下，使用相同的边缘完成 U 形转弯。" msgid "pgr_trsp_withPoints - Proposed" msgstr "pgr_trsp_withPoints - 拟议" @@ -15117,6 +15102,9 @@ msgstr "pgr_trsp_withPoints - 拟议" msgid "``pgr_trsp_withPoints`` Routing Vertex/Point with restrictions." msgstr "``pgr_trsp_withPoints``有限制的路由顶点/点。" +msgid "New proposed signatures:" +msgstr "新拟议的签名：" + msgid "``pgr_trsp_withPoints`` (`One to One`_)" msgstr "``pgr_trsp_withPoints`` (`一对一`_)" @@ -15237,14 +15225,6 @@ msgid "" "graph of point `(2.9, 1.8)`." msgstr "找到从顶点 :math:`1` 到点 `(2.9, 1.8)` 图上两个最近位置的路线。" -msgid "" -"Point :math:`-1` corresponds to the closest edge from point `(2.9, 1.8)`." -msgstr "点:math:`-1`对应于距离点`(2.9, 1.8)` 最近的边。" - -msgid "" -"Point :math:`-2` corresponds to the next close edge from point `(2.9, 1.8)`." -msgstr "点 :math:`-2`对应于点`(2.9, 1.8)` 的下一个闭合边。" - msgid "Pass in front or visits." msgstr "从前面经过或参观。" @@ -15290,11 +15270,11 @@ msgstr "" msgid "**options:** ``[directed, heap_paths, stop_on_first, strict]``" msgstr "**options:** ``[directed, heap_paths, stop_on_first, strict]``" -msgid "RETURNS SET OF |ksp-result|" -msgstr "RETURNS SET OF |ksp-result|" +msgid "Returns set of |ksp-result|" +msgstr "返回 |ksp-result| 的集合" -msgid "From vertex :math:`3` to vertex :math:`8` on a directed graph" -msgstr "有向图上从顶点 :math:`3`到顶点:math:`8`" +msgid "From vertex :math:`3` to vertex :math:`8` on a directed graph" +msgstr "从有向图上的顶点 :math:`3` 到顶点 :math:`8`" msgid "Special optional parameters" msgstr "特殊可选参数" @@ -15321,11 +15301,11 @@ msgstr "从顶点 :math:`3` 到:math:`8`，并启用 ``strict`` 标志。" msgid "No results because the only path available follows a restriction." msgstr "没有结果，因为唯一可用的路径受到限制。" -msgid "From vertex :math:`3` to vertex :math:`8` on an undirected graph" -msgstr "无向图中从顶点:math:`3`到顶点:math:`8`" +msgid "From vertex :math:`3` to vertex :math:`8` on an undirected graph" +msgstr "从无向图上的顶点 :math:`3` 到顶点 :math:`8`" -msgid "From vertex :math:`3` to vertex :math:`8` with more alternatives" -msgstr "从一个顶点 :math:`3`到另一个顶点 :math:`8`有更多的选择" +msgid "From vertex :math:`3` to vertex :math:`8` with more alternatives" +msgstr "从顶点 :math:`3` 到顶点 :math:`8` 更多选择" msgid "``pgr_version``" msgstr "``pgr_version``" @@ -15424,8 +15404,8 @@ msgstr "" msgid "**options:** ``[directed, driving_side, details])``" msgstr "**options:** ``[directed, driving_side, details])``" -msgid "RETURNS SET OF |old-pid-result|" -msgstr "RETURNS SET OF |old-pid-result|" +msgid "Returns set of |old-pid-result|" +msgstr "返回 |old-pid-result| 的集合" msgid "**options:** [directed, driving_side, details])" msgstr "**options:** [directed, driving_side, details])" @@ -15433,22 +15413,27 @@ msgstr "**options:** [directed, driving_side, details])" msgid "From point :math:`1` to vertex :math:`10` with details" msgstr "从点 :math:`1`到顶点:math:`10`的细节" -msgid "RETURNS SET OF |pid-1-m|" -msgstr "RETURNS SET OF |pid-1-m|" +msgid "Returns set of |pid-1-m|" +msgstr "返回 |pid-1-m| 的集合" msgid "" "From point :math:`1` to point :math:`3` and vertex :math:`7` on an " "undirected graph" msgstr "无向图上的点:math:`1`到点 :math:`3`和顶点 :math:`7`" -msgid "RETURNS SET OF |pid-m-1|" -msgstr "RETURNS SET OF |pid-m-1|" +msgid "Returns set of |pid-m-1|" +msgstr "返回 |pid-m-1| 的集合" msgid "From point :math:`1` and vertex :math:`6` to point :math:`3`" msgstr "从点 :math:`1`和顶点 :math:`6`到点 :math:`3`" -msgid "RETURNS SET OF |pid-m-m|" -msgstr "RETURNS SET OF |pid-m-m|" +msgid "Returns set of |pid-m-m|" +msgstr "返回 |pid-m-m| 的集合" + +msgid "" +"From point :math:`1` and vertex :math:`6` to point :math:`3` and vertex :" +"math:`1`" +msgstr "从点 :math:`1` 和顶点 :math:`6` 到点 :math:`3` 和顶点 :math:`1`" msgid "Two combinations" msgstr "两种组合" @@ -15562,9 +15547,6 @@ msgid "" "`end_vids` is ignored." msgstr "出于优化目的， `start_vids`或 `end_vids` 中的任何重复值都将被忽略。" -msgid "Running time: :math:`O(| start\\_vids | * (V \\log V + E))`" -msgstr "运行时间：:math:`O(| start\\_vids | * (V \\log V + E))`" - msgid "" "pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vid**, **end vid**, " "[**options**])" @@ -15600,11 +15582,11 @@ msgstr "" "pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, `Combinations SQL`_, " "[**options**])" -msgid "**options:** ``[directed, driving_side]``" -msgstr "**options:** ``[directed, driving_side]``" +msgid "**options:** ``[directed, driving_side]``" +msgstr "**options:** ``[directed, driving_side]``" -msgid "RETURNS SET OF |matrix-pid|" -msgstr "RETURNS SET OF |matrix-pid|" +msgid "Returns set of |matrix-pid|" +msgstr "返回|matrix-pid|的集合" msgid "" "There is no **details** flag, unlike the other members of the withPoints " @@ -15636,9 +15618,9 @@ msgstr "" "vids**, [**options**])" msgid "" -"From point :math:`15` and vertex :math:`6` to point :math:`3` and vertex :" +"From point :math:`15` and vertex :math:`6` to point :math:`3` and vertex :" "math:`1`" -msgstr "从点:math:`15`和顶点 :math:`6`到点 :math:`3` 和顶点:math:`1`" +msgstr "从点 :math:`15` 和顶点 :math:`6` 到点 :math:`3` 和顶点 :math:`1`" msgid "" "pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, `Combinations SQL`_, " @@ -15730,8 +15712,9 @@ msgstr "``pgr_withPointsDD`` -返回从起点开始的行驶**距离**。" msgid "" "Signature change: ``driving_side`` parameter changed from named optional to " "unnamed compulsory **driving side**." -msgstr "签名更改：``driving_side``参数从已命名的可选参数改为未命名的必选参数**" -"driving side**。" +msgstr "" +"签名更改：``driving_side``参数从已命名的可选参数改为未命名的必选参数" +"**driving side**。" msgid "``pgr_withPointsDD`` (`Single vertex`)" msgstr "``pgr_withPointsDD``（`单顶点`）" @@ -15748,22 +15731,23 @@ msgstr "当 ``details`` 为``false`` 时：" msgid "" "Only points that are visited are removed, that is, points reached within the " "distance are included" -msgstr "只有那些被访问的兴趣点会被移除，也就是说，位于一定距离范围内被到达的兴趣点会" +msgstr "" +"只有那些被访问的兴趣点会被移除，也就是说，位于一定距离范围内被到达的兴趣点会" "被包含在内" msgid "" "``pgr_withpointsdd(text,text,bigint,double precision,boolean,character," "boolean)``" msgstr "" -"``pgr_withpointsdd(text,text,bigint,double " -"precision,boolean,character,boolean)``" +"``pgr_withpointsdd(text,text,bigint,double precision,boolean,character," +"boolean)``" msgid "" "``pgr_withpointsdd(text,text,anyarray,double precision,boolean,character," "boolean,boolean)``" msgstr "" -"``pgr_withpointsdd(text,text,anyarray,double " -"precision,boolean,character,boolean,boolean)``" +"``pgr_withpointsdd(text,text,anyarray,double precision,boolean,character," +"boolean,boolean)``" msgid "" "Modify the graph to include points and using Dijkstra algorithm, extracts " @@ -15862,14 +15846,14 @@ msgid "" msgstr "求图上点 `(2.9, 1.8)` 距离最近的两个位置的行驶距离。" msgid "" -"Point :math:`-1` corresponds to the closest edge from point :math:" -"`(2.9,1.8)`." -msgstr "点:math:`-1`对应于距离点 :math:`(2.9,1.8)`最近的边。" +"Point :math:`-1` corresponds to the closest edge from point :math:`(2.9, " +"1.8)`." +msgstr "点 :math:`-1` 对应距离点 :math:`(2.9, 1.8)` 最近的边。" msgid "" -"Point :math:`-2` corresponds to the next close edge from point :math:" -"`(2.9,1.8)`." -msgstr "点:math:`-2`对应于点 :math:`(2.9,1.8)`的下一个闭合边。" +"Point :math:`-2` corresponds to the next close edge from point :math:`(2.9, " +"1.8)`." +msgstr "点 :math:`-2` 对应于点 :math:`(2.9, 1.8)` 的下一条近边。" msgid "Driving side does not matter" msgstr "驾驶侧并不重要" @@ -15897,6 +15881,9 @@ msgstr "标准化输出列为 |nksp-result|" msgid "``pgr_withPointsKSP`` (One to One)" msgstr "``pgr_withPointsKSP`` (一对一)" +msgid "New overload functions" +msgstr "新的重载函数" + msgid "``pgr_withPointsKSP`` (One to Many)" msgstr "``pgr_withPointsKSP`` (一对多)" @@ -15909,9 +15896,6 @@ msgstr "``pgr_withPointsKSP`` (多对多)" msgid "``pgr_withPointsKSP`` (Combinations)" msgstr "``pgr_withPointsKSP`` (组合)" -msgid "Deprecated signature:" -msgstr "已弃用的签名：" - msgid "" "``pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,char," "boolean)``" @@ -15960,8 +15944,8 @@ msgstr "" "pgr_withPointsKSP(`Edges SQL`_, `Points SQL`_, `Combinations SQL`_, **K**, " "**driving_side**, [**options**])" -msgid "**options:** ``[directed, heap_paths, details]``" -msgstr "**options:** ``[directed, heap_paths, details]``" +msgid "**options:** ``[directed, heap_paths, details]``" +msgstr "**options:** ``[directed, heap_paths, details]``" msgid "" "Get 2 paths from Point :math:`1` to point :math:`2` on a directed graph with " @@ -16072,8 +16056,8 @@ msgid "" msgstr "" "给定一个图、图上边缘的一组点以及一个顶点列表，此函数相当于找到 :math:" "`vertex_i` 和 :math:`vertex_{i+1}` 之间的最短路径（其中 :math:`vertex` 可以是" -"一个顶点或图上的一个点），对于所有的 :math:`i`，满足 :math:`i < size\\_of(via" -"\\;vertices)`。" +"一个顶点或图上的一个点），对于所有的 :math:`i`，满足 :math:`i < " +"size\\_of(via\\;vertices)`。" msgid "" "pgr_withPointsVia(`Edges SQL`_, `Points SQL`_, **via vertices**, " @@ -16140,8 +16124,8 @@ msgstr "" "prim_minimum_spanning_tree.html>`__" msgid "" -"Wikipedia: `Prim's algorithm `__" +"Wikipedia: `Prim's algorithm `__" msgstr "" "维基百科: `Prim算法 `__" @@ -16213,17 +16197,64 @@ msgstr "" "要查看完整的更改列表，请检查 Github 上的 `Git提交列表 `_。" +#, fuzzy +msgid "pgRouting 3.7.0 Release Notes" +msgstr "pgRouting 3.6.0 发布说" + +#, fuzzy +msgid "" +"To see all issues & pull requests closed by this release see the `Git closed " +"milestone for 3.7.0 `_" +msgstr "" +"要查看此版本关闭的所有问题和拉取请求，请访问 `Git 3.6.0 里程碑的已关闭问题和" +"拉取请求 `_" + +#, fuzzy +msgid "Code enhancement" +msgstr "C/C++ 代码增强" + +#, fuzzy +msgid "" +"`#2599 `__ Driving " +"distance cleanup" +msgstr "" +"`#2505 `__ 使用命名空间。" + +#, fuzzy +msgid "pgRouting 3.6.1 Release Notes" +msgstr "pgRouting 3.6.0 发布说" + +#, fuzzy +msgid "" +"To see all issues & pull requests closed by this release see the `Git closed " +"milestone for 3.6.1 `_" +msgstr "" +"要查看此版本关闭的所有问题和拉取请求，请访问 `Git 3.6.0 里程碑的已关闭问题和" +"拉取请求 `_" + +#, fuzzy +msgid "" +"`#2588 `__ pgrouting 3.6.0 " +"fails to build on OSX" +msgstr "" +"`#2400 `__: pgRouting " +"3.3.3 在 Focal 上无法构建" + msgid "pgRouting 3.6.0 Release Notes" msgstr "pgRouting 3.6.0 发布说" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.6.0 `_" +"milestone for 3.6.0 `_" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请访问 `Git 3.6.0 里程碑的已关闭问题和" -"拉取请求 `_" +"拉取请求 `_" msgid "Official functions changes" msgstr "官方功能变更" @@ -16266,8 +16297,8 @@ msgid "" "`#2547 `__ Standarize " "output and modifying signature pgr_KSP" msgstr "" -"`#2547 `__ " -"标准化输出并修改签名 pgr_KSP" +"`#2547 `__ 标准化输出并修改" +"签名 pgr_KSP" msgid "" "`#2548 `__ Standarize " @@ -16283,15 +16314,15 @@ msgid "" "`#2544 `__ Standarize " "output and modifying signature pgr_withPointsDD" msgstr "" -"`#2544 `__ " -"标准化输出并修改签名 pgr_withPointsDD" +"`#2544 `__ 标准化输出并修改" +"签名 pgr_withPointsDD" msgid "" "`#2546 `__ Standarize " "output and modifying signature pgr_withPointsKSP" msgstr "" -"`#2546 `__ " -"标准化输出并修改签名pgr_withPointsKSP" +"`#2546 `__ 标准化输出并修改" +"签名pgr_withPointsKSP" msgid "C/C++ code enhancements" msgstr "C/C++ 代码增强" @@ -16300,15 +16331,16 @@ msgid "" "`#2504 `__ To C++ pg data " "get, fetch and check." msgstr "" -"`#2504 `__ " -"获取、提取和检查C++ pg数据。" +"`#2504 `__ 获取、提取和检查" +"C++ pg数据。" msgid "Stopping support for compilation with MSVC." msgstr "停止支持使用 MSVC 进行编译。" msgid "" "`#2505 `__ Using namespace." -msgstr "`#2505 `__ 使用命名空间。" +msgstr "" +"`#2505 `__ 使用命名空间。" msgid "" "`#2512 `__ [Dijkstra] " @@ -16327,15 +16359,15 @@ msgid "" "`#2521 `__ Dijkstra code " "simplification." msgstr "" -"`#2521 `__ Dijkstra " -"代码简化。" +"`#2521 `__ Dijkstra 代码简" +"化。" msgid "" "`#2522 `__ bdAstar code " "simplification." msgstr "" -"`#2522 `__ bdAstar " -"代码简化。" +"`#2522 `__ bdAstar 代码简" +"化。" msgid "Documentation" msgstr "文档" @@ -16343,8 +16375,9 @@ msgstr "文档" msgid "" "`#2490 `__ Automatic page " "history links." -msgstr "`#2490 `__ " -"自动页面历史链接。" +msgstr "" +"`#2490 `__ 自动页面历史链" +"接。" msgid "..rubric:: SQL standarization" msgstr "..rubric::SQL 标准化" @@ -16352,8 +16385,9 @@ msgstr "..rubric::SQL 标准化" msgid "" "`#2555 `__ standarize " "deprecated messages" -msgstr "`#2555 `__标准化已弃用的消息" +msgstr "" +"`#2555 `__标准化已弃用的消" +"息" msgid "" "On new internal function: do not use named parameters and default parameters." @@ -16364,12 +16398,12 @@ msgstr "pgRouting 3.5.1 发布说明" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.5.1 `_" +"milestone for 3.5.1 `_" msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 `3.5.1 Git " -"关闭里程碑`_" +"要查看此版本关闭的所有问题和拉取请求，请参阅 `3.5.1 Git 关闭里程碑`_" msgid "Documentation fixes" msgstr "文档修复" @@ -16409,8 +16443,8 @@ msgid "" "`#2561 `__ Not use " "wildcards on SQL" msgstr "" -"`#2561 `__ 在 SQL " -"中不使用通配符" +"`#2561 `__ 在 SQL 中不使" +"用通配符" msgid "pgtap tests" msgstr "pgtap 测试" @@ -16419,8 +16453,8 @@ msgid "" "`#2559 `__ pgtap test " "using sampledata" msgstr "" -"`#2559 `__ pgtap " -"测试使用 示例数据" +"`#2559 `__ pgtap 测试使" +"用 示例数据" msgid "Build fixes" msgstr "构建修复" @@ -16442,12 +16476,12 @@ msgstr "pgRouting 3.5.0 发布说明" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.5.0 `_" +"milestone for 3.5.0 `_" msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 `3.5.0 Git 关闭里程碑 " -"`_" +"要查看此版本关闭的所有问题和拉取请求，请参阅 `3.5.0 Git 关闭里程碑 `_" msgid "Dijkstra" msgstr "Dijkstra" @@ -16467,12 +16501,12 @@ msgstr "pgRouting 3.4.2 发布说明" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.4.2 `_" +"milestone for 3.4.2 `_" msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 `3.4.2Git 关闭里程碑 " -"`_" +"要查看此版本关闭的所有问题和拉取请求，请参阅 `3.4.2Git 关闭里程碑 `_" msgid "" "`#2394 `__: pgr_bdAstar " @@ -16494,12 +16528,12 @@ msgstr "pgRouting 3.4.1 发布说明" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.4.1 `_" +"milestone for 3.4.1 `_" msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 `3.4.1Git 关闭里程碑 " -"`_" +"要查看此版本关闭的所有问题和拉取请求，请参阅 `3.4.1Git 关闭里程碑 `_" msgid "" "`#2401 `__: pgRouting " @@ -16512,27 +16546,27 @@ msgid "" "`#2398 `__: v3.4.0 does " "not upgrade from 3.3.3" msgstr "" -"`#2398 `__: v3.4.0 " -"不能从 3.3.3 升级" +"`#2398 `__: v3.4.0 不能" +"从 3.3.3 升级" msgid "pgRouting 3.4.0 Release Notes" msgstr "pgRouting 3.4.0 发布说明" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.4.0 `_" +"milestone for 3.4.0 `_" msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 `3.4.0 Git 关闭里程碑 " -"`_" +"要查看此版本关闭的所有问题和拉取请求，请参阅 `3.4.0 Git 关闭里程碑 `_" msgid "" "`#1891 `__: pgr_ksp " "doesn't give all correct shortest path" msgstr "" -"`#1891 `__: pgr_ksp " -"没有给出所有正确的最短路径" +"`#1891 `__: pgr_ksp 没有" +"给出所有正确的最短路径" msgid "New proposed functions" msgstr "新的拟议函数" @@ -16612,9 +16646,6 @@ msgstr "排序" msgid "``pgr_cuthillMckeeOrdering``" msgstr "``pgr_cuthillMckeeOrdering``" -msgid "Unclassified" -msgstr "未分类" - msgid "Flow functions" msgstr "流程函数" @@ -16624,7 +16655,7 @@ msgstr "``pgr_maxCardinalityMatch(text)``" msgid "Deprecating ``pgr_maxCardinalityMatch(text,boolean)``" msgstr "弃用``pgr_maxCardinalityMatch(text,boolean)``" -msgid "Deprecated functions" +msgid "Deprecated Functions" msgstr "已废弃的函数" msgid "``pgr_trsp(text,integer,float8,integer,float8,boolean,boolean,text)``" @@ -16641,12 +16672,12 @@ msgstr "pgRouting 3.3.4 发布说明" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.3.4 `_" +"milestone for 3.3.4 `_" msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 `3.3.4Git 关闭里程碑 " -"`_" +"要查看此版本关闭的所有问题和拉取请求，请参阅 `3.3.4Git 关闭里程碑 `_" msgid "" "`#2400 `__: pgRouting " @@ -16660,12 +16691,12 @@ msgstr "pgRouting 3.3.3 发布说明" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.3.3 `_" +"milestone for 3.3.3 `_" msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅` 3.3.3Git 关闭里程碑 " -"`_" +"要查看此版本关闭的所有问题和拉取请求，请参阅` 3.3.3Git 关闭里程碑 `_" msgid "" "Ignoring optional boolean parameter, as the algorithm works only for " @@ -16677,12 +16708,12 @@ msgstr "pgRouting 3.3.2 发布说明" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.3.2 `_" +"milestone for 3.3.2 `_" msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 ` 3.3.2Git 关闭里程碑 " -"`_" +"要查看此版本关闭的所有问题和拉取请求，请参阅 ` 3.3.2Git 关闭里程碑 `_" msgid "Revised documentation" msgstr "修订文档" @@ -16740,36 +16771,37 @@ msgstr "pgRouting 3.3.1 发布说明" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.3.1 `_ on Github." +"milestone for 3.3.1 `_ on Github." msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 ` " -"3.3.1Git关闭里程碑 `_。" +"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 ` 3.3.1Git关闭里程" +"碑 `_。" msgid "" "`#2216 `__: Warnings " "when using clang" msgstr "" -"`#2216 `__：使用 clang " -"时发出警告" +"`#2216 `__：使用 clang 时" +"发出警告" msgid "" "`#2266 `__: Error " "processing restrictions" -msgstr "`#2266 `__：错误处理限制" +msgstr "" +"`#2266 `__：错误处理限制" msgid "pgRouting 3.3.0 Release Notes" msgstr "pgRouting 3.3.0 发布说明" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.3.0 `_ on Github." +"milestone for 3.3.0 `_ on Github." msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 ` 3.3.0 " -"Git关闭里程碑`_。" +"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 ` 3.3.0 Git关闭里程" +"碑`_。" msgid "" "`#2057 `__: trspViaEdges " @@ -16789,22 +16821,22 @@ msgid "" "`#2201 `__: " "pgr_depthFirstSearch to proposed" msgstr "" -"`#2201 `__: " -"拟议的pgr_depthFirstSearch" +"`#2201 `__: 拟议的" +"pgr_depthFirstSearch" msgid "" "`#2202 `__: " "pgr_sequentialVertexColoring to proposed" msgstr "" -"`#2202 `__: " -"拟议的pgr_sequentialVertexColoring" +"`#2202 `__: 拟议的" +"pgr_sequentialVertexColoring" msgid "" "`#2203 `__: " "pgr_dijkstraNear and pgr_dijkstraNearCost to proposed" msgstr "" -"`#2203 `__: " -"拟议的pgr_dijkstraNear 和 pgr_dijkstraNearCost" +"`#2203 `__: 拟议的" +"pgr_dijkstraNear 和 pgr_dijkstraNearCost" msgid "Coloring" msgstr "着色" @@ -16865,15 +16897,12 @@ msgstr "pgRouting 3.2.2 发布说明" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.2.2 `_ on Github." +"milestone for 3.2.2 `_ on Github." msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.2.2 " -"Git关闭里程碑`_。" - -msgid "Issues" -msgstr "问题" +"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.2.2 Git关闭里程碑" +"`_。" msgid "" "`#2093 `__: Compilation " @@ -16886,20 +16915,20 @@ msgid "" "`#2189 `__: Build error " "on RHEL 7" msgstr "" -"`#2189 `__：RHEL 7 " -"上的构建错误" +"`#2189 `__：RHEL 7 上的构" +"建错误" msgid "pgRouting 3.2.1 Release Notes" msgstr "pgRouting 3.2.1 发布说明" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.2.1 `_ on Github." +"milestone for 3.2.1 `_ on Github." msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.2.1Git关闭里程碑 " -"`_。" +"`_。" msgid "" "`#1883 `__: " @@ -16924,12 +16953,12 @@ msgstr "pgRouting 3.2.0 发布说明" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.2.0 `_ on Github." +"milestone for 3.2.0 `_ on Github." msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 ` " -"3.2.0Git关闭里程碑 `_。" +"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 ` 3.2.0Git关闭里程" +"碑 `_。" msgid "Build" msgstr "构建" @@ -16938,8 +16967,8 @@ msgid "" "`#1850 `__: Change Boost " "min version to 1.56" msgstr "" -"`#1850 `__：将 Boost " -"最低版本更改为 1.56" +"`#1850 `__：将 Boost 最低" +"版本更改为 1.56" msgid "Removing support for Boost v1.53, v1.54 & v1.55" msgstr "删除对 Boost v1.53、v1.54 和 v1.55 的支持" @@ -17021,12 +17050,12 @@ msgstr "pgRouting 3.1.4 发布说明" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.1.4 `_ on Github." +"milestone for 3.1.4 `_ on Github." msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.1.4Git关闭里程碑 " -"`_。" +"`_。" msgid "Issues fixes" msgstr "问题修复" @@ -17036,45 +17065,45 @@ msgstr "pgRouting 3.1.3 发布说明" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.1.3 `_ on Github." +"milestone for 3.1.3 `_ on Github." msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.1.3 " -"Git关闭里程碑`_。" +"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.1.3 Git关闭里程碑" +"`_。" msgid "" "`#1825 `__: Boost " "versions are not honored" msgstr "" -"`#1825 `__：Boost " -"版本不受支持" +"`#1825 `__：Boost 版本不" +"受支持" msgid "" "`#1849 `__: Boost 1.75.0 " "geometry \"point_xy.hpp\" build error on macOS environment" msgstr "" -"`#1849 `__：macOS " -"环境中的 Boost 1.75.0 几何“point_xy.hpp”构建错误" +"`#1849 `__：macOS 环境中" +"的 Boost 1.75.0 几何“point_xy.hpp”构建错误" msgid "" "`#1861 `__: vrp " "functions crash server" msgstr "" -"`#1861 `__：vrp功能使服务器崩溃" +"`#1861 `__：vrp功能使服务" +"器崩溃" msgid "pgRouting 3.1.2 Release Notes" msgstr "pgRouting 3.1.2 发布说明" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.1.2 `_ on Github." +"milestone for 3.1.2 `_ on Github." msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.1.2Git关闭里程碑 " -"`_。" +"`_。" msgid "" "`#1304 `__: FreeBSD 12 " @@ -17094,8 +17123,8 @@ msgid "" "`#1725 `__: Server crash " "on pgr_pickDeliver and pgr_vrpOneDepot on openbsd" msgstr "" -"`#1725 `___：openbsd上的pgr_pickDeliver和pgr_vrpOneDepot服务器崩溃" +"`#1725 `___：openbsd上的" +"pgr_pickDeliver和pgr_vrpOneDepot服务器崩溃" msgid "" "`#1760 `__: TSP server " @@ -17116,26 +17145,26 @@ msgstr "pgRouting 3.1.1 发布说明" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.1.1 `_ on Github." +"milestone for 3.1.1 `_ on Github." msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.1.1 " -"Git关闭里程碑`_。" +"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.1.1 Git关闭里程碑" +"`_。" msgid "" "`#1733 `__: pgr_bdAstar " "fails when source or target vertex does not exist in the graph" msgstr "" -"`#1733 `__：当图中不存在源顶点或目标顶点时，pgr_bdAstar 失败" +"`#1733 `__：当图中不存在" +"源顶点或目标顶点时，pgr_bdAstar 失败" msgid "" "`#1647 `__: Linear " "Contraction contracts self loops" msgstr "" -"`#1647 `__：线性收缩收缩自循环" +"`#1647 `__：线性收缩收缩" +"自循环" msgid "" "`#1640 `__: " @@ -17148,8 +17177,8 @@ msgid "" "`#1616 `__: Path " "evaluation on C++ not updated before the results go back to C" msgstr "" -"`#1616 `___：C++ " -"上的路径评估在结果返回 C 之前没有更新" +"`#1616 `___：C++ 上的路径" +"评估在结果返回 C 之前没有更新" msgid "" "`#1300 `__: " @@ -17163,12 +17192,12 @@ msgstr "pgRouting 3.1.0 发布说明" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.1.0 `_ on Github." +"milestone for 3.1.0 `_ on Github." msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.1.0 " -"Git关闭里程碑`_。" +"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.1.0 Git关闭里程碑" +"`_。" msgid "pgr_dijkstra(combinations)" msgstr "pgr_dijkstra(组合)" @@ -17187,26 +17216,26 @@ msgstr "pgRouting 3.0.6 发布说明" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.0.6 `_ on Github." +"milestone for 3.0.6 `_ on Github." msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 ` " -"3.0.6Git关闭里程碑 `_。" +"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 ` 3.0.6Git关闭里程" +"碑 `_。" msgid "pgRouting 3.0.5 Release Notes" msgstr "pgRouting 3.0.5 发布说明" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.0.5 `_ on Github." +"milestone for 3.0.5 `_ on Github." msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.0.5Git关闭里程碑 " -"`_。" +"`_。" -msgid "Backport issues fixes" +msgid "Backport issue fixes" msgstr "回溯问题修复" msgid "pgRouting 3.0.4 Release Notes" @@ -17214,12 +17243,12 @@ msgstr "pgRouting 3.0.4 发布说明" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.0.4 `_ on Github." +"milestone for 3.0.4 `_ on Github." msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 ` " -"3.0.4Git关闭里程碑 `_。" +"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 ` 3.0.4Git关闭里程" +"碑 `_。" msgid "pgRouting 3.0.3 Release Notes" msgstr "pgRouting 3.0.3 发布说明" @@ -17229,12 +17258,12 @@ msgstr "pgRouting 3.0.2 发布说明" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.0.2 `_ on Github." +"milestone for 3.0.2 `_ on Github." msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.0.2Git关闭里程碑 " -"`_。" +"`_。" msgid "" "`#1378 `__: Visual " @@ -17248,31 +17277,31 @@ msgstr "pgRouting 3.0.1 发布说明" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.0.1 `_ on Github." +"milestone for 3.0.1 `_ on Github." msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.0.1Git关闭里程碑 " -"`_。" +"`_。" msgid "" -"`#232 `__: Honor client " +"`#232 `__: Honor client " "cancel requests in C /C++ code" msgstr "" -"`#232 `__：在C/" -"C++代码中响应客户端取消请求" +"`#232 `__：在 C /C++ 代码" +"中尊重客户端取消请求" msgid "pgRouting 3.0.0 Release Notes" msgstr "pgRouting 3.0.0 发布说明" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.0.0 `_ on Github." +"milestone for 3.0.0 `_ on Github." msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.0.0Git关闭里程碑 " -"`_。" +"`_。" msgid "Fixed Issues" msgstr "问题修复" @@ -17294,25 +17323,28 @@ msgstr "" msgid "" "`#1002 `__: Fixed " "contraction issues:" -msgstr "`#1002 `__：修复收缩问题：" +msgstr "" +"`#1002 `__：修复收缩问" +"题：" msgid "" "`#1004 `__: Contracts " "when forbidden vertices do not belong to graph" msgstr "" -"`#1004 `___：当禁止的顶点不属于图时的收缩" +"`#1004 `___：当禁止的顶点" +"不属于图时的收缩" msgid "" "`#1005 `__: Intermideate " "results eliminated" -msgstr "`#1005 `__：消除中间结果" +msgstr "" +"`#1005 `__：消除中间结果" msgid "" "`#1006 `__: No loss of " "information" -msgstr "`#1006 `__：无信息丢失" +msgstr "" +"`#1006 `__：无信息丢失" msgid "New functions" msgstr "新函数" @@ -17539,9 +17571,6 @@ msgstr "删除了不必要的列 seq" msgid "Bug Fixes" msgstr "Bug修复" -msgid "New Experimental functions" -msgstr "新的实验函数" - msgid "pgr_maxFlowMinCost" msgstr "pgr_maxFlowMinCost" @@ -17602,8 +17631,8 @@ msgstr "pgr_edwardMoore" msgid "Moved to legacy" msgstr "已移至旧版" -msgid "pgr_labelGraph - Use the components family of functions instead." -msgstr "pgr_labelGraph - 使用分量系列函数。" +msgid "pgr_labelGraph - Use the components family of functions instead." +msgstr "pgr_labelGraph - 使用组件系列函数。" msgid "Max flow - functions were renamed on v2.5.0" msgstr "Max flow - 2.5.0 版对函数进行了重命名" @@ -17640,19 +17669,19 @@ msgstr "pgRouting 2.6.3 发布说明" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.6.3 `_ on Github." +"2.6.3 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 `2.6.3Git关闭里程碑 " -"`_。" +"要查看此版本关闭的问题，请参阅 Github 上的 `2.6.3Git关闭里程碑 `_。" msgid "" "`#1219 `__ Implicit cast " "for via_path integer to text" msgstr "" -"`#1219 `__ via_path " -"整数到文本的隐式转换" +"`#1219 `__ via_path 整数到" +"文本的隐式转换" msgid "" "`#1193 `__ Fixed " @@ -17673,19 +17702,19 @@ msgstr "pgRouting 2.6.2 发布说明" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.6.2 `_ on Github." +"2.6.2 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 `2.6.2Git关闭里程碑 " -"`_。" +"要查看此版本关闭的问题，请参阅 Github 上的 `2.6.2Git关闭里程碑 `_。" msgid "" "`#1152 `__ Fixes driving " "distance when vertex is not part of the graph" msgstr "" -"`#1152 `__修复了顶点不属于图时的行驶距离问题" +"`#1152 `__修复了顶点不属" +"于图时的行驶距离问题" msgid "" "`#1098 `__ Fixes windows " @@ -17706,12 +17735,12 @@ msgstr "pgRouting 2.6.1 发布说明" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.6.1 `_ on Github." +"2.6.1 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 `2.6.1Git关闭里程碑 " -"`_。" +"要查看此版本关闭的问题，请参阅 Github 上的 `2.6.1Git关闭里程碑 `_。" msgid "Fixes server crash on several functions." msgstr "修复了多个函数导致服务器崩溃的问题。" @@ -17802,12 +17831,12 @@ msgstr "pgRouting 2.6.0 发布说明" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.6.0 `_ on Github." +"2.6.0 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 ` 2.6.0Git关闭里程碑 " -"`_。" +"要查看此版本关闭的问题，请参阅 Github 上的 ` 2.6.0Git关闭里程碑 `_。" msgid "pgr_lineGraphFull" msgstr "pgr_lineGraphFull" @@ -17816,8 +17845,8 @@ msgid "" "Fix pgr_trsp(text,integer,double precision,integer,double precision,boolean," "boolean[,text])" msgstr "" -"修复pgr_trsp(text,integer,double precision,integer,double " -"precision,boolean,boolean[,text])" +"修复pgr_trsp(text,integer,double precision,integer,double precision,boolean," +"boolean[,text])" msgid "without restrictions" msgstr "无限制" @@ -17856,12 +17885,12 @@ msgstr "pgRouting 2.5.5 发布说明" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.5.5 `_ on Github." +"2.5.5 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 `2.5.5Git关闭里程碑 " -"`_。" +"要查看此版本关闭的问题，请参阅 Github 上的 `2.5.5Git关闭里程碑 `_。" msgid "Fixes driving distance when vertex is not part of the graph" msgstr "修复顶点不在图中时的行驶距离问题" @@ -17877,24 +17906,24 @@ msgstr "pgRouting 2.5.4 发布说明" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.5.4 `_ on Github." +"2.5.4 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 `2.5.4 " -"Git关闭里程碑`_。" +"要查看此版本关闭的问题，请参阅 Github 上的 `2.5.4 Git关闭里程碑`_。" msgid "pgRouting 2.5.3 Release Notes" msgstr "pgRouting 2.5.3 发布说明" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.5.3 `_ on Github." +"2.5.3 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 ` 2.5.3Git关闭里程碑 " -"`_。" +"要查看此版本关闭的问题，请参阅 Github 上的 ` 2.5.3Git关闭里程碑 `_。" msgid "" "Fix for postgresql 11: Removed a compilation error when compiling with " @@ -17906,12 +17935,12 @@ msgstr "pgRouting 2.5.2 发布说明" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.5.2 `_ on Github." +"2.5.2 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 `2.5.2Git关闭里程碑 " -"`_。" +"要查看此版本关闭的问题，请参阅 Github 上的 `2.5.2Git关闭里程碑 `_。" msgid "Fix for postgresql 10.1: Removed a compiler condition" msgstr "postgresql 10.1 的修复：删除了一个编译器条件" @@ -17921,12 +17950,12 @@ msgstr "pgRouting 2.5.1 发布说明" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.5.1 `_ on Github." +"2.5.1 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 `2.5.1Git关闭里程碑 " -"`_。" +"要查看此版本关闭的问题，请参阅 Github 上的 `2.5.1Git关闭里程碑 `_。" msgid "Fixed prerequisite minimum version of: cmake" msgstr "修正了 cmake 的最低版本要求" @@ -17936,12 +17965,12 @@ msgstr "pgRouting 2.5.0 发布说明" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.5.0 `_ on Github." +"2.5.0 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 `2.5.0Git关闭里程碑`_ 。" +"要查看此版本关闭的问题，请参阅 Github 上的 `2.5.0Git关闭里程碑`_ 。" msgid "enhancement:" msgstr "增强：" @@ -17964,8 +17993,8 @@ msgstr "更改参数名称" msgid "The many version results are the union of the one to one version" msgstr "多版本结果是一对一版本的并集" -msgid "New Signatures:" -msgstr "新签名：" +msgid "New Signatures" +msgstr "新签名" msgid "pgr_bdAstar(one to one)" msgstr "pgr_bdAstar（一对一）" @@ -17982,14 +18011,11 @@ msgstr "pgr_bdDijkstraCostMatrix" msgid "pgr_lineGraph" msgstr "pgr_lineGraph" -msgid "Deprecated Signatures" -msgstr "废弃的签名" - msgid "pgr_bdastar - use pgr_bdAstar instead" msgstr "pgr_bdastar - 使用 pgr_bdAstar 代替" -msgid "Renamed Functions" -msgstr "已重命名的函数" +msgid "Renamed functions" +msgstr "重新命名的功能" msgid "pgr_maxFlowPushRelabel - use pgr_pushRelabel instead" msgstr "pgr_maxFlowPushRelabel - 使用 pgr_pushRelabel 代替" @@ -18003,8 +18029,8 @@ msgstr "pgr_maxFlowBoykovKolmogorov - 使用 pgr_boykovKolmogorov代替" msgid "pgr_maximumCardinalityMatching - use pgr_maxCardinalityMatch instead" msgstr "pgr_maximumCardinalityMatching - 使用 pgr_maximumCardinalityMatch 代替" -msgid "Deprecated function" -msgstr "已废弃的函数" +msgid "Deprecated Function" +msgstr "已废弃的功能" msgid "pgr_pointToEdgeNode" msgstr "pgr_pointtoEdgeNode" @@ -18014,12 +18040,12 @@ msgstr "pgRouting 2.4.2 发布说明" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.4.2 `_ on Github." +"2.4.2 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 `2.4.2Git关闭里程碑 " -"`_。" +"要查看此版本关闭的问题，请参阅 Github 上的 `2.4.2Git关闭里程碑 `_。" msgid "Improvement" msgstr "改进" @@ -18039,12 +18065,12 @@ msgstr "pgRouting 2.4.1 发布说明" msgid "" "To see the issues closed by this release see the `Git closed milestone for " -"2.4.1 `_ on Github." +"2.4.1 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 `2.4.1Git关闭里程碑 " -"`_。" +"要查看此版本关闭的问题，请参阅 Github 上的 `2.4.1Git关闭里程碑 `_。" msgid "Fixed compiling error on macOS" msgstr "修正了 macOS 上的编译错误" @@ -18057,15 +18083,12 @@ msgstr "pgRouting 2.4.0 发布说明" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.4.0 `_ on Github." +"2.4.0 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 ` 2.4.0Git关闭里程碑 " -"`_ 。" - -msgid "New Signatures" -msgstr "新签名" +"要查看此版本关闭的问题，请参阅 Github 上的 ` 2.4.0Git关闭里程碑 `_ 。" msgid "pgr_bdDijkstra" msgstr "pgr_bdDijkstra" @@ -18100,9 +18123,6 @@ msgstr "pgr_astarCostMatrix" msgid "pgr_bddijkstra - use pgr_bdDijkstra instead" msgstr "pgr_bddijkstra - 使用 pgr_bdDijkstra代替" -msgid "Deprecated Functions" -msgstr "已废弃的函数" - msgid "pgr_pointsToVids" msgstr "pgr_pointsToVids" @@ -18120,12 +18140,12 @@ msgstr "pgRouting 2.3.2 发布说明" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.3.2 `_ on Github." +"2.3.2 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 ` 2.3.2 " -"Git关闭里程碑`_ 。" +"要查看此版本关闭的问题，请参阅 Github 上的 ` 2.3.2 Git关闭里程碑`_ 。" msgid "Fixed pgr_gsoc_vrppdtw crash when all orders fit on one truck." msgstr "修正了当所有订单都装在一辆卡车上时 pgr_gsoc_vrppdtw 崩溃的问题。" @@ -18144,12 +18164,12 @@ msgstr "pgRouting 2.3.1 发布说明" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.3.1 `_ on Github." +"2.3.1 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 ` 2.3.1Git关闭里程碑 " -"`_ 。" +"要查看此版本关闭的问题，请参阅 Github 上的 ` 2.3.1Git关闭里程碑 `_ 。" msgid "Leaks on proposed max_flow functions" msgstr "拟议 max_flow 函数的泄漏问题" @@ -18165,12 +18185,12 @@ msgstr "pgRouting 2.3.0 发布说明" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.3.0 `_ on Github." +"2.3.0 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 `2.3.0Git关闭里程碑 " -"`_ 。" +"要查看此版本关闭的问题，请参阅 Github 上的 `2.3.0Git关闭里程碑 `_ 。" msgid "pgr_TSP" msgstr "pgr_TSP" @@ -18252,12 +18272,12 @@ msgstr "pgRouting 2.2.4 发布说明" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.2.4 `_ on Github." +"2.2.4 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 `2.2.4Git关闭里程碑 " -"`_ 。" +"要查看此版本关闭的问题，请参阅 Github 上的 `2.2.4Git关闭里程碑 `_ 。" msgid "Bogus uses of extern \"C\"" msgstr "无效的extern \"C\"" @@ -18273,12 +18293,12 @@ msgstr "pgRouting 2.2.3 发布说明" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.2.3 `_ on Github." +"2.2.3 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 ` 2.2.3Git关闭里程碑 " -"`_ 。" +"要查看此版本关闭的问题，请参阅 Github 上的 ` 2.2.3Git关闭里程碑 `_ 。" msgid "Fixed compatibility issues with PostgreSQL 9.6." msgstr "修复了 PostgreSQL 9.6 的兼容性问题。" @@ -18288,12 +18308,12 @@ msgstr "pgRouting 2.2.2 发布说明" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.2.2 `_ on Github." +"2.2.2 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 `2.2.2 " -"Git关闭里程碑`_ 。" +"要查看此版本关闭的问题，请参阅 Github 上的 `2.2.2 Git关闭里程碑`_ 。" msgid "Fixed regression error on pgr_drivingDistance" msgstr "修正了 pgr_drivingDistance 的回归错误" @@ -18303,12 +18323,11 @@ msgstr "pgRouting 2.2.1 发布说明" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.2.1 `_ on Github." +"2.2.1 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 ` 2.2.1Git关闭里程碑 " -"`_ 。" +"要查看此版本关闭的问题，请参阅 Github 上的 ` 2.2.1Git关闭里程碑 `_ 。" msgid "Server crash fix on pgr_alphaShape" msgstr "修复 pgr_alphaShape 使服务器崩溃问题" @@ -18321,12 +18340,12 @@ msgstr "pgRouting 2.2.0 发布说明" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.2.0 `_ on Github." +"2.2.0 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 `2.2.0Git关闭里程碑 " -"`_ 。" +"要查看此版本关闭的问题，请参阅 Github 上的 `2.2.0Git关闭里程碑 `_ 。" msgid "Improvements" msgstr "改进" @@ -18337,7 +18356,7 @@ msgstr "添加 row_where 和 outall 可选参数" msgid "Signature fix" msgstr "签名修复" -msgid "pgr_dijkstra -- to match what is documented" +msgid "pgr_dijkstra -- to match what is documented" msgstr "pgr_dijkstra -- 与文档中的内容相匹配" msgid "pgr_Johnson" @@ -18355,8 +18374,8 @@ msgstr "pgr_dijkstraCost（多对一）" msgid "pgr_dijkstraCost(many to many)" msgstr "pgr_dijkstraCost（多对多）" -msgid "Proposed functionality" -msgstr "拟议函数" +msgid "Proposed Functionality" +msgstr "建议的功能" msgid "pgr_withPoints(one to one)" msgstr "pgr_withPoints(一对一)" @@ -18394,13 +18413,10 @@ msgstr "pgr_withPointsKSP" msgid "pgr_dijkstraVia" msgstr "pgr_dijkstraVia" -msgid "Deprecated functions:" -msgstr "已废弃的函数：" - -msgid "pgr_apspWarshall use pgr_floydWarshall instead" +msgid "pgr_apspWarshall use pgr_floydWarshall instead" msgstr "pgr_apspWarshall 改用 pgr_floydWarshall" -msgid "pgr_apspJohnson use pgr_Johnson instead" +msgid "pgr_apspJohnson use pgr_Johnson instead" msgstr "pgr_apspJohnson 改用 pgr_Johnson" msgid "pgr_kDijkstraCost use pgr_dijkstraCost instead" @@ -18409,7 +18425,7 @@ msgstr "pgr_kDijkstraCost 改用 pgr_dijkstraCost" msgid "pgr_kDijkstraPath use pgr_dijkstra instead" msgstr "pgr_kDijkstraPath 改用 pgr_dijkstra" -msgid "Renamed and deprecated function" +msgid "Renamed and Deprecated Function" msgstr "已更名和废弃的函数" msgid "pgr_makeDistanceMatrix renamed to _pgr_makeDistanceMatrix" @@ -18420,12 +18436,12 @@ msgstr "pgRouting 2.1.0 发布说明" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.1.0 `_ on Github." +"2.1.0 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 `2.1.0Git关闭里程碑 " -"`_ 。" +"要查看此版本关闭的问题，请参阅 Github 上的 `2.1.0Git关闭里程碑 `_ 。" msgid "pgr_dijkstra(one to many)" msgstr "pgr_dijkstra（一对多）" @@ -18451,7 +18467,8 @@ msgstr "pgr_drivingDistance （单顶点）" msgid "" "pgr_alphaShape function now can generate better (multi)polygon with holes " "and alpha parameter." -msgstr "pgr_alphaShape 函数现在可以生成带有孔和 alpha 参数的更好的（多）多边形。" +msgstr "" +"pgr_alphaShape 函数现在可以生成带有孔和 alpha 参数的更好的（多）多边形。" msgid "" "Proposed functions from Steve Woodbridge, (Classified as Convenience by the " @@ -18461,7 +18478,8 @@ msgstr "Steve Woodbridge 提出的函数（作者分类为便利性函数。）" msgid "" "pgr_pointToEdgeNode - convert a point geometry to a vertex_id based on " "closest edge." -msgstr "pgr_pointToEdgeNode - 根据最近的边将点几何体转换为基于 vertex_id 的函数。" +msgstr "" +"pgr_pointToEdgeNode - 根据最近的边将点几何体转换为基于 vertex_id 的函数。" msgid "" "pgr_flipEdges - flip the edges in an array of geometries so the connect end " @@ -18556,7 +18574,8 @@ msgstr "允许在 cost/reverse_cost 列中使用任何数值" msgid "" "Instead of generating many libraries: - All functions are encapsulated in " "one library - The library has the prefix 2-1-0" -msgstr "无需生成多个程序库： - 所有功能都封装在一个程序库中 - 程序库的前缀为 2-1-0" +msgstr "" +"无需生成多个程序库： - 所有功能都封装在一个程序库中 - 程序库的前缀为 2-1-0" msgid "pgRouting 2.0.1 Release Notes" msgstr "pgRouting 2.0.1 发布说明" @@ -18572,20 +18591,20 @@ msgstr "pgRouting 2.0.0 发布说明" msgid "" "To see the issues closed by this release see the `Git closed issues for " -"2.0.0 `_ on Github." +"2.0.0 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 ` 2.0.0Git关闭里程碑 " -"`_ 。" +"要查看此版本关闭的问题，请参阅 Github 上的 ` 2.0.0Git关闭里程碑 `_ 。" msgid "" "With the release of pgRouting 2.0.0 the library has abandoned backwards " "compatibility to `pgRouting 1.x Release Notes`_ releases. The main Goals for " "this release are:" msgstr "" -"随着 pgRouting 2.0.0 版本的发布，该库已放弃与 `pgRouting 1.x 发行说明`_ " -"版本的向后兼容性。该版本的主要目标是：" +"随着 pgRouting 2.0.0 版本的发布，该库已放弃与 `pgRouting 1.x 发行说明`_ 版本" +"的向后兼容性。该版本的主要目标是：" msgid "Major restructuring of pgRouting." msgstr "对 pgRouting 进行重大重组。" @@ -18643,7 +18662,8 @@ msgstr "K 条备选路径最短路径（pgr_ksp）" msgid "" "New TSP solver that simplifies the code and the build process (pgr_tsp), " "dropped \"Gaul Library\" dependency" -msgstr "新的 TSP 求解器简化了代码和构建过程（pgr_tsp），放弃了对 \"Gaul 库 \"的依赖" +msgstr "" +"新的 TSP 求解器简化了代码和构建过程（pgr_tsp），放弃了对 \"Gaul 库 \"的依赖" msgid "Turn Restricted shortest path (pgr_trsp) that replaces Shooting Star" msgstr "取代了 Shooting Star的转向受限最短路径（pgr_trsp）" @@ -18659,7 +18679,8 @@ msgstr "构建了在签入主要代码更改之前运行的测试基础架构" msgid "" "Tested and fixed most all of the outstanding bugs reported against 1.x that " "existing in the 2.0-dev code base." -msgstr "测试并修复了 2.0-dev 代码库中存在的几乎所有已报告的 1.x 版本中的未解决问题。" +msgstr "" +"测试并修复了 2.0-dev 代码库中存在的几乎所有已报告的 1.x 版本中的未解决问题。" msgid "Improved build process for Windows" msgstr "改进了 Windows 的构建过程" @@ -18703,14 +18724,14 @@ msgstr "pgRouting 1.x 发布说明" msgid "" "To see the issues closed by this release see the `Git closed issues for 1.x " -"`_ on Github. The following release notes have been copied " +"`_ on Github. The following release notes have been copied " "from the previous ``RELEASE_NOTES`` file and are kept as a reference." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 `1.x Git 已关闭问题 " -"`_。以下的发行说明已从之前的 ``RELEASE_NOTES`` " -"文件中复制，并作为参考保留。" +"要查看此版本关闭的问题，请参阅 Github 上的 `1.x Git 已关闭问题 `_。以下的发行说明已从之前的 ``RELEASE_NOTES`` 文件中复制，" +"并作为参考保留。" msgid "Changes for release 1.05" msgstr "1.05 版的更改" @@ -18789,8 +18810,9 @@ msgid "" "The documentation provides very simple example queries based on a small " "sample network that resembles a city. To be able to execute the mayority of " "the examples queries, follow the instructions bellow." -msgstr "该文档提供了基于类似于城市的小型示例网络的非常简单的示例查询。 " -"为了能够执行大部分示例查询，请按照以下说明进行操作。" +msgstr "" +"该文档提供了基于类似于城市的小型示例网络的非常简单的示例查询。 为了能够执行大" +"部分示例查询，请按照以下说明进行操作。" msgid "Main graph" msgstr "主图" @@ -18804,7 +18826,8 @@ msgstr "要在数据库中插入以下城市：" msgid "" "Information known at this point is the geometry of the edges, cost values, " "cpacity values, category values and some locations that are not in the graph." -msgstr "此时已知的信息是边的几何形状、成本值、容量值、类别值和一些不在图中的位置。" +msgstr "" +"此时已知的信息是边的几何形状、成本值、容量值、类别值和一些不在图中的位置。" msgid "" "The process to have working topology starts by inserting the edges. After " @@ -18854,7 +18877,8 @@ msgstr ":math:`x` 几何图形起始顶点的坐标。" msgid "" "For convinience it is saved on the table but can be calculated as " "``ST_X(ST_StartPoint(geom))``." -msgstr "为了方便起见，它被保存在表格中，但也可以计算为 ``ST_X(ST_StartPoint(geom)) " +msgstr "" +"为了方便起见，它被保存在表格中，但也可以计算为 ``ST_X(ST_StartPoint(geom)) " "``。" msgid ":math:`y` coordinate of the ending vertex of the geometry." @@ -18863,13 +18887,14 @@ msgstr ":math:`y`几何图形结束顶点的坐标。" msgid "" "For convinience it is saved on the table but can be calculated as " "``ST_Y(ST_EndPoint(geom))``." -msgstr "为方便起见，它保存在表格中，但也可以计算为``ST_Y(ST_EndPoint(geom))``。" +msgstr "" +"为方便起见，它保存在表格中，但也可以计算为``ST_Y(ST_EndPoint(geom))``。" msgid "The geometry of the segments." msgstr "分段的几何形状。" -msgid "Starting on PostgreSQL 12::" -msgstr "从 PostgreSQL 12 开始::" +msgid "Starting on PostgreSQL 12::" +msgstr "从 PostgreSQL 12 开始：：" msgid "" "Optionally indexes on different columns can be created. The recomendation is " @@ -18909,8 +18934,9 @@ msgid "" "The vertex information is calculated based on the identifier of the edge and " "the geometry and saved on a table. Saving all the information provided by :" "doc:`pgr_extractVertices`:" -msgstr "根据边的标识符和几何形状计算顶点信息并保存在表中。 保存 " -":doc:`pgr_extractVertices` 提供的所有信息 ：" +msgstr "" +"根据边的标识符和几何形状计算顶点信息并保存在表中。 保存 :doc:" +"`pgr_extractVertices` 提供的所有信息 ：" msgid "" "In this case the because the ``CREATE`` statement was not used, the " @@ -18937,7 +18963,8 @@ msgstr "拓扑结构" msgid "" "This queries based on the vertices data create a topology by filling the " "``source`` and ``target`` columns in the edges table." -msgstr "此查询基于顶点数据，通过填充边表中的``source``列和``target``列来创建拓扑。" +msgstr "" +"此查询基于顶点数据，通过填充边表中的``source``列和``target``列来创建拓扑。" msgid "Topology data" msgstr "拓扑数据" @@ -18951,7 +18978,8 @@ msgstr "支持表" msgid "" "Many functions can be used with a combinations of ``(source, target)`` pairs " "when wanting a route from ``source`` to ``target``." -msgstr "当需要从 ``source`` 到 ``target`` 的路由时，许多函数都可以与 ``(source, " +msgstr "" +"当需要从 ``source`` 到 ``target`` 的路由时，许多函数都可以与 ``(source, " "target)`` 对组合使用。" msgid "" @@ -19239,23 +19267,20 @@ msgstr "route" msgid "is a sequence of **paths**" msgstr "是一系列**paths**" -msgid "**Used on:**" -msgstr "**用于:**" +msgid "**Used in:**" +msgstr "**用于：**" msgid "" "Besides the compulsory parameters each function has, there are optional " "parameters that exist due to the kind of function." msgstr "除了每个函数具有的强制参数之外，由于函数的种类而存在可选参数。" -msgid "Used on all Via functions" -msgstr "用于所有 Via 函数" +msgid "Used in all Via functions" +msgstr "用于所有 Via 功能" msgid "Depending on the function one or more inner queries are needed." msgstr "根据函数需要一个或多个内部查询。" -msgid "Used on" -msgstr "用于" - msgid "withPoints - Category" msgstr "withPoints - 类别" @@ -19608,663 +19633,775 @@ msgstr "pgr_withPointsDD 是**带有点**的 pgr_drivenDistance" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "pgr_withPointsvia 是**带有点**的 pgr_dijkstraVia" -msgid "" -"A discussion about the work of Hamilton & Kirkman can be found in the book " -"**Graph Theory (Biggs et al. 1976)**." -msgstr "" -"关于汉密尔顿和柯克曼工作的讨论可参见《**图论》（比格斯等人，1976 年）一书**。" +#~ msgid "" +#~ "Aniket Agarwal, Aryan Gupta, Ashish Kumar, Cayetano Benavent, Daniel " +#~ "Kastl, Nitish Chauhan, Rajat Shinde, Regina Obe, Shobhit Chaurasia, " +#~ "Swapnil Joshi, Virginia Vergara, Yige Huang" +#~ msgstr "" +#~ "Aniket Agarwal, Aryan Gupta, Ashish Kumar, Cayetano Benavent, Daniel " +#~ "Kastl, Nitish Chauhan, Rajat Shinde, Regina Obe, Shobhit Chaurasia, " +#~ "Swapnil Joshi, Virginia Vergara, Yige Huang" + +#~ msgid "`Georepublic `__" +#~ msgstr "`Georepublic `__" + +#~ msgid "" +#~ "The Migration guide from 2.6 can be found at https://github.com/pgRouting/" +#~ "pgrouting/wiki/Migration-Guide." +#~ msgstr "" +#~ "2.6 版的迁移指南可以在 https://github.com/pgRouting/pgrouting/wiki/" +#~ "Migration-Guide 找到。" + +#~ msgid "Result Columns" +#~ msgstr "结果列" + +#~ msgid "" +#~ "Returns SET OF ``(seq, depth, start_vid, node, edge, cost, agg_cost)``" +#~ msgstr "返回一组``(seq, depth, start_vid, node, edge, cost, agg_cost)``" + +#~ msgid "" +#~ "A discussion about the work of Hamilton & Kirkman can be found in the " +#~ "book **Graph Theory (Biggs et al. 1976)**." +#~ msgstr "" +#~ "关于Hamilton和Kirkman的工作的讨论可以在**《图论》（Biggs等人，1976年）**一" +#~ "书中找到。" + +#~ msgid "And :math:`n-2` choices for the third city, etc." +#~ msgstr "以及第三个城市有:math:`n-2`个选择等。" + +#~ msgid "" +#~ "Multiplying these together we get :math:`(n-1)! = (n-1) (n-2) . . 1`." +#~ msgstr "将它们相乘我们得到:math:`(n-1)! = (n-1) (n-2) . . 1`。" + +#~ msgid "" +#~ "To handle problems like: 10 (equal dimension) boxes of apples and 5 kg " +#~ "of feathers that are to be transported (not packed in boxes)." +#~ msgstr "处理这样的问题：10箱（等尺寸）苹果和5公斤羽毛需要运输（不装箱）。" + +#~ msgid "aStar optional Parameters" +#~ msgstr "aStar可选参数" + +#~ msgid "" +#~ "Working with cost/reverse_cost as length in degrees, x/y in lat/lon: " +#~ "Factor = 1 (no need to change units)" +#~ msgstr "" +#~ "使用 cost/reverse_cost 作为长度（以度为单位），x/y 以纬度/经度为单位：因" +#~ "子 = 1（无需更改单位）" + +#~ msgid "" +#~ "Working with cost/reverse_cost as length in meters, x/y in lat/lon: " +#~ "Factor = would depend on the location of the points:" +#~ msgstr "" +#~ "使用 cost/reverse_cost 作为以米为单位的长度，以纬度/经度为单位的 x/y： " +#~ "Factor = 将取决于点的位置：" + +#~ msgid "1 longitude degree is 78846.81 m" +#~ msgstr "1经度为78846.81 m" + +#~ msgid "The `agg_cost` of `(u, v)` is the same as for `(v, u)`." +#~ msgstr "`(u, v)` 的 `agg_cost` 与 `(v, u)`相同。" + +#~ msgid "When `start_vid` = `end_vid`, the `agg_cost` = 0." +#~ msgstr "当`start_vid` = `end_vid`时，`agg_cost`= 0。" + +#~ msgid "" +#~ ":doc:`pgr_bdDijkstraCostMatrix` - Bidirectional Dijkstra algorithm to " +#~ "create a matrix of costs of the shortest paths." +#~ msgstr "" +#~ ":doc:`pgr_bdDijkstraCostMatrix` - 双向 Dijkstra 算法创建最短路径成本矩阵。" + +#~ msgid "Returns SET OF ``(vertex_id, color_id)``" +#~ msgstr "返回``(vertex_id, color_id)``的集合" + +#~ msgid "Returns SET OF ``(edge_id, color_id)``" +#~ msgstr "返回``(edge_id, color_id)``的集合" + +#~ msgid "" +#~ "The edges :math:`v \\rightarrow w` and :math:`w \\rightarrow z` are " +#~ "removed from the graph." +#~ msgstr "边:math:`v \\rightarrow w`和:math:`w \\rightarrow z`已从图中移除。" + +#~ msgid "" +#~ "The edges :math:`u \\rightarrow v` and :math:`v \\rightarrow z` are " +#~ "removed from the graph." +#~ msgstr "边:math:`u \\rightarrow v`和 :math:`v \\rightarrow z`已从图中移除。" + +#~ msgid "" +#~ "The **aggregate cost** of :math:`(u, v)` is the same as for :math:`(v, " +#~ "u)`." +#~ msgstr ":math:`(u, v)`的**总成本**与 :math:`(v, u)`的相同。" + +#~ msgid "" +#~ "where :math:`sql = \\{(id_i, source_i, target_i, cost_i, " +#~ "reverse\\_cost_i)\\}`" +#~ msgstr "" +#~ "其中 :math:`sql = \\{(id_i, source_i, target_i, cost_i, " +#~ "reverse\\_cost_i)\\}`" + +#~ msgid "" +#~ "In other words: The algorithm returns a the shortest path between :math:" +#~ "`start_{vid}` and :math:`end_{vid}`, if it exists, in terms of a sequence " +#~ "of nodes and of edges," +#~ msgstr "" +#~ "换句话说：该算法返回 :math:`start_{vid}` 和:math:`end_{vid}` 之间的最短路" +#~ "径（如果存在），以节点和边的序列表示，" + +#~ msgid "Returns SET OF |result-spantree|" +#~ msgstr "返回 |result-spantree| 的一组结果" + +#~ msgid "Not classified" +#~ msgstr "未分类" + +#~ msgid "Capacity of the edge (``source``, ``target``)" +#~ msgstr "边 (``source``, ``target``)的容量" + +#~ msgid "Weight of the edge (``source``, ``target``) if it exist" +#~ msgstr "边 (``source``, ``target``)的权重（如果存在）" + +#~ msgid "" +#~ ":doc:`pgr_createTopology` - create a topology based on the geometry." +#~ msgstr ":doc:`pgr_createTopology` - 根据几何形状创建拓扑。" + +#~ msgid "" +#~ ":doc:`pgr_analyzeGraph` - to analyze the edges and vertices of the edge " +#~ "table." +#~ msgstr ":doc:`pgr_analyzeGraph` - 分析边表的边和顶点。" + +#~ msgid ":doc:`pgr_nodeNetwork` -to create nodes to a not noded edge table." +#~ msgstr ":doc:`pgr_nodeNetwork` -为无节点边表创建节点。" + +#~ msgid "Also ``l`` could be used as **driving side**" +#~ msgstr "``l`` 也可用作**行驶方向**" + +#~ msgid "Be aware of the existance of the additional return columns." +#~ msgstr "请注意附加返回列的存在。" + +#~ msgid "" +#~ "Edge :math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`) is not part of " +#~ "the graph." +#~ msgstr "" +#~ "边 :math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`) 不是图的一部分。" + +#~ msgid "The set of vertices :math:`V`:" +#~ msgstr "顶点 :math:`V`的集合：" + +#~ msgid ":math:`2` (:math:`1 \\rightarrow 3`)" +#~ msgstr ":math:`2` (:math:`1 \\rightarrow 3`)" + +#~ msgid ":math:`3` (:math:`3 \\rightarrow 2`)" +#~ msgstr ":math:`3` (:math:`3 \\rightarrow 2`)" + +#~ msgid ":math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`)" +#~ msgstr ":math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`)" + +#~ msgid ":math:`3` (:math:`3 \\frac{\\;\\;\\;\\;\\;}{} 2`)" +#~ msgstr ":math:`3` (:math:`3 \\frac{\\;\\;\\;\\;\\;}{} 2`)" + +#~ msgid "" +#~ "Personal relationships, genealogy, file dependency problems can be solved " +#~ "using pgRouting. Those problems, normally, do not come with geometries " +#~ "associated with the graph." +#~ msgstr "" +#~ "人际关系、家谱、文件依赖问题都可以使用pgRouting来解决。 通常，这些问题不会" +#~ "与与图形相关的几何图形相关。" + +#~ msgid ":doc:`sampledata`: a small graph used on the documentation examples" +#~ msgstr ":doc:`sampledata`: 文档示例中使用的小图" + +#~ msgid "" +#~ "That information is correct, for example, when in terms of vehicles, is " +#~ "it a tunnel or bride crossing over another road." +#~ msgstr "" +#~ "这些信息是正确的，例如，在车辆方面，它是一个穿越另一条道路的隧道或桥梁。" + +#~ msgid "" +#~ "Capacity information, used on the :doc:`flow-family` functions does not " +#~ "need to change when splitting edges." +#~ msgstr "分割边时， :doc:`flow-family` 函数上使用的容量信息不需要更改。" + +#~ msgid "" +#~ "pgr_dijkstra(`Edges SQL`_, **start vid**, **end vid** [, ``directed``])" +#~ msgstr "" +#~ "pgr_dijkstra(`Edges SQL`_, **start vid**, **end vid** [, ``directed``])" + +#~ msgid "Used on combination signatures" +#~ msgstr "用于组合签名" + +#~ msgid "" +#~ "When ``true`` departing from a visited vertex will not try to avoid using " +#~ "the edge used to reach it. In other words, U turn using the edge with " +#~ "same identifier is allowed." +#~ msgstr "" +#~ "当 为``true``时，从已访问的顶点出发，不会试图避免使用用于到达它的边。换句" +#~ "话说，允许使用具有相同标识符的边来进行掉头。" + +#~ msgid "" +#~ "When ``false`` when a departing from a visited vertex tries to avoid " +#~ "using the edge used to reach it. In other words, U turn using the edge " +#~ "with same identifier is used when no other path is found." +#~ msgstr "" +#~ "当为``false``时，从已访问的顶点出发，尝试避免使用用于到达它的边。换句话" +#~ "说，只有在找不到其他路径时才使用具有相同标识符的边来进行掉头。" + +#~ msgid "Return columns for a path" +#~ msgstr "返回路径的列" + +#~ msgid "Used on functions that return one path solution" +#~ msgstr "用于返回单路径解决方案的函数" + +#~ msgid "Used on functions the following:" +#~ msgstr "用于以下函数：" + +#~ msgid "Returned on `Many to One`_ and `Many to Many`_" +#~ msgstr "返回`多对一`_和`多对多`_" + +#~ msgid "Return columns for cost functions" +#~ msgstr "返回成本函数的列" + +#~ msgid "Return columns for flow functions" +#~ msgstr "流函数的返回列" + +#~ msgid "Return columns for spanning tree functions" +#~ msgstr "返回生成树函数的列" + +#~ msgid "Returns SET OF ``(edge, cost)``" +#~ msgstr "返回集合``(edge, cost)``" + +#~ msgid "" +#~ "Edit an existing `pgRouting Wiki `__ page." +#~ msgstr "" +#~ "编辑现有的 `pgRouting 维基 `__ 页面。" + +#~ msgid "" +#~ "And all the people that give us a little of their time making comments, " +#~ "finding issues, making pull requests etc. in any of our products: " +#~ "osm2pgrouting, pgRouting, pgRoutingLayer, workshop." +#~ msgstr "" +#~ "并且所有那些花一点时间为我们的任何产品提供评论、发现问题、提交请求等的人" +#~ "们，包括 osm2pgrouting、pgRouting、pgRoutingLayer 和 workshop。" + +#~ msgid "Return columns standarized to: |nksp-result|" +#~ msgstr "返回标准化后的列：|nksp-result|" + +#~ msgid "RETURNS SET OF |nksp-result|" +#~ msgstr "RETURNS SET OF |nksp-result|" + +#~ msgid "" +#~ "The minimum value of the ``agg_cost`` all instances of edge `(u, v)` is " +#~ "going to be considered as the ``agg_cost`` of edge `(u, v)`" +#~ msgstr "" +#~ "边 `(u, v)` 的所有实例的 ``agg_cost`` 最小值将被视为边`(u, v)`的 " +#~ "``agg_cost``" + +#~ msgid "RETURNS SET OF |tsp-result|" +#~ msgstr "RETURNS SET OF |tsp-result|" + +#~ msgid "" +#~ "Visualy, The first image is the `optimal solution `__ and the second image is the " +#~ "solution obtained with ``pgr_TSPeuclidean``." +#~ msgstr "" +#~ "从视觉上看，第一幅图像是 `最优解 `__ ，第二幅图像是使用 ``pgr_TSPeuclidean``获得的解。" + +#~ msgid "`pgr_aStar(` `One to Many`_ `)`" +#~ msgstr "`pgr_aStar(` `一对多`_ `)`" + +#~ msgid "`pgr_aStar(` `Many to One`_ `)`" +#~ msgstr "`pgr_aStar(` `多对一`_ `)`" + +#~ msgid "`pgr_aStar(` `Many to Many`_ `)`" +#~ msgstr "`pgr_aStar(` `多对多`_ `)`" + +#~ msgid "`pgr_aStar(` `Combinations`_ `)`" +#~ msgstr "`pgr_aStar(` `组合`_ `)`" + +#~ msgid "RETURNS SET OF |short-generic-result|" +#~ msgstr "RETURNS SET OF |short-generic-result|" + +#~ msgid "RETURNS SET OF |matrix-result|" +#~ msgstr "RETURNS SET OF |matrix-result|" + +#~ msgid "" +#~ "The edge table to be analyzed must contain a source column and a target " +#~ "column filled with id's of the vertices of the segments and the " +#~ "corresponding vertices table _vertices_pgr that stores the " +#~ "vertices information." +#~ msgstr "" +#~ "待分析的边表必须包含源列和目标列，其中填充了线段顶点的id以及对应的存储顶点" +#~ "信息的顶点表_vertices_pgr。" + +#~ msgid "" +#~ "``text`` Target column name of the network table. Default value is " +#~ "``target``." +#~ msgstr "``text``网络表的Target列名称。 默认值为 ``target``。" + +#~ msgid "" +#~ "``text`` Condition to select a subset or rows. Default value is " +#~ "``true`` to indicate all rows." +#~ msgstr "``text``选择子集或行的条件。 默认值为``true`` t表示所有行。" + +#~ msgid "" +#~ "Returns the analysis of the section of the network defined by " +#~ "``rows_where``" +#~ msgstr "返回由``rows_where`` 定义的网络部分的分析结果" + +#~ msgid "``integer`` Indicator that the vertex might have a problem." +#~ msgstr "``integer``指示顶点可能有问题。" + +#~ msgid "" +#~ "``boolean`` flag to treat oneway NULL values as bi-directional. Default " +#~ "value is ``true``." +#~ msgstr "``boolean``将单向 NULL 值视为双向的标志。 默认值为 ``true``。" + +#~ msgid "" +#~ "``integer`` Indicator that the vertex might have a problem. See :doc:" +#~ "`pgr_analyzeGraph `." +#~ msgstr "" +#~ "``integer``指示顶点可能有问题。 请参阅 :doc:`pgr_analyzeGraph " +#~ "`。" + +#~ msgid "Return columns change: ``seq`` is removed" +#~ msgstr "返回列更改：``seq``被删除" + +#~ msgid "RETURNS SET OF |result-node|" +#~ msgstr "RETURNS SET OF |result-node|" + +#~ msgid "`pgr_bdAstar(` `One to Many`_ `)`" +#~ msgstr "`pgr_bdAstar(` `一对多`_ `)`" + +#~ msgid "`pgr_bdAstar(` `Many to One`_ `)`" +#~ msgstr "`pgr_bdAstar(` `多对一`_ `)`" + +#~ msgid "`pgr_bdAstar(` `Many to Many`_ `)`" +#~ msgstr "`pgr_bdAstar(` `多对多`_ `)`" + +#~ msgid "`pgr_bdAstar(` `Combinations`_ `)`" +#~ msgstr "`pgr_bdAstar(` `组合`_ `)`" + +#~ msgid "RETURNS SET OF |old-generic-result|" +#~ msgstr "RETURNS SET OF |old-generic-result|" + +#~ msgid "RETURNS SET OF |result-1-1|" +#~ msgstr "RETURNS SET OF |result-1-1|" + +#~ msgid "RETURNS SET OF |result-1-m|" +#~ msgstr "RETURNS SET OF |result-1-m|" + +#~ msgid "RETURNS SET OF |result-m-1|" +#~ msgstr "RETURNS SET OF |result-m-1|" + +#~ msgid "" +#~ "pgr_bellmanFord(`Edges SQL`_, **start vids**, **end vid** , " +#~ "[``directed``])" +#~ msgstr "" +#~ "pgr_bellmanFord(`Edges SQL`_, **start vids**, **end vid** , " +#~ "[``directed``])" + +#~ msgid "Return columns change:" +#~ msgstr "返回列更改：" + +#~ msgid "RETURNS SET OF |result-component-E|" +#~ msgstr "RETURNS SET OF |result-component-E|" + +#~ msgid "" +#~ "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:`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." +#~ msgstr "" +#~ "众所周知，在无权图中，可以使用广度优先搜索（Breadth First Search）找到从单" +#~ "一源点到所有其他顶点的最短路径，其时间复杂度为 :math:`O(|E|)`，其中 |E| 表" +#~ "示图中的边数。也就是说，这里的距离是指从源点到另一个顶点所需穿越的最小边" +#~ "数。我们也可以将这样的图解释为一个带权图，其中每条边的权重都为 :math:`1`。" +#~ "如果图中的边不都具有相同的权重，那么我们就需要使用更通用的算法，比如" +#~ "Dijkstra算法，它的时间复杂度为 :math:`O(|E|log|V|)`，其中 |E| 表示图中的边" +#~ "数，|V| 表示图中的顶点数。" + +#~ msgid "Optional Parameters" +#~ msgstr "可选参数" + +#~ msgid "" +#~ "The algorithm checks graph is bipartite or not. If it is bipartite then " +#~ "it returns the node along with two colors `0` and `1` which represents " +#~ "two different sets." +#~ msgstr "" +#~ "该算法检查图是否是二分图。如果是二分图，它将返回节点以及分别代表两个不同集" +#~ "合的两种颜色，分别为 `0` 和 `1`。" + +#~ msgid "Returns set of |result-contract|" +#~ msgstr "返回集合 |result-contract|" + +#~ msgid "" +#~ "``text`` Condition to SELECT a subset or rows. Default value is " +#~ "``true`` to indicate all rows that where ``source`` or ``target`` have a " +#~ "null value, otherwise the condition is used." +#~ msgstr "" +#~ "``text`` 用于选择一组行的条件。默认值为 ``true``，表示选择所有具有空值的 " +#~ "``source`` 或 ``target`` 的行，否则将使用条件。" + +#~ msgid "" +#~ "``boolean`` Clean any previous topology. Default value is ``false``." +#~ msgstr "``boolean`` 清除任何先前的拓扑信息。默认值为 ``false``。" + +#~ msgid "" +#~ "``integer`` Indicator that the vertex might have a problem. See :doc:" +#~ "`pgr_analyzeGraph`." +#~ msgstr "" +#~ "``integer`` 表示该顶点可能存在问题的指标。请参阅 :doc:`pgr_analyzeGraph`。" + +#~ msgid "" +#~ "The reconstruction of the vertices table function accepts the following " +#~ "parameters:" +#~ msgstr "顶点表的重建函数接受以下参数：" + +#~ msgid "" +#~ "``text`` Condition to SELECT a subset or rows. Default value is " +#~ "``true`` to indicate all rows." +#~ msgstr "" +#~ "``text`` 用于选择行的子集的条件。默认值为 ``true``，表示选择所有行。" + +#~ msgid "" +#~ ":doc:`topology-functions` for an overview of a topology for routing " +#~ "algorithms." +#~ msgstr ":doc:`topology-functions` 用于路由算法拓扑的概述。" + +#~ msgid "Returns SET OF ``(seq, node)``" +#~ msgstr "Returns SET OF ``(seq, node)``" + +#~ msgid "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vid**)" +#~ msgstr "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vid**)" + +#~ msgid "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vids**)" +#~ msgstr "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vids**)" + +#~ msgid "From vertex :math:`5` to vertex :math:`11` on a **directed** graph" +#~ msgstr "在**有向**图上，从顶点:math:`5`到顶点 :math:`11`" + +#~ msgid "Resturn Columns" +#~ msgstr "返回列" + +#~ msgid "" +#~ "pgr_drivingDistance(`Edges SQL`_, **Root vid**, **distance**, " +#~ "[``directed``])" +#~ msgstr "" +#~ "pgr_drivingDistance(`Edges SQL`_, **Root vid**, **distance**, " +#~ "[``directed``])" + +#~ msgid "" +#~ "the chromatic number :math:`x'(G)` (minimum number of colors needed for " +#~ "proper edge coloring of graph) is equal to the degree :math:`\\Delta + " +#~ "1` of the graph, (:math:`x'(G) = \\Delta`)" +#~ msgstr "" +#~ "色数 :math:`x'(G)`（适当的图边着色所需的最小颜色数）等于图的度 :math:" +#~ "`\\Delta + 1`，即 :math:`x'(G) = \\Delta`" -msgid "And :math:`n-2` choices for the third city, etc." -msgstr "第三个城市的 :math:`n-2` 选项等。" +#~ msgid "RETURNS SET OF |result-edge-color|" +#~ msgstr "RETURNS SET OF |result-edge-color|" + +#~ msgid "RETURNS SET OF |result-disjoint|" +#~ msgstr "返回 |result-disjoint| 的集合" + +#~ msgid "RETURNS SET OF |result-disjoint-1-1|" +#~ msgstr "返回|result-disjoint-1-1|集合" -msgid "Multiplying these together we get :math:`(n-1)! = (n-1) (n-2) . . 1`." -msgstr "相乘得到 :math:`(n-1)！= (n-1) (n-2) ..1`." +#~ msgid "RETURNS SET OF |result-disjoint-1-m|" +#~ msgstr "返回 |result-disjoint-1-m|集合" -msgid "" -"To handle problems like: 10 (equal dimension) boxes of apples and 5 kg of " -"feathers that are to be transported (not packed in boxes)." -msgstr "处理以下问题：10 箱（尺寸相等）苹果和 5 千克羽毛的运输（不装箱）。" +#~ msgid "RETURNS SET OF |result-disjoint-m-1|" +#~ msgstr "返回|result-disjoint-m-1|集合" -msgid "" -"Working with cost/reverse_cost as length in degrees, x/y in lat/lon: Factor " -"= 1 (no need to change units)" -msgstr "" -"使用 cost/reverse_cost 作为长度（以度为单位），x/y 以纬度/经度为单位：因子 = " -"1（无需更改单位）" +#~ msgid "RETURNS SET OF |result-disjoint-m-m|" +#~ msgstr "返回 |result-disjoint-m-m|集合" -msgid "" -"Working with cost/reverse_cost as length in meters, x/y in lat/lon: Factor = " -"would depend on the location of the points:" -msgstr "" -"使用 cost/reverse_cost 作为以米为单位的长度，以纬度/经度为单位的 x/y： " -"Factor = 将取决于点的位置：" +#~ msgid "" +#~ "``pgr_edwardMoore`` — Returns the shortest path using Edward-Moore " +#~ "algorithm." +#~ msgstr "``pgr_edwardMoore`` - 使用 Edward-Moore 算法返回最短路径。" -msgid "1 longitude degree is 78846.81 m" -msgstr "1 经度为 78846.81 米" +#~ msgid "`start vid` ascending" +#~ msgstr "`start vid`升序" -msgid "The `agg_cost` of `(u, v)` is the same as for `(v, u)`." -msgstr "`(u, v)` 的 `agg_cost` 与 `(v, u)`相同。" +#~ msgid "`end vid` ascending" +#~ msgstr "`end vid`升序" -msgid "When `start_vid` = `end_vid`, the `agg_cost` = 0." -msgstr "当`start_vid` = `end_vid`时，`agg_cost`= 0。" +#~ msgid "Dryrun execution" +#~ msgstr "试运行执行" -msgid "" -":doc:`pgr_bdDijkstraCostMatrix` - Bidirectional Dijkstra algorithm to create " -"a matrix of costs of the shortest paths." -msgstr "" -":doc:`pgr_bdDijkstraCostMatrix` - 创建最短路径成本矩阵的双向 Dijkstra 算法。" +#~ msgid "RETURNS SET OF |result-find|" +#~ msgstr "RETURNS SET OF |result-find|" -msgid "" -"The edges :math:`v \\rightarrow w` and :math:`w \\rightarrow z` are removed " -"from the graph." -msgstr "从图中删除边 :math:`v \\rightarrow w` 和 :math:`w \\rightarrow z`。" +#~ msgid "" +#~ "The geometry ``geom``, marked as **g1** and **g2** are the **original " +#~ "points**" +#~ msgstr "几何体 ``geom``，标记 **g1** 和**g2**是**原始点**" -msgid "" -"The edges :math:`u \\rightarrow v` and :math:`v \\rightarrow z` are removed " -"from the graph." -msgstr "从图中删除边 :math:`u \\rightarrow v` 和 :math:`v \\rightarrow z`。" +#~ msgid "" +#~ "``pgr_hawickCircuits`` — Returns the list of cirucits using hawick " +#~ "circuits algorithm." +#~ msgstr "``pgr_hawickCircuits`` — 使用 Hawick 回路算法返回回路列表。" -msgid "" -"The **aggregate cost** of :math:`(u, v)` is the same as for :math:`(v, u)`." -msgstr ":math:`(u, v)`的**总成本**与 :math:`(v, u)`的相同。" +#~ msgid "RETURNS SET OF |generic-result|" +#~ msgstr "RETURNS SET OF |generic-result|" -msgid "" -"where :math:`sql = \\{(id_i, source_i, target_i, cost_i, reverse\\_cost_i)\\}" -"`" -msgstr "" -"其中 :math:`sql =\\{(id_i, source_i, target_i, cost_i, reverse\\_cost_i)\\}`" +#~ msgid "RETURNS SET OF |result-mst|" +#~ msgstr "RETURNS SET OF |result-mst|" -msgid "the set of vertices :math:`V`" -msgstr "顶点集:math:`V`" +#~ msgid "RETURNS SET OF |result-idom|" +#~ msgstr "RETURNS SET OF |result-idom|" -msgid "" -"In other words: The algorithm returns a the shortest path between :math:" -"`start_{vid}` and :math:`end_{vid}`, if it exists, in terms of a sequence of " -"nodes and of edges," -msgstr "" -"换句话说：如果:math:`start_{vid}`和:math:`end_{vid}`之间存在最短路径，算法会" -"根据节点和边的序列返回该路径、" +#~ msgid "RETURNS SET OF |result-lineg|" +#~ msgstr "RETURNS SET OF |result-lineg|" -msgid "Capacity of the edge (``source``, ``target``)" -msgstr "边 (``source``, ``target``)的容量" +#~ msgid "RETURNS SET OF |result-linegf|" +#~ msgstr "RETURNS SET OF |result-linegf|" -msgid "Weight of the edge (``source``, ``target``) if it exist" -msgstr "边 (``source``, ``target``)的权重（如果存在）" +#~ msgid "RETURNS SET OF |result-component-make|" +#~ msgstr "RETURNS SET OF |result-component-make|" -msgid ":doc:`pgr_createTopology` - create a topology based on the geometry." -msgstr ":doc:`pgr_createTopology` - 根据几何形状创建拓扑。" +#~ msgid "RETURNS SET OF |result-flow-mincost|" +#~ msgstr "RETURNS SET OF |result-flow-mincost|" -msgid "" -":doc:`pgr_analyzeGraph` - to analyze the edges and vertices of the edge " -"table." -msgstr ":doc:`pgr_analyzeGraph` - 分析边表的边和顶点。" +#~ msgid "The output table will have for ``edge_table_noded``" +#~ msgstr "输出表将具有``edge_table_noded``" -msgid ":doc:`pgr_nodeNetwork` - to create nodes to a not noded edge table." -msgstr ":doc:`pgr_nodeNetwork` - 为无节点边表创建节点。" +#~ msgid "before image" +#~ msgstr "之前的图像" -msgid "Also ``l`` could be used as **driving side**" -msgstr "此外，``l``也可用作**驾驶侧**" +#~ msgid "after image" +#~ msgstr "后面的图像" -msgid "" -"Edge :math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`) is not part of the " -"graph." -msgstr "边 :math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`) 不是图的一部分。" +#~ msgid "RETURNS SET OF |result-pickdrop|" +#~ msgstr "RETURNS SET OF |result-pickdrop|" -msgid "The set of vertices :math:`V`:" -msgstr "顶点集 :math:`V`：" +#~ msgid "RETURNS SET OF |result-mincut|" +#~ msgstr "RETURNS SET OF |result-mincut|" -msgid ":math:`2` (:math:`1 \\rightarrow 3`)" -msgstr ":math:`2` (:math:`1\\rightarrow 3`)" +#~ msgid "RETURNS SET OF |result-toposort|" +#~ msgstr "RETURNS SET OF |result-toposort|" -msgid ":math:`3` (:math:`3 \\rightarrow 2`)" -msgstr ":math:`3` (:math:`3\\rightarrow 2`)" +#~ msgid "RETURNS SET OF |result-closure|" +#~ msgstr "RETURNS SET OF |result-closure|" -msgid ":math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`)" -msgstr ":math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`)" +#~ msgid "Deprecated signatures:" +#~ msgstr "弃用签名：" -msgid ":math:`3` (:math:`3 \\frac{\\;\\;\\;\\;\\;}{} 2`)" -msgstr ":math:`3` (:math:`3 \\frac{\\;\\;\\;\\;\\;}{} 2`)" +#~ msgid "New prototypes:" +#~ msgstr "新原型：" -msgid "" -"Personal relationships, genealogy, file dependency problems can be solved " -"using pgRouting. Those problems, normally, do not come with geometries " -"associated with the graph." -msgstr "" -"使用 pgRouting 可以解决个人关系、家谱和文件依赖性问题。这些问题通常不会与图形" -"相关的几何图形一起出现。" +#~ msgid "From vertex :math:`6` to vertex :math:`10` on an undirected graph." +#~ msgstr "无向图上从一个顶点 :math:`6`到另一个顶点:math:`10`。" -msgid "pgr_dijkstra(`Edges SQL`_, **start vid**, **end vid** [, ``directed``])" -msgstr "" -"pgr_dijkstra(`Edges SQL`_, **start vid**, **end vid** [, ``directed``])" +#~ msgid "" +#~ "Point :math:`-1` corresponds to the closest edge from point `(2.9,1.8)`." +#~ msgstr "点 :math:`-1`对应于距离点 `(2.9,1.8)`最近的边。" -msgid "" -"When ``true`` departing from a visited vertex will not try to avoid using " -"the edge used to reach it. In other words, U turn using the edge with same " -"identifier is allowed." -msgstr "" -"当 为``true``时，从已访问的顶点出发，不会试图避免使用用于到达它的边。换句话" -"说，允许使用具有相同标识符的边来进行掉头。" +#~ msgid "" +#~ "Point :math:`-2` corresponds to the next close edge from point " +#~ "`(2.9,1.8)`." +#~ msgstr "点 :math:`-2`对应于点`(2.9,1.8)` 的下一个闭合边。" -msgid "" -"When ``false`` when a departing from a visited vertex tries to avoid using " -"the edge used to reach it. In other words, U turn using the edge with same " -"identifier is used when no other path is found." -msgstr "" -"当为``false``时，从已访问的顶点出发，尝试避免使用用于到达它的边。换句话说，只" -"有在找不到其他路径时才使用具有相同标识符的边来进行掉头。" +#~ msgid "RETURNS SET OF |ksp-result|" +#~ msgstr "RETURNS SET OF |ksp-result|" -msgid "Returned on `Many to One`_ and `Many to Many`_" -msgstr "`多对一`_和 `多对多`_的返回值" +#~ msgid "From vertex :math:`3` to vertex :math:`8` on a directed graph" +#~ msgstr "有向图上从顶点 :math:`3`到顶点:math:`8`" -msgid "" -"Edit an existing `pgRouting Wiki `__ page." -msgstr "" -"编辑现有的 `pgRouting 维基 `__ " -"页面。" +#~ msgid "From vertex :math:`3` to vertex :math:`8` on an undirected graph" +#~ msgstr "无向图中从顶点:math:`3`到顶点:math:`8`" -msgid "" -"And all the people that give us a little of their time making comments, " -"finding issues, making pull requests etc. in any of our products: " -"osm2pgrouting, pgRouting, pgRoutingLayer, workshop." -msgstr "" -"还有所有为我们的产品（osm2pgrouting、pgRouting、pgRoutingLayer、workshop）提" -"供意见、发现问题、提出拉取请求等的人们。" +#~ msgid "From vertex :math:`3` to vertex :math:`8` with more alternatives" +#~ msgstr "从一个顶点 :math:`3`到另一个顶点 :math:`8`有更多的选择" -msgid "" -"The minimum value of the ``agg_cost`` all instances of edge `(u, v)` is " -"going to be considered as the ``agg_cost`` of edge `(u, v)`" -msgstr "边 `(u, v)` 的所有实例的 ``agg_cost`` 最小值将被视为边 `(u, v)` 的 " -"``agg_cost``" +#~ msgid "RETURNS SET OF |old-pid-result|" +#~ msgstr "RETURNS SET OF |old-pid-result|" -msgid "" -"Visualy, The first image is the `optimal solution `__ and the second image is the solution " -"obtained with ``pgr_TSPeuclidean``." -msgstr "" -"从视觉上看，第一幅图像是 `最优解 `__ ，第二幅图像是使用 ``pgr_TSPeuclidean``获得的解。" +#~ msgid "RETURNS SET OF |pid-1-m|" +#~ msgstr "RETURNS SET OF |pid-1-m|" -msgid "" -"The edge table to be analyzed must contain a source column and a target " -"column filled with id's of the vertices of the segments and the " -"corresponding vertices table _vertices_pgr that stores the " -"vertices information." -msgstr "" -"待分析的边表必须包含源列和目标列，其中填充了线段顶点的id以及对应的存储顶点信" -"息的顶点表_vertices_pgr。" +#~ msgid "RETURNS SET OF |pid-m-1|" +#~ msgstr "RETURNS SET OF |pid-m-1|" -msgid "" -"``text`` Target column name of the network table. Default value is " -"``target``." -msgstr "``text``网络表的Target列名称。 默认值为 ``target``。" +#~ msgid "RETURNS SET OF |pid-m-m|" +#~ msgstr "RETURNS SET OF |pid-m-m|" -msgid "" -"``text`` Condition to select a subset or rows. Default value is ``true`` to " -"indicate all rows." -msgstr "``text`` 用于选择子集或行的条件。默认值为``true``，表示选择所有行。" +#~ msgid "Running time: :math:`O(| start\\_vids | * (V \\log V + E))`" +#~ msgstr "运行时间：:math:`O(| start\\_vids | * (V \\log V + E))`" -msgid "" -"Returns the analysis of the section of the network defined by ``rows_where``" -msgstr "返回由``rows_where`` 定义的网络部分的分析结果" +#~ msgid "**options:** ``[directed, driving_side]``" +#~ msgstr "**options:** ``[directed, driving_side]``" -msgid "``integer`` Indicator that the vertex might have a problem." -msgstr "``integer``指示顶点可能有问题。" +#~ msgid "RETURNS SET OF |matrix-pid|" +#~ msgstr "RETURNS SET OF |matrix-pid|" -msgid "" -"``boolean`` flag to treat oneway NULL values as bi-directional. Default " -"value is ``true``." -msgstr "``boolean``将单向 NULL 值视为双向的标志。 默认值为 ``true``。" +#~ msgid "" +#~ "From point :math:`15` and vertex :math:`6` to point :math:`3` and " +#~ "vertex :math:`1`" +#~ msgstr "从点:math:`15`和顶点 :math:`6`到点 :math:`3` 和顶点:math:`1`" -msgid "" -"``integer`` Indicator that the vertex might have a problem. See :doc:" -"`pgr_analyzeGraph `." -msgstr "" -"``integer``指示顶点可能有问题。 请参阅 :doc:`pgr_analyzeGraph " -"`。" +#~ msgid "" +#~ "Point :math:`-1` corresponds to the closest edge from point :math:" +#~ "`(2.9,1.8)`." +#~ msgstr "点:math:`-1`对应于距离点 :math:`(2.9,1.8)`最近的边。" -msgid "" -"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:" -"`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." -msgstr "" -"众所周知，在无权重图中，使用广度优先搜索（Breadth First Search）可以在 :math:" -"`O(|E|)`内找到单个源点与所有其他顶点之间的最短路径，也就是说，距离是指从源点" -"到另一个顶点所需的最少边数。我们也可以把这样的图解释为加权图，其中每条边的权" -"重为 :math:`1`。如果图中不是所有边的权重都相同，我们就需要一种更通用的算法，" -"比如 Dijkstra 算法，它的运行时间为 :math:`O(|E|log|V||)`。" +#~ msgid "" +#~ "Point :math:`-2` corresponds to the next close edge from point :math:" +#~ "`(2.9,1.8)`." +#~ msgstr "点:math:`-2`对应于点 :math:`(2.9,1.8)`的下一个闭合边。" -msgid "" -"The algorithm checks graph is bipartite or not. If it is bipartite then it " -"returns the node along with two colors `0` and `1` which represents two " -"different sets." -msgstr "" -"该算法检查图是否是二分图。 如果它是二分的，那么它返回节点以及代表两个不同集合" -"的两种颜色 `0` 和`1`。" +#~ msgid "Deprecated signature:" +#~ msgstr "已弃用的签名：" -msgid "Returns set of |result-contract|" -msgstr "Returns set of |result-contract|" +#~ msgid "**options:** ``[directed, heap_paths, details]``" +#~ msgstr "**options:** ``[directed, heap_paths, details]``" -msgid "" -"``text`` Condition to SELECT a subset or rows. Default value is ``true`` to " -"indicate all rows that where ``source`` or ``target`` have a null value, " -"otherwise the condition is used." -msgstr "" -"``text`` 用于选择行的条件。默认值为``true`` ，表示选择所有具有空值的 " -"``source``或``target`` 的行，否则将使用指定的条件。" +#~ msgid "Deprecated functions" +#~ msgstr "已废弃的函数" -msgid "``boolean`` Clean any previous topology. Default value is ``false``." -msgstr "``boolean`` 清除先前的拓扑。默认值为 ``false``。" +#~ msgid "Issues" +#~ msgstr "问题" -msgid "" -"``integer`` Indicator that the vertex might have a problem. See :doc:" -"`pgr_analyzeGraph`." -msgstr "``integer``指示顶点可能有问题。 请参阅 :doc:`pgr_analyzeGraph`。" +#~ msgid "Backport issues fixes" +#~ msgstr "回溯问题修复" -msgid "" -"The reconstruction of the vertices table function accepts the following " -"parameters:" -msgstr "顶点表重建函数接受以下参数：" +#~ msgid "" +#~ "`#232 `__: Honor " +#~ "client cancel requests in C /C++ code" +#~ msgstr "" +#~ "`#232 `__：在C/C++代码" +#~ "中响应客户端取消请求" -msgid "" -"``text`` Condition to SELECT a subset or rows. Default value is ``true`` to " -"indicate all rows." -msgstr "``text`` 用于选择行的条件。默认值为 ``true`` 表示选择所有行。" +#~ msgid "New Experimental functions" +#~ msgstr "新的实验函数" -msgid "" -":doc:`topology-functions` for an overview of a topology for routing " -"algorithms." -msgstr ":doc:`topology-functions` 用于路由算法的拓扑概述。" +#~ msgid "pgr_labelGraph - Use the components family of functions instead." +#~ msgstr "pgr_labelGraph - 使用分量系列函数。" -msgid "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vid**)" -msgstr "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vid**)" +#~ msgid "New Signatures:" +#~ msgstr "新签名：" -msgid "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vids**)" -msgstr "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vids**)" +#~ msgid "Deprecated Signatures" +#~ msgstr "废弃的签名" -msgid "From vertex :math:`5` to vertex :math:`11` on a **directed** graph" -msgstr "在**有向**图上，从顶点:math:`5`到顶点 :math:`11`" +#~ msgid "Renamed Functions" +#~ msgstr "已重命名的函数" -msgid "" -"pgr_drivingDistance(`Edges SQL`_, **Root vid**, **distance**, [``directed``])" -msgstr "" -"pgr_drivingDistance(`Edges SQL`_, **Root vid**, **distance**, [``directed``])" +#~ msgid "Deprecated function" +#~ msgstr "已废弃的函数" -msgid "" -"the chromatic number :math:`x'(G)` (minimum number of colors needed for " -"proper edge coloring of graph) is equal to the degree :math:`\\Delta + 1` of " -"the graph, (:math:`x'(G) = \\Delta`)" -msgstr "" -"色数（chromatic number）:math:`x'(G)`（用于图的适当边着色所需的最小颜色数）等" -"于图的度:math:`\\Delta + 1`（:math:`x'(G) = \\Delta`）" +#~ msgid "pgr_dijkstra -- to match what is documented" +#~ msgstr "pgr_dijkstra -- 与文档中的内容相匹配" -msgid "" -"``pgr_edwardMoore`` — Returns the shortest path using Edward-Moore algorithm." -msgstr "`pgr_edwardMoore`` - 使用 Edward-Moore 算法返回最短路径。" +#~ msgid "Proposed functionality" +#~ msgstr "拟议函数" -msgid "" -"The geometry ``geom``, marked as **g1** and **g2** are the **original " -"points**" -msgstr "标为**g1**和**g2**的几何体``geom``是**原始点**" +#~ msgid "Deprecated functions:" +#~ msgstr "已废弃的函数：" -msgid "" -"``pgr_hawickCircuits`` — Returns the list of cirucits using hawick circuits " -"algorithm." -msgstr "``pgr_hawickCircuits`` — 使用 Hawick 回路算法返回回路列表。" +#~ msgid "pgr_apspWarshall use pgr_floydWarshall instead" +#~ msgstr "pgr_apspWarshall 改用 pgr_floydWarshall" -msgid "The output table will have for ``edge_table_noded``" -msgstr "输出表中将包含``edge_table_noded``内容" +#~ msgid "pgr_apspJohnson use pgr_Johnson instead" +#~ msgstr "pgr_apspJohnson 改用 pgr_Johnson" -msgid "From vertex :math:`6` to vertex :math:`10` on an undirected graph." -msgstr "从无向图上的顶点 :math:`6` 到顶点 :math:`10`." +#~ msgid "Renamed and deprecated function" +#~ msgstr "已更名和废弃的函数" -msgid "From vertex :math:`3` to vertex :math:`8` on a directed graph" -msgstr "从有向图上的顶点 :math:`3` 到顶点 :math:`8`" +#~ msgid "Starting on PostgreSQL 12::" +#~ msgstr "从 PostgreSQL 12 开始::" -msgid "From vertex :math:`3` to vertex :math:`8` on an undirected graph" -msgstr "从无向图上的顶点 :math:`3` 到顶点 :math:`8`" +#~ msgid "**Used on:**" +#~ msgstr "**用于:**" -msgid "From vertex :math:`3` to vertex :math:`8` with more alternatives" -msgstr "从顶点 :math:`3` 到顶点 :math:`8` 更多选择" +#~ msgid "Used on all Via functions" +#~ msgstr "用于所有 Via 函数" -msgid "" -"From point :math:`1` and vertex :math:`6` to point :math:`3` and vertex :" -"math:`1`" -msgstr "从点 :math:`1` 和顶点 :math:`6` 到点 :math:`3` 和顶点 :math:`1`" +#~ msgid "Used on" +#~ msgstr "用于" -msgid "**options:** ``[directed, driving_side]``" -msgstr "**options:** ``[directed, driving_side]``" +#~ msgid "" +#~ "pgr_dijkstra(`Edges SQL`_, **start vid**, **end vid** [, ``directed``])" +#~ msgstr "" +#~ "pgr_dijkstra(`Edges SQL`_, **start vid**, **end vid** [, ``directed``])" -msgid "" -"From point :math:`15` and vertex :math:`6` to point :math:`3` and vertex :" -"math:`1`" -msgstr "从点 :math:`15` 和顶点 :math:`6` 到点 :math:`3` 和顶点 :math:`1`" +#~ msgid "RETURNS SET OF |result-node-color|" +#~ msgstr "RETURNS SET OF |result-node-color|" -msgid "**options:** ``[directed, heap_paths, details]``" -msgstr "**options:** ``[directed, heap_paths, details]``" +#~ msgid "RETURNS SET OF |result-flow|" +#~ msgstr "RETURNS SET OF |result-flow|" -msgid "" -"`#232 `__: Honor client " -"cancel requests in C /C++ code" -msgstr "" -"`#232 `__：在 C /C++ " -"代码中尊重客户端取消请求" +#~ msgid "RETURNS SET OF |result-bfs|" +#~ msgstr "RETURNS SET OF |result-bfs|" -msgid "pgr_labelGraph - Use the components family of functions instead." -msgstr "pgr_labelGraph - 使用组件系列函数。" +#~ msgid "RETURNS SET OF |result-edge|" +#~ msgstr "RETURNS SET OF |result-edge|" -msgid "pgr_dijkstra -- to match what is documented" -msgstr "pgr_dijkstra -- 与文档中的内容相匹配" +#~ msgid "RETURNS SET OF |result-1-1-no-seq|" +#~ msgstr "RETURNS SET OF |result-1-1-no-seq|" -msgid "pgr_apspWarshall use pgr_floydWarshall instead" -msgstr "pgr_apspWarshall 改用 pgr_floydWarshall" - -msgid "pgr_apspJohnson use pgr_Johnson instead" -msgstr "pgr_apspJohnson 改用 pgr_Johnson" - -msgid "Starting on PostgreSQL 12::" -msgstr "从 PostgreSQL 12 开始：：" - -msgid "Result columns" -msgstr "结果列" - -msgid "Returns set of ``(seq, depth, start_vid, node, edge, cost, agg_cost)``" -msgstr "返回一组``(seq, depth, start_vid, node, edge, cost, agg_cost)``" - -msgid "aStar optional parameters" -msgstr "aStar 可选参数" - -msgid "Returns set of ``(vertex_id, color_id)``" -msgstr "返回集合``(vertex_id, color_id)``" - -msgid "Returns set of ``(edge_id, color_id)``" -msgstr "返回 ``(edge_id, color_id)`` 的集合" - -msgid "Returns set of |result-spantree|" -msgstr "Returns set of |result-spantree|" - -msgid "Be aware of the existance of the additional result Columns." -msgstr "注意附加结果列的存在。" - -msgid ":doc:`sampledata`: a small graph used in the documentation examples" -msgstr ":doc:`sampledata`: 文档示例中使用的小图形" - -msgid "" -"Capacity information, used in the :doc:`flow-family` functions does not need " -"to change when splitting edges." -msgstr "分割边时，在 :doc:`flow-family` 函数中使用的容量信息不需要改变。" - -msgid "Used in combination signatures" -msgstr "结合签名使用" - -msgid "Result columns for a path" -msgstr "路径的结果列" +#~ msgid "RETURNS SET OF |result-component-V|" +#~ msgstr "RETURNS SET OF |result-component-V|" -msgid "Used in functions that return one path solution" -msgstr "在返回一个路径解的函数中使用" +#~ msgid "RETURNS SET OF |result-contract|" +#~ msgstr "RETURNS SET OF |result-contract|" -msgid "Used in functions the following:" -msgstr "用于以下函数：" +#~ msgid "``text`` Network table name. (may contain the schema name AS well)" +#~ msgstr "``text``网络表名称。（可能包括模式名称）" -msgid "Result columns for cost functions" -msgstr "成本函数结果列" +#~ msgid "When the arguments are given in the order described:" +#~ msgstr "当参数按描述的顺序给出时：" -msgid "Result columns for flow functions" -msgstr "流量函数的结果列" - -msgid "Result columns for spanning tree functions" -msgstr "生成树函数的结果列" +#~ msgid "We get the same result AS the simplest way to use the function." +#~ msgstr "我们得到与使用该函数的最简单方法相同的结果。" -msgid "Returns set of ``(edge, cost)``" -msgstr "返回集合``(edge, cost)``" - -msgid "Result columns standarized to: |nksp-result|" -msgstr "结果列标准化为|nksp-result|" - -msgid "Returns set of |tsp-result|" -msgstr "返回 |tsp-result| 的集合" - -msgid "Returns set of |short-generic-result|" -msgstr "Returns set of |short-generic-result|" +#~ msgid "" +#~ "The vertices table is a requierment of the :doc:`pgr_analyzeGraph` and " +#~ "the :doc:`pgr_analyzeOneWay` functions." +#~ msgstr "" +#~ "顶点表是 :doc:`pgr_analyzeGraph`和 :doc:`pgr_analyzeOneWay` 函数的必需条" +#~ "件。" -msgid "Returns set of |matrix-result|" -msgstr "返回 |matrix-result| 的集合" +#~ msgid "RETURNS SET OF |result-node-order|" +#~ msgstr "RETURNS SET OF |result-node-order|" -msgid "Result columns change: ``seq`` is removed" -msgstr "结果列更改：删除了 ``seq``" +#~ msgid "" +#~ "The results can be used as base code to make a refinement based on the " +#~ "back end development needs." +#~ msgstr "结果可以作为基础代码，根据后端开发需求进行细化。" -msgid "Returns set of |old-generic-result|" -msgstr "返回 |old-generic-result| 的集合" +#~ msgid "" +#~ "The subway stations are on the following vertices :math:`\\{ 1, 10, 11\\}`" +#~ msgstr "地铁站位于以下顶点上 :math:``{ 1, 10, 11\\}`" -msgid "Returns set of |result-1-1|" -msgstr "返回 |result-1-1| 的集合" +#~ msgid "RETURNS SET OF |via-result|" +#~ msgstr "返回 |via-result| 的集合" -msgid "Returns set of |result-1-m|" -msgstr "返回 |result-1-m| 的集合" +#~ msgid "RETURNS SET OF |result-spantree|" +#~ msgstr "RETURNS SET OF |result-spantree|" -msgid "Returns set of |result-m-1|" -msgstr "返回 |result-m-1| 的集合" +#~ msgid "Weight of the edge (``source``, ``target``)" +#~ msgstr "边(``source``, ``target``)的权重" -msgid "Result columns change:" -msgstr "结果列发生变化：" +#~ msgid "" +#~ "``text`` Geometry column name of the network table. Default value is " +#~ "``the_geom``." +#~ msgstr "``text``网络表的几何列名称。 默认值为 ``the_geom``。" -msgid "Returns set of |result-node-color|" -msgstr "Returns set of |result-node-color|" +#~ msgid "" +#~ "``text`` Primary key column name of the network table. Default value is " +#~ "``id``." +#~ msgstr "``text``网络表的主键列名称。 默认值为``id``。" -msgid "Returns set of |result-flow|" -msgstr "Returns set of |result-flow|" +#~ msgid "From vertex :math:`6` to vertex :math:`10` on a **directed** graph" +#~ msgstr "在**有向**图上从顶点 :math:`6`到顶点 :math:`10`" -msgid "Returns set of |result-bfs|" -msgstr "返回 |result-bfs| 的集合" - -msgid "Returns set of |result-1-1-no-seq|" -msgstr "返回|result-1-1-no-seq|的集合" - -msgid "We get the sameresult as the simplest way to use the function." -msgstr "我们得到的结果与使用该函数的最简单方法相同。" - -msgid "Returns set of |result-node-order|" -msgstr "Returns set of |result-node-order|" - -msgid "Returns set of ``(seq, node)``" -msgstr "返回 ``(seq, node)`` 的集合" - -msgid "Returns set of |via-result|" -msgstr "返回 |via-result| 的集合" - -msgid "Returns set of |result-edge-color|" -msgstr "Returns set of |result-edge-color|" - -msgid "Returns set of |result-disjoint|" -msgstr "Returns set of |result-disjoint|" - -msgid "Returns set of |result-disjoint-1-1|" -msgstr "返回 |result-disjoint-1-1|的集合" - -msgid "Returns set of |result-disjoint-1-m|" -msgstr "返回|result-disjoint-1-m|的集合" - -msgid "Returns set of |result-disjoint-m-1|" -msgstr "Returns set of |result-disjoint-m-1|" - -msgid "Returns set of |result-disjoint-m-m|" -msgstr "返回|result-disjoint-m-m|的集合" - -msgid "Returns set of |generic-result|" -msgstr "返回 |eneric-result| 的集合" - -msgid "Returns set of |result-mst|" -msgstr "返回 |result-mst| 的集合" - -msgid "Returns set of |result-idom|" -msgstr "返回 |result-idom| 的集合" - -msgid "Returns set of |result-lineg|" -msgstr "Returns set of |result-lineg|" - -msgid "Returns set of |result-linegf|" -msgstr "返回 |result-linegf| 的集合" - -msgid "Returns set of |result-flow-mincost|" -msgstr "返回 |result-flow-mincost| 的集合" - -msgid "Before image" -msgstr "图片前" - -msgid "After image" -msgstr "图像后" - -msgid "Returns set of |result-pickdrop|" -msgstr "返回 |result-pickdrop| 的集合" - -msgid "Returns set of |result-mincut|" -msgstr "返回|result-mincut|的集合" - -msgid "Returns set of |result-closure|" -msgstr "Returns set of |result-closure|" - -msgid "New proposed signatures" -msgstr "新拟议的签名" - -msgid "Deprecated signatures" -msgstr "弃用签名" - -msgid "New prototypes" -msgstr "新原型" - -msgid "Returns set of |ksp-result|" -msgstr "返回 |ksp-result| 的集合" - -msgid "Returns set of |old-pid-result|" -msgstr "返回 |old-pid-result| 的集合" - -msgid "Returns set of |pid-1-m|" -msgstr "返回 |pid-1-m| 的集合" - -msgid "Returns set of |pid-m-1|" -msgstr "返回 |pid-m-1| 的集合" - -msgid "Returns set of |pid-m-m|" -msgstr "返回 |pid-m-m| 的集合" - -msgid "Returns set of |matrix-pid|" -msgstr "返回|matrix-pid|的集合" - -msgid "" -"Point :math:`-1` corresponds to the closest edge from point :math:`(2.9, " -"1.8)`." -msgstr "点 :math:`-1` 对应距离点 :math:`(2.9, 1.8)` 最近的边。" - -msgid "" -"Point :math:`-2` corresponds to the next close edge from point :math:`(2.9, " -"1.8)`." -msgstr "点 :math:`-2` 对应于点 :math:`(2.9, 1.8)` 的下一条近边。" - -msgid "New overload functions" -msgstr "新的重载函数" - -msgid "Backport issue fixes" -msgstr "回溯问题修复" - -msgid "Renamed functions" -msgstr "重新命名的功能" - -msgid "Deprecated Function" -msgstr "已废弃的功能" - -msgid "Proposed Functionality" -msgstr "建议的功能" - -msgid "Renamed and Deprecated Function" -msgstr "已更名和废弃的函数" - -msgid "**Used in:**" -msgstr "**用于：**" - -msgid "Used in all Via functions" -msgstr "用于所有 Via 功能" - -msgid "" -"That information is correct, for example, when in terms of vehicles, is it a " -"tunnel or bridge crossing over another road." -msgstr "这些信息是正确的，例如，就车辆而言，是隧道还是横跨另一条道路的桥梁。" - -msgid "RETURNS SET OF |result-node-color|" -msgstr "RETURNS SET OF |result-node-color|" - -msgid "RETURNS SET OF |result-flow|" -msgstr "RETURNS SET OF |result-flow|" - -msgid "RETURNS SET OF |result-bfs|" -msgstr "RETURNS SET OF |result-bfs|" - -msgid "RETURNS SET OF |result-edge|" -msgstr "RETURNS SET OF |result-edge|" - -msgid "RETURNS SET OF |result-1-1-no-seq|" -msgstr "RETURNS SET OF |result-1-1-no-seq|" - -msgid "RETURNS SET OF |result-component-V|" -msgstr "RETURNS SET OF |result-component-V|" - -msgid "RETURNS SET OF |result-contract|" -msgstr "RETURNS SET OF |result-contract|" - -msgid "``text`` Network table name. (may contain the schema name AS well)" -msgstr "``text``网络表名称。（可能包括模式名称）" - -msgid "When the arguments are given in the order described:" -msgstr "当参数按描述的顺序给出时：" - -msgid "We get the same result AS the simplest way to use the function." -msgstr "我们得到与使用该函数的最简单方法相同的结果。" - -msgid "" -"The vertices table is a requierment of the :doc:`pgr_analyzeGraph` and the :" -"doc:`pgr_analyzeOneWay` functions." -msgstr "" -"顶点表是 :doc:`pgr_analyzeGraph`和 :doc:`pgr_analyzeOneWay` 函数的必需条件。" - -msgid "RETURNS SET OF |result-node-order|" -msgstr "RETURNS SET OF |result-node-order|" - -msgid "" -"The results can be used as base code to make a refinement based on the back " -"end development needs." -msgstr "结果可以作为基础代码，根据后端开发需求进行细化。" - -msgid "" -"The subway stations are on the following vertices :math:`\\{ 1, 10, 11\\}`" -msgstr "地铁站位于以下顶点上 :math:``{ 1, 10, 11\\}`" - -msgid "RETURNS SET OF |via-result|" -msgstr "返回 |via-result| 的集合" - -msgid "RETURNS SET OF |result-spantree|" -msgstr "RETURNS SET OF |result-spantree|" - -msgid "Weight of the edge (``source``, ``target``)" -msgstr "边(``source``, ``target``)的权重" - -msgid "" -"``text`` Geometry column name of the network table. Default value is " -"``the_geom``." -msgstr "``text``网络表的几何列名称。 默认值为 ``the_geom``。" - -msgid "" -"``text`` Primary key column name of the network table. Default value is " -"``id``." -msgstr "``text``网络表的主键列名称。 默认值为``id``。" - -msgid "From vertex :math:`6` to vertex :math:`10` on a **directed** graph" -msgstr "在**有向**图上从顶点 :math:`6`到顶点 :math:`10`" - -msgid "" -"From point :math:`1` and vertex :math:`6` to point :math:`3` and vertex :" -"math:`1`" -msgstr "从点 :math:`1`和顶点 :math:`6`到点:math:`3`和顶点 :math:`1`" +#~ msgid "" +#~ "From point :math:`1` and vertex :math:`6` to point :math:`3` and vertex :" +#~ "math:`1`" +#~ msgstr "从点 :math:`1`和顶点 :math:`6`到点:math:`3`和顶点 :math:`1`" From 997deeac4c9d6e68110857ac05a91219788e6d06 Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Fri, 5 Jan 2024 02:56:42 +0000 Subject: [PATCH 197/428] Translated using Weblate (Chinese (Simplified)) Currently translated at 99.9% (5168 of 5173 strings) Co-authored-by: Celia Virginia Vergara Castillo Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ Translation: pgRouting/pgRouting --- .../zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 5ada8245b9..ef85432692 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -4,15 +4,15 @@ # Regina Obe , 2023. # Wangdapeng , 2023. # Zuochenwei , 2023. -# Celia Virginia Vergara Castillo , 2023. +# Celia Virginia Vergara Castillo , 2023, 2024. # Wang Dapeng , 2023. msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-01-04 04:09+0000\n" -"PO-Revision-Date: 2023-10-27 06:23+0000\n" -"Last-Translator: Zuochenwei \n" +"PO-Revision-Date: 2024-01-05 02:56+0000\n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Chinese (Simplified) \n" "Language: zh_Hans\n" @@ -20,7 +20,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 5.0\n" +"X-Generator: Weblate 5.3\n" msgid "BFS - Category" msgstr "BFS-类别" @@ -74,7 +74,7 @@ msgid "``TEXT``" msgstr "``TEXT``" msgid "`Edges SQL`_ as described below." -msgstr "`Edges SQL`_如下所述。" +msgstr "`Edges SQL`_ 如下所述。" msgid "**root vid**" msgstr "**root vid**" @@ -458,7 +458,7 @@ msgstr "" "法在同一顶点上传递两次。" msgid "`Edges SQL`_ query as described." -msgstr "`Edges SQL`_按描述查询。" +msgstr "`Edges SQL`_ 按描述查询。" msgid "`Restrictions SQL`_" msgstr "`Restrictions SQL`_" @@ -5344,7 +5344,7 @@ msgid ":doc:`pgr_dijkstra`:" msgstr ":doc:`pgr_dijkstra`:" msgid "Autodetects if ``reverse_cost`` column is in the edges SQL." -msgstr "自动检测``reverse_cost``列是否在边SQL中。" +msgstr "自动检测 ``reverse_cost`` 列是否在边SQL中。" msgid "Accepts ``ANY-INTEGER`` on integral types" msgstr "接受整数类型``ANY-INTEGER``" From 907f8bf2e7697f8150f7fb0cedfb9837bb0b74b0 Mon Sep 17 00:00:00 2001 From: Zuochenwei Date: Fri, 5 Jan 2024 02:56:42 +0000 Subject: [PATCH 198/428] Translated using Weblate (Chinese (Simplified)) Currently translated at 99.9% (5168 of 5173 strings) Co-authored-by: Zuochenwei Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ Translation: pgRouting/pgRouting --- .../zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index ef85432692..5a4e415752 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the pgRouting package. # Regina Obe , 2023. # Wangdapeng , 2023. -# Zuochenwei , 2023. +# Zuochenwei , 2023, 2024. # Celia Virginia Vergara Castillo , 2023, 2024. # Wang Dapeng , 2023. msgid "" @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-01-04 04:09+0000\n" "PO-Revision-Date: 2024-01-05 02:56+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"Last-Translator: Zuochenwei \n" "Language-Team: Chinese (Simplified) \n" "Language: zh_Hans\n" @@ -7162,11 +7162,10 @@ msgstr "在数据库中启用 PostGIS 和 pgRouting 后检查它们的版本。" msgid "Upgrading the database" msgstr "升级数据库" -#, fuzzy msgid "" "To upgrade pgRouting in the database to version 3.7.0 use the following " "command:" -msgstr "要将数据库中的 pgRouting 升级到版本 3.5.1，请使用以下命令：" +msgstr "要将数据库中的 pgRouting 升级到版本3.7.0，请使用以下命令：" msgid "" "More information can be found in https://www.postgresql.org/docs/current/sql-" @@ -7521,16 +7520,15 @@ msgstr "贡献者" msgid "This Release Contributors" msgstr "此版本贡献者" -#, fuzzy msgid "Individuals in this release v3.7.x (in alphabetical order)" -msgstr "本版本的个人贡献者 (按字母顺序)" +msgstr "在此版本 v3.7.x 中的个人贡献者（按字母顺序排列）" #, fuzzy msgid "(Alphabetical order)" msgstr "个人贡献者（按字母排序）" msgid "Regina Obe, Vicky Vergara" -msgstr "" +msgstr "Regina Obe, Vicky Vergara" msgid "" "And all the people that give us a little of their time making comments, " @@ -7622,7 +7620,7 @@ msgid "OSGeo" msgstr "" msgid "OSGeo UK" -msgstr "" +msgstr "OSGeo UK" msgid "Paragon Corporation" msgstr "Paragon Corporation" From 0ab4b5fd9350c015ccd463dd9dcca09263b5b71c Mon Sep 17 00:00:00 2001 From: DeepL Date: Fri, 5 Jan 2024 02:56:43 +0000 Subject: [PATCH 199/428] Translated using Weblate (Chinese (Simplified)) Currently translated at 99.9% (5168 of 5173 strings) Co-authored-by: DeepL Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ Translation: pgRouting/pgRouting --- .../LC_MESSAGES/pgrouting_doc_strings.po | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 5a4e415752..c0ba8afad2 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -6,13 +6,14 @@ # Zuochenwei , 2023, 2024. # Celia Virginia Vergara Castillo , 2023, 2024. # Wang Dapeng , 2023. +# DeepL , 2024. msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-01-04 04:09+0000\n" "PO-Revision-Date: 2024-01-05 02:56+0000\n" -"Last-Translator: Zuochenwei \n" +"Last-Translator: DeepL \n" "Language-Team: Chinese (Simplified) \n" "Language: zh_Hans\n" @@ -7523,9 +7524,8 @@ msgstr "此版本贡献者" msgid "Individuals in this release v3.7.x (in alphabetical order)" msgstr "在此版本 v3.7.x 中的个人贡献者（按字母顺序排列）" -#, fuzzy msgid "(Alphabetical order)" -msgstr "个人贡献者（按字母排序）" +msgstr "(按字母顺序排列）" msgid "Regina Obe, Vicky Vergara" msgstr "Regina Obe, Vicky Vergara" @@ -7548,10 +7548,10 @@ msgstr "" "这些是为 pgRouting 项目贡献了开发人员时间、托管或直接货币资金的公司实体：" msgid "`OSGeo `__" -msgstr "" +msgstr "`OSGeo `__" msgid "`OSGeo UK `__" -msgstr "" +msgstr "`OSGeo UK `__" msgid "`Google Summer of Code `__" msgstr "`Google Summer of Code `__" @@ -7617,7 +7617,7 @@ msgid "Orkney" msgstr "Orkney" msgid "OSGeo" -msgstr "" +msgstr "OSGeo" msgid "OSGeo UK" msgstr "OSGeo UK" @@ -16195,19 +16195,17 @@ msgstr "" "要查看完整的更改列表，请检查 Github 上的 `Git提交列表 `_。" -#, fuzzy msgid "pgRouting 3.7.0 Release Notes" -msgstr "pgRouting 3.6.0 发布说" +msgstr "pgRouting 3.7.0 发布说明" -#, fuzzy msgid "" "To see all issues & pull requests closed by this release see the `Git closed " "milestone for 3.7.0 `_" msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请访问 `Git 3.6.0 里程碑的已关闭问题和" -"拉取请求 `_" +"要查看此版本关闭的所有问题和拉取请求，请参阅 \"3.7.0 `_ 的 Git 关闭里程碑\"。" #, fuzzy msgid "Code enhancement" From 02231dfa527d9380e22e6e6792fe996769b6e5dc Mon Sep 17 00:00:00 2001 From: DeepL Date: Fri, 5 Jan 2024 02:57:19 +0000 Subject: [PATCH 200/428] Translated using Weblate (Chinese (Simplified)) Currently translated at 99.9% (5172 of 5173 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ --- .../LC_MESSAGES/pgrouting_doc_strings.po | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index c0ba8afad2..f89dff281c 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-01-04 04:09+0000\n" -"PO-Revision-Date: 2024-01-05 02:56+0000\n" +"PO-Revision-Date: 2024-01-05 02:58+0000\n" "Last-Translator: DeepL \n" "Language-Team: Chinese (Simplified) \n" @@ -16207,30 +16207,25 @@ msgstr "" "pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.7." "0%22>`_ 的 Git 关闭里程碑\"。" -#, fuzzy msgid "Code enhancement" -msgstr "C/C++ 代码增强" +msgstr "代码改进" -#, fuzzy msgid "" "`#2599 `__ Driving " "distance cleanup" -msgstr "" -"`#2505 `__ 使用命名空间。" +msgstr "`#2599 `__ 行车距离清理" -#, fuzzy msgid "pgRouting 3.6.1 Release Notes" -msgstr "pgRouting 3.6.0 发布说" +msgstr "pgRouting 3.6.1 发布说明" -#, fuzzy msgid "" "To see all issues & pull requests closed by this release see the `Git closed " "milestone for 3.6.1 `_" msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请访问 `Git 3.6.0 里程碑的已关闭问题和" -"拉取请求 `_" +"要查看此版本关闭的所有问题和拉取请求，请参阅 3.6.1 ``_ 的 \"Git 关闭里程碑\"。" #, fuzzy msgid "" From e8fa89727a1ac12ca0bfe56ea4d3d01d255903d2 Mon Sep 17 00:00:00 2001 From: Zuochenwei Date: Fri, 5 Jan 2024 02:56:43 +0000 Subject: [PATCH 201/428] Translated using Weblate (Chinese (Simplified)) Currently translated at 99.9% (5172 of 5173 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ --- locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index f89dff281c..5c8f57c35c 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-01-04 04:09+0000\n" "PO-Revision-Date: 2024-01-05 02:58+0000\n" -"Last-Translator: DeepL \n" +"Last-Translator: Zuochenwei \n" "Language-Team: Chinese (Simplified) \n" "Language: zh_Hans\n" @@ -16203,9 +16203,9 @@ msgid "" "milestone for 3.7.0 `_" msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 \"3.7.0 `_ 的 Git 关闭里程碑\"。" +"0%22>`_ 的 Git 关闭里程碑" msgid "Code enhancement" msgstr "代码改进" From 781b4f4fa0a727fdba18d71ccb73e89dcfe7d691 Mon Sep 17 00:00:00 2001 From: Zuochenwei Date: Fri, 5 Jan 2024 02:58:42 +0000 Subject: [PATCH 202/428] Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (5173 of 5173 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ --- locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 5c8f57c35c..c4ff1de41c 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-01-04 04:09+0000\n" -"PO-Revision-Date: 2024-01-05 02:58+0000\n" +"PO-Revision-Date: 2024-01-05 03:00+0000\n" "Last-Translator: Zuochenwei \n" "Language-Team: Chinese (Simplified) \n" @@ -16223,9 +16223,9 @@ msgid "" "milestone for 3.6.1 `_" msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 3.6.1 ``_ 的 \"Git 关闭里程碑\"。" +"要查看此版本关闭的所有问题和拉取请求，请参阅 `3.6.1Git 关闭里程碑 " +"`_" #, fuzzy msgid "" From c27eaad6504707361dc80a959f9eb0c1e3f7953e Mon Sep 17 00:00:00 2001 From: DeepL Date: Fri, 5 Jan 2024 02:58:49 +0000 Subject: [PATCH 203/428] Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (5173 of 5173 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ --- locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index c4ff1de41c..5cc617bbec 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-01-04 04:09+0000\n" "PO-Revision-Date: 2024-01-05 03:00+0000\n" -"Last-Translator: Zuochenwei \n" +"Last-Translator: DeepL \n" "Language-Team: Chinese (Simplified) \n" "Language: zh_Hans\n" @@ -16227,13 +16227,12 @@ msgstr "" "`_" -#, fuzzy msgid "" "`#2588 `__ pgrouting 3.6.0 " "fails to build on OSX" msgstr "" -"`#2400 `__: pgRouting " -"3.3.3 在 Focal 上无法构建" +"`#2588 `__ pgrouting 3.6.0 " +"在 OSX 上构建失败" msgid "pgRouting 3.6.0 Release Notes" msgstr "pgRouting 3.6.0 发布说" From cff3a51b16cf219b567017efd2db1fa6248d2f73 Mon Sep 17 00:00:00 2001 From: Weblate Date: Sat, 6 Jan 2024 18:14:28 +0000 Subject: [PATCH 204/428] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/ --- .../de/LC_MESSAGES/pgrouting_doc_strings.po | 108 ++++++++++-- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 151 ++++++++++++++--- .../ja/LC_MESSAGES/pgrouting_doc_strings.po | 108 ++++++++++-- .../ko/LC_MESSAGES/pgrouting_doc_strings.po | 108 ++++++++++-- .../LC_MESSAGES/pgrouting_doc_strings.po | 155 +++++++++++++++--- 5 files changed, 535 insertions(+), 95 deletions(-) diff --git a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po index ce8e41bb3d..b6e9323e2d 100644 --- a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-04 04:09+0000\n" +"POT-Creation-Date: 2024-01-06 18:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -3857,11 +3857,6 @@ msgstr "" msgid "Identifier of the ``edge`` used to arrive from ``pred`` to ``node``." msgstr "" -msgid "" -"Column ``pred`` only applies to :doc:`pgr_drivingDistance` and :doc:" -"`pgr_withPointsDD`." -msgstr "" - msgid "Experimental Functions" msgstr "" @@ -4377,6 +4372,32 @@ msgstr "" msgid ":doc:`release_notes`" msgstr "" +msgid "Current release" +msgstr "" + +msgid "_" +msgstr "" + +msgid "Code enhancement" +msgstr "" + +msgid "" +"`#2599 `__ Driving " +"distance cleanup" +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 "" + msgid "Kruskal - Family of functions" msgstr "" @@ -15141,21 +15162,28 @@ msgid "" "github.com/pgRouting/pgrouting/commits>`_ on Github." msgstr "" +msgid "Mayors" +msgstr "" + +msgid "pgRouting 3" +msgstr "" + +msgid "Minors 3.x" +msgstr "" + +msgid "pgRouting 3.7" +msgstr "" + msgid "pgRouting 3.7.0 Release Notes" msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " "milestone for 3.7.0 `_" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.7.0%22>`__" msgstr "" -msgid "Code enhancement" -msgstr "" - -msgid "" -"`#2599 `__ Driving " -"distance cleanup" +msgid "pgRouting 3.6" msgstr "" msgid "pgRouting 3.6.1 Release Notes" @@ -15292,6 +15320,9 @@ msgid "" "On new internal function: do not use named parameters and default parameters." msgstr "" +msgid "pgRouting 3.5" +msgstr "" + msgid "pgRouting 3.5.1 Release Notes" msgstr "" @@ -15383,6 +15414,9 @@ msgstr "" msgid "``pgr_dijkstra`` (`Many to One`) added ``start_vid`` column." msgstr "" +msgid "pgRouting 3.4" +msgstr "" + msgid "pgRouting 3.4.2 Release Notes" msgstr "" @@ -15532,6 +15566,9 @@ msgstr "" msgid "``pgr_trspViaEdges(text,integer[],float[],boolean,boolean,text)``" msgstr "" +msgid "pgRouting 3.3" +msgstr "" + msgid "pgRouting 3.3.5 Release Notes" msgstr "" @@ -15724,6 +15761,9 @@ msgstr "" msgid "pgr_depthFirstSearch(Single vertex)" msgstr "" +msgid "pgRouting 3.2" +msgstr "" + msgid "pgRouting 3.2.2 Release Notes" msgstr "" @@ -15860,6 +15900,9 @@ msgstr "" msgid "pgr_pushRelabel(Combinations)" msgstr "" +msgid "pgRouting 3.1" +msgstr "" + msgid "pgRouting 3.1.4 Release Notes" msgstr "" @@ -15985,6 +16028,9 @@ msgstr "" msgid "Minimal requirement for Sphinx: version 1.8" msgstr "" +msgid "pgRouting 3.0" +msgstr "" + msgid "pgRouting 3.0.6 Release Notes" msgstr "" @@ -16406,6 +16452,15 @@ msgstr "" msgid "pgr_alphaShape old signature" msgstr "" +msgid "pgRouting 2" +msgstr "" + +msgid "Minors 2.x" +msgstr "" + +msgid "pgRouting 2.6" +msgstr "" + msgid "pgRouting 2.6.3 Release Notes" msgstr "" @@ -16596,6 +16651,9 @@ msgstr "" msgid "Cleaned the internal code of withPoints" msgstr "" +msgid "pgRouting 2.5" +msgstr "" + msgid "pgRouting 2.5.5 Release Notes" msgstr "" @@ -16733,6 +16791,9 @@ msgstr "" msgid "pgr_pointToEdgeNode" msgstr "" +msgid "pgRouting 2.4" +msgstr "" + msgid "pgRouting 2.4.2 Release Notes" msgstr "" @@ -16824,6 +16885,9 @@ msgstr "" msgid "TRSP original code is used with no changes on the compilation warnings" msgstr "" +msgid "pgRouting 2.3" +msgstr "" + msgid "pgRouting 2.3.2 Release Notes" msgstr "" @@ -16947,6 +17011,9 @@ msgstr "" msgid "pgr_textToPoints" msgstr "" +msgid "pgRouting 2.2" +msgstr "" + msgid "pgRouting 2.2.4 Release Notes" msgstr "" @@ -17097,6 +17164,9 @@ msgstr "" msgid "pgr_makeDistanceMatrix renamed to _pgr_makeDistanceMatrix" msgstr "" +msgid "pgRouting 2.1" +msgstr "" + msgid "pgRouting 2.1.0 Release Notes" msgstr "" @@ -17237,6 +17307,9 @@ msgid "" "one library - The library has the prefix 2-1-0" msgstr "" +msgid "pgRouting 2.0" +msgstr "" + msgid "pgRouting 2.0.1 Release Notes" msgstr "" @@ -17257,8 +17330,8 @@ msgstr "" msgid "" "With the release of pgRouting 2.0.0 the library has abandoned backwards " -"compatibility to `pgRouting 1.x Release Notes`_ releases. The main Goals for " -"this release are:" +"compatibility to `pgRouting 1.0`_ releases. The main Goals for this release " +"are:" msgstr "" msgid "Major restructuring of pgRouting." @@ -17372,7 +17445,10 @@ msgstr "" msgid "shooting_star is discontinued" msgstr "" -msgid "pgRouting 1.x Release Notes" +msgid "pgRouting 1" +msgstr "" + +msgid "pgRouting 1.0" msgstr "" msgid "" diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index d3b129a9db..c31bceea6a 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-04 04:09+0000\n" +"POT-Creation-Date: 2024-01-06 18:14+0000\n" "PO-Revision-Date: 2023-10-21 03:23+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish `__ Driving " +"distance cleanup" +msgstr "" +"`#2505 `__ Usando " +"namespace." + +#, fuzzy +msgid "Others" +msgstr "plumas" + +msgid "Adjust NEWS generator" +msgstr "" + +msgid "Name change to `NEWS.md` for better visualization on GitHub" +msgstr "" + +msgid "All releases" +msgstr "" + msgid "Kruskal - Family of functions" msgstr "Kruskal - Familia de funciones" @@ -17473,6 +17497,20 @@ msgstr "" "Para ver la lista completa de cambios, consulte la lista de `Git commits " "`_ en Github." +msgid "Mayors" +msgstr "" + +#, fuzzy +msgid "pgRouting 3" +msgstr "Versión de pgRouting" + +msgid "Minors 3.x" +msgstr "" + +#, fuzzy +msgid "pgRouting 3.7" +msgstr "Versión de pgRouting" + #, fuzzy msgid "pgRouting 3.7.0 Release Notes" msgstr "Notas de la versión 3.6.0 de pgRouting" @@ -17481,23 +17519,15 @@ msgstr "Notas de la versión 3.6.0 de pgRouting" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " "milestone for 3.7.0 `_" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.7.0%22>`__" msgstr "" "Para ver todos los problemas y solicitudes de extracción cerrados para ésta " "versión, consulte la `meta cerrada 3.6.0 `_" #, fuzzy -msgid "Code enhancement" -msgstr "Mejora de código C/C++" - -#, fuzzy -msgid "" -"`#2599 `__ Driving " -"distance cleanup" -msgstr "" -"`#2505 `__ Usando " -"namespace." +msgid "pgRouting 3.6" +msgstr "Versión de pgRouting" #, fuzzy msgid "pgRouting 3.6.1 Release Notes" @@ -17676,6 +17706,10 @@ msgid "" "On new internal function: do not use named parameters and default parameters." msgstr "" +#, fuzzy +msgid "pgRouting 3.5" +msgstr "Versión de pgRouting" + msgid "pgRouting 3.5.1 Release Notes" msgstr "Notas de la versión 3.5.1 de pgRouting" @@ -17781,6 +17815,10 @@ msgstr "``pgr_dijkstra`` (`Uno a Muchos`) ha añadido la columna ``end_vid``." msgid "``pgr_dijkstra`` (`Many to One`) added ``start_vid`` column." msgstr "``pgr_dijkstra`` (`Muchos a Uno`) ha añadido la columna ``start_vid``." +#, fuzzy +msgid "pgRouting 3.4" +msgstr "Versión de pgRouting" + msgid "pgRouting 3.4.2 Release Notes" msgstr "Notas de la versión 3.4.2 de pgRouting" @@ -17948,6 +17986,10 @@ msgstr "``pgr_trsp(text,integer,float8,integer,float8,boolean,boolean,text)``" msgid "``pgr_trspViaEdges(text,integer[],float[],boolean,boolean,text)``" msgstr "" +#, fuzzy +msgid "pgRouting 3.3" +msgstr "Versión de pgRouting" + msgid "pgRouting 3.3.5 Release Notes" msgstr "Notas de la versión 3.3.5 de pgRouting" @@ -18173,6 +18215,10 @@ msgstr "pgr_depthFirstSearch (Vértices múltiples)" msgid "pgr_depthFirstSearch(Single vertex)" msgstr "pgr_depthFirstSearch (Vértice único)" +#, fuzzy +msgid "pgRouting 3.2" +msgstr "Versión de pgRouting" + msgid "pgRouting 3.2.2 Release Notes" msgstr "Notas de la Versión 3.2.2 de pgRouting" @@ -18333,6 +18379,10 @@ msgstr "pgr_maxFlow(Combinaciones)" msgid "pgr_pushRelabel(Combinations)" msgstr "pgr_pushRelabel(Combinaciones)" +#, fuzzy +msgid "pgRouting 3.1" +msgstr "Versión de pgRouting" + msgid "pgRouting 3.1.4 Release Notes" msgstr "Notas de la Versión 3.1.4 de pgRouting" @@ -18504,6 +18554,10 @@ msgstr "Crear cambios" msgid "Minimal requirement for Sphinx: version 1.8" msgstr "Requerimientos mínimos para Sphinx: versión 1.8" +#, fuzzy +msgid "pgRouting 3.0" +msgstr "Versión de pgRouting" + msgid "pgRouting 3.0.6 Release Notes" msgstr "Notas de la Versión 3.0.6 de pgRouting" @@ -18962,6 +19016,17 @@ msgstr "pgr_pointsAsPolygon" msgid "pgr_alphaShape old signature" msgstr "pgr_alphaShape firma antigua" +#, fuzzy +msgid "pgRouting 2" +msgstr "Versión de pgRouting" + +msgid "Minors 2.x" +msgstr "" + +#, fuzzy +msgid "pgRouting 2.6" +msgstr "Versión de pgRouting" + msgid "pgRouting 2.6.3 Release Notes" msgstr "pgRouting 2.6.3 Notas de la Versión" @@ -19179,6 +19244,10 @@ msgstr "El código interno puede aceptar BIGINT" msgid "Cleaned the internal code of withPoints" msgstr "Limpiado el código interno de withPoints" +#, fuzzy +msgid "pgRouting 2.5" +msgstr "Versión de pgRouting" + msgid "pgRouting 2.5.5 Release Notes" msgstr "Notas de la versión de PgRouting 2.5.5" @@ -19340,6 +19409,10 @@ msgstr "Funcion Obsoleta" msgid "pgr_pointToEdgeNode" msgstr "pgr_pointToEdgeNode" +#, fuzzy +msgid "pgRouting 2.4" +msgstr "Versión de pgRouting" + msgid "pgRouting 2.4.2 Release Notes" msgstr "Notas de la versión de pgRouting 2.4.2" @@ -19444,6 +19517,10 @@ msgstr "" "El código original de TRSP se utiliza sin cambios en las advertencias de " "compilación" +#, fuzzy +msgid "pgRouting 2.3" +msgstr "Versión de pgRouting" + msgid "pgRouting 2.3.2 Release Notes" msgstr "Notas de la versión de pgRouting 2.3.2" @@ -19579,6 +19656,10 @@ msgstr "pgr_pointsToDMatrix" msgid "pgr_textToPoints" msgstr "pgr_textToPoints" +#, fuzzy +msgid "pgRouting 2.2" +msgstr "Versión de pgRouting" + msgid "pgRouting 2.2.4 Release Notes" msgstr "Notas de la versión de pgRouting 2.2.4" @@ -19744,6 +19825,10 @@ msgstr "Función Renombrada y Obsoleta" msgid "pgr_makeDistanceMatrix renamed to _pgr_makeDistanceMatrix" msgstr "pgr_makeDistanceMatrix renombrado a _pgr_makeDistanceMatrix" +#, fuzzy +msgid "pgRouting 2.1" +msgstr "Versión de pgRouting" + msgid "pgRouting 2.1.0 Release Notes" msgstr "Notas de la versión de pgRouting 2.1.0" @@ -19906,6 +19991,10 @@ msgstr "" "En lugar de generar muchas bibliotecas: - Todas las funciones están " "encapsuladas en una biblioteca - La biblioteca tiene el prefijo 2-1-0" +#, fuzzy +msgid "pgRouting 2.0" +msgstr "Versión de pgRouting" + msgid "pgRouting 2.0.1 Release Notes" msgstr "Notas de la versión de pgRouting 2.0.1" @@ -19927,10 +20016,11 @@ msgstr "" "issues for 2.0.0 `_ on Github." +#, fuzzy msgid "" "With the release of pgRouting 2.0.0 the library has abandoned backwards " -"compatibility to `pgRouting 1.x Release Notes`_ releases. The main Goals for " -"this release are:" +"compatibility to `pgRouting 1.0`_ releases. The main Goals for this release " +"are:" msgstr "" "Con la versión de pgRouting 2.0.0, la biblioteca ha abandonado la " "compatibilidad con versiones anteriores a las versiones `pgRouting 1.x " @@ -20063,8 +20153,13 @@ msgstr "Mejor documentación: https://docs.pgrouting.org" msgid "shooting_star is discontinued" msgstr "shooting_star está descontinuado" -msgid "pgRouting 1.x Release Notes" -msgstr "Notas de versión de pgRouting 1.x" +#, fuzzy +msgid "pgRouting 1" +msgstr "Versión de pgRouting" + +#, fuzzy +msgid "pgRouting 1.0" +msgstr "Versión de pgRouting" msgid "" "To see the issues closed by this release see the `Git closed issues for 1.x " @@ -21037,6 +21132,16 @@ msgstr "pgr_withPointsDD es pgr_drivingDistance **con puntos**" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "pgr_withPoints es pgr_dijkstraVia **con puntos**" +#~ msgid "" +#~ "Column ``pred`` only applies to :doc:`pgr_drivingDistance` and :doc:" +#~ "`pgr_withPointsDD`." +#~ msgstr "" +#~ "La columna ``pred`` sólo se aplica a :doc:`pgr_drivingDistance` y :doc:" +#~ "`pgr_withPointsDD`." + +#~ msgid "pgRouting 1.x Release Notes" +#~ msgstr "Notas de versión de pgRouting 1.x" + #~ msgid "" #~ "Aniket Agarwal, Aryan Gupta, Ashish Kumar, Cayetano Benavent, Daniel " #~ "Kastl, Nitish Chauhan, Rajat Shinde, Regina Obe, Shobhit Chaurasia, " diff --git a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po index ddff223e7e..1878aba0c3 100644 --- a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-04 04:09+0000\n" +"POT-Creation-Date: 2024-01-06 18:14+0000\n" "PO-Revision-Date: 2022-09-29 19:13+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Japanese `__ Driving " +"distance cleanup" +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 "" + msgid "Kruskal - Family of functions" msgstr "" @@ -15287,21 +15308,28 @@ msgid "" "github.com/pgRouting/pgrouting/commits>`_ on Github." msgstr "" +msgid "Mayors" +msgstr "" + +msgid "pgRouting 3" +msgstr "" + +msgid "Minors 3.x" +msgstr "" + +msgid "pgRouting 3.7" +msgstr "" + msgid "pgRouting 3.7.0 Release Notes" msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " "milestone for 3.7.0 `_" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.7.0%22>`__" msgstr "" -msgid "Code enhancement" -msgstr "" - -msgid "" -"`#2599 `__ Driving " -"distance cleanup" +msgid "pgRouting 3.6" msgstr "" msgid "pgRouting 3.6.1 Release Notes" @@ -15439,6 +15467,9 @@ msgid "" "On new internal function: do not use named parameters and default parameters." msgstr "" +msgid "pgRouting 3.5" +msgstr "" + msgid "pgRouting 3.5.1 Release Notes" msgstr "" @@ -15531,6 +15562,9 @@ msgstr "" msgid "``pgr_dijkstra`` (`Many to One`) added ``start_vid`` column." msgstr "" +msgid "pgRouting 3.4" +msgstr "" + msgid "pgRouting 3.4.2 Release Notes" msgstr "" @@ -15680,6 +15714,9 @@ msgstr "" msgid "``pgr_trspViaEdges(text,integer[],float[],boolean,boolean,text)``" msgstr "" +msgid "pgRouting 3.3" +msgstr "" + msgid "pgRouting 3.3.5 Release Notes" msgstr "" @@ -15872,6 +15909,9 @@ msgstr "" msgid "pgr_depthFirstSearch(Single vertex)" msgstr "" +msgid "pgRouting 3.2" +msgstr "" + msgid "pgRouting 3.2.2 Release Notes" msgstr "" @@ -16008,6 +16048,9 @@ msgstr "" msgid "pgr_pushRelabel(Combinations)" msgstr "" +msgid "pgRouting 3.1" +msgstr "" + msgid "pgRouting 3.1.4 Release Notes" msgstr "" @@ -16133,6 +16176,9 @@ msgstr "" msgid "Minimal requirement for Sphinx: version 1.8" msgstr "" +msgid "pgRouting 3.0" +msgstr "" + msgid "pgRouting 3.0.6 Release Notes" msgstr "" @@ -16554,6 +16600,15 @@ msgstr "" msgid "pgr_alphaShape old signature" msgstr "" +msgid "pgRouting 2" +msgstr "" + +msgid "Minors 2.x" +msgstr "" + +msgid "pgRouting 2.6" +msgstr "" + msgid "pgRouting 2.6.3 Release Notes" msgstr "" @@ -16744,6 +16799,9 @@ msgstr "" msgid "Cleaned the internal code of withPoints" msgstr "" +msgid "pgRouting 2.5" +msgstr "" + msgid "pgRouting 2.5.5 Release Notes" msgstr "" @@ -16882,6 +16940,9 @@ msgstr "" msgid "pgr_pointToEdgeNode" msgstr "" +msgid "pgRouting 2.4" +msgstr "" + msgid "pgRouting 2.4.2 Release Notes" msgstr "" @@ -16973,6 +17034,9 @@ msgstr "" msgid "TRSP original code is used with no changes on the compilation warnings" msgstr "" +msgid "pgRouting 2.3" +msgstr "" + msgid "pgRouting 2.3.2 Release Notes" msgstr "" @@ -17096,6 +17160,9 @@ msgstr "" msgid "pgr_textToPoints" msgstr "" +msgid "pgRouting 2.2" +msgstr "" + msgid "pgRouting 2.2.4 Release Notes" msgstr "" @@ -17247,6 +17314,9 @@ msgstr "" msgid "pgr_makeDistanceMatrix renamed to _pgr_makeDistanceMatrix" msgstr "" +msgid "pgRouting 2.1" +msgstr "" + msgid "pgRouting 2.1.0 Release Notes" msgstr "" @@ -17387,6 +17457,9 @@ msgid "" "one library - The library has the prefix 2-1-0" msgstr "" +msgid "pgRouting 2.0" +msgstr "" + msgid "pgRouting 2.0.1 Release Notes" msgstr "" @@ -17407,8 +17480,8 @@ msgstr "" msgid "" "With the release of pgRouting 2.0.0 the library has abandoned backwards " -"compatibility to `pgRouting 1.x Release Notes`_ releases. The main Goals for " -"this release are:" +"compatibility to `pgRouting 1.0`_ releases. The main Goals for this release " +"are:" msgstr "" msgid "Major restructuring of pgRouting." @@ -17522,7 +17595,10 @@ msgstr "" msgid "shooting_star is discontinued" msgstr "" -msgid "pgRouting 1.x Release Notes" +msgid "pgRouting 1" +msgstr "" + +msgid "pgRouting 1.0" msgstr "" msgid "" diff --git a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po index c9969cf4f8..9746d6adf4 100644 --- a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-04 04:09+0000\n" +"POT-Creation-Date: 2024-01-06 18:14+0000\n" "PO-Revision-Date: 2022-12-13 12:30+0000\n" "Last-Translator: Hyung-Gyu Ryoo \n" "Language-Team: Korean `__ Driving " +"distance cleanup" +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 "" + msgid "Kruskal - Family of functions" msgstr "" @@ -15185,21 +15206,28 @@ msgid "" "github.com/pgRouting/pgrouting/commits>`_ on Github." msgstr "" +msgid "Mayors" +msgstr "" + +msgid "pgRouting 3" +msgstr "" + +msgid "Minors 3.x" +msgstr "" + +msgid "pgRouting 3.7" +msgstr "" + msgid "pgRouting 3.7.0 Release Notes" msgstr "" msgid "" "To see all issues & pull requests closed by this release see the `Git closed " "milestone for 3.7.0 `_" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.7.0%22>`__" msgstr "" -msgid "Code enhancement" -msgstr "" - -msgid "" -"`#2599 `__ Driving " -"distance cleanup" +msgid "pgRouting 3.6" msgstr "" msgid "pgRouting 3.6.1 Release Notes" @@ -15336,6 +15364,9 @@ msgid "" "On new internal function: do not use named parameters and default parameters." msgstr "" +msgid "pgRouting 3.5" +msgstr "" + msgid "pgRouting 3.5.1 Release Notes" msgstr "" @@ -15428,6 +15459,9 @@ msgstr "" msgid "``pgr_dijkstra`` (`Many to One`) added ``start_vid`` column." msgstr "" +msgid "pgRouting 3.4" +msgstr "" + msgid "pgRouting 3.4.2 Release Notes" msgstr "" @@ -15577,6 +15611,9 @@ msgstr "" msgid "``pgr_trspViaEdges(text,integer[],float[],boolean,boolean,text)``" msgstr "" +msgid "pgRouting 3.3" +msgstr "" + msgid "pgRouting 3.3.5 Release Notes" msgstr "" @@ -15769,6 +15806,9 @@ msgstr "" msgid "pgr_depthFirstSearch(Single vertex)" msgstr "" +msgid "pgRouting 3.2" +msgstr "" + msgid "pgRouting 3.2.2 Release Notes" msgstr "" @@ -15905,6 +15945,9 @@ msgstr "" msgid "pgr_pushRelabel(Combinations)" msgstr "" +msgid "pgRouting 3.1" +msgstr "" + msgid "pgRouting 3.1.4 Release Notes" msgstr "" @@ -16030,6 +16073,9 @@ msgstr "" msgid "Minimal requirement for Sphinx: version 1.8" msgstr "" +msgid "pgRouting 3.0" +msgstr "" + msgid "pgRouting 3.0.6 Release Notes" msgstr "" @@ -16451,6 +16497,15 @@ msgstr "" msgid "pgr_alphaShape old signature" msgstr "" +msgid "pgRouting 2" +msgstr "" + +msgid "Minors 2.x" +msgstr "" + +msgid "pgRouting 2.6" +msgstr "" + msgid "pgRouting 2.6.3 Release Notes" msgstr "" @@ -16641,6 +16696,9 @@ msgstr "" msgid "Cleaned the internal code of withPoints" msgstr "" +msgid "pgRouting 2.5" +msgstr "" + msgid "pgRouting 2.5.5 Release Notes" msgstr "" @@ -16779,6 +16837,9 @@ msgstr "" msgid "pgr_pointToEdgeNode" msgstr "" +msgid "pgRouting 2.4" +msgstr "" + msgid "pgRouting 2.4.2 Release Notes" msgstr "" @@ -16870,6 +16931,9 @@ msgstr "" msgid "TRSP original code is used with no changes on the compilation warnings" msgstr "" +msgid "pgRouting 2.3" +msgstr "" + msgid "pgRouting 2.3.2 Release Notes" msgstr "" @@ -16993,6 +17057,9 @@ msgstr "" msgid "pgr_textToPoints" msgstr "" +msgid "pgRouting 2.2" +msgstr "" + msgid "pgRouting 2.2.4 Release Notes" msgstr "" @@ -17143,6 +17210,9 @@ msgstr "" msgid "pgr_makeDistanceMatrix renamed to _pgr_makeDistanceMatrix" msgstr "" +msgid "pgRouting 2.1" +msgstr "" + msgid "pgRouting 2.1.0 Release Notes" msgstr "" @@ -17283,6 +17353,9 @@ msgid "" "one library - The library has the prefix 2-1-0" msgstr "" +msgid "pgRouting 2.0" +msgstr "" + msgid "pgRouting 2.0.1 Release Notes" msgstr "" @@ -17303,8 +17376,8 @@ msgstr "" msgid "" "With the release of pgRouting 2.0.0 the library has abandoned backwards " -"compatibility to `pgRouting 1.x Release Notes`_ releases. The main Goals for " -"this release are:" +"compatibility to `pgRouting 1.0`_ releases. The main Goals for this release " +"are:" msgstr "" msgid "Major restructuring of pgRouting." @@ -17418,7 +17491,10 @@ msgstr "" msgid "shooting_star is discontinued" msgstr "" -msgid "pgRouting 1.x Release Notes" +msgid "pgRouting 1" +msgstr "" + +msgid "pgRouting 1.0" msgstr "" msgid "" diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 5cc617bbec..d721d9b9b9 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-04 04:09+0000\n" +"POT-Creation-Date: 2024-01-06 18:14+0000\n" "PO-Revision-Date: 2024-01-05 03:00+0000\n" "Last-Translator: DeepL \n" "Language-Team: Chinese (Simplified) `__ Driving " +"distance cleanup" +msgstr "" +"`#2599 `__ 行车距离清理" + +#, fuzzy +msgid "Others" +msgstr "羽毛" + +msgid "Adjust NEWS generator" +msgstr "" + +msgid "Name change to `NEWS.md` for better visualization on GitHub" +msgstr "" + +msgid "All releases" +msgstr "" + msgid "Kruskal - Family of functions" msgstr "Kruskal - 函数族" @@ -16195,25 +16217,36 @@ msgstr "" "要查看完整的更改列表，请检查 Github 上的 `Git提交列表 `_。" +msgid "Mayors" +msgstr "" + +#, fuzzy +msgid "pgRouting 3" +msgstr "pgRouting 版本" + +msgid "Minors 3.x" +msgstr "" + +#, fuzzy +msgid "pgRouting 3.7" +msgstr "pgRouting 版本" + msgid "pgRouting 3.7.0 Release Notes" msgstr "pgRouting 3.7.0 发布说明" +#, fuzzy msgid "" "To see all issues & pull requests closed by this release see the `Git closed " "milestone for 3.7.0 `_" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.7.0%22>`__" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 `3.7.0 `_ 的 Git 关闭里程碑" +"pgRouting/pgrouting/issues?" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.7.0%22>`_ 的 Git 关闭里程碑" -msgid "Code enhancement" -msgstr "代码改进" - -msgid "" -"`#2599 `__ Driving " -"distance cleanup" -msgstr "`#2599 `__ 行车距离清理" +#, fuzzy +msgid "pgRouting 3.6" +msgstr "pgRouting 版本" msgid "pgRouting 3.6.1 Release Notes" msgstr "pgRouting 3.6.1 发布说明" @@ -16223,9 +16256,9 @@ msgid "" "milestone for 3.6.1 `_" msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 `3.6.1Git 关闭里程碑 " -"`_" +"要查看此版本关闭的所有问题和拉取请求，请参阅 `3.6.1Git 关闭里程碑 `_" msgid "" "`#2588 `__ pgrouting 3.6.0 " @@ -16383,6 +16416,10 @@ msgid "" "On new internal function: do not use named parameters and default parameters." msgstr "新内部函数：不使用命名参数和默认参数。" +#, fuzzy +msgid "pgRouting 3.5" +msgstr "pgRouting 版本" + msgid "pgRouting 3.5.1 Release Notes" msgstr "pgRouting 3.5.1 发布说明" @@ -16486,6 +16523,10 @@ msgstr "``pgr_dijkstra``（`一对多`）添加了 ``end_vid``列。" msgid "``pgr_dijkstra`` (`Many to One`) added ``start_vid`` column." msgstr "``pgr_dijkstra`` （`多对一`）添加了 ``start_vid`` 列。" +#, fuzzy +msgid "pgRouting 3.4" +msgstr "pgRouting 版本" + msgid "pgRouting 3.4.2 Release Notes" msgstr "pgRouting 3.4.2 发布说明" @@ -16654,6 +16695,10 @@ msgstr "``pgr_trsp(text,integer,float8,integer,float8,boolean,boolean,text)``" msgid "``pgr_trspViaEdges(text,integer[],float[],boolean,boolean,text)``" msgstr "``pgr_trspViaEdges(text,integer[],float[],boolean,boolean,text)``" +#, fuzzy +msgid "pgRouting 3.3" +msgstr "pgRouting 版本" + msgid "pgRouting 3.3.5 Release Notes" msgstr "pgRouting 3.3.5 发布说明" @@ -16882,6 +16927,10 @@ msgstr "pgr_depthFirstSearch（多顶点）" msgid "pgr_depthFirstSearch(Single vertex)" msgstr "pgr_depthFirstSearch( 单顶点 )" +#, fuzzy +msgid "pgRouting 3.2" +msgstr "pgRouting 版本" + msgid "pgRouting 3.2.2 Release Notes" msgstr "pgRouting 3.2.2 发布说明" @@ -17035,6 +17084,10 @@ msgstr "pgr_maxFlow(组合)" msgid "pgr_pushRelabel(Combinations)" msgstr "pgr_pushRelabel(组合)" +#, fuzzy +msgid "pgRouting 3.1" +msgstr "pgRouting 版本" + msgid "pgRouting 3.1.4 Release Notes" msgstr "pgRouting 3.1.4 发布说明" @@ -17201,6 +17254,10 @@ msgstr "构建变更" msgid "Minimal requirement for Sphinx: version 1.8" msgstr "对 Sphinx 的最低要求：1.8 版本" +#, fuzzy +msgid "pgRouting 3.0" +msgstr "pgRouting 版本" + msgid "pgRouting 3.0.6 Release Notes" msgstr "pgRouting 3.0.6 发布说明" @@ -17654,6 +17711,17 @@ msgstr "pgr_pointsAsPolygon" msgid "pgr_alphaShape old signature" msgstr "pgr_alphaShape 旧签名" +#, fuzzy +msgid "pgRouting 2" +msgstr "pgRouting 版本" + +msgid "Minors 2.x" +msgstr "" + +#, fuzzy +msgid "pgRouting 2.6" +msgstr "pgRouting 版本" + msgid "pgRouting 2.6.3 Release Notes" msgstr "pgRouting 2.6.3 发布说明" @@ -17870,6 +17938,10 @@ msgstr "内部代码可接受 BIGINT" msgid "Cleaned the internal code of withPoints" msgstr "清理了 withPoints 的内部代码" +#, fuzzy +msgid "pgRouting 2.5" +msgstr "pgRouting 版本" + msgid "pgRouting 2.5.5 Release Notes" msgstr "pgRouting 2.5.5 发布说明" @@ -18025,6 +18097,10 @@ msgstr "已废弃的功能" msgid "pgr_pointToEdgeNode" msgstr "pgr_pointtoEdgeNode" +#, fuzzy +msgid "pgRouting 2.4" +msgstr "pgRouting 版本" + msgid "pgRouting 2.4.2 Release Notes" msgstr "pgRouting 2.4.2 发布说明" @@ -18125,6 +18201,10 @@ msgstr "pgr_withPointsKSP:修复了排序问题" msgid "TRSP original code is used with no changes on the compilation warnings" msgstr "使用 TRSP 原始代码，未对编译警告进行任何修改" +#, fuzzy +msgid "pgRouting 2.3" +msgstr "pgRouting 版本" + msgid "pgRouting 2.3.2 Release Notes" msgstr "pgRouting 2.3.2 发布说明" @@ -18257,6 +18337,10 @@ msgstr "pgr_pointsToDMatrix" msgid "pgr_textToPoints" msgstr "pgr_textToPoints" +#, fuzzy +msgid "pgRouting 2.2" +msgstr "pgRouting 版本" + msgid "pgRouting 2.2.4 Release Notes" msgstr "pgRouting 2.2.4 发布说明" @@ -18421,6 +18505,10 @@ msgstr "已更名和废弃的函数" msgid "pgr_makeDistanceMatrix renamed to _pgr_makeDistanceMatrix" msgstr "pgr_makeDistanceMatrix 更名为 _pgr_makeDistanceMatrix" +#, fuzzy +msgid "pgRouting 2.1" +msgstr "pgRouting 版本" + msgid "pgRouting 2.1.0 Release Notes" msgstr "pgRouting 2.1.0 发布说明" @@ -18567,6 +18655,10 @@ msgid "" msgstr "" "无需生成多个程序库： - 所有功能都封装在一个程序库中 - 程序库的前缀为 2-1-0" +#, fuzzy +msgid "pgRouting 2.0" +msgstr "pgRouting 版本" + msgid "pgRouting 2.0.1 Release Notes" msgstr "pgRouting 2.0.1 发布说明" @@ -18588,10 +18680,11 @@ msgstr "" "github.com/pgRouting/pgrouting/issues?" "q=milestone%3A%22Release+2.0.0%22+is%3Aclosed>`_ 。" +#, fuzzy msgid "" "With the release of pgRouting 2.0.0 the library has abandoned backwards " -"compatibility to `pgRouting 1.x Release Notes`_ releases. The main Goals for " -"this release are:" +"compatibility to `pgRouting 1.0`_ releases. The main Goals for this release " +"are:" msgstr "" "随着 pgRouting 2.0.0 版本的发布，该库已放弃与 `pgRouting 1.x 发行说明`_ 版本" "的向后兼容性。该版本的主要目标是：" @@ -18709,8 +18802,13 @@ msgstr "更好的文档：https://docs.pgrouting.org" msgid "shooting_star is discontinued" msgstr "shooting_star 已停用" -msgid "pgRouting 1.x Release Notes" -msgstr "pgRouting 1.x 发布说明" +#, fuzzy +msgid "pgRouting 1" +msgstr "pgRouting 版本" + +#, fuzzy +msgid "pgRouting 1.0" +msgstr "pgRouting 版本" msgid "" "To see the issues closed by this release see the `Git closed issues for 1.x " @@ -19623,6 +19721,15 @@ msgstr "pgr_withPointsDD 是**带有点**的 pgr_drivenDistance" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "pgr_withPointsvia 是**带有点**的 pgr_dijkstraVia" +#~ msgid "" +#~ "Column ``pred`` only applies to :doc:`pgr_drivingDistance` and :doc:" +#~ "`pgr_withPointsDD`." +#~ msgstr "" +#~ "列``pred``仅适用于 :doc:`pgr_drivingDistance` 和:doc:`pgr_withPointsDD`。" + +#~ msgid "pgRouting 1.x Release Notes" +#~ msgstr "pgRouting 1.x 发布说明" + #~ msgid "" #~ "Aniket Agarwal, Aryan Gupta, Ashish Kumar, Cayetano Benavent, Daniel " #~ "Kastl, Nitish Chauhan, Rajat Shinde, Regina Obe, Shobhit Chaurasia, " From da404580ebd20e0c5092922cceaf935cb15450ec Mon Sep 17 00:00:00 2001 From: DeepL Date: Sat, 6 Jan 2024 21:52:08 +0000 Subject: [PATCH 205/428] Translated using Weblate (Spanish) Currently translated at 89.4% (4650 of 5199 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 90 +++++++------------ 1 file changed, 33 insertions(+), 57 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index c31bceea6a..40149f4112 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -5,13 +5,14 @@ # Pedro Jose Rios Vergara , 2022. # Celia Virginia Vergara Castillo , 2022. # Celia Virginia Vergara Castillo , 2023. +# DeepL , 2024. msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-01-06 18:14+0000\n" -"PO-Revision-Date: 2023-10-21 03:23+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"PO-Revision-Date: 2024-01-06 22:00+0000\n" +"Last-Translator: DeepL \n" "Language-Team: Spanish \n" "Language: es\n" @@ -19,7 +20,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 5.0\n" +"X-Generator: Weblate 5.3\n" "Generated-By: Babel 2.10.3\n" msgid "BFS - Category" @@ -4930,14 +4931,13 @@ msgid ":doc:`release_notes`" msgstr ":doc:`release_notes`" msgid "Current release" -msgstr "" +msgstr "Versión actual" msgid "_" msgstr "" -#, fuzzy msgid "Code enhancement" -msgstr "Mejora de código C/C++" +msgstr "Mejora del código" #, fuzzy msgid "" @@ -4947,18 +4947,17 @@ msgstr "" "`#2505 `__ Usando " "namespace." -#, fuzzy msgid "Others" -msgstr "plumas" +msgstr "Otros" msgid "Adjust NEWS generator" -msgstr "" +msgstr "Ajustar el generador NEWS" msgid "Name change to `NEWS.md` for better visualization on GitHub" -msgstr "" +msgstr "Cambio de nombre a `NEWS.md` para una mejor visualización en GitHub" msgid "All releases" -msgstr "" +msgstr "Todas las ediciones" msgid "Kruskal - Family of functions" msgstr "Kruskal - Familia de funciones" @@ -7738,12 +7737,11 @@ msgstr "" msgid "Upgrading the database" msgstr "Actualización de la base de datos" -#, fuzzy msgid "" "To upgrade pgRouting in the database to version 3.7.0 use the following " "command:" msgstr "" -"Para actualizar pgRouting en la base de datos a la versión 3.6.0 utilice el " +"Para actualizar pgRouting en la base de datos a la versión 3.7.0 utilice el " "siguiente comando:" msgid "" @@ -8119,13 +8117,11 @@ msgstr "Colaboradores" msgid "This Release Contributors" msgstr "Colaboradores de esta Versión" -#, fuzzy msgid "Individuals in this release v3.7.x (in alphabetical order)" -msgstr "Personas en este lanzamiento (en orden alfabético)" +msgstr "Elementos de esta versión v3.7.x (por orden alfabético)" -#, fuzzy msgid "(Alphabetical order)" -msgstr "Personas (en orden alfabético)" +msgstr "(Orden alfabético)" msgid "Regina Obe, Vicky Vergara" msgstr "" @@ -17500,20 +17496,17 @@ msgstr "" msgid "Mayors" msgstr "" -#, fuzzy msgid "pgRouting 3" -msgstr "Versión de pgRouting" +msgstr "pgRouting 3" msgid "Minors 3.x" msgstr "" -#, fuzzy msgid "pgRouting 3.7" -msgstr "Versión de pgRouting" +msgstr "pgRouting 3.7" -#, fuzzy msgid "pgRouting 3.7.0 Release Notes" -msgstr "Notas de la versión 3.6.0 de pgRouting" +msgstr "Notas de la versión de pgRouting 3.7.0" #, fuzzy msgid "" @@ -17525,9 +17518,8 @@ msgstr "" "versión, consulte la `meta cerrada 3.6.0 `_" -#, fuzzy msgid "pgRouting 3.6" -msgstr "Versión de pgRouting" +msgstr "pgRouting 3.6" #, fuzzy msgid "pgRouting 3.6.1 Release Notes" @@ -17706,9 +17698,8 @@ msgid "" "On new internal function: do not use named parameters and default parameters." msgstr "" -#, fuzzy msgid "pgRouting 3.5" -msgstr "Versión de pgRouting" +msgstr "pgRouting 3.5" msgid "pgRouting 3.5.1 Release Notes" msgstr "Notas de la versión 3.5.1 de pgRouting" @@ -17815,9 +17806,8 @@ msgstr "``pgr_dijkstra`` (`Uno a Muchos`) ha añadido la columna ``end_vid``." msgid "``pgr_dijkstra`` (`Many to One`) added ``start_vid`` column." msgstr "``pgr_dijkstra`` (`Muchos a Uno`) ha añadido la columna ``start_vid``." -#, fuzzy msgid "pgRouting 3.4" -msgstr "Versión de pgRouting" +msgstr "pgRouting 3.4" msgid "pgRouting 3.4.2 Release Notes" msgstr "Notas de la versión 3.4.2 de pgRouting" @@ -17986,9 +17976,8 @@ msgstr "``pgr_trsp(text,integer,float8,integer,float8,boolean,boolean,text)``" msgid "``pgr_trspViaEdges(text,integer[],float[],boolean,boolean,text)``" msgstr "" -#, fuzzy msgid "pgRouting 3.3" -msgstr "Versión de pgRouting" +msgstr "pgRouting 3.3" msgid "pgRouting 3.3.5 Release Notes" msgstr "Notas de la versión 3.3.5 de pgRouting" @@ -18215,9 +18204,8 @@ msgstr "pgr_depthFirstSearch (Vértices múltiples)" msgid "pgr_depthFirstSearch(Single vertex)" msgstr "pgr_depthFirstSearch (Vértice único)" -#, fuzzy msgid "pgRouting 3.2" -msgstr "Versión de pgRouting" +msgstr "pgRouting 3.2" msgid "pgRouting 3.2.2 Release Notes" msgstr "Notas de la Versión 3.2.2 de pgRouting" @@ -18379,9 +18367,8 @@ msgstr "pgr_maxFlow(Combinaciones)" msgid "pgr_pushRelabel(Combinations)" msgstr "pgr_pushRelabel(Combinaciones)" -#, fuzzy msgid "pgRouting 3.1" -msgstr "Versión de pgRouting" +msgstr "pgRouting 3.1" msgid "pgRouting 3.1.4 Release Notes" msgstr "Notas de la Versión 3.1.4 de pgRouting" @@ -18554,9 +18541,8 @@ msgstr "Crear cambios" msgid "Minimal requirement for Sphinx: version 1.8" msgstr "Requerimientos mínimos para Sphinx: versión 1.8" -#, fuzzy msgid "pgRouting 3.0" -msgstr "Versión de pgRouting" +msgstr "pgRouting 3.0" msgid "pgRouting 3.0.6 Release Notes" msgstr "Notas de la Versión 3.0.6 de pgRouting" @@ -19016,16 +19002,14 @@ msgstr "pgr_pointsAsPolygon" msgid "pgr_alphaShape old signature" msgstr "pgr_alphaShape firma antigua" -#, fuzzy msgid "pgRouting 2" -msgstr "Versión de pgRouting" +msgstr "pgRouting 2" msgid "Minors 2.x" msgstr "" -#, fuzzy msgid "pgRouting 2.6" -msgstr "Versión de pgRouting" +msgstr "pgRouting 2.6" msgid "pgRouting 2.6.3 Release Notes" msgstr "pgRouting 2.6.3 Notas de la Versión" @@ -19244,9 +19228,8 @@ msgstr "El código interno puede aceptar BIGINT" msgid "Cleaned the internal code of withPoints" msgstr "Limpiado el código interno de withPoints" -#, fuzzy msgid "pgRouting 2.5" -msgstr "Versión de pgRouting" +msgstr "pgRouting 2.5" msgid "pgRouting 2.5.5 Release Notes" msgstr "Notas de la versión de PgRouting 2.5.5" @@ -19409,9 +19392,8 @@ msgstr "Funcion Obsoleta" msgid "pgr_pointToEdgeNode" msgstr "pgr_pointToEdgeNode" -#, fuzzy msgid "pgRouting 2.4" -msgstr "Versión de pgRouting" +msgstr "pgRouting 2.4" msgid "pgRouting 2.4.2 Release Notes" msgstr "Notas de la versión de pgRouting 2.4.2" @@ -19517,9 +19499,8 @@ msgstr "" "El código original de TRSP se utiliza sin cambios en las advertencias de " "compilación" -#, fuzzy msgid "pgRouting 2.3" -msgstr "Versión de pgRouting" +msgstr "pgRouting 2.3" msgid "pgRouting 2.3.2 Release Notes" msgstr "Notas de la versión de pgRouting 2.3.2" @@ -19656,9 +19637,8 @@ msgstr "pgr_pointsToDMatrix" msgid "pgr_textToPoints" msgstr "pgr_textToPoints" -#, fuzzy msgid "pgRouting 2.2" -msgstr "Versión de pgRouting" +msgstr "pgRouting 2.2" msgid "pgRouting 2.2.4 Release Notes" msgstr "Notas de la versión de pgRouting 2.2.4" @@ -19825,9 +19805,8 @@ msgstr "Función Renombrada y Obsoleta" msgid "pgr_makeDistanceMatrix renamed to _pgr_makeDistanceMatrix" msgstr "pgr_makeDistanceMatrix renombrado a _pgr_makeDistanceMatrix" -#, fuzzy msgid "pgRouting 2.1" -msgstr "Versión de pgRouting" +msgstr "pgRouting 2.1" msgid "pgRouting 2.1.0 Release Notes" msgstr "Notas de la versión de pgRouting 2.1.0" @@ -19991,9 +19970,8 @@ msgstr "" "En lugar de generar muchas bibliotecas: - Todas las funciones están " "encapsuladas en una biblioteca - La biblioteca tiene el prefijo 2-1-0" -#, fuzzy msgid "pgRouting 2.0" -msgstr "Versión de pgRouting" +msgstr "pgRouting 2.0" msgid "pgRouting 2.0.1 Release Notes" msgstr "Notas de la versión de pgRouting 2.0.1" @@ -20153,13 +20131,11 @@ msgstr "Mejor documentación: https://docs.pgrouting.org" msgid "shooting_star is discontinued" msgstr "shooting_star está descontinuado" -#, fuzzy msgid "pgRouting 1" -msgstr "Versión de pgRouting" +msgstr "pgRouting 1" -#, fuzzy msgid "pgRouting 1.0" -msgstr "Versión de pgRouting" +msgstr "pgRouting 1.0" msgid "" "To see the issues closed by this release see the `Git closed issues for 1.x " From b1760540f074d20a435cc361b1663848c50ea6af Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Sat, 6 Jan 2024 21:54:23 +0000 Subject: [PATCH 206/428] Translated using Weblate (Spanish) Currently translated at 89.4% (4650 of 5199 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 32 ++++++++----------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 40149f4112..abae8c2d02 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -4,7 +4,7 @@ # FIRST AUTHOR , 2022. # Pedro Jose Rios Vergara , 2022. # Celia Virginia Vergara Castillo , 2022. -# Celia Virginia Vergara Castillo , 2023. +# Celia Virginia Vergara Castillo , 2023, 2024. # DeepL , 2024. msgid "" msgstr "" @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-01-06 18:14+0000\n" "PO-Revision-Date: 2024-01-06 22:00+0000\n" -"Last-Translator: DeepL \n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" "Language: es\n" @@ -4939,13 +4939,12 @@ msgstr "" msgid "Code enhancement" msgstr "Mejora del código" -#, fuzzy msgid "" "`#2599 `__ Driving " "distance cleanup" msgstr "" -"`#2505 `__ Usando " -"namespace." +"`#2599 `__ Limpiando " +"Driving Distance" msgid "Others" msgstr "Otros" @@ -17508,40 +17507,36 @@ msgstr "pgRouting 3.7" msgid "pgRouting 3.7.0 Release Notes" msgstr "Notas de la versión de pgRouting 3.7.0" -#, fuzzy msgid "" "To see all issues & pull requests closed by this release see the `Git closed " "milestone for 3.7.0 `__" msgstr "" "Para ver todos los problemas y solicitudes de extracción cerrados para ésta " -"versión, consulte la `meta cerrada 3.6.0 `_" +"versión, consulte la `meta cerrada 3.7.0 `_" msgid "pgRouting 3.6" msgstr "pgRouting 3.6" -#, fuzzy msgid "pgRouting 3.6.1 Release Notes" -msgstr "Notas de la versión 3.6.0 de pgRouting" +msgstr "Notas de la versión 3.6.1 de pgRouting" -#, fuzzy msgid "" "To see all issues & pull requests closed by this release see the `Git closed " "milestone for 3.6.1 `_" msgstr "" "Para ver todos los problemas y solicitudes de extracción cerrados para ésta " -"versión, consulte la `meta cerrada 3.6.0 `_" +"versión, consulte la `meta cerrada 3.6.1 `_" -#, fuzzy msgid "" "`#2588 `__ pgrouting 3.6.0 " "fails to build on OSX" msgstr "" -"`#2400 `__: pgRouting " -"3.3.3 no es construido en focal" +"`#2588 `__ pgrouting 3.6.0 " +"no construye en OSX" msgid "pgRouting 3.6.0 Release Notes" msgstr "Notas de la versión 3.6.0 de pgRouting" @@ -19994,15 +19989,14 @@ msgstr "" "issues for 2.0.0 `_ on Github." -#, fuzzy msgid "" "With the release of pgRouting 2.0.0 the library has abandoned backwards " "compatibility to `pgRouting 1.0`_ releases. The main Goals for this release " "are:" msgstr "" "Con la versión de pgRouting 2.0.0, la biblioteca ha abandonado la " -"compatibilidad con versiones anteriores a las versiones `pgRouting 1.x " -"Release Notes`_. Los principales objetivos de esta versión son:" +"compatibilidad con versiones anteriores a las versiones `pgRouting 1.0`_. " +"Los principales objetivos de esta versión son:" msgid "Major restructuring of pgRouting." msgstr "Mayor reestructuración de pgRouting." From 9e3216dc5e3f69583af0bdd62da1686a47d83492 Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Sat, 6 Jan 2024 22:07:51 +0000 Subject: [PATCH 207/428] Translated using Weblate (Spanish) Currently translated at 90.3% (4697 of 5199 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 96 ++++++++++++++----- 1 file changed, 70 insertions(+), 26 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index abae8c2d02..d12d0d937a 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-01-06 18:14+0000\n" -"PO-Revision-Date: 2024-01-06 22:00+0000\n" +"PO-Revision-Date: 2024-01-07 23:45+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" @@ -4956,7 +4956,7 @@ msgid "Name change to `NEWS.md` for better visualization on GitHub" msgstr "Cambio de nombre a `NEWS.md` para una mejor visualización en GitHub" msgid "All releases" -msgstr "Todas las ediciones" +msgstr "Todas las versiones" msgid "Kruskal - Family of functions" msgstr "Kruskal - Familia de funciones" @@ -6961,110 +6961,141 @@ msgid "" "A fairly good method of finding out if contraction can be useful is because " "of the number of dead ends and/or the number of linear edges." msgstr "" +"Un método bastante bueno para saber si la contracción puede ser útil es por " +"el número de callejones sin salida y/o el número de aristas lineales." msgid "" "A complete method on how to contract and how to use the contracted graph is " "described on :doc:`contraction-family`" msgstr "" +"En :doc:`contraction-family` se describe un método completo sobre cómo " +"contraer y cómo utilizar el grafo contraído." msgid "Dead ends" msgstr "Callejones sin salida" msgid "To get the dead ends:" -msgstr "" +msgstr "Para obtener los callejones sin salida:" msgid "" "That information is correct, for example, when the dead end is on the limit " "of the imported graph." msgstr "" +"Esa información es correcta, por ejemplo, cuando el punto muerto está en el " +"límite del gráfico importado." msgid "" "Visually node :math:`4` looks to be as start/ending of 3 edges, but it is " "not." msgstr "" +"Visualmente el nodo :math:`4` parece ser el inicio/final de 3 aristas, pero " +"no lo es." msgid "Is that correct?" -msgstr "" +msgstr "¿Es correcto?" msgid "Is there such a small curb:" -msgstr "" +msgstr "Hay un bordillo tan pequeño:" msgid "That does not allow a vehicle to use that visual intersection?" -msgstr "" +msgstr "¿Eso no permite a un vehículo utilizar esa intersección visual?" msgid "" "Is the application for pedestrians and therefore the pedestrian can easily " "walk on the small curb?" msgstr "" +"¿Es la aplicación para peatones y por lo tanto el peatón puede caminar " +"fácilmente en una acera pequeña?" msgid "" "Is the application for the electricity and the electrical lines than can " "easily be extended on top of the small curb?" msgstr "" +"¿Es la aplicación para la electricidad y las líneas eléctricas que se puede " +"extender fácilmente en la parte superior de la acera pequeña?" msgid "" "Is there a big cliff and from eagles view look like the dead end is close to " "the segment?" msgstr "" +"¿Hay un gran acantilado y desde la vista de las águilas parece que el " +"callejón sin salida está cerca del segmento?" msgid "" "When there are many dead ends, to speed up, the :doc:`contraction-family` " "functions can be used to divide the problem." msgstr "" +"Cuando hay muchos callejones sin salida, para acelerar, se pueden utilizar " +"las funciones de :doc:`contraction-family` para dividir el problema." msgid "Linear edges" -msgstr "" +msgstr "Bordes lineales" msgid "To get the linear edges:" -msgstr "" +msgstr "Para obtener las aristas lineales:" msgid "" "This information is correct, for example, when the application is taking " "into account speed bumps, stop signals." msgstr "" +"Esta información es correcta, por ejemplo, cuando la aplicación tiene en " +"cuenta los topes o las señales de stop." msgid "" "When there are many linear edges, to speed up, the :doc:`contraction-family` " "functions can be used to divide the problem." msgstr "" +"Cuando hay muchas aristas lineales, para acelerar, se pueden utilizar las " +"funciones :doc:`contraction-family` para dividir el problema." msgid "Function's structure" -msgstr "" +msgstr "Estructura de la función" msgid "" "Once the graph preparation work has been done above, it is time to use a" msgstr "" +"Una vez realizado el trabajo de preparación del grafo anterior, es el " +"momento de utilizar un" msgid "The general form of a pgRouting function call is:" msgstr "La forma general de una llamada a una función de pgRouting es:" msgid "\\ \\" -msgstr "" +msgstr "\\ \\" msgid "pgr_(`Inner queries`_, **parameters**, [ ``Optional parameters``)" msgstr "" +"pgr_(`Consultas internas`_, **parámetros**, [ ``Parámetros " +"opcionales``)" msgid "" "`Inner queries`_: Are compulsory parameters that are ``TEXT`` strings " "containing SQL queries." msgstr "" +"`Consultas internas`_: Son parámetros obligatorios que son ``TEXT`` que " +"contienen consultas SQL." msgid "" "**parameters**: Additional compulsory parameters needed by the function." msgstr "" +"**Parámetros**: Parámetros obligatorios adicionales que necesita la función." msgid "" "``Optional parameters``: Are non compulsory **named** parameters that have a " "default value when omitted." msgstr "" +"``Parámetros opcionales``: Son parámetros **nombrados** no obligatorios que " +"tienen un valor por defecto cuando se omiten." msgid "" "The compulsory parameters are positional parameters, the optional parameters " "are named parameters." msgstr "" +"Los parámetros obligatorios son parámetros de posición, los parámetros " +"opcionales son parámetros nombrados." msgid "For example, for this :doc:`pgr_dijkstra` signature:" -msgstr "" +msgstr "Por ejemplo, para esta firma :doc:`pgr_dijkstra`:" msgid "" "pgr_dijkstra(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" @@ -7075,18 +7106,20 @@ msgid "`Edges SQL`_:" msgstr "`SQL de aristas`_:" msgid "Is the first parameter." -msgstr "" +msgstr "Es el primer parámetro." msgid "It is compulsory." -msgstr "" +msgstr "Es obligatorio." msgid "It is an inner query." -msgstr "" +msgstr "Es una consulta interna." msgid "" "It has no name, so **Edges SQL** gives an idea of what kind of inner query " "needs to be used" msgstr "" +"No tiene nombre, por lo que **SQL de aristas** da una idea del tipo de " +"consulta interna que hay que utilizar" msgid "**start vid**:" msgstr "**vid inical**:" @@ -7098,34 +7131,41 @@ msgid "" "It has no name, so **start vid** gives an idea of what the second " "parameter's value should contain." msgstr "" +"No tiene nombre, por lo que **salida** da una idea de lo que debe contener " +"el valor del segundo parámetro." msgid "Is the third parameter." -msgstr "" +msgstr "Es el tercer parámetro." msgid "" "It has no name, so **end vid** gives an idea of what the third parameter's " "value should contain" msgstr "" +"No tiene nombre, por lo que **destino** da una idea de lo que debe contener " +"el valor del tercer parámetro" msgid "Is the fourth parameter." -msgstr "" +msgstr "Es el cuarto parámetro." msgid "It is optional." -msgstr "" +msgstr "Es opcional." msgid "It has a name." -msgstr "" +msgstr "Tiene un nombre." msgid "" "The full description of the parameters are found on the `Parameters`_ " "section of each function." msgstr "" +"La descripción completa de los parámetros se encuentra en la sección " +"`Parámetros`_ de cada función." msgid "Function's overloads" -msgstr "" +msgstr "Sobrecargas de funciones" msgid "A function might have different overloads. The most common are called:" msgstr "" +"Una función puede tener diferentes sobrecargas. Las más comunes se llaman" msgid "`One to One`_" msgstr "`Uno a Uno`_" @@ -7146,15 +7186,17 @@ msgid "Depending on the overload the parameters types change." msgstr "Dependiendo de la sobrecarga, los tipos de los parámetros cambian." msgid "**One**: **ANY-INTEGER**" -msgstr "" +msgstr "**Uno**: **CUALQUIER-ENTERO**" msgid "**Many**: ``ARRAY`` [**ANY-INTEGER**]" -msgstr "" +msgstr "**Muchos**: ``ARRAY`` [**CUALQUIER-ENTERO**]" msgid "" "Depending of the function the overloads may vary. But the concept of " "parameter type change remains the same." msgstr "" +"Dependiendo de la función, las sobrecargas pueden variar. Pero el concepto " +"de cambio de tipo de parámetro sigue siendo el mismo." msgid "One to One" msgstr "Uno a Uno" @@ -7219,13 +7261,13 @@ msgid ":doc:`withPoints-family`" msgstr ":doc:`withPoints-family`" msgid "Some uncategorised functions" -msgstr "" +msgstr "Algunas funciones no categorizadas" msgid "General without ``id``" -msgstr "" +msgstr "General sin ``id``" msgid "General with (X,Y)" -msgstr "" +msgstr "General con (X,Y)" msgid "" "When negative: edge (``source``, ``target``) does not exist, therefore it's " @@ -7265,10 +7307,10 @@ msgid "Flow" msgstr "Flujo" msgid "Edges SQL for :doc:`flow-family`" -msgstr "" +msgstr "SQL de aristas para :doc:`flow-family`" msgid "Edges SQL for the following functions of :doc:`flow-family`" -msgstr "" +msgstr "SQL de aristas para las siguientes funciones de :doc:`flow-family`." msgid "Used in combination signatures" msgstr "Utilizado en combinación firmas" @@ -7280,6 +7322,8 @@ msgid "" "The main parameter of the majority of the pgRouting functions is a query " "that selects the edges of the graph." msgstr "" +"El parámetro principal de la mayoría de las funciones pgRouting es una " +"consulta que selecciona las aristas del grafo." msgid "" "Depending on the family or category of a function it will have additional " From 8b2cf2ea085d328b9f4442869eef3b60bbd5f253 Mon Sep 17 00:00:00 2001 From: DeepL Date: Fri, 19 Jan 2024 06:47:17 +0000 Subject: [PATCH 208/428] Translated using Weblate (Chinese (Simplified)) Currently translated at 99.5% (5175 of 5199 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ --- .../zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index d721d9b9b9..4df55048c7 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-01-06 18:14+0000\n" -"PO-Revision-Date: 2024-01-05 03:00+0000\n" +"PO-Revision-Date: 2024-01-19 06:48+0000\n" "Last-Translator: DeepL \n" "Language-Team: Chinese (Simplified) \n" @@ -4548,10 +4548,10 @@ msgid ":doc:`release_notes`" msgstr ":doc:`release_notes`" msgid "Current release" -msgstr "" +msgstr "当前版本" msgid "_" -msgstr "" +msgstr "_" msgid "Code enhancement" msgstr "代码改进" @@ -4562,18 +4562,17 @@ msgid "" msgstr "" "`#2599 `__ 行车距离清理" -#, fuzzy msgid "Others" -msgstr "羽毛" +msgstr "其他" msgid "Adjust NEWS generator" -msgstr "" +msgstr "调整新闻生成器" msgid "Name change to `NEWS.md` for better visualization on GitHub" -msgstr "" +msgstr "更名为 \"NEWS.md\"，以便在 GitHub 上更好地可视化" msgid "All releases" -msgstr "" +msgstr "所有版本" msgid "Kruskal - Family of functions" msgstr "Kruskal - 函数族" From 7c56b54a79cb32245824b05791e9b8402ab1e122 Mon Sep 17 00:00:00 2001 From: DeepL Date: Fri, 19 Jan 2024 09:16:16 +0000 Subject: [PATCH 209/428] Translated using Weblate (Chinese (Simplified)) Currently translated at 99.5% (5178 of 5199 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ --- locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 4df55048c7..934e27f635 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-01-06 18:14+0000\n" -"PO-Revision-Date: 2024-01-19 06:48+0000\n" +"PO-Revision-Date: 2024-01-19 09:21+0000\n" "Last-Translator: DeepL \n" "Language-Team: Chinese (Simplified) \n" @@ -16219,12 +16219,11 @@ msgstr "" msgid "Mayors" msgstr "" -#, fuzzy msgid "pgRouting 3" -msgstr "pgRouting 版本" +msgstr "pgRouting 3" msgid "Minors 3.x" -msgstr "" +msgstr "未成年人 3.x" #, fuzzy msgid "pgRouting 3.7" From ac8a05de1e1bc330903c6b6c2284430c5fa75ff1 Mon Sep 17 00:00:00 2001 From: Zuochenwei Date: Fri, 19 Jan 2024 06:49:10 +0000 Subject: [PATCH 210/428] Translated using Weblate (Chinese (Simplified)) Currently translated at 99.5% (5178 of 5199 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ --- locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 934e27f635..69ea4b1fc9 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-01-06 18:14+0000\n" "PO-Revision-Date: 2024-01-19 09:21+0000\n" -"Last-Translator: DeepL \n" +"Last-Translator: Zuochenwei \n" "Language-Team: Chinese (Simplified) \n" "Language: zh_Hans\n" @@ -4569,7 +4569,7 @@ msgid "Adjust NEWS generator" msgstr "调整新闻生成器" msgid "Name change to `NEWS.md` for better visualization on GitHub" -msgstr "更名为 \"NEWS.md\"，以便在 GitHub 上更好地可视化" +msgstr "更名为 `NEWS.md` ，以便在 GitHub 上更好地可视化" msgid "All releases" msgstr "所有版本" @@ -16217,7 +16217,7 @@ msgstr "" "pgRouting/pgrouting/commits>`_。" msgid "Mayors" -msgstr "" +msgstr "主要版本" msgid "pgRouting 3" msgstr "pgRouting 3" From 88d61b049b90dc140523fcf6efda714ddd04ef22 Mon Sep 17 00:00:00 2001 From: DeepL Date: Fri, 19 Jan 2024 09:22:18 +0000 Subject: [PATCH 211/428] Translated using Weblate (Chinese (Simplified)) Currently translated at 99.9% (5197 of 5199 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ --- .../LC_MESSAGES/pgrouting_doc_strings.po | 58 +++++++------------ 1 file changed, 20 insertions(+), 38 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 69ea4b1fc9..c8973112c1 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-01-06 18:14+0000\n" -"PO-Revision-Date: 2024-01-19 09:21+0000\n" -"Last-Translator: Zuochenwei \n" +"PO-Revision-Date: 2024-01-19 09:26+0000\n" +"Last-Translator: DeepL \n" "Language-Team: Chinese (Simplified) \n" "Language: zh_Hans\n" @@ -16225,9 +16225,8 @@ msgstr "pgRouting 3" msgid "Minors 3.x" msgstr "未成年人 3.x" -#, fuzzy msgid "pgRouting 3.7" -msgstr "pgRouting 版本" +msgstr "pgRouting 3.7" msgid "pgRouting 3.7.0 Release Notes" msgstr "pgRouting 3.7.0 发布说明" @@ -16242,9 +16241,8 @@ msgstr "" "pgRouting/pgrouting/issues?" "utf8=%E2%9C%93&q=milestone%3A%22Release%203.7.0%22>`_ 的 Git 关闭里程碑" -#, fuzzy msgid "pgRouting 3.6" -msgstr "pgRouting 版本" +msgstr "pgRouting 3.6" msgid "pgRouting 3.6.1 Release Notes" msgstr "pgRouting 3.6.1 发布说明" @@ -16414,9 +16412,8 @@ msgid "" "On new internal function: do not use named parameters and default parameters." msgstr "新内部函数：不使用命名参数和默认参数。" -#, fuzzy msgid "pgRouting 3.5" -msgstr "pgRouting 版本" +msgstr "pgRouting 3.5" msgid "pgRouting 3.5.1 Release Notes" msgstr "pgRouting 3.5.1 发布说明" @@ -16521,9 +16518,8 @@ msgstr "``pgr_dijkstra``（`一对多`）添加了 ``end_vid``列。" msgid "``pgr_dijkstra`` (`Many to One`) added ``start_vid`` column." msgstr "``pgr_dijkstra`` （`多对一`）添加了 ``start_vid`` 列。" -#, fuzzy msgid "pgRouting 3.4" -msgstr "pgRouting 版本" +msgstr "pgRouting 3.4" msgid "pgRouting 3.4.2 Release Notes" msgstr "pgRouting 3.4.2 发布说明" @@ -16693,9 +16689,8 @@ msgstr "``pgr_trsp(text,integer,float8,integer,float8,boolean,boolean,text)``" msgid "``pgr_trspViaEdges(text,integer[],float[],boolean,boolean,text)``" msgstr "``pgr_trspViaEdges(text,integer[],float[],boolean,boolean,text)``" -#, fuzzy msgid "pgRouting 3.3" -msgstr "pgRouting 版本" +msgstr "pgRouting 3.3" msgid "pgRouting 3.3.5 Release Notes" msgstr "pgRouting 3.3.5 发布说明" @@ -16925,9 +16920,8 @@ msgstr "pgr_depthFirstSearch（多顶点）" msgid "pgr_depthFirstSearch(Single vertex)" msgstr "pgr_depthFirstSearch( 单顶点 )" -#, fuzzy msgid "pgRouting 3.2" -msgstr "pgRouting 版本" +msgstr "pgRouting 3.2" msgid "pgRouting 3.2.2 Release Notes" msgstr "pgRouting 3.2.2 发布说明" @@ -17082,9 +17076,8 @@ msgstr "pgr_maxFlow(组合)" msgid "pgr_pushRelabel(Combinations)" msgstr "pgr_pushRelabel(组合)" -#, fuzzy msgid "pgRouting 3.1" -msgstr "pgRouting 版本" +msgstr "pgRouting 3.1" msgid "pgRouting 3.1.4 Release Notes" msgstr "pgRouting 3.1.4 发布说明" @@ -17252,9 +17245,8 @@ msgstr "构建变更" msgid "Minimal requirement for Sphinx: version 1.8" msgstr "对 Sphinx 的最低要求：1.8 版本" -#, fuzzy msgid "pgRouting 3.0" -msgstr "pgRouting 版本" +msgstr "pgRouting 3.0" msgid "pgRouting 3.0.6 Release Notes" msgstr "pgRouting 3.0.6 发布说明" @@ -17709,16 +17701,14 @@ msgstr "pgr_pointsAsPolygon" msgid "pgr_alphaShape old signature" msgstr "pgr_alphaShape 旧签名" -#, fuzzy msgid "pgRouting 2" -msgstr "pgRouting 版本" +msgstr "pgRouting 2" msgid "Minors 2.x" msgstr "" -#, fuzzy msgid "pgRouting 2.6" -msgstr "pgRouting 版本" +msgstr "pgRouting 2.6" msgid "pgRouting 2.6.3 Release Notes" msgstr "pgRouting 2.6.3 发布说明" @@ -17936,9 +17926,8 @@ msgstr "内部代码可接受 BIGINT" msgid "Cleaned the internal code of withPoints" msgstr "清理了 withPoints 的内部代码" -#, fuzzy msgid "pgRouting 2.5" -msgstr "pgRouting 版本" +msgstr "pgRouting 2.5" msgid "pgRouting 2.5.5 Release Notes" msgstr "pgRouting 2.5.5 发布说明" @@ -18095,9 +18084,8 @@ msgstr "已废弃的功能" msgid "pgr_pointToEdgeNode" msgstr "pgr_pointtoEdgeNode" -#, fuzzy msgid "pgRouting 2.4" -msgstr "pgRouting 版本" +msgstr "pgRouting 2.4" msgid "pgRouting 2.4.2 Release Notes" msgstr "pgRouting 2.4.2 发布说明" @@ -18199,9 +18187,8 @@ msgstr "pgr_withPointsKSP:修复了排序问题" msgid "TRSP original code is used with no changes on the compilation warnings" msgstr "使用 TRSP 原始代码，未对编译警告进行任何修改" -#, fuzzy msgid "pgRouting 2.3" -msgstr "pgRouting 版本" +msgstr "pgRouting 2.3" msgid "pgRouting 2.3.2 Release Notes" msgstr "pgRouting 2.3.2 发布说明" @@ -18335,9 +18322,8 @@ msgstr "pgr_pointsToDMatrix" msgid "pgr_textToPoints" msgstr "pgr_textToPoints" -#, fuzzy msgid "pgRouting 2.2" -msgstr "pgRouting 版本" +msgstr "pgRouting 2.2" msgid "pgRouting 2.2.4 Release Notes" msgstr "pgRouting 2.2.4 发布说明" @@ -18503,9 +18489,8 @@ msgstr "已更名和废弃的函数" msgid "pgr_makeDistanceMatrix renamed to _pgr_makeDistanceMatrix" msgstr "pgr_makeDistanceMatrix 更名为 _pgr_makeDistanceMatrix" -#, fuzzy msgid "pgRouting 2.1" -msgstr "pgRouting 版本" +msgstr "pgRouting 2.1" msgid "pgRouting 2.1.0 Release Notes" msgstr "pgRouting 2.1.0 发布说明" @@ -18653,9 +18638,8 @@ msgid "" msgstr "" "无需生成多个程序库： - 所有功能都封装在一个程序库中 - 程序库的前缀为 2-1-0" -#, fuzzy msgid "pgRouting 2.0" -msgstr "pgRouting 版本" +msgstr "pgRouting 2.0" msgid "pgRouting 2.0.1 Release Notes" msgstr "pgRouting 2.0.1 发布说明" @@ -18678,14 +18662,12 @@ msgstr "" "github.com/pgRouting/pgrouting/issues?" "q=milestone%3A%22Release+2.0.0%22+is%3Aclosed>`_ 。" -#, fuzzy msgid "" "With the release of pgRouting 2.0.0 the library has abandoned backwards " "compatibility to `pgRouting 1.0`_ releases. The main Goals for this release " "are:" -msgstr "" -"随着 pgRouting 2.0.0 版本的发布，该库已放弃与 `pgRouting 1.x 发行说明`_ 版本" -"的向后兼容性。该版本的主要目标是：" +msgstr "随着 pgRouting 2.0.0 的发布，该库已放弃向后兼容 `pgRouting 1.0`_ " +"版本。此版本的主要目标是" msgid "Major restructuring of pgRouting." msgstr "对 pgRouting 进行重大重组。" From 2db34e2b329a54b9c774365c5e04997ad350beaa Mon Sep 17 00:00:00 2001 From: Zuochenwei Date: Fri, 19 Jan 2024 09:24:24 +0000 Subject: [PATCH 212/428] Translated using Weblate (Chinese (Simplified)) Currently translated at 99.9% (5197 of 5199 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ --- locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index c8973112c1..740c09e98e 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-01-06 18:14+0000\n" "PO-Revision-Date: 2024-01-19 09:26+0000\n" -"Last-Translator: DeepL \n" +"Last-Translator: Zuochenwei \n" "Language-Team: Chinese (Simplified) \n" "Language: zh_Hans\n" @@ -16223,7 +16223,7 @@ msgid "pgRouting 3" msgstr "pgRouting 3" msgid "Minors 3.x" -msgstr "未成年人 3.x" +msgstr "3.x小版本" msgid "pgRouting 3.7" msgstr "pgRouting 3.7" @@ -16231,15 +16231,14 @@ msgstr "pgRouting 3.7" msgid "pgRouting 3.7.0 Release Notes" msgstr "pgRouting 3.7.0 发布说明" -#, fuzzy msgid "" "To see all issues & pull requests closed by this release see the `Git closed " "milestone for 3.7.0 `__" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 `3.7.0 `_ 的 Git 关闭里程碑" +"pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.7." +"0%22>`__ 的 Git 关闭里程碑" msgid "pgRouting 3.6" msgstr "pgRouting 3.6" @@ -17705,7 +17704,7 @@ msgid "pgRouting 2" msgstr "pgRouting 2" msgid "Minors 2.x" -msgstr "" +msgstr "2.x小版本" msgid "pgRouting 2.6" msgstr "pgRouting 2.6" From 7134ad0b44e6acf8abfc931188a8723c11dc5461 Mon Sep 17 00:00:00 2001 From: DeepL Date: Fri, 19 Jan 2024 09:26:12 +0000 Subject: [PATCH 213/428] Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (5199 of 5199 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ --- locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 740c09e98e..77684cd953 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-01-06 18:14+0000\n" -"PO-Revision-Date: 2024-01-19 09:26+0000\n" -"Last-Translator: Zuochenwei \n" +"PO-Revision-Date: 2024-01-19 09:46+0000\n" +"Last-Translator: DeepL \n" "Language-Team: Chinese (Simplified) \n" "Language: zh_Hans\n" @@ -18781,13 +18781,11 @@ msgstr "更好的文档：https://docs.pgrouting.org" msgid "shooting_star is discontinued" msgstr "shooting_star 已停用" -#, fuzzy msgid "pgRouting 1" -msgstr "pgRouting 版本" +msgstr "pgRouting 1" -#, fuzzy msgid "pgRouting 1.0" -msgstr "pgRouting 版本" +msgstr "pgRouting 1.0" msgid "" "To see the issues closed by this release see the `Git closed issues for 1.x " From 033842a80cf27d87de5a2ef816130ecd099c3b6c Mon Sep 17 00:00:00 2001 From: Zuochenwei Date: Fri, 19 Jan 2024 09:26:05 +0000 Subject: [PATCH 214/428] Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (5199 of 5199 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ --- locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 77684cd953..79b335b2ab 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-01-06 18:14+0000\n" "PO-Revision-Date: 2024-01-19 09:46+0000\n" -"Last-Translator: DeepL \n" +"Last-Translator: Zuochenwei \n" "Language-Team: Chinese (Simplified) \n" "Language: zh_Hans\n" @@ -24,7 +24,7 @@ msgstr "" "X-Generator: Weblate 5.3\n" msgid "BFS - Category" -msgstr "BFS-类别" +msgstr "BFS - 类别" msgid ":doc:`pgr_kruskalBFS`" msgstr ":doc:`pgr_kruskalBFS`" @@ -18666,7 +18666,7 @@ msgid "" "compatibility to `pgRouting 1.0`_ releases. The main Goals for this release " "are:" msgstr "随着 pgRouting 2.0.0 的发布，该库已放弃向后兼容 `pgRouting 1.0`_ " -"版本。此版本的主要目标是" +"版本。此版本的主要目标是：" msgid "Major restructuring of pgRouting." msgstr "对 pgRouting 进行重大重组。" From bad988b3e1ac64e6969c900847c6ec57fb637b12 Mon Sep 17 00:00:00 2001 From: Weblate Date: Wed, 24 Jan 2024 17:45:12 +0000 Subject: [PATCH 215/428] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/ --- .../de/LC_MESSAGES/pgrouting_doc_strings.po | 183 ++++++++++--- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 250 ++++++++++++++---- .../ja/LC_MESSAGES/pgrouting_doc_strings.po | 186 ++++++++++--- .../ko/LC_MESSAGES/pgrouting_doc_strings.po | 184 ++++++++++--- .../LC_MESSAGES/pgrouting_doc_strings.po | 246 +++++++++++++---- 5 files changed, 819 insertions(+), 230 deletions(-) diff --git a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po index b6e9323e2d..9ada26be30 100644 --- a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-06 18:14+0000\n" +"POT-Creation-Date: 2024-01-24 17:44+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -4378,6 +4378,41 @@ msgstr "" msgid "_" msgstr "" +msgid "Official functions changes" +msgstr "" + +msgid "" +"`#2605 `__ Standarize " +"spanning tree functions output" +msgstr "" + +msgid "Functions:" +msgstr "" + +msgid "``pgr_kruskalDD``" +msgstr "" + +msgid "``pgr_kruskalDFS``" +msgstr "" + +msgid "``pgr_kruskalBFS``" +msgstr "" + +msgid "``pgr_primDD``" +msgstr "" + +msgid "``pgr_primDFS``" +msgstr "" + +msgid "``pgr_primBFS``" +msgstr "" + +msgid "Standarizing output columns to |result-spantree|" +msgstr "" + +msgid "Added ``pred`` result columns." +msgstr "" + msgid "Code enhancement" msgstr "" @@ -4482,7 +4517,7 @@ msgstr "" msgid "Migration" msgstr "" -msgid "Be aware of the existance of the additional columns." +msgid "Be aware of the existence of the additional columns." msgstr "" msgid "In ``pgr_aStar`` (`One to One`)" @@ -4596,7 +4631,7 @@ msgstr "" msgid "" "Starting from `v3.6.0 `__ :" -"doc:`pgr_drivingDistance` result columns are being standarized." +"doc:`pgr_drivingDistance` result columns are being standardized." msgstr "" msgid "from" @@ -4629,7 +4664,7 @@ msgstr "" msgid "does not have ``depth`` result column." msgstr "" -msgid "Be aware of the existance and name change of the result columns." +msgid "Be aware of the existence and name change of the result columns." msgstr "" msgid "" @@ -4657,16 +4692,75 @@ msgid "The ``from_v`` result column name changes to ``start_vid``." msgstr "" msgid "" -"If needed filter out and rename colums, for example, to return the original " +"If needed filter out and rename columns, for example, to return the original " "columns:" msgstr "" +msgid "" +"Migration of ``pgr_kruskalDD`` / ``pgr_kruskalBFS`` / ``pgr_kruskalDFS``" +msgstr "" + +msgid "" +"Starting from `v3.7.0 `__ :" +"doc:`pgr_kruskalDD`, :doc:`pgr_kruskalBFS` and :doc:`pgr_kruskalDFS` result " +"columns are being standardized." +msgstr "" + +msgid "|result-bfs|" +msgstr "" + +msgid "Single vertex" +msgstr "" + +msgid "Multiple vertices" +msgstr "" + +msgid "Output columns were |result-bfs|" +msgstr "" + +msgid "Single vertex and Multiple vertices" +msgstr "" + +msgid "Do not have ``pred`` result column." +msgstr "" + +msgid "Be aware of the existence of `pred` result columns." +msgstr "" + +msgid "If needed filter out the added columns" +msgstr "" + +msgid "Kruskal single vertex" +msgstr "" + +msgid "" +"Using ``pgr_KruskalDD`` as example. Migration is similar to al the affected " +"functions." +msgstr "" + +msgid "" +"Comparing with `this `__ example." +msgstr "" + +msgid "" +"Now column ``pred`` exists and contains the predecessor of the ``node``." +msgstr "" + +msgid "Kruskal multiple vertices" +msgstr "" + +msgid "" +"Comparing with `this `__ example." +msgstr "" + msgid "Migration of ``pgr_KSP``" msgstr "" msgid "" "Starting from `v3.6.0 `__ :" -"doc:`pgr_KSP` result columns are being standarized." +"doc:`pgr_KSP` result columns are being standardized." msgstr "" msgid "|ksp-result|" @@ -4765,12 +4859,42 @@ msgstr "" msgid "In the query returns only ``edge`` column." msgstr "" +msgid "Migration of ``pgr_primDD`` / ``pgr_primBFS`` / ``pgr_primDFS``" +msgstr "" + +msgid "" +"Starting from `v3.7.0 `__ :" +"doc:`pgr_primDD`, :doc:`pgr_primBFS` and :doc:`pgr_primDFS` result columns " +"are being standardized." +msgstr "" + +msgid "Prim single vertex" +msgstr "" + +msgid "" +"Using ``pgr_primDD`` as example. Migration is similar to al the affected " +"functions." +msgstr "" + +msgid "" +"Comparing with `this `__ example." +msgstr "" + +msgid "Prim multiple vertices" +msgstr "" + +msgid "" +"Comparing with `this `__ example." +msgstr "" + msgid "Migration of ``pgr_withPointsDD``" msgstr "" msgid "" "Starting from `v3.6.0 `__ :" -"doc:`pgr_withPointsDD` result columns are being standarized." +"doc:`pgr_withPointsDD` result columns are being standardized." msgstr "" msgid "|result-generic-no-seq|" @@ -4795,7 +4919,7 @@ msgid "Does not have ``start_vid``, ``pred`` and ``depth`` result columns." msgstr "" msgid "" -"``driving_side`` parameter was named optional now it is compulsory unamed." +"``driving_side`` parameter was named optional now it is compulsory unnamed." msgstr "" msgid "``pgr_withPointsDD`` (`Multiple vertices`)" @@ -4846,7 +4970,7 @@ msgstr "" msgid "After Migration" msgstr "" -msgid "Be aware of the existance of the additional result Columns." +msgid "Be aware of the existence of the additional result Columns." msgstr "" msgid "New output columns are |result-spantree|" @@ -4908,7 +5032,7 @@ msgstr "" msgid "" "Starting from `v3.6.0 `__ :" -"doc:`pgr_withPointsKSP` result columns are being standarized." +"doc:`pgr_withPointsKSP` result columns are being standardized." msgstr "" msgid "" @@ -9257,17 +9381,11 @@ msgstr "" msgid "Returns set of |result-bfs|" msgstr "" -msgid "Single vertex" -msgstr "" - msgid "" "From root vertex :math:`6` on a **directed** graph with edges in ascending " "order of ``id``" msgstr "" -msgid "Multiple vertices" -msgstr "" - msgid "" "From root vertices :math:`\\{12, 6\\}` on an **undirected** graph with " "**depth** :math:`<= 2` and edges in ascending order of ``id``" @@ -11014,9 +11132,6 @@ msgid "" "``pgr_drivingDistance`` - Returns the driving distance from a start node." msgstr "" -msgid "Standarizing output columns to |result-spantree|" -msgstr "" - msgid "Added ``depth`` and ``start_vid`` result columns." msgstr "" @@ -12218,14 +12333,14 @@ msgstr "" msgid "Minimum spanning forest" msgstr "" -msgid "``pgr_kruskalBFS``" -msgstr "" - msgid "" "``pgr_kruskalBFS`` — Kruskal's algorithm for Minimum Spanning Tree with " "breadth First Search ordering." msgstr "" +msgid "Version 3.7.0" +msgstr "" + msgid "" "Visits and extracts the nodes information in Breath First Search ordering of " "the Minimum Spanning Tree created using Kruskal's algorithm." @@ -12251,9 +12366,6 @@ msgid "" "`depth \\leq 3`" msgstr "" -msgid "``pgr_kruskalDD``" -msgstr "" - msgid "``pgr_kruskalDD`` — Catchament nodes using Kruskal's algorithm." msgstr "" @@ -12285,9 +12397,6 @@ msgid "" "`distance \\leq 3.5`" msgstr "" -msgid "``pgr_kruskalDFS``" -msgstr "" - msgid "" "``pgr_kruskalDFS`` — Kruskal's algorithm for Minimum Spanning Tree with " "Depth First Search ordering." @@ -13432,9 +13541,6 @@ msgid "" "prim_minimum_spanning_tree.html>`__" msgstr "" -msgid "``pgr_primBFS``" -msgstr "" - msgid "" "``pgr_primBFS`` — Prim's algorithm for Minimum Spanning Tree with Depth " "First Search ordering." @@ -13442,7 +13548,7 @@ msgstr "" msgid "" "Visits and extracts the nodes information in Breath First Search ordering of " -"the Minimum Spanning Tree created with Prims's algorithm." +"the Minimum Spanning Tree created using Prims's algorithm." msgstr "" msgid "pgr_primBFS(`Edges SQL`_, **root vid**, [``max_depth``])" @@ -13451,16 +13557,13 @@ msgstr "" msgid "pgr_primBFS(`Edges SQL`_, **root vids**, [``max_depth``])" msgstr "" -msgid "``pgr_primDD``" -msgstr "" - msgid "``pgr_primDD`` — Catchament nodes using Prim's algorithm." msgstr "" msgid "" "Using Prim's algorithm, extracts the nodes that have aggregate costs less " -"than or equal to a **distance** from a **root** vertex (or vertices) within " -"the calculated minimum spanning tree." +"than or equal to a distance from a root vertex (or vertices) within the " +"calculated minimum spanning tree." msgstr "" msgid "pgr_primDD(`Edges SQL`_, **root vid**, **distance**)" @@ -13469,9 +13572,6 @@ msgstr "" msgid "pgr_primDD(`Edges SQL`_, **root vids**, **distance**)" msgstr "" -msgid "``pgr_primDFS``" -msgstr "" - msgid "" "``pgr_primDFS`` — Prim algorithm for Minimum Spanning Tree with Depth First " "Search ordering." @@ -15209,9 +15309,6 @@ msgid "" "utf8=%E2%9C%93&q=milestone%3A%22Release%203.6.0%22>`_" msgstr "" -msgid "Official functions changes" -msgstr "" - msgid "" "`#2516 `__ Standarize " "output pgr_aStar" diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index d12d0d937a..c3717a9b88 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-06 18:14+0000\n" +"POT-Creation-Date: 2024-01-24 17:44+0000\n" "PO-Revision-Date: 2024-01-07 23:45+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish `__ Standarize " +"spanning tree functions output" +msgstr "" +"`#2516 `__ estandarización " +"de resultados de pgr_aStar" + +#, fuzzy +msgid "Functions:" +msgstr "Nuevas Funciones" + +msgid "``pgr_kruskalDD``" +msgstr "``pgr_kruskalDD``" + +msgid "``pgr_kruskalDFS``" +msgstr "``pgr_kruskalDFS``" + +msgid "``pgr_kruskalBFS``" +msgstr "``pgr_kruskalBFS``" + +msgid "``pgr_primDD``" +msgstr "``pgr_primDD``" + +msgid "``pgr_primDFS``" +msgstr "``pgr_primDFS``" + +msgid "``pgr_primBFS``" +msgstr "``pgr_primBFS``" + +msgid "Standarizing output columns to |result-spantree|" +msgstr "Estandarización de columnas de resultados a |result-spantree|" + +#, fuzzy +msgid "Added ``pred`` result columns." +msgstr "Agregado las columnas de resultados``depth`` y ``pred``." + msgid "Code enhancement" msgstr "Mejora del código" @@ -5052,7 +5092,8 @@ msgstr "``pgr_aStar`` (`Muchos a Uno`) no tiene ``end_vid``." msgid "Migration" msgstr "Migración" -msgid "Be aware of the existance of the additional columns." +#, fuzzy +msgid "Be aware of the existence of the additional columns." msgstr "Tener en cuenta la existencia de las columnas adicionales." msgid "In ``pgr_aStar`` (`One to One`)" @@ -5175,9 +5216,10 @@ msgstr "Si es necesario, añadir las nuevas columnas, por ejemplo:" msgid "Migration of ``pgr_drivingdistance``" msgstr "Migración de ``pgr_drivingDistance``" +#, fuzzy msgid "" "Starting from `v3.6.0 `__ :" -"doc:`pgr_drivingDistance` result columns are being standarized." +"doc:`pgr_drivingDistance` result columns are being standardized." msgstr "" "A partir de `v3.6.0 `__, " "las columnas resultantes de :doc:`pgr_drivingDistance` son estandarizadas." @@ -5212,7 +5254,8 @@ msgstr "Tiene la columa de resultados ``from_v`` en vez de ``start_vid``." msgid "does not have ``depth`` result column." msgstr "no tiene la columna ``depth`` en los resultados." -msgid "Be aware of the existance and name change of the result columns." +#, fuzzy +msgid "Be aware of the existence and name change of the result columns." msgstr "" "Tener en cuenta la existencia y el cambio de nombre de las columnas de " "resultados." @@ -5248,19 +5291,99 @@ msgid "The ``from_v`` result column name changes to ``start_vid``." msgstr "" "El nombre de la columna de resultados ``from_v`` cambia a ``start_vid``." +#, fuzzy msgid "" -"If needed filter out and rename colums, for example, to return the original " +"If needed filter out and rename columns, for example, to return the original " "columns:" msgstr "" "Si es necesario, filtrar y cambiar el nombre de las columnas, por ejemplo, " "para devolver las columnas originales:" +msgid "" +"Migration of ``pgr_kruskalDD`` / ``pgr_kruskalBFS`` / ``pgr_kruskalDFS``" +msgstr "" + +#, fuzzy +msgid "" +"Starting from `v3.7.0 `__ :" +"doc:`pgr_kruskalDD`, :doc:`pgr_kruskalBFS` and :doc:`pgr_kruskalDFS` result " +"columns are being standardized." +msgstr "" +"A partir de `v3.6.0 `__, " +"las columnas resultantes de :doc:`pgr_drivingDistance` son estandarizadas." + +#, fuzzy +msgid "|result-bfs|" +msgstr "Resultados" + +msgid "Single vertex" +msgstr "Vértice único" + +msgid "Multiple vertices" +msgstr "Múltiples vértices" + +#, fuzzy +msgid "Output columns were |result-bfs|" +msgstr "Columnas de resultados eran |ksp-result|" + +#, fuzzy +msgid "Single vertex and Multiple vertices" +msgstr "Múltiples vértices" + +#, fuzzy +msgid "Do not have ``pred`` result column." +msgstr "No tiene un valor de facto." + +#, fuzzy +msgid "Be aware of the existence of `pred` result columns." +msgstr "" +"Tener en cuenta la existencia de las columnas de adicionales de resultados." + +#, fuzzy +msgid "If needed filter out the added columns" +msgstr "Si es necesario, filtrar las columnas añadidas, por ejemplo:" + +#, fuzzy +msgid "Kruskal single vertex" +msgstr "Vértice único" + +msgid "" +"Using ``pgr_KruskalDD`` as example. Migration is similar to al the affected " +"functions." +msgstr "" + +#, fuzzy +msgid "" +"Comparing with `this `__ example." +msgstr "" +"Usando `éste `__ ejemplo." + +#, fuzzy +msgid "" +"Now column ``pred`` exists and contains the predecessor of the ``node``." +msgstr "``pred`` contiene el predecesor del ``nodo``." + +#, fuzzy +msgid "Kruskal multiple vertices" +msgstr "Múltiples vértices" + +#, fuzzy +msgid "" +"Comparing with `this `__ example." +msgstr "" +"Usando `éste `__ ejemplo." + msgid "Migration of ``pgr_KSP``" msgstr "Migración de ``pgr_KSP``" +#, fuzzy msgid "" "Starting from `v3.6.0 `__ :" -"doc:`pgr_KSP` result columns are being standarized." +"doc:`pgr_KSP` result columns are being standardized." msgstr "" "A partir de `v3.6.0 `__ " "las columnas resultantes de :doc:`pgr_KSP` son estandarizadas." @@ -5377,12 +5500,54 @@ msgstr "No use la bandera ``directed``." msgid "In the query returns only ``edge`` column." msgstr "En la consulta solo devuelve la columna ``edge``." +msgid "Migration of ``pgr_primDD`` / ``pgr_primBFS`` / ``pgr_primDFS``" +msgstr "" + +#, fuzzy +msgid "" +"Starting from `v3.7.0 `__ :" +"doc:`pgr_primDD`, :doc:`pgr_primBFS` and :doc:`pgr_primDFS` result columns " +"are being standardized." +msgstr "" +"A partir de `v3.6.0 `__, " +"las columnas resultantes de :doc:`pgr_drivingDistance` son estandarizadas." + +#, fuzzy +msgid "Prim single vertex" +msgstr "Vértice único" + +msgid "" +"Using ``pgr_primDD`` as example. Migration is similar to al the affected " +"functions." +msgstr "" + +#, fuzzy +msgid "" +"Comparing with `this `__ example." +msgstr "" +"Usando `éste `__ ejemplo." + +#, fuzzy +msgid "Prim multiple vertices" +msgstr "Múltiples vértices" + +#, fuzzy +msgid "" +"Comparing with `this `__ example." +msgstr "" +"Usando `éste `__ ejemplo." + msgid "Migration of ``pgr_withPointsDD``" msgstr "Migración de ``pgr_withPointsDD``" +#, fuzzy msgid "" "Starting from `v3.6.0 `__ :" -"doc:`pgr_withPointsDD` result columns are being standarized." +"doc:`pgr_withPointsDD` result columns are being standardized." msgstr "" "A partir de `v3.6.0 `__ " "las columnas resultantes de :doc:`pgr_withPointsDD` son estandarizadas." @@ -5411,8 +5576,9 @@ msgstr "Las columnas de resultados eran |result-1-1-no-seq|" msgid "Does not have ``start_vid``, ``pred`` and ``depth`` result columns." msgstr "No tiene columnas de resultados ``start_vid``, ``pred`` y ``depth``." +#, fuzzy msgid "" -"``driving_side`` parameter was named optional now it is compulsory unamed." +"``driving_side`` parameter was named optional now it is compulsory unnamed." msgstr "" "El parámetro ``driving_side`` era opcional ahora es obligatorio sin nombre." @@ -5464,7 +5630,8 @@ msgstr "También `` l`` podía usarse como \"lado de manejo\"" msgid "After Migration" msgstr "Después de la migración" -msgid "Be aware of the existance of the additional result Columns." +#, fuzzy +msgid "Be aware of the existence of the additional result Columns." msgstr "" "Tener en cuenta la existencia de las columnas de adicionales de resultados." @@ -5538,9 +5705,10 @@ msgstr "Filtrar las columnas adicionales" msgid "Migration of ``pgr_withPointsKSP``" msgstr "Migración de ``pgr_withPointsKSP``" +#, fuzzy msgid "" "Starting from `v3.6.0 `__ :" -"doc:`pgr_withPointsKSP` result columns are being standarized." +"doc:`pgr_withPointsKSP` result columns are being standardized." msgstr "" "A partir de `v3.6.0 `__ " "las columnas resultantes de :doc:`pgr_withPointsKSP` son estandarizadas." @@ -10661,9 +10829,6 @@ msgstr "**opcionales:** ``[max_depth, directed]``" msgid "Returns set of |result-bfs|" msgstr "Regresa el conjunto de |result-bfs|" -msgid "Single vertex" -msgstr "Vértice único" - msgid "" "From root vertex :math:`6` on a **directed** graph with edges in ascending " "order of ``id``" @@ -10671,9 +10836,6 @@ msgstr "" "Desde el vértice raíz :math:`6` en un grafo **dirigido** con aristas en " "orden ascendente de ``id``" -msgid "Multiple vertices" -msgstr "Múltiples vértices" - msgid "" "From root vertices :math:`\\{12, 6\\}` on an **undirected** graph with " "**depth** :math:`<= 2` and edges in ascending order of ``id``" @@ -12742,9 +12904,6 @@ msgstr "" "``pgr_drivingDistance`` - Devuelve la distancia de manejo desde un nodo de " "inicio." -msgid "Standarizing output columns to |result-spantree|" -msgstr "Estandarización de columnas de resultados a |result-spantree|" - msgid "Added ``depth`` and ``start_vid`` result columns." msgstr "Agregado las columnas de resultados``depth`` y ``start_vid``." @@ -14080,9 +14239,6 @@ msgstr "Regresa el conjunto de |result-mst|" msgid "Minimum spanning forest" msgstr "Bosque de expansión mínimo" -msgid "``pgr_kruskalBFS``" -msgstr "``pgr_kruskalBFS``" - msgid "" "``pgr_kruskalBFS`` — Kruskal's algorithm for Minimum Spanning Tree with " "breadth First Search ordering." @@ -14090,6 +14246,10 @@ msgstr "" "``pgr_kruskalBFS`` — Algoritmo de Kruskal para el Árbol de Expansión Mínimo " "con orden de Primera Búsqueda en Anchura." +#, fuzzy +msgid "Version 3.7.0" +msgstr "Versión 3.6.0" + msgid "" "Visits and extracts the nodes information in Breath First Search ordering of " "the Minimum Spanning Tree created using Kruskal's algorithm." @@ -14122,9 +14282,6 @@ msgstr "" "El Árbol de Expansión Mínimo que comienza en los vértices :math:`\\{9, 6\\}` " "con ::math:`depth \\leq 3`" -msgid "``pgr_kruskalDD``" -msgstr "``pgr_kruskalDD``" - msgid "``pgr_kruskalDD`` — Catchament nodes using Kruskal's algorithm." msgstr "" "``pgr_kruskalDD`` — Nodos de captación utilizando el algoritmo de Kruskal." @@ -14166,9 +14323,6 @@ msgstr "" "El árbol de expansión mínimo que comienza en los vértices :math:`\\{9, 6\\}` " "con :math:`distance \\leq 3.5`" -msgid "``pgr_kruskalDFS``" -msgstr "``pgr_kruskalDFS``" - msgid "" "``pgr_kruskalDFS`` — Kruskal's algorithm for Minimum Spanning Tree with " "Depth First Search ordering." @@ -15489,9 +15643,6 @@ msgstr "" "`Boost: algoritmo de Prim `__" -msgid "``pgr_primBFS``" -msgstr "``pgr_primBFS``" - msgid "" "``pgr_primBFS`` — Prim's algorithm for Minimum Spanning Tree with Depth " "First Search ordering." @@ -15499,12 +15650,13 @@ msgstr "" "``pgr_primBFS`` — Algoritmo de Prim para el árbol de expansión mínimo con " "orden de primera búsqueda de profundidad." +#, fuzzy msgid "" "Visits and extracts the nodes information in Breath First Search ordering of " -"the Minimum Spanning Tree created with Prims's algorithm." +"the Minimum Spanning Tree created using Prims's algorithm." msgstr "" -"Visita y extrae la información de los nodos en el orden de búsqueda de " -"Primera Búsqueda de Respiración del Árbol de Expansión Mínimo creado con el " +"Visita y extrae la información de los nodos en el orden de la Primera " +"Búsqueda de Profundidad del Árbol de Expansión Mínima creado utilizando el " "algoritmo de Prim." msgid "pgr_primBFS(`Edges SQL`_, **root vid**, [``max_depth``])" @@ -15513,16 +15665,14 @@ msgstr "pgr_primBFS(`SQL de aristas`_, **Raíz**, [``max_depth``])" msgid "pgr_primBFS(`Edges SQL`_, **root vids**, [``max_depth``])" msgstr "pgr_primBFS(`SQL de aristas`_, **Raíces**, [``max_depth``])" -msgid "``pgr_primDD``" -msgstr "``pgr_primDD``" - msgid "``pgr_primDD`` — Catchament nodes using Prim's algorithm." msgstr "``pgr_primDD`` — Nodos de captación mediante el algoritmo de Prim." +#, fuzzy msgid "" "Using Prim's algorithm, extracts the nodes that have aggregate costs less " -"than or equal to a **distance** from a **root** vertex (or vertices) within " -"the calculated minimum spanning tree." +"than or equal to a distance from a root vertex (or vertices) within the " +"calculated minimum spanning tree." msgstr "" "Mediante el algoritmo Prim, se extraen los nodos que tienen costes agregados " "menores o iguales que el valor de la **Distancia** desde un vértice (o " @@ -15534,9 +15684,6 @@ msgstr "pgr_primDD(`SQL de aristas`_, **raíz**, **distancia**)" msgid "pgr_primDD(`Edges SQL`_, **root vids**, **distance**)" msgstr "pgr_primDD(`SQL de aristas`_, **raices**, **distancia**)" -msgid "``pgr_primDFS``" -msgstr "``pgr_primDFS``" - msgid "" "``pgr_primDFS`` — Prim algorithm for Minimum Spanning Tree with Depth First " "Search ordering." @@ -17594,9 +17741,6 @@ msgstr "" "versión, consulte la `meta cerrada 3.6.0 `_" -msgid "Official functions changes" -msgstr "" - msgid "" "`#2516 `__ Standarize " "output pgr_aStar" @@ -21146,6 +21290,14 @@ msgstr "pgr_withPointsDD es pgr_drivingDistance **con puntos**" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "pgr_withPoints es pgr_dijkstraVia **con puntos**" +#~ msgid "" +#~ "Visits and extracts the nodes information in Breath First Search ordering " +#~ "of the Minimum Spanning Tree created with Prims's algorithm." +#~ msgstr "" +#~ "Visita y extrae la información de los nodos en el orden de búsqueda de " +#~ "Primera Búsqueda de Respiración del Árbol de Expansión Mínimo creado con " +#~ "el algoritmo de Prim." + #~ msgid "" #~ "Column ``pred`` only applies to :doc:`pgr_drivingDistance` and :doc:" #~ "`pgr_withPointsDD`." @@ -21307,14 +21459,6 @@ msgstr "pgr_withPoints es pgr_dijkstraVia **con puntos**" #~ msgid ":doc:`pgr_nodeNetwork` -to create nodes to a not noded edge table." #~ msgstr ":doc:`pgr_nodeNetwork` - para crear nodos en una tabla de aristas." -#, fuzzy -#~ msgid "|result-bfs|" -#~ msgstr "Resultados" - -#, fuzzy -#~ msgid "Does not have ``depth`` result column." -#~ msgstr "No tiene un valor de facto." - #, fuzzy #~ msgid "Also ``l`` could be used as **driving side**" #~ msgstr "``l`` para el manejo del lado izquierdo" diff --git a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po index 1878aba0c3..2905b5dd03 100644 --- a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-06 18:14+0000\n" +"POT-Creation-Date: 2024-01-24 17:44+0000\n" "PO-Revision-Date: 2022-09-29 19:13+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Japanese `__ Standarize " +"spanning tree functions output" +msgstr "" + +msgid "Functions:" +msgstr "" + +msgid "``pgr_kruskalDD``" +msgstr "" + +msgid "``pgr_kruskalDFS``" +msgstr "" + +msgid "``pgr_kruskalBFS``" +msgstr "" + +msgid "``pgr_primDD``" +msgstr "" + +msgid "``pgr_primDFS``" +msgstr "" + +msgid "``pgr_primBFS``" +msgstr "" + +msgid "Standarizing output columns to |result-spantree|" +msgstr "" + +msgid "Added ``pred`` result columns." +msgstr "" + msgid "Code enhancement" msgstr "" @@ -4565,7 +4600,7 @@ msgstr "" msgid "Migration" msgstr "" -msgid "Be aware of the existance of the additional columns." +msgid "Be aware of the existence of the additional columns." msgstr "" msgid "In ``pgr_aStar`` (`One to One`)" @@ -4679,7 +4714,7 @@ msgstr "" msgid "" "Starting from `v3.6.0 `__ :" -"doc:`pgr_drivingDistance` result columns are being standarized." +"doc:`pgr_drivingDistance` result columns are being standardized." msgstr "" msgid "from" @@ -4712,7 +4747,7 @@ msgstr "" msgid "does not have ``depth`` result column." msgstr "" -msgid "Be aware of the existance and name change of the result columns." +msgid "Be aware of the existence and name change of the result columns." msgstr "" msgid "" @@ -4742,16 +4777,77 @@ msgid "The ``from_v`` result column name changes to ``start_vid``." msgstr "" msgid "" -"If needed filter out and rename colums, for example, to return the original " +"If needed filter out and rename columns, for example, to return the original " "columns:" msgstr "" +msgid "" +"Migration of ``pgr_kruskalDD`` / ``pgr_kruskalBFS`` / ``pgr_kruskalDFS``" +msgstr "" + +msgid "" +"Starting from `v3.7.0 `__ :" +"doc:`pgr_kruskalDD`, :doc:`pgr_kruskalBFS` and :doc:`pgr_kruskalDFS` result " +"columns are being standardized." +msgstr "" + +msgid "|result-bfs|" +msgstr "" + +msgid "Single vertex" +msgstr "" + +msgid "Multiple vertices" +msgstr "" + +msgid "Output columns were |result-bfs|" +msgstr "" + +msgid "Single vertex and Multiple vertices" +msgstr "" + +msgid "Do not have ``pred`` result column." +msgstr "" + +msgid "Be aware of the existence of `pred` result columns." +msgstr "" + +msgid "If needed filter out the added columns" +msgstr "" + +msgid "Kruskal single vertex" +msgstr "" + +msgid "" +"Using ``pgr_KruskalDD`` as example. Migration is similar to al the affected " +"functions." +msgstr "" + +msgid "" +"Comparing with `this `__ example." +msgstr "" + +#, fuzzy +msgid "" +"Now column ``pred`` exists and contains the predecessor of the ``node``." +msgstr "" +":math:'agg\\_cost' は、:math:'start_{vid}' からノードまでのコストです。" + +msgid "Kruskal multiple vertices" +msgstr "" + +msgid "" +"Comparing with `this `__ example." +msgstr "" + msgid "Migration of ``pgr_KSP``" msgstr "" msgid "" "Starting from `v3.6.0 `__ :" -"doc:`pgr_KSP` result columns are being standarized." +"doc:`pgr_KSP` result columns are being standardized." msgstr "" msgid "|ksp-result|" @@ -4851,12 +4947,42 @@ msgstr "" msgid "In the query returns only ``edge`` column." msgstr "" +msgid "Migration of ``pgr_primDD`` / ``pgr_primBFS`` / ``pgr_primDFS``" +msgstr "" + +msgid "" +"Starting from `v3.7.0 `__ :" +"doc:`pgr_primDD`, :doc:`pgr_primBFS` and :doc:`pgr_primDFS` result columns " +"are being standardized." +msgstr "" + +msgid "Prim single vertex" +msgstr "" + +msgid "" +"Using ``pgr_primDD`` as example. Migration is similar to al the affected " +"functions." +msgstr "" + +msgid "" +"Comparing with `this `__ example." +msgstr "" + +msgid "Prim multiple vertices" +msgstr "" + +msgid "" +"Comparing with `this `__ example." +msgstr "" + msgid "Migration of ``pgr_withPointsDD``" msgstr "" msgid "" "Starting from `v3.6.0 `__ :" -"doc:`pgr_withPointsDD` result columns are being standarized." +"doc:`pgr_withPointsDD` result columns are being standardized." msgstr "" msgid "|result-generic-no-seq|" @@ -4881,7 +5007,7 @@ msgid "Does not have ``start_vid``, ``pred`` and ``depth`` result columns." msgstr "" msgid "" -"``driving_side`` parameter was named optional now it is compulsory unamed." +"``driving_side`` parameter was named optional now it is compulsory unnamed." msgstr "" msgid "``pgr_withPointsDD`` (`Multiple vertices`)" @@ -4934,7 +5060,7 @@ msgstr "" msgid "After Migration" msgstr "もっと詳しく知る" -msgid "Be aware of the existance of the additional result Columns." +msgid "Be aware of the existence of the additional result Columns." msgstr "" msgid "New output columns are |result-spantree|" @@ -4998,7 +5124,7 @@ msgstr "" msgid "" "Starting from `v3.6.0 `__ :" -"doc:`pgr_withPointsKSP` result columns are being standarized." +"doc:`pgr_withPointsKSP` result columns are being standardized." msgstr "" msgid "" @@ -9371,17 +9497,11 @@ msgstr "" msgid "Returns set of |result-bfs|" msgstr "" -msgid "Single vertex" -msgstr "" - msgid "" "From root vertex :math:`6` on a **directed** graph with edges in ascending " "order of ``id``" msgstr "" -msgid "Multiple vertices" -msgstr "" - msgid "" "From root vertices :math:`\\{12, 6\\}` on an **undirected** graph with " "**depth** :math:`<= 2` and edges in ascending order of ``id``" @@ -11139,9 +11259,6 @@ msgid "" "``pgr_drivingDistance`` - Returns the driving distance from a start node." msgstr "" -msgid "Standarizing output columns to |result-spantree|" -msgstr "" - msgid "Added ``depth`` and ``start_vid`` result columns." msgstr "" @@ -12347,14 +12464,15 @@ msgstr "" msgid "Minimum spanning forest" msgstr "" -msgid "``pgr_kruskalBFS``" -msgstr "" - msgid "" "``pgr_kruskalBFS`` — Kruskal's algorithm for Minimum Spanning Tree with " "breadth First Search ordering." msgstr "" +#, fuzzy +msgid "Version 3.7.0" +msgstr "バージョン 3.0.0" + msgid "" "Visits and extracts the nodes information in Breath First Search ordering of " "the Minimum Spanning Tree created using Kruskal's algorithm." @@ -12380,9 +12498,6 @@ msgid "" "`depth \\leq 3`" msgstr "" -msgid "``pgr_kruskalDD``" -msgstr "" - msgid "``pgr_kruskalDD`` — Catchament nodes using Kruskal's algorithm." msgstr "" @@ -12414,9 +12529,6 @@ msgid "" "`distance \\leq 3.5`" msgstr "" -msgid "``pgr_kruskalDFS``" -msgstr "" - msgid "" "``pgr_kruskalDFS`` — Kruskal's algorithm for Minimum Spanning Tree with " "Depth First Search ordering." @@ -13563,9 +13675,6 @@ msgid "" "prim_minimum_spanning_tree.html>`__" msgstr "" -msgid "``pgr_primBFS``" -msgstr "" - msgid "" "``pgr_primBFS`` — Prim's algorithm for Minimum Spanning Tree with Depth " "First Search ordering." @@ -13573,7 +13682,7 @@ msgstr "" msgid "" "Visits and extracts the nodes information in Breath First Search ordering of " -"the Minimum Spanning Tree created with Prims's algorithm." +"the Minimum Spanning Tree created using Prims's algorithm." msgstr "" msgid "pgr_primBFS(`Edges SQL`_, **root vid**, [``max_depth``])" @@ -13582,16 +13691,13 @@ msgstr "" msgid "pgr_primBFS(`Edges SQL`_, **root vids**, [``max_depth``])" msgstr "" -msgid "``pgr_primDD``" -msgstr "" - msgid "``pgr_primDD`` — Catchament nodes using Prim's algorithm." msgstr "" msgid "" "Using Prim's algorithm, extracts the nodes that have aggregate costs less " -"than or equal to a **distance** from a **root** vertex (or vertices) within " -"the calculated minimum spanning tree." +"than or equal to a distance from a root vertex (or vertices) within the " +"calculated minimum spanning tree." msgstr "" msgid "pgr_primDD(`Edges SQL`_, **root vid**, **distance**)" @@ -13600,9 +13706,6 @@ msgstr "" msgid "pgr_primDD(`Edges SQL`_, **root vids**, **distance**)" msgstr "" -msgid "``pgr_primDFS``" -msgstr "" - msgid "" "``pgr_primDFS`` — Prim algorithm for Minimum Spanning Tree with Depth First " "Search ordering." @@ -15355,9 +15458,6 @@ msgid "" "utf8=%E2%9C%93&q=milestone%3A%22Release%203.6.0%22>`_" msgstr "" -msgid "Official functions changes" -msgstr "" - msgid "" "`#2516 `__ Standarize " "output pgr_aStar" diff --git a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po index 9746d6adf4..f04917e1dc 100644 --- a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-06 18:14+0000\n" +"POT-Creation-Date: 2024-01-24 17:44+0000\n" "PO-Revision-Date: 2022-12-13 12:30+0000\n" "Last-Translator: Hyung-Gyu Ryoo \n" "Language-Team: Korean `__ Standarize " +"spanning tree functions output" +msgstr "" + +msgid "Functions:" +msgstr "" + +msgid "``pgr_kruskalDD``" +msgstr "" + +msgid "``pgr_kruskalDFS``" +msgstr "" + +msgid "``pgr_kruskalBFS``" +msgstr "" + +msgid "``pgr_primDD``" +msgstr "" + +msgid "``pgr_primDFS``" +msgstr "" + +msgid "``pgr_primBFS``" +msgstr "" + +msgid "Standarizing output columns to |result-spantree|" +msgstr "" + +msgid "Added ``pred`` result columns." +msgstr "" + msgid "Code enhancement" msgstr "" @@ -4503,7 +4538,7 @@ msgstr "" msgid "Migration" msgstr "" -msgid "Be aware of the existance of the additional columns." +msgid "Be aware of the existence of the additional columns." msgstr "" msgid "In ``pgr_aStar`` (`One to One`)" @@ -4618,7 +4653,7 @@ msgstr ":doc:`pgr_withPoints`" msgid "" "Starting from `v3.6.0 `__ :" -"doc:`pgr_drivingDistance` result columns are being standarized." +"doc:`pgr_drivingDistance` result columns are being standardized." msgstr "" msgid "from" @@ -4652,7 +4687,7 @@ msgstr "" msgid "does not have ``depth`` result column." msgstr "" -msgid "Be aware of the existance and name change of the result columns." +msgid "Be aware of the existence and name change of the result columns." msgstr "" msgid "" @@ -4680,17 +4715,76 @@ msgid "The ``from_v`` result column name changes to ``start_vid``." msgstr "" msgid "" -"If needed filter out and rename colums, for example, to return the original " +"If needed filter out and rename columns, for example, to return the original " "columns:" msgstr "" +msgid "" +"Migration of ``pgr_kruskalDD`` / ``pgr_kruskalBFS`` / ``pgr_kruskalDFS``" +msgstr "" + +msgid "" +"Starting from `v3.7.0 `__ :" +"doc:`pgr_kruskalDD`, :doc:`pgr_kruskalBFS` and :doc:`pgr_kruskalDFS` result " +"columns are being standardized." +msgstr "" + +msgid "|result-bfs|" +msgstr "" + +msgid "Single vertex" +msgstr "" + +msgid "Multiple vertices" +msgstr "" + +msgid "Output columns were |result-bfs|" +msgstr "" + +msgid "Single vertex and Multiple vertices" +msgstr "" + +msgid "Do not have ``pred`` result column." +msgstr "" + +msgid "Be aware of the existence of `pred` result columns." +msgstr "" + +msgid "If needed filter out the added columns" +msgstr "" + +msgid "Kruskal single vertex" +msgstr "" + +msgid "" +"Using ``pgr_KruskalDD`` as example. Migration is similar to al the affected " +"functions." +msgstr "" + +msgid "" +"Comparing with `this `__ example." +msgstr "" + +msgid "" +"Now column ``pred`` exists and contains the predecessor of the ``node``." +msgstr "" + +msgid "Kruskal multiple vertices" +msgstr "" + +msgid "" +"Comparing with `this `__ example." +msgstr "" + #, fuzzy msgid "Migration of ``pgr_KSP``" msgstr ":doc:`pgr_withPoints`" msgid "" "Starting from `v3.6.0 `__ :" -"doc:`pgr_KSP` result columns are being standarized." +"doc:`pgr_KSP` result columns are being standardized." msgstr "" msgid "|ksp-result|" @@ -4790,13 +4884,44 @@ msgstr "" msgid "In the query returns only ``edge`` column." msgstr "" +msgid "Migration of ``pgr_primDD`` / ``pgr_primBFS`` / ``pgr_primDFS``" +msgstr "" + +msgid "" +"Starting from `v3.7.0 `__ :" +"doc:`pgr_primDD`, :doc:`pgr_primBFS` and :doc:`pgr_primDFS` result columns " +"are being standardized." +msgstr "" + +msgid "Prim single vertex" +msgstr "" + +msgid "" +"Using ``pgr_primDD`` as example. Migration is similar to al the affected " +"functions." +msgstr "" + +msgid "" +"Comparing with `this `__ example." +msgstr "" + +#, fuzzy +msgid "Prim multiple vertices" +msgstr ":doc:`pgr_withPointsCostMatrix`" + +msgid "" +"Comparing with `this `__ example." +msgstr "" + #, fuzzy msgid "Migration of ``pgr_withPointsDD``" msgstr ":doc:`pgr_withPoints`" msgid "" "Starting from `v3.6.0 `__ :" -"doc:`pgr_withPointsDD` result columns are being standarized." +"doc:`pgr_withPointsDD` result columns are being standardized." msgstr "" msgid "|result-generic-no-seq|" @@ -4823,7 +4948,7 @@ msgid "Does not have ``start_vid``, ``pred`` and ``depth`` result columns." msgstr "" msgid "" -"``driving_side`` parameter was named optional now it is compulsory unamed." +"``driving_side`` parameter was named optional now it is compulsory unnamed." msgstr "" msgid "``pgr_withPointsDD`` (`Multiple vertices`)" @@ -4874,7 +4999,7 @@ msgstr "" msgid "After Migration" msgstr "" -msgid "Be aware of the existance of the additional result Columns." +msgid "Be aware of the existence of the additional result Columns." msgstr "" msgid "New output columns are |result-spantree|" @@ -4937,7 +5062,7 @@ msgstr ":doc:`pgr_withPoints`" msgid "" "Starting from `v3.6.0 `__ :" -"doc:`pgr_withPointsKSP` result columns are being standarized." +"doc:`pgr_withPointsKSP` result columns are being standardized." msgstr "" msgid "" @@ -9294,17 +9419,11 @@ msgstr "" msgid "Returns set of |result-bfs|" msgstr "" -msgid "Single vertex" -msgstr "" - msgid "" "From root vertex :math:`6` on a **directed** graph with edges in ascending " "order of ``id``" msgstr "" -msgid "Multiple vertices" -msgstr "" - msgid "" "From root vertices :math:`\\{12, 6\\}` on an **undirected** graph with " "**depth** :math:`<= 2` and edges in ascending order of ``id``" @@ -11053,9 +11172,6 @@ msgid "" "``pgr_drivingDistance`` - Returns the driving distance from a start node." msgstr "" -msgid "Standarizing output columns to |result-spantree|" -msgstr "" - msgid "Added ``depth`` and ``start_vid`` result columns." msgstr "" @@ -12257,14 +12373,14 @@ msgstr "" msgid "Minimum spanning forest" msgstr "" -msgid "``pgr_kruskalBFS``" -msgstr "" - msgid "" "``pgr_kruskalBFS`` — Kruskal's algorithm for Minimum Spanning Tree with " "breadth First Search ordering." msgstr "" +msgid "Version 3.7.0" +msgstr "" + msgid "" "Visits and extracts the nodes information in Breath First Search ordering of " "the Minimum Spanning Tree created using Kruskal's algorithm." @@ -12290,9 +12406,6 @@ msgid "" "`depth \\leq 3`" msgstr "" -msgid "``pgr_kruskalDD``" -msgstr "" - msgid "``pgr_kruskalDD`` — Catchament nodes using Kruskal's algorithm." msgstr "" @@ -12324,9 +12437,6 @@ msgid "" "`distance \\leq 3.5`" msgstr "" -msgid "``pgr_kruskalDFS``" -msgstr "" - msgid "" "``pgr_kruskalDFS`` — Kruskal's algorithm for Minimum Spanning Tree with " "Depth First Search ordering." @@ -13471,9 +13581,6 @@ msgid "" "prim_minimum_spanning_tree.html>`__" msgstr "" -msgid "``pgr_primBFS``" -msgstr "" - msgid "" "``pgr_primBFS`` — Prim's algorithm for Minimum Spanning Tree with Depth " "First Search ordering." @@ -13481,7 +13588,7 @@ msgstr "" msgid "" "Visits and extracts the nodes information in Breath First Search ordering of " -"the Minimum Spanning Tree created with Prims's algorithm." +"the Minimum Spanning Tree created using Prims's algorithm." msgstr "" msgid "pgr_primBFS(`Edges SQL`_, **root vid**, [``max_depth``])" @@ -13490,16 +13597,13 @@ msgstr "" msgid "pgr_primBFS(`Edges SQL`_, **root vids**, [``max_depth``])" msgstr "" -msgid "``pgr_primDD``" -msgstr "" - msgid "``pgr_primDD`` — Catchament nodes using Prim's algorithm." msgstr "" msgid "" "Using Prim's algorithm, extracts the nodes that have aggregate costs less " -"than or equal to a **distance** from a **root** vertex (or vertices) within " -"the calculated minimum spanning tree." +"than or equal to a distance from a root vertex (or vertices) within the " +"calculated minimum spanning tree." msgstr "" msgid "pgr_primDD(`Edges SQL`_, **root vid**, **distance**)" @@ -13508,9 +13612,6 @@ msgstr "" msgid "pgr_primDD(`Edges SQL`_, **root vids**, **distance**)" msgstr "" -msgid "``pgr_primDFS``" -msgstr "" - msgid "" "``pgr_primDFS`` — Prim algorithm for Minimum Spanning Tree with Depth First " "Search ordering." @@ -15253,9 +15354,6 @@ msgid "" "utf8=%E2%9C%93&q=milestone%3A%22Release%203.6.0%22>`_" msgstr "" -msgid "Official functions changes" -msgstr "" - msgid "" "`#2516 `__ Standarize " "output pgr_aStar" diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 79b335b2ab..0a5348d96b 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-06 18:14+0000\n" +"POT-Creation-Date: 2024-01-24 17:44+0000\n" "PO-Revision-Date: 2024-01-19 09:46+0000\n" "Last-Translator: Zuochenwei \n" "Language-Team: Chinese (Simplified) `__ Standarize " +"spanning tree functions output" +msgstr "" +"`#2516 `__标准化输出" +"pgr_aStar" + +#, fuzzy +msgid "Functions:" +msgstr "新函数" + +msgid "``pgr_kruskalDD``" +msgstr "``pgr_kruskalDD``" + +msgid "``pgr_kruskalDFS``" +msgstr "``pgr_kruskalDFS``" + +msgid "``pgr_kruskalBFS``" +msgstr "``pgr_kruskalBFS``" + +msgid "``pgr_primDD``" +msgstr "``pgr_primDD``" + +msgid "``pgr_primDFS``" +msgstr "``pgr_primDFS``" + +msgid "``pgr_primBFS``" +msgstr "``pgr_primBFS``" + +msgid "Standarizing output columns to |result-spantree|" +msgstr "将输出列标准化为 |result-spantree|" + +#, fuzzy +msgid "Added ``pred`` result columns." +msgstr "添加了 ``depth``和``pred``结果列。" + msgid "Code enhancement" msgstr "代码改进" @@ -4660,7 +4700,8 @@ msgstr "``pgr_aStar`` (`多对一`)没有 ``end_vid``。" msgid "Migration" msgstr "迁移" -msgid "Be aware of the existance of the additional columns." +#, fuzzy +msgid "Be aware of the existence of the additional columns." msgstr "请注意附加列的存在。" msgid "In ``pgr_aStar`` (`One to One`)" @@ -4781,9 +4822,10 @@ msgstr "如果需要，过滤掉添加的列，例如：" msgid "Migration of ``pgr_drivingdistance``" msgstr "迁移``pgr_drivingdistance``" +#, fuzzy msgid "" "Starting from `v3.6.0 `__ :" -"doc:`pgr_drivingDistance` result columns are being standarized." +"doc:`pgr_drivingDistance` result columns are being standardized." msgstr "" "从 `v3.6.0 `__开始， :doc:" "`pgr_drivingDistance`结果列正在标准化。" @@ -4818,7 +4860,8 @@ msgstr "有 ``from_v`` 而不是 ``start_vid``结果列。" msgid "does not have ``depth`` result column." msgstr "没有``depth``结果列。" -msgid "Be aware of the existance and name change of the result columns." +#, fuzzy +msgid "Be aware of the existence and name change of the result columns." msgstr "请注意结果列的存在和名称更改。" msgid "" @@ -4849,17 +4892,96 @@ msgstr "" msgid "The ``from_v`` result column name changes to ``start_vid``." msgstr "``from_v`结果列名称更改为 ``start_vid``。" +#, fuzzy msgid "" -"If needed filter out and rename colums, for example, to return the original " +"If needed filter out and rename columns, for example, to return the original " "columns:" msgstr "如果需要，过滤掉并重命名列，例如，返回原始列：" +msgid "" +"Migration of ``pgr_kruskalDD`` / ``pgr_kruskalBFS`` / ``pgr_kruskalDFS``" +msgstr "" + +#, fuzzy +msgid "" +"Starting from `v3.7.0 `__ :" +"doc:`pgr_kruskalDD`, :doc:`pgr_kruskalBFS` and :doc:`pgr_kruskalDFS` result " +"columns are being standardized." +msgstr "" +"从 `v3.6.0 `__开始， :doc:" +"`pgr_drivingDistance`结果列正在标准化。" + +#, fuzzy +msgid "|result-bfs|" +msgstr "|result-spantree|" + +msgid "Single vertex" +msgstr "单顶点" + +msgid "Multiple vertices" +msgstr "多个顶点" + +#, fuzzy +msgid "Output columns were |result-bfs|" +msgstr "输出列是 |ksp-result|" + +#, fuzzy +msgid "Single vertex and Multiple vertices" +msgstr "多个顶点" + +#, fuzzy +msgid "Do not have ``pred`` result column." +msgstr "没有``depth``结果列。" + +#, fuzzy +msgid "Be aware of the existence of `pred` result columns." +msgstr "注意附加结果列的存在。" + +#, fuzzy +msgid "If needed filter out the added columns" +msgstr "如果需要，过滤掉添加的列，例如：" + +#, fuzzy +msgid "Kruskal single vertex" +msgstr "单顶点" + +msgid "" +"Using ``pgr_KruskalDD`` as example. Migration is similar to al the affected " +"functions." +msgstr "" + +#, fuzzy +msgid "" +"Comparing with `this `__ example." +msgstr "" +"使用`这个 `__ 示例。" + +#, fuzzy +msgid "" +"Now column ``pred`` exists and contains the predecessor of the ``node``." +msgstr "``pred`` 包含``node``的前驱。" + +#, fuzzy +msgid "Kruskal multiple vertices" +msgstr "多个顶点" + +#, fuzzy +msgid "" +"Comparing with `this `__ example." +msgstr "" +"使用`这个 `__ 示例。" + msgid "Migration of ``pgr_KSP``" msgstr "迁移``pgr_KSP``" +#, fuzzy msgid "" "Starting from `v3.6.0 `__ :" -"doc:`pgr_KSP` result columns are being standarized." +"doc:`pgr_KSP` result columns are being standardized." msgstr "" "从 `v3.6.0 `__ 开始， :doc:" "`pgr_KSP`结果列正在标准化。" @@ -4962,12 +5084,54 @@ msgstr "不要使用``directed``标志。" msgid "In the query returns only ``edge`` column." msgstr "查询中仅返回``边``列。" +msgid "Migration of ``pgr_primDD`` / ``pgr_primBFS`` / ``pgr_primDFS``" +msgstr "" + +#, fuzzy +msgid "" +"Starting from `v3.7.0 `__ :" +"doc:`pgr_primDD`, :doc:`pgr_primBFS` and :doc:`pgr_primDFS` result columns " +"are being standardized." +msgstr "" +"从 `v3.6.0 `__开始， :doc:" +"`pgr_drivingDistance`结果列正在标准化。" + +#, fuzzy +msgid "Prim single vertex" +msgstr "单顶点" + +msgid "" +"Using ``pgr_primDD`` as example. Migration is similar to al the affected " +"functions." +msgstr "" + +#, fuzzy +msgid "" +"Comparing with `this `__ example." +msgstr "" +"使用`这个 `__ 示例。" + +#, fuzzy +msgid "Prim multiple vertices" +msgstr "多个顶点" + +#, fuzzy +msgid "" +"Comparing with `this `__ example." +msgstr "" +"使用`这个 `__ 示例。" + msgid "Migration of ``pgr_withPointsDD``" msgstr "迁移``pgr_withPointsDD``" +#, fuzzy msgid "" "Starting from `v3.6.0 `__ :" -"doc:`pgr_withPointsDD` result columns are being standarized." +"doc:`pgr_withPointsDD` result columns are being standardized." msgstr "" "从`v3.6.0 `__开始 :doc:" "`pgr_withPointsDD`结果列正在标准化。" @@ -4995,8 +5159,9 @@ msgstr "输出列为|result-1-1-no-seq|" msgid "Does not have ``start_vid``, ``pred`` and ``depth`` result columns." msgstr "没有``start_vid``，``pred``和``depth``结果列。" +#, fuzzy msgid "" -"``driving_side`` parameter was named optional now it is compulsory unamed." +"``driving_side`` parameter was named optional now it is compulsory unnamed." msgstr "``driving_side`` 参数被命名为可选，现在强制未命名。" msgid "``pgr_withPointsDD`` (`Multiple vertices`)" @@ -5047,7 +5212,8 @@ msgstr "此外，``l``也可用作**驾驶侧**" msgid "After Migration" msgstr "迁移后" -msgid "Be aware of the existance of the additional result Columns." +#, fuzzy +msgid "Be aware of the existence of the additional result Columns." msgstr "注意附加结果列的存在。" msgid "New output columns are |result-spantree|" @@ -5114,9 +5280,10 @@ msgstr "过滤掉额外的列" msgid "Migration of ``pgr_withPointsKSP``" msgstr "迁移``pgr_withPointsKSP``" +#, fuzzy msgid "" "Starting from `v3.6.0 `__ :" -"doc:`pgr_withPointsKSP` result columns are being standarized." +"doc:`pgr_withPointsKSP` result columns are being standardized." msgstr "" "从`v3.6.0 `__ 开始 ，:doc:" "`pgr_withPointsKSP`结果列正在标准化。" @@ -9801,18 +9968,12 @@ msgstr "**options:** ``[max_depth, directed]``" msgid "Returns set of |result-bfs|" msgstr "返回 |result-bfs| 的集合" -msgid "Single vertex" -msgstr "单顶点" - msgid "" "From root vertex :math:`6` on a **directed** graph with edges in ascending " "order of ``id``" msgstr "" "从根顶点:math:`6` 开始，该顶点位于一个**有向**图中，其边按 ``id``升序排列" -msgid "Multiple vertices" -msgstr "多个顶点" - msgid "" "From root vertices :math:`\\{12, 6\\}` on an **undirected** graph with " "**depth** :math:`<= 2` and edges in ascending order of ``id``" @@ -11692,9 +11853,6 @@ msgid "" "``pgr_drivingDistance`` - Returns the driving distance from a start node." msgstr "``pgr_drivingDistance`` - 返回起始节点的行驶距离。" -msgid "Standarizing output columns to |result-spantree|" -msgstr "将输出列标准化为 |result-spantree|" - msgid "Added ``depth`` and ``start_vid`` result columns." msgstr "添加了 ``depth`` 和 ``start_vid`` 结果列。" @@ -12995,14 +13153,15 @@ msgstr "返回 |result-mst| 的集合" msgid "Minimum spanning forest" msgstr "最小生成森林" -msgid "``pgr_kruskalBFS``" -msgstr "``pgr_kruskalBFS``" - msgid "" "``pgr_kruskalBFS`` — Kruskal's algorithm for Minimum Spanning Tree with " "breadth First Search ordering." msgstr "``pgr_kruskalBFS`` — Kruskal 的最小生成树算法，具有广度优先搜索排序。" +#, fuzzy +msgid "Version 3.7.0" +msgstr "版本3.6.0" + msgid "" "Visits and extracts the nodes information in Breath First Search ordering of " "the Minimum Spanning Tree created using Kruskal's algorithm." @@ -13029,9 +13188,6 @@ msgid "" "`depth \\leq 3`" msgstr "以顶点 :math:`\\{9, 6\\}` 为起点， :math:`depth \\leq 3` 的最小生成树" -msgid "``pgr_kruskalDD``" -msgstr "``pgr_kruskalDD``" - msgid "``pgr_kruskalDD`` — Catchament nodes using Kruskal's algorithm." msgstr "``pgr_kruskalDD`` — 使用 Kruskal 算法的汇流节点。" @@ -13068,9 +13224,6 @@ msgid "" msgstr "" "以顶点:math:`\\{9, 6\\}` 为起点， :math:`distance \\leq 3.5`的最小生成树" -msgid "``pgr_kruskalDFS``" -msgstr "``pgr_kruskalDFS``" - msgid "" "``pgr_kruskalDFS`` — Kruskal's algorithm for Minimum Spanning Tree with " "Depth First Search ordering." @@ -14273,18 +14426,17 @@ msgstr "" "`Boost: Prim算法文档 `__" -msgid "``pgr_primBFS``" -msgstr "``pgr_primBFS``" - msgid "" "``pgr_primBFS`` — Prim's algorithm for Minimum Spanning Tree with Depth " "First Search ordering." msgstr "``pgr_primBFS`` — Prim 的深度优先搜索排序最小生成树算法。" +#, fuzzy msgid "" "Visits and extracts the nodes information in Breath First Search ordering of " -"the Minimum Spanning Tree created with Prims's algorithm." -msgstr "访问并提取Prims算法创建的最小生成树的呼吸优先搜索排序中的节点信息。" +"the Minimum Spanning Tree created using Prims's algorithm." +msgstr "" +"访问并提取使用 Prims 算法创建的最小生成树的深度优先搜索顺序中的节点信息。" msgid "pgr_primBFS(`Edges SQL`_, **root vid**, [``max_depth``])" msgstr "pgr_primBFS(`Edges SQL`_, **root vid**, [``max_depth``])" @@ -14292,16 +14444,14 @@ msgstr "pgr_primBFS(`Edges SQL`_, **root vid**, [``max_depth``])" msgid "pgr_primBFS(`Edges SQL`_, **root vids**, [``max_depth``])" msgstr "pgr_primBFS(`Edges SQL`_, **root vids**, [``max_depth``])" -msgid "``pgr_primDD``" -msgstr "``pgr_primDD``" - msgid "``pgr_primDD`` — Catchament nodes using Prim's algorithm." msgstr "``pgr_primDD`` — 使用 Prim 算法的集水区节点。" +#, fuzzy msgid "" "Using Prim's algorithm, extracts the nodes that have aggregate costs less " -"than or equal to a **distance** from a **root** vertex (or vertices) within " -"the calculated minimum spanning tree." +"than or equal to a distance from a root vertex (or vertices) within the " +"calculated minimum spanning tree." msgstr "" "使用 Prim 算法，在计算的最小生成树中提取总成本小于或等于距根顶点（或多个顶" "点）距离的节点。" @@ -14312,9 +14462,6 @@ msgstr "pgr_primDD(`Edges SQL`_, **root vid**, **distance**)" msgid "pgr_primDD(`Edges SQL`_, **root vids**, **distance**)" msgstr "pgr_primDD(`Edges SQL`_, **root vids**, **distance**)" -msgid "``pgr_primDFS``" -msgstr "``pgr_primDFS``" - msgid "" "``pgr_primDFS`` — Prim algorithm for Minimum Spanning Tree with Depth First " "Search ordering." @@ -16237,8 +16384,8 @@ msgid "" "utf8=%E2%9C%93&q=milestone%3A%22Release%203.7.0%22>`__" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 `3.7.0 `__ 的 Git 关闭里程碑" +"pgRouting/pgrouting/issues?" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.7.0%22>`__ 的 Git 关闭里程碑" msgid "pgRouting 3.6" msgstr "pgRouting 3.6" @@ -16274,9 +16421,6 @@ msgstr "" "拉取请求 `_" -msgid "Official functions changes" -msgstr "官方功能变更" - msgid "" "`#2516 `__ Standarize " "output pgr_aStar" @@ -18665,8 +18809,9 @@ msgid "" "With the release of pgRouting 2.0.0 the library has abandoned backwards " "compatibility to `pgRouting 1.0`_ releases. The main Goals for this release " "are:" -msgstr "随着 pgRouting 2.0.0 的发布，该库已放弃向后兼容 `pgRouting 1.0`_ " -"版本。此版本的主要目标是：" +msgstr "" +"随着 pgRouting 2.0.0 的发布，该库已放弃向后兼容 `pgRouting 1.0`_ 版本。此版本" +"的主要目标是：" msgid "Major restructuring of pgRouting." msgstr "对 pgRouting 进行重大重组。" @@ -19698,6 +19843,11 @@ msgstr "pgr_withPointsDD 是**带有点**的 pgr_drivenDistance" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "pgr_withPointsvia 是**带有点**的 pgr_dijkstraVia" +#~ msgid "" +#~ "Visits and extracts the nodes information in Breath First Search ordering " +#~ "of the Minimum Spanning Tree created with Prims's algorithm." +#~ msgstr "访问并提取Prims算法创建的最小生成树的呼吸优先搜索排序中的节点信息。" + #~ msgid "" #~ "Column ``pred`` only applies to :doc:`pgr_drivingDistance` and :doc:" #~ "`pgr_withPointsDD`." From a804bb721fade9ba285bfa337bf148661acfdf4e Mon Sep 17 00:00:00 2001 From: Weblate Date: Thu, 1 Feb 2024 17:52:09 +0000 Subject: [PATCH 216/428] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/ --- locale/de/LC_MESSAGES/pgrouting_doc_strings.po | 7 ++++++- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 10 +++++++++- locale/ja/LC_MESSAGES/pgrouting_doc_strings.po | 7 ++++++- locale/ko/LC_MESSAGES/pgrouting_doc_strings.po | 7 ++++++- locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po | 9 ++++++++- 5 files changed, 35 insertions(+), 5 deletions(-) diff --git a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po index 9ada26be30..ece3dd71b8 100644 --- a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-24 17:44+0000\n" +"POT-Creation-Date: 2024-02-01 17:51+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -4421,6 +4421,11 @@ msgid "" "distance cleanup" msgstr "" +msgid "" +"`#2607 `__ Read " +"postgresql data on C++" +msgstr "" + msgid "Others" msgstr "" diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index c3717a9b88..0507d54b09 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-24 17:44+0000\n" +"POT-Creation-Date: 2024-02-01 17:51+0000\n" "PO-Revision-Date: 2024-01-07 23:45+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish `__ Limpiando " "Driving Distance" +#, fuzzy +msgid "" +"`#2607 `__ Read " +"postgresql data on C++" +msgstr "" +"`#2517 `__ Simplificación " +"del código de Astar." + msgid "Others" msgstr "Otros" diff --git a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po index 2905b5dd03..3450005705 100644 --- a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-24 17:44+0000\n" +"POT-Creation-Date: 2024-02-01 17:51+0000\n" "PO-Revision-Date: 2022-09-29 19:13+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Japanese `__ Read " +"postgresql data on C++" +msgstr "" + msgid "Others" msgstr "" diff --git a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po index f04917e1dc..ad55f5ec89 100644 --- a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-24 17:44+0000\n" +"POT-Creation-Date: 2024-02-01 17:51+0000\n" "PO-Revision-Date: 2022-12-13 12:30+0000\n" "Last-Translator: Hyung-Gyu Ryoo \n" "Language-Team: Korean `__ Read " +"postgresql data on C++" +msgstr "" + msgid "Others" msgstr "" diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 0a5348d96b..803ba1b63f 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-24 17:44+0000\n" +"POT-Creation-Date: 2024-02-01 17:51+0000\n" "PO-Revision-Date: 2024-01-19 09:46+0000\n" "Last-Translator: Zuochenwei \n" "Language-Team: Chinese (Simplified) `__ 行车距离清理" +#, fuzzy +msgid "" +"`#2607 `__ Read " +"postgresql data on C++" +msgstr "" +"`#2517 `__ Astar 代码简化。" + msgid "Others" msgstr "其他" From ca1a02d012bc3b003c2f9712cc546433c0238e01 Mon Sep 17 00:00:00 2001 From: Weblate Date: Tue, 6 Feb 2024 15:37:25 +0000 Subject: [PATCH 217/428] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/ --- locale/de/LC_MESSAGES/pgrouting_doc_strings.po | 9 ++++++--- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 13 ++++++++++--- locale/ja/LC_MESSAGES/pgrouting_doc_strings.po | 9 ++++++--- locale/ko/LC_MESSAGES/pgrouting_doc_strings.po | 9 ++++++--- locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po | 11 ++++++++--- 5 files changed, 36 insertions(+), 15 deletions(-) diff --git a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po index ece3dd71b8..e8710498be 100644 --- a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-01 17:51+0000\n" +"POT-Creation-Date: 2024-02-06 15:37+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -17931,8 +17931,11 @@ msgid "" msgstr "" msgid "" -"Developer mailing list: https://lists.osgeo.org/mailman/listinfo/pgrouting-" -"dev" +"Developer mailing list: https://discourse.osgeo.org/c/pgrouting/pgrouting-" +"dev/" +msgstr "" + +msgid "Subscribe: https://discourse.osgeo.org/g/pgrouting-dev" msgstr "" msgid "" diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 0507d54b09..9ab5bb14c9 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-01 17:51+0000\n" +"POT-Creation-Date: 2024-02-06 15:37+0000\n" "PO-Revision-Date: 2024-01-07 23:45+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" "Language-Team: Japanese \n" "Language-Team: Korean \n" "Language-Team: Chinese (Simplified) Date: Tue, 13 Feb 2024 01:27:46 +0000 Subject: [PATCH 218/428] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/ --- .../de/LC_MESSAGES/pgrouting_doc_strings.po | 23 +++++------ .../es/LC_MESSAGES/pgrouting_doc_strings.po | 37 +++++++++-------- .../ja/LC_MESSAGES/pgrouting_doc_strings.po | 23 +++++------ .../ko/LC_MESSAGES/pgrouting_doc_strings.po | 23 +++++------ .../LC_MESSAGES/pgrouting_doc_strings.po | 41 +++++++++++-------- 5 files changed, 78 insertions(+), 69 deletions(-) diff --git a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po index e8710498be..85735aee5a 100644 --- a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-06 15:37+0000\n" +"POT-Creation-Date: 2024-02-13 01:27+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -4372,10 +4372,13 @@ msgstr "" msgid ":doc:`release_notes`" msgstr "" -msgid "Current release" +msgid "pgRouting 3.7.0 Release Notes" msgstr "" -msgid "_" +msgid "" +"To see all issues & pull requests closed by this release see the `Git closed " +"milestone for 3.7.0 `__" msgstr "" msgid "Official functions changes" @@ -4426,6 +4429,11 @@ msgid "" "postgresql data on C++" msgstr "" +msgid "" +"`#2614 `__ Clang tidy " +"does not work" +msgstr "" + msgid "Others" msgstr "" @@ -15279,15 +15287,6 @@ msgstr "" msgid "pgRouting 3.7" msgstr "" -msgid "pgRouting 3.7.0 Release Notes" -msgstr "" - -msgid "" -"To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.7.0 `__" -msgstr "" - msgid "pgRouting 3.6" msgstr "" diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 9ab5bb14c9..8ccbf2d75f 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-06 15:37+0000\n" +"POT-Creation-Date: 2024-02-13 01:27+0000\n" "PO-Revision-Date: 2024-01-07 23:45+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish `__" msgstr "" +"Para ver todos los problemas y solicitudes de extracción cerrados para ésta " +"versión, consulte la `meta cerrada 3.7.0 `_" msgid "Official functions changes" msgstr "" @@ -4994,6 +5000,14 @@ msgstr "" "`#2517 `__ Simplificación " "del código de Astar." +#, fuzzy +msgid "" +"`#2614 `__ Clang tidy " +"does not work" +msgstr "" +"`#2517 `__ Simplificación " +"del código de Astar." + msgid "Others" msgstr "Otros" @@ -17703,18 +17717,6 @@ msgstr "" msgid "pgRouting 3.7" msgstr "pgRouting 3.7" -msgid "pgRouting 3.7.0 Release Notes" -msgstr "Notas de la versión de pgRouting 3.7.0" - -msgid "" -"To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.7.0 `__" -msgstr "" -"Para ver todos los problemas y solicitudes de extracción cerrados para ésta " -"versión, consulte la `meta cerrada 3.7.0 `_" - msgid "pgRouting 3.6" msgstr "pgRouting 3.6" @@ -21305,6 +21307,9 @@ msgstr "pgr_withPointsDD es pgr_drivingDistance **con puntos**" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "pgr_withPoints es pgr_dijkstraVia **con puntos**" +#~ msgid "Current release" +#~ msgstr "Versión actual" + #~ msgid "" #~ "Visits and extracts the nodes information in Breath First Search ordering " #~ "of the Minimum Spanning Tree created with Prims's algorithm." diff --git a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po index f57a98f34f..e52c056d34 100644 --- a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-06 15:37+0000\n" +"POT-Creation-Date: 2024-02-13 01:27+0000\n" "PO-Revision-Date: 2022-09-29 19:13+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Japanese `__" msgstr "" msgid "Official functions changes" @@ -4507,6 +4510,11 @@ msgid "" "postgresql data on C++" msgstr "" +msgid "" +"`#2614 `__ Clang tidy " +"does not work" +msgstr "" + msgid "Others" msgstr "" @@ -15428,15 +15436,6 @@ msgstr "" msgid "pgRouting 3.7" msgstr "" -msgid "pgRouting 3.7.0 Release Notes" -msgstr "" - -msgid "" -"To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.7.0 `__" -msgstr "" - msgid "pgRouting 3.6" msgstr "" diff --git a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po index fc23f9b88e..c79db3727a 100644 --- a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-06 15:37+0000\n" +"POT-Creation-Date: 2024-02-13 01:27+0000\n" "PO-Revision-Date: 2022-12-13 12:30+0000\n" "Last-Translator: Hyung-Gyu Ryoo \n" "Language-Team: Korean `__" msgstr "" msgid "Official functions changes" @@ -4445,6 +4448,11 @@ msgid "" "postgresql data on C++" msgstr "" +msgid "" +"`#2614 `__ Clang tidy " +"does not work" +msgstr "" + msgid "Others" msgstr "" @@ -15324,15 +15332,6 @@ msgstr "" msgid "pgRouting 3.7" msgstr "" -msgid "pgRouting 3.7.0 Release Notes" -msgstr "" - -msgid "" -"To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.7.0 `__" -msgstr "" - msgid "pgRouting 3.6" msgstr "" diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index ec7cf6d43d..d9aa625ebc 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-06 15:37+0000\n" +"POT-Creation-Date: 2024-02-13 01:27+0000\n" "PO-Revision-Date: 2024-01-19 09:46+0000\n" "Last-Translator: Zuochenwei \n" "Language-Team: Chinese (Simplified) `__" +msgstr "" +"要查看此版本关闭的所有问题和拉取请求，请参阅 `3.7.0 `__ 的 Git 关闭里程碑" msgid "Official functions changes" msgstr "官方功能变更" @@ -4609,6 +4615,13 @@ msgid "" msgstr "" "`#2517 `__ Astar 代码简化。" +#, fuzzy +msgid "" +"`#2614 `__ Clang tidy " +"does not work" +msgstr "" +"`#2517 `__ Astar 代码简化。" + msgid "Others" msgstr "其他" @@ -16382,18 +16395,6 @@ msgstr "3.x小版本" msgid "pgRouting 3.7" msgstr "pgRouting 3.7" -msgid "pgRouting 3.7.0 Release Notes" -msgstr "pgRouting 3.7.0 发布说明" - -msgid "" -"To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.7.0 `__" -msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 `3.7.0 `__ 的 Git 关闭里程碑" - msgid "pgRouting 3.6" msgstr "pgRouting 3.6" @@ -19855,6 +19856,12 @@ msgstr "pgr_withPointsDD 是**带有点**的 pgr_drivenDistance" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "pgr_withPointsvia 是**带有点**的 pgr_dijkstraVia" +#~ msgid "Current release" +#~ msgstr "当前版本" + +#~ msgid "_" +#~ msgstr "_" + #~ msgid "" #~ "Visits and extracts the nodes information in Breath First Search ordering " #~ "of the Minimum Spanning Tree created with Prims's algorithm." From e00124cc5c5f3e8024ed07020d4dd4e4da770207 Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Thu, 11 Apr 2024 04:05:55 +0000 Subject: [PATCH 219/428] Translated using Weblate (Spanish) Currently translated at 90.1% (4709 of 5225 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 61 +++++++------------ 1 file changed, 23 insertions(+), 38 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 8ccbf2d75f..e2ceecc02e 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-02-13 01:27+0000\n" -"PO-Revision-Date: 2024-01-07 23:45+0000\n" +"PO-Revision-Date: 2024-04-11 04:15+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" @@ -20,7 +20,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 5.3\n" +"X-Generator: Weblate 5.4.3\n" "Generated-By: Babel 2.10.3\n" msgid "BFS - Category" @@ -4945,17 +4945,15 @@ msgstr "" msgid "Official functions changes" msgstr "" -#, fuzzy msgid "" "`#2605 `__ Standarize " "spanning tree functions output" msgstr "" -"`#2516 `__ estandarización " -"de resultados de pgr_aStar" +"`#2605 `__ Estandarización " +"de las salida de las funciones de árbol de expansión" -#, fuzzy msgid "Functions:" -msgstr "Nuevas Funciones" +msgstr "Funciones:" msgid "``pgr_kruskalDD``" msgstr "``pgr_kruskalDD``" @@ -4978,9 +4976,8 @@ msgstr "``pgr_primBFS``" msgid "Standarizing output columns to |result-spantree|" msgstr "Estandarización de columnas de resultados a |result-spantree|" -#, fuzzy msgid "Added ``pred`` result columns." -msgstr "Agregado las columnas de resultados``depth`` y ``pred``." +msgstr "Agregado columna de resultados ``pred``." msgid "Code enhancement" msgstr "Mejora del código" @@ -4992,21 +4989,19 @@ msgstr "" "`#2599 `__ Limpiando " "Driving Distance" -#, fuzzy msgid "" "`#2607 `__ Read " "postgresql data on C++" msgstr "" -"`#2517 `__ Simplificación " -"del código de Astar." +"`#2607 `__ Leer datos de " +"postgresql en C++" -#, fuzzy msgid "" "`#2614 `__ Clang tidy " "does not work" msgstr "" -"`#2517 `__ Simplificación " -"del código de Astar." +"`#2614 `__ Clang tidy no " +"funciona" msgid "Others" msgstr "Otros" @@ -5114,7 +5109,6 @@ msgstr "``pgr_aStar`` (`Muchos a Uno`) no tiene ``end_vid``." msgid "Migration" msgstr "Migración" -#, fuzzy msgid "Be aware of the existence of the additional columns." msgstr "Tener en cuenta la existencia de las columnas adicionales." @@ -5238,12 +5232,11 @@ msgstr "Si es necesario, añadir las nuevas columnas, por ejemplo:" msgid "Migration of ``pgr_drivingdistance``" msgstr "Migración de ``pgr_drivingDistance``" -#, fuzzy msgid "" "Starting from `v3.6.0 `__ :" "doc:`pgr_drivingDistance` result columns are being standardized." msgstr "" -"A partir de `v3.6.0 `__, " +"A partir de `v3.6.0 `__, " "las columnas resultantes de :doc:`pgr_drivingDistance` son estandarizadas." msgid "from" @@ -5276,7 +5269,6 @@ msgstr "Tiene la columa de resultados ``from_v`` en vez de ``start_vid``." msgid "does not have ``depth`` result column." msgstr "no tiene la columna ``depth`` en los resultados." -#, fuzzy msgid "Be aware of the existence and name change of the result columns." msgstr "" "Tener en cuenta la existencia y el cambio de nombre de las columnas de " @@ -5313,7 +5305,6 @@ msgid "The ``from_v`` result column name changes to ``start_vid``." msgstr "" "El nombre de la columna de resultados ``from_v`` cambia a ``start_vid``." -#, fuzzy msgid "" "If needed filter out and rename columns, for example, to return the original " "columns:" @@ -5325,18 +5316,17 @@ msgid "" "Migration of ``pgr_kruskalDD`` / ``pgr_kruskalBFS`` / ``pgr_kruskalDFS``" msgstr "" -#, fuzzy msgid "" "Starting from `v3.7.0 `__ :" "doc:`pgr_kruskalDD`, :doc:`pgr_kruskalBFS` and :doc:`pgr_kruskalDFS` result " "columns are being standardized." msgstr "" -"A partir de `v3.6.0 `__, " -"las columnas resultantes de :doc:`pgr_drivingDistance` son estandarizadas." +"A partir de `v3.6.0 `__, " +"Las columnas resultantes de :doc:`pgr_kruskalDD`, :doc:`pgr_kruskalBFS` and " +":doc:`pgr_kruskalDFS` son estandarizadas." -#, fuzzy msgid "|result-bfs|" -msgstr "Resultados" +msgstr "|result-bfs|" msgid "Single vertex" msgstr "Vértice único" @@ -5361,9 +5351,8 @@ msgid "Be aware of the existence of `pred` result columns." msgstr "" "Tener en cuenta la existencia de las columnas de adicionales de resultados." -#, fuzzy msgid "If needed filter out the added columns" -msgstr "Si es necesario, filtrar las columnas añadidas, por ejemplo:" +msgstr "Si es necesario, filtrar las columnas añadidas" #, fuzzy msgid "Kruskal single vertex" @@ -5374,41 +5363,37 @@ msgid "" "functions." msgstr "" -#, fuzzy msgid "" "Comparing with `this `__ example." msgstr "" -"Usando `éste `__ ejemplo." +"Comparación con `este ejemplo `__." -#, fuzzy msgid "" "Now column ``pred`` exists and contains the predecessor of the ``node``." -msgstr "``pred`` contiene el predecesor del ``nodo``." +msgstr "Ahora la columna ``pred`` existe y contiene el predecesor del ``node``." #, fuzzy msgid "Kruskal multiple vertices" msgstr "Múltiples vértices" -#, fuzzy msgid "" "Comparing with `this `__ example." msgstr "" -"Usando `éste `__ ejemplo." +"Comparación con `este ejemplo `__." msgid "Migration of ``pgr_KSP``" msgstr "Migración de ``pgr_KSP``" -#, fuzzy msgid "" "Starting from `v3.6.0 `__ :" "doc:`pgr_KSP` result columns are being standardized." msgstr "" -"A partir de `v3.6.0 `__ " -"las columnas resultantes de :doc:`pgr_KSP` son estandarizadas." +"A partir de `v3.6.0 `__ En " +":doc:`pgr_KSP` las columnas de resultados están siendo estandarizadas." msgid "|ksp-result|" msgstr "|ksp-result|" From 57d97ec8b8cd1bfb49e499e00fabb84d568111c5 Mon Sep 17 00:00:00 2001 From: DeepL Date: Thu, 11 Apr 2024 04:10:53 +0000 Subject: [PATCH 220/428] Translated using Weblate (Spanish) Currently translated at 90.1% (4709 of 5225 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 35 +++++++------------ 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index e2ceecc02e..71ace312a4 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-02-13 01:27+0000\n" "PO-Revision-Date: 2024-04-11 04:15+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"Last-Translator: DeepL \n" "Language-Team: Spanish \n" "Language: es\n" @@ -5334,29 +5334,23 @@ msgstr "Vértice único" msgid "Multiple vertices" msgstr "Múltiples vértices" -#, fuzzy msgid "Output columns were |result-bfs|" -msgstr "Columnas de resultados eran |ksp-result|" +msgstr "Las columnas de salida fueron |result-bfs|" -#, fuzzy msgid "Single vertex and Multiple vertices" -msgstr "Múltiples vértices" +msgstr "Vértice único y vértices múltiples" -#, fuzzy msgid "Do not have ``pred`` result column." -msgstr "No tiene un valor de facto." +msgstr "No tiene columna de resultados ``pred``." -#, fuzzy msgid "Be aware of the existence of `pred` result columns." -msgstr "" -"Tener en cuenta la existencia de las columnas de adicionales de resultados." +msgstr "Tenga en cuenta la existencia de columnas de resultados `pred`." msgid "If needed filter out the added columns" msgstr "Si es necesario, filtrar las columnas añadidas" -#, fuzzy msgid "Kruskal single vertex" -msgstr "Vértice único" +msgstr "Kruskal vértice único" msgid "" "Using ``pgr_KruskalDD`` as example. Migration is similar to al the affected " @@ -5374,9 +5368,8 @@ msgid "" "Now column ``pred`` exists and contains the predecessor of the ``node``." msgstr "Ahora la columna ``pred`` existe y contiene el predecesor del ``node``." -#, fuzzy msgid "Kruskal multiple vertices" -msgstr "Múltiples vértices" +msgstr "Kruskal vértices múltiples" msgid "" "Comparing with `this `__ :" "doc:`pgr_primDD`, :doc:`pgr_primBFS` and :doc:`pgr_primDFS` result columns " "are being standardized." msgstr "" -"A partir de `v3.6.0 `__, " -"las columnas resultantes de :doc:`pgr_drivingDistance` son estandarizadas." +"A partir de `v3.7.0 `__ se " +"estandarizan las columnas de resultados :doc:`pgr_primDD`, :doc:`pgr_primBFS`" +" y :doc:`pgr_primDFS`." -#, fuzzy msgid "Prim single vertex" -msgstr "Vértice único" +msgstr "Prim vértice único" msgid "" "Using ``pgr_primDD`` as example. Migration is similar to al the affected " "functions." msgstr "" -#, fuzzy msgid "" "Comparing with `this `__ example." msgstr "" -"Usando `éste `__ ejemplo." +"Comparación con `este ejemplo `__." #, fuzzy msgid "Prim multiple vertices" From d06a10b03012cc3c0411495d09804c9861d0ad4e Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Thu, 11 Apr 2024 04:15:55 +0000 Subject: [PATCH 221/428] Translated using Weblate (Spanish) Currently translated at 90.1% (4711 of 5225 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 71ace312a4..784285fece 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-02-13 01:27+0000\n" -"PO-Revision-Date: 2024-04-11 04:15+0000\n" -"Last-Translator: DeepL \n" +"PO-Revision-Date: 2024-04-11 04:17+0000\n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" "Language: es\n" @@ -5524,7 +5524,7 @@ msgid "" "Comparing with `this `__ example." msgstr "" -"Comparación con `este ejemplo `__." #, fuzzy From 4999b8a24e48e9afdcbee50037ab4292633140f9 Mon Sep 17 00:00:00 2001 From: DeepL Date: Thu, 11 Apr 2024 04:16:56 +0000 Subject: [PATCH 222/428] Translated using Weblate (Spanish) Currently translated at 90.1% (4711 of 5225 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 784285fece..e6724ae7bb 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-02-13 01:27+0000\n" "PO-Revision-Date: 2024-04-11 04:17+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"Last-Translator: DeepL \n" "Language-Team: Spanish \n" "Language: es\n" @@ -5527,17 +5527,15 @@ msgstr "" "Comparación con `este ejemplo `__." -#, fuzzy msgid "Prim multiple vertices" -msgstr "Múltiples vértices" +msgstr "Prim vértices múltiples" -#, fuzzy msgid "" "Comparing with `this `__ example." msgstr "" -"Usando `éste `__ ejemplo." +"Comparación con `este ejemplo `__." msgid "Migration of ``pgr_withPointsDD``" msgstr "Migración de ``pgr_withPointsDD``" From 753c99cb6fab6b5bca6493f16e51181efb4312f2 Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Thu, 11 Apr 2024 04:17:44 +0000 Subject: [PATCH 223/428] Translated using Weblate (Spanish) Currently translated at 90.1% (4712 of 5225 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index e6724ae7bb..dbac17853a 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-02-13 01:27+0000\n" -"PO-Revision-Date: 2024-04-11 04:17+0000\n" -"Last-Translator: DeepL \n" +"PO-Revision-Date: 2024-04-11 04:18+0000\n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" "Language: es\n" @@ -5534,7 +5534,7 @@ msgid "" "Comparing with `this `__ example." msgstr "" -"Comparación con `este ejemplo `__." msgid "Migration of ``pgr_withPointsDD``" From 1dc6ddaa2253931302278dc2db9cbdc616f05dc8 Mon Sep 17 00:00:00 2001 From: DeepL Date: Thu, 11 Apr 2024 04:17:56 +0000 Subject: [PATCH 224/428] Translated using Weblate (Spanish) Currently translated at 90.1% (4712 of 5225 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index dbac17853a..9bed23127e 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-02-13 01:27+0000\n" "PO-Revision-Date: 2024-04-11 04:18+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"Last-Translator: DeepL \n" "Language-Team: Spanish \n" "Language: es\n" @@ -5540,13 +5540,13 @@ msgstr "" msgid "Migration of ``pgr_withPointsDD``" msgstr "Migración de ``pgr_withPointsDD``" -#, fuzzy msgid "" "Starting from `v3.6.0 `__ :" "doc:`pgr_withPointsDD` result columns are being standardized." msgstr "" "A partir de `v3.6.0 `__ " -"las columnas resultantes de :doc:`pgr_withPointsDD` son estandarizadas." +":doc:`pgr_withPointsDD` las columnas de resultados están siendo " +"estandarizadas." msgid "|result-generic-no-seq|" msgstr "|result-generic-no-seq|" From a040f0b89452544a0240112ea0c3c740b6b583c4 Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Thu, 11 Apr 2024 04:18:48 +0000 Subject: [PATCH 225/428] Translated using Weblate (Spanish) Currently translated at 90.2% (4715 of 5225 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 9bed23127e..7bd06a8c8f 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-02-13 01:27+0000\n" -"PO-Revision-Date: 2024-04-11 04:18+0000\n" -"Last-Translator: DeepL \n" +"PO-Revision-Date: 2024-04-11 04:20+0000\n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" "Language: es\n" @@ -5544,7 +5544,7 @@ msgid "" "Starting from `v3.6.0 `__ :" "doc:`pgr_withPointsDD` result columns are being standardized." msgstr "" -"A partir de `v3.6.0 `__ " +"A partir de `v3.6.0 `__ En " ":doc:`pgr_withPointsDD` las columnas de resultados están siendo " "estandarizadas." @@ -5626,10 +5626,9 @@ msgstr "También `` l`` podía usarse como \"lado de manejo\"" msgid "After Migration" msgstr "Después de la migración" -#, fuzzy msgid "Be aware of the existence of the additional result Columns." msgstr "" -"Tener en cuenta la existencia de las columnas de adicionales de resultados." +"Tener en cuenta la existencia de las columnas adicionales de resultados." msgid "New output columns are |result-spantree|" msgstr "Las nuevas columnas de salida son |result-spantree|" From 87631cb1732ae8f1be0ff4b3237578fe47c37289 Mon Sep 17 00:00:00 2001 From: DeepL Date: Thu, 11 Apr 2024 04:19:39 +0000 Subject: [PATCH 226/428] Translated using Weblate (Spanish) Currently translated at 90.2% (4715 of 5225 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 7bd06a8c8f..3d16ce6b75 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-02-13 01:27+0000\n" "PO-Revision-Date: 2024-04-11 04:20+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"Last-Translator: DeepL \n" "Language-Team: Spanish \n" "Language: es\n" @@ -5572,7 +5572,6 @@ msgstr "Las columnas de resultados eran |result-1-1-no-seq|" msgid "Does not have ``start_vid``, ``pred`` and ``depth`` result columns." msgstr "No tiene columnas de resultados ``start_vid``, ``pred`` y ``depth``." -#, fuzzy msgid "" "``driving_side`` parameter was named optional now it is compulsory unnamed." msgstr "" @@ -5700,13 +5699,13 @@ msgstr "Filtrar las columnas adicionales" msgid "Migration of ``pgr_withPointsKSP``" msgstr "Migración de ``pgr_withPointsKSP``" -#, fuzzy msgid "" "Starting from `v3.6.0 `__ :" "doc:`pgr_withPointsKSP` result columns are being standardized." msgstr "" "A partir de `v3.6.0 `__ " -"las columnas resultantes de :doc:`pgr_withPointsKSP` son estandarizadas." +":doc:`pgr_withPointsKSP` las columnas de resultados están siendo " +"estandarizadas." msgid "" "And ``driving side`` parameter changed from named optional to unnamed " From b2b7a74d635f7cf7254481eb4521005420f9806e Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Thu, 11 Apr 2024 04:21:08 +0000 Subject: [PATCH 227/428] Translated using Weblate (Spanish) Currently translated at 90.2% (4718 of 5225 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 3d16ce6b75..61ec5f4c95 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-02-13 01:27+0000\n" -"PO-Revision-Date: 2024-04-11 04:20+0000\n" -"Last-Translator: DeepL \n" +"PO-Revision-Date: 2024-04-11 04:24+0000\n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" "Language: es\n" @@ -5703,7 +5703,7 @@ msgid "" "Starting from `v3.6.0 `__ :" "doc:`pgr_withPointsKSP` result columns are being standardized." msgstr "" -"A partir de `v3.6.0 `__ " +"A partir de `v3.6.0 `__ en " ":doc:`pgr_withPointsKSP` las columnas de resultados están siendo " "estandarizadas." @@ -15644,13 +15644,12 @@ msgstr "" "``pgr_primBFS`` — Algoritmo de Prim para el árbol de expansión mínimo con " "orden de primera búsqueda de profundidad." -#, fuzzy msgid "" "Visits and extracts the nodes information in Breath First Search ordering of " "the Minimum Spanning Tree created using Prims's algorithm." msgstr "" -"Visita y extrae la información de los nodos en el orden de la Primera " -"Búsqueda de Profundidad del Árbol de Expansión Mínima creado utilizando el " +"Visita y extrae la información de los nodos en el ordenamiento de la primera " +"búsqueda de amplitud del árbol de expansión mínima creado mediante el " "algoritmo de Prim." msgid "pgr_primBFS(`Edges SQL`_, **root vid**, [``max_depth``])" From 52bad063f94c8ff2b24600e0a1fd241cd4b36e19 Mon Sep 17 00:00:00 2001 From: DeepL Date: Thu, 11 Apr 2024 04:21:16 +0000 Subject: [PATCH 228/428] Translated using Weblate (Spanish) Currently translated at 90.2% (4718 of 5225 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 61ec5f4c95..8036f56138 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-02-13 01:27+0000\n" -"PO-Revision-Date: 2024-04-11 04:24+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"PO-Revision-Date: 2024-04-11 04:25+0000\n" +"Last-Translator: DeepL \n" "Language-Team: Spanish \n" "Language: es\n" @@ -14240,9 +14240,8 @@ msgstr "" "``pgr_kruskalBFS`` — Algoritmo de Kruskal para el Árbol de Expansión Mínimo " "con orden de Primera Búsqueda en Anchura." -#, fuzzy msgid "Version 3.7.0" -msgstr "Versión 3.6.0" +msgstr "Versión 3.7.0" msgid "" "Visits and extracts the nodes information in Breath First Search ordering of " @@ -15661,15 +15660,14 @@ msgstr "pgr_primBFS(`SQL de aristas`_, **Raíces**, [``max_depth``])" msgid "``pgr_primDD`` — Catchament nodes using Prim's algorithm." msgstr "``pgr_primDD`` — Nodos de captación mediante el algoritmo de Prim." -#, fuzzy msgid "" "Using Prim's algorithm, extracts the nodes that have aggregate costs less " "than or equal to a distance from a root vertex (or vertices) within the " "calculated minimum spanning tree." msgstr "" -"Mediante el algoritmo Prim, se extraen los nodos que tienen costes agregados " -"menores o iguales que el valor de la **Distancia** desde un vértice (o " -"vértices) raíz dentro del árbol de expansión mínimo calculado." +"Mediante el algoritmo de Prim, extrae los nodos que tienen costes agregados " +"inferiores o iguales a una distancia desde un vértice raíz (o vértices) " +"dentro del árbol de expansión mínimo calculado." msgid "pgr_primDD(`Edges SQL`_, **root vid**, **distance**)" msgstr "pgr_primDD(`SQL de aristas`_, **raíz**, **distancia**)" From 703395583a493726a4ad5733a7b7452fca2ec1a5 Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Thu, 11 Apr 2024 04:32:58 +0000 Subject: [PATCH 229/428] Translated using Weblate (Spanish) Currently translated at 90.8% (4748 of 5225 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 74 ++++++++++++------- 1 file changed, 48 insertions(+), 26 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 8036f56138..0a3ec61c67 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-02-13 01:27+0000\n" -"PO-Revision-Date: 2024-04-11 04:25+0000\n" -"Last-Translator: DeepL \n" +"PO-Revision-Date: 2024-04-11 04:37+0000\n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" "Language: es\n" @@ -4943,7 +4943,7 @@ msgstr "" "pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.7.0%22>`_" msgid "Official functions changes" -msgstr "" +msgstr "Cambios en las funciones oficiales" msgid "" "`#2605 `__ Standarize " @@ -5596,7 +5596,7 @@ msgid "directed" msgstr "dirigido" msgid "true" -msgstr "``true``" +msgstr "verdadero" msgid "driving_side" msgstr "driving_side" @@ -7131,7 +7131,7 @@ msgid "" "described on :doc:`contraction-family`" msgstr "" "En :doc:`contraction-family` se describe un método completo sobre cómo " -"contraer y cómo utilizar el grafo contraído." +"contraer y cómo utilizar el grafo contraído" msgid "Dead ends" msgstr "Callejones sin salida" @@ -7327,7 +7327,7 @@ msgstr "Sobrecargas de funciones" msgid "A function might have different overloads. The most common are called:" msgstr "" -"Una función puede tener diferentes sobrecargas. Las más comunes se llaman" +"Una función puede tener diferentes sobrecargas. Las más comunes se llaman:" msgid "`One to One`_" msgstr "`Uno a Uno`_" @@ -7472,7 +7472,7 @@ msgid "Edges SQL for :doc:`flow-family`" msgstr "SQL de aristas para :doc:`flow-family`" msgid "Edges SQL for the following functions of :doc:`flow-family`" -msgstr "SQL de aristas para las siguientes funciones de :doc:`flow-family`." +msgstr "SQL de aristas para las siguientes funciones de :doc:`flow-family`" msgid "Used in combination signatures" msgstr "Utilizado en combinación firmas" @@ -7491,12 +7491,17 @@ msgid "" "Depending on the family or category of a function it will have additional " "parameters, some of them are compulsory and some are optional." msgstr "" +"Dependiendo de la familia o categoría de una función tendrá parámetros " +"adicionales, algunos de ellos son obligatorios y otros opcionales." msgid "" "The compulsory parameters are nameless and must be given in the required " "order. The optional parameters are named parameters and will have a default " "value." msgstr "" +"Los parámetros obligatorios no tienen nombre y deben indicarse en el orden " +"requerido. Los parámetros opcionales son parámetros con nombre y tendrán un " +"valor por defecto." msgid "Parameters for the Via functions" msgstr "Párametros para las funciones Via" @@ -7566,7 +7571,7 @@ msgid "Result columns for a path" msgstr "Columnas de resultados para una ruta" msgid "Used in functions that return one path solution" -msgstr "" +msgstr "Se utiliza en funciones que devuelven una solución de ruta" msgid "" "Returns set of ``(seq, path_seq [, start_vid] [, end_vid], node, edge, cost, " @@ -7701,13 +7706,13 @@ msgid "Identifier of the ending vertex of the current path." msgstr "Identificador del vértice final de la ruta actual." msgid "Multiple paths" -msgstr "" +msgstr "Varias rutas" msgid "Selective for multiple paths." -msgstr "" +msgstr "Selectivo para múltiples rutas." msgid "The columns depend on the function call." -msgstr "" +msgstr "Las columnas dependen de la llamada a la función." msgid "" "Set of ``(seq, path_id, path_seq [, start_vid] [, end_vid], node, edge, " @@ -7728,10 +7733,10 @@ msgstr "" "Tiene valor **1** para el primero de la ruta de ``start_vid`` a ``end_vid``." msgid "Non selective for multiple paths" -msgstr "" +msgstr "No selectivo para rutas múltiples" msgid "Regardless of the call, al the columns are returned." -msgstr "" +msgstr "Independientemente de la llamada, se devuelven todas las columnas." msgid "" "Returns set of ``(seq, path_id, path_seq, start_vid, end_vid, node, edge, " @@ -7744,7 +7749,7 @@ msgid "Result columns for cost functions" msgstr "Columnas de resultados de las funciones de costes" msgid "Used in the following" -msgstr "" +msgstr "Se utiliza en" msgid "" "When start_vid or end_vid columns have negative values, the identifier is " @@ -7757,7 +7762,7 @@ msgid "Result columns for flow functions" msgstr "Columnas de resultados para funciones de flujo" msgid "Edges SQL for the following" -msgstr "" +msgstr "SQL de aristas para lo siguiente" msgid "Result columns for spanning tree functions" msgstr "Columnas de resultados para funciones de árbol de expansión" @@ -7860,6 +7865,11 @@ msgid "" "can be found in `Installation wiki `__" msgstr "" +"Las instrucciones para descargar e instalar los binarios para diferentes " +"sistemas operativos, notas adicionales y correcciones no incluidas en esta " +"documentación se pueden encontrar en `Installation wiki `__" msgid "" "To use pgRouting PostGIS needs to be installed, please read the information " @@ -7922,6 +7932,9 @@ msgid "" "(there is no tar ball involved while downloading pgRouting repository from " "GitHub)." msgstr "" +"Ir a :ref:`install-short` para más instrucciones sobre la compilación de " +"pgRouting (no hay bola tar involucrada al descargar el repositorio pgRouting " +"desde GitHub)." msgid "Enabling and upgrading in the database" msgstr "Habilitación y actualización en la base de datos" @@ -7934,10 +7947,15 @@ msgid "" "functionalities to end user. Below given code demonstrates enabling PostGIS " "and pgRouting in the database." msgstr "" +"pgRouting es una extensión de PostgreSQL y depende de PostGIS para " +"proporcionar funcionalidades al usuario final. A continuación se muestra el " +"código demuestra que permite PostGIS y pgRouting en la base de datos." msgid "" "Checking PostGIS and pgRouting version after enabling them in the database." msgstr "" +"Comprobación de la versión de PostGIS y pgRouting después de habilitarlos en " +"la base de datos." msgid "Upgrading the database" msgstr "Actualización de la base de datos" @@ -7970,7 +7988,7 @@ msgstr "" "dependencias:" msgid "C and C++0x compilers" -msgstr "" +msgstr "Compiladores C y C++0x" msgid "" "Compiling with Boost 1.56 up to Boost 1.74 requires C++ Compiler with C++03 " @@ -7982,6 +8000,8 @@ msgstr "" msgid "" "Compiling with Boost 1.75 requires C++ Compiler with C++14 standard support" msgstr "" +"La compilación con Boost 1.75 requiere un compilador de C++ compatible con " +"el estándar C++14." msgid "Postgresql version = Supported versions by PostgreSQL" msgstr "Versión postgresql = Versiones compatibles por PostgreSQL" @@ -8038,27 +8058,30 @@ msgid "Configuring PostgreSQL" msgstr "Configurar PostgreSQL" msgid "Entering psql console" -msgstr "" +msgstr "Entrar en la consola psql" msgid "To exit psql console" -msgstr "" +msgstr "Para salir de la consola psql" msgid "" "Entering psql console directly without switching roles can be done by the " "following commands" msgstr "" +"Se puede entrar directamente en la consola psql sin cambiar de rol mediante " +"los siguientes comandos" msgid "Then use the above given method to exit out of the psql console" msgstr "" +"A continuación, utilice el método anterior para salir de la consola psql" msgid "Checking PostgreSQL version" -msgstr "" +msgstr "Comprobación de la versión de PostgreSQL" msgid "or" -msgstr "" +msgstr "o" msgid "Enter the psql console using above given method and then enter" -msgstr "" +msgstr "Entrar en la consola psql usando el método anterior e introducir" msgid "Creating PostgreSQL role" msgstr "" @@ -10261,8 +10284,8 @@ msgstr "" msgid "pgr_bdDijkstraCost(`Edges SQL`_, `Combinations SQL`_, [ ``directed``])" msgstr "" -"pgr_bdDijkstraCost(`SQL de aristas`_, `SQL de combinaciones`_, " -"[``directed``])" +"pgr_bdDijkstraCost(`SQL de aristas`_, `SQL de combinaciones`_, [ " +"``directed``])" msgid "pgr_bdDijkstraCost(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgstr "" @@ -20729,13 +20752,12 @@ msgstr "" "Lista de correo para usuarios: https://lists.osgeo.org/mailman/listinfo/" "pgrouting-users" -#, fuzzy msgid "" "Developer mailing list: https://discourse.osgeo.org/c/pgrouting/pgrouting-" "dev/" msgstr "" -"Lista de correo para desarroladores: https://lists.osgeo.org/mailman/" -"listinfo/pgrouting-dev" +"Lista de correo para desarrolladores: https://discourse.osgeo.org/c/" +"pgrouting/pgrouting-dev/" #, fuzzy msgid "Subscribe: https://discourse.osgeo.org/g/pgrouting-dev" From 9514b3c324f4be328719fe534558d79203835db3 Mon Sep 17 00:00:00 2001 From: DeepL Date: Thu, 11 Apr 2024 04:31:23 +0000 Subject: [PATCH 230/428] Translated using Weblate (Spanish) Currently translated at 90.8% (4748 of 5225 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 0a3ec61c67..20d0382eb0 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-02-13 01:27+0000\n" "PO-Revision-Date: 2024-04-11 04:37+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"Last-Translator: DeepL \n" "Language-Team: Spanish \n" "Language: es\n" @@ -5315,6 +5315,7 @@ msgstr "" msgid "" "Migration of ``pgr_kruskalDD`` / ``pgr_kruskalBFS`` / ``pgr_kruskalDFS``" msgstr "" +"Migración de ``pgr_kruskalDD`` / ``pgr_kruskalBFS`` / ``pgr_kruskalDFS``" msgid "" "Starting from `v3.7.0 `__ :" @@ -5356,6 +5357,8 @@ msgid "" "Using ``pgr_KruskalDD`` as example. Migration is similar to al the affected " "functions." msgstr "" +"Usando ``pgr_KruskalDD`` como ejemplo. La migración es similar a todas las " +"funciones afectadas." msgid "" "Comparing with `this `__ :" @@ -5519,6 +5522,8 @@ msgid "" "Using ``pgr_primDD`` as example. Migration is similar to al the affected " "functions." msgstr "" +"Usando ``pgr_primDD`` como ejemplo. La migración es similar para todas las " +"funciones afectadas." msgid "" "Comparing with `this Date: Thu, 11 Apr 2024 04:41:14 +0000 Subject: [PATCH 231/428] Translated using Weblate (Spanish) Currently translated at 91.1% (4763 of 5225 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 45 ++++++++++++++----- 1 file changed, 34 insertions(+), 11 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 20d0382eb0..38328d666c 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-02-13 01:27+0000\n" -"PO-Revision-Date: 2024-04-11 04:37+0000\n" -"Last-Translator: DeepL \n" +"PO-Revision-Date: 2024-04-11 04:47+0000\n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" "Language: es\n" @@ -5357,7 +5357,7 @@ msgid "" "Using ``pgr_KruskalDD`` as example. Migration is similar to al the affected " "functions." msgstr "" -"Usando ``pgr_KruskalDD`` como ejemplo. La migración es similar a todas las " +"Usar ``pgr_KruskalDD`` como ejemplo. La migración es similar a todas las " "funciones afectadas." msgid "" @@ -8077,7 +8077,7 @@ msgstr "" msgid "Then use the above given method to exit out of the psql console" msgstr "" -"A continuación, utilice el método anterior para salir de la consola psql" +"A continuación, utilizar el método anterior para salir de la consola psql" msgid "Checking PostgreSQL version" msgstr "Comprobación de la versión de PostgreSQL" @@ -8086,10 +8086,10 @@ msgid "or" msgstr "o" msgid "Enter the psql console using above given method and then enter" -msgstr "Entrar en la consola psql usando el método anterior e introducir" +msgstr "Entrar a la consola psql usando el método anterior e introducir" msgid "Creating PostgreSQL role" -msgstr "" +msgstr "Creación del rol PostgreSQL" msgid "" "Default role provided by PostgreSQL is postgres. To create new roles you can " @@ -8097,25 +8097,33 @@ msgid "" "of the role and then provide affirmation. Proceed with the steps and you " "will succeed in creating PostgreSQL role successfully." msgstr "" +"El rol por defecto proporcionado por PostgreSQL es postgres. Para crear " +"nuevos roles puede utilizar los comandos proporcionados anteriromente. El " +"prompt le pedirá al usuario que escibir el nombre del rol y confirmarlo. " +"Proceder con los pasos y tendrá éxito en la creación de rol PostgreSQL." msgid "" "To add password to the role or change previously created password of the " "role use the following commands" msgstr "" +"Para añadir una contraseña a un rol o cambiar una contraseña previamente " +"creada utilizar los siguientes comandos" msgid "" "To get additional details on the flags associated with ``createuser`` below " "given command can be used" msgstr "" +"Para obtener detalles adicionales sobre las banderas asociadas con " +"``createuser`` se puede utilizar el siguiente comando" msgid "Creating Database in PostgreSQL" -msgstr "" +msgstr "Crear una base de datos en PostgreSQL" msgid "Connecting to a PostgreSQL Database" -msgstr "" +msgstr "Conexión a una base de datos PostgreSQL" msgid "Enter the psql console and type the following commands" -msgstr "" +msgstr "Entrar en la consola psql y escribir los siguientes comandos" msgid "Build dependencies" msgstr "Construir dependencias" @@ -8210,6 +8218,7 @@ msgstr "" msgid "Configuring cmake to create documentation before building pgRouting" msgstr "" +"Configuración de cmake para crear documentación antes de compilar pgRouting" msgid "Most of the effort of the documentation has been on the html files." msgstr "" @@ -8247,6 +8256,8 @@ msgstr "Las siguientes instrucciones comienzan desde *path/to/pgrouting*" msgid "" "To remove the build when the configuration changes, use the following code:" msgstr "" +"Para eliminar la compilación cuando se cambie la configuración, utilizar el " +"siguiente código:" msgid "and start the build process as mentioned previously." msgstr "e iniciar el proceso de compilación como se mencionó anteriormente." @@ -8357,7 +8368,7 @@ msgid "(Alphabetical order)" msgstr "(Orden alfabético)" msgid "Regina Obe, Vicky Vergara" -msgstr "" +msgstr "Regina Obe, Vicky Vergara" msgid "" "And all the people that give us a little of their time making comments, " @@ -8411,6 +8422,18 @@ msgid "" "Swapnil Joshi, Sylvain Housseman, Sylvain Pasche, Veenit Kumar, Vidhan Jain, " "Virginia Vergara, Yige Huang" msgstr "" +"Aasheesh Tiwari, Abhinav Jain, Aditya Pratap Singh, Adrien Berchet, Akio " +"Takubo, Andrea Nardelli, Anthony Tasca, Anton Patrushev, Aryan Gupta, Ashraf " +"Hossain, Ashish Kumar, Cayetano Benavent, Christian Gonzalez, Daniel Kastl, " +"Dave Potts, David Techer, Denis Rykov, Ema Miyawaki, Esteban Zimanyi, " +"Florian Thurkow, Frederic Junod, Gerald Fenoy, Gudesa Venkata Sai Akhil, " +"Hang Wu, Himanshu Raj, Imre Samu, Jay Mahadeokar, Jinfu Leng, Kai Behncke, " +"Kishore Kumar, Ko Nagase, Mahmoud Sakr, Manikata Kondeti, Mario Basa, Martin " +"Wiesenhaan, Maxim Dubinin, Maoguang Wang, Mohamed Bakli, Mohamed Zia, Mukul " +"Priya, Nitish Chauhan, Rajat Shinde, Razequl Islam, Regina Obe, Rohith " +"Reddy, Sarthak Agarwal, Shobhit Chaurasia, Sourabh Garg, Stephen Woodbridge, " +"Swapnil Joshi, Sylvain Housseman, Sylvain Pasche, Veenit Kumar, Vidhan Jain, " +"Virginia Vergara, Yige Huang" msgid "Corporate Sponsors (in alphabetical order)" msgstr "Patrocinadores corporativos (en orden alfabético)" @@ -8440,7 +8463,7 @@ msgid "OSGeo" msgstr "" msgid "OSGeo UK" -msgstr "" +msgstr "OSGeo UK" msgid "Paragon Corporation" msgstr "Paragon Corporation" From 742457bca17280db9325981164055ef502056810 Mon Sep 17 00:00:00 2001 From: DeepL Date: Thu, 11 Apr 2024 04:46:02 +0000 Subject: [PATCH 232/428] Translated using Weblate (Spanish) Currently translated at 91.1% (4763 of 5225 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 38328d666c..2247b600c8 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-02-13 01:27+0000\n" "PO-Revision-Date: 2024-04-11 04:47+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"Last-Translator: DeepL \n" "Language-Team: Spanish \n" "Language: es\n" @@ -8391,10 +8391,10 @@ msgstr "" "pgRouting:" msgid "`OSGeo `__" -msgstr "" +msgstr "`OSGeo `__" msgid "`OSGeo UK `__" -msgstr "" +msgstr "`OSGeo UK `__" msgid "`Google Summer of Code `__" msgstr "`Google Summer of Code `__" @@ -8460,7 +8460,7 @@ msgid "Orkney" msgstr "Orkney" msgid "OSGeo" -msgstr "" +msgstr "OSGeo" msgid "OSGeo UK" msgstr "OSGeo UK" From 8f2f5071bc6d2565387d50e80cd4752c871dd8a7 Mon Sep 17 00:00:00 2001 From: DeepL Date: Thu, 11 Apr 2024 04:47:48 +0000 Subject: [PATCH 233/428] Translated using Weblate (Spanish) Currently translated at 91.1% (4763 of 5225 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 2247b600c8..30847e0b87 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -8463,7 +8463,7 @@ msgid "OSGeo" msgstr "OSGeo" msgid "OSGeo UK" -msgstr "OSGeo UK" +msgstr "OSGeo Reino Unido" msgid "Paragon Corporation" msgstr "Paragon Corporation" From 52543206b1a95f90ea1f4afdcf4f7e72ad9d036a Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Thu, 11 Apr 2024 04:48:21 +0000 Subject: [PATCH 234/428] Translated using Weblate (Spanish) Currently translated at 91.3% (4772 of 5225 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 30847e0b87..0a932a56ba 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-02-13 01:27+0000\n" -"PO-Revision-Date: 2024-04-11 04:47+0000\n" -"Last-Translator: DeepL \n" +"PO-Revision-Date: 2024-04-12 05:45+0000\n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" "Language: es\n" @@ -8463,7 +8463,7 @@ msgid "OSGeo" msgstr "OSGeo" msgid "OSGeo UK" -msgstr "OSGeo Reino Unido" +msgstr "OSGeo UK" msgid "Paragon Corporation" msgstr "Paragon Corporation" @@ -8496,7 +8496,7 @@ msgid "Boost C++ source libraries at https://www.boost.org." msgstr "Bibliotecas de código Boost C++ en https://www.boost.org." msgid ":doc:`migration`" -msgstr "" +msgstr ":doc:`migration`" msgid "pgr_KSP" msgstr "pgr_KSP" @@ -8592,7 +8592,7 @@ msgid "Returns set of |nksp-result|" msgstr "Regresa conjunto de |nksp-result|" msgid "OR EMPTY SET" -msgstr "" +msgstr "O CONJUNTO VACÍO" msgid "Example" msgstr "Ejemplo" @@ -8848,7 +8848,7 @@ msgid "Returns set of |tsp-result|" msgstr "Regresa el conjunto de |nksp-result|" msgid "OR EMTPY SET" -msgstr "" +msgstr "O CONJUNTO VACÍO" msgid "Using :doc:`pgr_dijkstraCostMatrix` to generate the matrix information" msgstr "" @@ -9009,7 +9009,7 @@ msgstr "" "ejemplo:" msgid "pgr_TSPeuclidean(`Coordinates SQL`_, ``[start_id, end_id]``)" -msgstr "" +msgstr "pgr_TSPeuclidean(`SQL de Coordenadas`_, ``[start_id, end_id]``)" msgid "With default values" msgstr "Con valores predeterminados" @@ -9090,7 +9090,7 @@ msgid "``pgr_aStar`` — Shortest path using the A* algorithm." msgstr "``pgr_aStar`` — La ruta más corta utilizando el algoritmo A*." msgid "Standarizing output columns to |short-generic-result|" -msgstr "" +msgstr "Estandarización de las columnas de salida a |short-generic-result|." msgid "" "``pgr_aStar`` (`One to One`_) added ``start_vid`` and ``end_vid`` columns." @@ -9475,7 +9475,7 @@ msgid "**options:** ``[the_geom, id, source, target, rows_where]``" msgstr "**opcionales:** ``[the_geom, id, source, target, rows_where]``" msgid "RETURNS ``VARCHAR``" -msgstr "" +msgstr "DEVUELVE ``VARCHAR``" msgid "Prerequisites" msgstr "Pre-requisitos" @@ -9852,12 +9852,14 @@ msgid "" "pgr_analyzeOneWay(**geom_table**, **s_in_rules**, **s_out_rules**, " "**t_in_rules**, **t_out_rules**, [**options**])" msgstr "" +"pgr_analyzeOneWay(**geom_table**, **s_in_rules**, **s_out_rules**, " +"**t_in_rules**, **t_out_rules**, [**opciones**])" msgid "**options:** ``[oneway, source, target, two_way_if_null]``" msgstr "**opcionales:** ``[oneway, source, target, two_way_if_null]``" msgid "RETURNS ``TEXT``" -msgstr "" +msgstr "DEVUELVE ``TEXT``" msgid "s_in_rules" msgstr "s_in_rules" @@ -11025,7 +11027,7 @@ msgid "pgr_chinesePostmanCost(`Edges SQL`_)" msgstr "pgr_chinesePostmanCost(`SQL de aristas`_)" msgid "RETURNS ``FLOAT``" -msgstr "" +msgstr "DEVUELVE ``FLOAT``" msgid "``pgr_chinesepostmancost``" msgstr "``pgr_chinesepostmancost``" From b5fbfc3361fe916246d21eb3e900244d921d5c62 Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Tue, 23 Apr 2024 15:35:32 +0000 Subject: [PATCH 235/428] Translated using Weblate (Spanish) Currently translated at 91.7% (4793 of 5225 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 44 +++++++++++-------- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 0a932a56ba..9c71cef5cf 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-02-13 01:27+0000\n" -"PO-Revision-Date: 2024-04-12 05:45+0000\n" +"PO-Revision-Date: 2024-04-24 15:45+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" @@ -13543,84 +13543,92 @@ msgid "One point" msgstr "" msgid "Default: ``cap => 1``" -msgstr "" +msgstr "Por defecto: ``cap => 1``" msgid "Maximum one row answer." -msgstr "" +msgstr "Respuesta de una fila como máximo." msgid "Default: ``partial => true``" -msgstr "" +msgstr "Por defecto: ``partial => true``" msgid "With less calculations as possible." -msgstr "" +msgstr "Con menos cálculos posibles." msgid "Default: ``dryrun => false``" -msgstr "" +msgstr "Por defecto: ``dryrun => false``" msgid "Process query" -msgstr "" +msgstr "Consulta del proceso" msgid "Returns" -msgstr "" +msgstr "Devuelve" msgid "values on ``edge_id``, ``fraction``, ``side`` columns." -msgstr "" +msgstr "valores en las columnas ``edge_id``, ``fraction``, ``side``." msgid "``NULL`` on ``distance``, ``geom``, ``edge`` columns." -msgstr "" +msgstr "``NULL`` en las columnas ``distance``, ``geom``, ``edge``." msgid "Many points" -msgstr "" +msgstr "Muchos puntos" msgid "" "Find at most :math:`2` edges close to all vertices on the points of interest " "table." msgstr "" +"Encuentra como máximo :math:`2` aristas cercanas a todos los vértices de la " +"tabla de puntos de interés." msgid "One answer per point, as small as possible." -msgstr "" +msgstr "Una respuesta por punto, lo más pequeña posible." msgid "" "Columns ``edge_id``, ``fraction``, ``side`` and ``geom`` are returned with " "values." msgstr "" +"Las columnas ``edge_id``, ``fraction``, ``side`` y ``geom`` se devuelven con " +"valores." msgid "" "``geom`` contains the original point geometry to assist on deterpartialing " "to which point geometry the row belongs to." msgstr "" +"``geom`` contiene la geometría de puntos original para ayudar a determinar a " +"qué geometría de puntos pertenece la fila." msgid "**point**" msgstr "**punto**" msgid "The point geometry" -msgstr "" +msgstr "La geometría del punto" msgid "**points**" msgstr "**puntos**" msgid "``POINT[]``" -msgstr "" +msgstr "``POINT``" msgid "An array of point geometries" -msgstr "" +msgstr "Una matriz de geometrías de puntos" msgid "**tolerance**" msgstr "**tolerancia**" msgid "Max distance between geometries" -msgstr "" +msgstr "Distancia máxima entre geometrías" msgid "Limit output rows" -msgstr "" +msgstr "Limitar las filas de salida" msgid "``partial``" -msgstr "" +msgstr "``parcial``" msgid "" "When ``true`` only columns needed for :doc:`withPoints-category` are " "calculated." msgstr "" +"Cuando ``true`` sólo se calculan las columnas necesarias para :doc" +":`withPoints-category`." msgid "When ``false`` all columns are calculated" msgstr "" From cf972aa30a60ddb3765b9e8607cd563e46829801 Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Sun, 28 Apr 2024 23:59:27 +0000 Subject: [PATCH 236/428] Translated using Weblate (Spanish) Currently translated at 93.6% (4892 of 5225 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 209 ++++++++++++------ 1 file changed, 143 insertions(+), 66 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 9c71cef5cf..c64155dcfe 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-02-13 01:27+0000\n" -"PO-Revision-Date: 2024-04-24 15:45+0000\n" +"PO-Revision-Date: 2024-04-29 03:40+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" @@ -11300,7 +11300,7 @@ msgstr "" "``FAIL`` cuando el la red topológica no se no se completó debido a un error." msgid "pgr_createTopology(edge_table, tolerance, [**options**])" -msgstr "" +msgstr "pgr_createTopology(tabla_borde, tolerancia, [**opciones**])" msgid "**options:** ``[the_geom, id, source, target, rows_where, clean]``" msgstr "**opcionales:** ``[the_geom, id, source, target, rows_where, clean]``" @@ -11478,6 +11478,8 @@ msgid "" "An alternate method to create a routing topology use :doc:" "`pgr_extractVertices`" msgstr "" +"Un método alternativo para crear una topología de ruteo es utilizar " +":doc:`pgr_extractVertices`." msgid "Make sure the database does not have the ``vertices_table``" msgstr "Asegurarse de que la base de datos no tiene ``vertices_table``" @@ -11491,15 +11493,17 @@ msgstr "Crear la tabla de vértices" msgid "" "When the ``LINESTRING`` has a SRID then use ``geom::geometry(POINT, )``" msgstr "" +"Cuando ``LINESTRING`` tiene un SRID entonces usa ``geom::geometry(POINT, " +")``" msgid "For big edge tables that are been prepared," -msgstr "" +msgstr "Para grandes tablas de aristas que han sido preparadas," msgid "Create it as ``UNLOGGED`` and" -msgstr "" +msgstr "Crearlo como ``UNLOGGED`` y" msgid "After the table is created ``ALTER TABLE .. SET LOGGED``" -msgstr "" +msgstr "Después de crear la tabla ``ALTER TABLE .. SET LOGGED``" msgid "Inspect the vertices table" msgstr "Inspeccionar la tabla de vértices" @@ -11553,6 +11557,8 @@ msgid "" "pgr_createVerticesTable(edge_table, [``the_geom, source, target, " "rows_where``])" msgstr "" +"pgr_createVerticesTable(edge_table, [``the_geom, source, target, " +"rows_where``])" msgid "" "The reconstruction of the vertices table function accepts the following " @@ -11732,12 +11738,19 @@ msgid "" "matrix that has a symmetric sparsity pattern into a band matrix form with a " "small bandwidth." msgstr "" +"En álgebra lineal numérica, el algoritmo Cuthill-McKee (CM), llamado así por " +"Elizabeth Cuthill y James McKee, es un algoritmo para permutar una matriz " +"dispersa que tiene un patrón de dispersidad simétrico en una forma de matriz " +"de banda con un ancho de banda pequeño." msgid "" "The vertices are basically assigned a breadth-first search order, except " "that at each step, the adjacent vertices are placed in the queue in order of " "increasing degree." msgstr "" +"Básicamente, se asigna a los vértices un orden de búsqueda breadth-first, " +"con la salvedad de que, en cada paso, los vértices adyacentes se colocan en " +"la cola por orden creciente de grado." msgid "The implementation is for **undirected** graphs." msgstr "La implementación es para grafos **no dirigidos**." @@ -11745,6 +11758,8 @@ msgstr "La implementación es para grafos **no dirigidos**." msgid "" "The bandwidth minimization problems are considered NP-complete problems." msgstr "" +"Los problemas de minimización del ancho de banda se consideran problemas NP-" +"completos." msgid "The running time complexity is: :math:`O(m log(m)|V|)`" msgstr "Tiempo de ejecución es: :math:`O(m log(m)|V|)`" @@ -11890,15 +11905,17 @@ msgid "https://en.wikipedia.org/wiki/Topological_sorting" msgstr "https://en.wikipedia.org/wiki/Topological_sorting" msgid "``pgr_degree`` -- Proposed" -msgstr "" +msgstr "``pgr_degree`` -- Propuesto" msgid "" "``pgr_degree`` — For each vertex in an undirected graph, return the count of " "edges incident to the vertex." msgstr "" +"``pgr_degree`` - Para cada vértice de un grafo no dirigido, devuelve el " +"número de aristas incidentes en el vértice." msgid "Calculates the degree of the vertices of an **undirected** graph" -msgstr "" +msgstr "Calcula el grado de los vértices de un grafo **no dirigido**." msgid "pgr_degree(`Edges SQL`_ , `Vertex SQL`_, [``dryrun``])" msgstr "pgr_degree(`SQL de aristas`_ , `SQL de vértices`_, [``dryrun``])" @@ -11915,9 +11932,13 @@ msgid "" "best to prep your vertices table before hand and use that vertices table for " "pgr_degree calls." msgstr "" +"pgr_degree puede utilizar la salida de `pgr_extractVertices` o puede tener " +"`pgr_extractVertices` incrustado en la llamada. Para redes de tamaño " +"decente, lo mejor es preparar la tabla de vértices de antemano y utilizar " +"esa tabla de vértices para las llamadas pgr_degree." msgid "`Vertex SQL`_" -msgstr "" +msgstr "`Vertex SQL`_" msgid "`Vertex SQL`_ as described below" msgstr "`Vertex SQL`_ como se describe abajo" @@ -11930,7 +11951,7 @@ msgstr "" "Cuando verdadero, no procesar y recibir un AVISO de la consulta resultante." msgid "Vertex SQL" -msgstr "" +msgstr "SQL de vértices" msgid "``in_edges``" msgstr "``in_edges``" @@ -11946,7 +11967,7 @@ msgstr "" "*primer punto final*." msgid "When missing, ``out_edges`` must exist." -msgstr "" +msgstr "Si falta, ``out_edges`` debe existir." msgid "``out_edges``" msgstr "``out_edges``" @@ -11959,19 +11980,19 @@ msgstr "" "*segundo punto final*." msgid "When missing, ``in_edges`` must exist." -msgstr "" +msgstr "Si falta, ``in_edges`` debe existir." msgid "Vertex identifier" msgstr "Identificador de vértice" msgid "``degree``" -msgstr "" +msgstr "``degree``" msgid "Number of edges that are incident to the vertex ``id``" -msgstr "" +msgstr "Número de aristas incidentes al vértice ``id``." msgid "Degree of a sub graph" -msgstr "" +msgstr "Grado de un subgrafo" msgid "Dry run execution" msgstr "Ejecución de prueba" @@ -11991,13 +12012,17 @@ msgstr "" "basado en las necesidades de desarrollo de back-end." msgid "Degree from an existing table" -msgstr "" +msgstr "Grado a partir de una tabla existente" msgid "" "If you have a vertices table already built using ``pgr_extractVertices`` and " "want the degree of the whole graph rather than a subset, you can forgo using " "pgr_degree and work with the ``in_edges`` and ``out_edges`` columns directly." msgstr "" +"Si se tiene una tabla de vértices ya construida usando " +"``pgr_extractVertices`` y se quiere el grado de todo el grafo en lugar de un " +"subconjunto, se puede trabajar con las columnas ``in_edges`` y ``out_edges`` " +"directamente." msgid ":doc:`pgr_extractVertices`" msgstr ":doc:`pgr_extractVertices`" @@ -12531,10 +12556,10 @@ msgstr "" "B**])" msgid "**options A:** ``[directed, cap]``" -msgstr "" +msgstr "**opciones A:** ``[directed, cap]``" msgid "**options B:** ``[directed, cap, global]``" -msgstr "" +msgstr "**opciones B:** ``[directed, cap, global]``" msgid "" "pgr_dijkstraNear(`Edges SQL`_, **start vid**, **end vids**, [**options**])" @@ -12848,13 +12873,16 @@ msgid "``pgr_dijkstraVia`` - Proposed" msgstr "``pgr_dijkstraVia`` - Propuesto" msgid "``pgr_dijkstraVia`` — Route that goes through a list of vertices." -msgstr "" +msgstr "``pgr_dijkstraVia`` - Ruta que recorre una lista de vértices." 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)`." msgstr "" +"Dada una lista de vértices y un grafo, esta función equivale a encontrar el " +"camino más corto entre :math:`vértice_i` y :math:`vértice_{i+1}` para todo " +":math:`i < tamaño\\_de(vía\\;vértices)`." msgid "Route" msgstr "Ruta" @@ -12863,13 +12891,13 @@ msgid "is a sequence of paths." msgstr "es una secuencia de trayectorias." msgid "Path" -msgstr "" +msgstr "Ruta" msgid "is a section of the route." -msgstr "" +msgstr "es una sección de la ruta." msgid "One Via" -msgstr "" +msgstr "Una Vía" msgid "pgr_dijkstraVia(`Edges SQL`_, **via vertices**, [**options**])" msgstr "pgr_dijkstraVia(`SQL de aristas`_, **vértices**, [**opciones**])" @@ -12884,6 +12912,8 @@ msgid "" "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." msgid "Via optional parameters" msgstr "Parámetros opcionales Vía" @@ -12919,7 +12949,7 @@ msgstr "" "7, 1, 8, 15\\}` en ese orden, en un grafo **dirigido**." msgid "The main query" -msgstr "" +msgstr "La consulta principal" msgid "Aggregate cost of the third path." msgstr "Costo agregado de la tercera ruta." @@ -12934,13 +12964,13 @@ 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." msgid "Status of \"passes in front\" or \"visits\" of the nodes." -msgstr "" +msgstr "Estado de \"pasa enfrente\" o \"visita\" los nodos." msgid ":doc:`via-category`." -msgstr "" +msgstr ":doc:`via-category`" msgid ":doc:`dijkstra-family`." -msgstr "" +msgstr ":doc:`dijkstra-family`" msgid "``pgr_drivingDistance``" msgstr "``pgr_drivingDistance``" @@ -12956,6 +12986,7 @@ msgstr "Agregado las columnas de resultados``depth`` y ``start_vid``." msgid "Result column name change: ``from_v`` to ``start_vid``." msgstr "" +"Cambio de nombre en la columna de resultados: ``from_v`` a ``start_vid``." msgid "Added ``depth`` and ``pred`` result columns." msgstr "Agregado las columnas de resultados``depth`` y ``pred``." @@ -13286,13 +13317,13 @@ msgid "``pgr_edwardMoore`` (`One to One`_)" msgstr "``pgr_edwardMoore`` (`Uno a Uno`_)" msgid "``pgr_edwardMoore`` (`One to Many`_)" -msgstr "" +msgstr "``pgr_edwardMoore`` (`Uno a Muchos`_)" msgid "``pgr_edwardMoore`` (`Many to One`_)" -msgstr "" +msgstr "``pgr_edwardMoore`` (`Muchos a Uno`_)" msgid "``pgr_edwardMoore`` (`Many to Many`_)" -msgstr "" +msgstr "``pgr_edwardMoore`` (`Muchos a Muchos`_)" msgid "" "Edward Moore’s Algorithm is an improvement of the Bellman-Ford Algorithm. It " @@ -13339,13 +13370,13 @@ msgstr "" "`start_vids` o `end_vids`." msgid "Running time:" -msgstr "" +msgstr "Tiempo de ejecución:" msgid "Worst case: :math:`O(| V | * | E |)`" -msgstr "" +msgstr "Peor caso: :math:`O(| V | * | E |)`" msgid "Average case: :math:`O( | E | )`" -msgstr "" +msgstr "Caso promedio: :math:`O( | E | )`" msgid "" "pgr_edwardMoore(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" @@ -13492,36 +13523,44 @@ msgstr "" "vértices, utilice ``dryrun := true``." msgid "``pgr_findCloseEdges``" -msgstr "" +msgstr "``pgr_findCloseEdges``" msgid "``pgr_findCloseEdges`` - Finds the close edges to a point geometry." msgstr "" +"``pgr_findCloseEdges`` - Encuentra las aristas cercanas a una geometría " +"puntual." msgid "New **proposed** signatures:" -msgstr "" +msgstr "Nuevas firmas **propuestas**:" msgid "``pgr_findCloseEdges`` (`One point`_)" -msgstr "" +msgstr "``pgr_findCloseEdges`` (`Un punto`_)" msgid "``pgr_findCloseEdges`` (`Many points`_)" -msgstr "" +msgstr "``pgr_findCloseEdges`` (`Muchos puntos`_)" msgid "" "``pgr_findCloseEdges`` - An utility function that finds the closest edge to " "a point geometry." msgstr "" +"``pgr_findCloseEdges`` - Función de utilidad que encuentra la arista más " +"cercana a una geometría de puntos." msgid "" "The geometries must be in the same coordinate system (have the same SRID)." msgstr "" +"Las geometrías deben estar en el mismo sistema de coordenadas (tener el " +"mismo SRID)." msgid "" "The code to do the calculations can be obtained for further specific " "adjustments needed by the application." msgstr "" +"El código para realizar los cálculos puede obtenerse para realizar los " +"ajustes específicos que necesite la aplicación." msgid "``EMTPY SET`` is returned on dryrun executions" -msgstr "" +msgstr "``EMTPY SET`` se devuelve en ejecuciones en seco" msgid "" "pgr_findCloseEdges(`Edges SQL`_, **point**, **tolerance**, [**options**])" @@ -13540,7 +13579,7 @@ msgid "Returns set of |result-find|" msgstr "Regresa conjunto de |result-find|" msgid "One point" -msgstr "" +msgstr "Un punto" msgid "Default: ``cap => 1``" msgstr "Por defecto: ``cap => 1``" @@ -13631,185 +13670,223 @@ msgstr "" ":`withPoints-category`." msgid "When ``false`` all columns are calculated" -msgstr "" +msgstr "Cuando ``false`` se calculan todas las columnas" msgid "When ``false`` calculations are performed." -msgstr "" +msgstr "Cuando ``false`` se realizan los cálculos." msgid "" "When ``true`` calculations are not performed and the query to do the " "calculations is exposed in a PostgreSQL ``NOTICE``." msgstr "" +"Cuando ``true`` los cálculos no se realizan y la consulta para hacer los " +"cálculos se expone en un ``NOTICE`` de PostgreSQL." msgid "The ``LINESTRING`` geometry of the edge." -msgstr "" +msgstr "La geometría ``LINESTRING`` de la arista." msgid "When :math:`cap = 1`, it is the closest edge." -msgstr "" +msgstr "Cuando :math:`cap = 1`, es la arista más cercana." 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." msgid "Value in ``[r, l]`` indicating if the point is:" -msgstr "" +msgstr "Valor en ``[r, l]`` que indica si el punto es:" msgid "In the right ``r``." -msgstr "" +msgstr "A la derecha ``r``," msgid "In the left ``l``." -msgstr "" +msgstr "A la izquierda `l`," msgid "When the point is on the line it is considered to be on the right." -msgstr "" +msgstr "Cuando el punto está en la línea se considera que está a la derecha." +#, fuzzy msgid "``distance``" -msgstr "" +msgstr "``distance``" msgid "Distance from point to edge." -msgstr "" +msgstr "Distancia del punto a la arista." msgid "``NULL`` when ``cap = 1`` on the `One point`_ signature" -msgstr "" +msgstr "``NULL`` cuando ``cap = 1`` en la firma de `Un punto`_" msgid "``POINT`` geometry" -msgstr "" +msgstr "geometría ``POINT" msgid "" "`One Point`_: Contains the point on the edge that is ``fraction`` away from " "the starting point of the edge." msgstr "" +"`Un Punto`_: Contiene el punto de la arista que está a ``fraction`` del " +"punto inicial de la arista." msgid "`Many Points`_: Contains the corresponding **original point**" -msgstr "" +msgstr "`Muchos Puntos`_: Contiene el **punto original** correspondiente" msgid "" "``LINESTRING`` geometry from the **original point** to the closest point of " "the edge with identifier ``edge_id``" msgstr "" +"Geometría ``LINESTRING`` desde el **punto original** hasta el punto más " +"cercano de la arista con identificador ``edge_id``." msgid "One point results" -msgstr "" +msgstr "Resultados de un punto" msgid "The green nodes is the **original point**" -msgstr "" +msgstr "Los nodos verdes son el **punto original**" msgid "" "The geometry ``geom`` is a point on the :math:`sp \\rightarrow ep` edge." msgstr "" +"La geometría ``geom`` es un punto en la arista :math:`sp \\rightarrow ep`." msgid "" "The geometry ``edge`` is a line that connects the **original point** with " "``geom``" msgstr "" +"La geometría ``edge`` es una línea que conecta el **punto original** con " +"``geom``." msgid "Many point results" -msgstr "" +msgstr "Resultados de muchos puntos" msgid "The green nodes are the **original points**" -msgstr "" +msgstr "Los nodos verdes son los **puntos originales**." msgid "" "The geometry ``geom``, marked as **g1** and **g2** are the **original " "points**" msgstr "" +"La geometría ``geom``, marcada como **g1** y **g2** son los **puntos " +"originales**" msgid "" "The geometry ``edge``, marked as **edge1** and **edge2** is a line that " "connects the **original point** with the closest point on the :math:`sp " "\\rightarrow ep` edge." msgstr "" +"La geometría ``edge``, marcada como **edge1** y **edge2** es una línea que " +"conecta el **punto original** con el punto más cercano de la arista :math:`" +"sp \\rightarrow ep`." msgid "One point examples" -msgstr "" +msgstr "Ejemplos de un punto" msgid "At most two answers" -msgstr "" +msgstr "Como máximo dos respuestas" msgid "``cap => 2``" -msgstr "" +msgstr "``cap => 2``" msgid "Maximum two row answer." -msgstr "" +msgstr "Respuesta de dos filas como máximo." msgid "Understanding the result" -msgstr "" +msgstr "Comprendiendo el resultado" msgid "``NULL`` on ``geom``, ``edge``" -msgstr "" +msgstr "``NULL`` en ``geom``, ``edge``" msgid "``edge_id`` identifier of the edge close to the **original point**" -msgstr "" +msgstr "``edge_id`` identificador de la arista cercana al **punto original**." msgid "" "Two edges are withing :math:`0.5` distance units from the **original " "point**: :math:`{5, 8}`" msgstr "" +"Dos aristas están a menos de :math:`0.5` unidades de distancia del **punto " +"original**: :math:`{5, 8}`" msgid "For edge :math:`5`:" -msgstr "" +msgstr "Para la arista :math:`5`:" msgid "" "``fraction``: The closest point from the **original point** is at the :math:" "`0.8` fraction of the edge :math:`5`." msgstr "" +"``fraction``: El punto más cercano desde el **punto original** está en la " +"fracción :math:`0.8` del borde :math:`5`." msgid "" "``side``: The **original point** is located to the left side of edge :math:" "`5`." msgstr "" +"``side``: El **punto original** está situado a la izquierda de la arista " +":math:`5`." msgid "" "``distance``: The **original point** is located :math:`0.1` length units " "from edge :math:`5`." msgstr "" +"``distance``: El **punto original** está situado a :math:`0.1` unidades de " +"longitud de la arista :math:`5`." msgid "For edge :math:`8`:" -msgstr "" +msgstr "Para la arista :math:`8`:" msgid "" "``fraction``: The closest point from the **original point** is at the :math:" "`0.89..` fraction of the edge :math:`8`." msgstr "" +"``fraction``: El punto más cercano desde el **punto original** está en la " +"fracción :math:`0.89..` del borde :math:`8`." msgid "" "``side``: The **original point** is located to the right side of edge :math:" "`8`." msgstr "" +"``side``: El **punto original** está situado a la derecha de la arista " +":math:`8`." msgid "" "``distance``: The **original point** is located :math:`0.19..` length units " "from edge :math:`8`." msgstr "" +"``distance``: El **punto original** se encuentra a :math:`0.19..` unidades " +"de longitud de la arista :math:`8`." msgid "One answer, all columns" -msgstr "" +msgstr "Una respuesta, todas las columnas" msgid "``partial => false``" -msgstr "" +msgstr "``partial => false``" msgid "Calculate all columns" -msgstr "" +msgstr "Calcular todas las columnas" msgid "" "``edge_id`` identifier of the edge **closest** to the **original point**" msgstr "" +"``edge_id`` identificador de la arista **más cercana** al **punto original**." msgid "" "From all edges within :math:`0.5` distance units from the **original " "point**: :math:`{5}` is the closest one." msgstr "" +"De todos los bordes dentro de :math:`0.5` unidades de distancia desde el **" +"punto original**: :math:`{5}` es el más cercano." msgid "" "``geom``: Contains the geometry of the closest point on edge :math:`5` from " "the **original point**." msgstr "" +"``geom``: Contiene la geometría del punto más cercano de la arista :math:`5` " +"desde el **punto original**." msgid "" "``edge``: Contains the ``LINESTRING`` geometry of the **original point** to " "the closest point on on edge :math:`5` ``geom``" msgstr "" +"``edge``: Contiene la geometría ``LINESTRING`` del **punto original** al " +"punto más cercano de la arista :math:`5` ``geom``" msgid "At most two answers with all columns" msgstr "" From 4bcfcb5471f1efc66566a542eac47e66e3abe81e Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Sun, 28 Apr 2024 18:58:59 +0000 Subject: [PATCH 237/428] Translated using Weblate (Chinese (Simplified)) Currently translated at 99.2% (5185 of 5225 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ --- .../LC_MESSAGES/pgrouting_doc_strings.po | 66 +++++++++---------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index d9aa625ebc..c4dfa4aa65 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,8 +12,8 @@ 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" -"PO-Revision-Date: 2024-01-19 09:46+0000\n" -"Last-Translator: Zuochenwei \n" +"PO-Revision-Date: 2024-04-29 03:40+0000\n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Chinese (Simplified) \n" "Language: zh_Hans\n" @@ -21,7 +21,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 5.3\n" +"X-Generator: Weblate 5.4.3\n" msgid "BFS - Category" msgstr "BFS - 类别" @@ -16574,9 +16574,9 @@ msgid "" "milestone for 3.5.1 `_" msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 `3.5.1 Git 关闭里程碑`_" +"要查看此版本关闭的所有问题和拉取请求，请参阅 `3.5.1 Git 关闭里程碑 " +"`_" msgid "Documentation fixes" msgstr "文档修复" @@ -16978,9 +16978,9 @@ msgid "" "milestone for 3.3.0 `_ on Github." msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 ` 3.3.0 Git关闭里程" -"碑`_。" +"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 ` 3.3.0 " +"Git关闭里程碑 `_。" msgid "" "`#2057 `__: trspViaEdges " @@ -17082,9 +17082,9 @@ msgid "" "milestone for 3.2.2 `_ on Github." msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.2.2 Git关闭里程碑" -"`_。" +"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.2.2 " +"Git关闭里程碑 `_。" msgid "" "`#2093 `__: Compilation " @@ -17253,9 +17253,9 @@ msgid "" "milestone for 3.1.3 `_ on Github." msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.1.3 Git关闭里程碑" -"`_。" +"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.1.3 " +"Git关闭里程碑 `_。" msgid "" "`#1825 `__: Boost " @@ -17333,9 +17333,9 @@ msgid "" "milestone for 3.1.1 `_ on Github." msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.1.1 Git关闭里程碑" -"`_。" +"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.1.1 " +"Git关闭里程碑 `_。" msgid "" "`#1733 `__: pgr_bdAstar " @@ -17380,9 +17380,9 @@ msgid "" "milestone for 3.1.0 `_ on Github." msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.1.0 Git关闭里程碑" -"`_。" +"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.1.0 " +"Git关闭里程碑 `_。" msgid "pgr_dijkstra(combinations)" msgstr "pgr_dijkstra(组合)" @@ -18109,9 +18109,9 @@ msgid "" "2.5.4 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 `2.5.4 Git关闭里程碑`_。" +"要查看此版本关闭的问题，请参阅 Github 上的 `2.5.4 Git关闭里程碑 " +"`_。" msgid "pgRouting 2.5.3 Release Notes" msgstr "pgRouting 2.5.3 发布说明" @@ -18168,9 +18168,9 @@ msgid "" "2.5.0 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 `2.5.0Git关闭里程碑`_ 。" +"要查看此版本关闭的问题，请参阅 Github 上的 `2.5.0Git关闭里程碑 " +"`_ 。" msgid "enhancement:" msgstr "增强：" @@ -18349,9 +18349,9 @@ msgid "" "2.3.2 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 ` 2.3.2 Git关闭里程碑`_ 。" +"要查看此版本关闭的问题，请参阅 Github 上的 ` 2.3.2 Git关闭里程碑 " +"`_ 。" msgid "Fixed pgr_gsoc_vrppdtw crash when all orders fit on one truck." msgstr "修正了当所有订单都装在一辆卡车上时 pgr_gsoc_vrppdtw 崩溃的问题。" @@ -18520,9 +18520,9 @@ msgid "" "2.2.2 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 `2.2.2 Git关闭里程碑`_ 。" +"要查看此版本关闭的问题，请参阅 Github 上的 `2.2.2 Git关闭里程碑 " +"`_ 。" msgid "Fixed regression error on pgr_drivingDistance" msgstr "修正了 pgr_drivingDistance 的回归错误" From e1f97afd8869e2d74ac90de0a9ecada3d606e0d5 Mon Sep 17 00:00:00 2001 From: Weblate Date: Mon, 29 Apr 2024 03:40:34 +0000 Subject: [PATCH 238/428] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/ --- .../de/LC_MESSAGES/pgrouting_doc_strings.po | 85 ++++++---- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 151 ++++++++++------- .../ja/LC_MESSAGES/pgrouting_doc_strings.po | 90 ++++++---- .../ko/LC_MESSAGES/pgrouting_doc_strings.po | 85 ++++++---- .../LC_MESSAGES/pgrouting_doc_strings.po | 156 +++++++++++------- 5 files changed, 339 insertions(+), 228 deletions(-) diff --git a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po index 85735aee5a..4a161197fa 100644 --- a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po @@ -6,7 +6,7 @@ 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: Automatically generated\n" "Language-Team: none\n" @@ -1446,7 +1446,7 @@ msgstr "" msgid "16.5" msgstr "" -msgid ":math:`10.5 / 60 = 0.175`" +msgid ":math:`10.5 / 60 = 0.175`" msgstr "" msgid "minutes" @@ -3373,13 +3373,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" @@ -3659,11 +3659,11 @@ 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{ } " +"\\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{ } \\\\ \\cup \\{(target_i, source_i, reverse\\_cost_i) " "\\text{ when } reverse\\_cost_i>=0 \\} & \\quad \\text{if } reverse\\_cost " "\\neq \\varnothing \\\\ \\end{cases}`" msgstr "" @@ -3678,17 +3678,16 @@ 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" @@ -4434,15 +4433,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 "" @@ -13134,7 +13124,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" @@ -13229,7 +13219,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 "" @@ -13243,7 +13233,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" @@ -15290,6 +15280,36 @@ 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 "" @@ -15484,9 +15504,6 @@ msgstr "" msgid "Fix winnie build" msgstr "" -msgid "Code fixes" -msgstr "" - msgid "Fix clang warnings" msgstr "" diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index c64155dcfe..81c195a019 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.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: 2024-04-29 03:40+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish =0 \\} & \\quad \\text{if } reverse\\_cost = " -"\\varnothing \\\\ \\text{ } \\text{ } & \\quad \\text{ } \\\\ \\text{ } " +"\\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{ } \\\\ \\cup \\{(target_i, source_i, reverse\\_cost_i) " "\\text{ when } reverse\\_cost_i>=0 \\} & \\quad \\text{if } reverse\\_cost " "\\neq \\varnothing \\\\ \\end{cases}`" msgstr "" @@ -4110,18 +4112,18 @@ msgstr "El grafo ponderado no dirigido :math:`G_u(V,E)`, es definido por:" msgid ":math:`V = source \\cup target \\cup {start_v{vid}} \\cup {end_{vid}}`" msgstr ":math:`V = source \\cup target \\cup {start_v{vid}} \\cup {end_{vid}}`" +#, fuzzy 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 "" ":math:`E = \\begin{cases} \\text{ } \\{(source_i, target_i, cost_i) " "\\text{ when } cost >=0 \\} & \\quad \\text{ } \\\\ \\cup \\{(target_i, " @@ -5003,15 +5005,6 @@ msgstr "" "`#2614 `__ Clang tidy no " "funciona" -msgid "Others" -msgstr "Otros" - -msgid "Adjust NEWS generator" -msgstr "Ajustar el generador NEWS" - -msgid "Name change to `NEWS.md` for better visualization on GitHub" -msgstr "Cambio de nombre a `NEWS.md` para una mejor visualización en GitHub" - msgid "All releases" msgstr "Todas las versiones" @@ -5323,8 +5316,8 @@ msgid "" "columns are being standardized." msgstr "" "A partir de `v3.6.0 `__, " -"Las columnas resultantes de :doc:`pgr_kruskalDD`, :doc:`pgr_kruskalBFS` and " -":doc:`pgr_kruskalDFS` son estandarizadas." +"Las columnas resultantes de :doc:`pgr_kruskalDD`, :doc:`pgr_kruskalBFS` and :" +"doc:`pgr_kruskalDFS` son estandarizadas." msgid "|result-bfs|" msgstr "|result-bfs|" @@ -5369,7 +5362,8 @@ msgstr "" msgid "" "Now column ``pred`` exists and contains the predecessor of the ``node``." -msgstr "Ahora la columna ``pred`` existe y contiene el predecesor del ``node``." +msgstr "" +"Ahora la columna ``pred`` existe y contiene el predecesor del ``node``." msgid "Kruskal multiple vertices" msgstr "Kruskal vértices múltiples" @@ -5388,8 +5382,8 @@ msgid "" "Starting from `v3.6.0 `__ :" "doc:`pgr_KSP` result columns are being standardized." msgstr "" -"A partir de `v3.6.0 `__ En " -":doc:`pgr_KSP` las columnas de resultados están siendo estandarizadas." +"A partir de `v3.6.0 `__ " +"En :doc:`pgr_KSP` las columnas de resultados están siendo estandarizadas." msgid "|ksp-result|" msgstr "|ksp-result|" @@ -5512,8 +5506,8 @@ msgid "" "are being standardized." msgstr "" "A partir de `v3.7.0 `__ se " -"estandarizan las columnas de resultados :doc:`pgr_primDD`, :doc:`pgr_primBFS`" -" y :doc:`pgr_primDFS`." +"estandarizan las columnas de resultados :doc:`pgr_primDD`, :doc:" +"`pgr_primBFS` y :doc:`pgr_primDFS`." msgid "Prim single vertex" msgstr "Prim vértice único" @@ -5549,8 +5543,8 @@ msgid "" "Starting from `v3.6.0 `__ :" "doc:`pgr_withPointsDD` result columns are being standardized." msgstr "" -"A partir de `v3.6.0 `__ En " -":doc:`pgr_withPointsDD` las columnas de resultados están siendo " +"A partir de `v3.6.0 `__ " +"En :doc:`pgr_withPointsDD` las columnas de resultados están siendo " "estandarizadas." msgid "|result-generic-no-seq|" @@ -5708,8 +5702,8 @@ msgid "" "Starting from `v3.6.0 `__ :" "doc:`pgr_withPointsKSP` result columns are being standardized." msgstr "" -"A partir de `v3.6.0 `__ en " -":doc:`pgr_withPointsKSP` las columnas de resultados están siendo " +"A partir de `v3.6.0 `__ " +"en :doc:`pgr_withPointsKSP` las columnas de resultados están siendo " "estandarizadas." msgid "" @@ -10314,8 +10308,8 @@ msgstr "" msgid "pgr_bdDijkstraCost(`Edges SQL`_, `Combinations SQL`_, [ ``directed``])" msgstr "" -"pgr_bdDijkstraCost(`SQL de aristas`_, `SQL de combinaciones`_, [ " -"``directed``])" +"pgr_bdDijkstraCost(`SQL de aristas`_, `SQL de combinaciones`_, " +"[ ``directed``])" msgid "pgr_bdDijkstraCost(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgstr "" @@ -11478,8 +11472,8 @@ msgid "" "An alternate method to create a routing topology use :doc:" "`pgr_extractVertices`" msgstr "" -"Un método alternativo para crear una topología de ruteo es utilizar " -":doc:`pgr_extractVertices`." +"Un método alternativo para crear una topología de ruteo es utilizar :doc:" +"`pgr_extractVertices`." msgid "Make sure the database does not have the ``vertices_table``" msgstr "Asegurarse de que la base de datos no tiene ``vertices_table``" @@ -12881,8 +12875,8 @@ msgid "" "math:`i < size\\_of(via\\;vertices)`." msgstr "" "Dada una lista de vértices y un grafo, esta función equivale a encontrar el " -"camino más corto entre :math:`vértice_i` y :math:`vértice_{i+1}` para todo " -":math:`i < tamaño\\_de(vía\\;vértices)`." +"camino más corto entre :math:`vértice_i` y :math:`vértice_{i+1}` para todo :" +"math:`i < tamaño\\_de(vía\\;vértices)`." msgid "Route" msgstr "Ruta" @@ -13666,8 +13660,8 @@ msgid "" "When ``true`` only columns needed for :doc:`withPoints-category` are " "calculated." msgstr "" -"Cuando ``true`` sólo se calculan las columnas necesarias para :doc" -":`withPoints-category`." +"Cuando ``true`` sólo se calculan las columnas necesarias para :doc:" +"`withPoints-category`." msgid "When ``false`` all columns are calculated" msgstr "Cuando ``false`` se calculan todas las columnas" @@ -13774,8 +13768,8 @@ msgid "" "\\rightarrow ep` edge." msgstr "" "La geometría ``edge``, marcada como **edge1** y **edge2** es una línea que " -"conecta el **punto original** con el punto más cercano de la arista :math:`" -"sp \\rightarrow ep`." +"conecta el **punto original** con el punto más cercano de la arista :math:" +"`sp \\rightarrow ep`." msgid "One point examples" msgstr "Ejemplos de un punto" @@ -13819,8 +13813,8 @@ msgid "" "``side``: The **original point** is located to the left side of edge :math:" "`5`." msgstr "" -"``side``: El **punto original** está situado a la izquierda de la arista " -":math:`5`." +"``side``: El **punto original** está situado a la izquierda de la arista :" +"math:`5`." msgid "" "``distance``: The **original point** is located :math:`0.1` length units " @@ -13843,8 +13837,8 @@ msgid "" "``side``: The **original point** is located to the right side of edge :math:" "`8`." msgstr "" -"``side``: El **punto original** está situado a la derecha de la arista " -":math:`8`." +"``side``: El **punto original** está situado a la derecha de la arista :math:" +"`8`." msgid "" "``distance``: The **original point** is located :math:`0.19..` length units " @@ -13871,8 +13865,8 @@ msgid "" "From all edges within :math:`0.5` distance units from the **original " "point**: :math:`{5}` is the closest one." msgstr "" -"De todos los bordes dentro de :math:`0.5` unidades de distancia desde el **" -"punto original**: :math:`{5}` es el más cercano." +"De todos los bordes dentro de :math:`0.5` unidades de distancia desde el " +"**punto original**: :math:`{5}` es el más cercano." msgid "" "``geom``: Contains the geometry of the closest point on edge :math:`5` from " @@ -15302,7 +15296,8 @@ msgstr "``bigint`` identificador único del vértice" msgid "old_id" msgstr "old_id" -msgid "``bigint`` Identifier of the edge in original table" +#, fuzzy +msgid "``bigint`` Identifier of the edge in original table" msgstr "``bigint`` identificador del borde en la tabla original" msgid "sub_id" @@ -15405,7 +15400,8 @@ msgstr "Tiene solamente campos básicos para hacer un análisis de topología" msgid "Edges with 1 dead end: 1,6,24" msgstr "Los bordes con 1 callejón sin salida: 1,6,24" -msgid "Edges with 2 dead ends 17,18" +#, fuzzy +msgid "Edges with 2 dead ends: 17,18" msgstr "Bordes con 2 callejones sin salida 17,18" msgid "" @@ -15421,7 +15417,8 @@ msgstr "Los bordes con 1 callejón sin salida: 1-1, 6-1,14-2, 18-1-17-1 18-2" msgid "Isolated segments" msgstr "Segmentos aislados" -msgid "two isolated segments: 17 and 18 both they have 2 dead ends" +#, fuzzy +msgid "two isolated segments: 17 and 18 both they have 2 dead ends" msgstr "dos aislados segmentos: 17 y 18 ambos tienen 2 callejones sin salida" msgid "No Isolated segments" @@ -17827,6 +17824,41 @@ msgstr "pgRouting 3.7" msgid "pgRouting 3.6" msgstr "pgRouting 3.6" +#, fuzzy +msgid "pgRouting 3.6.2 Release Notes" +msgstr "Notas de la versión 3.6.1 de pgRouting" + +#, fuzzy +msgid "" +"To see all issues & pull requests closed by this release see the `Git closed " +"milestone for 3.6.2 `__" +msgstr "" +"Para ver todos los problemas y solicitudes de extracción cerrados para ésta " +"versión, consulte la `meta cerrada 3.6.1 `_" + +msgid "Upgrade fix" +msgstr "" + +msgid "The upgrade was failing for same minor" +msgstr "" + +msgid "Code fixes" +msgstr "Corrección de código" + +msgid "Fix warnings from cpplint" +msgstr "" + +msgid "Others" +msgstr "Otros" + +msgid "Adjust NEWS generator" +msgstr "Ajustar el generador NEWS" + +msgid "Name change to `NEWS.md` for better visualization on GitHub" +msgstr "Cambio de nombre a `NEWS.md` para una mejor visualización en GitHub" + msgid "pgRouting 3.6.1 Release Notes" msgstr "Notas de la versión 3.6.1 de pgRouting" @@ -18070,9 +18102,6 @@ msgstr "Correcciones de construcción" msgid "Fix winnie build" msgstr "" -msgid "Code fixes" -msgstr "Corrección de código" - msgid "Fix clang warnings" msgstr "" diff --git a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po index e52c056d34..8801dba5b8 100644 --- a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\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: 2022-09-29 19:13+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Japanese =0 \\} & \\quad \\text{if } reverse\\_cost = " -"\\varnothing \\\\ \\text{ } \\text{ } & \\quad \\text{ } \\\\ \\text{ } " +"\\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{ } \\\\ \\cup \\{(target_i, source_i, reverse\\_cost_i) " "\\text{ when } reverse\\_cost_i>=0 \\} & \\quad \\text{if } reverse\\_cost " "\\neq \\varnothing \\\\ \\end{cases}`" msgstr "" @@ -3732,18 +3733,18 @@ msgstr "重みづけされた無向グラフ :math:'G_u(V,E)''は、次のよう msgid ":math:`V = source \\cup target \\cup {start_v{vid}} \\cup {end_{vid}}`" msgstr ":math:`V = source \\cup target \\cup {start_v{vid}} \\cup {end_{vid}}`" +#, fuzzy 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 "" ":math:`E = \\begin{cases} \\text{ } \\{(source_i, target_i, cost_i) " "\\text{ when } cost >=0 \\} & \\quad \\text{ } \\\\ \\cup \\{(target_i, " @@ -4515,15 +4516,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 "" @@ -13266,8 +13258,9 @@ msgstr "" msgid "old_id" msgstr "" -msgid "``bigint`` Identifier of the edge in original table" -msgstr "" +#, fuzzy +msgid "``bigint`` Identifier of the edge in original table" +msgstr "終了ノードの識別子。" msgid "sub_id" msgstr "" @@ -13363,7 +13356,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 "" @@ -13377,7 +13370,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" @@ -15439,6 +15432,36 @@ 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 "" @@ -15635,9 +15658,6 @@ msgstr "" msgid "Fix winnie build" msgstr "" -msgid "Code fixes" -msgstr "" - msgid "Fix clang warnings" msgstr "" diff --git a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po index c79db3727a..60ba0b3981 100644 --- a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0\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: 2022-12-13 12:30+0000\n" "Last-Translator: Hyung-Gyu Ryoo \n" "Language-Team: Korean =0 \\} & \\quad \\text{if } reverse\\_cost = " -"\\varnothing \\\\ \\text{ } \\text{ } & \\quad \\text{ } \\\\ \\text{ } " +"\\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{ } \\\\ \\cup \\{(target_i, source_i, reverse\\_cost_i) " "\\text{ when } reverse\\_cost_i>=0 \\} & \\quad \\text{if } reverse\\_cost " "\\neq \\varnothing \\\\ \\end{cases}`" msgstr "" @@ -3692,17 +3692,16 @@ 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" @@ -4453,15 +4452,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 "" @@ -13174,7 +13164,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" @@ -13269,7 +13259,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 "" @@ -13283,7 +13273,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" @@ -15335,6 +15325,36 @@ 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 "" @@ -15530,9 +15550,6 @@ msgstr "빌드" msgid "Fix winnie build" msgstr "" -msgid "Code fixes" -msgstr "" - msgid "Fix clang warnings" msgstr "" diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index c4dfa4aa65..780f46ac46 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,7 +11,7 @@ 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: 2024-04-29 03:40+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Chinese (Simplified) =0 \\} & \\quad \\text{if } reverse\\_cost = " -"\\varnothing \\\\ \\text{ } \\text{ } & \\quad \\text{ } \\\\ \\text{ } " +"\\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{ } \\\\ \\cup \\{(target_i, source_i, reverse\\_cost_i) " "\\text{ when } reverse\\_cost_i>=0 \\} & \\quad \\text{if } reverse\\_cost " "\\neq \\varnothing \\\\ \\end{cases}`" msgstr "" @@ -3795,18 +3797,18 @@ msgid ":math:`V = source \\cup target \\cup {start_v{vid}} \\cup {end_{vid}}`" msgstr "" ":math:`V = source \\cup target \\cup {start_v{vid}} \\cup {end_{vid}}`" +#, fuzzy 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 "" ":math:`E = \\begin{cases} \\text{ } \\{(source_i, target_i, cost_i) " "\\text{ when } cost >=0 \\} & \\quad \\text{ } \\\\ \\cup " @@ -4622,15 +4624,6 @@ msgid "" msgstr "" "`#2517 `__ Astar 代码简化。" -msgid "Others" -msgstr "其他" - -msgid "Adjust NEWS generator" -msgstr "调整新闻生成器" - -msgid "Name change to `NEWS.md` for better visualization on GitHub" -msgstr "更名为 `NEWS.md` ，以便在 GitHub 上更好地可视化" - msgid "All releases" msgstr "所有版本" @@ -14008,7 +14001,8 @@ msgstr "``bigint`` 表的唯一标识符" msgid "old_id" msgstr "old_id" -msgid "``bigint`` Identifier of the edge in original table" +#, fuzzy +msgid "``bigint`` Identifier of the edge in original table" msgstr "``bigint``原表中边的标识符" msgid "sub_id" @@ -14103,7 +14097,8 @@ msgstr "仅具有进行拓扑分析的基本字段" msgid "Edges with 1 dead end: 1,6,24" msgstr "有 1 个死端的边：1、6、24" -msgid "Edges with 2 dead ends 17,18" +#, fuzzy +msgid "Edges with 2 dead ends: 17,18" msgstr "有两个死端的边：17，18" msgid "" @@ -14117,7 +14112,8 @@ msgstr "有 1 个死端的边：1-1 ,6-1,14-2, 18-1 17-1 18-2" msgid "Isolated segments" msgstr "孤立的片段" -msgid "two isolated segments: 17 and 18 both they have 2 dead ends" +#, fuzzy +msgid "two isolated segments: 17 and 18 both they have 2 dead ends" msgstr "两个孤立的段：17 和 18 都有 2 个死端" msgid "No Isolated segments" @@ -16398,6 +16394,41 @@ msgstr "pgRouting 3.7" msgid "pgRouting 3.6" msgstr "pgRouting 3.6" +#, fuzzy +msgid "pgRouting 3.6.2 Release Notes" +msgstr "pgRouting 3.6.1 发布说明" + +#, fuzzy +msgid "" +"To see all issues & pull requests closed by this release see the `Git closed " +"milestone for 3.6.2 `__" +msgstr "" +"要查看此版本关闭的所有问题和拉取请求，请参阅 `3.6.1Git 关闭里程碑 `_" + +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 "更名为 `NEWS.md` ，以便在 GitHub 上更好地可视化" + msgid "pgRouting 3.6.1 Release Notes" msgstr "pgRouting 3.6.1 发布说明" @@ -16574,9 +16605,9 @@ msgid "" "milestone for 3.5.1 `_" msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 `3.5.1 Git 关闭里程碑 " -"`_" +"要查看此版本关闭的所有问题和拉取请求，请参阅 `3.5.1 Git 关闭里程碑 `_" msgid "Documentation fixes" msgstr "文档修复" @@ -16635,9 +16666,6 @@ msgstr "构建修复" msgid "Fix winnie build" msgstr "修复 Winnie 构建" -msgid "Code fixes" -msgstr "代码修正" - msgid "Fix clang warnings" msgstr "修复 clang 警告" @@ -16978,9 +17006,9 @@ msgid "" "milestone for 3.3.0 `_ on Github." msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 ` 3.3.0 " -"Git关闭里程碑 `_。" +"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 ` 3.3.0 Git关闭里程" +"碑 `_。" msgid "" "`#2057 `__: trspViaEdges " @@ -17082,9 +17110,9 @@ msgid "" "milestone for 3.2.2 `_ on Github." msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.2.2 " -"Git关闭里程碑 `_。" +"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.2.2 Git关闭里程" +"碑 `_。" msgid "" "`#2093 `__: Compilation " @@ -17253,9 +17281,9 @@ msgid "" "milestone for 3.1.3 `_ on Github." msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.1.3 " -"Git关闭里程碑 `_。" +"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.1.3 Git关闭里程" +"碑 `_。" msgid "" "`#1825 `__: Boost " @@ -17333,9 +17361,9 @@ msgid "" "milestone for 3.1.1 `_ on Github." msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.1.1 " -"Git关闭里程碑 `_。" +"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.1.1 Git关闭里程" +"碑 `_。" msgid "" "`#1733 `__: pgr_bdAstar " @@ -17380,9 +17408,9 @@ msgid "" "milestone for 3.1.0 `_ on Github." msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.1.0 " -"Git关闭里程碑 `_。" +"要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.1.0 Git关闭里程" +"碑 `_。" msgid "pgr_dijkstra(combinations)" msgstr "pgr_dijkstra(组合)" @@ -18109,9 +18137,9 @@ msgid "" "2.5.4 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 `2.5.4 Git关闭里程碑 " -"`_。" +"要查看此版本关闭的问题，请参阅 Github 上的 `2.5.4 Git关闭里程碑 `_。" msgid "pgRouting 2.5.3 Release Notes" msgstr "pgRouting 2.5.3 发布说明" @@ -18168,9 +18196,9 @@ msgid "" "2.5.0 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 `2.5.0Git关闭里程碑 " -"`_ 。" +"要查看此版本关闭的问题，请参阅 Github 上的 `2.5.0Git关闭里程碑 `_ 。" msgid "enhancement:" msgstr "增强：" @@ -18349,9 +18377,9 @@ msgid "" "2.3.2 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 ` 2.3.2 Git关闭里程碑 " -"`_ 。" +"要查看此版本关闭的问题，请参阅 Github 上的 ` 2.3.2 Git关闭里程碑 `_ 。" msgid "Fixed pgr_gsoc_vrppdtw crash when all orders fit on one truck." msgstr "修正了当所有订单都装在一辆卡车上时 pgr_gsoc_vrppdtw 崩溃的问题。" @@ -18520,9 +18548,9 @@ msgid "" "2.2.2 `_ on Github." msgstr "" -"要查看此版本关闭的问题，请参阅 Github 上的 `2.2.2 Git关闭里程碑 " -"`_ 。" +"要查看此版本关闭的问题，请参阅 Github 上的 `2.2.2 Git关闭里程碑 `_ 。" msgid "Fixed regression error on pgr_drivingDistance" msgstr "修正了 pgr_drivingDistance 的回归错误" From c61cd6617248a9cde78cc543fa1f06e7fad1aaf8 Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Tue, 30 Apr 2024 03:08:17 +0000 Subject: [PATCH 239/428] Translated using Weblate (Japanese) Currently translated at 2.8% (148 of 5230 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/ja/ --- locale/ja/LC_MESSAGES/pgrouting_doc_strings.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po index 8801dba5b8..744657b24f 100644 --- a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po @@ -16,14 +16,14 @@ # Jin Igarashi , 2021 # Ko Nagase , 2021 # Celia Virginia Vergara Castillo , 2022. -# +# Celia Virginia Vergara Castillo , 2024. msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-04-28 19:05-0600\n" -"PO-Revision-Date: 2022-09-29 19:13+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"PO-Revision-Date: 2024-05-01 03:45+0000\n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -31,23 +31,23 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 4.14.1\n" +"X-Generator: Weblate 5.4.3\n" "Generated-By: Babel 2.10.3\n" msgid "BFS - Category" -msgstr "" +msgstr "BFS - カテゴリ" msgid ":doc:`pgr_kruskalBFS`" -msgstr "" +msgstr ":doc:`pgr_kruskalBFS`" msgid ":doc:`pgr_primBFS`" -msgstr "" +msgstr ":doc:`pgr_primBFS`" msgid "Traversal using breadth first search." msgstr "" msgid "It's implementation is only on **undirected** graph." -msgstr "" +msgstr "実装は**undirected**グラフのみです。" msgid "Process is done only on edges with positive costs." msgstr "" From dd472beaeed3015ba7e7fa911ddfff0e9e1826ee Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Tue, 30 Apr 2024 03:08:16 +0000 Subject: [PATCH 240/428] Translated using Weblate (Japanese) Currently translated at 17.3% (17 of 98 strings) Translation: pgRouting/index Translate-URL: https://weblate.osgeo.org/projects/pgrouting/index/ja/ --- locale/ja/LC_MESSAGES/index.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/locale/ja/LC_MESSAGES/index.po b/locale/ja/LC_MESSAGES/index.po index aec2251df6..f61ee5cf7e 100644 --- a/locale/ja/LC_MESSAGES/index.po +++ b/locale/ja/LC_MESSAGES/index.po @@ -8,8 +8,8 @@ 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" -"PO-Revision-Date: 2022-09-29 15:27+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"PO-Revision-Date: 2024-05-01 03:45+0000\n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 4.14.1\n" +"X-Generator: Weblate 5.4.3\n" "Generated-By: Babel 2.9.1\n" #: ../../build/doc/index.rst:12 @@ -283,7 +283,7 @@ msgstr "" #: ../../build/doc/BFS-category.rst:3 ../../build/doc/kruskal-family.rst:4 msgid ":doc:`pgr_kruskalBFS`" -msgstr "" +msgstr ":doc:`pgr_kruskalBFS`" #: ../../build/doc/kruskal-family.rst:5 msgid ":doc:`pgr_kruskalDD`" @@ -304,7 +304,7 @@ msgstr "" #: ../../build/doc/BFS-category.rst:4 ../../build/doc/prim-family.rst:4 msgid ":doc:`pgr_primBFS`" -msgstr "" +msgstr ":doc:`pgr_primBFS`" #: ../../build/doc/prim-family.rst:5 msgid ":doc:`pgr_primDD`" From 232830fa79e8299032f332b943284790aff6d931 Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Tue, 30 Apr 2024 03:17:21 +0000 Subject: [PATCH 241/428] Translated using Weblate (Chinese (Simplified)) Currently translated at 99.1% (5183 of 5230 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ --- locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 780f46ac46..03ad807441 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-04-28 19:05-0600\n" -"PO-Revision-Date: 2024-04-29 03:40+0000\n" +"PO-Revision-Date: 2024-05-01 03:45+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Chinese (Simplified) \n" @@ -36,7 +36,7 @@ msgid "Traversal using breadth first search." msgstr "使用广度优先搜索进行遍历。" msgid "It's implementation is only on **undirected** graph." -msgstr "它的实现仅在**无向**图上。" +msgstr "它的实现仅在 **无向** 图上。" msgid "Process is done only on edges with positive costs." msgstr "仅在具有正成本的边进行处理。" @@ -1499,9 +1499,8 @@ msgstr "9" msgid "16.5" msgstr "16.5" -#, fuzzy msgid ":math:`10.5 / 60 = 0.175`" -msgstr ":math:`10.5 / 60 = 0.175`" +msgstr ":math:`10.5 / 60 = 0.175`" msgid "minutes" msgstr "分钟" @@ -4572,9 +4571,8 @@ msgstr "" "`#2516 `__标准化输出" "pgr_aStar" -#, fuzzy msgid "Functions:" -msgstr "新函数" +msgstr "新函数:" msgid "``pgr_kruskalDD``" msgstr "``pgr_kruskalDD``" @@ -13048,7 +13046,7 @@ msgstr "``pgr_isPlanar`` - 实验" msgid "" "``pgr_isPlanar`` — Returns a boolean depending upon the planarity of the " "graph." -msgstr "``pgr_isPlanar`` —根据图的平面性返回布尔值." +msgstr "``pgr_isPlanar`` — 根据图的平面性返回布尔值." msgid "" "A graph is planar if it can be drawn in two-dimensional space with no two of " From 7f03918b16c7c13cc01a7f2447b3af6a299818ea Mon Sep 17 00:00:00 2001 From: DeepL Date: Tue, 30 Apr 2024 03:23:01 +0000 Subject: [PATCH 242/428] Translated using Weblate (Chinese (Simplified)) Currently translated at 99.1% (5183 of 5230 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ --- locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 03ad807441..5972b950ca 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-04-28 19:05-0600\n" "PO-Revision-Date: 2024-05-01 03:45+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"Last-Translator: DeepL \n" "Language-Team: Chinese (Simplified) \n" "Language: zh_Hans\n" @@ -4608,19 +4608,19 @@ msgid "" msgstr "" "`#2599 `__ 行车距离清理" -#, fuzzy msgid "" "`#2607 `__ Read " "postgresql data on C++" msgstr "" -"`#2517 `__ Astar 代码简化。" +"`#2607 `__ 在 C++ 上读取 " +"postgresql 数据" -#, fuzzy msgid "" "`#2614 `__ Clang tidy " "does not work" msgstr "" -"`#2517 `__ Astar 代码简化。" +"`#2614 `__ Clang tidy " +"不工作" msgid "All releases" msgstr "所有版本" From 5dbc488f740f2d03daaaf48ad6f6e595c636cad4 Mon Sep 17 00:00:00 2001 From: Weblate Date: Tue, 7 May 2024 21:32:15 +0000 Subject: [PATCH 243/428] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/ --- .../de/LC_MESSAGES/pgrouting_doc_strings.po | 17 +++++++----- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 22 +++++++++++----- .../ja/LC_MESSAGES/pgrouting_doc_strings.po | 21 +++++++++------ .../ko/LC_MESSAGES/pgrouting_doc_strings.po | 17 +++++++----- .../LC_MESSAGES/pgrouting_doc_strings.po | 26 ++++++++++++------- 5 files changed, 65 insertions(+), 38 deletions(-) diff --git a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po index 4a161197fa..82a2dafc6b 100644 --- a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-28 19:05-0600\n" +"POT-Creation-Date: 2024-05-07 21:31+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -4419,18 +4419,18 @@ msgid "Code enhancement" msgstr "" msgid "" -"`#2599 `__ Driving " +"`#2599 `__ Driving " "distance cleanup" msgstr "" msgid "" -"`#2607 `__ Read " -"postgresql data on C++" +"`#2607 `__ Read postgresql " +"data on C++" msgstr "" msgid "" -"`#2614 `__ Clang tidy " -"does not work" +"`#2614 `__ Clang tidy does " +"not work" msgstr "" msgid "All releases" @@ -12505,13 +12505,16 @@ msgid "" "share a common endpoint in G." msgstr "" +msgid "Currently works for undirected graph." +msgstr "" + msgid "pgr_lineGraph(`Edges SQL`_, [``directed``])" msgstr "" msgid "Returns set of |result-lineg|" msgstr "" -msgid "For a **directed** graph" +msgid "For an **undirected** graph" msgstr "" msgid "Gives a local identifier for the edge" diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 81c195a019..49d6023e64 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-28 19:05-0600\n" +"POT-Creation-Date: 2024-05-07 21:31+0000\n" "PO-Revision-Date: 2024-04-29 03:40+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish `__ Driving " +"`#2599 `__ Driving " "distance cleanup" msgstr "" "`#2599 `__ Limpiando " "Driving Distance" +#, fuzzy msgid "" -"`#2607 `__ Read " -"postgresql data on C++" +"`#2607 `__ Read postgresql " +"data on C++" msgstr "" "`#2607 `__ Leer datos de " "postgresql en C++" +#, fuzzy msgid "" -"`#2614 `__ Clang tidy " -"does not work" +"`#2614 `__ Clang tidy does " +"not work" msgstr "" "`#2614 `__ Clang tidy no " "funciona" @@ -14576,13 +14579,18 @@ msgstr "" "Dos vértices de L(G) son adyacentes si y sólo si sus aristas " "correspondientes comparten un punto final común en G." +#, fuzzy +msgid "Currently works for undirected graph." +msgstr "Funciona para grafos no dirigidos." + msgid "pgr_lineGraph(`Edges SQL`_, [``directed``])" msgstr "pgr_lineGraph(`SQL de aristas`_, [``directed``])" msgid "Returns set of |result-lineg|" msgstr "Regresa el conjunto de |result-lineg|" -msgid "For a **directed** graph" +#, fuzzy +msgid "For an **undirected** graph" msgstr "Para un grafo **dirigido**" msgid "Gives a local identifier for the edge" diff --git a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po index 744657b24f..b730a34d20 100644 --- a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-28 19:05-0600\n" +"POT-Creation-Date: 2024-05-07 21:31+0000\n" "PO-Revision-Date: 2024-05-01 03:45+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Japanese `__ Driving " +"`#2599 `__ Driving " "distance cleanup" msgstr "" msgid "" -"`#2607 `__ Read " -"postgresql data on C++" +"`#2607 `__ Read postgresql " +"data on C++" msgstr "" msgid "" -"`#2614 `__ Clang tidy " -"does not work" +"`#2614 `__ Clang tidy does " +"not work" msgstr "" msgid "All releases" @@ -12639,14 +12639,19 @@ msgid "" "share a common endpoint in G." msgstr "" +#, fuzzy +msgid "Currently works for undirected graph." +msgstr "導かれないグラフ。" + msgid "pgr_lineGraph(`Edges SQL`_, [``directed``])" msgstr "" msgid "Returns set of |result-lineg|" msgstr "" -msgid "For a **directed** graph" -msgstr "" +#, fuzzy +msgid "For an **undirected** graph" +msgstr "導かれないグラフ" msgid "Gives a local identifier for the edge" msgstr "" diff --git a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po index 60ba0b3981..421d4ce993 100644 --- a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-28 19:05-0600\n" +"POT-Creation-Date: 2024-05-07 21:31+0000\n" "PO-Revision-Date: 2022-12-13 12:30+0000\n" "Last-Translator: Hyung-Gyu Ryoo \n" "Language-Team: Korean `__ Driving " +"`#2599 `__ Driving " "distance cleanup" msgstr "" msgid "" -"`#2607 `__ Read " -"postgresql data on C++" +"`#2607 `__ Read postgresql " +"data on C++" msgstr "" msgid "" -"`#2614 `__ Clang tidy " -"does not work" +"`#2614 `__ Clang tidy does " +"not work" msgstr "" msgid "All releases" @@ -12545,13 +12545,16 @@ msgid "" "share a common endpoint in G." msgstr "" +msgid "Currently works for undirected graph." +msgstr "" + msgid "pgr_lineGraph(`Edges SQL`_, [``directed``])" msgstr "" msgid "Returns set of |result-lineg|" msgstr "" -msgid "For a **directed** graph" +msgid "For an **undirected** graph" msgstr "" msgid "Gives a local identifier for the edge" diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 5972b950ca..7224816769 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-28 19:05-0600\n" +"POT-Creation-Date: 2024-05-07 21:31+0000\n" "PO-Revision-Date: 2024-05-01 03:45+0000\n" "Last-Translator: DeepL \n" "Language-Team: Chinese (Simplified) `__ Driving " +"`#2599 `__ Driving " "distance cleanup" msgstr "" "`#2599 `__ 行车距离清理" +#, fuzzy msgid "" -"`#2607 `__ Read " -"postgresql data on C++" +"`#2607 `__ Read postgresql " +"data on C++" msgstr "" "`#2607 `__ 在 C++ 上读取 " "postgresql 数据" +#, fuzzy msgid "" -"`#2614 `__ Clang tidy " -"does not work" +"`#2614 `__ Clang tidy does " +"not work" msgstr "" -"`#2614 `__ Clang tidy " -"不工作" +"`#2614 `__ Clang tidy 不工" +"作" msgid "All releases" msgstr "所有版本" @@ -13346,13 +13349,18 @@ msgid "" "share a common endpoint in G." msgstr "L(G) 的两个顶点相邻当且仅当它们对应的边共享 G 中的公共端点。" +#, fuzzy +msgid "Currently works for undirected graph." +msgstr "适用于无向图。" + msgid "pgr_lineGraph(`Edges SQL`_, [``directed``])" msgstr "pgr_lineGraph(`Edges SQL`_, [``directed``])" msgid "Returns set of |result-lineg|" msgstr "Returns set of |result-lineg|" -msgid "For a **directed** graph" +#, fuzzy +msgid "For an **undirected** graph" msgstr "对于**有向**图" msgid "Gives a local identifier for the edge" From 8ada27d6911f149dd56553611fca6f36c4e4c861 Mon Sep 17 00:00:00 2001 From: Weblate Date: Mon, 13 May 2024 17:23:52 +0000 Subject: [PATCH 244/428] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/ --- .../de/LC_MESSAGES/pgrouting_doc_strings.po | 190 ++++++++++++- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 264 ++++++++++++++++-- .../ja/LC_MESSAGES/pgrouting_doc_strings.po | 214 ++++++++++++-- .../ko/LC_MESSAGES/pgrouting_doc_strings.po | 196 ++++++++++++- .../LC_MESSAGES/pgrouting_doc_strings.po | 247 ++++++++++++++-- 5 files changed, 1023 insertions(+), 88 deletions(-) diff --git a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po index 82a2dafc6b..93b70e10bc 100644 --- a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-05-07 21:31+0000\n" +"POT-Creation-Date: 2024-05-13 17:23+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -3880,10 +3880,6 @@ msgstr "" msgid ":doc:`transformation-family`" msgstr "" -msgid "" -":doc:`pgr_lineGraph` - Transformation algorithm for generating a Line Graph." -msgstr "" - msgid "" ":doc:`pgr_lineGraphFull` - Transformation algorithm for generating a Line " "Graph out of each vertex in the input graph." @@ -4415,6 +4411,23 @@ msgstr "" msgid "Added ``pred`` result columns." msgstr "" +msgid "Experimental promoted to proposed." +msgstr "" + +msgid "" +"`#2635 `__ pgr_LineGraph " +"ignores directed flag and use negative values for identifiers." +msgstr "" + +msgid "``pgr_lineGraph``" +msgstr "" + +msgid "Promoted to **proposed** signature." +msgstr "" + +msgid "Works for directed and undirected graphs." +msgstr "" + msgid "Code enhancement" msgstr "" @@ -12486,7 +12499,7 @@ msgid "" "Dominator_(graph_theory)>`__" msgstr "" -msgid "``pgr_lineGraph`` - Experimental" +msgid "pgr_lineGraph - Proposed" msgstr "" msgid "" @@ -12494,18 +12507,35 @@ msgid "" "based graph." msgstr "" -msgid "Given a graph G, its line graph L(G) is a graph such that:" +msgid "" +"Given a graph :math:`G`, its line graph :math:`L(G)` is a graph such that:" +msgstr "" + +msgid "Each vertex of :math:`L(G)` represents an edge of :math:`G`." +msgstr "" + +msgid "" +"Two vertices of :math:`L(G)` are adjacent if and only if their corresponding " +"edges share a common endpoint in :math:`G`" +msgstr "" + +msgid "" +"The ``cost`` and ``reverse_cost`` columns of the result represent existence " +"of the edge." msgstr "" -msgid "Each vertex of L(G) represents an edge of G" +msgid "When the graph is directed the result is directed." msgstr "" msgid "" -"Two vertices of L(G) are adjacent if and only if their corresponding edges " -"share a common endpoint in G." +"To get the complete Line Graph use unique identifiers on the double way " +"edges (See `Additional Examples`_)." +msgstr "" + +msgid "When the graph is undirected the result is undirected." msgstr "" -msgid "Currently works for undirected graph." +msgid "The ``reverse_cost`` is always :math:`-1`." msgstr "" msgid "pgr_lineGraph(`Edges SQL`_, [``directed``])" @@ -12514,7 +12544,7 @@ msgstr "" msgid "Returns set of |result-lineg|" msgstr "" -msgid "For an **undirected** graph" +msgid "For an undirected graph with edges :math:'{2,4,5,8}'" msgstr "" msgid "Gives a local identifier for the edge" @@ -12548,7 +12578,132 @@ msgid "" "it’s not part of the graph." msgstr "" -msgid "https://en.wikipedia.org/wiki/Line_graph" +msgid "Given the following directed graph" +msgstr "" + +msgid "" +":math:`G(V,E) = G(\\{1,2,3,4\\},\\{ 1 \\rightarrow 2, 1 \\rightarrow 4, 2 " +"\\rightarrow 3, 3 \\rightarrow 1, 3 \\rightarrow 2, 3 \\rightarrow 4, 4 " +"\\rightarrow 3\\})`" +msgstr "" + +msgid "Representation as directed with shared edge identifiers" +msgstr "" + +msgid "" +"For the simplicity, the design of the edges table on the database, has the " +"edge's identifiers are represented with 3 digits:" +msgstr "" + +msgid "hundreds" +msgstr "" + +msgid "the source vertex" +msgstr "" + +msgid "tens" +msgstr "" + +msgid "always 0, acts as a separator" +msgstr "" + +msgid "units" +msgstr "" + +msgid "the target vertex" +msgstr "" + +msgid "In this image," +msgstr "" + +msgid "" +"Single or double head arrows represent one edge (row) on the edges table." +msgstr "" + +msgid "The numbers in the yellow shadow are the edge identifiers." +msgstr "" + +msgid "" +"Two pair of edges share the same identifier when the ``reverse_cost`` column " +"is used." +msgstr "" + +msgid "" +"Edges :math:`{2 \\rightarrow 3, 3 \\rightarrow 2}` are represented with one " +"edge row with :math:`id=203`." +msgstr "" + +msgid "" +"Edges :math:`{3 \\rightarrow 4, 4 \\rightarrow 3}` are represented with one " +"edge row with :math:`id=304`." +msgstr "" + +msgid "The graph can be created as follows:" +msgstr "" + +msgid "Line Graph of a directed graph represented with shared edges" +msgstr "" + +msgid "The result is a directed graph." +msgstr "" + +msgid "" +"For :math:`seq=4` from :math:`203 \\leftrightarrow 304` represent two edges" +msgstr "" + +msgid "For all the other values of ``seq`` represent one edge." +msgstr "" + +msgid "" +"The ``cost`` and ``reverse_cost`` values represent the existence of the edge." +msgstr "" + +msgid "When positive: the edge exists." +msgstr "" + +msgid "When negative: the edge does not exist." +msgstr "" + +msgid "Representation as directed with unique edge identifiers" +msgstr "" + +msgid "Single head arrows represent one edge (row) on the edges table." +msgstr "" + +msgid "There are no double head arrows" +msgstr "" + +msgid "" +"Two pair of edges share the same ending nodes and the ``reverse_cost`` " +"column is not used." +msgstr "" + +msgid "" +"Edges :math:`{2 \\rightarrow 3, 3 \\rightarrow 2}` are represented with two " +"edges :math:`id=203` and :math:`id=302` respectively." +msgstr "" + +msgid "" +"Edges :math:`{3 \\rightarrow 4, 4 \\rightarrow 3}` are represented with two " +"edges :math:`id=304` and :math:`id=403` respectively." +msgstr "" + +msgid "Line Graph of a directed graph represented with unique edges" +msgstr "" + +msgid "" +"For :math:`seq=7` from :math:`203 \\leftrightarrow 302` represent two edges." +msgstr "" + +msgid "" +"For :math:`seq=8` from :math:`304 \\leftrightarrow 403` represent two edges." +msgstr "" + +msgid "wikipedia: `Line Graph `__" +msgstr "" + +msgid "" +"mathworld: `Line Graph `__" msgstr "" msgid "``pgr_lineGraphFull`` - Experimental" @@ -12795,6 +12950,9 @@ msgstr "" msgid "Routing from :math:`5` to :math:`1`" msgstr "" +msgid "https://en.wikipedia.org/wiki/Line_graph" +msgstr "" + msgid "https://en.wikipedia.org/wiki/Complete_graph" msgstr "" @@ -15236,6 +15394,10 @@ msgid "" "table information." msgstr "" +msgid "" +":doc:`pgr_lineGraph` - Transformation algorithm for generating a Line Graph." +msgstr "" + msgid ":doc:`pgr_withPointsVia`" msgstr "" @@ -18035,7 +18197,7 @@ msgstr "" msgid "Additional functions to analyze a graph:" msgstr "" -msgid "Transformation - Family of functions (Experimental)" +msgid "Transformation - Family of functions" msgstr "" msgid "" diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 49d6023e64..22a2eb233e 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-05-07 21:31+0000\n" +"POT-Creation-Date: 2024-05-13 17:23+0000\n" "PO-Revision-Date: 2024-04-29 03:40+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish `__ pgr_LineGraph " +"ignores directed flag and use negative values for identifiers." +msgstr "" +"`#2605 `__ Estandarización " +"de las salida de las funciones de árbol de expansión" + +#, fuzzy +msgid "``pgr_lineGraph``" +msgstr "pgr_lineGraph" + +#, fuzzy +msgid "Promoted to **proposed** signature." +msgstr "Promovido a firma **propuesta**" + +#, fuzzy +msgid "Works for directed and undirected graphs." +msgstr "Funciona para grafos **dirigidos** y **no dirigidos**." + msgid "Code enhancement" msgstr "Mejora del código" @@ -14556,8 +14574,9 @@ msgstr "" "'Wikipedia: árbol de dominador' `__" -msgid "``pgr_lineGraph`` - Experimental" -msgstr "``pgr_lineGraph`` - Experimental" +#, fuzzy +msgid "pgr_lineGraph - Proposed" +msgstr "pgr_lineGraph" msgid "" "``pgr_lineGraph`` — Transforms the given graph into its corresponding edge-" @@ -14566,22 +14585,46 @@ msgstr "" "``pgr_lineGraph`` — Transforma un grafo dado en su grafo correspondiente " "basado en aristas." -msgid "Given a graph G, its line graph L(G) is a graph such that:" +#, fuzzy +msgid "" +"Given a graph :math:`G`, its line graph :math:`L(G)` is a graph such that:" msgstr "Dado un grafo G, su grafo de líneas L(G) es un grafo de tal forma que:" -msgid "Each vertex of L(G) represents an edge of G" +#, fuzzy +msgid "Each vertex of :math:`L(G)` represents an edge of :math:`G`." msgstr "Cada vértice de L(G) representa una arista de G" +#, fuzzy msgid "" -"Two vertices of L(G) are adjacent if and only if their corresponding edges " -"share a common endpoint in G." +"Two vertices of :math:`L(G)` are adjacent if and only if their corresponding " +"edges share a common endpoint in :math:`G`" msgstr "" "Dos vértices de L(G) son adyacentes si y sólo si sus aristas " "correspondientes comparten un punto final común en G." #, fuzzy -msgid "Currently works for undirected graph." -msgstr "Funciona para grafos no dirigidos." +msgid "" +"The ``cost`` and ``reverse_cost`` columns of the result represent existence " +"of the edge." +msgstr "" +"Usa las columnas ``cost`` y ``reverse_cost`` para representar la existenica " +"de una arista." + +#, fuzzy +msgid "When the graph is directed the result is directed." +msgstr "Cuando el grafo es **no dirigido**, la matriz de costes es simétrica" + +msgid "" +"To get the complete Line Graph use unique identifiers on the double way " +"edges (See `Additional Examples`_)." +msgstr "" + +#, fuzzy +msgid "When the graph is undirected the result is undirected." +msgstr "Cuando el grafo es **no dirigido**, la matriz de costes es simétrica" + +msgid "The ``reverse_cost`` is always :math:`-1`." +msgstr "" msgid "pgr_lineGraph(`Edges SQL`_, [``directed``])" msgstr "pgr_lineGraph(`SQL de aristas`_, [``directed``])" @@ -14590,8 +14633,8 @@ msgid "Returns set of |result-lineg|" msgstr "Regresa el conjunto de |result-lineg|" #, fuzzy -msgid "For an **undirected** graph" -msgstr "Para un grafo **dirigido**" +msgid "For an undirected graph with edges :math:'{2,4,5,8}'" +msgstr "Para sub-grafo con aristas :math:`\\{1, 2, 3, 4\\}`." msgid "Gives a local identifier for the edge" msgstr "Da un identificador local de la arista" @@ -14630,8 +14673,163 @@ msgstr "" "Cuando `negative`: la arista (``target``, ``source``) no existe, por lo " "tanto no es parte del grafo." -msgid "https://en.wikipedia.org/wiki/Line_graph" -msgstr "https://en.wikipedia.org/wiki/Line_graph" +#, fuzzy +msgid "Given the following directed graph" +msgstr "Dada la siguiente consulta:" + +msgid "" +":math:`G(V,E) = G(\\{1,2,3,4\\},\\{ 1 \\rightarrow 2, 1 \\rightarrow 4, 2 " +"\\rightarrow 3, 3 \\rightarrow 1, 3 \\rightarrow 2, 3 \\rightarrow 4, 4 " +"\\rightarrow 3\\})`" +msgstr "" + +msgid "Representation as directed with shared edge identifiers" +msgstr "" + +msgid "" +"For the simplicity, the design of the edges table on the database, has the " +"edge's identifiers are represented with 3 digits:" +msgstr "" + +msgid "hundreds" +msgstr "" + +#, fuzzy +msgid "the source vertex" +msgstr "Obtener el vértice más cercano" + +msgid "tens" +msgstr "" + +msgid "always 0, acts as a separator" +msgstr "" + +#, fuzzy +msgid "units" +msgstr "Unidades" + +#, fuzzy +msgid "the target vertex" +msgstr "Obtener el vértice más cercano" + +msgid "In this image," +msgstr "" + +msgid "" +"Single or double head arrows represent one edge (row) on the edges table." +msgstr "" + +#, fuzzy +msgid "The numbers in the yellow shadow are the edge identifiers." +msgstr "" +"Las filas de resultados son ordenados ascendentemente respecto al " +"identificador de la arista." + +msgid "" +"Two pair of edges share the same identifier when the ``reverse_cost`` column " +"is used." +msgstr "" + +#, fuzzy +msgid "" +"Edges :math:`{2 \\rightarrow 3, 3 \\rightarrow 2}` are represented with one " +"edge row with :math:`id=203`." +msgstr "" +"Los aristas :math:`v \\rightarrow w` y :math:`w \\rightarrow z` fueron " +"eliminados del grafo." + +#, fuzzy +msgid "" +"Edges :math:`{3 \\rightarrow 4, 4 \\rightarrow 3}` are represented with one " +"edge row with :math:`id=304`." +msgstr "" +"Los aristas :math:`v \\rightarrow w` y :math:`w \\rightarrow z` fueron " +"eliminados del grafo." + +#, fuzzy +msgid "The graph can be created as follows:" +msgstr "Los gráficos se definen como sigue:" + +#, fuzzy +msgid "Line Graph of a directed graph represented with shared edges" +msgstr "En términos de un grafo dirigido es como tener cuatro aristas:" + +#, fuzzy +msgid "The result is a directed graph." +msgstr "Para un grafo dirigido." + +#, fuzzy +msgid "" +"For :math:`seq=4` from :math:`203 \\leftrightarrow 304` represent two edges" +msgstr "La arista :math:`2` (:math:`1 \\rightarrow 3`) no es parte del grafo." + +msgid "For all the other values of ``seq`` represent one edge." +msgstr "" + +#, fuzzy +msgid "" +"The ``cost`` and ``reverse_cost`` values represent the existence of the edge." +msgstr "" +"Usa las columnas ``cost`` y ``reverse_cost`` para representar la existenica " +"de una arista." + +#, fuzzy +msgid "When positive: the edge exists." +msgstr "Cuando es positivo, es el identificador de un vértice." + +#, fuzzy +msgid "When negative: the edge does not exist." +msgstr "Cuando negativo arroja error." + +msgid "Representation as directed with unique edge identifiers" +msgstr "" + +#, fuzzy +msgid "Single head arrows represent one edge (row) on the edges table." +msgstr "" +"Las flechas rojas corresponden cuando ``cost`` > 0 en la tabla de aristas." + +msgid "There are no double head arrows" +msgstr "" + +msgid "" +"Two pair of edges share the same ending nodes and the ``reverse_cost`` " +"column is not used." +msgstr "" + +msgid "" +"Edges :math:`{2 \\rightarrow 3, 3 \\rightarrow 2}` are represented with two " +"edges :math:`id=203` and :math:`id=302` respectively." +msgstr "" + +msgid "" +"Edges :math:`{3 \\rightarrow 4, 4 \\rightarrow 3}` are represented with two " +"edges :math:`id=304` and :math:`id=403` respectively." +msgstr "" + +#, fuzzy +msgid "Line Graph of a directed graph represented with unique edges" +msgstr "En términos de un grafo dirigido es como tener cuatro aristas:" + +#, fuzzy +msgid "" +"For :math:`seq=7` from :math:`203 \\leftrightarrow 302` represent two edges." +msgstr "La arista :math:`2` (:math:`1 \\rightarrow 3`) no es parte del grafo." + +#, fuzzy +msgid "" +"For :math:`seq=8` from :math:`304 \\leftrightarrow 403` represent two edges." +msgstr "La arista :math:`2` (:math:`1 \\rightarrow 3`) no es parte del grafo." + +#, fuzzy +msgid "wikipedia: `Line Graph `__" +msgstr "" +"`Wikipedia: grafo bipartito `__" + +msgid "" +"mathworld: `Line Graph `__" +msgstr "" msgid "``pgr_lineGraphFull`` - Experimental" msgstr "``pgr_lineGraphFull`` - Experimental" @@ -14910,6 +15108,9 @@ msgstr "" msgid "Routing from :math:`5` to :math:`1`" msgstr "" +msgid "https://en.wikipedia.org/wiki/Line_graph" +msgstr "https://en.wikipedia.org/wiki/Line_graph" + msgid "https://en.wikipedia.org/wiki/Complete_graph" msgstr "https://en.wikipedia.org/wiki/Complete_graph" @@ -17783,6 +17984,12 @@ msgstr "" ":doc:`pgr_extractVertices` - Extrae información de vértices basada en la " "tabla de aristas." +msgid "" +":doc:`pgr_lineGraph` - Transformation algorithm for generating a Line Graph." +msgstr "" +":doc:`pgr_lineGraph` - Algoritmo de transformación para generar un grafo de " +"líneas." + msgid ":doc:`pgr_withPointsVia`" msgstr ":doc:`pgr_withPointsVia`" @@ -21004,8 +21211,9 @@ msgstr "" msgid "Additional functions to analyze a graph:" msgstr "" -msgid "Transformation - Family of functions (Experimental)" -msgstr "Transformation - Familia de funciones (Experimental)" +#, fuzzy +msgid "Transformation - Family of functions" +msgstr "Contraction - Familia de funciones" msgid "" "This family of functions is used for transforming a given input graph :math:" @@ -21447,6 +21655,20 @@ msgstr "pgr_withPointsDD es pgr_drivingDistance **con puntos**" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "pgr_withPoints es pgr_dijkstraVia **con puntos**" +#~ msgid "``pgr_lineGraph`` - Experimental" +#~ msgstr "``pgr_lineGraph`` - Experimental" + +#, fuzzy +#~ msgid "Currently works for undirected graph." +#~ msgstr "Funciona para grafos no dirigidos." + +#, fuzzy +#~ msgid "For an **undirected** graph" +#~ msgstr "Para un grafo **dirigido**" + +#~ msgid "Transformation - Family of functions (Experimental)" +#~ msgstr "Transformation - Familia de funciones (Experimental)" + #~ msgid "Current release" #~ msgstr "Versión actual" diff --git a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po index b730a34d20..8feaa79dc8 100644 --- a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-05-07 21:31+0000\n" +"POT-Creation-Date: 2024-05-13 17:23+0000\n" "PO-Revision-Date: 2024-05-01 03:45+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Japanese `__ pgr_LineGraph " +"ignores directed flag and use negative values for identifiers." +msgstr "" + +msgid "``pgr_lineGraph``" +msgstr "" + +msgid "Promoted to **proposed** signature." +msgstr "" + +#, fuzzy +msgid "Works for directed and undirected graphs." +msgstr "導かれないグラフ。" + msgid "Code enhancement" msgstr "" @@ -12620,7 +12634,7 @@ msgid "" "Dominator_(graph_theory)>`__" msgstr "" -msgid "``pgr_lineGraph`` - Experimental" +msgid "pgr_lineGraph - Proposed" msgstr "" msgid "" @@ -12628,20 +12642,36 @@ msgid "" "based graph." msgstr "" -msgid "Given a graph G, its line graph L(G) is a graph such that:" +msgid "" +"Given a graph :math:`G`, its line graph :math:`L(G)` is a graph such that:" +msgstr "" + +msgid "Each vertex of :math:`L(G)` represents an edge of :math:`G`." msgstr "" -msgid "Each vertex of L(G) represents an edge of G" +msgid "" +"Two vertices of :math:`L(G)` are adjacent if and only if their corresponding " +"edges share a common endpoint in :math:`G`" msgstr "" msgid "" -"Two vertices of L(G) are adjacent if and only if their corresponding edges " -"share a common endpoint in G." +"The ``cost`` and ``reverse_cost`` columns of the result represent existence " +"of the edge." msgstr "" -#, fuzzy -msgid "Currently works for undirected graph." -msgstr "導かれないグラフ。" +msgid "When the graph is directed the result is directed." +msgstr "" + +msgid "" +"To get the complete Line Graph use unique identifiers on the double way " +"edges (See `Additional Examples`_)." +msgstr "" + +msgid "When the graph is undirected the result is undirected." +msgstr "" + +msgid "The ``reverse_cost`` is always :math:`-1`." +msgstr "" msgid "pgr_lineGraph(`Edges SQL`_, [``directed``])" msgstr "" @@ -12649,9 +12679,8 @@ msgstr "" msgid "Returns set of |result-lineg|" msgstr "" -#, fuzzy -msgid "For an **undirected** graph" -msgstr "導かれないグラフ" +msgid "For an undirected graph with edges :math:'{2,4,5,8}'" +msgstr "" msgid "Gives a local identifier for the edge" msgstr "" @@ -12684,7 +12713,138 @@ msgid "" "it’s not part of the graph." msgstr "" -msgid "https://en.wikipedia.org/wiki/Line_graph" +#, fuzzy +msgid "Given the following directed graph" +msgstr "次のクエリを実行します。" + +msgid "" +":math:`G(V,E) = G(\\{1,2,3,4\\},\\{ 1 \\rightarrow 2, 1 \\rightarrow 4, 2 " +"\\rightarrow 3, 3 \\rightarrow 1, 3 \\rightarrow 2, 3 \\rightarrow 4, 4 " +"\\rightarrow 3\\})`" +msgstr "" + +msgid "Representation as directed with shared edge identifiers" +msgstr "" + +msgid "" +"For the simplicity, the design of the edges table on the database, has the " +"edge's identifiers are represented with 3 digits:" +msgstr "" + +msgid "hundreds" +msgstr "" + +msgid "the source vertex" +msgstr "" + +msgid "tens" +msgstr "" + +msgid "always 0, acts as a separator" +msgstr "" + +msgid "units" +msgstr "" + +msgid "the target vertex" +msgstr "" + +msgid "In this image," +msgstr "" + +msgid "" +"Single or double head arrows represent one edge (row) on the edges table." +msgstr "" + +msgid "The numbers in the yellow shadow are the edge identifiers." +msgstr "" + +msgid "" +"Two pair of edges share the same identifier when the ``reverse_cost`` column " +"is used." +msgstr "" + +msgid "" +"Edges :math:`{2 \\rightarrow 3, 3 \\rightarrow 2}` are represented with one " +"edge row with :math:`id=203`." +msgstr "" + +msgid "" +"Edges :math:`{3 \\rightarrow 4, 4 \\rightarrow 3}` are represented with one " +"edge row with :math:`id=304`." +msgstr "" + +#, fuzzy +msgid "The graph can be created as follows:" +msgstr "グラフは次のように定義されます:" + +msgid "Line Graph of a directed graph represented with shared edges" +msgstr "" + +#, fuzzy +msgid "The result is a directed graph." +msgstr "導かれないグラフ。" + +msgid "" +"For :math:`seq=4` from :math:`203 \\leftrightarrow 304` represent two edges" +msgstr "" + +msgid "For all the other values of ``seq`` represent one edge." +msgstr "" + +msgid "" +"The ``cost`` and ``reverse_cost`` values represent the existence of the edge." +msgstr "" + +msgid "When positive: the edge exists." +msgstr "" + +msgid "When negative: the edge does not exist." +msgstr "" + +msgid "Representation as directed with unique edge identifiers" +msgstr "" + +msgid "Single head arrows represent one edge (row) on the edges table." +msgstr "" + +msgid "There are no double head arrows" +msgstr "" + +msgid "" +"Two pair of edges share the same ending nodes and the ``reverse_cost`` " +"column is not used." +msgstr "" + +msgid "" +"Edges :math:`{2 \\rightarrow 3, 3 \\rightarrow 2}` are represented with two " +"edges :math:`id=203` and :math:`id=302` respectively." +msgstr "" + +msgid "" +"Edges :math:`{3 \\rightarrow 4, 4 \\rightarrow 3}` are represented with two " +"edges :math:`id=304` and :math:`id=403` respectively." +msgstr "" + +msgid "Line Graph of a directed graph represented with unique edges" +msgstr "" + +msgid "" +"For :math:`seq=7` from :math:`203 \\leftrightarrow 302` represent two edges." +msgstr "" + +msgid "" +"For :math:`seq=8` from :math:`304 \\leftrightarrow 403` represent two edges." +msgstr "" + +#, fuzzy +msgid "wikipedia: `Line Graph `__" +msgstr "" +"`Wikipedia: 巡回セールスマン問題 `__" + +msgid "" +"mathworld: `Line Graph `__" msgstr "" msgid "``pgr_lineGraphFull`` - Experimental" @@ -12931,6 +13091,9 @@ msgstr "" msgid "Routing from :math:`5` to :math:`1`" msgstr "" +msgid "https://en.wikipedia.org/wiki/Line_graph" +msgstr "" + msgid "https://en.wikipedia.org/wiki/Complete_graph" msgstr "" @@ -15389,6 +15552,10 @@ msgid "" "table information." msgstr "" +msgid "" +":doc:`pgr_lineGraph` - Transformation algorithm for generating a Line Graph." +msgstr "" + msgid ":doc:`pgr_withPointsVia`" msgstr "" @@ -18193,8 +18360,9 @@ msgstr "" msgid "Additional functions to analyze a graph:" msgstr "" -msgid "Transformation - Family of functions (Experimental)" -msgstr "" +#, fuzzy +msgid "Transformation - Family of functions" +msgstr "ダイクストラ関連機能" msgid "" "This family of functions is used for transforming a given input graph :math:" @@ -18593,3 +18761,11 @@ msgstr "" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "" + +#, fuzzy +#~ msgid "Currently works for undirected graph." +#~ msgstr "導かれないグラフ。" + +#, fuzzy +#~ msgid "For an **undirected** graph" +#~ msgstr "導かれないグラフ" diff --git a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po index 421d4ce993..3c6ffc6234 100644 --- a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-05-07 21:31+0000\n" +"POT-Creation-Date: 2024-05-13 17:23+0000\n" "PO-Revision-Date: 2022-12-13 12:30+0000\n" "Last-Translator: Hyung-Gyu Ryoo \n" "Language-Team: Korean `__ pgr_LineGraph " +"ignores directed flag and use negative values for identifiers." +msgstr "" + +#, fuzzy +msgid "``pgr_lineGraph``" +msgstr ":doc:`pgr_analyzeGraph`" + +msgid "Promoted to **proposed** signature." +msgstr "" + +#, fuzzy +msgid "Works for directed and undirected graphs." +msgstr ":doc:`pgr_bridges` - 무방향 그래프의 브릿지." + msgid "Code enhancement" msgstr "" @@ -12526,7 +12541,7 @@ msgid "" "Dominator_(graph_theory)>`__" msgstr "" -msgid "``pgr_lineGraph`` - Experimental" +msgid "pgr_lineGraph - Proposed" msgstr "" msgid "" @@ -12534,18 +12549,35 @@ msgid "" "based graph." msgstr "" -msgid "Given a graph G, its line graph L(G) is a graph such that:" +msgid "" +"Given a graph :math:`G`, its line graph :math:`L(G)` is a graph such that:" +msgstr "" + +msgid "Each vertex of :math:`L(G)` represents an edge of :math:`G`." msgstr "" -msgid "Each vertex of L(G) represents an edge of G" +msgid "" +"Two vertices of :math:`L(G)` are adjacent if and only if their corresponding " +"edges share a common endpoint in :math:`G`" msgstr "" msgid "" -"Two vertices of L(G) are adjacent if and only if their corresponding edges " -"share a common endpoint in G." +"The ``cost`` and ``reverse_cost`` columns of the result represent existence " +"of the edge." +msgstr "" + +msgid "When the graph is directed the result is directed." msgstr "" -msgid "Currently works for undirected graph." +msgid "" +"To get the complete Line Graph use unique identifiers on the double way " +"edges (See `Additional Examples`_)." +msgstr "" + +msgid "When the graph is undirected the result is undirected." +msgstr "" + +msgid "The ``reverse_cost`` is always :math:`-1`." msgstr "" msgid "pgr_lineGraph(`Edges SQL`_, [``directed``])" @@ -12554,7 +12586,7 @@ msgstr "" msgid "Returns set of |result-lineg|" msgstr "" -msgid "For an **undirected** graph" +msgid "For an undirected graph with edges :math:'{2,4,5,8}'" msgstr "" msgid "Gives a local identifier for the edge" @@ -12588,7 +12620,133 @@ msgid "" "it’s not part of the graph." msgstr "" -msgid "https://en.wikipedia.org/wiki/Line_graph" +msgid "Given the following directed graph" +msgstr "" + +msgid "" +":math:`G(V,E) = G(\\{1,2,3,4\\},\\{ 1 \\rightarrow 2, 1 \\rightarrow 4, 2 " +"\\rightarrow 3, 3 \\rightarrow 1, 3 \\rightarrow 2, 3 \\rightarrow 4, 4 " +"\\rightarrow 3\\})`" +msgstr "" + +msgid "Representation as directed with shared edge identifiers" +msgstr "" + +msgid "" +"For the simplicity, the design of the edges table on the database, has the " +"edge's identifiers are represented with 3 digits:" +msgstr "" + +msgid "hundreds" +msgstr "" + +#, fuzzy +msgid "the source vertex" +msgstr "소스 가져오기" + +msgid "tens" +msgstr "" + +msgid "always 0, acts as a separator" +msgstr "" + +msgid "units" +msgstr "" + +msgid "the target vertex" +msgstr "" + +msgid "In this image," +msgstr "" + +msgid "" +"Single or double head arrows represent one edge (row) on the edges table." +msgstr "" + +msgid "The numbers in the yellow shadow are the edge identifiers." +msgstr "" + +msgid "" +"Two pair of edges share the same identifier when the ``reverse_cost`` column " +"is used." +msgstr "" + +msgid "" +"Edges :math:`{2 \\rightarrow 3, 3 \\rightarrow 2}` are represented with one " +"edge row with :math:`id=203`." +msgstr "" + +msgid "" +"Edges :math:`{3 \\rightarrow 4, 4 \\rightarrow 3}` are represented with one " +"edge row with :math:`id=304`." +msgstr "" + +msgid "The graph can be created as follows:" +msgstr "" + +msgid "Line Graph of a directed graph represented with shared edges" +msgstr "" + +msgid "The result is a directed graph." +msgstr "" + +msgid "" +"For :math:`seq=4` from :math:`203 \\leftrightarrow 304` represent two edges" +msgstr "" + +msgid "For all the other values of ``seq`` represent one edge." +msgstr "" + +msgid "" +"The ``cost`` and ``reverse_cost`` values represent the existence of the edge." +msgstr "" + +msgid "When positive: the edge exists." +msgstr "" + +msgid "When negative: the edge does not exist." +msgstr "" + +msgid "Representation as directed with unique edge identifiers" +msgstr "" + +msgid "Single head arrows represent one edge (row) on the edges table." +msgstr "" + +msgid "There are no double head arrows" +msgstr "" + +msgid "" +"Two pair of edges share the same ending nodes and the ``reverse_cost`` " +"column is not used." +msgstr "" + +msgid "" +"Edges :math:`{2 \\rightarrow 3, 3 \\rightarrow 2}` are represented with two " +"edges :math:`id=203` and :math:`id=302` respectively." +msgstr "" + +msgid "" +"Edges :math:`{3 \\rightarrow 4, 4 \\rightarrow 3}` are represented with two " +"edges :math:`id=304` and :math:`id=403` respectively." +msgstr "" + +msgid "Line Graph of a directed graph represented with unique edges" +msgstr "" + +msgid "" +"For :math:`seq=7` from :math:`203 \\leftrightarrow 302` represent two edges." +msgstr "" + +msgid "" +"For :math:`seq=8` from :math:`304 \\leftrightarrow 403` represent two edges." +msgstr "" + +msgid "wikipedia: `Line Graph `__" +msgstr "" + +msgid "" +"mathworld: `Line Graph `__" msgstr "" msgid "``pgr_lineGraphFull`` - Experimental" @@ -12835,6 +12993,9 @@ msgstr "" msgid "Routing from :math:`5` to :math:`1`" msgstr "" +msgid "https://en.wikipedia.org/wiki/Line_graph" +msgstr "" + msgid "https://en.wikipedia.org/wiki/Complete_graph" msgstr "" @@ -15281,6 +15442,10 @@ msgid "" "table information." msgstr "" +msgid "" +":doc:`pgr_lineGraph` - Transformation algorithm for generating a Line Graph." +msgstr "" + msgid ":doc:`pgr_withPointsVia`" msgstr ":doc:`pgr_withPointsVia`" @@ -18083,8 +18248,9 @@ msgstr "" msgid "Additional functions to analyze a graph:" msgstr "" -msgid "Transformation - Family of functions (Experimental)" -msgstr "" +#, fuzzy +msgid "Transformation - Family of functions" +msgstr ":doc:`pgr_withPoints`" msgid "" "This family of functions is used for transforming a given input graph :math:" diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 7224816769..34dde876c2 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-05-07 21:31+0000\n" +"POT-Creation-Date: 2024-05-13 17:23+0000\n" "PO-Revision-Date: 2024-05-01 03:45+0000\n" "Last-Translator: DeepL \n" "Language-Team: Chinese (Simplified) `__ pgr_LineGraph " +"ignores directed flag and use negative values for identifiers." +msgstr "" +"`#2516 `__标准化输出" +"pgr_aStar" + +#, fuzzy +msgid "``pgr_lineGraph``" +msgstr "pgr_lineGraph" + +#, fuzzy +msgid "Promoted to **proposed** signature." +msgstr "晋升为 **拟议** 签名" + +#, fuzzy +msgid "Works for directed and undirected graphs." +msgstr "适用于**有向**和**无向**图。" + msgid "Code enhancement" msgstr "代码改进" @@ -13330,28 +13350,51 @@ msgid "" msgstr "" "`维基百科:支配树`__" -msgid "``pgr_lineGraph`` - Experimental" -msgstr "``pgr_lineGraph`` - 实验" +#, fuzzy +msgid "pgr_lineGraph - Proposed" +msgstr "pgr_trsp - 拟议" msgid "" "``pgr_lineGraph`` — Transforms the given graph into its corresponding edge-" "based graph." msgstr "``pgr_lineGraph`` — 将给定图转换为其相应的基于边的图。" -msgid "Given a graph G, its line graph L(G) is a graph such that:" +#, fuzzy +msgid "" +"Given a graph :math:`G`, its line graph :math:`L(G)` is a graph such that:" msgstr "给定一个图 G，它的线图 L(G) 是这样的图：" -msgid "Each vertex of L(G) represents an edge of G" +#, fuzzy +msgid "Each vertex of :math:`L(G)` represents an edge of :math:`G`." msgstr "L(G)的每个顶点代表G的一条边" +#, fuzzy msgid "" -"Two vertices of L(G) are adjacent if and only if their corresponding edges " -"share a common endpoint in G." +"Two vertices of :math:`L(G)` are adjacent if and only if their corresponding " +"edges share a common endpoint in :math:`G`" msgstr "L(G) 的两个顶点相邻当且仅当它们对应的边共享 G 中的公共端点。" #, fuzzy -msgid "Currently works for undirected graph." -msgstr "适用于无向图。" +msgid "" +"The ``cost`` and ``reverse_cost`` columns of the result represent existence " +"of the edge." +msgstr "使用 ``cost``和 ``reverse_cost``列来表示边的存在。" + +#, fuzzy +msgid "When the graph is directed the result is directed." +msgstr "当图**无向**时，成本矩阵是对称的" + +msgid "" +"To get the complete Line Graph use unique identifiers on the double way " +"edges (See `Additional Examples`_)." +msgstr "" + +#, fuzzy +msgid "When the graph is undirected the result is undirected." +msgstr "当图**无向**时，成本矩阵是对称的" + +msgid "The ``reverse_cost`` is always :math:`-1`." +msgstr "" msgid "pgr_lineGraph(`Edges SQL`_, [``directed``])" msgstr "pgr_lineGraph(`Edges SQL`_, [``directed``])" @@ -13360,8 +13403,8 @@ msgid "Returns set of |result-lineg|" msgstr "Returns set of |result-lineg|" #, fuzzy -msgid "For an **undirected** graph" -msgstr "对于**有向**图" +msgid "For an undirected graph with edges :math:'{2,4,5,8}'" +msgstr "对于有边 :math:`\\{1, 2, 3, 4\\}`的有向子图。" msgid "Gives a local identifier for the edge" msgstr "给出边的本地标识符" @@ -13394,8 +13437,152 @@ msgid "" "it’s not part of the graph." msgstr "当为负时：边(``target``, ``source``)不存在，因此它不是图的一部分。" -msgid "https://en.wikipedia.org/wiki/Line_graph" -msgstr "https://en.wikipedia.org/wiki/Line_graph" +#, fuzzy +msgid "Given the following directed graph" +msgstr "给出以下查询：" + +msgid "" +":math:`G(V,E) = G(\\{1,2,3,4\\},\\{ 1 \\rightarrow 2, 1 \\rightarrow 4, 2 " +"\\rightarrow 3, 3 \\rightarrow 1, 3 \\rightarrow 2, 3 \\rightarrow 4, 4 " +"\\rightarrow 3\\})`" +msgstr "" + +msgid "Representation as directed with shared edge identifiers" +msgstr "" + +msgid "" +"For the simplicity, the design of the edges table on the database, has the " +"edge's identifiers are represented with 3 digits:" +msgstr "" + +msgid "hundreds" +msgstr "" + +#, fuzzy +msgid "the source vertex" +msgstr "获取最近的顶点" + +msgid "tens" +msgstr "" + +msgid "always 0, acts as a separator" +msgstr "" + +#, fuzzy +msgid "units" +msgstr "单位" + +#, fuzzy +msgid "the target vertex" +msgstr "获取最近的顶点" + +msgid "In this image," +msgstr "" + +msgid "" +"Single or double head arrows represent one edge (row) on the edges table." +msgstr "" + +#, fuzzy +msgid "The numbers in the yellow shadow are the edge identifiers." +msgstr "返回的行按边标识符升序排列。" + +msgid "" +"Two pair of edges share the same identifier when the ``reverse_cost`` column " +"is used." +msgstr "" + +#, fuzzy +msgid "" +"Edges :math:`{2 \\rightarrow 3, 3 \\rightarrow 2}` are represented with one " +"edge row with :math:`id=203`." +msgstr "从图中删除边 :math:`v \\rightarrow w` 和 :math:`w \\rightarrow z`。" + +#, fuzzy +msgid "" +"Edges :math:`{3 \\rightarrow 4, 4 \\rightarrow 3}` are represented with one " +"edge row with :math:`id=304`." +msgstr "从图中删除边 :math:`v \\rightarrow w` 和 :math:`w \\rightarrow z`。" + +#, fuzzy +msgid "The graph can be created as follows:" +msgstr "图定义如下：" + +#, fuzzy +msgid "Line Graph of a directed graph represented with shared edges" +msgstr "就有向图而言，就像有四个边：" + +#, fuzzy +msgid "The result is a directed graph." +msgstr "有向图。" + +#, fuzzy +msgid "" +"For :math:`seq=4` from :math:`203 \\leftrightarrow 304` represent two edges" +msgstr "边 :math:`2` (:math:`1 \\rightarrow 3`) 不是图的一部分。" + +msgid "For all the other values of ``seq`` represent one edge." +msgstr "" + +#, fuzzy +msgid "" +"The ``cost`` and ``reverse_cost`` values represent the existence of the edge." +msgstr "使用 ``cost``和 ``reverse_cost``列来表示边的存在。" + +#, fuzzy +msgid "When positive: the edge exists." +msgstr "当正数时是顶点的标识符。" + +#, fuzzy +msgid "When negative: the edge does not exist." +msgstr "为负数时抛出错误。" + +msgid "Representation as directed with unique edge identifiers" +msgstr "" + +#, fuzzy +msgid "Single head arrows represent one edge (row) on the edges table." +msgstr "红色箭头对应边表中``cost`` > 0的情况。" + +msgid "There are no double head arrows" +msgstr "" + +msgid "" +"Two pair of edges share the same ending nodes and the ``reverse_cost`` " +"column is not used." +msgstr "" + +msgid "" +"Edges :math:`{2 \\rightarrow 3, 3 \\rightarrow 2}` are represented with two " +"edges :math:`id=203` and :math:`id=302` respectively." +msgstr "" + +msgid "" +"Edges :math:`{3 \\rightarrow 4, 4 \\rightarrow 3}` are represented with two " +"edges :math:`id=304` and :math:`id=403` respectively." +msgstr "" + +#, fuzzy +msgid "Line Graph of a directed graph represented with unique edges" +msgstr "就有向图而言，就像有四个边：" + +#, fuzzy +msgid "" +"For :math:`seq=7` from :math:`203 \\leftrightarrow 302` represent two edges." +msgstr "边 :math:`2` (:math:`1 \\rightarrow 3`) 不是图的一部分。" + +#, fuzzy +msgid "" +"For :math:`seq=8` from :math:`304 \\leftrightarrow 403` represent two edges." +msgstr "边 :math:`2` (:math:`1 \\rightarrow 3`) 不是图的一部分。" + +#, fuzzy +msgid "wikipedia: `Line Graph `__" +msgstr "`维基百科：二分图 `__" + +msgid "" +"mathworld: `Line Graph `__" +msgstr "" msgid "``pgr_lineGraphFull`` - Experimental" msgstr "``pgr_lineGraphFull`` - 实验" @@ -13657,6 +13844,9 @@ msgstr "当使用这种方法进行具有软限制的路由时，将会出现 ut msgid "Routing from :math:`5` to :math:`1`" msgstr "路由从 :math:`5` 到:math:`1`" +msgid "https://en.wikipedia.org/wiki/Line_graph" +msgstr "https://en.wikipedia.org/wiki/Line_graph" + msgid "https://en.wikipedia.org/wiki/Complete_graph" msgstr "https://en.wikipedia.org/wiki/Complete_graph" @@ -16351,6 +16541,10 @@ msgid "" "table information." msgstr ":doc:`pgr_extractVertices` - 根据边表信息提取顶点信息。" +msgid "" +":doc:`pgr_lineGraph` - Transformation algorithm for generating a Line Graph." +msgstr ":doc:`pgr_lineGraph` - 用于生成折线图的转换算法。" + msgid ":doc:`pgr_withPointsVia`" msgstr ":doc:`pgr_withPointsVia`" @@ -19480,8 +19674,9 @@ msgstr "创建图表的附加函数：" msgid "Additional functions to analyze a graph:" msgstr "用于分析图表的附加函数：" -msgid "Transformation - Family of functions (Experimental)" -msgstr "Transformation - 函数族（实验）" +#, fuzzy +msgid "Transformation - Family of functions" +msgstr "收缩 - 函数族" msgid "" "This family of functions is used for transforming a given input graph :math:" @@ -19890,6 +20085,20 @@ msgstr "pgr_withPointsDD 是**带有点**的 pgr_drivenDistance" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "pgr_withPointsvia 是**带有点**的 pgr_dijkstraVia" +#~ msgid "``pgr_lineGraph`` - Experimental" +#~ msgstr "``pgr_lineGraph`` - 实验" + +#, fuzzy +#~ msgid "Currently works for undirected graph." +#~ msgstr "适用于无向图。" + +#, fuzzy +#~ msgid "For an **undirected** graph" +#~ msgstr "对于**有向**图" + +#~ msgid "Transformation - Family of functions (Experimental)" +#~ msgstr "Transformation - 函数族（实验）" + #~ msgid "Current release" #~ msgstr "当前版本" From c92f85e8839ca59d2eaba0b077925f11eb1cbbae Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Tue, 28 May 2024 14:55:16 +0000 Subject: [PATCH 245/428] Translated using Weblate (Spanish) Currently translated at 92.4% (4879 of 5275 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 22a2eb233e..91bae4c00c 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-05-13 17:23+0000\n" -"PO-Revision-Date: 2024-04-29 03:40+0000\n" +"PO-Revision-Date: 2024-05-28 14:59+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" @@ -13707,17 +13707,17 @@ 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 entre <0,1> indica la posición relativa desde el primer punto de la " +"arista." msgid "Value in ``[r, l]`` indicating if the point is:" msgstr "Valor en ``[r, l]`` que indica si el punto es:" msgid "In the right ``r``." -msgstr "A la derecha ``r``," +msgstr "A la derecha ``r``." msgid "In the left ``l``." -msgstr "A la izquierda `l`," +msgstr "A la izquierda ``l``." msgid "When the point is on the line it is considered to be on the right." msgstr "Cuando el punto está en la línea se considera que está a la derecha." @@ -13733,7 +13733,7 @@ msgid "``NULL`` when ``cap = 1`` on the `One point`_ signature" msgstr "``NULL`` cuando ``cap = 1`` en la firma de `Un punto`_" msgid "``POINT`` geometry" -msgstr "geometría ``POINT" +msgstr "geometría ``POINT``" msgid "" "`One Point`_: Contains the point on the edge that is ``fraction`` away from " @@ -14673,9 +14673,8 @@ msgstr "" "Cuando `negative`: la arista (``target``, ``source``) no existe, por lo " "tanto no es parte del grafo." -#, fuzzy msgid "Given the following directed graph" -msgstr "Dada la siguiente consulta:" +msgstr "Dado el siguente grafo dirigido" msgid "" ":math:`G(V,E) = G(\\{1,2,3,4\\},\\{ 1 \\rightarrow 2, 1 \\rightarrow 4, 2 " From b3f47ae0673d3207ea255fbf2c559c3cfc5e40d1 Mon Sep 17 00:00:00 2001 From: DeepL Date: Tue, 28 May 2024 14:59:01 +0000 Subject: [PATCH 246/428] Translated using Weblate (Spanish) Currently translated at 92.4% (4879 of 5275 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 91bae4c00c..026ed2c7cc 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-05-13 17:23+0000\n" "PO-Revision-Date: 2024-05-28 14:59+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"Last-Translator: DeepL \n" "Language-Team: Spanish \n" "Language: es\n" @@ -14749,9 +14749,9 @@ msgstr "" msgid "The graph can be created as follows:" msgstr "Los gráficos se definen como sigue:" -#, fuzzy msgid "Line Graph of a directed graph represented with shared edges" -msgstr "En términos de un grafo dirigido es como tener cuatro aristas:" +msgstr "" +"Gráfico lineal de un grafo dirigido representado con aristas compartidas" #, fuzzy msgid "The result is a directed graph." From d56448b73232a6691035cc69b4c30b939e3a063e Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Tue, 28 May 2024 15:00:02 +0000 Subject: [PATCH 247/428] Translated using Weblate (Spanish) Currently translated at 92.8% (4900 of 5275 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 113 ++++++++---------- 1 file changed, 51 insertions(+), 62 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 026ed2c7cc..cb67394c20 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-05-13 17:23+0000\n" -"PO-Revision-Date: 2024-05-28 14:59+0000\n" -"Last-Translator: DeepL \n" +"PO-Revision-Date: 2024-05-28 15:22+0000\n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" "Language: es\n" @@ -1610,7 +1610,6 @@ msgstr "9" msgid "16.5" msgstr "16.5" -#, fuzzy msgid ":math:`10.5 / 60 = 0.175`" msgstr ":math:`10.5 / 60 = 0.175`" @@ -4037,7 +4036,7 @@ msgid "Combinations SQL" msgstr "SQL Combinaciones" msgid "Identifier of the departure vertex." -msgstr "Identificador del vértice de salida." +msgstr "Identificador del vértice de partida." msgid "Identifier of the arrival vertex." msgstr "Identificador del vértice de llegada." @@ -4085,7 +4084,6 @@ msgstr ":math:`V = source \\cup target \\cup {start_{vid}} \\cup {end_{vid}}`" msgid "the set of edges :math:`E`" msgstr "El conjunto de aristas :math:`E`" -#, fuzzy msgid "" ":math:`E = \\begin{cases} \\text{ } \\{(source_i, target_i, cost_i) " "\\text{ when } cost >=0 \\} & \\quad \\text{if } reverse\\_cost = " @@ -4095,13 +4093,13 @@ msgid "" "\\text{ when } reverse\\_cost_i>=0 \\} & \\quad \\text{if } reverse\\_cost " "\\neq \\varnothing \\\\ \\end{cases}`" msgstr "" -":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}`" +":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 \\n" +"eq \\varnothing \\\\ \\end{cases}`" msgid "Undirected graph" msgstr "Grafo no dirigido" @@ -4112,7 +4110,6 @@ msgstr "El grafo ponderado no dirigido :math:`G_u(V,E)`, es definido por:" msgid ":math:`V = source \\cup target \\cup {start_v{vid}} \\cup {end_{vid}}`" msgstr ":math:`V = source \\cup target \\cup {start_v{vid}} \\cup {end_{vid}}`" -#, fuzzy msgid "" ":math:`E = \\begin{cases} \\text{ } \\{(source_i, target_i, cost_i) " "\\text{ when } cost >=0 \\} & \\quad \\text{ } \\\\ \\cup \\{(target_i, " @@ -4125,16 +4122,17 @@ msgid "" "target_i, reverse\\_cost_i) \\text{ when } reverse\\_cost_i >=0)\\} & \\quad " "\\text{ if } reverse\\_cost \\neq \\varnothing \\\\ \\end{cases}`" msgstr "" -":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 \\n" +"eq \\varnothing \\\\ \\end{cases}`" msgid "The problem" msgstr "El problema" @@ -4979,21 +4977,18 @@ msgstr "Agregado columna de resultados ``pred``." msgid "Experimental promoted to proposed." msgstr "Experimental promovido a Propuesto" -#, fuzzy msgid "" "`#2635 `__ pgr_LineGraph " "ignores directed flag and use negative values for identifiers." msgstr "" -"`#2605 `__ Estandarización " -"de las salida de las funciones de árbol de expansión" +"`#2635 `__ pgr_LineGraph " +"ignora la bandera directed y usa valores negatives para identificadores." -#, fuzzy msgid "``pgr_lineGraph``" -msgstr "pgr_lineGraph" +msgstr "``pgr_lineGraph``" -#, fuzzy msgid "Promoted to **proposed** signature." -msgstr "Promovido a firma **propuesta**" +msgstr "Promovido a firma **propuesta**." #, fuzzy msgid "Works for directed and undirected graphs." @@ -8021,7 +8016,7 @@ msgid "" "Compiling with Boost 1.75 requires C++ Compiler with C++14 standard support" msgstr "" "La compilación con Boost 1.75 requiere un compilador de C++ compatible con " -"el estándar C++14." +"el estándar C++14" msgid "Postgresql version = Supported versions by PostgreSQL" msgstr "Versión postgresql = Versiones compatibles por PostgreSQL" @@ -9105,7 +9100,7 @@ msgid "``pgr_aStar`` — Shortest path using the A* algorithm." msgstr "``pgr_aStar`` — La ruta más corta utilizando el algoritmo A*." msgid "Standarizing output columns to |short-generic-result|" -msgstr "Estandarización de las columnas de salida a |short-generic-result|." +msgstr "Estandarización de las columnas de salida a |short-generic-result|" msgid "" "``pgr_aStar`` (`One to One`_) added ``start_vid`` and ``end_vid`` columns." @@ -11493,8 +11488,8 @@ msgid "" "An alternate method to create a routing topology use :doc:" "`pgr_extractVertices`" msgstr "" -"Un método alternativo para crear una topología de ruteo es utilizar :doc:" -"`pgr_extractVertices`." +"Un método alternativo para crear una topología de ruteo es utilizar " +":doc:`pgr_extractVertices`" msgid "Make sure the database does not have the ``vertices_table``" msgstr "Asegurarse de que la base de datos no tiene ``vertices_table``" @@ -11930,7 +11925,7 @@ msgstr "" "número de aristas incidentes en el vértice." msgid "Calculates the degree of the vertices of an **undirected** graph" -msgstr "Calcula el grado de los vértices de un grafo **no dirigido**." +msgstr "Calcula el grado de los vértices de un grafo **no dirigido**" msgid "pgr_degree(`Edges SQL`_ , `Vertex SQL`_, [``dryrun``])" msgstr "pgr_degree(`SQL de aristas`_ , `SQL de vértices`_, [``dryrun``])" @@ -11953,7 +11948,7 @@ msgstr "" "esa tabla de vértices para las llamadas pgr_degree." msgid "`Vertex SQL`_" -msgstr "`Vertex SQL`_" +msgstr "`SQL de vértices`_" msgid "`Vertex SQL`_ as described below" msgstr "`Vertex SQL`_ como se describe abajo" @@ -12004,7 +11999,7 @@ msgid "``degree``" msgstr "``degree``" msgid "Number of edges that are incident to the vertex ``id``" -msgstr "Número de aristas incidentes al vértice ``id``." +msgstr "Número de aristas incidentes al vértice ``id``" msgid "Degree of a sub graph" msgstr "Grado de un subgrafo" @@ -12982,10 +12977,10 @@ msgid "Status of \"passes in front\" or \"visits\" of the nodes." msgstr "Estado de \"pasa enfrente\" o \"visita\" los nodos." msgid ":doc:`via-category`." -msgstr ":doc:`via-category`" +msgstr ":doc:`via-category`." msgid ":doc:`dijkstra-family`." -msgstr ":doc:`dijkstra-family`" +msgstr ":doc:`dijkstra-family`." msgid "``pgr_drivingDistance``" msgstr "``pgr_drivingDistance``" @@ -13722,9 +13717,8 @@ msgstr "A la izquierda ``l``." msgid "When the point is on the line it is considered to be on the right." msgstr "Cuando el punto está en la línea se considera que está a la derecha." -#, fuzzy msgid "``distance``" -msgstr "``distance``" +msgstr "``distancia``" msgid "Distance from point to edge." msgstr "Distancia del punto a la arista." @@ -13750,7 +13744,7 @@ msgid "" "the edge with identifier ``edge_id``" msgstr "" "Geometría ``LINESTRING`` desde el **punto original** hasta el punto más " -"cercano de la arista con identificador ``edge_id``." +"cercano de la arista con identificador ``edge_id``" msgid "One point results" msgstr "Resultados de un punto" @@ -13768,13 +13762,13 @@ msgid "" "``geom``" msgstr "" "La geometría ``edge`` es una línea que conecta el **punto original** con " -"``geom``." +"``geom``" msgid "Many point results" msgstr "Resultados de muchos puntos" msgid "The green nodes are the **original points**" -msgstr "Los nodos verdes son los **puntos originales**." +msgstr "Los nodos verdes son los **puntos originales**" msgid "" "The geometry ``geom``, marked as **g1** and **g2** are the **original " @@ -13811,7 +13805,7 @@ msgid "``NULL`` on ``geom``, ``edge``" msgstr "``NULL`` en ``geom``, ``edge``" msgid "``edge_id`` identifier of the edge close to the **original point**" -msgstr "``edge_id`` identificador de la arista cercana al **punto original**." +msgstr "``edge_id`` identificador de la arista cercana al **punto original**" msgid "" "Two edges are withing :math:`0.5` distance units from the **original " @@ -13880,7 +13874,7 @@ msgstr "Calcular todas las columnas" msgid "" "``edge_id`` identifier of the edge **closest** to the **original point**" msgstr "" -"``edge_id`` identificador de la arista **más cercana** al **punto original**." +"``edge_id`` identificador de la arista **más cercana** al **punto original**" msgid "" "From all edges within :math:`0.5` distance units from the **original " @@ -14590,17 +14584,15 @@ msgid "" "Given a graph :math:`G`, its line graph :math:`L(G)` is a graph such that:" msgstr "Dado un grafo G, su grafo de líneas L(G) es un grafo de tal forma que:" -#, fuzzy msgid "Each vertex of :math:`L(G)` represents an edge of :math:`G`." -msgstr "Cada vértice de L(G) representa una arista de G" +msgstr "Cada vértice de :math:`L(G)` representa una arista de :math:`G`." -#, fuzzy msgid "" "Two vertices of :math:`L(G)` are adjacent if and only if their corresponding " "edges share a common endpoint in :math:`G`" msgstr "" -"Dos vértices de L(G) son adyacentes si y sólo si sus aristas " -"correspondientes comparten un punto final común en G." +"Dos vértices de :math:`L(G)` son adyacentes si y sólo si sus aristas " +"correspondientes comparten un punto final común en :math:`G`" #, fuzzy msgid "" @@ -14610,18 +14602,16 @@ msgstr "" "Usa las columnas ``cost`` y ``reverse_cost`` para representar la existenica " "de una arista." -#, fuzzy msgid "When the graph is directed the result is directed." -msgstr "Cuando el grafo es **no dirigido**, la matriz de costes es simétrica" +msgstr "Cuando el grafo es dirigido el resultado es dirigido." msgid "" "To get the complete Line Graph use unique identifiers on the double way " "edges (See `Additional Examples`_)." msgstr "" -#, fuzzy msgid "When the graph is undirected the result is undirected." -msgstr "Cuando el grafo es **no dirigido**, la matriz de costes es simétrica" +msgstr "Cuando el grafo es no dirigido el resultado es no dirigido." msgid "The ``reverse_cost`` is always :math:`-1`." msgstr "" @@ -14632,9 +14622,8 @@ msgstr "pgr_lineGraph(`SQL de aristas`_, [``directed``])" msgid "Returns set of |result-lineg|" msgstr "Regresa el conjunto de |result-lineg|" -#, fuzzy msgid "For an undirected graph with edges :math:'{2,4,5,8}'" -msgstr "Para sub-grafo con aristas :math:`\\{1, 2, 3, 4\\}`." +msgstr "Para un grafo no dirigido con aristas :math:'{2,4,5,8}'" msgid "Gives a local identifier for the edge" msgstr "Da un identificador local de la arista" @@ -14750,17 +14739,17 @@ msgid "The graph can be created as follows:" msgstr "Los gráficos se definen como sigue:" msgid "Line Graph of a directed graph represented with shared edges" -msgstr "" -"Gráfico lineal de un grafo dirigido representado con aristas compartidas" +msgstr "Grafo lineal de un grafo dirigido representado con aristas compartidas" #, fuzzy msgid "The result is a directed graph." msgstr "Para un grafo dirigido." -#, fuzzy msgid "" "For :math:`seq=4` from :math:`203 \\leftrightarrow 304` represent two edges" -msgstr "La arista :math:`2` (:math:`1 \\rightarrow 3`) no es parte del grafo." +msgstr "" +"Para :math:`seq=4` desde :math:`203 \\leftrightarrow 304` representa dos " +"arsitas" msgid "For all the other values of ``seq`` represent one edge." msgstr "" @@ -18281,7 +18270,7 @@ msgid "using bootstrap_version 2 because 3+ does not do dropdowns" msgstr "" msgid "Issue fixes" -msgstr "Corrección de problemas" +msgstr "Corrección de problema" msgid "" "`#2565 `__ " From 4181f3b1e01e2179cbfd355757d14d13fb105a41 Mon Sep 17 00:00:00 2001 From: DeepL Date: Tue, 28 May 2024 15:00:14 +0000 Subject: [PATCH 248/428] Translated using Weblate (Spanish) Currently translated at 92.8% (4900 of 5275 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index cb67394c20..7c14505cd1 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-05-13 17:23+0000\n" "PO-Revision-Date: 2024-05-28 15:22+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"Last-Translator: DeepL \n" "Language-Team: Spanish \n" "Language: es\n" @@ -4973,9 +4973,8 @@ msgstr "Estandarización de columnas de resultados a |result-spantree|" msgid "Added ``pred`` result columns." msgstr "Agregado columna de resultados ``pred``." -#, fuzzy msgid "Experimental promoted to proposed." -msgstr "Experimental promovido a Propuesto" +msgstr "Experimental promovido a propuesto." msgid "" "`#2635 `__ pgr_LineGraph " @@ -4990,30 +4989,26 @@ msgstr "``pgr_lineGraph``" msgid "Promoted to **proposed** signature." msgstr "Promovido a firma **propuesta**." -#, fuzzy msgid "Works for directed and undirected graphs." -msgstr "Funciona para grafos **dirigidos** y **no dirigidos**." +msgstr "Funciona para grafos dirigidos y no dirigidos." msgid "Code enhancement" msgstr "Mejora del código" -#, fuzzy msgid "" "`#2599 `__ Driving " "distance cleanup" msgstr "" -"`#2599 `__ Limpiando " -"Driving Distance" +"`#2599 `__ Limpieza de la " +"distancia de conducción" -#, fuzzy msgid "" "`#2607 `__ Read postgresql " "data on C++" msgstr "" -"`#2607 `__ Leer datos de " +"`#2607 `__ Leer datos " "postgresql en C++" -#, fuzzy msgid "" "`#2614 `__ Clang tidy does " "not work" @@ -14568,9 +14563,8 @@ msgstr "" "'Wikipedia: árbol de dominador' `__" -#, fuzzy msgid "pgr_lineGraph - Proposed" -msgstr "pgr_lineGraph" +msgstr "pgr_lineGraph - Propuesto" msgid "" "``pgr_lineGraph`` — Transforms the given graph into its corresponding edge-" @@ -14579,10 +14573,11 @@ msgstr "" "``pgr_lineGraph`` — Transforma un grafo dado en su grafo correspondiente " "basado en aristas." -#, fuzzy msgid "" "Given a graph :math:`G`, its line graph :math:`L(G)` is a graph such that:" -msgstr "Dado un grafo G, su grafo de líneas L(G) es un grafo de tal forma que:" +msgstr "" +"Dado un gráfico :math:`G`, su gráfico lineal :math:`L(G)` es un gráfico tal " +"que:" msgid "Each vertex of :math:`L(G)` represents an edge of :math:`G`." msgstr "Cada vértice de :math:`L(G)` representa una arista de :math:`G`." @@ -14795,9 +14790,8 @@ msgid "" "edges :math:`id=304` and :math:`id=403` respectively." msgstr "" -#, fuzzy msgid "Line Graph of a directed graph represented with unique edges" -msgstr "En términos de un grafo dirigido es como tener cuatro aristas:" +msgstr "Gráfico lineal de un grafo dirigido representado con aristas únicas" #, fuzzy msgid "" From e616d48428af64735b50f3a5172ec26a3ad6398a Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Tue, 28 May 2024 15:22:56 +0000 Subject: [PATCH 249/428] Translated using Weblate (Spanish) Currently translated at 92.9% (4901 of 5275 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 7c14505cd1..c99fc51060 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-05-13 17:23+0000\n" -"PO-Revision-Date: 2024-05-28 15:22+0000\n" -"Last-Translator: DeepL \n" +"PO-Revision-Date: 2024-05-28 15:23+0000\n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" "Language: es\n" @@ -14576,8 +14576,7 @@ msgstr "" msgid "" "Given a graph :math:`G`, its line graph :math:`L(G)` is a graph such that:" msgstr "" -"Dado un gráfico :math:`G`, su gráfico lineal :math:`L(G)` es un gráfico tal " -"que:" +"Dado un grafo :math:`G`, su grafo lineal :math:`L(G)` es un grafo tal que:" msgid "Each vertex of :math:`L(G)` represents an edge of :math:`G`." msgstr "Cada vértice de :math:`L(G)` representa una arista de :math:`G`." From f56e0e079712e54e42fa8a1f7a45afe82b2b6516 Mon Sep 17 00:00:00 2001 From: DeepL Date: Tue, 28 May 2024 15:22:39 +0000 Subject: [PATCH 250/428] Translated using Weblate (Spanish) Currently translated at 92.9% (4901 of 5275 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index c99fc51060..36ed66a307 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-05-13 17:23+0000\n" "PO-Revision-Date: 2024-05-28 15:23+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"Last-Translator: DeepL \n" "Language-Team: Spanish \n" "Language: es\n" @@ -14588,13 +14588,12 @@ msgstr "" "Dos vértices de :math:`L(G)` son adyacentes si y sólo si sus aristas " "correspondientes comparten un punto final común en :math:`G`" -#, fuzzy msgid "" "The ``cost`` and ``reverse_cost`` columns of the result represent existence " "of the edge." msgstr "" -"Usa las columnas ``cost`` y ``reverse_cost`` para representar la existenica " -"de una arista." +"Las columnas ``coste`` y ``coste_inverso`` del resultado representan la " +"existencia de la arista." msgid "When the graph is directed the result is directed." msgstr "Cuando el grafo es dirigido el resultado es dirigido." From 76d660638ab32171b051a3af33cbd872b761cfec Mon Sep 17 00:00:00 2001 From: DeepL Date: Tue, 28 May 2024 15:24:01 +0000 Subject: [PATCH 251/428] Translated using Weblate (Spanish) Currently translated at 92.9% (4905 of 5275 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 36ed66a307..e59346a503 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-05-13 17:23+0000\n" -"PO-Revision-Date: 2024-05-28 15:23+0000\n" +"PO-Revision-Date: 2024-05-28 15:24+0000\n" "Last-Translator: DeepL \n" "Language-Team: Spanish \n" @@ -14675,9 +14675,8 @@ msgstr "" msgid "hundreds" msgstr "" -#, fuzzy msgid "the source vertex" -msgstr "Obtener el vértice más cercano" +msgstr "el vértice de origen" msgid "tens" msgstr "" @@ -14685,13 +14684,11 @@ msgstr "" msgid "always 0, acts as a separator" msgstr "" -#, fuzzy msgid "units" -msgstr "Unidades" +msgstr "unidades" -#, fuzzy msgid "the target vertex" -msgstr "Obtener el vértice más cercano" +msgstr "el vértice de destino" msgid "In this image," msgstr "" @@ -14700,11 +14697,9 @@ msgid "" "Single or double head arrows represent one edge (row) on the edges table." msgstr "" -#, fuzzy msgid "The numbers in the yellow shadow are the edge identifiers." msgstr "" -"Las filas de resultados son ordenados ascendentemente respecto al " -"identificador de la arista." +"Los números en la sombra amarilla son los identificadores de los bordes." msgid "" "Two pair of edges share the same identifier when the ``reverse_cost`` column " From c5a773bc04dd432e2ff7da2de68ed64e012f278e Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Tue, 28 May 2024 15:23:43 +0000 Subject: [PATCH 252/428] Translated using Weblate (Spanish) Currently translated at 92.9% (4905 of 5275 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index e59346a503..f429f44e35 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-05-13 17:23+0000\n" "PO-Revision-Date: 2024-05-28 15:24+0000\n" -"Last-Translator: DeepL \n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" "Language: es\n" @@ -14592,7 +14592,7 @@ msgid "" "The ``cost`` and ``reverse_cost`` columns of the result represent existence " "of the edge." msgstr "" -"Las columnas ``coste`` y ``coste_inverso`` del resultado representan la " +"Las columnas ``cost`` y ``reverse_cost`` del resultado representan la " "existencia de la arista." msgid "When the graph is directed the result is directed." From 54410c87a2b7b63e5585ffa5bfed728977b69eae Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Tue, 28 May 2024 15:25:33 +0000 Subject: [PATCH 253/428] Translated using Weblate (Spanish) Currently translated at 93.0% (4908 of 5275 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index f429f44e35..7752e2d4d0 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-05-13 17:23+0000\n" -"PO-Revision-Date: 2024-05-28 15:24+0000\n" +"PO-Revision-Date: 2024-05-28 15:26+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" @@ -14699,7 +14699,7 @@ msgstr "" msgid "The numbers in the yellow shadow are the edge identifiers." msgstr "" -"Los números en la sombra amarilla son los identificadores de los bordes." +"Los números en la sombra amarilla son los identificadores de las aristas." msgid "" "Two pair of edges share the same identifier when the ``reverse_cost`` column " From 05e69e17def680b8b06286ce1085a082f284bbd6 Mon Sep 17 00:00:00 2001 From: DeepL Date: Tue, 28 May 2024 15:25:48 +0000 Subject: [PATCH 254/428] Translated using Weblate (Spanish) Currently translated at 93.0% (4908 of 5275 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 7752e2d4d0..382d1a6e63 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-05-13 17:23+0000\n" "PO-Revision-Date: 2024-05-28 15:26+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"Last-Translator: DeepL \n" "Language-Team: Spanish \n" "Language: es\n" @@ -14706,25 +14706,22 @@ msgid "" "is used." msgstr "" -#, fuzzy msgid "" "Edges :math:`{2 \\rightarrow 3, 3 \\rightarrow 2}` are represented with one " "edge row with :math:`id=203`." msgstr "" -"Los aristas :math:`v \\rightarrow w` y :math:`w \\rightarrow z` fueron " -"eliminados del grafo." +"Las aristas :math:`{2 \\rightarrow 3, 3 \\rightarrow 2}` se representan con " +"una fila de aristas con :math:`id=203`." -#, fuzzy msgid "" "Edges :math:`{3 \\rightarrow 4, 4 \\rightarrow 3}` are represented with one " "edge row with :math:`id=304`." msgstr "" -"Los aristas :math:`v \\rightarrow w` y :math:`w \\rightarrow z` fueron " -"eliminados del grafo." +"Las aristas :math:`{3 \\rightarrow 4, 4 \\rightarrow 3}` se representan con " +"una fila de aristas con :math:`id=304`." -#, fuzzy msgid "The graph can be created as follows:" -msgstr "Los gráficos se definen como sigue:" +msgstr "El gráfico puede crearse del siguiente modo:" msgid "Line Graph of a directed graph represented with shared edges" msgstr "Grafo lineal de un grafo dirigido representado con aristas compartidas" From e61262e0c6e1b2dfa31d2845d25f0f597d5b7fab Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Tue, 28 May 2024 15:27:18 +0000 Subject: [PATCH 255/428] Translated using Weblate (Spanish) Currently translated at 93.1% (4914 of 5275 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 382d1a6e63..35c7fb6d0f 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-05-13 17:23+0000\n" -"PO-Revision-Date: 2024-05-28 15:26+0000\n" -"Last-Translator: DeepL \n" +"PO-Revision-Date: 2024-05-28 15:28+0000\n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" "Language: es\n" @@ -14721,7 +14721,7 @@ msgstr "" "una fila de aristas con :math:`id=304`." msgid "The graph can be created as follows:" -msgstr "El gráfico puede crearse del siguiente modo:" +msgstr "El grafo puede crearse del siguiente modo:" msgid "Line Graph of a directed graph represented with shared edges" msgstr "Grafo lineal de un grafo dirigido representado con aristas compartidas" From 439811634587fa18e60afadb68ab170d67aadcd9 Mon Sep 17 00:00:00 2001 From: DeepL Date: Tue, 28 May 2024 15:27:27 +0000 Subject: [PATCH 256/428] Translated using Weblate (Spanish) Currently translated at 93.1% (4914 of 5275 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 35c7fb6d0f..6895001c5e 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-05-13 17:23+0000\n" "PO-Revision-Date: 2024-05-28 15:28+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"Last-Translator: DeepL \n" "Language-Team: Spanish \n" "Language: es\n" @@ -14726,9 +14726,8 @@ msgstr "El grafo puede crearse del siguiente modo:" msgid "Line Graph of a directed graph represented with shared edges" msgstr "Grafo lineal de un grafo dirigido representado con aristas compartidas" -#, fuzzy msgid "The result is a directed graph." -msgstr "Para un grafo dirigido." +msgstr "El resultado es un grafo dirigido." msgid "" "For :math:`seq=4` from :math:`203 \\leftrightarrow 304` represent two edges" @@ -14739,28 +14738,25 @@ msgstr "" msgid "For all the other values of ``seq`` represent one edge." msgstr "" -#, fuzzy msgid "" "The ``cost`` and ``reverse_cost`` values represent the existence of the edge." msgstr "" -"Usa las columnas ``cost`` y ``reverse_cost`` para representar la existenica " -"de una arista." +"Los valores ``cost`` y ``reverse_cost`` representan la existencia de la " +"arista." -#, fuzzy msgid "When positive: the edge exists." -msgstr "Cuando es positivo, es el identificador de un vértice." +msgstr "Cuando es positivo: la arista existe." -#, fuzzy msgid "When negative: the edge does not exist." -msgstr "Cuando negativo arroja error." +msgstr "Cuando es negativo: la arista no existe." msgid "Representation as directed with unique edge identifiers" msgstr "" -#, fuzzy msgid "Single head arrows represent one edge (row) on the edges table." msgstr "" -"Las flechas rojas corresponden cuando ``cost`` > 0 en la tabla de aristas." +"Las flechas de una cabeza representan una arista (fila) en la tabla de " +"aristas." msgid "There are no double head arrows" msgstr "" @@ -14783,10 +14779,11 @@ msgstr "" msgid "Line Graph of a directed graph represented with unique edges" msgstr "Gráfico lineal de un grafo dirigido representado con aristas únicas" -#, fuzzy msgid "" "For :math:`seq=7` from :math:`203 \\leftrightarrow 302` represent two edges." -msgstr "La arista :math:`2` (:math:`1 \\rightarrow 3`) no es parte del grafo." +msgstr "" +"Para :math:`seq=7` de :math:`203 \\leftrightarrow 302` representan dos " +"aristas." #, fuzzy msgid "" From 534042e9b6d30eb609c083cc56008515007c593d Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Tue, 28 May 2024 15:29:15 +0000 Subject: [PATCH 257/428] Translated using Weblate (Spanish) Currently translated at 93.1% (4915 of 5275 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 6895001c5e..31c05481fc 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-05-13 17:23+0000\n" -"PO-Revision-Date: 2024-05-28 15:28+0000\n" -"Last-Translator: DeepL \n" +"PO-Revision-Date: 2024-05-28 15:29+0000\n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" "Language: es\n" @@ -14782,7 +14782,7 @@ msgstr "Gráfico lineal de un grafo dirigido representado con aristas únicas" msgid "" "For :math:`seq=7` from :math:`203 \\leftrightarrow 302` represent two edges." msgstr "" -"Para :math:`seq=7` de :math:`203 \\leftrightarrow 302` representan dos " +"Para :math:`seq=7` desde :math:`203 \\leftrightarrow 302` representan dos " "aristas." #, fuzzy From 52428588e7bc073808949fb00066464b20e93762 Mon Sep 17 00:00:00 2001 From: DeepL Date: Tue, 28 May 2024 15:29:35 +0000 Subject: [PATCH 258/428] Translated using Weblate (Spanish) Currently translated at 93.1% (4915 of 5275 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 31c05481fc..bd6456830b 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-05-13 17:23+0000\n" "PO-Revision-Date: 2024-05-28 15:29+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"Last-Translator: DeepL \n" "Language-Team: Spanish \n" "Language: es\n" @@ -14785,10 +14785,11 @@ msgstr "" "Para :math:`seq=7` desde :math:`203 \\leftrightarrow 302` representan dos " "aristas." -#, fuzzy msgid "" "For :math:`seq=8` from :math:`304 \\leftrightarrow 403` represent two edges." -msgstr "La arista :math:`2` (:math:`1 \\rightarrow 3`) no es parte del grafo." +msgstr "" +"Para :math:`seq=8` de :math:`304 \\leftrightarrow 403` representan dos " +"aristas." #, fuzzy msgid "wikipedia: `Line Graph `__" From e2cc09388a68fe682c18b26f0a0268ebae0b96f3 Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Tue, 28 May 2024 15:30:25 +0000 Subject: [PATCH 259/428] Translated using Weblate (Spanish) Currently translated at 93.1% (4916 of 5275 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index bd6456830b..fdbd3dce21 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-05-13 17:23+0000\n" -"PO-Revision-Date: 2024-05-28 15:29+0000\n" -"Last-Translator: DeepL \n" +"PO-Revision-Date: 2024-05-28 15:30+0000\n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" "Language: es\n" @@ -14788,7 +14788,7 @@ msgstr "" msgid "" "For :math:`seq=8` from :math:`304 \\leftrightarrow 403` represent two edges." msgstr "" -"Para :math:`seq=8` de :math:`304 \\leftrightarrow 403` representan dos " +"Para :math:`seq=8` desde :math:`304 \\leftrightarrow 403` representan dos " "aristas." #, fuzzy From 6cf93e7e39198bc496c62211004599036798a6dc Mon Sep 17 00:00:00 2001 From: DeepL Date: Tue, 28 May 2024 15:30:36 +0000 Subject: [PATCH 260/428] Translated using Weblate (Spanish) Currently translated at 93.1% (4916 of 5275 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index fdbd3dce21..9f19ea104e 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-05-13 17:23+0000\n" "PO-Revision-Date: 2024-05-28 15:30+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"Last-Translator: DeepL \n" "Language-Team: Spanish \n" "Language: es\n" @@ -14791,11 +14791,9 @@ msgstr "" "Para :math:`seq=8` desde :math:`304 \\leftrightarrow 403` representan dos " "aristas." -#, fuzzy msgid "wikipedia: `Line Graph `__" msgstr "" -"`Wikipedia: grafo bipartito `__" +"wikipedia: `Gráfico lineal `__" msgid "" "mathworld: `Line Graph `__" From ed5c1c6978f48caf2b8a4659f4f4907960cbc1fe Mon Sep 17 00:00:00 2001 From: DeepL Date: Tue, 28 May 2024 15:31:56 +0000 Subject: [PATCH 261/428] Translated using Weblate (Spanish) Currently translated at 93.2% (4918 of 5275 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 9f19ea104e..a690abed02 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-05-13 17:23+0000\n" -"PO-Revision-Date: 2024-05-28 15:30+0000\n" +"PO-Revision-Date: 2024-05-28 15:32+0000\n" "Last-Translator: DeepL \n" "Language-Team: Spanish \n" @@ -15473,9 +15473,8 @@ msgstr "``bigint`` identificador único del vértice" msgid "old_id" msgstr "old_id" -#, fuzzy msgid "``bigint`` Identifier of the edge in original table" -msgstr "``bigint`` identificador del borde en la tabla original" +msgstr "``bigint`` Identificador de la arista en la tabla original" msgid "sub_id" msgstr "sub_id" @@ -15577,9 +15576,8 @@ msgstr "Tiene solamente campos básicos para hacer un análisis de topología" msgid "Edges with 1 dead end: 1,6,24" msgstr "Los bordes con 1 callejón sin salida: 1,6,24" -#, fuzzy msgid "Edges with 2 dead ends: 17,18" -msgstr "Bordes con 2 callejones sin salida 17,18" +msgstr "Bordes con 2 callejones sin salida: 17,18" msgid "" "Edge 17's right node is a dead end because there is no other edge sharing " From ed3823e02c9f1f1774663e726485578c1b44752e Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Tue, 28 May 2024 15:31:38 +0000 Subject: [PATCH 262/428] Translated using Weblate (Spanish) Currently translated at 93.2% (4918 of 5275 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index a690abed02..510fc4a760 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-05-13 17:23+0000\n" "PO-Revision-Date: 2024-05-28 15:32+0000\n" -"Last-Translator: DeepL \n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" "Language: es\n" @@ -14792,8 +14792,7 @@ msgstr "" "aristas." msgid "wikipedia: `Line Graph `__" -msgstr "" -"wikipedia: `Gráfico lineal `__" +msgstr "wikipedia: `Grafo lineal `__" msgid "" "mathworld: `Line Graph `__" From f4396a5ffc96418703ff51c0d93b94730582e7e6 Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Tue, 28 May 2024 15:33:03 +0000 Subject: [PATCH 263/428] Translated using Weblate (Spanish) Currently translated at 93.2% (4921 of 5275 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 510fc4a760..f310557d6e 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-05-13 17:23+0000\n" -"PO-Revision-Date: 2024-05-28 15:32+0000\n" +"PO-Revision-Date: 2024-05-28 15:35+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" @@ -15576,7 +15576,7 @@ msgid "Edges with 1 dead end: 1,6,24" msgstr "Los bordes con 1 callejón sin salida: 1,6,24" msgid "Edges with 2 dead ends: 17,18" -msgstr "Bordes con 2 callejones sin salida: 17,18" +msgstr "Aristas con 2 callejones sin salida: 17,18" msgid "" "Edge 17's right node is a dead end because there is no other edge sharing " From 7a18b691400a7dfec38870b330f77044739b2754 Mon Sep 17 00:00:00 2001 From: DeepL Date: Tue, 28 May 2024 15:34:12 +0000 Subject: [PATCH 264/428] Translated using Weblate (Spanish) Currently translated at 93.2% (4921 of 5275 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index f310557d6e..02301f44ec 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-05-13 17:23+0000\n" "PO-Revision-Date: 2024-05-28 15:35+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"Last-Translator: DeepL \n" "Language-Team: Spanish \n" "Language: es\n" @@ -15591,9 +15591,8 @@ msgstr "Los bordes con 1 callejón sin salida: 1-1, 6-1,14-2, 18-1-17-1 18-2" msgid "Isolated segments" msgstr "Segmentos aislados" -#, fuzzy msgid "two isolated segments: 17 and 18 both they have 2 dead ends" -msgstr "dos aislados segmentos: 17 y 18 ambos tienen 2 callejones sin salida" +msgstr "dos segmentos aislados: 17 y 18 ambos tienen 2 callejones sin salida" msgid "No Isolated segments" msgstr "Segmentos no aislados" @@ -18004,19 +18003,18 @@ msgstr "pgRouting 3.7" msgid "pgRouting 3.6" msgstr "pgRouting 3.6" -#, fuzzy msgid "pgRouting 3.6.2 Release Notes" -msgstr "Notas de la versión 3.6.1 de pgRouting" +msgstr "Notas de la versión de pgRouting 3.6.2" -#, fuzzy msgid "" "To see all issues & pull requests closed by this release see the `Git closed " "milestone for 3.6.2 `__" msgstr "" -"Para ver todos los problemas y solicitudes de extracción cerrados para ésta " -"versión, consulte la `meta cerrada 3.6.1 `_" +"Para ver todas las incidencias y pull requests cerradas por esta versión, " +"consulte el hito `Git closed milestone for 3.6.2 `__" msgid "Upgrade fix" msgstr "" From 45ff9f7a265716982c7cd39b5d4c401d76e10491 Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Tue, 28 May 2024 15:35:55 +0000 Subject: [PATCH 265/428] Translated using Weblate (Spanish) Currently translated at 93.3% (4925 of 5275 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 02301f44ec..2a6696abf3 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-05-13 17:23+0000\n" -"PO-Revision-Date: 2024-05-28 15:35+0000\n" -"Last-Translator: DeepL \n" +"PO-Revision-Date: 2024-05-28 15:47+0000\n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" "Language: es\n" @@ -1819,7 +1819,7 @@ msgid "The main Characteristics are:" msgstr "Las características principales son:" msgid "Process works for directed and undirected graphs." -msgstr "Funciona para grafos dirigidos y no dirigidos." +msgstr "El proceso funciona para grafos dirigidos y no dirigidos." msgid "Ordering is:" msgstr "Ordenamiento es:" @@ -13893,15 +13893,17 @@ msgstr "" "punto más cercano de la arista :math:`5` ``geom``" msgid "At most two answers with all columns" -msgstr "" +msgstr "Como máximo dos respuestas con todas las columnas" msgid "Understanding the result:" -msgstr "" +msgstr "Comprender el resultado:" msgid "" "``geom``: Contains the geometry of the closest point on edge :math:`8` from " "the **original point**." msgstr "" +"``geom``: Contiene la geometría del punto más cercano de la arista :math:`8` " +"desde el **punto original**." msgid "" "``edge``: Contains the ``LINESTRING`` geometry of the **original point** to " @@ -18011,10 +18013,9 @@ msgid "" "milestone for 3.6.2 `__" msgstr "" -"Para ver todas las incidencias y pull requests cerradas por esta versión, " -"consulte el hito `Git closed milestone for 3.6.2 `__" +"Para ver todas las incidencias y pull requests cerrados por esta versión, " +"consulte `Git closed milestone for 3.6.2 `__" msgid "Upgrade fix" msgstr "" From 7af9b4c7dcd42c83d490fd1f96efe8fdaa625de1 Mon Sep 17 00:00:00 2001 From: DeepL Date: Tue, 28 May 2024 15:36:10 +0000 Subject: [PATCH 266/428] Translated using Weblate (Spanish) Currently translated at 93.3% (4925 of 5275 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 2a6696abf3..23d2628303 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-05-13 17:23+0000\n" "PO-Revision-Date: 2024-05-28 15:47+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"Last-Translator: DeepL \n" "Language-Team: Spanish \n" "Language: es\n" @@ -21175,9 +21175,8 @@ msgstr "" msgid "Additional functions to analyze a graph:" msgstr "" -#, fuzzy msgid "Transformation - Family of functions" -msgstr "Contraction - Familia de funciones" +msgstr "Transformación - Familia de funciones" msgid "" "This family of functions is used for transforming a given input graph :math:" From f539e204d1aadf12393d874b6591cf2cd4cc93c9 Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Tue, 28 May 2024 15:46:15 +0000 Subject: [PATCH 267/428] Translated using Weblate (Chinese (Simplified)) Currently translated at 98.1% (5177 of 5275 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ --- .../LC_MESSAGES/pgrouting_doc_strings.po | 50 +++++++++---------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 34dde876c2..4db9f32f95 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-05-13 17:23+0000\n" -"PO-Revision-Date: 2024-05-01 03:45+0000\n" -"Last-Translator: DeepL \n" +"PO-Revision-Date: 2024-05-28 15:47+0000\n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Chinese (Simplified) \n" "Language: zh_Hans\n" @@ -4595,25 +4595,23 @@ msgstr "将输出列标准化为 |result-spantree|" msgid "Added ``pred`` result columns." msgstr "添加了 ``depth``和``pred``结果列。" -#, fuzzy msgid "Experimental promoted to proposed." -msgstr "实验提升为拟议" +msgstr "实验提升为拟议。" #, fuzzy msgid "" "`#2635 `__ pgr_LineGraph " "ignores directed flag and use negative values for identifiers." msgstr "" -"`#2516 `__标准化输出" -"pgr_aStar" +"`#2516 `__标准化输出pgr_aStar." #, fuzzy msgid "``pgr_lineGraph``" msgstr "pgr_lineGraph" -#, fuzzy msgid "Promoted to **proposed** signature." -msgstr "晋升为 **拟议** 签名" +msgstr "晋升为 **拟议** 签名。" #, fuzzy msgid "Works for directed and undirected graphs." @@ -4973,7 +4971,7 @@ msgstr "注意附加结果列的存在。" #, fuzzy msgid "If needed filter out the added columns" -msgstr "如果需要，过滤掉添加的列，例如：" +msgstr "如果需要，过滤掉添加的列，例如" #, fuzzy msgid "Kruskal single vertex" @@ -13366,13 +13364,13 @@ msgstr "给定一个图 G，它的线图 L(G) 是这样的图：" #, fuzzy msgid "Each vertex of :math:`L(G)` represents an edge of :math:`G`." -msgstr "L(G)的每个顶点代表G的一条边" +msgstr ":math:`L(G)` 的每个顶点代表 :math:`G` 的一条边。" #, fuzzy msgid "" "Two vertices of :math:`L(G)` are adjacent if and only if their corresponding " "edges share a common endpoint in :math:`G`" -msgstr "L(G) 的两个顶点相邻当且仅当它们对应的边共享 G 中的公共端点。" +msgstr ":math:`L(G)` 的两个顶点相邻当且仅当它们对应的边共享 :math:`G` 中的公共端点" #, fuzzy msgid "" @@ -13382,16 +13380,15 @@ msgstr "使用 ``cost``和 ``reverse_cost``列来表示边的存在。" #, fuzzy msgid "When the graph is directed the result is directed." -msgstr "当图**无向**时，成本矩阵是对称的" +msgstr "当图无向时，成本矩阵是对称的。" msgid "" "To get the complete Line Graph use unique identifiers on the double way " "edges (See `Additional Examples`_)." msgstr "" -#, fuzzy msgid "When the graph is undirected the result is undirected." -msgstr "当图**无向**时，成本矩阵是对称的" +msgstr "当图无向时，成本矩阵是对称的。" msgid "The ``reverse_cost`` is always :math:`-1`." msgstr "" @@ -13404,7 +13401,7 @@ msgstr "Returns set of |result-lineg|" #, fuzzy msgid "For an undirected graph with edges :math:'{2,4,5,8}'" -msgstr "对于有边 :math:`\\{1, 2, 3, 4\\}`的有向子图。" +msgstr "对于有边 :math:`\\{1, 2, 3, 4\\}`的有向子图" msgid "Gives a local identifier for the edge" msgstr "给出边的本地标识符" @@ -13439,7 +13436,7 @@ msgstr "当为负时：边(``target``, ``source``)不存在，因此它不是图 #, fuzzy msgid "Given the following directed graph" -msgstr "给出以下查询：" +msgstr "给出以下查询" msgid "" ":math:`G(V,E) = G(\\{1,2,3,4\\},\\{ 1 \\rightarrow 2, 1 \\rightarrow 4, 2 " @@ -13510,7 +13507,7 @@ msgstr "图定义如下：" #, fuzzy msgid "Line Graph of a directed graph represented with shared edges" -msgstr "就有向图而言，就像有四个边：" +msgstr "就有向图而言，就像有四个边" #, fuzzy msgid "The result is a directed graph." @@ -13519,7 +13516,7 @@ msgstr "有向图。" #, fuzzy msgid "" "For :math:`seq=4` from :math:`203 \\leftrightarrow 304` represent two edges" -msgstr "边 :math:`2` (:math:`1 \\rightarrow 3`) 不是图的一部分。" +msgstr "边 :math:`2` (:math:`1 \\rightarrow 3`) 不是图的一部分" msgid "For all the other values of ``seq`` represent one edge." msgstr "" @@ -13564,7 +13561,7 @@ msgstr "" #, fuzzy msgid "Line Graph of a directed graph represented with unique edges" -msgstr "就有向图而言，就像有四个边：" +msgstr "就有向图而言，就像有四个边" #, fuzzy msgid "" @@ -15206,7 +15203,7 @@ msgid "Execute the **TRSP** algorithm with restrictions for the paths." msgstr "执行对路径有限制的 **TRSP** 算法。" msgid "**NOTE** when this is done, ``U_turn_on_edge`` flag is ignored." -msgstr "**注意**，完成此操作后， ``U_turn_on_edge``标志将被忽略。" +msgstr "**注意**，完成此操作后， ``U_turn_on_edge`` 标志将被忽略。" msgid "" "pgr_trspVia(`Edges SQL`_, `Restrictions SQL`_, **via vertices**, " @@ -15255,7 +15252,7 @@ msgid "Getting the same result as ``pgr_trspVia``:" msgstr "得到与 ``pgr_trspVia`` 相同的结果：" msgid "Sometimes ``U_turn_on_edge`` flag is ignored when is set to ``false``." -msgstr "有时，当设置为 ``false`` 时，``U_turn_on_edge`` 标志会被忽略。" +msgstr "有时，当设置为 ``false`` 时， ``U_turn_on_edge`` 标志会被忽略。" msgid "" "The first step, doing a :doc:`pgr_dijkstraVia` does consider not making a U " @@ -15268,9 +15265,8 @@ msgstr "" msgid "" "When executing the :doc:`pgr_trsp` algorithm for the conflicting path, there " "is no ``U_turn_on_edge`` flag." -msgstr "" -"当执行 :doc:`pgr_trsp`针对冲突路径的拟议算法时，没有 ``U_turn_on_edge`` 标" -"志。" +msgstr "当执行 :doc:`pgr_trsp` 针对冲突路径的拟议算法时，没有 ``U_turn_on_edge`` " +"标志。" msgid "" "Therefore the result ignores the ``U_turn_on_edge`` flag when set to " @@ -15470,9 +15466,9 @@ msgid "" "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 "" -"因此，当设置为 ``false`` 时，结果会忽略 ``U_turn_on_edge`` 标志。 从 :doc:" -"`pgr_withPointsVia`结果中，它删除了冲突路径，并使用 :doc:`pgr_trsp` 算法的结" -"果构建解决方案。 在这种情况下，使用相同的边缘完成 U 形转弯。" +"因此，当设置为 ``false`` 时，结果会忽略 ``U_turn_on_edge`` 标志。 从 " +":doc:`pgr_withPointsVia` 结果中，它删除了冲突路径，并使用 :doc:`pgr_trsp` " +"算法的结果构建解决方案。 在这种情况下，使用相同的边缘完成 U 形转弯。" msgid "pgr_trsp_withPoints - Proposed" msgstr "pgr_trsp_withPoints - 拟议" From bd6a65570fcbd9880e5f00f5e1069362354284e4 Mon Sep 17 00:00:00 2001 From: DeepL Date: Tue, 28 May 2024 15:48:17 +0000 Subject: [PATCH 268/428] Translated using Weblate (Chinese (Simplified)) Currently translated at 98.1% (5178 of 5275 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ --- locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 4db9f32f95..24b1555abc 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-05-13 17:23+0000\n" -"PO-Revision-Date: 2024-05-28 15:47+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"PO-Revision-Date: 2024-05-28 15:48+0000\n" +"Last-Translator: DeepL \n" "Language-Team: Chinese (Simplified) \n" "Language: zh_Hans\n" @@ -13362,7 +13362,6 @@ msgid "" "Given a graph :math:`G`, its line graph :math:`L(G)` is a graph such that:" msgstr "给定一个图 G，它的线图 L(G) 是这样的图：" -#, fuzzy msgid "Each vertex of :math:`L(G)` represents an edge of :math:`G`." msgstr ":math:`L(G)` 的每个顶点代表 :math:`G` 的一条边。" From b571548adbf7065b462472750dd276f5154123e7 Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Tue, 28 May 2024 16:06:30 +0000 Subject: [PATCH 269/428] Translated using Weblate (Chinese (Simplified)) Currently translated at 98.1% (5176 of 5275 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ --- .../LC_MESSAGES/pgrouting_doc_strings.po | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 24b1555abc..5b82d5266b 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-05-13 17:23+0000\n" -"PO-Revision-Date: 2024-05-28 15:48+0000\n" -"Last-Translator: DeepL \n" +"PO-Revision-Date: 2024-05-28 16:17+0000\n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Chinese (Simplified) \n" "Language: zh_Hans\n" @@ -211,13 +211,13 @@ msgid "``seq``" msgstr "``seq``" msgid "Sequential value starting from :math:`1`." -msgstr "从:math:`1`开始的顺序值。" +msgstr "从 :math:`1` 开始的顺序值。" msgid "``depth``" msgstr "``depth``" msgid "Depth of the ``node``." -msgstr "``node``的深度。" +msgstr "``node`` 的深度。" msgid ":math:`0` when ``node`` = ``start_vid``." msgstr ":math:`0` 当``node`` = ``start_vid``。" @@ -3495,9 +3495,8 @@ msgstr ":doc:`pgr_withPointsCostMatrix`" msgid "" ":doc:`TSP-family` needs as input a symmetric cost matrix and no edge `(u, " "v)` must value :math:`\\infty`." -msgstr "" -":doc:`TSP-family`需要一个对称成本矩阵作为输入，并且没有边 `(u, v)`必须值为:" -"math:`\\infty` 。" +msgstr ":doc:`TSP-family` 需要一个对称成本矩阵作为输入，并且没有边 `(u, v)` 必须值为 " +":math:`\\infty`。" msgid "" "This collection of functions will return a cost matrix in form of a table." @@ -3697,7 +3696,7 @@ msgid "`Combinations SQL`_" msgstr "`Combinations SQL`_" msgid "`Combinations SQL`_ as described below" -msgstr "`Combinations SQL`_如下所述" +msgstr "`Combinations SQL`_ 如下所述" msgid "**start vid**" msgstr "**start vid**" @@ -5715,13 +5714,13 @@ msgid "" msgstr "并将途经以下途经点： :math:`4\\rightarrow3\\rightarrow6`" msgid ":doc:`pgr_withPointsVia` when there are no restrictions," -msgstr ":doc:`pgr_withPointsVia`当没有限制时，" +msgstr ":doc:`pgr_withPointsVia` 当没有限制时，" msgid ":doc:`pgr_trspVia_withPoints` when there are restrictions." msgstr ":doc:`pgr_trspVia_withPoints`当有限制时。" msgid "Migrating ``pgr_trspViaEdges`` using ``pgr_withPointsVia``" -msgstr "使用``pgr_withPointsVia``迁移``pgr_trspViaEdges``" +msgstr "使用 ``pgr_withPointsVia`` 迁移 ``pgr_trspViaEdges``" msgid "Use :doc:`pgr_withPointsVia` instead." msgstr "请使用 :doc:`pgr_withPointsVia`。" @@ -6025,7 +6024,7 @@ msgstr "" "的示例问题 ：" msgid "Problem is to find the shortest path from :math:`1` to :math:`5`." -msgstr "问题是找到从 :math:`1`到:math:`5` 的最短路径。" +msgstr "问题是找到从 :math:`1` 到 :math:`5` 的最短路径。" msgid "Is an undirected graph." msgstr "是一个无向图。" @@ -6090,7 +6089,7 @@ msgid "" "To go from :math:`1` to :math:`5` the path goes thru the following " "vertices: :math:`1 \\rightarrow 3 \\rightarrow 6 \\rightarrow 5`" msgstr "" -"从 :math:`1` 到 :math:`5`的路径要经过以下顶点： :math:`1 \\rightarrow 3 " +"从 :math:`1` 到 :math:`5` 的路径要经过以下顶点： :math:`1 \\rightarrow 3 " "\\rightarrow 6 \\rightarrow 5`" msgid "Vertex information" @@ -6324,7 +6323,7 @@ msgid "" msgstr "假设样本数据中的 ``cost`` 和``reverse_cost``列表示：" msgid ":math:`1` when the edge exists in the graph" -msgstr "当边存在于图中时为:math:`1`" +msgstr "当边存在于图中时为 :math:`1`" msgid ":math:`-1` when the edge does not exist in the graph" msgstr "当图中不存在边时为:math:`-1`" @@ -6567,8 +6566,8 @@ msgid "" "vertex :math:`4`. And the closest edge to vertex :math:`4` is edge :math:" "`14`." msgstr "" -"使用 :doc:`pgr_findCloseEdges` 距离组件 :math:`1` 最近的顶点是顶点 :math:" -"`4` 。 距离顶点:math:`4`最近的边是 边 :math:`14`。" +"使用 :doc:`pgr_findCloseEdges` 距离组件 :math:`1` 最近的顶点是顶点 " +":math:`4`。 距离顶点 :math:`4` 最近的边是 边 :math:`14`。" msgid "" "The ``edge`` can be used to connect the components, using the ``fraction`` " @@ -6869,7 +6868,7 @@ msgid "Users can define the combinations as desired." msgstr "用户可以根据需要定义组合。" msgid "Needs a `Combinations SQL`_" -msgstr "需要`Combinations SQL`_" +msgstr "需要 `Combinations SQL`_" msgid "" "There are several kinds of valid inner queries and also the columns returned " @@ -8236,7 +8235,7 @@ msgid "``0`` for the first row in the tour sequence." msgstr "``0``表示游览序列中的第一行。" msgid "Start from vertex :math:`1`" -msgstr "从顶点 :math:`1`开始" +msgstr "从顶点 :math:`1` 开始" msgid "**Line 6** ``start_vid => 1``" msgstr "**Line 6** ``start_vid => 1``" @@ -9745,11 +9744,12 @@ msgid "" "general algorithm, like Dijkstra's Algorithm which runs in :math:`O(|E|log|" "V|)` time." msgstr "" -"众所周知，在无权重图中，使用广度优先搜索（Breadth First Search）可以在 :math:" -"`O(|E|)`内找到单个源点与所有其他顶点之间的最短路径，也就是说，距离是指从源点" -"到另一个顶点所需的最少边数。我们也可以把这样的图解释为加权图，其中每条边的权" -"重为 :math:`1`。如果图中不是所有边的权重都相同，我们就需要一种更通用的算法，" -"比如 Dijkstra 算法，它的运行时间为 :math:`O(|E|log|V||)`。" +"众所周知，在无权重图中，使用广度优先搜索（Breadth First Search）可以在 " +":math:`O(|E|)` 内找到单个源点与所有其他顶点之间的最短路径，也就是说，距离是指" +"从源点到另一个顶点所需的最少边数。我们也可以把这样的图解释为加权图，" +"其中每条边的权重为 " +":math:`1`。如果图中不是所有边的权重都相同，我们就需要一种更通用的算法，比如 " +"Dijkstra 算法，它的运行时间为 :math:`O(|E|log|V||)`。" msgid "" "However if the weights are more constrained, we can use a faster algorithm. " @@ -9813,8 +9813,7 @@ msgstr "" msgid "" "**Note:** Using the :doc:`sampledata` Network as all weights are same (i.e :" "math:`1``)" -msgstr "" -"**注意:** 使用 :doc:`示例数据`网络，因为所有权重都相同（即为 :math:`1``）" +msgstr "**注意:** 使用 :doc:`sampledata` 网络，因为所有权重都相同（即为 :math:`1`）" msgid "https://cp-algorithms.com/graph/01_bfs.html" msgstr "https://cp-algorithms.com/graph/01_bfs.html" @@ -11200,7 +11199,7 @@ msgid "pgr_dijkstra(`Edges SQL`_, **start vids**, **end vid**, [``directed``])" msgstr "pgr_dijkstra(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" msgid "pgr_dijkstra(`Edges SQL`_, `Combinations SQL`_, [``directed``])" -msgstr "pgr_dijkstra(`Edges SQL`_,`Combinations SQL`_, [``directed`])" +msgstr "pgr_dijkstra(`Edges SQL`_,`Combinations SQL`_, [``directed``])" msgid "Breaking change on 3.5.0" msgstr "3.5.0 上的重大变更" @@ -11414,7 +11413,7 @@ msgstr "" "pgr_dijkstraCost(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" msgid "pgr_dijkstraCost(`Edges SQL`_, `Combinations SQL`_, [``directed``])" -msgstr "pgr_dijkstraCost(`Edges SQL`_,`Combinations SQL`_, [`directed`])" +msgstr "pgr_dijkstraCost(`Edges SQL`_,`Combinations SQL`_, [``directed``])" msgid "``pgr_dijkstraCostMatrix``" msgstr "``pgr_dijkstraCostMatrix``" @@ -11656,8 +11655,7 @@ msgstr "" msgid "" "The best one is :math:`(11 \\rightarrow 16)` with a cost of :math:`1` " "(lines: `11` and `12`)" -msgstr "" -"最好的方法是 :math:`(11/rightarrow 16)`，成本是 :math:`1`（行：`11`和`12`）" +msgstr "最好的方法是 :math:`(11/rightarrow 16)`，成本是 :math:`1` （行：`11`和`12`）" msgid "" "making a connection from the second subway line :math:`\\{15, 16\\}` to the " @@ -13362,6 +13360,7 @@ msgid "" "Given a graph :math:`G`, its line graph :math:`L(G)` is a graph such that:" msgstr "给定一个图 G，它的线图 L(G) 是这样的图：" +#, fuzzy msgid "Each vertex of :math:`L(G)` represents an edge of :math:`G`." msgstr ":math:`L(G)` 的每个顶点代表 :math:`G` 的一条边。" @@ -15420,7 +15419,7 @@ msgid "Status of \"passes in front\" or \"visits\" of the nodes and points." msgstr "节点、点的\"通过\"或\"访问\"状态。" msgid "The algorithm performs a :doc:`pgr_withPointsVia`" -msgstr "该算法执行:doc:`pgr_withPointsVia`" +msgstr "该算法执行 :doc:`pgr_withPointsVia`" msgid "" "Detects which of the paths pass through a restriction in this case is for " @@ -15449,8 +15448,8 @@ msgid "" "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 "" -"第一步，执行 :doc:`pgr_withPointsVia` 不考虑在同一条边上进行掉头。但是路径 :" -"math:`9 \\rightarrow 16`（第4行和第5行）受到限制，结果中使用了它。" +"第一步，执行 :doc:`pgr_withPointsVia` 不考虑在同一条边上进行掉头。但是路径 " +":math:`9 \\rightarrow 16` （第4行和第5行）受到限制，结果中使用了它。" msgid "" "When executing the :doc:`pgr_trsp_withPoints` algorithm for the conflicting " @@ -16411,7 +16410,7 @@ msgstr "" "用堆路径（heap paths）并包含详细信息。" msgid "``pgr_withPointsVia`` - Proposed" -msgstr "``pgr_withPointsVia`` -拟议" +msgstr "``pgr_withPointsVia`` - 拟议" msgid "" "``pgr_withPointsVia`` - Route that goes through a list of vertices and/or " @@ -16419,7 +16418,7 @@ msgid "" msgstr "``pgr_withPointsVia`` - 经过一系列顶点和/或点的路线。" msgid "New **proposed** function ``pgr_withPointsVia`` (`One Via`_)" -msgstr "新 **拟议**的函数 ``pgr_withPointsVia`` (`One Via`_)" +msgstr "新 **拟议** 的函数 ``pgr_withPointsVia`` (`One Via`_)" msgid "" "Given a graph, a set of points on the graphs edges and a list of vertices, " @@ -16521,7 +16520,7 @@ msgid ":doc:`pgr_withPointsDD` - Driving distance." msgstr ":doc:`pgr_withPointsDD` -行驶距离。" msgid ":doc:`pgr_withPointsVia` - Via routing" -msgstr ":doc:`pgr_withPointsVia` -通过路由" +msgstr ":doc:`pgr_withPointsVia` - 通过路由" msgid "These proposed functions do not modify the database." msgstr "这些拟议的功能不会修改数据库。" @@ -20077,8 +20076,9 @@ msgstr "pgr_withPointsKSP 是**带有点**的 pgr_ksp" msgid "pgr_withPointsDD is pgr_drivingDistance **with points**" msgstr "pgr_withPointsDD 是**带有点**的 pgr_drivenDistance" +#, fuzzy msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" -msgstr "pgr_withPointsvia 是**带有点**的 pgr_dijkstraVia" +msgstr "pgr_withPointsvia 是 **带有点** 的" #~ msgid "``pgr_lineGraph`` - Experimental" #~ msgstr "``pgr_lineGraph`` - 实验" From a97f49501431e6944f29045cba12b12f6710aed9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 28 May 2024 17:52:05 +0000 Subject: [PATCH 270/428] Update locale: commit b571548adb --- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 828 ------------------ .../ja/LC_MESSAGES/pgrouting_doc_strings.po | 6 - .../LC_MESSAGES/pgrouting_doc_strings.po | 806 ----------------- 3 files changed, 1640 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 23d2628303..f01a3783d5 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -21618,831 +21618,3 @@ msgstr "pgr_withPointsDD es pgr_drivingDistance **con puntos**" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "pgr_withPoints es pgr_dijkstraVia **con puntos**" -#~ msgid "``pgr_lineGraph`` - Experimental" -#~ msgstr "``pgr_lineGraph`` - Experimental" - -#, fuzzy -#~ msgid "Currently works for undirected graph." -#~ msgstr "Funciona para grafos no dirigidos." - -#, fuzzy -#~ msgid "For an **undirected** graph" -#~ msgstr "Para un grafo **dirigido**" - -#~ msgid "Transformation - Family of functions (Experimental)" -#~ msgstr "Transformation - Familia de funciones (Experimental)" - -#~ msgid "Current release" -#~ msgstr "Versión actual" - -#~ msgid "" -#~ "Visits and extracts the nodes information in Breath First Search ordering " -#~ "of the Minimum Spanning Tree created with Prims's algorithm." -#~ msgstr "" -#~ "Visita y extrae la información de los nodos en el orden de búsqueda de " -#~ "Primera Búsqueda de Respiración del Árbol de Expansión Mínimo creado con " -#~ "el algoritmo de Prim." - -#~ msgid "" -#~ "Column ``pred`` only applies to :doc:`pgr_drivingDistance` and :doc:" -#~ "`pgr_withPointsDD`." -#~ msgstr "" -#~ "La columna ``pred`` sólo se aplica a :doc:`pgr_drivingDistance` y :doc:" -#~ "`pgr_withPointsDD`." - -#~ msgid "pgRouting 1.x Release Notes" -#~ msgstr "Notas de versión de pgRouting 1.x" - -#~ msgid "" -#~ "Aniket Agarwal, Aryan Gupta, Ashish Kumar, Cayetano Benavent, Daniel " -#~ "Kastl, Nitish Chauhan, Rajat Shinde, Regina Obe, Shobhit Chaurasia, " -#~ "Swapnil Joshi, Virginia Vergara, Yige Huang" -#~ msgstr "" -#~ "Aniket Agarwal, Aryan Gupta, Ashish Kumar, Cayetano Benavent, Daniel " -#~ "Kastl, Nitish Chauhan, Rajat Shinde, Regina Obe, Shobhit Chaurasia, " -#~ "Swapnil Joshi, Virginia Vergara, Yige Huang" - -#~ msgid "`Georepublic `__" -#~ msgstr "`Georepublic `__" - -#~ msgid "" -#~ "The Migration guide from 2.6 can be found at https://github.com/pgRouting/" -#~ "pgrouting/wiki/Migration-Guide." -#~ msgstr "" -#~ "La guía de Migración de 2.6 se puede encontrar en https://github.com/" -#~ "pgRouting/pgrouting/wiki/Migration-Guide." - -#~ msgid "Result Columns" -#~ msgstr "Columnas de Resultados" - -#~ msgid "" -#~ "Returns SET OF ``(seq, depth, start_vid, node, edge, cost, agg_cost)``" -#~ msgstr "" -#~ "Regresa ``SET OF (seq, depth, start_vid, node, edge, cost, agg_cost)``" - -#~ msgid "" -#~ "A discussion about the work of Hamilton & Kirkman can be found in the " -#~ "book **Graph Theory (Biggs et al. 1976)**." -#~ msgstr "" -#~ "Una discusión sobre el trabajo de Hamilton & Kirkman se puede encontrar " -#~ "en el libro **Graph Theory (Biggs et al. 1976)**." - -#~ msgid "And :math:`n-2` choices for the third city, etc." -#~ msgstr "Y :math:`n-2` opciones para la tercera ciudad, etc." - -#~ msgid "" -#~ "Multiplying these together we get :math:`(n-1)! = (n-1) (n-2) . . 1`." -#~ msgstr "" -#~ "Multiplicando estos juntos obtenemos :math:`(n-1)! = (n-1) (n-2) . . 1`." - -#~ msgid "" -#~ "To handle problems like: 10 (equal dimension) boxes of apples and 5 kg " -#~ "of feathers that are to be transported (not packed in boxes)." -#~ msgstr "" -#~ "Para manejar problemas como: 10 (dimensión igual) cajas de manzanas y 5 " -#~ "kg de plumas que se van a transportar (no embaladas en cajas)." - -#~ msgid "aStar optional Parameters" -#~ msgstr "Parámetros opcionales de aStar" - -#~ msgid "" -#~ "Working with cost/reverse_cost as length in degrees, x/y in lat/lon: " -#~ "Factor = 1 (no need to change units)" -#~ msgstr "" -#~ "Trabajando con cost/reverse_cost como longitud en grados, x / y en lat/" -#~ "lon: Factor = 1 (sin necesidad de cambiar unidades)" - -#~ msgid "" -#~ "Working with cost/reverse_cost as length in meters, x/y in lat/lon: " -#~ "Factor = would depend on the location of the points:" -#~ msgstr "" -#~ "Trabajando con cost/reverse_cost donde la longitud es en metros, x / y es " -#~ "lat/lon: Factor dependere de la ubicación de los puntos:" - -#~ msgid "1 longitude degree is 78846.81 m" -#~ msgstr "1 grado de longitud es 78846,81 m" - -#~ msgid "The `agg_cost` of `(u, v)` is the same as for `(v, u)`." -#~ msgstr "El `agg_cost` de `(u, v)` es el mismo que para `(v, u)`." - -#~ msgid "When `start_vid` = `end_vid`, the `agg_cost` = 0." -#~ msgstr "En caso de `start_vid` = `end_vid`, el `agg_cost` = 0." - -#~ msgid "Weight of the edge (``source``, ``target``)" -#~ msgstr "Peso de la arista (``source``, ``target``)" - -#~ msgid "" -#~ ":doc:`pgr_bdDijkstraCostMatrix` - Bidirectional Dijkstra algorithm to " -#~ "create a matrix of costs of the shortest paths." -#~ msgstr "" -#~ ":doc:`pgr_bdDijkstraCostMatrix` - Algoritmo Dijkstra bidireccional para " -#~ "crear una matriz de costes de las rutas más cortas." - -#~ msgid "Returns SET OF ``(vertex_id, color_id)``" -#~ msgstr "Devuelve SET OF ``(vertex_id, color_id)``" - -#~ msgid "Returns SET OF ``(edge_id, color_id)``" -#~ msgstr "Devuelve SET OF ``((edge_id, color_id)``" - -#~ msgid "" -#~ "The edges :math:`v \\rightarrow w` and :math:`w \\rightarrow z` are " -#~ "removed from the graph." -#~ msgstr "" -#~ "Los aristas :math:`v \\rightarrow w` y :math:`w \\rightarrow z` fueron " -#~ "eliminados del grafo." - -#~ msgid "" -#~ "The edges :math:`u \\rightarrow v` and :math:`v \\rightarrow z` are " -#~ "removed from the graph." -#~ msgstr "" -#~ "Los aristas :math:`u \\rightarrow v` y :math:`v \\rightarrow z` son " -#~ "removidos del grafo." - -#~ msgid "" -#~ "The **aggregate cost** of :math:`(u, v)` is the same as for :math:`(v, " -#~ "u)`." -#~ msgstr "El **costo agregado** de `(u, v)` es el mismo que para `(v, u)`." - -#~ msgid "" -#~ "where :math:`sql = \\{(id_i, source_i, target_i, cost_i, " -#~ "reverse\\_cost_i)\\}`" -#~ msgstr "" -#~ "Donde :math:`sql = \\{(id_i, source_i, target_i, cost_i, " -#~ "reverse\\_cost_i)\\}`" - -#~ msgid "" -#~ "In other words: The algorithm returns a the shortest path between :math:" -#~ "`start_{vid}` and :math:`end_{vid}`, if it exists, in terms of a sequence " -#~ "of nodes and of edges," -#~ msgstr "" -#~ "En otras palabras: El algoritmo devuelve la ruta más corta entre :math:" -#~ "`start_{vid}` y :math:`end_{vid}`, si es que existe, en términos de una " -#~ "secuencia de nodos y de aristas," - -#~ msgid "Not classified" -#~ msgstr "No clasificado" - -#~ msgid "Capacity of the edge (``source``, ``target``)" -#~ msgstr "Capacidad de la arista (``source``, ``target``)" - -#~ msgid "Weight of the edge (``source``, ``target``) if it exist" -#~ msgstr "Peso de la arista (``source``, ``target``) si existe" - -#~ msgid "" -#~ ":doc:`pgr_createTopology` - create a topology based on the geometry." -#~ msgstr "" -#~ ":doc:`pgr_createTopology` - para crear una topología basada en la " -#~ "geometría." - -#~ msgid "" -#~ ":doc:`pgr_analyzeGraph` - to analyze the edges and vertices of the edge " -#~ "table." -#~ msgstr "" -#~ ":doc:`pgr_analyzeGraph` - para analizar los bordes y vértices de la tabla " -#~ "de aristas." - -#~ msgid ":doc:`pgr_nodeNetwork` -to create nodes to a not noded edge table." -#~ msgstr ":doc:`pgr_nodeNetwork` - para crear nodos en una tabla de aristas." - -#, fuzzy -#~ msgid "Also ``l`` could be used as **driving side**" -#~ msgstr "``l`` para el manejo del lado izquierdo" - -#~ msgid "Be aware of the existance of the additional return columns." -#~ msgstr "" -#~ "Tener en cuenta la existencia de las columnas de adicionales de " -#~ "resultados." - -#, fuzzy -#~ msgid "New output columns are |result-bfs|" -#~ msgstr "REGRESA CONJUNTO DE |old-generic-result|" - -#~ msgid "" -#~ "Edge :math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`) is not part of " -#~ "the graph." -#~ msgstr "" -#~ "Arista :math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`) no es parte del " -#~ "grafo." - -#~ msgid "The set of vertices :math:`V`:" -#~ msgstr "El conjunto de aristas :math:`V`:" - -#~ msgid ":math:`2` (:math:`1 \\rightarrow 3`)" -#~ msgstr ":math:`2` (:math:`1 \\rightarrow 3`)" - -#~ msgid ":math:`3` (:math:`3 \\rightarrow 2`)" -#~ msgstr ":math:`3` (:math:`3 \\rightarrow 2`)" - -#~ msgid ":math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`)" -#~ msgstr ":math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`)" - -#~ msgid ":math:`3` (:math:`3 \\frac{\\;\\;\\;\\;\\;}{} 2`)" -#~ msgstr ":math:`3` (:math:`3 \\frac{\\;\\;\\;\\;\\;}{} 2`)" - -#~ msgid "" -#~ "Personal relationships, genealogy, file dependency problems can be solved " -#~ "using pgRouting. Those problems, normally, do not come with geometries " -#~ "associated with the graph." -#~ msgstr "" -#~ "Relaciones personales, genealogía, problemas de dependencia de archivos " -#~ "puede ser resueltos usando pgRouting. Esos problemas, normalmente, no " -#~ "vienen con las geometrías asociadas con el grafo." - -#~ msgid ":doc:`sampledata`: a small graph used on the documentation examples" -#~ msgstr "" -#~ ":doc:`sampledata`: un grafo chico usado para ejemplos de documentación" - -#~ msgid "" -#~ "That information is correct, for example, when in terms of vehicles, is " -#~ "it a tunnel or bride crossing over another road." -#~ msgstr "" -#~ "Esa información es correcta, por ejemplo, cuando en términos de " -#~ "vehículos, es un túnel o puente cruczando sobre otra carretera." - -#~ msgid "" -#~ "pgr_dijkstra(`Edges SQL`_, **start vid**, **end vid** [, ``directed``])" -#~ msgstr "" -#~ "pgr_dijkstra(`SQL de aristas`_, **salida**, **destino**, [``directed``])" - -#~ msgid "" -#~ "When ``true`` departing from a visited vertex will not try to avoid using " -#~ "the edge used to reach it. In other words, U turn using the edge with " -#~ "same identifier is allowed." -#~ msgstr "" -#~ "Cuando ``true`` saliendo de un vértice visitado no intentará evitar el " -#~ "uso de la arista utilizada para alcanzarlo. En otras palabras, se permite " -#~ "la vuelta en U usando la arista con el mismo identificador." - -#~ msgid "" -#~ "When ``false`` when a departing from a visited vertex tries to avoid " -#~ "using the edge used to reach it. In other words, U turn using the edge " -#~ "with same identifier is used when no other path is found." -#~ msgstr "" -#~ "Cuando ``false`` al salir de un vértice visitado intenta evitar el uso de " -#~ "la arista utilizada para alcanzarlo. En otras palabras, se utiliza la " -#~ "vuelta en U utilizando la arista con el mismo identificador cuando no se " -#~ "encuentra ninguna otra ruta." - -#~ msgid "Return columns for a path" -#~ msgstr "Columnas devueltas para una trayectoria" - -#~ msgid "Returned on `Many to One`_ and `Many to Many`_" -#~ msgstr "Regresado en `Muchos a Uno`_ y `Muchos a Muchos`_" - -#~ msgid "Return columns for cost functions" -#~ msgstr "Columnas devueltas para funciones de costo" - -#~ msgid "Return columns for flow functions" -#~ msgstr "Columnas devueltas para funciones de flujo" - -#~ msgid "Returns SET OF ``(edge, cost)``" -#~ msgstr "Devuelve CONJUNTO DE ``(edge, cost)``" - -#~ msgid "" -#~ "Edit an existing `pgRouting Wiki `__ page." -#~ msgstr "" -#~ "Edita una página existente `Wiki de pgRouting `_." - -#~ msgid "" -#~ "And all the people that give us a little of their time making comments, " -#~ "finding issues, making pull requests etc. in any of our products: " -#~ "osm2pgrouting, pgRouting, pgRoutingLayer, workshop." -#~ msgstr "" -#~ "Y todas las personas que nos dan un poco de su tiempo haciendo " -#~ "comentarios, encontrando problemas, haciendo pull request, etc. en " -#~ "cualquiera de nuestros productos: osm2pgrouting, pgRouting, " -#~ "pgRoutingLayer, workshop." - -#~ msgid "Return columns standarized to: |nksp-result|" -#~ msgstr "Devolver columnas estandarizadas a: |nksp-result|" - -#~ msgid "RETURNS SET OF |nksp-result|" -#~ msgstr "Regresa conjunto de |nksp-result|" - -#~ msgid "" -#~ "The minimum value of the ``agg_cost`` all instances of edge `(u, v)` is " -#~ "going to be considered as the ``agg_cost`` of edge `(u, v)`" -#~ msgstr "" -#~ "El valor mínimo de ``agg_cost`` en todas las instancias del segmento " -#~ "`(u, v)` se considera como el ``agg_cost`` de la arista `(u, v)`" - -#~ msgid "RETURNS SET OF |tsp-result|" -#~ msgstr "REGRESA CONJUNTO DE |tsp-result|" - -#~ msgid "" -#~ "Visualy, The first image is the `optimal solution `__ and the second image is the " -#~ "solution obtained with ``pgr_TSPeuclidean``." -#~ msgstr "" -#~ "Visualmente, la primera imagen es la 'solución óptima'`__ y la segunda imagen es la " -#~ "solución obtenida con ``pgr_TSPeuclidean``." - -#~ msgid "`pgr_aStar(` `One to Many`_ `)`" -#~ msgstr "`pgr_aStar(` `Uno a Muchos`_ `)`" - -#~ msgid "`pgr_aStar(` `Many to One`_ `)`" -#~ msgstr "`pgr_aStar(` `Muchos a Uno`_ `)`" - -#~ msgid "`pgr_aStar(` `Many to Many`_ `)`" -#~ msgstr "`pgr_aStar(` `Muchos a Muchos`_ `)`" - -#~ msgid "`pgr_aStar(` `Combinations`_ `)`" -#~ msgstr "``pgr_aStar`` (`Combinaciones`_)" - -#~ msgid "RETURNS SET OF |matrix-result|" -#~ msgstr "Regresa conjunto de |matrix-result|" - -#~ msgid "" -#~ "The edge table to be analyzed must contain a source column and a target " -#~ "column filled with id's of the vertices of the segments and the " -#~ "corresponding vertices table _vertices_pgr that stores the " -#~ "vertices information." -#~ msgstr "" -#~ "La tabla de bordes debe ser analizada debe contener una columna de origen " -#~ "y una columna de destino llena con los identificadores de los vértices de " -#~ "los segmentos y los vértices correspondientes de la tabla " -#~ "_vertices_pgr que almacena la información de los vértices." - -#~ msgid "" -#~ "``text`` Geometry column name of the network table. Default value is " -#~ "``the_geom``." -#~ msgstr "" -#~ "``text`` nombre de la columna de la geometría en la tabla de la red. El " -#~ "valor por defecto es ``the_geom``." - -#~ msgid "" -#~ "``text`` Primary key column name of the network table. Default value is " -#~ "``id``." -#~ msgstr "" -#~ "``text``Nombre de la columna de la clave principal de la tabla de red. " -#~ "Valor por defecto es ``id``." - -#~ msgid "" -#~ "``text`` Target column name of the network table. Default value is " -#~ "``target``." -#~ msgstr "" -#~ "``text`` El nombre de la columna del nodo de llegada del segmento. El " -#~ "valor por defecto es ``target``." - -#~ msgid "" -#~ "``text`` Condition to select a subset or rows. Default value is " -#~ "``true`` to indicate all rows." -#~ msgstr "" -#~ "``text`` condición para seleccionar un subconjunto o filas. Valor " -#~ "predeterminado es ``true`` para indicar todas las filas." - -#~ msgid "" -#~ "Returns the analysis of the section of the network defined by " -#~ "``rows_where``" -#~ msgstr "" -#~ "Devuelve el análisis de la sección de la red definida por ``rows_where``" - -#~ msgid "``integer`` Indicator that the vertex might have a problem." -#~ msgstr "``integer`` indicador que el vértice podría tener un problema." - -#~ msgid "" -#~ "``boolean`` flag to treat oneway NULL values as bi-directional. Default " -#~ "value is ``true``." -#~ msgstr "" -#~ "``boolean`` bandera para tratar los valores NULL de oneway como " -#~ "bidireccional. Valor predeterminado es``true``." - -#~ msgid "" -#~ "``integer`` Indicator that the vertex might have a problem. See :doc:" -#~ "`pgr_analyzeGraph `." -#~ msgstr "" -#~ "``integer`` Indicador de que el vértice podría tener un problema. " -#~ "Consulte :doc:`pgr_analyzeGraph `." - -#~ msgid "Return columns change: ``seq`` is removed" -#~ msgstr "Cambio de columnas de retorno: ``seq`` se elimina" - -#~ msgid "RETURNS SET OF |result-node|" -#~ msgstr "REGRESA CONJUNTO DE |result-node|" - -#~ msgid "`pgr_bdAstar(` `One to Many`_ `)`" -#~ msgstr "`pgr_bdAstar(` `Uno a Muchos`_ `)`" - -#~ msgid "`pgr_bdAstar(` `Many to One`_ `)`" -#~ msgstr "`pgr_bdAstar(` `Muchos a Uno`_ `)`" - -#~ msgid "`pgr_bdAstar(` `Many to Many`_ `)`" -#~ msgstr "`pgr_bdAstar(` `Muchos a Muchos`_ `)`" - -#~ msgid "`pgr_bdAstar(` `Combinations`_ `)`" -#~ msgstr "``pgr_bdAstar`` (`Combinaciones`_)" - -#~ msgid "RETURNS SET OF |old-generic-result|" -#~ msgstr "REGRESA CONJUNTO DE |old-generic-result|" - -#~ msgid "RETURNS SET OF |result-1-1|" -#~ msgstr "REGRESA CONJUNTO DE |result-1-1|" - -#~ msgid "From vertex :math:`6` to vertex :math:`10` on a **directed** graph" -#~ msgstr "" -#~ "Del vértice :math:`6` al vértice :math:`10` en un grafo **dirigido**" - -#~ msgid "RETURNS SET OF |result-1-m|" -#~ msgstr "REGRESA CONJUNTO DE |result-1-m|" - -#~ msgid "RETURNS SET OF |result-m-1|" -#~ msgstr "REGRESA CONJUNTO DE |result-m-1|" - -#~ msgid "" -#~ "pgr_bellmanFord(`Edges SQL`_, **start vids**, **end vid** , " -#~ "[``directed``])" -#~ msgstr "" -#~ "pgr_bellmanFord(`SQL de aristas`_, **salidas**, **destino**, " -#~ "[``directed``])" - -#~ msgid "Return columns change:" -#~ msgstr "Las columnas de retorno cambian:" - -#~ msgid "RETURNS SET OF |result-component-E|" -#~ msgstr "REGRESA CONJUNTO DE |result-component-E|" - -#~ msgid "" -#~ "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:`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." -#~ msgstr "" -#~ "Es bien sabido que las rutas más cortas entre una sola fuente y todos los " -#~ "demás vértices se pueden encontrar usando Breadth First Search en :math:" -#~ "`O(|E|)` en un grafo no ponderado, es decir, la distancia es el número " -#~ "mínimo de aristas que necesita atravesar desde el origen a otro vértice. " -#~ "Podemos interpretar tal grafo también como un grafo ponderado, donde cada " -#~ "arista tiene el peso 1. Si no todas las aristas del grafo tienen el mismo " -#~ "peso, que necesitamos un algoritmo más general, como el Algoritmo de " -#~ "Dijkstra que se ejecuta en :math:`O(|E|log|V|)` tiempo." - -#~ msgid "Optional Parameters" -#~ msgstr "Parámetros Opcionales" - -#~ msgid "" -#~ "The algorithm checks graph is bipartite or not. If it is bipartite then " -#~ "it returns the node along with two colors `0` and `1` which represents " -#~ "two different sets." -#~ msgstr "" -#~ "El algoritmo comprueba si el grafo es bi-partido o no. Si es bipartido, " -#~ "devuelve el nodo junto con dos colores `0` y `1` que representan dos " -#~ "conjuntos diferentes." - -#~ msgid "RETURNS SET OF |result-node-color|" -#~ msgstr "REGRESA CONJUNTO DE |result-node-color|" - -#~ msgid "RETURNS SET OF |result-flow|" -#~ msgstr "REGRESA CONJUNTO DE |result-flow|" - -#~ msgid "RETURNS SET OF |result-bfs|" -#~ msgstr "REGRESA CONJUNTO DE |result-bfs|" - -#~ msgid "RETURNS SET OF |result-edge|" -#~ msgstr "REGRESA CONJUNTO DE |result-edge|" - -#~ msgid "RETURNS SET OF |result-1-1-no-seq|" -#~ msgstr "REGRESA CONJUNTO DE |result-1-1-no-seq|" - -#~ msgid "RETURNS SET OF |result-component-V|" -#~ msgstr "REGRESA CONJUNTO DE |result-component-V|" - -#~ msgid "RETURNS SET OF |result-contract|" -#~ msgstr "REGRESA CONJUNTO DE |result-contract|" - -#~ msgid "``text`` Network table name. (may contain the schema name AS well)" -#~ msgstr "``text`` La tabla de la red. (puede contener el nombre del esquema)" - -#~ msgid "" -#~ "``text`` Condition to SELECT a subset or rows. Default value is " -#~ "``true`` to indicate all rows that where ``source`` or ``target`` have a " -#~ "null value, otherwise the condition is used." -#~ msgstr "" -#~ "``text`` Condición para SELECCIONAR un subconjunto de filas. El valor " -#~ "predeterminado es ``true`` para indicar todas las filas donde ``source`` " -#~ "o ``target`` tienen un valor nulo, de lo contrario se utiliza la " -#~ "condición." - -#~ msgid "" -#~ "``boolean`` Clean any previous topology. Default value is ``false``." -#~ msgstr "" -#~ "``boolean`` Limpie cualquier topología previa. El valor predeterminado es " -#~ "``false``." - -#~ msgid "" -#~ "``integer`` Indicator that the vertex might have a problem. See :doc:" -#~ "`pgr_analyzeGraph`." -#~ msgstr "" -#~ "``integer`` Indicador de que el vértice podría tener un problema. " -#~ "Consulte :doc:`pgr_analyzeGraph`." - -#~ msgid "When the arguments are given in the order described:" -#~ msgstr "" -#~ "Cuando los argumentos se escriben en el orden descrito en los parámetros:" - -#~ msgid "We get the same result AS the simplest way to use the function." -#~ msgstr "" -#~ "Obtenemos el mismo resultado que la forma más sencilla de utilizar la " -#~ "función." - -#~ msgid "" -#~ "The reconstruction of the vertices table function accepts the following " -#~ "parameters:" -#~ msgstr "" -#~ "La función para la reconstrucción de la tabla mesa vértices acepta los " -#~ "siguientes parámetros:" - -#~ msgid "" -#~ "``text`` Condition to SELECT a subset or rows. Default value is " -#~ "``true`` to indicate all rows." -#~ msgstr "" -#~ "``text`` condición para seleccionar un subconjunto o filas. Valor " -#~ "predeterminado es ``true`` para indicar todas las filas." - -#~ msgid "" -#~ "The vertices table is a requierment of the :doc:`pgr_analyzeGraph` and " -#~ "the :doc:`pgr_analyzeOneWay` functions." -#~ msgstr "" -#~ "La tabla de vértices es un requerimiento de las funciones :doc:" -#~ "`pgr_analyzeGraph` y :doc:`pgr_analyzeOneWay`." - -#~ msgid "" -#~ ":doc:`topology-functions` for an overview of a topology for routing " -#~ "algorithms." -#~ msgstr "" -#~ ":doc:`topology-functions` para obtener una visión general de una " -#~ "topología para algoritmos de ruteo." - -#~ msgid "RETURNS SET OF |result-node-order|" -#~ msgstr "REGRESA CONJUNTO DE |result-node-order|" - -#~ msgid "Returns SET OF ``(seq, node)``" -#~ msgstr "Regresa conjunto de ``(seq, node)``" - -#~ msgid "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vid**)" -#~ msgstr "pgr_dagShortestPath(`SQL de aristas`_, **salida**, **destino**)" - -#~ msgid "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vids**)" -#~ msgstr "pgr_dagShortestPath(`SQL de aristas`_, **salida**, **destinos**)" - -#~ msgid "From vertex :math:`5` to vertex :math:`11` on a **directed** graph" -#~ msgstr "" -#~ "Desde el vértice :math:`5` al vértice :math:`11` en un grafo **dirigido**" - -#~ msgid "Resturn Columns" -#~ msgstr "Columnas de resultados" - -#~ msgid "" -#~ "The results can be used as base code to make a refinement based on the " -#~ "back end development needs." -#~ msgstr "" -#~ "Los resultados se pueden usar como código base para realizar un " -#~ "refinamiento basado en las necesidades de desarrollo de back-end." - -#~ msgid "" -#~ "The subway stations are on the following vertices :math:`\\{ 1, 10, 11\\}`" -#~ msgstr "" -#~ "Las estaciones de metro se encuentran en los siguientes vértices :math:" -#~ "`\\{1, 10, 11\\}`" - -#~ msgid "RETURNS SET OF |via-result|" -#~ msgstr "REGRESA CONJUNTO DE |via-result|" - -#~ msgid "" -#~ "Using the Dijkstra algorithm, 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." -#~ msgstr "" -#~ "Usando el algoritmo Dijkstra, se extraen todos los nodos que tienen " -#~ "costes menores o iguales al valor ``distance``. Los bordes extraídos se " -#~ "ajustarán al árbol de expansión correspondiente." - -#~ msgid "" -#~ "pgr_drivingDistance(`Edges SQL`_, **Root vid**, **distance**, " -#~ "[``directed``])" -#~ msgstr "" -#~ "pgr_drivingDistance(`SQL de aristas`_, **Raíz**, **distancia**, " -#~ "[``directed``])" - -#~ msgid "" -#~ "the chromatic number :math:`x'(G)` (minimum number of colors needed for " -#~ "proper edge coloring of graph) is equal to the degree :math:`\\Delta + " -#~ "1` of the graph, (:math:`x'(G) = \\Delta`)" -#~ msgstr "" -#~ "El número cromático :math:`x'(G)` (mínima cantidad de colores necesitados " -#~ "para colorear apropiadamentnte las aristas de un grafo) es igual al " -#~ "grado :math:`\\Delta + 1` del grafo, (:math:`x'(G) = \\Delta`)" - -#~ msgid "RETURNS SET OF |result-edge-color|" -#~ msgstr "Regresa conjunto de |result-edge-color|" - -#~ msgid "" -#~ "``pgr_edwardMoore`` — Returns the shortest path using Edward-Moore " -#~ "algorithm." -#~ msgstr "" -#~ "``pgr_edwardMoore`` — Devuelve la ruta más cortas usando el algoritmo " -#~ "Edward-Moore." - -#~ msgid "`start vid` ascending" -#~ msgstr "`start vid` ascendente" - -#~ msgid "`end vid` ascending" -#~ msgstr "`end_vid` ascendente" - -#~ msgid "Dryrun execution" -#~ msgstr "Ejecución de prueba" - -#~ msgid "RETURNS SET OF |result-find|" -#~ msgstr "REGRESA CONJUNTO DE |result-find|" - -#~ msgid "Points of interest geometry" -#~ msgstr "Geometría de los puntos de interés" - -#~ msgid "Points of interest data" -#~ msgstr "Datos de puntos de interés" - -#~ msgid "" -#~ "``pgr_hawickCircuits`` — Returns the list of cirucits using hawick " -#~ "circuits algorithm." -#~ msgstr "" -#~ "``pgr_hawickCircuits`` — Enumeración de los circuitos usando el algoritmo " -#~ "de circutos de Hawick." - -#~ msgid "RETURNS SET OF |result-idom|" -#~ msgstr "REGRESA CONJUNTO DE |result-idom|" - -#~ msgid "RETURNS SET OF |result-component-make|" -#~ msgstr "REGRESA CONJUNTO DE |result-component-make|" - -#~ msgid "The output table will have for ``edge_table_noded``" -#~ msgstr "La tabla de salida tendrá para ``edge_table_noded``" - -#~ msgid "before image" -#~ msgstr "Imágen del Antes" - -#~ msgid "after image" -#~ msgstr "Imágen del Después" - -#~ msgid "RETURNS SET OF |result-pickdrop|" -#~ msgstr "REGRESA CONJUNTO DE |result-pickdrop|" - -#~ msgid "RETURNS SET OF |result-closure|" -#~ msgstr "REGRESA CONJUNTO DE |result-closure|" - -#~ msgid "New prototypes:" -#~ msgstr "Nuevos prototipos:" - -#~ 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)`." - -#~ 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, 1.8)`." - -#~ msgid "RETURNS SET OF |ksp-result|" -#~ msgstr "REGRESA CONJUNTO DE |ksp-result|" - -#~ msgid "RETURNS SET OF |old-pid-result|" -#~ msgstr "REGRESA CONJUNTO DE |old-pid-result|" - -#~ msgid "RETURNS SET OF |pid-1-m|" -#~ msgstr "REGRESA CONJUNTO DE |pid-1-m|" - -#~ msgid "RETURNS SET OF |pid-m-1|" -#~ msgstr "REGRESA CONJUNTO DE |pid-m-1|" - -#~ msgid "RETURNS SET OF |pid-m-m|" -#~ msgstr "REGRESA CONJUNTO DE |pid-m-m|" - -#~ msgid "" -#~ "From point :math:`1` and vertex :math:`6` to point :math:`3` and vertex :" -#~ "math:`1`" -#~ msgstr "" -#~ "Desde el punto :math:`1` y el vértice :math:`6` al punto :math:`3` y al " -#~ "vértice :math:`1`" - -#~ msgid "Running time: :math:`O(| start\\_vids | * (V \\log V + E))`" -#~ msgstr "Tiempo de ejecución: :math:`O(| start\\_vids | * (V \\log V + E))`" - -#~ msgid "**options:** ``[directed, driving_side]``" -#~ msgstr "**opcionales:** ``[directed, driving_side]``" - -#~ msgid "RETURNS SET OF |matrix-pid|" -#~ msgstr "REGRESA CONJUNTO DE |matrix-pid|" - -#~ msgid "" -#~ "From point :math:`15` and vertex :math:`6` to point :math:`3` and " -#~ "vertex :math:`1`" -#~ msgstr "" -#~ "Desde el punto :math:`15` y vértice :math:`6` al punto :math:`3` y " -#~ "vértice :math:`1`" - -#, fuzzy -#~ msgid "Added ``depth`` and ``start_vid`` column." -#~ msgstr "``pgr_dijkstra`` (`Uno a Muchos`) no tiene ``start_vid``." - -#~ msgid "" -#~ "Point :math:`-1` corresponds to the closest edge from point :math:" -#~ "`(2.9,1.8)`." -#~ msgstr "" -#~ "El punto :math:`-1` corresponde a la arista más cercana al punto `(2.9, " -#~ "1.8)`." - -#~ msgid "" -#~ "Point :math:`-2` corresponds to the next close edge from point :math:" -#~ "`(2.9,1.8)`." -#~ msgstr "" -#~ "El punto :math:`-2` corresponde a la segunda arista más cercana al punto " -#~ "`(2.9, 1.8)`." - -#~ msgid "Deprecated signature:" -#~ msgstr "Firma obsoleta:" - -#~ msgid "**options:** ``[directed, heap_paths, details]``" -#~ msgstr "**opcionales:** ``[directed, heap_paths, details]``" - -#~ msgid "Deprecated functions" -#~ msgstr "Funciones obsoletas" - -#~ msgid "Issues" -#~ msgstr "Corrección de problemas" - -#~ msgid "Backport issues fixes" -#~ msgstr "Corrección de problemas de Backport" - -#~ msgid "" -#~ "`#232 `__: Honor " -#~ "client cancel requests in C /C++ code" -#~ msgstr "" -#~ "`#232 `__: Cliente " -#~ "honorable cliente cancela las solicitudes de código C /C++" - -#~ msgid "New Experimental functions" -#~ msgstr "Nuevas funciones experimentales" - -#~ msgid "pgr_labelGraph - Use the components family of functions instead." -#~ msgstr "" -#~ "pgr_labelGraph - Utilice la familia de componentes de funciones en su " -#~ "lugar." - -#~ msgid "New Signatures:" -#~ msgstr "Nuevas Firmas:" - -#~ msgid "Deprecated Signatures" -#~ msgstr "Firmas Obsoletas" - -#~ msgid "Renamed Functions" -#~ msgstr "Funciones Renombradas" - -#~ msgid "Deprecated function" -#~ msgstr "Función Obsoleta" - -#~ msgid "pgr_dijkstra -- to match what is documented" -#~ msgstr "pgr_dijkstra - para que coincida con lo que está documentado" - -#~ msgid "Proposed functionality" -#~ msgstr "Funcionalidad propuesta" - -#~ msgid "Deprecated functions:" -#~ msgstr "Funciones obsoletas:" - -#~ msgid "pgr_apspWarshall use pgr_floydWarshall instead" -#~ msgstr "pgr_apspWarshall utilice pgr_floydWarshall en su lugar" - -#~ msgid "pgr_apspJohnson use pgr_Johnson instead" -#~ msgstr "pgr_apspJohnson utilice pgr_Johnson en su lugar" - -#~ msgid "Renamed and deprecated function" -#~ msgstr "Función renombrada y obsoleta" - -#~ msgid "**Used on:**" -#~ msgstr "**Usado en:**" - -#~ msgid "Used on all Via functions" -#~ msgstr "Usado en todas las funciones Via" - -#~ msgid "Used on" -#~ msgstr "Usado en" - -#~ msgid "Returns SET OF |result-spantree|" -#~ msgstr "Regresa conjunto de |result-spantree|" - -#~ msgid "RETURNS SET OF |result-spantree|" -#~ msgstr "Regresa conjunto de |result-spantree|" - -#~ msgid "" -#~ "pgr_dijkstra(`Edges SQL`_, **start vid**, **end vid** [, ``directed``])" -#~ msgstr "" -#~ "pgr_dijkstra(`SQL de aristas`_, **salida**, **destino**, [``directed``])" diff --git a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po index 8feaa79dc8..401ee81197 100644 --- a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po @@ -18763,9 +18763,3 @@ msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "" #, fuzzy -#~ msgid "Currently works for undirected graph." -#~ msgstr "導かれないグラフ。" - -#, fuzzy -#~ msgid "For an **undirected** graph" -#~ msgstr "導かれないグラフ" diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 5b82d5266b..35604aa3ca 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -20080,809 +20080,3 @@ msgstr "pgr_withPointsDD 是**带有点**的 pgr_drivenDistance" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "pgr_withPointsvia 是 **带有点** 的" -#~ msgid "``pgr_lineGraph`` - Experimental" -#~ msgstr "``pgr_lineGraph`` - 实验" - -#, fuzzy -#~ msgid "Currently works for undirected graph." -#~ msgstr "适用于无向图。" - -#, fuzzy -#~ msgid "For an **undirected** graph" -#~ msgstr "对于**有向**图" - -#~ msgid "Transformation - Family of functions (Experimental)" -#~ msgstr "Transformation - 函数族（实验）" - -#~ msgid "Current release" -#~ msgstr "当前版本" - -#~ msgid "_" -#~ msgstr "_" - -#~ msgid "" -#~ "Visits and extracts the nodes information in Breath First Search ordering " -#~ "of the Minimum Spanning Tree created with Prims's algorithm." -#~ msgstr "访问并提取Prims算法创建的最小生成树的呼吸优先搜索排序中的节点信息。" - -#~ msgid "" -#~ "Column ``pred`` only applies to :doc:`pgr_drivingDistance` and :doc:" -#~ "`pgr_withPointsDD`." -#~ msgstr "" -#~ "列``pred``仅适用于 :doc:`pgr_drivingDistance` 和:doc:`pgr_withPointsDD`。" - -#~ msgid "pgRouting 1.x Release Notes" -#~ msgstr "pgRouting 1.x 发布说明" - -#~ msgid "" -#~ "Aniket Agarwal, Aryan Gupta, Ashish Kumar, Cayetano Benavent, Daniel " -#~ "Kastl, Nitish Chauhan, Rajat Shinde, Regina Obe, Shobhit Chaurasia, " -#~ "Swapnil Joshi, Virginia Vergara, Yige Huang" -#~ msgstr "" -#~ "Aniket Agarwal, Aryan Gupta, Ashish Kumar, Cayetano Benavent, Daniel " -#~ "Kastl, Nitish Chauhan, Rajat Shinde, Regina Obe, Shobhit Chaurasia, " -#~ "Swapnil Joshi, Virginia Vergara, Yige Huang" - -#~ msgid "`Georepublic `__" -#~ msgstr "`Georepublic `__" - -#~ msgid "" -#~ "The Migration guide from 2.6 can be found at https://github.com/pgRouting/" -#~ "pgrouting/wiki/Migration-Guide." -#~ msgstr "" -#~ "2.6 版的迁移指南可以在 https://github.com/pgRouting/pgrouting/wiki/" -#~ "Migration-Guide 找到。" - -#~ msgid "Result Columns" -#~ msgstr "结果列" - -#~ msgid "" -#~ "Returns SET OF ``(seq, depth, start_vid, node, edge, cost, agg_cost)``" -#~ msgstr "返回一组``(seq, depth, start_vid, node, edge, cost, agg_cost)``" - -#~ msgid "" -#~ "A discussion about the work of Hamilton & Kirkman can be found in the " -#~ "book **Graph Theory (Biggs et al. 1976)**." -#~ msgstr "" -#~ "关于Hamilton和Kirkman的工作的讨论可以在**《图论》（Biggs等人，1976年）**一" -#~ "书中找到。" - -#~ msgid "And :math:`n-2` choices for the third city, etc." -#~ msgstr "以及第三个城市有:math:`n-2`个选择等。" - -#~ msgid "" -#~ "Multiplying these together we get :math:`(n-1)! = (n-1) (n-2) . . 1`." -#~ msgstr "将它们相乘我们得到:math:`(n-1)! = (n-1) (n-2) . . 1`。" - -#~ msgid "" -#~ "To handle problems like: 10 (equal dimension) boxes of apples and 5 kg " -#~ "of feathers that are to be transported (not packed in boxes)." -#~ msgstr "处理这样的问题：10箱（等尺寸）苹果和5公斤羽毛需要运输（不装箱）。" - -#~ msgid "aStar optional Parameters" -#~ msgstr "aStar可选参数" - -#~ msgid "" -#~ "Working with cost/reverse_cost as length in degrees, x/y in lat/lon: " -#~ "Factor = 1 (no need to change units)" -#~ msgstr "" -#~ "使用 cost/reverse_cost 作为长度（以度为单位），x/y 以纬度/经度为单位：因" -#~ "子 = 1（无需更改单位）" - -#~ msgid "" -#~ "Working with cost/reverse_cost as length in meters, x/y in lat/lon: " -#~ "Factor = would depend on the location of the points:" -#~ msgstr "" -#~ "使用 cost/reverse_cost 作为以米为单位的长度，以纬度/经度为单位的 x/y： " -#~ "Factor = 将取决于点的位置：" - -#~ msgid "1 longitude degree is 78846.81 m" -#~ msgstr "1经度为78846.81 m" - -#~ msgid "The `agg_cost` of `(u, v)` is the same as for `(v, u)`." -#~ msgstr "`(u, v)` 的 `agg_cost` 与 `(v, u)`相同。" - -#~ msgid "When `start_vid` = `end_vid`, the `agg_cost` = 0." -#~ msgstr "当`start_vid` = `end_vid`时，`agg_cost`= 0。" - -#~ msgid "" -#~ ":doc:`pgr_bdDijkstraCostMatrix` - Bidirectional Dijkstra algorithm to " -#~ "create a matrix of costs of the shortest paths." -#~ msgstr "" -#~ ":doc:`pgr_bdDijkstraCostMatrix` - 双向 Dijkstra 算法创建最短路径成本矩阵。" - -#~ msgid "Returns SET OF ``(vertex_id, color_id)``" -#~ msgstr "返回``(vertex_id, color_id)``的集合" - -#~ msgid "Returns SET OF ``(edge_id, color_id)``" -#~ msgstr "返回``(edge_id, color_id)``的集合" - -#~ msgid "" -#~ "The edges :math:`v \\rightarrow w` and :math:`w \\rightarrow z` are " -#~ "removed from the graph." -#~ msgstr "边:math:`v \\rightarrow w`和:math:`w \\rightarrow z`已从图中移除。" - -#~ msgid "" -#~ "The edges :math:`u \\rightarrow v` and :math:`v \\rightarrow z` are " -#~ "removed from the graph." -#~ msgstr "边:math:`u \\rightarrow v`和 :math:`v \\rightarrow z`已从图中移除。" - -#~ msgid "" -#~ "The **aggregate cost** of :math:`(u, v)` is the same as for :math:`(v, " -#~ "u)`." -#~ msgstr ":math:`(u, v)`的**总成本**与 :math:`(v, u)`的相同。" - -#~ msgid "" -#~ "where :math:`sql = \\{(id_i, source_i, target_i, cost_i, " -#~ "reverse\\_cost_i)\\}`" -#~ msgstr "" -#~ "其中 :math:`sql = \\{(id_i, source_i, target_i, cost_i, " -#~ "reverse\\_cost_i)\\}`" - -#~ msgid "" -#~ "In other words: The algorithm returns a the shortest path between :math:" -#~ "`start_{vid}` and :math:`end_{vid}`, if it exists, in terms of a sequence " -#~ "of nodes and of edges," -#~ msgstr "" -#~ "换句话说：该算法返回 :math:`start_{vid}` 和:math:`end_{vid}` 之间的最短路" -#~ "径（如果存在），以节点和边的序列表示，" - -#~ msgid "Returns SET OF |result-spantree|" -#~ msgstr "返回 |result-spantree| 的一组结果" - -#~ msgid "Not classified" -#~ msgstr "未分类" - -#~ msgid "Capacity of the edge (``source``, ``target``)" -#~ msgstr "边 (``source``, ``target``)的容量" - -#~ msgid "Weight of the edge (``source``, ``target``) if it exist" -#~ msgstr "边 (``source``, ``target``)的权重（如果存在）" - -#~ msgid "" -#~ ":doc:`pgr_createTopology` - create a topology based on the geometry." -#~ msgstr ":doc:`pgr_createTopology` - 根据几何形状创建拓扑。" - -#~ msgid "" -#~ ":doc:`pgr_analyzeGraph` - to analyze the edges and vertices of the edge " -#~ "table." -#~ msgstr ":doc:`pgr_analyzeGraph` - 分析边表的边和顶点。" - -#~ msgid ":doc:`pgr_nodeNetwork` -to create nodes to a not noded edge table." -#~ msgstr ":doc:`pgr_nodeNetwork` -为无节点边表创建节点。" - -#~ msgid "Also ``l`` could be used as **driving side**" -#~ msgstr "``l`` 也可用作**行驶方向**" - -#~ msgid "Be aware of the existance of the additional return columns." -#~ msgstr "请注意附加返回列的存在。" - -#~ msgid "" -#~ "Edge :math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`) is not part of " -#~ "the graph." -#~ msgstr "" -#~ "边 :math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`) 不是图的一部分。" - -#~ msgid "The set of vertices :math:`V`:" -#~ msgstr "顶点 :math:`V`的集合：" - -#~ msgid ":math:`2` (:math:`1 \\rightarrow 3`)" -#~ msgstr ":math:`2` (:math:`1 \\rightarrow 3`)" - -#~ msgid ":math:`3` (:math:`3 \\rightarrow 2`)" -#~ msgstr ":math:`3` (:math:`3 \\rightarrow 2`)" - -#~ msgid ":math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`)" -#~ msgstr ":math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`)" - -#~ msgid ":math:`3` (:math:`3 \\frac{\\;\\;\\;\\;\\;}{} 2`)" -#~ msgstr ":math:`3` (:math:`3 \\frac{\\;\\;\\;\\;\\;}{} 2`)" - -#~ msgid "" -#~ "Personal relationships, genealogy, file dependency problems can be solved " -#~ "using pgRouting. Those problems, normally, do not come with geometries " -#~ "associated with the graph." -#~ msgstr "" -#~ "人际关系、家谱、文件依赖问题都可以使用pgRouting来解决。 通常，这些问题不会" -#~ "与与图形相关的几何图形相关。" - -#~ msgid ":doc:`sampledata`: a small graph used on the documentation examples" -#~ msgstr ":doc:`sampledata`: 文档示例中使用的小图" - -#~ msgid "" -#~ "That information is correct, for example, when in terms of vehicles, is " -#~ "it a tunnel or bride crossing over another road." -#~ msgstr "" -#~ "这些信息是正确的，例如，在车辆方面，它是一个穿越另一条道路的隧道或桥梁。" - -#~ msgid "" -#~ "Capacity information, used on the :doc:`flow-family` functions does not " -#~ "need to change when splitting edges." -#~ msgstr "分割边时， :doc:`flow-family` 函数上使用的容量信息不需要更改。" - -#~ msgid "" -#~ "pgr_dijkstra(`Edges SQL`_, **start vid**, **end vid** [, ``directed``])" -#~ msgstr "" -#~ "pgr_dijkstra(`Edges SQL`_, **start vid**, **end vid** [, ``directed``])" - -#~ msgid "Used on combination signatures" -#~ msgstr "用于组合签名" - -#~ msgid "" -#~ "When ``true`` departing from a visited vertex will not try to avoid using " -#~ "the edge used to reach it. In other words, U turn using the edge with " -#~ "same identifier is allowed." -#~ msgstr "" -#~ "当 为``true``时，从已访问的顶点出发，不会试图避免使用用于到达它的边。换句" -#~ "话说，允许使用具有相同标识符的边来进行掉头。" - -#~ msgid "" -#~ "When ``false`` when a departing from a visited vertex tries to avoid " -#~ "using the edge used to reach it. In other words, U turn using the edge " -#~ "with same identifier is used when no other path is found." -#~ msgstr "" -#~ "当为``false``时，从已访问的顶点出发，尝试避免使用用于到达它的边。换句话" -#~ "说，只有在找不到其他路径时才使用具有相同标识符的边来进行掉头。" - -#~ msgid "Return columns for a path" -#~ msgstr "返回路径的列" - -#~ msgid "Used on functions that return one path solution" -#~ msgstr "用于返回单路径解决方案的函数" - -#~ msgid "Used on functions the following:" -#~ msgstr "用于以下函数：" - -#~ msgid "Returned on `Many to One`_ and `Many to Many`_" -#~ msgstr "返回`多对一`_和`多对多`_" - -#~ msgid "Return columns for cost functions" -#~ msgstr "返回成本函数的列" - -#~ msgid "Return columns for flow functions" -#~ msgstr "流函数的返回列" - -#~ msgid "Return columns for spanning tree functions" -#~ msgstr "返回生成树函数的列" - -#~ msgid "Returns SET OF ``(edge, cost)``" -#~ msgstr "返回集合``(edge, cost)``" - -#~ msgid "" -#~ "Edit an existing `pgRouting Wiki `__ page." -#~ msgstr "" -#~ "编辑现有的 `pgRouting 维基 `__ 页面。" - -#~ msgid "" -#~ "And all the people that give us a little of their time making comments, " -#~ "finding issues, making pull requests etc. in any of our products: " -#~ "osm2pgrouting, pgRouting, pgRoutingLayer, workshop." -#~ msgstr "" -#~ "并且所有那些花一点时间为我们的任何产品提供评论、发现问题、提交请求等的人" -#~ "们，包括 osm2pgrouting、pgRouting、pgRoutingLayer 和 workshop。" - -#~ msgid "Return columns standarized to: |nksp-result|" -#~ msgstr "返回标准化后的列：|nksp-result|" - -#~ msgid "RETURNS SET OF |nksp-result|" -#~ msgstr "RETURNS SET OF |nksp-result|" - -#~ msgid "" -#~ "The minimum value of the ``agg_cost`` all instances of edge `(u, v)` is " -#~ "going to be considered as the ``agg_cost`` of edge `(u, v)`" -#~ msgstr "" -#~ "边 `(u, v)` 的所有实例的 ``agg_cost`` 最小值将被视为边`(u, v)`的 " -#~ "``agg_cost``" - -#~ msgid "RETURNS SET OF |tsp-result|" -#~ msgstr "RETURNS SET OF |tsp-result|" - -#~ msgid "" -#~ "Visualy, The first image is the `optimal solution `__ and the second image is the " -#~ "solution obtained with ``pgr_TSPeuclidean``." -#~ msgstr "" -#~ "从视觉上看，第一幅图像是 `最优解 `__ ，第二幅图像是使用 ``pgr_TSPeuclidean``获得的解。" - -#~ msgid "`pgr_aStar(` `One to Many`_ `)`" -#~ msgstr "`pgr_aStar(` `一对多`_ `)`" - -#~ msgid "`pgr_aStar(` `Many to One`_ `)`" -#~ msgstr "`pgr_aStar(` `多对一`_ `)`" - -#~ msgid "`pgr_aStar(` `Many to Many`_ `)`" -#~ msgstr "`pgr_aStar(` `多对多`_ `)`" - -#~ msgid "`pgr_aStar(` `Combinations`_ `)`" -#~ msgstr "`pgr_aStar(` `组合`_ `)`" - -#~ msgid "RETURNS SET OF |short-generic-result|" -#~ msgstr "RETURNS SET OF |short-generic-result|" - -#~ msgid "RETURNS SET OF |matrix-result|" -#~ msgstr "RETURNS SET OF |matrix-result|" - -#~ msgid "" -#~ "The edge table to be analyzed must contain a source column and a target " -#~ "column filled with id's of the vertices of the segments and the " -#~ "corresponding vertices table _vertices_pgr that stores the " -#~ "vertices information." -#~ msgstr "" -#~ "待分析的边表必须包含源列和目标列，其中填充了线段顶点的id以及对应的存储顶点" -#~ "信息的顶点表_vertices_pgr。" - -#~ msgid "" -#~ "``text`` Target column name of the network table. Default value is " -#~ "``target``." -#~ msgstr "``text``网络表的Target列名称。 默认值为 ``target``。" - -#~ msgid "" -#~ "``text`` Condition to select a subset or rows. Default value is " -#~ "``true`` to indicate all rows." -#~ msgstr "``text``选择子集或行的条件。 默认值为``true`` t表示所有行。" - -#~ msgid "" -#~ "Returns the analysis of the section of the network defined by " -#~ "``rows_where``" -#~ msgstr "返回由``rows_where`` 定义的网络部分的分析结果" - -#~ msgid "``integer`` Indicator that the vertex might have a problem." -#~ msgstr "``integer``指示顶点可能有问题。" - -#~ msgid "" -#~ "``boolean`` flag to treat oneway NULL values as bi-directional. Default " -#~ "value is ``true``." -#~ msgstr "``boolean``将单向 NULL 值视为双向的标志。 默认值为 ``true``。" - -#~ msgid "" -#~ "``integer`` Indicator that the vertex might have a problem. See :doc:" -#~ "`pgr_analyzeGraph `." -#~ msgstr "" -#~ "``integer``指示顶点可能有问题。 请参阅 :doc:`pgr_analyzeGraph " -#~ "`。" - -#~ msgid "Return columns change: ``seq`` is removed" -#~ msgstr "返回列更改：``seq``被删除" - -#~ msgid "RETURNS SET OF |result-node|" -#~ msgstr "RETURNS SET OF |result-node|" - -#~ msgid "`pgr_bdAstar(` `One to Many`_ `)`" -#~ msgstr "`pgr_bdAstar(` `一对多`_ `)`" - -#~ msgid "`pgr_bdAstar(` `Many to One`_ `)`" -#~ msgstr "`pgr_bdAstar(` `多对一`_ `)`" - -#~ msgid "`pgr_bdAstar(` `Many to Many`_ `)`" -#~ msgstr "`pgr_bdAstar(` `多对多`_ `)`" - -#~ msgid "`pgr_bdAstar(` `Combinations`_ `)`" -#~ msgstr "`pgr_bdAstar(` `组合`_ `)`" - -#~ msgid "RETURNS SET OF |old-generic-result|" -#~ msgstr "RETURNS SET OF |old-generic-result|" - -#~ msgid "RETURNS SET OF |result-1-1|" -#~ msgstr "RETURNS SET OF |result-1-1|" - -#~ msgid "RETURNS SET OF |result-1-m|" -#~ msgstr "RETURNS SET OF |result-1-m|" - -#~ msgid "RETURNS SET OF |result-m-1|" -#~ msgstr "RETURNS SET OF |result-m-1|" - -#~ msgid "" -#~ "pgr_bellmanFord(`Edges SQL`_, **start vids**, **end vid** , " -#~ "[``directed``])" -#~ msgstr "" -#~ "pgr_bellmanFord(`Edges SQL`_, **start vids**, **end vid** , " -#~ "[``directed``])" - -#~ msgid "Return columns change:" -#~ msgstr "返回列更改：" - -#~ msgid "RETURNS SET OF |result-component-E|" -#~ msgstr "RETURNS SET OF |result-component-E|" - -#~ msgid "" -#~ "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:`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." -#~ msgstr "" -#~ "众所周知，在无权图中，可以使用广度优先搜索（Breadth First Search）找到从单" -#~ "一源点到所有其他顶点的最短路径，其时间复杂度为 :math:`O(|E|)`，其中 |E| 表" -#~ "示图中的边数。也就是说，这里的距离是指从源点到另一个顶点所需穿越的最小边" -#~ "数。我们也可以将这样的图解释为一个带权图，其中每条边的权重都为 :math:`1`。" -#~ "如果图中的边不都具有相同的权重，那么我们就需要使用更通用的算法，比如" -#~ "Dijkstra算法，它的时间复杂度为 :math:`O(|E|log|V|)`，其中 |E| 表示图中的边" -#~ "数，|V| 表示图中的顶点数。" - -#~ msgid "Optional Parameters" -#~ msgstr "可选参数" - -#~ msgid "" -#~ "The algorithm checks graph is bipartite or not. If it is bipartite then " -#~ "it returns the node along with two colors `0` and `1` which represents " -#~ "two different sets." -#~ msgstr "" -#~ "该算法检查图是否是二分图。如果是二分图，它将返回节点以及分别代表两个不同集" -#~ "合的两种颜色，分别为 `0` 和 `1`。" - -#~ msgid "Returns set of |result-contract|" -#~ msgstr "返回集合 |result-contract|" - -#~ msgid "" -#~ "``text`` Condition to SELECT a subset or rows. Default value is " -#~ "``true`` to indicate all rows that where ``source`` or ``target`` have a " -#~ "null value, otherwise the condition is used." -#~ msgstr "" -#~ "``text`` 用于选择一组行的条件。默认值为 ``true``，表示选择所有具有空值的 " -#~ "``source`` 或 ``target`` 的行，否则将使用条件。" - -#~ msgid "" -#~ "``boolean`` Clean any previous topology. Default value is ``false``." -#~ msgstr "``boolean`` 清除任何先前的拓扑信息。默认值为 ``false``。" - -#~ msgid "" -#~ "``integer`` Indicator that the vertex might have a problem. See :doc:" -#~ "`pgr_analyzeGraph`." -#~ msgstr "" -#~ "``integer`` 表示该顶点可能存在问题的指标。请参阅 :doc:`pgr_analyzeGraph`。" - -#~ msgid "" -#~ "The reconstruction of the vertices table function accepts the following " -#~ "parameters:" -#~ msgstr "顶点表的重建函数接受以下参数：" - -#~ msgid "" -#~ "``text`` Condition to SELECT a subset or rows. Default value is " -#~ "``true`` to indicate all rows." -#~ msgstr "" -#~ "``text`` 用于选择行的子集的条件。默认值为 ``true``，表示选择所有行。" - -#~ msgid "" -#~ ":doc:`topology-functions` for an overview of a topology for routing " -#~ "algorithms." -#~ msgstr ":doc:`topology-functions` 用于路由算法拓扑的概述。" - -#~ msgid "Returns SET OF ``(seq, node)``" -#~ msgstr "Returns SET OF ``(seq, node)``" - -#~ msgid "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vid**)" -#~ msgstr "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vid**)" - -#~ msgid "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vids**)" -#~ msgstr "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vids**)" - -#~ msgid "From vertex :math:`5` to vertex :math:`11` on a **directed** graph" -#~ msgstr "在**有向**图上，从顶点:math:`5`到顶点 :math:`11`" - -#~ msgid "Resturn Columns" -#~ msgstr "返回列" - -#~ msgid "" -#~ "pgr_drivingDistance(`Edges SQL`_, **Root vid**, **distance**, " -#~ "[``directed``])" -#~ msgstr "" -#~ "pgr_drivingDistance(`Edges SQL`_, **Root vid**, **distance**, " -#~ "[``directed``])" - -#~ msgid "" -#~ "the chromatic number :math:`x'(G)` (minimum number of colors needed for " -#~ "proper edge coloring of graph) is equal to the degree :math:`\\Delta + " -#~ "1` of the graph, (:math:`x'(G) = \\Delta`)" -#~ msgstr "" -#~ "色数 :math:`x'(G)`（适当的图边着色所需的最小颜色数）等于图的度 :math:" -#~ "`\\Delta + 1`，即 :math:`x'(G) = \\Delta`" - -#~ msgid "RETURNS SET OF |result-edge-color|" -#~ msgstr "RETURNS SET OF |result-edge-color|" - -#~ msgid "RETURNS SET OF |result-disjoint|" -#~ msgstr "返回 |result-disjoint| 的集合" - -#~ msgid "RETURNS SET OF |result-disjoint-1-1|" -#~ msgstr "返回|result-disjoint-1-1|集合" - -#~ msgid "RETURNS SET OF |result-disjoint-1-m|" -#~ msgstr "返回 |result-disjoint-1-m|集合" - -#~ msgid "RETURNS SET OF |result-disjoint-m-1|" -#~ msgstr "返回|result-disjoint-m-1|集合" - -#~ msgid "RETURNS SET OF |result-disjoint-m-m|" -#~ msgstr "返回 |result-disjoint-m-m|集合" - -#~ msgid "" -#~ "``pgr_edwardMoore`` — Returns the shortest path using Edward-Moore " -#~ "algorithm." -#~ msgstr "``pgr_edwardMoore`` - 使用 Edward-Moore 算法返回最短路径。" - -#~ msgid "`start vid` ascending" -#~ msgstr "`start vid`升序" - -#~ msgid "`end vid` ascending" -#~ msgstr "`end vid`升序" - -#~ msgid "Dryrun execution" -#~ msgstr "试运行执行" - -#~ msgid "RETURNS SET OF |result-find|" -#~ msgstr "RETURNS SET OF |result-find|" - -#~ msgid "" -#~ "The geometry ``geom``, marked as **g1** and **g2** are the **original " -#~ "points**" -#~ msgstr "几何体 ``geom``，标记 **g1** 和**g2**是**原始点**" - -#~ msgid "" -#~ "``pgr_hawickCircuits`` — Returns the list of cirucits using hawick " -#~ "circuits algorithm." -#~ msgstr "``pgr_hawickCircuits`` — 使用 Hawick 回路算法返回回路列表。" - -#~ msgid "RETURNS SET OF |generic-result|" -#~ msgstr "RETURNS SET OF |generic-result|" - -#~ msgid "RETURNS SET OF |result-mst|" -#~ msgstr "RETURNS SET OF |result-mst|" - -#~ msgid "RETURNS SET OF |result-idom|" -#~ msgstr "RETURNS SET OF |result-idom|" - -#~ msgid "RETURNS SET OF |result-lineg|" -#~ msgstr "RETURNS SET OF |result-lineg|" - -#~ msgid "RETURNS SET OF |result-linegf|" -#~ msgstr "RETURNS SET OF |result-linegf|" - -#~ msgid "RETURNS SET OF |result-component-make|" -#~ msgstr "RETURNS SET OF |result-component-make|" - -#~ msgid "RETURNS SET OF |result-flow-mincost|" -#~ msgstr "RETURNS SET OF |result-flow-mincost|" - -#~ msgid "The output table will have for ``edge_table_noded``" -#~ msgstr "输出表将具有``edge_table_noded``" - -#~ msgid "before image" -#~ msgstr "之前的图像" - -#~ msgid "after image" -#~ msgstr "后面的图像" - -#~ msgid "RETURNS SET OF |result-pickdrop|" -#~ msgstr "RETURNS SET OF |result-pickdrop|" - -#~ msgid "RETURNS SET OF |result-mincut|" -#~ msgstr "RETURNS SET OF |result-mincut|" - -#~ msgid "RETURNS SET OF |result-toposort|" -#~ msgstr "RETURNS SET OF |result-toposort|" - -#~ msgid "RETURNS SET OF |result-closure|" -#~ msgstr "RETURNS SET OF |result-closure|" - -#~ msgid "Deprecated signatures:" -#~ msgstr "弃用签名：" - -#~ msgid "New prototypes:" -#~ msgstr "新原型：" - -#~ msgid "From vertex :math:`6` to vertex :math:`10` on an undirected graph." -#~ msgstr "无向图上从一个顶点 :math:`6`到另一个顶点:math:`10`。" - -#~ msgid "" -#~ "Point :math:`-1` corresponds to the closest edge from point `(2.9,1.8)`." -#~ msgstr "点 :math:`-1`对应于距离点 `(2.9,1.8)`最近的边。" - -#~ msgid "" -#~ "Point :math:`-2` corresponds to the next close edge from point " -#~ "`(2.9,1.8)`." -#~ msgstr "点 :math:`-2`对应于点`(2.9,1.8)` 的下一个闭合边。" - -#~ msgid "RETURNS SET OF |ksp-result|" -#~ msgstr "RETURNS SET OF |ksp-result|" - -#~ msgid "From vertex :math:`3` to vertex :math:`8` on a directed graph" -#~ msgstr "有向图上从顶点 :math:`3`到顶点:math:`8`" - -#~ msgid "From vertex :math:`3` to vertex :math:`8` on an undirected graph" -#~ msgstr "无向图中从顶点:math:`3`到顶点:math:`8`" - -#~ msgid "From vertex :math:`3` to vertex :math:`8` with more alternatives" -#~ msgstr "从一个顶点 :math:`3`到另一个顶点 :math:`8`有更多的选择" - -#~ msgid "RETURNS SET OF |old-pid-result|" -#~ msgstr "RETURNS SET OF |old-pid-result|" - -#~ msgid "RETURNS SET OF |pid-1-m|" -#~ msgstr "RETURNS SET OF |pid-1-m|" - -#~ msgid "RETURNS SET OF |pid-m-1|" -#~ msgstr "RETURNS SET OF |pid-m-1|" - -#~ msgid "RETURNS SET OF |pid-m-m|" -#~ msgstr "RETURNS SET OF |pid-m-m|" - -#~ msgid "Running time: :math:`O(| start\\_vids | * (V \\log V + E))`" -#~ msgstr "运行时间：:math:`O(| start\\_vids | * (V \\log V + E))`" - -#~ msgid "**options:** ``[directed, driving_side]``" -#~ msgstr "**options:** ``[directed, driving_side]``" - -#~ msgid "RETURNS SET OF |matrix-pid|" -#~ msgstr "RETURNS SET OF |matrix-pid|" - -#~ msgid "" -#~ "From point :math:`15` and vertex :math:`6` to point :math:`3` and " -#~ "vertex :math:`1`" -#~ msgstr "从点:math:`15`和顶点 :math:`6`到点 :math:`3` 和顶点:math:`1`" - -#~ msgid "" -#~ "Point :math:`-1` corresponds to the closest edge from point :math:" -#~ "`(2.9,1.8)`." -#~ msgstr "点:math:`-1`对应于距离点 :math:`(2.9,1.8)`最近的边。" - -#~ msgid "" -#~ "Point :math:`-2` corresponds to the next close edge from point :math:" -#~ "`(2.9,1.8)`." -#~ msgstr "点:math:`-2`对应于点 :math:`(2.9,1.8)`的下一个闭合边。" - -#~ msgid "Deprecated signature:" -#~ msgstr "已弃用的签名：" - -#~ msgid "**options:** ``[directed, heap_paths, details]``" -#~ msgstr "**options:** ``[directed, heap_paths, details]``" - -#~ msgid "Deprecated functions" -#~ msgstr "已废弃的函数" - -#~ msgid "Issues" -#~ msgstr "问题" - -#~ msgid "Backport issues fixes" -#~ msgstr "回溯问题修复" - -#~ msgid "" -#~ "`#232 `__: Honor " -#~ "client cancel requests in C /C++ code" -#~ msgstr "" -#~ "`#232 `__：在C/C++代码" -#~ "中响应客户端取消请求" - -#~ msgid "New Experimental functions" -#~ msgstr "新的实验函数" - -#~ msgid "pgr_labelGraph - Use the components family of functions instead." -#~ msgstr "pgr_labelGraph - 使用分量系列函数。" - -#~ msgid "New Signatures:" -#~ msgstr "新签名：" - -#~ msgid "Deprecated Signatures" -#~ msgstr "废弃的签名" - -#~ msgid "Renamed Functions" -#~ msgstr "已重命名的函数" - -#~ msgid "Deprecated function" -#~ msgstr "已废弃的函数" - -#~ msgid "pgr_dijkstra -- to match what is documented" -#~ msgstr "pgr_dijkstra -- 与文档中的内容相匹配" - -#~ msgid "Proposed functionality" -#~ msgstr "拟议函数" - -#~ msgid "Deprecated functions:" -#~ msgstr "已废弃的函数：" - -#~ msgid "pgr_apspWarshall use pgr_floydWarshall instead" -#~ msgstr "pgr_apspWarshall 改用 pgr_floydWarshall" - -#~ msgid "pgr_apspJohnson use pgr_Johnson instead" -#~ msgstr "pgr_apspJohnson 改用 pgr_Johnson" - -#~ msgid "Renamed and deprecated function" -#~ msgstr "已更名和废弃的函数" - -#~ msgid "Starting on PostgreSQL 12::" -#~ msgstr "从 PostgreSQL 12 开始::" - -#~ msgid "**Used on:**" -#~ msgstr "**用于:**" - -#~ msgid "Used on all Via functions" -#~ msgstr "用于所有 Via 函数" - -#~ msgid "Used on" -#~ msgstr "用于" - -#~ msgid "" -#~ "pgr_dijkstra(`Edges SQL`_, **start vid**, **end vid** [, ``directed``])" -#~ msgstr "" -#~ "pgr_dijkstra(`Edges SQL`_, **start vid**, **end vid** [, ``directed``])" - -#~ msgid "RETURNS SET OF |result-node-color|" -#~ msgstr "RETURNS SET OF |result-node-color|" - -#~ msgid "RETURNS SET OF |result-flow|" -#~ msgstr "RETURNS SET OF |result-flow|" - -#~ msgid "RETURNS SET OF |result-bfs|" -#~ msgstr "RETURNS SET OF |result-bfs|" - -#~ msgid "RETURNS SET OF |result-edge|" -#~ msgstr "RETURNS SET OF |result-edge|" - -#~ msgid "RETURNS SET OF |result-1-1-no-seq|" -#~ msgstr "RETURNS SET OF |result-1-1-no-seq|" - -#~ msgid "RETURNS SET OF |result-component-V|" -#~ msgstr "RETURNS SET OF |result-component-V|" - -#~ msgid "RETURNS SET OF |result-contract|" -#~ msgstr "RETURNS SET OF |result-contract|" - -#~ msgid "``text`` Network table name. (may contain the schema name AS well)" -#~ msgstr "``text``网络表名称。（可能包括模式名称）" - -#~ msgid "When the arguments are given in the order described:" -#~ msgstr "当参数按描述的顺序给出时：" - -#~ msgid "We get the same result AS the simplest way to use the function." -#~ msgstr "我们得到与使用该函数的最简单方法相同的结果。" - -#~ msgid "" -#~ "The vertices table is a requierment of the :doc:`pgr_analyzeGraph` and " -#~ "the :doc:`pgr_analyzeOneWay` functions." -#~ msgstr "" -#~ "顶点表是 :doc:`pgr_analyzeGraph`和 :doc:`pgr_analyzeOneWay` 函数的必需条" -#~ "件。" - -#~ msgid "RETURNS SET OF |result-node-order|" -#~ msgstr "RETURNS SET OF |result-node-order|" - -#~ msgid "" -#~ "The results can be used as base code to make a refinement based on the " -#~ "back end development needs." -#~ msgstr "结果可以作为基础代码，根据后端开发需求进行细化。" - -#~ msgid "" -#~ "The subway stations are on the following vertices :math:`\\{ 1, 10, 11\\}`" -#~ msgstr "地铁站位于以下顶点上 :math:``{ 1, 10, 11\\}`" - -#~ msgid "RETURNS SET OF |via-result|" -#~ msgstr "返回 |via-result| 的集合" - -#~ msgid "RETURNS SET OF |result-spantree|" -#~ msgstr "RETURNS SET OF |result-spantree|" - -#~ msgid "Weight of the edge (``source``, ``target``)" -#~ msgstr "边(``source``, ``target``)的权重" - -#~ msgid "" -#~ "``text`` Geometry column name of the network table. Default value is " -#~ "``the_geom``." -#~ msgstr "``text``网络表的几何列名称。 默认值为 ``the_geom``。" - -#~ msgid "" -#~ "``text`` Primary key column name of the network table. Default value is " -#~ "``id``." -#~ msgstr "``text``网络表的主键列名称。 默认值为``id``。" - -#~ msgid "From vertex :math:`6` to vertex :math:`10` on a **directed** graph" -#~ msgstr "在**有向**图上从顶点 :math:`6`到顶点 :math:`10`" - -#~ msgid "" -#~ "From point :math:`1` and vertex :math:`6` to point :math:`3` and vertex :" -#~ "math:`1`" -#~ msgstr "从点 :math:`1`和顶点 :math:`6`到点:math:`3`和顶点 :math:`1`" From 2629123fd7948fe008f71ca1f9b5d50c90ea9ea8 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 20:22:26 -0600 Subject: [PATCH 271/428] tools/testers/doc_queries_generator.pl File names on configuration files must have extension (preferably .pg) Result files extension will be set to filename.result Added: - -level Better control over client_min_messages - -dbname Database nave to override default name - -data Only load the sampledata files Removed: - -pgisver will use the one installed with CASCADE - -force no longer allow to run queries on unsupported version - -dbg Use verbose instead - -debug Use verbose instead - -debug1 Use level instead - -ignorenotice NOTICES and CONTEXT are compared --- tools/testers/doc_queries_generator.pl | 347 ++++++++++--------------- 1 file changed, 141 insertions(+), 206 deletions(-) diff --git a/tools/testers/doc_queries_generator.pl b/tools/testers/doc_queries_generator.pl index f145aef0d7..50594d6c67 100755 --- a/tools/testers/doc_queries_generator.pl +++ b/tools/testers/doc_queries_generator.pl @@ -1,7 +1,7 @@ #! /usr/bin/perl -w =pod -File: aplgorithm testes +File: doc_queries_generator.pl Copyright (c) 2013 pgRouting developers @@ -48,13 +48,11 @@ *dir = *File::Find::dir; *prune = *File::Find::prune; -my $POSGRESQL_MIN_VERSION = '9.2'; +my $POSGRESQL_MIN_VERSION = '12'; my $DOCUMENTATION = 0; -my $INTERNAL_TESTS = 0; +my $DATA = 0; my $VERBOSE = 0; -my $DRYRUN = 0; -my $DEBUG = 0; -my $DEBUG1 = 0; +my $LEVEL = "NOTICE"; my $FORCE = 0; my $DBNAME = "pgr_test__db__test"; @@ -64,35 +62,30 @@ sub Usage { die "Usage: doc_queries_generator.pl -pgver vpg -pgisver vpgis -psql /path/to/psql\n" . - " -pgver vpg - postgresql version\n" . + " -alg 'dir' - directory to select which algorithm subdirs to test\n" . + " -pgver version - postgresql version\n" . " -pghost host - postgresql host or socket directory to use\n" . " -pgport port - postgresql port to use\n" . " -pguser username - postgresql user role to use\n" . - " -pgisver vpgis - postgis version\n" . - " -pgrver vpgr - pgrouting version\n" . + " -dbname name - Database name defaults to $DBNAME\n" . + " -pgrver version - pgrouting version. (Not all compares will pass)\n" . " -psql /path/to/psql - optional path to psql\n" . - " -v - verbose messages for small debuging\n" . - " -dbg - use when CMAKE_BUILD_TYPE = DEBUG\n" . - " -debug - verbose messages for debuging(enter twice for more)\n" . - " -debug1 - DEBUG1 messages (for timing reports)\n" . - " -clean - dropdb pgr_test__db__test\n" . - " -ignorenotice - ignore NOTICE statements when reporting failures\n" . - " -alg 'dir' - directory to select which algorithm subdirs to test\n" . - " -documentation - ONLY generate documentation examples\n" . - " -force - Force tests for unsupported versions >= 9.1 of postgreSQL \n" . - " -h - help\n"; + " -data - only install the sampledata.\n" . + " -l(evel) NOTICE - client_min_messages value. Defaults to $LEVEL. other values can be WARNING, DEBUG3, etc\n" . + " -c(lean) - dropdb before running.\n" . + " -doc(umentation) - ONLY generate documentation examples. LEVEL is set to NOTICE\n" . + " -v(erbose) - verbose messages of the execution\n" . + " -h(elp) - help\n"; } print "RUNNING: doc_queries_generator.pl " . join(" ", @ARGV) . "\n"; -my ($vpg, $postgis_ver, $vpgr, $psql); +my ($vpg, $vpgr, $psql); my $alg = ''; my @testpath = ("docqueries/"); my @test_direcotry = (); my $clean; -my $ignore; -$postgis_ver = ''; while (my $a = shift @ARGV) { if ( $a eq '-pgver') { @@ -107,37 +100,32 @@ sub Usage { elsif ($a eq '-pguser') { $DBUSER = shift @ARGV || Usage(); } - elsif ($a eq '-pgisver') { - $postgis_ver = shift @ARGV || Usage(); - $postgis_ver = " VERSION '$postgis_ver'"; - } elsif ($a eq '-pgrver') { $vpgr = shift @ARGV || Usage(); } elsif ($a eq '-alg') { $alg = shift @ARGV || Usage(); - @testpath = ("docqueries/$alg"); + @testpath = ("$alg"); + } + elsif ($a eq '-dbname') { + $DBNAME = shift @ARGV || Usage(); } elsif ($a eq '-psql') { $psql = shift @ARGV || Usage(); die "'$psql' is not executable!\n" unless -x $psql; } + elsif ($a eq '-data') { + $DATA = 1; + } elsif ($a =~ /^-h/) { Usage(); } - elsif ($a =~ /^-clean/) { - $clean = 1;; - } - elsif ($a =~ /^-ignoren/i) { - $ignore = 1;; + elsif ($a =~ /^-c/i) { + $clean = 1; } - elsif ($a =~ /^-debug1$/i) { - $DEBUG1 = 1 unless $DOCUMENTATION; - } - elsif ($a =~ /^-debug$/i) { - $DEBUG++; - $VERBOSE = 1; + elsif ($a =~ /^-l$/i) { + $LEVEL = $psql = shift @ARGV || Usage(); } elsif ($a =~ /^-v/i) { $VERBOSE = 1; @@ -147,10 +135,6 @@ sub Usage { } elsif ($a =~ /^-doc(umentation)?/i) { $DOCUMENTATION = 1; - $DEBUG1 = 0; # disbale timing reports during documentation generation - } - elsif ($a =~ /^-dbg/i) { - $INTERNAL_TESTS = 1; #directory internalQueryTests is also tested } else { warn "Error: unknown option '$a'\n"; @@ -158,16 +142,18 @@ sub Usage { } } +# documentation gets NOTICE +$LEVEL = "NOTICE" if $DOCUMENTATION; + my $connopts = ""; $connopts .= " -U $DBUSER" if defined $DBUSER; $connopts .= " -h $DBHOST" if defined $DBHOST; $connopts .= " -p $DBPORT" if defined $DBPORT; - -mysystem("dropdb $connopts $DBNAME") if $clean; +print "connoptions '$connopts'\n" if $VERBOSE; %main::tests = (); my @cfgs = (); -my %stats = (z_pass=>0, z_fail=>0, z_crash=>0); +my %stats = (z_pass=>0, z_fail=>0, z_crash=>0,RunTimeTotal=>0); my $TMP = "/tmp/pgr-test-runner-$$"; my $TMP2 = "/tmp/pgr-test-runner-$$-2"; my $TMP3 = "/tmp/pgr-test-runner-$$-3"; @@ -186,15 +172,19 @@ sub Usage { print "Operative system found: $OS\n"; +createTestDB($DBNAME); + +# Load the sample data & any other relevant data files +mysystem("$psql $connopts -A -t -q -f tools/testers/sampledata.sql $DBNAME >> $TMP2 2>\&1 "); + +if ($DATA) {exit 0;}; + # Traverse desired filesystems File::Find::find({wanted => \&want_tests}, @testpath); -die "Error: no test files found. Run this command from the top level pgRouting directory!\n" unless @cfgs; - -createTestDB($DBNAME); +die "Error: no queries files found. Run this command from the top path of pgRouting repository!\n" unless @cfgs; $vpg = '' if ! $vpg; -$postgis_ver = '' if ! $postgis_ver; # cfgs = SET of configuration file names # c one file in cfgs @@ -209,22 +199,14 @@ sub Usage { print Data::Dumper->Dump([\%main::tests],['test']) if $VERBOSE; - if ($main::tests{any} && !$DOCUMENTATION) { - push @{$stats{$c}}, run_test($c, $main::tests{any}); - $found++; - } - elsif ($main::tests{any}{documentation} && $DOCUMENTATION) { - push @{$stats{$c}}, run_test($c, $main::tests{any}); - $found++; - } + run_test($c, $main::tests{any}); + $found++; if (! $found) { - $stats{$c} = "No tests were found for '$vpg-$postgis_ver'!"; + $stats{$c} = "No files found for '$c'!"; } } -dropTestDB(); - print Data::Dumper->Dump([\%stats], ['stats']); unlink $TMP; @@ -238,237 +220,193 @@ sub Usage { exit 0; # signal we passed all the tests -# c one file in cfgs +# file one file in cfgs # t contents of array that has keys comment, data and test sub run_test { - my $c = shift; + my $confFile = shift; my $t = shift; - my %res = (); - - my $dir = dirname($c); - $res{comment} = $t->{comment} if $t->{comment}; - #t->{data} referencing the key data of the data files + my $dir = dirname($confFile); - my $singleDB = "____pgr___single_test___"; - for my $testName (@{$t->{singleTest}}) { - createTestDB($singleDB); - mysystem("$psql $connopts -A -t -q -f tools/testers/sampledata.sql' $singleDB >> $TMP2 2>\&1 "); - for my $x (@{$t->{data}}) { - mysystem("$psql $connopts -A -t -q -f '$dir/$x' $singleDB >> $TMP2 2>\&1 "); - } - process_single_test($testName, $dir, $singleDB,\%res); - mysystem("dropdb $connopts $singleDB"); + # There is data to load relative to the directory + for my $datafile (@{$t->{data}}) { + mysystem("$psql $connopts -A -t -q -f '$dir/$datafile' $DBNAME >> $TMP2 2>\&1 "); } - mysystem("$psql $connopts -A -t -q -f tools/testers/sampledata.sql $DBNAME >> $TMP2 2>\&1 "); - for my $x (@{$t->{data}}) { - mysystem("$psql $connopts -A -t -q -f '$dir/$x' $DBNAME >> $TMP2 2>\&1 "); + for my $file (@{$t->{files}}) { + process_single_test($file, $dir, $DBNAME); } - if ($INTERNAL_TESTS) { - for my $x (@{$t->{debugtests}}) { - process_single_test($x, $dir,, $DBNAME, \%res) + # Just in case but its not used + if ($OS =~/msys/ || $OS=~/MSW/ || $OS =~/cygwin/) { + for my $x (@{$t->{windows}}) { + process_single_test($x, $dir, $DBNAME) } - } - if ($DOCUMENTATION) { - for my $x (@{$t->{documentation}}) { - process_single_test($x, $dir,, $DBNAME, \%res); - my $cmd = q(perl -pi -e 's/[ \t]+$//'); - $cmd .= " $dir/$x.result"; - mysystem( $cmd ); - } - } - else { - for my $x (@{$t->{tests}}) { - process_single_test($x, $dir,, $DBNAME, \%res) + } elsif ($OS=~/Mac/ || $OS=~/dar/) { + for my $x (@{$t->{macos}}) { + process_single_test($x, $dir, $DBNAME) } - if ($OS =~/msys/ || $OS=~/MSW/ || $OS =~/cygwin/) { - for my $x (@{$t->{windows}}) { - process_single_test($x, $dir,, $DBNAME, \%res) - } - } elsif ($OS=~/Mac/ || $OS=~/dar/) { - for my $x (@{$t->{macos}}) { - process_single_test($x, $dir,, $DBNAME, \%res) - } - } else { - for my $x (@{$t->{linux}}) { - process_single_test($x, $dir,, $DBNAME, \%res) - } + } else { + for my $x (@{$t->{linux}}) { + process_single_test($x, $dir, $DBNAME) } } - - return \%res; } +# file: file to be processed. Example: johnson.pg +# dir: apth of the file. Example: docqueries/allpairs/ +# database: the database name: Example: pgr_test__db__test +# each tests will use clean data + sub process_single_test{ - my $x = shift; + my $file = shift; my $dir = shift; my $database = shift; - my $res = shift; - #each tests will use clean data - print "Processing queries $dir/$x"; + (my $filename = $file) =~ s/((\.[^.\s]+)+)$//; + my $inputFile = "$dir/$file"; + my $resultsFile = "$dir/$filename.result"; + + print "Processing $inputFile"; my $t0 = [gettimeofday]; - #TIN = test_input_file - open(TIN, "$dir/$x.test.sql") || do { - $res->{"$dir/$x.test.sql"} = "FAILED: could not open '$dir/$x.test.sql' : $!"; + + # Load the sample data & any other relevant data files + mysystem("$psql $connopts -A -t -q -f tools/testers/sampledata.sql $DBNAME >> $TMP2 2>\&1 "); + + # TIN = test input file + open(TIN, "$inputFile") || do { + print "\tFAILED: could not open '$inputFile \n"; + $stats{"$inputFile"} = "FAILED: could not open '$inputFile' : $!"; $stats{z_fail}++; - next; + return; }; - my $level = "NOTICE"; - $level = "WARNING" if $ignore; - $level = "DEBUG3" if $DEBUG1; + # Processing is handled kinda like a file + # Where the commands are stored on PSQL file + # When the PSQL is closed is when everything gets executed + # Connect to the database with PSQL if ($DOCUMENTATION) { - open(PSQL, "|$psql $connopts --set='VERBOSITY terse' -e $database > $dir/$x.result 2>\&1 ") || do { - $res->{"$dir/$x.test.sql"} = "FAILED: could not open connection to db : $!"; + # For rewriting the results files + # Do the rewrite or store FAILURE + open(PSQL, "|$psql $connopts --set='VERBOSITY terse' -e $database > $resultsFile 2>\&1 ") || do { + $stats{"$inputFile"} = "FAILED: could not open connection to db : $!"; + $stats{z_fail}++; next; }; - } - else { - #open(PSQL, "|$psql $connopts --set='VERBOSITY terse' -e $database > $dir/$x.result 2>\&1 ") || do { - # $res->{"$dir/$x.test.sql"} = "FAILED: could not open connection to db : $!"; - # $stats{z_fail}++; - # next; - #}; - + } else { + # For comparing the result + # Create temp file with current results open(PSQL, "|$psql $connopts --set='VERBOSITY terse' -e $database > $TMP 2>\&1 ") || do { - $res->{"$dir/$x.test.sql"} = "FAILED: could not open connection to db : $!"; - if (!$INTERNAL_TESTS) { - $stats{z_fail}++; - } + $stats{"$inputFile"} = "FAILED: could not open connection to db : $!"; + $stats{z_fail}++; next; }; } - - my @d = (); - @d = ; #reads the whole file into the array @d + # Read the whole (input) file into the array @d + my @queries = (); + @queries = ; print PSQL "BEGIN;\n"; - print PSQL "SET client_min_messages TO $level;\n"; - #prints the whole fle stored in @d - print PSQL @d; + print PSQL "SET client_min_messages TO $LEVEL;\n"; + # prints the whole fle stored in @queries + print PSQL @queries; print PSQL "\nROLLBACK;"; # executes everything close(PSQL); + #closes the input file /TIN = test input close(TIN); + my $runTime = tv_interval($t0, [gettimeofday]); + print "\tRun time: $runTime"; + $stats{RunTimeTotal} += $runTime; + if ($DOCUMENTATION) { + # convert tabs to spaces print "\n"; + my $cmd = q(perl -pi -e 's/[ \t]+$//'); + $cmd .= " $resultsFile"; + mysystem( $cmd ); return; } - my $dfile; - my $dfile2; - if ($ignore) { #decide how to compare results, if ignoring or not ignoring - $dfile2 = $TMP2; - mysystem("grep -v NOTICE '$TMP' | grep -v '^CONTEXT:' | grep -v '^PL/pgSQL function' | grep -v '^COPY' > $dfile2"); - $dfile = $TMP3; - mysystem("grep -v NOTICE '$dir/$x.result' | grep -v '^CONTEXT:' | grep -v '^PL/pgSQL function' | grep -v '^COPY' > $dfile"); - } - elsif ($DEBUG1) { #to delete CONTEXT lines - $dfile2 = $TMP2; - mysystem("grep -v '^CONTEXT:' '$TMP' | grep -v '^PL/pgSQL function' | grep -v '^COPY' > $dfile2"); - $dfile = $TMP3; - mysystem("grep -v '^CONTEXT:' '$dir/$x.result' | grep -v '^PL/pgSQL function' | grep -v '^COPY' > $dfile"); - } - else { - $dfile2 = $TMP2; - mysystem("grep -v '^COPY' '$TMP' | grep -v 'psql:tools' > $dfile2"); - $dfile = $TMP3; - mysystem("grep -v '^COPY' '$dir/$x.result' | grep -v 'psql:tools' > $dfile"); - } - if (! -f "$dir/$x.result") { - $res->{"$dir/$x.test.sql"} = "\nFAILED: result file missing : $!"; + if (! -f "$resultsFile") { + $stats{"$inputFile"} = "\nFAILED: '$resultsFile` file missing : $!"; $stats{z_fail}++; next; } - # use diff -w to ignore white space differences like \r vs \r\n - #ignore white spaces when comparing - #dfile is expected results - #dfile2 is the actual results - my $r = `diff -w '$dfile' '$dfile2' `; + # diff ignore white spaces when comparing + my $originalDiff = `diff -w '$resultsFile' '$TMP' `; + #looks for removing leading blanks and trailing blanks - $r =~ s/^\s*|\s*$//g; - if ($r =~ /connection to server was lost/) { - $res->{"$dir/$x.test.sql"} = "CRASHED SERVER: $r"; + $originalDiff =~ s/^\s*|\s*$//g; + if ($originalDiff =~ /connection to server was lost/) { + # when the server crashed + $stats{"$inputFile"} = "CRASHED SERVER: $originalDiff"; $stats{z_crash}++; # allow the server some time to recover from the crash - warn "CRASHED SERVER: '$dir/$x.test.sql', sleeping 5 ...\n"; + warn "CRASHED SERVER: '$inputFile', sleeping 5 ...\n"; sleep 20; - } - #if the diff has 0 length then everything was the same, so here we detect changes - elsif (length($r)) { - $res->{"$dir/$x.test.sql"} = "FAILED: $r"; - $stats{z_fail}++ unless $DEBUG1; + } elsif (length($originalDiff)) { + # Things changed print the diff + $stats{"$inputFile"} = "FAILED: $originalDiff"; + $stats{z_fail}++ unless $LEVEL ne "NOTICE"; print "\t FAIL\n"; - } - else { - $res->{"$dir/$x.test.sql"} = "Passed"; + } else { $stats{z_pass}++; print "\t PASS\n"; } - print " test run time: " . tv_interval($t0, [gettimeofday]) . "\n"; } sub createTestDB { + print "-> createTestDB\n" if $VERBOSE; my $databaseName = shift; - dropTestDB() if dbExists($databaseName); + dropTestDB() if $clean && dbExists($databaseName); my $template; my $dbver = getServerVersion(); my $dbshare = getSharePath($dbver); - if ($DEBUG) { - print "-- DBVERSION: $dbver\n"; - print "-- DBSHARE: $dbshare\n"; + if ($VERBOSE) { + print "\tDBVERSION: $dbver\n"; + print "\tDBSHARE: $dbshare\n"; } die " Unsupported postgreSQL version $dbver Minimum requierment is $POSGRESQL_MIN_VERSION version Use -force to force the tests\n" - unless version_greater_eq($dbver, $POSGRESQL_MIN_VERSION) or ($FORCE and version_greater_eq($dbver, '9.1')); - - die "postGIS extension $postgis_ver not found\n" - unless -f "$dbshare/extension/postgis.control"; - + unless version_greater_eq($dbver, $POSGRESQL_MIN_VERSION); # Create a database with postgis installed in it mysystem("createdb $connopts $databaseName"); - die "ERROR: Failed to create database '$databaseName'!\n" - unless dbExists($databaseName); + die "ERROR: Failed to create database '$databaseName'!\n" unless dbExists($databaseName); my $encoding = ''; if ($OS =~ /msys/ || $OS =~ /MSWin/) { $encoding = "SET client_encoding TO 'UTF8';"; } - print "-- Installing postgis extension $postgis_ver\n" if $DEBUG; - mysystem("$psql $connopts -c \"$encoding CREATE EXTENSION postgis $postgis_ver \" $databaseName"); # Install pgrouting into the database my $myver = ''; if ($vpgr) { $myver = " VERSION '$vpgr'"; } - print "Installing pgrouting extension $myver\n" if $DEBUG; - mysystem("$psql $connopts -c \"CREATE EXTENSION pgrouting $myver\" $databaseName"); + print "Installing pgrouting extension $myver\n" if $VERBOSE; + mysystem("$psql $connopts -c \"CREATE EXTENSION pgrouting $myver CASCADE\" $databaseName"); # Verify pgrouting was installed my $pgrv = `$psql $connopts -c "select pgr_version()" $databaseName`; - die "ERROR: failed to install pgrouting into the database!\n" - unless $pgrv; + die "ERROR: failed to install pgrouting into the database!\n" unless $pgrv; - print `$psql $connopts -c "select version();" postgres `, "\n"; + print `$psql $connopts -c "select version();" $databaseName `, "\n"; print `$psql $connopts -c "select postgis_full_version();" $databaseName `, "\n"; print `$psql $connopts -c "select pgr_full_version();" $databaseName `, "\n"; } @@ -501,13 +439,14 @@ sub version_greater_eq { sub getServerVersion { + print "-> getServerVersion\n" if $VERBOSE; my $v = `$psql $connopts -q -t -c "select version()" postgres`; - print "$psql $connopts -q -t -c \"select version()\" postgres\n # RETURNED: $v\n" if $VERBOSE; + print "\t$psql $connopts -q -t -c \"select version()\" postgres\n # RETURNED: $v\n" if $VERBOSE; if ($v =~ m/PostgreSQL (\d+(\.\d+)?)/) { my $version = $1 + 0; - print " Got: $version\n" if $VERBOSE; + print "\tGot: $version\n" if $VERBOSE; $version = int($version) if $version >= 10; - print " Got: $version\n" if $VERBOSE; + print "\tGot: $version\n" if $VERBOSE; return $version; } return undef; @@ -565,17 +504,13 @@ sub getSharePath { sub mysystem { my $cmd = shift; - print "$cmd\n" if $VERBOSE || $DRYRUN; - system($cmd) unless $DRYRUN; + print "$cmd\n" if $VERBOSE; + system($cmd); } sub want_tests { -# /^bd_d.*\z/s && -# ($File::Find::prune = 1) -# || /^test\.conf\z/s && push @cfgs, $name; - #print join("\n",@cfgs),"\n"; } From 2ff764c29ea01a303c23cae9faa6e7510fb4728e Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:46 -0600 Subject: [PATCH 272/428] (docqueries/allpairs) renaming queries files. Removing prefix andsuffix is pg --- .../allpairs/{doc-floydWarshall.test.sql => floydWarshall.pg} | 0 .../allpairs/{doc-floydWarshall.result => floydWarshall.result} | 0 docqueries/allpairs/{doc-johnson.test.sql => johnson.pg} | 0 docqueries/allpairs/{doc-johnson.result => johnson.result} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/allpairs/{doc-floydWarshall.test.sql => floydWarshall.pg} (100%) rename docqueries/allpairs/{doc-floydWarshall.result => floydWarshall.result} (100%) rename docqueries/allpairs/{doc-johnson.test.sql => johnson.pg} (100%) rename docqueries/allpairs/{doc-johnson.result => johnson.result} (100%) diff --git a/docqueries/allpairs/doc-floydWarshall.test.sql b/docqueries/allpairs/floydWarshall.pg similarity index 100% rename from docqueries/allpairs/doc-floydWarshall.test.sql rename to docqueries/allpairs/floydWarshall.pg diff --git a/docqueries/allpairs/doc-floydWarshall.result b/docqueries/allpairs/floydWarshall.result similarity index 100% rename from docqueries/allpairs/doc-floydWarshall.result rename to docqueries/allpairs/floydWarshall.result diff --git a/docqueries/allpairs/doc-johnson.test.sql b/docqueries/allpairs/johnson.pg similarity index 100% rename from docqueries/allpairs/doc-johnson.test.sql rename to docqueries/allpairs/johnson.pg diff --git a/docqueries/allpairs/doc-johnson.result b/docqueries/allpairs/johnson.result similarity index 100% rename from docqueries/allpairs/doc-johnson.result rename to docqueries/allpairs/johnson.result From 5bb44ae7e5198350aede1db2df2f5c90e19c482f Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:46 -0600 Subject: [PATCH 273/428] (docqueries/alpha_shape) renaming queries files. Removing prefix andsuffix is pg --- .../alpha_shape/{doc-pgr_alphashape.test.sql => alphashape.pg} | 0 .../alpha_shape/{doc-pgr_alphashape.result => alphashape.result} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/alpha_shape/{doc-pgr_alphashape.test.sql => alphashape.pg} (100%) rename docqueries/alpha_shape/{doc-pgr_alphashape.result => alphashape.result} (100%) diff --git a/docqueries/alpha_shape/doc-pgr_alphashape.test.sql b/docqueries/alpha_shape/alphashape.pg similarity index 100% rename from docqueries/alpha_shape/doc-pgr_alphashape.test.sql rename to docqueries/alpha_shape/alphashape.pg diff --git a/docqueries/alpha_shape/doc-pgr_alphashape.result b/docqueries/alpha_shape/alphashape.result similarity index 100% rename from docqueries/alpha_shape/doc-pgr_alphashape.result rename to docqueries/alpha_shape/alphashape.result From 918b17c83cb847676dede25d63c49a3c9aeb594b Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:47 -0600 Subject: [PATCH 274/428] (docqueries/astar) renaming queries files. Removing prefix andsuffix is pg --- docqueries/astar/{doc-aStarCost.test.sql => aStarCost.pg} | 0 docqueries/astar/{doc-aStarCost.result => aStarCost.result} | 0 .../astar/{doc-aStarCostMatrix.test.sql => aStarCostMatrix.pg} | 0 .../astar/{doc-aStarCostMatrix.result => aStarCostMatrix.result} | 0 docqueries/astar/{doc-astar.test.sql => astar.pg} | 0 docqueries/astar/{doc-astar.result => astar.result} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/astar/{doc-aStarCost.test.sql => aStarCost.pg} (100%) rename docqueries/astar/{doc-aStarCost.result => aStarCost.result} (100%) rename docqueries/astar/{doc-aStarCostMatrix.test.sql => aStarCostMatrix.pg} (100%) rename docqueries/astar/{doc-aStarCostMatrix.result => aStarCostMatrix.result} (100%) rename docqueries/astar/{doc-astar.test.sql => astar.pg} (100%) rename docqueries/astar/{doc-astar.result => astar.result} (100%) diff --git a/docqueries/astar/doc-aStarCost.test.sql b/docqueries/astar/aStarCost.pg similarity index 100% rename from docqueries/astar/doc-aStarCost.test.sql rename to docqueries/astar/aStarCost.pg diff --git a/docqueries/astar/doc-aStarCost.result b/docqueries/astar/aStarCost.result similarity index 100% rename from docqueries/astar/doc-aStarCost.result rename to docqueries/astar/aStarCost.result diff --git a/docqueries/astar/doc-aStarCostMatrix.test.sql b/docqueries/astar/aStarCostMatrix.pg similarity index 100% rename from docqueries/astar/doc-aStarCostMatrix.test.sql rename to docqueries/astar/aStarCostMatrix.pg diff --git a/docqueries/astar/doc-aStarCostMatrix.result b/docqueries/astar/aStarCostMatrix.result similarity index 100% rename from docqueries/astar/doc-aStarCostMatrix.result rename to docqueries/astar/aStarCostMatrix.result diff --git a/docqueries/astar/doc-astar.test.sql b/docqueries/astar/astar.pg similarity index 100% rename from docqueries/astar/doc-astar.test.sql rename to docqueries/astar/astar.pg diff --git a/docqueries/astar/doc-astar.result b/docqueries/astar/astar.result similarity index 100% rename from docqueries/astar/doc-astar.result rename to docqueries/astar/astar.result From 07d78e465f3cecfc5ebdb018f0826321553ea4f2 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:47 -0600 Subject: [PATCH 275/428] (docqueries/bdAstar) renaming queries files. Removing prefix andsuffix is pg --- docqueries/bdAstar/{doc-pgr_bdAstar.test.sql => bdAstar.pg} | 0 docqueries/bdAstar/{doc-pgr_bdAstar.result => bdAstar.result} | 0 .../bdAstar/{doc-pgr_bdAstarCost.test.sql => bdAstarCost.pg} | 0 .../bdAstar/{doc-pgr_bdAstarCost.result => bdAstarCost.result} | 0 .../{doc-pgr_bdAstarCostMatrix.test.sql => bdAstarCostMatrix.pg} | 0 ...{doc-pgr_bdAstarCostMatrix.result => bdAstarCostMatrix.result} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/bdAstar/{doc-pgr_bdAstar.test.sql => bdAstar.pg} (100%) rename docqueries/bdAstar/{doc-pgr_bdAstar.result => bdAstar.result} (100%) rename docqueries/bdAstar/{doc-pgr_bdAstarCost.test.sql => bdAstarCost.pg} (100%) rename docqueries/bdAstar/{doc-pgr_bdAstarCost.result => bdAstarCost.result} (100%) rename docqueries/bdAstar/{doc-pgr_bdAstarCostMatrix.test.sql => bdAstarCostMatrix.pg} (100%) rename docqueries/bdAstar/{doc-pgr_bdAstarCostMatrix.result => bdAstarCostMatrix.result} (100%) diff --git a/docqueries/bdAstar/doc-pgr_bdAstar.test.sql b/docqueries/bdAstar/bdAstar.pg similarity index 100% rename from docqueries/bdAstar/doc-pgr_bdAstar.test.sql rename to docqueries/bdAstar/bdAstar.pg diff --git a/docqueries/bdAstar/doc-pgr_bdAstar.result b/docqueries/bdAstar/bdAstar.result similarity index 100% rename from docqueries/bdAstar/doc-pgr_bdAstar.result rename to docqueries/bdAstar/bdAstar.result diff --git a/docqueries/bdAstar/doc-pgr_bdAstarCost.test.sql b/docqueries/bdAstar/bdAstarCost.pg similarity index 100% rename from docqueries/bdAstar/doc-pgr_bdAstarCost.test.sql rename to docqueries/bdAstar/bdAstarCost.pg diff --git a/docqueries/bdAstar/doc-pgr_bdAstarCost.result b/docqueries/bdAstar/bdAstarCost.result similarity index 100% rename from docqueries/bdAstar/doc-pgr_bdAstarCost.result rename to docqueries/bdAstar/bdAstarCost.result diff --git a/docqueries/bdAstar/doc-pgr_bdAstarCostMatrix.test.sql b/docqueries/bdAstar/bdAstarCostMatrix.pg similarity index 100% rename from docqueries/bdAstar/doc-pgr_bdAstarCostMatrix.test.sql rename to docqueries/bdAstar/bdAstarCostMatrix.pg diff --git a/docqueries/bdAstar/doc-pgr_bdAstarCostMatrix.result b/docqueries/bdAstar/bdAstarCostMatrix.result similarity index 100% rename from docqueries/bdAstar/doc-pgr_bdAstarCostMatrix.result rename to docqueries/bdAstar/bdAstarCostMatrix.result From 5d540ff8c46ac217c6ab2316fb7373e358e71800 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:47 -0600 Subject: [PATCH 276/428] (docqueries/bdDijkstra) renaming queries files. Removing prefix andsuffix is pg --- .../bdDijkstra/{bdDijkstra-large.test.sql => bdDijkstra-large.pg} | 0 .../bdDijkstra/{doc-pgr_bdDijkstra.test.sql => bdDijkstra.pg} | 0 .../bdDijkstra/{doc-pgr_bdDijkstra.result => bdDijkstra.result} | 0 .../{doc-pgr_bdDijkstraCost.test.sql => bdDijkstraCost.pg} | 0 .../{doc-pgr_bdDijkstraCost.result => bdDijkstraCost.result} | 0 ...-pgr_bdDijkstraCostMatrix.test.sql => bdDijkstraCostMatrix.pg} | 0 ...gr_bdDijkstraCostMatrix.result => bdDijkstraCostMatrix.result} | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/bdDijkstra/{bdDijkstra-large.test.sql => bdDijkstra-large.pg} (100%) rename docqueries/bdDijkstra/{doc-pgr_bdDijkstra.test.sql => bdDijkstra.pg} (100%) rename docqueries/bdDijkstra/{doc-pgr_bdDijkstra.result => bdDijkstra.result} (100%) rename docqueries/bdDijkstra/{doc-pgr_bdDijkstraCost.test.sql => bdDijkstraCost.pg} (100%) rename docqueries/bdDijkstra/{doc-pgr_bdDijkstraCost.result => bdDijkstraCost.result} (100%) rename docqueries/bdDijkstra/{doc-pgr_bdDijkstraCostMatrix.test.sql => bdDijkstraCostMatrix.pg} (100%) rename docqueries/bdDijkstra/{doc-pgr_bdDijkstraCostMatrix.result => bdDijkstraCostMatrix.result} (100%) diff --git a/docqueries/bdDijkstra/bdDijkstra-large.test.sql b/docqueries/bdDijkstra/bdDijkstra-large.pg similarity index 100% rename from docqueries/bdDijkstra/bdDijkstra-large.test.sql rename to docqueries/bdDijkstra/bdDijkstra-large.pg diff --git a/docqueries/bdDijkstra/doc-pgr_bdDijkstra.test.sql b/docqueries/bdDijkstra/bdDijkstra.pg similarity index 100% rename from docqueries/bdDijkstra/doc-pgr_bdDijkstra.test.sql rename to docqueries/bdDijkstra/bdDijkstra.pg diff --git a/docqueries/bdDijkstra/doc-pgr_bdDijkstra.result b/docqueries/bdDijkstra/bdDijkstra.result similarity index 100% rename from docqueries/bdDijkstra/doc-pgr_bdDijkstra.result rename to docqueries/bdDijkstra/bdDijkstra.result diff --git a/docqueries/bdDijkstra/doc-pgr_bdDijkstraCost.test.sql b/docqueries/bdDijkstra/bdDijkstraCost.pg similarity index 100% rename from docqueries/bdDijkstra/doc-pgr_bdDijkstraCost.test.sql rename to docqueries/bdDijkstra/bdDijkstraCost.pg diff --git a/docqueries/bdDijkstra/doc-pgr_bdDijkstraCost.result b/docqueries/bdDijkstra/bdDijkstraCost.result similarity index 100% rename from docqueries/bdDijkstra/doc-pgr_bdDijkstraCost.result rename to docqueries/bdDijkstra/bdDijkstraCost.result diff --git a/docqueries/bdDijkstra/doc-pgr_bdDijkstraCostMatrix.test.sql b/docqueries/bdDijkstra/bdDijkstraCostMatrix.pg similarity index 100% rename from docqueries/bdDijkstra/doc-pgr_bdDijkstraCostMatrix.test.sql rename to docqueries/bdDijkstra/bdDijkstraCostMatrix.pg diff --git a/docqueries/bdDijkstra/doc-pgr_bdDijkstraCostMatrix.result b/docqueries/bdDijkstra/bdDijkstraCostMatrix.result similarity index 100% rename from docqueries/bdDijkstra/doc-pgr_bdDijkstraCostMatrix.result rename to docqueries/bdDijkstra/bdDijkstraCostMatrix.result From 589dd8fe69a5c01893b9eefa5faab22a0057e153 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:47 -0600 Subject: [PATCH 277/428] (docqueries/bellman_ford) renaming queries files. Removing prefix andsuffix is pg --- .../bellman_ford/{doc-pgr_bellmanFord.test.sql => bellmanFord.pg} | 0 .../{doc-pgr_bellmanFord.result => bellmanFord.result} | 0 .../bellman_ford/{doc-pgr_edwardMoore.test.sql => edwardMoore.pg} | 0 .../{doc-pgr_edwardMoore.result => edwardMoore.result} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/bellman_ford/{doc-pgr_bellmanFord.test.sql => bellmanFord.pg} (100%) rename docqueries/bellman_ford/{doc-pgr_bellmanFord.result => bellmanFord.result} (100%) rename docqueries/bellman_ford/{doc-pgr_edwardMoore.test.sql => edwardMoore.pg} (100%) rename docqueries/bellman_ford/{doc-pgr_edwardMoore.result => edwardMoore.result} (100%) diff --git a/docqueries/bellman_ford/doc-pgr_bellmanFord.test.sql b/docqueries/bellman_ford/bellmanFord.pg similarity index 100% rename from docqueries/bellman_ford/doc-pgr_bellmanFord.test.sql rename to docqueries/bellman_ford/bellmanFord.pg diff --git a/docqueries/bellman_ford/doc-pgr_bellmanFord.result b/docqueries/bellman_ford/bellmanFord.result similarity index 100% rename from docqueries/bellman_ford/doc-pgr_bellmanFord.result rename to docqueries/bellman_ford/bellmanFord.result diff --git a/docqueries/bellman_ford/doc-pgr_edwardMoore.test.sql b/docqueries/bellman_ford/edwardMoore.pg similarity index 100% rename from docqueries/bellman_ford/doc-pgr_edwardMoore.test.sql rename to docqueries/bellman_ford/edwardMoore.pg diff --git a/docqueries/bellman_ford/doc-pgr_edwardMoore.result b/docqueries/bellman_ford/edwardMoore.result similarity index 100% rename from docqueries/bellman_ford/doc-pgr_edwardMoore.result rename to docqueries/bellman_ford/edwardMoore.result From 94a1b65fb5b0574a8647ee03668c1cb8c82ae307 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:47 -0600 Subject: [PATCH 278/428] (docqueries/breadthFirstSearch) renaming queries files. Removing prefix andsuffix is pg --- ...aryBreadthFirstSearch.test.sql => binaryBreadthFirstSearch.pg} | 0 ...yBreadthFirstSearch.result => binaryBreadthFirstSearch.result} | 0 ...{doc-pgr_breadthFirstSearch.test.sql => breadthFirstSearch.pg} | 0 ...oc-pgr_breadthFirstSearch.result => breadthFirstSearch.result} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/breadthFirstSearch/{doc-pgr_binaryBreadthFirstSearch.test.sql => binaryBreadthFirstSearch.pg} (100%) rename docqueries/breadthFirstSearch/{doc-pgr_binaryBreadthFirstSearch.result => binaryBreadthFirstSearch.result} (100%) rename docqueries/breadthFirstSearch/{doc-pgr_breadthFirstSearch.test.sql => breadthFirstSearch.pg} (100%) rename docqueries/breadthFirstSearch/{doc-pgr_breadthFirstSearch.result => breadthFirstSearch.result} (100%) diff --git a/docqueries/breadthFirstSearch/doc-pgr_binaryBreadthFirstSearch.test.sql b/docqueries/breadthFirstSearch/binaryBreadthFirstSearch.pg similarity index 100% rename from docqueries/breadthFirstSearch/doc-pgr_binaryBreadthFirstSearch.test.sql rename to docqueries/breadthFirstSearch/binaryBreadthFirstSearch.pg diff --git a/docqueries/breadthFirstSearch/doc-pgr_binaryBreadthFirstSearch.result b/docqueries/breadthFirstSearch/binaryBreadthFirstSearch.result similarity index 100% rename from docqueries/breadthFirstSearch/doc-pgr_binaryBreadthFirstSearch.result rename to docqueries/breadthFirstSearch/binaryBreadthFirstSearch.result diff --git a/docqueries/breadthFirstSearch/doc-pgr_breadthFirstSearch.test.sql b/docqueries/breadthFirstSearch/breadthFirstSearch.pg similarity index 100% rename from docqueries/breadthFirstSearch/doc-pgr_breadthFirstSearch.test.sql rename to docqueries/breadthFirstSearch/breadthFirstSearch.pg diff --git a/docqueries/breadthFirstSearch/doc-pgr_breadthFirstSearch.result b/docqueries/breadthFirstSearch/breadthFirstSearch.result similarity index 100% rename from docqueries/breadthFirstSearch/doc-pgr_breadthFirstSearch.result rename to docqueries/breadthFirstSearch/breadthFirstSearch.result From bdd377aea899349a2f6ae28e1eed3abe883825ee Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:47 -0600 Subject: [PATCH 279/428] (docqueries/chinese) renaming queries files. Removing prefix andsuffix is pg --- .../{doc-pgr_chinesePostman.test.sql => chinesePostman.pg} | 0 .../{doc-pgr_chinesePostman.result => chinesePostman.result} | 0 ...{doc-pgr_chinesePostmanCost.test.sql => chinesePostmanCost.pg} | 0 ...oc-pgr_chinesePostmanCost.result => chinesePostmanCost.result} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/chinese/{doc-pgr_chinesePostman.test.sql => chinesePostman.pg} (100%) rename docqueries/chinese/{doc-pgr_chinesePostman.result => chinesePostman.result} (100%) rename docqueries/chinese/{doc-pgr_chinesePostmanCost.test.sql => chinesePostmanCost.pg} (100%) rename docqueries/chinese/{doc-pgr_chinesePostmanCost.result => chinesePostmanCost.result} (100%) diff --git a/docqueries/chinese/doc-pgr_chinesePostman.test.sql b/docqueries/chinese/chinesePostman.pg similarity index 100% rename from docqueries/chinese/doc-pgr_chinesePostman.test.sql rename to docqueries/chinese/chinesePostman.pg diff --git a/docqueries/chinese/doc-pgr_chinesePostman.result b/docqueries/chinese/chinesePostman.result similarity index 100% rename from docqueries/chinese/doc-pgr_chinesePostman.result rename to docqueries/chinese/chinesePostman.result diff --git a/docqueries/chinese/doc-pgr_chinesePostmanCost.test.sql b/docqueries/chinese/chinesePostmanCost.pg similarity index 100% rename from docqueries/chinese/doc-pgr_chinesePostmanCost.test.sql rename to docqueries/chinese/chinesePostmanCost.pg diff --git a/docqueries/chinese/doc-pgr_chinesePostmanCost.result b/docqueries/chinese/chinesePostmanCost.result similarity index 100% rename from docqueries/chinese/doc-pgr_chinesePostmanCost.result rename to docqueries/chinese/chinesePostmanCost.result From 501631b2f1d92558de0b24c2c98f0de435f8bb1f Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:47 -0600 Subject: [PATCH 280/428] (docqueries/circuits) renaming queries files. Removing prefix andsuffix is pg --- .../circuits/{hawickCircuits.test.sql => hawickCircuits.pg} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docqueries/circuits/{hawickCircuits.test.sql => hawickCircuits.pg} (100%) diff --git a/docqueries/circuits/hawickCircuits.test.sql b/docqueries/circuits/hawickCircuits.pg similarity index 100% rename from docqueries/circuits/hawickCircuits.test.sql rename to docqueries/circuits/hawickCircuits.pg From 8ee6151cc786a05adb054630aed4612b66ecba7c Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:47 -0600 Subject: [PATCH 281/428] (docqueries/coloring) renaming queries files. Removing prefix andsuffix is pg --- docqueries/coloring/{doc-bipartite.test.sql => bipartite.pg} | 0 docqueries/coloring/{doc-bipartite.result => bipartite.result} | 0 .../coloring/{doc-edgeColoring.test.sql => edgeColoring.pg} | 0 .../coloring/{doc-edgeColoring.result => edgeColoring.result} | 0 ...uentialVertexColoring.test.sql => sequentialVertexColoring.pg} | 0 ...ntialVertexColoring.result => sequentialVertexColoring.result} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/coloring/{doc-bipartite.test.sql => bipartite.pg} (100%) rename docqueries/coloring/{doc-bipartite.result => bipartite.result} (100%) rename docqueries/coloring/{doc-edgeColoring.test.sql => edgeColoring.pg} (100%) rename docqueries/coloring/{doc-edgeColoring.result => edgeColoring.result} (100%) rename docqueries/coloring/{doc-pgr_sequentialVertexColoring.test.sql => sequentialVertexColoring.pg} (100%) rename docqueries/coloring/{doc-pgr_sequentialVertexColoring.result => sequentialVertexColoring.result} (100%) diff --git a/docqueries/coloring/doc-bipartite.test.sql b/docqueries/coloring/bipartite.pg similarity index 100% rename from docqueries/coloring/doc-bipartite.test.sql rename to docqueries/coloring/bipartite.pg diff --git a/docqueries/coloring/doc-bipartite.result b/docqueries/coloring/bipartite.result similarity index 100% rename from docqueries/coloring/doc-bipartite.result rename to docqueries/coloring/bipartite.result diff --git a/docqueries/coloring/doc-edgeColoring.test.sql b/docqueries/coloring/edgeColoring.pg similarity index 100% rename from docqueries/coloring/doc-edgeColoring.test.sql rename to docqueries/coloring/edgeColoring.pg diff --git a/docqueries/coloring/doc-edgeColoring.result b/docqueries/coloring/edgeColoring.result similarity index 100% rename from docqueries/coloring/doc-edgeColoring.result rename to docqueries/coloring/edgeColoring.result diff --git a/docqueries/coloring/doc-pgr_sequentialVertexColoring.test.sql b/docqueries/coloring/sequentialVertexColoring.pg similarity index 100% rename from docqueries/coloring/doc-pgr_sequentialVertexColoring.test.sql rename to docqueries/coloring/sequentialVertexColoring.pg diff --git a/docqueries/coloring/doc-pgr_sequentialVertexColoring.result b/docqueries/coloring/sequentialVertexColoring.result similarity index 100% rename from docqueries/coloring/doc-pgr_sequentialVertexColoring.result rename to docqueries/coloring/sequentialVertexColoring.result From 52cf62e0b0e4162cdedbbd1e396de01ca90c3df5 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:47 -0600 Subject: [PATCH 282/428] (docqueries/common) renaming queries files. Removing prefix andsuffix is pg --- .../common/{versionless-any-01.test.sql => versionless-any-01.pg} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docqueries/common/{versionless-any-01.test.sql => versionless-any-01.pg} (100%) diff --git a/docqueries/common/versionless-any-01.test.sql b/docqueries/common/versionless-any-01.pg similarity index 100% rename from docqueries/common/versionless-any-01.test.sql rename to docqueries/common/versionless-any-01.pg From 606744887b9e1ab46bb817c3d3dc733f383a852b Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:47 -0600 Subject: [PATCH 283/428] (docqueries/components) renaming queries files. Removing prefix andsuffix is pg --- ...{doc-pgr_articulationPoints.test.sql => articulationPoints.pg} | 0 ...oc-pgr_articulationPoints.result => articulationPoints.result} | 0 ...gr_biconnectedComponents.test.sql => biconnectedComponents.pg} | 0 ..._biconnectedComponents.result => biconnectedComponents.result} | 0 docqueries/components/{doc-pgr_bridges.test.sql => bridges.pg} | 0 docqueries/components/{doc-pgr_bridges.result => bridges.result} | 0 ...oc-pgr_connectedComponents.test.sql => connectedComponents.pg} | 0 ...-pgr_connectedComponents.result => connectedComponents.result} | 0 .../{doc-pgr_makeConnected.test.sql => makeConnected.pg} | 0 .../{doc-pgr_makeConnected.result => makeConnected.result} | 0 .../{doc-pgr_strongComponents.test.sql => strongComponents.pg} | 0 .../{doc-pgr_strongComponents.result => strongComponents.result} | 0 12 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/components/{doc-pgr_articulationPoints.test.sql => articulationPoints.pg} (100%) rename docqueries/components/{doc-pgr_articulationPoints.result => articulationPoints.result} (100%) rename docqueries/components/{doc-pgr_biconnectedComponents.test.sql => biconnectedComponents.pg} (100%) rename docqueries/components/{doc-pgr_biconnectedComponents.result => biconnectedComponents.result} (100%) rename docqueries/components/{doc-pgr_bridges.test.sql => bridges.pg} (100%) rename docqueries/components/{doc-pgr_bridges.result => bridges.result} (100%) rename docqueries/components/{doc-pgr_connectedComponents.test.sql => connectedComponents.pg} (100%) rename docqueries/components/{doc-pgr_connectedComponents.result => connectedComponents.result} (100%) rename docqueries/components/{doc-pgr_makeConnected.test.sql => makeConnected.pg} (100%) rename docqueries/components/{doc-pgr_makeConnected.result => makeConnected.result} (100%) rename docqueries/components/{doc-pgr_strongComponents.test.sql => strongComponents.pg} (100%) rename docqueries/components/{doc-pgr_strongComponents.result => strongComponents.result} (100%) diff --git a/docqueries/components/doc-pgr_articulationPoints.test.sql b/docqueries/components/articulationPoints.pg similarity index 100% rename from docqueries/components/doc-pgr_articulationPoints.test.sql rename to docqueries/components/articulationPoints.pg diff --git a/docqueries/components/doc-pgr_articulationPoints.result b/docqueries/components/articulationPoints.result similarity index 100% rename from docqueries/components/doc-pgr_articulationPoints.result rename to docqueries/components/articulationPoints.result diff --git a/docqueries/components/doc-pgr_biconnectedComponents.test.sql b/docqueries/components/biconnectedComponents.pg similarity index 100% rename from docqueries/components/doc-pgr_biconnectedComponents.test.sql rename to docqueries/components/biconnectedComponents.pg diff --git a/docqueries/components/doc-pgr_biconnectedComponents.result b/docqueries/components/biconnectedComponents.result similarity index 100% rename from docqueries/components/doc-pgr_biconnectedComponents.result rename to docqueries/components/biconnectedComponents.result diff --git a/docqueries/components/doc-pgr_bridges.test.sql b/docqueries/components/bridges.pg similarity index 100% rename from docqueries/components/doc-pgr_bridges.test.sql rename to docqueries/components/bridges.pg diff --git a/docqueries/components/doc-pgr_bridges.result b/docqueries/components/bridges.result similarity index 100% rename from docqueries/components/doc-pgr_bridges.result rename to docqueries/components/bridges.result diff --git a/docqueries/components/doc-pgr_connectedComponents.test.sql b/docqueries/components/connectedComponents.pg similarity index 100% rename from docqueries/components/doc-pgr_connectedComponents.test.sql rename to docqueries/components/connectedComponents.pg diff --git a/docqueries/components/doc-pgr_connectedComponents.result b/docqueries/components/connectedComponents.result similarity index 100% rename from docqueries/components/doc-pgr_connectedComponents.result rename to docqueries/components/connectedComponents.result diff --git a/docqueries/components/doc-pgr_makeConnected.test.sql b/docqueries/components/makeConnected.pg similarity index 100% rename from docqueries/components/doc-pgr_makeConnected.test.sql rename to docqueries/components/makeConnected.pg diff --git a/docqueries/components/doc-pgr_makeConnected.result b/docqueries/components/makeConnected.result similarity index 100% rename from docqueries/components/doc-pgr_makeConnected.result rename to docqueries/components/makeConnected.result diff --git a/docqueries/components/doc-pgr_strongComponents.test.sql b/docqueries/components/strongComponents.pg similarity index 100% rename from docqueries/components/doc-pgr_strongComponents.test.sql rename to docqueries/components/strongComponents.pg diff --git a/docqueries/components/doc-pgr_strongComponents.result b/docqueries/components/strongComponents.result similarity index 100% rename from docqueries/components/doc-pgr_strongComponents.result rename to docqueries/components/strongComponents.result From 730736ffdafde4376aa27ce1b4a284f82a790d34 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:47 -0600 Subject: [PATCH 284/428] (docqueries/contraction) renaming queries files. Removing prefix andsuffix is pg --- .../{doc-contraction-family.test.sql => contraction-family.pg} | 0 .../{doc-contraction-family.result => contraction-family.result} | 0 .../contraction/{doc-pgr_contraction.test.sql => contraction.pg} | 0 .../{doc-pgr_contraction.result => contraction.result} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/contraction/{doc-contraction-family.test.sql => contraction-family.pg} (100%) rename docqueries/contraction/{doc-contraction-family.result => contraction-family.result} (100%) rename docqueries/contraction/{doc-pgr_contraction.test.sql => contraction.pg} (100%) rename docqueries/contraction/{doc-pgr_contraction.result => contraction.result} (100%) diff --git a/docqueries/contraction/doc-contraction-family.test.sql b/docqueries/contraction/contraction-family.pg similarity index 100% rename from docqueries/contraction/doc-contraction-family.test.sql rename to docqueries/contraction/contraction-family.pg diff --git a/docqueries/contraction/doc-contraction-family.result b/docqueries/contraction/contraction-family.result similarity index 100% rename from docqueries/contraction/doc-contraction-family.result rename to docqueries/contraction/contraction-family.result diff --git a/docqueries/contraction/doc-pgr_contraction.test.sql b/docqueries/contraction/contraction.pg similarity index 100% rename from docqueries/contraction/doc-pgr_contraction.test.sql rename to docqueries/contraction/contraction.pg diff --git a/docqueries/contraction/doc-pgr_contraction.result b/docqueries/contraction/contraction.result similarity index 100% rename from docqueries/contraction/doc-pgr_contraction.result rename to docqueries/contraction/contraction.result From a270457601a3fbcd03098160b1be8f61e44ea475 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:47 -0600 Subject: [PATCH 285/428] (docqueries/dagShortestPath) renaming queries files. Removing prefix andsuffix is pg --- .../{doc-pgr_dagShortestPath.test.sql => dagShortestPath.pg} | 0 .../{doc-pgr_dagShortestPath.result => dagShortestPath.result} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/dagShortestPath/{doc-pgr_dagShortestPath.test.sql => dagShortestPath.pg} (100%) rename docqueries/dagShortestPath/{doc-pgr_dagShortestPath.result => dagShortestPath.result} (100%) diff --git a/docqueries/dagShortestPath/doc-pgr_dagShortestPath.test.sql b/docqueries/dagShortestPath/dagShortestPath.pg similarity index 100% rename from docqueries/dagShortestPath/doc-pgr_dagShortestPath.test.sql rename to docqueries/dagShortestPath/dagShortestPath.pg diff --git a/docqueries/dagShortestPath/doc-pgr_dagShortestPath.result b/docqueries/dagShortestPath/dagShortestPath.result similarity index 100% rename from docqueries/dagShortestPath/doc-pgr_dagShortestPath.result rename to docqueries/dagShortestPath/dagShortestPath.result From 6dd05f8186828d2843726995ccaa8cbab5765886 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:47 -0600 Subject: [PATCH 286/428] (docqueries/dijkstra) renaming queries files. Removing prefix andsuffix is pg --- docqueries/dijkstra/{doc-pgr_dijkstra.test.sql => dijkstra.pg} | 0 docqueries/dijkstra/{doc-pgr_dijkstra.result => dijkstra.result} | 0 .../dijkstra/{doc-pgr_dijkstraCost.test.sql => dijkstraCost.pg} | 0 .../dijkstra/{doc-pgr_dijkstraCost.result => dijkstraCost.result} | 0 ...{doc-pgr_dijkstraCostMatrix.test.sql => dijkstraCostMatrix.pg} | 0 ...oc-pgr_dijkstraCostMatrix.result => dijkstraCostMatrix.result} | 0 .../dijkstra/{doc-pgr_dijkstraNear.test.sql => dijkstraNear.pg} | 0 .../dijkstra/{doc-pgr_dijkstraNear.result => dijkstraNear.result} | 0 .../{doc-pgr_dijkstraNearCost.test.sql => dijkstraNearCost.pg} | 0 .../{doc-pgr_dijkstraNearCost.result => dijkstraNearCost.result} | 0 .../dijkstra/{doc-pgr_dijkstraVia.test.sql => dijkstraVia.pg} | 0 .../dijkstra/{doc-pgr_dijkstraVia.result => dijkstraVia.result} | 0 12 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/dijkstra/{doc-pgr_dijkstra.test.sql => dijkstra.pg} (100%) rename docqueries/dijkstra/{doc-pgr_dijkstra.result => dijkstra.result} (100%) rename docqueries/dijkstra/{doc-pgr_dijkstraCost.test.sql => dijkstraCost.pg} (100%) rename docqueries/dijkstra/{doc-pgr_dijkstraCost.result => dijkstraCost.result} (100%) rename docqueries/dijkstra/{doc-pgr_dijkstraCostMatrix.test.sql => dijkstraCostMatrix.pg} (100%) rename docqueries/dijkstra/{doc-pgr_dijkstraCostMatrix.result => dijkstraCostMatrix.result} (100%) rename docqueries/dijkstra/{doc-pgr_dijkstraNear.test.sql => dijkstraNear.pg} (100%) rename docqueries/dijkstra/{doc-pgr_dijkstraNear.result => dijkstraNear.result} (100%) rename docqueries/dijkstra/{doc-pgr_dijkstraNearCost.test.sql => dijkstraNearCost.pg} (100%) rename docqueries/dijkstra/{doc-pgr_dijkstraNearCost.result => dijkstraNearCost.result} (100%) rename docqueries/dijkstra/{doc-pgr_dijkstraVia.test.sql => dijkstraVia.pg} (100%) rename docqueries/dijkstra/{doc-pgr_dijkstraVia.result => dijkstraVia.result} (100%) diff --git a/docqueries/dijkstra/doc-pgr_dijkstra.test.sql b/docqueries/dijkstra/dijkstra.pg similarity index 100% rename from docqueries/dijkstra/doc-pgr_dijkstra.test.sql rename to docqueries/dijkstra/dijkstra.pg diff --git a/docqueries/dijkstra/doc-pgr_dijkstra.result b/docqueries/dijkstra/dijkstra.result similarity index 100% rename from docqueries/dijkstra/doc-pgr_dijkstra.result rename to docqueries/dijkstra/dijkstra.result diff --git a/docqueries/dijkstra/doc-pgr_dijkstraCost.test.sql b/docqueries/dijkstra/dijkstraCost.pg similarity index 100% rename from docqueries/dijkstra/doc-pgr_dijkstraCost.test.sql rename to docqueries/dijkstra/dijkstraCost.pg diff --git a/docqueries/dijkstra/doc-pgr_dijkstraCost.result b/docqueries/dijkstra/dijkstraCost.result similarity index 100% rename from docqueries/dijkstra/doc-pgr_dijkstraCost.result rename to docqueries/dijkstra/dijkstraCost.result diff --git a/docqueries/dijkstra/doc-pgr_dijkstraCostMatrix.test.sql b/docqueries/dijkstra/dijkstraCostMatrix.pg similarity index 100% rename from docqueries/dijkstra/doc-pgr_dijkstraCostMatrix.test.sql rename to docqueries/dijkstra/dijkstraCostMatrix.pg diff --git a/docqueries/dijkstra/doc-pgr_dijkstraCostMatrix.result b/docqueries/dijkstra/dijkstraCostMatrix.result similarity index 100% rename from docqueries/dijkstra/doc-pgr_dijkstraCostMatrix.result rename to docqueries/dijkstra/dijkstraCostMatrix.result diff --git a/docqueries/dijkstra/doc-pgr_dijkstraNear.test.sql b/docqueries/dijkstra/dijkstraNear.pg similarity index 100% rename from docqueries/dijkstra/doc-pgr_dijkstraNear.test.sql rename to docqueries/dijkstra/dijkstraNear.pg diff --git a/docqueries/dijkstra/doc-pgr_dijkstraNear.result b/docqueries/dijkstra/dijkstraNear.result similarity index 100% rename from docqueries/dijkstra/doc-pgr_dijkstraNear.result rename to docqueries/dijkstra/dijkstraNear.result diff --git a/docqueries/dijkstra/doc-pgr_dijkstraNearCost.test.sql b/docqueries/dijkstra/dijkstraNearCost.pg similarity index 100% rename from docqueries/dijkstra/doc-pgr_dijkstraNearCost.test.sql rename to docqueries/dijkstra/dijkstraNearCost.pg diff --git a/docqueries/dijkstra/doc-pgr_dijkstraNearCost.result b/docqueries/dijkstra/dijkstraNearCost.result similarity index 100% rename from docqueries/dijkstra/doc-pgr_dijkstraNearCost.result rename to docqueries/dijkstra/dijkstraNearCost.result diff --git a/docqueries/dijkstra/doc-pgr_dijkstraVia.test.sql b/docqueries/dijkstra/dijkstraVia.pg similarity index 100% rename from docqueries/dijkstra/doc-pgr_dijkstraVia.test.sql rename to docqueries/dijkstra/dijkstraVia.pg diff --git a/docqueries/dijkstra/doc-pgr_dijkstraVia.result b/docqueries/dijkstra/dijkstraVia.result similarity index 100% rename from docqueries/dijkstra/doc-pgr_dijkstraVia.result rename to docqueries/dijkstra/dijkstraVia.result From 8304639eb41b1fa99ea16bcbb6353cfc46b3fe3f Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:47 -0600 Subject: [PATCH 287/428] (docqueries/dominator) renaming queries files. Removing prefix andsuffix is pg --- ...arjanDominatorTree.test.sql => lengauerTarjanDominatorTree.pg} | 0 ...janDominatorTree.result => lengauerTarjanDominatorTree.result} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/dominator/{doc-lengauerTarjanDominatorTree.test.sql => lengauerTarjanDominatorTree.pg} (100%) rename docqueries/dominator/{doc-lengauerTarjanDominatorTree.result => lengauerTarjanDominatorTree.result} (100%) diff --git a/docqueries/dominator/doc-lengauerTarjanDominatorTree.test.sql b/docqueries/dominator/lengauerTarjanDominatorTree.pg similarity index 100% rename from docqueries/dominator/doc-lengauerTarjanDominatorTree.test.sql rename to docqueries/dominator/lengauerTarjanDominatorTree.pg diff --git a/docqueries/dominator/doc-lengauerTarjanDominatorTree.result b/docqueries/dominator/lengauerTarjanDominatorTree.result similarity index 100% rename from docqueries/dominator/doc-lengauerTarjanDominatorTree.result rename to docqueries/dominator/lengauerTarjanDominatorTree.result From 8693293b1122fedfa5cf8d3d3d83e0fdb26f6657 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:47 -0600 Subject: [PATCH 288/428] (docqueries/driving_distance) renaming queries files. Removing prefix andsuffix is pg --- .../{dijksraDD-issue729.test.sql => dijksraDD-issue729.pg} | 0 .../{pgr_drivingDistance.test.sql => drivingDistance.pg} | 0 .../{pgr_drivingDistance.result => drivingDistance.result} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/driving_distance/{dijksraDD-issue729.test.sql => dijksraDD-issue729.pg} (100%) rename docqueries/driving_distance/{pgr_drivingDistance.test.sql => drivingDistance.pg} (100%) rename docqueries/driving_distance/{pgr_drivingDistance.result => drivingDistance.result} (100%) diff --git a/docqueries/driving_distance/dijksraDD-issue729.test.sql b/docqueries/driving_distance/dijksraDD-issue729.pg similarity index 100% rename from docqueries/driving_distance/dijksraDD-issue729.test.sql rename to docqueries/driving_distance/dijksraDD-issue729.pg diff --git a/docqueries/driving_distance/pgr_drivingDistance.test.sql b/docqueries/driving_distance/drivingDistance.pg similarity index 100% rename from docqueries/driving_distance/pgr_drivingDistance.test.sql rename to docqueries/driving_distance/drivingDistance.pg diff --git a/docqueries/driving_distance/pgr_drivingDistance.result b/docqueries/driving_distance/drivingDistance.result similarity index 100% rename from docqueries/driving_distance/pgr_drivingDistance.result rename to docqueries/driving_distance/drivingDistance.result From a6f587bf997491e46a96d05849a6ca62136091e6 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:47 -0600 Subject: [PATCH 289/428] (docqueries/ksp) renaming queries files. Removing prefix andsuffix is pg --- docqueries/ksp/{doc-ksp.test.sql => ksp.pg} | 0 docqueries/ksp/{doc-ksp.result => ksp.result} | 0 ...{doc-pgr_turnRestrictedPath.test.sql => turnRestrictedPath.pg} | 0 ...oc-pgr_turnRestrictedPath.result => turnRestrictedPath.result} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/ksp/{doc-ksp.test.sql => ksp.pg} (100%) rename docqueries/ksp/{doc-ksp.result => ksp.result} (100%) rename docqueries/ksp/{doc-pgr_turnRestrictedPath.test.sql => turnRestrictedPath.pg} (100%) rename docqueries/ksp/{doc-pgr_turnRestrictedPath.result => turnRestrictedPath.result} (100%) diff --git a/docqueries/ksp/doc-ksp.test.sql b/docqueries/ksp/ksp.pg similarity index 100% rename from docqueries/ksp/doc-ksp.test.sql rename to docqueries/ksp/ksp.pg diff --git a/docqueries/ksp/doc-ksp.result b/docqueries/ksp/ksp.result similarity index 100% rename from docqueries/ksp/doc-ksp.result rename to docqueries/ksp/ksp.result diff --git a/docqueries/ksp/doc-pgr_turnRestrictedPath.test.sql b/docqueries/ksp/turnRestrictedPath.pg similarity index 100% rename from docqueries/ksp/doc-pgr_turnRestrictedPath.test.sql rename to docqueries/ksp/turnRestrictedPath.pg diff --git a/docqueries/ksp/doc-pgr_turnRestrictedPath.result b/docqueries/ksp/turnRestrictedPath.result similarity index 100% rename from docqueries/ksp/doc-pgr_turnRestrictedPath.result rename to docqueries/ksp/turnRestrictedPath.result From 6abb1cc0dca47589cc1396ab198e3fe719627e1b Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:47 -0600 Subject: [PATCH 290/428] (docqueries/lineGraph) renaming queries files. Removing prefix andsuffix is pg --- docqueries/lineGraph/{doc-pgr_lineGraph.test.sql => lineGraph.pg} | 0 .../lineGraph/{doc-pgr_lineGraph.result => lineGraph.result} | 0 .../{doc-pgr_lineGraphFull.test.sql => lineGraphFull.pg} | 0 .../{doc-pgr_lineGraphFull.result => lineGraphFull.result} | 0 ...esign_lineGraphFull.test.sql => pgtap_design_lineGraphFull.pg} | 0 .../lineGraph/{proofOfConcept1.test.sql => proofOfConcept1.pg} | 0 .../lineGraph/{proofOfConcept2.test.sql => proofOfConcept2.pg} | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/lineGraph/{doc-pgr_lineGraph.test.sql => lineGraph.pg} (100%) rename docqueries/lineGraph/{doc-pgr_lineGraph.result => lineGraph.result} (100%) rename docqueries/lineGraph/{doc-pgr_lineGraphFull.test.sql => lineGraphFull.pg} (100%) rename docqueries/lineGraph/{doc-pgr_lineGraphFull.result => lineGraphFull.result} (100%) rename docqueries/lineGraph/{pgtap_design_lineGraphFull.test.sql => pgtap_design_lineGraphFull.pg} (100%) rename docqueries/lineGraph/{proofOfConcept1.test.sql => proofOfConcept1.pg} (100%) rename docqueries/lineGraph/{proofOfConcept2.test.sql => proofOfConcept2.pg} (100%) diff --git a/docqueries/lineGraph/doc-pgr_lineGraph.test.sql b/docqueries/lineGraph/lineGraph.pg similarity index 100% rename from docqueries/lineGraph/doc-pgr_lineGraph.test.sql rename to docqueries/lineGraph/lineGraph.pg diff --git a/docqueries/lineGraph/doc-pgr_lineGraph.result b/docqueries/lineGraph/lineGraph.result similarity index 100% rename from docqueries/lineGraph/doc-pgr_lineGraph.result rename to docqueries/lineGraph/lineGraph.result diff --git a/docqueries/lineGraph/doc-pgr_lineGraphFull.test.sql b/docqueries/lineGraph/lineGraphFull.pg similarity index 100% rename from docqueries/lineGraph/doc-pgr_lineGraphFull.test.sql rename to docqueries/lineGraph/lineGraphFull.pg diff --git a/docqueries/lineGraph/doc-pgr_lineGraphFull.result b/docqueries/lineGraph/lineGraphFull.result similarity index 100% rename from docqueries/lineGraph/doc-pgr_lineGraphFull.result rename to docqueries/lineGraph/lineGraphFull.result diff --git a/docqueries/lineGraph/pgtap_design_lineGraphFull.test.sql b/docqueries/lineGraph/pgtap_design_lineGraphFull.pg similarity index 100% rename from docqueries/lineGraph/pgtap_design_lineGraphFull.test.sql rename to docqueries/lineGraph/pgtap_design_lineGraphFull.pg diff --git a/docqueries/lineGraph/proofOfConcept1.test.sql b/docqueries/lineGraph/proofOfConcept1.pg similarity index 100% rename from docqueries/lineGraph/proofOfConcept1.test.sql rename to docqueries/lineGraph/proofOfConcept1.pg diff --git a/docqueries/lineGraph/proofOfConcept2.test.sql b/docqueries/lineGraph/proofOfConcept2.pg similarity index 100% rename from docqueries/lineGraph/proofOfConcept2.test.sql rename to docqueries/lineGraph/proofOfConcept2.pg From 228c21f3dd792113cbbbc034b67d8e45d7d1f837 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:47 -0600 Subject: [PATCH 291/428] (docqueries/max_flow) renaming queries files. Removing prefix andsuffix is pg --- .../{doc-pgr_boykovKolmogorov.test.sql => boykovKolmogorov.pg} | 0 .../{doc-pgr_boykovKolmogorov.result => boykovKolmogorov.result} | 0 .../{doc-pgr_edgeDisjointPaths.test.sql => edgeDisjointPaths.pg} | 0 ...{doc-pgr_edgeDisjointPaths.result => edgeDisjointPaths.result} | 0 .../max_flow/{doc-pgr_edmondsKarp.test.sql => edmondsKarp.pg} | 0 .../max_flow/{doc-pgr_edmondsKarp.result => edmondsKarp.result} | 0 ...oc-pgr_maxCardinalityMatch.test.sql => maxCardinalityMatch.pg} | 0 ...-pgr_maxCardinalityMatch.result => maxCardinalityMatch.result} | 0 docqueries/max_flow/{doc-pgr_maxFlow.test.sql => maxFlow.pg} | 0 docqueries/max_flow/{doc-pgr_maxFlow.result => maxFlow.result} | 0 .../{doc-pgr_maxFlowMinCost.test.sql => maxFlowMinCost.pg} | 0 .../{doc-pgr_maxFlowMinCost.result => maxFlowMinCost.result} | 0 ...oc-pgr_maxFlowMinCost_Cost.test.sql => maxFlowMinCost_Cost.pg} | 0 ...-pgr_maxFlowMinCost_Cost.result => maxFlowMinCost_Cost.result} | 0 .../max_flow/{doc-pgr_pushRelabel.test.sql => pushRelabel.pg} | 0 .../max_flow/{doc-pgr_pushRelabel.result => pushRelabel.result} | 0 16 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/max_flow/{doc-pgr_boykovKolmogorov.test.sql => boykovKolmogorov.pg} (100%) rename docqueries/max_flow/{doc-pgr_boykovKolmogorov.result => boykovKolmogorov.result} (100%) rename docqueries/max_flow/{doc-pgr_edgeDisjointPaths.test.sql => edgeDisjointPaths.pg} (100%) rename docqueries/max_flow/{doc-pgr_edgeDisjointPaths.result => edgeDisjointPaths.result} (100%) rename docqueries/max_flow/{doc-pgr_edmondsKarp.test.sql => edmondsKarp.pg} (100%) rename docqueries/max_flow/{doc-pgr_edmondsKarp.result => edmondsKarp.result} (100%) rename docqueries/max_flow/{doc-pgr_maxCardinalityMatch.test.sql => maxCardinalityMatch.pg} (100%) rename docqueries/max_flow/{doc-pgr_maxCardinalityMatch.result => maxCardinalityMatch.result} (100%) rename docqueries/max_flow/{doc-pgr_maxFlow.test.sql => maxFlow.pg} (100%) rename docqueries/max_flow/{doc-pgr_maxFlow.result => maxFlow.result} (100%) rename docqueries/max_flow/{doc-pgr_maxFlowMinCost.test.sql => maxFlowMinCost.pg} (100%) rename docqueries/max_flow/{doc-pgr_maxFlowMinCost.result => maxFlowMinCost.result} (100%) rename docqueries/max_flow/{doc-pgr_maxFlowMinCost_Cost.test.sql => maxFlowMinCost_Cost.pg} (100%) rename docqueries/max_flow/{doc-pgr_maxFlowMinCost_Cost.result => maxFlowMinCost_Cost.result} (100%) rename docqueries/max_flow/{doc-pgr_pushRelabel.test.sql => pushRelabel.pg} (100%) rename docqueries/max_flow/{doc-pgr_pushRelabel.result => pushRelabel.result} (100%) diff --git a/docqueries/max_flow/doc-pgr_boykovKolmogorov.test.sql b/docqueries/max_flow/boykovKolmogorov.pg similarity index 100% rename from docqueries/max_flow/doc-pgr_boykovKolmogorov.test.sql rename to docqueries/max_flow/boykovKolmogorov.pg diff --git a/docqueries/max_flow/doc-pgr_boykovKolmogorov.result b/docqueries/max_flow/boykovKolmogorov.result similarity index 100% rename from docqueries/max_flow/doc-pgr_boykovKolmogorov.result rename to docqueries/max_flow/boykovKolmogorov.result diff --git a/docqueries/max_flow/doc-pgr_edgeDisjointPaths.test.sql b/docqueries/max_flow/edgeDisjointPaths.pg similarity index 100% rename from docqueries/max_flow/doc-pgr_edgeDisjointPaths.test.sql rename to docqueries/max_flow/edgeDisjointPaths.pg diff --git a/docqueries/max_flow/doc-pgr_edgeDisjointPaths.result b/docqueries/max_flow/edgeDisjointPaths.result similarity index 100% rename from docqueries/max_flow/doc-pgr_edgeDisjointPaths.result rename to docqueries/max_flow/edgeDisjointPaths.result diff --git a/docqueries/max_flow/doc-pgr_edmondsKarp.test.sql b/docqueries/max_flow/edmondsKarp.pg similarity index 100% rename from docqueries/max_flow/doc-pgr_edmondsKarp.test.sql rename to docqueries/max_flow/edmondsKarp.pg diff --git a/docqueries/max_flow/doc-pgr_edmondsKarp.result b/docqueries/max_flow/edmondsKarp.result similarity index 100% rename from docqueries/max_flow/doc-pgr_edmondsKarp.result rename to docqueries/max_flow/edmondsKarp.result diff --git a/docqueries/max_flow/doc-pgr_maxCardinalityMatch.test.sql b/docqueries/max_flow/maxCardinalityMatch.pg similarity index 100% rename from docqueries/max_flow/doc-pgr_maxCardinalityMatch.test.sql rename to docqueries/max_flow/maxCardinalityMatch.pg diff --git a/docqueries/max_flow/doc-pgr_maxCardinalityMatch.result b/docqueries/max_flow/maxCardinalityMatch.result similarity index 100% rename from docqueries/max_flow/doc-pgr_maxCardinalityMatch.result rename to docqueries/max_flow/maxCardinalityMatch.result diff --git a/docqueries/max_flow/doc-pgr_maxFlow.test.sql b/docqueries/max_flow/maxFlow.pg similarity index 100% rename from docqueries/max_flow/doc-pgr_maxFlow.test.sql rename to docqueries/max_flow/maxFlow.pg diff --git a/docqueries/max_flow/doc-pgr_maxFlow.result b/docqueries/max_flow/maxFlow.result similarity index 100% rename from docqueries/max_flow/doc-pgr_maxFlow.result rename to docqueries/max_flow/maxFlow.result diff --git a/docqueries/max_flow/doc-pgr_maxFlowMinCost.test.sql b/docqueries/max_flow/maxFlowMinCost.pg similarity index 100% rename from docqueries/max_flow/doc-pgr_maxFlowMinCost.test.sql rename to docqueries/max_flow/maxFlowMinCost.pg diff --git a/docqueries/max_flow/doc-pgr_maxFlowMinCost.result b/docqueries/max_flow/maxFlowMinCost.result similarity index 100% rename from docqueries/max_flow/doc-pgr_maxFlowMinCost.result rename to docqueries/max_flow/maxFlowMinCost.result diff --git a/docqueries/max_flow/doc-pgr_maxFlowMinCost_Cost.test.sql b/docqueries/max_flow/maxFlowMinCost_Cost.pg similarity index 100% rename from docqueries/max_flow/doc-pgr_maxFlowMinCost_Cost.test.sql rename to docqueries/max_flow/maxFlowMinCost_Cost.pg diff --git a/docqueries/max_flow/doc-pgr_maxFlowMinCost_Cost.result b/docqueries/max_flow/maxFlowMinCost_Cost.result similarity index 100% rename from docqueries/max_flow/doc-pgr_maxFlowMinCost_Cost.result rename to docqueries/max_flow/maxFlowMinCost_Cost.result diff --git a/docqueries/max_flow/doc-pgr_pushRelabel.test.sql b/docqueries/max_flow/pushRelabel.pg similarity index 100% rename from docqueries/max_flow/doc-pgr_pushRelabel.test.sql rename to docqueries/max_flow/pushRelabel.pg diff --git a/docqueries/max_flow/doc-pgr_pushRelabel.result b/docqueries/max_flow/pushRelabel.result similarity index 100% rename from docqueries/max_flow/doc-pgr_pushRelabel.result rename to docqueries/max_flow/pushRelabel.result From 74807ef4758f9521e7f08d70f74cdb959a9654ba Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:47 -0600 Subject: [PATCH 292/428] (docqueries/mincut) renaming queries files. Removing prefix andsuffix is pg --- docqueries/mincut/{doc-stoerWagner.test.sql => stoerWagner.pg} | 0 docqueries/mincut/{doc-stoerWagner.result => stoerWagner.result} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/mincut/{doc-stoerWagner.test.sql => stoerWagner.pg} (100%) rename docqueries/mincut/{doc-stoerWagner.result => stoerWagner.result} (100%) diff --git a/docqueries/mincut/doc-stoerWagner.test.sql b/docqueries/mincut/stoerWagner.pg similarity index 100% rename from docqueries/mincut/doc-stoerWagner.test.sql rename to docqueries/mincut/stoerWagner.pg diff --git a/docqueries/mincut/doc-stoerWagner.result b/docqueries/mincut/stoerWagner.result similarity index 100% rename from docqueries/mincut/doc-stoerWagner.result rename to docqueries/mincut/stoerWagner.result From e38d4a1c4210cc78e0915ce104a7f79619a2a9a7 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:47 -0600 Subject: [PATCH 293/428] (docqueries/ordering) renaming queries files. Removing prefix andsuffix is pg --- .../{cuthillMckeeOrdering.test.sql => cuthillMckeeOrdering.pg} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docqueries/ordering/{cuthillMckeeOrdering.test.sql => cuthillMckeeOrdering.pg} (100%) diff --git a/docqueries/ordering/cuthillMckeeOrdering.test.sql b/docqueries/ordering/cuthillMckeeOrdering.pg similarity index 100% rename from docqueries/ordering/cuthillMckeeOrdering.test.sql rename to docqueries/ordering/cuthillMckeeOrdering.pg From d18e8c65f7e0657cf1f7ff53c90efcf4154f4df1 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:47 -0600 Subject: [PATCH 294/428] (docqueries/pickDeliver) renaming queries files. Removing prefix andsuffix is pg --- docqueries/pickDeliver/{lc101.test.sql => lc101.pg} | 0 .../pickDeliver/{doc-pickDeliver.test.sql => pickDeliver.pg} | 0 .../pickDeliver/{doc-pickDeliver.result => pickDeliver.result} | 0 ...{doc-pickDeliverEuclidean.test.sql => pickDeliverEuclidean.pg} | 0 ...oc-pickDeliverEuclidean.result => pickDeliverEuclidean.result} | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/pickDeliver/{lc101.test.sql => lc101.pg} (100%) rename docqueries/pickDeliver/{doc-pickDeliver.test.sql => pickDeliver.pg} (100%) rename docqueries/pickDeliver/{doc-pickDeliver.result => pickDeliver.result} (100%) rename docqueries/pickDeliver/{doc-pickDeliverEuclidean.test.sql => pickDeliverEuclidean.pg} (100%) rename docqueries/pickDeliver/{doc-pickDeliverEuclidean.result => pickDeliverEuclidean.result} (100%) diff --git a/docqueries/pickDeliver/lc101.test.sql b/docqueries/pickDeliver/lc101.pg similarity index 100% rename from docqueries/pickDeliver/lc101.test.sql rename to docqueries/pickDeliver/lc101.pg diff --git a/docqueries/pickDeliver/doc-pickDeliver.test.sql b/docqueries/pickDeliver/pickDeliver.pg similarity index 100% rename from docqueries/pickDeliver/doc-pickDeliver.test.sql rename to docqueries/pickDeliver/pickDeliver.pg diff --git a/docqueries/pickDeliver/doc-pickDeliver.result b/docqueries/pickDeliver/pickDeliver.result similarity index 100% rename from docqueries/pickDeliver/doc-pickDeliver.result rename to docqueries/pickDeliver/pickDeliver.result diff --git a/docqueries/pickDeliver/doc-pickDeliverEuclidean.test.sql b/docqueries/pickDeliver/pickDeliverEuclidean.pg similarity index 100% rename from docqueries/pickDeliver/doc-pickDeliverEuclidean.test.sql rename to docqueries/pickDeliver/pickDeliverEuclidean.pg diff --git a/docqueries/pickDeliver/doc-pickDeliverEuclidean.result b/docqueries/pickDeliver/pickDeliverEuclidean.result similarity index 100% rename from docqueries/pickDeliver/doc-pickDeliverEuclidean.result rename to docqueries/pickDeliver/pickDeliverEuclidean.result From 4f40aa9b0ec51fbd4794fb342cdc6b1119941fb8 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:47 -0600 Subject: [PATCH 295/428] (docqueries/planar) renaming queries files. Removing prefix andsuffix is pg --- .../planar/{doc-pgr_boyerMyrvold.test.sql => boyerMyrvold.pg} | 0 .../planar/{doc-pgr_boyerMyrvold.result => boyerMyrvold.result} | 0 docqueries/planar/{doc-pgr_isPlanar.test.sql => isPlanar.pg} | 0 docqueries/planar/{doc-pgr_isPlanar.result => isPlanar.result} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/planar/{doc-pgr_boyerMyrvold.test.sql => boyerMyrvold.pg} (100%) rename docqueries/planar/{doc-pgr_boyerMyrvold.result => boyerMyrvold.result} (100%) rename docqueries/planar/{doc-pgr_isPlanar.test.sql => isPlanar.pg} (100%) rename docqueries/planar/{doc-pgr_isPlanar.result => isPlanar.result} (100%) diff --git a/docqueries/planar/doc-pgr_boyerMyrvold.test.sql b/docqueries/planar/boyerMyrvold.pg similarity index 100% rename from docqueries/planar/doc-pgr_boyerMyrvold.test.sql rename to docqueries/planar/boyerMyrvold.pg diff --git a/docqueries/planar/doc-pgr_boyerMyrvold.result b/docqueries/planar/boyerMyrvold.result similarity index 100% rename from docqueries/planar/doc-pgr_boyerMyrvold.result rename to docqueries/planar/boyerMyrvold.result diff --git a/docqueries/planar/doc-pgr_isPlanar.test.sql b/docqueries/planar/isPlanar.pg similarity index 100% rename from docqueries/planar/doc-pgr_isPlanar.test.sql rename to docqueries/planar/isPlanar.pg diff --git a/docqueries/planar/doc-pgr_isPlanar.result b/docqueries/planar/isPlanar.result similarity index 100% rename from docqueries/planar/doc-pgr_isPlanar.result rename to docqueries/planar/isPlanar.result From 3278c59fbe4ab9f0d0bcd58349f2a8afe21bb3ac Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:47 -0600 Subject: [PATCH 296/428] (docqueries/spanningTree) renaming queries files. Removing prefix andsuffix is pg --- docqueries/spanningTree/{doc-pgr_kruskal.test.sql => kruskal.pg} | 0 .../spanningTree/{doc-pgr_kruskal.result => kruskal.result} | 0 .../spanningTree/{doc-pgr_kruskalBFS.test.sql => kruskalBFS.pg} | 0 .../spanningTree/{doc-pgr_kruskalBFS.result => kruskalBFS.result} | 0 .../spanningTree/{doc-pgr_kruskalDD.test.sql => kruskalDD.pg} | 0 .../spanningTree/{doc-pgr_kruskalDD.result => kruskalDD.result} | 0 .../spanningTree/{doc-pgr_kruskalDFS.test.sql => kruskalDFS.pg} | 0 .../spanningTree/{doc-pgr_kruskalDFS.result => kruskalDFS.result} | 0 docqueries/spanningTree/{doc-pgr_prim.test.sql => prim.pg} | 0 docqueries/spanningTree/{doc-pgr_prim.result => prim.result} | 0 docqueries/spanningTree/{doc-pgr_primBFS.test.sql => primBFS.pg} | 0 .../spanningTree/{doc-pgr_primBFS.result => primBFS.result} | 0 docqueries/spanningTree/{doc-pgr_primDD.test.sql => primDD.pg} | 0 docqueries/spanningTree/{doc-pgr_primDD.result => primDD.result} | 0 docqueries/spanningTree/{doc-pgr_primDFS.test.sql => primDFS.pg} | 0 .../spanningTree/{doc-pgr_primDFS.result => primDFS.result} | 0 .../{doc-pgr_randomSpanTree.test.sql => randomSpanTree.pg} | 0 .../{doc-pgr_randomSpanTree.result => randomSpanTree.result} | 0 18 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/spanningTree/{doc-pgr_kruskal.test.sql => kruskal.pg} (100%) rename docqueries/spanningTree/{doc-pgr_kruskal.result => kruskal.result} (100%) rename docqueries/spanningTree/{doc-pgr_kruskalBFS.test.sql => kruskalBFS.pg} (100%) rename docqueries/spanningTree/{doc-pgr_kruskalBFS.result => kruskalBFS.result} (100%) rename docqueries/spanningTree/{doc-pgr_kruskalDD.test.sql => kruskalDD.pg} (100%) rename docqueries/spanningTree/{doc-pgr_kruskalDD.result => kruskalDD.result} (100%) rename docqueries/spanningTree/{doc-pgr_kruskalDFS.test.sql => kruskalDFS.pg} (100%) rename docqueries/spanningTree/{doc-pgr_kruskalDFS.result => kruskalDFS.result} (100%) rename docqueries/spanningTree/{doc-pgr_prim.test.sql => prim.pg} (100%) rename docqueries/spanningTree/{doc-pgr_prim.result => prim.result} (100%) rename docqueries/spanningTree/{doc-pgr_primBFS.test.sql => primBFS.pg} (100%) rename docqueries/spanningTree/{doc-pgr_primBFS.result => primBFS.result} (100%) rename docqueries/spanningTree/{doc-pgr_primDD.test.sql => primDD.pg} (100%) rename docqueries/spanningTree/{doc-pgr_primDD.result => primDD.result} (100%) rename docqueries/spanningTree/{doc-pgr_primDFS.test.sql => primDFS.pg} (100%) rename docqueries/spanningTree/{doc-pgr_primDFS.result => primDFS.result} (100%) rename docqueries/spanningTree/{doc-pgr_randomSpanTree.test.sql => randomSpanTree.pg} (100%) rename docqueries/spanningTree/{doc-pgr_randomSpanTree.result => randomSpanTree.result} (100%) diff --git a/docqueries/spanningTree/doc-pgr_kruskal.test.sql b/docqueries/spanningTree/kruskal.pg similarity index 100% rename from docqueries/spanningTree/doc-pgr_kruskal.test.sql rename to docqueries/spanningTree/kruskal.pg diff --git a/docqueries/spanningTree/doc-pgr_kruskal.result b/docqueries/spanningTree/kruskal.result similarity index 100% rename from docqueries/spanningTree/doc-pgr_kruskal.result rename to docqueries/spanningTree/kruskal.result diff --git a/docqueries/spanningTree/doc-pgr_kruskalBFS.test.sql b/docqueries/spanningTree/kruskalBFS.pg similarity index 100% rename from docqueries/spanningTree/doc-pgr_kruskalBFS.test.sql rename to docqueries/spanningTree/kruskalBFS.pg diff --git a/docqueries/spanningTree/doc-pgr_kruskalBFS.result b/docqueries/spanningTree/kruskalBFS.result similarity index 100% rename from docqueries/spanningTree/doc-pgr_kruskalBFS.result rename to docqueries/spanningTree/kruskalBFS.result diff --git a/docqueries/spanningTree/doc-pgr_kruskalDD.test.sql b/docqueries/spanningTree/kruskalDD.pg similarity index 100% rename from docqueries/spanningTree/doc-pgr_kruskalDD.test.sql rename to docqueries/spanningTree/kruskalDD.pg diff --git a/docqueries/spanningTree/doc-pgr_kruskalDD.result b/docqueries/spanningTree/kruskalDD.result similarity index 100% rename from docqueries/spanningTree/doc-pgr_kruskalDD.result rename to docqueries/spanningTree/kruskalDD.result diff --git a/docqueries/spanningTree/doc-pgr_kruskalDFS.test.sql b/docqueries/spanningTree/kruskalDFS.pg similarity index 100% rename from docqueries/spanningTree/doc-pgr_kruskalDFS.test.sql rename to docqueries/spanningTree/kruskalDFS.pg diff --git a/docqueries/spanningTree/doc-pgr_kruskalDFS.result b/docqueries/spanningTree/kruskalDFS.result similarity index 100% rename from docqueries/spanningTree/doc-pgr_kruskalDFS.result rename to docqueries/spanningTree/kruskalDFS.result diff --git a/docqueries/spanningTree/doc-pgr_prim.test.sql b/docqueries/spanningTree/prim.pg similarity index 100% rename from docqueries/spanningTree/doc-pgr_prim.test.sql rename to docqueries/spanningTree/prim.pg diff --git a/docqueries/spanningTree/doc-pgr_prim.result b/docqueries/spanningTree/prim.result similarity index 100% rename from docqueries/spanningTree/doc-pgr_prim.result rename to docqueries/spanningTree/prim.result diff --git a/docqueries/spanningTree/doc-pgr_primBFS.test.sql b/docqueries/spanningTree/primBFS.pg similarity index 100% rename from docqueries/spanningTree/doc-pgr_primBFS.test.sql rename to docqueries/spanningTree/primBFS.pg diff --git a/docqueries/spanningTree/doc-pgr_primBFS.result b/docqueries/spanningTree/primBFS.result similarity index 100% rename from docqueries/spanningTree/doc-pgr_primBFS.result rename to docqueries/spanningTree/primBFS.result diff --git a/docqueries/spanningTree/doc-pgr_primDD.test.sql b/docqueries/spanningTree/primDD.pg similarity index 100% rename from docqueries/spanningTree/doc-pgr_primDD.test.sql rename to docqueries/spanningTree/primDD.pg diff --git a/docqueries/spanningTree/doc-pgr_primDD.result b/docqueries/spanningTree/primDD.result similarity index 100% rename from docqueries/spanningTree/doc-pgr_primDD.result rename to docqueries/spanningTree/primDD.result diff --git a/docqueries/spanningTree/doc-pgr_primDFS.test.sql b/docqueries/spanningTree/primDFS.pg similarity index 100% rename from docqueries/spanningTree/doc-pgr_primDFS.test.sql rename to docqueries/spanningTree/primDFS.pg diff --git a/docqueries/spanningTree/doc-pgr_primDFS.result b/docqueries/spanningTree/primDFS.result similarity index 100% rename from docqueries/spanningTree/doc-pgr_primDFS.result rename to docqueries/spanningTree/primDFS.result diff --git a/docqueries/spanningTree/doc-pgr_randomSpanTree.test.sql b/docqueries/spanningTree/randomSpanTree.pg similarity index 100% rename from docqueries/spanningTree/doc-pgr_randomSpanTree.test.sql rename to docqueries/spanningTree/randomSpanTree.pg diff --git a/docqueries/spanningTree/doc-pgr_randomSpanTree.result b/docqueries/spanningTree/randomSpanTree.result similarity index 100% rename from docqueries/spanningTree/doc-pgr_randomSpanTree.result rename to docqueries/spanningTree/randomSpanTree.result From 6e73986c7c666964a04c7faf511560888648c555 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:47 -0600 Subject: [PATCH 297/428] (docqueries/src) renaming queries files. Removing prefix andsuffix is pg --- docqueries/src/{concepts.test.sql => concepts.pg} | 0 docqueries/src/{migration.test.sql => migration.pg} | 0 docqueries/src/{sampledata.test.sql => sampledata.pg} | 0 .../src/{withPoints-category.test.sql => withPoints-category.pg} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/src/{concepts.test.sql => concepts.pg} (100%) rename docqueries/src/{migration.test.sql => migration.pg} (100%) rename docqueries/src/{sampledata.test.sql => sampledata.pg} (100%) rename docqueries/src/{withPoints-category.test.sql => withPoints-category.pg} (100%) diff --git a/docqueries/src/concepts.test.sql b/docqueries/src/concepts.pg similarity index 100% rename from docqueries/src/concepts.test.sql rename to docqueries/src/concepts.pg diff --git a/docqueries/src/migration.test.sql b/docqueries/src/migration.pg similarity index 100% rename from docqueries/src/migration.test.sql rename to docqueries/src/migration.pg diff --git a/docqueries/src/sampledata.test.sql b/docqueries/src/sampledata.pg similarity index 100% rename from docqueries/src/sampledata.test.sql rename to docqueries/src/sampledata.pg diff --git a/docqueries/src/withPoints-category.test.sql b/docqueries/src/withPoints-category.pg similarity index 100% rename from docqueries/src/withPoints-category.test.sql rename to docqueries/src/withPoints-category.pg From 6f09dced8833fe904e3950de42c5382fcbe3dd75 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:47 -0600 Subject: [PATCH 298/428] (docqueries/topologicalSort) renaming queries files. Removing prefix andsuffix is pg --- .../{doc-topologicalSort.test.sql => topologicalSort.pg} | 0 .../{doc-topologicalSort.result => topologicalSort.result} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/topologicalSort/{doc-topologicalSort.test.sql => topologicalSort.pg} (100%) rename docqueries/topologicalSort/{doc-topologicalSort.result => topologicalSort.result} (100%) diff --git a/docqueries/topologicalSort/doc-topologicalSort.test.sql b/docqueries/topologicalSort/topologicalSort.pg similarity index 100% rename from docqueries/topologicalSort/doc-topologicalSort.test.sql rename to docqueries/topologicalSort/topologicalSort.pg diff --git a/docqueries/topologicalSort/doc-topologicalSort.result b/docqueries/topologicalSort/topologicalSort.result similarity index 100% rename from docqueries/topologicalSort/doc-topologicalSort.result rename to docqueries/topologicalSort/topologicalSort.result From 41e931f13a8625342ff24213f8f1c0ede6d4090f Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:47 -0600 Subject: [PATCH 299/428] (docqueries/topology) renaming queries files. Removing prefix andsuffix is pg --- .../topology/{doc-pgr_analyzeGraph.test.sql => analyzeGraph.pg} | 0 .../topology/{doc-pgr_analyzeGraph.result => analyzeGraph.result} | 0 .../topology/{doc-pgr_analyzeOneWay.test.sql => analyzeOneWay.pg} | 0 .../{doc-pgr_analyzeOneWay.result => analyzeOneWay.result} | 0 .../{doc-pgr_createTopology.test.sql => createTopology.pg} | 0 .../{doc-pgr_createTopology.result => createTopology.result} | 0 .../topology/{createVertTab-any.test.sql => createVertTab-any.pg} | 0 ...oc-pgr_createVerticesTable.test.sql => createVerticesTable.pg} | 0 ...-pgr_createVerticesTable.result => createVerticesTable.result} | 0 docqueries/topology/{degree.test.sql => degree.pg} | 0 .../{doc-pgr_extractVertices.test.sql => extractVertices.pg} | 0 .../{doc-pgr_extractVertices.result => extractVertices.result} | 0 docqueries/topology/{issue900.test.sql => issue900.pg} | 0 .../topology/{doc-pgr_nodeNetwork.test.sql => nodeNetwork.pg} | 0 .../topology/{doc-pgr_nodeNetwork.result => nodeNetwork.result} | 0 15 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/topology/{doc-pgr_analyzeGraph.test.sql => analyzeGraph.pg} (100%) rename docqueries/topology/{doc-pgr_analyzeGraph.result => analyzeGraph.result} (100%) rename docqueries/topology/{doc-pgr_analyzeOneWay.test.sql => analyzeOneWay.pg} (100%) rename docqueries/topology/{doc-pgr_analyzeOneWay.result => analyzeOneWay.result} (100%) rename docqueries/topology/{doc-pgr_createTopology.test.sql => createTopology.pg} (100%) rename docqueries/topology/{doc-pgr_createTopology.result => createTopology.result} (100%) rename docqueries/topology/{createVertTab-any.test.sql => createVertTab-any.pg} (100%) rename docqueries/topology/{doc-pgr_createVerticesTable.test.sql => createVerticesTable.pg} (100%) rename docqueries/topology/{doc-pgr_createVerticesTable.result => createVerticesTable.result} (100%) rename docqueries/topology/{degree.test.sql => degree.pg} (100%) rename docqueries/topology/{doc-pgr_extractVertices.test.sql => extractVertices.pg} (100%) rename docqueries/topology/{doc-pgr_extractVertices.result => extractVertices.result} (100%) rename docqueries/topology/{issue900.test.sql => issue900.pg} (100%) rename docqueries/topology/{doc-pgr_nodeNetwork.test.sql => nodeNetwork.pg} (100%) rename docqueries/topology/{doc-pgr_nodeNetwork.result => nodeNetwork.result} (100%) diff --git a/docqueries/topology/doc-pgr_analyzeGraph.test.sql b/docqueries/topology/analyzeGraph.pg similarity index 100% rename from docqueries/topology/doc-pgr_analyzeGraph.test.sql rename to docqueries/topology/analyzeGraph.pg diff --git a/docqueries/topology/doc-pgr_analyzeGraph.result b/docqueries/topology/analyzeGraph.result similarity index 100% rename from docqueries/topology/doc-pgr_analyzeGraph.result rename to docqueries/topology/analyzeGraph.result diff --git a/docqueries/topology/doc-pgr_analyzeOneWay.test.sql b/docqueries/topology/analyzeOneWay.pg similarity index 100% rename from docqueries/topology/doc-pgr_analyzeOneWay.test.sql rename to docqueries/topology/analyzeOneWay.pg diff --git a/docqueries/topology/doc-pgr_analyzeOneWay.result b/docqueries/topology/analyzeOneWay.result similarity index 100% rename from docqueries/topology/doc-pgr_analyzeOneWay.result rename to docqueries/topology/analyzeOneWay.result diff --git a/docqueries/topology/doc-pgr_createTopology.test.sql b/docqueries/topology/createTopology.pg similarity index 100% rename from docqueries/topology/doc-pgr_createTopology.test.sql rename to docqueries/topology/createTopology.pg diff --git a/docqueries/topology/doc-pgr_createTopology.result b/docqueries/topology/createTopology.result similarity index 100% rename from docqueries/topology/doc-pgr_createTopology.result rename to docqueries/topology/createTopology.result diff --git a/docqueries/topology/createVertTab-any.test.sql b/docqueries/topology/createVertTab-any.pg similarity index 100% rename from docqueries/topology/createVertTab-any.test.sql rename to docqueries/topology/createVertTab-any.pg diff --git a/docqueries/topology/doc-pgr_createVerticesTable.test.sql b/docqueries/topology/createVerticesTable.pg similarity index 100% rename from docqueries/topology/doc-pgr_createVerticesTable.test.sql rename to docqueries/topology/createVerticesTable.pg diff --git a/docqueries/topology/doc-pgr_createVerticesTable.result b/docqueries/topology/createVerticesTable.result similarity index 100% rename from docqueries/topology/doc-pgr_createVerticesTable.result rename to docqueries/topology/createVerticesTable.result diff --git a/docqueries/topology/degree.test.sql b/docqueries/topology/degree.pg similarity index 100% rename from docqueries/topology/degree.test.sql rename to docqueries/topology/degree.pg diff --git a/docqueries/topology/doc-pgr_extractVertices.test.sql b/docqueries/topology/extractVertices.pg similarity index 100% rename from docqueries/topology/doc-pgr_extractVertices.test.sql rename to docqueries/topology/extractVertices.pg diff --git a/docqueries/topology/doc-pgr_extractVertices.result b/docqueries/topology/extractVertices.result similarity index 100% rename from docqueries/topology/doc-pgr_extractVertices.result rename to docqueries/topology/extractVertices.result diff --git a/docqueries/topology/issue900.test.sql b/docqueries/topology/issue900.pg similarity index 100% rename from docqueries/topology/issue900.test.sql rename to docqueries/topology/issue900.pg diff --git a/docqueries/topology/doc-pgr_nodeNetwork.test.sql b/docqueries/topology/nodeNetwork.pg similarity index 100% rename from docqueries/topology/doc-pgr_nodeNetwork.test.sql rename to docqueries/topology/nodeNetwork.pg diff --git a/docqueries/topology/doc-pgr_nodeNetwork.result b/docqueries/topology/nodeNetwork.result similarity index 100% rename from docqueries/topology/doc-pgr_nodeNetwork.result rename to docqueries/topology/nodeNetwork.result From 756351fb34358cbe14aa0d8f5db5e397b7b23356 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:48 -0600 Subject: [PATCH 300/428] (docqueries/transitiveClosure) renaming queries files. Removing prefix andsuffix is pg --- .../{doc-transitiveClosure.test.sql => transitiveClosure.pg} | 0 .../{doc-transitiveClosure.result => transitiveClosure.result} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/transitiveClosure/{doc-transitiveClosure.test.sql => transitiveClosure.pg} (100%) rename docqueries/transitiveClosure/{doc-transitiveClosure.result => transitiveClosure.result} (100%) diff --git a/docqueries/transitiveClosure/doc-transitiveClosure.test.sql b/docqueries/transitiveClosure/transitiveClosure.pg similarity index 100% rename from docqueries/transitiveClosure/doc-transitiveClosure.test.sql rename to docqueries/transitiveClosure/transitiveClosure.pg diff --git a/docqueries/transitiveClosure/doc-transitiveClosure.result b/docqueries/transitiveClosure/transitiveClosure.result similarity index 100% rename from docqueries/transitiveClosure/doc-transitiveClosure.result rename to docqueries/transitiveClosure/transitiveClosure.result From 37a30029439f2a1c7f2afb7a6f19c93344a18f68 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:48 -0600 Subject: [PATCH 301/428] (docqueries/traversal) renaming queries files. Removing prefix andsuffix is pg --- .../{doc-pgr_depthFirstSearch.test.sql => depthFirstSearch.pg} | 0 .../{doc-pgr_depthFirstSearch.result => depthFirstSearch.result} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/traversal/{doc-pgr_depthFirstSearch.test.sql => depthFirstSearch.pg} (100%) rename docqueries/traversal/{doc-pgr_depthFirstSearch.result => depthFirstSearch.result} (100%) diff --git a/docqueries/traversal/doc-pgr_depthFirstSearch.test.sql b/docqueries/traversal/depthFirstSearch.pg similarity index 100% rename from docqueries/traversal/doc-pgr_depthFirstSearch.test.sql rename to docqueries/traversal/depthFirstSearch.pg diff --git a/docqueries/traversal/doc-pgr_depthFirstSearch.result b/docqueries/traversal/depthFirstSearch.result similarity index 100% rename from docqueries/traversal/doc-pgr_depthFirstSearch.result rename to docqueries/traversal/depthFirstSearch.result From af9e8cd47c32cb6c3751fd85e2a909c9e9d50312 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:48 -0600 Subject: [PATCH 302/428] (docqueries/trsp) renaming queries files. Removing prefix andsuffix is pg --- docqueries/trsp/{four_edges.test.sql => four_edges.pg} | 0 docqueries/trsp/{issue693.test.sql => issue693.pg} | 0 docqueries/trsp/{issue704.test.sql => issue704.pg} | 0 docqueries/trsp/{issue717.test.sql => issue717.pg} | 0 docqueries/trsp/{trsp-any-02.test.sql => trsp-any-02.pg} | 0 docqueries/trsp/{trsp-renumber.test.sql => trsp-renumber.pg} | 0 docqueries/trsp/{doc-trsp.test.sql => trsp.pg} | 0 docqueries/trsp/{doc-trsp.result => trsp.result} | 0 docqueries/trsp/{trspVia.test.sql => trspVia.pg} | 0 .../trsp/{trspVia_withPoints.test.sql => trspVia_withPoints.pg} | 0 .../trsp/{trsp_vias-any-04.test.sql => trsp_vias-any-04.pg} | 0 docqueries/trsp/{trsp_withPoints.test.sql => trsp_withPoints.pg} | 0 12 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/trsp/{four_edges.test.sql => four_edges.pg} (100%) rename docqueries/trsp/{issue693.test.sql => issue693.pg} (100%) rename docqueries/trsp/{issue704.test.sql => issue704.pg} (100%) rename docqueries/trsp/{issue717.test.sql => issue717.pg} (100%) rename docqueries/trsp/{trsp-any-02.test.sql => trsp-any-02.pg} (100%) rename docqueries/trsp/{trsp-renumber.test.sql => trsp-renumber.pg} (100%) rename docqueries/trsp/{doc-trsp.test.sql => trsp.pg} (100%) rename docqueries/trsp/{doc-trsp.result => trsp.result} (100%) rename docqueries/trsp/{trspVia.test.sql => trspVia.pg} (100%) rename docqueries/trsp/{trspVia_withPoints.test.sql => trspVia_withPoints.pg} (100%) rename docqueries/trsp/{trsp_vias-any-04.test.sql => trsp_vias-any-04.pg} (100%) rename docqueries/trsp/{trsp_withPoints.test.sql => trsp_withPoints.pg} (100%) diff --git a/docqueries/trsp/four_edges.test.sql b/docqueries/trsp/four_edges.pg similarity index 100% rename from docqueries/trsp/four_edges.test.sql rename to docqueries/trsp/four_edges.pg diff --git a/docqueries/trsp/issue693.test.sql b/docqueries/trsp/issue693.pg similarity index 100% rename from docqueries/trsp/issue693.test.sql rename to docqueries/trsp/issue693.pg diff --git a/docqueries/trsp/issue704.test.sql b/docqueries/trsp/issue704.pg similarity index 100% rename from docqueries/trsp/issue704.test.sql rename to docqueries/trsp/issue704.pg diff --git a/docqueries/trsp/issue717.test.sql b/docqueries/trsp/issue717.pg similarity index 100% rename from docqueries/trsp/issue717.test.sql rename to docqueries/trsp/issue717.pg diff --git a/docqueries/trsp/trsp-any-02.test.sql b/docqueries/trsp/trsp-any-02.pg similarity index 100% rename from docqueries/trsp/trsp-any-02.test.sql rename to docqueries/trsp/trsp-any-02.pg diff --git a/docqueries/trsp/trsp-renumber.test.sql b/docqueries/trsp/trsp-renumber.pg similarity index 100% rename from docqueries/trsp/trsp-renumber.test.sql rename to docqueries/trsp/trsp-renumber.pg diff --git a/docqueries/trsp/doc-trsp.test.sql b/docqueries/trsp/trsp.pg similarity index 100% rename from docqueries/trsp/doc-trsp.test.sql rename to docqueries/trsp/trsp.pg diff --git a/docqueries/trsp/doc-trsp.result b/docqueries/trsp/trsp.result similarity index 100% rename from docqueries/trsp/doc-trsp.result rename to docqueries/trsp/trsp.result diff --git a/docqueries/trsp/trspVia.test.sql b/docqueries/trsp/trspVia.pg similarity index 100% rename from docqueries/trsp/trspVia.test.sql rename to docqueries/trsp/trspVia.pg diff --git a/docqueries/trsp/trspVia_withPoints.test.sql b/docqueries/trsp/trspVia_withPoints.pg similarity index 100% rename from docqueries/trsp/trspVia_withPoints.test.sql rename to docqueries/trsp/trspVia_withPoints.pg diff --git a/docqueries/trsp/trsp_vias-any-04.test.sql b/docqueries/trsp/trsp_vias-any-04.pg similarity index 100% rename from docqueries/trsp/trsp_vias-any-04.test.sql rename to docqueries/trsp/trsp_vias-any-04.pg diff --git a/docqueries/trsp/trsp_withPoints.test.sql b/docqueries/trsp/trsp_withPoints.pg similarity index 100% rename from docqueries/trsp/trsp_withPoints.test.sql rename to docqueries/trsp/trsp_withPoints.pg From 6d5e9b90cf98e8ce8f2d9c9135b74a8976cfa183 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:48 -0600 Subject: [PATCH 303/428] (docqueries/tsp) renaming queries files. Removing prefix andsuffix is pg --- docqueries/tsp/{doc-pgr_TSP.test.sql => TSP.pg} | 0 docqueries/tsp/{doc-pgr_TSP.result => TSP.result} | 0 docqueries/tsp/{doc-pgr_TSPeuclidean.test.sql => TSPeuclidean.pg} | 0 .../tsp/{doc-pgr_TSPeuclidean.result => TSPeuclidean.result} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/tsp/{doc-pgr_TSP.test.sql => TSP.pg} (100%) rename docqueries/tsp/{doc-pgr_TSP.result => TSP.result} (100%) rename docqueries/tsp/{doc-pgr_TSPeuclidean.test.sql => TSPeuclidean.pg} (100%) rename docqueries/tsp/{doc-pgr_TSPeuclidean.result => TSPeuclidean.result} (100%) diff --git a/docqueries/tsp/doc-pgr_TSP.test.sql b/docqueries/tsp/TSP.pg similarity index 100% rename from docqueries/tsp/doc-pgr_TSP.test.sql rename to docqueries/tsp/TSP.pg diff --git a/docqueries/tsp/doc-pgr_TSP.result b/docqueries/tsp/TSP.result similarity index 100% rename from docqueries/tsp/doc-pgr_TSP.result rename to docqueries/tsp/TSP.result diff --git a/docqueries/tsp/doc-pgr_TSPeuclidean.test.sql b/docqueries/tsp/TSPeuclidean.pg similarity index 100% rename from docqueries/tsp/doc-pgr_TSPeuclidean.test.sql rename to docqueries/tsp/TSPeuclidean.pg diff --git a/docqueries/tsp/doc-pgr_TSPeuclidean.result b/docqueries/tsp/TSPeuclidean.result similarity index 100% rename from docqueries/tsp/doc-pgr_TSPeuclidean.result rename to docqueries/tsp/TSPeuclidean.result From dc4afaa643c01ccadcf016ec55df5e391332bb2a Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:48 -0600 Subject: [PATCH 304/428] (docqueries/utilities) renaming queries files. Removing prefix andsuffix is pg --- .../utilities/{findCloseEdges.test.sql => findCloseEdges.pg} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docqueries/utilities/{findCloseEdges.test.sql => findCloseEdges.pg} (100%) diff --git a/docqueries/utilities/findCloseEdges.test.sql b/docqueries/utilities/findCloseEdges.pg similarity index 100% rename from docqueries/utilities/findCloseEdges.test.sql rename to docqueries/utilities/findCloseEdges.pg From 730ba2d6446514089cac0348e529d74d2c8efe57 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:48 -0600 Subject: [PATCH 305/428] (docqueries/version) renaming queries files. Removing prefix andsuffix is pg --- docqueries/version/{doc-full_version.test.sql => full_version.pg} | 0 .../version/{doc-full_version.result => full_version.result} | 0 docqueries/version/{doc-version.test.sql => version.pg} | 0 docqueries/version/{doc-version.result => version.result} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/version/{doc-full_version.test.sql => full_version.pg} (100%) rename docqueries/version/{doc-full_version.result => full_version.result} (100%) rename docqueries/version/{doc-version.test.sql => version.pg} (100%) rename docqueries/version/{doc-version.result => version.result} (100%) diff --git a/docqueries/version/doc-full_version.test.sql b/docqueries/version/full_version.pg similarity index 100% rename from docqueries/version/doc-full_version.test.sql rename to docqueries/version/full_version.pg diff --git a/docqueries/version/doc-full_version.result b/docqueries/version/full_version.result similarity index 100% rename from docqueries/version/doc-full_version.result rename to docqueries/version/full_version.result diff --git a/docqueries/version/doc-version.test.sql b/docqueries/version/version.pg similarity index 100% rename from docqueries/version/doc-version.test.sql rename to docqueries/version/version.pg diff --git a/docqueries/version/doc-version.result b/docqueries/version/version.result similarity index 100% rename from docqueries/version/doc-version.result rename to docqueries/version/version.result From 6c742c1b701960838faa481a64484ff7ff26a89f Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:48 -0600 Subject: [PATCH 306/428] (docqueries/vrp_basic) renaming queries files. Removing prefix andsuffix is pg --- .../vrp_basic/{oneDepotWrapper.test.sql => oneDepotWrapper.pg} | 0 .../vrp_basic/{doc-pgr_vrpOneDepot.test.sql => vrpOneDepot.pg} | 0 .../vrp_basic/{doc-pgr_vrpOneDepot.result => vrpOneDepot.result} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/vrp_basic/{oneDepotWrapper.test.sql => oneDepotWrapper.pg} (100%) rename docqueries/vrp_basic/{doc-pgr_vrpOneDepot.test.sql => vrpOneDepot.pg} (100%) rename docqueries/vrp_basic/{doc-pgr_vrpOneDepot.result => vrpOneDepot.result} (100%) diff --git a/docqueries/vrp_basic/oneDepotWrapper.test.sql b/docqueries/vrp_basic/oneDepotWrapper.pg similarity index 100% rename from docqueries/vrp_basic/oneDepotWrapper.test.sql rename to docqueries/vrp_basic/oneDepotWrapper.pg diff --git a/docqueries/vrp_basic/doc-pgr_vrpOneDepot.test.sql b/docqueries/vrp_basic/vrpOneDepot.pg similarity index 100% rename from docqueries/vrp_basic/doc-pgr_vrpOneDepot.test.sql rename to docqueries/vrp_basic/vrpOneDepot.pg diff --git a/docqueries/vrp_basic/doc-pgr_vrpOneDepot.result b/docqueries/vrp_basic/vrpOneDepot.result similarity index 100% rename from docqueries/vrp_basic/doc-pgr_vrpOneDepot.result rename to docqueries/vrp_basic/vrpOneDepot.result From 660d7ff9563d2663120319189536ec73bec8c040 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:20:48 -0600 Subject: [PATCH 307/428] (docqueries/withPoints) renaming queries files. Removing prefix andsuffix is pg --- .../withPoints/{doc-pgr_withPoints.test.sql => withPoints.pg} | 0 .../withPoints/{doc-pgr_withPoints.result => withPoints.result} | 0 .../{doc-pgr_withPointsCost.test.sql => withPointsCost.pg} | 0 .../{doc-pgr_withPointsCost.result => withPointsCost.result} | 0 ...-pgr_withPointsCostMatrix.test.sql => withPointsCostMatrix.pg} | 0 ...gr_withPointsCostMatrix.result => withPointsCostMatrix.result} | 0 .../withPoints/{doc-pgr_withPointsDD.test.sql => withPointsDD.pg} | 0 .../{doc-pgr_withPointsDD.result => withPointsDD.result} | 0 .../{doc-pgr_withPointsKSP.test.sql => withPointsKSP.pg} | 0 .../{doc-pgr_withPointsKSP.result => withPointsKSP.result} | 0 .../withPoints/{withPointsVia.test.sql => withPointsVia.pg} | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename docqueries/withPoints/{doc-pgr_withPoints.test.sql => withPoints.pg} (100%) rename docqueries/withPoints/{doc-pgr_withPoints.result => withPoints.result} (100%) rename docqueries/withPoints/{doc-pgr_withPointsCost.test.sql => withPointsCost.pg} (100%) rename docqueries/withPoints/{doc-pgr_withPointsCost.result => withPointsCost.result} (100%) rename docqueries/withPoints/{doc-pgr_withPointsCostMatrix.test.sql => withPointsCostMatrix.pg} (100%) rename docqueries/withPoints/{doc-pgr_withPointsCostMatrix.result => withPointsCostMatrix.result} (100%) rename docqueries/withPoints/{doc-pgr_withPointsDD.test.sql => withPointsDD.pg} (100%) rename docqueries/withPoints/{doc-pgr_withPointsDD.result => withPointsDD.result} (100%) rename docqueries/withPoints/{doc-pgr_withPointsKSP.test.sql => withPointsKSP.pg} (100%) rename docqueries/withPoints/{doc-pgr_withPointsKSP.result => withPointsKSP.result} (100%) rename docqueries/withPoints/{withPointsVia.test.sql => withPointsVia.pg} (100%) diff --git a/docqueries/withPoints/doc-pgr_withPoints.test.sql b/docqueries/withPoints/withPoints.pg similarity index 100% rename from docqueries/withPoints/doc-pgr_withPoints.test.sql rename to docqueries/withPoints/withPoints.pg diff --git a/docqueries/withPoints/doc-pgr_withPoints.result b/docqueries/withPoints/withPoints.result similarity index 100% rename from docqueries/withPoints/doc-pgr_withPoints.result rename to docqueries/withPoints/withPoints.result diff --git a/docqueries/withPoints/doc-pgr_withPointsCost.test.sql b/docqueries/withPoints/withPointsCost.pg similarity index 100% rename from docqueries/withPoints/doc-pgr_withPointsCost.test.sql rename to docqueries/withPoints/withPointsCost.pg diff --git a/docqueries/withPoints/doc-pgr_withPointsCost.result b/docqueries/withPoints/withPointsCost.result similarity index 100% rename from docqueries/withPoints/doc-pgr_withPointsCost.result rename to docqueries/withPoints/withPointsCost.result diff --git a/docqueries/withPoints/doc-pgr_withPointsCostMatrix.test.sql b/docqueries/withPoints/withPointsCostMatrix.pg similarity index 100% rename from docqueries/withPoints/doc-pgr_withPointsCostMatrix.test.sql rename to docqueries/withPoints/withPointsCostMatrix.pg diff --git a/docqueries/withPoints/doc-pgr_withPointsCostMatrix.result b/docqueries/withPoints/withPointsCostMatrix.result similarity index 100% rename from docqueries/withPoints/doc-pgr_withPointsCostMatrix.result rename to docqueries/withPoints/withPointsCostMatrix.result diff --git a/docqueries/withPoints/doc-pgr_withPointsDD.test.sql b/docqueries/withPoints/withPointsDD.pg similarity index 100% rename from docqueries/withPoints/doc-pgr_withPointsDD.test.sql rename to docqueries/withPoints/withPointsDD.pg diff --git a/docqueries/withPoints/doc-pgr_withPointsDD.result b/docqueries/withPoints/withPointsDD.result similarity index 100% rename from docqueries/withPoints/doc-pgr_withPointsDD.result rename to docqueries/withPoints/withPointsDD.result diff --git a/docqueries/withPoints/doc-pgr_withPointsKSP.test.sql b/docqueries/withPoints/withPointsKSP.pg similarity index 100% rename from docqueries/withPoints/doc-pgr_withPointsKSP.test.sql rename to docqueries/withPoints/withPointsKSP.pg diff --git a/docqueries/withPoints/doc-pgr_withPointsKSP.result b/docqueries/withPoints/withPointsKSP.result similarity index 100% rename from docqueries/withPoints/doc-pgr_withPointsKSP.result rename to docqueries/withPoints/withPointsKSP.result diff --git a/docqueries/withPoints/withPointsVia.test.sql b/docqueries/withPoints/withPointsVia.pg similarity index 100% rename from docqueries/withPoints/withPointsVia.test.sql rename to docqueries/withPoints/withPointsVia.pg From d4e36bdeeb1a6384ef32090ee54a70c1ce6d65af Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:24:06 -0600 Subject: [PATCH 308/428] Updating the build to the new names --- docqueries/allpairs/CMakeLists.txt | 4 ++-- docqueries/alpha_shape/CMakeLists.txt | 2 +- docqueries/astar/CMakeLists.txt | 6 +++--- docqueries/bdAstar/CMakeLists.txt | 6 +++--- docqueries/bdDijkstra/CMakeLists.txt | 6 +++--- docqueries/bellman_ford/CMakeLists.txt | 4 ++-- docqueries/breadthFirstSearch/CMakeLists.txt | 4 ++-- docqueries/chinese/CMakeLists.txt | 4 ++-- docqueries/coloring/CMakeLists.txt | 6 +++--- docqueries/components/CMakeLists.txt | 12 ++++++------ docqueries/contraction/CMakeLists.txt | 4 ++-- docqueries/dagShortestPath/CMakeLists.txt | 2 +- docqueries/dijkstra/CMakeLists.txt | 12 ++++++------ docqueries/dominator/CMakeLists.txt | 2 +- docqueries/driving_distance/CMakeLists.txt | 2 +- docqueries/ksp/CMakeLists.txt | 4 ++-- docqueries/lineGraph/CMakeLists.txt | 4 ++-- docqueries/max_flow/CMakeLists.txt | 16 ++++++++-------- docqueries/mincut/CMakeLists.txt | 2 +- docqueries/pickDeliver/CMakeLists.txt | 4 ++-- docqueries/planar/CMakeLists.txt | 4 ++-- docqueries/spanningTree/CMakeLists.txt | 16 ++++++++-------- docqueries/topologicalSort/CMakeLists.txt | 2 +- docqueries/topology/CMakeLists.txt | 12 ++++++------ docqueries/transitiveClosure/CMakeLists.txt | 2 +- docqueries/traversal/CMakeLists.txt | 2 +- docqueries/trsp/CMakeLists.txt | 2 +- docqueries/tsp/CMakeLists.txt | 4 ++-- docqueries/version/CMakeLists.txt | 4 ++-- docqueries/vrp_basic/CMakeLists.txt | 2 +- docqueries/withPoints/CMakeLists.txt | 10 +++++----- 31 files changed, 83 insertions(+), 83 deletions(-) diff --git a/docqueries/allpairs/CMakeLists.txt b/docqueries/allpairs/CMakeLists.txt index a4cf2412f7..a1736c9cf9 100644 --- a/docqueries/allpairs/CMakeLists.txt +++ b/docqueries/allpairs/CMakeLists.txt @@ -1,7 +1,7 @@ # Do not use extensions SET(LOCAL_FILES - doc-floydWarshall - doc-johnson + floydWarshall + johnson ) foreach (f ${LOCAL_FILES}) diff --git a/docqueries/alpha_shape/CMakeLists.txt b/docqueries/alpha_shape/CMakeLists.txt index 19b80ec97e..5f783af7cb 100644 --- a/docqueries/alpha_shape/CMakeLists.txt +++ b/docqueries/alpha_shape/CMakeLists.txt @@ -1,6 +1,6 @@ # Do not use extensions SET(LOCAL_FILES - doc-pgr_alphashape + alphashape ) foreach (f ${LOCAL_FILES}) diff --git a/docqueries/astar/CMakeLists.txt b/docqueries/astar/CMakeLists.txt index 702d34add7..e7a4f59502 100644 --- a/docqueries/astar/CMakeLists.txt +++ b/docqueries/astar/CMakeLists.txt @@ -1,8 +1,8 @@ # Do not use extensions SET(LOCAL_FILES - doc-aStarCostMatrix - doc-aStarCost - doc-astar + aStarCostMatrix + aStarCost + astar ) foreach (f ${LOCAL_FILES}) diff --git a/docqueries/bdAstar/CMakeLists.txt b/docqueries/bdAstar/CMakeLists.txt index e2cff1ce02..7800b4f242 100644 --- a/docqueries/bdAstar/CMakeLists.txt +++ b/docqueries/bdAstar/CMakeLists.txt @@ -1,8 +1,8 @@ # Do not use extensions SET(LOCAL_FILES - doc-pgr_bdAstarCostMatrix - doc-pgr_bdAstarCost - doc-pgr_bdAstar + bdAstarCostMatrix + bdAstarCost + bdAstar ) foreach (f ${LOCAL_FILES}) diff --git a/docqueries/bdDijkstra/CMakeLists.txt b/docqueries/bdDijkstra/CMakeLists.txt index 21ef9f7895..33ddab1f9f 100644 --- a/docqueries/bdDijkstra/CMakeLists.txt +++ b/docqueries/bdDijkstra/CMakeLists.txt @@ -1,8 +1,8 @@ # Do not use extensions SET(LOCAL_FILES - doc-pgr_bdDijkstraCostMatrix - doc-pgr_bdDijkstraCost - doc-pgr_bdDijkstra + bdDijkstraCostMatrix + bdDijkstraCost + bdDijkstra ) foreach (f ${LOCAL_FILES}) diff --git a/docqueries/bellman_ford/CMakeLists.txt b/docqueries/bellman_ford/CMakeLists.txt index 54f4caec92..0724ab0309 100644 --- a/docqueries/bellman_ford/CMakeLists.txt +++ b/docqueries/bellman_ford/CMakeLists.txt @@ -1,7 +1,7 @@ # Do not use extensions SET(LOCAL_FILES - doc-pgr_bellmanFord - doc-pgr_edwardMoore + bellmanFord + edwardMoore ) foreach (f ${LOCAL_FILES}) diff --git a/docqueries/breadthFirstSearch/CMakeLists.txt b/docqueries/breadthFirstSearch/CMakeLists.txt index cf1ab25dcd..02c0b95bf6 100644 --- a/docqueries/breadthFirstSearch/CMakeLists.txt +++ b/docqueries/breadthFirstSearch/CMakeLists.txt @@ -1,7 +1,7 @@ # Do not use extensions SET(LOCAL_FILES - doc-pgr_breadthFirstSearch - doc-pgr_binaryBreadthFirstSearch + breadthFirstSearch + binaryBreadthFirstSearch ) foreach (f ${LOCAL_FILES}) diff --git a/docqueries/chinese/CMakeLists.txt b/docqueries/chinese/CMakeLists.txt index e80997468f..9c187a96f1 100644 --- a/docqueries/chinese/CMakeLists.txt +++ b/docqueries/chinese/CMakeLists.txt @@ -1,7 +1,7 @@ # Do not use extensions SET(LOCAL_FILES - doc-pgr_chinesePostmanCost - doc-pgr_chinesePostman + chinesePostmanCost + chinesePostman ) foreach (f ${LOCAL_FILES}) diff --git a/docqueries/coloring/CMakeLists.txt b/docqueries/coloring/CMakeLists.txt index 0fa79dfa0b..4e67b0b2f4 100644 --- a/docqueries/coloring/CMakeLists.txt +++ b/docqueries/coloring/CMakeLists.txt @@ -1,8 +1,8 @@ # Do not use extensions SET(LOCAL_FILES - doc-pgr_sequentialVertexColoring - doc-bipartite - doc-edgeColoring + sequentialVertexColoring + bipartite + edgeColoring ) foreach (f ${LOCAL_FILES}) diff --git a/docqueries/components/CMakeLists.txt b/docqueries/components/CMakeLists.txt index 52dbe38f14..d21c494aa1 100644 --- a/docqueries/components/CMakeLists.txt +++ b/docqueries/components/CMakeLists.txt @@ -1,11 +1,11 @@ # Do not use extensions SET(LOCAL_FILES - doc-pgr_articulationPoints - doc-pgr_biconnectedComponents - doc-pgr_bridges - doc-pgr_connectedComponents - doc-pgr_strongComponents - doc-pgr_makeConnected + articulationPoints + biconnectedComponents + bridges + connectedComponents + strongComponents + makeConnected ) foreach (f ${LOCAL_FILES}) diff --git a/docqueries/contraction/CMakeLists.txt b/docqueries/contraction/CMakeLists.txt index 9ba4b3e245..d640c0ea80 100644 --- a/docqueries/contraction/CMakeLists.txt +++ b/docqueries/contraction/CMakeLists.txt @@ -1,7 +1,7 @@ # Do not use extensions SET(LOCAL_FILES - doc-contraction-family - doc-pgr_contraction + contraction-family + contraction ) foreach (f ${LOCAL_FILES}) diff --git a/docqueries/dagShortestPath/CMakeLists.txt b/docqueries/dagShortestPath/CMakeLists.txt index e8a3efdd12..3c14948b6e 100644 --- a/docqueries/dagShortestPath/CMakeLists.txt +++ b/docqueries/dagShortestPath/CMakeLists.txt @@ -1,6 +1,6 @@ # Do not use extensions SET(LOCAL_FILES - doc-pgr_dagShortestPath + dagShortestPath ) foreach (f ${LOCAL_FILES}) diff --git a/docqueries/dijkstra/CMakeLists.txt b/docqueries/dijkstra/CMakeLists.txt index b32b909c25..90b64c6c33 100644 --- a/docqueries/dijkstra/CMakeLists.txt +++ b/docqueries/dijkstra/CMakeLists.txt @@ -1,11 +1,11 @@ # Do not use extensions SET(LOCAL_FILES - doc-pgr_dijkstraCostMatrix - doc-pgr_dijkstraCost - doc-pgr_dijkstra - doc-pgr_dijkstraVia - doc-pgr_dijkstraNear - doc-pgr_dijkstraNearCost + dijkstraCostMatrix + dijkstraCost + dijkstra + dijkstraVia + dijkstraNear + dijkstraNearCost ) foreach (f ${LOCAL_FILES}) diff --git a/docqueries/dominator/CMakeLists.txt b/docqueries/dominator/CMakeLists.txt index e8a7f6e4ec..9def4ce4bc 100644 --- a/docqueries/dominator/CMakeLists.txt +++ b/docqueries/dominator/CMakeLists.txt @@ -1,6 +1,6 @@ # Do not use extensions SET(LOCAL_FILES - doc-lengauerTarjanDominatorTree + lengauerTarjanDominatorTree ) foreach (f ${LOCAL_FILES}) diff --git a/docqueries/driving_distance/CMakeLists.txt b/docqueries/driving_distance/CMakeLists.txt index bc221d84af..a570865c48 100644 --- a/docqueries/driving_distance/CMakeLists.txt +++ b/docqueries/driving_distance/CMakeLists.txt @@ -1,6 +1,6 @@ # Do not use extensions SET(LOCAL_FILES - pgr_drivingDistance + drivingDistance ) foreach (f ${LOCAL_FILES}) diff --git a/docqueries/ksp/CMakeLists.txt b/docqueries/ksp/CMakeLists.txt index 94d9b6aa78..3922d10d59 100644 --- a/docqueries/ksp/CMakeLists.txt +++ b/docqueries/ksp/CMakeLists.txt @@ -1,7 +1,7 @@ # Do not use extensions SET(LOCAL_FILES - doc-ksp - doc-pgr_turnRestrictedPath + ksp + turnRestrictedPath ) foreach (f ${LOCAL_FILES}) diff --git a/docqueries/lineGraph/CMakeLists.txt b/docqueries/lineGraph/CMakeLists.txt index 49d3d58ac9..1e52b109cc 100644 --- a/docqueries/lineGraph/CMakeLists.txt +++ b/docqueries/lineGraph/CMakeLists.txt @@ -1,7 +1,7 @@ # Do not use extensions SET(LOCAL_FILES - doc-pgr_lineGraphFull - doc-pgr_lineGraph + lineGraphFull + lineGraph ) foreach (f ${LOCAL_FILES}) diff --git a/docqueries/max_flow/CMakeLists.txt b/docqueries/max_flow/CMakeLists.txt index c105b3fc23..ac285200d0 100644 --- a/docqueries/max_flow/CMakeLists.txt +++ b/docqueries/max_flow/CMakeLists.txt @@ -1,13 +1,13 @@ # Do not use extensions SET(LOCAL_FILES - doc-pgr_boykovKolmogorov - doc-pgr_edgeDisjointPaths - doc-pgr_edmondsKarp - doc-pgr_maxCardinalityMatch - doc-pgr_maxFlow - doc-pgr_pushRelabel - doc-pgr_maxFlowMinCost - doc-pgr_maxFlowMinCost_Cost + boykovKolmogorov + edgeDisjointPaths + edmondsKarp + maxCardinalityMatch + maxFlow + pushRelabel + maxFlowMinCost + maxFlowMinCost_Cost ) diff --git a/docqueries/mincut/CMakeLists.txt b/docqueries/mincut/CMakeLists.txt index 96b295e0ea..84c97ae8b9 100644 --- a/docqueries/mincut/CMakeLists.txt +++ b/docqueries/mincut/CMakeLists.txt @@ -1,6 +1,6 @@ # Do not use extensions SET(LOCAL_FILES - doc-stoerWagner + stoerWagner ) foreach (f ${LOCAL_FILES}) diff --git a/docqueries/pickDeliver/CMakeLists.txt b/docqueries/pickDeliver/CMakeLists.txt index 5ae797dcd0..76b0015761 100644 --- a/docqueries/pickDeliver/CMakeLists.txt +++ b/docqueries/pickDeliver/CMakeLists.txt @@ -1,7 +1,7 @@ # Do not use extensions SET(LOCAL_FILES - doc-pickDeliverEuclidean - doc-pickDeliver + pickDeliverEuclidean + pickDeliver lc101 ) diff --git a/docqueries/planar/CMakeLists.txt b/docqueries/planar/CMakeLists.txt index 790fddd0e8..21a66f4e36 100644 --- a/docqueries/planar/CMakeLists.txt +++ b/docqueries/planar/CMakeLists.txt @@ -1,7 +1,7 @@ # Do not use extensions SET(LOCAL_FILES - doc-pgr_boyerMyrvold - doc-pgr_isPlanar + boyerMyrvold + isPlanar ) foreach (f ${LOCAL_FILES}) diff --git a/docqueries/spanningTree/CMakeLists.txt b/docqueries/spanningTree/CMakeLists.txt index 4a33c1643d..c7a5dac2de 100644 --- a/docqueries/spanningTree/CMakeLists.txt +++ b/docqueries/spanningTree/CMakeLists.txt @@ -1,13 +1,13 @@ # Do not use extensions SET(LOCAL_FILES - doc-pgr_kruskalBFS - doc-pgr_kruskalDD - doc-pgr_kruskalDFS - doc-pgr_kruskal - doc-pgr_primBFS - doc-pgr_primDD - doc-pgr_primDFS - doc-pgr_prim + kruskalBFS + kruskalDD + kruskalDFS + kruskal + primBFS + primDD + primDFS + prim ) foreach (f ${LOCAL_FILES}) diff --git a/docqueries/topologicalSort/CMakeLists.txt b/docqueries/topologicalSort/CMakeLists.txt index 22dee19269..f2f5aae793 100644 --- a/docqueries/topologicalSort/CMakeLists.txt +++ b/docqueries/topologicalSort/CMakeLists.txt @@ -1,6 +1,6 @@ # Do not use extensions SET(LOCAL_FILES - doc-topologicalSort + topologicalSort ) foreach (f ${LOCAL_FILES}) diff --git a/docqueries/topology/CMakeLists.txt b/docqueries/topology/CMakeLists.txt index 7466f209d7..0d78f52ed8 100644 --- a/docqueries/topology/CMakeLists.txt +++ b/docqueries/topology/CMakeLists.txt @@ -1,11 +1,11 @@ # Do not use extensions SET(LOCAL_FILES - doc-pgr_analyzeGraph - doc-pgr_analyzeOneWay - doc-pgr_createTopology - doc-pgr_createVerticesTable - doc-pgr_extractVertices - doc-pgr_nodeNetwork + analyzeGraph + analyzeOneWay + createTopology + createVerticesTable + extractVertices + nodeNetwork degree ) diff --git a/docqueries/transitiveClosure/CMakeLists.txt b/docqueries/transitiveClosure/CMakeLists.txt index f3c4890009..1f7502b1da 100644 --- a/docqueries/transitiveClosure/CMakeLists.txt +++ b/docqueries/transitiveClosure/CMakeLists.txt @@ -1,6 +1,6 @@ # Do not use extensions SET(LOCAL_FILES - doc-transitiveClosure + transitiveClosure ) foreach (f ${LOCAL_FILES}) diff --git a/docqueries/traversal/CMakeLists.txt b/docqueries/traversal/CMakeLists.txt index eae0c3f681..6bc7709c8f 100644 --- a/docqueries/traversal/CMakeLists.txt +++ b/docqueries/traversal/CMakeLists.txt @@ -1,6 +1,6 @@ # Do not use extensions SET(LOCAL_FILES - doc-pgr_depthFirstSearch + depthFirstSearch ) foreach (f ${LOCAL_FILES}) diff --git a/docqueries/trsp/CMakeLists.txt b/docqueries/trsp/CMakeLists.txt index 87252d0242..a3636ad44d 100644 --- a/docqueries/trsp/CMakeLists.txt +++ b/docqueries/trsp/CMakeLists.txt @@ -1,6 +1,6 @@ # Do not use extensions SET(LOCAL_FILES - doc-trsp + trsp trsp_withPoints trspVia trspVia_withPoints diff --git a/docqueries/tsp/CMakeLists.txt b/docqueries/tsp/CMakeLists.txt index 375dd9173e..69b00b58c3 100644 --- a/docqueries/tsp/CMakeLists.txt +++ b/docqueries/tsp/CMakeLists.txt @@ -1,7 +1,7 @@ # Do not use extensions SET(LOCAL_FILES - doc-pgr_TSPeuclidean - doc-pgr_TSP + TSPeuclidean + TSP ) configure_file("wi29.sql" "${PGR_DOCUMENTATION_SOURCE_DIR}/wi29.queries") diff --git a/docqueries/version/CMakeLists.txt b/docqueries/version/CMakeLists.txt index 304b591291..42e8d8a427 100644 --- a/docqueries/version/CMakeLists.txt +++ b/docqueries/version/CMakeLists.txt @@ -1,7 +1,7 @@ # Do not use extensions SET(LOCAL_FILES - doc-version - doc-full_version + version + full_version ) foreach (f ${LOCAL_FILES}) diff --git a/docqueries/vrp_basic/CMakeLists.txt b/docqueries/vrp_basic/CMakeLists.txt index 6f3cd2f161..b350952e7f 100644 --- a/docqueries/vrp_basic/CMakeLists.txt +++ b/docqueries/vrp_basic/CMakeLists.txt @@ -1,6 +1,6 @@ # Do not use extensions SET(LOCAL_FILES - doc-pgr_vrpOneDepot + vrpOneDepot ) foreach (f ${LOCAL_FILES}) diff --git a/docqueries/withPoints/CMakeLists.txt b/docqueries/withPoints/CMakeLists.txt index 6d1a286060..a20fdf84cb 100644 --- a/docqueries/withPoints/CMakeLists.txt +++ b/docqueries/withPoints/CMakeLists.txt @@ -1,10 +1,10 @@ # Do not use extensions SET(LOCAL_FILES - doc-pgr_withPointsCostMatrix - doc-pgr_withPointsCost - doc-pgr_withPointsDD - doc-pgr_withPointsKSP - doc-pgr_withPoints + withPointsCostMatrix + withPointsCost + withPointsDD + withPointsKSP + withPoints withPointsVia ) From cc8627605999f703f66cc9da0bdbe40b8fbd935d Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:25:55 -0600 Subject: [PATCH 309/428] Adjusting test.conf to have only files key --- docqueries/allpairs/test.conf | 19 ++----------- docqueries/alpha_shape/test.conf | 12 ++------ docqueries/astar/test.conf | 18 +++--------- docqueries/bdAstar/test.conf | 15 +++------- docqueries/bdDijkstra/test.conf | 16 ++++------- docqueries/bellman_ford/test.conf | 12 ++------ docqueries/breadthFirstSearch/test.conf | 12 ++------ docqueries/chinese/test.conf | 12 ++------ docqueries/circuits/test.conf | 9 ++---- docqueries/coloring/test.conf | 15 +++------- docqueries/common/test.conf | 15 ++-------- docqueries/components/test.conf | 24 +++++----------- docqueries/contraction/test.conf | 13 ++------- docqueries/dagShortestPath/test.conf | 9 ++---- docqueries/dijkstra/test.conf | 26 +++++------------ docqueries/dominator/test.conf | 9 ++---- docqueries/driving_distance/test.conf | 14 ++-------- docqueries/ksp/test.conf | 12 ++------ docqueries/lineGraph/test.conf | 18 ++++-------- docqueries/max_flow/test.conf | 31 ++++++--------------- docqueries/mincut/test.conf | 9 ++---- docqueries/ordering/test.conf | 11 ++------ docqueries/pickDeliver/test.conf | 18 ++++-------- docqueries/planar/test.conf | 9 ++---- docqueries/spanningTree/test.conf | 31 ++++++--------------- docqueries/src/test.conf | 18 ++++-------- docqueries/topologicalSort/test.conf | 9 ++---- docqueries/topology/test.conf | 37 +++++++------------------ docqueries/transitiveClosure/test.conf | 9 ++---- docqueries/traversal/test.conf | 9 ++---- docqueries/trsp/test.conf | 35 ++++++++--------------- docqueries/tsp/test.conf | 11 ++------ docqueries/utilities/test.conf | 9 ++---- docqueries/version/test.conf | 17 ++---------- docqueries/vrp_basic/test.conf | 8 ++---- docqueries/withPoints/test.conf | 23 +++++---------- 36 files changed, 148 insertions(+), 426 deletions(-) diff --git a/docqueries/allpairs/test.conf b/docqueries/allpairs/test.conf index 9c7a4149ae..653707ea54 100644 --- a/docqueries/allpairs/test.conf +++ b/docqueries/allpairs/test.conf @@ -2,24 +2,11 @@ %main::tests = ( 'any' => { - 'comment' => 'All pairs tests.', - 'data' => [''], - 'tests' => [qw( - doc-johnson - doc-floydWarshall - )], - - 'documentation' => [qw( - doc-johnson - doc-floydWarshall + 'files' => [qw( + johnson.pg + floydWarshall.pg )] }, -# I don't know what this are for or how to use them. -# TODO ask Steve -# 'vpg-vpgis' => {}, # for version specific tests -# '8-1' => {}, # for pg 8.x and postgis 1.x -# '9.2-2.1' => {}, # for pg 9.2 and postgis 2.1 - ); 1; diff --git a/docqueries/alpha_shape/test.conf b/docqueries/alpha_shape/test.conf index b51e6d9b01..228e355b5a 100644 --- a/docqueries/alpha_shape/test.conf +++ b/docqueries/alpha_shape/test.conf @@ -2,18 +2,10 @@ %main::tests = ( 'any' => { - 'comment' => 'AlphaShape documentation queries', - 'data' => [], - 'tests' => [qw( - doc-pgr_alphashape - )], - 'documentation' => [qw( - doc-pgr_alphashape + 'files' => [qw( + alphashape.pg )] }, - # 'vpg-vpgis' => {}, # for version specific tests - # '8-1' => {}, # for pg 8.x and postgis 1.x - # '9.2-2.1' => {}, # for pg 9.2 and postgis 2.1 ); 1; diff --git a/docqueries/astar/test.conf b/docqueries/astar/test.conf index 5cab28a16b..0aacac69f5 100644 --- a/docqueries/astar/test.conf +++ b/docqueries/astar/test.conf @@ -2,22 +2,12 @@ %main::tests = ( 'any' => { - 'comment' => 'astar test for any versions.', - 'data' => [''], - 'tests' => [qw( - doc-astar - doc-aStarCost - doc-aStarCostMatrix - )], - 'documentation' => [qw( - doc-astar - doc-aStarCost - doc-aStarCostMatrix + 'files' => [qw( + astar.pg + aStarCost.pg + aStarCostMatrix.pg )] }, -# 'vpg-vpgis' => {}, # for version specific tests -# '8-1' => {}, # for pg 8.x and postgis 1.x -# '9.2-2.1' => {}, # for pg 9.2 and postgis 2.1 ); 1; diff --git a/docqueries/bdAstar/test.conf b/docqueries/bdAstar/test.conf index 4225cc76ff..2338200a7b 100644 --- a/docqueries/bdAstar/test.conf +++ b/docqueries/bdAstar/test.conf @@ -2,17 +2,10 @@ %main::tests = ( 'any' => { - 'comment' => 'pgr_pdAstar (new signature)', - 'data' => [], - 'tests' => [qw( - doc-pgr_bdAstar - doc-pgr_bdAstarCost - doc-pgr_bdAstarCostMatrix - )], - 'documentation' => [qw( - doc-pgr_bdAstar - doc-pgr_bdAstarCost - doc-pgr_bdAstarCostMatrix + 'files' => [qw( + bdAstar.pg + bdAstarCost.pg + bdAstarCostMatrix.pg )] }, ); diff --git a/docqueries/bdDijkstra/test.conf b/docqueries/bdDijkstra/test.conf index fcba6d74bb..2a713d1c3a 100644 --- a/docqueries/bdDijkstra/test.conf +++ b/docqueries/bdDijkstra/test.conf @@ -2,18 +2,12 @@ %main::tests = ( 'any' => { - 'comment' => 'pgr_pdDijkstra (new signature) old large test', 'data' => ["large.data" ], - 'tests' => [qw( - bdDijkstra-large - doc-pgr_bdDijkstra - doc-pgr_bdDijkstraCost - doc-pgr_bdDijkstraCostMatrix - )], - 'documentation' => [qw( - doc-pgr_bdDijkstra - doc-pgr_bdDijkstraCost - doc-pgr_bdDijkstraCostMatrix + 'files' => [qw( + bdDijkstra-large.pg + bdDijkstra.pg + bdDijkstraCost.pg + bdDijkstraCostMatrix.pg )] }, ); diff --git a/docqueries/bellman_ford/test.conf b/docqueries/bellman_ford/test.conf index fb75b984df..3b5e0985f9 100644 --- a/docqueries/bellman_ford/test.conf +++ b/docqueries/bellman_ford/test.conf @@ -2,15 +2,9 @@ %main::tests = ( 'any' => { - 'comment' => 'Dijkstra test for any versions.', - 'data' => [ ], - 'tests' => [qw( - doc-pgr_bellmanFord - doc-pgr_edwardMoore - )], - 'documentation' => [qw( - doc-pgr_bellmanFord - doc-pgr_edwardMoore + 'files' => [qw( + bellmanFord.pg + edwardMoore.pg )] }, diff --git a/docqueries/breadthFirstSearch/test.conf b/docqueries/breadthFirstSearch/test.conf index bb117b0680..0e358e5a09 100644 --- a/docqueries/breadthFirstSearch/test.conf +++ b/docqueries/breadthFirstSearch/test.conf @@ -2,15 +2,9 @@ %main::tests = ( 'any' => { - 'comment' => 'Breadth First Search algorithm tests.', - 'data' => [ ], - 'tests' => [qw( - doc-pgr_breadthFirstSearch - doc-pgr_binaryBreadthFirstSearch - )], - 'documentation' => [qw( - doc-pgr_breadthFirstSearch - doc-pgr_binaryBreadthFirstSearch + 'files' => [qw( + breadthFirstSearch.pg + binaryBreadthFirstSearch.pg )] }, diff --git a/docqueries/chinese/test.conf b/docqueries/chinese/test.conf index 3f839367c4..2f6b622a66 100644 --- a/docqueries/chinese/test.conf +++ b/docqueries/chinese/test.conf @@ -2,15 +2,9 @@ %main::tests = ( 'any' => { - 'comment' => 'Directed Chinese Postman Problem test for any versions.', - 'data' => [ ], - 'tests' => [qw( - doc-pgr_chinesePostman - doc-pgr_chinesePostmanCost - )], - 'documentation' => [qw( - doc-pgr_chinesePostman - doc-pgr_chinesePostmanCost + 'files' => [qw( + chinesePostman.pg + chinesePostmanCost.pg )] }, diff --git a/docqueries/circuits/test.conf b/docqueries/circuits/test.conf index 8d5c0d4e5f..a128ab4ca6 100644 --- a/docqueries/circuits/test.conf +++ b/docqueries/circuits/test.conf @@ -2,13 +2,8 @@ %main::tests = ( 'any' => { - 'comment' => 'pgr_hawickCircuits algorithm tests', - 'data' => ["" ], - 'tests' => [qw( - hawickCircuits - )], - 'documentation' => [qw( - hawickCircuits + 'files' => [qw( + hawickCircuits.pg )] }, ); diff --git a/docqueries/coloring/test.conf b/docqueries/coloring/test.conf index 4fdc3150e8..f2991ead56 100644 --- a/docqueries/coloring/test.conf +++ b/docqueries/coloring/test.conf @@ -2,17 +2,10 @@ %main::tests = ( 'any' => { - 'comment' => 'Coloring algorithm tests.', - 'data' => [ ], - 'tests' => [qw( - doc-pgr_sequentialVertexColoring - doc-bipartite - doc-edgeColoring - )], - 'documentation' => [qw( - doc-pgr_sequentialVertexColoring - doc-bipartite - doc-edgeColoring + 'files' => [qw( + sequentialVertexColoring.pg + bipartite.pg + edgeColoring.pg )] }, diff --git a/docqueries/common/test.conf b/docqueries/common/test.conf index ae4ad12deb..7eb6a08025 100644 --- a/docqueries/common/test.conf +++ b/docqueries/common/test.conf @@ -2,22 +2,11 @@ %main::tests = ( 'any' => { - 'comment' => 'pgr_createTopology, pgr_analyzegraph, and pgr_analyzeOneway tests for any versions.', 'data' => ['sampledata.data'], - 'tests' => [qw( - versionless-any-01 + 'files' => [qw( + versionless-any-01.pg )], - - 'documentation' => [qw( - )], - - 'dummyStorage' => [qw( - )] - }, -# 'vpg-vpgis' => {}, # for version specific tests -# '8-1' => {}, # for pg 8.x and postgis 1.x -# '9.2-2.1' => {}, # for pg 9.2 and postgis 2.1 ); 1; diff --git a/docqueries/components/test.conf b/docqueries/components/test.conf index 287a4862f1..cb3b31a57a 100644 --- a/docqueries/components/test.conf +++ b/docqueries/components/test.conf @@ -2,23 +2,13 @@ %main::tests = ( 'any' => { - 'comment' => 'Components test for any versions.', - 'data' => [ ], - 'tests' => [qw( - doc-pgr_connectedComponents - doc-pgr_strongComponents - doc-pgr_biconnectedComponents - doc-pgr_articulationPoints - doc-pgr_bridges - doc-pgr_makeConnected - )], - 'documentation' => [qw( - doc-pgr_connectedComponents - doc-pgr_strongComponents - doc-pgr_biconnectedComponents - doc-pgr_articulationPoints - doc-pgr_bridges - doc-pgr_makeConnected + 'files' => [qw( + connectedComponents.pg + strongComponents.pg + biconnectedComponents.pg + articulationPoints.pg + bridges.pg + makeConnected.pg )] }, diff --git a/docqueries/contraction/test.conf b/docqueries/contraction/test.conf index b2aaf02ff3..bd08f892df 100644 --- a/docqueries/contraction/test.conf +++ b/docqueries/contraction/test.conf @@ -2,16 +2,9 @@ %main::tests = ( 'any' => { - 'comment' => 'Contraction', - 'data' => [ ], - 'tests' => [qw( - doc-contraction-family - doc-pgr_contraction - )], - - 'documentation' => [qw( - doc-contraction-family - doc-pgr_contraction + 'files' => [qw( + contraction-family.pg + contraction.pg )] }, diff --git a/docqueries/dagShortestPath/test.conf b/docqueries/dagShortestPath/test.conf index 74bcbc9987..1182f9cfb8 100644 --- a/docqueries/dagShortestPath/test.conf +++ b/docqueries/dagShortestPath/test.conf @@ -2,13 +2,8 @@ %main::tests = ( 'any' => { - 'comment' => 'pgr_dagShortestPath', - 'data' => [ ], - 'tests' => [qw( - doc-pgr_dagShortestPath - )], - 'documentation' => [qw( - doc-pgr_dagShortestPath + 'files' => [qw( + dagShortestPath.pg )] }, diff --git a/docqueries/dijkstra/test.conf b/docqueries/dijkstra/test.conf index 16222ee358..9a020d6203 100644 --- a/docqueries/dijkstra/test.conf +++ b/docqueries/dijkstra/test.conf @@ -2,25 +2,13 @@ %main::tests = ( 'any' => { - 'comment' => 'Dijkstra test for any versions.', - 'data' => [ ], - 'tests' => [qw( - doc-pgr_dijkstra - doc-pgr_dijkstraVia - doc-pgr_dijkstraCost - doc-pgr_dijkstraCostMatrix - doc-pgr_dijkstraNear - doc-pgr_dijkstraNearCost - )], - 'documentation' => [qw( - doc-pgr_dijkstra - doc-pgr_dijkstraVia - doc-pgr_dijkstraCost - doc-pgr_dijkstraCostMatrix - doc-pgr_dijkstraNear - doc-pgr_dijkstraNearCost - )] - ,'notests' => [qw( + 'files' => [qw( + dijkstra.pg + dijkstraVia.pg + dijkstraCost.pg + dijkstraCostMatrix.pg + dijkstraNear.pg + dijkstraNearCost.pg )] }, ); diff --git a/docqueries/dominator/test.conf b/docqueries/dominator/test.conf index 79b4135f1d..4553a9865e 100644 --- a/docqueries/dominator/test.conf +++ b/docqueries/dominator/test.conf @@ -2,13 +2,8 @@ %main::tests = ( 'any' => { - 'comment' => 'dominator algorithm tests', - 'data' => [ ], - 'tests' => [qw( - doc-lengauerTarjanDominatorTree - )], - 'documentation' => [qw( - doc-lengauerTarjanDominatorTree + 'files' => [qw( + lengauerTarjanDominatorTree.pg )] }, diff --git a/docqueries/driving_distance/test.conf b/docqueries/driving_distance/test.conf index 121bb24a9e..b9770391bd 100644 --- a/docqueries/driving_distance/test.conf +++ b/docqueries/driving_distance/test.conf @@ -2,19 +2,11 @@ %main::tests = ( 'any' => { - 'comment' => 'Driving Distance test for any versions.', - 'data' => [], - 'tests' => [qw( - pgr_drivingDistance - dijksraDD-issue729 - )], - 'documentation' => [qw( - pgr_drivingDistance + 'files' => [qw( + drivingDistance.pg + dijksraDD-issue729.pg )] }, -# 'vpg-vpgis' => {}, # for version specific tests -# '8-1' => {}, # for pg 8.x and postgis 1.x -# '9.2-2.1' => {}, # for pg 9.2 and postgis 2.1 ); 1; diff --git a/docqueries/ksp/test.conf b/docqueries/ksp/test.conf index f4cbb10ed1..a7597f5210 100644 --- a/docqueries/ksp/test.conf +++ b/docqueries/ksp/test.conf @@ -2,15 +2,9 @@ %main::tests = ( 'any' => { - 'comment' => 'KSP', - 'data' => [''], - 'tests' => [qw( - doc-ksp - doc-pgr_turnRestrictedPath - )], - 'documentation' => [qw( - doc-ksp - doc-pgr_turnRestrictedPath + 'files' => [qw( + ksp.pg + turnRestrictedPath.pg )] }, diff --git a/docqueries/lineGraph/test.conf b/docqueries/lineGraph/test.conf index 4f4763dad9..6f7757901d 100644 --- a/docqueries/lineGraph/test.conf +++ b/docqueries/lineGraph/test.conf @@ -2,19 +2,13 @@ %main::tests = ( 'any' => { - 'comment' => 'LineGraph test for any versions.', - 'data' => [ ], - 'tests' => [qw( - doc-pgr_lineGraphFull - doc-pgr_lineGraph - pgtap_design_lineGraphFull - proofOfConcept1 - proofOfConcept2 + 'files' => [qw( + lineGraphFull.pg + lineGraph.pg + pgtap_design_lineGraphFull.pg + proofOfConcept1.pg + proofOfConcept2.pg )], - 'documentation' => [qw( - doc-pgr_lineGraphFull - doc-pgr_lineGraph - )] }, ); diff --git a/docqueries/max_flow/test.conf b/docqueries/max_flow/test.conf index 1b2e6c1407..46a87da896 100644 --- a/docqueries/max_flow/test.conf +++ b/docqueries/max_flow/test.conf @@ -2,28 +2,15 @@ %main::tests = ( 'any' => { - 'comment' => 'Max flow and applications test for any versions.', - 'data' => [ ], - 'tests' => [qw( - doc-pgr_maxFlow - doc-pgr_boykovKolmogorov - doc-pgr_pushRelabel - doc-pgr_edmondsKarp - doc-pgr_maxCardinalityMatch - doc-pgr_edgeDisjointPaths - doc-pgr_maxFlowMinCost - doc-pgr_maxFlowMinCost_Cost - - )], - 'documentation' => [qw( - doc-pgr_maxFlow - doc-pgr_boykovKolmogorov - doc-pgr_pushRelabel - doc-pgr_edmondsKarp - doc-pgr_maxCardinalityMatch - doc-pgr_edgeDisjointPaths - doc-pgr_maxFlowMinCost - doc-pgr_maxFlowMinCost_Cost + 'files' => [qw( + maxFlow.pg + boykovKolmogorov.pg + pushRelabel.pg + edmondsKarp.pg + maxCardinalityMatch.pg + edgeDisjointPaths.pg + maxFlowMinCost.pg + maxFlowMinCost_Cost.pg )] }, ); diff --git a/docqueries/mincut/test.conf b/docqueries/mincut/test.conf index b0a914f6e5..2ce6ca260d 100644 --- a/docqueries/mincut/test.conf +++ b/docqueries/mincut/test.conf @@ -2,13 +2,8 @@ %main::tests = ( 'any' => { - 'comment' => 'stoer_wagner algorithm tets.', - 'data' => [ ], - 'tests' => [qw( - doc-stoerWagner - )], - 'documentation' => [qw( - doc-stoerWagner + 'files' => [qw( + stoerWagner.pg )] }, diff --git a/docqueries/ordering/test.conf b/docqueries/ordering/test.conf index 73d9c92212..257a2beef7 100644 --- a/docqueries/ordering/test.conf +++ b/docqueries/ordering/test.conf @@ -2,16 +2,11 @@ %main::tests = ( 'any' => { - 'comment' => 'Ordering algorithm tests.', - 'data' => [ ], - 'tests' => [qw( - cuthillMckeeOrdering - )], - 'documentation' => [qw( - cuthillMckeeOrdering + 'files' => [qw( + cuthillMckeeOrdering.pg )] }, ); -1; \ No newline at end of file +1; diff --git a/docqueries/pickDeliver/test.conf b/docqueries/pickDeliver/test.conf index f30ce9bb2d..7b331a952e 100644 --- a/docqueries/pickDeliver/test.conf +++ b/docqueries/pickDeliver/test.conf @@ -2,21 +2,13 @@ %main::tests = ( 'any' => { - 'comment' => 'Function test for any versions.', - 'data' => [], - 'tests' => [qw( - doc-pickDeliver - doc-pickDeliverEuclidean - lc101 + 'files' => [qw( + pickDeliver.pg + pickDeliverEuclidean.pg + lc101.pg )], - 'documentation' => [qw( - doc-pickDeliver - doc-pickDeliverEuclidean - lc101 - )], - -#put here the ones that you are not testing (just a place holder) + #put here the ones that you are not testing (just a place holder) 'nottesting' => [qw( past_example jet_customers diff --git a/docqueries/planar/test.conf b/docqueries/planar/test.conf index 4f6137c562..35096e4766 100644 --- a/docqueries/planar/test.conf +++ b/docqueries/planar/test.conf @@ -2,13 +2,8 @@ %main::tests = ( 'any' => { - 'comment' => 'boyerMyrvold planarity algorithm tests.', - 'data' => [ ], - 'tests' => [qw( - doc-pgr_isPlanar - )], - 'documentation' => [qw( - doc-pgr_isPlanar + 'files' => [qw( + isPlanar.pg )] }, diff --git a/docqueries/spanningTree/test.conf b/docqueries/spanningTree/test.conf index 8d6f730dab..2c2d87f39a 100644 --- a/docqueries/spanningTree/test.conf +++ b/docqueries/spanningTree/test.conf @@ -2,29 +2,16 @@ %main::tests = ( 'any' => { - 'comment' => 'Spanning tree algorithm tets.', - 'data' => [ ], - 'tests' => [qw( - doc-pgr_kruskal - doc-pgr_kruskalDD - doc-pgr_kruskalDFS - doc-pgr_kruskalBFS + 'files' => [qw( + kruskal.pg + kruskalDD.pg + kruskalDFS.pg + kruskalBFS.pg - doc-pgr_prim - doc-pgr_primDFS - doc-pgr_primDD - doc-pgr_primBFS - )], - 'documentation' => [qw( - doc-pgr_kruskal - doc-pgr_kruskalDD - doc-pgr_kruskalDFS - doc-pgr_kruskalBFS - - doc-pgr_prim - doc-pgr_primDFS - doc-pgr_primDD - doc-pgr_primBFS + prim.pg + primDFS.pg + primDD.pg + primBFS.pg )] }, diff --git a/docqueries/src/test.conf b/docqueries/src/test.conf index a8072e7593..2eb35118be 100644 --- a/docqueries/src/test.conf +++ b/docqueries/src/test.conf @@ -2,19 +2,11 @@ %main::tests = ( 'any' => { - 'comment' => '', - 'data' => [], - 'tests' => [qw( - withPoints-category - sampledata - migration - concepts - )], - 'documentation' => [qw( - sampledata - withPoints-category - migration - concepts + 'files' => [qw( + sampledata.pg + withPoints-category.pg + migration.pg + concepts.pg )], }, ); diff --git a/docqueries/topologicalSort/test.conf b/docqueries/topologicalSort/test.conf index 1843c3d68c..4fb2719adf 100644 --- a/docqueries/topologicalSort/test.conf +++ b/docqueries/topologicalSort/test.conf @@ -2,13 +2,8 @@ %main::tests = ( 'any' => { - 'comment' => 'topologicalSort algorithm tests.', - 'data' => [ ], - 'tests' => [qw( - doc-topologicalSort - )], - 'documentation' => [qw( - doc-topologicalSort + 'files' => [qw( + topologicalSort.pg )] }, diff --git a/docqueries/topology/test.conf b/docqueries/topology/test.conf index c821ed980c..de6a9bfd29 100644 --- a/docqueries/topology/test.conf +++ b/docqueries/topology/test.conf @@ -2,34 +2,17 @@ %main::tests = ( 'any' => { - 'comment' => 'pgr_createTopology, pgr_analyzegraph, and pgr_analyzeOneway tests for any versions.', - 'data' => [ ], - 'tests' => [qw( - issue900 - createVertTab-any - doc-pgr_createTopology - doc-pgr_createVerticesTable - doc-pgr_analyzeGraph - doc-pgr_analyzeOneWay - doc-pgr_nodeNetwork - doc-pgr_extractVertices - degree + 'files' => [qw( + issue900.pg + createVertTab-any.pg + createTopology.pg + createVerticesTable.pg + analyzeGraph.pg + analyzeOneWay.pg + nodeNetwork.pg + extractVertices.pg + degree.pg )], - - 'documentation' => [qw( - doc-pgr_analyzeGraph - doc-pgr_createTopology - doc-pgr_nodeNetwork - doc-pgr_analyzeOneWay - doc-pgr_createVerticesTable - doc-pgr_extractVertices - doc-pgr_analyzeGraph - degree - )], - - 'dummyStorage' => [qw( - )] - }, ); diff --git a/docqueries/transitiveClosure/test.conf b/docqueries/transitiveClosure/test.conf index 1aef599376..11e49e0b23 100644 --- a/docqueries/transitiveClosure/test.conf +++ b/docqueries/transitiveClosure/test.conf @@ -2,13 +2,8 @@ %main::tests = ( 'any' => { - 'comment' => 'transitiveClosure algorithm tests.', - 'data' => [ ], - 'tests' => [qw( - doc-transitiveClosure - )], - 'documentation' => [qw( - doc-transitiveClosure + 'files' => [qw( + transitiveClosure.pg )] }, diff --git a/docqueries/traversal/test.conf b/docqueries/traversal/test.conf index 22d6d906fe..816840fe48 100644 --- a/docqueries/traversal/test.conf +++ b/docqueries/traversal/test.conf @@ -2,13 +2,8 @@ %main::tests = ( 'any' => { - 'comment' => 'Depth First Search algorithm tests.', - 'data' => [ ], - 'tests' => [qw( - doc-pgr_depthFirstSearch - )], - 'documentation' => [qw( - doc-pgr_depthFirstSearch + 'files' => [qw( + depthFirstSearch.pg )] }, diff --git a/docqueries/trsp/test.conf b/docqueries/trsp/test.conf index 7978fa4fd3..c8a12420d6 100644 --- a/docqueries/trsp/test.conf +++ b/docqueries/trsp/test.conf @@ -2,32 +2,21 @@ %main::tests = ( 'any' => { - 'comment' => 'TRSP test for any versions.', 'data' => ['trsp-issue244.data'], - 'tests' => [qw( - trsp-renumber - doc-trsp - trsp_withPoints - trspVia - trspVia_withPoints - trsp-any-02 - trsp_vias-any-04 - issue693 - issue704 - issue717 - four_edges + 'files' => [qw( + trsp-renumber.pg + trsp.pg + trsp_withPoints.pg + trspVia.pg + trspVia_withPoints.pg + trsp-any-02.pg + trsp_vias-any-04.pg + issue693.pg + issue704.pg + issue717.pg + four_edges.pg )], - 'documentation' => [qw( - doc-trsp - trsp_withPoints - trspVia - trspVia_withPoints - )] }, - -# 'vpg-vpgis' => {}, # for version specific tests -# '8-1' => {}, # for pg 8.x and postgis 1.x -# '9.2-2.1' => {}, # for pg 9.2 and postgis 2.1 ); 1; diff --git a/docqueries/tsp/test.conf b/docqueries/tsp/test.conf index 306060ce73..869bc11e81 100644 --- a/docqueries/tsp/test.conf +++ b/docqueries/tsp/test.conf @@ -2,15 +2,10 @@ %main::tests = ( 'any' => { - 'comment' => 'TSP tests', 'data' => ['wi29.sql'], - 'tests' => [qw( - doc-pgr_TSPeuclidean - doc-pgr_TSP - )], - 'documentation' => [qw( - doc-pgr_TSPeuclidean - doc-pgr_TSP + 'files' => [qw( + TSPeuclidean.pg + TSP.pg )] }, ); diff --git a/docqueries/utilities/test.conf b/docqueries/utilities/test.conf index 1a785c2182..d7ea922f6b 100644 --- a/docqueries/utilities/test.conf +++ b/docqueries/utilities/test.conf @@ -2,13 +2,8 @@ %main::tests = ( 'any' => { - 'comment' => 'Utilites example queries.', - 'data' => [ ], - 'tests' => [qw( - findCloseEdges - )], - 'documentation' => [qw( - findCloseEdges + 'files' => [qw( + findCloseEdges.pg )] }, ); diff --git a/docqueries/version/test.conf b/docqueries/version/test.conf index 81cf944ae1..54c89cf12a 100644 --- a/docqueries/version/test.conf +++ b/docqueries/version/test.conf @@ -2,21 +2,10 @@ %main::tests = ( 'any' => { - 'comment' => 'pgr_createTopology, pgr_analyzegraph, and pgr_analyzeOneway tests for any versions.', - 'data' => ['sampledata.data'], - 'tests' => [qw( - doc-version - doc-full_version + 'files' => [qw( + version.pg + full_version.pg )], - - 'documentation' => [qw( - doc-version - doc-full_version - )], - - 'dummyStorage' => [qw( - )] - }, ); diff --git a/docqueries/vrp_basic/test.conf b/docqueries/vrp_basic/test.conf index bcbd4d6501..63f256698e 100644 --- a/docqueries/vrp_basic/test.conf +++ b/docqueries/vrp_basic/test.conf @@ -2,13 +2,9 @@ %main::tests = ( 'any' => { - 'comment' => 'VRP Single depot test for any versions.', 'data' => ['../../tools/testers/solomon_100_rc101.data.sql'], - 'tests' => [qw( - doc-pgr_vrpOneDepot - )], - 'documentation' => [qw( - doc-pgr_vrpOneDepot + 'files' => [qw( + vrpOneDepot.pg )] }, ); diff --git a/docqueries/withPoints/test.conf b/docqueries/withPoints/test.conf index e7f7ac8e12..6ad1789e0f 100644 --- a/docqueries/withPoints/test.conf +++ b/docqueries/withPoints/test.conf @@ -2,23 +2,14 @@ %main::tests = ( 'any' => { - 'comment' => 'Function test for any versions.', 'data' => ['sampledata.data'], - 'tests' => [qw( - doc-pgr_withPoints - doc-pgr_withPointsCost - doc-pgr_withPointsCostMatrix - doc-pgr_withPointsDD - doc-pgr_withPointsKSP - withPointsVia - )], - 'documentation' => [qw( - doc-pgr_withPoints - doc-pgr_withPointsCost - doc-pgr_withPointsCostMatrix - doc-pgr_withPointsDD - doc-pgr_withPointsKSP - withPointsVia + 'files' => [qw( + withPoints.pg + withPointsCost.pg + withPointsCostMatrix.pg + withPointsDD.pg + withPointsKSP.pg + withPointsVia.pg )], }, ); From c1bde1eaa8c3c7a03e238c9e0a77a3ac64aa86e9 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:38:40 -0600 Subject: [PATCH 310/428] (doc) Adjusting include file.queries to the new file names --- doc/allpairs/pgr_floydWarshall.rst | 2 +- doc/allpairs/pgr_johnson.rst | 2 +- doc/alpha_shape/pgr_alphaShape.rst | 2 +- doc/astar/pgr_aStar.rst | 18 ++-- doc/astar/pgr_aStarCost.rst | 18 ++-- doc/astar/pgr_aStarCostMatrix.rst | 4 +- doc/bdAstar/pgr_bdAstar.rst | 18 ++-- doc/bdAstar/pgr_bdAstarCost.rst | 18 ++-- doc/bdAstar/pgr_bdAstarCostMatrix.rst | 4 +- doc/bdDijkstra/pgr_bdDijkstra.rst | 18 ++-- doc/bdDijkstra/pgr_bdDijkstraCost.rst | 18 ++-- doc/bdDijkstra/pgr_bdDijkstraCostMatrix.rst | 4 +- doc/bellman_ford/pgr_bellmanFord.rst | 18 ++-- doc/bellman_ford/pgr_edwardMoore.rst | 18 ++-- .../pgr_binaryBreadthFirstSearch.rst | 14 +-- .../pgr_breadthFirstSearch.rst | 8 +- doc/chinese/pgr_chinesePostman.rst | 2 +- doc/chinese/pgr_chinesePostmanCost.rst | 2 +- doc/coloring/pgr_bipartite.rst | 6 +- doc/coloring/pgr_edgeColoring.rst | 2 +- doc/coloring/pgr_sequentialVertexColoring.rst | 2 +- doc/components/pgr_articulationPoints.rst | 2 +- doc/components/pgr_biconnectedComponents.rst | 2 +- doc/components/pgr_bridges.rst | 2 +- doc/components/pgr_connectedComponents.rst | 2 +- doc/components/pgr_makeConnected.rst | 2 +- doc/components/pgr_strongComponents.rst | 2 +- doc/contraction/contraction-family.rst | 46 +++++----- doc/contraction/pgr_contraction.rst | 6 +- doc/dagShortestPath/pgr_dagShortestPath.rst | 18 ++-- doc/dijkstra/pgr_dijkstra.rst | 92 +++++++++---------- doc/dijkstra/pgr_dijkstraCost.rst | 18 ++-- doc/dijkstra/pgr_dijkstraCostMatrix.rst | 4 +- doc/dijkstra/pgr_dijkstraNear.rst | 10 +- doc/dijkstra/pgr_dijkstraNearCost.rst | 10 +- doc/dijkstra/pgr_dijkstraVia.rst | 14 +-- .../pgr_lengauerTarjanDominatorTree.rst | 4 +- doc/driving_distance/pgr_drivingDistance.rst | 6 +- doc/ksp/pgr_KSP.rst | 20 ++-- doc/lineGraph/pgr_lineGraph.rst | 10 +- doc/lineGraph/pgr_lineGraphFull.rst | 54 +++++------ doc/max_flow/pgr_boykovKolmogorov.rst | 14 +-- doc/max_flow/pgr_edgeDisjointPaths.rst | 14 +-- doc/max_flow/pgr_edmondsKarp.rst | 14 +-- doc/max_flow/pgr_maxCardinalityMatch.rst | 2 +- doc/max_flow/pgr_maxFlow.rst | 14 +-- doc/max_flow/pgr_maxFlowMinCost.rst | 14 +-- doc/max_flow/pgr_maxFlowMinCost_Cost.rst | 14 +-- doc/max_flow/pgr_pushRelabel.rst | 14 +-- doc/mincut/pgr_stoerWagner.rst | 6 +- doc/pickDeliver/pgr_pickDeliver.rst | 6 +- doc/pickDeliver/pgr_pickDeliverEuclidean.rst | 6 +- doc/planar/pgr_isPlanar.rst | 6 +- doc/spanningTree/pgr_kruskal.rst | 2 +- doc/spanningTree/pgr_kruskalBFS.rst | 4 +- doc/spanningTree/pgr_kruskalDD.rst | 4 +- doc/spanningTree/pgr_kruskalDFS.rst | 4 +- doc/spanningTree/pgr_prim.rst | 2 +- doc/spanningTree/pgr_primBFS.rst | 4 +- doc/spanningTree/pgr_primDD.rst | 4 +- doc/spanningTree/pgr_primDFS.rst | 4 +- doc/topologicalSort/pgr_topologicalSort.rst | 6 +- doc/topology/pgr_analyzeGraph.rst | 52 +++++------ doc/topology/pgr_analyzeOneWay.rst | 2 +- doc/topology/pgr_createTopology.rst | 34 +++---- doc/topology/pgr_createVerticesTable.rst | 42 ++++----- doc/topology/pgr_extractVertices.rst | 18 ++-- doc/topology/pgr_nodeNetwork.rst | 22 ++--- .../pgr_transitiveClosure.rst | 2 +- doc/traversal/pgr_depthFirstSearch.rst | 6 +- doc/trsp/pgr_trsp.rst | 10 +- doc/trsp/pgr_turnRestrictedPath.rst | 8 +- doc/tsp/pgr_TSP.rst | 10 +- doc/tsp/pgr_TSPeuclidean.rst | 6 +- doc/version/pgr_full_version.rst | 2 +- doc/version/pgr_version.rst | 2 +- doc/vrp_basic/pgr_vrpOneDepot.rst | 2 +- doc/withPoints/pgr_withPoints.rst | 18 ++-- doc/withPoints/pgr_withPointsCost.rst | 18 ++-- doc/withPoints/pgr_withPointsCostMatrix.rst | 6 +- doc/withPoints/pgr_withPointsDD.rst | 8 +- doc/withPoints/pgr_withPointsKSP.rst | 16 ++-- 82 files changed, 482 insertions(+), 482 deletions(-) diff --git a/doc/allpairs/pgr_floydWarshall.rst b/doc/allpairs/pgr_floydWarshall.rst index b329513096..d0e5b687fa 100644 --- a/doc/allpairs/pgr_floydWarshall.rst +++ b/doc/allpairs/pgr_floydWarshall.rst @@ -60,7 +60,7 @@ Signatures :Example: For a directed subgraph with edges :math:`\{1, 2, 3, 4\}`. -.. literalinclude:: doc-floydWarshall.queries +.. literalinclude:: floydWarshall.queries :start-after: -- q1 :end-before: -- q2 diff --git a/doc/allpairs/pgr_johnson.rst b/doc/allpairs/pgr_johnson.rst index c3effa52c8..69102e68fb 100644 --- a/doc/allpairs/pgr_johnson.rst +++ b/doc/allpairs/pgr_johnson.rst @@ -58,7 +58,7 @@ Signatures :Example: For a directed subgraph with edges :math:`\{1, 2, 3, 4\}`. -.. literalinclude:: doc-johnson.queries +.. literalinclude:: johnson.queries :start-after: -- q1 :end-before: -- q2 diff --git a/doc/alpha_shape/pgr_alphaShape.rst b/doc/alpha_shape/pgr_alphaShape.rst index d4c18cefc5..81abc58200 100644 --- a/doc/alpha_shape/pgr_alphaShape.rst +++ b/doc/alpha_shape/pgr_alphaShape.rst @@ -75,7 +75,7 @@ Signatures :Example: passing a geometry collection with spoon radius :math:`1.5` using the return variable ``geom`` -.. literalinclude:: doc-pgr_alphashape.queries +.. literalinclude:: alphashape.queries :start-after: -- q1 :end-before: -- q2 diff --git a/doc/astar/pgr_aStar.rst b/doc/astar/pgr_aStar.rst index a8ce21fde2..95f268e276 100644 --- a/doc/astar/pgr_aStar.rst +++ b/doc/astar/pgr_aStar.rst @@ -113,7 +113,7 @@ One to One :Example: From vertex :math:`6` to vertex :math:`12` on a **directed** graph with heuristic :math:`2` -.. literalinclude:: doc-astar.queries +.. literalinclude:: astar.queries :start-after: -- q2 :end-before: -- q3 @@ -135,7 +135,7 @@ One to Many :Example: From vertex :math:`6` to vertices :math:`\{10, 12\}` on a **directed** graph with heuristic :math:`3` and factor :math:`3.5` -.. literalinclude:: doc-astar.queries +.. literalinclude:: astar.queries :start-after: -- q3 :end-before: -- q4 @@ -157,7 +157,7 @@ Many to One :Example: From vertices :math:`\{6, 8\}` to vertex :math:`10` on an **undirected** graph with heuristic :math:`4` -.. literalinclude:: doc-astar.queries +.. literalinclude:: astar.queries :start-after: -- q4 :end-before: -- q5 @@ -179,7 +179,7 @@ Many to Many :Example: From vertices :math:`\{6, 8\}` to vertices :math:`\{10, 12\}` on a **directed** graph with factor :math:`0.5` -.. literalinclude:: doc-astar.queries +.. literalinclude:: astar.queries :start-after: -- q5 :end-before: -- q51 @@ -203,13 +203,13 @@ Combinations The combinations table: -.. literalinclude:: doc-astar.queries +.. literalinclude:: astar.queries :start-after: -- q51 :end-before: -- q52 The query: -.. literalinclude:: doc-astar.queries +.. literalinclude:: astar.queries :start-after: -- q52 :end-before: -- q6 @@ -263,19 +263,19 @@ Additional Examples :Example 1: Demonstration of repeated values are ignored, and result is sorted. -.. literalinclude:: doc-astar.queries +.. literalinclude:: astar.queries :start-after: -- q6 :end-before: -- q7 :Example 2: Making **start vids** the same as **end vids**. -.. literalinclude:: doc-astar.queries +.. literalinclude:: astar.queries :start-after: -- q7 :end-before: -- q8 :Example 3: Manually assigned vertex combinations. -.. literalinclude:: doc-astar.queries +.. literalinclude:: astar.queries :start-after: -- q8 :end-before: -- q9 diff --git a/doc/astar/pgr_aStarCost.rst b/doc/astar/pgr_aStarCost.rst index 8155a33840..60057664d6 100644 --- a/doc/astar/pgr_aStarCost.rst +++ b/doc/astar/pgr_aStarCost.rst @@ -99,7 +99,7 @@ One to One :Example: From vertex :math:`6` to vertex :math:`12` on a **directed** graph with heuristic :math:`2` -.. literalinclude:: doc-aStarCost.queries +.. literalinclude:: aStarCost.queries :start-after: -- q2 :end-before: -- q3 @@ -121,7 +121,7 @@ One to Many :Example: From vertex :math:`6` to vertices :math:`\{10, 12\}` on a **directed** graph with heuristic :math:`3` and factor :math:`3.5` -.. literalinclude:: doc-aStarCost.queries +.. literalinclude:: aStarCost.queries :start-after: -- q3 :end-before: -- q4 @@ -143,7 +143,7 @@ Many to One :Example: From vertices :math:`\{6, 8\}` to vertex :math:`10` on an **undirected** graph with heuristic :math:`4` -.. literalinclude:: doc-aStarCost.queries +.. literalinclude:: aStarCost.queries :start-after: -- q4 :end-before: -- q5 @@ -165,7 +165,7 @@ Many to Many :Example: From vertices :math:`\{6, 8\}` to vertices :math:`\{10, 12\}` on a **directed** graph with factor :math:`0.5` -.. literalinclude:: doc-aStarCost.queries +.. literalinclude:: aStarCost.queries :start-after: -- q5 :end-before: -- q51 @@ -189,13 +189,13 @@ Combinations The combinations table: -.. literalinclude:: doc-aStarCost.queries +.. literalinclude:: aStarCost.queries :start-after: -- q51 :end-before: -- q52 The query: -.. literalinclude:: doc-aStarCost.queries +.. literalinclude:: aStarCost.queries :start-after: -- q52 :end-before: -- q6 @@ -249,19 +249,19 @@ Additional Examples :Example 1: Demonstration of repeated values are ignored, and result is sorted. -.. literalinclude:: doc-aStarCost.queries +.. literalinclude:: aStarCost.queries :start-after: -- q6 :end-before: -- q7 :Example 2: Making **start vids** the same as **end vids**. -.. literalinclude:: doc-aStarCost.queries +.. literalinclude:: aStarCost.queries :start-after: -- q7 :end-before: -- q8 :Example 3: Manually assigned vertex combinations. -.. literalinclude:: doc-aStarCost.queries +.. literalinclude:: aStarCost.queries :start-after: -- q8 :end-before: -- q9 diff --git a/doc/astar/pgr_aStarCostMatrix.rst b/doc/astar/pgr_aStarCostMatrix.rst index a4668eb6ed..7f0320e57d 100644 --- a/doc/astar/pgr_aStarCostMatrix.rst +++ b/doc/astar/pgr_aStarCostMatrix.rst @@ -72,7 +72,7 @@ Signatures :Example: Symmetric cost matrix for vertices :math:`\{5, 6, 10, 15\}` on an **undirected** graph using heuristic :math:`2` -.. literalinclude:: doc-aStarCostMatrix.queries +.. literalinclude:: aStarCostMatrix.queries :start-after: -- q2 :end-before: -- q3 @@ -119,7 +119,7 @@ Additional Examples :Example: Use with :doc:`pgr_TSP` -.. literalinclude:: doc-aStarCostMatrix.queries +.. literalinclude:: aStarCostMatrix.queries :start-after: -- q3 :end-before: -- q4 diff --git a/doc/bdAstar/pgr_bdAstar.rst b/doc/bdAstar/pgr_bdAstar.rst index 1e4c2d6242..5ef6b9a46c 100644 --- a/doc/bdAstar/pgr_bdAstar.rst +++ b/doc/bdAstar/pgr_bdAstar.rst @@ -111,7 +111,7 @@ One to One :Example: From vertex :math:`6` to vertex :math:`12` on a **directed** graph with heuristic :math:`2` -.. literalinclude:: doc-pgr_bdAstar.queries +.. literalinclude:: bdAstar.queries :start-after: -- q2 :end-before: -- q3 @@ -133,7 +133,7 @@ One to Many :Example: From vertex :math:`6` to vertices :math:`\{10, 12\}` on a **directed** graph with heuristic :math:`3` and factor :math:`3.5` -.. literalinclude:: doc-pgr_bdAstar.queries +.. literalinclude:: bdAstar.queries :start-after: -- q3 :end-before: -- q4 @@ -155,7 +155,7 @@ Many to One :Example: From vertices :math:`\{6, 8\}` to vertex :math:`10` on an **undirected** graph with heuristic :math:`4` -.. literalinclude:: doc-pgr_bdAstar.queries +.. literalinclude:: bdAstar.queries :start-after: -- q4 :end-before: -- q5 @@ -177,7 +177,7 @@ Many to Many :Example: From vertices :math:`\{6, 8\}` to vertices :math:`\{10, 12\}` on a **directed** graph with factor :math:`0.5` -.. literalinclude:: doc-pgr_bdAstar.queries +.. literalinclude:: bdAstar.queries :start-after: -- q5 :end-before: -- q51 @@ -201,13 +201,13 @@ Combinations The combinations table: -.. literalinclude:: doc-pgr_bdAstar.queries +.. literalinclude:: bdAstar.queries :start-after: -- q51 :end-before: -- q52 The query: -.. literalinclude:: doc-pgr_bdAstar.queries +.. literalinclude:: bdAstar.queries :start-after: -- q52 :end-before: -- q6 @@ -261,19 +261,19 @@ Additional Examples :Example 1: Demonstration of repeated values are ignored, and result is sorted. -.. literalinclude:: doc-pgr_bdAstar.queries +.. literalinclude:: bdAstar.queries :start-after: -- q6 :end-before: -- q7 :Example 2: Making **start vids** the same as **end vids**. -.. literalinclude:: doc-pgr_bdAstar.queries +.. literalinclude:: bdAstar.queries :start-after: -- q7 :end-before: -- q8 :Example 3: Manually assigned vertex combinations. -.. literalinclude:: doc-pgr_bdAstar.queries +.. literalinclude:: bdAstar.queries :start-after: -- q8 :end-before: -- q9 diff --git a/doc/bdAstar/pgr_bdAstarCost.rst b/doc/bdAstar/pgr_bdAstarCost.rst index 378ce655da..530cb06b9d 100644 --- a/doc/bdAstar/pgr_bdAstarCost.rst +++ b/doc/bdAstar/pgr_bdAstarCost.rst @@ -100,7 +100,7 @@ One to One :Example: From vertex :math:`6` to vertex :math:`12` on a **directed** graph with heuristic :math:`2` -.. literalinclude:: doc-pgr_bdAstarCost.queries +.. literalinclude:: bdAstarCost.queries :start-after: -- q2 :end-before: -- q3 @@ -122,7 +122,7 @@ One to Many :Example: From vertex :math:`6` to vertices :math:`\{10, 12\}` on a **directed** graph with heuristic :math:`3` and factor :math:`3.5` -.. literalinclude:: doc-pgr_bdAstarCost.queries +.. literalinclude:: bdAstarCost.queries :start-after: -- q3 :end-before: -- q4 @@ -144,7 +144,7 @@ Many to One :Example: From vertices :math:`\{6, 8\}` to vertex :math:`10` on an **undirected** graph with heuristic :math:`4` -.. literalinclude:: doc-pgr_bdAstarCost.queries +.. literalinclude:: bdAstarCost.queries :start-after: -- q4 :end-before: -- q5 @@ -166,7 +166,7 @@ Many to Many :Example: From vertices :math:`\{6, 8\}` to vertices :math:`\{10, 12\}` on a **directed** graph with factor :math:`0.5` -.. literalinclude:: doc-pgr_bdAstarCost.queries +.. literalinclude:: bdAstarCost.queries :start-after: -- q5 :end-before: -- q51 @@ -190,13 +190,13 @@ Combinations The combinations table: -.. literalinclude:: doc-pgr_bdAstarCost.queries +.. literalinclude:: bdAstarCost.queries :start-after: -- q51 :end-before: -- q52 The query: -.. literalinclude:: doc-pgr_bdAstarCost.queries +.. literalinclude:: bdAstarCost.queries :start-after: -- q52 :end-before: -- q6 @@ -250,19 +250,19 @@ Additional Examples :Example 1: Demonstration of repeated values are ignored, and result is sorted. -.. literalinclude:: doc-pgr_bdAstarCost.queries +.. literalinclude:: bdAstarCost.queries :start-after: -- q6 :end-before: -- q7 :Example 2: Making **start vids** the same as **end vids**. -.. literalinclude:: doc-pgr_bdAstarCost.queries +.. literalinclude:: bdAstarCost.queries :start-after: -- q7 :end-before: -- q8 :Example 3: Manually assigned vertex combinations. -.. literalinclude:: doc-pgr_bdAstarCost.queries +.. literalinclude:: bdAstarCost.queries :start-after: -- q8 :end-before: -- q9 diff --git a/doc/bdAstar/pgr_bdAstarCostMatrix.rst b/doc/bdAstar/pgr_bdAstarCostMatrix.rst index d250933a48..6f97f58127 100644 --- a/doc/bdAstar/pgr_bdAstarCostMatrix.rst +++ b/doc/bdAstar/pgr_bdAstarCostMatrix.rst @@ -72,7 +72,7 @@ Signatures :Example: Symmetric cost matrix for vertices :math:`\{5, 6, 10, 15\}` on an **undirected** graph using heuristic :math:`2` -.. literalinclude:: doc-pgr_bdAstarCostMatrix.queries +.. literalinclude:: bdAstarCostMatrix.queries :start-after: -- q2 :end-before: -- q3 @@ -119,7 +119,7 @@ Additional Examples :Example: Use with :doc:`pgr_TSP` -.. literalinclude:: doc-pgr_bdAstarCostMatrix.queries +.. literalinclude:: bdAstarCostMatrix.queries :start-after: -- q3 :end-before: -- q4 diff --git a/doc/bdDijkstra/pgr_bdDijkstra.rst b/doc/bdDijkstra/pgr_bdDijkstra.rst index e100fa3dd8..f9b6a055cd 100644 --- a/doc/bdDijkstra/pgr_bdDijkstra.rst +++ b/doc/bdDijkstra/pgr_bdDijkstra.rst @@ -94,7 +94,7 @@ One to One :Example: From vertex :math:`6` to vertex :math:`10` on a **directed** graph -.. literalinclude:: doc-pgr_bdDijkstra.queries +.. literalinclude:: bdDijkstra.queries :start-after: -- q2 :end-before: -- q3 @@ -115,7 +115,7 @@ One to Many :Example: From vertex :math:`6` to vertices :math:`\{10, 17\}` on a **directed** graph -.. literalinclude:: doc-pgr_bdDijkstra.queries +.. literalinclude:: bdDijkstra.queries :start-after: -- q3 :end-before: -- q4 @@ -136,7 +136,7 @@ Many to One :Example: From vertices :math:`\{6, 1\}` to vertex :math:`17` on a **directed** graph -.. literalinclude:: doc-pgr_bdDijkstra.queries +.. literalinclude:: bdDijkstra.queries :start-after: -- q4 :end-before: -- q5 @@ -157,7 +157,7 @@ Many to Many :Example: From vertices :math:`\{6, 1\}` to vertices :math:`\{10, 17\}` on an **undirected** graph -.. literalinclude:: doc-pgr_bdDijkstra.queries +.. literalinclude:: bdDijkstra.queries :start-after: -- q5 :end-before: -- q51 @@ -179,13 +179,13 @@ Combinations The combinations table: -.. literalinclude:: doc-pgr_bdDijkstra.queries +.. literalinclude:: bdDijkstra.queries :start-after: -- q51 :end-before: -- q52 The query: -.. literalinclude:: doc-pgr_bdDijkstra.queries +.. literalinclude:: bdDijkstra.queries :start-after: -- q52 :end-before: -- q6 @@ -232,19 +232,19 @@ Additional Examples :Example 1: Demonstration of repeated values are ignored, and result is sorted. -.. literalinclude:: doc-pgr_bdDijkstra.queries +.. literalinclude:: bdDijkstra.queries :start-after: -- q6 :end-before: -- q7 :Example 2: Making **start vids** the same as **end vids**. -.. literalinclude:: doc-pgr_bdDijkstra.queries +.. literalinclude:: bdDijkstra.queries :start-after: -- q7 :end-before: -- q8 :Example 3: Manually assigned vertex combinations. -.. literalinclude:: doc-pgr_bdDijkstra.queries +.. literalinclude:: bdDijkstra.queries :start-after: -- q8 :end-before: -- q9 diff --git a/doc/bdDijkstra/pgr_bdDijkstraCost.rst b/doc/bdDijkstra/pgr_bdDijkstraCost.rst index 3847e8427e..29606a4e03 100644 --- a/doc/bdDijkstra/pgr_bdDijkstraCost.rst +++ b/doc/bdDijkstra/pgr_bdDijkstraCost.rst @@ -85,7 +85,7 @@ One to One :Example: From vertex :math:`6` to vertex :math:`10` on a **directed** graph -.. literalinclude:: doc-pgr_bdDijkstraCost.queries +.. literalinclude:: bdDijkstraCost.queries :start-after: -- q2 :end-before: -- q3 @@ -106,7 +106,7 @@ One to Many :Example: From vertex :math:`6` to vertices :math:`\{10, 17\}` on a **directed** graph -.. literalinclude:: doc-pgr_bdDijkstraCost.queries +.. literalinclude:: bdDijkstraCost.queries :start-after: -- q3 :end-before: -- q4 @@ -127,7 +127,7 @@ Many to One :Example: From vertices :math:`\{6, 1\}` to vertex :math:`17` on a **directed** graph -.. literalinclude:: doc-pgr_bdDijkstraCost.queries +.. literalinclude:: bdDijkstraCost.queries :start-after: -- q4 :end-before: -- q5 @@ -148,7 +148,7 @@ Many to Many :Example: From vertices :math:`\{6, 1\}` to vertices :math:`\{10, 17\}` on an **undirected** graph -.. literalinclude:: doc-pgr_bdDijkstraCost.queries +.. literalinclude:: bdDijkstraCost.queries :start-after: -- q5 :end-before: -- q51 @@ -170,13 +170,13 @@ Combinations The combinations table: -.. literalinclude:: doc-pgr_bdDijkstraCost.queries +.. literalinclude:: bdDijkstraCost.queries :start-after: -- q51 :end-before: -- q52 The query: -.. literalinclude:: doc-pgr_bdDijkstraCost.queries +.. literalinclude:: bdDijkstraCost.queries :start-after: -- q52 :end-before: -- q6 @@ -223,19 +223,19 @@ Additional Examples :Example 1: Demonstration of repeated values are ignored, and result is sorted. -.. literalinclude:: doc-pgr_bdDijkstraCost.queries +.. literalinclude:: bdDijkstraCost.queries :start-after: -- q6 :end-before: -- q7 :Example 2: Making **start vids** the same as **end vids**. -.. literalinclude:: doc-pgr_bdDijkstraCost.queries +.. literalinclude:: bdDijkstraCost.queries :start-after: -- q7 :end-before: -- q8 :Example 3: Manually assigned vertex combinations. -.. literalinclude:: doc-pgr_bdDijkstraCost.queries +.. literalinclude:: bdDijkstraCost.queries :start-after: -- q8 :end-before: -- q9 diff --git a/doc/bdDijkstra/pgr_bdDijkstraCostMatrix.rst b/doc/bdDijkstra/pgr_bdDijkstraCostMatrix.rst index 6931cd50d4..cebff3a600 100644 --- a/doc/bdDijkstra/pgr_bdDijkstraCostMatrix.rst +++ b/doc/bdDijkstra/pgr_bdDijkstraCostMatrix.rst @@ -64,7 +64,7 @@ Signatures :Example: Symmetric cost matrix for vertices :math:`\{5, 6, 10, 15\}` on an **undirected** graph -.. literalinclude:: doc-pgr_bdDijkstraCostMatrix.queries +.. literalinclude:: bdDijkstraCostMatrix.queries :start-after: -- q2 :end-before: -- q3 @@ -104,7 +104,7 @@ Additional Examples :Example: Use with :doc:`pgr_TSP`. -.. literalinclude:: doc-pgr_bdDijkstraCostMatrix.queries +.. literalinclude:: bdDijkstraCostMatrix.queries :start-after: -- q3 :end-before: -- q4 diff --git a/doc/bellman_ford/pgr_bellmanFord.rst b/doc/bellman_ford/pgr_bellmanFord.rst index 5cdf49e9c8..3b78cd0ebb 100644 --- a/doc/bellman_ford/pgr_bellmanFord.rst +++ b/doc/bellman_ford/pgr_bellmanFord.rst @@ -112,7 +112,7 @@ One to One :Example: From vertex :math:`6` to vertex :math:`10` on a **directed** graph -.. literalinclude:: doc-pgr_bellmanFord.queries +.. literalinclude:: bellmanFord.queries :start-after: -- q2 :end-before: -- q3 @@ -133,7 +133,7 @@ One to Many :Example: From vertex :math:`6` to vertices :math:`\{ 10, 17\}` on a **directed** graph -.. literalinclude:: doc-pgr_bellmanFord.queries +.. literalinclude:: bellmanFord.queries :start-after: -- q3 :end-before: -- q4 @@ -154,7 +154,7 @@ Many to One :Example: From vertices :math:`\{6, 1\}` to vertex :math:`17` on a **directed** graph -.. literalinclude:: doc-pgr_bellmanFord.queries +.. literalinclude:: bellmanFord.queries :start-after: -- q4 :end-before: -- q5 @@ -175,7 +175,7 @@ Many to Many :Example: From vertices :math:`\{6, 1\}` to vertices :math:`\{10, 17\}` on an **undirected** graph -.. literalinclude:: doc-pgr_bellmanFord.queries +.. literalinclude:: bellmanFord.queries :start-after: -- q5 :end-before: -- q51 @@ -197,13 +197,13 @@ Combinations The combinations table: -.. literalinclude:: doc-pgr_bellmanFord.queries +.. literalinclude:: bellmanFord.queries :start-after: -- q51 :end-before: -- q52 The query: -.. literalinclude:: doc-pgr_bellmanFord.queries +.. literalinclude:: bellmanFord.queries :start-after: -- q52 :end-before: -- q6 @@ -250,19 +250,19 @@ Additional Examples :Example 1: Demonstration of repeated values are ignored, and result is sorted. -.. literalinclude:: doc-pgr_bellmanFord.queries +.. literalinclude:: bellmanFord.queries :start-after: -- q6 :end-before: -- q7 :Example 2: Making **start vids** the same as **end vids**. -.. literalinclude:: doc-pgr_bellmanFord.queries +.. literalinclude:: bellmanFord.queries :start-after: -- q7 :end-before: -- q8 :Example 3: Manually assigned vertex combinations. -.. literalinclude:: doc-pgr_bellmanFord.queries +.. literalinclude:: bellmanFord.queries :start-after: -- q8 :end-before: -- q9 diff --git a/doc/bellman_ford/pgr_edwardMoore.rst b/doc/bellman_ford/pgr_edwardMoore.rst index ff10364889..e4a2c93ecc 100644 --- a/doc/bellman_ford/pgr_edwardMoore.rst +++ b/doc/bellman_ford/pgr_edwardMoore.rst @@ -114,7 +114,7 @@ One to One :Example: From vertex :math:`6` to vertex :math:`10` on a **directed** graph -.. literalinclude:: doc-pgr_edwardMoore.queries +.. literalinclude:: edwardMoore.queries :start-after: -- q2 :end-before: -- q3 @@ -135,7 +135,7 @@ One to Many :Example: From vertex :math:`6` to vertices :math:`\{ 10, 17\}` on a **directed** graph -.. literalinclude:: doc-pgr_edwardMoore.queries +.. literalinclude:: edwardMoore.queries :start-after: -- q3 :end-before: -- q4 @@ -156,7 +156,7 @@ Many to One :Example: From vertices :math:`\{6, 1\}` to vertex :math:`17` on a **directed** graph -.. literalinclude:: doc-pgr_edwardMoore.queries +.. literalinclude:: edwardMoore.queries :start-after: -- q4 :end-before: -- q5 @@ -177,7 +177,7 @@ Many to Many :Example: From vertices :math:`\{6, 1\}` to vertices :math:`\{10, 17\}` on an **undirected** graph -.. literalinclude:: doc-pgr_edwardMoore.queries +.. literalinclude:: edwardMoore.queries :start-after: -- q5 :end-before: -- q51 @@ -199,13 +199,13 @@ Combinations The combinations table: -.. literalinclude:: doc-pgr_edwardMoore.queries +.. literalinclude:: edwardMoore.queries :start-after: -- q51 :end-before: -- q52 The query: -.. literalinclude:: doc-pgr_edwardMoore.queries +.. literalinclude:: edwardMoore.queries :start-after: -- q52 :end-before: -- q6 @@ -252,19 +252,19 @@ Additional Examples :Example 1: Demonstration of repeated values are ignored, and result is sorted. -.. literalinclude:: doc-pgr_edwardMoore.queries +.. literalinclude:: edwardMoore.queries :start-after: -- q6 :end-before: -- q7 :Example 2: Making **start vids** the same as **end vids**. -.. literalinclude:: doc-pgr_edwardMoore.queries +.. literalinclude:: edwardMoore.queries :start-after: -- q7 :end-before: -- q8 :Example 3: Manually assigned vertex combinations. -.. literalinclude:: doc-pgr_edwardMoore.queries +.. literalinclude:: edwardMoore.queries :start-after: -- q8 :end-before: -- q9 diff --git a/doc/breadthFirstSearch/pgr_binaryBreadthFirstSearch.rst b/doc/breadthFirstSearch/pgr_binaryBreadthFirstSearch.rst index 8c260eaf69..2980146284 100644 --- a/doc/breadthFirstSearch/pgr_binaryBreadthFirstSearch.rst +++ b/doc/breadthFirstSearch/pgr_binaryBreadthFirstSearch.rst @@ -113,7 +113,7 @@ One to One :Example: From vertex :math:`6` to vertex :math:`10` on a **directed** graph -.. literalinclude:: doc-pgr_binaryBreadthFirstSearch.queries +.. literalinclude:: binaryBreadthFirstSearch.queries :start-after: -- q1 :end-before: -- q2 @@ -134,7 +134,7 @@ One to Many :Example: From vertex :math:`6` to vertices :math:`\{10, 17\}` on a **directed** graph -.. literalinclude:: doc-pgr_binaryBreadthFirstSearch.queries +.. literalinclude:: binaryBreadthFirstSearch.queries :start-after: -- q2 :end-before: -- q3 @@ -155,7 +155,7 @@ Many to One :Example: From vertices :math:`\{6, 1\}` to vertex :math:`17` on a **directed** graph -.. literalinclude:: doc-pgr_binaryBreadthFirstSearch.queries +.. literalinclude:: binaryBreadthFirstSearch.queries :start-after: -- q3 :end-before: -- q4 @@ -176,7 +176,7 @@ Many to Many :Example: From vertices :math:`\{6, 1\}` to vertices :math:`\{10, 17\}` on an **undirected** graph -.. literalinclude:: doc-pgr_binaryBreadthFirstSearch.queries +.. literalinclude:: binaryBreadthFirstSearch.queries :start-after: -- q4 :end-before: -- q5 @@ -198,13 +198,13 @@ Combinations The combinations table: -.. literalinclude:: doc-pgr_binaryBreadthFirstSearch.queries +.. literalinclude:: binaryBreadthFirstSearch.queries :start-after: -- q5 :end-before: -- q51 The query: -.. literalinclude:: doc-pgr_binaryBreadthFirstSearch.queries +.. literalinclude:: binaryBreadthFirstSearch.queries :start-after: -- q51 :end-before: -- q6 @@ -252,7 +252,7 @@ Additional Examples :Example: Manually assigned vertex combinations. -.. literalinclude:: doc-pgr_binaryBreadthFirstSearch.queries +.. literalinclude:: binaryBreadthFirstSearch.queries :start-after: -- q6 :end-before: -- q7 diff --git a/doc/breadthFirstSearch/pgr_breadthFirstSearch.rst b/doc/breadthFirstSearch/pgr_breadthFirstSearch.rst index 38e0af043e..eb8c6d61e2 100644 --- a/doc/breadthFirstSearch/pgr_breadthFirstSearch.rst +++ b/doc/breadthFirstSearch/pgr_breadthFirstSearch.rst @@ -78,7 +78,7 @@ Single vertex :Example: From root vertex :math:`6` on a **directed** graph with edges in ascending order of ``id`` -.. literalinclude:: doc-pgr_breadthFirstSearch.queries +.. literalinclude:: breadthFirstSearch.queries :start-after: -- q1 :end-before: -- q2 @@ -99,7 +99,7 @@ Multiple vertices :Example: From root vertices :math:`\{12, 6\}` on an **undirected** graph with **depth** :math:`<= 2` and edges in ascending order of ``id`` -.. literalinclude:: doc-pgr_breadthFirstSearch.queries +.. literalinclude:: breadthFirstSearch.queries :start-after: -- q2 :end-before: -- q3 @@ -146,13 +146,13 @@ Additional Examples :Example: Same as `Single vertex`_ with edges in ascending order of ``id``. -.. literalinclude:: doc-pgr_breadthFirstSearch.queries +.. literalinclude:: breadthFirstSearch.queries :start-after: -- q1 :end-before: -- q2 :Example: Same as `Single vertex`_ with edges in descending order of ``id``. -.. literalinclude:: doc-pgr_breadthFirstSearch.queries +.. literalinclude:: breadthFirstSearch.queries :start-after: -- q3 :end-before: -- q4 diff --git a/doc/chinese/pgr_chinesePostman.rst b/doc/chinese/pgr_chinesePostman.rst index c952677316..4991c9bc25 100644 --- a/doc/chinese/pgr_chinesePostman.rst +++ b/doc/chinese/pgr_chinesePostman.rst @@ -52,7 +52,7 @@ Signatures :Example: -.. literalinclude:: doc-pgr_chinesePostman.queries +.. literalinclude:: chinesePostman.queries :start-after: -- q1 :end-before: -- q2 diff --git a/doc/chinese/pgr_chinesePostmanCost.rst b/doc/chinese/pgr_chinesePostmanCost.rst index 0035a3f3a3..99fcdaa617 100644 --- a/doc/chinese/pgr_chinesePostmanCost.rst +++ b/doc/chinese/pgr_chinesePostmanCost.rst @@ -51,7 +51,7 @@ Signatures :Example: -.. literalinclude:: doc-pgr_chinesePostmanCost.queries +.. literalinclude:: chinesePostmanCost.queries :start-after: -- q1 :end-before: -- q2 diff --git a/doc/coloring/pgr_bipartite.rst b/doc/coloring/pgr_bipartite.rst index 86a98f4519..732ca04c93 100644 --- a/doc/coloring/pgr_bipartite.rst +++ b/doc/coloring/pgr_bipartite.rst @@ -66,7 +66,7 @@ Signatures :Example: When the graph is bipartite -.. literalinclude:: doc-bipartite.queries +.. literalinclude:: bipartite.queries :start-after: --q1 :end-before: --q2 @@ -102,7 +102,7 @@ Additional Example The edge :math:`5 \rightarrow 1` will make subgraph with vertices :math:`\{1, 3, 7, 6, 5\}` an odd length cyclic graph, as the cycle has 5 vertices. -.. literalinclude:: doc-bipartite.queries +.. literalinclude:: bipartite.queries :start-after: --q2 :end-before: --q3 @@ -111,7 +111,7 @@ Edges in blue represent odd length cycle subgraph. .. image:: images/bipartite.png :scale: 40% -.. literalinclude:: doc-bipartite.queries +.. literalinclude:: bipartite.queries :start-after: --q3 :end-before: --q4 diff --git a/doc/coloring/pgr_edgeColoring.rst b/doc/coloring/pgr_edgeColoring.rst index 8128da422c..797e770116 100644 --- a/doc/coloring/pgr_edgeColoring.rst +++ b/doc/coloring/pgr_edgeColoring.rst @@ -86,7 +86,7 @@ Signatures :Example: Graph coloring of pgRouting :doc:`sampledata` -.. literalinclude:: doc-edgeColoring.queries +.. literalinclude:: edgeColoring.queries :start-after: -- q1 :end-before: -- q2 diff --git a/doc/coloring/pgr_sequentialVertexColoring.rst b/doc/coloring/pgr_sequentialVertexColoring.rst index 652e0e1b15..568fa305a8 100644 --- a/doc/coloring/pgr_sequentialVertexColoring.rst +++ b/doc/coloring/pgr_sequentialVertexColoring.rst @@ -76,7 +76,7 @@ Signatures :Example: Graph coloring of pgRouting :doc:`sampledata` -.. literalinclude:: doc-pgr_sequentialVertexColoring.queries +.. literalinclude:: sequentialVertexColoring.queries :start-after: -- q1 :end-before: -- q2 diff --git a/doc/components/pgr_articulationPoints.rst b/doc/components/pgr_articulationPoints.rst index 1daaf30879..8c1775231c 100644 --- a/doc/components/pgr_articulationPoints.rst +++ b/doc/components/pgr_articulationPoints.rst @@ -67,7 +67,7 @@ Signatures :Example: The articulation points of the graph -.. literalinclude:: doc-pgr_articulationPoints.queries +.. literalinclude:: articulationPoints.queries :start-after: -- q1 :end-before: -- q2 diff --git a/doc/components/pgr_biconnectedComponents.rst b/doc/components/pgr_biconnectedComponents.rst index cd3d36d757..a4ed2df7b5 100644 --- a/doc/components/pgr_biconnectedComponents.rst +++ b/doc/components/pgr_biconnectedComponents.rst @@ -75,7 +75,7 @@ Signatures :Example: The biconnected components of the graph -.. literalinclude:: doc-pgr_biconnectedComponents.queries +.. literalinclude:: biconnectedComponents.queries :start-after: -- q1 :end-before: -- q2 diff --git a/doc/components/pgr_bridges.rst b/doc/components/pgr_bridges.rst index 941da6b619..093d622487 100644 --- a/doc/components/pgr_bridges.rst +++ b/doc/components/pgr_bridges.rst @@ -63,7 +63,7 @@ Signatures :Example: The bridges of the graph -.. literalinclude:: doc-pgr_bridges.queries +.. literalinclude:: bridges.queries :start-after: -- q1 :end-before: -- q2 diff --git a/doc/components/pgr_connectedComponents.rst b/doc/components/pgr_connectedComponents.rst index dc864e50dc..b29b99fdca 100644 --- a/doc/components/pgr_connectedComponents.rst +++ b/doc/components/pgr_connectedComponents.rst @@ -72,7 +72,7 @@ Signatures :Example: The connected components of the graph -.. literalinclude:: doc-pgr_connectedComponents.queries +.. literalinclude:: connectedComponents.queries :start-after: -- q1 :end-before: -- q2 diff --git a/doc/components/pgr_makeConnected.rst b/doc/components/pgr_makeConnected.rst index 9382d01eaf..47f38dee98 100644 --- a/doc/components/pgr_makeConnected.rst +++ b/doc/components/pgr_makeConnected.rst @@ -70,7 +70,7 @@ Signatures :Example: Query done on :doc:`sampledata` network gives the list of edges that are needed to connect the graph. -.. literalinclude:: doc-pgr_makeConnected.queries +.. literalinclude:: makeConnected.queries :start-after: -- q1 :end-before: -- q2 diff --git a/doc/components/pgr_strongComponents.rst b/doc/components/pgr_strongComponents.rst index b0b58670e7..d39b94ccf9 100644 --- a/doc/components/pgr_strongComponents.rst +++ b/doc/components/pgr_strongComponents.rst @@ -70,7 +70,7 @@ Signatures :Example: The strong components of the graph -.. literalinclude:: doc-pgr_strongComponents.queries +.. literalinclude:: strongComponents.queries :start-after: -- q1 :end-before: -- q2 diff --git a/doc/contraction/contraction-family.rst b/doc/contraction/contraction-family.rst index 2dfc549683..87a9c127cd 100644 --- a/doc/contraction/contraction-family.rst +++ b/doc/contraction/contraction-family.rst @@ -439,7 +439,7 @@ Construction of the graph in the database The following query shows the original data involved in the contraction operation. -.. literalinclude:: doc-contraction-family.queries +.. literalinclude:: contraction-family.queries :start-after: -- q00 :end-before: -- q01 @@ -458,7 +458,7 @@ algorithm. Observe that vertices, for example, :math:`6` do not appear in the results because it was not affected by the contraction algorithm. -.. literalinclude:: doc-contraction-family.queries +.. literalinclude:: contraction-family.queries :start-after: -- q2 :end-before: -- q3 @@ -507,7 +507,7 @@ tables, where: * when ``false`` the edge is an original edge, might be or not part of the contracted graph. -.. literalinclude:: doc-contraction-family.queries +.. literalinclude:: contraction-family.queries :start-after: -- q1 :end-before: -- q2 @@ -516,7 +516,7 @@ Store contraction information Store the `contraction results`_ in a table -.. literalinclude:: doc-contraction-family.queries +.. literalinclude:: contraction-family.queries :start-after: -- q3 :end-before: -- q4 @@ -526,20 +526,20 @@ The vertex table update Use ``is_contracted`` column to indicate the vertices that are contracted. -.. literalinclude:: doc-contraction-family.queries +.. literalinclude:: contraction-family.queries :start-after: -- q4 :end-before: -- q5 Fill ``contracted_vertices`` with the information from the results tha belong to the vertices. -.. literalinclude:: doc-contraction-family.queries +.. literalinclude:: contraction-family.queries :start-after: -- q6 :end-before: -- q7 The modified vertices table: -.. literalinclude:: doc-contraction-family.queries +.. literalinclude:: contraction-family.queries :start-after: -- q7 :end-before: -- q8 @@ -548,13 +548,13 @@ The edge table update Insert the new edges generated by pgr_contraction. -.. literalinclude:: doc-contraction-family.queries +.. literalinclude:: contraction-family.queries :start-after: -- q8 :end-before: -- q9 The modified ``edge_table``. -.. literalinclude:: doc-contraction-family.queries +.. literalinclude:: contraction-family.queries :start-after: -- q9 :end-before: -- q10 @@ -565,14 +565,14 @@ The contracted graph Vertices that belong to the contracted graph. +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-contraction-family.queries +.. literalinclude:: contraction-family.queries :start-after: -- q10 :end-before: -- q11 Edges that belong to the contracted graph. +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-contraction-family.queries +.. literalinclude:: contraction-family.queries :start-after: -- q11 :end-before: -- case1 @@ -599,7 +599,7 @@ Case 1: Both source and target belong to the contracted graph. Using the `Edges that belong to the contracted graph.`_ on lines 11 to 20. -.. literalinclude:: doc-contraction-family.queries +.. literalinclude:: contraction-family.queries :emphasize-lines: 11-20 :start-after: -- case1 :end-before: -- use1 @@ -609,7 +609,7 @@ Using the `Edges that belong to the contracted graph.`_ on lines 11 to 20. When both source and target belong to the contracted graph, a path is found. -.. literalinclude:: doc-contraction-family.queries +.. literalinclude:: contraction-family.queries :start-after: -- use1 :end-before: -- use1-1 @@ -620,7 +620,7 @@ When source and/or target belong to an edge subgraph then a path is not found. In this case, the contracted graph do not have an edge connecting with node :math:`4`. -.. literalinclude:: doc-contraction-family.queries +.. literalinclude:: contraction-family.queries :start-after: -- use1-1 :end-before: -- use1-2 @@ -631,7 +631,7 @@ When source and/or target belong to a vertex then a path is not found. In this case, the contracted graph do not have an edge connecting with node :math:`7` and of node :math:`4` of the second case. -.. literalinclude:: doc-contraction-family.queries +.. literalinclude:: contraction-family.queries :start-after: -- use1-2 :end-before: -- case2 @@ -643,7 +643,7 @@ Refining the above function to include nodes that belong to an edge. - The vertices that need to be expanded are calculated on lines 11 to 17. - Adding to the contracted graph that additional section on lines 26 to 28. -.. literalinclude:: doc-contraction-family.queries +.. literalinclude:: contraction-family.queries :emphasize-lines: 11-17, 26-28 :start-after: -- case2 :end-before: -- use2 @@ -653,7 +653,7 @@ Refining the above function to include nodes that belong to an edge. When both source and target belong to the contracted graph, a path is found. -.. literalinclude:: doc-contraction-family.queries +.. literalinclude:: contraction-family.queries :start-after: -- use2 :end-before: -- use2-1 @@ -663,7 +663,7 @@ When source and/or target belong to an edge subgraph, now, a path is found. The routing graph now has an edge connecting with node :math:`4`. -.. literalinclude:: doc-contraction-family.queries +.. literalinclude:: contraction-family.queries :start-after: -- use2-1 :end-before: -- use2-2 @@ -674,7 +674,7 @@ When source and/or target belong to a vertex then a path is not found. In this case, the contracted graph do not have an edge connecting with node :math:`7`. -.. literalinclude:: doc-contraction-family.queries +.. literalinclude:: contraction-family.queries :start-after: -- use2-2 :end-before: -- case3 @@ -686,7 +686,7 @@ Refining the above function to include nodes that belong to an edge. - The vertices that need to be expanded are calculated on lines 19 to 24. - Adding to the contracted graph that additional section on lines 38 to 40. -.. literalinclude:: doc-contraction-family.queries +.. literalinclude:: contraction-family.queries :emphasize-lines: 19-24, 39-41 :start-after: -- case3 :end-before: -- use3 @@ -696,7 +696,7 @@ Refining the above function to include nodes that belong to an edge. When both source and target belong to the contracted graph, a path is found. -.. literalinclude:: doc-contraction-family.queries +.. literalinclude:: contraction-family.queries :start-after: -- use3 :end-before: -- use3-1 @@ -705,7 +705,7 @@ When both source and target belong to the contracted graph, a path is found. The code change do not affect this case so when source and/or target belong to an edge subgraph, a path is still found. -.. literalinclude:: doc-contraction-family.queries +.. literalinclude:: contraction-family.queries :start-after: -- use3-1 :end-before: -- use3-2 @@ -715,7 +715,7 @@ When source and/or target belong to a vertex, now, a path is found. Now, the routing graph has an edge connecting with node :math:`7`. -.. literalinclude:: doc-contraction-family.queries +.. literalinclude:: contraction-family.queries :start-after: -- use3-2 :end-before: -- end diff --git a/doc/contraction/pgr_contraction.rst b/doc/contraction/pgr_contraction.rst index c8d8774b9f..7505cfe6be 100644 --- a/doc/contraction/pgr_contraction.rst +++ b/doc/contraction/pgr_contraction.rst @@ -87,7 +87,7 @@ The pgr_contraction function has the following signature: :Example: Making a dead end and linear contraction in that order on an undirected graph. -.. literalinclude:: doc-pgr_contraction.queries +.. literalinclude:: contraction.queries :start-after: -- q1 :end-before: -- q2 @@ -213,13 +213,13 @@ Additional Examples :Example: Only dead end contraction -.. literalinclude:: doc-pgr_contraction.queries +.. literalinclude:: contraction.queries :start-after: -- q2 :end-before: -- q3 :Example: Only linear contraction -.. literalinclude:: doc-pgr_contraction.queries +.. literalinclude:: contraction.queries :start-after: -- q3 :end-before: -- q4 diff --git a/doc/dagShortestPath/pgr_dagShortestPath.rst b/doc/dagShortestPath/pgr_dagShortestPath.rst index 373f53a608..0ffbabf9f9 100644 --- a/doc/dagShortestPath/pgr_dagShortestPath.rst +++ b/doc/dagShortestPath/pgr_dagShortestPath.rst @@ -113,7 +113,7 @@ One to One :Example: From vertex :math:`5` to vertex :math:`11` on a **directed** graph -.. literalinclude:: doc-pgr_dagShortestPath.queries +.. literalinclude:: dagShortestPath.queries :start-after: -- q2 :end-before: -- q3 @@ -133,7 +133,7 @@ One to Many :Example: From vertex :math:`5` to vertices :math:`\{7, 11\}` -.. literalinclude:: doc-pgr_dagShortestPath.queries +.. literalinclude:: dagShortestPath.queries :start-after: -- q3 :end-before: -- q4 @@ -153,7 +153,7 @@ Many to One :Example: From vertices :math:`\{5, 10\}` to vertex :math:`11` -.. literalinclude:: doc-pgr_dagShortestPath.queries +.. literalinclude:: dagShortestPath.queries :start-after: -- q4 :end-before: -- q5 @@ -174,7 +174,7 @@ Many to Many :Example: From vertices :math:`\{5, 15\}` to vertices :math:`\{11, 17\}` on an **undirected** graph -.. literalinclude:: doc-pgr_dagShortestPath.queries +.. literalinclude:: dagShortestPath.queries :start-after: -- q5 :end-before: -- q51 @@ -196,13 +196,13 @@ Combinations The combinations table: -.. literalinclude:: doc-pgr_dijkstraCost.queries +.. literalinclude:: dijkstraCost.queries :start-after: -- q51 :end-before: -- q52 The query: -.. literalinclude:: doc-pgr_dagShortestPath.queries +.. literalinclude:: dagShortestPath.queries :start-after: -- q52 :end-before: -- q6 @@ -242,19 +242,19 @@ Additional Examples :Example 1: Demonstration of repeated values are ignored, and result is sorted. -.. literalinclude:: doc-pgr_dagShortestPath.queries +.. literalinclude:: dagShortestPath.queries :start-after: -- q6 :end-before: -- q7 :Example 2: Making **start_vids** the same as **end_vids** -.. literalinclude:: doc-pgr_dagShortestPath.queries +.. literalinclude:: dagShortestPath.queries :start-after: -- q7 :end-before: -- q8 :Example 3: Manually assigned vertex combinations. -.. literalinclude:: doc-pgr_dagShortestPath.queries +.. literalinclude:: dagShortestPath.queries :start-after: -- q8 :end-before: -- q9 diff --git a/doc/dijkstra/pgr_dijkstra.rst b/doc/dijkstra/pgr_dijkstra.rst index 7ee90dfc3a..91e20fec84 100644 --- a/doc/dijkstra/pgr_dijkstra.rst +++ b/doc/dijkstra/pgr_dijkstra.rst @@ -108,7 +108,7 @@ One to One :Example: From vertex :math:`6` to vertex :math:`10` on a **directed** graph -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q2 :end-before: -- q3 @@ -128,7 +128,7 @@ One to Many :Example: From vertex :math:`6` to vertices :math:`\{10, 17\}` on a **directed** -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q3 :end-before: -- q4 @@ -149,7 +149,7 @@ Many to One :Example: From vertices :math:`\{6, 1\}` to vertex :math:`17` on a **directed** graph -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q4 :end-before: -- q5 @@ -170,7 +170,7 @@ Many to Many :Example: From vertices :math:`\{6, 1\}` to vertices :math:`\{10, 17\}` on an **undirected** graph -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q5 :end-before: -- q51 @@ -192,13 +192,13 @@ Combinations The combinations table: -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q51 :end-before: -- q52 The query: -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q52 :end-before: -- q6 @@ -245,19 +245,19 @@ Additional Examples :Example: Demonstration of repeated values are ignored, and result is sorted. -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q6 :end-before: -- q7 :Example 2: Making **start_vids** the same as **end_vids** -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q7 :end-before: -- q8 :Example: Manually assigned vertex combinations. -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q8 :end-before: -- q9 @@ -278,28 +278,28 @@ For **directed** graphs with ``cost`` and ``reverse_cost`` columns 1) Path from :math:`6` to :math:`10` +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q70 :end-before: -- q71 2) Path from :math:`6` to :math:`7` +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q71 :end-before: -- q72 3) Path from :math:`12` to :math:`10` +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q72 :end-before: -- q73 4) Path from :math:`12` to :math:`7` +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q73 :end-before: -- q74 @@ -308,7 +308,7 @@ For **directed** graphs with ``cost`` and ``reverse_cost`` columns Paths :math:`\{6\}\rightarrow\{10, 7\}` -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q74 :end-before: -- q75 @@ -317,7 +317,7 @@ Paths :math:`\{6\}\rightarrow\{10, 7\}` Paths :math:`\{6, 12\}\rightarrow\{7\}` -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q75 :end-before: -- q76 @@ -326,7 +326,7 @@ Paths :math:`\{6, 12\}\rightarrow\{7\}` Paths :math:`\{6, 12\}\rightarrow\{10, 7\}` -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q76 :end-before: -- q77 @@ -335,7 +335,7 @@ Paths :math:`\{6, 12\}\rightarrow\{10, 7\}` Paths :math:`\{6\}\rightarrow\{10, 7\}\cup\{12\}\rightarrow\{10\}` -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q77 :end-before: -- q80 @@ -350,28 +350,28 @@ For **undirected** graphs with ``cost`` and ``reverse_cost`` columns 9) Path from :math:`6` to :math:`10` +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q90 :end-before: -- q91 10) Path from :math:`6` to :math:`7` +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q91 :end-before: -- q92 11) Path from :math:`12` to :math:`10` +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q92 :end-before: -- q93 12) Path from :math:`12` to :math:`7` +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q93 :end-before: -- q94 @@ -380,7 +380,7 @@ For **undirected** graphs with ``cost`` and ``reverse_cost`` columns Paths :math:`\{6\}\rightarrow\{10, 7\}` -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q94 :end-before: -- q95 @@ -389,7 +389,7 @@ Paths :math:`\{6\}\rightarrow\{10, 7\}` Paths :math:`\{6, 12\}\rightarrow\{7\}` -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q95 :end-before: -- q96 @@ -398,7 +398,7 @@ Paths :math:`\{6, 12\}\rightarrow\{7\}` Paths :math:`\{6, 12\}\rightarrow\{10, 7\}` -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q96 :end-before: -- q97 @@ -407,7 +407,7 @@ Paths :math:`\{6, 12\}\rightarrow\{10, 7\}` Paths :math:`\{6\}\rightarrow\{10, 7\}\cup\{12\}\rightarrow\{10\}` -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q97 :end-before: -- q10 @@ -422,28 +422,28 @@ For **directed** graphs only with ``cost`` column 17) Path from :math:`6` to :math:`10` +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q11 :end-before: -- q111 18) Path from :math:`6` to :math:`7` +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q111 :end-before: -- q112 19) Path from :math:`12` to :math:`10` +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q112 :end-before: -- q113 20) Path from :math:`12` to :math:`7` +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q113 :end-before: -- q114 @@ -452,7 +452,7 @@ For **directed** graphs only with ``cost`` column Paths :math:`\{6\}\rightarrow\{10, 7\}` -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q114 :end-before: -- q115 @@ -461,7 +461,7 @@ Paths :math:`\{6\}\rightarrow\{10, 7\}` Paths :math:`\{6, 12\}\rightarrow\{7\}` -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q115 :end-before: -- q116 @@ -470,7 +470,7 @@ Paths :math:`\{6, 12\}\rightarrow\{7\}` Paths :math:`\{6, 12\}\rightarrow\{10, 7\}` -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q116 :end-before: -- q117 @@ -479,7 +479,7 @@ Paths :math:`\{6, 12\}\rightarrow\{10, 7\}` Paths :math:`\{6\}\rightarrow\{10, 7\}\cup\{12\}\rightarrow\{10\}` -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q117 :end-before: -- q12 @@ -494,28 +494,28 @@ For **undirected** graphs only with ``cost`` column 25) Path from :math:`6` to :math:`10` +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q13 :end-before: -- q131 26) Path from :math:`6` to :math:`7` +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q131 :end-before: -- q132 27) Path from :math:`12` to :math:`10` +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q132 :end-before: -- q133 28) Path from :math:`12` to :math:`7` +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q133 :end-before: -- q134 @@ -524,7 +524,7 @@ For **undirected** graphs only with ``cost`` column Paths :math:`\{6\}\rightarrow\{10, 7\}` -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q134 :end-before: -- q135 @@ -533,7 +533,7 @@ Paths :math:`\{6\}\rightarrow\{10, 7\}` Paths :math:`\{6, 12\}\rightarrow\{7\}` -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q135 :end-before: -- q136 @@ -542,7 +542,7 @@ Paths :math:`\{6, 12\}\rightarrow\{7\}` Paths :math:`\{6, 12\}\rightarrow\{10, 7\}` -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q136 :end-before: -- q137 @@ -551,7 +551,7 @@ Paths :math:`\{6, 12\}\rightarrow\{10, 7\}` Paths :math:`\{6\}\rightarrow\{10, 7\}\cup\{12\}\rightarrow\{10\}` -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q137 :end-before: -- q14 @@ -564,35 +564,35 @@ The following examples find the path for :math:`\{6\}\rightarrow\{10\}` 33) Using `One to One`_ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q15 :end-before: -- q151 34) Using `One to Many`_ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q151 :end-before: -- q152 35) Using `Many to One`_ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q152 :end-before: -- q153 36) Using `Many to Many`_ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q153 :end-before: -- q154 37) Using `Combinations`_ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q154 :end-before: -- q16 diff --git a/doc/dijkstra/pgr_dijkstraCost.rst b/doc/dijkstra/pgr_dijkstraCost.rst index 67657df22a..acbb83b396 100644 --- a/doc/dijkstra/pgr_dijkstraCost.rst +++ b/doc/dijkstra/pgr_dijkstraCost.rst @@ -86,7 +86,7 @@ One to One :Example: From vertex :math:`6` to vertex :math:`10` on a **directed** graph -.. literalinclude:: doc-pgr_dijkstraCost.queries +.. literalinclude:: dijkstraCost.queries :start-after: -- q2 :end-before: -- q3 @@ -107,7 +107,7 @@ One to Many :Example: From vertex :math:`6` to vertices :math:`\{10, 17\}` on a **directed** graph -.. literalinclude:: doc-pgr_dijkstraCost.queries +.. literalinclude:: dijkstraCost.queries :start-after: -- q3 :end-before: -- q4 @@ -128,7 +128,7 @@ Many to One :Example: From vertices :math:`\{6, 1\}` to vertex :math:`17` on a **directed** graph -.. literalinclude:: doc-pgr_dijkstraCost.queries +.. literalinclude:: dijkstraCost.queries :start-after: -- q4 :end-before: -- q5 @@ -149,7 +149,7 @@ Many to Many :Example: From vertices :math:`\{6, 1\}` to vertices :math:`\{10, 17\}` on an **undirected** graph -.. literalinclude:: doc-pgr_dijkstraCost.queries +.. literalinclude:: dijkstraCost.queries :start-after: -- q5 :end-before: -- q51 @@ -171,13 +171,13 @@ Combinations The combinations table: -.. literalinclude:: doc-pgr_dijkstraCost.queries +.. literalinclude:: dijkstraCost.queries :start-after: -- q51 :end-before: -- q52 The query: -.. literalinclude:: doc-pgr_dijkstraCost.queries +.. literalinclude:: dijkstraCost.queries :start-after: -- q52 :end-before: -- q6 @@ -224,19 +224,19 @@ Additional Examples :Example 1: Demonstration of repeated values are ignored, and result is sorted. -.. literalinclude:: doc-pgr_dijkstraCost.queries +.. literalinclude:: dijkstraCost.queries :start-after: -- q6 :end-before: -- q7 :Example 2: Making **start_vids** the same as **end_vids** -.. literalinclude:: doc-pgr_dijkstraCost.queries +.. literalinclude:: dijkstraCost.queries :start-after: -- q7 :end-before: -- q8 :Example 3: Manually assigned vertex combinations. -.. literalinclude:: doc-pgr_dijkstraCost.queries +.. literalinclude:: dijkstraCost.queries :start-after: -- q8 :end-before: -- q9 diff --git a/doc/dijkstra/pgr_dijkstraCostMatrix.rst b/doc/dijkstra/pgr_dijkstraCostMatrix.rst index 2af45b2e8f..3ad97f1f70 100644 --- a/doc/dijkstra/pgr_dijkstraCostMatrix.rst +++ b/doc/dijkstra/pgr_dijkstraCostMatrix.rst @@ -62,7 +62,7 @@ Signatures :Example: Symmetric cost matrix for vertices :math:`\{5, 6, 10, 15\}` on an **undirected** graph -.. literalinclude:: doc-pgr_dijkstraCostMatrix.queries +.. literalinclude:: dijkstraCostMatrix.queries :start-after: -- q1 :end-before: -- q2 @@ -102,7 +102,7 @@ Additional Examples :Example: Use with :doc:`pgr_TSP`. -.. literalinclude:: doc-pgr_dijkstraCostMatrix.queries +.. literalinclude:: dijkstraCostMatrix.queries :start-after: -- q2 :end-before: -- q3 diff --git a/doc/dijkstra/pgr_dijkstraNear.rst b/doc/dijkstra/pgr_dijkstraNear.rst index a3b7b470ab..f1989f7412 100644 --- a/doc/dijkstra/pgr_dijkstraNear.rst +++ b/doc/dijkstra/pgr_dijkstraNear.rst @@ -118,7 +118,7 @@ One to Many * `cap => 1` -.. literalinclude:: doc-pgr_dijkstraNear.queries +.. literalinclude:: dijkstraNear.queries :start-after: -- q1 :end-before: -- q2 :linenos: @@ -148,7 +148,7 @@ Many to One * On line `4`: using the positional parameter: `directed` set to ``true`` * In line `5`: using named parameter `cap => 2` -.. literalinclude:: doc-pgr_dijkstraNear.queries +.. literalinclude:: dijkstraNear.queries :start-after: -- q2 :end-before: -- q3 :linenos: @@ -182,7 +182,7 @@ Many to Many * `cap => 1` * `global => true` -.. literalinclude:: doc-pgr_dijkstraNear.queries +.. literalinclude:: dijkstraNear.queries :start-after: -- q3 :end-before: -- q4 :linenos: @@ -216,7 +216,7 @@ Combinations The combinations contents: -.. literalinclude:: doc-pgr_dijkstraNear.queries +.. literalinclude:: dijkstraNear.queries :start-after: -- q4 :end-before: -- q41 @@ -232,7 +232,7 @@ The query: * `directed => true` * `cap => 1` -.. literalinclude:: doc-pgr_dijkstraNear.queries +.. literalinclude:: dijkstraNear.queries :start-after: -- q41 :end-before: -- q5 :linenos: diff --git a/doc/dijkstra/pgr_dijkstraNearCost.rst b/doc/dijkstra/pgr_dijkstraNearCost.rst index cb714fecaa..4327b8d4f7 100644 --- a/doc/dijkstra/pgr_dijkstraNearCost.rst +++ b/doc/dijkstra/pgr_dijkstraNearCost.rst @@ -93,7 +93,7 @@ One to Many * `cap => 1` -.. literalinclude:: doc-pgr_dijkstraNearCost.queries +.. literalinclude:: dijkstraNearCost.queries :start-after: -- q1 :end-before: -- q2 :linenos: @@ -123,7 +123,7 @@ Many to One * On line `4`: using the positional parameter: `directed` set to ``true`` * In line `5`: using named parameter `cap => 2` -.. literalinclude:: doc-pgr_dijkstraNearCost.queries +.. literalinclude:: dijkstraNearCost.queries :start-after: -- q2 :end-before: -- q3 :linenos: @@ -157,7 +157,7 @@ Many to Many * `cap => 1` * `global => true` -.. literalinclude:: doc-pgr_dijkstraNearCost.queries +.. literalinclude:: dijkstraNearCost.queries :start-after: -- q3 :end-before: -- q4 :linenos: @@ -191,7 +191,7 @@ Combinations The combinations contents: -.. literalinclude:: doc-pgr_dijkstraNear.queries +.. literalinclude:: dijkstraNear.queries :start-after: -- q4 :end-before: -- q41 @@ -207,7 +207,7 @@ The query: * `directed => true` * `cap => 1` -.. literalinclude:: doc-pgr_dijkstraNearCost.queries +.. literalinclude:: dijkstraNearCost.queries :start-after: -- q41 :end-before: -- q5 :linenos: diff --git a/doc/dijkstra/pgr_dijkstraVia.rst b/doc/dijkstra/pgr_dijkstraVia.rst index 2a88623d13..125fcabb07 100644 --- a/doc/dijkstra/pgr_dijkstraVia.rst +++ b/doc/dijkstra/pgr_dijkstraVia.rst @@ -61,7 +61,7 @@ One Via :Example: Find the route that visits the vertices :math:`\{5, 1, 8\}` in that order on an **directed** graph. -.. literalinclude:: doc-pgr_dijkstraVia.queries +.. literalinclude:: dijkstraVia.queries :start-after: -- q01 :end-before: -- q1 @@ -115,42 +115,42 @@ All this examples are about the route that visits the vertices :math:`\{5, 7, 1, The main query ............................................................................... -.. literalinclude:: doc-pgr_dijkstraVia.queries +.. literalinclude:: dijkstraVia.queries :start-after: -- q1 :end-before: -- q2 Aggregate cost of the third path. +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_dijkstraVia.queries +.. literalinclude:: dijkstraVia.queries :start-after: -- q2 :end-before: -- q3 Route's aggregate cost of the route at the end of the third path. +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_dijkstraVia.queries +.. literalinclude:: dijkstraVia.queries :start-after: -- q3 :end-before: -- q4 Nodes visited in the route. +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_dijkstraVia.queries +.. literalinclude:: dijkstraVia.queries :start-after: -- q4 :end-before: -- q5 The aggregate costs of the route when the visited vertices are reached. +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_dijkstraVia.queries +.. literalinclude:: dijkstraVia.queries :start-after: -- q5 :end-before: -- q6 Status of "passes in front" or "visits" of the nodes. +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_dijkstraVia.queries +.. literalinclude:: dijkstraVia.queries :start-after: -- q6 :end-before: -- q7 diff --git a/doc/dominator/pgr_lengauerTarjanDominatorTree.rst b/doc/dominator/pgr_lengauerTarjanDominatorTree.rst index 53e4def664..cbdd2049ca 100644 --- a/doc/dominator/pgr_lengauerTarjanDominatorTree.rst +++ b/doc/dominator/pgr_lengauerTarjanDominatorTree.rst @@ -66,7 +66,7 @@ Signatures :Example: The dominator tree with root vertex :math:`5` -.. literalinclude:: doc-lengauerTarjanDominatorTree.queries +.. literalinclude:: lengauerTarjanDominatorTree.queries :start-after: --q1 :end-before: --q2 @@ -109,7 +109,7 @@ Additional Examples :Example: Dominator tree of another component. -.. literalinclude:: doc-lengauerTarjanDominatorTree.queries +.. literalinclude:: lengauerTarjanDominatorTree.queries :start-after: --q2 :end-before: --q3 diff --git a/doc/driving_distance/pgr_drivingDistance.rst b/doc/driving_distance/pgr_drivingDistance.rst index 51b5a670a9..e8ca25e24f 100644 --- a/doc/driving_distance/pgr_drivingDistance.rst +++ b/doc/driving_distance/pgr_drivingDistance.rst @@ -79,7 +79,7 @@ Single Vertex :Example: From vertex :math:`11` for a distance of :math:`3.0` -.. literalinclude:: pgr_drivingDistance.queries +.. literalinclude:: drivingDistance.queries :start-after: --q5 :end-before: --q6 @@ -100,7 +100,7 @@ Multiple Vertices :Example: From vertices :math:`\{11, 16\}` for a distance of :math:`3.0` with equi-cost on a directed graph -.. literalinclude:: pgr_drivingDistance.queries +.. literalinclude:: drivingDistance.queries :start-after: --q6 :end-before: --q10 @@ -165,7 +165,7 @@ Additional Examples :Example: From vertices :math:`\{11, 16\}` for a distance of :math:`3.0` on an undirected graph -.. literalinclude:: pgr_drivingDistance.queries +.. literalinclude:: drivingDistance.queries :start-after: --q10 :end-before: --q15 diff --git a/doc/ksp/pgr_KSP.rst b/doc/ksp/pgr_KSP.rst index 6a17e818f1..e0d7dd5f3f 100644 --- a/doc/ksp/pgr_KSP.rst +++ b/doc/ksp/pgr_KSP.rst @@ -89,7 +89,7 @@ One to One :Example: Get 2 paths from :math:`6` to :math:`17` on a directed graph. -.. literalinclude:: doc-ksp.queries +.. literalinclude:: ksp.queries :start-after: --q1 :end-before: --q2 @@ -110,7 +110,7 @@ One to Many :Example: Get 2 paths from vertex :math:`6` to vertices :math:`\{10, 17\}` on a directed graph. -.. literalinclude:: doc-ksp.queries +.. literalinclude:: ksp.queries :start-after: --q2 :end-before: --q3 @@ -131,7 +131,7 @@ Many to One :Example: Get 2 paths from vertices :math:`\{6, 1\}` to vertex :math:`17` on a directed graph. -.. literalinclude:: doc-ksp.queries +.. literalinclude:: ksp.queries :start-after: --q3 :end-before: --q4 @@ -152,7 +152,7 @@ Many to Many :Example: Get 2 paths vertices :math:`\{6, 1\}` to vertices :math:`\{10, 17\}` on a directed graph. -.. literalinclude:: doc-ksp.queries +.. literalinclude:: ksp.queries :start-after: --q4 :end-before: --q5 @@ -175,13 +175,13 @@ Combinations The combinations table: -.. literalinclude:: doc-pgr_dijkstra.queries +.. literalinclude:: dijkstra.queries :start-after: -- q51 :end-before: -- q52 The query: -.. literalinclude:: doc-ksp.queries +.. literalinclude:: ksp.queries :start-after: --q5 :end-before: --q6 @@ -322,7 +322,7 @@ Additional Examples Also get the paths in the heap. -.. literalinclude:: doc-ksp.queries +.. literalinclude:: ksp.queries :start-after: --q6 :end-before: --q7 @@ -330,13 +330,13 @@ Also get the paths in the heap. Also get the paths in the heap. -.. literalinclude:: doc-ksp.queries +.. literalinclude:: ksp.queries :start-after: --q7 :end-before: --q8 :Example: Get 2 paths from vertices :math:`\{6, 1\}` to vertex :math:`17` on a undirected graph. -.. literalinclude:: doc-ksp.queries +.. literalinclude:: ksp.queries :start-after: --q8 :end-before: --q9 @@ -344,7 +344,7 @@ Also get the paths in the heap. Also get the paths in the heap. -.. literalinclude:: doc-ksp.queries +.. literalinclude:: ksp.queries :start-after: --q9 :end-before: --q10 diff --git a/doc/lineGraph/pgr_lineGraph.rst b/doc/lineGraph/pgr_lineGraph.rst index e9568024b8..8d64d93e98 100644 --- a/doc/lineGraph/pgr_lineGraph.rst +++ b/doc/lineGraph/pgr_lineGraph.rst @@ -76,7 +76,7 @@ Signatures :Example: For an undirected graph with edges :math:'{2,4,5,8}' -.. literalinclude:: doc-pgr_lineGraph.queries +.. literalinclude:: lineGraph.queries :start-after: -- q1 :end-before: -- q2 @@ -266,7 +266,7 @@ used. The graph can be created as follows: -.. literalinclude:: doc-pgr_lineGraph.queries +.. literalinclude:: lineGraph.queries :start-after: -- q2 :end-before: INSERT 0 5 @@ -274,7 +274,7 @@ The graph can be created as follows: Line Graph of a directed graph represented with shared edges +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_lineGraph.queries +.. literalinclude:: lineGraph.queries :start-after: INSERT 0 5 :end-before: -- q3 @@ -386,14 +386,14 @@ not used. The graph can be created as follows: -.. literalinclude:: doc-pgr_lineGraph.queries +.. literalinclude:: lineGraph.queries :start-after: -- q3 :end-before: INSERT 0 7 Line Graph of a directed graph represented with unique edges +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_lineGraph.queries +.. literalinclude:: lineGraph.queries :start-after: INSERT 0 7 :end-before: -- q4 diff --git a/doc/lineGraph/pgr_lineGraphFull.rst b/doc/lineGraph/pgr_lineGraphFull.rst index d5bcd5a5ad..aecceeb83f 100644 --- a/doc/lineGraph/pgr_lineGraphFull.rst +++ b/doc/lineGraph/pgr_lineGraphFull.rst @@ -72,7 +72,7 @@ Signatures :Example: Full line graph of subgraph of edges :math:`\{4, 7, 8, 10\}` -.. literalinclude:: doc-pgr_lineGraphFull.queries +.. literalinclude:: lineGraphFull.queries :start-after: -- q1 :end-before: -- q2 @@ -151,7 +151,7 @@ The data This example displays how this graph transformation works to create additional edges for each possible turn in a graph. -.. literalinclude:: doc-pgr_lineGraphFull.queries +.. literalinclude:: lineGraphFull.queries :start-after: -- q0 :end-before: -- q1 @@ -165,7 +165,7 @@ edges for each possible turn in a graph. The transformation ............................................................................... -.. literalinclude:: doc-pgr_lineGraphFull.queries +.. literalinclude:: lineGraphFull.queries :start-after: -- q1 :end-before: -- q2 @@ -200,7 +200,7 @@ Store edge results The first step is to store the results of the ``pgr_lineGraphFull`` call into a table -.. literalinclude:: doc-pgr_lineGraphFull.queries +.. literalinclude:: lineGraphFull.queries :start-after: -- q2 :end-before: -- q3 @@ -209,13 +209,13 @@ Create the mapping table From the original graph's vertex information -.. literalinclude:: doc-pgr_lineGraphFull.queries +.. literalinclude:: lineGraphFull.queries :start-after: -- q3 :end-before: -- q4 Add the new vertices -.. literalinclude:: doc-pgr_lineGraphFull.queries +.. literalinclude:: lineGraphFull.queries :start-after: -- q4 :end-before: -- q5 @@ -224,44 +224,44 @@ Filling the mapping table The positive vertex identifiers are the original identifiers -.. literalinclude:: doc-pgr_lineGraphFull.queries +.. literalinclude:: lineGraphFull.queries :start-after: -- q5 :end-before: -- q6 Inspecting the vertices map -.. literalinclude:: doc-pgr_lineGraphFull.queries +.. literalinclude:: lineGraphFull.queries :start-after: -- q6 :end-before: -- q7 The self loops happen when there is no cost traveling to the ``target`` and the source has an original value. -.. literalinclude:: doc-pgr_lineGraphFull.queries +.. literalinclude:: lineGraphFull.queries :start-after: -- q7 :end-before: -- q8 Updating values from self loops -.. literalinclude:: doc-pgr_lineGraphFull.queries +.. literalinclude:: lineGraphFull.queries :start-after: -- q8 :end-before: -- q9 Inspecting the vertices table -.. literalinclude:: doc-pgr_lineGraphFull.queries +.. literalinclude:: lineGraphFull.queries :start-after: -- q9 :end-before: -- q10 Updating from inner self loops -.. literalinclude:: doc-pgr_lineGraphFull.queries +.. literalinclude:: lineGraphFull.queries :start-after: -- q10 :end-before: -- q11 Inspecting the vertices map -.. literalinclude:: doc-pgr_lineGraphFull.queries +.. literalinclude:: lineGraphFull.queries :start-after: -- q11 :end-before: -- q12 @@ -276,14 +276,14 @@ Idenifying the restriction Running a :doc:`pgr_dijkstraNear` the edge with cost 0, edge 8, is where the cost will be increased -.. literalinclude:: doc-pgr_lineGraphFull.queries +.. literalinclude:: lineGraphFull.queries :start-after: -- q12 :end-before: -- q13 The edge to be altered is ``WHERE cost = 0 AND seq != 1 AND edge != -1`` from the previus query: -.. literalinclude:: doc-pgr_lineGraphFull.queries +.. literalinclude:: lineGraphFull.queries :start-after: -- q13 :end-before: -- q14 @@ -292,7 +292,7 @@ Adding a value to the restriction Updating the cost to the edge: -.. literalinclude:: doc-pgr_lineGraphFull.queries +.. literalinclude:: lineGraphFull.queries :start-after: -- q14 :end-before: -- q15 @@ -300,7 +300,7 @@ Updating the cost to the edge: Now the route does not use edge 8 and does a U turn on a leaf vertex. -.. literalinclude:: doc-pgr_lineGraphFull.queries +.. literalinclude:: lineGraphFull.queries :start-after: -- q15 :end-before: -- q16 @@ -314,13 +314,13 @@ Using the vertex map give the leaf verices their original value. On the source column -.. literalinclude:: doc-pgr_lineGraphFull.queries +.. literalinclude:: lineGraphFull.queries :start-after: -- q16 :end-before: -- q17 On the target column -.. literalinclude:: doc-pgr_lineGraphFull.queries +.. literalinclude:: lineGraphFull.queries :start-after: -- q17 :end-before: -- q18 @@ -329,13 +329,13 @@ Removing self loops on leaf nodes The self loops of the leaf nodes are -.. literalinclude:: doc-pgr_lineGraphFull.queries +.. literalinclude:: lineGraphFull.queries :start-after: -- q18 :end-before: -- q19 Which can be removed -.. literalinclude:: doc-pgr_lineGraphFull.queries +.. literalinclude:: lineGraphFull.queries :start-after: -- q19 :end-before: -- q20 @@ -343,7 +343,7 @@ Which can be removed Routing can be done now using the original vertices id using :doc:`pgr_dijkstra` -.. literalinclude:: doc-pgr_lineGraphFull.queries +.. literalinclude:: lineGraphFull.queries :start-after: -- q20 :end-before: -- q21 @@ -356,20 +356,20 @@ Add edges from the original graph Add all the edges that are not involved in the line graph process to the new table -.. literalinclude:: doc-pgr_lineGraphFull.queries +.. literalinclude:: lineGraphFull.queries :start-after: -- q21 :end-before: -- q22 Some administrative tasks to get new identifiers for the edges -.. literalinclude:: doc-pgr_lineGraphFull.queries +.. literalinclude:: lineGraphFull.queries :start-after: -- q22 :end-before: -- q23 Add the newly calculated edges +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_lineGraphFull.queries +.. literalinclude:: lineGraphFull.queries :start-after: -- q23 :end-before: -- q24 @@ -380,13 +380,13 @@ When using this method for routing with soft restrictions there will be uturns :Example: Routing from :math:`6` to :math:`3` -.. literalinclude:: doc-pgr_lineGraphFull.queries +.. literalinclude:: lineGraphFull.queries :start-after: -- q24 :end-before: -- q25 :Example: Routing from :math:`5` to :math:`1` -.. literalinclude:: doc-pgr_lineGraphFull.queries +.. literalinclude:: lineGraphFull.queries :start-after: -- q25 :end-before: -- q26 diff --git a/doc/max_flow/pgr_boykovKolmogorov.rst b/doc/max_flow/pgr_boykovKolmogorov.rst index 969f496ffb..99900409ab 100644 --- a/doc/max_flow/pgr_boykovKolmogorov.rst +++ b/doc/max_flow/pgr_boykovKolmogorov.rst @@ -85,7 +85,7 @@ One to One :Example: From vertex :math:`11` to vertex :math:`12` -.. literalinclude:: doc-pgr_boykovKolmogorov.queries +.. literalinclude:: boykovKolmogorov.queries :start-after: -- q1 :end-before: -- q2 @@ -105,7 +105,7 @@ One to Many :Example: From vertex :math:`11` to vertices :math:`\{5, 10, 12\}` -.. literalinclude:: doc-pgr_boykovKolmogorov.queries +.. literalinclude:: boykovKolmogorov.queries :start-after: -- q2 :end-before: -- q3 @@ -125,7 +125,7 @@ Many to One :Example: From vertices :math:`\{11, 3, 17\}` to vertex :math:`12` -.. literalinclude:: doc-pgr_boykovKolmogorov.queries +.. literalinclude:: boykovKolmogorov.queries :start-after: -- q3 :end-before: -- q4 @@ -145,7 +145,7 @@ Many to Many :Example: From vertices :math:`\{11, 3, 17\}` to vertices :math:`\{5, 10, 12\}` -.. literalinclude:: doc-pgr_boykovKolmogorov.queries +.. literalinclude:: boykovKolmogorov.queries :start-after: -- q4 :end-before: -- q5 @@ -168,13 +168,13 @@ Combinations The combinations table: -.. literalinclude:: doc-pgr_boykovKolmogorov.queries +.. literalinclude:: boykovKolmogorov.queries :start-after: -- q5 :end-before: -- q51 The query: -.. literalinclude:: doc-pgr_boykovKolmogorov.queries +.. literalinclude:: boykovKolmogorov.queries :start-after: -- q51 :end-before: -- q6 @@ -214,7 +214,7 @@ Additional Examples :Example: Manually assigned vertex combinations. -.. literalinclude:: doc-pgr_boykovKolmogorov.queries +.. literalinclude:: boykovKolmogorov.queries :start-after: -- q6 :end-before: -- q7 diff --git a/doc/max_flow/pgr_edgeDisjointPaths.rst b/doc/max_flow/pgr_edgeDisjointPaths.rst index 0c9f46229d..12e7ea1364 100644 --- a/doc/max_flow/pgr_edgeDisjointPaths.rst +++ b/doc/max_flow/pgr_edgeDisjointPaths.rst @@ -88,7 +88,7 @@ One to One :Example: From vertex :math:`11` to vertex :math:`12` -.. literalinclude:: doc-pgr_edgeDisjointPaths.queries +.. literalinclude:: edgeDisjointPaths.queries :start-after: -- q1 :end-before: -- q2 @@ -109,7 +109,7 @@ One to Many :Example: From vertex :math:`11` to vertices :math:`\{5, 10, 12\}` -.. literalinclude:: doc-pgr_edgeDisjointPaths.queries +.. literalinclude:: edgeDisjointPaths.queries :start-after: -- q2 :end-before: -- q3 @@ -129,7 +129,7 @@ Many to One :Example: From vertices :math:`\{11, 3, 17\}` to vertex :math:`12` -.. literalinclude:: doc-pgr_edgeDisjointPaths.queries +.. literalinclude:: edgeDisjointPaths.queries :start-after: -- q3 :end-before: -- q4 @@ -149,7 +149,7 @@ Many to Many :Example: From vertices :math:`\{11, 3, 17\}` to vertices :math:`\{5, 10, 12\}` -.. literalinclude:: doc-pgr_edgeDisjointPaths.queries +.. literalinclude:: edgeDisjointPaths.queries :start-after: -- q4 :end-before: -- q5 @@ -173,13 +173,13 @@ Combinations The combinations table: -.. literalinclude:: doc-pgr_edgeDisjointPaths.queries +.. literalinclude:: edgeDisjointPaths.queries :start-after: -- q5 :end-before: -- q51 The query: -.. literalinclude:: doc-pgr_edgeDisjointPaths.queries +.. literalinclude:: edgeDisjointPaths.queries :start-after: -- q51 :end-before: -- q6 @@ -226,7 +226,7 @@ Additional Examples :Example: Manually assigned vertex combinations on an undirected graph. -.. literalinclude:: doc-pgr_edgeDisjointPaths.queries +.. literalinclude:: edgeDisjointPaths.queries :start-after: -- q6 :end-before: -- q7 diff --git a/doc/max_flow/pgr_edmondsKarp.rst b/doc/max_flow/pgr_edmondsKarp.rst index 0f5016b111..d6eb81f362 100644 --- a/doc/max_flow/pgr_edmondsKarp.rst +++ b/doc/max_flow/pgr_edmondsKarp.rst @@ -85,7 +85,7 @@ One to One :Example: From vertex :math:`11` to vertex :math:`12` -.. literalinclude:: doc-pgr_edmondsKarp.queries +.. literalinclude:: edmondsKarp.queries :start-after: -- q1 :end-before: -- q2 @@ -105,7 +105,7 @@ One to Many :Example: From vertex :math:`11` to vertices :math:`\{5, 10, 12\}` -.. literalinclude:: doc-pgr_edmondsKarp.queries +.. literalinclude:: edmondsKarp.queries :start-after: -- q2 :end-before: -- q3 @@ -125,7 +125,7 @@ Many to One :Example: From vertices :math:`\{11, 3, 17\}` to vertex :math:`12` -.. literalinclude:: doc-pgr_edmondsKarp.queries +.. literalinclude:: edmondsKarp.queries :start-after: -- q3 :end-before: -- q4 @@ -145,7 +145,7 @@ Many to Many :Example: From vertices :math:`\{11, 3, 17\}` to vertices :math:`\{5, 10, 12\}` -.. literalinclude:: doc-pgr_edmondsKarp.queries +.. literalinclude:: edmondsKarp.queries :start-after: -- q4 :end-before: -- q5 @@ -168,13 +168,13 @@ Combinations The combinations table: -.. literalinclude:: doc-pgr_edmondsKarp.queries +.. literalinclude:: edmondsKarp.queries :start-after: -- q5 :end-before: -- q51 The query: -.. literalinclude:: doc-pgr_edmondsKarp.queries +.. literalinclude:: edmondsKarp.queries :start-after: -- q51 :end-before: -- q6 @@ -214,7 +214,7 @@ Additional Examples :Example: Manually assigned vertex combinations. -.. literalinclude:: doc-pgr_edmondsKarp.queries +.. literalinclude:: edmondsKarp.queries :start-after: -- q6 :end-before: -- q7 diff --git a/doc/max_flow/pgr_maxCardinalityMatch.rst b/doc/max_flow/pgr_maxCardinalityMatch.rst index f80f641e29..b27682342f 100644 --- a/doc/max_flow/pgr_maxCardinalityMatch.rst +++ b/doc/max_flow/pgr_maxCardinalityMatch.rst @@ -89,7 +89,7 @@ Signatures :Example: Using all edges. -.. literalinclude:: doc-pgr_maxCardinalityMatch.queries +.. literalinclude:: maxCardinalityMatch.queries :start-after: -- q2 :end-before: -- q3 diff --git a/doc/max_flow/pgr_maxFlow.rst b/doc/max_flow/pgr_maxFlow.rst index 07b8d0de43..d58df35628 100644 --- a/doc/max_flow/pgr_maxFlow.rst +++ b/doc/max_flow/pgr_maxFlow.rst @@ -85,7 +85,7 @@ One to One :Example: From vertex :math:`11` to vertex :math:`12` -.. literalinclude:: doc-pgr_maxFlow.queries +.. literalinclude:: maxFlow.queries :start-after: -- q1 :end-before: -- q2 @@ -104,7 +104,7 @@ One to Many :Example: From vertex :math:`11` to vertices :math:`\{5, 10, 12\}` -.. literalinclude:: doc-pgr_maxFlow.queries +.. literalinclude:: maxFlow.queries :start-after: -- q2 :end-before: -- q3 @@ -123,7 +123,7 @@ Many to One :Example: From vertices :math:`\{11, 3, 17\}` to vertex :math:`12` -.. literalinclude:: doc-pgr_maxFlow.queries +.. literalinclude:: maxFlow.queries :start-after: -- q3 :end-before: -- q4 @@ -142,7 +142,7 @@ Many to Many :Example: From vertices :math:`\{11, 3, 17\}` to vertices :math:`\{5, 10, 12\}` -.. literalinclude:: doc-pgr_maxFlow.queries +.. literalinclude:: maxFlow.queries :start-after: -- q4 :end-before: -- q5 @@ -164,13 +164,13 @@ Combinations The combinations table: -.. literalinclude:: doc-pgr_maxFlow.queries +.. literalinclude:: maxFlow.queries :start-after: -- q5 :end-before: -- q51 The query: -.. literalinclude:: doc-pgr_maxFlow.queries +.. literalinclude:: maxFlow.queries :start-after: -- q51 :end-before: -- q6 @@ -212,7 +212,7 @@ Additional Examples :Example: Manually assigned vertex combinations. -.. literalinclude:: doc-pgr_maxFlow.queries +.. literalinclude:: maxFlow.queries :start-after: -- q6 :end-before: -- q7 diff --git a/doc/max_flow/pgr_maxFlowMinCost.rst b/doc/max_flow/pgr_maxFlowMinCost.rst index 1a3f856a4a..031d016ac0 100644 --- a/doc/max_flow/pgr_maxFlowMinCost.rst +++ b/doc/max_flow/pgr_maxFlowMinCost.rst @@ -90,7 +90,7 @@ One to One :Example: From vertex :math:`11` to vertex :math:`12` -.. literalinclude:: doc-pgr_maxFlowMinCost.queries +.. literalinclude:: maxFlowMinCost.queries :start-after: -- q1 :end-before: -- q2 @@ -110,7 +110,7 @@ One to Many :Example: From vertex :math:`11` to vertices :math:`\{5, 10, 12\}` -.. literalinclude:: doc-pgr_maxFlowMinCost.queries +.. literalinclude:: maxFlowMinCost.queries :start-after: -- q2 :end-before: -- q3 @@ -130,7 +130,7 @@ Many to One :Example: From vertices :math:`\{11, 3, 17\}` to vertex :math:`12` -.. literalinclude:: doc-pgr_maxFlowMinCost.queries +.. literalinclude:: maxFlowMinCost.queries :start-after: -- q3 :end-before: -- q4 @@ -150,7 +150,7 @@ Many to Many :Example: From vertices :math:`\{11, 3, 17\}` to vertices :math:`\{5, 10, 12\}` -.. literalinclude:: doc-pgr_maxFlowMinCost.queries +.. literalinclude:: maxFlowMinCost.queries :start-after: -- q4 :end-before: -- q5 @@ -173,13 +173,13 @@ Combinations The combinations table: -.. literalinclude:: doc-pgr_maxFlowMinCost.queries +.. literalinclude:: maxFlowMinCost.queries :start-after: -- q5 :end-before: -- q51 The query: -.. literalinclude:: doc-pgr_maxFlowMinCost.queries +.. literalinclude:: maxFlowMinCost.queries :start-after: -- q51 :end-before: -- q6 @@ -219,7 +219,7 @@ Additional Examples :Example: Manually assigned vertex combinations. -.. literalinclude:: doc-pgr_maxFlowMinCost.queries +.. literalinclude:: maxFlowMinCost.queries :start-after: -- q6 :end-before: -- q7 diff --git a/doc/max_flow/pgr_maxFlowMinCost_Cost.rst b/doc/max_flow/pgr_maxFlowMinCost_Cost.rst index f987d16a80..b92bbc0231 100644 --- a/doc/max_flow/pgr_maxFlowMinCost_Cost.rst +++ b/doc/max_flow/pgr_maxFlowMinCost_Cost.rst @@ -93,7 +93,7 @@ One to One :Example: From vertex :math:`11` to vertex :math:`12` -.. literalinclude:: doc-pgr_maxFlowMinCost_Cost.queries +.. literalinclude:: maxFlowMinCost_Cost.queries :start-after: -- q1 :end-before: -- q2 @@ -112,7 +112,7 @@ One to Many :Example: From vertex :math:`11` to vertices :math:`\{5, 10, 12\}` -.. literalinclude:: doc-pgr_maxFlowMinCost_Cost.queries +.. literalinclude:: maxFlowMinCost_Cost.queries :start-after: -- q3 :end-before: -- q4 @@ -131,7 +131,7 @@ Many to One :Example: From vertices :math:`\{11, 3, 17\}` to vertex :math:`12` -.. literalinclude:: doc-pgr_maxFlowMinCost_Cost.queries +.. literalinclude:: maxFlowMinCost_Cost.queries :start-after: -- q2 :end-before: -- q3 @@ -151,7 +151,7 @@ Many to Many :Example: From vertices :math:`\{11, 3, 17\}` to vertices :math:`\{5, 10, 12\}` -.. literalinclude:: doc-pgr_maxFlowMinCost_Cost.queries +.. literalinclude:: maxFlowMinCost_Cost.queries :start-after: -- q4 :end-before: -- q5 @@ -173,13 +173,13 @@ Combinations The combinations table: -.. literalinclude:: doc-pgr_maxFlowMinCost_Cost.queries +.. literalinclude:: maxFlowMinCost_Cost.queries :start-after: -- q5 :end-before: -- q51 The query: -.. literalinclude:: doc-pgr_maxFlowMinCost_Cost.queries +.. literalinclude:: maxFlowMinCost_Cost.queries :start-after: -- q51 :end-before: -- q6 @@ -221,7 +221,7 @@ Additional Examples :Example: Manually assigned vertex combinations. -.. literalinclude:: doc-pgr_maxFlowMinCost_Cost.queries +.. literalinclude:: maxFlowMinCost_Cost.queries :start-after: -- q6 :end-before: -- q7 diff --git a/doc/max_flow/pgr_pushRelabel.rst b/doc/max_flow/pgr_pushRelabel.rst index 550885366c..b1a8abc239 100644 --- a/doc/max_flow/pgr_pushRelabel.rst +++ b/doc/max_flow/pgr_pushRelabel.rst @@ -85,7 +85,7 @@ One to One :Example: From vertex :math:`11` to vertex :math:`12` -.. literalinclude:: doc-pgr_pushRelabel.queries +.. literalinclude:: pushRelabel.queries :start-after: -- q1 :end-before: -- q2 @@ -105,7 +105,7 @@ One to Many :Example: From vertex :math:`11` to vertices :math:`\{5, 10, 12\}` -.. literalinclude:: doc-pgr_pushRelabel.queries +.. literalinclude:: pushRelabel.queries :start-after: -- q2 :end-before: -- q3 @@ -125,7 +125,7 @@ Many to One :Example: From vertices :math:`\{11, 3, 17\}` to vertex :math:`12` -.. literalinclude:: doc-pgr_pushRelabel.queries +.. literalinclude:: pushRelabel.queries :start-after: -- q3 :end-before: -- q4 @@ -145,7 +145,7 @@ Many to Many :Example: From vertices :math:`\{11, 3, 17\}` to vertices :math:`\{5, 10, 12\}` -.. literalinclude:: doc-pgr_pushRelabel.queries +.. literalinclude:: pushRelabel.queries :start-after: -- q4 :end-before: -- q5 @@ -168,13 +168,13 @@ Combinations The combinations table: -.. literalinclude:: doc-pgr_pushRelabel.queries +.. literalinclude:: pushRelabel.queries :start-after: -- q5 :end-before: -- q51 The query: -.. literalinclude:: doc-pgr_pushRelabel.queries +.. literalinclude:: pushRelabel.queries :start-after: -- q51 :end-before: -- q6 @@ -214,7 +214,7 @@ Additional Examples :Example: Manually assigned vertex combinations. -.. literalinclude:: doc-pgr_pushRelabel.queries +.. literalinclude:: pushRelabel.queries :start-after: -- q6 :end-before: -- q7 diff --git a/doc/mincut/pgr_stoerWagner.rst b/doc/mincut/pgr_stoerWagner.rst index 644543aae3..a08d0630f3 100644 --- a/doc/mincut/pgr_stoerWagner.rst +++ b/doc/mincut/pgr_stoerWagner.rst @@ -82,7 +82,7 @@ Signatures :Example: min cut of the main subgraph -.. literalinclude:: doc-stoerWagner.queries +.. literalinclude:: stoerWagner.queries :start-after: -- q1 :end-before: -- q2 @@ -122,13 +122,13 @@ Additional Example: :Example: min cut of an edge -.. literalinclude:: doc-stoerWagner.queries +.. literalinclude:: stoerWagner.queries :start-after: -- q2 :end-before: -- q3 :Example: Using :doc:`pgr_connectedComponents` -.. literalinclude:: doc-stoerWagner.queries +.. literalinclude:: stoerWagner.queries :start-after: -- q3 :end-before: -- q4 diff --git a/doc/pickDeliver/pgr_pickDeliver.rst b/doc/pickDeliver/pgr_pickDeliver.rst index ba339e5ce7..77dc4abb54 100644 --- a/doc/pickDeliver/pgr_pickDeliver.rst +++ b/doc/pickDeliver/pgr_pickDeliver.rst @@ -88,19 +88,19 @@ Signature Given the vehicles: -.. literalinclude:: doc-pickDeliver.queries +.. literalinclude:: pickDeliver.queries :start-after: -- q1 :end-before: -- q2 and the orders: -.. literalinclude:: doc-pickDeliver.queries +.. literalinclude:: pickDeliver.queries :start-after: -- q2 :end-before: -- q3 The query: -.. literalinclude:: doc-pickDeliver.queries +.. literalinclude:: pickDeliver.queries :start-after: -- q3 :end-before: -- q4 diff --git a/doc/pickDeliver/pgr_pickDeliverEuclidean.rst b/doc/pickDeliver/pgr_pickDeliverEuclidean.rst index a049c5ba8f..4f0d491dfd 100644 --- a/doc/pickDeliver/pgr_pickDeliverEuclidean.rst +++ b/doc/pickDeliver/pgr_pickDeliverEuclidean.rst @@ -90,19 +90,19 @@ Signature Given the vehicles: -.. literalinclude:: ./doc-pickDeliverEuclidean.queries +.. literalinclude:: ./pickDeliverEuclidean.queries :start-after: -- q1 :end-before: -- q2 and the orders: -.. literalinclude:: ./doc-pickDeliverEuclidean.queries +.. literalinclude:: ./pickDeliverEuclidean.queries :start-after: -- q2 :end-before: -- q3 The query: -.. literalinclude:: ./doc-pickDeliverEuclidean.queries +.. literalinclude:: ./pickDeliverEuclidean.queries :start-after: -- q3 :end-before: -- q4 diff --git a/doc/planar/pgr_isPlanar.rst b/doc/planar/pgr_isPlanar.rst index 9b735d5593..25485a2955 100644 --- a/doc/planar/pgr_isPlanar.rst +++ b/doc/planar/pgr_isPlanar.rst @@ -64,7 +64,7 @@ Signatures | RETURNS ``BOOLEAN`` -.. literalinclude:: doc-pgr_isPlanar.queries +.. literalinclude:: isPlanar.queries :start-after: -- q1 :end-before: -- q2 @@ -103,7 +103,7 @@ Additional Examples The following edges will make the subgraph with vertices {10, 15, 11, 16, 13} a :math:`K_1` graph. -.. literalinclude:: doc-pgr_isPlanar.queries +.. literalinclude:: isPlanar.queries :start-after: -- q2 :end-before: -- q3 @@ -115,7 +115,7 @@ represent :math:`K_5` subgraph. .. image:: images/nonPlanar.png :scale: 50% -.. literalinclude:: doc-pgr_isPlanar.queries +.. literalinclude:: isPlanar.queries :start-after: -- q3 :end-before: -- q4 diff --git a/doc/spanningTree/pgr_kruskal.rst b/doc/spanningTree/pgr_kruskal.rst index 7ec6d26825..35f48b4a3d 100644 --- a/doc/spanningTree/pgr_kruskal.rst +++ b/doc/spanningTree/pgr_kruskal.rst @@ -59,7 +59,7 @@ Signatures :Example: Minimum spanning forest -.. literalinclude:: doc-pgr_kruskal.queries +.. literalinclude:: kruskal.queries :start-after: -- q1 :end-before: -- q2 diff --git a/doc/spanningTree/pgr_kruskalBFS.rst b/doc/spanningTree/pgr_kruskalBFS.rst index 1fc7b62cbe..5fca24275e 100644 --- a/doc/spanningTree/pgr_kruskalBFS.rst +++ b/doc/spanningTree/pgr_kruskalBFS.rst @@ -74,7 +74,7 @@ Single vertex :Example: The Minimum Spanning Tree having as root vertex :math:`6` -.. literalinclude:: doc-pgr_kruskalBFS.queries +.. literalinclude:: kruskalBFS.queries :start-after: -- q1 :end-before: -- q2 @@ -94,7 +94,7 @@ Multiple vertices :Example: The Minimum Spanning Tree starting on vertices :math:`\{9, 6\}` with :math:`depth \leq 3` -.. literalinclude:: doc-pgr_kruskalBFS.queries +.. literalinclude:: kruskalBFS.queries :start-after: -- q2 :end-before: -- q3 diff --git a/doc/spanningTree/pgr_kruskalDD.rst b/doc/spanningTree/pgr_kruskalDD.rst index 96488a3a83..400206a976 100644 --- a/doc/spanningTree/pgr_kruskalDD.rst +++ b/doc/spanningTree/pgr_kruskalDD.rst @@ -79,7 +79,7 @@ Single vertex :Example: The Minimum Spanning Tree starting on vertex :math:`6` with :math:`distance \leq 3.5` -.. literalinclude:: doc-pgr_kruskalDD.queries +.. literalinclude:: kruskalDD.queries :start-after: -- q1 :end-before: -- q2 @@ -99,7 +99,7 @@ Multiple vertices :Example: The Minimum Spanning Tree starting on vertices :math:`\{9, 6\}` with :math:`distance \leq 3.5` -.. literalinclude:: doc-pgr_kruskalDD.queries +.. literalinclude:: kruskalDD.queries :start-after: -- q2 :end-before: -- q3 diff --git a/doc/spanningTree/pgr_kruskalDFS.rst b/doc/spanningTree/pgr_kruskalDFS.rst index 1e009046b7..616bb96e7e 100644 --- a/doc/spanningTree/pgr_kruskalDFS.rst +++ b/doc/spanningTree/pgr_kruskalDFS.rst @@ -75,7 +75,7 @@ Single vertex :Example: The Minimum Spanning Tree having as root vertex :math:`6` -.. literalinclude:: doc-pgr_kruskalDFS.queries +.. literalinclude:: kruskalDFS.queries :start-after: -- q1 :end-before: -- q2 @@ -95,7 +95,7 @@ Multiple vertices :Example: The Minimum Spanning Tree starting on vertices :math:`\{9, 6\}` with :math:`depth \leq 3` -.. literalinclude:: doc-pgr_kruskalDFS.queries +.. literalinclude:: kruskalDFS.queries :start-after: -- q2 :end-before: -- q3 diff --git a/doc/spanningTree/pgr_prim.rst b/doc/spanningTree/pgr_prim.rst index 9c124330cb..88f567cfef 100644 --- a/doc/spanningTree/pgr_prim.rst +++ b/doc/spanningTree/pgr_prim.rst @@ -60,7 +60,7 @@ Signatures :Example: Minimum spanning forest of a subgraph -.. literalinclude:: doc-pgr_prim.queries +.. literalinclude:: prim.queries :start-after: -- q1 :end-before: -- q2 diff --git a/doc/spanningTree/pgr_primBFS.rst b/doc/spanningTree/pgr_primBFS.rst index fd28b0fbd6..b5d799bcc1 100644 --- a/doc/spanningTree/pgr_primBFS.rst +++ b/doc/spanningTree/pgr_primBFS.rst @@ -74,7 +74,7 @@ Single vertex :Example: The Minimum Spanning Tree having as root vertex :math:`6` -.. literalinclude:: doc-pgr_primBFS.queries +.. literalinclude:: primBFS.queries :start-after: -- q1 :end-before: -- q2 @@ -94,7 +94,7 @@ Multiple vertices :Example: The Minimum Spanning Tree starting on vertices :math:`\{9, 6\}` with :math:`depth \leq 3` -.. literalinclude:: doc-pgr_primBFS.queries +.. literalinclude:: primBFS.queries :start-after: -- q2 :end-before: -- q3 diff --git a/doc/spanningTree/pgr_primDD.rst b/doc/spanningTree/pgr_primDD.rst index 4f8cc6be6e..9e96b28727 100644 --- a/doc/spanningTree/pgr_primDD.rst +++ b/doc/spanningTree/pgr_primDD.rst @@ -79,7 +79,7 @@ Single vertex :Example: The Minimum Spanning Tree starting on vertex :math:`6` with :math:`distance \leq 3.5` -.. literalinclude:: doc-pgr_primDD.queries +.. literalinclude:: primDD.queries :start-after: -- q1 :end-before: -- q2 @@ -99,7 +99,7 @@ Multiple vertices :Example: The Minimum Spanning Tree starting on vertices :math:`\{9, 6\}` with :math:`distance \leq 3.5` -.. literalinclude:: doc-pgr_primDD.queries +.. literalinclude:: primDD.queries :start-after: -- q2 :end-before: -- q3 diff --git a/doc/spanningTree/pgr_primDFS.rst b/doc/spanningTree/pgr_primDFS.rst index 09c00570fa..c2822fb88f 100644 --- a/doc/spanningTree/pgr_primDFS.rst +++ b/doc/spanningTree/pgr_primDFS.rst @@ -74,7 +74,7 @@ Single vertex :Example: The Minimum Spanning Tree having as root vertex :math:`6` -.. literalinclude:: doc-pgr_primDFS.queries +.. literalinclude:: primDFS.queries :start-after: -- q1 :end-before: -- q2 @@ -94,7 +94,7 @@ Multiple vertices :Example: The Minimum Spanning Tree starting on vertices :math:`\{9, 6\}` with :math:`depth \leq 3` -.. literalinclude:: doc-pgr_primDFS.queries +.. literalinclude:: primDFS.queries :start-after: -- q2 :end-before: -- q3 diff --git a/doc/topologicalSort/pgr_topologicalSort.rst b/doc/topologicalSort/pgr_topologicalSort.rst index 9cc85a8026..3e4bddc70d 100644 --- a/doc/topologicalSort/pgr_topologicalSort.rst +++ b/doc/topologicalSort/pgr_topologicalSort.rst @@ -69,7 +69,7 @@ Signatures :Example: Topologically sorting the graph -.. literalinclude:: doc-topologicalSort.queries +.. literalinclude:: topologicalSort.queries :start-after: -- q1 :end-before: -- q2 @@ -115,13 +115,13 @@ Additional examples :Example: Topologically sorting the one way segments -.. literalinclude:: doc-topologicalSort.queries +.. literalinclude:: topologicalSort.queries :start-after: -- q2 :end-before: -- q3 :Example: Graph is not a DAG -.. literalinclude:: doc-topologicalSort.queries +.. literalinclude:: topologicalSort.queries :start-after: -- q3 :end-before: -- q4 diff --git a/doc/topology/pgr_analyzeGraph.rst b/doc/topology/pgr_analyzeGraph.rst index 4b8a407258..64c68bb56c 100644 --- a/doc/topology/pgr_analyzeGraph.rst +++ b/doc/topology/pgr_analyzeGraph.rst @@ -106,13 +106,13 @@ Usage when the edge table's columns MATCH the default values: .. rubric:: The simplest way to use pgr_analyzeGraph is: -.. literalinclude:: doc-pgr_analyzeGraph.queries +.. literalinclude:: analyzeGraph.queries :start-after: -- q1 :end-before: -- q1.1 .. rubric:: Arguments are given in the order described in the parameters: -.. literalinclude:: doc-pgr_analyzeGraph.queries +.. literalinclude:: analyzeGraph.queries :start-after: -- q3 :end-before: -- q3.1 @@ -126,7 +126,7 @@ We get the same result as the simplest way to use the function. is passed to the function as the geometry column, and the geometry column ``the_geom`` is passed to the function as the id column. -.. literalinclude:: doc-pgr_analyzeGraph.queries +.. literalinclude:: analyzeGraph.queries :start-after: -- q5 :end-before: -- q5.1 @@ -135,18 +135,18 @@ We get the same result as the simplest way to use the function. The order of the parameters do not matter: -.. literalinclude:: doc-pgr_analyzeGraph.queries +.. literalinclude:: analyzeGraph.queries :start-after: -- q6 :end-before: -- q6.1 -.. literalinclude:: doc-pgr_analyzeGraph.queries +.. literalinclude:: analyzeGraph.queries :start-after: -- q7 :end-before: -- q7.1 Parameters defined with a default value can be omitted, as long as the value matches the default: -.. literalinclude:: doc-pgr_analyzeGraph.queries +.. literalinclude:: analyzeGraph.queries :start-after: -- q8 :end-before: -- q8.1 @@ -155,21 +155,21 @@ matches the default: Selecting rows based on the id. Displays the analysis a the section of the network. -.. literalinclude:: doc-pgr_analyzeGraph.queries +.. literalinclude:: analyzeGraph.queries :start-after: -- q9 :end-before: -- q9.1 Selecting the rows where the geometry is near the geometry of row with ``id`` = 5 -.. literalinclude:: doc-pgr_analyzeGraph.queries +.. literalinclude:: analyzeGraph.queries :start-after: -- q10 :end-before: -- q10.1 Selecting the rows where the geometry is near the geometry of the row with ``gid`` =100 of the table ``othertable``. -.. literalinclude:: doc-pgr_analyzeGraph.queries +.. literalinclude:: analyzeGraph.queries :start-after: -- q11 :end-before: -- q11.1 @@ -178,7 +178,7 @@ Usage when the edge table's columns DO NOT MATCH the default values: For the following table -.. literalinclude:: doc-pgr_analyzeGraph.queries +.. literalinclude:: analyzeGraph.queries :start-after: -- q12 :end-before: -- q12.1 @@ -186,7 +186,7 @@ For the following table The arguments need to be given in the order described in the parameters: -.. literalinclude:: doc-pgr_analyzeGraph.queries +.. literalinclude:: analyzeGraph.queries :start-after: -- q13 :end-before: -- q13.1 @@ -196,7 +196,7 @@ The arguments need to be given in the order described in the parameters: geometry column, and the geometry column ``mygeom`` is passed to the function as the id column. -.. literalinclude:: doc-pgr_analyzeGraph.queries +.. literalinclude:: analyzeGraph.queries :start-after: -- q14 :end-before: -- q14.1 @@ -204,11 +204,11 @@ The arguments need to be given in the order described in the parameters: The order of the parameters do not matter: -.. literalinclude:: doc-pgr_analyzeGraph.queries +.. literalinclude:: analyzeGraph.queries :start-after: -- q15 :end-before: -- q15.1 -.. literalinclude:: doc-pgr_analyzeGraph.queries +.. literalinclude:: analyzeGraph.queries :start-after: -- q16 :end-before: -- q16.1 @@ -219,59 +219,59 @@ values for the column names do not match the column names of the table. Selecting rows based on the id. -.. literalinclude:: doc-pgr_analyzeGraph.queries +.. literalinclude:: analyzeGraph.queries :start-after: -- q17 :end-before: -- q17.1 -.. literalinclude:: doc-pgr_analyzeGraph.queries +.. literalinclude:: analyzeGraph.queries :start-after: -- q18 :end-before: -- q18.1 Selecting the rows WHERE the geometry is near the geometry of row with ``id`` =5 . -.. literalinclude:: doc-pgr_analyzeGraph.queries +.. literalinclude:: analyzeGraph.queries :start-after: -- q19 :end-before: -- q19.1 -.. literalinclude:: doc-pgr_analyzeGraph.queries +.. literalinclude:: analyzeGraph.queries :start-after: -- q20 :end-before: -- q20.1 Selecting the rows WHERE the geometry is near the place='myhouse' of the table ``othertable``. (note the use of quote_literal) -.. literalinclude:: doc-pgr_analyzeGraph.queries +.. literalinclude:: analyzeGraph.queries :start-after: -- q21 :end-before: -- q21.1 -.. literalinclude:: doc-pgr_analyzeGraph.queries +.. literalinclude:: analyzeGraph.queries :start-after: -- q22 :end-before: -- q22.1 Additional Examples ------------------------------------------------------------------------------- -.. literalinclude:: doc-pgr_analyzeGraph.queries +.. literalinclude:: analyzeGraph.queries :start-after: -- q23 :end-before: -- q23.1 -.. literalinclude:: doc-pgr_analyzeGraph.queries +.. literalinclude:: analyzeGraph.queries :start-after: -- q24 :end-before: -- q24.1 -.. literalinclude:: doc-pgr_analyzeGraph.queries +.. literalinclude:: analyzeGraph.queries :start-after: -- q25 :end-before: -- q25.1 -.. literalinclude:: doc-pgr_analyzeGraph.queries +.. literalinclude:: analyzeGraph.queries :start-after: -- q26 :end-before: -- q26.1 -.. literalinclude:: doc-pgr_analyzeGraph.queries +.. literalinclude:: analyzeGraph.queries :start-after: -- q27 :end-before: -- q27.1 -.. literalinclude:: doc-pgr_analyzeGraph.queries +.. literalinclude:: analyzeGraph.queries :start-after: -- q28 :end-before: -- q28.1 diff --git a/doc/topology/pgr_analyzeOneWay.rst b/doc/topology/pgr_analyzeOneWay.rst index 3b90a579b5..a5dd2c6d18 100644 --- a/doc/topology/pgr_analyzeOneWay.rst +++ b/doc/topology/pgr_analyzeOneWay.rst @@ -128,7 +128,7 @@ The structure of the vertices table is: Additional Examples ------------------------------------------------------------------------------- -.. literalinclude:: doc-pgr_analyzeOneWay.queries +.. literalinclude:: analyzeOneWay.queries :start-after: --q1 :end-before: --q1.1 diff --git a/doc/topology/pgr_createTopology.rst b/doc/topology/pgr_createTopology.rst index 6b55267531..9e4886d9ec 100644 --- a/doc/topology/pgr_createTopology.rst +++ b/doc/topology/pgr_createTopology.rst @@ -120,7 +120,7 @@ Usage when the edge table's columns MATCH the default values: The simplest way to use pgr_createTopology is: -.. literalinclude:: doc-pgr_createTopology.queries +.. literalinclude:: createTopology.queries :start-after: --q1 :end-before: --q1.1 @@ -129,7 +129,7 @@ The simplest way to use pgr_createTopology is: We get the sameresult as the simplest way to use the function. -.. literalinclude:: doc-pgr_createTopology.queries +.. literalinclude:: createTopology.queries :start-after: --q2 :end-before: --q2.1 @@ -139,7 +139,7 @@ We get the sameresult as the simplest way to use the function. passed to the function as the geometry column, and the geometry column ``the_geom`` is passed to the function as the id column. - .. literalinclude:: doc-pgr_createTopology.queries + .. literalinclude:: createTopology.queries :start-after: --q3 :end-before: --q3.1 @@ -148,15 +148,15 @@ We get the sameresult as the simplest way to use the function. Parameters defined with a default value can be omitted, as long as the value matches the default And The order of the parameters would not matter. -.. literalinclude:: doc-pgr_createTopology.queries +.. literalinclude:: createTopology.queries :start-after: --q4 :end-before: --q4.1 -.. literalinclude:: doc-pgr_createTopology.queries +.. literalinclude:: createTopology.queries :start-after: --q5 :end-before: --q5.1 -.. literalinclude:: doc-pgr_createTopology.queries +.. literalinclude:: createTopology.queries :start-after: --q6 :end-before: --q6.1 @@ -164,21 +164,21 @@ matches the default And The order of the parameters would not matter. Selecting rows based on the id. -.. literalinclude:: doc-pgr_createTopology.queries +.. literalinclude:: createTopology.queries :start-after: --q7 :end-before: --q7.1 Selecting the rows where the geometry is near the geometry of row with ``id = 5``. -.. literalinclude:: doc-pgr_createTopology.queries +.. literalinclude:: createTopology.queries :start-after: --q8 :end-before: --q8.1 Selecting the rows where the geometry is near the geometry of the row with ``gid`` =100 of the table ``othertable``. -.. literalinclude:: doc-pgr_createTopology.queries +.. literalinclude:: createTopology.queries :start-after: --q9 :end-before: --q9.1 @@ -187,7 +187,7 @@ Usage when the edge table's columns DO NOT MATCH the default values: For the following table -.. literalinclude:: doc-pgr_createTopology.queries +.. literalinclude:: createTopology.queries :start-after: --q10 :end-before: --q10.1 @@ -198,7 +198,7 @@ The arguments need to be given in the order described in the parameters. Note that this example uses clean flag. So it recreates the whole vertices table. -.. literalinclude:: doc-pgr_createTopology.queries +.. literalinclude:: createTopology.queries :start-after: --q11 :end-before: --q11.1 @@ -208,7 +208,7 @@ table. to the function AS the geometry column, and the geometry column ``mygeom`` is passed to the function AS the id column. - .. literalinclude:: doc-pgr_createTopology.queries + .. literalinclude:: createTopology.queries :start-after: --q12 :end-before: --q12.1 @@ -218,11 +218,11 @@ In this scenario omitting a parameter would create an error because the default values for the column names do not match the column names of the table. The order of the parameters do not matter: -.. literalinclude:: doc-pgr_createTopology.queries +.. literalinclude:: createTopology.queries :start-after: --q13 :end-before: --q13.1 -.. literalinclude:: doc-pgr_createTopology.queries +.. literalinclude:: createTopology.queries :start-after: --q14 :end-before: --q14.1 @@ -230,14 +230,14 @@ The order of the parameters do not matter: Based on id: -.. literalinclude:: doc-pgr_createTopology.queries +.. literalinclude:: createTopology.queries :start-after: --q15 :end-before: --q15.1 Selecting the rows where the geometry is near the geometry of the row with ``gid`` =100 of the table ``othertable``. -.. literalinclude:: doc-pgr_createTopology.queries +.. literalinclude:: createTopology.queries :start-after: --q16 :end-before: --q16.1 @@ -264,7 +264,7 @@ With full output This example start a clean topology, with 5 edges, and then its incremented to the rest of the edges. -.. literalinclude:: doc-pgr_createTopology.queries +.. literalinclude:: createTopology.queries :start-after: --q17 :end-before: --q17.1 diff --git a/doc/topology/pgr_createVerticesTable.rst b/doc/topology/pgr_createVerticesTable.rst index 69562235a6..b17ad3d10a 100644 --- a/doc/topology/pgr_createVerticesTable.rst +++ b/doc/topology/pgr_createVerticesTable.rst @@ -104,7 +104,7 @@ The structure of the vertices table is: :Example 1: The simplest way to use pgr_createVerticesTable -.. literalinclude:: doc-pgr_createVerticesTable.queries +.. literalinclude:: createVerticesTable.queries :start-after: --q1 :end-before: --q1.1 @@ -115,7 +115,7 @@ Additional Examples :Example 2: When the arguments are given in the order described in the parameters: -.. literalinclude:: doc-pgr_createVerticesTable.queries +.. literalinclude:: createVerticesTable.queries :start-after: --q2 :end-before: --q2.1 @@ -128,7 +128,7 @@ We get the same result as the simplest way to use the function. ``mytable`` is passed to the function as the geometry column, and the geometry column ``the_geom`` is passed to the function as the source column. - .. literalinclude:: doc-pgr_createVerticesTable.queries + .. literalinclude:: createVerticesTable.queries :start-after: --q2.1 :end-before: --q2.2 @@ -137,13 +137,13 @@ We get the same result as the simplest way to use the function. :Example 3: The order of the parameters do not matter: -.. literalinclude:: doc-pgr_createVerticesTable.queries +.. literalinclude:: createVerticesTable.queries :start-after: --q3.1 :end-before: --q3.2 :Example 4: Using a different ordering -.. literalinclude:: doc-pgr_createVerticesTable.queries +.. literalinclude:: createVerticesTable.queries :start-after: --q4 :end-before: --q4.1 @@ -151,7 +151,7 @@ We get the same result as the simplest way to use the function. :Example 5: Parameters defined with a default value can be omitted, as long as the value matches the default: -.. literalinclude:: doc-pgr_createVerticesTable.queries +.. literalinclude:: createVerticesTable.queries :start-after: --q5 :end-before: --q5.1 @@ -160,7 +160,7 @@ We get the same result as the simplest way to use the function. :Example 6: Selecting rows based on the id. -.. literalinclude:: doc-pgr_createVerticesTable.queries +.. literalinclude:: createVerticesTable.queries :start-after: --q6 :end-before: --q6.1 @@ -168,7 +168,7 @@ We get the same result as the simplest way to use the function. :Example 7: Selecting the rows where the geometry is near the geometry of row with ``id`` =5 . -.. literalinclude:: doc-pgr_createVerticesTable.queries +.. literalinclude:: createVerticesTable.queries :start-after: --q7 :end-before: --q7.1 @@ -176,7 +176,7 @@ We get the same result as the simplest way to use the function. :Example 8: Selecting the rows where the geometry is near the geometry of the row with ``gid`` =100 of the table ``othertable``. -.. literalinclude:: doc-pgr_createVerticesTable.queries +.. literalinclude:: createVerticesTable.queries :start-after: --q8 :end-before: --q8.1 @@ -185,7 +185,7 @@ Usage when the edge table's columns DO NOT MATCH the default values: Using the following table -.. literalinclude:: doc-pgr_createVerticesTable.queries +.. literalinclude:: createVerticesTable.queries :start-after: --tab1 :end-before: --tab2 @@ -194,7 +194,7 @@ Using the following table :Example 9: The arguments need to be given in the order described in the parameters: -.. literalinclude:: doc-pgr_createVerticesTable.queries +.. literalinclude:: createVerticesTable.queries :start-after: --q9 :end-before: --q9.1 @@ -204,7 +204,7 @@ Using the following table to the function as the geometry column, and the geometry column ``mygeom`` is passed to the function as the source column. - .. literalinclude:: doc-pgr_createVerticesTable.queries + .. literalinclude:: createVerticesTable.queries :start-after: --q9.1 :end-before: --q9.2 @@ -212,7 +212,7 @@ Using the following table :Example 10: The order of the parameters do not matter: -.. literalinclude:: doc-pgr_createVerticesTable.queries +.. literalinclude:: createVerticesTable.queries :start-after: --q10 :end-before: --q10.1 @@ -221,7 +221,7 @@ Using the following table In this scenario omitting a parameter would create an error because the default values for the column names do not match the column names of the table. -.. literalinclude:: doc-pgr_createVerticesTable.queries +.. literalinclude:: createVerticesTable.queries :start-after: --q11 :end-before: --q11.1 @@ -230,44 +230,44 @@ values for the column names do not match the column names of the table. :Example 12: Selecting rows based on the gid. (positional notation) -.. literalinclude:: doc-pgr_createVerticesTable.queries +.. literalinclude:: createVerticesTable.queries :start-after: --q12 :end-before: --q12.1 :Example 13: Selecting rows based on the gid. (named notation) -.. literalinclude:: doc-pgr_createVerticesTable.queries +.. literalinclude:: createVerticesTable.queries :start-after: --q13 :end-before: --q13.1 :Example 14: Selecting the rows where the geometry is near the geometry of row with ``gid`` = 5. -.. literalinclude:: doc-pgr_createVerticesTable.queries +.. literalinclude:: createVerticesTable.queries :start-after: --q14 :end-before: --q14.1 :Example 15: TBD -.. literalinclude:: doc-pgr_createVerticesTable.queries +.. literalinclude:: createVerticesTable.queries :start-after: --q15 :end-before: --q15.1 :Example 16: Selecting the rows where the geometry is near the geometry of the row with ``gid`` =100 of the table ``othertable``. -.. literalinclude:: doc-pgr_createVerticesTable.queries +.. literalinclude:: createVerticesTable.queries :start-after: --q16 :end-before: --q16.1 -.. literalinclude:: doc-pgr_createVerticesTable.queries +.. literalinclude:: createVerticesTable.queries :start-after: --q16.1 :end-before: --q16.2 :Example 17: TBD -.. literalinclude:: doc-pgr_createVerticesTable.queries +.. literalinclude:: createVerticesTable.queries :start-after: --q17 :end-before: --q17.1 diff --git a/doc/topology/pgr_extractVertices.rst b/doc/topology/pgr_extractVertices.rst index b4d58bee7c..fed52d23af 100644 --- a/doc/topology/pgr_extractVertices.rst +++ b/doc/topology/pgr_extractVertices.rst @@ -57,7 +57,7 @@ Signatures :Example: Extracting the vertex information -.. literalinclude:: doc-pgr_extractVertices.queries +.. literalinclude:: extractVertices.queries :start-after: --q1 :end-before: --q1.1 @@ -206,7 +206,7 @@ true``. The results can be used as base code to make a refinement based on the backend development needs. -.. literalinclude:: doc-pgr_extractVertices.queries +.. literalinclude:: extractVertices.queries :start-after: --q2 :end-before: --q2.1 @@ -219,14 +219,14 @@ Create a routing topology Make sure the database does not have the ``vertices_table`` +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_extractVertices.queries +.. literalinclude:: extractVertices.queries :start-after: --q3 :end-before: --q3.1 Clean up the columns of the routing topology to be created +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_extractVertices.queries +.. literalinclude:: extractVertices.queries :start-after: --q3.1 :end-before: --q3.2 @@ -239,14 +239,14 @@ Create the vertices table * Create it as ``UNLOGGED`` and * After the table is created ``ALTER TABLE .. SET LOGGED`` -.. literalinclude:: doc-pgr_extractVertices.queries +.. literalinclude:: extractVertices.queries :start-after: --q3.2 :end-before: --q3.3 Inspect the vertices table +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_extractVertices.queries +.. literalinclude:: extractVertices.queries :start-after: --q3.3 :end-before: --q3.4 @@ -255,20 +255,20 @@ Create the routing topology on the edge table Updating the ``source`` information -.. literalinclude:: doc-pgr_extractVertices.queries +.. literalinclude:: extractVertices.queries :start-after: --q3.4 :end-before: --q3.5 Updating the ``target`` information -.. literalinclude:: doc-pgr_extractVertices.queries +.. literalinclude:: extractVertices.queries :start-after: --q3.5 :end-before: --q3.6 Inspect the routing topology +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_extractVertices.queries +.. literalinclude:: extractVertices.queries :start-after: --q3.6 :end-before: --q3.7 diff --git a/doc/topology/pgr_nodeNetwork.rst b/doc/topology/pgr_nodeNetwork.rst index bc321e160b..239cf54858 100644 --- a/doc/topology/pgr_nodeNetwork.rst +++ b/doc/topology/pgr_nodeNetwork.rst @@ -86,39 +86,39 @@ Examples Let's create the topology for the data in :doc:`sampledata` -.. literalinclude:: doc-pgr_nodeNetwork.queries +.. literalinclude:: nodeNetwork.queries :start-after: --q1 :end-before: --q1.1 Now we can analyze the network. -.. literalinclude:: doc-pgr_nodeNetwork.queries +.. literalinclude:: nodeNetwork.queries :start-after: --q2 :end-before: --q2.1 The analysis tell us that the network has a gap and an intersection. We try to fix the problem using: -.. literalinclude:: doc-pgr_nodeNetwork.queries +.. literalinclude:: nodeNetwork.queries :start-after: --q3 :end-before: --q3.1 Inspecting the generated table, we can see that edges 13,14 and 18 has been segmented -.. literalinclude:: doc-pgr_nodeNetwork.queries +.. literalinclude:: nodeNetwork.queries :start-after: --q4 :end-before: --q4.1 We can create the topology of the new network -.. literalinclude:: doc-pgr_nodeNetwork.queries +.. literalinclude:: nodeNetwork.queries :start-after: --q5 :end-before: --q5.1 Now let's analyze the new topology -.. literalinclude:: doc-pgr_nodeNetwork.queries +.. literalinclude:: nodeNetwork.queries :start-after: --q6 :end-before: --q6.1 @@ -182,27 +182,27 @@ following steps: of the original edge - Insert only the segmented edges, that is, the ones whose max(sub_id) >1 -.. literalinclude:: doc-pgr_nodeNetwork.queries +.. literalinclude:: nodeNetwork.queries :start-after: --q7 :end-before: --q7.1 We recreate the topology: -.. literalinclude:: doc-pgr_nodeNetwork.queries +.. literalinclude:: nodeNetwork.queries :start-after: --q8 :end-before: --q8.1 To get the same analysis results as the topology of edge_table_noded, we do the following query: -.. literalinclude:: doc-pgr_nodeNetwork.queries +.. literalinclude:: nodeNetwork.queries :start-after: --q9 :end-before: --q9.1 To get the same analysis results as the original edge_table, we do the following query: -.. literalinclude:: doc-pgr_nodeNetwork.queries +.. literalinclude:: nodeNetwork.queries :start-after: --q10 :end-before: --q10.1 @@ -210,7 +210,7 @@ Or we can analyze everything because, maybe edge 18 is an overpass, edge 14 is an under pass and there is also a street level juction, and the same happens with edges 17 and 13. -.. literalinclude:: doc-pgr_nodeNetwork.queries +.. literalinclude:: nodeNetwork.queries :start-after: --q11 :end-before: --q11.1 diff --git a/doc/transitiveClosure/pgr_transitiveClosure.rst b/doc/transitiveClosure/pgr_transitiveClosure.rst index 0bf435cf86..0417be5f79 100644 --- a/doc/transitiveClosure/pgr_transitiveClosure.rst +++ b/doc/transitiveClosure/pgr_transitiveClosure.rst @@ -69,7 +69,7 @@ The pgr_transitiveClosure function has the following signature: :Example: Rechability of a subgraph -.. literalinclude:: doc-transitiveClosure.queries +.. literalinclude:: transitiveClosure.queries :start-after: -- q1 :end-before: -- q2 diff --git a/doc/traversal/pgr_depthFirstSearch.rst b/doc/traversal/pgr_depthFirstSearch.rst index 7e85479100..70560f0d4e 100644 --- a/doc/traversal/pgr_depthFirstSearch.rst +++ b/doc/traversal/pgr_depthFirstSearch.rst @@ -91,7 +91,7 @@ Single vertex :Example: From root vertex :math:`6` on a **directed** graph with edges in ascending order of ``id`` -.. literalinclude:: doc-pgr_depthFirstSearch.queries +.. literalinclude:: depthFirstSearch.queries :start-after: -- q1 :end-before: -- q2 @@ -112,7 +112,7 @@ Multiple vertices :Example: From root vertices :math:`\{12, 6\}` on an **undirected** graph with **depth** :math:`<= 2` and edges in ascending order of ``id`` -.. literalinclude:: doc-pgr_depthFirstSearch.queries +.. literalinclude:: depthFirstSearch.queries :start-after: -- q2 :end-before: -- q3 @@ -159,7 +159,7 @@ Additional Examples :Example: Same as `Single vertex`_ but with edges in descending order of ``id``. -.. literalinclude:: doc-pgr_depthFirstSearch.queries +.. literalinclude:: depthFirstSearch.queries :start-after: -- q3 :end-before: -- q4 diff --git a/doc/trsp/pgr_trsp.rst b/doc/trsp/pgr_trsp.rst index 4fe728abbb..cb979f7322 100644 --- a/doc/trsp/pgr_trsp.rst +++ b/doc/trsp/pgr_trsp.rst @@ -105,7 +105,7 @@ One to One :Example: From vertex :math:`6` to vertex :math:`10` on an undirected graph. -.. literalinclude:: doc-trsp.queries +.. literalinclude:: trsp.queries :start-after: -- q2 :end-before: -- q3 @@ -126,7 +126,7 @@ One to Many :Example: From vertex :math:`6` to vertices :math:`\{10, 1\}` on an undirected graph. -.. literalinclude:: doc-trsp.queries +.. literalinclude:: trsp.queries :start-after: -- q3 :end-before: -- q4 @@ -147,7 +147,7 @@ Many to One :Example: From vertices :math:`\{6, 1\}` to vertex :math:`8` on a directed graph. -.. literalinclude:: doc-trsp.queries +.. literalinclude:: trsp.queries :start-after: -- q4 :end-before: -- q5 @@ -169,7 +169,7 @@ Many to Many :Example: From vertices :math:`\{6, 1\}` to vertices :math:`\{10, 8\}` on an undirected graph. -.. literalinclude:: doc-trsp.queries +.. literalinclude:: trsp.queries :start-after: -- q5 :end-before: -- q6 @@ -189,7 +189,7 @@ Combinations :Example: Using a combinations table on an undirected graph. -.. literalinclude:: doc-trsp.queries +.. literalinclude:: trsp.queries :start-after: -- q6 :end-before: -- q7 diff --git a/doc/trsp/pgr_turnRestrictedPath.rst b/doc/trsp/pgr_turnRestrictedPath.rst index 453b38e777..59fd8379c9 100644 --- a/doc/trsp/pgr_turnRestrictedPath.rst +++ b/doc/trsp/pgr_turnRestrictedPath.rst @@ -49,7 +49,7 @@ Signatures :Example: From vertex :math:`3` to vertex :math:`8` on a directed graph -.. literalinclude:: doc-pgr_turnRestrictedPath.queries +.. literalinclude:: turnRestrictedPath.queries :start-after: -- q1 :end-before: -- q2 @@ -130,19 +130,19 @@ Additional Examples No results because the only path available follows a restriction. -.. literalinclude:: doc-pgr_turnRestrictedPath.queries +.. literalinclude:: turnRestrictedPath.queries :start-after: -- q2 :end-before: -- q3 :Example: From vertex :math:`3` to vertex :math:`8` on an undirected graph -.. literalinclude:: doc-pgr_turnRestrictedPath.queries +.. literalinclude:: turnRestrictedPath.queries :start-after: -- q3 :end-before: -- q4 :Example: From vertex :math:`3` to vertex :math:`8` with more alternatives -.. literalinclude:: doc-pgr_turnRestrictedPath.queries +.. literalinclude:: turnRestrictedPath.queries :start-after: -- q4 :end-before: -- q5 diff --git a/doc/tsp/pgr_TSP.rst b/doc/tsp/pgr_TSP.rst index 26aa91fed1..db9db05478 100644 --- a/doc/tsp/pgr_TSP.rst +++ b/doc/tsp/pgr_TSP.rst @@ -126,7 +126,7 @@ Signatures * **Line 4** Vertices :math:`\{2, 4, 13, 14\}` are not included because they are not connected. -.. literalinclude:: doc-pgr_TSP.queries +.. literalinclude:: TSP.queries :start-after: -- q1 :end-before: -- q2 :linenos: @@ -183,7 +183,7 @@ Start from vertex :math:`1` * **Line 6** ``start_vid => 1`` -.. literalinclude:: doc-pgr_TSP.queries +.. literalinclude:: TSP.queries :start-after: -- q2 :end-before: -- q3 :linenos: @@ -205,7 +205,7 @@ To generate an asymmetric matrix: * Triangle inequality might not be satisfied. * ``start_id != 0 AND end_id != 0`` -.. literalinclude:: doc-pgr_TSP.queries +.. literalinclude:: TSP.queries :start-after: -- q3 :end-before: -- q4 :linenos: @@ -215,7 +215,7 @@ Connected incomplete data Using selected edges :math:`\{2, 4, 5, 8, 9, 15\}` the matrix is not complete. -.. literalinclude:: doc-pgr_TSP.queries +.. literalinclude:: TSP.queries :start-after: -- q4 :end-before: -- q5 :linenos: @@ -223,7 +223,7 @@ Using selected edges :math:`\{2, 4, 5, 8, 9, 15\}` the matrix is not complete. Cost value for :math:`17 \rightarrow 10` do not exist on the matrix, but the value used is taken from :math:`10 \rightarrow 17`. -.. literalinclude:: doc-pgr_TSP.queries +.. literalinclude:: TSP.queries :start-after: -- q5 :end-before: -- q6 :linenos: diff --git a/doc/tsp/pgr_TSPeuclidean.rst b/doc/tsp/pgr_TSPeuclidean.rst index a36dacc12b..0c1e1e4fba 100644 --- a/doc/tsp/pgr_TSPeuclidean.rst +++ b/doc/tsp/pgr_TSPeuclidean.rst @@ -89,7 +89,7 @@ Signatures :Example: With default values -.. literalinclude:: doc-pgr_TSPeuclidean.queries +.. literalinclude:: TSPeuclidean.queries :start-after: -- q1 :end-before: -- q2 @@ -167,14 +167,14 @@ Total tour cost Getting a total cost of the tour, compare the value with the length of an optimal tour is 27603, given on the dataset -.. literalinclude:: doc-pgr_TSPeuclidean.queries +.. literalinclude:: TSPeuclidean.queries :start-after: -- q2 :end-before: -- q3 Getting a geometry of the tour +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -.. literalinclude:: doc-pgr_TSPeuclidean.queries +.. literalinclude:: TSPeuclidean.queries :start-after: -- q3 :end-before: -- q4 diff --git a/doc/version/pgr_full_version.rst b/doc/version/pgr_full_version.rst index bfdff43310..8d32604add 100644 --- a/doc/version/pgr_full_version.rst +++ b/doc/version/pgr_full_version.rst @@ -43,7 +43,7 @@ Signatures :Example: Information about when this documentation was built -.. literalinclude:: doc-full_version.queries +.. literalinclude:: full_version.queries :start-after: -- q1 :end-before: -- q2 diff --git a/doc/version/pgr_version.rst b/doc/version/pgr_version.rst index 8e1146cac2..88807fe1d2 100644 --- a/doc/version/pgr_version.rst +++ b/doc/version/pgr_version.rst @@ -47,7 +47,7 @@ Signature :Example: pgRouting Version for this documentation -.. literalinclude:: doc-version.queries +.. literalinclude:: version.queries :start-after: -- q1 :end-before: -- q2 diff --git a/doc/vrp_basic/pgr_vrpOneDepot.rst b/doc/vrp_basic/pgr_vrpOneDepot.rst index 9e4fe34d64..5dd273d67d 100644 --- a/doc/vrp_basic/pgr_vrpOneDepot.rst +++ b/doc/vrp_basic/pgr_vrpOneDepot.rst @@ -55,7 +55,7 @@ Result columns Additional Example: ------------------------------------------------------------------------------- -.. literalinclude:: doc-pgr_vrpOneDepot.queries +.. literalinclude:: vrpOneDepot.queries .. rubric:: Data diff --git a/doc/withPoints/pgr_withPoints.rst b/doc/withPoints/pgr_withPoints.rst index d0101ea917..f2bc97f1af 100644 --- a/doc/withPoints/pgr_withPoints.rst +++ b/doc/withPoints/pgr_withPoints.rst @@ -103,7 +103,7 @@ One to One :Example: From point :math:`1` to vertex :math:`10` with details -.. literalinclude:: doc-pgr_withPoints.queries +.. literalinclude:: withPoints.queries :start-after: -- q1 :end-before: -- q2 @@ -125,7 +125,7 @@ One to Many :Example: From point :math:`1` to point :math:`3` and vertex :math:`7` on an undirected graph -.. literalinclude:: doc-pgr_withPoints.queries +.. literalinclude:: withPoints.queries :start-after: -- q2 :end-before: -- q3 @@ -146,7 +146,7 @@ Many to One :Example: From point :math:`1` and vertex :math:`6` to point :math:`3` -.. literalinclude:: doc-pgr_withPoints.queries +.. literalinclude:: withPoints.queries :start-after: -- q3 :end-before: -- q4 @@ -168,7 +168,7 @@ Many to Many :Example: From point :math:`1` and vertex :math:`6` to point :math:`3` and vertex :math:`1` -.. literalinclude:: doc-pgr_withPoints.queries +.. literalinclude:: withPoints.queries :start-after: -- q4 :end-before: -- q5 @@ -192,7 +192,7 @@ Combinations From point :math:`1` to vertex :math:`10`, and from vertex :math:`6` to point :math:`3` with **right** side driving. -.. literalinclude:: doc-pgr_withPoints.queries +.. literalinclude:: withPoints.queries :start-after: -- q5 :end-before: -- q6 @@ -260,7 +260,7 @@ Use :doc:`pgr_findCloseEdges` in the `Points SQL`_. Find the routes from vertex :math:`1` to the two closest locations on the graph of point `(2.9, 1.8)`. -.. literalinclude:: doc-pgr_withPoints.queries +.. literalinclude:: withPoints.queries :start-after: -- q9 :end-before: -- q10 @@ -273,7 +273,7 @@ Usage variations All the examples are about traveling from point :math:`1` and vertex :math:`5` to points :math:`\{2, 3, 6\}` and vertices :math:`\{10, 11\}` -.. literalinclude:: doc-pgr_withPoints.queries +.. literalinclude:: withPoints.queries :start-after: -- q6 :end-before: -- q7 @@ -283,7 +283,7 @@ Passes in front or visits with right side driving. For point :math:`6` and vertex :math:`11`. -.. literalinclude:: doc-pgr_withPoints.queries +.. literalinclude:: withPoints.queries :start-after: -- q7 :end-before: -- q8 @@ -292,7 +292,7 @@ Passes in front or visits with left side driving. For point :math:`6` and vertex :math:`11`. -.. literalinclude:: doc-pgr_withPoints.queries +.. literalinclude:: withPoints.queries :start-after: -- q8 :end-before: -- q9 diff --git a/doc/withPoints/pgr_withPointsCost.rst b/doc/withPoints/pgr_withPointsCost.rst index 32770a50a8..1962bd8156 100644 --- a/doc/withPoints/pgr_withPointsCost.rst +++ b/doc/withPoints/pgr_withPointsCost.rst @@ -125,7 +125,7 @@ One to One :Example: From point :math:`1` to vertex :math:`10` with defaults -.. literalinclude:: doc-pgr_withPointsCost.queries +.. literalinclude:: withPointsCost.queries :start-after: -- q1 :end-before: -- q2 @@ -147,7 +147,7 @@ One to Many :Example: From point :math:`1` to point :math:`3` and vertex :math:`7` on an undirected graph -.. literalinclude:: doc-pgr_withPointsCost.queries +.. literalinclude:: withPointsCost.queries :start-after: -- q2 :end-before: -- q3 @@ -168,7 +168,7 @@ Many to One :Example: From point :math:`1` and vertex :math:`6` to point :math:`3` -.. literalinclude:: doc-pgr_withPointsCost.queries +.. literalinclude:: withPointsCost.queries :start-after: -- q3 :end-before: -- q4 @@ -190,7 +190,7 @@ Many to Many :Example: From point :math:`15` and vertex :math:`6` to point :math:`3` and vertex :math:`1` -.. literalinclude:: doc-pgr_withPointsCost.queries +.. literalinclude:: withPointsCost.queries :start-after: -- q4 :end-before: -- q5 @@ -214,7 +214,7 @@ Combinations From point :math:`1` to vertex :math:`10`, and from vertex :math:`6` to point :math:`3` with **right** side driving. -.. literalinclude:: doc-pgr_withPointsCost.queries +.. literalinclude:: withPointsCost.queries :start-after: -- q5 :end-before: -- q6 @@ -320,7 +320,7 @@ Use :doc:`pgr_findCloseEdges` in the `Points SQL`_. Find the cost of the routes from vertex :math:`1` to the two closest locations on the graph of point `(2.9, 1.8)`. -.. literalinclude:: doc-pgr_withPointsCost.queries +.. literalinclude:: withPointsCost.queries :start-after: -- q9 :end-before: -- q10 @@ -334,7 +334,7 @@ Right side driving topology Traveling from point :math:`1` and vertex :math:`5` to points :math:`\{2, 3, 6\}` and vertices :math:`\{10, 11\}` -.. literalinclude:: doc-pgr_withPointsCost.queries +.. literalinclude:: withPointsCost.queries :start-after: -- q6 :end-before: -- q7 @@ -344,7 +344,7 @@ Left side driving topology Traveling from point :math:`1` and vertex :math:`5` to points :math:`\{2, 3, 6\}` and vertices :math:`\{10, 11\}` -.. literalinclude:: doc-pgr_withPointsCost.queries +.. literalinclude:: withPointsCost.queries :start-after: -- q7 :end-before: -- q8 @@ -354,7 +354,7 @@ Does not matter driving side driving topology Traveling from point :math:`1` and vertex :math:`5` to points :math:`\{2, 3, 6\}` and vertices :math:`\{10, 11\}` -.. literalinclude:: doc-pgr_withPointsCost.queries +.. literalinclude:: withPointsCost.queries :start-after: -- q8 :end-before: -- q9 diff --git a/doc/withPoints/pgr_withPointsCostMatrix.rst b/doc/withPoints/pgr_withPointsCostMatrix.rst index c45584c59d..b5f434ce44 100644 --- a/doc/withPoints/pgr_withPointsCostMatrix.rst +++ b/doc/withPoints/pgr_withPointsCostMatrix.rst @@ -71,7 +71,7 @@ Signatures * Using the default ``side`` value on the **points_sql** query * Using the default ``driving_side`` value -.. literalinclude:: doc-pgr_withPointsCostMatrix.queries +.. literalinclude:: withPointsCostMatrix.queries :start-after: -- q1 :end-before: -- q2 @@ -136,7 +136,7 @@ Use :doc:`pgr_findCloseEdges` in the `Points SQL`_. Find the matrix cost of the routes from vertex :math:`1` and the two closest locations on the graph of point `(2.9, 1.8)`. -.. literalinclude:: doc-pgr_withPointsCostMatrix.queries +.. literalinclude:: withPointsCostMatrix.queries :start-after: -- q3 :end-before: -- q4 @@ -146,7 +146,7 @@ locations on the graph of point `(2.9, 1.8)`. Use with :doc:`pgr_TSP`. ............................................................................... -.. literalinclude:: doc-pgr_withPointsCostMatrix.queries +.. literalinclude:: withPointsCostMatrix.queries :start-after: -- q2 :end-before: -- q3 diff --git a/doc/withPoints/pgr_withPointsDD.rst b/doc/withPoints/pgr_withPointsDD.rst index dfab10b032..7988acb3e1 100644 --- a/doc/withPoints/pgr_withPointsDD.rst +++ b/doc/withPoints/pgr_withPointsDD.rst @@ -100,7 +100,7 @@ Single vertex :Example: Right side driving topology, from point :math:`1` within a distance of :math:`3.3` with details. -.. literalinclude:: doc-pgr_withPointsDD.queries +.. literalinclude:: withPointsDD.queries :start-after: -- q2 :end-before: -- q3 @@ -122,7 +122,7 @@ Multiple vertices :Example: From point :math:`1` and vertex :math:`16` within a distance of :math:`3.3` with ``equicost`` on a directed graph -.. literalinclude:: doc-pgr_withPointsDD.queries +.. literalinclude:: withPointsDD.queries :start-after: -- q3 :end-before: -- q4 @@ -244,7 +244,7 @@ Use :doc:`pgr_findCloseEdges` in the `Points SQL`_. Find the driving distance from the two closest locations on the graph of point `(2.9, 1.8)`. -.. literalinclude:: doc-pgr_withPointsDD.queries +.. literalinclude:: withPointsDD.queries :start-after: -- q5 :end-before: -- q6 @@ -257,7 +257,7 @@ Driving side does not matter From point :math:`1` within a distance of :math:`3.3`, does not matter driving side, with details. -.. literalinclude:: doc-pgr_withPointsDD.queries +.. literalinclude:: withPointsDD.queries :start-after: -- q4 :end-before: -- q5 diff --git a/doc/withPoints/pgr_withPointsKSP.rst b/doc/withPoints/pgr_withPointsKSP.rst index 08d0cb782b..648614dbfb 100644 --- a/doc/withPoints/pgr_withPointsKSP.rst +++ b/doc/withPoints/pgr_withPointsKSP.rst @@ -98,7 +98,7 @@ One to One * No details are given about distance of other points of the query. * No heap paths are returned. -.. literalinclude:: doc-pgr_withPointsKSP.queries +.. literalinclude:: withPointsKSP.queries :start-after: --q1 :end-before: --q2 @@ -120,7 +120,7 @@ One to Many :Example: Get 2 paths from point :math:`1` to point :math:`3` and vertex :math:`7` on an undirected graph -.. literalinclude:: doc-pgr_withPointsKSP.queries +.. literalinclude:: withPointsKSP.queries :start-after: --q2 :end-before: --q3 @@ -142,7 +142,7 @@ Many to One :Example: Get a path from point :math:`1` and vertex :math:`6` to point :math:`3` on a **directed** graph with **right** side driving and **details** set to **True** -.. literalinclude:: doc-pgr_withPointsKSP.queries +.. literalinclude:: withPointsKSP.queries :start-after: --q3 :end-before: --q4 @@ -164,7 +164,7 @@ Many to Many :Example: Get a path from point :math:`1` and vertex :math:`6` to point :math:`3` and vertex :math:`1` on a **directed** graph with **left** side driving and **heap_paths** set to **True** -.. literalinclude:: doc-pgr_withPointsKSP.queries +.. literalinclude:: withPointsKSP.queries :start-after: --q4 :end-before: --q5 @@ -185,7 +185,7 @@ Combinations :Example: Using a combinations table on an **directed** graph -.. literalinclude:: doc-pgr_withPointsKSP.queries +.. literalinclude:: withPointsKSP.queries :start-after: --q5 :end-before: --q6 @@ -307,7 +307,7 @@ Use :doc:`pgr_findCloseEdges` in the `Points SQL`_. Get :math:`2` paths using left side driving topology, from vertex :math:`1` to the closest location on the graph of point `(2.9, 1.8)`. -.. literalinclude:: doc-pgr_withPointsKSP.queries +.. literalinclude:: withPointsKSP.queries :start-after: --q6 :end-before: --q7 @@ -319,7 +319,7 @@ Left driving side Get :math:`2` paths using left side driving topology, from point :math:`1` to point :math:`3` with details. -.. literalinclude:: doc-pgr_withPointsKSP.queries +.. literalinclude:: withPointsKSP.queries :start-after: --q7 :end-before: --q8 @@ -329,7 +329,7 @@ Right driving side Get :math:`2` paths using right side driving topology from, point :math:`1` to point :math:`2` with heap paths and details. -.. literalinclude:: doc-pgr_withPointsKSP.queries +.. literalinclude:: withPointsKSP.queries :start-after: --q8 :end-before: --q9 From 1139dbff1809340893c28971a06e3e317de6c4ac Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 27 May 2024 21:53:44 -0600 Subject: [PATCH 311/428] adjusting scripts to new filenames --- .github/workflows/check-queries.yml | 2 +- tools/developer/run.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check-queries.yml b/.github/workflows/check-queries.yml index 0e7adb2d27..8186607dba 100644 --- a/.github/workflows/check-queries.yml +++ b/.github/workflows/check-queries.yml @@ -113,7 +113,7 @@ jobs: TESTDIRS="version" for d in ${TESTDIRS} do - ./tools/testers/doc_queries_generator.pl -pgver "${PGVER}" -pguser runner -documentation -alg "${d}" + ./tools/testers/doc_queries_generator.pl -pgver "${PGVER}" -pguser runner -documentation -alg "docqueries/${d}" done ./tools/testers/doc_queries_generator.pl -pgver "${PGVER}" diff --git a/tools/developer/run.sh b/tools/developer/run.sh index 359a75661b..1a6480008e 100755 --- a/tools/developer/run.sh +++ b/tools/developer/run.sh @@ -153,9 +153,9 @@ function test_compile { echo -------------------------------------------- for d in ${QUERIES_DIRS} do - #tools/testers/doc_queries_generator.pl -alg "${d}" -documentation -pgport "${PGPORT}" - #tools/testers/doc_queries_generator.pl -alg "${d}" -debug1 -pgport "${PGPORT}" - tools/testers/doc_queries_generator.pl -alg "${d}" -pgport "${PGPORT}" + #tools/testers/doc_queries_generator.pl -alg "docqueries/${d}" -documentation -pgport "${PGPORT}" + #tools/testers/doc_queries_generator.pl -alg "docqueries/${d}" -debug1 -pgport "${PGPORT}" + tools/testers/doc_queries_generator.pl -alg "docqueries/${d}" -pgport "${PGPORT}" done build_doc From 0c47a51a68162d085484d9c06b6f517775d6b6a5 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 28 May 2024 11:31:48 -0600 Subject: [PATCH 312/428] doc_queries_generator.pl drop/create with if exists --- tools/testers/doc_queries_generator.pl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/testers/doc_queries_generator.pl b/tools/testers/doc_queries_generator.pl index 50594d6c67..34cb9b5628 100755 --- a/tools/testers/doc_queries_generator.pl +++ b/tools/testers/doc_queries_generator.pl @@ -385,7 +385,7 @@ sub createTestDB { unless version_greater_eq($dbver, $POSGRESQL_MIN_VERSION); # Create a database with postgis installed in it - mysystem("createdb $connopts $databaseName"); + mysystem("createdb $connopts $databaseName") if !dbExists($databaseName); die "ERROR: Failed to create database '$databaseName'!\n" unless dbExists($databaseName); my $encoding = ''; if ($OS =~ /msys/ @@ -398,6 +398,10 @@ sub createTestDB { if ($vpgr) { $myver = " VERSION '$vpgr'"; } + + + mysystem("$psql $connopts -c \"DROP EXTENSION IF EXISTS pgrouting $myver\" $databaseName "); + print "Installing pgrouting extension $myver\n" if $VERBOSE; mysystem("$psql $connopts -c \"CREATE EXTENSION pgrouting $myver CASCADE\" $databaseName"); From aaf4c66d8bcc33366b484a60cdea9a55829feee2 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 12 Aug 2024 14:39:21 -0600 Subject: [PATCH 313/428] (e_report) free memory of logs on function call --- include/c_common/e_report.h | 77 ++---------------------- src/common/e_report.c | 116 +++++++++++++----------------------- 2 files changed, 45 insertions(+), 148 deletions(-) diff --git a/include/c_common/e_report.h b/include/c_common/e_report.h index 1f49b620cc..d11ac238ba 100644 --- a/include/c_common/e_report.h +++ b/include/c_common/e_report.h @@ -1,9 +1,6 @@ /*PGR-GNU***************************************************************** File: e_report.h -Copyright (c) 2016 pgRouting developers -Mail: project@pgrouting.org - Function's developer: Copyright (c) 2016 Celia Virginia Vergara Castillo Mail: vicky_vergara@hotmail.com @@ -56,7 +53,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * */ -///@{ /*! @brief notice & error * * ~~~~{.c} @@ -70,76 +66,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ void pgr_global_report( - char* log_msg, - char* notice_msg, - char* error_msg); - -/*! @brief notice with no hint - * - * ~~~~{.c} - * pgr_notice(&log_msg, ¬ice_msg); - * - * precondition: before calling ereport - * assert(!log_msg); - * assert(!notice_msg); - * ~~~~ - */ -void -pgr_notice( - char* notice_msg); - -/*! @brief notice with hint - * - * ~~~~{.c} - * pgr_notice(&log_msg, ¬ice_msg); - * - * precondition: before calling ereport - * assert(!log_msg); - * assert(!notice_msg); - * ~~~~ - */ -void -pgr_notice2( - char* log_msg, - char* notice_msg); - -/*! @brief error with no hint - * - * - * ~~~~{.c} - * if (err_msg) { - * pfree(); - * } - * pgr_error(&error_msg); - * - * precondition: before calling ereport - * assert(!*error_msg); - * ~~~~ - */ -void -pgr_error(char* error_msg); + char** log_msg, + char** notice_msg, + char** error_msg); /* @brief throws postgres error when first string is not null */ -void throw_error(char*, char*); - - -/*! @brief error with hint - * - * ~~~~{.c} - * if (err_msg) { - * pfree(); - * } - * pgr_error(&log_msg, &error_msg); - * - * precondition: before calling ereport - * assert(!*log_msg); - * assert(!*error_msg); - * ~~~~ - */ -void -pgr_error2( - char* log_msg, - char* error_msg); -///@} +void pgr_throw_error(char*, char*); #endif // INCLUDE_C_COMMON_E_REPORT_H_ diff --git a/src/common/e_report.c b/src/common/e_report.c index 93a46525dd..15500c849d 100644 --- a/src/common/e_report.c +++ b/src/common/e_report.c @@ -1,9 +1,6 @@ /*PGR-GNU***************************************************************** File: e_report.c -Copyright (c) 2016 pgRouting developers -Mail: project@pgrouting.org - Function's developer: Copyright (c) 2016 Celia Virginia Vergara Castillo Mail: vicky_vergara@hotmail.com @@ -27,50 +24,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ #include "c_common/postgres_connection.h" -#include "c_common/debug_macro.h" #include "c_common/e_report.h" -void -pgr_notice( - char* notice) { - PGR_DBG("Returned notice message = %s", notice); - - if (notice) { - ereport(NOTICE, - (errmsg("%s", notice))); - } -} - -void -pgr_notice2( - char* log, - char* notice) { - PGR_DBG("Returned log message = %s", log); - PGR_DBG("Returned notice message = %s", notice); - - if (log) { - pgr_notice(notice); - return; - } - - if (notice) { - ereport(NOTICE, - (errmsg("%s", notice), - errhint("%s", log))); - } -} - -void -pgr_error(char* err) { - PGR_DBG("Returned error message = %s", err); - - if (err) { - ereport(ERROR, - (errmsg_internal("Unexpected"), - errhint("%s", err))); - } -} - /** * @param[in] err string with an error message * @param[in] hint string with the hint to be used @@ -78,56 +33,67 @@ pgr_error(char* err) { * Generates an ERROR on postgres when err in not null */ void -throw_error(char *err, char *hint) { +pgr_throw_error(char *err, char *hint) { if (err) { ereport(ERROR, (errmsg("%s", err), errhint("%s", hint))); } } - -void -pgr_error2( - char* log, - char* err) { - PGR_DBG("Returned log message = %s", log); - PGR_DBG("Returned error message = %s", err); - - if (err) { - ereport(ERROR, - (errmsg_internal("%s", err), - errhint("%s", log))); - } -} - +/** + * On C++ side, the message to be returned; + * ~~~~{.c} + * std::ostringstream log; + * log << "the message"; + * *log_msg = to_pg_msg(log.str().c_str()); + * ~~~~ + * + * Then on the C side + * ~~~~{.c} + * vrp_global_report(&log_msg, ¬ice_msg, &error_msg); + * ~~~~ + * + * - When there is ERROR then postgreSQL takes over control + * - The char* messages are cleared automaticalyy with pfree. + * - When there is no error this will free the log & notice + */ void pgr_global_report( - char* log, - char* notice, - char* err) { - if (!notice && log) { + char** log, + char** notice, + char** err) { + if (!(*notice) && (*log)) { ereport(DEBUG1, - (errmsg_internal("%s", log))); + (errmsg_internal("%s", *log))); } - if (notice) { + if (*notice) { if (log) { ereport(NOTICE, - (errmsg_internal("%s", notice), - errhint("%s", log))); + (errmsg_internal("%s", *notice), + errhint("%s", *log))); } else { ereport(NOTICE, - (errmsg_internal("%s", notice))); + (errmsg_internal("%s", *notice))); } } - if (err) { - if (log) { + if (*err) { + if (*log) { ereport(ERROR, - (errmsg_internal("%s", err), - errhint("%s", log))); + (errmsg_internal("%s", *err), + errhint("%s", *log))); } else { ereport(ERROR, - (errmsg_internal("%s", err))); + (errmsg_internal("%s", *err))); + } + } else { + if (*log) { + pfree(*log); + *log = NULL; + } + if (*notice) { + pfree(*notice); + *notice = NULL; } } } From 163a7b02b5bbbea272db8e2602f7d4821bff51b7 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 12 Aug 2024 14:40:38 -0600 Subject: [PATCH 314/428] (C/C++) Remove unnecessary pfree --- include/bgraph/graph_to_edges.hpp | 3 ++- src/allpairs/floydWarshall.c | 6 +----- src/allpairs/johnson.c | 7 +------ src/alpha_shape/alphaShape.c | 5 +---- src/astar/astar.c | 6 +----- src/bdAstar/bdAstar.c | 6 +----- src/bdDijkstra/bdDijkstra.c | 6 +----- src/bellman_ford/bellman_ford.c | 6 +----- src/bellman_ford/bellman_ford_neg.c | 6 +----- src/bellman_ford/edwardMoore.c | 6 +----- src/breadthFirstSearch/binaryBreadthFirstSearch.c | 6 +----- src/breadthFirstSearch/breadthFirstSearch.c | 6 +----- src/chinese/chinesePostman.c | 6 +----- src/circuits/hawickCircuits.c | 6 +----- src/coloring/bipartite.c | 5 +---- src/coloring/edgeColoring.c | 6 +----- src/coloring/sequentialVertexColoring.c | 6 +----- src/components/articulationPoints.c | 6 +----- src/components/biconnectedComponents.c | 6 +----- src/components/bridges.c | 6 +----- src/components/connectedComponents.c | 6 +----- src/components/makeConnected.c | 2 +- src/components/strongComponents.c | 6 +----- src/contraction/contractGraph.c | 5 +---- src/dagShortestPath/dagShortestPath.c | 6 +----- src/dijkstra/dijkstra.c | 6 +----- src/dijkstra/dijkstraVia.c | 6 +----- src/dominator/lengauerTarjanDominatorTree.c | 5 +---- .../many_to_dist_driving_distance.c | 6 +----- src/driving_distance/many_to_dist_withPointsDD.c | 12 ++++-------- src/ksp/ksp.c | 6 +----- src/ksp/turnRestrictedPath.c | 6 +----- src/ksp/withPoints_ksp.c | 10 +++------- src/lineGraph/lineGraph.c | 6 +----- src/lineGraph/lineGraphFull.c | 6 +----- src/max_flow/edge_disjoint_paths.c | 5 +---- src/max_flow/max_flow.c | 6 +----- src/max_flow/maximum_cardinality_matching.c | 6 +----- src/max_flow/minCostMaxFlow.c | 6 +----- src/mincut/stoerWagner.c | 6 +----- src/ordering/cuthillMckeeOrdering.c | 6 +----- src/pickDeliver/pickDeliver.c | 6 +----- src/pickDeliver/pickDeliverEuclidean.c | 6 +----- src/planar/boyerMyrvold.c | 6 +----- src/planar/isPlanar.c | 6 +----- src/spanningTree/kruskal.c | 12 ++++-------- src/spanningTree/prim.c | 12 ++++-------- src/spanningTree/randomSpanningTree.c | 7 +------ src/topologicalSort/topologicalSort.c | 5 +---- src/transitiveClosure/transitiveClosure.c | 6 +----- src/traversal/depthFirstSearch.c | 6 +----- src/trsp/new_trsp.c | 5 +---- src/trsp/trsp.c | 2 +- src/trsp/trspVia.c | 6 +----- src/trsp/trspVia_withPoints.c | 13 +++++++------ src/trsp/trsp_withPoints.c | 13 +++++++------ src/tsp/TSP.c | 6 +----- src/tsp/euclideanTSP.c | 6 +----- src/withPoints/withPoints.c | 6 +----- src/withPoints/withPointsVia.c | 6 +----- 60 files changed, 84 insertions(+), 296 deletions(-) diff --git a/include/bgraph/graph_to_edges.hpp b/include/bgraph/graph_to_edges.hpp index 9fa6ad7378..05e805e375 100644 --- a/include/bgraph/graph_to_edges.hpp +++ b/include/bgraph/graph_to_edges.hpp @@ -40,7 +40,8 @@ namespace pgrouting { namespace b_g { /** @brief converts a bg to Edges_t - * @param[in] bg the boost grah + * @param[in] bg the boost graph + * @param[in] add_self_loop flagg to include self loops on the graph * @returns a set of Edges_t that exist on the graph * id, source, target, cost, reverse_cost * source < target diff --git a/src/allpairs/floydWarshall.c b/src/allpairs/floydWarshall.c index 5c2702c254..4d5c98b10a 100644 --- a/src/allpairs/floydWarshall.c +++ b/src/allpairs/floydWarshall.c @@ -68,12 +68,8 @@ process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); pgr_SPI_finish(); } diff --git a/src/allpairs/johnson.c b/src/allpairs/johnson.c index 66c6c9a457..3c4d88990c 100644 --- a/src/allpairs/johnson.c +++ b/src/allpairs/johnson.c @@ -68,12 +68,7 @@ void process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/alpha_shape/alphaShape.c b/src/alpha_shape/alphaShape.c index 2b95e863f7..cf4971ce55 100644 --- a/src/alpha_shape/alphaShape.c +++ b/src/alpha_shape/alphaShape.c @@ -68,11 +68,8 @@ static void process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); pgr_SPI_finish(); } diff --git a/src/astar/astar.c b/src/astar/astar.c index 02832b7033..444a29b754 100644 --- a/src/astar/astar.c +++ b/src/astar/astar.c @@ -91,11 +91,7 @@ process(char* edges_sql, (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/bdAstar/bdAstar.c b/src/bdAstar/bdAstar.c index 407456717a..06f2404c0a 100644 --- a/src/bdAstar/bdAstar.c +++ b/src/bdAstar/bdAstar.c @@ -89,11 +89,7 @@ process(char* edges_sql, (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/bdDijkstra/bdDijkstra.c b/src/bdDijkstra/bdDijkstra.c index 6ab457ab97..ec75c82317 100644 --- a/src/bdDijkstra/bdDijkstra.c +++ b/src/bdDijkstra/bdDijkstra.c @@ -79,11 +79,7 @@ process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/bellman_ford/bellman_ford.c b/src/bellman_ford/bellman_ford.c index 253fb21c6d..a26e0e6303 100644 --- a/src/bellman_ford/bellman_ford.c +++ b/src/bellman_ford/bellman_ford.c @@ -83,11 +83,7 @@ process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/bellman_ford/bellman_ford_neg.c b/src/bellman_ford/bellman_ford_neg.c index e2c8c3f071..103ec18b34 100644 --- a/src/bellman_ford/bellman_ford_neg.c +++ b/src/bellman_ford/bellman_ford_neg.c @@ -84,11 +84,7 @@ process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/bellman_ford/edwardMoore.c b/src/bellman_ford/edwardMoore.c index 88f192d460..7e14b5dd3a 100644 --- a/src/bellman_ford/edwardMoore.c +++ b/src/bellman_ford/edwardMoore.c @@ -80,11 +80,7 @@ process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/breadthFirstSearch/binaryBreadthFirstSearch.c b/src/breadthFirstSearch/binaryBreadthFirstSearch.c index 718c160c1e..423628c0c2 100644 --- a/src/breadthFirstSearch/binaryBreadthFirstSearch.c +++ b/src/breadthFirstSearch/binaryBreadthFirstSearch.c @@ -80,11 +80,7 @@ process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/breadthFirstSearch/breadthFirstSearch.c b/src/breadthFirstSearch/breadthFirstSearch.c index 7f4637f325..7ed6be6731 100644 --- a/src/breadthFirstSearch/breadthFirstSearch.c +++ b/src/breadthFirstSearch/breadthFirstSearch.c @@ -79,11 +79,7 @@ process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/chinese/chinesePostman.c b/src/chinese/chinesePostman.c index 52509a3066..4f14167ed5 100644 --- a/src/chinese/chinesePostman.c +++ b/src/chinese/chinesePostman.c @@ -79,11 +79,7 @@ process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/circuits/hawickCircuits.c b/src/circuits/hawickCircuits.c index 68228499a1..fd639bba89 100644 --- a/src/circuits/hawickCircuits.c +++ b/src/circuits/hawickCircuits.c @@ -69,11 +69,7 @@ process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/coloring/bipartite.c b/src/coloring/bipartite.c index 97eda52d49..610ed45c1a 100644 --- a/src/coloring/bipartite.c +++ b/src/coloring/bipartite.c @@ -70,11 +70,8 @@ process(char* edges_sql, (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); pgr_SPI_finish(); } diff --git a/src/coloring/edgeColoring.c b/src/coloring/edgeColoring.c index 662e08a549..4020600e86 100644 --- a/src/coloring/edgeColoring.c +++ b/src/coloring/edgeColoring.c @@ -78,11 +78,7 @@ process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/coloring/sequentialVertexColoring.c b/src/coloring/sequentialVertexColoring.c index 497e411636..72e5c0427b 100644 --- a/src/coloring/sequentialVertexColoring.c +++ b/src/coloring/sequentialVertexColoring.c @@ -78,11 +78,7 @@ process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/components/articulationPoints.c b/src/components/articulationPoints.c index 78e671c6b8..8cdb4b163b 100644 --- a/src/components/articulationPoints.c +++ b/src/components/articulationPoints.c @@ -73,11 +73,7 @@ process( if (*result_tuples) pfree(*result_tuples); (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/components/biconnectedComponents.c b/src/components/biconnectedComponents.c index b4ae000d96..3299a5fd52 100644 --- a/src/components/biconnectedComponents.c +++ b/src/components/biconnectedComponents.c @@ -75,11 +75,7 @@ process( if (*result_tuples) pfree(*result_tuples); (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/components/bridges.c b/src/components/bridges.c index 8e4f8702aa..8a508a3d4c 100644 --- a/src/components/bridges.c +++ b/src/components/bridges.c @@ -73,11 +73,7 @@ process( if (*result_tuples) pfree(*result_tuples); (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/components/connectedComponents.c b/src/components/connectedComponents.c index 545dd9b9aa..2fff2f10c5 100644 --- a/src/components/connectedComponents.c +++ b/src/components/connectedComponents.c @@ -75,11 +75,7 @@ process( if (*result_tuples) pfree(*result_tuples); (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/components/makeConnected.c b/src/components/makeConnected.c index def4ef0b3f..fe81659d1d 100644 --- a/src/components/makeConnected.c +++ b/src/components/makeConnected.c @@ -72,7 +72,7 @@ process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); if (log_msg) pfree(log_msg); if (notice_msg) pfree(notice_msg); diff --git a/src/components/strongComponents.c b/src/components/strongComponents.c index 7731d818dc..bd5721db0f 100644 --- a/src/components/strongComponents.c +++ b/src/components/strongComponents.c @@ -75,11 +75,7 @@ process( if (*result_tuples) pfree(*result_tuples); (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/contraction/contractGraph.c b/src/contraction/contractGraph.c index 551645c89b..37e3c4c523 100644 --- a/src/contraction/contractGraph.c +++ b/src/contraction/contractGraph.c @@ -86,11 +86,8 @@ process(char* edges_sql, (*result_tuples) = NULL; (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); pgr_SPI_finish(); } diff --git a/src/dagShortestPath/dagShortestPath.c b/src/dagShortestPath/dagShortestPath.c index 1741b7982b..8e50d3fe1e 100644 --- a/src/dagShortestPath/dagShortestPath.c +++ b/src/dagShortestPath/dagShortestPath.c @@ -77,11 +77,7 @@ process( if (err_msg) { if (*result_tuples) pfree(*result_tuples); } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/dijkstra/dijkstra.c b/src/dijkstra/dijkstra.c index 18581520db..2dc6c82993 100644 --- a/src/dijkstra/dijkstra.c +++ b/src/dijkstra/dijkstra.c @@ -107,11 +107,7 @@ process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/dijkstra/dijkstraVia.c b/src/dijkstra/dijkstraVia.c index b3b48b47d8..149e766b49 100644 --- a/src/dijkstra/dijkstraVia.c +++ b/src/dijkstra/dijkstraVia.c @@ -73,11 +73,7 @@ process(char* edges_sql, (*result_tuples) = NULL; (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/dominator/lengauerTarjanDominatorTree.c b/src/dominator/lengauerTarjanDominatorTree.c index dac79235e9..6eea54f441 100644 --- a/src/dominator/lengauerTarjanDominatorTree.c +++ b/src/dominator/lengauerTarjanDominatorTree.c @@ -72,11 +72,8 @@ process(char* edges_sql, (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); pgr_SPI_finish(); } diff --git a/src/driving_distance/many_to_dist_driving_distance.c b/src/driving_distance/many_to_dist_driving_distance.c index 8beb92f479..3fa5a97001 100644 --- a/src/driving_distance/many_to_dist_driving_distance.c +++ b/src/driving_distance/many_to_dist_driving_distance.c @@ -79,11 +79,7 @@ void process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/driving_distance/many_to_dist_withPointsDD.c b/src/driving_distance/many_to_dist_withPointsDD.c index 80db9db19b..8071d29b82 100644 --- a/src/driving_distance/many_to_dist_withPointsDD.c +++ b/src/driving_distance/many_to_dist_withPointsDD.c @@ -59,13 +59,13 @@ process( char d_side = estimate_drivingSide(driving_side[0]); if (is_new) { if (d_side == ' ') { - throw_error("Invalid value of 'driving side'", "Valid value are 'r', 'l', 'b'"); + pgr_throw_error("Invalid value of 'driving side'", "Valid value are 'r', 'l', 'b'"); return; } else if (directed && !(d_side == 'r' || d_side == 'l')) { - throw_error("Invalid value of 'driving side'", "Valid values are for directed graph are: 'r', 'l'"); + pgr_throw_error("Invalid value of 'driving side'", "Valid values are for directed graph are: 'r', 'l'"); return; } else if (!directed && !(d_side == 'b')) { - throw_error("Invalid value of 'driving side'", "Valid values are for undirected graph is: 'b'"); + pgr_throw_error("Invalid value of 'driving side'", "Valid values are for undirected graph is: 'b'"); return; } } else { @@ -112,11 +112,7 @@ process( (*result_tuples) = NULL; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/ksp/ksp.c b/src/ksp/ksp.c index 6420d9b985..100b6708a2 100644 --- a/src/ksp/ksp.c +++ b/src/ksp/ksp.c @@ -90,11 +90,7 @@ process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/ksp/turnRestrictedPath.c b/src/ksp/turnRestrictedPath.c index d3bf8e07c8..34eb7eb90e 100644 --- a/src/ksp/turnRestrictedPath.c +++ b/src/ksp/turnRestrictedPath.c @@ -104,11 +104,7 @@ process( if (err_msg) { if (*path) pfree(*path); } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) {pfree(log_msg); log_msg = NULL;} - if (notice_msg) {pfree(notice_msg); notice_msg = NULL;} - if (err_msg) {pfree(err_msg); err_msg = NULL;} + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/ksp/withPoints_ksp.c b/src/ksp/withPoints_ksp.c index fefa03b56b..0632ef6854 100644 --- a/src/ksp/withPoints_ksp.c +++ b/src/ksp/withPoints_ksp.c @@ -80,11 +80,11 @@ process( driving_side[0] = (char) tolower(driving_side[0]); if (directed) { if (!((driving_side[0] == 'r') || (driving_side[0] == 'l'))) { - throw_error("Invalid value of 'driving side'", "Valid values are for directed graph are: 'r', 'l'"); + pgr_throw_error("Invalid value of 'driving side'", "Valid values are for directed graph are: 'r', 'l'"); return; } } else if (!(driving_side[0] == 'b')) { - throw_error("Invalid value of 'driving side'", "Valid values are for undirected graph is: 'b'"); + pgr_throw_error("Invalid value of 'driving side'", "Valid values are for undirected graph is: 'b'"); return; } } @@ -134,11 +134,7 @@ process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/lineGraph/lineGraph.c b/src/lineGraph/lineGraph.c index addc3e640d..cac946a544 100644 --- a/src/lineGraph/lineGraph.c +++ b/src/lineGraph/lineGraph.c @@ -73,11 +73,7 @@ process( if (err_msg) { if (*result_tuples) pfree(*result_tuples); } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/lineGraph/lineGraphFull.c b/src/lineGraph/lineGraphFull.c index d677d490ad..1d273d0344 100644 --- a/src/lineGraph/lineGraphFull.c +++ b/src/lineGraph/lineGraphFull.c @@ -68,11 +68,7 @@ process( if (*result_tuples) pfree(*result_tuples); } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/max_flow/edge_disjoint_paths.c b/src/max_flow/edge_disjoint_paths.c index cab17488b8..33051f2c4d 100644 --- a/src/max_flow/edge_disjoint_paths.c +++ b/src/max_flow/edge_disjoint_paths.c @@ -76,11 +76,8 @@ process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); pgr_SPI_finish(); } diff --git a/src/max_flow/max_flow.c b/src/max_flow/max_flow.c index 50387d44ae..a59188ab32 100644 --- a/src/max_flow/max_flow.c +++ b/src/max_flow/max_flow.c @@ -92,11 +92,7 @@ process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/max_flow/maximum_cardinality_matching.c b/src/max_flow/maximum_cardinality_matching.c index ee63ff8f11..848194497e 100644 --- a/src/max_flow/maximum_cardinality_matching.c +++ b/src/max_flow/maximum_cardinality_matching.c @@ -73,11 +73,7 @@ process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/max_flow/minCostMaxFlow.c b/src/max_flow/minCostMaxFlow.c index f1301dc36f..8ef46153c9 100644 --- a/src/max_flow/minCostMaxFlow.c +++ b/src/max_flow/minCostMaxFlow.c @@ -81,11 +81,7 @@ process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/mincut/stoerWagner.c b/src/mincut/stoerWagner.c index d6352eb5b9..9601789821 100644 --- a/src/mincut/stoerWagner.c +++ b/src/mincut/stoerWagner.c @@ -71,11 +71,7 @@ process( if (err_msg) { if (*result_tuples) pfree(*result_tuples); } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/ordering/cuthillMckeeOrdering.c b/src/ordering/cuthillMckeeOrdering.c index 2e04ffb407..6ac06bcdaa 100644 --- a/src/ordering/cuthillMckeeOrdering.c +++ b/src/ordering/cuthillMckeeOrdering.c @@ -72,11 +72,7 @@ process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/pickDeliver/pickDeliver.c b/src/pickDeliver/pickDeliver.c index d050a8e8a2..9da28534f7 100644 --- a/src/pickDeliver/pickDeliver.c +++ b/src/pickDeliver/pickDeliver.c @@ -108,11 +108,7 @@ process( (*result_tuples) = NULL; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/pickDeliver/pickDeliverEuclidean.c b/src/pickDeliver/pickDeliverEuclidean.c index a807078233..f1e41c5b7a 100644 --- a/src/pickDeliver/pickDeliverEuclidean.c +++ b/src/pickDeliver/pickDeliverEuclidean.c @@ -108,11 +108,7 @@ process( (*result_tuples) = NULL; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/planar/boyerMyrvold.c b/src/planar/boyerMyrvold.c index 10d7ffbd7b..30533b0ef0 100644 --- a/src/planar/boyerMyrvold.c +++ b/src/planar/boyerMyrvold.c @@ -70,11 +70,7 @@ process( pfree(*result_tuples); } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/planar/isPlanar.c b/src/planar/isPlanar.c index 64395f85c4..d8ebad7b9f 100644 --- a/src/planar/isPlanar.c +++ b/src/planar/isPlanar.c @@ -58,11 +58,7 @@ process( &err_msg); time_msg(" processing pgr_isPlanar", start_t, clock()); - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); diff --git a/src/spanningTree/kruskal.c b/src/spanningTree/kruskal.c index f58513f13d..7e0d11c888 100644 --- a/src/spanningTree/kruskal.c +++ b/src/spanningTree/kruskal.c @@ -64,15 +64,15 @@ process( char * fn_name = get_name(0, fn_suffix, &err_msg); if (err_msg) { - pgr_global_report(log_msg, notice_msg, err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); return; } /* checks previously done on sql now done here */ if (strcmp(fn_suffix, "DD") == 0 && distance < 0) { - throw_error("Negative value found on 'distance'", "Must be positive"); + pgr_throw_error("Negative value found on 'distance'", "Must be positive"); } else if ((strcmp(fn_suffix, "BFS") == 0 || strcmp(fn_suffix, "DFS") == 0) && max_depth < 0) { - throw_error("Negative value found on 'max_depth'", "Must be positive"); + pgr_throw_error("Negative value found on 'max_depth'", "Must be positive"); } clock_t start_t = clock(); @@ -93,11 +93,7 @@ process( if (err_msg) { if (*result_tuples) pfree(*result_tuples); } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/spanningTree/prim.c b/src/spanningTree/prim.c index 1c43bfd103..93071398f3 100644 --- a/src/spanningTree/prim.c +++ b/src/spanningTree/prim.c @@ -59,14 +59,14 @@ process( char * fn_name = get_name(1, fn_suffix, &err_msg); if (err_msg) { - pgr_global_report(log_msg, notice_msg, err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); return; } if (strcmp(fn_suffix, "DD") == 0 && distance < 0) { - throw_error("Negative value found on 'distance'", "Must be positive"); + pgr_throw_error("Negative value found on 'distance'", "Must be positive"); } else if ((strcmp(fn_suffix, "BFS") == 0 || strcmp(fn_suffix, "DFS") == 0) && max_depth < 0) { - throw_error("Negative value found on 'max_depth'", "Must be positive"); + pgr_throw_error("Negative value found on 'max_depth'", "Must be positive"); } clock_t start_t = clock(); @@ -91,11 +91,7 @@ process( if (err_msg) { if (*result_tuples) pfree(*result_tuples); } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/spanningTree/randomSpanningTree.c b/src/spanningTree/randomSpanningTree.c index 75e9315ea5..6fadbff0c2 100644 --- a/src/spanningTree/randomSpanningTree.c +++ b/src/spanningTree/randomSpanningTree.c @@ -73,12 +73,7 @@ process( if (err_msg) { if (*result_tuples) pfree(*result_tuples); } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); - if (roots) pfree(roots); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/topologicalSort/topologicalSort.c b/src/topologicalSort/topologicalSort.c index a53455e3ed..548db8de3d 100644 --- a/src/topologicalSort/topologicalSort.c +++ b/src/topologicalSort/topologicalSort.c @@ -68,11 +68,8 @@ process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); pgr_SPI_finish(); } diff --git a/src/transitiveClosure/transitiveClosure.c b/src/transitiveClosure/transitiveClosure.c index 2b8a1e09e1..246ae2b74a 100644 --- a/src/transitiveClosure/transitiveClosure.c +++ b/src/transitiveClosure/transitiveClosure.c @@ -75,11 +75,7 @@ process(char* edges_sql, (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/traversal/depthFirstSearch.c b/src/traversal/depthFirstSearch.c index b6aaf46522..e3d70f4f21 100644 --- a/src/traversal/depthFirstSearch.c +++ b/src/traversal/depthFirstSearch.c @@ -77,11 +77,7 @@ process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/trsp/new_trsp.c b/src/trsp/new_trsp.c index 684c95d2b0..fe7a6cd3bc 100644 --- a/src/trsp/new_trsp.c +++ b/src/trsp/new_trsp.c @@ -83,10 +83,7 @@ void process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - if (log_msg) {pfree(log_msg); log_msg=NULL;} - if (notice_msg) {pfree(notice_msg); notice_msg=NULL;} - if (err_msg) {pfree(err_msg); err_msg=NULL;} + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/trsp/trsp.c b/src/trsp/trsp.c index 0404ca265b..3092d2fce5 100644 --- a/src/trsp/trsp.c +++ b/src/trsp/trsp.c @@ -152,7 +152,7 @@ static int compute_trsp( Edge_t *edges = NULL; size_t total_tuples = 0; pgr_get_edges(edges_sql, &edges, &total_tuples, true, false, &err_msg); - throw_error(err_msg, edges_sql); + pgr_throw_error(err_msg, edges_sql); // defining min and max vertex id int64_t v_max_id = 0; diff --git a/src/trsp/trspVia.c b/src/trsp/trspVia.c index a61d3cda5f..c451474565 100644 --- a/src/trsp/trspVia.c +++ b/src/trsp/trspVia.c @@ -73,11 +73,7 @@ process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) {pfree(log_msg); log_msg = NULL;} - if (notice_msg) {pfree(notice_msg); notice_msg = NULL;} - if (err_msg) {pfree(err_msg); err_msg = NULL;} + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/trsp/trspVia_withPoints.c b/src/trsp/trspVia_withPoints.c index f9eaf43c9a..f73b97a781 100644 --- a/src/trsp/trspVia_withPoints.c +++ b/src/trsp/trspVia_withPoints.c @@ -98,13 +98,14 @@ process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); - if (log_msg) {pfree(log_msg); log_msg = NULL;} - if (notice_msg) {pfree(notice_msg); notice_msg = NULL;} - if (err_msg) {pfree(err_msg); err_msg = NULL;} - if (edges_of_points_query) {pfree(edges_of_points_query); edges_of_points_query = NULL;} - if (edges_no_points_query) {pfree(edges_no_points_query); edges_no_points_query = NULL;} + if (edges_of_points_query) { + pfree(edges_of_points_query); edges_of_points_query = NULL; + } + if (edges_no_points_query) { + pfree(edges_no_points_query); edges_no_points_query = NULL; + } pgr_SPI_finish(); } diff --git a/src/trsp/trsp_withPoints.c b/src/trsp/trsp_withPoints.c index efa06c258f..5f0f04cee5 100644 --- a/src/trsp/trsp_withPoints.c +++ b/src/trsp/trsp_withPoints.c @@ -107,13 +107,14 @@ process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); - if (edges_of_points_query) {pfree(edges_of_points_query); edges_of_points_query = NULL;} - if (edges_no_points_query) {pfree(edges_no_points_query); edges_no_points_query = NULL;} + if (edges_of_points_query) { + pfree(edges_of_points_query); edges_of_points_query = NULL; + } + if (edges_no_points_query) { + pfree(edges_no_points_query); edges_no_points_query = NULL; + } pgr_SPI_finish(); } diff --git a/src/tsp/TSP.c b/src/tsp/TSP.c index 8ef89f901c..b795116419 100644 --- a/src/tsp/TSP.c +++ b/src/tsp/TSP.c @@ -77,11 +77,7 @@ process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/tsp/euclideanTSP.c b/src/tsp/euclideanTSP.c index e7e090b692..c0274e4e12 100644 --- a/src/tsp/euclideanTSP.c +++ b/src/tsp/euclideanTSP.c @@ -77,11 +77,7 @@ process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/withPoints/withPoints.c b/src/withPoints/withPoints.c index d60eb59a5a..4325e8ce30 100644 --- a/src/withPoints/withPoints.c +++ b/src/withPoints/withPoints.c @@ -105,11 +105,7 @@ process( (*result_tuples) = NULL; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) pfree(log_msg); - if (notice_msg) pfree(notice_msg); - if (err_msg) pfree(err_msg); + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } diff --git a/src/withPoints/withPointsVia.c b/src/withPoints/withPointsVia.c index e227db7d22..fa4cdef207 100644 --- a/src/withPoints/withPointsVia.c +++ b/src/withPoints/withPointsVia.c @@ -87,11 +87,7 @@ process( (*result_count) = 0; } - pgr_global_report(log_msg, notice_msg, err_msg); - - if (log_msg) {pfree(log_msg); log_msg = NULL;} - if (notice_msg) {pfree(notice_msg); notice_msg = NULL;} - if (err_msg) {pfree(err_msg); err_msg = NULL;} + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); pgr_SPI_finish(); } From 5e02f265104147994a6ef07e042e8b117f7124f6 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 12 Aug 2024 14:43:43 -0600 Subject: [PATCH 315/428] (lint) Fix additional lint errors --- src/cpp_common/combinations.cpp | 4 +++- src/trsp/trspVia_driver.cpp | 4 +++- src/trsp/trspVia_withPoints_driver.cpp | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/cpp_common/combinations.cpp b/src/cpp_common/combinations.cpp index 41908adf4d..739685c449 100644 --- a/src/cpp_common/combinations.cpp +++ b/src/cpp_common/combinations.cpp @@ -95,7 +95,9 @@ get_combinations( */ bool rule_breaker = true; for (const auto &e : r.precedences()) { - if (*ptr != e) {rule_breaker = false; break;} + if (*ptr != e) { + rule_breaker = false; break; + } ++ptr; } if (rule_breaker) { diff --git a/src/trsp/trspVia_driver.cpp b/src/trsp/trspVia_driver.cpp index 8f9043e655..6fb22cf54a 100644 --- a/src/trsp/trspVia_driver.cpp +++ b/src/trsp/trspVia_driver.cpp @@ -59,7 +59,9 @@ post_process_trspvia(std::deque &paths, std::vector vi auto u = via.front(); bool skip = true; for (const auto &v : via) { - if (skip) {skip = false; continue;} + if (skip) { + skip = false; continue; + } /* * look for the path (u,v) */ diff --git a/src/trsp/trspVia_withPoints_driver.cpp b/src/trsp/trspVia_withPoints_driver.cpp index 1dd7b70240..a6811c832e 100644 --- a/src/trsp/trspVia_withPoints_driver.cpp +++ b/src/trsp/trspVia_withPoints_driver.cpp @@ -57,7 +57,9 @@ post_process_trspvia(std::deque &paths, std::vector vi auto u = via.front(); bool skip = true; for (const auto &v : via) { - if (skip) {skip = false; continue;} + if (skip) { + skip = false; continue; + } /* * look for the path (u,v) */ From bda02b73a41bb188636c2a02dba3d285e4481de9 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 12 Aug 2024 14:46:09 -0600 Subject: [PATCH 316/428] (lint) Fix additional lint errors --- include/c_common/debug_macro.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/c_common/debug_macro.h b/include/c_common/debug_macro.h index e802479d03..b8f9be1d17 100644 --- a/include/c_common/debug_macro.h +++ b/include/c_common/debug_macro.h @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define PGR_DBG(...) \ elog(DEBUG3, __VA_ARGS__) #else -#define PGR_DBG(...) do { ; } while (0) +#define PGR_DBG(...) do { ; } while (0) // NOLINT [whitespace/newline] #endif #endif // INCLUDE_C_COMMON_DEBUG_MACRO_H_ From 0fb07bea8a0b17ad7a28234b27a82f00e9edeea8 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 12 Aug 2024 14:56:41 -0600 Subject: [PATCH 317/428] (CI) Adding workflow_dispatch where missing --- .github/workflows/boost_version.yml | 1 + .github/workflows/check-queries.yml | 1 + .github/workflows/clang.yml | 1 + .github/workflows/tidy-check.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/.github/workflows/boost_version.yml b/.github/workflows/boost_version.yml index 412c7ab92c..f1d2b748c9 100644 --- a/.github/workflows/boost_version.yml +++ b/.github/workflows/boost_version.yml @@ -27,6 +27,7 @@ name: Boost supported versions # - 1.56 is the minimum version we ask (Aug 2014) on: + workflow_dispatch: push: paths: - '.github/workflows/boost_version.yml' diff --git a/.github/workflows/check-queries.yml b/.github/workflows/check-queries.yml index 8186607dba..efb1be5722 100644 --- a/.github/workflows/check-queries.yml +++ b/.github/workflows/check-queries.yml @@ -12,6 +12,7 @@ name: Check queries # - the latest postgis version on: + workflow_dispatch: push: paths: - '.github/workflows/check-queries.yml' diff --git a/.github/workflows/clang.yml b/.github/workflows/clang.yml index bd3a3611b1..0e6a194d6d 100644 --- a/.github/workflows/clang.yml +++ b/.github/workflows/clang.yml @@ -11,6 +11,7 @@ name: Build for Ubuntu with clang # - postgis 3 on: + workflow_dispatch: push: paths: - '.github/workflows/clang.yml' diff --git a/.github/workflows/tidy-check.yml b/.github/workflows/tidy-check.yml index 0a1f9318a8..58f29867c3 100644 --- a/.github/workflows/tidy-check.yml +++ b/.github/workflows/tidy-check.yml @@ -1,6 +1,7 @@ name: clang-tidy check on: + workflow_dispatch: pull_request: branches-ignore: - 'gh-pages' From 0a3b9890e28d65a43ad9a93b5461f514045ce4ca Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 12 Aug 2024 15:07:58 -0600 Subject: [PATCH 318/428] (lint) Removing trailing spaces --- .../lineGraphFull/edge_cases/original_vertex_mapping.pg | 2 +- pgtap/traversal/breadthFirstSearch/edge_cases.pg | 8 ++++---- sql/legacy/tsp/_makeDistanceMatrix.sql | 2 +- sql/legacy/tsp/tsp_v2.0_coordinates.sql | 2 +- sql/legacy/tsp/tsp_v2.0_matrix.sql | 2 +- sql/spanningTree/CMakeLists.txt | 2 +- src/breadthFirstSearch/CMakeLists.txt | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pgtap/lineGraph/lineGraphFull/edge_cases/original_vertex_mapping.pg b/pgtap/lineGraph/lineGraphFull/edge_cases/original_vertex_mapping.pg index 47aaf55cdd..7fe00588a6 100644 --- a/pgtap/lineGraph/lineGraphFull/edge_cases/original_vertex_mapping.pg +++ b/pgtap/lineGraph/lineGraphFull/edge_cases/original_vertex_mapping.pg @@ -79,7 +79,7 @@ BEGIN b AS (SELECT source,edge FROM result2 WHERE source IN (SELECT id FROM a)), c AS (SELECT id,source FROM edges WHERE id IN (SELECT edge FROM b)) UPDATE result2_vertices_pgr AS d SET original_id = (SELECT source FROM c WHERE c.id = (SELECT edge FROM b WHERE b.source = d.id)) WHERE id IN (SELECT id FROM a); - + WITH a AS (SELECT id FROM result2_vertices_pgr WHERE original_id IS NULL), b AS (SELECT target,edge FROM result2 WHERE target IN (SELECT id FROM a)), c AS (SELECT id,target FROM edges WHERE id IN (SELECT edge FROM b)) diff --git a/pgtap/traversal/breadthFirstSearch/edge_cases.pg b/pgtap/traversal/breadthFirstSearch/edge_cases.pg index d34fc7da85..6add18c252 100644 --- a/pgtap/traversal/breadthFirstSearch/edge_cases.pg +++ b/pgtap/traversal/breadthFirstSearch/edge_cases.pg @@ -55,7 +55,7 @@ SELECT is_empty(' SELECT * from pgr_breadthFirstSearch(''SELECT id, source, target, cost, reverse_cost from edges where id>18 '',array[2,5], 2, directed := false)', '13'); --- vertex not present in graph tests +-- vertex not present in graph tests -- directed graph SELECT is_empty(' @@ -85,7 +85,7 @@ SELECT * from pgr_breadthFirstSearch(''SELECT id, source, target, cost, reverse_ SELECT is_empty(' SELECT * from pgr_breadthFirstSearch(''SELECT id, source, target, cost, reverse_cost from edges'',array[20,-10], 2, directed := false)', '25'); --- negative depth tests +-- negative depth tests PREPARE breadthFirstSearch26 AS SELECT * @@ -141,8 +141,8 @@ FROM pgr_breadthFirstSearch( SELECT throws_ok('breadthFirstSearch29', 'P0001', 'Negative value found on ''max_depth''', - '29: Negative max_depth throws'); + '29: Negative max_depth throws'); SELECT * FROM finish(); -ROLLBACK; +ROLLBACK; diff --git a/sql/legacy/tsp/_makeDistanceMatrix.sql b/sql/legacy/tsp/_makeDistanceMatrix.sql index e810b18294..07da120eb9 100644 --- a/sql/legacy/tsp/_makeDistanceMatrix.sql +++ b/sql/legacy/tsp/_makeDistanceMatrix.sql @@ -39,7 +39,7 @@ THE SOFTWARE. create or replace function _pgr_makeDistanceMatrix - (sqlin text, + (sqlin text, OUT dmatrix double precision[], OUT ids integer[]) diff --git a/sql/legacy/tsp/tsp_v2.0_coordinates.sql b/sql/legacy/tsp/tsp_v2.0_coordinates.sql index 35ff0a8cf9..7e2837746f 100644 --- a/sql/legacy/tsp/tsp_v2.0_coordinates.sql +++ b/sql/legacy/tsp/tsp_v2.0_coordinates.sql @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. CREATE OR REPLACE FUNCTION pgr_tsp( - sql text, + sql text, start_id INTEGER, end_id INTEGER default (-1), diff --git a/sql/legacy/tsp/tsp_v2.0_matrix.sql b/sql/legacy/tsp/tsp_v2.0_matrix.sql index c11ded449d..b24d988a4c 100644 --- a/sql/legacy/tsp/tsp_v2.0_matrix.sql +++ b/sql/legacy/tsp/tsp_v2.0_matrix.sql @@ -83,7 +83,7 @@ debuglevel TEXT; BEGIN RAISE NOTICE 'Deprecated Signature pgr_tsp(float8[][], integer, integer)'; - CREATE TEMP TABLE ___tmp2 ON COMMIT DROP AS + CREATE TEMP TABLE ___tmp2 ON COMMIT DROP AS SELECT start_vid, end_vid, agg_cost FROM _pgr_unnest_matrix( matrix ); diff --git a/sql/spanningTree/CMakeLists.txt b/sql/spanningTree/CMakeLists.txt index b695a503d4..671894c80e 100644 --- a/sql/spanningTree/CMakeLists.txt +++ b/sql/spanningTree/CMakeLists.txt @@ -3,7 +3,7 @@ SET(LOCAL_FILES _prim.sql _kruskal.sql #_randomSpanTree.sql - + prim.sql primDFS.sql primBFS.sql diff --git a/src/breadthFirstSearch/CMakeLists.txt b/src/breadthFirstSearch/CMakeLists.txt index 0a86985f74..f7c64f8234 100644 --- a/src/breadthFirstSearch/CMakeLists.txt +++ b/src/breadthFirstSearch/CMakeLists.txt @@ -2,5 +2,5 @@ ADD_LIBRARY(breadthFirstSearch OBJECT breadthFirstSearch.c breadthFirstSearch_driver.cpp binaryBreadthFirstSearch.c - binaryBreadthFirstSearch_driver.cpp + binaryBreadthFirstSearch_driver.cpp ) From 95d26cf8ede47041648adde8e5c6ee31ad75f900 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 12 Aug 2024 17:12:27 -0600 Subject: [PATCH 319/428] (lineGraph/pgtap) fix for update test --- pgtap/lineGraph/lineGraph/edge_cases/edge_cases.pg | 11 +++++++---- pgtap/lineGraph/lineGraph/edge_cases/mathw_1.pg | 3 ++- pgtap/lineGraph/lineGraph/edge_cases/mathw_2.pg | 6 ++++-- pgtap/lineGraph/lineGraph/edge_cases/wiki_1.pg | 3 ++- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/pgtap/lineGraph/lineGraph/edge_cases/edge_cases.pg b/pgtap/lineGraph/lineGraph/edge_cases/edge_cases.pg index f373240800..81a9e332c6 100644 --- a/pgtap/lineGraph/lineGraph/edge_cases/edge_cases.pg +++ b/pgtap/lineGraph/lineGraph/edge_cases/edge_cases.pg @@ -38,10 +38,12 @@ SELECT is_empty($$ SELECT lives_ok($$ SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id = 17') $$, '11-lives: one bi-edge directed'); -SELECT set_eq($$ +SELECT CASE WHEN min_version('3.7.0') THEN set_eq($$ SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id = 17') $$, $$VALUES (1,17,17,1,1)$$, - '12-non empty: one bi-edge directed'); + '12-non empty: one bi-edge directed') + ELSE skip(1, 'pgr_lineGraph was fixed on 3.7.0') END; + SELECT lives_ok($$ SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id = 17', false) $$, '13-lives: one bi-edge undirected'); @@ -71,11 +73,12 @@ SELECT lives_ok($$ SELECT isnt_empty($$ SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id IN (6,7)') $$, '5-not_empty: two bi-edge directed'); -SELECT set_eq($$ +SELECT CASE WHEN min_version('3.7.0') THEN set_eq($$ SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id IN (6,7)') $$, $$VALUES (1,6,6,1,1),(2,6,7,1,1),(3,7,7,1,1)$$, - '5-set_eq: two bi-edge directed'); + '5-set_eq: two bi-edge directed') + ELSE skip(1, 'pgr_lineGraph was fixed on 3.7.0') END; SELECT lives_ok($$ SELECT * FROM pgr_lineGraph('SELECT id, source, target, cost, reverse_cost FROM edges WHERE id IN (6,7)', false) diff --git a/pgtap/lineGraph/lineGraph/edge_cases/mathw_1.pg b/pgtap/lineGraph/lineGraph/edge_cases/mathw_1.pg index 3cbabc000c..b12d827534 100644 --- a/pgtap/lineGraph/lineGraph/edge_cases/mathw_1.pg +++ b/pgtap/lineGraph/lineGraph/edge_cases/mathw_1.pg @@ -60,7 +60,8 @@ FROM (VALUES (8, 304, 204, 1, -1)) AS t(id, source, target, cost, reverse_cost); -SELECT set_eq('mathw_lg_1', 'expected_mathw_lg_1'); +SELECT CASE WHEN min_version('3.7.0') THEN set_eq('mathw_lg_1', 'expected_mathw_lg_1', 'Expected Results') +ELSE skip(1, 'pgr_lineGraph was fixed on 3.7.0') END; SELECT finish(); ROLLBACK; diff --git a/pgtap/lineGraph/lineGraph/edge_cases/mathw_2.pg b/pgtap/lineGraph/lineGraph/edge_cases/mathw_2.pg index 70c0f26ecf..f21dbdbd7d 100644 --- a/pgtap/lineGraph/lineGraph/edge_cases/mathw_2.pg +++ b/pgtap/lineGraph/lineGraph/edge_cases/mathw_2.pg @@ -62,7 +62,8 @@ FROM (VALUES (9, 304, 304, 1, 1)) AS t(id, source, target, cost, reverse_cost); -SELECT set_eq('mathw_lg_2', 'expected_mathw_lg_2'); +SELECT CASE WHEN min_version('3.7.0') THEN set_eq('mathw_lg_2', 'expected_mathw_lg_2', 'Expected Results') +ELSE skip(1, 'pgr_lineGraph was fixed on 3.7.0') END; /* same example with expanded edges */ CREATE TABLE mathw_3 ( @@ -109,7 +110,8 @@ FROM (VALUES (10, 403, 302, 1, -1)) AS t(id, source, target, cost, reverse_cost); -SELECT set_eq('mathw_lg_3', 'expected_mathw_lg_3'); +SELECT CASE WHEN min_version('3.7.0') THEN set_eq('mathw_lg_3', 'expected_mathw_lg_3', 'Expected Results') +ELSE skip(1, 'pgr_lineGraph was fixed on 3.7.0') END; SELECT finish(); ROLLBACK; diff --git a/pgtap/lineGraph/lineGraph/edge_cases/wiki_1.pg b/pgtap/lineGraph/lineGraph/edge_cases/wiki_1.pg index 853afb275a..eebaaf95b0 100644 --- a/pgtap/lineGraph/lineGraph/edge_cases/wiki_1.pg +++ b/pgtap/lineGraph/lineGraph/edge_cases/wiki_1.pg @@ -62,7 +62,8 @@ FROM (VALUES (9, 405, 304, 1, -1)) AS t(id, source, target, cost, reverse_cost); -SELECT set_eq('wiki_lg_1', 'expected_wiki_lg_1'); +SELECT CASE WHEN min_version('3.7.0') THEN set_eq('wiki_lg_1', 'expected_wiki_lg_1', 'Expected Results') +ELSE skip(1, 'pgr_lineGraph was fixed on 3.7.0') END; SELECT finish(); ROLLBACK; From eabdbd13db8da5a523f654ad9f3bc5d6e2772cda Mon Sep 17 00:00:00 2001 From: bedupako12mas <141558656+bedupako12mas@users.noreply.github.com> Date: Mon, 26 Aug 2024 16:49:30 +0530 Subject: [PATCH 320/428] New function pgr betweenness centrality (#2647) * (betweennessCentrality) pgtap that need to be passed * (betweennessCentrality) adding sql functions * (betweennessCentrality) adding C/C++ code * (betweennessCentrality) adding documentation as exprimental * (betweennessCentrality) adding examples for the documentation * (betweennessCentrality) adding to the build * (betweennessCentrality) updating changes --- NEWS.md | 6 + configuration.conf | 1 + doc/metrics/CMakeLists.txt | 12 + doc/metrics/metrics-family.rst | 41 +++ doc/metrics/pgr_betweennessCentrality.rst | 148 +++++++++ doc/src/experimental.rst | 7 + doc/src/release_notes.rst | 6 + docqueries/metrics/CMakeLists.txt | 11 + docqueries/metrics/betweennessCentrality.pg | 9 + .../metrics/betweennessCentrality.result | 21 ++ docqueries/metrics/test.conf | 12 + .../metrics/betweennessCentrality_driver.h | 64 ++++ include/metrics/betweennessCentrality.hpp | 144 +++++++++ .../betweennessCentrality/edge_cases.pg | 282 ++++++++++++++++++ .../betweennessCentrality/inner_query.pg | 46 +++ .../betweennessCentrality/no_crash_test.pg | 72 +++++ .../betweennessCentrality/types_check.pg | 62 ++++ sql/metrics/CMakeLists.txt | 12 + sql/metrics/_betweennessCentrality.sql | 49 +++ sql/metrics/betweennessCentrality.sql | 57 ++++ sql/sigs/pgrouting--3.7.sig | 2 + src/metrics/CMakeLists.txt | 4 + src/metrics/betweennessCentrality.c | 136 +++++++++ src/metrics/betweennessCentrality_driver.cpp | 118 ++++++++ 24 files changed, 1322 insertions(+) create mode 100644 doc/metrics/CMakeLists.txt create mode 100644 doc/metrics/metrics-family.rst create mode 100644 doc/metrics/pgr_betweennessCentrality.rst create mode 100644 docqueries/metrics/CMakeLists.txt create mode 100644 docqueries/metrics/betweennessCentrality.pg create mode 100644 docqueries/metrics/betweennessCentrality.result create mode 100644 docqueries/metrics/test.conf create mode 100644 include/drivers/metrics/betweennessCentrality_driver.h create mode 100644 include/metrics/betweennessCentrality.hpp create mode 100644 pgtap/metrics/betweennessCentrality/edge_cases.pg create mode 100644 pgtap/metrics/betweennessCentrality/inner_query.pg create mode 100644 pgtap/metrics/betweennessCentrality/no_crash_test.pg create mode 100644 pgtap/metrics/betweennessCentrality/types_check.pg create mode 100644 sql/metrics/CMakeLists.txt create mode 100644 sql/metrics/_betweennessCentrality.sql create mode 100644 sql/metrics/betweennessCentrality.sql create mode 100644 src/metrics/CMakeLists.txt create mode 100644 src/metrics/betweennessCentrality.c create mode 100644 src/metrics/betweennessCentrality_driver.cpp diff --git a/NEWS.md b/NEWS.md index 205430b7db..545ce4eda0 100644 --- a/NEWS.md +++ b/NEWS.md @@ -12,6 +12,12 @@ To see all issues & pull requests closed by this release see the [Git closed milestone for 3.7.0 ](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.7.0%22) +**New experimental functions** + +* Metrics + + * pgr_betweennessCentrality + **Official functions changes** * [#2605](https://github.com/pgRouting/pgrouting/pull/2605) Standarize diff --git a/configuration.conf b/configuration.conf index aa53bb647b..1f63c98998 100644 --- a/configuration.conf +++ b/configuration.conf @@ -46,6 +46,7 @@ planar | Y | Y | Y dominator | Y | Y | Y ordering | Y | Y | Y circuits | Y | Y | Y +metrics | Y | Y | Y #---------------------- # SQL only directories #---------------------- diff --git a/doc/metrics/CMakeLists.txt b/doc/metrics/CMakeLists.txt new file mode 100644 index 0000000000..5adba5a42a --- /dev/null +++ b/doc/metrics/CMakeLists.txt @@ -0,0 +1,12 @@ + +SET(LOCAL_FILES + metrics-family.rst + pgr_betweennessCentrality.rst + ) + +foreach (f ${LOCAL_FILES}) + configure_file(${f} "${PGR_DOCUMENTATION_SOURCE_DIR}/${f}") + list(APPEND LOCAL_DOC_FILES ${PGR_DOCUMENTATION_SOURCE_DIR}/${f}) +endforeach() + +set(PROJECT_DOC_FILES ${PROJECT_DOC_FILES} ${LOCAL_DOC_FILES} PARENT_SCOPE) diff --git a/doc/metrics/metrics-family.rst b/doc/metrics/metrics-family.rst new file mode 100644 index 0000000000..66cacabdc6 --- /dev/null +++ b/doc/metrics/metrics-family.rst @@ -0,0 +1,41 @@ +.. + **************************************************************************** + pgRouting Manual + Copyright(c) pgRouting Contributors + + This documentation is licensed under a Creative Commons Attribution-Share + Alike 3.0 License: https://creativecommons.org/licenses/by-sa/3.0/ + **************************************************************************** + +| + + + +Metrics - Family of functions +=============================================================================== + +.. rubric:: Experimental + +.. include:: experimental.rst + :start-after: begin-warn-expr + :end-before: end-warn-expr + +.. index experimental from here + +* :doc:`pgr_betweennessCentrality` - Calculates relative betweenness centrality using Brandes Algorithm + +.. index experimental to here + + +.. toctree:: + :hidden: + + pgr_betweennessCentrality + +See Also +------------------------------------------------------------------------------- + +.. rubric:: Indices and tables + +* :ref:`genindex` +* :ref:`search` diff --git a/doc/metrics/pgr_betweennessCentrality.rst b/doc/metrics/pgr_betweennessCentrality.rst new file mode 100644 index 0000000000..ad4b0c94f0 --- /dev/null +++ b/doc/metrics/pgr_betweennessCentrality.rst @@ -0,0 +1,148 @@ +.. + **************************************************************************** + pgRouting Manual + Copyright(c) pgRouting Contributors + + This documentation is licensed under a Creative Commons Attribution-Share + Alike 3.0 License: https://creativecommons.org/licenses/by-sa/3.0/ + **************************************************************************** + +| + + +``pgr_betweennessCentrality`` +=============================================================================== + +``pgr_betweennessCentrality`` - Calculates the relative betweeness centrality +using Brandes Algorithm + +.. figure:: images/boost-inside.jpeg + :target: https://www.boost.org/doc/libs/1_84_0/libs/graph/doc/betweenness_centrality.html + + Boost Graph Inside + +.. rubric:: Availability + +* Version 3.7.0 + + * New **experimental** function: + + * ``pgr_betweennessCentrality`` + +Description +------------------------------------------------------------------------------- + +The Brandes Algorithm takes advantage of the sparse graphs for evaluating the +betweenness centrality score of all vertices. + + +Betweenness centrality measures the extent to which a vertex lies on the +shortest paths between all other pairs of vertices. Vertices with a high +betweenness centrality score may have considerable influence in a network by the +virtue of their control over the shortest paths passing between them. + +The removal of these vertices will affect the network by disrupting the +it, as most of the shortest paths between vertices pass through them. + +This implementation work for both directed and undirected graphs. + +- Running time: :math:`\Theta(VE)` +- Running space: :math:`\Theta(VE)` +- Throws when there are no edges in the graph + +Signatures +------------------------------------------------------------------------------- + +.. rubric:: Summary + +.. admonition:: \ \ + :class: signatures + + pgr_betweennessCentrality(`Edges SQL`_, [``directed``]) + + | Returns set of ``(vid, centrality)`` + +:Example: For a directed graph with edges :math:`\{1, 2, 3, 4\}`. + +.. literalinclude:: betweennessCentrality.queries + :start-after: -- q1 + :end-before: -- q2 + +.. rubric:: Explanation + +* The betweenness centrality are between parenthesis. +* The leaf vertices have betweenness centrality :math:`0`. +* Betweenness centrality of vertex :math:`6` is higher than of vertex :math:`10`. + + * Removing vertex :math:`6` will create three graph components. + * Removing vertex :math:`10` will create two graph components. + +.. graphviz:: + + digraph G { + 5, 7, 15 [shape=circle;style=filled;width=.5;color=deepskyblue;fontsize=8;fixedsize=true;]; + 6, 10 [shape=circle;style=filled;width=.5;color=green;fontsize=8;fixedsize=true;]; + 5 [pos="0,0!";label="5 (0)"]; + 6 [pos="0,1!"label="6 (0.5)"]; + 7 [pos="0,2!"label="7 (0)"]; + 10 [pos="1,1!"label="10 (0.25)"]; + 15 [pos="2,1!"label="15 (0)"]; + 5 -> 6 [dir=both;label="1 "]; + 6->7 [dir=both;label="4 "]; + 10->6 [label="3"]; + 15->10 [label="4"]; + } + +Parameters +------------------------------------------------------------------------------- + +.. include:: allpairs-family.rst + :start-after: edges_start + :end-before: edges_end + +Optional parameters +............................................................................... + +.. include:: dijkstra-family.rst + :start-after: dijkstra_optionals_start + :end-before: dijkstra_optionals_end + +Inner Queries +------------------------------------------------------------------------------- + +Edges SQL +............................................................................... + +.. include:: pgRouting-concepts.rst + :start-after: no_id_edges_sql_start + :end-before: no_id_edges_sql_end + +Result columns +------------------------------------------------------------------------------- + +.. list-table:: + :width: 81 + :widths: auto + :header-rows: 1 + + * - Column + - Type + - Description + * - ``vid`` + - ``BIGINT`` + - Identifier of the vertex + * - ``centrality`` + - ``FLOAT`` + - Relative betweenness centrality score of the vertex (will be in range [0,1]) + +See Also +------------------------------------------------------------------------------- + +* Boost's `betweenness_centrality + `_ +* Queries use the :doc:`sampledata` network. + +.. rubric:: Indices and tables + +* :ref:`genindex` +* :ref:`search` diff --git a/doc/src/experimental.rst b/doc/src/experimental.rst index 7277a28067..6f054c9324 100644 --- a/doc/src/experimental.rst +++ b/doc/src/experimental.rst @@ -83,6 +83,12 @@ Experimental Functions :start-after: index from here :end-before: index to here +:doc:`metrics-family` + +.. include:: metrics-family.rst + :start-after: index experimental from here + :end-before: index experimental to here + :doc:`TRSP-family` .. include:: TRSP-family.rst @@ -96,6 +102,7 @@ Experimental Functions transformation-family components-family ordering-family + metrics-family .. rubric:: categories diff --git a/doc/src/release_notes.rst b/doc/src/release_notes.rst index fd4a98899d..453042d49c 100644 --- a/doc/src/release_notes.rst +++ b/doc/src/release_notes.rst @@ -43,6 +43,12 @@ To see all issues & pull requests closed by this release see the `Git closed milestone for 3.7.0 `__ +.. rubric:: New experimental functions + +* Metrics + + * pgr_betweennessCentrality + .. rubric:: Official functions changes * `#2605 `__ Standarize diff --git a/docqueries/metrics/CMakeLists.txt b/docqueries/metrics/CMakeLists.txt new file mode 100644 index 0000000000..27f1bdae57 --- /dev/null +++ b/docqueries/metrics/CMakeLists.txt @@ -0,0 +1,11 @@ +# Do not use extensions +SET(LOCAL_FILES + betweennessCentrality + ) + +foreach (f ${LOCAL_FILES}) + configure_file("${f}.result" "${PGR_DOCUMENTATION_SOURCE_DIR}/${f}.queries") + list(APPEND LOCAL_DOC_FILES "${PGR_DOCUMENTATION_SOURCE_DIR}/${f}.queries") +endforeach() + +set(PROJECT_DOC_FILES ${PROJECT_DOC_FILES} ${LOCAL_DOC_FILES} PARENT_SCOPE) diff --git a/docqueries/metrics/betweennessCentrality.pg b/docqueries/metrics/betweennessCentrality.pg new file mode 100644 index 0000000000..dbd30cc264 --- /dev/null +++ b/docqueries/metrics/betweennessCentrality.pg @@ -0,0 +1,9 @@ +-- CopyRight(c) pgRouting developers +-- Creative Commons Attribution-Share Alike 3.0 License : https://creativecommons.org/licenses/by-sa/3.0/ + +/* -- q1 */ +SELECT * FROM pgr_betweennessCentrality( +'SELECT id, source, target, cost, reverse_cost +FROM edges where id < 5' +) ORDER BY vid; +/* -- q2 */ diff --git a/docqueries/metrics/betweennessCentrality.result b/docqueries/metrics/betweennessCentrality.result new file mode 100644 index 0000000000..be9bb20878 --- /dev/null +++ b/docqueries/metrics/betweennessCentrality.result @@ -0,0 +1,21 @@ +BEGIN; +BEGIN +SET client_min_messages TO NOTICE; +SET +/* -- q1 */ +SELECT * FROM pgr_betweennessCentrality( +'SELECT id, source, target, cost, reverse_cost +FROM edges where id < 5' +) ORDER BY vid; + vid | centrality +-----+------------ + 5 | 0 + 6 | 0.5 + 7 | 0 + 10 | 0.25 + 15 | 0 +(5 rows) + +/* -- q2 */ +ROLLBACK; +ROLLBACK diff --git a/docqueries/metrics/test.conf b/docqueries/metrics/test.conf new file mode 100644 index 0000000000..6afe7ec483 --- /dev/null +++ b/docqueries/metrics/test.conf @@ -0,0 +1,12 @@ +#!/usr/bin/perl -w + +%main::tests = ( + 'any' => { + 'files' => [qw( + betweennessCentrality.pg + )] + }, + +); + +1; diff --git a/include/drivers/metrics/betweennessCentrality_driver.h b/include/drivers/metrics/betweennessCentrality_driver.h new file mode 100644 index 0000000000..29d2a2e978 --- /dev/null +++ b/include/drivers/metrics/betweennessCentrality_driver.h @@ -0,0 +1,64 @@ +/*PGR-GNU***************************************************************** +File: betweennessCentrality_driver.h + +Generated with Template by: +Copyright (c) 2015 pgRouting developers +Mail: project@pgrouting.org + +Function's developer: +Copyright (c) 2024 Arun Thakur +Mail: bedupako12mas at gmail.com + +------ + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + ********************************************************************PGR-GNU*/ + +#ifndef INCLUDE_DRIVERS_METRICS_BETWEENNESSCENTRALITY_DRIVER_H_ +#define INCLUDE_DRIVERS_METRICS_BETWEENNESSCENTRALITY_DRIVER_H_ +#pragma once + +/* for size-t */ +#ifdef __cplusplus +# include +using IID_t_rt = struct IID_t_rt; +#else +# include +#include +typedef struct IID_t_rt IID_t_rt; +#endif + + + +#ifdef __cplusplus +extern "C" { +#endif + +void +pgr_do_betweennessCentrality( + char*, + bool, + + IID_t_rt**, + size_t*, + char**, + char**); + +#ifdef __cplusplus +} +#endif + +#endif // INCLUDE_DRIVERS_METRICS_BETWEENNESSCENTRALITY_DRIVER_H_ diff --git a/include/metrics/betweennessCentrality.hpp b/include/metrics/betweennessCentrality.hpp new file mode 100644 index 0000000000..1277e94caa --- /dev/null +++ b/include/metrics/betweennessCentrality.hpp @@ -0,0 +1,144 @@ +/*PGR-GNU***************************************************************** +File: betweennessCentrality.hpp + +Copyright (c) 2015 pgRouting developers +Mail: project@pgrouting.org + +Copyright (c) 2024 Arun Thakur +Mail: bedupako12mas at gmail.com + +------ + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +********************************************************************PGR-GNU*/ + +#ifndef INCLUDE_METRICS_BETWEENNESSCENTRALITY_HPP_ +#define INCLUDE_METRICS_BETWEENNESSCENTRALITY_HPP_ +#pragma once + +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "c_types/iid_t_rt.h" +#include "cpp_common/basePath_SSEC.hpp" +#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/interruption.hpp" +#include "cpp_common/pgr_alloc.hpp" + +namespace pgrouting { +template class Pgr_metrics; + +template +void +pgr_betweennesscentrality( + G &graph, + size_t &result_tuple_count, + IID_t_rt **postgres_rows) { + Pgr_metrics fn_centrality; + fn_centrality.betweennessCentrality(graph, result_tuple_count, postgres_rows); +} + +template +class Pgr_metrics { + public: + using Graph = typename G::B_G; + using V = typename G::V; + using E = typename G::E; + typedef typename boost::graph_traits::directed_category directed_category; + + void betweennessCentrality( + const G &graph, + size_t &result_tuple_count, + IID_t_rt **postgres_rows) { + // required parameters + std::vector centrality(boost::num_vertices(graph.graph), 0.0); + auto centrality_map = boost::make_iterator_property_map(centrality.begin(), + boost::get(boost::vertex_index, graph.graph)); + std::vector distance(boost::num_vertices(graph.graph), 0.0); + auto distance_map = boost::make_iterator_property_map(distance.begin(), + boost::get(boost::vertex_index, graph.graph)); + // dummy parameters + std::vector edge_centrality(boost::num_edges(graph.graph), 0.0); + auto edge_centrality_map = boost::make_iterator_property_map(edge_centrality.begin(), + boost::get(&pgrouting::Basic_edge::cost, + graph.graph)); + std::vector> incoming(boost::num_vertices(graph.graph)); + auto incoming_map = boost::make_iterator_property_map(incoming.begin(), + boost::get(boost::vertex_index, graph.graph), + std::vector()); + std::vector dependency(boost::num_vertices(graph.graph), 0.0); + auto dependency_map = boost::make_iterator_property_map(dependency.begin(), + boost::get(boost::vertex_index, graph.graph)); + std::vector path_count(boost::num_vertices(graph.graph), 0); + auto path_count_map = boost::make_iterator_property_map(path_count.begin(), + boost::get(boost::vertex_index, graph.graph)); + auto vertex_index = boost::get(boost::vertex_index, graph.graph); + + /* abort in case of an interruption occurs (e.g. the query is being cancelled) */ + CHECK_FOR_INTERRUPTS(); + + boost::brandes_betweenness_centrality( + graph.graph, + centrality_map, + edge_centrality_map, + incoming_map, + distance_map, + dependency_map, + path_count_map, + vertex_index, + get(&pgrouting::Basic_edge::cost, graph.graph)); + + if (boost::num_vertices(graph.graph) > 2) { + boost::relative_betweenness_centrality( + graph.graph, + centrality_map); + } + + generate_results(graph, centrality, result_tuple_count, postgres_rows); + } + + private: + void generate_results( + const G &graph, + const std::vector centrality_results, + size_t &result_tuple_count, + IID_t_rt **postgres_rows) const { + result_tuple_count = centrality_results.size(); + *postgres_rows = pgr_alloc(result_tuple_count, (*postgres_rows)); + + size_t seq = 0; + for (typename G::V v_i = 0; v_i < graph.num_vertices(); ++v_i) { + (*postgres_rows)[seq].from_vid = graph[v_i].id; + (*postgres_rows)[seq].to_vid = 0; + (*postgres_rows)[seq].cost = centrality_results[v_i]; + if (std::is_same::value) { + (*postgres_rows)[seq].cost = centrality_results[v_i]/2.0; + } + seq++; + } + } +}; + +} // namespace pgrouting + +#endif // INCLUDE_METRICS_BETWEENNESSCENTRALITY_HPP_ diff --git a/pgtap/metrics/betweennessCentrality/edge_cases.pg b/pgtap/metrics/betweennessCentrality/edge_cases.pg new file mode 100644 index 0000000000..d4582a4889 --- /dev/null +++ b/pgtap/metrics/betweennessCentrality/edge_cases.pg @@ -0,0 +1,282 @@ +/*PGR-GNU***************************************************************** + +Copyright (c) 2024 pgRouting developers +Mail: project@pgrouting.org + +------ +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + ********************************************************************PGR-GNU*/ + +BEGIN; + +UPDATE edges SET cost = sign(cost), reverse_cost = sign(reverse_cost); +SELECT CASE WHEN NOT min_version('3.7.0') THEN plan(1) ELSE plan(24) END; + +CREATE OR REPLACE FUNCTION edge_cases() +RETURNS SETOF TEXT AS +$BODY$ +BEGIN + +IF NOT min_version('3.7.0') THEN + RETURN QUERY + SELECT skip(1, 'Function is new on 3.7.0'); + RETURN; +END IF; + +/* Implicit Test Cases */ + +PREPARE idless5_q AS + SELECT * FROM pgr_betweennessCentrality( + 'SELECT id, source, target, cost, reverse_cost + FROM edges WHERE id < 5' + ) ORDER BY vid; + +PREPARE idless5_r AS + SELECT * FROM (VALUES + (5::BIGINT , 0::FLOAT), + (6 , 0.5), + (7 , 0), + (10 , 0.25), + (15 , 0)) + AS t(vid, centrality); + +RETURN QUERY +SELECT lives_ok('idless5_q'); + +RETURN QUERY +SELECT results_eq('idless5_q', 'idless5_r'); + + +PREPARE idless4_q AS + SELECT * FROM pgr_betweennessCentrality( + 'SELECT id, source, target, cost, reverse_cost + FROM edges WHERE id < 4' + ) ORDER BY vid; + +PREPARE idless4_r AS + SELECT * FROM (VALUES + (5::BIGINT , 0::FLOAT), + (6 , 0.3333333333333333), + (10 , 0.3333333333333333), + (15 , 0)) + AS t(vid, centrality); + +RETURN QUERY +SELECT lives_ok('idless4_q'); + +RETURN QUERY +SELECT results_eq('idless4_q', 'idless4_r'); + + +PREPARE idless3_q AS + SELECT * FROM pgr_betweennessCentrality( + 'SELECT id, source, target, cost, reverse_cost + FROM edges WHERE id < 3' + ) ORDER BY vid; + +PREPARE idless3_r AS + SELECT * FROM (VALUES + (5::BIGINT , 0::FLOAT), + (6 , 0.5), + (10 , 0) + ) AS t(vid, centrality); + +RETURN QUERY +SELECT lives_ok('idless3_q'); + +RETURN QUERY +SELECT results_eq('idless3_q', 'idless3_r'); + +PREPARE idless2_q AS + SELECT * FROM pgr_betweennessCentrality( + 'SELECT id, source, target, cost, reverse_cost + FROM edges WHERE id < 2' + ) ORDER BY vid; + +PREPARE idless2_r AS + SELECT * FROM (VALUES + (5::BIGINT , 0::FLOAT), + (6 , 0) + ) AS t(vid, centrality); + +RETURN QUERY +SELECT lives_ok('idless2_q'); + +RETURN QUERY +SELECT results_eq('idless2_q', 'idless2_r'); + +/* Explicit Undirected Cases */ + +PREPARE idless5ud_q AS + SELECT * FROM pgr_betweennessCentrality( + 'SELECT id, source, target, cost, reverse_cost + FROM edges WHERE id < 5', directed => false ) ORDER BY vid; + +PREPARE idless5ud_r AS + SELECT * FROM (VALUES + (5::BIGINT , 0::FLOAT), + (6 , 0.8333333333333333), + (7 , 0), + (10 , 0.5), + (15 , 0)) + AS t(vid, centrality); + +RETURN QUERY +SELECT lives_ok('idless5ud_q'); + +RETURN QUERY +SELECT results_eq('idless5ud_q', 'idless5ud_r'); + +PREPARE idless4ud_q AS + SELECT * FROM pgr_betweennessCentrality( + 'SELECT id, source, target, cost, reverse_cost + FROM edges WHERE id < 4', directed => false ) ORDER BY vid; + +PREPARE idless4ud_r AS + SELECT * FROM (VALUES + (5::BIGINT , 0::FLOAT), + (6 , 0.6666666666666666), + (10 , 0.6666666666666666), (15 , 0)) + AS t(vid, centrality); + +RETURN QUERY +SELECT lives_ok('idless4ud_q'); + +RETURN QUERY +SELECT results_eq('idless4ud_q', 'idless4ud_r'); + + +PREPARE idless3ud_q AS + SELECT * FROM pgr_betweennessCentrality( + 'SELECT id, source, target, cost, reverse_cost + FROM edges WHERE id < 3', directed => false ) ORDER BY vid; + +PREPARE idless3ud_r AS + SELECT * FROM (VALUES + (5::BIGINT , 0::FLOAT), + (6 , 1), + (10 , 0)) + AS t(vid, centrality); + +RETURN QUERY +SELECT lives_ok('idless3ud_q'); + +RETURN QUERY +SELECT results_eq('idless3ud_q', 'idless3ud_r'); + +PREPARE idless2ud_q AS + SELECT * FROM pgr_betweennessCentrality( + 'SELECT id, source, target, cost, reverse_cost + FROM edges WHERE id < 2', directed => false + ) ORDER BY vid; + +PREPARE idless2ud_r AS + SELECT * FROM (VALUES + (5::BIGINT , 0::FLOAT), + (6 , 0)) + AS t(vid, centrality); + +RETURN QUERY +SELECT lives_ok('idless2ud_q'); + +RETURN QUERY +SELECT results_eq('idless2ud_q', 'idless2ud_r'); + +/* Explicit Directed Cases */ + + +PREPARE idless5d_q AS + SELECT * FROM pgr_betweennessCentrality( + 'SELECT id, source, target, cost, reverse_cost + FROM edges WHERE id < 5', directed => true ) ORDER BY vid; + +PREPARE idless5d_r AS + SELECT * FROM (VALUES + (5::BIGINT , 0::FLOAT), + (6 , 0.5), + (7 , 0), + (10 , 0.25), + (15 , 0)) + AS t(vid, centrality); + +RETURN QUERY +SELECT lives_ok('idless5d_q'); + +RETURN QUERY +SELECT results_eq('idless5d_q', 'idless5d_r'); + + +PREPARE idless4d_q AS + SELECT * FROM pgr_betweennessCentrality( + 'SELECT id, source, target, cost, reverse_cost + FROM edges WHERE id < 4', directed => true ) ORDER BY vid; + +PREPARE idless4d_r AS + SELECT * FROM (VALUES + (5::BIGINT , 0::FLOAT), + (6 , 0.3333333333333333), + (10 , 0.3333333333333333), + (15 , 0)) + AS t(vid, centrality); + +RETURN QUERY +SELECT lives_ok('idless4d_q'); + +RETURN QUERY +SELECT results_eq('idless4d_q', 'idless4d_r'); + + +PREPARE idless3d_q AS + SELECT * FROM pgr_betweennessCentrality( + 'SELECT id, source, target, cost, reverse_cost + FROM edges WHERE id < 3', directed => true ) ORDER BY vid; + +PREPARE idless3d_r AS + SELECT * FROM (VALUES + (5::BIGINT , 0::FLOAT), + (6 , 0.5), + (10 , 0) + ) AS t(vid, centrality); + +RETURN QUERY +SELECT lives_ok('idless3d_q'); + +RETURN QUERY +SELECT results_eq('idless3d_q', 'idless3d_r'); + +PREPARE idless2d_q AS + SELECT * FROM pgr_betweennessCentrality( + 'SELECT id, source, target, cost, reverse_cost + FROM edges WHERE id < 2', directed => true + ) ORDER BY vid; + +PREPARE idless2d_r AS + SELECT * FROM (VALUES + (5::BIGINT , 0::FLOAT), + (6 , 0) + ) AS t(vid, centrality); + +RETURN QUERY +SELECT lives_ok('idless2d_q'); + +RETURN QUERY +SELECT results_eq('idless2d_q', 'idless2d_r'); + +END; +$BODY$ +LANGUAGE plpgsql; + +SELECT edge_cases(); + +SELECT finish(); +ROLLBACK; diff --git a/pgtap/metrics/betweennessCentrality/inner_query.pg b/pgtap/metrics/betweennessCentrality/inner_query.pg new file mode 100644 index 0000000000..9873cbb703 --- /dev/null +++ b/pgtap/metrics/betweennessCentrality/inner_query.pg @@ -0,0 +1,46 @@ + +/*PGR-GNU***************************************************************** + +Copyright (c) 2024 pgRouting developers +Mail: project@pgrouting.org + +------ +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + ********************************************************************PGR-GNU*/ +BEGIN; + +UPDATE edges SET cost = sign(cost), reverse_cost = sign(reverse_cost); +SELECT CASE WHEN NOT min_version('3.7.0') THEN plan(1) ELSE plan(54) END; + +CREATE OR REPLACE FUNCTION inner_query() +RETURNS SETOF TEXT AS +$BODY$ +BEGIN + +IF NOT min_version('3.7.0') THEN + RETURN QUERY + SELECT skip(1, 'Function is new on 3.7.0'); + RETURN; +END IF; + +RETURN QUERY +SELECT style_dijkstra('pgr_betweennessCentrality(', ')'); + +END; +$BODY$ +LANGUAGE plpgsql; + +SELECT inner_query(); + +SELECT finish(); +ROLLBACK; diff --git a/pgtap/metrics/betweennessCentrality/no_crash_test.pg b/pgtap/metrics/betweennessCentrality/no_crash_test.pg new file mode 100644 index 0000000000..c7b37ce9e7 --- /dev/null +++ b/pgtap/metrics/betweennessCentrality/no_crash_test.pg @@ -0,0 +1,72 @@ + +/*PGR-GNU***************************************************************** + +Copyright (c) 2024 pgRouting developers +Mail: project@pgrouting.org + +------ +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + ********************************************************************PGR-GNU*/ +BEGIN; + +UPDATE edges SET cost = sign(cost), reverse_cost = sign(reverse_cost); +SELECT CASE WHEN NOT min_version('3.7.0') THEN plan(1) ELSE plan(7) END; + +PREPARE edges_q AS +SELECT id, source, target, cost, reverse_cost FROM edges; + +PREPARE null_ret AS +SELECT id FROM vertices WHERE id IN (-1); + +PREPARE null_ret_arr AS +SELECT array_agg(id) FROM vertices WHERE id IN (-1); + + +CREATE OR REPLACE FUNCTION no_crash() +RETURNS SETOF TEXT AS +$BODY$ +DECLARE +params TEXT[]; +subs TEXT[]; +BEGIN + IF NOT min_version('3.7.0') THEN + RETURN QUERY + SELECT skip(1, 'Function is new on 3.7.0'); + RETURN; + END IF; + + RETURN QUERY + SELECT isnt_empty('edges_q', 'Should be not empty to tests be meaningful'); + RETURN QUERY + SELECT is_empty('null_ret', 'Should be empty to tests be meaningful'); + RETURN QUERY + SELECT set_eq('null_ret_arr', 'SELECT NULL::BIGINT[]', 'Should be empty to tests be meaningful'); + + params = ARRAY[ + '$$SELECT id, source, target, cost, reverse_cost FROM edges$$' + ]::TEXT[]; + subs = ARRAY[ + 'NULL' + ]::TEXT[]; + + RETURN query SELECT * FROM no_crash_test('pgr_betweennessCentrality', params, subs); + +END +$BODY$ +LANGUAGE plpgsql VOLATILE; + + +SELECT * FROM no_crash(); + +SELECT finish(); +ROLLBACK; diff --git a/pgtap/metrics/betweennessCentrality/types_check.pg b/pgtap/metrics/betweennessCentrality/types_check.pg new file mode 100644 index 0000000000..032556df94 --- /dev/null +++ b/pgtap/metrics/betweennessCentrality/types_check.pg @@ -0,0 +1,62 @@ + +/*PGR-GNU***************************************************************** + +Copyright (c) 2024 pgRouting developers +Mail: project@pgrouting.org + +------ +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + ********************************************************************PGR-GNU*/ +BEGIN; + +SELECT CASE WHEN NOT min_version('3.7.0') THEN plan(1) ELSE plan(5) END; + +CREATE OR REPLACE FUNCTION types_check() +RETURNS SETOF TEXT AS +$BODY$ +BEGIN + + IF NOT min_version('3.7.0') THEN + RETURN QUERY + SELECT skip(1, 'Function is new on 3.7.0'); + RETURN; + END IF; + +RETURN QUERY +SELECT has_function('pgr_betweennesscentrality'); +RETURN QUERY +SELECT has_function('pgr_betweennesscentrality', ARRAY['text','boolean']); +RETURN QUERY +SELECT function_returns('pgr_betweennesscentrality', ARRAY['text','boolean'],'setof record'); + +RETURN QUERY +SELECT set_eq( + $$SELECT proargnames from pg_proc where proname = 'pgr_betweennesscentrality'$$, + $$VALUES + ('{"","directed","vid","centrality"}'::TEXT[]) + $$); + +RETURN QUERY +SELECT set_eq( + $$SELECT proallargtypes from pg_proc where proname = 'pgr_betweennesscentrality'$$, + $$VALUES + ('{25,16,20,701}'::OID[]) + $$); + +END; +$BODY$ +LANGUAGE plpgsql; +SELECT types_check(); + +SELECT finish(); +ROLLBACK; diff --git a/sql/metrics/CMakeLists.txt b/sql/metrics/CMakeLists.txt new file mode 100644 index 0000000000..c047b395e5 --- /dev/null +++ b/sql/metrics/CMakeLists.txt @@ -0,0 +1,12 @@ + +SET(LOCAL_FILES + _betweennessCentrality.sql + betweennessCentrality.sql +) + +foreach (f ${LOCAL_FILES}) + configure_file(${f} ${f}) + list(APPEND PACKAGE_SQL_FILES ${CMAKE_CURRENT_BINARY_DIR}/${f}) +endforeach() + +set(PROJECT_SQL_FILES ${PROJECT_SQL_FILES} ${PACKAGE_SQL_FILES} PARENT_SCOPE) diff --git a/sql/metrics/_betweennessCentrality.sql b/sql/metrics/_betweennessCentrality.sql new file mode 100644 index 0000000000..4a8b7479c2 --- /dev/null +++ b/sql/metrics/_betweennessCentrality.sql @@ -0,0 +1,49 @@ +/*PGR-GNU***************************************************************** + +File: _betweennessCentrality.sql + +Template: +Copyright (c) 2015 pgRouting developers +Mail: project@pgrouting.org + +Function developer: +Copyright (c) 2024 Arun Thakur +Mail: bedupako12mas at gmail.com + +------ + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + ********************************************************************PGR-GNU*/ + +-------------------------------- +-- pgr_betweennessCentrality +-------------------------------- + +--v3.7 +CREATE FUNCTION _pgr_betweennessCentrality( + edges_sql TEXT, + directed BOOLEAN, + + OUT vid BIGINT, + OUT centrality FLOAT) +RETURNS SETOF RECORD AS +'MODULE_PATHNAME' +LANGUAGE C VOLATILE STRICT; + +-- COMMENTS + +COMMENT ON FUNCTION _pgr_betweennessCentrality(TEXT, BOOLEAN) +IS 'pgRouting internal function'; diff --git a/sql/metrics/betweennessCentrality.sql b/sql/metrics/betweennessCentrality.sql new file mode 100644 index 0000000000..8da8d6916a --- /dev/null +++ b/sql/metrics/betweennessCentrality.sql @@ -0,0 +1,57 @@ +/*PGR-GNU***************************************************************** + +File: betweennessCentrality.sql + +Template: +Copyright (c) 2015 pgRouting developers +Mail: project@pgrouting.org + +Function developer: +Copyright (c) 2024 Arun Thakur +Mail: bedupako12mas at gmail.com + +------ + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + ********************************************************************PGR-GNU*/ + +--v3.7 +CREATE FUNCTION pgr_betweennessCentrality( + TEXT, -- edges_sql (required) + directed BOOLEAN DEFAULT true, + + OUT vid BIGINT, + OUT centrality FLOAT) +RETURNS SETOF RECORD AS +$BODY$ + + SELECT vid, centrality + FROM _pgr_betweennesscentrality(_pgr_get_statement($1), $2); + +$BODY$ +LANGUAGE SQL VOLATILE STRICT; + +-- COMMENTS + +COMMENT ON FUNCTION pgr_betweennessCentrality(TEXT, BOOLEAN) +IS 'pgr_betweennessCentrality +- Parameters: + - edges SQL with columns: source, target, cost [,reverse_cost]) +- Optional Parameters: + - directed := true +- Documentation: + - ${PROJECT_DOC_LINK}/pgr_centrality.html +'; diff --git a/sql/sigs/pgrouting--3.7.sig b/sql/sigs/pgrouting--3.7.sig index 987a688ccf..460e9e69d6 100644 --- a/sql/sigs/pgrouting--3.7.sig +++ b/sql/sigs/pgrouting--3.7.sig @@ -51,6 +51,8 @@ pgr_bellmanford(text,bigint,anyarray,boolean) pgr_bellmanford(text,bigint,bigint,boolean) pgr_bellmanford(text,text,boolean) _pgr_bellmanford(text,text,boolean,boolean) +_pgr_betweennesscentrality(text,boolean) +pgr_betweennesscentrality(text,boolean) _pgr_biconnectedcomponents(text) pgr_biconnectedcomponents(text) _pgr_binarybreadthfirstsearch(text,anyarray,anyarray,boolean) diff --git a/src/metrics/CMakeLists.txt b/src/metrics/CMakeLists.txt new file mode 100644 index 0000000000..c88a1dfd8e --- /dev/null +++ b/src/metrics/CMakeLists.txt @@ -0,0 +1,4 @@ +ADD_LIBRARY(metrics OBJECT + betweennessCentrality.c + betweennessCentrality_driver.cpp + ) diff --git a/src/metrics/betweennessCentrality.c b/src/metrics/betweennessCentrality.c new file mode 100644 index 0000000000..bbebd4f3cd --- /dev/null +++ b/src/metrics/betweennessCentrality.c @@ -0,0 +1,136 @@ +/*PGR-GNU***************************************************************** +File: betweennessCentrality.c + +Generated with Template by: +Copyright (c) 2015 pgRouting developers +Mail: project@pgrouting.org + +Function's developer: +Copyright (c) 2024 Arun Thakur +Mail: bedupako12mas at gmail.com + +------ + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + ********************************************************************PGR-GNU*/ + +#include +#include "c_common/postgres_connection.h" + +#include "c_types/iid_t_rt.h" +#include "c_common/debug_macro.h" +#include "c_common/e_report.h" +#include "c_common/time_msg.h" + +#include "drivers/metrics/betweennessCentrality_driver.h" + +PGDLLEXPORT Datum _pgr_betweennesscentrality(PG_FUNCTION_ARGS); +PG_FUNCTION_INFO_V1(_pgr_betweennesscentrality); + +static +void +process( + char* edges_sql, + bool directed, + IID_t_rt **result_tuples, + size_t *result_count) { + pgr_SPI_connect(); + char* log_msg = NULL; + char* notice_msg = NULL; + char* err_msg = NULL; + + clock_t start_t = clock(); + pgr_do_betweennessCentrality( + edges_sql, + directed, + result_tuples, + result_count, + &log_msg, + &err_msg); + time_msg(" processing Centrality", start_t, clock()); + + if (err_msg && (*result_tuples)) { + pfree(*result_tuples); + (*result_tuples) = NULL; + (*result_count) = 0; + } + + pgr_global_report(&log_msg, ¬ice_msg, &err_msg); + + pgr_SPI_finish(); +} + + +PGDLLEXPORT Datum +_pgr_betweennesscentrality(PG_FUNCTION_ARGS) { + FuncCallContext *funcctx; + TupleDesc tuple_desc; + + + IID_t_rt *result_tuples = NULL; + size_t result_count = 0; + + 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)), + PG_GETARG_BOOL(1), + &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 = (IID_t_rt*) funcctx->user_fctx; + + if (funcctx->call_cntr < funcctx->max_calls) { + HeapTuple tuple; + Datum result; + Datum *values; + bool* nulls; + + values = palloc(2 * sizeof(Datum)); + nulls = palloc(2 * sizeof(bool)); + + // postgres starts counting from 1 + values[0] = Int64GetDatum(result_tuples[funcctx->call_cntr].from_vid); + nulls[0] = false; + values[1] = Float8GetDatum(result_tuples[funcctx->call_cntr].cost); + nulls[1] = false; + + tuple = heap_form_tuple(tuple_desc, values, nulls); + result = HeapTupleGetDatum(tuple); + SRF_RETURN_NEXT(funcctx, result); + } else { + SRF_RETURN_DONE(funcctx); + } +} diff --git a/src/metrics/betweennessCentrality_driver.cpp b/src/metrics/betweennessCentrality_driver.cpp new file mode 100644 index 0000000000..6c6a1aa1ce --- /dev/null +++ b/src/metrics/betweennessCentrality_driver.cpp @@ -0,0 +1,118 @@ +/*PGR-GNU***************************************************************** +File: betweennessCentrality_driver.cpp + +Generated with Template by: +Copyright (c) 2015 pgRouting developers +Mail: project@pgrouting.org + +Function's developer: +Copyright (c) 2024 Arun Thakur +Mail: bedupako12mas at gmail.com + +------ + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + ********************************************************************PGR-GNU*/ + +#include "drivers/metrics/betweennessCentrality_driver.h" + +#include +#include +#include +#include +#include "metrics/betweennessCentrality.hpp" +#include "cpp_common/pgdata_getters.hpp" + +#include "cpp_common/pgr_assert.hpp" + + +void +pgr_do_betweennessCentrality( + char *edges_sql, + bool directed, + + IID_t_rt **return_tuples, + size_t *return_count, + char ** log_msg, + char ** err_msg) { + using pgrouting::pgr_msg; + using pgrouting::pgr_free; + + std::ostringstream log; + std::ostringstream err; + char *hint = nullptr; + + try { + pgassert(!(*log_msg)); + pgassert(!(*err_msg)); + pgassert(!(*return_tuples)); + pgassert(*return_count == 0); + + hint = edges_sql; + auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, true); + + if (edges.empty()) { + throw std::string("No edges found"); + } + hint = nullptr; + + if (directed) { + log << "Processing Directed graph\n"; + pgrouting::DirectedGraph digraph; + digraph.insert_edges(edges); + pgr_betweennesscentrality(digraph, *return_count, return_tuples); + } else { + log << "Processing Undirected graph\n"; + pgrouting::UndirectedGraph undigraph; + undigraph.insert_edges(edges); + pgr_betweennesscentrality(undigraph, *return_count, return_tuples); + } + + + if (*return_count == 0) { + err << "No result generated, report this error\n"; + *err_msg = pgr_msg(err.str().c_str()); + *return_tuples = NULL; + *return_count = 0; + return; + } + + *log_msg = log.str().empty()? + *log_msg : + pgr_msg(log.str().c_str()); + } catch (AssertFailedException &except) { + (*return_tuples) = pgr_free(*return_tuples); + (*return_count) = 0; + err << except.what(); + *err_msg = pgr_msg(err.str().c_str()); + *log_msg = pgr_msg(log.str().c_str()); + } catch (const std::string &ex) { + *err_msg = pgr_msg(ex.c_str()); + *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); + } catch (std::exception &except) { + (*return_tuples) = pgr_free(*return_tuples); + (*return_count) = 0; + err << except.what(); + *err_msg = pgr_msg(err.str().c_str()); + *log_msg = pgr_msg(log.str().c_str()); + } catch(...) { + (*return_tuples) = pgr_free(*return_tuples); + (*return_count) = 0; + err << "Caught unknown exception!"; + *err_msg = pgr_msg(err.str().c_str()); + *log_msg = pgr_msg(log.str().c_str()); + } +} From 84b0948d1cedce7819d3248c66284097c70f25be Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 16 Aug 2024 18:52:48 +0000 Subject: [PATCH 321/428] Update locale: commit 641dc3321d --- .../en/LC_MESSAGES/pgrouting_doc_strings.po | 131 ++++++++++++++++-- locale/pot/pgrouting_doc_strings.pot | 110 +++++++++++++-- 2 files changed, 214 insertions(+), 27 deletions(-) diff --git a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po index c0fecff321..597dc19a00 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-05-13 17:23+0000\n" +"POT-Creation-Date: 2024-08-16 18:52+0000\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.15.0\n" +"Generated-By: Babel 2.16.0\n" msgid "BFS - Category" msgstr "" @@ -3918,6 +3918,14 @@ msgid "" "of an undirected graph." msgstr "" +msgid ":doc:`metrics-family`" +msgstr "" + +msgid "" +":doc:`pgr_betweennessCentrality` - Calculates relative betweenness " +"centrality using Brandes Algorithm" +msgstr "" + msgid ":doc:`TRSP-family`" msgstr "" @@ -4389,6 +4397,15 @@ msgid "" "`__" msgstr "" +msgid "New experimental functions" +msgstr "" + +msgid "Metrics" +msgstr "" + +msgid "pgr_betweennessCentrality" +msgstr "" + msgid "Official functions changes" msgstr "" @@ -4484,6 +4501,9 @@ msgstr "" msgid "Kruskal's running time: :math:`O(E * log E)`" msgstr "" +msgid "Metrics - Family of functions" +msgstr "" + msgid "Migration guide" msgstr "" @@ -9100,6 +9120,101 @@ msgstr "" msgid "https://en.wikipedia.org/wiki/Bellman%E2%80%93Ford_algorithm" msgstr "" +msgid "``pgr_betweennessCentrality``" +msgstr "" + +msgid "" +"``pgr_betweennessCentrality`` - Calculates the relative betweeness " +"centrality using Brandes Algorithm" +msgstr "" + +msgid "Version 3.7.0" +msgstr "" + +msgid "New **experimental** function:" +msgstr "" + +msgid "" +"The Brandes Algorithm takes advantage of the sparse graphs for evaluating" +" the betweenness centrality score of all vertices." +msgstr "" + +msgid "" +"Betweenness centrality measures the extent to which a vertex lies on the " +"shortest paths between all other pairs of vertices. Vertices with a high " +"betweenness centrality score may have considerable influence in a network" +" by the virtue of their control over the shortest paths passing between " +"them." +msgstr "" + +msgid "" +"The removal of these vertices will affect the network by disrupting the " +"it, as most of the shortest paths between vertices pass through them." +msgstr "" + +msgid "This implementation work for both directed and undirected graphs." +msgstr "" + +msgid "Running time: :math:`\\Theta(VE)`" +msgstr "" + +msgid "Running space: :math:`\\Theta(VE)`" +msgstr "" + +msgid "Throws when there are no edges in the graph" +msgstr "" + +msgid "pgr_betweennessCentrality(`Edges SQL`_, [``directed``])" +msgstr "" + +msgid "Returns set of ``(vid, centrality)``" +msgstr "" + +msgid "For a directed graph with edges :math:`\\{1, 2, 3, 4\\}`." +msgstr "" + +msgid "Explanation" +msgstr "" + +msgid "The betweenness centrality are between parenthesis." +msgstr "" + +msgid "The leaf vertices have betweenness centrality :math:`0`." +msgstr "" + +msgid "" +"Betweenness centrality of vertex :math:`6` is higher than of vertex " +":math:`10`." +msgstr "" + +msgid "Removing vertex :math:`6` will create three graph components." +msgstr "" + +msgid "Removing vertex :math:`10` will create two graph components." +msgstr "" + +msgid "``vid``" +msgstr "" + +msgid "Identifier of the vertex" +msgstr "" + +msgid "``centrality``" +msgstr "" + +msgid "" +"Relative betweenness centrality score of the vertex (will be in range " +"[0,1])" +msgstr "" + +msgid "" +"Boost's `betweenness_centrality " +"`_" +msgstr "" + +msgid "Queries use the :doc:`sampledata` network." +msgstr "" + msgid "``pgr_biconnectedComponents``" msgstr "" @@ -10210,9 +10325,6 @@ msgid "" "algorithm implemented by Boost.Graph." msgstr "" -msgid "New **experimental** function:" -msgstr "" - msgid "pgr_dagShortestPath(Combinations)" msgstr "" @@ -12387,9 +12499,6 @@ msgid "" "breadth First Search ordering." msgstr "" -msgid "Version 3.7.0" -msgstr "" - msgid "" "Visits and extracts the nodes information in Breath First Search ordering" " of the Minimum Spanning Tree created using Kruskal's algorithm." @@ -14094,9 +14203,6 @@ msgstr "" msgid "Rechability of a subgraph" msgstr "" -msgid "``vid``" -msgstr "" - msgid "Identifier of the source of the edges" msgstr "" @@ -15883,9 +15989,6 @@ msgstr "" msgid "``pgr_findCloseEdges`` (Many points)" msgstr "" -msgid "New experimental functions" -msgstr "" - msgid "Ordering" msgstr "" diff --git a/locale/pot/pgrouting_doc_strings.pot b/locale/pot/pgrouting_doc_strings.pot index 61964b7e90..cc50046aa5 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-05-13 17:23+0000\n" +"POT-Creation-Date: 2024-08-16 18:52+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3535,6 +3535,12 @@ msgstr "" msgid ":doc:`pgr_cuthillMckeeOrdering` - Return reverse Cuthill-McKee ordering of an undirected graph." msgstr "" +msgid ":doc:`metrics-family`" +msgstr "" + +msgid ":doc:`pgr_betweennessCentrality` - Calculates relative betweenness centrality using Brandes Algorithm" +msgstr "" + msgid ":doc:`TRSP-family`" msgstr "" @@ -3934,6 +3940,15 @@ msgstr "" msgid "To see all issues & pull requests closed by this release see the `Git closed milestone for 3.7.0 `__" msgstr "" +msgid "New experimental functions" +msgstr "" + +msgid "Metrics" +msgstr "" + +msgid "pgr_betweennessCentrality" +msgstr "" + msgid "Official functions changes" msgstr "" @@ -4015,6 +4030,9 @@ msgstr "" msgid "Kruskal's running time: :math:`O(E * log E)`" msgstr "" +msgid "Metrics - Family of functions" +msgstr "" + msgid "Migration guide" msgstr "" @@ -7906,6 +7924,84 @@ msgstr "" msgid "https://en.wikipedia.org/wiki/Bellman%E2%80%93Ford_algorithm" msgstr "" +msgid "``pgr_betweennessCentrality``" +msgstr "" + +msgid "``pgr_betweennessCentrality`` - Calculates the relative betweeness centrality using Brandes Algorithm" +msgstr "" + +msgid "Version 3.7.0" +msgstr "" + +msgid "New **experimental** function:" +msgstr "" + +msgid "The Brandes Algorithm takes advantage of the sparse graphs for evaluating the betweenness centrality score of all vertices." +msgstr "" + +msgid "Betweenness centrality measures the extent to which a vertex lies on the shortest paths between all other pairs of vertices. Vertices with a high betweenness centrality score may have considerable influence in a network by the virtue of their control over the shortest paths passing between them." +msgstr "" + +msgid "The removal of these vertices will affect the network by disrupting the it, as most of the shortest paths between vertices pass through them." +msgstr "" + +msgid "This implementation work for both directed and undirected graphs." +msgstr "" + +msgid "Running time: :math:`\\Theta(VE)`" +msgstr "" + +msgid "Running space: :math:`\\Theta(VE)`" +msgstr "" + +msgid "Throws when there are no edges in the graph" +msgstr "" + +msgid "pgr_betweennessCentrality(`Edges SQL`_, [``directed``])" +msgstr "" + +msgid "Returns set of ``(vid, centrality)``" +msgstr "" + +msgid "For a directed graph with edges :math:`\\{1, 2, 3, 4\\}`." +msgstr "" + +msgid "Explanation" +msgstr "" + +msgid "The betweenness centrality are between parenthesis." +msgstr "" + +msgid "The leaf vertices have betweenness centrality :math:`0`." +msgstr "" + +msgid "Betweenness centrality of vertex :math:`6` is higher than of vertex :math:`10`." +msgstr "" + +msgid "Removing vertex :math:`6` will create three graph components." +msgstr "" + +msgid "Removing vertex :math:`10` will create two graph components." +msgstr "" + +msgid "``vid``" +msgstr "" + +msgid "Identifier of the vertex" +msgstr "" + +msgid "``centrality``" +msgstr "" + +msgid "Relative betweenness centrality score of the vertex (will be in range [0,1])" +msgstr "" + +msgid "Boost's `betweenness_centrality `_" +msgstr "" + +msgid "Queries use the :doc:`sampledata` network." +msgstr "" + msgid "``pgr_biconnectedComponents``" msgstr "" @@ -8806,9 +8902,6 @@ msgstr "" msgid "``pgr_dagShortestPath`` — Returns the shortest path(s) for weighted directed acyclic graphs(DAG). In particular, the DAG shortest paths algorithm implemented by Boost.Graph." msgstr "" -msgid "New **experimental** function:" -msgstr "" - msgid "pgr_dagShortestPath(Combinations)" msgstr "" @@ -10639,9 +10732,6 @@ msgstr "" msgid "``pgr_kruskalBFS`` — Kruskal's algorithm for Minimum Spanning Tree with breadth First Search ordering." msgstr "" -msgid "Version 3.7.0" -msgstr "" - msgid "Visits and extracts the nodes information in Breath First Search ordering of the Minimum Spanning Tree created using Kruskal's algorithm." msgstr "" @@ -12070,9 +12160,6 @@ msgstr "" msgid "Rechability of a subgraph" msgstr "" -msgid "``vid``" -msgstr "" - msgid "Identifier of the source of the edges" msgstr "" @@ -13465,9 +13552,6 @@ msgstr "" msgid "``pgr_findCloseEdges`` (Many points)" msgstr "" -msgid "New experimental functions" -msgstr "" - msgid "Ordering" msgstr "" From bf52d3728f78f447c99b51d207fca72fffa08d81 Mon Sep 17 00:00:00 2001 From: Weblate Date: Fri, 16 Aug 2024 18:52:56 +0000 Subject: [PATCH 322/428] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Co-authored-by: Weblate Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/ Translation: pgRouting/pgRouting --- .../de/LC_MESSAGES/pgrouting_doc_strings.po | 127 +++++++++-- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 187 ++++++++++++++--- .../ja/LC_MESSAGES/pgrouting_doc_strings.po | 138 ++++++++++-- .../ko/LC_MESSAGES/pgrouting_doc_strings.po | 130 ++++++++++-- .../LC_MESSAGES/pgrouting_doc_strings.po | 197 ++++++++++++++---- 5 files changed, 666 insertions(+), 113 deletions(-) diff --git a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po index 93b70e10bc..c774c618cf 100644 --- a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-05-13 17:23+0000\n" +"POT-Creation-Date: 2024-08-16 18:52+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -3908,6 +3908,14 @@ msgid "" "an undirected graph." msgstr "" +msgid ":doc:`metrics-family`" +msgstr "" + +msgid "" +":doc:`pgr_betweennessCentrality` - Calculates relative betweenness " +"centrality using Brandes Algorithm" +msgstr "" + msgid ":doc:`TRSP-family`" msgstr "" @@ -4376,6 +4384,15 @@ msgid "" "utf8=%E2%9C%93&q=milestone%3A%22Release%203.7.0%22>`__" msgstr "" +msgid "New experimental functions" +msgstr "" + +msgid "Metrics" +msgstr "" + +msgid "pgr_betweennessCentrality" +msgstr "" + msgid "Official functions changes" msgstr "" @@ -4470,6 +4487,9 @@ msgstr "" msgid "Kruskal's running time: :math:`O(E * log E)`" msgstr "" +msgid "Metrics - Family of functions" +msgstr "" + msgid "Migration guide" msgstr "" @@ -9077,6 +9097,99 @@ msgstr "" msgid "https://en.wikipedia.org/wiki/Bellman%E2%80%93Ford_algorithm" msgstr "" +msgid "``pgr_betweennessCentrality``" +msgstr "" + +msgid "" +"``pgr_betweennessCentrality`` - Calculates the relative betweeness " +"centrality using Brandes Algorithm" +msgstr "" + +msgid "Version 3.7.0" +msgstr "" + +msgid "New **experimental** function:" +msgstr "" + +msgid "" +"The Brandes Algorithm takes advantage of the sparse graphs for evaluating " +"the betweenness centrality score of all vertices." +msgstr "" + +msgid "" +"Betweenness centrality measures the extent to which a vertex lies on the " +"shortest paths between all other pairs of vertices. Vertices with a high " +"betweenness centrality score may have considerable influence in a network by " +"the virtue of their control over the shortest paths passing between them." +msgstr "" + +msgid "" +"The removal of these vertices will affect the network by disrupting the it, " +"as most of the shortest paths between vertices pass through them." +msgstr "" + +msgid "This implementation work for both directed and undirected graphs." +msgstr "" + +msgid "Running time: :math:`\\Theta(VE)`" +msgstr "" + +msgid "Running space: :math:`\\Theta(VE)`" +msgstr "" + +msgid "Throws when there are no edges in the graph" +msgstr "" + +msgid "pgr_betweennessCentrality(`Edges SQL`_, [``directed``])" +msgstr "" + +msgid "Returns set of ``(vid, centrality)``" +msgstr "" + +msgid "For a directed graph with edges :math:`\\{1, 2, 3, 4\\}`." +msgstr "" + +msgid "Explanation" +msgstr "" + +msgid "The betweenness centrality are between parenthesis." +msgstr "" + +msgid "The leaf vertices have betweenness centrality :math:`0`." +msgstr "" + +msgid "" +"Betweenness centrality of vertex :math:`6` is higher than of vertex :math:" +"`10`." +msgstr "" + +msgid "Removing vertex :math:`6` will create three graph components." +msgstr "" + +msgid "Removing vertex :math:`10` will create two graph components." +msgstr "" + +msgid "``vid``" +msgstr "" + +msgid "Identifier of the vertex" +msgstr "" + +msgid "``centrality``" +msgstr "" + +msgid "" +"Relative betweenness centrality score of the vertex (will be in range [0,1])" +msgstr "" + +msgid "" +"Boost's `betweenness_centrality `_" +msgstr "" + +msgid "Queries use the :doc:`sampledata` network." +msgstr "" + msgid "``pgr_biconnectedComponents``" msgstr "" @@ -10181,9 +10294,6 @@ msgid "" "implemented by Boost.Graph." msgstr "" -msgid "New **experimental** function:" -msgstr "" - msgid "pgr_dagShortestPath(Combinations)" msgstr "" @@ -12354,9 +12464,6 @@ msgid "" "breadth First Search ordering." msgstr "" -msgid "Version 3.7.0" -msgstr "" - msgid "" "Visits and extracts the nodes information in Breath First Search ordering of " "the Minimum Spanning Tree created using Kruskal's algorithm." @@ -14055,9 +14162,6 @@ msgstr "" msgid "Rechability of a subgraph" msgstr "" -msgid "``vid``" -msgstr "" - msgid "Identifier of the source of the edges" msgstr "" @@ -15822,9 +15926,6 @@ msgstr "" msgid "``pgr_findCloseEdges`` (Many points)" msgstr "" -msgid "New experimental functions" -msgstr "" - msgid "Ordering" msgstr "" diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index f01a3783d5..2fc2018ac3 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-05-13 17:23+0000\n" +"POT-Creation-Date: 2024-08-16 18:52+0000\n" "PO-Revision-Date: 2024-05-28 15:47+0000\n" "Last-Translator: DeepL \n" "Language-Team: Spanish =0 \\} & \\quad \\text{if } reverse\\_cost " "\\neq \\varnothing \\\\ \\end{cases}`" msgstr "" -":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 \\n" -"eq \\varnothing \\\\ \\end{cases}`" +":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 "Undirected graph" msgstr "Grafo no dirigido" @@ -4122,17 +4122,16 @@ msgid "" "target_i, reverse\\_cost_i) \\text{ when } reverse\\_cost_i >=0)\\} & \\quad " "\\text{ if } reverse\\_cost \\neq \\varnothing \\\\ \\end{cases}`" msgstr "" -":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 \\n" -"eq \\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}`" msgid "The problem" msgstr "El problema" @@ -4390,6 +4389,15 @@ msgstr "" ":doc:`pgr_cuthillMckeeOrdering` - Ordenamiento Cuthill-McKee de grafo sin no " "dirigido." +#, fuzzy +msgid ":doc:`metrics-family`" +msgstr ":doc:`prim-family`" + +msgid "" +":doc:`pgr_betweennessCentrality` - Calculates relative betweenness " +"centrality using Brandes Algorithm" +msgstr "" + msgid ":doc:`TRSP-family`" msgstr ":doc:`TRSP-family`" @@ -4936,6 +4944,16 @@ msgstr "" "versión, consulte la `meta cerrada 3.7.0 `_" +msgid "New experimental functions" +msgstr "Nuevas funciones experimentales" + +#, fuzzy +msgid "Metrics" +msgstr "Restricciones" + +msgid "pgr_betweennessCentrality" +msgstr "" + msgid "Official functions changes" msgstr "Cambios en las funciones oficiales" @@ -5043,6 +5061,10 @@ msgstr "Se minimiza el peso total de todos los bordes del árbol o bosque." msgid "Kruskal's running time: :math:`O(E * log E)`" msgstr "Tiempo de ejecución de Kruskal: :math:`O(E * log E)`" +#, fuzzy +msgid "Metrics - Family of functions" +msgstr "Prim - Familia de funciones" + msgid "Migration guide" msgstr "Guía de migración" @@ -10490,6 +10512,116 @@ msgstr "Uso de una tabla de combinaciones en un grafo **no dirigido**." msgid "https://en.wikipedia.org/wiki/Bellman%E2%80%93Ford_algorithm" msgstr "https://en.wikipedia.org/wiki/Bellman%E2%80%93Ford_algorithm" +msgid "``pgr_betweennessCentrality``" +msgstr "" + +msgid "" +"``pgr_betweennessCentrality`` - Calculates the relative betweeness " +"centrality using Brandes Algorithm" +msgstr "" + +msgid "Version 3.7.0" +msgstr "Versión 3.7.0" + +msgid "New **experimental** function:" +msgstr "Nueva función **experimental**:" + +msgid "" +"The Brandes Algorithm takes advantage of the sparse graphs for evaluating " +"the betweenness centrality score of all vertices." +msgstr "" + +msgid "" +"Betweenness centrality measures the extent to which a vertex lies on the " +"shortest paths between all other pairs of vertices. Vertices with a high " +"betweenness centrality score may have considerable influence in a network by " +"the virtue of their control over the shortest paths passing between them." +msgstr "" + +msgid "" +"The removal of these vertices will affect the network by disrupting the it, " +"as most of the shortest paths between vertices pass through them." +msgstr "" + +#, fuzzy +msgid "This implementation work for both directed and undirected graphs." +msgstr "" +"La implementación funciona para los grafos **dirigidos** y **no dirigidos**." + +#, fuzzy +msgid "Running time: :math:`\\Theta(VE)`" +msgstr "Tiempo de ejecución: :math:`O(V + E)`" + +#, fuzzy +msgid "Running space: :math:`\\Theta(VE)`" +msgstr "Tiempo de ejecución: :math:`O(V + E)`" + +#, fuzzy +msgid "Throws when there are no edges in the graph" +msgstr "EMPTY SET es regresado cuando no hay aristas en el grafo." + +#, fuzzy +msgid "pgr_betweennessCentrality(`Edges SQL`_, [``directed``])" +msgstr "pgr_lineGraph(`SQL de aristas`_, [``directed``])" + +#, fuzzy +msgid "Returns set of ``(vid, centrality)``" +msgstr "Regresa el conjunto de ``(edge, cost)``" + +#, fuzzy +msgid "For a directed graph with edges :math:`\\{1, 2, 3, 4\\}`." +msgstr "Para sub-grafo con aristas :math:`\\{1, 2, 3, 4\\}`." + +#, fuzzy +msgid "Explanation" +msgstr "Aplicaciones" + +msgid "The betweenness centrality are between parenthesis." +msgstr "" + +msgid "The leaf vertices have betweenness centrality :math:`0`." +msgstr "" + +#, fuzzy +msgid "" +"Betweenness centrality of vertex :math:`6` is higher than of vertex :math:" +"`10`." +msgstr "Del vértice :math:`11` al vértice :math:`12`" + +#, fuzzy +msgid "Removing vertex :math:`6` will create three graph components." +msgstr "El vértice :math:`w` se elimina del grafo" + +msgid "Removing vertex :math:`10` will create two graph components." +msgstr "" + +msgid "``vid``" +msgstr "" + +#, fuzzy +msgid "Identifier of the vertex" +msgstr "Identificador del vértice." + +#, fuzzy +msgid "``centrality``" +msgstr "``capacity``" + +msgid "" +"Relative betweenness centrality score of the vertex (will be in range [0,1])" +msgstr "" + +#, fuzzy +msgid "" +"Boost's `betweenness_centrality `_" +msgstr "" +"`Boost: Algoritmo de Circutios de Hawick `__" + +#, fuzzy +msgid "Queries use the :doc:`sampledata` network." +msgstr "Consultas utilizan la red :doc:`sampledata`." + msgid "``pgr_biconnectedComponents``" msgstr "``pgr_biconnectedComponents``" @@ -11483,8 +11615,8 @@ msgid "" "An alternate method to create a routing topology use :doc:" "`pgr_extractVertices`" msgstr "" -"Un método alternativo para crear una topología de ruteo es utilizar " -":doc:`pgr_extractVertices`" +"Un método alternativo para crear una topología de ruteo es utilizar :doc:" +"`pgr_extractVertices`" msgid "Make sure the database does not have the ``vertices_table``" msgstr "Asegurarse de que la base de datos no tiene ``vertices_table``" @@ -11819,9 +11951,6 @@ msgstr "" "acíclicos dirigidos ponderados (DAG). En particular, el algoritmo de rutas " "más cortas de DAG implementado por Boost.Graph." -msgid "New **experimental** function:" -msgstr "Nueva función **experimental**:" - msgid "pgr_dagShortestPath(Combinations)" msgstr "pgr_dagShortestPath(Combinaciones)" @@ -14384,9 +14513,6 @@ msgstr "" "``pgr_kruskalBFS`` — Algoritmo de Kruskal para el Árbol de Expansión Mínimo " "con orden de Primera Búsqueda en Anchura." -msgid "Version 3.7.0" -msgstr "Versión 3.7.0" - msgid "" "Visits and extracts the nodes information in Breath First Search ordering of " "the Minimum Spanning Tree created using Kruskal's algorithm." @@ -16367,9 +16493,6 @@ msgstr "Regresa el conjunto de |result-closure|" msgid "Rechability of a subgraph" msgstr "" -msgid "``vid``" -msgstr "" - msgid "Identifier of the source of the edges" msgstr "Identificador del nodo inicial de las aristas" @@ -18457,9 +18580,6 @@ msgstr "" msgid "``pgr_findCloseEdges`` (Many points)" msgstr "" -msgid "New experimental functions" -msgstr "Nuevas funciones experimentales" - msgid "Ordering" msgstr "Ordenamiento" @@ -21617,4 +21737,3 @@ msgstr "pgr_withPointsDD es pgr_drivingDistance **con puntos**" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "pgr_withPoints es pgr_dijkstraVia **con puntos**" - diff --git a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po index 401ee81197..29afdc8518 100644 --- a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-05-13 17:23+0000\n" +"POT-Creation-Date: 2024-08-16 18:52+0000\n" "PO-Revision-Date: 2024-05-01 03:45+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Japanese `__" msgstr "" +msgid "New experimental functions" +msgstr "" + +msgid "Metrics" +msgstr "" + +msgid "pgr_betweennessCentrality" +msgstr "" + msgid "Official functions changes" msgstr "" @@ -4554,6 +4572,10 @@ msgstr "" msgid "Kruskal's running time: :math:`O(E * log E)`" msgstr "" +#, fuzzy +msgid "Metrics - Family of functions" +msgstr "ダイクストラ関連機能" + msgid "Migration guide" msgstr "" @@ -9195,6 +9217,105 @@ msgstr "" msgid "https://en.wikipedia.org/wiki/Bellman%E2%80%93Ford_algorithm" msgstr "" +msgid "``pgr_betweennessCentrality``" +msgstr "" + +msgid "" +"``pgr_betweennessCentrality`` - Calculates the relative betweeness " +"centrality using Brandes Algorithm" +msgstr "" + +#, fuzzy +msgid "Version 3.7.0" +msgstr "バージョン 3.0.0" + +msgid "New **experimental** function:" +msgstr "" + +msgid "" +"The Brandes Algorithm takes advantage of the sparse graphs for evaluating " +"the betweenness centrality score of all vertices." +msgstr "" + +msgid "" +"Betweenness centrality measures the extent to which a vertex lies on the " +"shortest paths between all other pairs of vertices. Vertices with a high " +"betweenness centrality score may have considerable influence in a network by " +"the virtue of their control over the shortest paths passing between them." +msgstr "" + +msgid "" +"The removal of these vertices will affect the network by disrupting the it, " +"as most of the shortest paths between vertices pass through them." +msgstr "" + +#, fuzzy +msgid "This implementation work for both directed and undirected graphs." +msgstr "導かれないグラフ。" + +msgid "Running time: :math:`\\Theta(VE)`" +msgstr "" + +msgid "Running space: :math:`\\Theta(VE)`" +msgstr "" + +msgid "Throws when there are no edges in the graph" +msgstr "" + +#, fuzzy +msgid "pgr_betweennessCentrality(`Edges SQL`_, [``directed``])" +msgstr "p" + +#, fuzzy +msgid "Returns set of ``(vid, centrality)``" +msgstr "``(seq, node, cost, agg_cost)`` の1セットを返却します" + +msgid "For a directed graph with edges :math:`\\{1, 2, 3, 4\\}`." +msgstr "" + +msgid "Explanation" +msgstr "" + +msgid "The betweenness centrality are between parenthesis." +msgstr "" + +msgid "The leaf vertices have betweenness centrality :math:`0`." +msgstr "" + +msgid "" +"Betweenness centrality of vertex :math:`6` is higher than of vertex :math:" +"`10`." +msgstr "" + +msgid "Removing vertex :math:`6` will create three graph components." +msgstr "" + +msgid "Removing vertex :math:`10` will create two graph components." +msgstr "" + +msgid "``vid``" +msgstr "" + +#, fuzzy +msgid "Identifier of the vertex" +msgstr "終了ノードの識別子。" + +msgid "``centrality``" +msgstr "" + +msgid "" +"Relative betweenness centrality score of the vertex (will be in range [0,1])" +msgstr "" + +msgid "" +"Boost's `betweenness_centrality `_" +msgstr "" + +#, fuzzy +msgid "Queries use the :doc:`sampledata` network." +msgstr "クエリは :doc:`sampledata` ネットワークを使用します。" + msgid "``pgr_biconnectedComponents``" msgstr "" @@ -10302,9 +10423,6 @@ msgid "" "implemented by Boost.Graph." msgstr "" -msgid "New **experimental** function:" -msgstr "" - msgid "pgr_dagShortestPath(Combinations)" msgstr "" @@ -12488,10 +12606,6 @@ msgid "" "breadth First Search ordering." msgstr "" -#, fuzzy -msgid "Version 3.7.0" -msgstr "バージョン 3.0.0" - msgid "" "Visits and extracts the nodes information in Breath First Search ordering of " "the Minimum Spanning Tree created using Kruskal's algorithm." @@ -14200,9 +14314,6 @@ msgstr "" msgid "Rechability of a subgraph" msgstr "" -msgid "``vid``" -msgstr "" - msgid "Identifier of the source of the edges" msgstr "" @@ -15983,9 +16094,6 @@ msgstr "" msgid "``pgr_findCloseEdges`` (Many points)" msgstr "" -msgid "New experimental functions" -msgstr "" - msgid "Ordering" msgstr "" @@ -18761,5 +18869,3 @@ msgstr "" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "" - -#, fuzzy diff --git a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po index 3c6ffc6234..f5b001a61a 100644 --- a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-05-13 17:23+0000\n" +"POT-Creation-Date: 2024-08-16 18:52+0000\n" "PO-Revision-Date: 2022-12-13 12:30+0000\n" "Last-Translator: Hyung-Gyu Ryoo \n" "Language-Team: Korean `__" msgstr "" +msgid "New experimental functions" +msgstr "" + +msgid "Metrics" +msgstr "" + +msgid "pgr_betweennessCentrality" +msgstr "" + msgid "Official functions changes" msgstr "" @@ -4491,6 +4509,10 @@ msgstr "" msgid "Kruskal's running time: :math:`O(E * log E)`" msgstr "" +#, fuzzy +msgid "Metrics - Family of functions" +msgstr ":doc:`pgr_withPoints`" + msgid "Migration guide" msgstr "" @@ -9116,6 +9138,100 @@ msgstr "" msgid "https://en.wikipedia.org/wiki/Bellman%E2%80%93Ford_algorithm" msgstr "" +msgid "``pgr_betweennessCentrality``" +msgstr "" + +msgid "" +"``pgr_betweennessCentrality`` - Calculates the relative betweeness " +"centrality using Brandes Algorithm" +msgstr "" + +msgid "Version 3.7.0" +msgstr "" + +msgid "New **experimental** function:" +msgstr "" + +msgid "" +"The Brandes Algorithm takes advantage of the sparse graphs for evaluating " +"the betweenness centrality score of all vertices." +msgstr "" + +msgid "" +"Betweenness centrality measures the extent to which a vertex lies on the " +"shortest paths between all other pairs of vertices. Vertices with a high " +"betweenness centrality score may have considerable influence in a network by " +"the virtue of their control over the shortest paths passing between them." +msgstr "" + +msgid "" +"The removal of these vertices will affect the network by disrupting the it, " +"as most of the shortest paths between vertices pass through them." +msgstr "" + +#, fuzzy +msgid "This implementation work for both directed and undirected graphs." +msgstr ":doc:`pgr_bridges` - 무방향 그래프의 브릿지." + +msgid "Running time: :math:`\\Theta(VE)`" +msgstr "" + +msgid "Running space: :math:`\\Theta(VE)`" +msgstr "" + +msgid "Throws when there are no edges in the graph" +msgstr "" + +msgid "pgr_betweennessCentrality(`Edges SQL`_, [``directed``])" +msgstr "" + +msgid "Returns set of ``(vid, centrality)``" +msgstr "" + +msgid "For a directed graph with edges :math:`\\{1, 2, 3, 4\\}`." +msgstr "" + +msgid "Explanation" +msgstr "" + +msgid "The betweenness centrality are between parenthesis." +msgstr "" + +msgid "The leaf vertices have betweenness centrality :math:`0`." +msgstr "" + +msgid "" +"Betweenness centrality of vertex :math:`6` is higher than of vertex :math:" +"`10`." +msgstr "" + +msgid "Removing vertex :math:`6` will create three graph components." +msgstr "" + +msgid "Removing vertex :math:`10` will create two graph components." +msgstr "" + +msgid "``vid``" +msgstr "" + +msgid "Identifier of the vertex" +msgstr "" + +msgid "``centrality``" +msgstr "" + +msgid "" +"Relative betweenness centrality score of the vertex (will be in range [0,1])" +msgstr "" + +msgid "" +"Boost's `betweenness_centrality `_" +msgstr "" + +msgid "Queries use the :doc:`sampledata` network." +msgstr "" + msgid "``pgr_biconnectedComponents``" msgstr "" @@ -10222,9 +10338,6 @@ msgid "" "implemented by Boost.Graph." msgstr "" -msgid "New **experimental** function:" -msgstr "" - msgid "pgr_dagShortestPath(Combinations)" msgstr "" @@ -12396,9 +12509,6 @@ msgid "" "breadth First Search ordering." msgstr "" -msgid "Version 3.7.0" -msgstr "" - msgid "" "Visits and extracts the nodes information in Breath First Search ordering of " "the Minimum Spanning Tree created using Kruskal's algorithm." @@ -14098,9 +14208,6 @@ msgstr "" msgid "Rechability of a subgraph" msgstr "" -msgid "``vid``" -msgstr "" - msgid "Identifier of the source of the edges" msgstr "" @@ -15871,9 +15978,6 @@ msgstr "" msgid "``pgr_findCloseEdges`` (Many points)" msgstr "" -msgid "New experimental functions" -msgstr "" - msgid "Ordering" msgstr "" diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 35604aa3ca..1607972d56 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-05-13 17:23+0000\n" +"POT-Creation-Date: 2024-08-16 18:52+0000\n" "PO-Revision-Date: 2024-05-28 16:17+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Chinese (Simplified) `__ 的 Git 关闭里程碑" +msgid "New experimental functions" +msgstr "新的实验函数" + +#, fuzzy +msgid "Metrics" +msgstr "限制" + +msgid "pgr_betweennessCentrality" +msgstr "" + msgid "Official functions changes" msgstr "官方功能变更" @@ -4602,8 +4622,8 @@ msgid "" "`#2635 `__ pgr_LineGraph " "ignores directed flag and use negative values for identifiers." msgstr "" -"`#2516 `__标准化输出pgr_aStar." +"`#2516 `__标准化输出" +"pgr_aStar." #, fuzzy msgid "``pgr_lineGraph``" @@ -4668,6 +4688,10 @@ msgstr "树或森林中所有边的总权重最小化。" msgid "Kruskal's running time: :math:`O(E * log E)`" msgstr "克鲁斯卡尔的运行时间： :math:`O(E * log E)`" +#, fuzzy +msgid "Metrics - Family of functions" +msgstr "Prim - 函数族" + msgid "Migration guide" msgstr "迁移指南" @@ -6566,8 +6590,8 @@ msgid "" "vertex :math:`4`. And the closest edge to vertex :math:`4` is edge :math:" "`14`." msgstr "" -"使用 :doc:`pgr_findCloseEdges` 距离组件 :math:`1` 最近的顶点是顶点 " -":math:`4`。 距离顶点 :math:`4` 最近的边是 边 :math:`14`。" +"使用 :doc:`pgr_findCloseEdges` 距离组件 :math:`1` 最近的顶点是顶点 :math:" +"`4`。 距离顶点 :math:`4` 最近的边是 边 :math:`14`。" msgid "" "The ``edge`` can be used to connect the components, using the ``fraction`` " @@ -9640,6 +9664,116 @@ msgstr "在**无向**图上使用组合表。" msgid "https://en.wikipedia.org/wiki/Bellman%E2%80%93Ford_algorithm" msgstr "https://en.wikipedia.org/wiki/Bellman%E2%80%93Ford_algorithm" +msgid "``pgr_betweennessCentrality``" +msgstr "" + +msgid "" +"``pgr_betweennessCentrality`` - Calculates the relative betweeness " +"centrality using Brandes Algorithm" +msgstr "" + +#, fuzzy +msgid "Version 3.7.0" +msgstr "版本3.6.0" + +msgid "New **experimental** function:" +msgstr "新的**实验**函数：" + +msgid "" +"The Brandes Algorithm takes advantage of the sparse graphs for evaluating " +"the betweenness centrality score of all vertices." +msgstr "" + +msgid "" +"Betweenness centrality measures the extent to which a vertex lies on the " +"shortest paths between all other pairs of vertices. Vertices with a high " +"betweenness centrality score may have considerable influence in a network by " +"the virtue of their control over the shortest paths passing between them." +msgstr "" + +msgid "" +"The removal of these vertices will affect the network by disrupting the it, " +"as most of the shortest paths between vertices pass through them." +msgstr "" + +#, fuzzy +msgid "This implementation work for both directed and undirected graphs." +msgstr "该实现适用于**有向**图和**无向**图。" + +#, fuzzy +msgid "Running time: :math:`\\Theta(VE)`" +msgstr "运行时间：:math:`O(V + E)`" + +#, fuzzy +msgid "Running space: :math:`\\Theta(VE)`" +msgstr "运行时间：:math:`O(V + E)`" + +#, fuzzy +msgid "Throws when there are no edges in the graph" +msgstr "当图中没有边时，返回 EMPTY SET。" + +#, fuzzy +msgid "pgr_betweennessCentrality(`Edges SQL`_, [``directed``])" +msgstr "pgr_lineGraph(`Edges SQL`_, [``directed``])" + +#, fuzzy +msgid "Returns set of ``(vid, centrality)``" +msgstr "返回集合``(edge, cost)``" + +#, fuzzy +msgid "For a directed graph with edges :math:`\\{1, 2, 3, 4\\}`." +msgstr "对于有边 :math:`\\{1, 2, 3, 4\\}`的有向子图。" + +#, fuzzy +msgid "Explanation" +msgstr "应用" + +msgid "The betweenness centrality are between parenthesis." +msgstr "" + +msgid "The leaf vertices have betweenness centrality :math:`0`." +msgstr "" + +#, fuzzy +msgid "" +"Betweenness centrality of vertex :math:`6` is higher than of vertex :math:" +"`10`." +msgstr "从顶点 :math:`11` 到顶点 :math:`12`" + +#, fuzzy +msgid "Removing vertex :math:`6` will create three graph components." +msgstr "顶点 :math:`w`已从图中移除" + +msgid "Removing vertex :math:`10` will create two graph components." +msgstr "" + +msgid "``vid``" +msgstr "``vid``" + +#, fuzzy +msgid "Identifier of the vertex" +msgstr "顶点的标识符。" + +#, fuzzy +msgid "``centrality``" +msgstr "``capacity``" + +msgid "" +"Relative betweenness centrality score of the vertex (will be in range [0,1])" +msgstr "" + +#, fuzzy +msgid "" +"Boost's `betweenness_centrality `_" +msgstr "" +"`Boost：Hawick 电路算法`__" + +#, fuzzy +msgid "Queries use the :doc:`sampledata` network." +msgstr "查询使用 :doc:`示例数据`网络。" + msgid "``pgr_biconnectedComponents``" msgstr "``pgr_biconnectedComponents``" @@ -9744,12 +9878,11 @@ msgid "" "general algorithm, like Dijkstra's Algorithm which runs in :math:`O(|E|log|" "V|)` time." msgstr "" -"众所周知，在无权重图中，使用广度优先搜索（Breadth First Search）可以在 " -":math:`O(|E|)` 内找到单个源点与所有其他顶点之间的最短路径，也就是说，距离是指" -"从源点到另一个顶点所需的最少边数。我们也可以把这样的图解释为加权图，" -"其中每条边的权重为 " -":math:`1`。如果图中不是所有边的权重都相同，我们就需要一种更通用的算法，比如 " -"Dijkstra 算法，它的运行时间为 :math:`O(|E|log|V||)`。" +"众所周知，在无权重图中，使用广度优先搜索（Breadth First Search）可以在 :math:" +"`O(|E|)` 内找到单个源点与所有其他顶点之间的最短路径，也就是说，距离是指从源点" +"到另一个顶点所需的最少边数。我们也可以把这样的图解释为加权图，其中每条边的权" +"重为 :math:`1`。如果图中不是所有边的权重都相同，我们就需要一种更通用的算法，" +"比如 Dijkstra 算法，它的运行时间为 :math:`O(|E|log|V||)`。" msgid "" "However if the weights are more constrained, we can use a faster algorithm. " @@ -9813,7 +9946,8 @@ msgstr "" msgid "" "**Note:** Using the :doc:`sampledata` Network as all weights are same (i.e :" "math:`1``)" -msgstr "**注意:** 使用 :doc:`sampledata` 网络，因为所有权重都相同（即为 :math:`1`）" +msgstr "" +"**注意:** 使用 :doc:`sampledata` 网络，因为所有权重都相同（即为 :math:`1`）" msgid "https://cp-algorithms.com/graph/01_bfs.html" msgstr "https://cp-algorithms.com/graph/01_bfs.html" @@ -10851,9 +10985,6 @@ msgstr "" "``pgr_dagShortestPath`` — 返回加权有向无环图（DAG）的最短路径（path）。特别" "是，由Boost.Graph实现的DAG最短路径算法。" -msgid "New **experimental** function:" -msgstr "新的**实验**函数：" - msgid "pgr_dagShortestPath(Combinations)" msgstr "pgr_dagShortestPath(组合)" @@ -11655,7 +11786,8 @@ msgstr "" msgid "" "The best one is :math:`(11 \\rightarrow 16)` with a cost of :math:`1` " "(lines: `11` and `12`)" -msgstr "最好的方法是 :math:`(11/rightarrow 16)`，成本是 :math:`1` （行：`11`和`12`）" +msgstr "" +"最好的方法是 :math:`(11/rightarrow 16)`，成本是 :math:`1` （行：`11`和`12`）" msgid "" "making a connection from the second subway line :math:`\\{15, 16\\}` to the " @@ -13188,10 +13320,6 @@ msgid "" "breadth First Search ordering." msgstr "``pgr_kruskalBFS`` — Kruskal 的最小生成树算法，具有广度优先搜索排序。" -#, fuzzy -msgid "Version 3.7.0" -msgstr "版本3.6.0" - msgid "" "Visits and extracts the nodes information in Breath First Search ordering of " "the Minimum Spanning Tree created using Kruskal's algorithm." @@ -13368,7 +13496,8 @@ msgstr ":math:`L(G)` 的每个顶点代表 :math:`G` 的一条边。" msgid "" "Two vertices of :math:`L(G)` are adjacent if and only if their corresponding " "edges share a common endpoint in :math:`G`" -msgstr ":math:`L(G)` 的两个顶点相邻当且仅当它们对应的边共享 :math:`G` 中的公共端点" +msgstr "" +":math:`L(G)` 的两个顶点相邻当且仅当它们对应的边共享 :math:`G` 中的公共端点" #, fuzzy msgid "" @@ -15015,9 +15144,6 @@ msgstr "Returns set of |result-closure|" msgid "Rechability of a subgraph" msgstr "子图的可达性" -msgid "``vid``" -msgstr "``vid``" - msgid "Identifier of the source of the edges" msgstr "边来源的标识符" @@ -15263,8 +15389,9 @@ msgstr "" msgid "" "When executing the :doc:`pgr_trsp` algorithm for the conflicting path, there " "is no ``U_turn_on_edge`` flag." -msgstr "当执行 :doc:`pgr_trsp` 针对冲突路径的拟议算法时，没有 ``U_turn_on_edge`` " -"标志。" +msgstr "" +"当执行 :doc:`pgr_trsp` 针对冲突路径的拟议算法时，没有 ``U_turn_on_edge`` 标" +"志。" msgid "" "Therefore the result ignores the ``U_turn_on_edge`` flag when set to " @@ -15448,8 +15575,8 @@ msgid "" "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 "" -"第一步，执行 :doc:`pgr_withPointsVia` 不考虑在同一条边上进行掉头。但是路径 " -":math:`9 \\rightarrow 16` （第4行和第5行）受到限制，结果中使用了它。" +"第一步，执行 :doc:`pgr_withPointsVia` 不考虑在同一条边上进行掉头。但是路径 :" +"math:`9 \\rightarrow 16` （第4行和第5行）受到限制，结果中使用了它。" msgid "" "When executing the :doc:`pgr_trsp_withPoints` algorithm for the conflicting " @@ -15464,9 +15591,9 @@ msgid "" "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 "" -"因此，当设置为 ``false`` 时，结果会忽略 ``U_turn_on_edge`` 标志。 从 " -":doc:`pgr_withPointsVia` 结果中，它删除了冲突路径，并使用 :doc:`pgr_trsp` " -"算法的结果构建解决方案。 在这种情况下，使用相同的边缘完成 U 形转弯。" +"因此，当设置为 ``false`` 时，结果会忽略 ``U_turn_on_edge`` 标志。 从 :doc:" +"`pgr_withPointsVia` 结果中，它删除了冲突路径，并使用 :doc:`pgr_trsp` 算法的结" +"果构建解决方案。 在这种情况下，使用相同的边缘完成 U 形转弯。" msgid "pgr_trsp_withPoints - Proposed" msgstr "pgr_trsp_withPoints - 拟议" @@ -17035,9 +17162,6 @@ msgstr "``pgr_findCloseEdges``（单点）" msgid "``pgr_findCloseEdges`` (Many points)" msgstr "``pgr_findCloseEdges``（多点）" -msgid "New experimental functions" -msgstr "新的实验函数" - msgid "Ordering" msgstr "排序" @@ -20079,4 +20203,3 @@ msgstr "pgr_withPointsDD 是**带有点**的 pgr_drivenDistance" #, fuzzy msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "pgr_withPointsvia 是 **带有点** 的" - From d4e02cf0d71eb7ac915d529bea346c57849d5919 Mon Sep 17 00:00:00 2001 From: DeepL Date: Fri, 16 Aug 2024 20:14:51 +0000 Subject: [PATCH 323/428] Translated using Weblate (Spanish) Currently translated at 92.9% (4928 of 5303 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 2fc2018ac3..f9be50d6ed 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-08-16 18:52+0000\n" -"PO-Revision-Date: 2024-05-28 15:47+0000\n" +"PO-Revision-Date: 2024-08-16 20:15+0000\n" "Last-Translator: DeepL \n" "Language-Team: Spanish \n" @@ -10556,9 +10556,8 @@ msgstr "Tiempo de ejecución: :math:`O(V + E)`" msgid "Running space: :math:`\\Theta(VE)`" msgstr "Tiempo de ejecución: :math:`O(V + E)`" -#, fuzzy msgid "Throws when there are no edges in the graph" -msgstr "EMPTY SET es regresado cuando no hay aristas en el grafo." +msgstr "Lanza cuando no hay aristas en el grafo" #, fuzzy msgid "pgr_betweennessCentrality(`Edges SQL`_, [``directed``])" @@ -10582,15 +10581,16 @@ msgstr "" msgid "The leaf vertices have betweenness centrality :math:`0`." msgstr "" -#, fuzzy msgid "" "Betweenness centrality of vertex :math:`6` is higher than of vertex :math:" "`10`." -msgstr "Del vértice :math:`11` al vértice :math:`12`" +msgstr "" +"La centralidad de entrecruzamiento del vértice :math:`6` es mayor que la del " +"vértice :math:`10`." -#, fuzzy msgid "Removing vertex :math:`6` will create three graph components." -msgstr "El vértice :math:`w` se elimina del grafo" +msgstr "" +"Al eliminar el vértice :math:`6` se crearán tres componentes del gráfico." msgid "Removing vertex :math:`10` will create two graph components." msgstr "" From dab3cb4e9e6d389c840f5cd421fe7ef10a7dd976 Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Fri, 16 Aug 2024 20:20:10 +0000 Subject: [PATCH 324/428] Translated using Weblate (Spanish) Currently translated at 93.1% (4938 of 5303 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index f9be50d6ed..701bc53493 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-08-16 18:52+0000\n" -"PO-Revision-Date: 2024-08-16 20:15+0000\n" -"Last-Translator: DeepL \n" +"PO-Revision-Date: 2024-08-16 20:24+0000\n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" "Language: es\n" @@ -4389,9 +4389,8 @@ msgstr "" ":doc:`pgr_cuthillMckeeOrdering` - Ordenamiento Cuthill-McKee de grafo sin no " "dirigido." -#, fuzzy msgid ":doc:`metrics-family`" -msgstr ":doc:`prim-family`" +msgstr ":doc:`metrics-family`" msgid "" ":doc:`pgr_betweennessCentrality` - Calculates relative betweenness " @@ -10559,13 +10558,11 @@ msgstr "Tiempo de ejecución: :math:`O(V + E)`" msgid "Throws when there are no edges in the graph" msgstr "Lanza cuando no hay aristas en el grafo" -#, fuzzy msgid "pgr_betweennessCentrality(`Edges SQL`_, [``directed``])" -msgstr "pgr_lineGraph(`SQL de aristas`_, [``directed``])" +msgstr "pgr_betweennessCentrality(`SQL de aristas`_, [``directed``])" -#, fuzzy msgid "Returns set of ``(vid, centrality)``" -msgstr "Regresa el conjunto de ``(edge, cost)``" +msgstr "Regresa el conjunto de ``(vid, centrality)``" #, fuzzy msgid "For a directed graph with edges :math:`\\{1, 2, 3, 4\\}`." @@ -10589,8 +10586,7 @@ msgstr "" "vértice :math:`10`." msgid "Removing vertex :math:`6` will create three graph components." -msgstr "" -"Al eliminar el vértice :math:`6` se crearán tres componentes del gráfico." +msgstr "Al eliminar el vértice :math:`6` se crearían tres componentes." msgid "Removing vertex :math:`10` will create two graph components." msgstr "" @@ -10598,9 +10594,8 @@ msgstr "" msgid "``vid``" msgstr "" -#, fuzzy msgid "Identifier of the vertex" -msgstr "Identificador del vértice." +msgstr "Identificador del vértice" #, fuzzy msgid "``centrality``" From dbf9aabd00d9db219d8d1a67995cabe85f674771 Mon Sep 17 00:00:00 2001 From: DeepL Date: Fri, 16 Aug 2024 20:20:49 +0000 Subject: [PATCH 325/428] Translated using Weblate (Spanish) Currently translated at 93.1% (4938 of 5303 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 701bc53493..ece0713bad 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-08-16 18:52+0000\n" "PO-Revision-Date: 2024-08-16 20:24+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"Last-Translator: DeepL \n" "Language-Team: Spanish \n" "Language: es\n" @@ -4946,9 +4946,8 @@ msgstr "" msgid "New experimental functions" msgstr "Nuevas funciones experimentales" -#, fuzzy msgid "Metrics" -msgstr "Restricciones" +msgstr "Métricas" msgid "pgr_betweennessCentrality" msgstr "" @@ -5060,9 +5059,8 @@ msgstr "Se minimiza el peso total de todos los bordes del árbol o bosque." msgid "Kruskal's running time: :math:`O(E * log E)`" msgstr "Tiempo de ejecución de Kruskal: :math:`O(E * log E)`" -#, fuzzy msgid "Metrics - Family of functions" -msgstr "Prim - Familia de funciones" +msgstr "Métricas - Familia de funciones" msgid "Migration guide" msgstr "Guía de migración" @@ -10542,18 +10540,15 @@ msgid "" "as most of the shortest paths between vertices pass through them." msgstr "" -#, fuzzy msgid "This implementation work for both directed and undirected graphs." msgstr "" -"La implementación funciona para los grafos **dirigidos** y **no dirigidos**." +"Esta implementación funciona tanto para grafos dirigidos como no dirigidos." -#, fuzzy msgid "Running time: :math:`\\Theta(VE)`" -msgstr "Tiempo de ejecución: :math:`O(V + E)`" +msgstr "Tiempo de ejecución: :math:`\\Theta(VE)`" -#, fuzzy msgid "Running space: :math:`\\Theta(VE)`" -msgstr "Tiempo de ejecución: :math:`O(V + E)`" +msgstr "Espacio de ejecución: :math:`\\Theta(VE)`" msgid "Throws when there are no edges in the graph" msgstr "Lanza cuando no hay aristas en el grafo" @@ -10564,9 +10559,8 @@ msgstr "pgr_betweennessCentrality(`SQL de aristas`_, [``directed``])" msgid "Returns set of ``(vid, centrality)``" msgstr "Regresa el conjunto de ``(vid, centrality)``" -#, fuzzy msgid "For a directed graph with edges :math:`\\{1, 2, 3, 4\\}`." -msgstr "Para sub-grafo con aristas :math:`\\{1, 2, 3, 4\\}`." +msgstr "Para un grafo dirigido con aristas :math:`{1, 2, 3, 4\\}`." #, fuzzy msgid "Explanation" From 5077087b4519af40557a2c24fe21ddb3eca4f65e Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Fri, 16 Aug 2024 20:28:33 +0000 Subject: [PATCH 326/428] Translated using Weblate (Spanish) Currently translated at 93.3% (4948 of 5303 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index ece0713bad..2ecccb68ac 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-08-16 18:52+0000\n" -"PO-Revision-Date: 2024-08-16 20:24+0000\n" -"Last-Translator: DeepL \n" +"PO-Revision-Date: 2024-08-16 20:34+0000\n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" "Language: es\n" @@ -595,7 +595,7 @@ msgid "" "A discussion about the work of Hamilton & Kirkman can be found in the book " "**Graph Theory (Biggs et al. 1976)**." msgstr "" -"Una discusión sobre el trabajo de Hamilton & Kirkman se puede encontrar en " +"Se puede encontrar una discusión sobre el trabajo de Hamilton & Kirkman en " "el libro **Graph Theory (Biggs et al. 1976)**." msgid "ISBN-13: 978-0198539162" @@ -1482,8 +1482,8 @@ msgid "" "To handle problems like: 10 (equal dimension) boxes of apples and 5 kg of " "feathers that are to be transported (not packed in boxes)." msgstr "" -"Para manejar problemas como: 10 cajas de manzanas de dimesiones iguales y 5 " -"kg de plumas que se van a transportar (no embaladas en cajas)." +"Para manejar problemas como: 10 cajas (de igual dimensión) de manzanas y 5 " +"kg de plumas que van a ser transportadas (no embaladas en cajas)." msgid "" "If the vehicle's **capacity** is measured in `boxes`, a conversion of `kg of " @@ -4076,7 +4076,7 @@ msgid "The weighted directed graph, :math:`G_d(V,E)`, is definied by:" msgstr "El gráfico dirigido ponderado, :math:`G_d(V,E)`, se define por:" msgid "the set of vertices :math:`V`" -msgstr "El conjunto de vértices :math:`V`" +msgstr "el conjunto de vértices :math:`V`" msgid ":math:`V = source \\cup target \\cup {start_{vid}} \\cup {end_{vid}}`" msgstr ":math:`V = source \\cup target \\cup {start_{vid}} \\cup {end_{vid}}`" @@ -4950,7 +4950,7 @@ msgid "Metrics" msgstr "Métricas" msgid "pgr_betweennessCentrality" -msgstr "" +msgstr "pgr_betweennessCentrality" msgid "Official functions changes" msgstr "Cambios en las funciones oficiales" @@ -10560,7 +10560,7 @@ msgid "Returns set of ``(vid, centrality)``" msgstr "Regresa el conjunto de ``(vid, centrality)``" msgid "For a directed graph with edges :math:`\\{1, 2, 3, 4\\}`." -msgstr "Para un grafo dirigido con aristas :math:`{1, 2, 3, 4\\}`." +msgstr "Para un grafo dirigido con aristas :math:`\\{1, 2, 3, 4\\}`." #, fuzzy msgid "Explanation" @@ -10591,21 +10591,19 @@ msgstr "" msgid "Identifier of the vertex" msgstr "Identificador del vértice" -#, fuzzy msgid "``centrality``" -msgstr "``capacity``" +msgstr "``centrality``" msgid "" "Relative betweenness centrality score of the vertex (will be in range [0,1])" msgstr "" -#, fuzzy msgid "" "Boost's `betweenness_centrality `_" msgstr "" -"`Boost: Algoritmo de Circutios de Hawick `__" +"`Boost: Centralidad de intermediación `__" #, fuzzy msgid "Queries use the :doc:`sampledata` network." From f4c1fe4ddc14b16f899019f838bd3b3b33c14097 Mon Sep 17 00:00:00 2001 From: DeepL Date: Fri, 16 Aug 2024 20:24:27 +0000 Subject: [PATCH 327/428] Translated using Weblate (Spanish) Currently translated at 93.3% (4948 of 5303 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 2ecccb68ac..e4db54bfb9 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-08-16 18:52+0000\n" "PO-Revision-Date: 2024-08-16 20:34+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"Last-Translator: DeepL \n" "Language-Team: Spanish \n" "Language: es\n" @@ -4396,6 +4396,8 @@ msgid "" ":doc:`pgr_betweennessCentrality` - Calculates relative betweenness " "centrality using Brandes Algorithm" msgstr "" +":doc:`pgr_betweennessCentrality` - Calcula la centralidad intermedia " +"relativa mediante el algoritmo de Brandes" msgid ":doc:`TRSP-family`" msgstr ":doc:`TRSP-family`" @@ -10510,12 +10512,14 @@ msgid "https://en.wikipedia.org/wiki/Bellman%E2%80%93Ford_algorithm" msgstr "https://en.wikipedia.org/wiki/Bellman%E2%80%93Ford_algorithm" msgid "``pgr_betweennessCentrality``" -msgstr "" +msgstr "``pgr_betweennessCentrality``" msgid "" "``pgr_betweennessCentrality`` - Calculates the relative betweeness " "centrality using Brandes Algorithm" msgstr "" +"``pgr_betweennessCentrality`` - Calcula la centralidad intermedia relativa " +"mediante el algoritmo de Brandes." msgid "Version 3.7.0" msgstr "Versión 3.7.0" @@ -10527,6 +10531,8 @@ msgid "" "The Brandes Algorithm takes advantage of the sparse graphs for evaluating " "the betweenness centrality score of all vertices." msgstr "" +"El algoritmo Brandes aprovecha los grafos dispersos para evaluar la " +"puntuación de centralidad intermedia de todos los vértices." msgid "" "Betweenness centrality measures the extent to which a vertex lies on the " @@ -10534,6 +10540,11 @@ msgid "" "betweenness centrality score may have considerable influence in a network by " "the virtue of their control over the shortest paths passing between them." msgstr "" +"La centralidad de interrelación mide hasta qué punto un vértice se encuentra " +"en los caminos más cortos entre todos los demás pares de vértices. Los " +"vértices con una alta centralidad entre pares pueden tener una influencia " +"considerable en una red gracias a su control sobre los caminos más cortos " +"que pasan entre ellos." msgid "" "The removal of these vertices will affect the network by disrupting the it, " @@ -10562,9 +10573,8 @@ msgstr "Regresa el conjunto de ``(vid, centrality)``" msgid "For a directed graph with edges :math:`\\{1, 2, 3, 4\\}`." msgstr "Para un grafo dirigido con aristas :math:`\\{1, 2, 3, 4\\}`." -#, fuzzy msgid "Explanation" -msgstr "Aplicaciones" +msgstr "Explicación" msgid "The betweenness centrality are between parenthesis." msgstr "" @@ -10605,9 +10615,8 @@ msgstr "" "`Boost: Centralidad de intermediación `__" -#, fuzzy msgid "Queries use the :doc:`sampledata` network." -msgstr "Consultas utilizan la red :doc:`sampledata`." +msgstr "Las consultas utilizan la red :doc:`sampledata`." msgid "``pgr_biconnectedComponents``" msgstr "``pgr_biconnectedComponents``" From 059e3c91a8b3b598b2af850fd8a8ada077344dd3 Mon Sep 17 00:00:00 2001 From: DeepL Date: Fri, 16 Aug 2024 20:35:03 +0000 Subject: [PATCH 328/428] Translated using Weblate (Spanish) Currently translated at 93.3% (4952 of 5303 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index e4db54bfb9..e510d55b7b 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-08-16 18:52+0000\n" -"PO-Revision-Date: 2024-08-16 20:34+0000\n" +"PO-Revision-Date: 2024-08-16 20:35+0000\n" "Last-Translator: DeepL \n" "Language-Team: Spanish \n" @@ -10550,6 +10550,8 @@ msgid "" "The removal of these vertices will affect the network by disrupting the it, " "as most of the shortest paths between vertices pass through them." msgstr "" +"La eliminación de estos vértices afectará a la red al perturbarla, ya que la " +"mayoría de los caminos más cortos entre vértices pasan por ellos." msgid "This implementation work for both directed and undirected graphs." msgstr "" @@ -10577,10 +10579,10 @@ msgid "Explanation" msgstr "Explicación" msgid "The betweenness centrality are between parenthesis." -msgstr "" +msgstr "La centralidad intermedia está entre paréntesis." msgid "The leaf vertices have betweenness centrality :math:`0`." -msgstr "" +msgstr "Los vértices de las hojas tienen una centralidad intermedia :math:`0`." msgid "" "Betweenness centrality of vertex :math:`6` is higher than of vertex :math:" @@ -10594,6 +10596,7 @@ msgstr "Al eliminar el vértice :math:`6` se crearían tres componentes." msgid "Removing vertex :math:`10` will create two graph components." msgstr "" +"Al eliminar el vértice :math:`10` se crearán dos componentes del gráfico." msgid "``vid``" msgstr "" From ff05f5eee117198c59dff44cbc6d5bc6c4d3b01e Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Fri, 16 Aug 2024 20:34:50 +0000 Subject: [PATCH 329/428] Translated using Weblate (Spanish) Currently translated at 93.3% (4952 of 5303 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index e510d55b7b..9a726fe560 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-08-16 18:52+0000\n" "PO-Revision-Date: 2024-08-16 20:35+0000\n" -"Last-Translator: DeepL \n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" "Language: es\n" @@ -10541,7 +10541,7 @@ msgid "" "the virtue of their control over the shortest paths passing between them." msgstr "" "La centralidad de interrelación mide hasta qué punto un vértice se encuentra " -"en los caminos más cortos entre todos los demás pares de vértices. Los " +"en las rutas más cortas entre todos los demás pares de vértices. Los " "vértices con una alta centralidad entre pares pueden tener una influencia " "considerable en una red gracias a su control sobre los caminos más cortos " "que pasan entre ellos." From 08a510de785cf8a9d79b487895314b86ac12bff5 Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Fri, 16 Aug 2024 20:35:35 +0000 Subject: [PATCH 330/428] Translated using Weblate (Spanish) Currently translated at 93.4% (4955 of 5303 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 9a726fe560..d1c4420b1e 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-08-16 18:52+0000\n" -"PO-Revision-Date: 2024-08-16 20:35+0000\n" +"PO-Revision-Date: 2024-08-17 20:45+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" @@ -10595,11 +10595,10 @@ msgid "Removing vertex :math:`6` will create three graph components." msgstr "Al eliminar el vértice :math:`6` se crearían tres componentes." msgid "Removing vertex :math:`10` will create two graph components." -msgstr "" -"Al eliminar el vértice :math:`10` se crearán dos componentes del gráfico." +msgstr "Al eliminar el vértice :math:`10` se crearán dos componentes del grafo." msgid "``vid``" -msgstr "" +msgstr "``vid``" msgid "Identifier of the vertex" msgstr "Identificador del vértice" @@ -14037,6 +14036,8 @@ msgid "" "``edge``: Contains the ``LINESTRING`` geometry of the **original point** to " "the closest point on on edge :math:`8` ``geom``" msgstr "" +"``borde``: Contiene la geometría ``LINESTRING`` del **punto original** al " +"punto más cercano de la arista :math:`8` ``geom``" msgid "One point dry run execution" msgstr "" From 72f6bd9175c17fec7148169b763f27be2f411c32 Mon Sep 17 00:00:00 2001 From: DeepL Date: Fri, 16 Aug 2024 20:35:59 +0000 Subject: [PATCH 331/428] Translated using Weblate (Spanish) Currently translated at 93.4% (4955 of 5303 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index d1c4420b1e..1cb741bb2f 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-08-16 18:52+0000\n" "PO-Revision-Date: 2024-08-17 20:45+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"Last-Translator: DeepL \n" "Language-Team: Spanish \n" "Language: es\n" @@ -10609,6 +10609,7 @@ msgstr "``centrality``" msgid "" "Relative betweenness centrality score of the vertex (will be in range [0,1])" msgstr "" +"Puntuación relativa de centralidad entre vértices (estará en el rango [0,1])" msgid "" "Boost's `betweenness_centrality Date: Mon, 26 Aug 2024 11:20:56 +0000 Subject: [PATCH 332/428] Update locale: commit eabdbd13db --- .../en/LC_MESSAGES/pgrouting_doc_strings.po | 131 ++++++++++++++++-- locale/pot/pgrouting_doc_strings.pot | 110 +++++++++++++-- 2 files changed, 214 insertions(+), 27 deletions(-) diff --git a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po index c0fecff321..6cbbceff42 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-05-13 17:23+0000\n" +"POT-Creation-Date: 2024-08-26 11:20+0000\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.15.0\n" +"Generated-By: Babel 2.16.0\n" msgid "BFS - Category" msgstr "" @@ -3918,6 +3918,14 @@ msgid "" "of an undirected graph." msgstr "" +msgid ":doc:`metrics-family`" +msgstr "" + +msgid "" +":doc:`pgr_betweennessCentrality` - Calculates relative betweenness " +"centrality using Brandes Algorithm" +msgstr "" + msgid ":doc:`TRSP-family`" msgstr "" @@ -4389,6 +4397,15 @@ msgid "" "`__" msgstr "" +msgid "New experimental functions" +msgstr "" + +msgid "Metrics" +msgstr "" + +msgid "pgr_betweennessCentrality" +msgstr "" + msgid "Official functions changes" msgstr "" @@ -4484,6 +4501,9 @@ msgstr "" msgid "Kruskal's running time: :math:`O(E * log E)`" msgstr "" +msgid "Metrics - Family of functions" +msgstr "" + msgid "Migration guide" msgstr "" @@ -9100,6 +9120,101 @@ msgstr "" msgid "https://en.wikipedia.org/wiki/Bellman%E2%80%93Ford_algorithm" msgstr "" +msgid "``pgr_betweennessCentrality``" +msgstr "" + +msgid "" +"``pgr_betweennessCentrality`` - Calculates the relative betweeness " +"centrality using Brandes Algorithm" +msgstr "" + +msgid "Version 3.7.0" +msgstr "" + +msgid "New **experimental** function:" +msgstr "" + +msgid "" +"The Brandes Algorithm takes advantage of the sparse graphs for evaluating" +" the betweenness centrality score of all vertices." +msgstr "" + +msgid "" +"Betweenness centrality measures the extent to which a vertex lies on the " +"shortest paths between all other pairs of vertices. Vertices with a high " +"betweenness centrality score may have considerable influence in a network" +" by the virtue of their control over the shortest paths passing between " +"them." +msgstr "" + +msgid "" +"The removal of these vertices will affect the network by disrupting the " +"it, as most of the shortest paths between vertices pass through them." +msgstr "" + +msgid "This implementation work for both directed and undirected graphs." +msgstr "" + +msgid "Running time: :math:`\\Theta(VE)`" +msgstr "" + +msgid "Running space: :math:`\\Theta(VE)`" +msgstr "" + +msgid "Throws when there are no edges in the graph" +msgstr "" + +msgid "pgr_betweennessCentrality(`Edges SQL`_, [``directed``])" +msgstr "" + +msgid "Returns set of ``(vid, centrality)``" +msgstr "" + +msgid "For a directed graph with edges :math:`\\{1, 2, 3, 4\\}`." +msgstr "" + +msgid "Explanation" +msgstr "" + +msgid "The betweenness centrality are between parenthesis." +msgstr "" + +msgid "The leaf vertices have betweenness centrality :math:`0`." +msgstr "" + +msgid "" +"Betweenness centrality of vertex :math:`6` is higher than of vertex " +":math:`10`." +msgstr "" + +msgid "Removing vertex :math:`6` will create three graph components." +msgstr "" + +msgid "Removing vertex :math:`10` will create two graph components." +msgstr "" + +msgid "``vid``" +msgstr "" + +msgid "Identifier of the vertex" +msgstr "" + +msgid "``centrality``" +msgstr "" + +msgid "" +"Relative betweenness centrality score of the vertex (will be in range " +"[0,1])" +msgstr "" + +msgid "" +"Boost's `betweenness_centrality " +"`_" +msgstr "" + +msgid "Queries use the :doc:`sampledata` network." +msgstr "" + msgid "``pgr_biconnectedComponents``" msgstr "" @@ -10210,9 +10325,6 @@ msgid "" "algorithm implemented by Boost.Graph." msgstr "" -msgid "New **experimental** function:" -msgstr "" - msgid "pgr_dagShortestPath(Combinations)" msgstr "" @@ -12387,9 +12499,6 @@ msgid "" "breadth First Search ordering." msgstr "" -msgid "Version 3.7.0" -msgstr "" - msgid "" "Visits and extracts the nodes information in Breath First Search ordering" " of the Minimum Spanning Tree created using Kruskal's algorithm." @@ -14094,9 +14203,6 @@ msgstr "" msgid "Rechability of a subgraph" msgstr "" -msgid "``vid``" -msgstr "" - msgid "Identifier of the source of the edges" msgstr "" @@ -15883,9 +15989,6 @@ msgstr "" msgid "``pgr_findCloseEdges`` (Many points)" msgstr "" -msgid "New experimental functions" -msgstr "" - msgid "Ordering" msgstr "" diff --git a/locale/pot/pgrouting_doc_strings.pot b/locale/pot/pgrouting_doc_strings.pot index 61964b7e90..fefd37ce29 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-05-13 17:23+0000\n" +"POT-Creation-Date: 2024-08-26 11:20+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3535,6 +3535,12 @@ msgstr "" msgid ":doc:`pgr_cuthillMckeeOrdering` - Return reverse Cuthill-McKee ordering of an undirected graph." msgstr "" +msgid ":doc:`metrics-family`" +msgstr "" + +msgid ":doc:`pgr_betweennessCentrality` - Calculates relative betweenness centrality using Brandes Algorithm" +msgstr "" + msgid ":doc:`TRSP-family`" msgstr "" @@ -3934,6 +3940,15 @@ msgstr "" msgid "To see all issues & pull requests closed by this release see the `Git closed milestone for 3.7.0 `__" msgstr "" +msgid "New experimental functions" +msgstr "" + +msgid "Metrics" +msgstr "" + +msgid "pgr_betweennessCentrality" +msgstr "" + msgid "Official functions changes" msgstr "" @@ -4015,6 +4030,9 @@ msgstr "" msgid "Kruskal's running time: :math:`O(E * log E)`" msgstr "" +msgid "Metrics - Family of functions" +msgstr "" + msgid "Migration guide" msgstr "" @@ -7906,6 +7924,84 @@ msgstr "" msgid "https://en.wikipedia.org/wiki/Bellman%E2%80%93Ford_algorithm" msgstr "" +msgid "``pgr_betweennessCentrality``" +msgstr "" + +msgid "``pgr_betweennessCentrality`` - Calculates the relative betweeness centrality using Brandes Algorithm" +msgstr "" + +msgid "Version 3.7.0" +msgstr "" + +msgid "New **experimental** function:" +msgstr "" + +msgid "The Brandes Algorithm takes advantage of the sparse graphs for evaluating the betweenness centrality score of all vertices." +msgstr "" + +msgid "Betweenness centrality measures the extent to which a vertex lies on the shortest paths between all other pairs of vertices. Vertices with a high betweenness centrality score may have considerable influence in a network by the virtue of their control over the shortest paths passing between them." +msgstr "" + +msgid "The removal of these vertices will affect the network by disrupting the it, as most of the shortest paths between vertices pass through them." +msgstr "" + +msgid "This implementation work for both directed and undirected graphs." +msgstr "" + +msgid "Running time: :math:`\\Theta(VE)`" +msgstr "" + +msgid "Running space: :math:`\\Theta(VE)`" +msgstr "" + +msgid "Throws when there are no edges in the graph" +msgstr "" + +msgid "pgr_betweennessCentrality(`Edges SQL`_, [``directed``])" +msgstr "" + +msgid "Returns set of ``(vid, centrality)``" +msgstr "" + +msgid "For a directed graph with edges :math:`\\{1, 2, 3, 4\\}`." +msgstr "" + +msgid "Explanation" +msgstr "" + +msgid "The betweenness centrality are between parenthesis." +msgstr "" + +msgid "The leaf vertices have betweenness centrality :math:`0`." +msgstr "" + +msgid "Betweenness centrality of vertex :math:`6` is higher than of vertex :math:`10`." +msgstr "" + +msgid "Removing vertex :math:`6` will create three graph components." +msgstr "" + +msgid "Removing vertex :math:`10` will create two graph components." +msgstr "" + +msgid "``vid``" +msgstr "" + +msgid "Identifier of the vertex" +msgstr "" + +msgid "``centrality``" +msgstr "" + +msgid "Relative betweenness centrality score of the vertex (will be in range [0,1])" +msgstr "" + +msgid "Boost's `betweenness_centrality `_" +msgstr "" + +msgid "Queries use the :doc:`sampledata` network." +msgstr "" + msgid "``pgr_biconnectedComponents``" msgstr "" @@ -8806,9 +8902,6 @@ msgstr "" msgid "``pgr_dagShortestPath`` — Returns the shortest path(s) for weighted directed acyclic graphs(DAG). In particular, the DAG shortest paths algorithm implemented by Boost.Graph." msgstr "" -msgid "New **experimental** function:" -msgstr "" - msgid "pgr_dagShortestPath(Combinations)" msgstr "" @@ -10639,9 +10732,6 @@ msgstr "" msgid "``pgr_kruskalBFS`` — Kruskal's algorithm for Minimum Spanning Tree with breadth First Search ordering." msgstr "" -msgid "Version 3.7.0" -msgstr "" - msgid "Visits and extracts the nodes information in Breath First Search ordering of the Minimum Spanning Tree created using Kruskal's algorithm." msgstr "" @@ -12070,9 +12160,6 @@ msgstr "" msgid "Rechability of a subgraph" msgstr "" -msgid "``vid``" -msgstr "" - msgid "Identifier of the source of the edges" msgstr "" @@ -13465,9 +13552,6 @@ msgstr "" msgid "``pgr_findCloseEdges`` (Many points)" msgstr "" -msgid "New experimental functions" -msgstr "" - msgid "Ordering" msgstr "" From b09618a96e08514738d8688646a2a45e7650d735 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 19 Sep 2024 09:36:59 -0600 Subject: [PATCH 333/428] (C) forward declaration of struct ArrayType --- include/cpp_common/combinations.hpp | 9 +++------ include/cpp_common/pgdata_getters.hpp | 8 ++------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/include/cpp_common/combinations.hpp b/include/cpp_common/combinations.hpp index 00c422c8c5..a7e3a00165 100644 --- a/include/cpp_common/combinations.hpp +++ b/include/cpp_common/combinations.hpp @@ -28,11 +28,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_CPP_COMMON_COMBINATIONS_HPP_ #pragma once -extern "C" { -#include -#include -} - #include #include #include @@ -40,12 +35,14 @@ extern "C" { #include #include -#include "cpp_common/undefPostgresDefine.hpp" #include "c_types/ii_t_rt.h" #include "cpp_common/basePath_SSEC.hpp" #include "cpp_common/rule.hpp" + +typedef struct ArrayType ArrayType; + namespace pgrouting { class Path; diff --git a/include/cpp_common/pgdata_getters.hpp b/include/cpp_common/pgdata_getters.hpp index 9699bbbb5b..9d47bb5f52 100644 --- a/include/cpp_common/pgdata_getters.hpp +++ b/include/cpp_common/pgdata_getters.hpp @@ -38,18 +38,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_CPP_COMMON_PGDATA_GETTERS_HPP_ #pragma once -extern "C" { -#include -#include -} - #include #include #include #include #include -#include "cpp_common/undefPostgresDefine.hpp" #include "cpp_common/info_t.hpp" #include "c_types/ii_t_rt.h" @@ -65,6 +59,8 @@ extern "C" { #include "cpp_common/point_on_edge_t.hpp" #include "cpp_common/vehicle_t.hpp" +typedef struct ArrayType ArrayType; + namespace pgrouting { namespace pgget { From a4de476f92bf0bd626feb2c11c3b3b8537004c1d Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 19 Sep 2024 11:32:46 -0600 Subject: [PATCH 334/428] postgres headers go before all other headers --- include/cpp_common/get_data.hpp | 3 ++- src/cpp_common/pgdata_getters.cpp | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/include/cpp_common/get_data.hpp b/include/cpp_common/get_data.hpp index bb352103cf..851dd232f6 100644 --- a/include/cpp_common/get_data.hpp +++ b/include/cpp_common/get_data.hpp @@ -29,10 +29,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_CPP_COMMON_GET_DATA_HPP_ #pragma once +#include "c_common/postgres_connection.h" + #include #include -#include "c_common/postgres_connection.h" #include "cpp_common/info_t.hpp" #include "cpp_common/get_check_data.hpp" #include "cpp_common/pgr_alloc.hpp" diff --git a/src/cpp_common/pgdata_getters.cpp b/src/cpp_common/pgdata_getters.cpp index e5dc8fa714..552ba8ea9e 100644 --- a/src/cpp_common/pgdata_getters.cpp +++ b/src/cpp_common/pgdata_getters.cpp @@ -35,6 +35,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ +extern "C" { + +#include +#include +#include +#include +#include +#include +#include +#include + +} + #include "cpp_common/pgdata_getters.hpp" #include #include From 79835502698569ee7df271667c9953ea76636292 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 19 Sep 2024 11:33:52 -0600 Subject: [PATCH 335/428] wrap a define --- include/cpp_common/interruption.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/cpp_common/interruption.hpp b/include/cpp_common/interruption.hpp index e326fb9da3..9140b7a4bb 100644 --- a/include/cpp_common/interruption.hpp +++ b/include/cpp_common/interruption.hpp @@ -52,7 +52,9 @@ extern "C" { /* * https://doxygen.postgresql.org/c_8h.html#a166c1d950e659804f0e3247aad99a81f */ +#ifndef PGDLLIMPORT #define PGDLLIMPORT +#endif /* * https://doxygen.postgresql.org/miscadmin_8h_source.html From f391c9139618fc63b8461a365eff4cf70d6e0527 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 19 Sep 2024 11:35:11 -0600 Subject: [PATCH 336/428] Undef bind and unlink defined in postgres --- include/cpp_common/undefPostgresDefine.hpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/cpp_common/undefPostgresDefine.hpp b/include/cpp_common/undefPostgresDefine.hpp index 58b5877c4b..ffa6b737bb 100644 --- a/include/cpp_common/undefPostgresDefine.hpp +++ b/include/cpp_common/undefPostgresDefine.hpp @@ -70,6 +70,14 @@ extern "C" { #undef vsnprintf #endif +#ifdef unlink +#undef unlink +#endif + +#ifdef bind +#undef bind +#endif + #endif #endif // INCLUDE_CPP_COMMON_UNDEFPOSTGRESDEFINE_HPP_ From 78644d1f3c91c1be0069d5ba076797f01e02cf4a Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 19 Sep 2024 11:36:22 -0600 Subject: [PATCH 337/428] adjust code_checker to ignore include order --- tools/scripts/code_checker.sh | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/tools/scripts/code_checker.sh b/tools/scripts/code_checker.sh index 8a705e55a1..920c91c221 100755 --- a/tools/scripts/code_checker.sh +++ b/tools/scripts/code_checker.sh @@ -43,6 +43,7 @@ if ! test -d code_linter; then fi DIRECTORY="$1" +INCLUDE_ORDER="-build/include_order:src/cpp_common/pgdata_getters.cpp,-build/include_order:include/cpp_common/get_data.hpp" if test -z "$DIRECTORY"; then echo "--------------------" @@ -52,11 +53,15 @@ if test -z "$DIRECTORY"; then echo "--------------------" echo "------ *.cpp ------" echo "--------------------" - code_linter/cpplint/cpplint.py --filter=-runtime/references,-whitespace/indent_namespace --linelength=120 src/*/*.cpp + code_linter/cpplint/cpplint.py --linelength=120 \ + --filter=-runtime/references,-whitespace/indent_namespace,"${INCLUDE_ORDER}" \ + --linelength=120 src/*/*.cpp + echo "--------------------" echo "------ HEADERS ------" echo "--------------------" - code_linter/cpplint/cpplint.py --extensions=hpp,h --headers=hpp,h --linelength=120 --filter=-runtime/references,-whitespace/indent_namespace \ + code_linter/cpplint/cpplint.py --extensions=hpp,h --headers=hpp,h --linelength=120 \ + --filter=-runtime/references,-whitespace/indent_namespace,"${INCLUDE_ORDER}" \ include/*/*.h* \ include/*/*/*.h* @@ -66,7 +71,8 @@ else echo "--------------------" echo "------ IN PLACE 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_ORDER}" \ include/*/*.h* \ include/*/*/*.h* @@ -74,11 +80,17 @@ else echo "--------------------" echo "------ *.c ------" echo "--------------------" - code_linter/cpplint/cpplint.py --extensions=c --linelength=120 --filter=-readability/casting src/"$DIRECTORY"/*.c + code_linter/cpplint/cpplint.py --extensions=c --linelength=120 \ + --filter=-readability/casting \ + src/"$DIRECTORY"/*.c + echo "--------------------" echo "------ *.cpp ------" echo "--------------------" - code_linter/cpplint/cpplint.py --linelength=120 --filter=-runtime/references,-whitespace/indent_namespace src/"$DIRECTORY"/*.cpp + code_linter/cpplint/cpplint.py --linelength=120 \ + --filter=-runtime/references,-whitespace/indent_namespace,"${INCLUDE_ORDER}" \ + src/"$DIRECTORY"/*.cpp + echo "--------------------" echo "------ C HEADER ------" echo "--------------------" @@ -89,11 +101,9 @@ else echo "--------------------" echo "------ C++ HEADER ------" echo "--------------------" - 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 "--------------------" - code_linter/cpplint/cpplint.py src/"$DIRECTORY"/src/*.h* + code_linter/cpplint/cpplint.py --extensions=hpp,h --headers=hpp,h --linelength=120 \ + --filter=-runtime/references,-whitespace/indent_namespace,"${INCLUDE_ORDER}" \ + include/"$DIRECTORY"/*.h* fi fi From d38f00fcfb6f841f0d890824a595253add001f3e Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 19 Sep 2024 13:39:20 -0600 Subject: [PATCH 338/428] (lint) fixing lint errors --- include/max_flow/pgr_maximumcardinalitymatching.hpp | 4 ++-- src/cpp_common/get_check_data.cpp | 4 ++-- src/max_flow/pgr_maxflow.cpp | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/max_flow/pgr_maximumcardinalitymatching.hpp b/include/max_flow/pgr_maximumcardinalitymatching.hpp index 3d8175b7ca..22c85e28ac 100644 --- a/include/max_flow/pgr_maximumcardinalitymatching.hpp +++ b/include/max_flow/pgr_maximumcardinalitymatching.hpp @@ -127,9 +127,9 @@ class PgrCardinalityGraph { ++vi) { boost::tie(e, exists) = boost::edge(*vi, mate_map[*vi], boost_graph); - if (((uint64_t)mate_map[*vi] + if ((static_cast(mate_map[*vi]) != boost::graph_traits::null_vertex()) - && (*vi < (uint64_t)mate_map[*vi])) { + && (*vi < static_cast(mate_map[*vi]))) { Only_int_rt matched_couple; matched_couple.source = get_vertex_id(*vi); matched_couple.target = get_vertex_id(mate_map[*vi]); diff --git a/src/cpp_common/get_check_data.cpp b/src/cpp_common/get_check_data.cpp index 6386e7ce73..a8f1139a39 100644 --- a/src/cpp_common/get_check_data.cpp +++ b/src/cpp_common/get_check_data.cpp @@ -564,10 +564,10 @@ int64_t getBigInt( throw std::string("Unexpected Null value in column ") + info.name; switch (info.type) { case INT2OID: - value = (int64_t) DatumGetInt16(binval); + value = static_cast(DatumGetInt16(binval)); break; case INT4OID: - value = (int64_t) DatumGetInt32(binval); + value = static_cast(DatumGetInt32(binval)); break; case INT8OID: value = DatumGetInt64(binval); diff --git a/src/max_flow/pgr_maxflow.cpp b/src/max_flow/pgr_maxflow.cpp index c44d5559ef..dad55491ed 100644 --- a/src/max_flow/pgr_maxflow.cpp +++ b/src/max_flow/pgr_maxflow.cpp @@ -85,7 +85,7 @@ void PgrFlowGraph::insert_edges_push_relabel( boost::add_edge(v2, v1, graph); E_to_id.insert(std::pair(e1, edge.id)); E_to_id.insert(std::pair(e1_rev, edge.id)); - capacity[e1] = (int64_t) edge.cost; + capacity[e1] = static_cast(edge.cost); capacity[e1_rev] = 0; rev[e1] = e1_rev; rev[e1_rev] = e1; @@ -96,7 +96,7 @@ void PgrFlowGraph::insert_edges_push_relabel( boost::add_edge(v1, v2, graph); E_to_id.insert(std::pair(e2, edge.id)); E_to_id.insert(std::pair(e2_rev, edge.id)); - capacity[e2] = (int64_t) edge.reverse_cost; + capacity[e2] = static_cast(edge.reverse_cost); capacity[e2_rev] = 0; rev[e2] = e2_rev; rev[e2_rev] = e2; @@ -119,9 +119,9 @@ void PgrFlowGraph::insert_edges( boost::add_edge(v2, v1, graph); E_to_id.insert(std::pair(e, edge.id)); E_to_id.insert(std::pair(e_rev, edge.id)); - capacity[e] = edge.cost > 0 ? (int64_t) edge.cost : 0; + capacity[e] = edge.cost > 0 ? static_cast(edge.cost) : 0; capacity[e_rev] = edge.reverse_cost > 0 - ? (int64_t) edge.reverse_cost : 0; + ? static_cast(edge.reverse_cost) : 0; rev[e] = e_rev; rev[e_rev] = e; } From 0b78b07099e031f2d83a3987935bb80189c984f6 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 22 Sep 2024 18:43:42 -0600 Subject: [PATCH 339/428] Fixing some errors detected on weblate --- doc/astar/pgr_aStarCost.rst | 4 ++-- doc/bdAstar/pgr_bdAstarCost.rst | 4 ++-- doc/bdDijkstra/pgr_bdDijkstra.rst | 4 ++-- doc/bdDijkstra/pgr_bdDijkstraCost.rst | 2 +- doc/bellman_ford/pgr_bellmanFord.rst | 2 +- .../pgr_binaryBreadthFirstSearch.rst | 2 +- doc/coloring/pgr_edgeColoring.rst | 3 +-- doc/dagShortestPath/pgr_dagShortestPath.rst | 2 +- doc/dijkstra/pgr_dijkstra.rst | 2 +- doc/dijkstra/pgr_dijkstraCost.rst | 4 ++-- doc/dijkstra/pgr_dijkstraVia.rst | 2 +- doc/max_flow/flow-family.rst | 11 +++++++---- doc/max_flow/pgr_maxFlow.rst | 6 +++--- doc/max_flow/pgr_maxFlowMinCost_Cost.rst | 4 ++-- doc/metrics/pgr_betweennessCentrality.rst | 2 +- doc/src/pgRouting-concepts.rst | 4 ++-- doc/src/pgRouting-installation.rst | 2 -- doc/trsp/pgr_trspVia.rst | 2 +- doc/trsp/pgr_trsp_withPoints.rst | 2 +- doc/withPoints/pgr_withPoints.rst | 2 +- doc/withPoints/pgr_withPointsCost.rst | 4 ++-- 21 files changed, 35 insertions(+), 35 deletions(-) diff --git a/doc/astar/pgr_aStarCost.rst b/doc/astar/pgr_aStarCost.rst index 60057664d6..e25866d385 100644 --- a/doc/astar/pgr_aStarCost.rst +++ b/doc/astar/pgr_aStarCost.rst @@ -13,7 +13,7 @@ pgr_aStarCost =============================================================================== -``pgr_aStarCost`` - Total cost of the shortest path(s) using the A* algorithm. +``pgr_aStarCost`` - Total cost of the shortest path using the A* algorithm. .. figure:: images/boost-inside.jpeg :target: https://www.boost.org/libs/graph/doc/astar_search.html @@ -39,7 +39,7 @@ pgr_aStarCost Description ------------------------------------------------------------------------------- -The ``pgr_aStarCost`` function sumarizes of the cost of the shortest path(s) +The ``pgr_aStarCost`` function sumarizes of the cost of the shortest path using the A* algorithm. **The main characteristics are:** diff --git a/doc/bdAstar/pgr_bdAstarCost.rst b/doc/bdAstar/pgr_bdAstarCost.rst index 530cb06b9d..0a1fe77cb5 100644 --- a/doc/bdAstar/pgr_bdAstarCost.rst +++ b/doc/bdAstar/pgr_bdAstarCost.rst @@ -13,7 +13,7 @@ pgr_bdAstarCost =============================================================================== -``pgr_bdAstarCost`` - Total cost of the shortest path(s) using the bidirectional +``pgr_bdAstarCost`` - Total cost of the shortest path using the bidirectional A* algorithm. .. figure:: images/boost-inside.jpeg @@ -40,7 +40,7 @@ A* algorithm. Description ------------------------------------------------------------------------------- -The ``pgr_bdAstarCost`` function sumarizes of the cost of the shortest path(s) +The ``pgr_bdAstarCost`` function sumarizes of the cost of the shortest path using the bidirectional A* algorithm. **The main characteristics are:** diff --git a/doc/bdDijkstra/pgr_bdDijkstra.rst b/doc/bdDijkstra/pgr_bdDijkstra.rst index f9b6a055cd..da46ca8c1a 100644 --- a/doc/bdDijkstra/pgr_bdDijkstra.rst +++ b/doc/bdDijkstra/pgr_bdDijkstra.rst @@ -13,7 +13,7 @@ ``pgr_bdDijkstra`` =============================================================================== -``pgr_bdDijkstra`` — Returns the shortest path(s) using Bidirectional Dijkstra +``pgr_bdDijkstra`` — Returns the shortest path using Bidirectional Dijkstra algorithm. .. figure:: images/boost-inside.jpeg @@ -73,7 +73,7 @@ Signatures | pgr_bdDijkstra(`Edges SQL`_, **start vid**, **end vids**, [``directed``]) | pgr_bdDijkstra(`Edges SQL`_, **start vids**, **end vid**, [``directed``]) | pgr_bdDijkstra(`Edges SQL`_, **start vids**, **end vids**, [``directed``]) - | pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_ , [``directed``]) + | pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_, [``directed``]) | Returns set of |old-generic-result| | OR EMPTY SET diff --git a/doc/bdDijkstra/pgr_bdDijkstraCost.rst b/doc/bdDijkstra/pgr_bdDijkstraCost.rst index 29606a4e03..69cd2e453d 100644 --- a/doc/bdDijkstra/pgr_bdDijkstraCost.rst +++ b/doc/bdDijkstra/pgr_bdDijkstraCost.rst @@ -13,7 +13,7 @@ ``pgr_bdDijkstraCost`` =============================================================================== -``pgr_bdDijkstraCost`` — Returns the shortest path(s)'s cost using Bidirectional +``pgr_bdDijkstraCost`` — Returns the shortest path's cost using Bidirectional Dijkstra algorithm. .. figure:: images/boost-inside.jpeg diff --git a/doc/bellman_ford/pgr_bellmanFord.rst b/doc/bellman_ford/pgr_bellmanFord.rst index 3b78cd0ebb..b0292322d7 100644 --- a/doc/bellman_ford/pgr_bellmanFord.rst +++ b/doc/bellman_ford/pgr_bellmanFord.rst @@ -13,7 +13,7 @@ ``pgr_bellmanFord - Experimental`` =============================================================================== -``pgr_bellmanFord`` — Shortest path(s) using Bellman-Ford algorithm. +``pgr_bellmanFord`` — Shortest path using Bellman-Ford algorithm. .. figure:: images/boost-inside.jpeg :target: https://www.boost.org/libs/graph/doc/bellman_ford_shortest.html diff --git a/doc/breadthFirstSearch/pgr_binaryBreadthFirstSearch.rst b/doc/breadthFirstSearch/pgr_binaryBreadthFirstSearch.rst index 2980146284..010310100b 100644 --- a/doc/breadthFirstSearch/pgr_binaryBreadthFirstSearch.rst +++ b/doc/breadthFirstSearch/pgr_binaryBreadthFirstSearch.rst @@ -13,7 +13,7 @@ ``pgr_binaryBreadthFirstSearch`` - Experimental =============================================================================== -``pgr_binaryBreadthFirstSearch`` — Returns the shortest path(s) in a binary +``pgr_binaryBreadthFirstSearch`` — Returns the shortest path in a binary graph. Any graph whose edge-weights belongs to the set {0,X}, where 'X' is any diff --git a/doc/coloring/pgr_edgeColoring.rst b/doc/coloring/pgr_edgeColoring.rst index 797e770116..509ee6e850 100644 --- a/doc/coloring/pgr_edgeColoring.rst +++ b/doc/coloring/pgr_edgeColoring.rst @@ -126,8 +126,7 @@ See Also * `Boost: Edge Coloring Algorithm documentation `__ -* `Wikipedia: Graph Coloring - `__ +* `Wikipedia: Graph coloring `__ .. see also end diff --git a/doc/dagShortestPath/pgr_dagShortestPath.rst b/doc/dagShortestPath/pgr_dagShortestPath.rst index 0ffbabf9f9..c7a118b2f3 100644 --- a/doc/dagShortestPath/pgr_dagShortestPath.rst +++ b/doc/dagShortestPath/pgr_dagShortestPath.rst @@ -13,7 +13,7 @@ pgr_dagShortestPath - Experimental =============================================================================== -``pgr_dagShortestPath`` — Returns the shortest path(s) for weighted directed +``pgr_dagShortestPath`` — Returns the shortest path for weighted directed acyclic graphs(DAG). In particular, the DAG shortest paths algorithm implemented by Boost.Graph. diff --git a/doc/dijkstra/pgr_dijkstra.rst b/doc/dijkstra/pgr_dijkstra.rst index 91e20fec84..a436670035 100644 --- a/doc/dijkstra/pgr_dijkstra.rst +++ b/doc/dijkstra/pgr_dijkstra.rst @@ -13,7 +13,7 @@ ``pgr_dijkstra`` =============================================================================== -``pgr_dijkstra`` — Shortest path(s) using Dijkstra algorithm. +``pgr_dijkstra`` — Shortest path using Dijkstra algorithm. .. figure:: images/boost-inside.jpeg :target: https://www.boost.org/libs/graph/doc/dijkstra_shortest_paths.html diff --git a/doc/dijkstra/pgr_dijkstraCost.rst b/doc/dijkstra/pgr_dijkstraCost.rst index acbb83b396..96265e27f9 100644 --- a/doc/dijkstra/pgr_dijkstraCost.rst +++ b/doc/dijkstra/pgr_dijkstraCost.rst @@ -14,7 +14,7 @@ ``pgr_dijkstraCost`` =============================================================================== -``pgr_dijkstraCost`` - Total cost of the shortest path(s) using Dijkstra +``pgr_dijkstraCost`` - Total cost of the shortest path using Dijkstra algorithm. .. figure:: images/boost-inside.jpeg @@ -38,7 +38,7 @@ algorithm. Description ------------------------------------------------------------------------------- -The ``pgr_dijkstraCost`` function sumarizes of the cost of the shortest path(s) +The ``pgr_dijkstraCost`` function sumarizes of the cost of the shortest path using Dijkstra Algorithm. .. include:: dijkstra-family.rst diff --git a/doc/dijkstra/pgr_dijkstraVia.rst b/doc/dijkstra/pgr_dijkstraVia.rst index 125fcabb07..9a6b0f00e2 100644 --- a/doc/dijkstra/pgr_dijkstraVia.rst +++ b/doc/dijkstra/pgr_dijkstraVia.rst @@ -59,7 +59,7 @@ One Via | 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:: dijkstraVia.queries :start-after: -- q01 diff --git a/doc/max_flow/flow-family.rst b/doc/max_flow/flow-family.rst index cbb222ce01..b2ce974d73 100644 --- a/doc/max_flow/flow-family.rst +++ b/doc/max_flow/flow-family.rst @@ -70,15 +70,18 @@ Flow Functions General Information - When the maximum flow is 0 then there is no flow and **EMPTY SET** is returned. - - There is no flow when a **source** is the same as a **target**. + - There is no flow when source has the same vaule as target. -- Any duplicated value in the source(s) or target(s) are ignored. +- Any duplicated values in source or target are ignored. - Calculates the flow/residual capacity for each edge. In the output - Edges with zero flow are omitted. -- Creates a **super source** and edges to all the source(s), and a **super - target** and the edges from all the targets(s). +- Creates + + - a **super source** and edges from it to all the sources, + - a **super target** and edges from it to all the targetss. + - The maximum flow through the graph is guaranteed to be the value returned by :doc:`pgr_maxFlow ` when executed with the same parameters and can be calculated: diff --git a/doc/max_flow/pgr_maxFlow.rst b/doc/max_flow/pgr_maxFlow.rst index d58df35628..2428ff99fb 100644 --- a/doc/max_flow/pgr_maxFlow.rst +++ b/doc/max_flow/pgr_maxFlow.rst @@ -44,12 +44,12 @@ Description **The main characteristics are:** - The graph is **directed**. -- Calculates the maximum flow from the `source(s)` to the `target(s)`. +- Calculates the maximum flow from the sources to the targets. - When the maximum flow is **0** then there is no flow and **0** is returned. - - There is no flow when a **source** is the same as a **target**. + - There is no flow when source has the same vaule as target. -- Any duplicated value in the source(s) or target(s) are ignored. +- Any duplicated values in source or target are ignored. - Uses the :doc:`pgr_pushRelabel ` algorithm. * Running time: :math:`O( V ^ 3)` diff --git a/doc/max_flow/pgr_maxFlowMinCost_Cost.rst b/doc/max_flow/pgr_maxFlowMinCost_Cost.rst index b92bbc0231..7d39f4d45d 100644 --- a/doc/max_flow/pgr_maxFlowMinCost_Cost.rst +++ b/doc/max_flow/pgr_maxFlowMinCost_Cost.rst @@ -51,9 +51,9 @@ Description - **The cost value of all input edges must be nonnegative.** - When the maximum flow is 0 then there is no flow and **0** is returned. - - There is no flow when a **source** is the same as a **target**. + - There is no flow when source has the same vaule as target. -- Any duplicated value in the source(s) or target(s) are ignored. +- Any duplicated values in source or target are ignored. - Uses :doc:`pgr_maxFlowMinCost`. * Running time: :math:`O(U * (E + V * logV))` diff --git a/doc/metrics/pgr_betweennessCentrality.rst b/doc/metrics/pgr_betweennessCentrality.rst index ad4b0c94f0..5a92199a7d 100644 --- a/doc/metrics/pgr_betweennessCentrality.rst +++ b/doc/metrics/pgr_betweennessCentrality.rst @@ -130,7 +130,7 @@ Result columns - Description * - ``vid`` - ``BIGINT`` - - Identifier of the vertex + - Identifier of the vertex. * - ``centrality`` - ``FLOAT`` - Relative betweenness centrality score of the vertex (will be in range [0,1]) diff --git a/doc/src/pgRouting-concepts.rst b/doc/src/pgRouting-concepts.rst index 240a993739..07177a3b5e 100644 --- a/doc/src/pgRouting-concepts.rst +++ b/doc/src/pgRouting-concepts.rst @@ -1010,8 +1010,8 @@ Inner Queries There are several kinds of valid inner queries and also the columns returned are depending of the function. -Which kind of inner query will depend on the function(s) requirements. -To simplify variety of types, **ANY-INTEGER** and **ANY-NUMERICAL** is used. +Which kind of inner query will depend on the function's requirements. +To simplify the variety of types, **ANY-INTEGER** and **ANY-NUMERICAL** is used. .. where_definition_starts diff --git a/doc/src/pgRouting-installation.rst b/doc/src/pgRouting-installation.rst index 88fc487d2c..c081da0fc4 100644 --- a/doc/src/pgRouting-installation.rst +++ b/doc/src/pgRouting-installation.rst @@ -73,8 +73,6 @@ Get the sources The pgRouting latest release can be found in https://github.com/pgRouting/pgrouting/releases/latest -.. rubric:: wget - To download this release: .. parsed-literal:: diff --git a/doc/trsp/pgr_trspVia.rst b/doc/trsp/pgr_trspVia.rst index dfe01b9c18..546eedcbc8 100644 --- a/doc/trsp/pgr_trspVia.rst +++ b/doc/trsp/pgr_trspVia.rst @@ -68,7 +68,7 @@ One Via | Returns set of |via-result| | OR EMPTY SET -:Example: Find the route that visits the vertices :math:`\{ 5, 1, 8\}` in that +:Example: Find the route that visits the vertices :math:`\{5, 1, 8\}` in that order on an directed graph. .. literalinclude:: trspVia.queries diff --git a/doc/trsp/pgr_trsp_withPoints.rst b/doc/trsp/pgr_trsp_withPoints.rst index 7efa75d2e7..2b66b43d6a 100644 --- a/doc/trsp/pgr_trsp_withPoints.rst +++ b/doc/trsp/pgr_trsp_withPoints.rst @@ -40,7 +40,7 @@ Description ------------------------------------------------------------------------------- Modify the graph to include points defined by points_sql. -Using Dijkstra algorithm, find the shortest path(s) +Using Dijkstra algorithm, find the shortest path Characteristics: diff --git a/doc/withPoints/pgr_withPoints.rst b/doc/withPoints/pgr_withPoints.rst index f2bc97f1af..3eeb99caa9 100644 --- a/doc/withPoints/pgr_withPoints.rst +++ b/doc/withPoints/pgr_withPoints.rst @@ -41,7 +41,7 @@ Description ------------------------------------------------------------------------------- Modify the graph to include points defined by points_sql. -Using Dijkstra algorithm, find the shortest path(s) +Using Dijkstra algorithm, find the shortest path **The main characteristics are:** diff --git a/doc/withPoints/pgr_withPointsCost.rst b/doc/withPoints/pgr_withPointsCost.rst index 1962bd8156..59f186a61d 100644 --- a/doc/withPoints/pgr_withPointsCost.rst +++ b/doc/withPoints/pgr_withPointsCost.rst @@ -14,7 +14,7 @@ =============================================================================== ``pgr_withPointsCost`` - Calculates the shortest path and returns only the -aggregate cost of the shortest path(s) found, for the combination of points +aggregate cost of the shortest path found, for the combination of points given. .. include:: proposed.rst @@ -43,7 +43,7 @@ Description ------------------------------------------------------------------------------- Modify the graph to include points defined by points_sql. -Using Dijkstra algorithm, return only the aggregate cost of the shortest path(s) +Using Dijkstra algorithm, return only the aggregate cost of the shortest path found. The main characteristics are: From e24ef9dc7d5e1e9d5189b3366bbc79b68fece5d2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 01:17:41 +0000 Subject: [PATCH 340/428] Update locale: commit 0b78b07099 --- .../en/LC_MESSAGES/pgrouting_doc_strings.po | 81 ++++++++----------- locale/pot/pgrouting_doc_strings.pot | 67 +++++++-------- 2 files changed, 62 insertions(+), 86 deletions(-) diff --git a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po index 6cbbceff42..bd57f93000 100644 --- a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-26 11:20+0000\n" +"POT-Creation-Date: 2024-09-23 01:17+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2757,11 +2757,6 @@ msgid "" "`__" msgstr "" -msgid "" -"`Wikipedia: Graph Coloring " -"`__" -msgstr "" - msgid "Components - Family of functions" msgstr "" @@ -4015,10 +4010,10 @@ msgid "" "returned." msgstr "" -msgid "There is no flow when a **source** is the same as a **target**." +msgid "There is no flow when source has the same vaule as target." msgstr "" -msgid "Any duplicated value in the source(s) or target(s) are ignored." +msgid "Any duplicated values in source or target are ignored." msgstr "" msgid "Calculates the flow/residual capacity for each edge. In the output" @@ -4027,9 +4022,13 @@ msgstr "" msgid "Edges with zero flow are omitted." msgstr "" -msgid "" -"Creates a **super source** and edges to all the source(s), and a **super " -"target** and the edges from all the targets(s)." +msgid "Creates" +msgstr "" + +msgid "a **super source** and edges from it to all the sources," +msgstr "" + +msgid "a **super target** and edges from it to all the targetss." msgstr "" msgid "" @@ -6555,7 +6554,7 @@ msgstr "" msgid "" "There are several kinds of valid inner queries and also the columns " "returned are depending of the function. Which kind of inner query will " -"depend on the function(s) requirements. To simplify variety of types, " +"depend on the function's requirements. To simplify the variety of types, " "**ANY-INTEGER** and **ANY-NUMERICAL** is used." msgstr "" @@ -6983,9 +6982,6 @@ msgid "" "https://github.com/pgRouting/pgrouting/releases/latest" msgstr "" -msgid "wget" -msgstr "" - msgid "To download this release:" msgstr "" @@ -8099,7 +8095,7 @@ msgid "pgr_aStarCost" msgstr "" msgid "" -"``pgr_aStarCost`` - Total cost of the shortest path(s) using the A* " +"``pgr_aStarCost`` - Total cost of the shortest path using the A* " "algorithm." msgstr "" @@ -8110,8 +8106,8 @@ msgid "New **proposed** function" msgstr "" msgid "" -"The ``pgr_aStarCost`` function sumarizes of the cost of the shortest " -"path(s) using the A* algorithm." +"The ``pgr_aStarCost`` function sumarizes of the cost of the shortest path" +" using the A* algorithm." msgstr "" msgid "" @@ -8826,7 +8822,7 @@ msgid "pgr_bdAstarCost" msgstr "" msgid "" -"``pgr_bdAstarCost`` - Total cost of the shortest path(s) using the " +"``pgr_bdAstarCost`` - Total cost of the shortest path using the " "bidirectional A* algorithm." msgstr "" @@ -8835,7 +8831,7 @@ msgstr "" msgid "" "The ``pgr_bdAstarCost`` function sumarizes of the cost of the shortest " -"path(s) using the bidirectional A* algorithm." +"path using the bidirectional A* algorithm." msgstr "" msgid "pgr_bdAstarCost(`Edges SQL`_, **start vid**, **end vid**, [**options**])" @@ -8871,7 +8867,7 @@ msgid "``pgr_bdDijkstra``" msgstr "" msgid "" -"``pgr_bdDijkstra`` — Returns the shortest path(s) using Bidirectional " +"``pgr_bdDijkstra`` — Returns the shortest path using Bidirectional " "Dijkstra algorithm." msgstr "" @@ -8908,7 +8904,7 @@ msgstr "" msgid "pgr_bdDijkstra(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" msgstr "" -msgid "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_ , [``directed``])" +msgid "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgstr "" msgid "Returns set of |old-generic-result|" @@ -8941,9 +8937,6 @@ msgid "" "**undirected** graph" msgstr "" -msgid "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_, [``directed``])" -msgstr "" - msgid "Using a combinations table on an **undirected** graph" msgstr "" @@ -8958,7 +8951,7 @@ msgid "``pgr_bdDijkstraCost``" msgstr "" msgid "" -"``pgr_bdDijkstraCost`` — Returns the shortest path(s)'s cost using " +"``pgr_bdDijkstraCost`` — Returns the shortest path's cost using " "Bidirectional Dijkstra algorithm." msgstr "" @@ -9023,7 +9016,7 @@ msgstr "" msgid "``pgr_bellmanFord - Experimental``" msgstr "" -msgid "``pgr_bellmanFord`` — Shortest path(s) using Bellman-Ford algorithm." +msgid "``pgr_bellmanFord`` — Shortest path using Bellman-Ford algorithm." msgstr "" msgid "New **experimental** signature:" @@ -9196,9 +9189,6 @@ msgstr "" msgid "``vid``" msgstr "" -msgid "Identifier of the vertex" -msgstr "" - msgid "``centrality``" msgstr "" @@ -9280,8 +9270,8 @@ msgid "``pgr_binaryBreadthFirstSearch`` - Experimental" msgstr "" msgid "" -"``pgr_binaryBreadthFirstSearch`` — Returns the shortest path(s) in a " -"binary graph." +"``pgr_binaryBreadthFirstSearch`` — Returns the shortest path in a binary " +"graph." msgstr "" msgid "" @@ -10320,9 +10310,9 @@ msgid "pgr_dagShortestPath - Experimental" msgstr "" msgid "" -"``pgr_dagShortestPath`` — Returns the shortest path(s) for weighted " -"directed acyclic graphs(DAG). In particular, the DAG shortest paths " -"algorithm implemented by Boost.Graph." +"``pgr_dagShortestPath`` — Returns the shortest path for weighted directed" +" acyclic graphs(DAG). In particular, the DAG shortest paths algorithm " +"implemented by Boost.Graph." msgstr "" msgid "pgr_dagShortestPath(Combinations)" @@ -10593,7 +10583,7 @@ msgstr "" msgid "``pgr_dijkstra``" msgstr "" -msgid "``pgr_dijkstra`` — Shortest path(s) using Dijkstra algorithm." +msgid "``pgr_dijkstra`` — Shortest path using Dijkstra algorithm." msgstr "" msgid "Version 3.5.0" @@ -10831,7 +10821,7 @@ msgid "``pgr_dijkstraCost``" msgstr "" msgid "" -"``pgr_dijkstraCost`` - Total cost of the shortest path(s) using Dijkstra " +"``pgr_dijkstraCost`` - Total cost of the shortest path using Dijkstra " "algorithm." msgstr "" @@ -10840,7 +10830,7 @@ msgstr "" msgid "" "The ``pgr_dijkstraCost`` function sumarizes of the cost of the shortest " -"path(s) using Dijkstra Algorithm." +"path using Dijkstra Algorithm." msgstr "" msgid "pgr_dijkstraCost(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" @@ -11233,7 +11223,7 @@ msgstr "" 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 "" msgid "Via optional parameters" @@ -13226,7 +13216,7 @@ msgstr "" msgid "New **Proposed** function" msgstr "" -msgid "Calculates the maximum flow from the `source(s)` to the `target(s)`." +msgid "Calculates the maximum flow from the sources to the targets." msgstr "" msgid "" @@ -14383,11 +14373,6 @@ msgid "" "[**options**])" msgstr "" -msgid "" -"Find the route that visits the vertices :math:`\\{ 5, 1, 8\\}` in that " -"order on an directed graph." -msgstr "" - 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." @@ -14637,7 +14622,7 @@ msgstr "" msgid "" "Modify the graph to include points defined by points_sql. Using Dijkstra " -"algorithm, find the shortest path(s)" +"algorithm, find the shortest path" msgstr "" msgid "Characteristics:" @@ -14981,7 +14966,7 @@ msgstr "" msgid "" "``pgr_withPointsCost`` - Calculates the shortest path and returns only " -"the aggregate cost of the shortest path(s) found, for the combination of " +"the aggregate cost of the shortest path found, for the combination of " "points given." msgstr "" @@ -14990,7 +14975,7 @@ msgstr "" msgid "" "Modify the graph to include points defined by points_sql. Using Dijkstra " -"algorithm, return only the aggregate cost of the shortest path(s) found." +"algorithm, return only the aggregate cost of the shortest path found." msgstr "" msgid "" diff --git a/locale/pot/pgrouting_doc_strings.pot b/locale/pot/pgrouting_doc_strings.pot index fefd37ce29..c5423ab80a 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-08-26 11:20+0000\n" +"POT-Creation-Date: 2024-09-23 01:17+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2548,9 +2548,6 @@ msgstr "" msgid "`Boost: Edge Coloring Algorithm documentation `__" msgstr "" -msgid "`Wikipedia: Graph Coloring `__" -msgstr "" - msgid "Components - Family of functions" msgstr "" @@ -3616,10 +3613,10 @@ msgstr "" msgid "When the maximum flow is 0 then there is no flow and **EMPTY SET** is returned." msgstr "" -msgid "There is no flow when a **source** is the same as a **target**." +msgid "There is no flow when source has the same vaule as target." msgstr "" -msgid "Any duplicated value in the source(s) or target(s) are ignored." +msgid "Any duplicated values in source or target are ignored." msgstr "" msgid "Calculates the flow/residual capacity for each edge. In the output" @@ -3628,7 +3625,13 @@ msgstr "" msgid "Edges with zero flow are omitted." msgstr "" -msgid "Creates a **super source** and edges to all the source(s), and a **super target** and the edges from all the targets(s)." +msgid "Creates" +msgstr "" + +msgid "a **super source** and edges from it to all the sources," +msgstr "" + +msgid "a **super target** and edges from it to all the targetss." msgstr "" msgid "The maximum flow through the graph is guaranteed to be the value returned by :doc:`pgr_maxFlow ` when executed with the same parameters and can be calculated:" @@ -5764,7 +5767,7 @@ msgstr "" msgid "Needs a `Combinations SQL`_" msgstr "" -msgid "There are several kinds of valid inner queries and also the columns returned are depending of the function. Which kind of inner query will depend on the function(s) requirements. To simplify variety of types, **ANY-INTEGER** and **ANY-NUMERICAL** is used." +msgid "There are several kinds of valid inner queries and also the columns returned are depending of the function. Which kind of inner query will depend on the function's requirements. To simplify the variety of types, **ANY-INTEGER** and **ANY-NUMERICAL** is used." msgstr "" msgid "Edges SQL for" @@ -6130,9 +6133,6 @@ msgstr "" msgid "The pgRouting latest release can be found in https://github.com/pgRouting/pgrouting/releases/latest" msgstr "" -msgid "wget" -msgstr "" - msgid "To download this release:" msgstr "" @@ -7084,7 +7084,7 @@ msgstr "" msgid "pgr_aStarCost" msgstr "" -msgid "``pgr_aStarCost`` - Total cost of the shortest path(s) using the A* algorithm." +msgid "``pgr_aStarCost`` - Total cost of the shortest path using the A* algorithm." msgstr "" msgid "``pgr_aStarCost`` (`Combinations`_)" @@ -7093,7 +7093,7 @@ msgstr "" msgid "New **proposed** function" msgstr "" -msgid "The ``pgr_aStarCost`` function sumarizes of the cost of the shortest path(s) using the A* algorithm." +msgid "The ``pgr_aStarCost`` function sumarizes of the cost of the shortest path using the A* algorithm." msgstr "" msgid "Let be the case the values returned are stored in a table, so the unique index would be the pair: `(start_vid, end_vid)`" @@ -7687,13 +7687,13 @@ msgstr "" msgid "pgr_bdAstarCost" msgstr "" -msgid "``pgr_bdAstarCost`` - Total cost of the shortest path(s) using the bidirectional A* algorithm." +msgid "``pgr_bdAstarCost`` - Total cost of the shortest path using the bidirectional A* algorithm." msgstr "" msgid "``pgr_bdAstarCost`` (`Combinations`_)" msgstr "" -msgid "The ``pgr_bdAstarCost`` function sumarizes of the cost of the shortest path(s) using the bidirectional A* algorithm." +msgid "The ``pgr_bdAstarCost`` function sumarizes of the cost of the shortest path using the bidirectional A* algorithm." msgstr "" msgid "pgr_bdAstarCost(`Edges SQL`_, **start vid**, **end vid**, [**options**])" @@ -7726,7 +7726,7 @@ msgstr "" msgid "``pgr_bdDijkstra``" msgstr "" -msgid "``pgr_bdDijkstra`` — Returns the shortest path(s) using Bidirectional Dijkstra algorithm." +msgid "``pgr_bdDijkstra`` — Returns the shortest path using Bidirectional Dijkstra algorithm." msgstr "" msgid "pgr_bdDijkstra(`Combinations`_)" @@ -7762,7 +7762,7 @@ msgstr "" msgid "pgr_bdDijkstra(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" msgstr "" -msgid "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_ , [``directed``])" +msgid "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgstr "" msgid "Returns set of |old-generic-result|" @@ -7789,9 +7789,6 @@ msgstr "" msgid "From vertices :math:`\\{6, 1\\}` to vertices :math:`\\{10, 17\\}` on an **undirected** graph" msgstr "" -msgid "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_, [``directed``])" -msgstr "" - msgid "Using a combinations table on an **undirected** graph" msgstr "" @@ -7804,7 +7801,7 @@ msgstr "" msgid "``pgr_bdDijkstraCost``" msgstr "" -msgid "``pgr_bdDijkstraCost`` — Returns the shortest path(s)'s cost using Bidirectional Dijkstra algorithm." +msgid "``pgr_bdDijkstraCost`` — Returns the shortest path's cost using Bidirectional Dijkstra algorithm." msgstr "" msgid "``pgr_bdDijkstraCost`` (`Combinations`_)" @@ -7852,7 +7849,7 @@ msgstr "" msgid "``pgr_bellmanFord - Experimental``" msgstr "" -msgid "``pgr_bellmanFord`` — Shortest path(s) using Bellman-Ford algorithm." +msgid "``pgr_bellmanFord`` — Shortest path using Bellman-Ford algorithm." msgstr "" msgid "New **experimental** signature:" @@ -7987,9 +7984,6 @@ msgstr "" msgid "``vid``" msgstr "" -msgid "Identifier of the vertex" -msgstr "" - msgid "``centrality``" msgstr "" @@ -8056,7 +8050,7 @@ msgstr "" msgid "``pgr_binaryBreadthFirstSearch`` - Experimental" msgstr "" -msgid "``pgr_binaryBreadthFirstSearch`` — Returns the shortest path(s) in a binary graph." +msgid "``pgr_binaryBreadthFirstSearch`` — Returns the shortest path in a binary graph." msgstr "" msgid "Any graph whose edge-weights belongs to the set {0,X}, where 'X' is any non-negative integer, is termed as a 'binary graph'." @@ -8899,7 +8893,7 @@ msgstr "" msgid "pgr_dagShortestPath - Experimental" msgstr "" -msgid "``pgr_dagShortestPath`` — Returns the shortest path(s) for weighted directed acyclic graphs(DAG). In particular, the DAG shortest paths algorithm implemented by Boost.Graph." +msgid "``pgr_dagShortestPath`` — Returns the shortest path for weighted directed acyclic graphs(DAG). In particular, the DAG shortest paths algorithm implemented by Boost.Graph." msgstr "" msgid "pgr_dagShortestPath(Combinations)" @@ -9118,7 +9112,7 @@ msgstr "" msgid "``pgr_dijkstra``" msgstr "" -msgid "``pgr_dijkstra`` — Shortest path(s) using Dijkstra algorithm." +msgid "``pgr_dijkstra`` — Shortest path using Dijkstra algorithm." msgstr "" msgid "Version 3.5.0" @@ -9346,13 +9340,13 @@ msgstr "" msgid "``pgr_dijkstraCost``" msgstr "" -msgid "``pgr_dijkstraCost`` - Total cost of the shortest path(s) using Dijkstra algorithm." +msgid "``pgr_dijkstraCost`` - Total cost of the shortest path using Dijkstra algorithm." msgstr "" msgid "``pgr_dijkstraCost`` (`Combinations`_)" msgstr "" -msgid "The ``pgr_dijkstraCost`` function sumarizes of the cost of the shortest path(s) using Dijkstra Algorithm." +msgid "The ``pgr_dijkstraCost`` function sumarizes of the cost of the shortest path using Dijkstra Algorithm." msgstr "" msgid "pgr_dijkstraCost(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" @@ -9673,7 +9667,7 @@ msgstr "" msgid "Returns set of |via-result|" msgstr "" -msgid "Find the route that visits the vertices :math:`\\{5, 1, 8\\}` in that order on an **directed** graph." +msgid "Find the route that visits the vertices :math:`\\{5, 1, 8\\}` in that order on an directed graph." msgstr "" msgid "Via optional parameters" @@ -11323,7 +11317,7 @@ msgstr "" msgid "New **Proposed** function" msgstr "" -msgid "Calculates the maximum flow from the `source(s)` to the `target(s)`." +msgid "Calculates the maximum flow from the sources to the targets." msgstr "" msgid "When the maximum flow is **0** then there is no flow and **0** is returned." @@ -12307,9 +12301,6 @@ msgstr "" msgid "pgr_trspVia(`Edges SQL`_, `Restrictions SQL`_, **via vertices**, [**options**])" msgstr "" -msgid "Find the route that visits the vertices :math:`\\{ 5, 1, 8\\}` in that order on an directed graph." -msgstr "" - 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 "" @@ -12502,7 +12493,7 @@ msgstr "" msgid "``pgr_trsp_withPoints`` (`Combinations`_)" msgstr "" -msgid "Modify the graph to include points defined by points_sql. Using Dijkstra algorithm, find the shortest path(s)" +msgid "Modify the graph to include points defined by points_sql. Using Dijkstra algorithm, find the shortest path" msgstr "" msgid "Characteristics:" @@ -12781,13 +12772,13 @@ msgstr "" msgid "``pgr_withPointsCost`` - Proposed" msgstr "" -msgid "``pgr_withPointsCost`` - Calculates the shortest path and returns only the aggregate cost of the shortest path(s) found, for the combination of points given." +msgid "``pgr_withPointsCost`` - Calculates the shortest path and returns only the aggregate cost of the shortest path found, for the combination of points given." msgstr "" msgid "pgr_withPointsCost(Combinations)" msgstr "" -msgid "Modify the graph to include points defined by points_sql. Using Dijkstra algorithm, return only the aggregate cost of the shortest path(s) found." +msgid "Modify the graph to include points defined by points_sql. Using Dijkstra algorithm, return only the aggregate cost of the shortest path found." msgstr "" msgid "Returns the sum of the costs of the shortest path for pair combination of vertices in the modified graph." From 2e96c1d94440097da6276cd9bc16ef439e5b9edf Mon Sep 17 00:00:00 2001 From: Weblate Date: Mon, 23 Sep 2024 01:59:51 +0000 Subject: [PATCH 341/428] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Co-authored-by: Weblate Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/ Translation: pgRouting/pgRouting --- locale/de/LC_MESSAGES/pgrouting_doc_strings.po | 2 +- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 5 +++-- locale/ja/LC_MESSAGES/pgrouting_doc_strings.po | 2 +- locale/ko/LC_MESSAGES/pgrouting_doc_strings.po | 2 +- locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po index c774c618cf..7ed661ad45 100644 --- a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-16 18:52+0000\n" +"POT-Creation-Date: 2024-08-26 11:20+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 1cb741bb2f..0daf4dfb5d 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-16 18:52+0000\n" +"POT-Creation-Date: 2024-08-26 11:20+0000\n" "PO-Revision-Date: 2024-08-17 20:45+0000\n" "Last-Translator: DeepL \n" "Language-Team: Spanish \n" "Language-Team: Japanese \n" "Language-Team: Korean \n" "Language-Team: Chinese (Simplified) Date: Mon, 23 Sep 2024 01:59:54 +0000 Subject: [PATCH 342/428] Translated using Weblate (Spanish) Currently translated at 94.2% (4997 of 5300 strings) Translated using Weblate (Spanish) Currently translated at 93.4% (4952 of 5300 strings) Translated using Weblate (Spanish) Currently translated at 93.4% (4951 of 5300 strings) Translated using Weblate (Spanish) Currently translated at 93.0% (4930 of 5300 strings) Translated using Weblate (Japanese) Currently translated at 2.8% (150 of 5303 strings) Translated using Weblate (Spanish) Currently translated at 93.4% (4955 of 5303 strings) Co-authored-by: Celia Virginia Vergara Castillo Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/ja/ Translation: pgRouting/pgRouting --- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 250 +++++++++++++++--- .../ja/LC_MESSAGES/pgrouting_doc_strings.po | 8 +- 2 files changed, 216 insertions(+), 42 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 0daf4dfb5d..3735f4fdc4 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-08-26 11:20+0000\n" -"PO-Revision-Date: 2024-08-17 20:45+0000\n" -"Last-Translator: DeepL \n" +"PO-Revision-Date: 2024-09-23 01:16+0000\n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" "Language: es\n" @@ -7940,7 +7940,7 @@ msgstr "" "pgRouting/pgrouting/releases/latest" msgid "wget" -msgstr "Wget" +msgstr "wget" msgid "To download this release:" msgstr "Para descargar esta versión:" @@ -10519,7 +10519,7 @@ msgid "" "centrality using Brandes Algorithm" msgstr "" "``pgr_betweennessCentrality`` - Calcula la centralidad intermedia relativa " -"mediante el algoritmo de Brandes." +"mediante el algoritmo de Brandes" msgid "Version 3.7.0" msgstr "Versión 3.7.0" @@ -14042,99 +14042,113 @@ msgstr "" "punto más cercano de la arista :math:`8` ``geom``" msgid "One point dry run execution" -msgstr "" +msgstr "Ejecución en seco de un punto" msgid "Returns ``EMPTY SET``." -msgstr "" +msgstr "Devuelve ``CONJUNTO VACÍO``." msgid "``partial => true``" -msgstr "" +msgstr "``partial => true``" msgid "Is ignored" -msgstr "" +msgstr "Se ignora" msgid "" "Because it is a **dry run** excecution, the code for all calculations are " "shown on the PostgreSQL ``NOTICE``." msgstr "" +"Dado que se trata de una ejecución **dry run**, el código de todos los " +"cálculos se muestra en el ``NOTICE`` de PostgreSQL." msgid "``dryrun => true``" -msgstr "" +msgstr "``dryrun => true``" msgid "Do not process query" -msgstr "" +msgstr "No procesar la consulta" msgid "" "Generate a PostgreSQL ``NOTICE`` with the code used to calculate all columns" msgstr "" +"Generar un ``NOTICE`` de PostgreSQL con el código utilizado para calcular " +"todas las columnas" msgid "``cap`` and **original point** are used in the code" -msgstr "" +msgstr "``cap`` y **punto original** se utilizan en el código" msgid "Many points examples" -msgstr "" +msgstr "Ejemplos de muchos puntos" msgid "At most two answers per point" -msgstr "" +msgstr "Un máximo de dos respuestas por punto" msgid "``NULL`` on ``edge``" -msgstr "" +msgstr "``NULL`` en ``edge``" msgid "" "``edge_id`` identifier of the edge close to a **original point** (``geom``)" msgstr "" +"``edge_id`` identificador de la arista cercana a un **punto original** " +"(``geom``)" msgid "" "Two edges at most withing :math:`0.5` distance units from each of the " "**original points**:" msgstr "" +"Dos aristas a un máximo de :math:`0.5` unidades de distancia de cada uno de " +"los **puntos originales**:" msgid "For ``POINT(1.8 0.4)`` and ``POINT(0.3 1.8)`` only one edge was found." msgstr "" +"Para ``POINT(1.8 0.4)`` y ``POINT(0.3 1.8)`` sólo se encontró una arista." msgid "For the rest of the points two edges were found." -msgstr "" +msgstr "Para el resto de los puntos se encontraron dos aristas." msgid "For point ``POINT(2.9 1.8)``" -msgstr "" +msgstr "Para el punto ``POINT(2.9 1.8)``" msgid "" "Edge :math:`5` is before :math:`8` therefore edge :math:`5` has the shortest " "distance to ``POINT(2.9 1.8)``." msgstr "" +"La arista :math:`5` está antes que la arista :math:`8` por lo tanto la " +"arista :math:`5` tiene la distancia más corta a ``POINT(2.9 1.8)``." msgid "One answer per point, all columns" -msgstr "" +msgstr "Una respuesta por punto, todas las columnas" msgid "For the **original point** ``POINT(2.9 1.8)``" -msgstr "" +msgstr "Para el **punto original** ``POINT(2.9 1.8)``" msgid "Edge :math:`5` is the closest edge to the **original point**" -msgstr "" +msgstr "La arista :math:`5` es la más cercana al **punto original**." msgid "" "``geom``: Contains the geometry of the **original point** ``POINT(2.9 1.8)``" msgstr "" +"``geom``: Contiene la geometría del **punto original** ``POINT(2.9 1.8)``" msgid "" "``edge``: Contains the ``LINESTRING`` geometry of the **original point** " "(``geom``) to the closest point on on edge." msgstr "" +"``edge``: Contiene la geometría ``LINESTRING`` del **punto original** " +"(``geom``) al punto más cercano en el borde." msgid "Many points dry run execution" -msgstr "" +msgstr "Ejecución en seco de muchos puntos" msgid "Find at most two routes to a given point" -msgstr "" +msgstr "Encontrar como máximo dos rutas a un punto dado" msgid "Using :doc:`pgr_withPoints`" -msgstr "" +msgstr "Usando :doc:`pgr_withPoints" msgid "A point of interest table" -msgstr "" +msgstr "Una tabla de puntos de interés" msgid "Handling points outside the graph." -msgstr "" +msgstr "Manejo de puntos fuera del gráfico." msgid "Points of interest" msgstr "Puntos de interés" @@ -14144,38 +14158,47 @@ msgid "" "that is not a vertex in the graph. Those locations, in pgRrouting are called " "points of interest." msgstr "" +"Algunas veces las aplicaciones trabajan \"sobre la marcha\" comenzando desde " +"una localización que no es un vértice en el grafo. Esas localizaciones, en " +"pgRrouting se llaman puntos de interés." msgid "" "The information needed in the points of interest is ``pid``, ``edge_id``, " "``side``, ``fraction``." msgstr "" +"La información necesaria en los puntos de interés es ``pid``, ``edge_id``, " +"``side``, ``fraction``." msgid "" "On this documentation there will be some 6 fixed points of interest and they " "will be stored on a table." msgstr "" +"En esta documentación habrá unos 6 puntos de interés fijos y se almacenarán " +"en una tabla." msgid "A unique identifier." -msgstr "" +msgstr "Un identificador único." msgid "" "Identifier of the edge nearest edge that allows an arrival to the point." msgstr "" +"Identificador de la arista más cercana que permite una llegada al punto." msgid "Is it on the left, right or both sides of the segment ``edge_id``" msgstr "" +"¿Está a la izquierda, a la derecha o a ambos lados del segmento ``edge_id``?" msgid "Where in the segment is the point located." -msgstr "" +msgstr "En qué parte del segmento se encuentra el punto." msgid "The geometry of the points." -msgstr "" +msgstr "La geometría de los puntos." msgid "``newPoint``" -msgstr "" +msgstr "``newPoint``" msgid "The geometry of the points moved on top of the segment." -msgstr "" +msgstr "La geometría de los puntos desplazados sobre el segmento." msgid "Points of interest fillup" msgstr "LLenado de puntos de interés" @@ -14316,6 +14339,12 @@ msgid "" "performance im-plementation. It is an extension of Johnson's Algorithm of " "finding all the elementary circuits of a directed graph." msgstr "" +"El algoritmo Hawick Circuit fue publicado en 2008 por Ken Hawick y Health A. " +"James. Este algoritmo resuelve el problema de detectar y enumerar circuitos " +"en grafos. Es capaz de enumerar circuitos en grafos con arcos dirigidos, " +"arcos múltiples y autoarcos con una implementación eficiente en memoria y de " +"alto rendimiento. Es una extensión del Algoritmo de Johnson para encontrar " +"todos los circuitos elementales de un grafo dirigido." msgid "" "There are 2 variations defined in the Boost Graph Library. Here, we have " @@ -14325,18 +14354,25 @@ msgid "" "you want to count the no. of circuits.Maybe in future, we will also " "implemenent this variation." msgstr "" +"Hay 2 variaciones definidas en la librería Boost Graph. Aquí hemos " +"implementado sólo la segunda, ya que es la más adecuada y práctica. En esta " +"variación obtenemos los circuitos después de filtrar los circuitos causados " +"por aristas paralelas. Los circuitos de aristas paralelas tienen más casos " +"de uso cuando se quiere contar el número de circuitos." msgid "The algorithm implementation works only for directed graph" msgstr "La implementación del algoritmo sirve solo para grafos dirigidos" msgid "It is a variation of Johnson's algorithm for circuit enumeration." msgstr "" +"Es una variación del algoritmo de Johnson para la enumeración de circuitos." msgid "The algorithm outputs the distinct circuits present in the graph." msgstr "" +"El algoritmo da como resultado los distintos circuitos presentes en el grafo." msgid "Time Complexity: :math:`O((V + E) (c + 1))`" -msgstr "" +msgstr "Complejidad temporal: :math:`O((V + E) (c + 1))`" msgid ":math:`|c|` is the number of circuts in the graph." msgstr ":math:`|c|` es la cantidad de vertices del grafo." @@ -14418,7 +14454,7 @@ msgid "pgr_isPlanar(`Edges SQL`)" msgstr "pgr_isPlanar(`SQL de aristas`)" msgid "RETURNS ``BOOLEAN``" -msgstr "" +msgstr "DEVUELVE ``BOOLEAN``" msgid "Returns a boolean ``(pgr_isplanar)``" msgstr "Devuelve un valor boolean ``(pgr_isplanar)``" @@ -19432,13 +19468,13 @@ msgid "pgr_bdDijkstra(many to one)" msgstr "pgr_bdDijkstra(muchos a uno)" msgid "pgr_bdDijkstra(many to many)" -msgstr "pgr_bdDijkstra(muchos to muchos)" +msgstr "pgr_bdDijkstra(muchos a muchos)" msgid "pgr_bdDijkstraCost(one to one)" -msgstr "pgr_bdDijkstraCost(Uno a Uno)" +msgstr "pgr_bdDijkstraCost(uno a uno)" msgid "pgr_bdDijkstraCost(one to many)" -msgstr "pgr_bdDijkstraCost(Uno a Muchos)" +msgstr "pgr_bdDijkstraCost(uno a muchos)" msgid "pgr_bdDijkstraCost(many to one)" msgstr "pgr_bdDijkstraCost(muchos a uno)" @@ -19447,10 +19483,10 @@ msgid "pgr_bdDijkstraCost(many to many)" msgstr "pgr_bdDijkstraCost(muchos a muchos)" msgid "pgr_bdDijkstraCostMatrix(one to one)" -msgstr "pgr_bdDijkstraCostMatrix(Uno a Uno)" +msgstr "pgr_bdDijkstraCostMatrix(uno a uno)" msgid "pgr_bdDijkstraCostMatrix(one to many)" -msgstr "pgr_bdDijkstraCostMatrix(Uno a Muchos)" +msgstr "pgr_bdDijkstraCostMatrix(uno a muchos)" msgid "pgr_bdDijkstraCostMatrix(many to one)" msgstr "pgr_bdDijkstraCostMatrix(muchos a uno)" @@ -20113,7 +20149,7 @@ msgid "pgr_astarCostMatrix" msgstr "pgr_astarCostMatrix" msgid "pgr_bddijkstra - use pgr_bdDijkstra instead" -msgstr "pgr_bddijkstra - utilice pgr_bdDijkstra en su lugar" +msgstr "pgr_bddijkstra - utilizar pgr_bdDijkstra en su lugar" msgid "pgr_pointsToVids" msgstr "pgr_pointsToVids" @@ -21739,3 +21775,143 @@ msgstr "pgr_withPointsDD es pgr_drivingDistance **con puntos**" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "pgr_withPoints es pgr_dijkstraVia **con puntos**" + +msgid "There is no flow when source has the same vaule as target." +msgstr "No hay ningún flujo cuando el orígen es el mismo que el destino" + +msgid "Any duplicated values in source or target are ignored." +msgstr "Los valores duplicados en origen o destino se ignoran." + +msgid "Creates" +msgstr "Crea" + +msgid "a **super source** and edges from it to all the sources," +msgstr "una **super fuente** y aristas desde ella a todas las fuentes," + +msgid "a **super target** and edges from it to all the targetss." +msgstr "un **super objetivo** y aristas desde él a todos los objetivos." + +msgid "" +"There are several kinds of valid inner queries and also the columns returned " +"are depending of the function. Which kind of inner query will depend on the " +"function's requirements. To simplify the variety of types, **ANY-INTEGER** " +"and **ANY-NUMERICAL** is used." +msgstr "" +"Existen varios tipos de consultas internas válidas y también las columnas " +"devueltas dependen de la función. El tipo de consulta interna dependerá de " +"los requisitos de la función. Para simplificar la variedad de tipos, se " +"utiliza **ANY-INTEGER** y **ANY-NUMERICAL**." + +msgid "" +"``pgr_aStarCost`` - Total cost of the shortest path using the A* algorithm." +msgstr "" +"``pgr_aStarCost`` - Coste total del camino más corto utilizando el algoritmo " +"A*." + +msgid "" +"The ``pgr_aStarCost`` function sumarizes of the cost of the shortest path " +"using the A* algorithm." +msgstr "" +"La función ``pgr_aStarCost`` suma el coste del camino más corto utilizando " +"el algoritmo A*." + +msgid "" +"``pgr_bdAstarCost`` - Total cost of the shortest path using the " +"bidirectional A* algorithm." +msgstr "" +"``pgr_bdAstarCost`` - Coste total del camino más corto utilizando el " +"algoritmo bidireccional A*." + +msgid "" +"The ``pgr_bdAstarCost`` function sumarizes of the cost of the shortest path " +"using the bidirectional A* algorithm." +msgstr "" +"La función ``pgr_bdAstarCost`` suma el coste del camino más corto utilizando " +"el algoritmo bidireccional A*." + +msgid "" +"``pgr_bdDijkstra`` — Returns the shortest path using Bidirectional Dijkstra " +"algorithm." +msgstr "" +"``pgr_bdDijkstra`` - Devuelve el camino más corto utilizando el algoritmo " +"Bidireccional de Dijkstra." + +msgid "" +"``pgr_bdDijkstraCost`` — Returns the shortest path's cost using " +"Bidirectional Dijkstra algorithm." +msgstr "" +"``pgr_bdDijkstraCost`` - Devuelve el coste del camino más corto utilizando " +"el algoritmo Bidireccional de Dijkstra." + +msgid "``pgr_bellmanFord`` — Shortest path using Bellman-Ford algorithm." +msgstr "" +"``pgr_bellmanFord`` - Camino más corto utilizando el algoritmo de Bellman-" +"Ford." + +msgid "" +"``pgr_binaryBreadthFirstSearch`` — Returns the shortest path in a binary " +"graph." +msgstr "" +"``pgr_binaryBreadthFirstSearch`` - Devuelve el camino más corto en un grafo " +"binario." + +msgid "" +"``pgr_dagShortestPath`` — Returns the shortest path for weighted directed " +"acyclic graphs(DAG). In particular, the DAG shortest paths algorithm " +"implemented by Boost.Graph." +msgstr "" +"``pgr_dagShortestPath`` - Devuelve el camino más corto para grafos acíclicos " +"dirigidos ponderados (DAG). En particular, el algoritmo de caminos más " +"cortos DAG implementado por Boost.Graph." + +msgid "``pgr_dijkstra`` — Shortest path using Dijkstra algorithm." +msgstr "" +"``pgr_dijkstra`` - Camino más corto utilizando el algoritmo de Dijkstra." + +msgid "" +"``pgr_dijkstraCost`` - Total cost of the shortest path using Dijkstra " +"algorithm." +msgstr "" +"``pgr_dijkstraCost`` - Coste total del camino más corto utilizando el " +"algoritmo de Dijkstra." + +msgid "" +"The ``pgr_dijkstraCost`` function sumarizes of the cost of the shortest path " +"using Dijkstra Algorithm." +msgstr "" +"La función ``pgr_dijkstraCost`` suma el coste del camino más corto " +"utilizando el Algoritmo de Dijkstra." + +msgid "" +"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." + +msgid "Calculates the maximum flow from the sources to the targets." +msgstr "Calcula el flujo máximo de las fuentes a los objetivos." + +msgid "" +"Modify the graph to include points defined by points_sql. Using Dijkstra " +"algorithm, find the shortest path" +msgstr "" +"Modificar el grafo para incluir los puntos definidos por points_sql. " +"Utilizando el algoritmo de Dijkstra, encontrar el camino más corto" + +msgid "" +"``pgr_withPointsCost`` - Calculates the shortest path and returns only the " +"aggregate cost of the shortest path found, for the combination of points " +"given." +msgstr "" +"``pgr_withPointsCost`` - Calcula el camino más corto y devuelve sólo el " +"coste agregado del camino más corto encontrado, para la combinación de " +"puntos dada." + +msgid "" +"Modify the graph to include points defined by points_sql. Using Dijkstra " +"algorithm, return only the aggregate cost of the shortest path found." +msgstr "" +"Modificar el grafo para incluir los puntos definidos por points_sql. " +"Utilizando el algoritmo de Dijkstra, devolver sólo el coste agregado del " +"camino más corto encontrado." diff --git a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po index 882ef4e519..fd355b09e5 100644 --- a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-08-26 11:20+0000\n" -"PO-Revision-Date: 2024-05-01 03:45+0000\n" +"PO-Revision-Date: 2024-09-23 01:16+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Japanese \n" @@ -5767,9 +5767,8 @@ msgid "" "negative are part of the graph." msgstr "" -#, fuzzy msgid "The set of vertices :math:`V`:" -msgstr "ノードのセット :math:`V`" +msgstr "ノードのセット :math:`V`:" msgid "In a directed graph both edges have directionality" msgstr "" @@ -7580,9 +7579,8 @@ msgstr "" msgid "Added ``start_vid`` and ``end_vid`` result columns." msgstr "" -#, fuzzy msgid "New overload functions:" -msgstr "新しい **公式** 機能" +msgstr "新しい **公式** 機能:" msgid "``pgr_ksp`` (One to Many)" msgstr "" From ceb2e80b8f9a470af1eba5e5fe7382c980d4d9e2 Mon Sep 17 00:00:00 2001 From: Weblate Date: Mon, 23 Sep 2024 01:59:54 +0000 Subject: [PATCH 343/428] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Co-authored-by: Weblate Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/ Translation: pgRouting/pgRouting --- .../de/LC_MESSAGES/pgrouting_doc_strings.po | 81 +++++------ .../ja/LC_MESSAGES/pgrouting_doc_strings.po | 95 ++++++------ .../ko/LC_MESSAGES/pgrouting_doc_strings.po | 99 ++++++------- .../LC_MESSAGES/pgrouting_doc_strings.po | 135 +++++++++++------- 4 files changed, 205 insertions(+), 205 deletions(-) diff --git a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po index 7ed661ad45..33f5f49b0a 100644 --- a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-26 11:20+0000\n" +"POT-Creation-Date: 2024-09-23 01:17+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -2752,10 +2752,6 @@ msgid "" "graph/doc/edge_coloring.html>`__" msgstr "" -msgid "" -"`Wikipedia: Graph Coloring `__" -msgstr "" - msgid "Components - Family of functions" msgstr "" @@ -4005,10 +4001,10 @@ msgid "" "returned." msgstr "" -msgid "There is no flow when a **source** is the same as a **target**." +msgid "There is no flow when source has the same vaule as target." msgstr "" -msgid "Any duplicated value in the source(s) or target(s) are ignored." +msgid "Any duplicated values in source or target are ignored." msgstr "" msgid "Calculates the flow/residual capacity for each edge. In the output" @@ -4017,9 +4013,13 @@ msgstr "" msgid "Edges with zero flow are omitted." msgstr "" -msgid "" -"Creates a **super source** and edges to all the source(s), and a **super " -"target** and the edges from all the targets(s)." +msgid "Creates" +msgstr "" + +msgid "a **super source** and edges from it to all the sources," +msgstr "" + +msgid "a **super target** and edges from it to all the targetss." msgstr "" msgid "" @@ -6529,8 +6529,8 @@ msgstr "" msgid "" "There are several kinds of valid inner queries and also the columns returned " "are depending of the function. Which kind of inner query will depend on the " -"function(s) requirements. To simplify variety of types, **ANY-INTEGER** and " -"**ANY-NUMERICAL** is used." +"function's requirements. To simplify the variety of types, **ANY-INTEGER** " +"and **ANY-NUMERICAL** is used." msgstr "" msgid "Edges SQL for" @@ -6957,9 +6957,6 @@ msgid "" "pgrouting/releases/latest" msgstr "" -msgid "wget" -msgstr "" - msgid "To download this release:" msgstr "" @@ -8069,8 +8066,7 @@ msgid "pgr_aStarCost" msgstr "" msgid "" -"``pgr_aStarCost`` - Total cost of the shortest path(s) using the A* " -"algorithm." +"``pgr_aStarCost`` - Total cost of the shortest path using the A* algorithm." msgstr "" msgid "``pgr_aStarCost`` (`Combinations`_)" @@ -8080,7 +8076,7 @@ msgid "New **proposed** function" msgstr "" msgid "" -"The ``pgr_aStarCost`` function sumarizes of the cost of the shortest path(s) " +"The ``pgr_aStarCost`` function sumarizes of the cost of the shortest path " "using the A* algorithm." msgstr "" @@ -8796,7 +8792,7 @@ msgid "pgr_bdAstarCost" msgstr "" msgid "" -"``pgr_bdAstarCost`` - Total cost of the shortest path(s) using the " +"``pgr_bdAstarCost`` - Total cost of the shortest path using the " "bidirectional A* algorithm." msgstr "" @@ -8804,8 +8800,8 @@ msgid "``pgr_bdAstarCost`` (`Combinations`_)" msgstr "" msgid "" -"The ``pgr_bdAstarCost`` function sumarizes of the cost of the shortest " -"path(s) using the bidirectional A* algorithm." +"The ``pgr_bdAstarCost`` function sumarizes of the cost of the shortest path " +"using the bidirectional A* algorithm." msgstr "" msgid "" @@ -8845,8 +8841,8 @@ msgid "``pgr_bdDijkstra``" msgstr "" msgid "" -"``pgr_bdDijkstra`` — Returns the shortest path(s) using Bidirectional " -"Dijkstra algorithm." +"``pgr_bdDijkstra`` — Returns the shortest path using Bidirectional Dijkstra " +"algorithm." msgstr "" msgid "pgr_bdDijkstra(`Combinations`_)" @@ -8886,7 +8882,7 @@ msgid "" "pgr_bdDijkstra(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" msgstr "" -msgid "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_ , [``directed``])" +msgid "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgstr "" msgid "Returns set of |old-generic-result|" @@ -8918,9 +8914,6 @@ msgid "" "**undirected** graph" msgstr "" -msgid "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_, [``directed``])" -msgstr "" - msgid "Using a combinations table on an **undirected** graph" msgstr "" @@ -8936,7 +8929,7 @@ msgid "``pgr_bdDijkstraCost``" msgstr "" msgid "" -"``pgr_bdDijkstraCost`` — Returns the shortest path(s)'s cost using " +"``pgr_bdDijkstraCost`` — Returns the shortest path's cost using " "Bidirectional Dijkstra algorithm." msgstr "" @@ -8998,7 +8991,7 @@ msgstr "" msgid "``pgr_bellmanFord - Experimental``" msgstr "" -msgid "``pgr_bellmanFord`` — Shortest path(s) using Bellman-Ford algorithm." +msgid "``pgr_bellmanFord`` — Shortest path using Bellman-Ford algorithm." msgstr "" msgid "New **experimental** signature:" @@ -9172,9 +9165,6 @@ msgstr "" msgid "``vid``" msgstr "" -msgid "Identifier of the vertex" -msgstr "" - msgid "``centrality``" msgstr "" @@ -9255,7 +9245,7 @@ msgid "``pgr_binaryBreadthFirstSearch`` - Experimental" msgstr "" msgid "" -"``pgr_binaryBreadthFirstSearch`` — Returns the shortest path(s) in a binary " +"``pgr_binaryBreadthFirstSearch`` — Returns the shortest path in a binary " "graph." msgstr "" @@ -10289,7 +10279,7 @@ msgid "pgr_dagShortestPath - Experimental" msgstr "" msgid "" -"``pgr_dagShortestPath`` — Returns the shortest path(s) for weighted directed " +"``pgr_dagShortestPath`` — Returns the shortest path for weighted directed " "acyclic graphs(DAG). In particular, the DAG shortest paths algorithm " "implemented by Boost.Graph." msgstr "" @@ -10561,7 +10551,7 @@ msgstr "" msgid "``pgr_dijkstra``" msgstr "" -msgid "``pgr_dijkstra`` — Shortest path(s) using Dijkstra algorithm." +msgid "``pgr_dijkstra`` — Shortest path using Dijkstra algorithm." msgstr "" msgid "Version 3.5.0" @@ -10797,7 +10787,7 @@ msgid "``pgr_dijkstraCost``" msgstr "" msgid "" -"``pgr_dijkstraCost`` - Total cost of the shortest path(s) using Dijkstra " +"``pgr_dijkstraCost`` - Total cost of the shortest path using Dijkstra " "algorithm." msgstr "" @@ -10805,8 +10795,8 @@ msgid "``pgr_dijkstraCost`` (`Combinations`_)" msgstr "" msgid "" -"The ``pgr_dijkstraCost`` function sumarizes of the cost of the shortest " -"path(s) using Dijkstra Algorithm." +"The ``pgr_dijkstraCost`` function sumarizes of the cost of the shortest path " +"using Dijkstra Algorithm." msgstr "" msgid "" @@ -11196,7 +11186,7 @@ msgstr "" msgid "" "Find the route that visits the vertices :math:`\\{5, 1, 8\\}` in that order " -"on an **directed** graph." +"on an directed graph." msgstr "" msgid "Via optional parameters" @@ -13190,7 +13180,7 @@ msgstr "" msgid "New **Proposed** function" msgstr "" -msgid "Calculates the maximum flow from the `source(s)` to the `target(s)`." +msgid "Calculates the maximum flow from the sources to the targets." msgstr "" msgid "" @@ -14336,11 +14326,6 @@ msgid "" "[**options**])" msgstr "" -msgid "" -"Find the route that visits the vertices :math:`\\{ 5, 1, 8\\}` in that order " -"on an directed graph." -msgstr "" - 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." @@ -14587,7 +14572,7 @@ msgstr "" msgid "" "Modify the graph to include points defined by points_sql. Using Dijkstra " -"algorithm, find the shortest path(s)" +"algorithm, find the shortest path" msgstr "" msgid "Characteristics:" @@ -14932,7 +14917,7 @@ msgstr "" msgid "" "``pgr_withPointsCost`` - Calculates the shortest path and returns only the " -"aggregate cost of the shortest path(s) found, for the combination of points " +"aggregate cost of the shortest path found, for the combination of points " "given." msgstr "" @@ -14941,7 +14926,7 @@ msgstr "" msgid "" "Modify the graph to include points defined by points_sql. Using Dijkstra " -"algorithm, return only the aggregate cost of the shortest path(s) found." +"algorithm, return only the aggregate cost of the shortest path found." msgstr "" msgid "" diff --git a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po index fd355b09e5..db06297942 100644 --- a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-26 11:20+0000\n" +"POT-Creation-Date: 2024-09-23 01:17+0000\n" "PO-Revision-Date: 2024-09-23 01:16+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Japanese `__" msgstr "" -msgid "" -"`Wikipedia: Graph Coloring `__" -msgstr "" - msgid "Components - Family of functions" msgstr "" @@ -4089,10 +4085,10 @@ msgid "" "returned." msgstr "" -msgid "There is no flow when a **source** is the same as a **target**." +msgid "There is no flow when source has the same vaule as target." msgstr "" -msgid "Any duplicated value in the source(s) or target(s) are ignored." +msgid "Any duplicated values in source or target are ignored." msgstr "" msgid "Calculates the flow/residual capacity for each edge. In the output" @@ -4101,9 +4097,13 @@ msgstr "" msgid "Edges with zero flow are omitted." msgstr "" -msgid "" -"Creates a **super source** and edges to all the source(s), and a **super " -"target** and the edges from all the targets(s)." +msgid "Creates" +msgstr "" + +msgid "a **super source** and edges from it to all the sources," +msgstr "" + +msgid "a **super target** and edges from it to all the targetss." msgstr "" msgid "" @@ -6629,8 +6629,8 @@ msgstr "" msgid "" "There are several kinds of valid inner queries and also the columns returned " "are depending of the function. Which kind of inner query will depend on the " -"function(s) requirements. To simplify variety of types, **ANY-INTEGER** and " -"**ANY-NUMERICAL** is used." +"function's requirements. To simplify the variety of types, **ANY-INTEGER** " +"and **ANY-NUMERICAL** is used." msgstr "" msgid "Edges SQL for" @@ -7059,9 +7059,6 @@ msgid "" "pgrouting/releases/latest" msgstr "" -msgid "wget" -msgstr "" - msgid "To download this release:" msgstr "" @@ -8186,10 +8183,10 @@ msgstr "" msgid "pgr_aStarCost" msgstr "" +#, fuzzy msgid "" -"``pgr_aStarCost`` - Total cost of the shortest path(s) using the A* " -"algorithm." -msgstr "" +"``pgr_aStarCost`` - Total cost of the shortest path using the A* algorithm." +msgstr ":doc:`pgr_dijkstraCost` - 最短経路の総コストを集計します。" msgid "``pgr_aStarCost`` (`Combinations`_)" msgstr "" @@ -8198,7 +8195,7 @@ msgid "New **proposed** function" msgstr "" msgid "" -"The ``pgr_aStarCost`` function sumarizes of the cost of the shortest path(s) " +"The ``pgr_aStarCost`` function sumarizes of the cost of the shortest path " "using the A* algorithm." msgstr "" @@ -8914,7 +8911,7 @@ msgid "pgr_bdAstarCost" msgstr "" msgid "" -"``pgr_bdAstarCost`` - Total cost of the shortest path(s) using the " +"``pgr_bdAstarCost`` - Total cost of the shortest path using the " "bidirectional A* algorithm." msgstr "" @@ -8922,8 +8919,8 @@ msgid "``pgr_bdAstarCost`` (`Combinations`_)" msgstr "" msgid "" -"The ``pgr_bdAstarCost`` function sumarizes of the cost of the shortest " -"path(s) using the bidirectional A* algorithm." +"The ``pgr_bdAstarCost`` function sumarizes of the cost of the shortest path " +"using the bidirectional A* algorithm." msgstr "" msgid "" @@ -8963,8 +8960,8 @@ msgid "``pgr_bdDijkstra``" msgstr "" msgid "" -"``pgr_bdDijkstra`` — Returns the shortest path(s) using Bidirectional " -"Dijkstra algorithm." +"``pgr_bdDijkstra`` — Returns the shortest path using Bidirectional Dijkstra " +"algorithm." msgstr "" msgid "pgr_bdDijkstra(`Combinations`_)" @@ -9004,7 +9001,7 @@ msgid "" "pgr_bdDijkstra(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" msgstr "" -msgid "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_ , [``directed``])" +msgid "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgstr "" msgid "Returns set of |old-generic-result|" @@ -9036,9 +9033,6 @@ msgid "" "**undirected** graph" msgstr "" -msgid "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_, [``directed``])" -msgstr "" - msgid "Using a combinations table on an **undirected** graph" msgstr "" @@ -9054,7 +9048,7 @@ msgid "``pgr_bdDijkstraCost``" msgstr "" msgid "" -"``pgr_bdDijkstraCost`` — Returns the shortest path(s)'s cost using " +"``pgr_bdDijkstraCost`` — Returns the shortest path's cost using " "Bidirectional Dijkstra algorithm." msgstr "" @@ -9116,7 +9110,7 @@ msgstr "" msgid "``pgr_bellmanFord - Experimental``" msgstr "" -msgid "``pgr_bellmanFord`` — Shortest path(s) using Bellman-Ford algorithm." +msgid "``pgr_bellmanFord`` — Shortest path using Bellman-Ford algorithm." msgstr "" msgid "New **experimental** signature:" @@ -9294,10 +9288,6 @@ msgstr "" msgid "``vid``" msgstr "" -#, fuzzy -msgid "Identifier of the vertex" -msgstr "終了ノードの識別子。" - msgid "``centrality``" msgstr "" @@ -9380,7 +9370,7 @@ msgid "``pgr_binaryBreadthFirstSearch`` - Experimental" msgstr "" msgid "" -"``pgr_binaryBreadthFirstSearch`` — Returns the shortest path(s) in a binary " +"``pgr_binaryBreadthFirstSearch`` — Returns the shortest path in a binary " "graph." msgstr "" @@ -10416,7 +10406,7 @@ msgid "pgr_dagShortestPath - Experimental" msgstr "" msgid "" -"``pgr_dagShortestPath`` — Returns the shortest path(s) for weighted directed " +"``pgr_dagShortestPath`` — Returns the shortest path for weighted directed " "acyclic graphs(DAG). In particular, the DAG shortest paths algorithm " "implemented by Boost.Graph." msgstr "" @@ -10691,7 +10681,7 @@ msgstr "" msgid "``pgr_dijkstra``" msgstr "" -msgid "``pgr_dijkstra`` — Shortest path(s) using Dijkstra algorithm." +msgid "``pgr_dijkstra`` — Shortest path using Dijkstra algorithm." msgstr "" #, fuzzy @@ -10930,18 +10920,20 @@ msgstr "" msgid "``pgr_dijkstraCost``" msgstr "" +#, fuzzy msgid "" -"``pgr_dijkstraCost`` - Total cost of the shortest path(s) using Dijkstra " +"``pgr_dijkstraCost`` - Total cost of the shortest path using Dijkstra " "algorithm." -msgstr "" +msgstr ":doc:`pgr_dijkstraCost` - 最短経路の総コストを集計します。" msgid "``pgr_dijkstraCost`` (`Combinations`_)" msgstr "" +#, fuzzy msgid "" -"The ``pgr_dijkstraCost`` function sumarizes of the cost of the shortest " -"path(s) using Dijkstra Algorithm." -msgstr "" +"The ``pgr_dijkstraCost`` function sumarizes of the cost of the shortest path " +"using Dijkstra Algorithm." +msgstr ":doc:`pgr_dijkstraCost` - 最短経路の総コストを集計します。" #, fuzzy msgid "" @@ -11332,7 +11324,7 @@ msgstr "" msgid "" "Find the route that visits the vertices :math:`\\{5, 1, 8\\}` in that order " -"on an **directed** graph." +"on an directed graph." msgstr "" msgid "Via optional parameters" @@ -13336,7 +13328,7 @@ msgstr "" msgid "New **Proposed** function" msgstr "" -msgid "Calculates the maximum flow from the `source(s)` to the `target(s)`." +msgid "Calculates the maximum flow from the sources to the targets." msgstr "" msgid "" @@ -14486,11 +14478,6 @@ msgid "" "[**options**])" msgstr "" -msgid "" -"Find the route that visits the vertices :math:`\\{ 5, 1, 8\\}` in that order " -"on an directed graph." -msgstr "" - 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." @@ -14737,7 +14724,7 @@ msgstr "" msgid "" "Modify the graph to include points defined by points_sql. Using Dijkstra " -"algorithm, find the shortest path(s)" +"algorithm, find the shortest path" msgstr "" msgid "Characteristics:" @@ -15084,7 +15071,7 @@ msgstr "" msgid "" "``pgr_withPointsCost`` - Calculates the shortest path and returns only the " -"aggregate cost of the shortest path(s) found, for the combination of points " +"aggregate cost of the shortest path found, for the combination of points " "given." msgstr "" @@ -15093,7 +15080,7 @@ msgstr "" msgid "" "Modify the graph to include points defined by points_sql. Using Dijkstra " -"algorithm, return only the aggregate cost of the shortest path(s) found." +"algorithm, return only the aggregate cost of the shortest path found." msgstr "" msgid "" @@ -18867,3 +18854,7 @@ msgstr "" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "" + +#, fuzzy +#~ msgid "Identifier of the vertex" +#~ msgstr "終了ノードの識別子。" diff --git a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po index 2b275b5e4c..36d86529b7 100644 --- a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-26 11:20+0000\n" +"POT-Creation-Date: 2024-09-23 01:17+0000\n" "PO-Revision-Date: 2022-12-13 12:30+0000\n" "Last-Translator: Hyung-Gyu Ryoo \n" "Language-Team: Korean `__" msgstr "" -msgid "" -"`Wikipedia: Graph Coloring `__" -msgstr "" - msgid "Components - Family of functions" msgstr "" @@ -4020,10 +4016,10 @@ msgid "" "returned." msgstr "" -msgid "There is no flow when a **source** is the same as a **target**." +msgid "There is no flow when source has the same vaule as target." msgstr "" -msgid "Any duplicated value in the source(s) or target(s) are ignored." +msgid "Any duplicated values in source or target are ignored." msgstr "" msgid "Calculates the flow/residual capacity for each edge. In the output" @@ -4032,9 +4028,13 @@ msgstr "" msgid "Edges with zero flow are omitted." msgstr "" -msgid "" -"Creates a **super source** and edges to all the source(s), and a **super " -"target** and the edges from all the targets(s)." +msgid "Creates" +msgstr "" + +msgid "a **super source** and edges from it to all the sources," +msgstr "" + +msgid "a **super target** and edges from it to all the targetss." msgstr "" msgid "" @@ -6564,8 +6564,8 @@ msgstr "" msgid "" "There are several kinds of valid inner queries and also the columns returned " "are depending of the function. Which kind of inner query will depend on the " -"function(s) requirements. To simplify variety of types, **ANY-INTEGER** and " -"**ANY-NUMERICAL** is used." +"function's requirements. To simplify the variety of types, **ANY-INTEGER** " +"and **ANY-NUMERICAL** is used." msgstr "" msgid "Edges SQL for" @@ -6993,9 +6993,6 @@ msgid "" "pgrouting/releases/latest" msgstr "" -msgid "wget" -msgstr "wget" - msgid "To download this release:" msgstr "" @@ -8109,10 +8106,10 @@ msgstr "" msgid "pgr_aStarCost" msgstr "" +#, fuzzy msgid "" -"``pgr_aStarCost`` - Total cost of the shortest path(s) using the A* " -"algorithm." -msgstr "" +"``pgr_aStarCost`` - Total cost of the shortest path using the A* algorithm." +msgstr ":doc:`pgr_aStarCost` - 최단 경로의 집계 비용 반환." msgid "``pgr_aStarCost`` (`Combinations`_)" msgstr "" @@ -8120,10 +8117,11 @@ msgstr "" msgid "New **proposed** function" msgstr "" +#, fuzzy msgid "" -"The ``pgr_aStarCost`` function sumarizes of the cost of the shortest path(s) " +"The ``pgr_aStarCost`` function sumarizes of the cost of the shortest path " "using the A* algorithm." -msgstr "" +msgstr ":doc:`pgr_aStarCost` - 최단 경로의 집계 비용 반환." msgid "" "Let be the case the values returned are stored in a table, so the unique " @@ -8837,7 +8835,7 @@ msgid "pgr_bdAstarCost" msgstr "" msgid "" -"``pgr_bdAstarCost`` - Total cost of the shortest path(s) using the " +"``pgr_bdAstarCost`` - Total cost of the shortest path using the " "bidirectional A* algorithm." msgstr "" @@ -8845,8 +8843,8 @@ msgid "``pgr_bdAstarCost`` (`Combinations`_)" msgstr "" msgid "" -"The ``pgr_bdAstarCost`` function sumarizes of the cost of the shortest " -"path(s) using the bidirectional A* algorithm." +"The ``pgr_bdAstarCost`` function sumarizes of the cost of the shortest path " +"using the bidirectional A* algorithm." msgstr "" msgid "" @@ -8885,10 +8883,11 @@ msgstr "" msgid "``pgr_bdDijkstra``" msgstr "" +#, fuzzy msgid "" -"``pgr_bdDijkstra`` — Returns the shortest path(s) using Bidirectional " -"Dijkstra algorithm." -msgstr "" +"``pgr_bdDijkstra`` — Returns the shortest path using Bidirectional Dijkstra " +"algorithm." +msgstr ":doc:`pgr_bdDijkstra` - 최단 경로를 위한 양방향 다익스트라 알고리즘." msgid "pgr_bdDijkstra(`Combinations`_)" msgstr "" @@ -8927,7 +8926,7 @@ msgid "" "pgr_bdDijkstra(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" msgstr "" -msgid "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_ , [``directed``])" +msgid "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgstr "" msgid "Returns set of |old-generic-result|" @@ -8959,9 +8958,6 @@ msgid "" "**undirected** graph" msgstr "" -msgid "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_, [``directed``])" -msgstr "" - msgid "Using a combinations table on an **undirected** graph" msgstr "" @@ -8977,7 +8973,7 @@ msgid "``pgr_bdDijkstraCost``" msgstr "" msgid "" -"``pgr_bdDijkstraCost`` — Returns the shortest path(s)'s cost using " +"``pgr_bdDijkstraCost`` — Returns the shortest path's cost using " "Bidirectional Dijkstra algorithm." msgstr "" @@ -9039,7 +9035,7 @@ msgstr "" msgid "``pgr_bellmanFord - Experimental``" msgstr "" -msgid "``pgr_bellmanFord`` — Shortest path(s) using Bellman-Ford algorithm." +msgid "``pgr_bellmanFord`` — Shortest path using Bellman-Ford algorithm." msgstr "" msgid "New **experimental** signature:" @@ -9214,9 +9210,6 @@ msgstr "" msgid "``vid``" msgstr "" -msgid "Identifier of the vertex" -msgstr "" - msgid "``centrality``" msgstr "" @@ -9298,7 +9291,7 @@ msgid "``pgr_binaryBreadthFirstSearch`` - Experimental" msgstr "" msgid "" -"``pgr_binaryBreadthFirstSearch`` — Returns the shortest path(s) in a binary " +"``pgr_binaryBreadthFirstSearch`` — Returns the shortest path in a binary " "graph." msgstr "" @@ -10333,7 +10326,7 @@ msgid "pgr_dagShortestPath - Experimental" msgstr "" msgid "" -"``pgr_dagShortestPath`` — Returns the shortest path(s) for weighted directed " +"``pgr_dagShortestPath`` — Returns the shortest path for weighted directed " "acyclic graphs(DAG). In particular, the DAG shortest paths algorithm " "implemented by Boost.Graph." msgstr "" @@ -10606,7 +10599,7 @@ msgstr "" msgid "``pgr_dijkstra``" msgstr "" -msgid "``pgr_dijkstra`` — Shortest path(s) using Dijkstra algorithm." +msgid "``pgr_dijkstra`` — Shortest path using Dijkstra algorithm." msgstr "" msgid "Version 3.5.0" @@ -10841,18 +10834,22 @@ msgstr "" msgid "``pgr_dijkstraCost``" msgstr "" +#, fuzzy msgid "" -"``pgr_dijkstraCost`` - Total cost of the shortest path(s) using Dijkstra " +"``pgr_dijkstraCost`` - Total cost of the shortest path using Dijkstra " "algorithm." -msgstr "" +msgstr ":doc:`pgr_aStarCost` - 최단 경로의 집계 비용 반환." msgid "``pgr_dijkstraCost`` (`Combinations`_)" msgstr "" +#, fuzzy msgid "" -"The ``pgr_dijkstraCost`` function sumarizes of the cost of the shortest " -"path(s) using Dijkstra Algorithm." +"The ``pgr_dijkstraCost`` function sumarizes of the cost of the shortest path " +"using Dijkstra Algorithm." msgstr "" +":doc:`pgr_bdDijkstraCost` - 최단 경로의 비용을 계산하기 위한 양방향 다익스트" +"라 알고리즘" msgid "" "pgr_dijkstraCost(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" @@ -11241,7 +11238,7 @@ msgstr "" msgid "" "Find the route that visits the vertices :math:`\\{5, 1, 8\\}` in that order " -"on an **directed** graph." +"on an directed graph." msgstr "" msgid "Via optional parameters" @@ -13236,7 +13233,7 @@ msgstr "" msgid "New **Proposed** function" msgstr "" -msgid "Calculates the maximum flow from the `source(s)` to the `target(s)`." +msgid "Calculates the maximum flow from the sources to the targets." msgstr "" msgid "" @@ -14382,11 +14379,6 @@ msgid "" "[**options**])" msgstr "" -msgid "" -"Find the route that visits the vertices :math:`\\{ 5, 1, 8\\}` in that order " -"on an directed graph." -msgstr "" - 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." @@ -14633,7 +14625,7 @@ msgstr "" msgid "" "Modify the graph to include points defined by points_sql. Using Dijkstra " -"algorithm, find the shortest path(s)" +"algorithm, find the shortest path" msgstr "" msgid "Characteristics:" @@ -14978,7 +14970,7 @@ msgstr "" msgid "" "``pgr_withPointsCost`` - Calculates the shortest path and returns only the " -"aggregate cost of the shortest path(s) found, for the combination of points " +"aggregate cost of the shortest path found, for the combination of points " "given." msgstr "" @@ -14987,7 +14979,7 @@ msgstr "" msgid "" "Modify the graph to include points defined by points_sql. Using Dijkstra " -"algorithm, return only the aggregate cost of the shortest path(s) found." +"algorithm, return only the aggregate cost of the shortest path found." msgstr "" msgid "" @@ -18750,3 +18742,6 @@ msgstr "" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "" + +#~ msgid "wget" +#~ msgstr "wget" diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index d6e3d56cc3..30ea1d448a 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-26 11:20+0000\n" +"POT-Creation-Date: 2024-09-23 01:17+0000\n" "PO-Revision-Date: 2024-05-28 16:17+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Chinese (Simplified) `__" -msgid "" -"`Wikipedia: Graph Coloring `__" -msgstr "`维基百科：图着色 `__" - msgid "Components - Family of functions" msgstr "分量 - 函数族" @@ -4151,10 +4147,12 @@ msgid "" "returned." msgstr "当最大流量为0时则没有流量并返回**EMPTY SET**。" -msgid "There is no flow when a **source** is the same as a **target**." +#, fuzzy +msgid "There is no flow when source has the same vaule as target." msgstr "当 **source**与 **target**相同时，就没有流量。" -msgid "Any duplicated value in the source(s) or target(s) are ignored." +#, fuzzy +msgid "Any duplicated values in source or target are ignored." msgstr "source(s)或target(s) 中的任何重复值都将被忽略。" msgid "Calculates the flow/residual capacity for each edge. In the output" @@ -4163,11 +4161,14 @@ msgstr "计算每条边的流量/剩余容量。 在输出中" msgid "Edges with zero flow are omitted." msgstr "流量为零的边被忽略。" -msgid "" -"Creates a **super source** and edges to all the source(s), and a **super " -"target** and the edges from all the targets(s)." +msgid "Creates" +msgstr "" + +msgid "a **super source** and edges from it to all the sources," +msgstr "" + +msgid "a **super target** and edges from it to all the targetss." msgstr "" -"创建**super source**和所有源的边，以及 **super target** 和所有目标的边。" msgid "" "The maximum flow through the graph is guaranteed to be the value returned " @@ -6894,11 +6895,12 @@ msgstr "用户可以根据需要定义组合。" msgid "Needs a `Combinations SQL`_" msgstr "需要 `Combinations SQL`_" +#, fuzzy msgid "" "There are several kinds of valid inner queries and also the columns returned " "are depending of the function. Which kind of inner query will depend on the " -"function(s) requirements. To simplify variety of types, **ANY-INTEGER** and " -"**ANY-NUMERICAL** is used." +"function's requirements. To simplify the variety of types, **ANY-INTEGER** " +"and **ANY-NUMERICAL** is used." msgstr "" "有多种有效的内部查询，返回的列也取决于函数。 哪种内部查询取决于函数的要求。 " "为了简化各种类型，使用 **ANY-INTEGER** 和 **ANY-NUMERICAL** 。" @@ -7359,9 +7361,6 @@ msgstr "" "pgRouting 最新版本可以在 https://github.com/pgRouting/pgrouting/releases/" "latest 中找到" -msgid "wget" -msgstr "wget" - msgid "To download this release:" msgstr "要下载此版本：" @@ -8552,9 +8551,9 @@ msgstr "手动指定的顶点组合。" msgid "pgr_aStarCost" msgstr "pgr_aStarCost" +#, fuzzy msgid "" -"``pgr_aStarCost`` - Total cost of the shortest path(s) using the A* " -"algorithm." +"``pgr_aStarCost`` - Total cost of the shortest path using the A* algorithm." msgstr "``pgr_aStarCost`` -使用 A* 算法的最短路径的总成本。" msgid "``pgr_aStarCost`` (`Combinations`_)" @@ -8563,8 +8562,9 @@ msgstr "``pgr_aStarCost`` (`组合`_)" msgid "New **proposed** function" msgstr "新**拟议**函数" +#, fuzzy msgid "" -"The ``pgr_aStarCost`` function sumarizes of the cost of the shortest path(s) " +"The ``pgr_aStarCost`` function sumarizes of the cost of the shortest path " "using the A* algorithm." msgstr "``pgr_aStarCost`` 函数使用 A* 算法汇总最短路径的成本。" @@ -9330,17 +9330,19 @@ msgstr "pgr_bdAstar(`Edges SQL`_, `Combinations SQL`_, [**options**])" msgid "pgr_bdAstarCost" msgstr "pgr_bdAstarCost" +#, fuzzy msgid "" -"``pgr_bdAstarCost`` - Total cost of the shortest path(s) using the " +"``pgr_bdAstarCost`` - Total cost of the shortest path using the " "bidirectional A* algorithm." msgstr "``pgr_bdAstarCost`` -使用双向 A* 算法的最短路径的总成本。" msgid "``pgr_bdAstarCost`` (`Combinations`_)" msgstr "``pgr_bdAstarCost`` (`组合`_)" +#, fuzzy msgid "" -"The ``pgr_bdAstarCost`` function sumarizes of the cost of the shortest " -"path(s) using the bidirectional A* algorithm." +"The ``pgr_bdAstarCost`` function sumarizes of the cost of the shortest path " +"using the bidirectional A* algorithm." msgstr "``pgr_bdAstarCost``函数使用双向 A* 算法汇总最短路径的成本。" msgid "" @@ -9383,9 +9385,10 @@ msgstr "pgr_bdAstarCostMatrix(`Edges SQL`_, **start vids**, [**options**])" msgid "``pgr_bdDijkstra``" msgstr "``pgr_bdDijkstra``" +#, fuzzy msgid "" -"``pgr_bdDijkstra`` — Returns the shortest path(s) using Bidirectional " -"Dijkstra algorithm." +"``pgr_bdDijkstra`` — Returns the shortest path using Bidirectional Dijkstra " +"algorithm." msgstr "``pgr_bdDijkstra`` — 使用双向 Dijkstra 算法返回最短路径。" msgid "pgr_bdDijkstra(`Combinations`_)" @@ -9429,8 +9432,8 @@ msgid "" msgstr "" "pgr_bdDijkstra(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" -msgid "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_ , [``directed``])" -msgstr "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_ , [``directed``])" +msgid "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_, [``directed``])" +msgstr "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgid "Returns set of |old-generic-result|" msgstr "返回 |old-generic-result| 的集合" @@ -9461,9 +9464,6 @@ msgid "" "**undirected** graph" msgstr "在**无向**图上从顶点 :math:`\\{6, 1\\}`到顶点 :math:`\\{10, 17\\}`" -msgid "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_, [``directed``])" -msgstr "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_, [``directed``])" - msgid "Using a combinations table on an **undirected** graph" msgstr "在**无向**图上使用组合表" @@ -9480,8 +9480,9 @@ msgstr "https://en.wikipedia.org/wiki/Bidirectional_search" msgid "``pgr_bdDijkstraCost``" msgstr "``pgr_bdDijkstraCost``" +#, fuzzy msgid "" -"``pgr_bdDijkstraCost`` — Returns the shortest path(s)'s cost using " +"``pgr_bdDijkstraCost`` — Returns the shortest path's cost using " "Bidirectional Dijkstra algorithm." msgstr "``pgr_bdDijkstraCost`` — 使用双向 Dijkstra 算法返回最短路径的成本。" @@ -9550,7 +9551,8 @@ msgstr "与 :doc:`pgr_TSP` 一起使用。" msgid "``pgr_bellmanFord - Experimental``" msgstr "``pgr_bellmanFord - 实验``" -msgid "``pgr_bellmanFord`` — Shortest path(s) using Bellman-Ford algorithm." +#, fuzzy +msgid "``pgr_bellmanFord`` — Shortest path using Bellman-Ford algorithm." msgstr "``pgr_bellmanFord`` — 使用 Bellman-Ford 算法的最短路径。" msgid "New **experimental** signature:" @@ -9750,10 +9752,6 @@ msgstr "" msgid "``vid``" msgstr "``vid``" -#, fuzzy -msgid "Identifier of the vertex" -msgstr "顶点的标识符。" - #, fuzzy msgid "``centrality``" msgstr "``capacity``" @@ -9843,8 +9841,9 @@ msgstr "" msgid "``pgr_binaryBreadthFirstSearch`` - Experimental" msgstr "``pgr_binaryBreadthFirstSearch`` - 实验" +#, fuzzy msgid "" -"``pgr_binaryBreadthFirstSearch`` — Returns the shortest path(s) in a binary " +"``pgr_binaryBreadthFirstSearch`` — Returns the shortest path in a binary " "graph." msgstr "``pgr_binaryBreadthFirstSearch`` — 返回二元图中的最短路径。" @@ -10977,8 +10976,9 @@ msgstr "" msgid "pgr_dagShortestPath - Experimental" msgstr "pgr_dagShortestPath - 实验" +#, fuzzy msgid "" -"``pgr_dagShortestPath`` — Returns the shortest path(s) for weighted directed " +"``pgr_dagShortestPath`` — Returns the shortest path for weighted directed " "acyclic graphs(DAG). In particular, the DAG shortest paths algorithm " "implemented by Boost.Graph." msgstr "" @@ -11273,7 +11273,8 @@ msgstr "" msgid "``pgr_dijkstra``" msgstr "`pgr_dijkstra```" -msgid "``pgr_dijkstra`` — Shortest path(s) using Dijkstra algorithm." +#, fuzzy +msgid "``pgr_dijkstra`` — Shortest path using Dijkstra algorithm." msgstr "`pgr_dijkstra`` - 使用 Dijkstra 算法的最短路径。" msgid "Version 3.5.0" @@ -11510,17 +11511,19 @@ msgstr "https://en.wikipedia.org/wiki/Dijkstra%27s_algorithm" msgid "``pgr_dijkstraCost``" msgstr "`pgr_dijkstraCost``" +#, fuzzy msgid "" -"``pgr_dijkstraCost`` - Total cost of the shortest path(s) using Dijkstra " +"``pgr_dijkstraCost`` - Total cost of the shortest path using Dijkstra " "algorithm." msgstr "`pgr_dijkstraCost`` - 使用 Dijkstra 算法计算的最短路径总成本。" msgid "``pgr_dijkstraCost`` (`Combinations`_)" msgstr "``pgr_dijkstraCost`` (`组合`_)" +#, fuzzy msgid "" -"The ``pgr_dijkstraCost`` function sumarizes of the cost of the shortest " -"path(s) using Dijkstra Algorithm." +"The ``pgr_dijkstraCost`` function sumarizes of the cost of the shortest path " +"using Dijkstra Algorithm." msgstr "``pgr_dijkstraCost`` 函数总结了使用Dijkstra算法的最短路径的成本。" msgid "" @@ -11948,11 +11951,11 @@ msgstr "**选项：** ``[directed, strict, U_turn_on_edge]``" msgid "Returns set of |via-result|" msgstr "返回 |via-result| 的集合" +#, fuzzy msgid "" "Find the route that visits the vertices :math:`\\{5, 1, 8\\}` in that order " -"on an **directed** graph." -msgstr "" -"在一个**有向**图上，找出按此顺序访问顶点 :math:`\\{5, 1, 8\\}` 的路径。" +"on an directed graph." +msgstr "在有向图上查找按顺序访问顶点 :math:`\\{ 5, 1, 8\\}` 的路线。" msgid "Via optional parameters" msgstr "Via可选参数" @@ -14106,7 +14109,8 @@ msgstr "``pgr_maxFlow`` (`组合`_)" msgid "New **Proposed** function" msgstr "新**拟议** 的函数" -msgid "Calculates the maximum flow from the `source(s)` to the `target(s)`." +#, fuzzy +msgid "Calculates the maximum flow from the sources to the targets." msgstr "计算从 `source(s)`到 `target(s)`的最大流量。" msgid "" @@ -15336,11 +15340,6 @@ msgstr "" "pgr_trspVia(`Edges SQL`_, `Restrictions SQL`_, **via vertices**, " "[**options**])" -msgid "" -"Find the route that visits the vertices :math:`\\{ 5, 1, 8\\}` in that order " -"on an directed graph." -msgstr "在有向图上查找按顺序访问顶点 :math:`\\{ 5, 1, 8\\}` 的路线。" - 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." @@ -15619,9 +15618,10 @@ msgstr "``pgr_trsp_withPoints`` (`多对多`_)" msgid "``pgr_trsp_withPoints`` (`Combinations`_)" msgstr "``pgr_trsp_withPoints`` (`组合`_)" +#, fuzzy msgid "" "Modify the graph to include points defined by points_sql. Using Dijkstra " -"algorithm, find the shortest path(s)" +"algorithm, find the shortest path" msgstr "修改图以包括由points_sql 定义的点。 使用 Dijkstra 算法，找到最短路径" msgid "Characteristics:" @@ -15998,9 +15998,10 @@ msgstr "从前方超车或以左侧驾驶方式行驶。" msgid "``pgr_withPointsCost`` - Proposed" msgstr "``pgr_withPointsCost`` -拟议" +#, fuzzy msgid "" "``pgr_withPointsCost`` - Calculates the shortest path and returns only the " -"aggregate cost of the shortest path(s) found, for the combination of points " +"aggregate cost of the shortest path found, for the combination of points " "given." msgstr "" "``pgr_withPointsCost`` -对于给定的点组合，计算最短路径并仅返回找到的最短路径" @@ -16009,9 +16010,10 @@ msgstr "" msgid "pgr_withPointsCost(Combinations)" msgstr "pgr_withPointsCost（组合）" +#, fuzzy msgid "" "Modify the graph to include points defined by points_sql. Using Dijkstra " -"algorithm, return only the aggregate cost of the shortest path(s) found." +"algorithm, return only the aggregate cost of the shortest path found." msgstr "" "修改图以包括由points_sql 定义的点。 使用 Dijkstra 算法，仅返回找到的最短路径" "的总成本。" @@ -20203,3 +20205,30 @@ msgstr "pgr_withPointsDD 是**带有点**的 pgr_drivenDistance" #, fuzzy msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "pgr_withPointsvia 是 **带有点** 的" + +#~ msgid "" +#~ "`Wikipedia: Graph Coloring `__" +#~ msgstr "`维基百科：图着色 `__" + +#~ msgid "" +#~ "Creates a **super source** and edges to all the source(s), and a **super " +#~ "target** and the edges from all the targets(s)." +#~ msgstr "" +#~ "创建**super source**和所有源的边，以及 **super target** 和所有目标的边。" + +#~ msgid "wget" +#~ msgstr "wget" + +#~ msgid "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_ , [``directed``])" +#~ msgstr "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_ , [``directed``])" + +#, fuzzy +#~ msgid "Identifier of the vertex" +#~ msgstr "顶点的标识符。" + +#~ msgid "" +#~ "Find the route that visits the vertices :math:`\\{5, 1, 8\\}` in that " +#~ "order on an **directed** graph." +#~ msgstr "" +#~ "在一个**有向**图上，找出按此顺序访问顶点 :math:`\\{5, 1, 8\\}` 的路径。" From 60ae6acc2521342e11ea57d8a1c5d224c2e8f094 Mon Sep 17 00:00:00 2001 From: DeepL Date: Mon, 23 Sep 2024 01:59:57 +0000 Subject: [PATCH 344/428] Translated using Weblate (Spanish) Currently translated at 94.2% (4997 of 5300 strings) Translated using Weblate (Spanish) Currently translated at 93.4% (4952 of 5300 strings) Translated using Weblate (Spanish) Currently translated at 93.4% (4951 of 5300 strings) Co-authored-by: DeepL Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ Translation: pgRouting/pgRouting --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 3735f4fdc4..7e015fd3ab 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-08-26 11:20+0000\n" -"PO-Revision-Date: 2024-09-23 01:16+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"PO-Revision-Date: 2024-09-23 01:50+0000\n" +"Last-Translator: DeepL \n" "Language-Team: Spanish \n" "Language: es\n" @@ -14768,6 +14768,8 @@ msgid "" "To get the complete Line Graph use unique identifiers on the double way " "edges (See `Additional Examples`_)." msgstr "" +"Para obtener el Line Graph completo utilice identificadores únicos en las " +"aristas de doble sentido (Ver `Ejemplos Adicionales`_)." msgid "When the graph is undirected the result is undirected." msgstr "Cuando el grafo es no dirigido el resultado es no dirigido." @@ -21777,7 +21779,7 @@ msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "pgr_withPoints es pgr_dijkstraVia **con puntos**" msgid "There is no flow when source has the same vaule as target." -msgstr "No hay ningún flujo cuando el orígen es el mismo que el destino" +msgstr "No hay flujo cuando el origen tiene el mismo valor que el destino." msgid "Any duplicated values in source or target are ignored." msgstr "Los valores duplicados en origen o destino se ignoran." From 0df0ba22cdaee34d194b0740b517b9084f7583d1 Mon Sep 17 00:00:00 2001 From: DeepL Date: Mon, 23 Sep 2024 02:00:17 +0000 Subject: [PATCH 345/428] Translated using Weblate (Spanish) Currently translated at 94.3% (4998 of 5300 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 7e015fd3ab..0c856d777c 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-08-26 11:20+0000\n" -"PO-Revision-Date: 2024-09-23 01:50+0000\n" +"PO-Revision-Date: 2024-09-23 02:00+0000\n" "Last-Translator: DeepL \n" "Language-Team: Spanish \n" @@ -14775,7 +14775,7 @@ msgid "When the graph is undirected the result is undirected." msgstr "Cuando el grafo es no dirigido el resultado es no dirigido." msgid "The ``reverse_cost`` is always :math:`-1`." -msgstr "" +msgstr "El ``coste_inverso`` es siempre :math:`-1`." msgid "pgr_lineGraph(`Edges SQL`_, [``directed``])" msgstr "pgr_lineGraph(`SQL de aristas`_, [``directed``])" From 024ba94634028f5f811a3e7f5b4dda0a0a889d65 Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Mon, 23 Sep 2024 01:59:57 +0000 Subject: [PATCH 346/428] Translated using Weblate (Spanish) Currently translated at 94.3% (4998 of 5300 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 0c856d777c..6f99147060 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-08-26 11:20+0000\n" "PO-Revision-Date: 2024-09-23 02:00+0000\n" -"Last-Translator: DeepL \n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" "Language: es\n" @@ -14768,7 +14768,7 @@ msgid "" "To get the complete Line Graph use unique identifiers on the double way " "edges (See `Additional Examples`_)." msgstr "" -"Para obtener el Line Graph completo utilice identificadores únicos en las " +"Para obtener el Grafo lineal completo utilizar identificadores únicos en las " "aristas de doble sentido (Ver `Ejemplos Adicionales`_)." msgid "When the graph is undirected the result is undirected." From 1425bb2743c5b8dbcf529c994388fa48c3e8c32d Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Mon, 23 Sep 2024 02:00:32 +0000 Subject: [PATCH 347/428] Translated using Weblate (Spanish) Currently translated at 94.3% (4998 of 5300 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 6f99147060..556c8e325b 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-08-26 11:20+0000\n" -"PO-Revision-Date: 2024-09-23 02:00+0000\n" +"PO-Revision-Date: 2024-09-23 02:56+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" @@ -14775,7 +14775,7 @@ msgid "When the graph is undirected the result is undirected." msgstr "Cuando el grafo es no dirigido el resultado es no dirigido." msgid "The ``reverse_cost`` is always :math:`-1`." -msgstr "El ``coste_inverso`` es siempre :math:`-1`." +msgstr "El ``reverse_cost`` es siempre :math:`-1`." msgid "pgr_lineGraph(`Edges SQL`_, [``directed``])" msgstr "pgr_lineGraph(`SQL de aristas`_, [``directed``])" From 8d3eb0d79d391d4ba7e62cf8dc9bb712671dc149 Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Mon, 23 Sep 2024 02:38:48 +0000 Subject: [PATCH 348/428] Translated using Weblate (Chinese (Simplified)) Currently translated at 97.1% (5150 of 5300 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ --- .../LC_MESSAGES/pgrouting_doc_strings.po | 141 +++++++++--------- 1 file changed, 68 insertions(+), 73 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 30ea1d448a..53b09c408c 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-09-23 01:17+0000\n" -"PO-Revision-Date: 2024-05-28 16:17+0000\n" +"PO-Revision-Date: 2024-09-23 02:56+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Chinese (Simplified) \n" @@ -1671,7 +1671,7 @@ msgid "https://en.wikipedia.org/wiki/Vehicle_routing_problem" msgstr "https://en.wikipedia.org/wiki/Vehicle_routing_problem" msgid "The queries use the :doc:`sampledata` network." -msgstr "查询使用:doc:`sampledata` 网络。" +msgstr "查询使用 :doc:`sampledata` 网络。" msgid "A* - Family of functions" msgstr "A* - 函数族" @@ -5119,7 +5119,7 @@ msgstr "所使用的列是 ``going`` 和 ``coming``，用于表示边的存在 msgid "" "Flag ``directed`` was used to indicate if it was for a **directed** or " "**undirected** graph." -msgstr "``directed``标志用于指示是**有向**图还是 **无向**图。" +msgstr "``directed`` 标志用于指示是 **有向** 图还是 **无向** 图。" msgid "The flag ``directed`` is ignored." msgstr "``directed``标志被忽略。" @@ -5127,7 +5127,7 @@ msgstr "``directed``标志被忽略。" msgid "" "Regardless of it's value it gives the result considering the graph as " "**undirected**." -msgstr "无论它的值如何，它都会给出将图视为**无向**的结果。" +msgstr "无论它的值如何，它都会给出将图视为 **无向** 的结果。" msgid "" "Use the columns ``cost`` and ``reverse_cost`` to represent the existence of " @@ -5863,7 +5863,7 @@ msgstr "当为负时，图上不存在边(``target``, ``source``)。" msgid "" "The decision of the graph to be **directed** or **undirected** is done when " "executing a pgRouting algorithm." -msgstr "图是**有向**图还是**无向**图的决定是在执行 pgRouting 算法时完成的。" +msgstr "图是 **有向** 图还是 **无向** 图的决定是在执行 pgRouting 算法时完成的。" msgid "Graph with ``cost``" msgstr "``成本``图" @@ -6318,7 +6318,7 @@ msgid "" msgstr "最后使用存储在顶点表上的数据填充 ``source``和``target`` 。" msgid "See :doc:`sampledata` for an example for building a topology." -msgstr "有关构建拓扑的示例，请参阅 :doc:`示例数据`。" +msgstr "有关构建拓扑的示例，请参阅 :doc:`sampledata`。" msgid "" "Data coming from OSM and using `osm2pgrouting `_" msgid "Queries uses the :doc:`sampledata` network." -msgstr "查询使用 :doc:`示例数据`网络。" +msgstr "查询使用 :doc:`sampledata` 网络。" msgid "``pgr_full_version``" msgstr "``pgr_full_version``" @@ -13170,7 +13170,7 @@ msgid "Returns set of |generic-result|" msgstr "返回 |eneric-result| 的集合" msgid "Circuits present in the pgRouting :doc:`sampledata`" -msgstr "pgRouting :doc:`示例数据`中存在的电路" +msgstr "pgRouting :doc:`sampledata` 中存在的电路" msgid "Id of the circuit starting from ``1``" msgstr "电路id从``1``开始" @@ -13222,7 +13222,7 @@ msgid "" msgstr "它将根据图形的平面性返回一个布尔值。" msgid "Applicable only for **undirected** graphs." -msgstr "仅适用于**无向**图。" +msgstr "仅适用于 **无向** 图。" msgid "The algorithm does not considers traversal costs in the calculations." msgstr "该算法在计算中不考虑遍历成本。" @@ -13781,8 +13781,8 @@ msgid "" "examples include the subgraph including edges 4, 7, 8, and 10 with " "``reverse_cost``." msgstr "" -"本节的示例基于 :doc:`示例数据`网络。 这些示例包括包含具有``reverse_cost``的" -"边 4、7、8 和 10 的子图。" +"本节的示例基于 :doc:`sampledata` 网络。 这些示例包括包含具有 ``reverse_cost``" +" 的边 4、7、8 和 10 的子图。" msgid "The data" msgstr "数据" @@ -14015,7 +14015,7 @@ msgstr "Returns set of |result-component-make|" msgid "" "Query done on :doc:`sampledata` network gives the list of edges that are " "needed to connect the graph." -msgstr "在:doc:`示例数据`网络上完成的查询给出了连接图所需的边列表。" +msgstr "在 :doc:`sampledata` 网络上完成的查询给出了连接图所需的边列表。" msgid "https://www.boost.org/libs/graph/doc/make_connected.html" msgstr "https://www.boost.org/libs/graph/doc/make_connected.html" @@ -14355,7 +14355,7 @@ msgid "Examples" msgstr "示例" msgid "Let's create the topology for the data in :doc:`sampledata`" -msgstr "让我们为 :doc:`示例数据`中的数据创建拓扑" +msgstr "让我们为 :doc:`sampledata` 中的数据创建拓扑" msgid "Now we can analyze the network." msgstr "现在我们可以分析网络了。" @@ -14870,7 +14870,7 @@ msgstr "" "得没有边连接两个相同颜色的顶点。" msgid "The implementation is applicable only for **undirected** graphs." -msgstr "该实现仅适用于**无向**图。" +msgstr "该实现仅适用于 **无向** 图。" msgid "" "Provides the color to be assigned to all the vertices present in the graph." @@ -15634,7 +15634,7 @@ msgid "**positive** when it belongs to the `Edges SQL`_" msgstr "当它属于`Edges SQL`_ 时为**正**" msgid "**negative** when it belongs to the `Points SQL`_" -msgstr "当它属于 `Points SQL`_为**负**" +msgstr "当它属于 `Points SQL`_ 为**负**" msgid "Driving side can not be ``b``" msgstr "驾驶侧不可能为 ``b``" @@ -15977,7 +15977,7 @@ msgid "``b`` for both." msgstr "``b``对于两者。" msgid "Use :doc:`pgr_findCloseEdges` in the `Points SQL`_." -msgstr "在 `Points SQL`_ 中使用 :doc:`pgr_findCloseEdges` 。" +msgstr "在 `Points SQL`_ 中使用 :doc:`pgr_findCloseEdges`。" msgid "" "All the examples are about traveling from point :math:`1` and vertex :math:" @@ -16041,7 +16041,7 @@ msgstr "" "如果返回的值存储在表中，则唯一索引将是这一对：`(start_vid, end_vid)`.。" msgid "For **undirected** graphs, the results are **symmetric**." -msgstr "对于**无向**图，结果是**对称**的。" +msgstr "对于 **无向** 图，结果是 **对称** 的。" msgid "" "For optimization purposes, any duplicated value in the `start_vids` or " @@ -16184,8 +16184,7 @@ msgstr "" msgid "" "Cost matrix for points :math:`\\{1, 6\\}` and vertices :math:`\\{10, 11\\}` " "on an **undirected** graph" -msgstr "" -"**无向**图上的点 :math:`\\{1, 6\\}`和顶点:math:`\\{10, 11\\}`的成本矩阵" +msgstr "**无向** 图上的点 :math:`\\{1, 6\\}` 和顶点 :math:`\\{10, 11\\}` 的成本矩阵" msgid "Returning a **symmetrical** cost matrix" msgstr "返回**对称**成本矩阵" @@ -16407,8 +16406,7 @@ msgstr "" msgid "" "Modifies the graph to include the points defined in the `Points SQL`_ and " "using Yen algorithm, finds the :math:`K` shortest paths." -msgstr "" -"修改图以包括`Points SQL`_ 中定义的点并使用 Yen 算法查找 :math:`K`最短路径。" +msgstr "修改图以包括 `Points SQL`_ 中定义的点并使用 Yen 算法查找 :math:`K`最短路径。" msgid "" "pgr_withPointsKSP(`Edges SQL`_, `Points SQL`_, **start vid**, **end vid**, " @@ -19420,16 +19418,16 @@ msgid "Identifier of the ending vertex of the geometry ``geom``" msgstr "几何体 ``geom`` 终止顶点的标识符" msgid "Cost to traverse from `source` to ``target``." -msgstr "从`source` 到 ``target`` 的遍历成本。" +msgstr "从 `source` 到 ``target`` 的遍历成本。" msgid "Cost to traverse from `target` to ``source``." -msgstr "从 `target`到 ``source``的遍历成本。" +msgstr "从 `target` 到 ``source`` 的遍历成本。" msgid "Flow capacity from `source` to ``target``." -msgstr "从`source`到``target``的流量。" +msgstr "从 `source` 到 ``target`` 的流量。" msgid "Flow capacity from `target` to ``source``." -msgstr "从`target`到``source``的流量。" +msgstr "从 `target` 到 ``source`` 的流量。" msgid "``category``" msgstr "``category``" @@ -19443,18 +19441,16 @@ msgstr ":math:`x` 几何图形起始顶点的坐标。" msgid "" "For convinience it is saved on the table but can be calculated as " "``ST_X(ST_StartPoint(geom))``." -msgstr "" -"为了方便起见，它被保存在表格中，但也可以计算为 ``ST_X(ST_StartPoint(geom)) " -"``。" +msgstr "为了方便起见，它被保存在表格中，但也可以计算为 " +"``ST_X(ST_StartPoint(geom))``。" msgid ":math:`y` coordinate of the ending vertex of the geometry." -msgstr ":math:`y`几何图形结束顶点的坐标。" +msgstr ":math:`y` 几何图形结束顶点的坐标。" msgid "" "For convinience it is saved on the table but can be calculated as " "``ST_Y(ST_EndPoint(geom))``." -msgstr "" -"为方便起见，它保存在表格中，但也可以计算为``ST_Y(ST_EndPoint(geom))``。" +msgstr "为方便起见，它保存在表格中，但也可以计算为 ``ST_Y(ST_EndPoint(geom))``。" msgid "The geometry of the segments." msgstr "分段的几何形状。" @@ -19468,11 +19464,11 @@ msgid "" msgstr "可以选择在不同的列上创建索引。建议的做法是" msgid "``id`` indexed." -msgstr "``id``列创建索引 。" +msgstr "``id`` 列创建索引 。" msgid "" "``source`` and ``target`` columns indexed to speed up pgRouting queries." -msgstr "``source``和``target``列建立索引以加快 pgRouting 查询。" +msgstr "``source`` 和 ``target`` 列建立索引以加快 pgRouting 查询。" msgid "" "``geom`` indexed to speed up gemetry processes that might be needed in the " @@ -19480,7 +19476,7 @@ msgid "" msgstr "``geom`` 列建立索引以加快前端可能需要的 gemetry 处理。" msgid "For this small example the indexes are skipped, except for ``id``" -msgstr "在这个小例子中，除了 ``id``以外，其他索引都被跳过" +msgstr "在这个小例子中，除了 ``id`` 以外，其他索引都被跳过" msgid "Edges data" msgstr "边数据" @@ -19586,7 +19582,7 @@ msgid "Directed, with cost and reverse_cost" msgstr "具有cost和reverse_cost的有向图" msgid "Undirected graph with ``cost`` and ``reverse_cost``" -msgstr "具有``cost``和``reverse_cost``的无向图" +msgstr "具有 ``cost`` 和 ``reverse_cost`` 的无向图" msgid "" "When working with city networks, this is recommended for point of view of " @@ -19603,7 +19599,7 @@ msgid "Directed, with cost" msgstr "有向，有成本" msgid "Undirected graph with ``cost``" -msgstr "带有 ``cost``的无向图" +msgstr "带有 ``cost`` 的无向图" msgid "Undirected, with cost" msgstr "无向，有成本" @@ -19900,7 +19896,7 @@ msgid "**directed** graph" msgstr "**有向**图" msgid "**undirected** graph" -msgstr "**无向**图" +msgstr "**无向** 图" msgid "Arriving at the point:" msgstr "到达点：" @@ -19940,7 +19936,7 @@ msgid "**Temporal**: for example points given through a web application" msgstr "**时间**：例如通过 Web 应用程序给出的点" msgid "The numbering of the points are handled with negative sign." -msgstr "在点 SQL 中使用pgr_findCloseEdges。" +msgstr "" msgid "" "This sign change is to avoid confusion when there is a vertex with the same " @@ -19960,7 +19956,7 @@ msgid "positive sign is a vertex of the original graph" msgstr "正号是原始图的顶点" msgid "negative sign is a point of the `Points SQL`_" -msgstr "负号是`Points SQL`_ 的一个点" +msgstr "负号是 `Points SQL`_ 的一个点" msgid "About points" msgstr "关于积分" @@ -19969,9 +19965,8 @@ msgid "" "For this section the following city (see :doc:`sampledata`) some interesing " "points such as restaurant, supermarket, post office, etc. will be used as " "example." -msgstr "" -"对于本节，将使用以下城市（参见:doc:`示例数据`）一些有趣的点（例如餐馆、超市、" -"邮局等）作为示例。" +msgstr "对于本节，将使用以下城市（参见 " +":doc:`sampledata`）一些有趣的点（例如餐馆、超市、邮局等）作为示例。" msgid "The graph is **directed**" msgstr "图是**有向**的" @@ -20049,10 +20044,10 @@ msgid "Like having all points to be considered in both sides ``b``" msgstr "就像双方都要考虑所有点 ``b``" msgid "Prefered usage on **undirected** graphs" -msgstr "**无向**图上的首选用法" +msgstr "**无向** 图上的首选用法" msgid "On the :doc:`TRSP-family` this option is not valid" -msgstr "在 :doc:`TRSP-family`上，此选项无效" +msgstr "在 :doc:`TRSP-family` 上，此选项无效" msgid "Point **1** located on edge ``(5, 6)`` and ``(6, 5)``" msgstr "点**1**位于边``(5, 6)``和 ``(6, 5)``" @@ -20188,19 +20183,19 @@ msgid "Depending on the name:" msgstr "取决于名称：" msgid "pgr_withPoints is pgr_dijkstra **with points**" -msgstr "pgr_withPoints 是**带有点**的 pgr_dijkstra" +msgstr "pgr_withPoints 是 **带有点** 的 pgr_dijkstra" msgid "pgr_withPointsCost is pgr_dijkstraCost **with points**" -msgstr "pgr_withPointsCost 是**带有点**的 pgr_dijkstraCost" +msgstr "pgr_withPointsCost 是 **带有点** 的 pgr_dijkstraCost" msgid "pgr_withPointsCostMatrix is pgr_dijkstraCostMatrix **with points**" -msgstr "pgr_withPointsCostMatrix 是**带有点**的 pgr_dijkstraCostMatrix" +msgstr "pgr_withPointsCostMatrix 是 **带有点** 的 pgr_dijkstraCostMatrix" msgid "pgr_withPointsKSP is pgr_ksp **with points**" -msgstr "pgr_withPointsKSP 是**带有点**的 pgr_ksp" +msgstr "pgr_withPointsKSP 是 **带有点** 的 pgr_ksp" msgid "pgr_withPointsDD is pgr_drivingDistance **with points**" -msgstr "pgr_withPointsDD 是**带有点**的 pgr_drivenDistance" +msgstr "pgr_withPointsDD 是 **带有点** 的 pgr_drivenDistance" #, fuzzy msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" From b378097d596ce7b97651a50beedad55859a05c28 Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Mon, 23 Sep 2024 03:01:08 +0000 Subject: [PATCH 349/428] Translated using Weblate (Chinese (Simplified)) Currently translated at 97.3% (5160 of 5300 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ --- .../LC_MESSAGES/pgrouting_doc_strings.po | 88 ++++++++----------- 1 file changed, 36 insertions(+), 52 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 53b09c408c..2ddbb88319 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-09-23 01:17+0000\n" -"PO-Revision-Date: 2024-09-23 02:56+0000\n" +"PO-Revision-Date: 2024-09-23 03:17+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Chinese (Simplified) \n" @@ -2650,8 +2650,8 @@ msgid "" msgstr "" "基于A*算法，双向搜索找到从起始顶点(``start_vid``)到结束顶点(``end_vid``)的最" "短路径。 它同时运行两项搜索：一项从 ``start_vid`` 向前搜索，一项从 " -"``end_vid``向后搜索，当两者在中间相遇时停止。 该实现可以与有向图和无向图一起" -"使用。" +"``end_vid`` 向后搜索，当两者在中间相遇时停止。 " +"该实现可以与有向图和无向图一起使用。" msgid "" "For large graphs where there is a path bewtween the starting vertex and " @@ -3173,7 +3173,7 @@ msgid "" msgstr "在本节中，将通过示例展示构建和使用收缩图。" msgid "The :doc:`sampledata` for an undirected graph is used" -msgstr "使用无向图的:doc:`sampledata`" +msgstr "使用无向图的 :doc:`sampledata`" msgid "a dead end operation first followed by a linear operation." msgstr "首先是死端操作，然后是线性操作。" @@ -3764,7 +3764,6 @@ msgstr ":math:`V = source \\cup target \\cup {start_{vid}} \\cup {end_{vid}}`" msgid "the set of edges :math:`E`" msgstr "边集:math:`E`" -#, fuzzy msgid "" ":math:`E = \\begin{cases} \\text{ } \\{(source_i, target_i, cost_i) " "\\text{ when } cost >=0 \\} & \\quad \\text{if } reverse\\_cost = " @@ -3774,13 +3773,13 @@ msgid "" "\\text{ when } reverse\\_cost_i>=0 \\} & \\quad \\text{if } reverse\\_cost " "\\neq \\varnothing \\\\ \\end{cases}`" msgstr "" -":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}`" +":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 \\n" +"eq \\varnothing \\\\ \\end{cases}`" msgid "Undirected graph" msgstr "无向图" @@ -3792,7 +3791,6 @@ msgid ":math:`V = source \\cup target \\cup {start_v{vid}} \\cup {end_{vid}}`" msgstr "" ":math:`V = source \\cup target \\cup {start_v{vid}} \\cup {end_{vid}}`" -#, fuzzy msgid "" ":math:`E = \\begin{cases} \\text{ } \\{(source_i, target_i, cost_i) " "\\text{ when } cost >=0 \\} & \\quad \\text{ } \\\\ \\cup \\{(target_i, " @@ -3805,17 +3803,17 @@ msgid "" "target_i, reverse\\_cost_i) \\text{ when } reverse\\_cost_i >=0)\\} & \\quad " "\\text{ if } reverse\\_cost \\neq \\varnothing \\\\ \\end{cases}`" msgstr "" -":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 \\n" +"eq \\varnothing \\\\ \\end{cases}`" msgid "The problem" msgstr "问题" @@ -4049,9 +4047,8 @@ msgid "" "an undirected graph." msgstr ":doc:`pgr_cuthillMckeeOrdering` -返回无向图的反向 Cuthill-McKee 排序。" -#, fuzzy msgid ":doc:`metrics-family`" -msgstr ":doc:`prim-family`" +msgstr ":doc:`metrics-family`" msgid "" ":doc:`pgr_betweennessCentrality` - Calculates relative betweenness " @@ -4149,11 +4146,11 @@ msgstr "当最大流量为0时则没有流量并返回**EMPTY SET**。" #, fuzzy msgid "There is no flow when source has the same vaule as target." -msgstr "当 **source**与 **target**相同时，就没有流量。" +msgstr "当 source与 target相同时，就没有流量。" #, fuzzy msgid "Any duplicated values in source or target are ignored." -msgstr "source(s)或target(s) 中的任何重复值都将被忽略。" +msgstr "source或target 中的任何重复值都将被忽略。" msgid "Calculates the flow/residual capacity for each edge. In the output" msgstr "计算每条边的流量/剩余容量。 在输出中" @@ -4579,13 +4576,10 @@ msgstr "" msgid "Official functions changes" msgstr "官方功能变更" -#, fuzzy msgid "" "`#2605 `__ Standarize " "spanning tree functions output" msgstr "" -"`#2516 `__标准化输出" -"pgr_aStar" msgid "Functions:" msgstr "新函数:" @@ -4626,16 +4620,14 @@ msgstr "" "`#2516 `__标准化输出" "pgr_aStar." -#, fuzzy msgid "``pgr_lineGraph``" -msgstr "pgr_lineGraph" +msgstr "``pgr_lineGraph``" msgid "Promoted to **proposed** signature." msgstr "晋升为 **拟议** 签名。" -#, fuzzy msgid "Works for directed and undirected graphs." -msgstr "适用于**有向**和**无向**图。" +msgstr "适用于有向和无向图。" msgid "Code enhancement" msgstr "代码改进" @@ -4689,9 +4681,8 @@ msgstr "树或森林中所有边的总权重最小化。" msgid "Kruskal's running time: :math:`O(E * log E)`" msgstr "克鲁斯卡尔的运行时间： :math:`O(E * log E)`" -#, fuzzy msgid "Metrics - Family of functions" -msgstr "Prim - 函数族" +msgstr "" msgid "Migration guide" msgstr "迁移指南" @@ -4878,13 +4869,12 @@ msgstr "如果需要，过滤掉添加的列，例如：" msgid "Migration of ``pgr_drivingdistance``" msgstr "迁移``pgr_drivingdistance``" -#, fuzzy msgid "" "Starting from `v3.6.0 `__ :" "doc:`pgr_drivingDistance` result columns are being standardized." msgstr "" -"从 `v3.6.0 `__开始， :doc:" -"`pgr_drivingDistance`结果列正在标准化。" +"从 `v3.6.0 `__开始， " +":doc:`pgr_drivingDistance` 结果列正在标准化。" msgid "from" msgstr "从" @@ -4958,18 +4948,14 @@ msgid "" "Migration of ``pgr_kruskalDD`` / ``pgr_kruskalBFS`` / ``pgr_kruskalDFS``" msgstr "" -#, fuzzy msgid "" "Starting from `v3.7.0 `__ :" "doc:`pgr_kruskalDD`, :doc:`pgr_kruskalBFS` and :doc:`pgr_kruskalDFS` result " "columns are being standardized." msgstr "" -"从 `v3.6.0 `__开始， :doc:" -"`pgr_drivingDistance`结果列正在标准化。" -#, fuzzy msgid "|result-bfs|" -msgstr "|result-spantree|" +msgstr "|result-bfs|" msgid "Single vertex" msgstr "单顶点" @@ -4977,17 +4963,15 @@ msgstr "单顶点" msgid "Multiple vertices" msgstr "多个顶点" -#, fuzzy msgid "Output columns were |result-bfs|" -msgstr "输出列是 |ksp-result|" +msgstr "" #, fuzzy msgid "Single vertex and Multiple vertices" msgstr "多个顶点" -#, fuzzy msgid "Do not have ``pred`` result column." -msgstr "没有``depth``结果列。" +msgstr "" #, fuzzy msgid "Be aware of the existence of `pred` result columns." @@ -11350,7 +11334,7 @@ msgid "" msgstr "本节的示例基于 :doc:`sampledata` 网络。" msgid "For **directed** graphs with ``cost`` and ``reverse_cost`` columns" -msgstr "对于带有 ``cost``和``reverse_cost``列的**有向**图" +msgstr "对于带有 ``cost`` 和 ``reverse_cost`` 列的 **有向** 图" msgid "Directed graph with cost and reverse cost columns" msgstr "带成本列和反向成本列的有向图" @@ -11424,7 +11408,7 @@ msgid "16) Using `Combinations`_ to get the solution of examples 9 to 11" msgstr "16) 使用 `组合`_ 来获取示例9到11的解决方案" msgid "For **directed** graphs only with ``cost`` column" -msgstr "仅适用于**有向**图，且仅包含``cost``列" +msgstr "仅适用于 **有向** 图，且仅包含 ``cost`` 列" msgid "Directed graph only with cost column" msgstr "仅有成本列的有向图" @@ -19593,7 +19577,7 @@ msgid "Undirected, with cost and reverse cost" msgstr "带有cost和 reverse cost的无向图" msgid "Directed graph with ``cost``" -msgstr "有``cost``的有向图" +msgstr "有 ``cost`` 的有向图" msgid "Directed, with cost" msgstr "有向，有成本" From 657567268b3162ff0235072e6dd8bed48e9d50c4 Mon Sep 17 00:00:00 2001 From: DeepL Date: Mon, 23 Sep 2024 03:11:16 +0000 Subject: [PATCH 350/428] Translated using Weblate (Chinese (Simplified)) Currently translated at 97.3% (5160 of 5300 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ --- locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 2ddbb88319..7cf5311398 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-09-23 01:17+0000\n" "PO-Revision-Date: 2024-09-23 03:17+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"Last-Translator: DeepL \n" "Language-Team: Chinese (Simplified) \n" "Language: zh_Hans\n" @@ -4632,14 +4632,11 @@ msgstr "适用于有向和无向图。" msgid "Code enhancement" msgstr "代码改进" -#, fuzzy msgid "" "`#2599 `__ Driving " "distance cleanup" -msgstr "" -"`#2599 `__ 行车距离清理" +msgstr "`#2599 `__ 行车距离清理" -#, fuzzy msgid "" "`#2607 `__ Read postgresql " "data on C++" @@ -4647,13 +4644,12 @@ msgstr "" "`#2607 `__ 在 C++ 上读取 " "postgresql 数据" -#, fuzzy msgid "" "`#2614 `__ Clang tidy does " "not work" msgstr "" -"`#2614 `__ Clang tidy 不工" -"作" +"`#2614 `__ Clang tidy " +"不工作" msgid "All releases" msgstr "所有版本" From 4d36e1b36f4224683cb4e44c3dc73cbe21b3d92d Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Mon, 23 Sep 2024 03:23:33 +0000 Subject: [PATCH 351/428] Translated using Weblate (Chinese (Simplified)) Currently translated at 97.3% (5161 of 5300 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ --- .../zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 7cf5311398..6a9f200c88 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-09-23 01:17+0000\n" -"PO-Revision-Date: 2024-09-23 03:17+0000\n" -"Last-Translator: DeepL \n" +"PO-Revision-Date: 2024-09-23 03:29+0000\n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Chinese (Simplified) \n" "Language: zh_Hans\n" @@ -9748,9 +9748,8 @@ msgstr "" "`Boost：Hawick 电路算法`__" -#, fuzzy msgid "Queries use the :doc:`sampledata` network." -msgstr "查询使用 :doc:`示例数据`网络。" +msgstr "查询使用 :doc:sampledata` 网络。" msgid "``pgr_biconnectedComponents``" msgstr "``pgr_biconnectedComponents``" @@ -11434,7 +11433,7 @@ msgid "24) Using `Combinations`_ to get the solution of examples 17 to 19" msgstr "24) 使用 `组合`_ 来获取示例17到19的解决方案" msgid "For **undirected** graphs only with ``cost`` column" -msgstr "仅适用于带有 ` `cost`` 列的 **无向** 图" +msgstr "仅适用于带有 ``cost`` 列的 **无向** 图" msgid "Undirected graph only with cost column" msgstr "仅有成本列的无向图" @@ -12152,7 +12151,7 @@ msgid "Returns set of |result-edge-color|" msgstr "Returns set of |result-edge-color|" msgid "Graph coloring of pgRouting :doc:`sampledata`" -msgstr "pgRouting :doc:`sampledata`的图着色" +msgstr "pgRouting :doc:`sampledata` 的图着色" msgid "``pgr_edgeDisjointPaths``" msgstr "``pgr_edgeDisjointPaths``" @@ -20149,14 +20148,13 @@ msgid "" msgstr "边``(-2, 17)``变为``(17, -2)``，成本为``0.6``，并添加到图中。" msgid "withPoints - Family of functions" -msgstr "withPoints -函数族" +msgstr "withPoints - 函数族" msgid "" "This family of functions belongs to the :doc:`withPoints-category` and the " "functions that compose them are based one way or another on dijkstra " "algorithm." -msgstr "" -"这一系列函数属于:doc:`withPoints-category`，组成它们的函数以某种方式基于 " +msgstr "这一系列函数属于 :doc:`withPoints-category`，组成它们的函数以某种方式基于 " "dijkstra 算法。" msgid "Depending on the name:" From 60dad36efc067d0867141fc6bd539d7eff140246 Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Mon, 23 Sep 2024 04:52:36 +0000 Subject: [PATCH 352/428] Translated using Weblate (Chinese (Simplified)) Currently translated at 97.3% (5160 of 5300 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ --- .../LC_MESSAGES/pgrouting_doc_strings.po | 178 +++++++++--------- 1 file changed, 87 insertions(+), 91 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 6a9f200c88..26379ba9f2 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-09-23 01:17+0000\n" -"PO-Revision-Date: 2024-09-23 03:29+0000\n" +"PO-Revision-Date: 2024-09-23 14:18+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Chinese (Simplified) \n" @@ -220,7 +220,7 @@ msgid "Depth of the ``node``." msgstr "``node`` 的深度。" msgid ":math:`0` when ``node`` = ``start_vid``." -msgstr ":math:`0` 当``node`` = ``start_vid``。" +msgstr ":math:`0` 当 ``node`` = ``start_vid``。" msgid "``start_vid``" msgstr "``start_vid``" @@ -241,7 +241,7 @@ msgid "Identifier of the ``edge`` used to arrive to ``node``." msgstr "用于到达``node``的``edge``的标识符。" msgid ":math:`-1` when ``node`` = ``start_vid``." -msgstr ":math:`-1` 当``node`` = ``start_vid``。" +msgstr ":math:`-1` 当 ``node`` = ``start_vid``。" msgid "``FLOAT``" msgstr "``FLOAT``" @@ -593,13 +593,13 @@ msgstr "" "ps>`__" msgid "To calculate the number of different tours through :math:`n` cities:" -msgstr "计算经过:math:`n` 城市的不同旅行次数：" +msgstr "计算经过 : math:`n` 城市的不同旅行次数：" msgid "Given a starting city," msgstr "给定一个起始城市，" msgid "There are :math:`n-1` choices for the second city," -msgstr "第二个城市还有:math:`n-1`个选择，" +msgstr "第二个城市还有 :math:`n-1` 个选择，" msgid "And :math:`n-2` choices for the third city, etc." msgstr "第三个城市的 :math:`n-2` 选项等。" @@ -819,7 +819,7 @@ msgid "Time based calculations:" msgstr "基于时间的计算：" msgid "Travel time between customers is :math:`distance / speed`" -msgstr "客户之间的旅行时间为:math:`distance / speed`" +msgstr "客户之间的旅行时间为 :math:`distance / speed`" msgid "Pickup and delivery order pair is done by the same vehicle." msgstr "取货和送货订单对由同一辆车完成。" @@ -994,31 +994,31 @@ msgstr "送货的节点标识符必须与 `Matrix SQL`_中的顶点标识符匹 msgid "" "For :doc:`pgr_pickDeliverEuclidean` the :math:`(x, y)` values of the " "locations are needed:" -msgstr "对于 :doc:`pgr_pickDeliverEuclidean`，这需要位置的:math:`(x, y)`值：" +msgstr "对于 :doc:`pgr_pickDeliverEuclidean`，这需要位置的 :math:`(x, y)` 值：" msgid "``p_x``" msgstr "``p_x``" msgid ":math:`x` value of the pick up location" -msgstr "取货地点的:math:`x`值" +msgstr "取货地点的 :math:`x` 值" msgid "``p_y``" msgstr "``p_y``" msgid ":math:`y` value of the pick up location" -msgstr "取货地点的:math:`y`值" +msgstr "取货地点的 :math:`y` 值" msgid "``d_x``" msgstr "``d_x``" msgid ":math:`x` value of the delivery location" -msgstr "送货地点的:math:`x`值" +msgstr "送货地点的 :math:`x` 值" msgid "``d_y``" msgstr "``d_y``" msgid ":math:`y` value of the delivery location" -msgstr "送货地点的:math:`y` 值" +msgstr "送货地点的 :math:`y` 值" msgid "Vehicles SQL" msgstr "车辆 SQL" @@ -1111,19 +1111,19 @@ msgid "``start_x``" msgstr "``start_x``" msgid ":math:`x` value of the starting location" -msgstr "起始位置的:math:`x`值" +msgstr "起始位置的 :math:`x` 值" msgid "``start_y``" msgstr "``start_y``" msgid ":math:`y` value of the starting location" -msgstr "起始位置的:math:`y`值" +msgstr "起始位置的 :math:`y` 值" msgid "[``end_x``]" msgstr "[``end_x``]" msgid ":math:`x` value of the ending location" -msgstr "结束位置的:math:`x`值" +msgstr "结束位置的 :math:`x` 值" msgid "When missing: ``start_x`` is used." msgstr "缺失时：使用``start_x``值。" @@ -1132,7 +1132,7 @@ msgid "[``end_y``]" msgstr "[``end_y``]" msgid ":math:`y` value of the ending location" -msgstr "结束位置的:math:`y`值" +msgstr "结束位置的 :math:`y` 值" msgid "When missing: ``start_y`` is used." msgstr "缺失时：使用``start_y``值。" @@ -1194,7 +1194,7 @@ msgstr "INTEGER" msgid "" "Sequential value starting from **1** for the stops made by the current " "vehicle. The :math:`m_{th}` stop of the current vehicle." -msgstr "当前车辆停止的顺序值，从 **1** 开始。 当前第:math:`m_{th}`车辆的停止。" +msgstr "当前车辆停止的顺序值，从 **1** 开始。 当前第 :math:`m_{th}` 车辆的停止。" msgid "Sumary row has the **total time windows violations**." msgstr "摘要行包含**总时间窗口违规情况**。" @@ -1232,7 +1232,7 @@ msgstr "取货-送货订单对标识符。" msgid "" "Value :math:`-1`: When no order is involved on the current stop location." -msgstr "值:math:`-1`: 当前停留位置没有订单参与。" +msgstr "值 :math:`-1`: 当前停留位置没有订单参与。" msgid "``cargo``" msgstr "``cargo``" @@ -1241,7 +1241,7 @@ msgid "Cargo units of the vehicle when leaving the stop." msgstr "车辆离开停车点时的货物单位。" msgid "Value :math:`-1` on solution summary row." -msgstr "值:math:`-1`在解决方案摘要行。" +msgstr "值 :math:`-1` 在解决方案摘要行。" msgid "``travel_time``" msgstr "``travel_time``" @@ -1363,13 +1363,13 @@ msgid "The `capacity` of a vehicle, can be measured in:" msgstr "车辆的`容量`可以通过以下方式测量：" msgid "Volume units like :math:`m^3`." -msgstr "体积单位如:math:`m^3`。" +msgstr "体积单位如 :math:`m^3`。" msgid "Area units like :math:`m^2` (when no stacking is allowed)." -msgstr "面积单位如:math:`m^2`（不允许堆叠时）。" +msgstr "面积单位如 : math:`m^2` （不允许堆叠时）。" msgid "Weight units like :math:`kg`." -msgstr "重量单位如:math:`kg`。" +msgstr "重量单位如 :math:`kg`。" msgid "Number of boxes that fit in the vehicle." msgstr "车辆内可容纳的箱子数量。" @@ -1439,10 +1439,10 @@ msgid "When using :doc:`pgr_pickDeliverEuclidean`:" msgstr "当使用 :doc:`pgr_pickDeliverEuclidean`：" msgid "The vehicles have :math:`(x, y)` pairs for start and ending locations." -msgstr "车辆有起点和终点:math:`(x, y)`对。" +msgstr "车辆有起点和终点 :math:`(x, y)` 对。" msgid "The orders Have :math:`(x, y)` pairs for pickup and delivery locations." -msgstr "订单有取货和送货地点:math:`(x, y)`对。" +msgstr "订单有取货和送货地点 :math:`(x, y)` 对。" msgid "When using :doc:`pgr_pickDeliver`:" msgstr "当使用:doc:`pgr_pickDeliver`:" @@ -1584,8 +1584,7 @@ msgstr "用于:doc:`pgr_pickDeliver`:" msgid "" "Given :math:`v = d / t` therefore :math:`t = d / v` And the ``factor`` " "becomes :math:`1 / v`" -msgstr "" -"给定 :math:`v = d / t` 因此:math:`t = d / v` 并且``因子``变为:math:`1 / v`" +msgstr "给定 :math:`v = d / t` 因此 :math:`t = d / v` 并且 ``因子`` 变为:math:`1 / v`" msgid "v" msgstr "v" @@ -1703,10 +1702,10 @@ msgid "Ordering is:" msgstr "顺序是：" msgid "first by ``start_vid`` (if exists)" -msgstr "首先按``start_vid``（如果存在）" +msgstr "首先按 ``start_vid`` （如果存在）" msgid "then by ``end_vid``" -msgstr "然后按``end_vid``" +msgstr "然后按 ``end_vid``" msgid "Values are returned when there is a path." msgstr "当存在路径时返回值。" @@ -1715,28 +1714,28 @@ msgid "Let :math:`v` and :math:`u` be nodes on the graph:" msgstr "设 :math:`v` 和 :math:`u` 为图上的节点：" msgid "If there is no path from :math:`v` to :math:`u`:" -msgstr "如果没有从:math:`v` 到 :math:`u`的路径：" +msgstr "如果没有从 :math:`v` 到 :math:`u` 的路径：" msgid "no corresponding row is returned" msgstr "没有返回对应的行" msgid "``agg_cost`` from :math:`v` to :math:`u` is :math:`\\infty`" -msgstr "从:math:`v`到:math:`u`的``agg_cost`` 是 :math:`\\infty`" +msgstr "从 :math:`v` 到 :math:`u` 的 ``agg_cost`` 是 :math:`\\infty`" msgid "There is no path when :math:`v = u` therefore" -msgstr "当:math:`v = u`没有路径，因此" +msgstr "当 :math:`v = u` 没有路径，因此" msgid "``agg_cost`` from `v` to `u` is :math:`0`" -msgstr "从`v`到`u`的``agg_cost``是:math:`0`" +msgstr "从 `v` 到 `u` 的 ``agg_cost`` 是 :math:`0`" msgid "When :math:`(x,y)` coordinates for the same vertex identifier differ:" -msgstr "当同一顶点标识符的:math:`(x,y)` 坐标不同时：" +msgstr "当同一顶点标识符的 :math:`(x,y)` 坐标不同时：" msgid "A random selection of the vertex's :math:`(x,y)` coordinates is used." -msgstr "使用随机选择的顶点的:math:`(x,y)`坐标。" +msgstr "使用随机选择的顶点的 :math:`(x,y)` 坐标。" msgid "Running time: :math:`O((E + V) * \\log V)`" -msgstr "运行时间：:math:`O((E + V) * \\log V)`" +msgstr "运行时间： :math:`O((E + V) * \\log V)`" msgid "aStar optional parameters" msgstr "aStar 可选参数" @@ -1769,20 +1768,20 @@ msgid "``1``" msgstr "``1``" msgid "For units manipulation. :math:`factor > 0`." -msgstr "对于单位操作。:math:`factor > 0`。" +msgstr "对于单位操作。 :math:`factor > 0`。" msgid "``epsilon``" msgstr "``epsilon``" msgid "For less restricted results. :math:`epsilon >= 1`." -msgstr "对于限制较少的结果。:math:`epsilon >= 1`。" +msgstr "对于限制较少的结果。 :math:`epsilon >= 1`。" msgid "" "See :ref:`heuristics ` available and :ref:`factor " "` handling." msgstr "" -"查看可用的:ref:`heuristics `和:ref:`factor `" -"处理。" +"查看可用的 :ref:`heuristics ` 和 :ref:`factor " +"` 处理。" msgid "Advanced documentation" msgstr "高级文档" @@ -1794,7 +1793,7 @@ msgid "Currently the heuristic functions available are:" msgstr "目前可用的heuristic函数有：" msgid "where :math:`\\Delta x = x_1 - x_0` and :math:`\\Delta y = y_1 - y_0`" -msgstr "其中 :math:`\\Delta x = x_1 - x_0`和:math:`\\Delta y = y_1 - y_0`" +msgstr "其中 :math:`\\Delta x = x_1 - x_0` 和 :math:`\\Delta y = y_1 - y_0`" msgid "Analysis 1" msgstr "分析1" @@ -1874,9 +1873,8 @@ msgstr "返回图中每对节点的最短路径成本之和。" msgid "" "Boost returns a :math:`V \\times V` matrix, where the infinity values. " "Represent the distance between vertices for which there is no path." -msgstr "" -"Boost 返回一个:math:`V \\times V`矩阵，其中无穷大值。 表示没有路径的顶点之间" -"的距离。" +msgstr "Boost 返回一个 :math:`V \\times V` 矩阵，其中无穷大值。 " +"表示没有路径的顶点之间的距离。" msgid "" "We return only the non infinity values in form of a set of `(start_vid, " @@ -1984,7 +1982,7 @@ msgid "DENSITY" msgstr "DENSITY" msgid "is the density of the data :math:`\\dfrac{E}{V \\times (V-1)}`." -msgstr "是数据:math:`\\dfrac{E}{V \\times (V-1)}`的密度。" +msgstr "是数据 :math:`\\dfrac{E}{V \\times (V-1)}` 的密度。" msgid "OUT ROWS" msgstr "OUT ROWS" @@ -2718,7 +2716,7 @@ msgstr "当起始顶点和结束顶点相同时。" msgid "" "The **aggregate cost** of the non included values :math:`(v, v)` is :math:`0`" -msgstr "未包含值:math:`(v, v)`的**aggregate cost**为:math:`0`" +msgstr "未包含值 :math:`(v, v)` 的 **aggregate cost** 为 :math:`0`" msgid "" "When the starting vertex and ending vertex are the different and there is no " @@ -2728,7 +2726,7 @@ msgstr "当起始顶点和结束顶点不同且不存在路径时：" msgid "" "The **aggregate cost** the non included values :math:`(u, v)` is :math:" "`\\infty`" -msgstr "未包含值:math:`(u, v)`的**aggregate cost**是:math:`\\infty`" +msgstr "未包含值 :math:`(u, v)` 的 **aggregate cost** 是 :math:`\\infty`" msgid "" "For optimization purposes, any duplicated value in the starting vertices or " @@ -2736,7 +2734,7 @@ msgid "" msgstr "出于优化目的，起始顶点或结束顶点中的任何重复值都将被忽略。" msgid "Running time (worse case scenario): :math:`O((V \\log V + E))`" -msgstr "运行时间（最坏情况）：:math:`O((V \\log V + E))`" +msgstr "运行时间（最坏情况）： :math:`O((V \\log V + E))`" msgid "It is expected to terminate faster than pgr_dijkstra" msgstr "预计终止速度比 pgr_dijkstra 更快" @@ -2757,7 +2755,7 @@ msgid "Process is done only on edges with **positive** costs." msgstr "仅在具有**正**成本的边缘进行处理。" msgid "Running time: :math:`O(E * (E + V * logV))`" -msgstr "运行时间：:math:`O(E * (E + V * logV))`" +msgstr "运行时间： :math:`O(E * (E + V * logV))`" msgid "Graph must be connected." msgstr "图必须是连通的。" @@ -3002,14 +3000,13 @@ msgstr ":math:`\\{x, y\\}`" msgid "" "From above, nodes :math:`\\{a, b, d\\}` are dead ends because the number of " "adjacent vertices is 1. No further checks are needed for those nodes." -msgstr "" -"从上面来看，节点:math:`\\{a, b, d\\}`是死端，因为相邻顶点的数量为 1。不需要对" -"这些节点进行进一步检查。" +msgstr "从上面来看，节点 :math:`\\{a, b, d\\}` 是死端，因为相邻顶点的数量为 " +"1。不需要对这些节点进行进一步检查。" msgid "" "On the following table, nodes :math:`\\{c, e\\}` because the even that the " "number of adjacent vertices is not 1 for" -msgstr "下表中，节点 :math:`\\{c, e\\}`因为相邻顶点数不为1的偶数为" +msgstr "下表中，节点 :math:`\\{c, e\\}` 因为相邻顶点数不为1的偶数为" msgid "Operation: Dead End Contraction" msgstr "操作：死端收缩" @@ -3017,19 +3014,18 @@ msgstr "操作：死端收缩" msgid "" "The dead end contraction will stop until there are no more dead end nodes. " "For example from the following graph where :math:`w` is the `dead end`_ node:" -msgstr "" -"死端收缩将停止，直到不再有死端节点。 例如，从下图中，其中:math:`w`是`死端`_节" -"点：" +msgstr "死端收缩将停止，直到不再有死端节点。 例如，从下图中，其中 :math:`w` " +"是`死端`_节点：" msgid "" "After contracting :math:`w`, node :math:`v` is now a `dead end`_ node and is " "contracted:" -msgstr "收缩 :math:`w`后，节点:math:`v`现在是一个`死端`_ 节点并且已收缩：" +msgstr "收缩 :math:`w` 后，节点 :math:`v` 现在是一个`死端`_ 节点并且已收缩：" msgid "" "After contracting :math:`v`, stop. Node :math:`u` has the information of " "nodes that were contrcted." -msgstr "在收缩:math:`v`之后，停止。节点:math:`u`有已收缩节点的信息。" +msgstr "在收缩 :math:`v` 之后，停止。节点 :math:`u` 有已收缩节点的信息。" msgid "Node :math:`u` has the information of nodes that were contracted." msgstr "节点:math:`u`有已收缩节点的信息。" @@ -3756,13 +3752,13 @@ msgid "The weighted directed graph, :math:`G_d(V,E)`, is definied by:" msgstr "加权有向图， :math:`G_d(V,E)`的定义如下：" msgid "the set of vertices :math:`V`" -msgstr "顶点集:math:`V`" +msgstr "顶点集 :math:`V`" msgid ":math:`V = source \\cup target \\cup {start_{vid}} \\cup {end_{vid}}`" msgstr ":math:`V = source \\cup target \\cup {start_{vid}} \\cup {end_{vid}}`" msgid "the set of edges :math:`E`" -msgstr "边集:math:`E`" +msgstr "边集 :math:`E`" msgid "" ":math:`E = \\begin{cases} \\text{ } \\{(source_i, target_i, cost_i) " @@ -3785,7 +3781,7 @@ msgid "Undirected graph" msgstr "无向图" msgid "The weighted undirected graph, :math:`G_u(V,E)`, is definied by:" -msgstr "加权无向图，:math:`G_u(V,E)`的定义如下：" +msgstr "加权无向图， :math:`G_u(V,E)` 的定义如下：" msgid ":math:`V = source \\cup target \\cup {start_v{vid}} \\cup {end_{vid}}`" msgstr "" @@ -3893,8 +3889,8 @@ msgid "" "`start_{vid}` and :math:`end_{vid}`, if it exists, in terms of a sequence of " "nodes and of edges," msgstr "" -"换句话说：如果:math:`start_{vid}`和:math:`end_{vid}`之间存在最短路径，算法会" -"根据节点和边的序列返回该路径、" +"换句话说：如果 :math:`start_{vid}` 和 :math:`end_{vid}` " +"之间存在最短路径，算法会根据节点和边的序列返回该路径、" msgid "" ":math:`path\\_seq` indicates the relative position in the path of the :math:" @@ -3906,7 +3902,7 @@ msgstr ":math:`cost`是用于转到下一个节点的边的成本。" msgid "" ":math:`agg\\_cost` is the cost from the :math:`start_{vid}` up to the node." -msgstr ":math:`agg\\_cost`是从 :math:`start_{vid}`到节点的成本。" +msgstr ":math:`agg\\_cost` 是从 :math:`start_{vid}` 到节点的成本。" msgid "If there is no path, the resulting set is empty." msgstr "如果没有路径，则结果集为空。" @@ -3948,7 +3944,7 @@ msgid "Edge :math:`(u, v)` will not be included when:" msgstr "在以下情况下，边:math:`(u, v)`将不包括在内：" msgid "The distance from the **root** to :math:`u` > limit distance." -msgstr "从 **root**到 :math:`u`的距离>限制距离。" +msgstr "从 **root** 到 :math:`u` 的距离>限制距离。" msgid "The distance from the **root** to :math:`v` > limit distance." msgstr "从 **root**到 :math:`v`的距离>限制距离。" @@ -4428,10 +4424,11 @@ msgid "" "https://pgrouting.org. For other licenses used in pgRouting see the :ref:" "`license` page." msgstr "" -"pgRouting 手册根据`知识共享署名-相同方式共享3.0许可证 `_。 您可以随意使用本材料，但我们要求" -"您将功劳归功于 pgRouting 项目，并尽可能提供返回 https://pgrouting.org 的链" -"接。 有关 pgRouting 中使用的其他许可证，请参阅:ref:`license` page.。" +"pgRouting 手册根据 `知识共享署名-相同方式共享3.0许可证 " +"`_。 您可以随意使用本材料，" +"但我们要求您将功劳归功于 pgRouting 项目，并尽可能提供返回 https://" +"pgrouting.org 的链接。 有关 pgRouting 中使用的其他许可证，请参阅 " +":ref:`license` page.。" msgid "General" msgstr "常规" @@ -7347,8 +7344,7 @@ msgstr "要下载此版本：" msgid "" "Go to :ref:`install-short` for more instructions on extracting tar ball and " "compiling pgRouting." -msgstr "" -"转到:ref:`install-short`以获取有关提取 tar 包和编译 pgRouting 的更多说明。" +msgstr "转到 :ref:`install-short`以获取有关提取 tar 包和编译 pgRouting 的更多说明。" msgid "git" msgstr "git" @@ -8034,7 +8030,7 @@ msgid "Identifier of the node in the path from ``start_vid`` to ``end_vid``" msgstr "从``start_vid`` 到 ``end_vid``路径中节点的标识符" msgid ":math:`0` for the last ``node`` of the path." -msgstr ":math:`0`为路径的最后一个``node``。" +msgstr ":math:`0` 为路径的最后一个 ``node``。" msgid "Aggregate cost from **start vid** to ``node``." msgstr "从 **start vid**到``node``的总成本。" @@ -8611,16 +8607,16 @@ msgid "let `v` and `u` are nodes on the graph:" msgstr "设`v`和 `u` 是图上的节点：" msgid "when there is no path from `v` to `u`:" -msgstr "当没有从`v`到 `u` 的路径时：" +msgstr "当没有从 `v` 到 `u` 的路径时：" msgid "cost from `v` to `u` is :math:`\\inf`" -msgstr "从`v`到 `u`的成本是 :math:`\\inf`" +msgstr "从 `v` 到 `u` 的成本是 :math:`\\inf`" msgid "when :math:`v = u` then" msgstr "当 :math:`v = u`时" msgid "cost from `v` to `u` is :math:`0`" -msgstr "从`v`到`u`的成本是:math:`0`" +msgstr "从 `v` 到 `u` 的成本是 :math:`0`" msgid "When the graph is **undirected** the cost matrix is symmetric" msgstr "当图 **无向** 时，成本矩阵是对称的" @@ -9749,7 +9745,7 @@ msgstr "" "hawick_circuits.html>`__" msgid "Queries use the :doc:`sampledata` network." -msgstr "查询使用 :doc:sampledata` 网络。" +msgstr "查询使用 :doc:`sampledata` 网络。" msgid "``pgr_biconnectedComponents``" msgstr "``pgr_biconnectedComponents``" @@ -11797,7 +11793,7 @@ msgid "Near optional parameters" msgstr "接近可选参数" msgid "``cap``" -msgstr "`cap``" +msgstr "``cap``" msgid "Find at most ``cap`` number of nearest shortest paths" msgstr "查找最多 ``cap`` 条最近的最短路径" @@ -11806,10 +11802,10 @@ msgid "``global``" msgstr "``global``" msgid "When ``true``: only ``cap`` limit results will be returned" -msgstr "``true``时：仅返回``cap``结果" +msgstr "``true`` 时：仅返回 ``cap`` 结果" msgid "When ``false``: ``cap`` limit per ``Start vid`` will be returned" -msgstr "当 ``false` 时：将返回每个 ``Start vid` 的 ``cap` 限值" +msgstr "当 ``false`` 时：将返回每个 ``Start vid`` 的 ``cap`` 限值" msgid "boost: https://www.boost.org/libs/graph/doc/table_of_contents.html" msgstr "boost: https://www.boost.org/libs/graph/doc/table_of_contents.html" @@ -12151,7 +12147,7 @@ msgid "Returns set of |result-edge-color|" msgstr "Returns set of |result-edge-color|" msgid "Graph coloring of pgRouting :doc:`sampledata`" -msgstr "pgRouting :doc:`sampledata` 的图着色" +msgstr "" msgid "``pgr_edgeDisjointPaths``" msgstr "``pgr_edgeDisjointPaths``" @@ -12860,7 +12856,7 @@ msgid "" msgstr "生成一个包含用于计算所有列的代码的 PostgreSQL ``NOTICE``" msgid "``cap`` and **original point** are used in the code" -msgstr "代码中使用了``cap``和 **原始点**" +msgstr "代码中使用了 ``cap`` 和 **原始点**" msgid "Many points examples" msgstr "多点示例" @@ -15536,7 +15532,7 @@ msgstr "" msgid "" "Executes the :ref:`TRSP-family:TRSP algorithm` for the conflicting paths." -msgstr "对冲突路径执行 :ref:`TRSP-family:TRSP 算法`。" +msgstr "对冲突路径执行 :ref:`TRSP-family:TRSP algorithm`。" msgid "" "From the :doc:`pgr_withPointsVia` result it removes the conflicting paths " @@ -19607,9 +19603,9 @@ msgid "" "companies providing pgRouting development and consulting services." msgstr "" "pgRouting 社区支持可通过 `pgRouting 网站 `_、`文档`_、教程、邮件列表等获得。 如果您正" -"在寻求:ref:`商业支持`，请在下面找到提供 pgRouting 开发和" -"咨询服务的公司列表。" +"html>`_、`文档 `_、教程、邮件列表等获得。 " +"如果您正在寻求 :ref:`商业支持 `，请在下面找到提供 " +"pgRouting 开发和咨询服务的公司列表。" msgid "Reporting Problems" msgstr "报告问题" @@ -19962,10 +19958,10 @@ msgid "" msgstr "每个点位置显示它与边 ``(source, target)``的关系" msgid "On the right for points **2** and **4**." -msgstr "在右侧为第** 2 **点和第** 4** 点。" +msgstr "在右侧为第 **2** 点和第 **4** 点。" msgid "On the left for points **1**, **3** and **5**." -msgstr "左侧为第 **1**、**3** 和** 5 **点。" +msgstr "左侧为第 **1**、 **3** 和 **5** 点。" msgid "On both sides for point **6**." msgstr "在两侧为第**6**点。" @@ -19993,10 +19989,10 @@ msgid "" msgstr "直观地显示不同驾驶侧数据解释方式的差异。" msgid "Point **1** located on edge ``(6, 5)``" -msgstr "点** 1 **位于边``(6, 5)``" +msgstr "点 **1** 位于边 ``(6, 5)``" msgid "Point **2** located on edge ``(16, 17)``" -msgstr "点** 2 **位于边缘 ``(16, 17)``" +msgstr "点 **2** 位于边缘 ``(16, 17)``" msgid "Point **3** located on edge ``(8, 12)``" msgstr "点 **3** 位于边缘``(8, 12)``" @@ -20011,10 +20007,10 @@ msgid "Point **6** located on edges ``(6, 7)`` and ``(7, 6)``" msgstr "点** 6** 位于边``(6, 7)``和``(7, 6)``" msgid "Point **1** located on edge ``(5, 6)``" -msgstr "点 **1 **位于边 ``(5, 6)``" +msgstr "点 **1 ** 位于边 ``(5, 6)``" msgid "Point **2** located on edge ``(17, 16)``" -msgstr "点** 2** 位于边 ``(17, 16)``" +msgstr "点 **2** 位于边 ``(17, 16)``" msgid "Point **4** located on edge ``(3, 1)``" msgstr "点 4 位于边``(3, 1)``" @@ -20029,10 +20025,10 @@ msgid "On the :doc:`TRSP-family` this option is not valid" msgstr "在 :doc:`TRSP-family` 上，此选项无效" msgid "Point **1** located on edge ``(5, 6)`` and ``(6, 5)``" -msgstr "点**1**位于边``(5, 6)``和 ``(6, 5)``" +msgstr "点 **1** 位于边 ``(5, 6)`` 和 ``(6, 5)``" msgid "Point **2** located on edge ``(17, 16)``and ``16, 17``" -msgstr "点**2**位于边``(17, 16)``和 ``16, 17``" +msgstr "点 **2** 位于边 ``(17, 16)`` 和 ``16, 17``" msgid "Point **4** located on edge ``(3, 1)`` and ``(1, 3)``" msgstr "点 **4**位于边``(3, 1)``和``(1, 3)``" From 34869fc95d790f0cab054502b481776a7780d99a Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Mon, 23 Sep 2024 03:49:40 +0000 Subject: [PATCH 353/428] Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (98 of 98 strings) Translation: pgRouting/index Translate-URL: https://weblate.osgeo.org/projects/pgrouting/index/zh_Hans/ --- locale/zh_Hans/LC_MESSAGES/index.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/index.po b/locale/zh_Hans/LC_MESSAGES/index.po index ba2a8f34ef..225a3549e6 100644 --- a/locale/zh_Hans/LC_MESSAGES/index.po +++ b/locale/zh_Hans/LC_MESSAGES/index.po @@ -8,8 +8,8 @@ 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" -"PO-Revision-Date: 2023-10-21 03:23+0000\n" -"Last-Translator: Zuochenwei \n" +"PO-Revision-Date: 2024-09-23 14:18+0000\n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Chinese (Simplified) \n" "Language: zh_Hans\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 5.0\n" +"X-Generator: Weblate 5.4.3\n" #: ../../build/doc/index.rst:12 msgid "**Supported versions:** `Latest `__ (`3.4 `__) `3.3 `__ `3.2 `__ `3.1 `__ `3.0 `__" @@ -59,11 +59,11 @@ msgstr "知识共享署名 - 相同方式共享 3.0 许可证" #: ../../build/doc/index.rst:42 msgid "The pgRouting Manual is licensed under a `Creative Commons Attribution-Share Alike 3.0 License `_. Feel free to use this material any way you like, but we ask that you attribute credit to the pgRouting Project and wherever possible, a link back to https://pgrouting.org. For other licenses used in pgRouting see the :ref:`license` page." msgstr "" -"pgRouting 手册根据`知识共享署名-相同方式共享3.0许可证 " +"pgRouting 手册根据 `知识共享署名-相同方式共享3.0许可证 " "`_。 您可以随意使用本材料，" "但我们要求您将功劳归功于 pgRouting 项目，并尽可能提供返回 https://" -"pgrouting.org 的链接。 有关 pgRouting " -"中使用的其他许可证，请参阅:ref:`license` page.。" +"pgrouting.org 的链接。 有关 pgRouting 中使用的其他许可证，请参阅 " +":ref:`license` page.。" #: ../../build/doc/index.rst:50 msgid "General" From 21fe8f13789f1da62aed93faa64ce1ac6ea7b6f3 Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Mon, 23 Sep 2024 19:48:30 +0000 Subject: [PATCH 354/428] Translated using Weblate (Spanish) Currently translated at 94.3% (4998 of 5300 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 556c8e325b..194ffbd28b 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-08-26 11:20+0000\n" -"PO-Revision-Date: 2024-09-23 02:56+0000\n" +"PO-Revision-Date: 2024-09-23 19:49+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" @@ -6074,7 +6074,7 @@ msgid "Migrating ``pgr_trsp`` (Edges) using ``pgr_withPoints``" msgstr "Migrando ``pgr_trsp`` (Aristas) usando ``pgr_withPoints``" msgid "Use :doc:`pgr_withPoints` instead." -msgstr "Utiliza en su lugar :doc:`pgr_withPoints`." +msgstr "Utilizar en su lugar :doc:`pgr_withPoints`." msgid "Do not show details, as the deprecated function does not show details." msgstr "No enseña detalles, pues las funciones obsoletas no enseñan detalles." @@ -14142,7 +14142,7 @@ msgid "Find at most two routes to a given point" msgstr "Encontrar como máximo dos rutas a un punto dado" msgid "Using :doc:`pgr_withPoints`" -msgstr "Usando :doc:`pgr_withPoints" +msgstr "Usando :doc:`pgr_withPoints`" msgid "A point of interest table" msgstr "Una tabla de puntos de interés" From b4d23e814fb44fa9ac0c9295c5a02c8601d6bbaa Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 20:01:33 +0000 Subject: [PATCH 355/428] Update locale: commit 21fe8f1378 --- .../ja/LC_MESSAGES/pgrouting_doc_strings.po | 2 -- .../ko/LC_MESSAGES/pgrouting_doc_strings.po | 2 -- .../LC_MESSAGES/pgrouting_doc_strings.po | 26 ------------------- 3 files changed, 30 deletions(-) diff --git a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po index db06297942..43112e3b7b 100644 --- a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po @@ -18856,5 +18856,3 @@ msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "" #, fuzzy -#~ msgid "Identifier of the vertex" -#~ msgstr "終了ノードの識別子。" diff --git a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po index 36d86529b7..ca5a127369 100644 --- a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po @@ -18743,5 +18743,3 @@ msgstr "" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "" -#~ msgid "wget" -#~ msgstr "wget" diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 26379ba9f2..4c890c1bc8 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -20175,29 +20175,3 @@ msgstr "pgr_withPointsDD 是 **带有点** 的 pgr_drivenDistance" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "pgr_withPointsvia 是 **带有点** 的" -#~ msgid "" -#~ "`Wikipedia: Graph Coloring `__" -#~ msgstr "`维基百科：图着色 `__" - -#~ msgid "" -#~ "Creates a **super source** and edges to all the source(s), and a **super " -#~ "target** and the edges from all the targets(s)." -#~ msgstr "" -#~ "创建**super source**和所有源的边，以及 **super target** 和所有目标的边。" - -#~ msgid "wget" -#~ msgstr "wget" - -#~ msgid "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_ , [``directed``])" -#~ msgstr "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_ , [``directed``])" - -#, fuzzy -#~ msgid "Identifier of the vertex" -#~ msgstr "顶点的标识符。" - -#~ msgid "" -#~ "Find the route that visits the vertices :math:`\\{5, 1, 8\\}` in that " -#~ "order on an **directed** graph." -#~ msgstr "" -#~ "在一个**有向**图上，找出按此顺序访问顶点 :math:`\\{5, 1, 8\\}` 的路径。" From 08463e5f9f3cac1737a08773e674b8eaee417c0a Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 23 Sep 2024 15:41:48 -0600 Subject: [PATCH 356/428] some manual changes to fix sphinx errors in chinese --- .github/workflows/doc-check.yml | 2 +- .../LC_MESSAGES/pgrouting_doc_strings.po | 424 +++++++++--------- 2 files changed, 214 insertions(+), 212 deletions(-) diff --git a/.github/workflows/doc-check.yml b/.github/workflows/doc-check.yml index 88aa3717a4..1c22de909c 100644 --- a/.github/workflows/doc-check.yml +++ b/.github/workflows/doc-check.yml @@ -65,7 +65,7 @@ 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 + # 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/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 4c890c1bc8..d33ec5c1f0 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -563,7 +563,7 @@ msgid "" "mathematicians **Sir William Rowam Hamilton** and **Thomas Penyngton " "Kirkman**." msgstr "" -"旅行推销员问题由数学家 **William Rowam Hamilton 爵士**和 **Thomas Penyngton " +"旅行推销员问题由数学家 **William Rowam Hamilton 爵士** 和 **Thomas Penyngton " "Kirkman** 于 18 世纪研究。" msgid "" @@ -730,7 +730,7 @@ msgstr "内容" msgid "" "Vehicle Routing Problems `VRP` are **NP-hard** optimization problem, it " "generalises the travelling salesman problem (TSP)." -msgstr "车辆路径问题 `VRP` 是 **NP-hard**优化问题，它推广了旅行商问题 (TSP)。" +msgstr "车辆路径问题 `VRP` 是 **NP-hard** 优化问题，它推广了旅行商问题 (TSP)。" msgid "The objective of the VRP is to minimize the total route cost." msgstr "VRP 的目标是最小化总路由成本。" @@ -1156,7 +1156,7 @@ msgid "Aggregate cost from ``start_vid`` to ``end_vid``." msgstr "从 ``start_vid`` 到 ``end_vid`` 的总成本。" msgid "Sequential value starting from **1**." -msgstr "从**1**开始的顺序值。" +msgstr "从 **1** 开始的顺序值。" msgid "``vehicle_seq``" msgstr "``vehicle_seq``" @@ -1179,7 +1179,7 @@ msgid "Current vehicle identifier." msgstr "当前车辆标识符。" msgid "Sumary row has the **total capacity violations**." -msgstr "摘要行有**总容量违规情况**。" +msgstr "摘要行有 **总容量违规情况**。" msgid "" "A capacity violation happens when overloading or underloading a vehicle." @@ -1194,10 +1194,10 @@ msgstr "INTEGER" msgid "" "Sequential value starting from **1** for the stops made by the current " "vehicle. The :math:`m_{th}` stop of the current vehicle." -msgstr "当前车辆停止的顺序值，从 **1** 开始。 当前第 :math:`m_{th}` 车辆的停止。" +msgstr "当前车辆停止的顺序值，从 **1** 开始。 当前第:math:`m_{th}`车辆的停止。" msgid "Sumary row has the **total time windows violations**." -msgstr "摘要行包含**总时间窗口违规情况**。" +msgstr "摘要行包含 **总时间窗口违规情况**。" msgid "" "A time window violation happens when arriving after the location has closed." @@ -1250,7 +1250,7 @@ msgid "Travel time from previous ``stop_seq`` to current ``stop_seq``." msgstr "从前一个 ``stop_seq`` 到当前 ``stop_seq`` 的行程时间。" msgid "Summary has the **total traveling time**:" -msgstr "总结一下**总的行程时间**：" +msgstr "总结一下 **总的行程时间**：" msgid "The sum of all the ``travel_time``." msgstr "所有 ``travel_time`` 的总和。" @@ -1271,7 +1271,7 @@ msgid "``wait_time``" msgstr "``wait_time``" msgid "Summary row has the **total waiting time**:" -msgstr "摘要行包含**总等待时间**：" +msgstr "摘要行包含 **总等待时间**：" msgid "The sum of all the ``wait_time``." msgstr "所有 ``wait_time`` 的总和。" @@ -1283,7 +1283,7 @@ msgid "Service duration at current location." msgstr "当前位置的服务持续时间。" msgid "Summary row has the **total service time**:" -msgstr "摘要行包含**总服务时间**：" +msgstr "摘要行包含 **总服务时间**：" msgid "The sum of all the ``service_time``." msgstr "所有``service_time``的总和。" @@ -1298,10 +1298,10 @@ msgid ":math:`arrival\\_time + wait\\_time + service\\_time`." msgstr ":math:`arrival\\_time + wait\\_time + service\\_time`。" msgid "The ending location has the **total time** used by the current vehicle." -msgstr "结束位置有当前车辆使用的**总时间**。" +msgstr "结束位置有当前车辆使用的 **总时间**。" msgid "Summary row has the **total solution time**:" -msgstr "摘要行包含**总解决问题时间**：" +msgstr "摘要行包含 **总解决问题时间**：" msgid "" ":math:`total\\ traveling\\ time + total\\ waiting\\ time + total\\ service\\ " @@ -1391,12 +1391,12 @@ msgid "" "If the vehicle's **capacity** is measured in `boxes`, a conversion of `kg of " "feathers` to `number of boxes` is needed." msgstr "" -"如果车辆的 **容量**以`箱子`来衡量，则需要将`羽毛的千克`换算为`箱子的数量`。" +"如果车辆的 **容量** 以`箱子`来衡量，则需要将`羽毛的千克`换算为`箱子的数量`。" msgid "" "If the vehicle's **capacity** is measured in `kg`, a conversion of `box of " "apples` to `kg` is needed." -msgstr "如果车辆的**容量**以`kg`为单位，则需要将`一箱苹果`换算为`kg`。" +msgstr "如果车辆的 **容量** 以 `kg` 为单位，则需要将 `一箱苹果` 换算为 `kg`。" msgid "Showing how the 2 possible conversions can be done" msgstr "显示如何完成两种可能的转换" @@ -1584,7 +1584,7 @@ msgstr "用于:doc:`pgr_pickDeliver`:" msgid "" "Given :math:`v = d / t` therefore :math:`t = d / v` And the ``factor`` " "becomes :math:`1 / v`" -msgstr "给定 :math:`v = d / t` 因此 :math:`t = d / v` 并且 ``因子`` 变为:math:`1 / v`" +msgstr "给定 :math:`v = d / t` 因此 :math:`t = d / v` 并且 ``因子`` 变为 :math:`1 / v`" msgid "v" msgstr "v" @@ -1780,8 +1780,8 @@ msgid "" "See :ref:`heuristics ` available and :ref:`factor " "` handling." msgstr "" -"查看可用的 :ref:`heuristics ` 和 :ref:`factor " -"` 处理。" +"查看可用的 :ref:`heuristics ` 和 :ref:`factor ` " +"处理。" msgid "Advanced documentation" msgstr "高级文档" @@ -1873,8 +1873,9 @@ msgstr "返回图中每对节点的最短路径成本之和。" msgid "" "Boost returns a :math:`V \\times V` matrix, where the infinity values. " "Represent the distance between vertices for which there is no path." -msgstr "Boost 返回一个 :math:`V \\times V` 矩阵，其中无穷大值。 " -"表示没有路径的顶点之间的距离。" +msgstr "" +"Boost 返回一个 :math:`V \\times V` 矩阵，其中无穷大值。 表示没有路径的顶点之间" +"的距离。" msgid "" "We return only the non infinity values in form of a set of `(start_vid, " @@ -1911,7 +1912,7 @@ msgid "``true``" msgstr "``true``" msgid "When ``true`` the graph is considered `Directed`" -msgstr "当 ``true``时，该图被视为有`有向`" +msgstr "当 ``true`` 时，该图被视为有`有向`" msgid "When ``false`` the graph is considered as `Undirected`." msgstr "如果为 ``false``，则该图被视为 `无向`。" @@ -2752,7 +2753,7 @@ msgid "**The main characteristics are:**" msgstr "**主要特点是：**" msgid "Process is done only on edges with **positive** costs." -msgstr "仅在具有**正**成本的边缘进行处理。" +msgstr "仅在具有 **正** 成本的边缘进行处理。" msgid "Running time: :math:`O(E * (E + V * logV))`" msgstr "运行时间： :math:`O(E * (E + V * logV))`" @@ -2911,7 +2912,7 @@ msgid "Dead end" msgstr "死端" msgid "A node is considered a **dead end** node when" -msgstr "当一个节点被认为是**死端**节点时" +msgstr "当一个节点被认为是 **死端** 节点时" msgid "On undirected graphs:" msgstr "在无向图上：" @@ -3000,8 +3001,9 @@ msgstr ":math:`\\{x, y\\}`" msgid "" "From above, nodes :math:`\\{a, b, d\\}` are dead ends because the number of " "adjacent vertices is 1. No further checks are needed for those nodes." -msgstr "从上面来看，节点 :math:`\\{a, b, d\\}` 是死端，因为相邻顶点的数量为 " -"1。不需要对这些节点进行进一步检查。" +msgstr "" +"从上面来看，节点 :math:`\\{a, b, d\\}` 是死端，因为相邻顶点的数量为 1。不需要对" +"这些节点进行进一步检查。" msgid "" "On the following table, nodes :math:`\\{c, e\\}` because the even that the " @@ -3014,13 +3016,14 @@ msgstr "操作：死端收缩" msgid "" "The dead end contraction will stop until there are no more dead end nodes. " "For example from the following graph where :math:`w` is the `dead end`_ node:" -msgstr "死端收缩将停止，直到不再有死端节点。 例如，从下图中，其中 :math:`w` " -"是`死端`_节点：" +msgstr "" +"死端收缩将停止，直到不再有死端节点。 例如，从下图中，其中 :math:`w` 是 `死端`_ 节" +"点：" msgid "" "After contracting :math:`w`, node :math:`v` is now a `dead end`_ node and is " "contracted:" -msgstr "收缩 :math:`w` 后，节点 :math:`v` 现在是一个`死端`_ 节点并且已收缩：" +msgstr "收缩 :math:`w` 后，节点 :math:`v` 现在是一个 `死端`_ 节点并且已收缩：" msgid "" "After contracting :math:`v`, stop. Node :math:`u` has the information of " @@ -3028,7 +3031,7 @@ msgid "" msgstr "在收缩 :math:`v` 之后，停止。节点 :math:`u` 有已收缩节点的信息。" msgid "Node :math:`u` has the information of nodes that were contracted." -msgstr "节点:math:`u`有已收缩节点的信息。" +msgstr "节点 :math:`u` 有已收缩节点的信息。" msgid "In the algorithm, linear contraction is represented by 2." msgstr "算法中，线性收缩用2表示。" @@ -3074,10 +3077,10 @@ msgid "The white node is not linear because the linearity is not symetrical." msgstr "白色节点不是线性的，因为线性不对称。" msgid "It is possible to go :math:`y \\rightarrow c \\rightarrow z`" -msgstr "它是可能去走:math:`y \\rightarrow c \\rightarrow z`" +msgstr "它是可能去走 :math:`y \\rightarrow c \\rightarrow z`" msgid "It's not possible to go :math:`z \\rightarrow c \\rightarrow y`" -msgstr "不可能走:math:`z \\rightarrow c \\rightarrow y`" +msgstr "不可能走 :math:`z \\rightarrow c \\rightarrow y`" msgid "Is symmetrical?" msgstr "是对称的吗？" @@ -3109,10 +3112,10 @@ msgstr "" "是`线性`_节点：" msgid "Contracting :math:`w`," -msgstr "收缩:math:`w`，" +msgstr "收缩 :math:`w`，" msgid "The vertex :math:`w` is removed from the graph" -msgstr "顶点 :math:`w`已从图中移除" +msgstr "顶点 :math:`w` 已从图中移除" msgid "" "The edges :math:`v \\rightarrow w` and :math:`w \\rightarrow z` are removed " @@ -3448,7 +3451,7 @@ msgstr "根据函数及其参数，结果可能是对称的。" msgid "" "The **aggregate cost** of :math:`(u, v)` is the same as for :math:`(v, u)`." -msgstr ":math:`(u, v)`的**总成本**与 :math:`(v, u)`的相同。" +msgstr ":math:`(u, v)` 的 **总成本** 与 :math:`(v, u)` 的相同。" msgid "" "Any duplicated value in the start or end vertex identifiers are ignored." @@ -3554,7 +3557,7 @@ msgid "The aggregate cost of `(u, v)` is the same as for `(v, u)`." msgstr "`(u, v)`的总成本与 `(v, u)`相同。" msgid "Any duplicated value in the **start vids** are ignored." -msgstr "**start vids**中的任何重复值都会被忽略。" +msgstr "**start vids** 中的任何重复值都会被忽略。" msgid "Used in:" msgstr "用于：" @@ -3599,7 +3602,7 @@ msgstr "如果列存在，则它不能为 NULL。" msgid "" "If column is not present, a sequential negative **value** will be given " "automatically." -msgstr "如果列不存在，将自动给出连续的负**值**。" +msgstr "如果列不存在，将自动给出连续的负 **值** 。" msgid "Identifier of the \"closest\" edge to the point." msgstr "距离该点“最近”的边的标识符。" @@ -3749,7 +3752,7 @@ msgid "Directed graph" msgstr "有向图" msgid "The weighted directed graph, :math:`G_d(V,E)`, is definied by:" -msgstr "加权有向图， :math:`G_d(V,E)`的定义如下：" +msgstr "加权有向图， :math:`G_d(V,E)` 的定义如下：" msgid "the set of vertices :math:`V`" msgstr "顶点集 :math:`V`" @@ -3889,16 +3892,16 @@ msgid "" "`start_{vid}` and :math:`end_{vid}`, if it exists, in terms of a sequence of " "nodes and of edges," msgstr "" -"换句话说：如果 :math:`start_{vid}` 和 :math:`end_{vid}` " -"之间存在最短路径，算法会根据节点和边的序列返回该路径、" +"换句话说：如果 :math:`start_{vid}` 和 :math:`end_{vid}` 之间存在最短路径，算法会" +"根据节点和边的序列返回该路径、" msgid "" ":math:`path\\_seq` indicates the relative position in the path of the :math:" "`node` or :math:`edge`." -msgstr ":math:`path\\_seq`表示 :math:`node`或:math:`edge`的路径中的相对位置。" +msgstr ":math:`path\\_seq` 表示 :math:`node` 或 :math:`edge` 的路径中的相对位置。" msgid ":math:`cost` is the cost of the edge to be used to go to the next node." -msgstr ":math:`cost`是用于转到下一个节点的边的成本。" +msgstr ":math:`cost` 是用于转到下一个节点的边的成本。" msgid "" ":math:`agg\\_cost` is the cost from the :math:`start_{vid}` up to the node." @@ -3947,7 +3950,7 @@ msgid "The distance from the **root** to :math:`u` > limit distance." msgstr "从 **root** 到 :math:`u` 的距离>限制距离。" msgid "The distance from the **root** to :math:`v` > limit distance." -msgstr "从 **root**到 :math:`v`的距离>限制距离。" +msgstr "从 **root** 到 :math:`v` 的距离>限制距离。" msgid "" "No new nodes are created on the graph, so when is within the limit and is " @@ -4130,7 +4133,7 @@ msgid "Flow Functions General Information" msgstr "流函数一般信息" msgid "The graph is **directed**." -msgstr "该图是**有向**的。" +msgstr "该图是 **有向** 的。" msgid "Process is done only on edges with positive capacities." msgstr "仅在具有正容量的边缘上进行处理。" @@ -4138,7 +4141,7 @@ msgstr "仅在具有正容量的边缘上进行处理。" msgid "" "When the maximum flow is 0 then there is no flow and **EMPTY SET** is " "returned." -msgstr "当最大流量为0时则没有流量并返回**EMPTY SET**。" +msgstr "当最大流量为0时则没有流量并返回 **EMPTY SET** 。" #, fuzzy msgid "There is no flow when source has the same vaule as target." @@ -4424,11 +4427,10 @@ msgid "" "https://pgrouting.org. For other licenses used in pgRouting see the :ref:" "`license` page." msgstr "" -"pgRouting 手册根据 `知识共享署名-相同方式共享3.0许可证 " -"`_。 您可以随意使用本材料，" -"但我们要求您将功劳归功于 pgRouting 项目，并尽可能提供返回 https://" -"pgrouting.org 的链接。 有关 pgRouting 中使用的其他许可证，请参阅 " -":ref:`license` page.。" +"pgRouting 手册根据`知识共享署名-相同方式共享3.0许可证 `_。 您可以随意使用本材料，但我们要求" +"您将功劳归功于 pgRouting 项目，并尽可能提供返回 https://pgrouting.org 的链" +"接。 有关 pgRouting 中使用的其他许可证，请参阅 :ref:`license` page.。" msgid "General" msgstr "常规" @@ -4748,10 +4750,10 @@ msgid "In ``pgr_aStar`` (`One to One`)" msgstr "在``pgr_aStar`` (`一对一`)中" msgid "``start_vid`` contains the **start vid** parameter value." -msgstr "``start_vid`` 包含**起始 vid **参数值。" +msgstr "``start_vid`` 包含 **起始 vid** 参数值。" msgid "``end_vid`` contains the **end vid** parameter value." -msgstr "``end_vid`` 包含**结束 vid** 参数值。" +msgstr "``end_vid`` 包含 **结束 vid** 参数值。" msgid "In ``pgr_aStar`` (`One to Many`)" msgstr "在``pgr_aStar`` (`一对多`)中" @@ -5177,7 +5179,7 @@ msgid "" "compulsory **driving side** and its validity differ for directed and " "undirected graphs." msgstr "" -"并且 ``driving_side`` 参数从命名可选变为未命名强制**driving side**，其有效性" +"并且 ``driving_side`` 参数从命名可选变为未命名强制 **driving side** ，其有效性" "对于有向图和无向图是不同的。" msgid "``pgr_withPointsDD`` (Single vertex)" @@ -5237,10 +5239,10 @@ msgid "On directed graph ``b`` could be used as **driving side**" msgstr "在有向图上 ``b``可以用作 **行驶方向**" msgid "On undirected graph ``r`` could be used as **driving side**" -msgstr "在无向图上``r``可以用作**行驶方向**" +msgstr "在无向图上 ``r`` 可以用作 **行驶方向**" msgid "Also ``l`` could be used as **driving side**" -msgstr "此外，``l``也可用作**驾驶侧**" +msgstr "此外，``l`` 也可用作 **驾驶侧**" msgid "After Migration" msgstr "迁移后" @@ -5255,7 +5257,7 @@ msgstr "新的输出列是 |result-spantree|" msgid "" "**driving side** parameter is unnamed compulsory, and valid values differ " "for directed and undirected graphs." -msgstr "**driving side**参数是未命名的强制参数，有向图和无向图的有效值不同。" +msgstr "**driving side** 参数是未命名的强制参数，有向图和无向图的有效值不同。" msgid "Does not have a default value." msgstr "没有默认值。" @@ -5279,13 +5281,13 @@ msgstr "" msgid "" "``depth`` contains the **depth** from the ``start_vid`` vertex to the " "``node``." -msgstr "``depth``包含从``start_vid``顶点到``node``的 **深度**。" +msgstr "``depth`` 包含从 ``start_vid`` 顶点到 ``node`` 的 **深度**。" msgid "" "To migrate, use an unnamed valid value for **driving side** after the " "**distance** parameter:" msgstr "" -"要进行迁移，请在 **distance**参数之后使用一个未命名的有效值作为 **行驶方向" +"要进行迁移，请在 **distance** 参数之后使用一个未命名的有效值作为 **行驶方向" "**：" msgid "To get results from previous versions:" @@ -5797,7 +5799,7 @@ msgstr "没有几何图形。" msgid "" "Some graph theory problems require graphs to have weights, called **cost** " "in pgRouting." -msgstr "一些图论问题需要图具有权重，在 pgRouting 中称为**成本**。" +msgstr "一些图论问题需要图具有权重，在 pgRouting 中称为 **成本** 。" msgid "" "In pgRouting there are several ways to represent a graph on the database:" @@ -6166,7 +6168,7 @@ msgid "" "compatible with pgRouting and when this happens the topology needs to be " "adjusted." msgstr "" -"请注意，这些工具**不会**导入与 pgRouting 兼容的结构中的数据，当发生这种情况" +"请注意，这些工具 **不会** 导入与 pgRouting 兼容的结构中的数据，当发生这种情况" "时，需要调整拓扑。" msgid "Breakup a segments on each segment-segment intersection" @@ -6478,7 +6480,7 @@ msgid "" "application. For example, if the edges have a trait **name**, then that " "column is to be copied." msgstr "" -"插入的列和计算方式取决于应用程序。 例如，如果边具有特征**名称**，则将复制该" +"插入的列和计算方式取决于应用程序。 例如，如果边具有特征 **名称** ，则将复制该" "列。" msgid "For pgRouting calculations" @@ -6487,7 +6489,7 @@ msgstr "用于 pgRouting 计算" msgid "" "**factor** based on the position of the intersection of the edges can be " "used to adjust the ``cost`` and ``reverse_cost`` columns." -msgstr "基于边相交位置的**因子**可用于调整``cost`` 和``reverse_cost`` 列。" +msgstr "基于边相交位置的 **因子** 可用于调整 ``cost`` 和 ``reverse_cost`` 列。" msgid "" "Capacity information, used in the :doc:`flow-family` functions does not need " @@ -6757,7 +6759,7 @@ msgstr "这是一个内部查询。" msgid "" "It has no name, so **Edges SQL** gives an idea of what kind of inner query " "needs to be used" -msgstr "它没有名称，因此 **Edges SQL**给出了需要使用哪种内部查询的想法" +msgstr "它没有名称，因此 **Edges SQL** 给出了需要使用哪种内部查询的想法" msgid "**start vid**:" msgstr "**start vid**:" @@ -6776,7 +6778,7 @@ msgstr "是第三个参数。" msgid "" "It has no name, so **end vid** gives an idea of what the third parameter's " "value should contain" -msgstr "它没有名称，因此 **end vid**给出了第三个参数的值应包含的内容" +msgstr "它没有名称，因此 **end vid** 给出了第三个参数的值应包含的内容" msgid "Is the fourth parameter." msgstr "是第四个参数。" @@ -6834,22 +6836,22 @@ msgid "When routing from:" msgstr "当路由来自：" msgid "From **one** starting vertex" -msgstr "从**一**起始顶点" +msgstr "从 **一** 起始顶点" msgid "to **one** ending vertex" -msgstr "到**一**结束顶点" +msgstr "到 **一** 结束顶点" msgid "One to Many" msgstr "一对多" msgid "to **many** ending vertices" -msgstr "到**多**结束顶点" +msgstr "到 **多** 结束顶点" msgid "Many to One" msgstr "多对一" msgid "From **many** starting vertices" -msgstr "从**多**起始顶点" +msgstr "从 **多** 起始顶点" msgid "Many to Many" msgstr "多对多" @@ -6858,10 +6860,10 @@ msgid "Combinations" msgstr "组合" msgid "From **many** different starting vertices" -msgstr "从**多个**不同的起始顶点" +msgstr "从 **多个** 不同的起始顶点" msgid "to **many** different ending vertices" -msgstr "到**多个**不同的结束顶点" +msgstr "到 **多个** 不同的结束顶点" msgid "Every tuple specifies a pair of a start vertex and an end vertex" msgstr "每个元组指定一对起始顶点和结束顶点" @@ -6973,10 +6975,10 @@ msgid "SQL query as described." msgstr "如所述的 SQL 查询。" msgid "When ``true`` Graph is considered `Directed`" -msgstr "当为``true``时，图被视为`有向`图" +msgstr "当为 ``true`` 时，图被视为`有向`图" msgid "When ``false`` the graph is considered as Undirected." -msgstr "当为``false``时，图被视为无向图。" +msgstr "当为 ``false`` 时，图被视为无向图。" msgid "``strict``" msgstr "``strict``" @@ -6998,7 +7000,7 @@ msgid "" "the edge used to reach it. In other words, U turn using the edge with same " "identifier is allowed." msgstr "" -"当 为``true``时，从已访问的顶点出发，不会试图避免使用用于到达它的边。换句话" +"当 为 ``true`` 时，从已访问的顶点出发，不会试图避免使用用于到达它的边。换句话" "说，允许使用具有相同标识符的边来进行掉头。" msgid "" @@ -7059,7 +7061,7 @@ 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 "" -"用于从路径序列中的``node`` 到下一个节点的边的标识符。**-1** 表示路径的最后一" +"用于从路径序列中的``node`` 到下一个节点的边的标识符。 **-1** 表示路径的最后一" "个节点。" msgid "" @@ -7084,7 +7086,7 @@ msgid "Relative position in the path." msgstr "路径中的相对位置。" msgid "**1** For the first row of the path." -msgstr "**1 **对于路径的第一行。" +msgstr "**1** 对于路径的第一行。" msgid "``start_pid``" msgstr "``start_pid``" @@ -7131,7 +7133,7 @@ msgid "" msgstr "用于从路径序列中的 ``node``到下一个节点的边的标识符。" msgid "**-1** for the last row of the path." -msgstr "**-1 **表示路径的最后一行。" +msgstr "**-1** 表示路径的最后一行。" msgid "**0** For the first row of the path." msgstr "**0** 表示路径的第一行。" @@ -7174,7 +7176,7 @@ msgstr "路径标识符。" msgid "" "Has value **1** for the first of a path from ``start_vid`` to ``end_vid``." -msgstr "从``start_vid`` 到 ``end_vid``的第一个路径的值为** 1**。" +msgstr "从 ``start_vid`` 到 ``end_vid`` 的第一个路径的值为 **1** 。" msgid "Non selective for multiple paths" msgstr "多路径非选择性" @@ -7344,7 +7346,7 @@ msgstr "要下载此版本：" msgid "" "Go to :ref:`install-short` for more instructions on extracting tar ball and " "compiling pgRouting." -msgstr "转到 :ref:`install-short`以获取有关提取 tar 包和编译 pgRouting 的更多说明。" +msgstr "转到 :ref:`install-short` 以获取有关提取 tar 包和编译 pgRouting 的更多说明。" msgid "git" msgstr "git" @@ -8033,13 +8035,13 @@ msgid ":math:`0` for the last ``node`` of the path." msgstr ":math:`0` 为路径的最后一个 ``node``。" msgid "Aggregate cost from **start vid** to ``node``." -msgstr "从 **start vid**到``node``的总成本。" +msgstr "从 **start vid** 到 ``node`` 的总成本。" msgid "Additional Examples" msgstr "其他示例" msgid "Get 2 paths from :math:`6` to :math:`17` on an undirected graph" -msgstr "在无向图中获取从 :math:`6`到:math:`17`的2条路径" +msgstr "在无向图中获取从 :math:`6` 到 :math:`17` 的2条路径" msgid "Also get the paths in the heap." msgstr "还获取堆中的路径。" @@ -8127,7 +8129,7 @@ msgid "" "as long as the optimal tour, due to the fact that `end_vid` is forced to be " "in a fixed position." msgstr "" -"在最坏情况下，**不能保证**解决方案将是最优路径的两倍长，因为 `end_vid` 被强制" +"在最坏情况下， **不能保证** 解决方案将是最优路径的两倍长，因为 `end_vid` 被强制" "设置在固定位置。" msgid "With ``directed => true``" @@ -8136,7 +8138,7 @@ msgstr "当``directed => true``" msgid "" "It is **not garanteed** that the solution will be, in the worse case, twice " "as long as the optimal tour" -msgstr "**不能保证**在最坏情况下解决方案将是最优路径的两倍长" +msgstr "**不能保证** 在最坏情况下解决方案将是最优路径的两倍长" msgid "is directed" msgstr "有向" @@ -8309,7 +8311,7 @@ msgid "Name change from pgr_eucledianTSP" msgstr "pgr_eucledianTSP 的名称更改" msgid "New **Official** function" -msgstr "**官方**新函数" +msgstr "**官方** 新函数" msgid "" "Any duplicated identifier will be ignored. The coordinates that will be kept" @@ -8420,7 +8422,7 @@ msgid "Version 3.2.0" msgstr "版本3.2.0" msgid "New **proposed** signature:" -msgstr "新 **拟议**的签名：" +msgstr "新 **拟议** 的签名：" msgid "``pgr_aStar`` (`Combinations`_)" msgstr "``pgr_aStar`` (`组合`_)" @@ -8429,7 +8431,7 @@ msgid "Version 2.4.0" msgstr "版本2.4.0" msgid "New **Proposed** signatures:" -msgstr "新**拟议**签名：" +msgstr "新 **拟议** 签名：" msgid "``pgr_aStar`` (`One to Many`_)" msgstr "``pgr_aStar`` (`一对多`_)" @@ -8444,7 +8446,7 @@ msgid "Signature change on ``pgr_astar`` (`One to One`_)" msgstr "签名更改``pgr_astar`` (`一对一`_)" msgid "**Official** ``pgr_aStar`` (`One to One`_)" -msgstr "**官方**``pgr_aStar`` (`一对一`_)" +msgstr "**官方** ``pgr_aStar`` (`一对一`_)" msgid "" "The results are equivalent to the union of the results of the `pgr_aStar(` " @@ -8479,13 +8481,13 @@ msgid "" "From vertex :math:`6` to vertex :math:`12` on a **directed** graph with " "heuristic :math:`2`" msgstr "" -"在具有heuristic :math:`2` 的**有向**图上，从顶点 :math:`6` 到顶点 :math:`12`" +"在具有heuristic :math:`2` 的 **有向** 图上，从顶点 :math:`6` 到顶点 :math:`12`" msgid "" "From vertex :math:`6` to vertices :math:`\\{10, 12\\}` on a **directed** " "graph with heuristic :math:`3` and factor :math:`3.5`" msgstr "" -"在具有heuristic :math:`3` 和factor :math:`3.5` 的**有向**图上，从顶点 :math:" +"在具有heuristic :math:`3` 和factor :math:`3.5` 的 **有向** 图上，从顶点 :math:" "`6` 到顶点 :math:`\\{10, 12\\}`" msgid "" @@ -8499,12 +8501,12 @@ msgid "" "From vertices :math:`\\{6, 8\\}` to vertices :math:`\\{10, 12\\}` on a " "**directed** graph with factor :math:`0.5`" msgstr "" -"在具有factor :math:`0.5` 的**有向**图上，从顶点 :math:`\\{6, 8\\}` 到顶点 :" +"在具有factor :math:`0.5` 的 **有向** 图上，从顶点 :math:`\\{6, 8\\}` 到顶点 :" "math:`\\{10, 12\\}`" msgid "" "Using a combinations table on a **directed** graph with factor :math:`0.5`." -msgstr "在**有向**图上使用组合表，且使用factor :math:`0.5`。" +msgstr "在 **有向** 图上使用组合表，且使用factor :math:`0.5`。" msgid "Example 1" msgstr "示例1" @@ -8516,7 +8518,7 @@ msgid "Example 2" msgstr "示例2" msgid "Making **start vids** the same as **end vids**." -msgstr "使 **start vids**与**end vids**相同。" +msgstr "使 **start vids** 与 **end vids** 相同。" msgid "Example 3" msgstr "示例3" @@ -8536,7 +8538,7 @@ msgid "``pgr_aStarCost`` (`Combinations`_)" msgstr "``pgr_aStarCost`` (`组合`_)" msgid "New **proposed** function" -msgstr "新**拟议**函数" +msgstr "新 **拟议** 函数" #, fuzzy msgid "" @@ -8644,10 +8646,10 @@ msgid "Breaking change on signature" msgstr "签名的重大更改" msgid "**Boost 1.54** & **Boost 1.55** are supported" -msgstr "**Boost 1.54** & **Boost 1.55**被支持" +msgstr "**Boost 1.54** & **Boost 1.55** 被支持" msgid "**Boost 1.56+** is preferable" -msgstr "**Boost 1.56+**更好" +msgstr "**Boost 1.56+** 更好" msgid "Boost Geometry is stable on Boost 1.56" msgstr "Boost Geometry 在 Boost 1.56 上保持稳定" @@ -9096,25 +9098,25 @@ msgid "s_in_rules" msgstr "s_in_rules" msgid "``text[]`` source node **in** rules" -msgstr "``text[]``source节点**输入**规则" +msgstr "``text[]`` source节点 **输入** 规则" msgid "s_out_rules" msgstr "s_out_rules" msgid "``text[]`` source node **out** rules" -msgstr "``text[]``source节点**输出**规则" +msgstr "``text[]`` source节点 **输出** 规则" msgid "t_in_rules" msgstr "t_in_rules" msgid "``text[]`` target node **in** rules" -msgstr "``text[]``target节点**输入**规则" +msgstr "``text[]`` target节点 **输入** 规则" msgid "t_out_rules" msgstr "t_out_rules" msgid "``text[]`` target node **out** rules" -msgstr "``text[]``target节点**输出**规则" +msgstr "``text[]`` target节点 **输出** 规则" msgid "oneway" msgstr "oneway" @@ -9151,8 +9153,8 @@ msgid "" "``oneway`` value would be counted as ``true`` for the source or target " "**in** or **out** condition." msgstr "" -"这些规则被定义为文本字符串数组，如果与 ``oneway``值匹配，则 source或 target**" -"输入**或**输出**条件将被视为``true``。" +"这些规则被定义为文本字符串数组，如果与 ``oneway`` 值匹配，则 source或 target **" +"输入** 或 **输出** 条件将被视为 ``true``。" msgid "" "The vertices table can be created with :doc:`pgr_createVerticesTable` or :" @@ -9203,7 +9205,7 @@ msgid "Version 2.5.0" msgstr "版本2.5.0" msgid "New **experimental** function" -msgstr "新**实验**函数" +msgstr "新 **实验** 函数" msgid "" "Those vertices that belong to more than one biconnected component are called " @@ -9281,7 +9283,7 @@ msgid "Signature change on ``pgr_bdAstar`` (`One to One`_)" msgstr "在``pgr_bdAstar`` (`一对一`_)上的签名更改" msgid "**Official** ``pgr_bdAstar`` (`One to One`_)" -msgstr "**官方**``pgr_bdAstar`` (`一对一`_)" +msgstr "**官方** ``pgr_bdAstar`` (`一对一`_)" msgid "" "The results are equivalent to the union of the results of the `pgr_bdAStar(` " @@ -9371,7 +9373,7 @@ msgid "pgr_bdDijkstra(`Combinations`_)" msgstr "pgr_bdDijkstra(`组合`_)" msgid "New **Proposed** functions:" -msgstr "新**拟议**函数：" +msgstr "新 **拟议** 函数：" msgid "``pgr_bdDijkstra`` (`One to Many`_)" msgstr "``pgr_bdDijkstra`` (`一对多`_)" @@ -9418,7 +9420,7 @@ msgid "Returns set of |result-1-1|" msgstr "返回 |result-1-1| 的集合" msgid "From vertex :math:`6` to vertex :math:`10` on a **directed** graph" -msgstr "在**有向**图上从顶点 :math:`6`到顶点 :math:`10`" +msgstr "在 **有向** 图上从顶点 :math:`6` 到顶点 :math:`10`" msgid "Returns set of |result-1-m|" msgstr "返回 |result-1-m| 的集合" @@ -9426,14 +9428,14 @@ msgstr "返回 |result-1-m| 的集合" msgid "" "From vertex :math:`6` to vertices :math:`\\{10, 17\\}` on a **directed** " "graph" -msgstr "在**有向**图上从顶点:math:`6`到顶点:math:`\\{10, 17\\}`" +msgstr "在 **有向** 图上从顶点 :math:`6` 到顶点 :math:`\\{10, 17\\}`" msgid "Returns set of |result-m-1|" msgstr "返回 |result-m-1| 的集合" msgid "" "From vertices :math:`\\{6, 1\\}` to vertex :math:`17` on a **directed** graph" -msgstr "在**有向**图上从顶点 :math:`\\{6, 1\\}`到顶点:math:`17`" +msgstr "在 **有向** 图上从顶点 :math:`\\{6, 1\\}` 到顶点 :math:`17`" msgid "" "From vertices :math:`\\{6, 1\\}` to vertices :math:`\\{10, 17\\}` on an " @@ -9532,13 +9534,13 @@ msgid "``pgr_bellmanFord`` — Shortest path using Bellman-Ford algorithm." msgstr "``pgr_bellmanFord`` — 使用 Bellman-Ford 算法的最短路径。" msgid "New **experimental** signature:" -msgstr "新**实验性**签名：" +msgstr "新 **实验性** 签名：" msgid "``pgr_bellmanFord`` (`Combinations`_)" msgstr "``pgr_bellmanFord`` (`组合`_)" msgid "New **experimental** signatures:" -msgstr "新**实验**签名：" +msgstr "新 **实验** 签名：" msgid "``pgr_bellmanFord`` (`One to One`_)" msgstr "``pgr_bellmanFord`` (`一对一`_)" @@ -9632,9 +9634,9 @@ msgid "pgr_bellmanFord(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgstr "pgr_bellmanFord(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgid "" -"From vertex :math:`6` to vertices :math:`\\{ 10, 17\\}` on a **directed** " +"From vertex :math:`6` to vertices :math:`\\{ 10, 17\\}` on a **directed**" "graph" -msgstr "在**有向**图上从顶点 :math:`6` 到顶点 :math:`\\{ 10, 17\\}`" +msgstr "在 **有向** 图上从顶点 :math:`6` 到顶点 :math:`\\{ 10, 17\\}`" msgid "Using a combinations table on an **undirected** graph." msgstr "在 **无向** 图上使用组合表。" @@ -9655,7 +9657,7 @@ msgid "Version 3.7.0" msgstr "版本3.6.0" msgid "New **experimental** function:" -msgstr "新的**实验**函数：" +msgstr "新的 **实验** 函数：" msgid "" "The Brandes Algorithm takes advantage of the sparse graphs for evaluating " @@ -9676,7 +9678,7 @@ msgstr "" #, fuzzy msgid "This implementation work for both directed and undirected graphs." -msgstr "该实现适用于**有向**图和**无向**图。" +msgstr "该实现适用于 **有向** 图和 **无向** 图。" #, fuzzy msgid "Running time: :math:`\\Theta(VE)`" @@ -9940,7 +9942,7 @@ msgid "" msgstr "`pgr_bipartite` - 不相邻的顶点集合，同一集合中没有两个顶点相邻。" msgid "New **experimental** signature" -msgstr "新的**实验**签名" +msgstr "新的 **实验** 签名" msgid "" "A bipartite graph is a graph with two sets of vertices which are connected " @@ -10007,7 +10009,7 @@ msgstr "" "目标的流量最大。" msgid "New **proposed** signature" -msgstr "新的**拟议**签名" +msgstr "新的 **拟议** 签名" msgid "``pgr_boykovKolmogorov`` (`Combinations`_)" msgstr "``pgr_boykovKolmogorov`` (`组合`_)" @@ -10016,10 +10018,10 @@ msgid "Renamed from ``pgr_maxFlowBoykovKolmogorov``" msgstr "从``pgr_maxFlowBoykovKolmogorov``更名而来" msgid "**Proposed** function" -msgstr "**拟议**函数" +msgstr "**拟议** 函数" msgid "New **Experimental** function" -msgstr "新的**实验**函数" +msgstr "新的 **实验** 函数" msgid "Running time: Polynomial" msgstr "运行时间：多项式时间" @@ -10111,13 +10113,13 @@ msgid "" "From root vertex :math:`6` on a **directed** graph with edges in ascending " "order of ``id``" msgstr "" -"从根顶点:math:`6` 开始，该顶点位于一个**有向**图中，其边按 ``id``升序排列" +"从根顶点 :math:`6` 开始，该顶点位于一个 **有向** 图中，其边按 ``id`` 升序排列" msgid "" "From root vertices :math:`\\{12, 6\\}` on an **undirected** graph with " "**depth** :math:`<= 2` and edges in ascending order of ``id``" msgstr "" -"从根顶点开始 :math:`{12, 6\\}` 在一个**无向**图上，**depth** :math:`<=2`，" +"从根顶点开始 :math:`{12, 6\\}` 在一个 **无向** 图上，**depth** :math:`<=2`，" "边按 ``id`` 升序排列" msgid "DFS optional parameters" @@ -10442,16 +10444,16 @@ msgid "All numbers on this column are ``DISTINCT``" msgstr "此列中的所有数字都是``DISTINCT``" msgid "When ``type`` = **'v'**." -msgstr "当``type`` = **'v'**时。" +msgstr "当 ``type`` = **'v'** 时。" msgid "Identifier of the modified vertex." msgstr "修改顶点的标识符。" msgid "When ``type`` = **'e'**." -msgstr "当 ``type`` = **'e'**时。" +msgstr "当 ``type`` = **'e'** 时。" msgid "Decreasing sequence starting from **-1**." -msgstr "从**-1**开始递减序列。" +msgstr "从 **-1** 开始递减序列。" msgid "" "Representing a pseudo `id` as is not incorporated in the set of original " @@ -10468,7 +10470,7 @@ msgid "" "When ``type`` = **'e'**: Identifier of the source vertex of the current edge " "(``source``, ``target``)." msgstr "" -"当 ``type`` = **'e'**时：当前边（``source``，``target``）的source顶点标识符。" +"当 ``type`` = **'e'** 时：当前边（``source``，``target``）的source顶点标识符。" msgid "" "When ``type`` = **'e'**: Identifier of the target vertex of the current edge " @@ -10975,7 +10977,7 @@ msgstr "" msgid "" "This implementation can only be used with a **directed** graph with no " "cycles i.e. directed acyclic graph." -msgstr "这个实现只能用于**有向**图，且没有循环，即有向无环图。" +msgstr "这个实现只能用于 **有向** 图，且没有循环，即有向无环图。" msgid "" "The algorithm relies on topological sorting the dag to impose a linear " @@ -11015,18 +11017,18 @@ msgid "pgr_dagShortestPath(`Edges SQL`_, `Combinations SQL`_)" msgstr "pgr_dagShortestPath(`Edges SQL`_, `Combinations SQL`_)" msgid "From vertex :math:`5` to vertex :math:`11` on a **directed** graph" -msgstr "在**有向**图上，从顶点:math:`5`到顶点 :math:`11`" +msgstr "在 **有向** 图上，从顶点 :math:`5` 到顶点 :math:`11`" msgid "From vertex :math:`5` to vertices :math:`\\{7, 11\\}`" -msgstr "从顶点:math:`5`到顶点 :math:`\\{7, 11\\}`" +msgstr "从顶点 :math:`5` 到顶点 :math:`\\{7, 11\\}`" msgid "From vertices :math:`\\{5, 10\\}` to vertex :math:`11`" -msgstr "从顶点:math:`\\{5, 10\\}`到顶点 :math:`11`" +msgstr "从顶点 :math:`\\{5, 10\\}` 到顶点 :math:`11`" msgid "" "From vertices :math:`\\{5, 15\\}` to vertices :math:`\\{11, 17\\}` on an " "**undirected** graph" -msgstr "在 **无向** 图上，从顶点:math:`\\{5, 15\\}`到顶点:math:`\\{11, 17\\}`" +msgstr "在 **无向** 图上，从顶点 :math:`\\{5, 15\\} `到顶点 :math:`\\{11, 17\\}`" msgid "Return columns" msgstr "返回列" @@ -11161,7 +11163,7 @@ msgid "Version 3.3.0" msgstr "版本 3.3.0" msgid "Promoted to **proposed** function" -msgstr "升级至**拟议**函数" +msgstr "升级至 **拟议** 函数" msgid "``pgr_depthFirstSearch`` (`Single Vertex`_)" msgstr "``pgr_depthFirstSearch`` (`单个顶点`_)" @@ -11272,13 +11274,13 @@ msgid "``pgr_dijkstra`` (`Combinations`_)" msgstr "``pgr_dijkstra`` (`组合`_)" msgid "**Official** functions" -msgstr "**官方**函数" +msgstr "**官方** 函数" msgid "Version 2.2.0" msgstr "版本 2.2.0" msgid "New **proposed** functions:" -msgstr "新的**拟议**函数：" +msgstr "新的 **拟议** 函数：" msgid "``pgr_dijkstra`` (`One to Many`_)" msgstr "``pgr_dijkstra`` (`一对多`_)" @@ -11293,7 +11295,7 @@ msgid "Signature change on ``pgr_dijkstra`` (`One to One`_)" msgstr "``pgr_dijkstra`` (`一对一`_)的签名更改" msgid "**Official** ``pgr_dijkstra`` (`One to One`_)" -msgstr "**官方**``pgr_dijkstra`` (`一对一`_)" +msgstr "**官方** ``pgr_dijkstra`` (`一对一`_)" msgid "pgr_dijkstra(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" msgstr "pgr_dijkstra(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" @@ -11318,7 +11320,7 @@ msgstr "请阅读 :doc:`migration` 关于如何从旧的结果列迁移到新的 msgid "" "From vertex :math:`6` to vertices :math:`\\{10, 17\\}` on a **directed**" -msgstr "在**有向**图上，从顶点 :math:`6`到顶点 :math:`\\{10, 17\\}`" +msgstr "在 **有向** 图上，从顶点 :math:`6` 到顶点 :math:`\\{10, 17\\}`" msgid "" "The examples of this section are based on the :doc:`sampledata` network." @@ -11635,7 +11637,7 @@ msgid "Departing on car from vertex :math:`6` find the nearest subway station." msgstr "从顶点:math:`6`乘车出发，找到最近的地铁站。" msgid "Using a **directed** graph for car routing." -msgstr "使用**有向**图进行汽车路线规划。" +msgstr "使用 **有向** 图进行汽车路线规划。" msgid "" "The subway stations are on the following vertices :math:`\\{1, 10, 11\\}`" @@ -11661,7 +11663,7 @@ msgstr "" msgid "" "Departing on a car from a subway station find the nearest **two** stations " "to vertex :math:`2`" -msgstr "从地铁站开车出发，找到距离顶点 :math:`2`最近的**两个**车站" +msgstr "从地铁站开车出发，找到距离顶点 :math:`2`最近的 **两个** 车站" msgid "On line `4`: using the positional parameter: `directed` set to ``true``" msgstr "第`4`行：使用位置参数：`directed`设置为`true`" @@ -11863,7 +11865,7 @@ msgstr "" msgid "" "Departing on a car from a subway station find the nearest **two** stations " "to vertex :math:`6`" -msgstr "从地铁站开车出发找到距离顶点:math:`6`最近的**两个**车站" +msgstr "从地铁站开车出发找到距离顶点 :math:`6` 最近的 **两个** 车站" msgid "" "pgr_dijkstraNearCost(`Edges SQL`_, **start vids**, **end vids**, " @@ -11959,7 +11961,7 @@ 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 "" -"所有这些示例都是关于在**有向**图上按顺序访问顶点 :math:`\\{5, 7, 1, 8, 15\\}" +"所有这些示例都是关于在 **有向** 图上按顺序访问顶点 :math:`\\{5, 7, 1, 8, 15\\}" "` 的路径。" msgid "The main query" @@ -12006,7 +12008,7 @@ msgid "Signature change pgr_drivingDistance(single vertex)" msgstr "签名更改 pgr_drivingDistance（单顶点）" msgid "New **Official** pgr_drivingDistance(multiple vertices)" -msgstr "新**官方** pgr_drivingDistance(多顶点)" +msgstr "新 **官方** pgr_drivingDistance(多顶点)" msgid "Official:: pgr_drivingDistance(single vertex)" msgstr "官方:: pgr_drivingDistance(单顶点)" @@ -12158,7 +12160,7 @@ msgid "" msgstr "``pgr_edgeDisjointPaths`` - 计算两组顶点之间的边不相交路径。" msgid "New **proposed** function:" -msgstr "新的**拟议**函数：" +msgstr "新的 **拟议** 函数：" msgid "pgr_edgeDisjointPaths(Combinations)" msgstr "pgr_edgeDisjointPaths(组合)" @@ -12383,7 +12385,7 @@ msgid "``pgr_extractVertices`` — Extracts the vertices information" msgstr "``pgr_extractVertices`` — 提取顶点信息" msgid "Classified as **proposed** function" -msgstr "列为**拟议**函数" +msgstr "列为 **拟议** 函数" msgid "" "This is an auxiliary function for extracting the vertex information of the " @@ -12490,7 +12492,7 @@ msgid "``pgr_findCloseEdges`` - Finds the close edges to a point geometry." msgstr "``pgr_findCloseEdges`` -查找点几何图形的闭合边。" msgid "New **proposed** signatures:" -msgstr "新的**拟议**签名：" +msgstr "新的 **拟议** 签名：" msgid "``pgr_findCloseEdges`` (`One point`_)" msgstr "``pgr_findCloseEdges`` (`一个点`_)" @@ -12668,19 +12670,19 @@ msgid "" msgstr "`一个点`_：包含边缘上距边缘起点一小部分的点。" msgid "`Many Points`_: Contains the corresponding **original point**" -msgstr "`多个点`_：包含对应的**原始点**" +msgstr "`多个点`_：包含对应的 **原始点**" msgid "" "``LINESTRING`` geometry from the **original point** to the closest point of " "the edge with identifier ``edge_id``" msgstr "" -"从**原始点**到具有标识符``edge_id``的边的最近点的``LINESTRING``几何图形" +"从 **原始点** 到具有标识符 ``edge_id`` 的边的最近点的 ``LINESTRING`` 几何图形" msgid "One point results" msgstr "单一点的结果" msgid "The green nodes is the **original point**" -msgstr "绿色节点是**原始点**" +msgstr "绿色节点是 **原始点**" msgid "" "The geometry ``geom`` is a point on the :math:`sp \\rightarrow ep` edge." @@ -12689,18 +12691,18 @@ msgstr "几何``geom`` 是 :math:`sp \\rightarrow ep` 边上的一个点。" msgid "" "The geometry ``edge`` is a line that connects the **original point** with " "``geom``" -msgstr "几何``edge``是连接**original point**和``geom``的线" +msgstr "几何 ``edge`` 是连接 **original point** 和 ``geom`` 的线" msgid "Many point results" msgstr "多点成果" msgid "The green nodes are the **original points**" -msgstr "绿色节点为**原始点**" +msgstr "绿色节点为 **原始点**" msgid "" "The geometry ``geom``, marked as **g1** and **g2** are the **original " "points**" -msgstr "标为**g1**和**g2**的几何体``geom``是**原始点**" +msgstr "标为 **g1** 和 **g2** 的几何体 ``geom`` 是 **原始点**" msgid "" "The geometry ``edge``, marked as **edge1** and **edge2** is a line that " @@ -12729,7 +12731,7 @@ msgid "``NULL`` on ``geom``, ``edge``" msgstr "``NULL`` 在 ``geom``, ``edge``上" msgid "``edge_id`` identifier of the edge close to the **original point**" -msgstr "``edge_id``靠近**原始点**的边的标识符" +msgstr "``edge_id`` 靠近 **原始点** 的边的标识符" msgid "" "Two edges are withing :math:`0.5` distance units from the **original " @@ -12749,12 +12751,12 @@ msgstr "" msgid "" "``side``: The **original point** is located to the left side of edge :math:" "`5`." -msgstr "``side``：**原始点** 位于边:math:`5`的左侧。" +msgstr "``side``： **原始点** 位于边 :math:`5` 的左侧。" msgid "" "``distance``: The **original point** is located :math:`0.1` length units " "from edge :math:`5`." -msgstr "``distance``：**原始点** 位于边 :math:`5` 的 :math:`0.1` 长度单位处。" +msgstr "``distance``： **原始点** 位于边 :math:`5` 的 :math:`0.1` 长度单位处。" msgid "For edge :math:`8`:" msgstr "对于边 :math:`8`：" @@ -12769,12 +12771,12 @@ msgstr "" msgid "" "``side``: The **original point** is located to the right side of edge :math:" "`8`." -msgstr "``side``：**原始点** 位于边:math:`8` 的右侧。" +msgstr "``side``： **原始点** 位于边 :math:`8` 的右侧。" msgid "" "``distance``: The **original point** is located :math:`0.19..` length units " "from edge :math:`8`." -msgstr "``distance``：**原始点** 距离边 :math:`8`有 :math:`0.19..` 长度单位。" +msgstr "``distance``： **原始点** 距离边 :math:`8` 有 :math:`0.19..` 长度单位。" msgid "One answer, all columns" msgstr "一个答案，所有列" @@ -12787,25 +12789,25 @@ msgstr "计算所有列" msgid "" "``edge_id`` identifier of the edge **closest** to the **original point**" -msgstr "``edge_id``与**原始点**最**接近**的边的标识符" +msgstr "``edge_id`` 与 **原始点** 最 **接近** 的边的标识符" msgid "" "From all edges within :math:`0.5` distance units from the **original " "point**: :math:`{5}` is the closest one." msgstr "" -"从距离**原始点**不超过 :math:`0.5` 距离单位的所有边中，边 :math:`{5}` 是最近" +"从距离 **原始点** 不超过 :math:`0.5` 距离单位的所有边中，边 :math:`{5}` 是最近" "的一条。" msgid "" "``geom``: Contains the geometry of the closest point on edge :math:`5` from " "the **original point**." -msgstr "``geom``:包含了从**原始点**到边 :math:`5` 上最近点的几何形状。" +msgstr "``geom``:包含了从 **原始点** 到边 :math:`5` 上最近点的几何形状。" msgid "" "``edge``: Contains the ``LINESTRING`` geometry of the **original point** to " "the closest point on on edge :math:`5` ``geom``" msgstr "" -"``edge``：包含了从**原始点**到边 :math:`5```geom`` 上最近点的``LINESTRING``几" +"``edge``：包含了从 **原始点** 到边 :math:`5```geom`` 上最近点的 ``LINESTRING`` 几" "何形状" msgid "At most two answers with all columns" @@ -12817,13 +12819,13 @@ msgstr "了解结果：" msgid "" "``geom``: Contains the geometry of the closest point on edge :math:`8` from " "the **original point**." -msgstr "``geom``：包含了从**原始点**到边 :math:`8` 上最近点的几何形状。" +msgstr "``geom``：包含了从 **原始点** 到边 :math:`8` 上最近点的几何形状。" msgid "" "``edge``: Contains the ``LINESTRING`` geometry of the **original point** to " "the closest point on on edge :math:`8` ``geom``" msgstr "" -"``edge``：包含了从**原始点**到边 :math:`8` ``geom``上最近点的``LINESTRING``几" +"``edge``：包含了从 **原始点** 到边 :math:`8` ``geom`` 上最近点的 ``LINESTRING`` 几" "何形状" msgid "One point dry run execution" @@ -12869,13 +12871,13 @@ msgstr "``edge``为``NULL``" msgid "" "``edge_id`` identifier of the edge close to a **original point** (``geom``)" -msgstr "``edge_id``是与一个**原始点**（``geom``）靠近的边的标识符" +msgstr "``edge_id``是与一个 **原始点** （``geom``）靠近的边的标识符" msgid "" "Two edges at most withing :math:`0.5` distance units from each of the " "**original points**:" msgstr "" -"每个**原始点**中，最多有两条边位于距离不超过 :math:`0.5`距离单位的范围内：" +"每个 **原始点** 中，最多有两条边位于距离不超过 :math:`0.5` 距离单位的范围内：" msgid "For ``POINT(1.8 0.4)`` and ``POINT(0.3 1.8)`` only one edge was found." msgstr "对于 ``POINT(1.8 0.4)`` 和 ``POINT(0.3 1.8)`` ，只找到一条边。" @@ -12897,20 +12899,20 @@ msgid "One answer per point, all columns" msgstr "每点一个答案，所有列" msgid "For the **original point** ``POINT(2.9 1.8)``" -msgstr "对于**原始点** ``POINT(2.9 1.8)``" +msgstr "对于 **原始点** ``POINT(2.9 1.8)``" msgid "Edge :math:`5` is the closest edge to the **original point**" -msgstr "边 :math:`5`是距离**原始点**最近的边" +msgstr "边 :math:`5`是距离 **原始点** 最近的边" msgid "" "``geom``: Contains the geometry of the **original point** ``POINT(2.9 1.8)``" -msgstr "``geom``：包含了**原始点**的几何形状，即 ``POINT(2.9 1.8)``" +msgstr "``geom``：包含了 **原始点** 的几何形状，即 ``POINT(2.9 1.8)``" msgid "" "``edge``: Contains the ``LINESTRING`` geometry of the **original point** " "(``geom``) to the closest point on on edge." msgstr "" -"``edge``：包含了**原始点**（``geom``）到最接近的边上的``LINESTRING``几何形" +"``edge``：包含了 **原始点** （``geom``）到最接近的边上的 ``LINESTRING`` 几何形" "状。" msgid "Many points dry run execution" @@ -13018,7 +13020,7 @@ msgid "" msgstr "``pgr_full_version`` — 获取pgRouting版本信息的详细信息。." msgid "New **official** function" -msgstr "**官方**新功能" +msgstr "**官方** 新功能" msgid "Get complete details of pgRouting version information" msgstr "获取 pgRouting 版本信息的完整详细信息" @@ -13332,8 +13334,8 @@ msgid "" "than or equal to a **distance** from a **root** vertex (or vertices) within " "the calculated minimum spanning tree." msgstr "" -"使用 Kruskal 算法，在计算的最小生成树中提取总成本小于或等于距**根**顶点（或多" -"个顶点）**距离**的节点。" +"使用 Kruskal 算法，在计算的最小生成树中提取总成本小于或等于距 **根** 顶点（或多" +"个顶点） **距离** 的节点。" msgid "Returned tree nodes from a root vertex are on Depth First Search order." msgstr "从根顶点返回的树节点遵循深度优先搜索顺序。" @@ -13393,8 +13395,8 @@ msgid "" "**idom**, once **idom** of each vertex is calculated then by making every " "**idom** of each vertex as its parent, the dominator tree can be built." msgstr "" -"该算法计算每个顶点的**直接支配者**（称为**idom**），一旦计算出每个顶点的" -"**idom**，然后通过将每个顶点的**idom**作为其父节点，可以构建支配树。" +"该算法计算每个顶点的 **直接支配者**（称为 **idom**），一旦计算出每个顶点的" +" **idom**，然后通过将每个顶点的 **idom** 作为其父节点，可以构建支配树。" msgid "The algorithm works in directed graph only." msgstr "该算法仅适用于有向图。" @@ -13729,7 +13731,7 @@ msgstr "" "点的每个可能的转弯都有一条新边。" msgid "This function is for **directed** graphs." -msgstr "该函数适用于**有向**图。" +msgstr "该函数适用于 **有向** 图。" msgid "" "Results are undefined when a negative vertex id is used in the input graph." @@ -14082,7 +14084,7 @@ msgid "``pgr_maxFlow`` (`Combinations`_)" msgstr "``pgr_maxFlow`` (`组合`_)" msgid "New **Proposed** function" -msgstr "新**拟议** 的函数" +msgstr "新 **拟议** 的函数" #, fuzzy msgid "Calculates the maximum flow from the sources to the targets." @@ -14090,7 +14092,7 @@ msgstr "计算从 `source(s)`到 `target(s)`的最大流量。" msgid "" "When the maximum flow is **0** then there is no flow and **0** is returned." -msgstr "当最大流量为**0**时则没有流量，返回**0**。" +msgstr "当最大流量为 **0** 时则没有流量，返回 **0** 。" msgid "Uses the :doc:`pgr_pushRelabel ` algorithm." msgstr "使用:doc:`pgr_pushRelabel `算法。" @@ -14139,7 +14141,7 @@ msgid "``pgr_maxFlowMinCost`` (`Combinations`_)" msgstr "``pgr_maxFlowMinCost`` (`组合`_)" msgid "**TODO** check which statement is true:" -msgstr "**TODO **检查哪个陈述是正确的：" +msgstr "**TODO** 检查哪个陈述是正确的：" msgid "The cost value of all input edges must be nonnegative." msgstr "所有输入边的成本值必须是非负的。" @@ -14203,7 +14205,7 @@ msgid "**The cost value of all input edges must be nonnegative.**" msgstr "**所有输入边的成本值必须是非负的。**" msgid "When the maximum flow is 0 then there is no flow and **0** is returned." -msgstr "当最大流量为0时则没有流量，返回**0**。" +msgstr "当最大流量为0时则没有流量，返回 **0** 。" msgid "Uses :doc:`pgr_maxFlowMinCost`." msgstr "使用:doc:`pgr_maxFlowMinCost`。" @@ -14708,7 +14710,7 @@ msgstr "" "customers/ 上发布的最佳解决方案信息进行比较" msgid "The best solution found for **lc101** is a travel time: 828.94" -msgstr "找到的 **lc101**的最佳解是行程时间：828.94" +msgstr "找到的 **lc101** 的最佳解是行程时间：828.94" msgid "This implementation's travel time: 854.54" msgstr "此实施的行程时间：854.54" @@ -14922,7 +14924,7 @@ msgid "Sum of the weights of all edges between the two sets is mincut." msgstr "两组之间所有边的权重之和是最小割。" msgid "A **mincut** is a cut having the least weight." -msgstr "**最小切割**是重量最小的切割。" +msgstr "**最小切割** 是重量最小的切割。" msgid "Values are returned when graph is connected." msgstr "连接图形时返回值。" @@ -14995,7 +14997,7 @@ msgid "" msgstr "有向图的强连接组件是一组彼此可达的顶点。" msgid "Works for **directed** graphs." -msgstr "适用于**有向**图。" +msgstr "适用于 **有向** 图。" msgid "Components are described by vertices identifiers." msgstr "组件由顶点标识符描述。" @@ -15532,7 +15534,7 @@ msgstr "" msgid "" "Executes the :ref:`TRSP-family:TRSP algorithm` for the conflicting paths." -msgstr "对冲突路径执行 :ref:`TRSP-family:TRSP algorithm`。" +msgstr "对冲突路径执行 :ref:`TRSP-family:TRSP 算法`。" msgid "" "From the :doc:`pgr_withPointsVia` result it removes the conflicting paths " @@ -15606,10 +15608,10 @@ msgid "Vertices of the graph are:" msgstr "图的顶点是：" msgid "**positive** when it belongs to the `Edges SQL`_" -msgstr "当它属于`Edges SQL`_ 时为**正**" +msgstr "当它属于 `Edges SQL`_ 时为 **正**" msgid "**negative** when it belongs to the `Points SQL`_" -msgstr "当它属于 `Points SQL`_ 为**负**" +msgstr "当它属于 `Points SQL`_ 为 **负**" msgid "Driving side can not be ``b``" msgstr "驾驶侧不可能为 ``b``" @@ -15823,10 +15825,10 @@ msgid "pgr_withPoints(Combinations)" msgstr "pgr_withPoints（组合）" msgid "**positive** when it belongs to the edges_sql" -msgstr "当它属于edges_sql时为**正**" +msgstr "当它属于edges_sql时为 **正**" msgid "**negative** when it belongs to the points_sql" -msgstr "当它属于 points_sql时为**负**" +msgstr "当它属于 points_sql时为 **负**" msgid "" "When the starting vertex and ending vertex are the same, there is no path. - " @@ -16067,7 +16069,7 @@ msgstr "返回|matrix-pid|的集合" msgid "" "There is no **details** flag, unlike the other members of the withPoints " "family of functions." -msgstr "与 withPoints 函数系列的其他成员不同，没有**详细信息**标志。" +msgstr "与 withPoints 函数系列的其他成员不同，没有 **详细信息** 标志。" msgid "From point :math:`1` to vertex :math:`10` with defaults" msgstr "使用默认值从点 :math:`1`到顶点:math:`10`" @@ -16162,13 +16164,13 @@ msgid "" msgstr "**无向** 图上的点 :math:`\\{1, 6\\}` 和顶点 :math:`\\{10, 11\\}` 的成本矩阵" msgid "Returning a **symmetrical** cost matrix" -msgstr "返回**对称**成本矩阵" +msgstr "返回 **对称** 成本矩阵" msgid "Using the default ``side`` value on the **points_sql** query" -msgstr "在**points_sql**查询上使用默认``side``值" +msgstr "在 **points_sql** 查询上使用默认 ``side`` 值" msgid "Using the default ``driving_side`` value" -msgstr "使用默认``driving_side``值" +msgstr "使用默认 ``driving_side`` 值" msgid "" "Find the matrix cost of the routes from vertex :math:`1` and the two closest " @@ -16182,7 +16184,7 @@ msgstr "``pgr_withPointsDD`` - 拟议" msgid "" "``pgr_withPointsDD`` - Returns the driving **distance** from a starting " "point." -msgstr "``pgr_withPointsDD`` -返回从起点开始的行驶**距离**。" +msgstr "``pgr_withPointsDD`` - 返回从起点开始的行驶 **距离** 。" msgid "" "Signature change: ``driving_side`` parameter changed from named optional to " @@ -16230,7 +16232,7 @@ msgid "" "``**distance**`` from the starting point. The edges extracted will conform " "the corresponding spanning tree." msgstr "" -"修改图以包含点，并使用 Dijkstra 算法，提取成本小于或等于距起点``**距离**``值" +"修改图以包含点，并使用 Dijkstra 算法，提取成本小于或等于距起点 ``**距离**`` 值" "的所有节点和点。 提取的边将符合相应的生成树。" msgid "" @@ -16425,7 +16427,7 @@ msgid "" "Get 2 paths from Point :math:`1` to point :math:`2` on a directed graph with " "**left** side driving." msgstr "" -"在具有**左侧**驾驶的有向图上，从点 :math:`1` 到点 :math:`2` 获取两条路径。" +"在具有 **左侧** 驾驶的有向图上，从点 :math:`1` 到点 :math:`2` 获取两条路径。" msgid "For a directed graph." msgstr "有向图。" @@ -16446,19 +16448,19 @@ msgid "" "**directed** graph with **right** side driving and **details** set to " "**True**" msgstr "" -"在具有**右侧**驾驶的**有向**图上，从点 :math:`1` 和顶点 :math:`6` 到点 :math:" -"`3` 获取一条路径，且**details** 设置为 **True**" +"在具有 **右侧** 驾驶的 **有向** 图上，从点 :math:`1` 和顶点 :math:`6` 到点 :math:" +"`3` 获取一条路径，且 **details** 设置为 **True**" msgid "" "Get a path from point :math:`1` and vertex :math:`6` to point :math:`3` and " "vertex :math:`1` on a **directed** graph with **left** side driving and " "**heap_paths** set to **True**" msgstr "" -"在具有**左侧**驾驶的**有向**图上，从点 :math:`1` 和顶点 :math:`6` 到点 :math:" -"`3` 和顶点 :math:`1` 获取一条路径，且**heap_paths** 设置为 **True**" +"在具有 **左侧** 驾驶的 **有向** 图上，从点 :math:`1` 和顶点 :math:`6` 到点 :math:" +"`3` 和顶点 :math:`1` 获取一条路径，且 **heap_paths** 设置为 **True**" msgid "Using a combinations table on an **directed** graph" -msgstr "在**有向**图上使用组合表" +msgstr "在 **有向** 图上使用组合表" msgid "`Points SQL`_ query as described." msgstr "按照描述的方式执行 `Points SQL`_ 查询。" @@ -16543,7 +16545,7 @@ msgstr "" msgid "" "Find the route that visits the vertices :math:`\\{ -6, 15, -1\\}` in that " "order on a **directed** graph." -msgstr "在**有向**图上按顺序访问顶点 :math:`\\{ -6, 15, -1\\}` 的路线。" +msgstr "在 **有向** 图上按顺序访问顶点 :math:`\\{ -6, 15, -1\\}` 的路线。" msgid "Use :doc:`pgr_findCloseEdges` in the `Points SQL`_" msgstr "在 `Points SQL`_ 中使用 :doc:`pgr_findCloseEdges` 函数" @@ -16552,7 +16554,7 @@ msgid "" "All this examples are about the route that visits the vertices :math:`\\{-1, " "7, -3, 16, 15\\}` in that order on a **directed** graph." msgstr "" -"所有这些示例都是关于在**有向**图上按顺序访问顶点 :math:`\\{-1, 7, -3, 16, " +"所有这些示例都是关于在 **有向** 图上按顺序访问顶点 :math:`\\{-1, 7, -3, 16, " "15\\}` 的路线。" msgid "Prim - Family of functions" @@ -19802,13 +19804,13 @@ msgid "path" msgstr "path" msgid "represents a section of a **route**." -msgstr "代表**route**的一部分。" +msgstr "代表 **route** 的一部分。" msgid "route" msgstr "route" msgid "is a sequence of **paths**" -msgstr "是一系列**paths**" +msgstr "是一系列 **paths**" msgid "**Used in:**" msgstr "**用于：**" @@ -19868,7 +19870,7 @@ msgid "Kind of graph:" msgstr "图的种类：" msgid "**directed** graph" -msgstr "**有向**图" +msgstr "**有向** 图" msgid "**undirected** graph" msgstr "**无向** 图" @@ -19887,10 +19889,10 @@ msgid "Countries with:" msgstr "具有以下条件的国家：" msgid "**Right** side driving" -msgstr "**右侧**驾驶" +msgstr "**右侧** 驾驶" msgid "**Left** side driving" -msgstr "**左侧**驾驶" +msgstr "**左侧** 驾驶" msgid "Some points are:" msgstr "一些要点是：" @@ -19944,7 +19946,7 @@ msgstr "对于本节，将使用以下城市（参见 " ":doc:`sampledata`）一些有趣的点（例如餐馆、超市、邮局等）作为示例。" msgid "The graph is **directed**" -msgstr "图是**有向**的" +msgstr "图是 **有向** 的" msgid "Red arrows show the ``(source, target)`` of the edge on the edge table" msgstr "红色箭头显示边表上的边``(source, target)``" @@ -19961,10 +19963,10 @@ msgid "On the right for points **2** and **4**." msgstr "在右侧为第 **2** 点和第 **4** 点。" msgid "On the left for points **1**, **3** and **5**." -msgstr "左侧为第 **1**、 **3** 和 **5** 点。" +msgstr "左侧为第 **1**、**3** 和 **5** 点。" msgid "On both sides for point **6**." -msgstr "在两侧为第**6**点。" +msgstr "在两侧为第 **6** 点。" msgid "" "The representation on the data base follows the `Points SQL`_ description, " @@ -19995,25 +19997,25 @@ msgid "Point **2** located on edge ``(16, 17)``" msgstr "点 **2** 位于边缘 ``(16, 17)``" msgid "Point **3** located on edge ``(8, 12)``" -msgstr "点 **3** 位于边缘``(8, 12)``" +msgstr "点 **3** 位于边缘 ``(8, 12)``" msgid "Point **4** located on edge ``(1, 3)``" -msgstr "点 **4 **位于边 ``(1, 3)``" +msgstr "点 **4** 位于边 ``(1, 3)``" msgid "Point **5** located on edge ``(10, 11)``" msgstr "点 **5** 位于边缘 ``(10, 11)``" msgid "Point **6** located on edges ``(6, 7)`` and ``(7, 6)``" -msgstr "点** 6** 位于边``(6, 7)``和``(7, 6)``" +msgstr "点 **6** 位于边 ``(6, 7)`` 和 ``(7, 6)``" msgid "Point **1** located on edge ``(5, 6)``" -msgstr "点 **1 ** 位于边 ``(5, 6)``" +msgstr "点 **1** 位于边 ``(5, 6)``" msgid "Point **2** located on edge ``(17, 16)``" msgstr "点 **2** 位于边 ``(17, 16)``" msgid "Point **4** located on edge ``(3, 1)``" -msgstr "点 4 位于边``(3, 1)``" +msgstr "点 **4** 位于边 ``(3, 1)``" msgid "Like having all points to be considered in both sides ``b``" msgstr "就像双方都要考虑所有点 ``b``" @@ -20025,13 +20027,13 @@ msgid "On the :doc:`TRSP-family` this option is not valid" msgstr "在 :doc:`TRSP-family` 上，此选项无效" msgid "Point **1** located on edge ``(5, 6)`` and ``(6, 5)``" -msgstr "点 **1** 位于边 ``(5, 6)`` 和 ``(6, 5)``" +msgstr "点 **1** 位于边``(5, 6)``和 ``(6, 5)``" msgid "Point **2** located on edge ``(17, 16)``and ``16, 17``" -msgstr "点 **2** 位于边 ``(17, 16)`` 和 ``16, 17``" +msgstr "点 **2** 位于边``(17, 16)``和 ``16, 17``" msgid "Point **4** located on edge ``(3, 1)`` and ``(1, 3)``" -msgstr "点 **4**位于边``(3, 1)``和``(1, 3)``" +msgstr "点 **4** 位于边``(3, 1)``和``(1, 3)``" msgid "Creating temporary vertices" msgstr "创建临时顶点" @@ -20054,7 +20056,7 @@ msgid "On a right hand side driving network" msgstr "在右侧行驶网络" msgid "Arrival to point ``-2`` can be achived only via vertex **16**." -msgstr "只能通过顶点 **16**才能到达点 ``-2``。" +msgstr "只能通过顶点 **16** 才能到达点 ``-2``。" msgid "Does not affects edge ``(17, 16)``, therefore the edge is kept." msgstr "不影响边``(17, 16)``，因此边被保留。" @@ -20084,7 +20086,7 @@ msgid "On a left hand side driving network" msgstr "在左侧驾驶网络上" msgid "Arrival to point ``-2`` can be achived only via vertex **17**." -msgstr "只能通过顶点 **17 **才能到达点 ``-2`` 。" +msgstr "只能通过顶点 **17** 才能到达点 ``-2`` 。" msgid "Does not affects edge ``(16, 17)``, therefore the edge is kept." msgstr "不影响边 ``(16, 17)``，因此保留边。" @@ -20114,7 +20116,7 @@ msgid "When driving side does not matter" msgstr "当驾驶侧无关紧要时" msgid "Arrival to point ``-2`` can be achived via vertices **16** or **17**." -msgstr "可以通过顶点 **16**或 **17**到达点 ``-2`` 。" +msgstr "可以通过顶点 **16** 或 **17** 到达点 ``-2`` 。" msgid "" "Affects the edges ``(16, 17)`` and ``(17, 16)``, therefore the edges are " From 8dd5107fea6904993d40b01cf84a38d01909c143 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 23 Sep 2024 18:15:54 -0600 Subject: [PATCH 357/428] Reducing to 558 warnings --- .../LC_MESSAGES/pgrouting_doc_strings.po | 780 +++++++++--------- 1 file changed, 390 insertions(+), 390 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index d33ec5c1f0..4afda09b6e 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -190,7 +190,7 @@ msgstr "边(``target``, ``source``)的权重" msgid "" "When negative: edge (``target``, ``source``) does not exist, therefore it's " "not part of the graph." -msgstr "当为负时：边（``target``, ``source``）不存在，因此它不是图的一部分。" +msgstr "当为负时：边（ ``target``, ``source`` ）不存在，因此它不是图的一部分。" msgid "``SMALLINT``, ``INTEGER``, ``BIGINT``" msgstr "``SMALLINT``, ``INTEGER``, ``BIGINT``" @@ -205,7 +205,7 @@ msgid "Result columns" msgstr "结果列" msgid "Returns set of ``(seq, depth, start_vid, node, edge, cost, agg_cost)``" -msgstr "返回一组``(seq, depth, start_vid, node, edge, cost, agg_cost)``" +msgstr "返回一组 ``(seq, depth, start_vid, node, edge, cost, agg_cost)``" msgid "``seq``" msgstr "``seq``" @@ -232,13 +232,13 @@ msgid "``node``" msgstr "``node``" msgid "Identifier of ``node`` reached using ``edge``." -msgstr "使用``edge``到达的``node``的标识符。" +msgstr "使用 ``edge``到达的``node`` 的标识符。" msgid "``edge``" msgstr "``edge``" msgid "Identifier of the ``edge`` used to arrive to ``node``." -msgstr "用于到达``node``的``edge``的标识符。" +msgstr "用于到达 ``node`` 的 ``edge`` 的标识符。" msgid ":math:`-1` when ``node`` = ``start_vid``." msgstr ":math:`-1` 当 ``node`` = ``start_vid``。" @@ -247,13 +247,13 @@ msgid "``FLOAT``" msgstr "``FLOAT``" msgid "Cost to traverse ``edge``." -msgstr "遍历``edge``的成本。" +msgstr "遍历 ``edge`` 的成本。" msgid "``agg_cost``" msgstr "``agg_cost``" msgid "Aggregate cost from ``start_vid`` to ``node``." -msgstr "从``start_vid``到``node``的总成本。" +msgstr "从 ``start_vid`` 到 ``node`` 的总成本。" msgid "See Also" msgstr "另请参阅" @@ -648,7 +648,7 @@ msgid "The traveling costs are symmetric:" msgstr "旅行费用是对称的：" msgid "" -"Traveling costs from ``u`` to ``v`` are just as much as traveling from ``v`` " +"Traveling costs from ``u`` to ``v`` are just as much as traveling from ``v``" "to ``u``" msgstr "从 ``u`` 到 ``v`` 的旅行费用与从 ``v`` 到 ``u`` 的旅行费用相同" @@ -681,7 +681,7 @@ msgstr "" msgid "" "When ``NOT 0`` and ``start_id = 0`` then it is the first and last vertex" -msgstr "当 ``NOT 0`` 且 ``start_id = 0``时，它是第一个和最后一个顶点" +msgstr "当 ``NOT 0`` 且 ``start_id = 0`` 时，它是第一个和最后一个顶点" msgid "References" msgstr "参考" @@ -1063,7 +1063,7 @@ msgid "The time, relative to 0, when the ending location opens." msgstr "结束位置打开的时间（相对于 0）。" msgid "When missing: The value of ``start_open`` is used" -msgstr "缺失时：使用``start_open``的值" +msgstr "缺失时：使用 ``start_open`` 的值" msgid "[``end_close``]" msgstr "[``end_close``]" @@ -1072,7 +1072,7 @@ msgid "The time, relative to 0, when the ending location closes." msgstr "结束位置关闭的时间（相对于 0）。" msgid "When missing: The value of ``start_close`` is used" -msgstr "缺失时：使用``start_close``的值" +msgstr "缺失时：使用 ``start_close`` 的值" msgid "[``end_service``]" msgstr "[``end_service``]" @@ -1105,7 +1105,7 @@ msgid "" msgstr "结束位置的节点标识符必须与 `Matrix SQL`_ 中的顶点标识符匹配。" msgid "When missing: ``end_node_id`` is used." -msgstr "缺少时：使用``end_node_id``。" +msgstr "缺少时：使用 ``end_node_id``。" msgid "``start_x``" msgstr "``start_x``" @@ -1126,7 +1126,7 @@ msgid ":math:`x` value of the ending location" msgstr "结束位置的 :math:`x` 值" msgid "When missing: ``start_x`` is used." -msgstr "缺失时：使用``start_x``值。" +msgstr "缺失时：使用 ``start_x`` 值。" msgid "[``end_y``]" msgstr "[``end_y``]" @@ -1135,7 +1135,7 @@ msgid ":math:`y` value of the ending location" msgstr "结束位置的 :math:`y` 值" msgid "When missing: ``start_y`` is used." -msgstr "缺失时：使用``start_y``值。" +msgstr "缺失时：使用 ``start_y`` 值。" msgid "Matrix SQL" msgstr "矩阵SQL" @@ -1286,7 +1286,7 @@ msgid "Summary row has the **total service time**:" msgstr "摘要行包含 **总服务时间**：" msgid "The sum of all the ``service_time``." -msgstr "所有``service_time``的总和。" +msgstr "所有 ``service_time`` 的总和。" msgid "``departure_time``" msgstr "``departure_time``" @@ -1535,10 +1535,10 @@ msgid "When the values are already in the desired time units" msgstr "当值已处于所需时间单位时" msgid "``factor`` should be **1**" -msgstr "``因数``应为 **1**" +msgstr "``因数`` 应为 **1**" msgid "When ``factor`` > 1 the travel times are faster" -msgstr "当``因子`` > 1 时，行程时间更快" +msgstr "当 ``因子`` > 1 时，行程时间更快" msgid "When ``factor`` < 1 the travel times are slower" msgstr "当 ``因子`` < 1 时，行程时间会变慢" @@ -1582,7 +1582,7 @@ msgid "For the :doc:`pgr_pickDeliver`:" msgstr "用于:doc:`pgr_pickDeliver`:" msgid "" -"Given :math:`v = d / t` therefore :math:`t = d / v` And the ``factor`` " +"Given :math:`v = d / t` therefore :math:`t = d / v` And the ``factor``" "becomes :math:`1 / v`" msgstr "给定 :math:`v = d / t` 因此 :math:`t = d / v` 并且 ``因子`` 变为 :math:`1 / v`" @@ -1915,7 +1915,7 @@ msgid "When ``true`` the graph is considered `Directed`" msgstr "当 ``true`` 时，该图被视为有`有向`" msgid "When ``false`` the graph is considered as `Undirected`." -msgstr "如果为 ``false``，则该图被视为 `无向`。" +msgstr "如果为 ``false`` ，则该图被视为 `无向`。" msgid "Performance" msgstr "表现" @@ -2783,7 +2783,7 @@ msgid "" msgstr ":doc:`pgr_edgeColoring` - 使用 Vizing 定理的边缘着色算法。" msgid "Returns set of ``(vertex_id, color_id)``" -msgstr "返回集合``(vertex_id, color_id)``" +msgstr "返回集合 ``(vertex_id, color_id)``" msgid "``vertex_id``" msgstr "``vertex_id``" @@ -3160,8 +3160,8 @@ msgstr "" msgid "" "This implementation, cycles ``max_cycles`` times through " -"``operations_order`` ." -msgstr "此实现通过``operations_order``循环 ``max_cycles`` 次。" +"``operations_order``." +msgstr "此实现通过 ``operations_order``循环 ``max_cycles`` 次。" msgid "Contracting sample data" msgstr "收缩示例数据" @@ -3217,9 +3217,9 @@ msgid "Add additional columns" msgstr "添加附加列" msgid "" -"Adding extra columns to the ``edge_table`` and ``edge_table_vertices_pgr`` " +"Adding extra columns to the ``edge_table`` and ``edge_table_vertices_pgr``" "tables, where:" -msgstr "向``edge_table`` 和``edge_table_vertices_pgr`` 表添加额外的列，其中：" +msgstr "向 ``edge_table`` 和``edge_table_vertices_pgr`` 表添加额外的列，其中：" msgid "``contracted_vertices``" msgstr "``contracted_vertices``" @@ -3269,12 +3269,12 @@ msgstr "顶点表更新" msgid "" "Use ``is_contracted`` column to indicate the vertices that are contracted." -msgstr "使用 ``is_contracted``列来指示收缩的顶点。" +msgstr "使用 ``is_contracted`` 列来指示收缩的顶点。" msgid "" "Fill ``contracted_vertices`` with the information from the results tha " "belong to the vertices." -msgstr "使用属于顶点的结果中的信息填充``contracted_vertices``。" +msgstr "使用属于顶点的结果中的信息填充 ``contracted_vertices``。" msgid "The modified vertices table:" msgstr "修改后的顶点表：" @@ -3286,7 +3286,7 @@ msgid "Insert the new edges generated by pgr_contraction." msgstr "插入由 pgr_contraction 生成的新边。" msgid "The modified ``edge_table``." -msgstr "修改后的``edge_table``。" +msgstr "修改后的 ``edge_table``。" msgid "The contracted graph" msgstr "收缩图" @@ -3443,7 +3443,7 @@ msgid "" "Let be the case the values returned are stored in a table, so the unique " "index would be the pair: ``(start_vid, end_vid)``." msgstr "" -"假设返回的值存储在表中，因此唯一索引将是一对：``(start_vid, end_vid)``。" +"假设返回的值存储在表中，因此唯一索引将是一对： ``(start_vid, end_vid)``。" msgid "" "Depending on the function and its parameters, the results can be symmetric." @@ -3464,7 +3464,7 @@ msgid "``start_vid`` ascending" msgstr "``start_vid`` 升序" msgid "``end_vid`` ascending" -msgstr "``end_vid``升序" +msgstr "``end_vid`` 升序" msgid "Cost Matrix - Category" msgstr "成本矩阵 - 类别" @@ -3628,13 +3628,13 @@ msgid "Value in [``b``, ``r``, ``l``, ``NULL``] indicating if the point is:" msgstr "[``b``, ``r``, ``l``, ``NULL``] 中的值指示该点是否为：" msgid "In the right ``r``," -msgstr "``r``在右边，" +msgstr "``r`` 在右边，" msgid "In the left ``l``," -msgstr "``l``在左边，" +msgstr "``l`` 在左边，" msgid "In both sides ``b``, ``NULL``" -msgstr "``b``, ``NULL``在两边" +msgstr "``b``, ``NULL`` 在两边" msgid ":doc:`TSP-family`" msgstr ":doc:`TSP-family`" @@ -3757,8 +3757,8 @@ msgstr "加权有向图， :math:`G_d(V,E)` 的定义如下：" msgid "the set of vertices :math:`V`" msgstr "顶点集 :math:`V`" -msgid ":math:`V = source \\cup target \\cup {start_{vid}} \\cup {end_{vid}}`" -msgstr ":math:`V = source \\cup target \\cup {start_{vid}} \\cup {end_{vid}}`" +msgid ":math:`V = source \\cup target \\cup {start_{vid}} \\cup {end_{vid}}`" +msgstr ":math:`V = source \\cup target \\cup {start_{vid}} \\cup {end_{vid}}`" msgid "the set of edges :math:`E`" msgstr "边集 :math:`E`" @@ -3766,15 +3766,15 @@ msgstr "边集 :math:`E`" 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 " +"\\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 "" ":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, " +"\\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 \\n" @@ -3786,15 +3786,15 @@ msgstr "无向图" msgid "The weighted undirected graph, :math:`G_u(V,E)`, is definied by:" msgstr "加权无向图， :math:`G_u(V,E)` 的定义如下：" -msgid ":math:`V = source \\cup target \\cup {start_v{vid}} \\cup {end_{vid}}`" +msgid ":math:`V = source \\cup target \\cup {start_v{vid}} \\cup {end_{vid}}`" msgstr "" -":math:`V = source \\cup target \\cup {start_v{vid}} \\cup {end_{vid}}`" +":math:`V = source \\cup target \\cup {start_v{vid}} \\cup {end_{vid}}`" 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{ 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) " @@ -3803,7 +3803,7 @@ msgid "" "\\text{ if } reverse\\_cost \\neq \\varnothing \\\\ \\end{cases}`" msgstr "" ":math:`E = \\begin{cases} \\text{ } \\{(source_i, target_i, cost_i) \\text{ " -"when } cost >=0 \\} & \\quad \\text{ } \\\\ \\cup \\{(target_i, source_i, " +"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{ } \\\\ " @@ -3858,8 +3858,8 @@ msgstr ":math:`node_i \\in V`" msgid ":math:`node_1 = start_{vid}`" msgstr ":math:`node_1 = start_{vid}`" -msgid ":math:`node_{| \\pi |} = end_{vid}`" -msgstr ":math:`node_{| \\pi |} = end_{vid}`" +msgid ":math:`node_{| \\pi |} = end_{vid}`" +msgstr ":math:`node_{| \\pi |} = end_{vid}`" msgid "" ":math:`\\forall i \\neq | \\pi |, \\quad (node_i, node_{i+1}, cost_i) \\in E`" @@ -3867,24 +3867,24 @@ msgstr "" ":math:`\\forall i \\neq | \\pi |, \\quad (node_i, node_{i+1}, cost_i) \\in E`" msgid "" -":math:`edge_i = \\begin{cases} id_{(node_i, node_{i+1},cost_i)} &\\quad " -"\\text{when } i \\neq | \\pi | \\\\ -1 &\\quad \\text{when } i = | \\pi | \\" +":math:`edge_i = \\begin{cases} id_{(node_i, node_{i+1},cost_i)} &\\quad " +"\\text{when } i \\neq | \\pi | \\\\ -1 &\\quad \\text{when } i = | \\pi | \\" "\\ \\end{cases}`" msgstr "" -":math:`edge_i = \\begin{cases} id_{(node_i, node_{i+1},cost_i)} &\\quad " -"\\text{when } i \\neq | \\pi | \\\\ -1 &\\quad \\text{when } i = | \\pi | \\" +":math:`edge_i = \\begin{cases} id_{(node_i, node_{i+1},cost_i)} &\\quad " +"\\text{when } i \\neq | \\pi | \\\\ -1 &\\quad \\text{when } i = | \\pi | \\" "\\ \\end{cases}`" msgid ":math:`cost_i = cost_{(node_i, node_{i+1})}`" msgstr ":math:`cost_i = cost_{(node_i, node_{i+1})}`" msgid "" -":math:`agg\\_cost_i = \\begin{cases} 0 &\\quad \\text{when } i = 1 \\" -"\\ \\displaystyle\\sum_{k=1}^{i} cost_{(node_{k-1}, node_k)} &\\quad " +":math:`agg\\_cost_i = \\begin{cases} 0 &\\quad \\text{when } i = 1 \\" +"\\ \\displaystyle\\sum_{k=1}^{i} cost_{(node_{k-1}, node_k)} &\\quad " "\\text{when } i \\neq 1 \\\\ \\end{cases}`" msgstr "" -":math:`agg\\_cost_i = \\begin{cases} 0 &\\quad \\text{when } i = 1 \\" -"\\ \\displaystyle\\sum_{k=1}^{i} cost_{(node_{k-1}, node_k)} &\\quad " +":math:`agg\\_cost_i = \\begin{cases} 0 &\\quad \\text{when } i = 1 \\" +"\\ \\displaystyle\\sum_{k=1}^{i} cost_{(node_{k-1}, node_k)} &\\quad " "\\text{when } i \\neq 1 \\\\ \\end{cases}`" msgid "" @@ -3985,13 +3985,13 @@ msgid "``pred``" msgstr "``pred``" msgid "Predecessor of ``node``." -msgstr "``node``的前驱。" +msgstr "``node`` 的前驱。" msgid "When ``node`` = ``start_vid`` then has the value ``node``." msgstr "当 `node` 等于 `start_vid` 时，它的值就是 `node`。" msgid "Identifier of the ``edge`` used to arrive from ``pred`` to ``node``." -msgstr "从``pred`` 到达``node``所使用的 ``edge``的标识符。" +msgstr "从 ``pred`` 到达``node``所使用的 ``edge`` 的标识符。" msgid "Experimental Functions" msgstr "实验函数" @@ -4335,19 +4335,19 @@ msgstr "图定义" msgid "The weighted directed graph, :math:`G(V,E)`, is defined as:" msgstr "加权有向图， :math:`G(V,E)` 定义为：" -msgid "the set of vertices :math:`V`" +msgid "the set of vertices :math:`V`" msgstr "顶点集:math:`V`" msgid "" -":math:`source\\_vertex \\cup sink\\_vertex \\bigcup source_i \\bigcup " +":math:`source\\_vertex \\cup sink\\_vertex \\bigcup source_i \\bigcup " "target_i`" msgstr "" -":math:`source\\_vertex \\cup sink\\_vertex \\bigcup source_i \\bigcup " +":math:`source\\_vertex \\cup sink\\_vertex \\bigcup source_i \\bigcup " "target_i`" msgid "" ":math:`E = \\begin{cases} \\text{ } \\{(source_i, target_i, capacity_i) " -"\\text{ when } capacity > 0 \\} & \\quad \\text{ if } reverse\\_capacity = " +"\\text{ when } capacity > 0 \\} & \\quad \\text{ if } reverse\\_capacity = " "\\varnothing \\\\ \\text{ } & \\quad \\text{ } \\\\ \\{(source_i, target_i, " "capacity_i) \\text{ when } capacity > 0 \\} & \\text{ } \\\\ \\cup " "\\{(target_i, source_i, reverse\\_capacity_i) \\text{ when } " @@ -4355,7 +4355,7 @@ msgid "" "\\varnothing \\\\ \\end{cases}`" msgstr "" ":math:`E = \\begin{cases} \\text{ } \\{(source_i, target_i, capacity_i) " -"\\text{ when } capacity > 0 \\} & \\quad \\text{ if } reverse\\_capacity = " +"\\text{ when } capacity > 0 \\} & \\quad \\text{ if } reverse\\_capacity = " "\\varnothing \\\\ \\text{ } & \\quad \\text{ } \\\\ \\{(source_i, target_i, " "capacity_i) \\text{ when } capacity > 0 \\} & \\text{ } \\\\ \\cup " "\\{(target_i, source_i, reverse\\_capacity_i) \\text{ when } " @@ -4606,7 +4606,7 @@ msgstr "将输出列标准化为 |result-spantree|" #, fuzzy msgid "Added ``pred`` result columns." -msgstr "添加了 ``depth``和``pred``结果列。" +msgstr "添加了 ``depth``和``pred`` 结果列。" msgid "Experimental promoted to proposed." msgstr "实验提升为拟议。" @@ -4700,7 +4700,7 @@ msgid "Migrating functions" msgstr "迁移函数" msgid "Migration of ``pgr_aStar``" -msgstr "``pgr_aStar``迁移" +msgstr "``pgr_aStar`` 迁移" msgid "" "Starting from `v3.6.0 `__" @@ -4725,9 +4725,9 @@ msgid "Output columns were |old-generic-result|" msgstr "输出列是 |old-generic-result|" msgid "" -"Depending on the overload used, the columns ``start_vid`` and ``end_vid`` " +"Depending on the overload used, the columns ``start_vid`` and ``end_vid``" "might be missing:" -msgstr "根据所使用的重载， ``start_vid`` 和``end_vid``列可能会丢失：" +msgstr "根据所使用的重载， ``start_vid`` 和``end_vid`` 列可能会丢失：" msgid "" "``pgr_aStar`` (`One to One`) does not have ``start_vid`` and ``end_vid``." @@ -4747,7 +4747,7 @@ msgid "Be aware of the existence of the additional columns." msgstr "请注意附加列的存在。" msgid "In ``pgr_aStar`` (`One to One`)" -msgstr "在``pgr_aStar`` (`一对一`)中" +msgstr "在 ``pgr_aStar`` (`一对一`)中" msgid "``start_vid`` contains the **start vid** parameter value." msgstr "``start_vid`` 包含 **起始 vid** 参数值。" @@ -4756,10 +4756,10 @@ msgid "``end_vid`` contains the **end vid** parameter value." msgstr "``end_vid`` 包含 **结束 vid** 参数值。" msgid "In ``pgr_aStar`` (`One to Many`)" -msgstr "在``pgr_aStar`` (`一对多`)中" +msgstr "在 ``pgr_aStar`` (`一对多`)中" msgid "In ``pgr_aStar`` (`Many to One`)" -msgstr "在``pgr_aStar`` (`多对一`)中" +msgstr "在 ``pgr_aStar`` (`多对一`)中" msgid "If needed filter out the added columns, for example:" msgstr "如果需要，过滤掉添加的列，例如：" @@ -4789,10 +4789,10 @@ msgid "" msgstr "" "从 `v3.5 `__开始，函数 " -"``my_dijkstra`` 返回 ``pgr_dijkstra``的新附加列。" +"``my_dijkstra`` 返回 ``pgr_dijkstra`` 的新附加列。" msgid "Migration of ``pgr_bdAstar``" -msgstr "迁移``pgr_bdAstar``" +msgstr "迁移 ``pgr_bdAstar``" msgid "``pgr_bdAstar`` (`One to One`)" msgstr "``pgr_bdAstar`` (`一对一`)" @@ -4814,16 +4814,16 @@ msgid "``pgr_bdAstar`` (`Many to One`) does not have ``end_vid``." msgstr "``pgr_bdAstar`` (`多对一`) 没有 ``end_vid``。" msgid "In ``pgr_bdAstar`` (`One to One`)" -msgstr "在``pgr_bdAstar`` (`一对一`)中" +msgstr "在 ``pgr_bdAstar`` (`一对一`)中" msgid "In ``pgr_bdAstar`` (`One to Many`)" -msgstr "在``pgr_bdAstar`` (`一对多`)中" +msgstr "在 ``pgr_bdAstar`` (`一对多`)中" msgid "In ``pgr_bdAstar`` (`Many to One`)" -msgstr "在``pgr_bdAstar`` (`多对一`)中" +msgstr "在 ``pgr_bdAstar`` (`多对一`)中" msgid "Migration of ``pgr_dijkstra``" -msgstr "迁移``pgr_dijkstra``" +msgstr "迁移 ``pgr_dijkstra``" msgid "" "Starting from `v3.5.0 `__" @@ -4850,19 +4850,19 @@ msgid "``pgr_dijkstra`` (`Many to One`) does not have ``end_vid``." msgstr "``pgr_dijkstra`` (`多对一`) 没有``end_vid``。" msgid "In ``pgr_dijkstra`` (`One to One`)" -msgstr "在``pgr_dijkstra`` (`一对一`)中" +msgstr "在 ``pgr_dijkstra`` (`一对一`)中" msgid "In ``pgr_dijkstra`` (`One to Many`)" -msgstr "在``pgr_dijkstra`` (`一对多`)中" +msgstr "在 ``pgr_dijkstra`` (`一对多`)中" msgid "In ``pgr_dijkstra`` (`Many to One`)" -msgstr "在``pgr_dijkstra`` (`多对一`)中" +msgstr "在 ``pgr_dijkstra`` (`多对一`)中" msgid "If needed add the new columns, for example:" msgstr "如果需要，过滤掉添加的列，例如：" msgid "Migration of ``pgr_drivingdistance``" -msgstr "迁移``pgr_drivingdistance``" +msgstr "迁移 ``pgr_drivingdistance``" msgid "" "Starting from `v3.6.0 `__ :" @@ -4893,13 +4893,13 @@ msgid "Output columns were |result-dij-dd|" msgstr "输出列是 |result-dij-dd|" msgid "Does not have ``start_vid`` and ``depth`` result columns." -msgstr "没有``start_vid``和 ``depth``结果列。" +msgstr "没有 ``start_vid``和 ``depth`` 结果列。" msgid "Has ``from_v`` instead of ``start_vid`` result column." -msgstr "有 ``from_v`` 而不是 ``start_vid``结果列。" +msgstr "有 ``from_v`` 而不是 ``start_vid`` 结果列。" msgid "does not have ``depth`` result column." -msgstr "没有``depth``结果列。" +msgstr "没有 ``depth`` 结果列。" #, fuzzy msgid "Be aware of the existence and name change of the result columns." @@ -4913,10 +4913,10 @@ msgstr "" "vertex>`__示例。" msgid "``depth`` contains the depth of the ``node``." -msgstr "``depth``包含``node``的深度。" +msgstr "``depth``包含``node`` 的深度。" msgid "``pred`` contains the predecessor of the ``node``." -msgstr "``pred`` 包含``node``的前驱。" +msgstr "``pred`` 包含``node`` 的前驱。" msgid "" "If needed filter out the added columns, for example, to return the original " @@ -4996,7 +4996,7 @@ msgstr "" #, fuzzy msgid "" "Now column ``pred`` exists and contains the predecessor of the ``node``." -msgstr "``pred`` 包含``node``的前驱。" +msgstr "``pred`` 包含``node`` 的前驱。" #, fuzzy msgid "Kruskal multiple vertices" @@ -5011,7 +5011,7 @@ msgstr "" "vertices>`__ 示例。" msgid "Migration of ``pgr_KSP``" -msgstr "迁移``pgr_KSP``" +msgstr "迁移 ``pgr_KSP``" #, fuzzy msgid "" @@ -5034,7 +5034,7 @@ msgid "Output columns were |ksp-result|" msgstr "输出列是 |ksp-result|" msgid "the columns ``start_vid`` and ``end_vid`` do not exist." -msgstr "``start_vid``和 ``end_vid``列不存在。" +msgstr "``start_vid``和 ``end_vid`` 列不存在。" msgid "``pgr_KSP`` (One to One) does not have ``start_vid`` and ``end_vid``." msgstr "``pgr_KSP`` (一对一) 没有 ``start_vid`` 和``end_vid``。" @@ -5057,7 +5057,7 @@ msgid "" ":doc:`pgr_maxCardinalityMatch` works only for undirected graphs, therefore " "the ``directed`` flag has been removed." msgstr "" -":doc:`pgr_maxCardinalityMatch` 仅适用于无向图，因此``有向``标志已被删除。" +":doc:`pgr_maxCardinalityMatch` 仅适用于无向图，因此 ``有向`` 标志已被删除。" msgid "" "Starting from `v3.4.0 `__" @@ -5070,7 +5070,7 @@ msgid "Migration is needed, because:" msgstr "需要迁移，因为：" msgid "Use ``cost`` and ``reverse_cost`` on the inner query" -msgstr "在内部查询上使用``cost``和 ``reverse_cost``" +msgstr "在内部查询上使用 ``cost``和 ``reverse_cost``" msgid "Results are ordered" msgstr "结果已排序" @@ -5082,10 +5082,10 @@ msgid "New signature" msgstr "新签名" msgid "``pgr_maxCardinalityMatch(text)`` returns only ``edge`` column." -msgstr "``pgr_maxCardinalityMatch(text)`` 仅仅返回``边``列." +msgstr "``pgr_maxCardinalityMatch(text)`` 仅仅返回``边`` 列." msgid "The optional flag ``directed`` is removed." -msgstr "可选的 ``directed``标志被删除。" +msgstr "可选的 ``directed`` 标志被删除。" msgid "Before migration" msgstr "迁移前" @@ -5093,7 +5093,7 @@ msgstr "迁移前" msgid "" "Columns used are ``going`` and ``coming`` to represent the existence of an " "edge." -msgstr "所使用的列是 ``going`` 和 ``coming``，用于表示边的存在。" +msgstr "所使用的列是 ``going`` 和 ``coming`` ，用于表示边的存在。" msgid "" "Flag ``directed`` was used to indicate if it was for a **directed** or " @@ -5101,7 +5101,7 @@ msgid "" msgstr "``directed`` 标志用于指示是 **有向** 图还是 **无向** 图。" msgid "The flag ``directed`` is ignored." -msgstr "``directed``标志被忽略。" +msgstr "``directed`` 标志被忽略。" msgid "" "Regardless of it's value it gives the result considering the graph as " @@ -5111,13 +5111,13 @@ msgstr "无论它的值如何，它都会给出将图视为 **无向** 的结果 msgid "" "Use the columns ``cost`` and ``reverse_cost`` to represent the existence of " "an edge." -msgstr "使用 ``cost``和 ``reverse_cost``列来表示边的存在。" +msgstr "使用 ``cost``和 ``reverse_cost`` 列来表示边的存在。" msgid "Do not use the flag ``directed``." -msgstr "不要使用``directed``标志。" +msgstr "不要使用 ``directed`` 标志。" msgid "In the query returns only ``edge`` column." -msgstr "查询中仅返回``边``列。" +msgstr "查询中仅返回 ``边`` 列。" msgid "Migration of ``pgr_primDD`` / ``pgr_primBFS`` / ``pgr_primDFS``" msgstr "" @@ -5161,7 +5161,7 @@ msgstr "" "vertices>`__ 示例。" msgid "Migration of ``pgr_withPointsDD``" -msgstr "迁移``pgr_withPointsDD``" +msgstr "迁移 ``pgr_withPointsDD``" #, fuzzy msgid "" @@ -5192,7 +5192,7 @@ msgid "Output columns were |result-1-1-no-seq|" msgstr "输出列为|result-1-1-no-seq|" msgid "Does not have ``start_vid``, ``pred`` and ``depth`` result columns." -msgstr "没有``start_vid``，``pred``和``depth``结果列。" +msgstr "没有 ``start_vid``，``pred``和``depth`` 结果列。" #, fuzzy msgid "" @@ -5206,7 +5206,7 @@ msgid "Output columns were |result-m-1-no-seq|" msgstr "输出列为|result-m-1-no-seq|" msgid "Does not have ``depth`` and ``pred`` result columns." -msgstr "没有 ``depth``和``pred``结果列。" +msgstr "没有 ``depth``和``pred`` 结果列。" msgid "Driving side was optional" msgstr "驾驶侧是可选的" @@ -5236,13 +5236,13 @@ msgid "Driving side was named optional" msgstr "驾驶侧被命名为可选" msgid "On directed graph ``b`` could be used as **driving side**" -msgstr "在有向图上 ``b``可以用作 **行驶方向**" +msgstr "在有向图上 ``b`` 可以用作 **行驶方向**" msgid "On undirected graph ``r`` could be used as **driving side**" msgstr "在无向图上 ``r`` 可以用作 **行驶方向**" msgid "Also ``l`` could be used as **driving side**" -msgstr "此外，``l`` 也可用作 **驾驶侧**" +msgstr "此外， ``l`` 也可用作 **驾驶侧**" msgid "After Migration" msgstr "迁移后" @@ -5297,10 +5297,10 @@ msgid "filter out the additional columns, for example;" msgstr "过滤掉额外的列，例如；" msgid "" -"When ``details => false`` to remove the points use ``WHERE node >= 0 OR cost " +"When ``details => false`` to remove the points use `` WHERE node >= 0 OR cost " "= 0``" msgstr "" -"当设置``details => false`` 以移除点时，请使用 ``WHERE node >= 0 OR cost = 0``" +"当设置 ``details => false`` 以移除点时，请使用 ``WHERE node >= 0 OR cost = 0``" msgid "" "Using `this `__ 作为导入工具的数据附带路由拓扑。 请参阅`workshop `__上使用``osm2pgrouting`` " +"workshop.pgrouting.org/latest/en/basic/data.html>`__上使用 ``osm2pgrouting``" "的示例。" msgid "Adjust costs" @@ -6316,7 +6316,7 @@ msgstr "调整成本" msgid "" "For this example the ``cost`` and ``reverse_cost`` values are going to be " "the double of the length of the geometry." -msgstr "对于本示例，``cost`` 和``reverse_cost``值将是几何体长度的两倍。" +msgstr "对于本示例， ``cost`` 和``reverse_cost`` 值将是几何体长度的两倍。" msgid "Update costs to length of geometry" msgstr "将成本更新为几何形状的长度" @@ -6324,7 +6324,7 @@ msgstr "将成本更新为几何形状的长度" msgid "" "Suppose that ``cost`` and ``reverse_cost`` columns in the sample data " "represent:" -msgstr "假设样本数据中的 ``cost`` 和``reverse_cost``列表示：" +msgstr "假设样本数据中的 ``cost`` 和``reverse_cost`` 列表示：" msgid ":math:`1` when the edge exists in the graph" msgstr "当边存在于图中时为 :math:`1`" @@ -6353,13 +6353,13 @@ msgid "Other datasets, can have a column with values like" msgstr "其他数据集可以有一列包含如下值" msgid "``FT`` vehicle flow on the direction of the geometry" -msgstr "``FT``几何方向上的车流" +msgstr "``FT`` 几何方向上的车流" msgid "``TF`` vehicle flow opposite of the direction of the geometry" msgstr "``TF`` 车流与几何方向相反" msgid "``B`` vehicle flow on both directions" -msgstr "``B``双向车流" +msgstr "``B`` 双向车流" msgid "Preparing a code column for the example:" msgstr "为示例准备代码列：" @@ -6574,7 +6574,7 @@ msgstr "" "`4`。 距离顶点 :math:`4` 最近的边是 边 :math:`14`。" msgid "" -"The ``edge`` can be used to connect the components, using the ``fraction`` " +"The ``edge`` can be used to connect the components, using the ``fraction``" "information about the edge :math:`14` to split the connecting edge." msgstr "" "``edge``可用于连接组件，利用边 :math:`14`的``fraction`` 信息来分割连接边。" @@ -6713,23 +6713,23 @@ msgstr "pgRouting 函数调用的一般形式是：" msgid "\\ \\" msgstr "\\ \\" -msgid "pgr_(`Inner queries`_, **parameters**, [ ``Optional parameters``)" +msgid "pgr_(`Inner queries`_, **parameters**, [``Optional parameters``)" msgstr "" -"pgr_(`Inner queries`_, **parameters**, [ ``Optional parameters``)" +"pgr_(`Inner queries`_, **parameters**, [``Optional parameters``)" msgid "" "`Inner queries`_: Are compulsory parameters that are ``TEXT`` strings " "containing SQL queries." -msgstr "`Inner queries`_：是强制参数，是包含 SQL 查询的``TEXT``字符串。" +msgstr "`Inner queries`_：是强制参数，是包含 SQL 查询的 ``TEXT`` 字符串。" msgid "" "**parameters**: Additional compulsory parameters needed by the function." msgstr "**parameters**：函数需要的附加强制参数。" msgid "" -"``Optional parameters``: Are non compulsory **named** parameters that have a " +"``Optional parameters`` : Are non compulsory **named** parameters that have a " "default value when omitted." -msgstr "``Optional parameters``：是非强制命名参数，省略时具有默认值。" +msgstr "``Optional parameters`` ：是非强制命名参数，省略时具有默认值。" msgid "" "The compulsory parameters are positional parameters, the optional parameters " @@ -6894,7 +6894,7 @@ msgid "Some uncategorised functions" msgstr "一些未分类的函数" msgid "General without ``id``" -msgstr "一般没有``id``" +msgstr "一般没有 ``id``" msgid "General with (X,Y)" msgstr "通常带有（X,Y)" @@ -6902,7 +6902,7 @@ msgstr "通常带有（X,Y)" msgid "" "When negative: edge (``source``, ``target``) does not exist, therefore it's " "not part of the graph." -msgstr "当为负时：边（``source``, ``target``）不存在，因此它不是图的一部分。" +msgstr "当为负时：边（ ``source``, ``target`` ）不存在，因此它不是图的一部分。" msgid "Weight of the edge (``target``, ``source``)," msgstr "边 (``target``, ``source``)的权重，" @@ -6917,19 +6917,19 @@ msgid "``y1``" msgstr "``y1``" msgid "Y coordinate of ``source`` vertex." -msgstr "``source``顶点的Y坐标。" +msgstr "``source`` 顶点的Y坐标。" msgid "``x2``" msgstr "``x2``" msgid "X coordinate of ``target`` vertex." -msgstr "``target``顶点的X坐标。" +msgstr "``target`` 顶点的X坐标。" msgid "``y2``" msgstr "``y2``" msgid "Y coordinate of ``target`` vertex." -msgstr "``target``顶点的Y坐标。" +msgstr "``target`` 顶点的Y坐标。" msgid "Flow" msgstr "流" @@ -6990,7 +6990,7 @@ msgid "When ``true`` if a path is missing stops and returns **EMPTY SET**" msgstr "当为 ``true`` 时，如果路径丢失，则停止并返回 **EMPTY SET**" msgid "When ``false`` ignores missing paths returning all paths found" -msgstr "当``false``忽略丢失的路径时，返回找到的所有路径" +msgstr "当 ``false`` 忽略丢失的路径时，返回找到的所有路径" msgid "``U_turn_on_edge``" msgstr "``U_turn_on_edge``" @@ -7008,7 +7008,7 @@ msgid "" "the edge used to reach it. In other words, U turn using the edge with same " "identifier is used when no other path is found." msgstr "" -"当为``false``时，从已访问的顶点出发，尝试避免使用用于到达它的边。换句话说，只" +"当为 ``false`` 时，从已访问的顶点出发，尝试避免使用用于到达它的边。换句话说，只" "有在找不到其他路径时才使用具有相同标识符的边来进行掉头。" msgid "For the TRSP functions" @@ -7034,7 +7034,7 @@ msgid "" "Returns set of ``(seq, path_seq [, start_vid] [, end_vid], node, edge, cost, " "agg_cost)``" msgstr "" -"返回``(seq, path_seq [, start_vid] [, end_vid], node, edge, cost, agg_cost)``" +"返回 ``(seq, path_seq [, start_vid] [, end_vid], node, edge, cost, agg_cost)``" "的集合" msgid "``path_seq``" @@ -7055,19 +7055,19 @@ msgid "" msgstr "结束顶点的标识符。 当查询中有多个结束顶点时返回。" msgid "Identifier of the node in the path from ``start_vid`` to ``end_vid``." -msgstr "从``start_vid``到 ``end_vid``路径中节点的标识符。" +msgstr "从 ``start_vid``到 ``end_vid`` 路径中节点的标识符。" 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 "" -"用于从路径序列中的``node`` 到下一个节点的边的标识符。 **-1** 表示路径的最后一" +"用于从路径序列中的 ``node`` 到下一个节点的边的标识符。 **-1** 表示路径的最后一" "个节点。" msgid "" "Cost to traverse from ``node`` using ``edge`` to the next node in the path " "sequence." -msgstr "从使用``edge``的 ``node`` 遍历到路径序列中的下一个节点的成本。" +msgstr "从使用 ``edge``的 ``node`` 遍历到路径序列中的下一个节点的成本。" msgid "Used in functions the following:" msgstr "用于以下函数：" @@ -7079,7 +7079,7 @@ msgid "" "Returns set of ``(seq, path_seq [, start_pid] [, end_pid], node, edge, cost, " "agg_cost)``" msgstr "" -"返回``(seq, path_seq [, start_pid] [, end_pid], node, edge, cost, agg_cost)``" +"返回 ``(seq, path_seq [, start_pid] [, end_pid], node, edge, cost, agg_cost)``" "的集合" msgid "Relative position in the path." @@ -7119,7 +7119,7 @@ msgid "Returned on `One to Many`_ and `Many to Many`_" msgstr "返回`一对多`_和`多对多`_" msgid "Identifier of the node in the path from ``start_pid`` to ``end_pid``." -msgstr "从``start_pid`` 到``end_pid``路径中节点的标识符。" +msgstr "从 ``start_pid`` 到``end_pid`` 路径中节点的标识符。" msgid "When positive is the identifier of the a vertex." msgstr "当正数时是顶点的标识符。" @@ -7130,7 +7130,7 @@ msgstr "当负数时是a点的标识符。" msgid "" "Identifier of the edge used to go from ``node`` to the next node in the path " "sequence." -msgstr "用于从路径序列中的 ``node``到下一个节点的边的标识符。" +msgstr "用于从路径序列中的 ``node`` 到下一个节点的边的标识符。" msgid "**-1** for the last row of the path." msgstr "**-1** 表示路径的最后一行。" @@ -7144,7 +7144,7 @@ msgstr ":doc:`pgr_dijkstraNear`" msgid "" "Returns ``(seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)``" msgstr "" -"返回``(seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)``" +"返回 ``(seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)``" msgid "Identifier of the starting vertex of the current path." msgstr "当前路径起始顶点的标识符。" @@ -7212,7 +7212,7 @@ msgid "Result columns for spanning tree functions" msgstr "生成树函数的结果列" msgid "Returns set of ``(edge, cost)``" -msgstr "返回集合``(edge, cost)``" +msgstr "返回集合 ``(edge, cost)``" msgid "Cost to traverse the edge." msgstr "穿越边的成本。" @@ -7519,7 +7519,7 @@ msgid "" "To get additional details on the flags associated with ``createuser`` below " "given command can be used" msgstr "" -"要获取与下面的 ``createuser``相关的标志的更多详细信息，可以使用给定的命令" +"要获取与下面的 ``createuser`` 相关的标志的更多详细信息，可以使用给定的命令" msgid "Creating Database in PostgreSQL" msgstr "在 PostgreSQL 中创建数据库" @@ -7634,7 +7634,7 @@ msgid "" msgstr "我们已经在多个平台上进行了测试，安装或重新安装需要所有步骤。" msgid "The sql signatures are configured and build in the ``cmake`` command." -msgstr "SQL签名是在``cmake``命令中配置和构建的。" +msgstr "SQL签名是在 ``cmake`` 命令中配置和构建的。" msgid "MinGW on Windows" msgstr "Windows 上的 MinGW" @@ -7891,7 +7891,7 @@ msgid "``pgr_ksp`` (One to One)" msgstr "``pgr_ksp`` (一对一)" msgid "Added ``start_vid`` and ``end_vid`` result columns." -msgstr "增加``start_vid``和``end_vid``结果列。" +msgstr "增加 ``start_vid``和``end_vid`` 结果列。" msgid "New overload functions:" msgstr "新的重载函数：" @@ -8012,7 +8012,7 @@ msgid "``heap_paths``" msgstr "``heap_paths``" msgid "When ``false`` Returns at most K paths." -msgstr "当``false``时返回最多 K 条路径。" +msgstr "当 ``false`` 时返回最多 K 条路径。" msgid "When ``true`` all the calculated paths while processing are returned." msgstr "当 ``true`` 时，返回处理时的所有计算路径。" @@ -8021,15 +8021,15 @@ 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 "" -"粗略地说，当最短路径有 ``N`` 个边时，对于``K``值较小且``K > 5``，堆将包含大" +"粗略地说，当最短路径有 ``N`` 个边时，对于``K``值较小且``K > 5`` ，堆将包含大" "约 ``N * K`` 条路径。" msgid "" "Has value **1** for the first of a path from ``start_vid`` to ``end_vid``" -msgstr "从``start_vid``到 ``end_vid``的第一个路径的值为 **1**" +msgstr "从 ``start_vid``到 ``end_vid`` 的第一个路径的值为 **1**" msgid "Identifier of the node in the path from ``start_vid`` to ``end_vid``" -msgstr "从``start_vid`` 到 ``end_vid``路径中节点的标识符" +msgstr "从 ``start_vid`` 到 ``end_vid`` 路径中节点的标识符" msgid ":math:`0` for the last ``node`` of the path." msgstr ":math:`0` 为路径的最后一个 ``node``。" @@ -8099,7 +8099,7 @@ msgstr "" "可以与:doc:`costMatrix-category` 函数一起使用，最好使用 `directed => false`。" msgid "With ``directed => false``" -msgstr "使用``directed => false``" +msgstr "使用 ``directed => false``" msgid "Will generate a graph that:" msgstr "将生成一个图：" @@ -8114,7 +8114,7 @@ msgid "all traveling costs on edges obey the triangle inequality." msgstr "所有边上的旅行成本都遵循三角不等式。" msgid "When ``start_vid = 0 OR end_vid = 0``" -msgstr "当``start_vid = 0 OR end_vid = 0``" +msgstr "当 ``start_vid = 0 OR end_vid = 0``" msgid "" "The solutions generated is garanteed to be *twice as long as the optimal " @@ -8133,7 +8133,7 @@ msgstr "" "设置在固定位置。" msgid "With ``directed => true``" -msgstr "当``directed => true``" +msgstr "当 ``directed => true``" msgid "" "It is **not garanteed** that the solution will be, in the worse case, twice " @@ -8210,7 +8210,7 @@ msgid "Cost for going from start_vid to end_vid" msgstr "从 start_vid 到 end_vid 的成本" msgid "Returns SET OF ``(seq, node, cost, agg_cost)``" -msgstr "返回集合``(seq, node, cost, agg_cost)``" +msgstr "返回集合 ``(seq, node, cost, agg_cost)``" msgid "Row sequence." msgstr "行顺序。" @@ -8230,10 +8230,10 @@ msgid "``0`` for the last row in the tour sequence." msgstr "``0`` 表示游览序列中的最后一行。" msgid "Aggregate cost from the ``node`` at ``seq = 1`` to the current node." -msgstr "从``seq = 1``的 ``node``到当前节点的总成本。" +msgstr "从 ``seq = 1``的 ``node`` 到当前节点的总成本。" msgid "``0`` for the first row in the tour sequence." -msgstr "``0``表示游览序列中的第一行。" +msgstr "``0`` 表示游览序列中的第一行。" msgid "Start from vertex :math:`1`" msgstr "从顶点 :math:`1` 开始" @@ -8254,7 +8254,7 @@ msgstr "" "**Line 4** 通过未在查询中包括 ``pointsOfInterset`` 中的``side`` 信息而被忽略" msgid "**Line 6** Generating an asymetric matrix with ``directed => true``" -msgstr "**Line 6** 使用``directed => true``生成一个非对称矩阵" +msgstr "**Line 6** 使用 ``directed => true`` 生成一个非对称矩阵" msgid "" ":math:`min(agg\\_cost(u, v), agg\\_cost(v, u))` is going to be considered as " @@ -8394,7 +8394,7 @@ msgid "" "obtained with ``pgr_TSPeuclidean``." msgstr "" "从视觉上看，第一幅图像是 `最优解 `__ ，第二幅图像是使用 ``pgr_TSPeuclidean``获得的解。" +"witour.html>`__ ，第二幅图像是使用 ``pgr_TSPeuclidean`` 获得的解。" msgid ":doc:`sampledata` network." msgstr ":doc:`sampledata` 网络。" @@ -8416,7 +8416,7 @@ msgid "``pgr_aStar`` (`One to Many`_) added ``end_vid`` column." msgstr "``pgr_aStar`` (`一对多`_) 增加 ``end_vid`` 列." msgid "``pgr_aStar`` (`Many to One`_) added ``start_vid`` column." -msgstr "``pgr_aStar`` (`多对一`_) 增加 ``start_vid``列." +msgstr "``pgr_aStar`` (`多对一`_) 增加 ``start_vid`` 列." msgid "Version 3.2.0" msgstr "版本3.2.0" @@ -8443,7 +8443,7 @@ msgid "``pgr_aStar`` (`Many to Many`_)" msgstr "``pgr_aStar`` (`多对多`_)" msgid "Signature change on ``pgr_astar`` (`One to One`_)" -msgstr "签名更改``pgr_astar`` (`一对一`_)" +msgstr "签名更改 ``pgr_astar`` (`一对一`_)" msgid "**Official** ``pgr_aStar`` (`One to One`_)" msgstr "**官方** ``pgr_aStar`` (`一对一`_)" @@ -8690,7 +8690,7 @@ msgstr "" "radius < spoon\\_radius`" msgid "The ``alpha`` parameter is the **spoon radius**" -msgstr "``alpha``参数是 **spoon radius**" +msgstr "``alpha`` 参数是 **spoon radius**" msgid "" "When the total number of points is less than 3, returns an EMPTY geometry" @@ -8750,10 +8750,10 @@ msgid "The function returns:" msgstr "函数返回：" msgid "``OK`` after the analysis has finished." -msgstr "``OK``分析完成后。" +msgstr "``OK`` 分析完成后。" msgid "``FAIL`` when the analysis was not completed due to an error." -msgstr "``FAIL``当分析因错误而未完成时。" +msgstr "``FAIL`` 当分析因错误而未完成时。" msgid "pgr_analyzeGraph(**edge_table**, **tolerance**, [**options**])" msgstr "pgr_analyzeGraph(**edge_table**, **tolerance**, [**options**])" @@ -8797,7 +8797,7 @@ msgstr "tolerance" msgid "" "``float8`` Snapping tolerance of disconnected edges. (in projection unit)" -msgstr "``float8``断开边的捕捉容差。 （以投影单位表示）" +msgstr "``float8`` 断开边的捕捉容差。 （以投影单位表示）" msgid "the_geom" msgstr "the_geom" @@ -8837,17 +8837,17 @@ msgstr "rows_where" msgid "" "``text`` Condition to select a subset or rows. Default value is ``true`` to " "indicate all rows." -msgstr "``text`` 用于选择子集或行的条件。默认值为``true``，表示选择所有行。" +msgstr "``text`` 用于选择子集或行的条件。默认值为``true`` ，表示选择所有行。" msgid "Uses the vertices table: _vertices_pgr." msgstr "使用这个顶点表：_vertices_pgr。" msgid "Fills completely the ``cnt`` and ``chk`` columns of the vertices table." -msgstr "完全填充顶点表的``cnt`` 和``chk`` 列。" +msgstr "完全填充顶点表的 ``cnt`` 和``chk`` 列。" msgid "" "Returns the analysis of the section of the network defined by ``rows_where``" -msgstr "返回由``rows_where`` 定义的网络部分的分析结果" +msgstr "返回由 ``rows_where`` 定义的网络部分的分析结果" msgid "The vertices table is not found." msgstr "未找到顶点表。" @@ -8880,20 +8880,20 @@ msgid "The structure of the vertices table is:" msgstr "顶点表的结构为：" msgid "``bigint`` Identifier of the vertex." -msgstr "``bigint``顶点的标识符。" +msgstr "``bigint`` 顶点的标识符。" msgid "cnt" msgstr "cnt" msgid "" "``integer`` Number of vertices in the edge_table that reference this vertex." -msgstr "``integer``edge_table 中引用该顶点的顶点数。" +msgstr "``integer`` edge_table 中引用该顶点的顶点数。" msgid "chk" msgstr "chk" msgid "``integer`` Indicator that the vertex might have a problem." -msgstr "``integer``指示顶点可能有问题。" +msgstr "``integer`` 指示顶点可能有问题。" msgid "ein" msgstr "ein" @@ -8902,7 +8902,7 @@ msgid "" "``integer`` Number of vertices in the edge_table that reference this vertex " "as incoming. See :doc:`pgr_analyzeOneWay `." msgstr "" -"``integer``edge_table 中引用该顶点作为传入的顶点数。 请参阅 :doc:" +"``integer`` edge_table 中引用该顶点作为传入的顶点数。 请参阅 :doc:" "`pgr_analyzeOneWay `。" msgid "eout" @@ -8912,11 +8912,11 @@ msgid "" "``integer`` Number of vertices in the edge_table that reference this vertex " "as outgoing. See :doc:`pgr_analyzeOneWay `." msgstr "" -"``integer``Edge_table 中引用该顶点作为传出的顶点数。 请参阅 :doc:" +"``integer`` Edge_table 中引用该顶点作为传出的顶点数。 请参阅 :doc:" "`pgr_analyzeOneWay `。" msgid "``geometry`` Point geometry of the vertex." -msgstr "``geometry``顶点的点几何。" +msgstr "``geometry`` 顶点的点几何。" msgid "Usage when the edge table's columns MATCH the default values:" msgstr "当边表的列与默认值匹配时的用法：" @@ -8966,12 +8966,12 @@ msgstr "根据 id 选择行。 显示网络部分的分析。" msgid "" "Selecting the rows where the geometry is near the geometry of row with " "``id`` = 5" -msgstr "选择几何形状接近``id``= 5 的几何形状的行" +msgstr "选择几何形状接近 ``id`` = 5 的几何形状的行" msgid "" "Selecting the rows where the geometry is near the geometry of the row with " "``gid`` =100 of the table ``othertable``." -msgstr "选择几何形状接近表``othertable`` 的``gid`` = 100 的行的几何形状的行。" +msgstr "选择几何形状接近表 ``othertable`` 的``gid`` = 100 的行的几何形状的行。" msgid "Usage when the edge table's columns DO NOT MATCH the default values:" msgstr "当边表的列与默认值不匹配时的用法：" @@ -9007,13 +9007,13 @@ msgstr "根据 id 选择行。" msgid "" "Selecting the rows WHERE the geometry is near the geometry of row with " "``id`` =5 ." -msgstr "选择那些几何与具有``id`` = 5的行的几何接近的行。" +msgstr "选择那些几何与具有 ``id`` = 5的行的几何接近的行。" msgid "" "Selecting the rows WHERE the geometry is near the place='myhouse' of the " "table ``othertable``. (note the use of quote_literal)" msgstr "" -"选择几何图形靠近表``othertable``的 place='myhouse' 的行。 （注意 " +"选择几何图形靠近表 ``othertable`` 的 place='myhouse' 的行。 （注意 " "quote_literal 的使用）" msgid "The examples use the :doc:`sampledata` network." @@ -9167,25 +9167,25 @@ msgid "" "``integer`` Number of vertices in the edge_table that reference this vertex. " "See :doc:`pgr_analyzeGgraph `." msgstr "" -"``integer``edge_table 中引用该顶点的顶点数。 请参阅 :doc:`pgr_analyzeGgraph " +"``integer`` edge_table 中引用该顶点的顶点数。 请参阅 :doc:`pgr_analyzeGgraph " "`。" msgid "" "``integer`` Indicator that the vertex might have a problem. See :doc:" "`pgr_analyzeGraph `." msgstr "" -"``integer``指示顶点可能有问题。 请参阅 :doc:`pgr_analyzeGraph " +"``integer`` 指示顶点可能有问题。 请参阅 :doc:`pgr_analyzeGraph " "`。" msgid "" "``integer`` Number of vertices in the edge_table that reference this vertex " "as incoming." -msgstr "``integer``edge_table 中引用该顶点作为传入的顶点数。" +msgstr "``integer`` edge_table 中引用该顶点作为传入的顶点数。" msgid "" "``integer`` Number of vertices in the edge_table that reference this vertex " "as outgoing." -msgstr "``integer``Edge_table 中引用该顶点作为传出的顶点数。" +msgstr "``integer`` Edge_table 中引用该顶点作为传出的顶点数。" msgid ":doc:`pgr_analyzeGraph`" msgstr ":doc:`pgr_analyzeGraph`" @@ -9220,7 +9220,7 @@ msgid "Works for **undirected** graphs." msgstr "适用于 **无向** 图。" msgid "``node`` ascending" -msgstr "``node``升序" +msgstr "``node`` 升序" msgid "Running time: :math:`O(V + E)`" msgstr "运行时间：:math:`O(V + E)`" @@ -9259,13 +9259,13 @@ msgstr "``pgr_bdAstar`` — 使用双向 A* 算法的最短路径。" msgid "" "``pgr_bdAstar`` (`One to One`_) added ``start_vid`` and ``end_vid`` columns." -msgstr "``pgr_bdAstar`` (`一对一`_) 增加``start_vid`` 和 ``end_vid``列。" +msgstr "``pgr_bdAstar`` (`一对一`_) 增加``start_vid`` 和 ``end_vid`` 列。" msgid "``pgr_bdAstar`` (`One to Many`_) added ``end_vid`` column." msgstr "``pgr_bdAstar`` (`一对多`_) 增加``end_vid`` 列。" msgid "``pgr_bdAstar`` (`Many to One`_) added ``start_vid`` column." -msgstr "``pgr_bdAstar`` (`多对一`_) 增加``start_vid``列。" +msgstr "``pgr_bdAstar`` (`多对一`_) 增加``start_vid`` 列。" msgid "``pgr_bdAstar`` (`Combinations`_)" msgstr "``pgr_bdAstar`` (`组合`_)" @@ -9280,7 +9280,7 @@ msgid "``pgr_bdAstar`` (`Many to Many`_)" msgstr "``pgr_bdAstar`` (`多对多`_)" msgid "Signature change on ``pgr_bdAstar`` (`One to One`_)" -msgstr "在``pgr_bdAstar`` (`一对一`_)上的签名更改" +msgstr "在 ``pgr_bdAstar`` (`一对一`_)上的签名更改" msgid "**Official** ``pgr_bdAstar`` (`One to One`_)" msgstr "**官方** ``pgr_bdAstar`` (`一对一`_)" @@ -9321,7 +9321,7 @@ msgstr "``pgr_bdAstarCost`` (`组合`_)" msgid "" "The ``pgr_bdAstarCost`` function sumarizes of the cost of the shortest path " "using the bidirectional A* algorithm." -msgstr "``pgr_bdAstarCost``函数使用双向 A* 算法汇总最短路径的成本。" +msgstr "``pgr_bdAstarCost`` 函数使用双向 A* 算法汇总最短路径的成本。" msgid "" "pgr_bdAstarCost(`Edges SQL`_, **start vid**, **end vid**, [**options**])" @@ -9496,8 +9496,8 @@ msgstr "" "pgr_bdDijkstraCost(`Edges SQL`_, **start vids**, **end vids**, " "[``directed``])" -msgid "pgr_bdDijkstraCost(`Edges SQL`_, `Combinations SQL`_, [ ``directed``])" -msgstr "pgr_bdDijkstraCost(`Edges SQL`_, `Combinations SQL`_, [ ``directed``])" +msgid "pgr_bdDijkstraCost(`Edges SQL`_, `Combinations SQL`_, [``directed``])" +msgstr "pgr_bdDijkstraCost(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgid "pgr_bdDijkstraCost(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgstr "pgr_bdDijkstraCost(`Edges SQL`_, `Combinations SQL`_, [``directed``])" @@ -9565,7 +9565,7 @@ msgid "" msgstr "" "Bellman-Ford算法以Richard Bellman和Lester Ford的名字命名，他们分别于1958年和" "1956年首次发表了这个算法。它是一种图搜索算法，用于计算从起始顶点" -"（``start_vid``）到终点顶点（``end_vid``）的最短路径，其中一些边的权重可以为" +"（ ``start_vid``）到终点顶点（``end_vid`` ）的最短路径，其中一些边的权重可以为" "负数。尽管它更加通用，但比Dijkstra算法更慢。这个实现可以用于有向图和无向图。" msgid "" @@ -9681,7 +9681,7 @@ msgid "This implementation work for both directed and undirected graphs." msgstr "该实现适用于 **有向** 图和 **无向** 图。" #, fuzzy -msgid "Running time: :math:`\\Theta(VE)`" +msgid "Running time: :math:`\\Theta(VE)`" msgstr "运行时间：:math:`O(V + E)`" #, fuzzy @@ -9698,7 +9698,7 @@ msgstr "pgr_lineGraph(`Edges SQL`_, [``directed``])" #, fuzzy msgid "Returns set of ``(vid, centrality)``" -msgstr "返回集合``(edge, cost)``" +msgstr "返回集合 ``(edge, cost)``" #, fuzzy msgid "For a directed graph with edges :math:`\\{1, 2, 3, 4\\}`." @@ -9761,7 +9761,7 @@ msgid "Result columns change:" msgstr "结果列发生变化：" msgid "``n_seq`` is removed" -msgstr "``n_seq``被删除" +msgstr "``n_seq`` 被删除" msgid "``seq`` changed type to ``BIGINT``" msgstr "``seq`` 将类型更改为``BIGINT``" @@ -9785,7 +9785,7 @@ msgid "``component`` ascending." msgstr "``component`` 升序。" msgid "``edge`` ascending." -msgstr "``edge``升序。" +msgstr "``edge`` 升序。" msgid "pgr_biconnectedComponents(`Edges SQL`_)" msgstr "pgr_biconnectedComponents(`Edges SQL`_)" @@ -9806,7 +9806,7 @@ msgid "Has the value of the minimum edge identifier in the component." msgstr "具有组件中最小边标识符的值。" msgid "Identifier of the edge that belongs to the ``component``." -msgstr "属于该``分量``的边的标识符。" +msgstr "属于该 ``分量`` 的边的标识符。" msgid "" "Boost: `Biconnected components _vertices_pgr." msgstr "创建一个顶点表：_vertices_pgr。" msgid "Fills ``id`` and ``the_geom`` columns of the vertices table." -msgstr "填充顶点表的``id`` 和 ``the_geom`` 列。" +msgstr "填充顶点表的 ``id`` 和 ``the_geom`` 列。" msgid "" -"Fills the source and target columns of the edge table referencing the ``id`` " +"Fills the source and target columns of the edge table referencing the ``id``" "of the vertices table." -msgstr "引用顶点表的``id``填充边表的 source列和target列。" +msgstr "引用顶点表的 ``id`` 填充边表的 source列和target列。" msgid "``FAIL`` when the network topology was not built due to an error:" -msgstr "``FAIL``当由于错误原因未能构建网络拓扑时：" +msgstr "``FAIL`` 当由于错误原因未能构建网络拓扑时：" msgid "" "The vertices table is a requirement of the :doc:`pgr_analyzeGraph` and the :" @@ -10571,25 +10571,25 @@ msgid "" "``integer`` Number of vertices in the edge_table that reference this vertex. " "See :doc:`pgr_analyzeGraph`." msgstr "" -"``integer``edge_table 中引用该顶点的顶点数。 参见:doc:`pgr_analyzeGraph`。" +"``integer`` edge_table 中引用该顶点的顶点数。 参见:doc:`pgr_analyzeGraph`。" msgid "" "``integer`` Indicator that the vertex might have a problem. See :doc:" "`pgr_analyzeGraph`." -msgstr "``integer``指示顶点可能有问题。 请参阅 :doc:`pgr_analyzeGraph`。" +msgstr "``integer`` 指示顶点可能有问题。 请参阅 :doc:`pgr_analyzeGraph`。" msgid "" "``integer`` Number of vertices in the edge_table that reference this vertex " "AS incoming. See :doc:`pgr_analyzeOneWay`." msgstr "" -"``integer``边表中引用此顶点作为入边的顶点数量。请参考 :doc:" +"``integer`` 边表中引用此顶点作为入边的顶点数量。请参考 :doc:" "`pgr_analyzeOneWay`。" msgid "" "``integer`` Number of vertices in the edge_table that reference this vertex " "AS outgoing. See :doc:`pgr_analyzeOneWay`." msgstr "" -"``integer``边表中引用此顶点作为出边的顶点数量。请参考 :doc:" +"``integer`` 边表中引用此顶点作为出边的顶点数量。请参考 :doc:" "`pgr_analyzeOneWay`。" msgid "The simplest way to use pgr_createTopology is:" @@ -10607,8 +10607,8 @@ msgid "" "passed to the function as the geometry column, and the geometry column " "``the_geom`` is passed to the function as the id column." msgstr "" -"当参数未按适当顺序给出时会导致错误：在此示例中，表 ``ege_table`` 的列``id`` " -"被错误地传递给函数作为几何列，而几何列 ``the_geom``被错误地传递给函数作为 id " +"当参数未按适当顺序给出时会导致错误：在此示例中，表 ``ege_table`` 的列``id``" +"被错误地传递给函数作为几何列，而几何列 ``the_geom`` 被错误地传递给函数作为 id " "列。" msgid "" @@ -10636,7 +10636,7 @@ msgid "" "passed to the function AS the geometry column, and the geometry column " "``mygeom`` is passed to the function AS the id column." msgstr "" -"当参数未按适当的顺序给出时，会导致错误。在这个示例中，表``mytable``的列 " +"当参数未按适当的顺序给出时，会导致错误。在这个示例中，表 ``mytable`` 的列 " "``gid`` 被错误地传递给函数作为几何列，而几何列``mygeom`` 被错误地传递给函数作" "为 id 列。" @@ -10689,10 +10689,10 @@ msgid "Create the routing topology on the edge table" msgstr "在边表上创建路由拓扑" msgid "Updating the ``source`` information" -msgstr "更新``source``信息" +msgstr "更新 ``source`` 信息" msgid "Updating the ``target`` information" -msgstr "更新``target``信息" +msgstr "更新 ``target`` 信息" msgid "Inspect the routing topology" msgstr "检查路由拓扑" @@ -10720,10 +10720,10 @@ msgid "" msgstr "``pgr_createVerticesTable`` — 根据 source和target信息重建顶点表。" msgid "``OK`` after the vertices table has been reconstructed." -msgstr "``OK``重建顶点表后。" +msgstr "``OK`` 重建顶点表后。" msgid "``FAIL`` when the vertices table was not reconstructed due to an error." -msgstr "``FAIL``当由于错误而未重建顶点表时。" +msgstr "``FAIL`` 当由于错误而未重建顶点表时。" msgid "" "pgr_createVerticesTable(edge_table, [``the_geom, source, target, " @@ -10746,8 +10746,8 @@ msgid "" "Fills ``id`` and ``the_geom`` columns of the vertices table based on the " "source and target columns of the edge table." msgstr "" -"根据边表的源点（source）和目标点（target）列，填充顶点表的``id``和" -"``the_geom``列。" +"根据边表的源点（source）和目标点（target）列，填充顶点表的 ``id`` 和" +"``the_geom`` 列。" msgid "The names of source, target are the same." msgstr "source, target的名称相同。" @@ -10756,14 +10756,14 @@ msgid "" "``integer`` Number of vertices in the edge_table that reference this vertex " "as incoming. See :doc:`pgr_analyzeOneWay`." msgstr "" -"``integer``edge_table 中引用该顶点作为传入的顶点数。 请参阅 :doc:" +"``integer`` edge_table 中引用该顶点作为传入的顶点数。 请参阅 :doc:" "`pgr_analyzeOneWay`。" msgid "" "``integer`` Number of vertices in the edge_table that reference this vertex " "as outgoing. See :doc:`pgr_analyzeOneWay`." msgstr "" -"``integer``Edge_table 中引用该顶点作为传出的顶点数。 请参阅 :doc:" +"``integer`` Edge_table 中引用该顶点作为传出的顶点数。 请参阅 :doc:" "`pgr_analyzeOneWay`。" msgid "The simplest way to use pgr_createVerticesTable" @@ -10775,8 +10775,8 @@ msgid "" "``mytable`` is passed to the function as the geometry column, and the " "geometry column ``the_geom`` is passed to the function as the source column." msgstr "" -"当参数没有按照适当的顺序提供时，将会发生错误：在这个例子中，表``mytable``的源" -"列``source``被错误地传递给函数作为几何列，而几何列``the_geom``被错误地传递给" +"当参数没有按照适当的顺序提供时，将会发生错误：在这个例子中，表 ``mytable`` 的源" +"列 ``source``被错误地传递给函数作为几何列，而几何列``the_geom`` 被错误地传递给" "函数作为源列。" msgid "Example 4" @@ -10797,7 +10797,7 @@ msgstr "示例 7" msgid "" "Selecting the rows where the geometry is near the geometry of row with " "``id`` =5 ." -msgstr "选择几何与具有``id``=5的行的几何接近的行。" +msgstr "选择几何与具有 ``id`` =5的行的几何接近的行。" msgid "Example 8" msgstr "示例 8" @@ -10815,7 +10815,7 @@ msgid "" "``mygeom`` is passed to the function as the source column." msgstr "" "当参数没有按照适当的顺序提供时，会发生错误。在这个例子中，表 ``mytable`` 的" -"``src``列被错误地传递给函数作为几何列，而几何列``mygeom``被错误地传递给函数作" +"``src``列被错误地传递给函数作为几何列，而几何列``mygeom`` 被错误地传递给函数作" "为源列。" msgid "Example 10" @@ -10842,7 +10842,7 @@ msgstr "示例 14" msgid "" "Selecting the rows where the geometry is near the geometry of row with " "``gid`` = 5." -msgstr "选择几何与具有``gid``=5的行的几何接近的行。" +msgstr "选择几何与具有 ``gid`` =5的行的几何接近的行。" msgid "Example 15" msgstr "示例 15" @@ -10972,7 +10972,7 @@ msgid "" "ending vertex (``end_vid``)." msgstr "" "有向无环图（DAG）的最短路径是一种图搜索算法，用于解决加权有向无环图的最短路径" -"问题，找到从起始顶点（``start_vid``）到结束顶点（``end_vid``）的最短路径。" +"问题，找到从起始顶点（ ``start_vid``）到结束顶点（``end_vid`` ）的最短路径。" msgid "" "This implementation can only be used with a **directed** graph with no " @@ -11093,10 +11093,10 @@ msgstr "``BIGINT[]``" msgid "" "Array of identifiers of the edges that have the vertex ``id`` as *first end " "point*." -msgstr "以顶点``id``作为*第一个端点*的边的标识符数组。" +msgstr "以顶点 ``id`` 作为*第一个端点*的边的标识符数组。" msgid "When missing, ``out_edges`` must exist." -msgstr "当缺失时，``out_edges``必须存在。" +msgstr "当缺失时， ``out_edges`` 必须存在。" msgid "``out_edges``" msgstr "``out_edges``" @@ -11104,10 +11104,10 @@ msgstr "``out_edges``" msgid "" "Array of identifiers of the edges that have the vertex ``id`` as *second end " "point*." -msgstr "以顶点``id``作为*第二个端点*的边的标识符数组。" +msgstr "以顶点 ``id`` 作为*第二个端点*的边的标识符数组。" msgid "When missing, ``in_edges`` must exist." -msgstr "缺失时，``in_edges`` 必须存在。" +msgstr "缺失时， ``in_edges`` 必须存在。" msgid "Vertex identifier" msgstr "顶点标识符" @@ -11142,7 +11142,7 @@ msgid "" "want the degree of the whole graph rather than a subset, you can forgo using " "pgr_degree and work with the ``in_edges`` and ``out_edges`` columns directly." msgstr "" -"如果您已经使用 ``pgr_extractVertices``构建了一个顶点表，并且想要整个图的度而" +"如果您已经使用 ``pgr_extractVertices`` 构建了一个顶点表，并且想要整个图的度而" "不是子集，则可以放弃使用 pgr_ Degree 并直接使用 ``in_edges`` 和 ``out_edges``" "列。" @@ -11224,7 +11224,7 @@ msgid "**options:** ``[directed, max_depth]``" msgstr "**options:** ``[directed, max_depth]``" msgid "Same as `Single vertex`_ but with edges in descending order of ``id``." -msgstr "与 `单顶点`_相同，但边按``id``降序排列。" +msgstr "与 `单顶点`_相同，但边按 ``id`` 降序排列。" msgid "" "`Boost: Depth First Search algorithm documentation true``" -msgstr "默认：``partial => true``" +msgstr "默认： ``partial => true``" msgid "With less calculations as possible." msgstr "尽可能减少计算。" @@ -12558,7 +12558,7 @@ msgid "Returns" msgstr "返回" msgid "values on ``edge_id``, ``fraction``, ``side`` columns." -msgstr "``edge_id``, ``fraction``, ``side``列的值。" +msgstr "``edge_id``, ``fraction``, ``side`` 列的值。" msgid "``NULL`` on ``distance``, ``geom``, ``edge`` columns." msgstr "``distance``, ``geom``, ``edge``列上为``NULL``。" @@ -12614,10 +12614,10 @@ msgstr "``partial``" msgid "" "When ``true`` only columns needed for :doc:`withPoints-category` are " "calculated." -msgstr "当为 ``true``时，只计算 :doc:`withPoints-category` 需要的列。" +msgstr "当为 ``true`` 时，只计算 :doc:`withPoints-category` 需要的列。" msgid "When ``false`` all columns are calculated" -msgstr "当为``false``时，所有的列都计算" +msgstr "当为 ``false`` 时，所有的列都计算" msgid "When ``false`` calculations are performed." msgstr "当为 ``false`` 时，执行计算。" @@ -12626,11 +12626,11 @@ msgid "" "When ``true`` calculations are not performed and the query to do the " "calculations is exposed in a PostgreSQL ``NOTICE``." msgstr "" -"当为``true`` 时，不执行计算，并在 PostgreSQL 的 ``NOTICE``中显示执行计算的查" +"当为 ``true`` 时，不执行计算，并在 PostgreSQL 的 ``NOTICE`` 中显示执行计算的查" "询。" msgid "The ``LINESTRING`` geometry of the edge." -msgstr "边的 ``LINESTRING``几何。" +msgstr "边的 ``LINESTRING`` 几何。" msgid "When :math:`cap = 1`, it is the closest edge." msgstr "当 :math:`cap = 1` 时，它是最近的边。" @@ -12641,7 +12641,7 @@ msgid "" msgstr "在 <0,1> 范围内的值，表示相对于边的第一个端点的相对位置。" msgid "Value in ``[r, l]`` indicating if the point is:" -msgstr "``[r, l]``中的值指示该点是否为：" +msgstr "``[r, l]`` 中的值指示该点是否为：" msgid "In the right ``r``." msgstr "在右边的 ``r``。" @@ -12659,10 +12659,10 @@ msgid "Distance from point to edge." msgstr "点到边缘的距离。" msgid "``NULL`` when ``cap = 1`` on the `One point`_ signature" -msgstr "``NULL``当在 `一个点`_签名，``cap = 1``时" +msgstr "``NULL``当在 `一个点`_签名，``cap = 1`` 时" msgid "``POINT`` geometry" -msgstr "``POINT``几何" +msgstr "``POINT`` 几何" msgid "" "`One Point`_: Contains the point on the edge that is ``fraction`` away from " @@ -12686,7 +12686,7 @@ msgstr "绿色节点是 **原始点**" msgid "" "The geometry ``geom`` is a point on the :math:`sp \\rightarrow ep` edge." -msgstr "几何``geom`` 是 :math:`sp \\rightarrow ep` 边上的一个点。" +msgstr "几何 ``geom`` 是 :math:`sp \\rightarrow ep` 边上的一个点。" msgid "" "The geometry ``edge`` is a line that connects the **original point** with " @@ -12728,7 +12728,7 @@ msgid "Understanding the result" msgstr "了解结果" msgid "``NULL`` on ``geom``, ``edge``" -msgstr "``NULL`` 在 ``geom``, ``edge``上" +msgstr "``NULL`` 在 ``geom``, ``edge`` 上" msgid "``edge_id`` identifier of the edge close to the **original point**" msgstr "``edge_id`` 靠近 **原始点** 的边的标识符" @@ -12742,41 +12742,41 @@ msgid "For edge :math:`5`:" msgstr "对于边 :math:`5`:" msgid "" -"``fraction``: The closest point from the **original point** is at the :math:" +"``fraction`` : The closest point from the **original point** is at the :math:" "`0.8` fraction of the edge :math:`5`." msgstr "" -"``fraction``：离 **原始点** 最近的点位于边 :math:`5` 处的 :math:`0.8` 分数位" +"``fraction`` ：离 **原始点** 最近的点位于边 :math:`5` 处的 :math:`0.8` 分数位" "置。" msgid "" -"``side``: The **original point** is located to the left side of edge :math:" +"``side`` : The **original point** is located to the left side of edge :math:" "`5`." -msgstr "``side``： **原始点** 位于边 :math:`5` 的左侧。" +msgstr "``side`` ： **原始点** 位于边 :math:`5` 的左侧。" msgid "" -"``distance``: The **original point** is located :math:`0.1` length units " +"``distance`` : The **original point** is located :math:`0.1` length units " "from edge :math:`5`." -msgstr "``distance``： **原始点** 位于边 :math:`5` 的 :math:`0.1` 长度单位处。" +msgstr "``distance`` ： **原始点** 位于边 :math:`5` 的 :math:`0.1` 长度单位处。" msgid "For edge :math:`8`:" msgstr "对于边 :math:`8`：" msgid "" -"``fraction``: The closest point from the **original point** is at the :math:" +"``fraction`` : The closest point from the **original point** is at the :math:" "`0.89..` fraction of the edge :math:`8`." msgstr "" -"``fraction``：离 **原始点** 最近的点位于边 :math:`8` 的 :math:`0.89..` 分数位" +"``fraction`` ：离 **原始点** 最近的点位于边 :math:`8` 的 :math:`0.89..` 分数位" "置。" msgid "" -"``side``: The **original point** is located to the right side of edge :math:" +"``side`` : The **original point** is located to the right side of edge :math:" "`8`." -msgstr "``side``： **原始点** 位于边 :math:`8` 的右侧。" +msgstr "``side`` ： **原始点** 位于边 :math:`8` 的右侧。" msgid "" -"``distance``: The **original point** is located :math:`0.19..` length units " +"``distance`` : The **original point** is located :math:`0.19..` length units " "from edge :math:`8`." -msgstr "``distance``： **原始点** 距离边 :math:`8` 有 :math:`0.19..` 长度单位。" +msgstr "``distance`` ： **原始点** 距离边 :math:`8` 有 :math:`0.19..` 长度单位。" msgid "One answer, all columns" msgstr "一个答案，所有列" @@ -12799,9 +12799,9 @@ msgstr "" "的一条。" msgid "" -"``geom``: Contains the geometry of the closest point on edge :math:`5` from " +"``geom`` : Contains the geometry of the closest point on edge :math:`5` from " "the **original point**." -msgstr "``geom``:包含了从 **原始点** 到边 :math:`5` 上最近点的几何形状。" +msgstr "``geom`` :包含了从 **原始点** 到边 :math:`5` 上最近点的几何形状。" msgid "" "``edge``: Contains the ``LINESTRING`` geometry of the **original point** to " @@ -12817,9 +12817,9 @@ msgid "Understanding the result:" msgstr "了解结果：" msgid "" -"``geom``: Contains the geometry of the closest point on edge :math:`8` from " +"``geom`` : Contains the geometry of the closest point on edge :math:`8` from " "the **original point**." -msgstr "``geom``：包含了从 **原始点** 到边 :math:`8` 上最近点的几何形状。" +msgstr "``geom`` ：包含了从 **原始点** 到边 :math:`8` 上最近点的几何形状。" msgid "" "``edge``: Contains the ``LINESTRING`` geometry of the **original point** to " @@ -12871,7 +12871,7 @@ msgstr "``edge``为``NULL``" msgid "" "``edge_id`` identifier of the edge close to a **original point** (``geom``)" -msgstr "``edge_id``是与一个 **原始点** （``geom``）靠近的边的标识符" +msgstr "``edge_id``是与一个 **原始点** （``geom`` ）靠近的边的标识符" msgid "" "Two edges at most withing :math:`0.5` distance units from each of the " @@ -12892,7 +12892,7 @@ msgid "" "Edge :math:`5` is before :math:`8` therefore edge :math:`5` has the shortest " "distance to ``POINT(2.9 1.8)``." msgstr "" -"边 :math:`5` 在:math:`8` 之前，因此边 :math:`5` 到``POINT(2.9 1.8)``的距离最" +"边 :math:`5` 在:math:`8` 之前，因此边 :math:`5` 到 ``POINT(2.9 1.8)`` 的距离最" "短。" msgid "One answer per point, all columns" @@ -12944,7 +12944,7 @@ msgstr "" msgid "" "The information needed in the points of interest is ``pid``, ``edge_id``, " "``side``, ``fraction``." -msgstr "兴趣点所需的信息包括``pid``, ``edge_id``, ``side``, ``fraction``。" +msgstr "兴趣点所需的信息包括 ``pid``, ``edge_id``, ``side``, ``fraction``。" msgid "" "On this documentation there will be some 6 fixed points of interest and they " @@ -13150,7 +13150,7 @@ msgid "Circuits present in the pgRouting :doc:`sampledata`" msgstr "pgRouting :doc:`sampledata` 中存在的电路" msgid "Id of the circuit starting from ``1``" -msgstr "电路id从``1``开始" +msgstr "电路id从 ``1`` 开始" msgid "Relative postion in the path. Has value ``0`` for beginning of the path" msgstr "路径中的相对位置。 路径开头的值为 ``0``" @@ -13427,7 +13427,7 @@ msgid "**root vertex**" msgstr "**root vertex**" msgid "Returns set of ``(seq, vertex_id, idom)``" -msgstr "返回集合``(seq, vertex_id, idom)``" +msgstr "返回集合 ``(seq, vertex_id, idom)``" msgid "Identifier of vertex ." msgstr "顶点的标识符。" @@ -13483,7 +13483,7 @@ msgstr "" msgid "" "The ``cost`` and ``reverse_cost`` columns of the result represent existence " "of the edge." -msgstr "使用 ``cost``和 ``reverse_cost``列来表示边的存在。" +msgstr "使用 ``cost``和 ``reverse_cost`` 列来表示边的存在。" #, fuzzy msgid "When the graph is directed the result is directed." @@ -13631,7 +13631,7 @@ msgstr "" #, fuzzy msgid "" "The ``cost`` and ``reverse_cost`` values represent the existence of the edge." -msgstr "使用 ``cost``和 ``reverse_cost``列来表示边的存在。" +msgstr "使用 ``cost``和 ``reverse_cost`` 列来表示边的存在。" #, fuzzy msgid "When positive: the edge exists." @@ -13646,13 +13646,13 @@ msgstr "" #, fuzzy msgid "Single head arrows represent one edge (row) on the edges table." -msgstr "红色箭头对应边表中``cost`` > 0的情况。" +msgstr "红色箭头对应边表中 ``cost`` > 0的情况。" msgid "There are no double head arrows" msgstr "" msgid "" -"Two pair of edges share the same ending nodes and the ``reverse_cost`` " +"Two pair of edges share the same ending nodes and the ``reverse_cost``" "column is not used." msgstr "" @@ -13822,7 +13822,7 @@ msgstr "存储边结果" msgid "" "The first step is to store the results of the ``pgr_lineGraphFull`` call " "into a table" -msgstr "第一步是将 ``pgr_lineGraphFull``调用的结果存储到表中" +msgstr "第一步是将 ``pgr_lineGraphFull`` 调用的结果存储到表中" msgid "Create the mapping table" msgstr "创建映射表" @@ -13873,10 +13873,10 @@ msgid "" msgstr "运行 :doc:`pgr_dijkstraNear` 时，成本将会增加的地方是边 8，其成本为 0" msgid "" -"The edge to be altered is ``WHERE cost = 0 AND seq != 1 AND edge != -1`` " +"The edge to be altered is ``WHERE cost = 0 AND seq != 1 AND edge != -1``" "from the previus query:" msgstr "" -"要更改的边是上一个查询中的 ``WHERE cost = 0 AND seq != 1 AND edge != -1``：" +"要更改的边是上一个查询中的 ``WHERE cost = 0 AND seq != 1 AND edge != -1`` ：" msgid "Adding a value to the restriction" msgstr "向限制添加值" @@ -14012,7 +14012,7 @@ msgid "``pgr_maxCardinalityMatch(text,boolean)``" msgstr "``pgr_maxCardinalityMatch(text,boolean)``" msgid "``directed => false`` when used." -msgstr "使用时``directed => false``。" +msgstr "使用时 ``directed => false``。" msgid "Renamed from ``pgr_maximumCardinalityMatching``" msgstr "从 ``pgr_maximumCardinalityMatching`` 重命名" @@ -14280,9 +14280,9 @@ msgid "" "``edge_table_noded``. It uses the ``tolerance`` for deciding that multiple " "nodes within the tolerance are considered the same node." msgstr "" -"该函数读取``edge_table``表，该表具有主键列 ``id`` 和名为``the_geom``的几何" -"列，并将其中的所有段与所有其他段相交，然后创建表``edge_table_noded``。 它使用" -"``tolerance``来决定容差内的多个节点被视为同一节点。" +"该函数读取 ``edge_table``表，该表具有主键列 ``id`` 和名为``the_geom`` 的几何" +"列，并将其中的所有段与所有其他段相交，然后创建表 ``edge_table_noded``。 它使用" +"``tolerance`` 来决定容差内的多个节点被视为同一节点。" msgid "``float8`` tolerance for coincident points (in projection unit)dd" msgstr "``float8`` 重合点公差（以投影单位表示）dd" @@ -14294,7 +14294,7 @@ msgid "``text`` Suffix for the new table's. Default value is ``noded``." msgstr "``text``新表的后缀。 默认值是``noded``。" msgid "The output table will have for ``edge_table_noded``" -msgstr "输出表中将包含``edge_table_noded``内容" +msgstr "输出表中将包含 ``edge_table_noded`` 内容" msgid "``bigint`` Unique identifier for the table" msgstr "``bigint`` 表的唯一标识符" @@ -14304,29 +14304,29 @@ msgstr "old_id" #, fuzzy msgid "``bigint`` Identifier of the edge in original table" -msgstr "``bigint``原表中边的标识符" +msgstr "``bigint`` 原表中边的标识符" msgid "sub_id" msgstr "sub_id" msgid "``integer`` Segment number of the original edge" -msgstr "``integer``原边的段号" +msgstr "``integer`` 原边的段号" msgid "" "``integer`` Empty source column to be used with :doc:`pgr_createTopology` " "function" -msgstr "``integer``与 :doc:`pgr_createTopology` 函数一起使用的空source列" +msgstr "``integer`` 与 :doc:`pgr_createTopology` 函数一起使用的空source列" msgid "" "``integer`` Empty target column to be used with :doc:`pgr_createTopology` " "function" -msgstr "``integer``与 :doc:`pgr_createTopology` 函数一起使用的空target列" +msgstr "``integer`` 与 :doc:`pgr_createTopology` 函数一起使用的空target列" msgid "the geom" msgstr "the geom" msgid "``geometry`` Geometry column of the noded network" -msgstr "``geometry``节点网络的几何列" +msgstr "``geometry`` 节点网络的几何列" msgid "Examples" msgstr "示例" @@ -14955,7 +14955,7 @@ msgid "min cut of the main subgraph" msgstr "主子图的最小割" msgid "Returns set of ``(seq, edge, cost, mincut)``" -msgstr "返回集合``(seq, edge, cost, mincut)``" +msgstr "返回集合 ``(seq, edge, cost, mincut)``" msgid "Edges which divides the set of vertices into two." msgstr "将顶点集一分为二的边。" @@ -15277,7 +15277,7 @@ msgstr "``pgr_trspVia`` - 拟议" msgid "" "``pgr_trspVia`` Route that goes through a list of vertices with restrictions." -msgstr "``pgr_trspVia``穿过有限制的顶点列表的路线。" +msgstr "``pgr_trspVia`` 穿过有限制的顶点列表的路线。" msgid "New proposed function:" msgstr "新提议的函数：" @@ -15335,7 +15335,7 @@ msgid "" "for the ``path_id = 5`` from ``6`` to ``3`` because the path :math:`15 " "\\rightarrow 1` is restricted." msgstr "" -"检测哪些子路径通过了限制，本例中是针对``path_id = 5``从``6``到``3`` ，因为该" +"检测哪些子路径通过了限制，本例中是针对 ``path_id = 5``从``6`` 到 ``3`` ，因为该" "路径 :math:`15 \\rightarrow 1`受到限制。" msgid "Executes the :doc:`pgr_trsp` algorithm for the conflicting paths." @@ -15348,7 +15348,7 @@ msgstr "" "从 :doc:`pgr_dijkstraVia` 提议的结果中，它删除了冲突路径，并使用 :doc:" "`pgr_trsp` 提议的算法的结果构建解决方案：" -msgid "Getting the same result as ``pgr_trspVia``:" +msgid "Getting the same result as ``pgr_trspVia`` :" msgstr "得到与 ``pgr_trspVia`` 相同的结果：" msgid "Sometimes ``U_turn_on_edge`` flag is ignored when is set to ``false``." @@ -15459,7 +15459,7 @@ msgid "``r`` for right driving side" msgstr "``r`` 代表右驾驶侧" msgid "``l`` for left driving side" -msgstr "``l``表示左驾驶侧" +msgstr "``l`` 表示左驾驶侧" msgid "Any other value will be considered as ``r``" msgstr "任何其他值将被视为 ``r``" @@ -15468,17 +15468,17 @@ msgid "``details``" msgstr "``details``" msgid "When ``true`` the results will include the points that are in the path." -msgstr "如果为 ``true``，结果将包括路径中的点。" +msgstr "如果为 ``true`` ，结果将包括路径中的点。" msgid "" "When ``false`` the results will not include the points that are in the path." -msgstr "如果为``false``，结果将不包括路径中的点。" +msgstr "如果为 ``false`` ，结果将不包括路径中的点。" msgid "" "When ``start_vid``, ``end_vid`` and ``node`` columns have negative values, " "the identifier is for a Point." msgstr "" -"当 ``start_vid``、 ``end_vid``和``node``列具有负值时，该标识符用于Point。" +"当 ``start_vid``、 ``end_vid``和``node`` 列具有负值时，该标识符用于Point。" msgid "Use ``pgr_findCloseEdges`` for points on the fly" msgstr "对动态点使用 ``pgr_findCloseEdges``" @@ -15529,7 +15529,7 @@ msgid "" "the ``path_id = 1`` from ``-6`` to ``15`` because the path :math:`9 " "\\rightarrow 16` is restricted." msgstr "" -"检测哪些路径通过了限制，在本例中是针对从 ``-6``到``15`` 的 ``path_id = 1``，" +"检测哪些路径通过了限制，在本例中是针对从 ``-6`` 到 ``15`` 的 ``path_id = 1`` ，" "因为路径:math:`9 \\rightarrow 16`受到限制。" msgid "" @@ -15543,8 +15543,8 @@ msgstr "" "从 :doc:`pgr_withPointsVia` 的结果中移除冲突的路径，并使用 :doc:`pgr_trsp` 算" "法的结果构建解决方案：" -msgid "Getting the same result as ``pgr_trspVia_withPoints``:" -msgstr "得到与 ``pgr_trspVia_withPoints``相同的结果：" +msgid "Getting the same result as ``pgr_trspVia_withPoints`` :" +msgstr "得到与 ``pgr_trspVia_withPoints`` 相同的结果：" msgid "" "The first step, doing a :doc:`pgr_withPointsVia` does consider not making a " @@ -15575,7 +15575,7 @@ msgid "pgr_trsp_withPoints - Proposed" msgstr "pgr_trsp_withPoints - 拟议" msgid "``pgr_trsp_withPoints`` Routing Vertex/Point with restrictions." -msgstr "``pgr_trsp_withPoints``有限制的路由顶点/点。" +msgstr "``pgr_trsp_withPoints`` 有限制的路由顶点/点。" msgid "New proposed signatures:" msgstr "新拟议的签名：" @@ -15726,7 +15726,7 @@ msgstr "pgr_turnRestrictedPath - 实验性" msgid "" "``pgr_turnRestrictedPath`` Using Yen's algorithm Vertex -Vertex routing with " "restrictions" -msgstr "``pgr_turnRestrictedPath``使用 Yen 算法顶点- 带限制的顶点路由" +msgstr "``pgr_turnRestrictedPath`` 使用 Yen 算法顶点- 带限制的顶点路由" msgid "New experimental function" msgstr "新实验功能" @@ -15763,7 +15763,7 @@ msgid "" msgstr "当 ``true`` 停止在发现不违反限制的第一条路径上时" msgid "When ``false`` returns at most K paths" -msgstr "当 ``false``时返回最多 K 条路径" +msgstr "当 ``false`` 时返回最多 K 条路径" msgid "When ``true`` returns only paths that do not violate restrictions" msgstr "当 ``true`` 时仅返回不违反限制的路径" @@ -15948,10 +15948,10 @@ msgid "``r`` for right driving side." msgstr "``r`` 代表右驾驶侧。" msgid "``l`` for left driving side." -msgstr "``l``代表左驾驶侧。" +msgstr "``l`` 代表左驾驶侧。" msgid "``b`` for both." -msgstr "``b``对于两者。" +msgstr "``b`` 对于两者。" msgid "Use :doc:`pgr_findCloseEdges` in the `Points SQL`_." msgstr "在 `Points SQL`_ 中使用 :doc:`pgr_findCloseEdges`。" @@ -16190,11 +16190,11 @@ msgid "" "Signature change: ``driving_side`` parameter changed from named optional to " "unnamed compulsory **driving side**." msgstr "" -"签名更改：``driving_side``参数从已命名的可选参数改为未命名的必选参数" +"签名更改： ``driving_side`` 参数从已命名的可选参数改为未命名的必选参数" "**driving side**。" msgid "``pgr_withPointsDD`` (`Single vertex`)" -msgstr "``pgr_withPointsDD``（`单顶点`）" +msgstr "``pgr_withPointsDD`` （`单顶点`）" msgid "Added ``depth``, ``pred`` and ``start_vid`` column." msgstr "添加了 ``depth``、``pred`` 和 ``start_vid`` 列。" @@ -16202,7 +16202,7 @@ msgstr "添加了 ``depth``、``pred`` 和 ``start_vid`` 列。" msgid "Added ``depth``, ``pred`` columns." msgstr "添加了 ``depth``，``pred`` 列。" -msgid "When ``details`` is ``false``:" +msgid "When ``details`` is ``false`` :" msgstr "当 ``details`` 为``false`` 时：" msgid "" @@ -16767,13 +16767,13 @@ msgstr "" msgid "" "``pgr_aStar`` (`One to One`) added ``start_vid`` and ``end_vid`` columns." -msgstr "``pgr_aStar`` （`一对一`）增加了 ``start_vid``和 ``end_vid``列。" +msgstr "``pgr_aStar`` （`一对一`）增加了 ``start_vid``和 ``end_vid`` 列。" msgid "``pgr_aStar`` (`One to Many`) added ``end_vid`` column." msgstr "``pgr_aStar``（`一对多`）添加了 ``end_vid`` 列。" msgid "``pgr_aStar`` (`Many to One`) added ``start_vid`` column." -msgstr "``pgr_aStar``（`多对一`）添加了 ``start_vid``列。" +msgstr "``pgr_aStar``（`多对一`）添加了 ``start_vid`` 列。" msgid "" "`#2523 `__ Standarize " @@ -16787,10 +16787,10 @@ msgid "" msgstr "``pgr_bdAstar``（`一对一`）增加了 ``start_vid`` 和``end_vid`` 列。" msgid "``pgr_bdAstar`` (`One to Many`) added ``end_vid`` column." -msgstr "``pgr_bdAstar``（`一对多）添加了``end_vid``列。" +msgstr "``pgr_bdAstar``（`一对多）添加了``end_vid`` 列。" msgid "``pgr_bdAstar`` (`Many to One`) added ``start_vid`` column." -msgstr "``pgr_bdAstar``（`多对一`）添加了``start_vid``列。" +msgstr "``pgr_bdAstar``（`多对一`）添加了``start_vid`` 列。" msgid "" "`#2547 `__ Standarize " @@ -16987,10 +16987,10 @@ msgstr "Dijkstra" msgid "" "``pgr_dijkstra`` (`One to One`) added ``start_vid`` and ``end_vid`` columns." -msgstr "``pgr_dijkstra``（`一对一`）增加了``start_vid`` 和``end_vid``列。" +msgstr "``pgr_dijkstra``（`一对一`）增加了``start_vid`` 和``end_vid`` 列。" msgid "``pgr_dijkstra`` (`One to Many`) added ``end_vid`` column." -msgstr "``pgr_dijkstra``（`一对多`）添加了 ``end_vid``列。" +msgstr "``pgr_dijkstra``（`一对多`）添加了 ``end_vid`` 列。" msgid "``pgr_dijkstra`` (`Many to One`) added ``start_vid`` column." msgstr "``pgr_dijkstra`` （`多对一`）添加了 ``start_vid`` 列。" @@ -17098,22 +17098,22 @@ msgid "``pgr_trsp`` (One to One)" msgstr "``pgr_trsp`` （一对一）" msgid "``pgr_trsp`` (One to Many)" -msgstr "``pgr_trsp``（一对多）" +msgstr "``pgr_trsp`` （一对多）" msgid "``pgr_trsp`` (Many to One)" -msgstr "``pgr_trsp``（多对一）" +msgstr "``pgr_trsp`` （多对一）" msgid "``pgr_trsp`` (Many to Many)" -msgstr "``pgr_trsp``（多对多）" +msgstr "``pgr_trsp`` （多对多）" msgid "``pgr_trsp`` (Combinations)" -msgstr "``pgr_trsp``（组合）" +msgstr "``pgr_trsp`` （组合）" msgid "``pgr_trsp_withPoints``" msgstr "``pgr_trsp_withPoints``" msgid "``pgr_trsp_withPoints`` (One to One)" -msgstr "``pgr_trsp_withPoints``（一对一）" +msgstr "``pgr_trsp_withPoints`` （一对一）" msgid "``pgr_trsp_withPoints`` (One to Many)" msgstr "``pgr_trsp_withPoints`` （一对多）" @@ -17122,7 +17122,7 @@ msgid "``pgr_trsp_withPoints`` (Many to One)" msgstr "pgr_trsp_withPoints``（多对一）" msgid "``pgr_trsp_withPoints`` (Many to Many)" -msgstr "``pgr_trsp_withPoints``（多对多）" +msgstr "``pgr_trsp_withPoints`` （多对多）" msgid "``pgr_trsp_withPoints`` (Combinations)" msgstr "``pgr_trsp_withPoints`` （组合）" @@ -17134,10 +17134,10 @@ msgid "``pgr_degree``" msgstr "``pgr_degree``" msgid "``pgr_findCloseEdges`` (One point)" -msgstr "``pgr_findCloseEdges``（单点）" +msgstr "``pgr_findCloseEdges`` （单点）" msgid "``pgr_findCloseEdges`` (Many points)" -msgstr "``pgr_findCloseEdges``（多点）" +msgstr "``pgr_findCloseEdges`` （多点）" msgid "Ordering" msgstr "排序" @@ -17152,7 +17152,7 @@ msgid "``pgr_maxCardinalityMatch(text)``" msgstr "``pgr_maxCardinalityMatch(text)``" msgid "Deprecating ``pgr_maxCardinalityMatch(text,boolean)``" -msgstr "弃用``pgr_maxCardinalityMatch(text,boolean)``" +msgstr "弃用 ``pgr_maxCardinalityMatch(text,boolean)``" msgid "Deprecated Functions" msgstr "已废弃的函数" @@ -19385,7 +19385,7 @@ msgid "" "which corresponds to the segment on the oposite direction of the geometry." msgstr "" "pgRouting文档的数据库设计将同一行中的两段保留在一个方向上，其中一个是与几何形" -"状相同方向的，另一个是与几何形状相反方向的。因此，一些信息具有 ``reverse_`` " +"状相同方向的，另一个是与几何形状相反方向的。因此，一些信息具有 ``reverse_``" "前缀，对应于几何形状相反方向的段。" msgid "Identifier of the starting vertex of the geometry ``geom``." @@ -19480,7 +19480,7 @@ msgstr "" msgid "" "In this case the because the ``CREATE`` statement was not used, the " "definition of an index on the table is needed." -msgstr "在本例中，由于未使用``CREATE``语句，因此需要在表上定义索引。" +msgstr "在本例中，由于未使用 ``CREATE`` 语句，因此需要在表上定义索引。" msgid "The structure of the table is:" msgstr "表的结构如下：" @@ -19503,7 +19503,7 @@ msgid "" "This queries based on the vertices data create a topology by filling the " "``source`` and ``target`` columns in the edges table." msgstr "" -"此查询基于顶点数据，通过填充边表中的``source``列和``target``列来创建拓扑。" +"此查询基于顶点数据，通过填充边表中的 ``source``列和``target`` 列来创建拓扑。" msgid "Topology data" msgstr "拓扑数据" @@ -19518,7 +19518,7 @@ msgid "" "Many functions can be used with a combinations of ``(source, target)`` pairs " "when wanting a route from ``source`` to ``target``." msgstr "" -"当需要从 ``source`` 到 ``target`` 的路由时，许多函数都可以与 ``(source, " +"当需要从 ``source`` 到 ``target`` 的路由时，许多函数都可以与 `` (source, " "target)`` 对组合使用。" msgid "" @@ -19536,10 +19536,10 @@ msgid "Some functions accept soft restrictions about the segments." msgstr "一些函数接受关于段的软约束。" msgid "Red arrows correspond when ``cost`` > 0 in the edge table." -msgstr "红色箭头对应边表中``cost`` > 0的情况。" +msgstr "红色箭头对应边表中 ``cost`` > 0的情况。" msgid "Blue arrows correspond when ``reverse_cost`` > 0 in the edge table." -msgstr "蓝色箭头对应边表中的``reverse_cost`` > 0 的情况。" +msgstr "蓝色箭头对应边表中的 ``reverse_cost`` > 0 的情况。" msgid "Points are outside the graph." msgstr "点位于图之外。" @@ -19949,15 +19949,15 @@ msgid "The graph is **directed**" msgstr "图是 **有向** 的" msgid "Red arrows show the ``(source, target)`` of the edge on the edge table" -msgstr "红色箭头显示边表上的边``(source, target)``" +msgstr "红色箭头显示边表上的边 ``(source, target)``" msgid "Blue arrows show the ``(target, source)`` of the edge on the edge table" -msgstr "蓝色箭头显示边表上的边``(target, source)``" +msgstr "蓝色箭头显示边表上的边 ``(target, source)``" msgid "" "Each point location shows where it is located with relation of the edge " "``(source, target)``" -msgstr "每个点位置显示它与边 ``(source, target)``的关系" +msgstr "每个点位置显示它与边 ``(source, target)`` 的关系" msgid "On the right for points **2** and **4**." msgstr "在右侧为第 **2** 点和第 **4** 点。" @@ -20027,13 +20027,13 @@ msgid "On the :doc:`TRSP-family` this option is not valid" msgstr "在 :doc:`TRSP-family` 上，此选项无效" msgid "Point **1** located on edge ``(5, 6)`` and ``(6, 5)``" -msgstr "点 **1** 位于边``(5, 6)``和 ``(6, 5)``" +msgstr "点 **1** 位于边 ``(5, 6)``和 ``(6, 5)``" msgid "Point **2** located on edge ``(17, 16)``and ``16, 17``" -msgstr "点 **2** 位于边``(17, 16)``和 ``16, 17``" +msgstr "点 **2** 位于边 ``(17, 16)``和 ``16, 17``" msgid "Point **4** located on edge ``(3, 1)`` and ``(1, 3)``" -msgstr "点 **4** 位于边``(3, 1)``和``(1, 3)``" +msgstr "点 **4** 位于边 ``(3, 1)``和``(1, 3)``" msgid "Creating temporary vertices" msgstr "创建临时顶点" @@ -20059,10 +20059,10 @@ msgid "Arrival to point ``-2`` can be achived only via vertex **16**." msgstr "只能通过顶点 **16** 才能到达点 ``-2``。" msgid "Does not affects edge ``(17, 16)``, therefore the edge is kept." -msgstr "不影响边``(17, 16)``，因此边被保留。" +msgstr "不影响边 ``(17, 16)`` ，因此边被保留。" msgid "It only affects the edge ``(16, 17)``, therefore the edge is removed." -msgstr "它只影响边``(16, 17)``，因此边被移除。" +msgstr "它只影响边 ``(16, 17)`` ，因此边被移除。" msgid "Create two new edges:" msgstr "创建两条新边：" @@ -20070,10 +20070,10 @@ msgstr "创建两条新边：" msgid "" "Edge ``(16, -2)`` with cost ``0.4`` (original cost * fraction == :math:`1 * " "0.4`)" -msgstr "边``(16, -2)``的成本为``0.4``（原始成本*分数==:math:`1 * 0.4`）" +msgstr "边 ``(16, -2)``的成本为``0.4`` （原始成本*分数==:math:`1 * 0.4`）" msgid "Edge ``(-2, 17)`` with cost ``0.6`` (the remaing cost)" -msgstr "边``(-2, 17)``的成本为``0.6``（剩余成本）" +msgstr "边 ``(-2, 17)``的成本为``0.6`` （剩余成本）" msgid "The total cost of the additional edges is equal to the original cost." msgstr "附加边的总成本等于原始成本。" @@ -20086,18 +20086,18 @@ msgid "On a left hand side driving network" msgstr "在左侧驾驶网络上" msgid "Arrival to point ``-2`` can be achived only via vertex **17**." -msgstr "只能通过顶点 **17** 才能到达点 ``-2`` 。" +msgstr "只能通过顶点 **17** 才能到达点 ``-2``。" msgid "Does not affects edge ``(16, 17)``, therefore the edge is kept." -msgstr "不影响边 ``(16, 17)``，因此保留边。" +msgstr "不影响边 ``(16, 17)`` ，因此保留边。" msgid "It only affects the edge ``(17, 16)``, therefore the edge is removed." -msgstr "它只影响边 ``(17, 16)``，因此边被移除。" +msgstr "它只影响边 ``(17, 16)`` ，因此边被移除。" msgid "" "Work with the original edge ``(16, 17)`` as the fraction is a fraction of " "the original:" -msgstr "使用原始边``(16, 17)``，因为分数是原始边的分数：" +msgstr "使用原始边 ``(16, 17)`` ，因为分数是原始边的分数：" msgid "Flip the Edges and add them to the graph:" msgstr "翻转边并将它们添加到图中：" @@ -20105,23 +20105,23 @@ msgstr "翻转边并将它们添加到图中：" msgid "" "Edge ``(17, -2)`` becomes ``(-2, 16)`` with cost ``0.4`` and is added to the " "graph." -msgstr "边 ``(17, -2)``变为 ``(-2, 16)``，成本为``0.4``，并添加到图中。" +msgstr "边 ``(17, -2)``变为 ``(-2, 16)``，成本为``0.4`` ，并添加到图中。" msgid "" "Edge ``(-2, 16)`` becomes ``(17, -2)`` with cost ``0.6`` and is added to the " "graph." -msgstr "边 ``(-2, 16)`` 变为 ``(17, -2)``，成本为 ``0.6``，并添加到图中。" +msgstr "边 ``(-2, 16)`` 变为 ``(17, -2)``，成本为 ``0.6`` ，并添加到图中。" msgid "When driving side does not matter" msgstr "当驾驶侧无关紧要时" msgid "Arrival to point ``-2`` can be achived via vertices **16** or **17**." -msgstr "可以通过顶点 **16** 或 **17** 到达点 ``-2`` 。" +msgstr "可以通过顶点 **16** 或 **17** 到达点 ``-2``。" msgid "" "Affects the edges ``(16, 17)`` and ``(17, 16)``, therefore the edges are " "removed." -msgstr "影响边 ``(16, 17)`` 和 ``(17, 16)``，因此边被移除。" +msgstr "影响边 ``(16, 17)`` 和 ``(17, 16)`` ，因此边被移除。" msgid "Create four new edges:" msgstr "创建四个新边：" @@ -20130,20 +20130,20 @@ msgid "Flip the Edges and add all the edges to the graph:" msgstr "翻转边并将所有边添加到图中：" msgid "Edge ``(16, -2)`` is added to the graph." -msgstr "边 ``(16, -2)``被添加到图中。" +msgstr "边 ``(16, -2)`` 被添加到图中。" msgid "Edge ``(-2, 17)`` is added to the graph." -msgstr "边``(-2, 17)``被添加到图中。" +msgstr "边 ``(-2, 17)`` 被添加到图中。" msgid "" "Edge ``(16, -2)`` becomes ``(-2, 16)`` with cost ``0.4`` and is added to the " "graph." -msgstr "边 ``(16, -2)``变为 ``(-2, 16)``，成本为 0.4，并添加到图中。" +msgstr "边 ``(16, -2)``变为 ``(-2, 16)`` ，成本为 0.4，并添加到图中。" msgid "" "Edge ``(-2, 17)`` becomes ``(17, -2)`` with cost ``0.6`` and is added to the " "graph." -msgstr "边``(-2, 17)``变为``(17, -2)``，成本为``0.6``，并添加到图中。" +msgstr "边 ``(-2, 17)``变为``(17, -2)``，成本为``0.6`` ，并添加到图中。" msgid "withPoints - Family of functions" msgstr "withPoints - 函数族" From 8c209f0271c8fd9e11e8806a19d9e1ca39d18b8d Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 23 Sep 2024 18:26:31 -0600 Subject: [PATCH 358/428] Reducing to 476 warnings --- .../LC_MESSAGES/pgrouting_doc_strings.po | 266 +++++++++--------- 1 file changed, 133 insertions(+), 133 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 4afda09b6e..1c3ff473f5 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -784,7 +784,7 @@ msgid "" msgstr "问题：`CVRPPDTW` 具有时间窗口的有能力分拣和送货车辆路径问题" msgid "Times are relative to `0`" -msgstr "时间是相对于`0`的" +msgstr "时间是相对于`0` 的" msgid "The vehicles" msgstr "车辆" @@ -1194,7 +1194,7 @@ msgstr "INTEGER" msgid "" "Sequential value starting from **1** for the stops made by the current " "vehicle. The :math:`m_{th}` stop of the current vehicle." -msgstr "当前车辆停止的顺序值，从 **1** 开始。 当前第:math:`m_{th}`车辆的停止。" +msgstr "当前车辆停止的顺序值，从 **1** 开始。 当前第 :math:`m_{th}`车辆的停止。" msgid "Sumary row has the **total time windows violations**." msgstr "摘要行包含 **总时间窗口违规情况**。" @@ -1891,7 +1891,7 @@ msgid "For the undirected graph, the results are symmetric." msgstr "对于无向图，结果是对称的。" msgid "The `agg_cost` of `(u, v)` is the same as for `(v, u)`." -msgstr "`(u, v)` 的 `agg_cost` 与 `(v, u)`相同。" +msgstr "`(u, v)` 的 `agg_cost` 与 `(v, u)` 相同。" msgid "When `start_vid` = `end_vid`, the `agg_cost` = 0." msgstr "当`start_vid` = `end_vid`时，`agg_cost`= 0。" @@ -3108,7 +3108,7 @@ msgid "" "example from the following graph where :math:`v` and :math:`w` are `linear`_ " "nodes:" msgstr "" -"当不再有线性节点时，线性收缩将停止。 例如，在下图中，其中:math:`v`和:math:`w`" +"当不再有线性节点时，线性收缩将停止。 例如，在下图中，其中 :math:`v` 和 :math:`w`" "是`线性`_节点：" msgid "Contracting :math:`w`," @@ -3127,10 +3127,10 @@ msgid "" msgstr "插入一条新边 :math:`v \\rightarrow z`，以红色表示。" msgid "Contracting :math:`v`:" -msgstr "收缩:math:`v`：" +msgstr "收缩 :math:`v`：" msgid "The vertex :math:`v` is removed from the graph" -msgstr "顶点:math:`v`已从图中移除" +msgstr "顶点 :math:`v` 已从图中移除" msgid "" "The edges :math:`u \\rightarrow v` and :math:`v \\rightarrow z` are removed " @@ -3139,12 +3139,12 @@ msgstr "从图中删除边 :math:`u \\rightarrow v` 和 :math:`v \\rightarrow z` msgid "" "A new edge :math:`u \\rightarrow z` is inserted represented with red color." -msgstr "插入一条新边:math:`u \\rightarrow z`，以红色表示。" +msgstr "插入一条新边 :math:`u \\rightarrow z`，以红色表示。" msgid "" "Edge :math:`u \\rightarrow z` has the information of nodes that were " "contracted." -msgstr "边:math:`u \\rightarrow z`有收缩点的信息。" +msgstr "边 :math:`u \\rightarrow z`有收缩点的信息。" msgid "The cycle" msgstr "循环" @@ -3202,7 +3202,7 @@ msgstr "结果不代表收缩图。 它们表示应用收缩算法后对图所 msgid "" "Observe that vertices, for example, :math:`6` do not appear in the results " "because it was not affected by the contraction algorithm." -msgstr "例如，观察到顶点:math:`6`没有出现在结果中，因为它不受收缩算法的影响。" +msgstr "例如，观察到顶点 :math:`6`没有出现在结果中，因为它不受收缩算法的影响。" msgid "After doing the dead end contraction operation:" msgstr "进行死端收缩操作后：" @@ -3342,7 +3342,7 @@ msgstr "当源和/或目标属于边缘子图时，则找不到路径。" msgid "" "In this case, the contracted graph do not have an edge connecting with node :" "math:`4`." -msgstr "在这种情况下，收缩图没有与节点:math:`4` 相连的边。" +msgstr "在这种情况下，收缩图没有与节点 :math:`4` 相连的边。" msgid "Case 3" msgstr "情况3" @@ -3354,7 +3354,7 @@ msgid "" "In this case, the contracted graph do not have an edge connecting with node :" "math:`7` and of node :math:`4` of the second case." msgstr "" -"在这种情况下，收缩图没有与第二种情况的节点:math:`7`和节点 :math:`4`连接的边。" +"在这种情况下，收缩图没有与第二种情况的节点 :math:`7` 和节点 :math:`4`连接的边。" msgid "Refining the above function to include nodes that belong to an edge." msgstr "改进上述函数以包含属于边的节点。" @@ -3371,12 +3371,12 @@ msgid "" msgstr "当源和目标都属于收缩图时，就找到了一条路径。" msgid "The routing graph now has an edge connecting with node :math:`4`." -msgstr "路由图现在有一条与节点:math:`4` 连接的边。" +msgstr "路由图现在有一条与节点 :math:`4` 连接的边。" msgid "" "In this case, the contracted graph do not have an edge connecting with node :" "math:`7`." -msgstr "在这种情况下，收缩图没有与节点:math:`7`相连的边。" +msgstr "在这种情况下，收缩图没有与节点 :math:`7` 相连的边。" msgid "The vertices that need to be expanded are calculated on lines 19 to 24." msgstr "需要扩展的顶点在第19到24行计算。" @@ -3395,7 +3395,7 @@ msgid "When source and/or target belong to a vertex, now, a path is found." msgstr "当源和/或目标属于一个顶点时，现在就找到了一条路径。" msgid "Now, the routing graph has an edge connecting with node :math:`7`." -msgstr "现在，路由图有一条与节点:math:`7`连接的边。" +msgstr "现在，路由图有一条与节点 :math:`7`连接的边。" msgid ":doc:`sampledata`" msgstr ":doc:`sampledata`" @@ -3524,7 +3524,7 @@ msgid "" msgstr "通过将下三角形设置为上三角形的镜像。" msgid "It is also the users responsibility to fix an :math:`\\infty` value." -msgstr "确定:math:`\\infty`值也是用户的责任。" +msgstr "确定 :math:`\\infty`值也是用户的责任。" msgid "" "Returns the sum of the costs of the shortest path for pair combination of " @@ -3554,7 +3554,7 @@ msgid "The unique index would be the pair: ``(start_vid, end_vid)``." msgstr "唯一索引将是一对： ``(start_vid, end_vid)``。" msgid "The aggregate cost of `(u, v)` is the same as for `(v, u)`." -msgstr "`(u, v)`的总成本与 `(v, u)`相同。" +msgstr "`(u, v)` 的总成本与 `(v, u)` 相同。" msgid "Any duplicated value in the **start vids** are ignored." msgstr "**start vids** 中的任何重复值都会被忽略。" @@ -3683,7 +3683,7 @@ msgstr "" "路径。 该实现可以与有向图和无向图一起使用。" msgid "Running time: :math:`O(| start\\ vids | * (V \\log V + E))`" -msgstr "运行时间：:math:`O(| start\\ vids | * (V \\log V + E))`" +msgstr "运行时间： :math:`O(| start\\ vids | * (V \\log V + E))`" msgid "The Dijkstra family functions are based on the Dijkstra algorithm." msgstr "Dijkstra 系列函数基于 Dijkstra 算法。" @@ -3879,11 +3879,11 @@ msgid ":math:`cost_i = cost_{(node_i, node_{i+1})}`" msgstr ":math:`cost_i = cost_{(node_i, node_{i+1})}`" msgid "" -":math:`agg\\_cost_i = \\begin{cases} 0 &\\quad \\text{when } i = 1 \\" +":math:`agg\\_cost_i = \\begin{cases} 0 &\\quad \\text{when } i = 1 \\" "\\ \\displaystyle\\sum_{k=1}^{i} cost_{(node_{k-1}, node_k)} &\\quad " "\\text{when } i \\neq 1 \\\\ \\end{cases}`" msgstr "" -":math:`agg\\_cost_i = \\begin{cases} 0 &\\quad \\text{when } i = 1 \\" +":math:`agg\\_cost_i = \\begin{cases} 0 &\\quad \\text{when } i = 1 \\" "\\ \\displaystyle\\sum_{k=1}^{i} cost_{(node_{k-1}, node_k)} &\\quad " "\\text{when } i \\neq 1 \\\\ \\end{cases}`" @@ -3944,7 +3944,7 @@ msgid "The edges extracted will conform to the corresponding spanning tree." msgstr "提取的边将符合相应的生成树。" msgid "Edge :math:`(u, v)` will not be included when:" -msgstr "在以下情况下，边:math:`(u, v)`将不包括在内：" +msgstr "在以下情况下，边 :math:`(u, v)` 将不包括在内：" msgid "The distance from the **root** to :math:`u` > limit distance." msgstr "从 **root** 到 :math:`u` 的距离>限制距离。" @@ -4320,13 +4320,13 @@ msgstr "" "所有实现中通过图表的最大流量保证相同，但通过每条边的实际流量可能会有所不同。" msgid "pgr_maxFlow :math:`(edges\\_sql, source\\_vertex, sink\\_vertex)`" -msgstr "pgr_maxFlow:math:`(edges\\_sql, source\\_vertex, sink\\_vertex)`" +msgstr "pgr_maxFlow :math:`(edges\\_sql, source\\_vertex, sink\\_vertex)`" msgid "" "where :math:`edges\\_sql = \\{(id_i, source_i, target_i, capacity_i, " "reverse\\_capacity_i)\\}`" msgstr "" -"其中:math:`edges\\_sql = \\{(id_i, source_i, target_i, capacity_i, " +"其中 :math:`edges\\_sql = \\{(id_i, source_i, target_i, capacity_i, " "reverse\\_capacity_i)\\}`" msgid "Graph definition" @@ -4336,7 +4336,7 @@ msgid "The weighted directed graph, :math:`G(V,E)`, is defined as:" msgstr "加权有向图， :math:`G(V,E)` 定义为：" msgid "the set of vertices :math:`V`" -msgstr "顶点集:math:`V`" +msgstr "顶点集 :math:`V`" msgid "" ":math:`source\\_vertex \\cup sink\\_vertex \\bigcup source_i \\bigcup " @@ -4606,7 +4606,7 @@ msgstr "将输出列标准化为 |result-spantree|" #, fuzzy msgid "Added ``pred`` result columns." -msgstr "添加了 ``depth``和``pred`` 结果列。" +msgstr "添加了 ``depth`` 和``pred`` 结果列。" msgid "Experimental promoted to proposed." msgstr "实验提升为拟议。" @@ -4893,7 +4893,7 @@ msgid "Output columns were |result-dij-dd|" msgstr "输出列是 |result-dij-dd|" msgid "Does not have ``start_vid`` and ``depth`` result columns." -msgstr "没有 ``start_vid``和 ``depth`` 结果列。" +msgstr "没有 ``start_vid`` 和 ``depth`` 结果列。" msgid "Has ``from_v`` instead of ``start_vid`` result column." msgstr "有 ``from_v`` 而不是 ``start_vid`` 结果列。" @@ -5034,7 +5034,7 @@ msgid "Output columns were |ksp-result|" msgstr "输出列是 |ksp-result|" msgid "the columns ``start_vid`` and ``end_vid`` do not exist." -msgstr "``start_vid``和 ``end_vid`` 列不存在。" +msgstr "``start_vid`` 和 ``end_vid`` 列不存在。" msgid "``pgr_KSP`` (One to One) does not have ``start_vid`` and ``end_vid``." msgstr "``pgr_KSP`` (一对一) 没有 ``start_vid`` 和``end_vid``。" @@ -5070,7 +5070,7 @@ msgid "Migration is needed, because:" msgstr "需要迁移，因为：" msgid "Use ``cost`` and ``reverse_cost`` on the inner query" -msgstr "在内部查询上使用 ``cost``和 ``reverse_cost``" +msgstr "在内部查询上使用 ``cost`` 和 ``reverse_cost``" msgid "Results are ordered" msgstr "结果已排序" @@ -5111,7 +5111,7 @@ msgstr "无论它的值如何，它都会给出将图视为 **无向** 的结果 msgid "" "Use the columns ``cost`` and ``reverse_cost`` to represent the existence of " "an edge." -msgstr "使用 ``cost``和 ``reverse_cost`` 列来表示边的存在。" +msgstr "使用 ``cost`` 和 ``reverse_cost`` 列来表示边的存在。" msgid "Do not use the flag ``directed``." msgstr "不要使用 ``directed`` 标志。" @@ -5192,7 +5192,7 @@ msgid "Output columns were |result-1-1-no-seq|" msgstr "输出列为|result-1-1-no-seq|" msgid "Does not have ``start_vid``, ``pred`` and ``depth`` result columns." -msgstr "没有 ``start_vid``，``pred``和``depth`` 结果列。" +msgstr "没有 ``start_vid``，``pred`` 和``depth`` 结果列。" #, fuzzy msgid "" @@ -5206,7 +5206,7 @@ msgid "Output columns were |result-m-1-no-seq|" msgstr "输出列为|result-m-1-no-seq|" msgid "Does not have ``depth`` and ``pred`` result columns." -msgstr "没有 ``depth``和``pred`` 结果列。" +msgstr "没有 ``depth`` 和``pred`` 结果列。" msgid "Driving side was optional" msgstr "驾驶侧是可选的" @@ -5627,10 +5627,10 @@ msgid "Migration of ``pgr_trsp`` (Edges)" msgstr "迁移 ``pgr_trsp`` （边）" msgid "The integral types of the ``sql`` can only be ``INTEGER``." -msgstr "``sql``的整型类型只能是``INTEGER``。" +msgstr "``sql`` 的整型类型只能是``INTEGER``。" msgid "The floating point type of the ``sql`` can only be ``FLOAT``." -msgstr "``sql``的浮点类型只能是``FLOAT``。" +msgstr "``sql`` 的浮点类型只能是``FLOAT``。" msgid "For these migration guide the following points will be used:" msgstr "对于这些迁移指南，将使用以下几点：" @@ -5674,7 +5674,7 @@ msgid "Migration of ``pgr_trspViaVertices``" msgstr "迁移 ``pgr_trspViaVertices``" msgid "The integral types of the ``Edges SQL`` can only be ``INTEGER``." -msgstr "``Edges SQL``的整数类型只能是 ``INTEGER``。" +msgstr "``Edges SQL`` 的整数类型只能是 ``INTEGER``。" msgid ":doc:`pgr_dijkstraVia` when there are no restrictions," msgstr ":doc:`pgr_dijkstraVia`当无限制时，" @@ -5900,7 +5900,7 @@ msgid "" "In terms of a directed graph is like having two edges: :math:`source_{id} " "\\leftrightarrow target_{id}`" msgstr "" -"在有向图的术语中，这相当于有两条边：:math:`source_{id} \\leftrightarrow " +"在有向图的术语中，这相当于有两条边： :math:`source_{id} \\leftrightarrow " "target_{id}`" msgid "" @@ -5909,7 +5909,7 @@ msgid "" msgstr "边 :math:`2` (:math:`1 \\frac{\\;\\;\\;\\;\\;}{} 3`) 不是图的一部分。" msgid "Graph with ``cost`` and ``reverse_cost``" -msgstr "带有 ``cost``和``reverse_cost`` 的图" +msgstr "带有 ``cost`` 和``reverse_cost`` 的图" msgid "The weighted directed graph, :math:`G_d(V,E)`, is defined by:" msgstr "加权有向图， :math:`G_d(V,E)`， 定义如下：" @@ -5988,7 +5988,7 @@ msgid "" "Edge :math:`(target_{id}, source_{id}, reverse\\_cost_{id})` is :math:" "`target_{id} \\frac{\\;\\;\\;\\;\\;}{} source_{id}`" msgstr "" -"边:math:`(target_{id}, source_{id}, reverse\\_cost_{id})`是 :math:" +"边 :math:`(target_{id}, source_{id}, reverse\\_cost_{id})`是 :math:" "`target_{id} \\frac{\\;\\;\\;\\;\\;}{} source_{id}`" msgid "In terms of a directed graph is like having four edges:" @@ -6274,7 +6274,7 @@ msgid "" "traversing the edge in both directions." msgstr "" "几何图的所有开始和结束顶点都需要一个标识符，该标识符将存储在数据表的" -"``source``列和``target``列中。 同样，``cost``和 ``reverse_cost`` 需要具有在两" +"``source``列和``target``列中。 同样，``cost`` 和 ``reverse_cost`` 需要具有在两" "个方向上遍历边的值。" msgid "" @@ -6294,7 +6294,7 @@ msgstr "" msgid "" "Finally using the data stored on the vertices tables the ``source`` and " "``target`` are filled up." -msgstr "最后使用存储在顶点表上的数据填充 ``source``和``target``。" +msgstr "最后使用存储在顶点表上的数据填充 ``source`` 和``target``。" msgid "See :doc:`sampledata` for an example for building a topology." msgstr "有关构建拓扑的示例，请参阅 :doc:`sampledata`。" @@ -6330,7 +6330,7 @@ msgid ":math:`1` when the edge exists in the graph" msgstr "当边存在于图中时为 :math:`1`" msgid ":math:`-1` when the edge does not exist in the graph" -msgstr "当图中不存在边时为:math:`-1`" +msgstr "当图中不存在边时为 :math:`-1`" msgid "Using that information updating to the length of the geometries:" msgstr "使用该信息更新几何形状的长度：" @@ -6577,7 +6577,7 @@ msgid "" "The ``edge`` can be used to connect the components, using the ``fraction``" "information about the edge :math:`14` to split the connecting edge." msgstr "" -"``edge``可用于连接组件，利用边 :math:`14`的``fraction`` 信息来分割连接边。" +"``edge``可用于连接组件，利用边 :math:`14` 的``fraction`` 信息来分割连接边。" msgid "Connecting components" msgstr "连接组件" @@ -6938,7 +6938,7 @@ msgid "Edges SQL for :doc:`flow-family`" msgstr "用于流数据系列 ( :doc:`flow-family`) 的Edges SQL" msgid "Edges SQL for the following functions of :doc:`flow-family`" -msgstr "Edges SQL 适用于:doc:`flow-family`的以下函数" +msgstr "Edges SQL 适用于:doc:`flow-family` 的以下函数" msgid "Used in combination signatures" msgstr "结合签名使用" @@ -7067,7 +7067,7 @@ msgstr "" msgid "" "Cost to traverse from ``node`` using ``edge`` to the next node in the path " "sequence." -msgstr "从使用 ``edge``的 ``node`` 遍历到路径序列中的下一个节点的成本。" +msgstr "从使用 ``edge`` 的 ``node`` 遍历到路径序列中的下一个节点的成本。" msgid "Used in functions the following:" msgstr "用于以下函数：" @@ -7891,7 +7891,7 @@ msgid "``pgr_ksp`` (One to One)" msgstr "``pgr_ksp`` (一对一)" msgid "Added ``start_vid`` and ``end_vid`` result columns." -msgstr "增加 ``start_vid``和``end_vid`` 结果列。" +msgstr "增加 ``start_vid`` 和``end_vid`` 结果列。" msgid "New overload functions:" msgstr "新的重载函数：" @@ -7969,23 +7969,23 @@ msgid "Example" msgstr "示例" msgid "Get 2 paths from :math:`6` to :math:`17` on a directed graph." -msgstr "在有向图上获取从 :math:`6` 到 :math:`17`的 2 条路径。" +msgstr "在有向图上获取从 :math:`6` 到 :math:`17` 的 2 条路径。" msgid "" "Get 2 paths from vertex :math:`6` to vertices :math:`\\{10, 17\\}` on a " "directed graph." -msgstr "获取有向图上从顶点:math:`6`到顶点 :math:`\\{10, 17\\}`的 2 条路径。" +msgstr "获取有向图上从顶点 :math:`6`到顶点 :math:`\\{10, 17\\}` 的 2 条路径。" msgid "" "Get 2 paths from vertices :math:`\\{6, 1\\}` to vertex :math:`17` on a " "directed graph." -msgstr "在有向图中得到从顶点 :math:`\\{6, 1\\}`到顶点 :math:`17`的2条路经。" +msgstr "在有向图中得到从顶点 :math:`\\{6, 1\\}`到顶点 :math:`17` 的2条路经。" msgid "" "Get 2 paths vertices :math:`\\{6, 1\\}` to vertices :math:`\\{10, 17\\}` on " "a directed graph." msgstr "" -"在有向图中得到从顶点 :math:`\\{6, 1\\}`到顶点 :math:`\\{10, 17\\}`的2条路经。" +"在有向图中得到从顶点 :math:`\\{6, 1\\}`到顶点 :math:`\\{10, 17\\}` 的2条路经。" msgid "Using a combinations table on an directed graph" msgstr "在有向图上使用组合表" @@ -8052,7 +8052,7 @@ msgstr "使用无向图上的组合表获取 2 条路径" msgid "" "Get 2 paths from vertices :math:`\\{6, 1\\}` to vertex :math:`17` on a " "undirected graph." -msgstr "在无向图中获取从顶点 :math:`\\{6, 1\\}`到顶点:math:`17`的2条路径。" +msgstr "在无向图中获取从顶点 :math:`\\{6, 1\\}`到顶点:math:`17` 的2条路径。" msgid "https://en.wikipedia.org/wiki/K_shortest_path_routing" msgstr "https://en.wikipedia.org/wiki/K_shortest_path_routing" @@ -8156,7 +8156,7 @@ msgstr "由于需要无向图，有向图变换如下：" msgid "" "edges `(u, v)` and `(v, u)` is considered to be the same edge (denoted `(u, " "v)`" -msgstr "边 `(u, v)`和 `(v, u)`被认为是相同的边（表示为 `(u, v)`" +msgstr "边 `(u, v)` 和 `(v, u)`被认为是相同的边（表示为 `(u, v)`" msgid "if ``agg_cost`` differs between one or more instances of edge `(u, v)`" msgstr "如果 ``agg_cost`` 在边`(u, v)` 的一个或多个实例之间不同" @@ -8230,7 +8230,7 @@ msgid "``0`` for the last row in the tour sequence." msgstr "``0`` 表示游览序列中的最后一行。" msgid "Aggregate cost from the ``node`` at ``seq = 1`` to the current node." -msgstr "从 ``seq = 1``的 ``node`` 到当前节点的总成本。" +msgstr "从 ``seq = 1`` 的 ``node`` 到当前节点的总成本。" msgid "``0`` for the first row in the tour sequence." msgstr "``0`` 表示游览序列中的第一行。" @@ -8606,7 +8606,7 @@ msgid "No ordering is performed" msgstr "不进行排序" msgid "let `v` and `u` are nodes on the graph:" -msgstr "设`v`和 `u` 是图上的节点：" +msgstr "设`v` 和 `u` 是图上的节点：" msgid "when there is no path from `v` to `u`:" msgstr "当没有从 `v` 到 `u` 的路径时：" @@ -8941,7 +8941,7 @@ msgid "" "function as the geometry column, and the geometry column ``the_geom`` is " "passed to the function as the id column." msgstr "" -"在此示例中，表 ``mytable``的列 ``id`` 作为几何列传递给函数，几何列 " +"在此示例中，表 ``mytable`` 的列 ``id`` 作为几何列传递给函数，几何列 " "``the_geom`` 作为 id 列传递给函数。" msgid "When using the named notation" @@ -9132,7 +9132,7 @@ msgstr "two_way_if_null" msgid "" "``boolean`` flag to treat oneway NULL values as bi-directional. Default " "value is ``true``." -msgstr "``boolean``将单向 NULL 值视为双向的标志。 默认值为 ``true``。" +msgstr "``boolean`` 将单向 NULL 值视为双向的标志。 默认值为 ``true``。" msgid "" "It is strongly recommended to use the named notation. See :doc:" @@ -9143,7 +9143,7 @@ msgstr "" msgid "" "Fills completely the ``ein`` and ``eout`` columns of the vertices table." -msgstr "完全填充顶点表的 ``ein``和 ``eout`` 列。" +msgstr "完全填充顶点表的 ``ein`` 和 ``eout`` 列。" msgid "The names of source , target or oneway are the same." msgstr "source 、 target 或 oneway 的名称相同。" @@ -9223,7 +9223,7 @@ msgid "``node`` ascending" msgstr "``node`` 升序" msgid "Running time: :math:`O(V + E)`" -msgstr "运行时间：:math:`O(V + E)`" +msgstr "运行时间： :math:`O(V + E)`" msgid "pgr_articulationPoints(`Edges SQL`_)" msgstr "pgr_articulationPoints(`Edges SQL`_)" @@ -9599,7 +9599,7 @@ msgid "" "When the start vertex and the end vertex are different, and there is no " "path. The agg_cost is :math:`\\infty`." msgstr "" -"当起始顶点和结束顶点不同且不存在路径时，聚合成本（agg_cost）为:math:" +"当起始顶点和结束顶点不同且不存在路径时，聚合成本（agg_cost）为 :math:" "`\\infty`。" msgid "" @@ -9608,7 +9608,7 @@ msgid "" msgstr "出于优化目的，`start_vids`或 `end_vids` 中的任何重复值都将被忽略。" msgid "Running time: :math:`O(| start\\_vids | * ( V * E))`" -msgstr "运行时间：:math:`O(| start\\_vids | * ( V * E))`" +msgstr "运行时间： :math:`O(| start\\_vids | * ( V * E))`" msgid "" "pgr_bellmanFord(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" @@ -9682,11 +9682,11 @@ msgstr "该实现适用于 **有向** 图和 **无向** 图。" #, fuzzy msgid "Running time: :math:`\\Theta(VE)`" -msgstr "运行时间：:math:`O(V + E)`" +msgstr "运行时间： :math:`O(V + E)`" #, fuzzy msgid "Running space: :math:`\\Theta(VE)`" -msgstr "运行时间：:math:`O(V + E)`" +msgstr "运行时间： :math:`O(V + E)`" #, fuzzy msgid "Throws when there are no edges in the graph" @@ -9702,7 +9702,7 @@ msgstr "返回集合 ``(edge, cost)``" #, fuzzy msgid "For a directed graph with edges :math:`\\{1, 2, 3, 4\\}`." -msgstr "对于有边 :math:`\\{1, 2, 3, 4\\}`的有向子图。" +msgstr "对于有边 :math:`\\{1, 2, 3, 4\\}` 的有向子图。" #, fuzzy msgid "Explanation" @@ -9722,7 +9722,7 @@ msgstr "从顶点 :math:`11` 到顶点 :math:`12`" #, fuzzy msgid "Removing vertex :math:`6` will create three graph components." -msgstr "顶点 :math:`w`已从图中移除" +msgstr "顶点 :math:`w` 已从图中移除" msgid "Removing vertex :math:`10` will create two graph components." msgstr "" @@ -10061,7 +10061,7 @@ msgid "" "Using a combinations table, equivalent to calculating result from vertices :" "math:`\\{5, 6\\}` to vertices :math:`\\{10, 15, 14\\}`." msgstr "" -"使用组合表，相当于计算从顶点:math:`{5, 6\\}` 到顶点:math:`{10, 15, 14\\}` 的" +"使用组合表，相当于计算从顶点 :math:`{5, 6\\}` 到顶点:math:`{10, 15, 14\\}` 的" "结果。" msgid "https://www.boost.org/libs/graph/doc/boykov_kolmogorov_max_flow.html" @@ -10305,7 +10305,7 @@ msgid "" "Boost: `Connected components `__" msgstr "" -"Boost: `已连接组件 `__" msgid "" @@ -10910,7 +10910,7 @@ msgid "" msgstr "带宽最小化问题被认为是NP完全问题。" msgid "The running time complexity is: :math:`O(m log(m)|V|)`" -msgstr "运行时间复杂度为：:math:`O(m log(m)|V|)`" +msgstr "运行时间复杂度为： :math:`O(m log(m)|V|)`" msgid "where :math:`|V|` is the number of vertices," msgstr "其中 :math:`|V|`是顶点数，" @@ -10993,13 +10993,13 @@ msgid "" msgstr "该过程仅对加权有向无环图有效。 否则它会抛出警告。" msgid "The `agg_cost` the non included values `(v, v)` is `0`" -msgstr "`agg_cost`中未包括的值`(v, v)`的成本为`0`" +msgstr "`agg_cost`中未包括的值`(v, v)` 的成本为`0`" msgid "The `agg_cost` the non included values `(u, v)` is :math:`\\infty`" -msgstr "`agg_cost`中未包括的值 `(u, v)`是数学符号中的:math:`\\infty`" +msgstr "`agg_cost`中未包括的值 `(u, v)`是数学符号中的 :math:`\\infty`" msgid "Running time: :math:`O(| start\\_vids | * (V + E))`" -msgstr "运行时间：:math:`O(| start\\_vids | * (V + E))`" +msgstr "运行时间： :math:`O(| start\\_vids | * (V + E))`" msgid "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vid**)" msgstr "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vid**)" @@ -11065,7 +11065,7 @@ msgid "" "best to prep your vertices table before hand and use that vertices table for " "pgr_degree calls." msgstr "" -"`pgr_degree`可以利用`pgr_extractVertices`的输出，或者可以在调用中嵌入" +"`pgr_degree`可以利用`pgr_extractVertices` 的输出，或者可以在调用中嵌入" "`pgr_extractVertices`。对于较大规模的网络，最好提前准备好顶点表并在" "`pgr_degree`调用中使用该顶点表。" @@ -11259,7 +11259,7 @@ msgstr "版本 3.5.0" msgid "" "``pgr_dijkstra`` (`One to One`_) added ``start_vid`` and ``end_vid`` columns." -msgstr "``pgr_dijkstra`` (`一对一`_)增加``start_vid``和``end_vid`` 列。" +msgstr "``pgr_dijkstra`` (`一对一`_)增加``start_vid`` 和``end_vid`` 列。" msgid "``pgr_dijkstra`` (`One to Many`_) added ``end_vid`` column." msgstr "``pgr_dijkstra`` (`一对多`_) 增加``end_vid`` 列。" @@ -11634,7 +11634,7 @@ msgid "**options:** ``[directed, cap]``" msgstr "**选项：** ``[directed, cap]``" msgid "Departing on car from vertex :math:`6` find the nearest subway station." -msgstr "从顶点:math:`6`乘车出发，找到最近的地铁站。" +msgstr "从顶点 :math:`6`乘车出发，找到最近的地铁站。" msgid "Using a **directed** graph for car routing." msgstr "使用 **有向** 图进行汽车路线规划。" @@ -11694,7 +11694,7 @@ msgid "The first subway line stations are at :math:`\\{15, 16\\}`" msgstr "第一条地铁线的站点位于 :math:`\\{15, 16\\}`" msgid "The second subway line stations stops are at :math:`\\{1, 10, 11\\}`" -msgstr "地铁二号线的站点是:math:`\\{1, 10, 11\\}`" +msgstr "地铁二号线的站点是 :math:`\\{1, 10, 11\\}`" msgid "On line `4`: using the named parameter: `directed => false`" msgstr "第 `4` 行：使用命名参数：`directed => false`" @@ -11722,7 +11722,7 @@ msgid "" msgstr "查找两条地铁线所有站点之间的最佳汽车连接线路" msgid "The first subway line stations stops are at :math:`\\{1, 10, 11\\}`" -msgstr "第一条地铁线的站点是:math:`\\{1, 10, 11\\}`" +msgstr "第一条地铁线的站点是 :math:`\\{1, 10, 11\\}`" msgid "The second subway line stations are at :math:`\\{15, 16\\}`" msgstr "地铁二号线站点位于 :math:`\\{15, 16\\}`" @@ -11754,7 +11754,7 @@ msgid "" "making a connection from the first subway line :math:`\\{1, 10, 11\\}` to " "the second :math:`\\{15, 16\\}`:" msgstr "" -"将第一条地铁线:math:`{1, 10, 11\\}` 连接到第二条地铁线:math:`{15, 16\\}`：" +"将第一条地铁线 :math:`{1, 10, 11\\}` 连接到第二条地铁线:math:`{15, 16\\}`：" msgid "" "The best connections from all the stations from the first line are: :math:" @@ -11767,13 +11767,13 @@ msgid "" "The best one is :math:`(11 \\rightarrow 16)` with a cost of :math:`1` " "(lines: `11` and `12`)" msgstr "" -"最好的方法是 :math:`(11/rightarrow 16)`，成本是 :math:`1` （行：`11`和`12`）" +"最好的方法是 :math:`(11/rightarrow 16)`，成本是 :math:`1` （行：`11` 和`12`）" msgid "" "making a connection from the second subway line :math:`\\{15, 16\\}` to the " "first :math:`\\{1, 10, 11\\}`:" msgstr "" -"将第二条地铁线:math:`{15, 16\\}` 连接到第一条地铁线:math:`{1, 10, 11\\}`：" +"将第二条地铁线 :math:`{15, 16\\}` 连接到第一条地铁线:math:`{1, 10, 11\\}`：" msgid "" "The best connections from all the stations from the second line are: :math:" @@ -11786,7 +11786,7 @@ msgid "" "Both are equaly good as they have the same cost. (lines: `13` and `14` and " "lines: `15` and `16`)" msgstr "" -"它们都一样好，因为它们具有相同的成本（线路：`13`和`14`以及线路：`15`和`16`）" +"它们都一样好，因为它们具有相同的成本（线路：`13` 和`14`以及线路：`15`和`16`）" msgid "Dijkstra optional parameters" msgstr "Dijkstra 可选参数" @@ -11888,7 +11888,7 @@ msgid "" msgstr "最好的方法是 :math:`(11/rightarrow 16)`，成本是 :math:`1` (lines: `1`)" msgid "Both are equaly good as they have the same cost. (lines: `12` and `13`)" -msgstr "由于成本相同，所以两者同样好。(线路：`12`和 `13`）" +msgstr "由于成本相同，所以两者同样好。(线路：`12` 和 `13`）" msgid "``pgr_dijkstraVia`` - Proposed" msgstr "``pgr_dijkstraVia`` -拟议" @@ -12002,7 +12002,7 @@ msgid "Result column name change: ``from_v`` to ``start_vid``." msgstr "结果列名称更改： ``from_v``改为 ``start_vid``。" msgid "Added ``depth`` and ``pred`` result columns." -msgstr "添加了 ``depth``和``pred`` 结果列。" +msgstr "添加了 ``depth`` 和``pred`` 结果列。" msgid "Signature change pgr_drivingDistance(single vertex)" msgstr "签名更改 pgr_drivingDistance（单顶点）" @@ -12038,7 +12038,7 @@ msgid "Single Vertex" msgstr "单顶点" msgid "From vertex :math:`11` for a distance of :math:`3.0`" -msgstr "从顶点:math:`11`到:math:`3.0`的距离" +msgstr "从顶点 :math:`11`到:math:`3.0` 的距离" msgid "Multiple Vertices" msgstr "多顶点" @@ -12069,7 +12069,7 @@ msgstr "``false`` 时，类似于使用单顶点签名的多次调用。" msgid "" "From vertices :math:`\\{11, 16\\}` for a distance of :math:`3.0` on an " "undirected graph" -msgstr "在无向图上，从顶点:math:`{11, 16\\}` 开始的距离为:math:`3.0`" +msgstr "在无向图上，从顶点 :math:`{11, 16\\}` 开始的距离为:math:`3.0`" msgid "pgr_edgeColoring - Experimental" msgstr "pgr_edgeColoring - 实验" @@ -12117,8 +12117,8 @@ msgid "" "proper edge coloring of graph) is equal to the degree :math:`\\Delta + 1` of " "the graph, (:math:`x'(G) = \\Delta`)" msgstr "" -"色数（chromatic number）:math:`x'(G)`（用于图的适当边着色所需的最小颜色数）等" -"于图的度:math:`\\Delta + 1`（:math:`x'(G) = \\Delta`）" +"色数（chromatic number） :math:`x'(G)`（用于图的适当边着色所需的最小颜色数）等" +"于图的度 :math:`\\Delta + 1`（:math:`x'(G) = \\Delta`）" msgid "The algorithm tries to assign the least possible color to every edge." msgstr "该算法尝试为每条边分配尽可能少的颜色。" @@ -12240,7 +12240,7 @@ msgid "" "graph." msgstr "" "使用组合表，相当于计算无向图上从顶点 :math:`\\{5, 6\\}`到顶点 :math:`\\{10, " -"15, 14\\}`的结果。" +"15, 14\\}` 的结果。" msgid "Manually assigned vertex combinations on an undirected graph." msgstr "在无向图上手动分配顶点组合。" @@ -12324,7 +12324,7 @@ msgid "" "complexity of :math:`O( | E | )` for random graphs. This is significantly " "faster in terms of computation speed." msgstr "" -"该算法的最坏运行时间为:math:`O(| V | * | E |)` ，类似于Bellman-Ford算法的时间" +"该算法的最坏运行时间为 :math:`O(| V | * | E |)` ，类似于Bellman-Ford算法的时间" "复杂度。然而，实验表明，对于随机图，该算法的平均运行时间复杂度为 :math:`O( | " "E | )`。这在计算速度上明显更快。" @@ -12347,10 +12347,10 @@ msgid "Running time:" msgstr "运行时间：" msgid "Worst case: :math:`O(| V | * | E |)`" -msgstr "最坏的情况：:math:`O(| V | * | E |)`" +msgstr "最坏的情况： :math:`O(| V | * | E |)`" msgid "Average case: :math:`O( | E | )`" -msgstr "平均情况：:math:`O( | E | )`" +msgstr "平均情况： :math:`O( | E | )`" msgid "" "pgr_edwardMoore(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" @@ -12465,7 +12465,7 @@ msgid "" "To use this inner query the columns ``geom``, ``startpoint`` and " "``endpoint`` should not be part of the set of columns." msgstr "" -"要使用此内部查询，列 ``geom``、``startpoint``和``endpoint`` 不应成为列集的一部" +"要使用此内部查询，列 ``geom``、``startpoint`` 和``endpoint`` 不应成为列集的一部" "分。" msgid "``NULL`` When the ``id`` is not part of the inner query" @@ -13000,7 +13000,7 @@ msgid "pgr_floydWarshall(`Edges SQL`_, [``directed``])" msgstr "pgr_floydWarshall(`Edges SQL`_, [``directed``])" msgid "For a directed subgraph with edges :math:`\\{1, 2, 3, 4\\}`." -msgstr "对于有边 :math:`\\{1, 2, 3, 4\\}`的有向子图。" +msgstr "对于有边 :math:`\\{1, 2, 3, 4\\}` 的有向子图。" msgid "" "Boost `floyd-Warshall ` algorithm." msgstr "使用:doc:`pgr_pushRelabel `算法。" msgid "Running time: :math:`O( V ^ 3)`" -msgstr "运行时间：:math:`O( V ^ 3)`" +msgstr "运行时间： :math:`O( V ^ 3)`" msgid "pgr_maxFlow(`Edges SQL`_, **start vid**, **end vid**)" msgstr "pgr_maxFlow(`Edges SQL`_, **start vid**, **end vid**)" @@ -14153,7 +14153,7 @@ msgid "Process is done on edges with nonnegative cost." msgstr "过程是在具有非负成本的边上完成的。" msgid "Running time: :math:`O(U * (E + V * logV))`" -msgstr "运行时间：:math:`O(U * (E + V * logV))`" +msgstr "运行时间： :math:`O(U * (E + V * logV))`" msgid "where :math:`U` is the value of the max flow." msgstr "其中 :math:`U`是最大流量的值。" @@ -14728,7 +14728,7 @@ msgid "" msgstr "该算法使用 Prim 算法在可能断开的图中找到最小生成森林。" msgid "Prim's running time: :math:`O(E * log V)`" -msgstr "Prim运行时间：:math:`O(E * log V)`" +msgstr "Prim运行时间： :math:`O(E * log V)`" msgid "pgr_prim(`Edges SQL`_)" msgstr "pgr_prim(`Edges SQL`_)" @@ -14873,7 +14873,7 @@ msgid "The returned rows are ordered in ascending order of the vertex value." msgstr "返回的行按顶点值的升序排列。" msgid "Sequential Vertex Coloring Running Time: :math:`O(|V|*(d + k))`" -msgstr "顺序顶点着色运行时间：:math:`O(|V|*(d + k))`" +msgstr "顺序顶点着色运行时间： :math:`O(|V|*(d + k))`" msgid ":math:`d` is the maximum degree of the vertices in the graph," msgstr ":math:`d`是图中顶点的最大度数，" @@ -15111,7 +15111,7 @@ msgid "The returned graph is compresed" msgstr "返回的图被压缩" msgid "Running time: :math:`O(|V||E|)`" -msgstr "运行时间：:math:`O(|V||E|)`" +msgstr "运行时间： :math:`O(|V||E|)`" msgid "The pgr_transitiveClosure function has the following signature:" msgstr "pgr_transitiveClosure 函数具有以下签名：" @@ -15254,7 +15254,7 @@ msgstr "从无向图上的顶点 :math:`6` 到顶点 :math:`10`." msgid "" "From vertex :math:`6` to vertices :math:`\\{10, 1\\}` on an undirected graph." -msgstr "无向图上从顶点:math:`6` 到顶点 :math:`\\{10, 1\\}` 。" +msgstr "无向图上从顶点 :math:`6` 到顶点 :math:`\\{10, 1\\}` 。" msgid "" "From vertices :math:`\\{6, 1\\}` to vertex :math:`8` on a directed graph." @@ -15270,7 +15270,7 @@ msgstr "在无向图上使用组合表。" msgid "" "`Deprecated documentation `_" -msgstr "`已弃用文档 `_" +msgstr "` 已弃用文档 `_" msgid "``pgr_trspVia`` - Proposed" msgstr "``pgr_trspVia`` - 拟议" @@ -15290,8 +15290,8 @@ msgid "" "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 "" -"给定一个顶点列表和一个图，这个函数等同于在所有:math:`i < size\\_of(via\\;" -"vertices)`的情况下找到从 :math:`vertex_i`到 :math:`vertex_{i+1}`的最短路径，" +"给定一个顶点列表和一个图，这个函数等同于在所有 :math:`i < size\\_of(via\\;" +"vertices)` 的情况下找到从 :math:`vertex_i`到 :math:`vertex_{i+1}`的最短路径，" "尽量避免使用受限路径。" msgid "The paths represents the sections of the route." @@ -15435,7 +15435,7 @@ msgstr "" msgid "" "Find the route that visits the vertices :math:`\\{-6, 15, -5\\}` in that " "order on an directed graph." -msgstr "在有向图上查找按顺序访问顶点 :math:`\\{-6, 15, -5\\}`的路线。" +msgstr "在有向图上查找按顺序访问顶点 :math:`\\{-6, 15, -5\\}` 的路线。" msgid "When positive it is considered a vertex identifier" msgstr "当为正时，它被视为顶点标识符" @@ -15478,7 +15478,7 @@ msgid "" "When ``start_vid``, ``end_vid`` and ``node`` columns have negative values, " "the identifier is for a Point." msgstr "" -"当 ``start_vid``、 ``end_vid``和``node`` 列具有负值时，该标识符用于Point。" +"当 ``start_vid``、 ``end_vid`` 和``node`` 列具有负值时，该标识符用于Point。" msgid "Use ``pgr_findCloseEdges`` for points on the fly" msgstr "对动态点使用 ``pgr_findCloseEdges``" @@ -15495,7 +15495,7 @@ msgstr "" msgid "" "Point :math:`-1` corresponds to the closest edge from point `(2.9, 1.8)`." -msgstr "点:math:`-1`对应于距离点`(2.9, 1.8)` 最近的边。" +msgstr "点 :math:`-1`对应于距离点`(2.9, 1.8)` 最近的边。" msgid "" "Point :math:`-2` corresponds to the next close edge from point `(2.9, 1.8)`." @@ -15505,7 +15505,7 @@ 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 "" -"点 :math:`-2`在从顶点 :math:`1` 到点 :math:`-1`的路线上被访问（参见行 ，其中:" +"点 :math:`-2`在从顶点 :math:`1` 到点 :math:`-1` 的路线上被访问（参见行 ，其中:" "math:`seq = 4`）。" msgid "Usage variations" @@ -15515,7 +15515,7 @@ 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 "" -"所有这些示例都是关于按有向图上的顺序访问顶点:math:`\\{-6, 7, -4, 8, -2\\}`的" +"所有这些示例都是关于按有向图上的顺序访问顶点 :math:`\\{-6, 7, -4, 8, -2\\}` 的" "路线。" msgid "Status of \"passes in front\" or \"visits\" of the nodes and points." @@ -15530,7 +15530,7 @@ msgid "" "\\rightarrow 16` is restricted." msgstr "" "检测哪些路径通过了限制，在本例中是针对从 ``-6`` 到 ``15`` 的 ``path_id = 1`` ，" -"因为路径:math:`9 \\rightarrow 16`受到限制。" +"因为路径 :math:`9 \\rightarrow 16`受到限制。" msgid "" "Executes the :ref:`TRSP-family:TRSP algorithm` for the conflicting paths." @@ -15679,21 +15679,21 @@ msgstr "" "从点 :math:`1`到顶点 :math:`10`，在有向图上显示左侧驾驶侧配置的详细信息。" msgid "From point :math:`1` to point :math:`3` and vertex :math:`7`." -msgstr "从点:math:`1`到点 :math:`3`和顶点 :math:`7`。" +msgstr "从点 :math:`1`到点 :math:`3` 和顶点 :math:`7`。" msgid "From point :math:`1` and vertex :math:`6` to point :math:`3`." -msgstr "从点:math:`1`和顶点 :math:`6`到点 :math:`3`。" +msgstr "从点 :math:`1` 和顶点 :math:`6`到点 :math:`3`。" msgid "" "From point :math:`1` and vertex :math:`6` to point :math:`3` and vertex :" "math:`1`." -msgstr "从点:math:`1`和顶点 :math:`6`到点 :math:`3`和顶点:math:`1`。" +msgstr "从点 :math:`1` 和顶点 :math:`6`到点 :math:`3`和顶点:math:`1`。" msgid "" "From point :math:`1` to vertex :math:`10` and from vertex :math:`6` to " "point :math:`3` with right side driving configuration." msgstr "" -"从点:math:`1`到顶点 :math:`10`以及从顶点 :math:`6`到点 :math:`3`，采用右侧驾" +"从点 :math:`1`到顶点 :math:`10`以及从顶点 :math:`6`到点 :math:`3`，采用右侧驾" "驶配置。" msgid "" @@ -15717,7 +15717,7 @@ msgid "" "From point :math:`1` and vertex :math:`6` to point :math:`3` to vertex :math:" "`1` on an undirected graph, with details." msgstr "" -"无向图上从点:math:`1`和顶点:math:`6`到点 :math:`3`到顶点 :math:`1` 的详细信" +"无向图上从点 :math:`1` 和顶点:math:`6`到点 :math:`3`到顶点 :math:`1` 的详细信" "息。" msgid "pgr_turnRestrictedPath - Experimental" @@ -15887,7 +15887,7 @@ msgid "**options:** [directed, driving_side, details])" msgstr "**options:** [directed, driving_side, details])" msgid "From point :math:`1` to vertex :math:`10` with details" -msgstr "从点 :math:`1`到顶点:math:`10`的细节" +msgstr "从点 :math:`1`到顶点:math:`10` 的细节" msgid "Returns set of |pid-1-m|" msgstr "返回 |pid-1-m| 的集合" @@ -15895,13 +15895,13 @@ msgstr "返回 |pid-1-m| 的集合" msgid "" "From point :math:`1` to point :math:`3` and vertex :math:`7` on an " "undirected graph" -msgstr "无向图上的点:math:`1`到点 :math:`3`和顶点 :math:`7`" +msgstr "无向图上的点 :math:`1`到点 :math:`3` 和顶点 :math:`7`" msgid "Returns set of |pid-m-1|" msgstr "返回 |pid-m-1| 的集合" msgid "From point :math:`1` and vertex :math:`6` to point :math:`3`" -msgstr "从点 :math:`1`和顶点 :math:`6`到点 :math:`3`" +msgstr "从点 :math:`1` 和顶点 :math:`6`到点 :math:`3`" msgid "Returns set of |pid-m-m|" msgstr "返回 |pid-m-m| 的集合" @@ -15960,14 +15960,14 @@ msgid "" "All the examples are about traveling from point :math:`1` and vertex :math:" "`5` to points :math:`\\{2, 3, 6\\}` and vertices :math:`\\{10, 11\\}`" msgstr "" -"所有示例都是关于从点:math:`1`和顶点 :math:`5`到点:math:`\\{2, 3, 6\\}`和顶" -"点 :math:`\\{10, 11\\}`的旅行" +"所有示例都是关于从点 :math:`1` 和顶点 :math:`5`到点:math:`\\{2, 3, 6\\}`和顶" +"点 :math:`\\{10, 11\\}` 的旅行" msgid "Passes in front or visits with right side driving." msgstr "从前方超车或右侧行驶来访。" msgid "For point :math:`6` and vertex :math:`11`." -msgstr "对于点 :math:`6`和顶点 :math:`11`。" +msgstr "对于点 :math:`6` 和顶点 :math:`11`。" msgid "Passes in front or visits with left side driving." msgstr "从前方超车或以左侧驾驶方式行驶。" @@ -16009,7 +16009,7 @@ msgid "The `agg_cost` in the non included values `(v, v)` is `0`" msgstr "非包含值`(v, v)`中的`agg_cost`为`0`" msgid "The `agg_cost` in the non included values `(u, v)` is :math:`\\infty`" -msgstr "非包含值 `(u, v)`中的 `agg_cost`为:math:`\\infty`" +msgstr "非包含值 `(u, v)`中的 `agg_cost`为 :math:`\\infty`" msgid "" "If the values returned are stored in a table, the unique index would be the " @@ -16176,7 +16176,7 @@ msgid "" "Find the matrix cost of the routes from vertex :math:`1` and the two closest " "locations on the graph of point `(2.9, 1.8)`." msgstr "" -"求从顶点:math:`1`到图上点 `(2.9, 1.8)` 的两个最近位置的路线的矩阵成本。" +"求从顶点 :math:`1`到图上点 `(2.9, 1.8)` 的两个最近位置的路线的矩阵成本。" msgid "``pgr_withPointsDD`` - Proposed" msgstr "``pgr_withPointsDD`` - 拟议" @@ -16767,7 +16767,7 @@ msgstr "" msgid "" "``pgr_aStar`` (`One to One`) added ``start_vid`` and ``end_vid`` columns." -msgstr "``pgr_aStar`` （`一对一`）增加了 ``start_vid``和 ``end_vid`` 列。" +msgstr "``pgr_aStar`` （`一对一`）增加了 ``start_vid`` 和 ``end_vid`` 列。" msgid "``pgr_aStar`` (`One to Many`) added ``end_vid`` column." msgstr "``pgr_aStar``（`一对多`）添加了 ``end_vid`` 列。" @@ -19774,7 +19774,7 @@ msgstr "收缩 - 函数族" msgid "" "This family of functions is used for transforming a given input graph :math:" "`G(V,E)` into a new graph :math:`G'(V',E')`." -msgstr "该函数族用于将给定的输入图:math:`G(V,E)`转换为新图 :math:`G'(V',E')`。" +msgstr "该函数族用于将给定的输入图 :math:`G(V,E)`转换为新图 :math:`G'(V',E')`。" msgid "Traversal - Family of functions" msgstr "Traversal - 函数族" @@ -20027,13 +20027,13 @@ msgid "On the :doc:`TRSP-family` this option is not valid" msgstr "在 :doc:`TRSP-family` 上，此选项无效" msgid "Point **1** located on edge ``(5, 6)`` and ``(6, 5)``" -msgstr "点 **1** 位于边 ``(5, 6)``和 ``(6, 5)``" +msgstr "点 **1** 位于边 ``(5, 6)`` 和 ``(6, 5)``" msgid "Point **2** located on edge ``(17, 16)``and ``16, 17``" -msgstr "点 **2** 位于边 ``(17, 16)``和 ``16, 17``" +msgstr "点 **2** 位于边 ``(17, 16)`` 和 ``16, 17``" msgid "Point **4** located on edge ``(3, 1)`` and ``(1, 3)``" -msgstr "点 **4** 位于边 ``(3, 1)``和``(1, 3)``" +msgstr "点 **4** 位于边 ``(3, 1)`` 和``(1, 3)``" msgid "Creating temporary vertices" msgstr "创建临时顶点" @@ -20070,10 +20070,10 @@ msgstr "创建两条新边：" msgid "" "Edge ``(16, -2)`` with cost ``0.4`` (original cost * fraction == :math:`1 * " "0.4`)" -msgstr "边 ``(16, -2)``的成本为``0.4`` （原始成本*分数==:math:`1 * 0.4`）" +msgstr "边 ``(16, -2)`` 的成本为``0.4`` （原始成本*分数== :math:`1 * 0.4`）" msgid "Edge ``(-2, 17)`` with cost ``0.6`` (the remaing cost)" -msgstr "边 ``(-2, 17)``的成本为``0.6`` （剩余成本）" +msgstr "边 ``(-2, 17)`` 的成本为``0.6`` （剩余成本）" msgid "The total cost of the additional edges is equal to the original cost." msgstr "附加边的总成本等于原始成本。" From aba179265d1e8a023bb639ecf03d8ba942cb426a Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 23 Sep 2024 18:40:49 -0600 Subject: [PATCH 359/428] Reducing to 451 warnings --- .../LC_MESSAGES/pgrouting_doc_strings.po | 90 +++++++++---------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 1c3ff473f5..22b218a01f 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -232,7 +232,7 @@ msgid "``node``" msgstr "``node``" msgid "Identifier of ``node`` reached using ``edge``." -msgstr "使用 ``edge``到达的``node`` 的标识符。" +msgstr "使用 ``edge`` 到达的``node`` 的标识符。" msgid "``edge``" msgstr "``edge``" @@ -1194,7 +1194,7 @@ msgstr "INTEGER" msgid "" "Sequential value starting from **1** for the stops made by the current " "vehicle. The :math:`m_{th}` stop of the current vehicle." -msgstr "当前车辆停止的顺序值，从 **1** 开始。 当前第 :math:`m_{th}`车辆的停止。" +msgstr "当前车辆停止的顺序值，从 **1** 开始。 当前第 :math:`m_{th}` 车辆的停止。" msgid "Sumary row has the **total time windows violations**." msgstr "摘要行包含 **总时间窗口违规情况**。" @@ -5955,14 +5955,14 @@ msgid "" "edge :math:`(source_{id}, target_{id}, cost_{id})` has directionality: :math:" "`source_{id} \\rightarrow target_{id}`" msgstr "" -"边 :math:`(source_{id}, target_{id}, cost_{id})` 具有方向性：:math:" +"边 :math:`(source_{id}, target_{id}, cost_{id})` 具有方向性： :math:" "`source_{id} \\rightarrow target_{id}`" msgid "" "edge :math:`(target_{id}, source_{id}, reverse\\_cost_{id})` has " "directionality: :math:`target_{id} \\rightarrow source_{id}`" msgstr "" -"边 :math:`(target_{id}, source_{id}, reverse\\_cost_{id})` 具有方向性：:math:" +"边 :math:`(target_{id}, source_{id}, reverse\\_cost_{id})` 具有方向性： :math:" "`target_{id} \\rightarrow source_{id}`" msgid "Edges not part of the graph:" @@ -7055,7 +7055,7 @@ msgid "" msgstr "结束顶点的标识符。 当查询中有多个结束顶点时返回。" msgid "Identifier of the node in the path from ``start_vid`` to ``end_vid``." -msgstr "从 ``start_vid``到 ``end_vid`` 路径中节点的标识符。" +msgstr "从 ``start_vid`` 到 ``end_vid`` 路径中节点的标识符。" msgid "" "Identifier of the edge used to go from ``node`` to the next node in the path " @@ -7974,18 +7974,18 @@ msgstr "在有向图上获取从 :math:`6` 到 :math:`17` 的 2 条路径。" msgid "" "Get 2 paths from vertex :math:`6` to vertices :math:`\\{10, 17\\}` on a " "directed graph." -msgstr "获取有向图上从顶点 :math:`6`到顶点 :math:`\\{10, 17\\}` 的 2 条路径。" +msgstr "获取有向图上从顶点 :math:`6` 到顶点 :math:`\\{10, 17\\}` 的 2 条路径。" msgid "" "Get 2 paths from vertices :math:`\\{6, 1\\}` to vertex :math:`17` on a " "directed graph." -msgstr "在有向图中得到从顶点 :math:`\\{6, 1\\}`到顶点 :math:`17` 的2条路经。" +msgstr "在有向图中得到从顶点 :math:`\\{6, 1\\}` 到顶点 :math:`17` 的2条路经。" msgid "" "Get 2 paths vertices :math:`\\{6, 1\\}` to vertices :math:`\\{10, 17\\}` on " "a directed graph." msgstr "" -"在有向图中得到从顶点 :math:`\\{6, 1\\}`到顶点 :math:`\\{10, 17\\}` 的2条路经。" +"在有向图中得到从顶点 :math:`\\{6, 1\\}` 到顶点 :math:`\\{10, 17\\}` 的2条路经。" msgid "Using a combinations table on an directed graph" msgstr "在有向图上使用组合表" @@ -8026,7 +8026,7 @@ msgstr "" msgid "" "Has value **1** for the first of a path from ``start_vid`` to ``end_vid``" -msgstr "从 ``start_vid``到 ``end_vid`` 的第一个路径的值为 **1**" +msgstr "从 ``start_vid`` 到 ``end_vid`` 的第一个路径的值为 **1**" msgid "Identifier of the node in the path from ``start_vid`` to ``end_vid``" msgstr "从 ``start_vid`` 到 ``end_vid`` 路径中节点的标识符" @@ -8052,7 +8052,7 @@ msgstr "使用无向图上的组合表获取 2 条路径" msgid "" "Get 2 paths from vertices :math:`\\{6, 1\\}` to vertex :math:`17` on a " "undirected graph." -msgstr "在无向图中获取从顶点 :math:`\\{6, 1\\}`到顶点:math:`17` 的2条路径。" +msgstr "在无向图中获取从顶点 :math:`\\{6, 1\\}` 到顶点 :math:`17` 的2条路径。" msgid "https://en.wikipedia.org/wiki/K_shortest_path_routing" msgstr "https://en.wikipedia.org/wiki/K_shortest_path_routing" @@ -9440,7 +9440,7 @@ msgstr "在 **有向** 图上从顶点 :math:`\\{6, 1\\}` 到顶点 :math:`17`" msgid "" "From vertices :math:`\\{6, 1\\}` to vertices :math:`\\{10, 17\\}` on an " "**undirected** graph" -msgstr "在 **无向** 图上从顶点 :math:`\\{6, 1\\}`到顶点 :math:`\\{10, 17\\}`" +msgstr "在 **无向** 图上从顶点 :math:`\\{6, 1\\}` 到顶点 :math:`\\{10, 17\\}`" msgid "Using a combinations table on an **undirected** graph" msgstr "在 **无向** 图上使用组合表" @@ -10051,17 +10051,17 @@ msgid "From vertex :math:`11` to vertices :math:`\\{5, 10, 12\\}`" msgstr "从顶点 :math:`11` 到顶点 :math:`\\{5, 10, 12\\}`" msgid "From vertices :math:`\\{11, 3, 17\\}` to vertex :math:`12`" -msgstr "从顶点 :math:`\\{11, 3, 17\\}`到顶点 :math:`12`" +msgstr "从顶点 :math:`\\{11, 3, 17\\}` 到顶点 :math:`12`" msgid "" "From vertices :math:`\\{11, 3, 17\\}` to vertices :math:`\\{5, 10, 12\\}`" -msgstr "从顶点 :math:`\\{11, 3, 17\\}`到顶点 :math:`\\{5, 10, 12\\}`" +msgstr "从顶点 :math:`\\{11, 3, 17\\}` 到顶点 :math:`\\{5, 10, 12\\}`" msgid "" "Using a combinations table, equivalent to calculating result from vertices :" "math:`\\{5, 6\\}` to vertices :math:`\\{10, 15, 14\\}`." msgstr "" -"使用组合表，相当于计算从顶点 :math:`{5, 6\\}` 到顶点:math:`{10, 15, 14\\}` 的" +"使用组合表，相当于计算从顶点 :math:`{5, 6\\}` 到顶点 :math:`{10, 15, 14\\}` 的" "结果。" msgid "https://www.boost.org/libs/graph/doc/boykov_kolmogorov_max_flow.html" @@ -10230,7 +10230,7 @@ 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 "" -"用于从路径序列中的 ``节点``到下一个节点的边的标识符。``-1`` 表示路径的最后一个" +"用于从路径序列中的 ``节点`` 到下一个节点的边的标识符。``-1`` 表示路径的最后一个" "节点。" msgid "Aggregate cost from ``start_v`` to ``node``." @@ -11028,7 +11028,7 @@ msgstr "从顶点 :math:`\\{5, 10\\}` 到顶点 :math:`11`" msgid "" "From vertices :math:`\\{5, 15\\}` to vertices :math:`\\{11, 17\\}` on an " "**undirected** graph" -msgstr "在 **无向** 图上，从顶点 :math:`\\{5, 15\\} `到顶点 :math:`\\{11, 17\\}`" +msgstr "在 **无向** 图上，从顶点 :math:`\\{5, 15\\} ` 到顶点 :math:`\\{11, 17\\}`" msgid "Return columns" msgstr "返回列" @@ -11754,7 +11754,7 @@ msgid "" "making a connection from the first subway line :math:`\\{1, 10, 11\\}` to " "the second :math:`\\{15, 16\\}`:" msgstr "" -"将第一条地铁线 :math:`{1, 10, 11\\}` 连接到第二条地铁线:math:`{15, 16\\}`：" +"将第一条地铁线 :math:`{1, 10, 11\\}` 连接到第二条地铁线 :math:`{15, 16\\}`：" msgid "" "The best connections from all the stations from the first line are: :math:" @@ -11773,7 +11773,7 @@ msgid "" "making a connection from the second subway line :math:`\\{15, 16\\}` to the " "first :math:`\\{1, 10, 11\\}`:" msgstr "" -"将第二条地铁线 :math:`{15, 16\\}` 连接到第一条地铁线:math:`{1, 10, 11\\}`：" +"将第二条地铁线 :math:`{15, 16\\}` 连接到第一条地铁线 :math:`{1, 10, 11\\}`：" msgid "" "The best connections from all the stations from the second line are: :math:" @@ -11786,7 +11786,7 @@ msgid "" "Both are equaly good as they have the same cost. (lines: `13` and `14` and " "lines: `15` and `16`)" msgstr "" -"它们都一样好，因为它们具有相同的成本（线路：`13` 和`14`以及线路：`15`和`16`）" +"它们都一样好，因为它们具有相同的成本（线路：`13` 和`14`以及线路：`15` 和`16`）" msgid "Dijkstra optional parameters" msgstr "Dijkstra 可选参数" @@ -12038,7 +12038,7 @@ msgid "Single Vertex" msgstr "单顶点" msgid "From vertex :math:`11` for a distance of :math:`3.0`" -msgstr "从顶点 :math:`11`到:math:`3.0` 的距离" +msgstr "从顶点 :math:`11` 到 :math:`3.0` 的距离" msgid "Multiple Vertices" msgstr "多顶点" @@ -12069,7 +12069,7 @@ msgstr "``false`` 时，类似于使用单顶点签名的多次调用。" msgid "" "From vertices :math:`\\{11, 16\\}` for a distance of :math:`3.0` on an " "undirected graph" -msgstr "在无向图上，从顶点 :math:`{11, 16\\}` 开始的距离为:math:`3.0`" +msgstr "在无向图上，从顶点 :math:`{11, 16\\}` 开始的距离为 :math:`3.0`" msgid "pgr_edgeColoring - Experimental" msgstr "pgr_edgeColoring - 实验" @@ -12118,7 +12118,7 @@ msgid "" "the graph, (:math:`x'(G) = \\Delta`)" msgstr "" "色数（chromatic number） :math:`x'(G)`（用于图的适当边着色所需的最小颜色数）等" -"于图的度 :math:`\\Delta + 1`（:math:`x'(G) = \\Delta`）" +"于图的度 :math:`\\Delta + 1`（ :math:`x'(G) = \\Delta`）" msgid "The algorithm tries to assign the least possible color to every edge." msgstr "该算法尝试为每条边分配尽可能少的颜色。" @@ -12239,7 +12239,7 @@ msgid "" "math:`\\{5, 6\\}` to vertices :math:`\\{10, 15, 14\\}` on an undirected " "graph." msgstr "" -"使用组合表，相当于计算无向图上从顶点 :math:`\\{5, 6\\}`到顶点 :math:`\\{10, " +"使用组合表，相当于计算无向图上从顶点 :math:`\\{5, 6\\}` 到顶点 :math:`\\{10, " "15, 14\\}` 的结果。" msgid "Manually assigned vertex combinations on an undirected graph." @@ -12892,7 +12892,7 @@ msgid "" "Edge :math:`5` is before :math:`8` therefore edge :math:`5` has the shortest " "distance to ``POINT(2.9 1.8)``." msgstr "" -"边 :math:`5` 在:math:`8` 之前，因此边 :math:`5` 到 ``POINT(2.9 1.8)`` 的距离最" +"边 :math:`5` 在 :math:`8` 之前，因此边 :math:`5` 到 ``POINT(2.9 1.8)`` 的距离最" "短。" msgid "One answer per point, all columns" @@ -13885,7 +13885,7 @@ msgid "Updating the cost to the edge:" msgstr "将成本更新到边：" msgid "Routing from :math:`6` to :math:`3`" -msgstr "路由从 :math:`6`到 :math:`3`" +msgstr "路由从 :math:`6` 到 :math:`3`" msgid "Now the route does not use edge 8 and does a U turn on a leaf vertex." msgstr "现在，该路线不使用边 8，而是在叶顶点上进行 U 形转弯。" @@ -13946,7 +13946,7 @@ msgid "" msgstr "当使用这种方法进行具有软限制的路由时，将会出现 uturn" msgid "Routing from :math:`5` to :math:`1`" -msgstr "路由从 :math:`5` 到:math:`1`" +msgstr "路由从 :math:`5` 到 :math:`1`" msgid "https://en.wikipedia.org/wiki/Line_graph" msgstr "https://en.wikipedia.org/wiki/Line_graph" @@ -14088,7 +14088,7 @@ msgstr "新 **拟议** 的函数" #, fuzzy msgid "Calculates the maximum flow from the sources to the targets." -msgstr "计算从 `source(s)`到 `target(s)` 的最大流量。" +msgstr "计算从 `source(s)` 到 `target(s)` 的最大流量。" msgid "" "When the maximum flow is **0** then there is no flow and **0** is returned." @@ -14162,7 +14162,7 @@ msgid "" ":math:`U` is upper bound on number of iterations. In many real world cases " "number of iterations is much smaller than :math:`U`." msgstr "" -":math:`U`是迭代次数的上限。 在许多现实世界的情况下，迭代次数远小于:math:" +":math:`U`是迭代次数的上限。 在许多现实世界的情况下，迭代次数远小于 :math:" "`U` 。" msgid "pgr_maxFlowMinCost(`Edges SQL`_, **start vid**, **end vid**)" @@ -15258,12 +15258,12 @@ msgstr "无向图上从顶点 :math:`6` 到顶点 :math:`\\{10, 1\\}` 。" msgid "" "From vertices :math:`\\{6, 1\\}` to vertex :math:`8` on a directed graph." -msgstr "有向图上从顶点 :math:`\\{6, 1\\}`到顶点 :math:`8`。" +msgstr "有向图上从顶点 :math:`\\{6, 1\\}` 到顶点 :math:`8`。" msgid "" "From vertices :math:`\\{6, 1\\}` to vertices :math:`\\{10, 8\\}` on an " "undirected graph." -msgstr "无向图上从顶点 :math:`\\{6, 1\\}`到顶点 :math:`\\{10, 8\\}`。" +msgstr "无向图上从顶点 :math:`\\{6, 1\\}` 到顶点 :math:`\\{10, 8\\}`。" msgid "Using a combinations table on an undirected graph." msgstr "在无向图上使用组合表。" @@ -15291,7 +15291,7 @@ msgid "" "math:`i < size\\_of(via\\;vertices)` trying not to use restricted paths." msgstr "" "给定一个顶点列表和一个图，这个函数等同于在所有 :math:`i < size\\_of(via\\;" -"vertices)` 的情况下找到从 :math:`vertex_i`到 :math:`vertex_{i+1}`的最短路径，" +"vertices)` 的情况下找到从 :math:`vertex_i` 到 :math:`vertex_{i+1}`的最短路径，" "尽量避免使用受限路径。" msgid "The paths represents the sections of the route." @@ -15676,24 +15676,24 @@ msgid "" "From point :math:`1` to vertex :math:`10` with details on a left driving " "side configuration on a directed graph with details." msgstr "" -"从点 :math:`1`到顶点 :math:`10`，在有向图上显示左侧驾驶侧配置的详细信息。" +"从点 :math:`1` 到顶点 :math:`10`，在有向图上显示左侧驾驶侧配置的详细信息。" msgid "From point :math:`1` to point :math:`3` and vertex :math:`7`." -msgstr "从点 :math:`1`到点 :math:`3` 和顶点 :math:`7`。" +msgstr "从点 :math:`1` 到点 :math:`3` 和顶点 :math:`7`。" msgid "From point :math:`1` and vertex :math:`6` to point :math:`3`." -msgstr "从点 :math:`1` 和顶点 :math:`6`到点 :math:`3`。" +msgstr "从点 :math:`1` 和顶点 :math:`6` 到点 :math:`3`。" msgid "" "From point :math:`1` and vertex :math:`6` to point :math:`3` and vertex :" "math:`1`." -msgstr "从点 :math:`1` 和顶点 :math:`6`到点 :math:`3`和顶点:math:`1`。" +msgstr "从点 :math:`1` 和顶点 :math:`6` 到点 :math:`3` 和顶点 :math:`1`。" msgid "" "From point :math:`1` to vertex :math:`10` and from vertex :math:`6` to " "point :math:`3` with right side driving configuration." msgstr "" -"从点 :math:`1`到顶点 :math:`10`以及从顶点 :math:`6`到点 :math:`3`，采用右侧驾" +"从点 :math:`1` 到顶点 :math:`10`以及从顶点 :math:`6`到点 :math:`3`，采用右侧驾" "驶配置。" msgid "" @@ -15717,7 +15717,7 @@ msgid "" "From point :math:`1` and vertex :math:`6` to point :math:`3` to vertex :math:" "`1` on an undirected graph, with details." msgstr "" -"无向图上从点 :math:`1` 和顶点:math:`6`到点 :math:`3`到顶点 :math:`1` 的详细信" +"无向图上从点 :math:`1` 和顶点 :math:`6` 到点 :math:`3`到顶点 :math:`1` 的详细信" "息。" msgid "pgr_turnRestrictedPath - Experimental" @@ -15772,7 +15772,7 @@ msgid "When ``false`` returns the paths found" msgstr "当 ``false`` 返回找到的路径" msgid "From vertex :math:`3` to :math:`8` with ``strict`` flag on." -msgstr "从顶点 :math:`3` 到:math:`8`，并启用 ``strict`` 标志。" +msgstr "从顶点 :math:`3` 到 :math:`8`，并启用 ``strict`` 标志。" msgid "No results because the only path available follows a restriction." msgstr "没有结果，因为唯一可用的路径受到限制。" @@ -15887,7 +15887,7 @@ msgid "**options:** [directed, driving_side, details])" msgstr "**options:** [directed, driving_side, details])" msgid "From point :math:`1` to vertex :math:`10` with details" -msgstr "从点 :math:`1`到顶点:math:`10` 的细节" +msgstr "从点 :math:`1` 到顶点 :math:`10` 的细节" msgid "Returns set of |pid-1-m|" msgstr "返回 |pid-1-m| 的集合" @@ -15895,13 +15895,13 @@ msgstr "返回 |pid-1-m| 的集合" msgid "" "From point :math:`1` to point :math:`3` and vertex :math:`7` on an " "undirected graph" -msgstr "无向图上的点 :math:`1`到点 :math:`3` 和顶点 :math:`7`" +msgstr "无向图上的点 :math:`1` 到点 :math:`3` 和顶点 :math:`7`" msgid "Returns set of |pid-m-1|" msgstr "返回 |pid-m-1| 的集合" msgid "From point :math:`1` and vertex :math:`6` to point :math:`3`" -msgstr "从点 :math:`1` 和顶点 :math:`6`到点 :math:`3`" +msgstr "从点 :math:`1` 和顶点 :math:`6` 到点 :math:`3`" msgid "Returns set of |pid-m-m|" msgstr "返回 |pid-m-m| 的集合" @@ -15918,7 +15918,7 @@ msgid "" "From point :math:`1` to vertex :math:`10`, and from vertex :math:`6` to " "point :math:`3` with **right** side driving." msgstr "" -"从点 :math:`1`到顶点 :math:`10`，以及从顶点 :math:`6` 到点:math:`3` ，**右侧" +"从点 :math:`1` 到顶点 :math:`10`，以及从顶点 :math:`6` 到点 :math:`3` ，**右侧" "**行驶。" msgid "" @@ -15960,7 +15960,7 @@ msgid "" "All the examples are about traveling from point :math:`1` and vertex :math:" "`5` to points :math:`\\{2, 3, 6\\}` and vertices :math:`\\{10, 11\\}`" msgstr "" -"所有示例都是关于从点 :math:`1` 和顶点 :math:`5`到点:math:`\\{2, 3, 6\\}`和顶" +"所有示例都是关于从点 :math:`1` 和顶点 :math:`5` 到点 :math:`\\{2, 3, 6\\}` 和顶" "点 :math:`\\{10, 11\\}` 的旅行" msgid "Passes in front or visits with right side driving." @@ -16072,7 +16072,7 @@ msgid "" msgstr "与 withPoints 函数系列的其他成员不同，没有 **详细信息** 标志。" msgid "From point :math:`1` to vertex :math:`10` with defaults" -msgstr "使用默认值从点 :math:`1`到顶点:math:`10`" +msgstr "使用默认值从点 :math:`1` 到顶点 :math:`10`" msgid "" "pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, **start vid**, **end vids**, " @@ -16176,7 +16176,7 @@ msgid "" "Find the matrix cost of the routes from vertex :math:`1` and the two closest " "locations on the graph of point `(2.9, 1.8)`." msgstr "" -"求从顶点 :math:`1`到图上点 `(2.9, 1.8)` 的两个最近位置的路线的矩阵成本。" +"求从顶点 :math:`1` 到图上点 `(2.9, 1.8)` 的两个最近位置的路线的矩阵成本。" msgid "``pgr_withPointsDD`` - Proposed" msgstr "``pgr_withPointsDD`` - 拟议" From b9439740d6a9700435c04ffa1006546d8f04c753 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 23 Sep 2024 18:50:37 -0600 Subject: [PATCH 360/428] Reducing to 363 warnings --- .../LC_MESSAGES/pgrouting_doc_strings.po | 1166 ++++++++--------- 1 file changed, 583 insertions(+), 583 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 22b218a01f..21a9828dbe 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -465,7 +465,7 @@ msgid "`Restrictions SQL`_" msgstr "`Restrictions SQL`_" msgid "`Restrictions SQL`_ query as described." -msgstr "`Restrictions SQL`_按描述查询。" +msgstr "`Restrictions SQL`_ 按描述查询。" msgid "**via vertices**" msgstr "**via vertices**" @@ -837,7 +837,7 @@ msgid "`Orders SQL`_" msgstr "`Orders SQL`_" msgid "`Orders SQL`_ as described below." -msgstr "`Orders SQL`_如下所述。" +msgstr "`Orders SQL`_ 如下所述。" msgid "`Vehicles SQL`_" msgstr "`Vehicles SQL`_" @@ -989,7 +989,7 @@ msgstr "``d_node_id``" msgid "" "The node identifier of the delivery, must match a vertex identifier in the " "`Matrix SQL`_." -msgstr "送货的节点标识符必须与 `Matrix SQL`_中的顶点标识符匹配。" +msgstr "送货的节点标识符必须与 `Matrix SQL`_ 中的顶点标识符匹配。" msgid "" "For :doc:`pgr_pickDeliverEuclidean` the :math:`(x, y)` values of the " @@ -2932,13 +2932,13 @@ msgstr "没有传入边缘，但至少有一个传出边缘。" msgid "" "When the conditions are true then the `Operation: Dead End Contraction`_ can " "be done." -msgstr "当条件成立时，可以进行当条件成立时，可以进行`操作: 死端收缩`_。" +msgstr "当条件成立时，可以进行当条件成立时，可以进行`操作: 死端收缩`_ 。" msgid "Dead end vertex on undirected graph" msgstr "无向图上的死端顶点" msgid "The green nodes are `dead end`_ nodes" -msgstr "绿色节点是`死端`_节点" +msgstr "绿色节点是`死端`_ 节点" msgid "The blue nodes have an unlimited number of edges." msgstr "蓝色节点具有无限数量的边。" @@ -3056,7 +3056,7 @@ msgid "Linear vertex on undirected graph" msgstr "无向图上的线性顶点" msgid "The green nodes are `linear`_ nodes" -msgstr "绿色节点是`线性`_节点" +msgstr "绿色节点是`线性`_ 节点" msgid "The blue nodes have an unlimited number of incoming and outgoing edges." msgstr "蓝色节点具有无限数量的传入和传出边缘。" @@ -3105,11 +3105,11 @@ msgstr "操作：线性收缩" msgid "" "The linear contraction will stop when there are no more linear nodes. For " -"example from the following graph where :math:`v` and :math:`w` are `linear`_ " +"example from the following graph where :math:`v` and :math:`w` are `linear`_" "nodes:" msgstr "" "当不再有线性节点时，线性收缩将停止。 例如，在下图中，其中 :math:`v` 和 :math:`w`" -"是`线性`_节点：" +"是`线性`_ 节点：" msgid "Contracting :math:`w`," msgstr "收缩 :math:`w`，" @@ -3262,7 +3262,7 @@ msgid "Store contraction information" msgstr "存储收缩信息" msgid "Store the `contraction results`_ in a table" -msgstr "将`收缩结果`_存储在表中" +msgstr "将`收缩结果`_ 存储在表中" msgid "The vertex table update" msgstr "顶点表更新" @@ -4406,11 +4406,11 @@ msgid "https://en.wikipedia.org/wiki/Maximum_flow_problem" msgstr "https://en.wikipedia.org/wiki/Maximum_flow_problem" msgid "" -"pgRouting extends the `PostGIS `__/`PostgreSQL `__ /`PostgreSQL `__ geospatial database to provide geospatial routing and " "other network analysis functionality." msgstr "" -"pgRouting 扩展了 `PostGIS `__/`PostgreSQL `__ /`PostgreSQL `__ 地理空间数据库，以提供地理空间路由和其他网络分析功能。" msgid "This is the manual for pgRouting |release|." @@ -4428,7 +4428,7 @@ msgid "" "`license` page." msgstr "" "pgRouting 手册根据`知识共享署名-相同方式共享3.0许可证 `_。 您可以随意使用本材料，但我们要求" +"creativecommons.org/licenses/by-sa/3.0/>`_ 。 您可以随意使用本材料，但我们要求" "您将功劳归功于 pgRouting 项目，并尽可能提供返回 https://pgrouting.org 的链" "接。 有关 pgRouting 中使用的其他许可证，请参阅 :ref:`license` page.。" @@ -4616,7 +4616,7 @@ msgid "" "`#2635 `__ pgr_LineGraph " "ignores directed flag and use negative values for identifiers." msgstr "" -"`#2516 `__标准化输出" +"`#2516 `__ 标准化输出" "pgr_aStar." msgid "``pgr_lineGraph``" @@ -4788,7 +4788,7 @@ msgid "" "``pgr_dijkstra``." msgstr "" "从 `v3.5 `__开始，函数 " +"both-source-and-target-belong-to-the-contracted-graph>`__ 开始，函数 " "``my_dijkstra`` 返回 ``pgr_dijkstra`` 的新附加列。" msgid "Migration of ``pgr_bdAstar``" @@ -4828,7 +4828,7 @@ msgstr "迁移 ``pgr_dijkstra``" msgid "" "Starting from `v3.5.0 `__" msgstr "" -"从`v3.5.0 `__版本开始" +"从`v3.5.0 `__ 版本开始" msgid "``pgr_dijkstra`` (`One to One`)" msgstr "``pgr_dijkstra`` (`一对一`)" @@ -4868,7 +4868,7 @@ msgid "" "Starting from `v3.6.0 `__ :" "doc:`pgr_drivingDistance` result columns are being standardized." msgstr "" -"从 `v3.6.0 `__开始， " +"从 `v3.6.0 `__ 开始， " ":doc:`pgr_drivingDistance` 结果列正在标准化。" msgid "from" @@ -4910,7 +4910,7 @@ msgid "" "html#single-vertex>`__ example." msgstr "" "使用`这个 `__示例。" +"vertex>`__ 示例。" msgid "``depth`` contains the depth of the ``node``." msgstr "``depth``包含``node`` 的深度。" @@ -5040,10 +5040,10 @@ msgid "``pgr_KSP`` (One to One) does not have ``start_vid`` and ``end_vid``." msgstr "``pgr_KSP`` (一对一) 没有 ``start_vid`` 和``end_vid``。" msgid "" -"Using `this `__ " +"Using `this `__" "example." msgstr "" -"使用`这个`__示例。" +"使用`这个`__ 示例。" msgid "" "If needed filter out the added columns, for example, to return the original " @@ -5061,7 +5061,7 @@ msgstr "" msgid "" "Starting from `v3.4.0 `__" -msgstr "从`v3.4.0 `__开始" +msgstr "从`v3.4.0 `__ 开始" msgid "Signature to be migrated:" msgstr "待迁移签名：" @@ -5128,7 +5128,7 @@ msgid "" "doc:`pgr_primDD`, :doc:`pgr_primBFS` and :doc:`pgr_primDFS` result columns " "are being standardized." msgstr "" -"从 `v3.6.0 `__开始， :doc:" +"从 `v3.6.0 `__ 开始， :doc:" "`pgr_drivingDistance`结果列正在标准化。" #, fuzzy @@ -5168,7 +5168,7 @@ msgid "" "Starting from `v3.6.0 `__ :" "doc:`pgr_withPointsDD` result columns are being standardized." msgstr "" -"从`v3.6.0 `__开始 :doc:" +"从`v3.6.0 `__ 开始 :doc:" "`pgr_withPointsDD`结果列正在标准化。" msgid "|result-generic-no-seq|" @@ -5345,7 +5345,7 @@ msgid "" "html#signatures>`__ example." msgstr "" "使用 `这个 `__示例。" +"html#signatures>`__ 示例。" msgid "" "If needed filter out the additional columns, for example, to return the " @@ -5482,13 +5482,13 @@ msgstr "在此迁移指南中使用了 ``new_restrictions``。" msgid "" "For this migration pgRouting supplies an auxiliary function for reversal of " -"an array ``_pgr_array_reverse`` needed for the migration." +"an array ``_ pgr_array_reverse`` needed for the migration." msgstr "" "为了进行这次迁移，pgRouting 提供了一个用于反转数组的辅助函数 " -"``_pgr_array_reverse`` ，这在迁移过程中是必需的。" +"``_ pgr_array_reverse`` ，这在迁移过程中是必需的。" -msgid "``_pgr_array_reverse`` :" -msgstr "``_pgr_array_reverse`` :" +msgid "``_ pgr_array_reverse`` :" +msgstr "``_ pgr_array_reverse`` :" msgid "Was created temporally for this migration" msgstr "是为此迁移临时创建的" @@ -6024,7 +6024,7 @@ msgid "" "Solve the example problem taken from `wikipedia `__):" msgstr "" -"解决来自 `维基百科`__）" +"解决来自 `维基百科`__ ）" "的示例问题 ：" msgid "Problem is to find the shortest path from :math:`1` to :math:`5`." @@ -6215,7 +6215,7 @@ msgid "" "`__ and some others involve graph operations like :doc:" "`pgr_contraction` to contract a graph." msgstr "" -"准备图的步骤涉及使用`PostGIS `__进行几何操作，其他一些" +"准备图的步骤涉及使用`PostGIS `__ 进行几何操作，其他一些" "步骤涉及诸如:doc:`pgr_contraction` 之类的图操作来收缩图。" msgid "" @@ -6223,7 +6223,7 @@ msgid "" "on how to prepare a graph using Open Street Map data, for a small " "application." msgstr "" -"该 `workshop `__逐步介绍了如何使用开放" +"该 `workshop `__ 逐步介绍了如何使用开放" "街道地图数据为小型应用程序准备图。" msgid "The use of indexes on the database design in general:" @@ -6236,11 +6236,11 @@ msgid "Have the identifiers columns indexed." msgstr "对标识符列建立索引。" msgid "" -"Please consult the `PostgreSQL `__ " +"Please consult the `PostgreSQL `__" "documentation and the `PostGIS `__ documentation." msgstr "" "请查阅`PostgreSQL `__ 文档和 `PostGIS " -"`__文档。" +"`__ 文档。" msgid "Build a routing topology" msgstr "构建路由拓扑" @@ -6283,7 +6283,7 @@ msgid "" "html>`__)" msgstr "" "如果这些列不存在，则需要将它们添加到相关表中。 （参见`ALTER TABLE `__）" +"www.postgresql.org/docs/current/sql-altertable.html>`__ ）" msgid "" "The function :doc:`pgr_extractVertices` is used to create a vertices table " @@ -6303,11 +6303,11 @@ msgid "" "Data coming from OSM and using `osm2pgrouting `__ as an import tool, comes with the routing topology. See an " "example of using ``osm2pgrouting`` on the `workshop `__." +"pgrouting.org/latest/en/basic/data.html>`__ ." msgstr "" "来自 OSM 并使用 `osm2pgrouting `__ 作为导入工具的数据附带路由拓扑。 请参阅`workshop `__上使用 ``osm2pgrouting``" +"workshop.pgrouting.org/latest/en/basic/data.html>`__ 上使用 ``osm2pgrouting``" "的示例。" msgid "Adjust costs" @@ -6454,10 +6454,10 @@ msgstr "数据需要针对特定应用程序进行本地修复。" msgid "" "Once analyzed one by one the crossings, for the ones that need a local fix, " -"the edges need to be `split `__." +"the edges need to be `split `__ ." msgstr "" "对交叉点进行一一分析后，对于需要局部修复的交叉点，需要 `分割 `__边。" +"postgis.net/docs/ST_Split.html>`__ 边。" msgid "" "The new edges need to be added to the edges table, the rest of the " @@ -6713,14 +6713,14 @@ msgstr "pgRouting 函数调用的一般形式是：" msgid "\\ \\" msgstr "\\ \\" -msgid "pgr_(`Inner queries`_, **parameters**, [``Optional parameters``)" +msgid "pgr_(`Inner queries`_ , **parameters**, [``Optional parameters``)" msgstr "" -"pgr_(`Inner queries`_, **parameters**, [``Optional parameters``)" +"pgr_(`Inner queries`_ , **parameters**, [``Optional parameters``)" msgid "" -"`Inner queries`_: Are compulsory parameters that are ``TEXT`` strings " +"`Inner queries`_ : Are compulsory parameters that are ``TEXT`` strings " "containing SQL queries." -msgstr "`Inner queries`_：是强制参数，是包含 SQL 查询的 ``TEXT`` 字符串。" +msgstr "`Inner queries`_ ：是强制参数，是包含 SQL 查询的 ``TEXT`` 字符串。" msgid "" "**parameters**: Additional compulsory parameters needed by the function." @@ -6740,12 +6740,12 @@ msgid "For example, for this :doc:`pgr_dijkstra` signature:" msgstr "例如，对于这个 :doc:`pgr_dijkstra`签名：" msgid "" -"pgr_dijkstra(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" +"pgr_dijkstra(`Edges SQL`_ , **start vids**, **end vids**, [``directed``])" msgstr "" -"pgr_dijkstra(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" +"pgr_dijkstra(`Edges SQL`_ , **start vids**, **end vids**, [``directed``])" -msgid "`Edges SQL`_:" -msgstr "`Edges SQL`_:" +msgid "`Edges SQL`_ :" +msgstr "`Edges SQL`_ :" msgid "Is the first parameter." msgstr "是第一个参数。" @@ -6790,9 +6790,9 @@ msgid "It has a name." msgstr "它有一个名字。" msgid "" -"The full description of the parameters are found on the `Parameters`_ " +"The full description of the parameters are found on the `Parameters`_" "section of each function." -msgstr "参数的完整描述可以在每个函数的 `Parameters`_部分找到。" +msgstr "参数的完整描述可以在每个函数的 `Parameters`_ 部分找到。" msgid "Function's overloads" msgstr "函数的重载" @@ -7101,7 +7101,7 @@ msgid "When negative is the identifier of the starting point." msgstr "当负数时是起点的标识符。" msgid "Returned on `Many to One`_ and `Many to Many`_" -msgstr "`多对一`_和 `多对多`_的返回值" +msgstr "`多对一`_ 和 `多对多`_ 的返回值" msgid "``end_pid``" msgstr "``end_pid``" @@ -7116,7 +7116,7 @@ msgid "When negative is the identifier of the ending point." msgstr "当负数时是终点的标识符。" msgid "Returned on `One to Many`_ and `Many to Many`_" -msgstr "返回`一对多`_和`多对多`_" +msgstr "返回`一对多`_ 和`多对多`_" msgid "Identifier of the node in the path from ``start_pid`` to ``end_pid``." msgstr "从 ``start_pid`` 到``end_pid`` 路径中节点的标识符。" @@ -7244,7 +7244,7 @@ msgid "" "Edit an existing `pgRouting Wiki `__ page." msgstr "" -"编辑现有的 `pgRouting 维基 `__ " +"编辑现有的 `pgRouting 维基 `__" "页面。" msgid "Or create a new Wiki page" @@ -7254,7 +7254,7 @@ msgid "" "Create a page on the `pgRouting Wiki `__" msgstr "" -"在 `pgRouting 维基`__上创建页面" +"在 `pgRouting 维基`__ 上创建页面" msgid "Give the title an appropriate name" msgstr "给标题起一个合适的名称" @@ -7306,7 +7306,7 @@ msgid "" msgstr "" "有关下载和安装适用于不同操作系统的二进制文件的说明、本文档中未包含的其他注释" "和更正，可以在 `安装维基`__中找到" +"on-Download%2C-Installation-and-building-pgRouting>`__ 中找到" msgid "" "To use pgRouting PostGIS needs to be installed, please read the information " @@ -7314,7 +7314,7 @@ msgid "" "presentations/postgis_install_guide_22.html>`__" msgstr "" "使用pgRouting需要安装PostGIS，请阅读本`安装指南 `__中有关安装的信息" +"presentations/postgis_install_guide_22.html>`__ 中有关安装的信息" msgid "Short Version" msgstr "简洁版本" @@ -7666,26 +7666,26 @@ msgid "" "`PostgreSQL `__ geospatial database and adds " "routing and other network analysis functionality. A predecessor of pgRouting " "– pgDijkstra, written by Sylvain Pasche from `Camptocamp `__, was later extended by Orkney and renamed to pgRouting. The project " +"com>`__ , was later extended by Orkney and renamed to pgRouting. The project " "is now supported and maintained by `Georepublic `__, `Paragon Corporation `__ and " +"info>`__ , `Paragon Corporation `__ and " "a broad user community." msgstr "" "pgRouting 是 `PostGIS `__ 和 `PostgreSQL `__ 地理空间数据库的扩展，并添加了路由和其他网络分析功能。 " -"pgRouting的前身——pgDijkstra，由`Camptocamp `__的" +"pgRouting的前身——pgDijkstra，由`Camptocamp `__ 的" "Sylvain Pasche编写，后来被Orkney扩展并更名为pgRouting。 该项目现在得到了 " -"`Georepublic `__、`Paragon Corporation `__ 、`Paragon Corporation `__ 和广大用户社区的支持和维护。" msgid "" "pgRouting is part of `OSGeo Community Projects `__ from the `OSGeo Foundation `__ and included on `OSGeoLive `__." +"org>`__ and included on `OSGeoLive `__ ." msgstr "" "pgRouting 是 `OSGeo 基金会 `__ `OSGeo 社区项目 " "`__ 的一部分，并包含在 " -"`OSGeoLive `__中。" +"`OSGeoLive `__ 中。" msgid "Licensing" msgstr "许可" @@ -7704,7 +7704,7 @@ msgid "" "v2.0 or later `_." msgstr "" "pgRouting 的大多数功能都可以在` GNU 通用公共许可证 v2.0 或更高版本`_下使用。" +"spdx.org/licenses/GPL-2.0-or-later.html>`_ 下使用。" msgid "Boost Software License - Version 1.0" msgstr "Boost 软件许可证 - 版本 1.0" @@ -7714,7 +7714,7 @@ msgid "" "1.0 `_." msgstr "" "一些 Boost 扩展可根据` Boost 软件许可证 - 版本 1.0 获得`_。" +"org/LICENSE_1_0.txt>`_ 。" msgid "MIT-X License" msgstr "MIT-X License" @@ -7728,7 +7728,7 @@ msgid "" "Alike 3.0 License `_." msgstr "" "pgRouting 手册根据`知识共享署名-相同方式共享 3.0 许可证获得许可 `_。" +"creativecommons.org/licenses/by-sa/3.0/>`_ 。" msgid "" "In general license information should be included in the header of each " @@ -7934,27 +7934,27 @@ msgstr "签名" msgid "Summary" msgstr "总结" -msgid "pgr_KSP(`Edges SQL`_, **start vid**, **end vid**, **K**, [**options**])" +msgid "pgr_KSP(`Edges SQL`_ , **start vid**, **end vid**, **K**, [**options**])" msgstr "" -"pgr_KSP(`Edges SQL`_, **start vid**, **end vid**, **K**, [**options**])" +"pgr_KSP(`Edges SQL`_ , **start vid**, **end vid**, **K**, [**options**])" msgid "" -"pgr_KSP(`Edges SQL`_, **start vid**, **end vids**, **K**, [**options**])" +"pgr_KSP(`Edges SQL`_ , **start vid**, **end vids**, **K**, [**options**])" msgstr "" -"pgr_KSP(`Edges SQL`_, **start vid**, **end vids**, **K**, [**options**])" +"pgr_KSP(`Edges SQL`_ , **start vid**, **end vids**, **K**, [**options**])" msgid "" -"pgr_KSP(`Edges SQL`_, **start vids**, **end vid**, **K**, [**options**])" +"pgr_KSP(`Edges SQL`_ , **start vids**, **end vid**, **K**, [**options**])" msgstr "" -"pgr_KSP(`Edges SQL`_, **start vids**, **end vid**, **K**, [**options**])" +"pgr_KSP(`Edges SQL`_ , **start vids**, **end vid**, **K**, [**options**])" msgid "" -"pgr_KSP(`Edges SQL`_, **start vids**, **end vids**, **K**, [**options**])" +"pgr_KSP(`Edges SQL`_ , **start vids**, **end vids**, **K**, [**options**])" msgstr "" -"pgr_KSP(`Edges SQL`_, **start vids**, **end vids**, **K**, [**options**])" +"pgr_KSP(`Edges SQL`_ , **start vids**, **end vids**, **K**, [**options**])" -msgid "pgr_KSP(`Edges SQL`_, `Combinations SQL`_, **K**, [**options**])" -msgstr "pgr_KSP(`Edges SQL`_, `Combinations SQL`_, **K**, [**options**])" +msgid "pgr_KSP(`Edges SQL`_ , `Combinations SQL`_ , **K**, [**options**])" +msgstr "pgr_KSP(`Edges SQL`_ , `Combinations SQL`_ , **K**, [**options**])" msgid "**options:** ``[directed, heap_paths]``" msgstr "**options:** ``[directed, heap_paths]``" @@ -8073,7 +8073,7 @@ msgid "" "Metric Algorithm from `Boost library `__" msgstr "" -"`Boost库 `__中的" +"`Boost库 `__ 中的" "度量算法" msgid "Simulated Annealing Algorithm no longer supported" @@ -8179,8 +8179,8 @@ msgstr "当数据不完整，但是是连通图时：" msgid "the missing values will be calculated with dijkstra algorithm." msgstr "缺失值将使用 dijkstra 算法计算。" -msgid "pgr_TSP(`Matrix SQL`_, ``[start_id, end_id]``)" -msgstr "pgr_TSP(`Matrix SQL`_, ``[start_id, end_id]``)" +msgid "pgr_TSP(`Matrix SQL`_ , ``[start_id, end_id]``)" +msgstr "pgr_TSP(`Matrix SQL`_ , ``[start_id, end_id]``)" msgid "Returns set of |tsp-result|" msgstr "返回 |tsp-result| 的集合" @@ -8198,7 +8198,7 @@ msgstr "" "**Line 4** 顶点 :math:`\\{2, 4, 13, 14\\}` 不包括在内，因为它们未连接。" msgid "`Matrix SQL`_ as described below" -msgstr "`Matrix SQL`_如下所述" +msgstr "`Matrix SQL`_ 如下所述" msgid "``ANY-INTEGER``" msgstr "``ANY-INTEGER``" @@ -8328,8 +8328,8 @@ msgid "" "The coordinates are quite different for the same identifier, for example ::" msgstr "对于相同的标识符，坐标有很大不同，例如::" -msgid "pgr_TSPeuclidean(`Coordinates SQL`_, ``[start_id, end_id]``)" -msgstr "pgr_TSPeuclidean(`Coordinates SQL`_, ``[start_id, end_id]``)" +msgid "pgr_TSPeuclidean(`Coordinates SQL`_ , ``[start_id, end_id]``)" +msgstr "pgr_TSPeuclidean(`Coordinates SQL`_ , ``[start_id, end_id]``)" msgid "With default values" msgstr "有默认值" @@ -8365,8 +8365,8 @@ msgid "" "uwaterloo.ca/tsp/world/wi29.tsp>`__" msgstr "" "此示例展示了如何使用Waterloo大学的 `示例数据 `__（使用西撒哈拉 29 个城市的数据集 `__）进行性能测试" +"tsp/world/countries.html>`__ （使用西撒哈拉 29 个城市的数据集 `__ ）进行性能测试" msgid "Creating a table for the data and storing the data" msgstr "创建数据表并存储数据" @@ -8453,20 +8453,20 @@ msgid "" "`One to One`_ `)` on the:" msgstr "结果相当于 `pgr_aStar(` `一对一`_ `)` 结果的并集：" -msgid "pgr_aStar(`Edges SQL`_, **start vid**, **end vid**, [**options**])" -msgstr "pgr_aStar(`Edges SQL`_, **start vid**, **end vid**, [**options**])" +msgid "pgr_aStar(`Edges SQL`_ , **start vid**, **end vid**, [**options**])" +msgstr "pgr_aStar(`Edges SQL`_ , **start vid**, **end vid**, [**options**])" -msgid "pgr_aStar(`Edges SQL`_, **start vid**, **end vids**, [**options**])" -msgstr "pgr_aStar(`Edges SQL`_, **start vid**, **end vids**, [**options**])" +msgid "pgr_aStar(`Edges SQL`_ , **start vid**, **end vids**, [**options**])" +msgstr "pgr_aStar(`Edges SQL`_ , **start vid**, **end vids**, [**options**])" -msgid "pgr_aStar(`Edges SQL`_, **start vids**, **end vid**, [**options**])" -msgstr "pgr_aStar(`Edges SQL`_, **start vids**, **end vid**, [**options**])" +msgid "pgr_aStar(`Edges SQL`_ , **start vids**, **end vid**, [**options**])" +msgstr "pgr_aStar(`Edges SQL`_ , **start vids**, **end vid**, [**options**])" -msgid "pgr_aStar(`Edges SQL`_, **start vids**, **end vids**, [**options**])" -msgstr "pgr_aStar(`Edges SQL`_, **start vids**, **end vids**, [**options**])" +msgid "pgr_aStar(`Edges SQL`_ , **start vids**, **end vids**, [**options**])" +msgstr "pgr_aStar(`Edges SQL`_ , **start vids**, **end vids**, [**options**])" -msgid "pgr_aStar(`Edges SQL`_, `Combinations SQL`_, [**options**])" -msgstr "pgr_aStar(`Edges SQL`_, `Combinations SQL`_, [**options**])" +msgid "pgr_aStar(`Edges SQL`_ , `Combinations SQL`_ , [**options**])" +msgstr "pgr_aStar(`Edges SQL`_ , `Combinations SQL`_ , [**options**])" msgid "**options:** ``[directed, heuristic, factor, epsilon]``" msgstr "**options:** ``[directed, heuristic, factor, epsilon]``" @@ -8563,30 +8563,30 @@ msgstr "`start_vid`升序" msgid "`end_vid` ascending" msgstr "`end_vid`升序" -msgid "pgr_aStarCost(`Edges SQL`_, **start vid**, **end vid**, [**options**])" -msgstr "pgr_aStarCost(`Edges SQL`_, **start vid**, **end vid**, [**options**])" +msgid "pgr_aStarCost(`Edges SQL`_ , **start vid**, **end vid**, [**options**])" +msgstr "pgr_aStarCost(`Edges SQL`_ , **start vid**, **end vid**, [**options**])" -msgid "pgr_aStarCost(`Edges SQL`_, **start vid**, **end vids**, [**options**])" +msgid "pgr_aStarCost(`Edges SQL`_ , **start vid**, **end vids**, [**options**])" msgstr "" -"pgr_aStarCost(`Edges SQL`_, **start vid**, **end vids**, [**options**])" +"pgr_aStarCost(`Edges SQL`_ , **start vid**, **end vids**, [**options**])" -msgid "pgr_aStarCost(`Edges SQL`_, **start vids**, **end vid**, [**options**])" +msgid "pgr_aStarCost(`Edges SQL`_ , **start vids**, **end vid**, [**options**])" msgstr "" -"pgr_aStarCost(`Edges SQL`_, **start vids**, **end vid**, [**options**])" +"pgr_aStarCost(`Edges SQL`_ , **start vids**, **end vid**, [**options**])" msgid "" -"pgr_aStarCost(`Edges SQL`_, **start vids**, **end vids**, [**options**])" +"pgr_aStarCost(`Edges SQL`_ , **start vids**, **end vids**, [**options**])" msgstr "" -"pgr_aStarCost(`Edges SQL`_, **start vids**, **end vids**, [**options**])" +"pgr_aStarCost(`Edges SQL`_ , **start vids**, **end vids**, [**options**])" -msgid "pgr_aStarCost(`Edges SQL`_, `Combinations SQL`_, [**options**])" -msgstr "pgr_aStarCost(`Edges SQL`_, `Combinations SQL`_, [**options**])" +msgid "pgr_aStarCost(`Edges SQL`_ , `Combinations SQL`_ , [**options**])" +msgstr "pgr_aStarCost(`Edges SQL`_ , `Combinations SQL`_ , [**options**])" msgid "Returns set of |matrix-result|" msgstr "返回 |matrix-result| 的集合" -msgid "pgr_aStarCost(`Edges SQL`_, **start vids**, **end vids**, [options])" -msgstr "pgr_aStarCost(`Edges SQL`_, **start vids**, **end vids**, [options])" +msgid "pgr_aStarCost(`Edges SQL`_ , **start vids**, **end vids**, [options])" +msgstr "pgr_aStarCost(`Edges SQL`_ , **start vids**, **end vids**, [options])" msgid "``pgr_aStarCostMatrix``" msgstr "``pgr_aStarCostMatrix``" @@ -8623,8 +8623,8 @@ msgstr "从 `v` 到 `u` 的成本是 :math:`0`" msgid "When the graph is **undirected** the cost matrix is symmetric" msgstr "当图 **无向** 时，成本矩阵是对称的" -msgid "pgr_aStarCostMatrix(`Edges SQL`_, **start vids**, [**options**])" -msgstr "pgr_aStarCostMatrix(`Edges SQL`_, **start vids**, [**options**])" +msgid "pgr_aStarCostMatrix(`Edges SQL`_ , **start vids**, [**options**])" +msgstr "pgr_aStarCostMatrix(`Edges SQL`_ , **start vids**, [**options**])" msgid "" "Symmetric cost matrix for vertices :math:`\\{5, 6, 10, 15\\}` on an " @@ -9290,20 +9290,20 @@ msgid "" "`One to One`_ `)` on the:" msgstr "结果相当于`pgr_bdAStar(` `一对一`_ `)` 结果的并集：" -msgid "pgr_bdAstar(`Edges SQL`_, **start vid**, **end vid**, [**options**])" -msgstr "pgr_bdAstar(`Edges SQL`_, **start vid**, **end vid**, [**options**])" +msgid "pgr_bdAstar(`Edges SQL`_ , **start vid**, **end vid**, [**options**])" +msgstr "pgr_bdAstar(`Edges SQL`_ , **start vid**, **end vid**, [**options**])" -msgid "pgr_bdAstar(`Edges SQL`_, **start vid**, **end vids**, [**options**])" -msgstr "pgr_bdAstar(`Edges SQL`_, **start vid**, **end vids**, [**options**])" +msgid "pgr_bdAstar(`Edges SQL`_ , **start vid**, **end vids**, [**options**])" +msgstr "pgr_bdAstar(`Edges SQL`_ , **start vid**, **end vids**, [**options**])" -msgid "pgr_bdAstar(`Edges SQL`_, **start vids**, **end vid**, [**options**])" -msgstr "pgr_bdAstar(`Edges SQL`_, **start vids**, **end vid**, [**options**])" +msgid "pgr_bdAstar(`Edges SQL`_ , **start vids**, **end vid**, [**options**])" +msgstr "pgr_bdAstar(`Edges SQL`_ , **start vids**, **end vid**, [**options**])" -msgid "pgr_bdAstar(`Edges SQL`_, **start vids**, **end vids**, [**options**])" -msgstr "pgr_bdAstar(`Edges SQL`_, **start vids**, **end vids**, [**options**])" +msgid "pgr_bdAstar(`Edges SQL`_ , **start vids**, **end vids**, [**options**])" +msgstr "pgr_bdAstar(`Edges SQL`_ , **start vids**, **end vids**, [**options**])" -msgid "pgr_bdAstar(`Edges SQL`_, `Combinations SQL`_, [**options**])" -msgstr "pgr_bdAstar(`Edges SQL`_, `Combinations SQL`_, [**options**])" +msgid "pgr_bdAstar(`Edges SQL`_ , `Combinations SQL`_ , [**options**])" +msgstr "pgr_bdAstar(`Edges SQL`_ , `Combinations SQL`_ , [**options**])" msgid "pgr_bdAstarCost" msgstr "pgr_bdAstarCost" @@ -9324,27 +9324,27 @@ msgid "" msgstr "``pgr_bdAstarCost`` 函数使用双向 A* 算法汇总最短路径的成本。" msgid "" -"pgr_bdAstarCost(`Edges SQL`_, **start vid**, **end vid**, [**options**])" +"pgr_bdAstarCost(`Edges SQL`_ , **start vid**, **end vid**, [**options**])" msgstr "" -"pgr_bdAstarCost(`Edges SQL`_, **start vid**, **end vid**, [**options**])" +"pgr_bdAstarCost(`Edges SQL`_ , **start vid**, **end vid**, [**options**])" msgid "" -"pgr_bdAstarCost(`Edges SQL`_, **start vid**, **end vids**, [**options**])" +"pgr_bdAstarCost(`Edges SQL`_ , **start vid**, **end vids**, [**options**])" msgstr "" -"pgr_bdAstarCost(`Edges SQL`_, **start vid**, **end vids**, [**options**])" +"pgr_bdAstarCost(`Edges SQL`_ , **start vid**, **end vids**, [**options**])" msgid "" -"pgr_bdAstarCost(`Edges SQL`_, **start vids**, **end vid**, [**options**])" +"pgr_bdAstarCost(`Edges SQL`_ , **start vids**, **end vid**, [**options**])" msgstr "" -"pgr_bdAstarCost(`Edges SQL`_, **start vids**, **end vid**, [**options**])" +"pgr_bdAstarCost(`Edges SQL`_ , **start vids**, **end vid**, [**options**])" msgid "" -"pgr_bdAstarCost(`Edges SQL`_, **start vids**, **end vids**, [**options**])" +"pgr_bdAstarCost(`Edges SQL`_ , **start vids**, **end vids**, [**options**])" msgstr "" -"pgr_bdAstarCost(`Edges SQL`_, **start vids**, **end vids**, [**options**])" +"pgr_bdAstarCost(`Edges SQL`_ , **start vids**, **end vids**, [**options**])" -msgid "pgr_bdAstarCost(`Edges SQL`_, `Combinations SQL`_, [**options**])" -msgstr "pgr_bdAstarCost(`Edges SQL`_, `Combinations SQL`_, [**options**])" +msgid "pgr_bdAstarCost(`Edges SQL`_ , `Combinations SQL`_ , [**options**])" +msgstr "pgr_bdAstarCost(`Edges SQL`_ , `Combinations SQL`_ , [**options**])" msgid "``pgr_bdAstarCostMatrix``" msgstr "``pgr_bdAstarCostMatrix``" @@ -9357,8 +9357,8 @@ msgstr "``pgr_bdAstarCostMatrix`` - 使用:doc:`pgr_aStar` 计算成本矩阵。 msgid "Using internaly the :doc:`pgr_bdAstar` algorithm" msgstr "内部使用 :doc:`pgr_bdAstar` 算法" -msgid "pgr_bdAstarCostMatrix(`Edges SQL`_, **start vids**, [**options**])" -msgstr "pgr_bdAstarCostMatrix(`Edges SQL`_, **start vids**, [**options**])" +msgid "pgr_bdAstarCostMatrix(`Edges SQL`_ , **start vids**, [**options**])" +msgstr "pgr_bdAstarCostMatrix(`Edges SQL`_ , **start vids**, [**options**])" msgid "``pgr_bdDijkstra``" msgstr "``pgr_bdDijkstra``" @@ -9391,27 +9391,27 @@ msgid "**Official** ``pgr_bdDijkstra`` (`One to One`_)" msgstr "**官方** ``pgr_bdDijkstra`` (`一对一`_)" msgid "" -"pgr_bdDijkstra(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" +"pgr_bdDijkstra(`Edges SQL`_ , **start vid**, **end vid**, [``directed``])" msgstr "" -"pgr_bdDijkstra(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" +"pgr_bdDijkstra(`Edges SQL`_ , **start vid**, **end vid**, [``directed``])" msgid "" -"pgr_bdDijkstra(`Edges SQL`_, **start vid**, **end vids**, [``directed``])" +"pgr_bdDijkstra(`Edges SQL`_ , **start vid**, **end vids**, [``directed``])" msgstr "" -"pgr_bdDijkstra(`Edges SQL`_, **start vid**, **end vids**, [``directed``])" +"pgr_bdDijkstra(`Edges SQL`_ , **start vid**, **end vids**, [``directed``])" msgid "" -"pgr_bdDijkstra(`Edges SQL`_, **start vids**, **end vid**, [``directed``])" +"pgr_bdDijkstra(`Edges SQL`_ , **start vids**, **end vid**, [``directed``])" msgstr "" -"pgr_bdDijkstra(`Edges SQL`_, **start vids**, **end vid**, [``directed``])" +"pgr_bdDijkstra(`Edges SQL`_ , **start vids**, **end vid**, [``directed``])" msgid "" -"pgr_bdDijkstra(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" +"pgr_bdDijkstra(`Edges SQL`_ , **start vids**, **end vids**, [``directed``])" msgstr "" -"pgr_bdDijkstra(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" +"pgr_bdDijkstra(`Edges SQL`_ , **start vids**, **end vids**, [``directed``])" -msgid "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_, [``directed``])" -msgstr "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_, [``directed``])" +msgid "pgr_bdDijkstra(`Edges SQL`_ , `Combinations SQL`_ , [``directed``])" +msgstr "pgr_bdDijkstra(`Edges SQL`_ , `Combinations SQL`_ , [``directed``])" msgid "Returns set of |old-generic-result|" msgstr "返回 |old-generic-result| 的集合" @@ -9473,34 +9473,34 @@ msgid "" msgstr "``pgr_bdDijkstraCost`` 函数使用双向 Dijkstra 算法汇总最短路径的成本。" msgid "" -"pgr_bdDijkstraCost(`Edges SQL`_, **start vid**, **end vid** , [``directed``])" +"pgr_bdDijkstraCost(`Edges SQL`_ , **start vid**, **end vid** , [``directed``])" msgstr "" -"pgr_bdDijkstraCost(`Edges SQL`_, **start vid**, **end vid** , [``directed``])" +"pgr_bdDijkstraCost(`Edges SQL`_ , **start vid**, **end vid** , [``directed``])" msgid "" -"pgr_bdDijkstraCost(`Edges SQL`_, **start vid**, **end vids**, [``directed``])" +"pgr_bdDijkstraCost(`Edges SQL`_ , **start vid**, **end vids**, [``directed``])" msgstr "" -"pgr_bdDijkstraCost(`Edges SQL`_, **start vid**, **end vids**, [``directed``])" +"pgr_bdDijkstraCost(`Edges SQL`_ , **start vid**, **end vids**, [``directed``])" msgid "" -"pgr_bdDijkstraCost(`Edges SQL`_, **start vids**, **end vid** , " +"pgr_bdDijkstraCost(`Edges SQL`_ , **start vids**, **end vid** , " "[``directed``])" msgstr "" -"pgr_bdDijkstraCost(`Edges SQL`_, **start vids**, **end vid** , " +"pgr_bdDijkstraCost(`Edges SQL`_ , **start vids**, **end vid** , " "[``directed``])" msgid "" -"pgr_bdDijkstraCost(`Edges SQL`_, **start vids**, **end vids**, " +"pgr_bdDijkstraCost(`Edges SQL`_ , **start vids**, **end vids**, " "[``directed``])" msgstr "" -"pgr_bdDijkstraCost(`Edges SQL`_, **start vids**, **end vids**, " +"pgr_bdDijkstraCost(`Edges SQL`_ , **start vids**, **end vids**, " "[``directed``])" -msgid "pgr_bdDijkstraCost(`Edges SQL`_, `Combinations SQL`_, [``directed``])" -msgstr "pgr_bdDijkstraCost(`Edges SQL`_, `Combinations SQL`_, [``directed``])" +msgid "pgr_bdDijkstraCost(`Edges SQL`_ , `Combinations SQL`_ , [``directed``])" +msgstr "pgr_bdDijkstraCost(`Edges SQL`_ , `Combinations SQL`_ , [``directed``])" -msgid "pgr_bdDijkstraCost(`Edges SQL`_, `Combinations SQL`_, [``directed``])" -msgstr "pgr_bdDijkstraCost(`Edges SQL`_, `Combinations SQL`_, [``directed``])" +msgid "pgr_bdDijkstraCost(`Edges SQL`_ , `Combinations SQL`_ , [``directed``])" +msgstr "pgr_bdDijkstraCost(`Edges SQL`_ , `Combinations SQL`_ , [``directed``])" msgid "``pgr_bdDijkstraCostMatrix``" msgstr "``pgr_bdDijkstraCostMatrix``" @@ -9515,8 +9515,8 @@ msgid "" "Using bidirectional Dijkstra algorithm, calculate and return a cost matrix." msgstr "使用双向Dijkstra算法，计算并返回成本矩阵。" -msgid "pgr_bdDijkstraCostMatrix(`Edges SQL`_, **start vids**, [``directed``])" -msgstr "pgr_bdDijkstraCostMatrix(`Edges SQL`_, **start vids**, [``directed``])" +msgid "pgr_bdDijkstraCostMatrix(`Edges SQL`_ , **start vids**, [``directed``])" +msgstr "pgr_bdDijkstraCostMatrix(`Edges SQL`_ , **start vids**, [``directed``])" msgid "" "Symmetric cost matrix for vertices :math:`\\{5, 6, 10, 15\\}` on an " @@ -9611,27 +9611,27 @@ msgid "Running time: :math:`O(| start\\_vids | * ( V * E))`" msgstr "运行时间： :math:`O(| start\\_vids | * ( V * E))`" msgid "" -"pgr_bellmanFord(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" +"pgr_bellmanFord(`Edges SQL`_ , **start vid**, **end vid**, [``directed``])" msgstr "" -"pgr_bellmanFord(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" +"pgr_bellmanFord(`Edges SQL`_ , **start vid**, **end vid**, [``directed``])" msgid "" -"pgr_bellmanFord(`Edges SQL`_, **start vid**, **end vids**, [``directed``])" +"pgr_bellmanFord(`Edges SQL`_ , **start vid**, **end vids**, [``directed``])" msgstr "" -"pgr_bellmanFord(`Edges SQL`_, **start vid**, **end vids**, [``directed``])" +"pgr_bellmanFord(`Edges SQL`_ , **start vid**, **end vids**, [``directed``])" msgid "" -"pgr_bellmanFord(`Edges SQL`_, **start vids**, **end vid**, [``directed``])" +"pgr_bellmanFord(`Edges SQL`_ , **start vids**, **end vid**, [``directed``])" msgstr "" -"pgr_bellmanFord(`Edges SQL`_, **start vids**, **end vid**, [``directed``])" +"pgr_bellmanFord(`Edges SQL`_ , **start vids**, **end vid**, [``directed``])" msgid "" -"pgr_bellmanFord(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" +"pgr_bellmanFord(`Edges SQL`_ , **start vids**, **end vids**, [``directed``])" msgstr "" -"pgr_bellmanFord(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" +"pgr_bellmanFord(`Edges SQL`_ , **start vids**, **end vids**, [``directed``])" -msgid "pgr_bellmanFord(`Edges SQL`_, `Combinations SQL`_, [``directed``])" -msgstr "pgr_bellmanFord(`Edges SQL`_, `Combinations SQL`_, [``directed``])" +msgid "pgr_bellmanFord(`Edges SQL`_ , `Combinations SQL`_ , [``directed``])" +msgstr "pgr_bellmanFord(`Edges SQL`_ , `Combinations SQL`_ , [``directed``])" msgid "" "From vertex :math:`6` to vertices :math:`\\{ 10, 17\\}` on a **directed**" @@ -9693,8 +9693,8 @@ msgid "Throws when there are no edges in the graph" msgstr "当图中没有边时，返回 EMPTY SET。" #, fuzzy -msgid "pgr_betweennessCentrality(`Edges SQL`_, [``directed``])" -msgstr "pgr_lineGraph(`Edges SQL`_, [``directed``])" +msgid "pgr_betweennessCentrality(`Edges SQL`_ , [``directed``])" +msgstr "pgr_lineGraph(`Edges SQL`_ , [``directed``])" #, fuzzy msgid "Returns set of ``(vid, centrality)``" @@ -9885,38 +9885,38 @@ msgid "Running time: :math:`O(| start\\_vids | * |E|)`" msgstr "运行时间： :math:`O(| start\\_vids | * |E|)`" msgid "" -"pgr_binaryBreadthFirstSearch(`Edges SQL`_, **start vid**, **end vid**, " +"pgr_binaryBreadthFirstSearch(`Edges SQL`_ , **start vid**, **end vid**, " "[``directed``])" msgstr "" -"pgr_binaryBreadthFirstSearch(`Edges SQL`_, **start vid**, **end vid**, " +"pgr_binaryBreadthFirstSearch(`Edges SQL`_ , **start vid**, **end vid**, " "[``directed``])" msgid "" -"pgr_binaryBreadthFirstSearch(`Edges SQL`_, **start vid**, **end vids**, " +"pgr_binaryBreadthFirstSearch(`Edges SQL`_ , **start vid**, **end vids**, " "[``directed``])" msgstr "" -"pgr_binaryBreadthFirstSearch(`Edges SQL`_, **start vid**, **end vids**, " +"pgr_binaryBreadthFirstSearch(`Edges SQL`_ , **start vid**, **end vids**, " "[``directed``])" msgid "" -"pgr_binaryBreadthFirstSearch(`Edges SQL`_, **start vids**, **end vid**, " +"pgr_binaryBreadthFirstSearch(`Edges SQL`_ , **start vids**, **end vid**, " "[``directed``])" msgstr "" -"pgr_binaryBreadthFirstSearch(`Edges SQL`_, **start vids**, **end vid**, " +"pgr_binaryBreadthFirstSearch(`Edges SQL`_ , **start vids**, **end vid**, " "[``directed``])" msgid "" -"pgr_binaryBreadthFirstSearch(`Edges SQL`_, **start vids**, **end vids**, " +"pgr_binaryBreadthFirstSearch(`Edges SQL`_ , **start vids**, **end vids**, " "[``directed``])" msgstr "" -"pgr_binaryBreadthFirstSearch(`Edges SQL`_, **start vids**, **end vids**, " +"pgr_binaryBreadthFirstSearch(`Edges SQL`_ , **start vids**, **end vids**, " "[``directed``])" msgid "" -"pgr_binaryBreadthFirstSearch(`Edges SQL`_, `Combinations SQL`_, " +"pgr_binaryBreadthFirstSearch(`Edges SQL`_ , `Combinations SQL`_ , " "[``directed``])" msgstr "" -"pgr_binaryBreadthFirstSearch(`Edges SQL`_, `Combinations SQL`_, " +"pgr_binaryBreadthFirstSearch(`Edges SQL`_ , `Combinations SQL`_ , " "[``directed``])" msgid "" @@ -10026,20 +10026,20 @@ msgstr "新的 **实验** 函数" msgid "Running time: Polynomial" msgstr "运行时间：多项式时间" -msgid "pgr_boykovKolmogorov(`Edges SQL`_, **start vid**, **end vid**)" -msgstr "pgr_boykovKolmogorov(`Edges SQL`_, **start vid**, **end vid**)" +msgid "pgr_boykovKolmogorov(`Edges SQL`_ , **start vid**, **end vid**)" +msgstr "pgr_boykovKolmogorov(`Edges SQL`_ , **start vid**, **end vid**)" -msgid "pgr_boykovKolmogorov(`Edges SQL`_, **start vid**, **end vids**)" -msgstr "pgr_boykovKolmogorov(`Edges SQL`_, **start vid**, **end vids**)" +msgid "pgr_boykovKolmogorov(`Edges SQL`_ , **start vid**, **end vids**)" +msgstr "pgr_boykovKolmogorov(`Edges SQL`_ , **start vid**, **end vids**)" -msgid "pgr_boykovKolmogorov(`Edges SQL`_, **start vids**, **end vid**)" -msgstr "pgr_boykovKolmogorov(`Edges SQL`_, **start vids**, **end vid**)" +msgid "pgr_boykovKolmogorov(`Edges SQL`_ , **start vids**, **end vid**)" +msgstr "pgr_boykovKolmogorov(`Edges SQL`_ , **start vids**, **end vid**)" -msgid "pgr_boykovKolmogorov(`Edges SQL`_, **start vids**, **end vids**)" -msgstr "pgr_boykovKolmogorov(`Edges SQL`_, **start vids**, **end vids**)" +msgid "pgr_boykovKolmogorov(`Edges SQL`_ , **start vids**, **end vids**)" +msgstr "pgr_boykovKolmogorov(`Edges SQL`_ , **start vids**, **end vids**)" -msgid "pgr_boykovKolmogorov(`Edges SQL`_, `Combinations SQL`_)" -msgstr "pgr_boykovKolmogorov(`Edges SQL`_, `Combinations SQL`_)" +msgid "pgr_boykovKolmogorov(`Edges SQL`_ , `Combinations SQL`_)" +msgstr "pgr_boykovKolmogorov(`Edges SQL`_ , `Combinations SQL`_)" msgid "Returns set of |result-flow|" msgstr "Returns set of |result-flow|" @@ -10097,11 +10097,11 @@ msgstr "提供从源节点到目标深度级别的广度优先搜索遍历顺序 msgid "Running time: :math:`O(E + V)`" msgstr "运行时间： :math:`O(E + V)`" -msgid "pgr_breadthFirstSearch(`Edges SQL`_, **root vid**, [**options**])" -msgstr "pgr_breadthFirstSearch(`Edges SQL`_, **root vid**, [**options**])" +msgid "pgr_breadthFirstSearch(`Edges SQL`_ , **root vid**, [**options**])" +msgstr "pgr_breadthFirstSearch(`Edges SQL`_ , **root vid**, [**options**])" -msgid "pgr_breadthFirstSearch(`Edges SQL`_, **root vids**, [**options**])" -msgstr "pgr_breadthFirstSearch(`Edges SQL`_, **root vids**, [**options**])" +msgid "pgr_breadthFirstSearch(`Edges SQL`_ , **root vids**, [**options**])" +msgstr "pgr_breadthFirstSearch(`Edges SQL`_ , **root vids**, [**options**])" msgid "**options:** ``[max_depth, directed]``" msgstr "**options:** ``[max_depth, directed]``" @@ -10373,8 +10373,8 @@ msgstr "当类型为 ``e`` 时，按列``id`` 降序" msgid "The pgr_contraction function has the following signature:" msgstr "pgr_contraction 函数具有以下签名：" -msgid "pgr_contraction(`Edges SQL`_, **contraction order**, [**options**])" -msgstr "pgr_contraction(`Edges SQL`_, **contraction order**, [**options**])" +msgid "pgr_contraction(`Edges SQL`_ , **contraction order**, [**options**])" +msgstr "pgr_contraction(`Edges SQL`_ , **contraction order**, [**options**])" msgid "**options:** ``[ max_cycles, forbidden_vertices, directed]``" msgstr "**options:** ``[ max_cycles, forbidden_vertices, directed]``" @@ -11001,20 +11001,20 @@ msgstr "`agg_cost`中未包括的值 `(u, v)`是数学符号中的 :math:`\\inft msgid "Running time: :math:`O(| start\\_vids | * (V + E))`" msgstr "运行时间： :math:`O(| start\\_vids | * (V + E))`" -msgid "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vid**)" -msgstr "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vid**)" +msgid "pgr_dagShortestPath(`Edges SQL`_ , **start vid**, **end vid**)" +msgstr "pgr_dagShortestPath(`Edges SQL`_ , **start vid**, **end vid**)" -msgid "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vids**)" -msgstr "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vids**)" +msgid "pgr_dagShortestPath(`Edges SQL`_ , **start vid**, **end vids**)" +msgstr "pgr_dagShortestPath(`Edges SQL`_ , **start vid**, **end vids**)" -msgid "pgr_dagShortestPath(`Edges SQL`_, **start vids**, **end vid**)" -msgstr "pgr_dagShortestPath(`Edges SQL`_, **start vids**, **end vid**)" +msgid "pgr_dagShortestPath(`Edges SQL`_ , **start vids**, **end vid**)" +msgstr "pgr_dagShortestPath(`Edges SQL`_ , **start vids**, **end vid**)" -msgid "pgr_dagShortestPath(`Edges SQL`_, **start vids**, **end vids**)" -msgstr "pgr_dagShortestPath(`Edges SQL`_, **start vids**, **end vids**)" +msgid "pgr_dagShortestPath(`Edges SQL`_ , **start vids**, **end vids**)" +msgstr "pgr_dagShortestPath(`Edges SQL`_ , **start vids**, **end vids**)" -msgid "pgr_dagShortestPath(`Edges SQL`_, `Combinations SQL`_)" -msgstr "pgr_dagShortestPath(`Edges SQL`_, `Combinations SQL`_)" +msgid "pgr_dagShortestPath(`Edges SQL`_ , `Combinations SQL`_)" +msgstr "pgr_dagShortestPath(`Edges SQL`_ , `Combinations SQL`_)" msgid "From vertex :math:`5` to vertex :math:`11` on a **directed** graph" msgstr "在 **有向** 图上，从顶点 :math:`5` 到顶点 :math:`11`" @@ -11050,8 +11050,8 @@ msgstr "``pgr_degree`` —对于无向图中的每个顶点，返回与该顶点 msgid "Calculates the degree of the vertices of an **undirected** graph" msgstr "计算 **无向** 图顶点的度数" -msgid "pgr_degree(`Edges SQL`_ , `Vertex SQL`_, [``dryrun``])" -msgstr "pgr_degree(`Edges SQL`_ , `Vertex SQL`_, [``dryrun``])" +msgid "pgr_degree(`Edges SQL`_ , `Vertex SQL`_ , [``dryrun``])" +msgstr "pgr_degree(`Edges SQL`_ , `Vertex SQL`_ , [``dryrun``])" msgid "RETURNS SETOF |result-degree|" msgstr "RETURNS SETOF |result-degree|" @@ -11073,7 +11073,7 @@ msgid "`Vertex SQL`_" msgstr "`Vertex SQL`_" msgid "`Vertex SQL`_ as described below" -msgstr "`Vertex SQL`_如下所述" +msgstr "`Vertex SQL`_ 如下所述" msgid "``dryrun``" msgstr "``dryrun``" @@ -11214,17 +11214,17 @@ msgstr "返回值按 `start_vid` 升序排列。" msgid "Depth First Search Running time: :math:`O(E + V)`" msgstr "深度优先搜索运行时间： :math:`O(E + V)`" -msgid "pgr_depthFirstSearch(`Edges SQL`_, **root vid**, [**options**])" -msgstr "pgr_depthFirstSearch(`Edges SQL`_, **root vid**, [**options**])" +msgid "pgr_depthFirstSearch(`Edges SQL`_ , **root vid**, [**options**])" +msgstr "pgr_depthFirstSearch(`Edges SQL`_ , **root vid**, [**options**])" -msgid "pgr_depthFirstSearch(`Edges SQL`_, **root vids**, [**options**])" -msgstr "pgr_depthFirstSearch(`Edges SQL`_, **root vids**, [**options**])" +msgid "pgr_depthFirstSearch(`Edges SQL`_ , **root vids**, [**options**])" +msgstr "pgr_depthFirstSearch(`Edges SQL`_ , **root vids**, [**options**])" msgid "**options:** ``[directed, max_depth]``" msgstr "**options:** ``[directed, max_depth]``" msgid "Same as `Single vertex`_ but with edges in descending order of ``id``." -msgstr "与 `单顶点`_相同，但边按 ``id`` 降序排列。" +msgstr "与 `单顶点`_ 相同，但边按 ``id`` 降序排列。" msgid "" "`Boost: Depth First Search algorithm documentation `算法。" msgid "Running time: :math:`O( V ^ 3)`" msgstr "运行时间： :math:`O( V ^ 3)`" -msgid "pgr_maxFlow(`Edges SQL`_, **start vid**, **end vid**)" -msgstr "pgr_maxFlow(`Edges SQL`_, **start vid**, **end vid**)" +msgid "pgr_maxFlow(`Edges SQL`_ , **start vid**, **end vid**)" +msgstr "pgr_maxFlow(`Edges SQL`_ , **start vid**, **end vid**)" -msgid "pgr_maxFlow(`Edges SQL`_, **start vid**, **end vids**)" -msgstr "pgr_maxFlow(`Edges SQL`_, **start vid**, **end vids**)" +msgid "pgr_maxFlow(`Edges SQL`_ , **start vid**, **end vids**)" +msgstr "pgr_maxFlow(`Edges SQL`_ , **start vid**, **end vids**)" -msgid "pgr_maxFlow(`Edges SQL`_, **start vids**, **end vid**)" -msgstr "pgr_maxFlow(`Edges SQL`_, **start vids**, **end vid**)" +msgid "pgr_maxFlow(`Edges SQL`_ , **start vids**, **end vid**)" +msgstr "pgr_maxFlow(`Edges SQL`_ , **start vids**, **end vid**)" -msgid "pgr_maxFlow(`Edges SQL`_, **start vids**, **end vids**)" -msgstr "pgr_maxFlow(`Edges SQL`_, **start vids**, **end vids**)" +msgid "pgr_maxFlow(`Edges SQL`_ , **start vids**, **end vids**)" +msgstr "pgr_maxFlow(`Edges SQL`_ , **start vids**, **end vids**)" -msgid "pgr_maxFlow(`Edges SQL`_, `Combinations SQL`_)" -msgstr "pgr_maxFlow(`Edges SQL`_, `Combinations SQL`_)" +msgid "pgr_maxFlow(`Edges SQL`_ , `Combinations SQL`_)" +msgstr "pgr_maxFlow(`Edges SQL`_ , `Combinations SQL`_)" msgid "RETURNS ``BIGINT``" msgstr "RETURNS ``BIGINT``" @@ -14165,20 +14165,20 @@ msgstr "" ":math:`U`是迭代次数的上限。 在许多现实世界的情况下，迭代次数远小于 :math:" "`U` 。" -msgid "pgr_maxFlowMinCost(`Edges SQL`_, **start vid**, **end vid**)" -msgstr "pgr_maxFlowMinCost(`Edges SQL`_, **start vid**, **end vid**)" +msgid "pgr_maxFlowMinCost(`Edges SQL`_ , **start vid**, **end vid**)" +msgstr "pgr_maxFlowMinCost(`Edges SQL`_ , **start vid**, **end vid**)" -msgid "pgr_maxFlowMinCost(`Edges SQL`_, **start vid**, **end vids**)" -msgstr "pgr_maxFlowMinCost(`Edges SQL`_, **start vid**, **end vids**)" +msgid "pgr_maxFlowMinCost(`Edges SQL`_ , **start vid**, **end vids**)" +msgstr "pgr_maxFlowMinCost(`Edges SQL`_ , **start vid**, **end vids**)" -msgid "pgr_maxFlowMinCost(`Edges SQL`_, **start vids**, **end vid**)" -msgstr "pgr_maxFlowMinCost(`Edges SQL`_, **start vids**, **end vid**)" +msgid "pgr_maxFlowMinCost(`Edges SQL`_ , **start vids**, **end vid**)" +msgstr "pgr_maxFlowMinCost(`Edges SQL`_ , **start vids**, **end vid**)" -msgid "pgr_maxFlowMinCost(`Edges SQL`_, **start vids**, **end vids**)" -msgstr "pgr_maxFlowMinCost(`Edges SQL`_, **start vids**, **end vids**)" +msgid "pgr_maxFlowMinCost(`Edges SQL`_ , **start vids**, **end vids**)" +msgstr "pgr_maxFlowMinCost(`Edges SQL`_ , **start vids**, **end vids**)" -msgid "pgr_maxFlowMinCost(`Edges SQL`_, `Combinations SQL`_)" -msgstr "pgr_maxFlowMinCost(`Edges SQL`_, `Combinations SQL`_)" +msgid "pgr_maxFlowMinCost(`Edges SQL`_ , `Combinations SQL`_)" +msgstr "pgr_maxFlowMinCost(`Edges SQL`_ , `Combinations SQL`_)" msgid "Returns set of |result-flow-mincost|" msgstr "返回 |result-flow-mincost| 的集合" @@ -14210,20 +14210,20 @@ msgstr "当最大流量为0时则没有流量，返回 **0** 。" msgid "Uses :doc:`pgr_maxFlowMinCost`." msgstr "使用:doc:`pgr_maxFlowMinCost`。" -msgid "pgr_maxFlowMinCost_Cost(`Edges SQL`_, **start vid**, **end vid**)" -msgstr "pgr_maxFlowMinCost_Cost(`Edges SQL`_, **start vid**, **end vid**)" +msgid "pgr_maxFlowMinCost_Cost(`Edges SQL`_ , **start vid**, **end vid**)" +msgstr "pgr_maxFlowMinCost_Cost(`Edges SQL`_ , **start vid**, **end vid**)" -msgid "pgr_maxFlowMinCost_Cost(`Edges SQL`_, **start vid**, **end vids**)" -msgstr "pgr_maxFlowMinCost_Cost(`Edges SQL`_, **start vid**, **end vids**)" +msgid "pgr_maxFlowMinCost_Cost(`Edges SQL`_ , **start vid**, **end vids**)" +msgstr "pgr_maxFlowMinCost_Cost(`Edges SQL`_ , **start vid**, **end vids**)" -msgid "pgr_maxFlowMinCost_Cost(`Edges SQL`_, **start vids**, **end vid**)" -msgstr "pgr_maxFlowMinCost_Cost(`Edges SQL`_, **start vids**, **end vid**)" +msgid "pgr_maxFlowMinCost_Cost(`Edges SQL`_ , **start vids**, **end vid**)" +msgstr "pgr_maxFlowMinCost_Cost(`Edges SQL`_ , **start vids**, **end vid**)" -msgid "pgr_maxFlowMinCost_Cost(`Edges SQL`_, **start vids**, **end vids**)" -msgstr "pgr_maxFlowMinCost_Cost(`Edges SQL`_, **start vids**, **end vids**)" +msgid "pgr_maxFlowMinCost_Cost(`Edges SQL`_ , **start vids**, **end vids**)" +msgstr "pgr_maxFlowMinCost_Cost(`Edges SQL`_ , **start vids**, **end vids**)" -msgid "pgr_maxFlowMinCost_Cost(`Edges SQL`_, `Combinations SQL`_)" -msgstr "pgr_maxFlowMinCost_Cost(`Edges SQL`_, `Combinations SQL`_)" +msgid "pgr_maxFlowMinCost_Cost(`Edges SQL`_ , `Combinations SQL`_)" +msgstr "pgr_maxFlowMinCost_Cost(`Edges SQL`_ , `Combinations SQL`_)" msgid "RETURNS FLOAT" msgstr "RETURNS FLOAT" @@ -14575,9 +14575,9 @@ msgid "Signature" msgstr "标识" msgid "" -"pgr_pickDeliver(`Orders SQL`_, `Vehicles SQL`_, `Matrix SQL`_, [**options**])" +"pgr_pickDeliver(`Orders SQL`_ , `Vehicles SQL`_ , `Matrix SQL`_ , [**options**])" msgstr "" -"pgr_pickDeliver(`Orders SQL`_, `Vehicles SQL`_, `Matrix SQL`_, [**options**])" +"pgr_pickDeliver(`Orders SQL`_ , `Vehicles SQL`_ , `Matrix SQL`_ , [**options**])" msgid "**options:** ``[factor, max_cycles, initial_sol]``" msgstr "**options:** ``[factor, max_cycles, initial_sol]``" @@ -14661,9 +14661,9 @@ msgstr "六种不同的可选不同初始解决方案" msgid "the best solution found will be result" msgstr "找到的最佳解决方案将作为结果" -msgid "pgr_pickDeliverEuclidean(`Orders SQL`_, `Vehicles SQL`_, [**options**])" +msgid "pgr_pickDeliverEuclidean(`Orders SQL`_ , `Vehicles SQL`_ , [**options**])" msgstr "" -"pgr_pickDeliverEuclidean(`Orders SQL`_, `Vehicles SQL`_, [**options**])" +"pgr_pickDeliverEuclidean(`Orders SQL`_ , `Vehicles SQL`_ , [**options**])" msgid "p_x, p_y, p_open, p_close, [p_service,]" msgstr "p_x, p_y, p_open, p_close, [p_service,]" @@ -14755,11 +14755,11 @@ msgid "" msgstr "" "访问并提取使用 Prims 算法创建的最小生成树的深度优先搜索顺序中的节点信息。" -msgid "pgr_primBFS(`Edges SQL`_, **root vid**, [``max_depth``])" -msgstr "pgr_primBFS(`Edges SQL`_, **root vid**, [``max_depth``])" +msgid "pgr_primBFS(`Edges SQL`_ , **root vid**, [``max_depth``])" +msgstr "pgr_primBFS(`Edges SQL`_ , **root vid**, [``max_depth``])" -msgid "pgr_primBFS(`Edges SQL`_, **root vids**, [``max_depth``])" -msgstr "pgr_primBFS(`Edges SQL`_, **root vids**, [``max_depth``])" +msgid "pgr_primBFS(`Edges SQL`_ , **root vids**, [``max_depth``])" +msgstr "pgr_primBFS(`Edges SQL`_ , **root vids**, [``max_depth``])" msgid "``pgr_primDD`` — Catchament nodes using Prim's algorithm." msgstr "``pgr_primDD`` — 使用 Prim 算法的集水区节点。" @@ -14773,11 +14773,11 @@ msgstr "" "使用 Prim 算法，在计算的最小生成树中提取总成本小于或等于距根顶点（或多个顶" "点）距离的节点。" -msgid "pgr_primDD(`Edges SQL`_, **root vid**, **distance**)" -msgstr "pgr_primDD(`Edges SQL`_, **root vid**, **distance**)" +msgid "pgr_primDD(`Edges SQL`_ , **root vid**, **distance**)" +msgstr "pgr_primDD(`Edges SQL`_ , **root vid**, **distance**)" -msgid "pgr_primDD(`Edges SQL`_, **root vids**, **distance**)" -msgstr "pgr_primDD(`Edges SQL`_, **root vids**, **distance**)" +msgid "pgr_primDD(`Edges SQL`_ , **root vids**, **distance**)" +msgstr "pgr_primDD(`Edges SQL`_ , **root vids**, **distance**)" msgid "" "``pgr_primDFS`` — Prim algorithm for Minimum Spanning Tree with Depth First " @@ -14790,11 +14790,11 @@ msgid "" msgstr "" "访问并提取使用 Prims 算法创建的最小生成树的深度优先搜索顺序中的节点信息。" -msgid "pgr_primDFS(`Edges SQL`_, **root vid**, [``max_depth``])" -msgstr "pgr_primDFS(`Edges SQL`_, **root vid**, [``max_depth``])" +msgid "pgr_primDFS(`Edges SQL`_ , **root vid**, [``max_depth``])" +msgstr "pgr_primDFS(`Edges SQL`_ , **root vid**, [``max_depth``])" -msgid "pgr_primDFS(`Edges SQL`_, **root vids**, [``max_depth``])" -msgstr "pgr_primDFS(`Edges SQL`_, **root vids**, [``max_depth``])" +msgid "pgr_primDFS(`Edges SQL`_ , **root vids**, [``max_depth``])" +msgstr "pgr_primDFS(`Edges SQL`_ , **root vids**, [``max_depth``])" msgid "``pgr_pushRelabel``" msgstr "``pgr_pushRelabel``" @@ -14812,20 +14812,20 @@ msgstr "``pgr_pushRelabel`` (`组合`_)" msgid "Renamed from ``pgr_maxFlowPushRelabel``" msgstr "由 ``pgr_maxFlowPushRelabel`` 重命名" -msgid "pgr_pushRelabel(`Edges SQL`_, **start vid**, **end vid**)" -msgstr "pgr_pushRelabel(`Edges SQL`_, **start vid**, **end vid**)" +msgid "pgr_pushRelabel(`Edges SQL`_ , **start vid**, **end vid**)" +msgstr "pgr_pushRelabel(`Edges SQL`_ , **start vid**, **end vid**)" -msgid "pgr_pushRelabel(`Edges SQL`_, **start vid**, **end vids**)" -msgstr "pgr_pushRelabel(`Edges SQL`_, **start vid**, **end vids**)" +msgid "pgr_pushRelabel(`Edges SQL`_ , **start vid**, **end vids**)" +msgstr "pgr_pushRelabel(`Edges SQL`_ , **start vid**, **end vids**)" -msgid "pgr_pushRelabel(`Edges SQL`_, **start vids**, **end vid**)" -msgstr "pgr_pushRelabel(`Edges SQL`_, **start vids**, **end vid**)" +msgid "pgr_pushRelabel(`Edges SQL`_ , **start vids**, **end vid**)" +msgstr "pgr_pushRelabel(`Edges SQL`_ , **start vids**, **end vid**)" -msgid "pgr_pushRelabel(`Edges SQL`_, **start vids**, **end vids**)" -msgstr "pgr_pushRelabel(`Edges SQL`_, **start vids**, **end vids**)" +msgid "pgr_pushRelabel(`Edges SQL`_ , **start vids**, **end vids**)" +msgstr "pgr_pushRelabel(`Edges SQL`_ , **start vids**, **end vids**)" -msgid "pgr_pushRelabel(`Edges SQL`_, `Combinations SQL`_)" -msgstr "pgr_pushRelabel(`Edges SQL`_, `Combinations SQL`_)" +msgid "pgr_pushRelabel(`Edges SQL`_ , `Combinations SQL`_)" +msgstr "pgr_pushRelabel(`Edges SQL`_ , `Combinations SQL`_)" msgid "pgr_sequentialVertexColoring - Proposed" msgstr "pgr_sequentialVertexColoring - 拟议" @@ -15215,38 +15215,38 @@ msgid "Execute the **TRSP** algorithm with restrictions." msgstr "有限制地执行 **TRSP** 算法。" msgid "" -"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vid**, **end vid**, " +"pgr_trsp(`Edges SQL`_ , `Restrictions SQL`_ , **start vid**, **end vid**, " "[``directed``])" msgstr "" -"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vid**, **end vid**, " +"pgr_trsp(`Edges SQL`_ , `Restrictions SQL`_ , **start vid**, **end vid**, " "[``directed``])" msgid "" -"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vid**, **end vids**, " +"pgr_trsp(`Edges SQL`_ , `Restrictions SQL`_ , **start vid**, **end vids**, " "[``directed``])" msgstr "" -"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vid**, **end vids**, " +"pgr_trsp(`Edges SQL`_ , `Restrictions SQL`_ , **start vid**, **end vids**, " "[``directed``])" msgid "" -"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vids**, **end vid**, " +"pgr_trsp(`Edges SQL`_ , `Restrictions SQL`_ , **start vids**, **end vid**, " "[``directed``])" msgstr "" -"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vids**, **end vid**, " +"pgr_trsp(`Edges SQL`_ , `Restrictions SQL`_ , **start vids**, **end vid**, " "[``directed``])" msgid "" -"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vids**, **end vids**, " +"pgr_trsp(`Edges SQL`_ , `Restrictions SQL`_ , **start vids**, **end vids**, " "[``directed``])" msgstr "" -"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vids**, **end vids**, " +"pgr_trsp(`Edges SQL`_ , `Restrictions SQL`_ , **start vids**, **end vids**, " "[``directed``])" msgid "" -"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, `Combinations SQL`_, " +"pgr_trsp(`Edges SQL`_ , `Restrictions SQL`_ , `Combinations SQL`_ , " "[``directed``])" msgstr "" -"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, `Combinations SQL`_, " +"pgr_trsp(`Edges SQL`_ , `Restrictions SQL`_ , `Combinations SQL`_ , " "[``directed``])" msgid "From vertex :math:`6` to vertex :math:`10` on an undirected graph." @@ -15311,10 +15311,10 @@ msgid "**NOTE** when this is done, ``U_turn_on_edge`` flag is ignored." msgstr "**注意**，完成此操作后， ``U_turn_on_edge`` 标志将被忽略。" msgid "" -"pgr_trspVia(`Edges SQL`_, `Restrictions SQL`_, **via vertices**, " +"pgr_trspVia(`Edges SQL`_ , `Restrictions SQL`_ , **via vertices**, " "[**options**])" msgstr "" -"pgr_trspVia(`Edges SQL`_, `Restrictions SQL`_, **via vertices**, " +"pgr_trspVia(`Edges SQL`_ , `Restrictions SQL`_ , **via vertices**, " "[**options**])" msgid "" @@ -15426,10 +15426,10 @@ msgid "Do not use negative values on identifiers of the inner queries." msgstr "不要在内部查询的标识符上使用负值。" msgid "" -"pgr_trspVia_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " +"pgr_trspVia_withPoints(`Edges SQL`_ , `Restrictions SQL`_ , `Points SQL`_ , " "**via vertices**, [**options**])" msgstr "" -"pgr_trspVia_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " +"pgr_trspVia_withPoints(`Edges SQL`_ , `Restrictions SQL`_ , `Points SQL`_ , " "**via vertices**, [**options**])" msgid "" @@ -15635,39 +15635,39 @@ msgid "Running time: :math:`O(|start\\_vids|\\times(V \\log V + E))`" msgstr "运行时间： :math:`O(|start\\_vids|\\times(V \\log V + E))`" msgid "" -"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " +"pgr_trsp_withPoints(`Edges SQL`_ , `Restrictions SQL`_ , `Points SQL`_ , " "**start vid**, **end vid**, [**options**])" msgstr "" -"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " +"pgr_trsp_withPoints(`Edges SQL`_ , `Restrictions SQL`_ , `Points SQL`_ , " "**start vid**, **end vid**, [**options**])" msgid "" -"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " +"pgr_trsp_withPoints(`Edges SQL`_ , `Restrictions SQL`_ , `Points SQL`_ , " "**start vid**, **end vids**, [**options**])" msgstr "" -"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " +"pgr_trsp_withPoints(`Edges SQL`_ , `Restrictions SQL`_ , `Points SQL`_ , " "**start vid**, **end vids**, [**options**])" msgid "" -"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " +"pgr_trsp_withPoints(`Edges SQL`_ , `Restrictions SQL`_ , `Points SQL`_ , " "**start vids**, **end vid**, [**options**])" msgstr "" -"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " +"pgr_trsp_withPoints(`Edges SQL`_ , `Restrictions SQL`_ , `Points SQL`_ , " "**start vids**, **end vid**, [**options**])" msgid "" -"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " +"pgr_trsp_withPoints(`Edges SQL`_ , `Restrictions SQL`_ , `Points SQL`_ , " "**start vids**, **end vids**, [**options**])" msgstr "" -"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " +"pgr_trsp_withPoints(`Edges SQL`_ , `Restrictions SQL`_ , `Points SQL`_ , " "**start vids**, **end vids**, [**options**])" msgid "" -"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Combinations SQL`_, " -"`Points SQL`_, [**options**])" +"pgr_trsp_withPoints(`Edges SQL`_ , `Restrictions SQL`_ , `Combinations SQL`_ , " +"`Points SQL`_ , [**options**])" msgstr "" -"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Combinations SQL`_, " -"`Points SQL`_, [**options**])" +"pgr_trsp_withPoints(`Edges SQL`_ , `Restrictions SQL`_ , `Combinations SQL`_ , " +"`Points SQL`_ , [**options**])" msgid "**options:** ``[directed, driving_side, details]``" msgstr "**options:** ``[directed, driving_side, details]``" @@ -15737,10 +15737,10 @@ msgid "" msgstr "利用Yen算法获得K条最短路径并对路径进行分析以选择不使用限制的路径" msgid "" -"pgr_turnRestrictedPath(`Edges SQL`_, `Restrictions SQL`_, **start vid**, " +"pgr_turnRestrictedPath(`Edges SQL`_ , `Restrictions SQL`_ , **start vid**, " "**end vid**, **K**, [**options**])" msgstr "" -"pgr_turnRestrictedPath(`Edges SQL`_, `Restrictions SQL`_, **start vid**, " +"pgr_turnRestrictedPath(`Edges SQL`_ , `Restrictions SQL`_ , **start vid**, " "**end vid**, **K**, [**options**])" msgid "**options:** ``[directed, heap_paths, stop_on_first, strict]``" @@ -15843,38 +15843,38 @@ msgstr "" "当起始顶点和结束顶点不同并且没有路径时： - 不包含的值 (u, v) 的 agg_cost 为 ∞" msgid "" -"pgr_withPoints(`Edges SQL`_, `Points SQL`_, **start vid**, **end vid**, " +"pgr_withPoints(`Edges SQL`_ , `Points SQL`_ , **start vid**, **end vid**, " "[**options**])" msgstr "" -"pgr_withPoints(`Edges SQL`_, `Points SQL`_, **start vid**, **end vid**, " +"pgr_withPoints(`Edges SQL`_ , `Points SQL`_ , **start vid**, **end vid**, " "[**options**])" msgid "" -"pgr_withPoints(`Edges SQL`_, `Points SQL`_, **start vid**, **end vids**, " +"pgr_withPoints(`Edges SQL`_ , `Points SQL`_ , **start vid**, **end vids**, " "[**options**])" msgstr "" -"pgr_withPoints(`Edges SQL`_, `Points SQL`_, **start vid**, **end vids**, " +"pgr_withPoints(`Edges SQL`_ , `Points SQL`_ , **start vid**, **end vids**, " "[**options**])" msgid "" -"pgr_withPoints(`Edges SQL`_, `Points SQL`_, **start vids**, **end vid**, " +"pgr_withPoints(`Edges SQL`_ , `Points SQL`_ , **start vids**, **end vid**, " "[**options**])" msgstr "" -"pgr_withPoints(`Edges SQL`_, `Points SQL`_, **start vids**, **end vid**, " +"pgr_withPoints(`Edges SQL`_ , `Points SQL`_ , **start vids**, **end vid**, " "[**options**])" msgid "" -"pgr_withPoints(`Edges SQL`_, `Points SQL`_, **start vids**, **end vids**, " +"pgr_withPoints(`Edges SQL`_ , `Points SQL`_ , **start vids**, **end vids**, " "[**options**])" msgstr "" -"pgr_withPoints(`Edges SQL`_, `Points SQL`_, **start vids**, **end vids**, " +"pgr_withPoints(`Edges SQL`_ , `Points SQL`_ , **start vids**, **end vids**, " "[**options**])" msgid "" -"pgr_withPoints(`Edges SQL`_, `Points SQL`_, `Combinations SQL`_, " +"pgr_withPoints(`Edges SQL`_ , `Points SQL`_ , `Combinations SQL`_ , " "[**options**])" msgstr "" -"pgr_withPoints(`Edges SQL`_, `Points SQL`_, `Combinations SQL`_, " +"pgr_withPoints(`Edges SQL`_ , `Points SQL`_ , `Combinations SQL`_ , " "[**options**])" msgid "**options:** ``[directed, driving_side, details])``" @@ -15919,7 +15919,7 @@ msgid "" "point :math:`3` with **right** side driving." msgstr "" "从点 :math:`1` 到顶点 :math:`10`，以及从顶点 :math:`6` 到点 :math:`3` ，**右侧" -"**行驶。" +"** 行驶。" msgid "" "Identifier of the starting vertex of the path. Negative value is for point’s " @@ -16026,38 +16026,38 @@ msgid "" msgstr "出于优化目的， `start_vids`或 `end_vids` 中的任何重复值都将被忽略。" msgid "" -"pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vid**, **end vid**, " +"pgr_withPointsCost(`Edges SQL`_ , 'Points SQL`_ , **start vid**, **end vid**, " "[**options**])" msgstr "" -"pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vid**, **end vid**, " +"pgr_withPointsCost(`Edges SQL`_ , 'Points SQL`_ , **start vid**, **end vid**, " "[**options**])" msgid "" -"pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vid**, **end vids**, " +"pgr_withPointsCost(`Edges SQL`_ , 'Points SQL`_ , **start vid**, **end vids**, " "[**options**])" msgstr "" -"pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vid**, **end vids**, " +"pgr_withPointsCost(`Edges SQL`_ , 'Points SQL`_ , **start vid**, **end vids**, " "[**options**])" msgid "" -"pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vids**, **end vid**, " +"pgr_withPointsCost(`Edges SQL`_ , 'Points SQL`_ , **start vids**, **end vid**, " "[**options**])" msgstr "" -"pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vids**, **end vid**, " +"pgr_withPointsCost(`Edges SQL`_ , 'Points SQL`_ , **start vids**, **end vid**, " "[**options**])" msgid "" -"pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vids**, **end " +"pgr_withPointsCost(`Edges SQL`_ , 'Points SQL`_ , **start vids**, **end " "vids**, [**options**])" msgstr "" -"pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vids**, **end " +"pgr_withPointsCost(`Edges SQL`_ , 'Points SQL`_ , **start vids**, **end " "vids**, [**options**])" msgid "" -"pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, `Combinations SQL`_, " +"pgr_withPointsCost(`Edges SQL`_ , 'Points SQL`_ , `Combinations SQL`_ , " "[**options**])" msgstr "" -"pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, `Combinations SQL`_, " +"pgr_withPointsCost(`Edges SQL`_ , 'Points SQL`_ , `Combinations SQL`_ , " "[**options**])" msgid "**options:** ``[directed, driving_side]``" @@ -16075,24 +16075,24 @@ msgid "From point :math:`1` to vertex :math:`10` with defaults" msgstr "使用默认值从点 :math:`1` 到顶点 :math:`10`" msgid "" -"pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, **start vid**, **end vids**, " +"pgr_withPointsCost(`Edges SQL`_ , `Points SQL`_ , **start vid**, **end vids**, " "[**options**])" msgstr "" -"pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, **start vid**, **end vids**, " +"pgr_withPointsCost(`Edges SQL`_ , `Points SQL`_ , **start vid**, **end vids**, " "[**options**])" msgid "" -"pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, **start vids**, **end vid**, " +"pgr_withPointsCost(`Edges SQL`_ , `Points SQL`_ , **start vids**, **end vid**, " "[**options**])" msgstr "" -"pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, **start vids**, **end vid**, " +"pgr_withPointsCost(`Edges SQL`_ , `Points SQL`_ , **start vids**, **end vid**, " "[**options**])" msgid "" -"pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, **start vids**, **end " +"pgr_withPointsCost(`Edges SQL`_ , `Points SQL`_ , **start vids**, **end " "vids**, [**options**])" msgstr "" -"pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, **start vids**, **end " +"pgr_withPointsCost(`Edges SQL`_ , `Points SQL`_ , **start vids**, **end " "vids**, [**options**])" msgid "" @@ -16101,10 +16101,10 @@ msgid "" msgstr "从点 :math:`15` 和顶点 :math:`6` 到点 :math:`3` 和顶点 :math:`1`" msgid "" -"pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, `Combinations SQL`_, " +"pgr_withPointsCost(`Edges SQL`_ , `Points SQL`_ , `Combinations SQL`_ , " "[**options**])" msgstr "" -"pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, `Combinations SQL`_, " +"pgr_withPointsCost(`Edges SQL`_ , `Points SQL`_ , `Combinations SQL`_ , " "[**options**])" msgid "Identifier of the starting vertex or point." @@ -16152,10 +16152,10 @@ msgid "" msgstr "``pgr_withPointsCostMatrix`` - 使用 :doc:`pgr_withPoints`计算成本矩阵." msgid "" -"pgr_withPointsCostMatrix(`Edges SQL`_, `Points SQL`_, **start vids**, " +"pgr_withPointsCostMatrix(`Edges SQL`_ , `Points SQL`_ , **start vids**, " "[**options**])" msgstr "" -"pgr_withPointsCostMatrix(`Edges SQL`_, `Points SQL`_, **start vids**, " +"pgr_withPointsCostMatrix(`Edges SQL`_ , `Points SQL`_ , **start vids**, " "[**options**])" msgid "" @@ -16236,17 +16236,17 @@ msgstr "" "的所有节点和点。 提取的边将符合相应的生成树。" msgid "" -"pgr_withPointsDD(`Edges SQL`_, `Points SQL`_, **root vid**, **distance**, " +"pgr_withPointsDD(`Edges SQL`_ , `Points SQL`_ , **root vid**, **distance**, " "**driving side**, [**options A**])" msgstr "" -"pgr_withPointsDD(`Edges SQL`_, `Points SQL`_, **root vid**, **distance**, " +"pgr_withPointsDD(`Edges SQL`_ , `Points SQL`_ , **root vid**, **distance**, " "**driving side**, [**options A**])" msgid "" -"pgr_withPointsDD(`Edges SQL`_, `Points SQL`_, **root vids**, **distance**, " +"pgr_withPointsDD(`Edges SQL`_ , `Points SQL`_ , **root vids**, **distance**, " "**driving side**, [**options B**])" msgstr "" -"pgr_withPointsDD(`Edges SQL`_, `Points SQL`_, **root vids**, **distance**, " +"pgr_withPointsDD(`Edges SQL`_ , `Points SQL`_ , **root vids**, **distance**, " "**driving side**, [**options B**])" msgid "**options A:** ``[directed, details]``" @@ -16256,10 +16256,10 @@ msgid "**options B:** ``[directed, details, equicost]``" msgstr "**options B:** ``[directed, details, equicost]``" msgid "" -"pgr_withPointsDD(`Edges SQL`_, `Points SQL`_, **root vid**, **distance**, " +"pgr_withPointsDD(`Edges SQL`_ , `Points SQL`_ , **root vid**, **distance**, " "**driving side**, [**options**])" msgstr "" -"pgr_withPointsDD(`Edges SQL`_, `Points SQL`_, **root vid**, **distance**, " +"pgr_withPointsDD(`Edges SQL`_ , `Points SQL`_ , **root vid**, **distance**, " "**driving side**, [**options**])" msgid "**options:** ``[directed, details]``" @@ -16272,10 +16272,10 @@ msgstr "" "右侧驾驶拓扑，从点 :math:`1` 开始，距离不超过 :math:`3.3`，并提供详细信息。" msgid "" -"pgr_withPointsDD(`Edges SQL`_, `Points SQL`_, **root vids**, **distance**, " +"pgr_withPointsDD(`Edges SQL`_ , `Points SQL`_ , **root vids**, **distance**, " "**driving side**, [**options**])" msgstr "" -"pgr_withPointsDD(`Edges SQL`_, `Points SQL`_, **root vids**, **distance**, " +"pgr_withPointsDD(`Edges SQL`_ , `Points SQL`_ , **root vids**, **distance**, " "**driving side**, [**options**])" msgid "**options:** ``[directed, details, equicost]``" @@ -16386,38 +16386,38 @@ msgid "" msgstr "修改图以包括 `Points SQL`_ 中定义的点并使用 Yen 算法查找 :math:`K`最短路径。" msgid "" -"pgr_withPointsKSP(`Edges SQL`_, `Points SQL`_, **start vid**, **end vid**, " +"pgr_withPointsKSP(`Edges SQL`_ , `Points SQL`_ , **start vid**, **end vid**, " "**K**, **driving_side**, [**options**])" msgstr "" -"pgr_withPointsKSP(`Edges SQL`_, `Points SQL`_, **start vid**, **end vid**, " +"pgr_withPointsKSP(`Edges SQL`_ , `Points SQL`_ , **start vid**, **end vid**, " "**K**, **driving_side**, [**options**])" msgid "" -"pgr_withPointsKSP(`Edges SQL`_, `Points SQL`_, **start vid**, **end vids**, " +"pgr_withPointsKSP(`Edges SQL`_ , `Points SQL`_ , **start vid**, **end vids**, " "**K**, **driving_side**, [**options**])" msgstr "" -"pgr_withPointsKSP(`Edges SQL`_, `Points SQL`_, **start vid**, **end vids**, " +"pgr_withPointsKSP(`Edges SQL`_ , `Points SQL`_ , **start vid**, **end vids**, " "**K**, **driving_side**, [**options**])" msgid "" -"pgr_withPointsKSP(`Edges SQL`_, `Points SQL`_, **start vids**, **end vid**, " +"pgr_withPointsKSP(`Edges SQL`_ , `Points SQL`_ , **start vids**, **end vid**, " "**K**, **driving_side**, [**options**])" msgstr "" -"pgr_withPointsKSP(`Edges SQL`_, `Points SQL`_, **start vids**, **end vid**, " +"pgr_withPointsKSP(`Edges SQL`_ , `Points SQL`_ , **start vids**, **end vid**, " "**K**, **driving_side**, [**options**])" msgid "" -"pgr_withPointsKSP(`Edges SQL`_, `Points SQL`_, **start vids**, **end vids**, " +"pgr_withPointsKSP(`Edges SQL`_ , `Points SQL`_ , **start vids**, **end vids**, " "**K**, **driving_side**, [**options**])" msgstr "" -"pgr_withPointsKSP(`Edges SQL`_, `Points SQL`_, **start vids**, **end vids**, " +"pgr_withPointsKSP(`Edges SQL`_ , `Points SQL`_ , **start vids**, **end vids**, " "**K**, **driving_side**, [**options**])" msgid "" -"pgr_withPointsKSP(`Edges SQL`_, `Points SQL`_, `Combinations SQL`_, **K**, " +"pgr_withPointsKSP(`Edges SQL`_ , `Points SQL`_ , `Combinations SQL`_ , **K**, " "**driving_side**, [**options**])" msgstr "" -"pgr_withPointsKSP(`Edges SQL`_, `Points SQL`_, `Combinations SQL`_, **K**, " +"pgr_withPointsKSP(`Edges SQL`_ , `Points SQL`_ , `Combinations SQL`_ , **K**, " "**driving_side**, [**options**])" msgid "**options:** ``[directed, heap_paths, details]``" @@ -16536,10 +16536,10 @@ msgstr "" "size\\_of(via\\;vertices)`。" msgid "" -"pgr_withPointsVia(`Edges SQL`_, `Points SQL`_, **via vertices**, " +"pgr_withPointsVia(`Edges SQL`_ , `Points SQL`_ , **via vertices**, " "[**options**])" msgstr "" -"pgr_withPointsVia(`Edges SQL`_, `Points SQL`_, **via vertices**, " +"pgr_withPointsVia(`Edges SQL`_ , `Points SQL`_ , **via vertices**, " "[**options**])" msgid "" @@ -16675,7 +16675,7 @@ msgid "" "github.com/pgRouting/pgrouting/commits>`_ on Github." msgstr "" "要查看完整的更改列表，请检查 Github 上的 `Git提交列表 `_。" +"pgRouting/pgrouting/commits>`_ 。" msgid "Mayors" msgstr "主要版本" @@ -16762,7 +16762,7 @@ msgid "" "`#2516 `__ Standarize " "output pgr_aStar" msgstr "" -"`#2516 `__标准化输出" +"`#2516 `__ 标准化输出" "pgr_aStar" msgid "" @@ -16885,7 +16885,7 @@ msgid "" "`#2555 `__ standarize " "deprecated messages" msgstr "" -"`#2555 `__标准化已弃用的消" +"`#2555 `__ 标准化已弃用的消" "息" msgid "" @@ -16932,10 +16932,10 @@ msgid "Issue fixes" msgstr "问题修复" msgid "" -"`#2565 `__ " +"`#2565 `__" "pgr_pgr_lengauerTarjanDominatorTree triggers an assertion" msgstr "" -"`#2565 `__ " +"`#2565 `__" "pgr_pgr_lengauerTarjanDominatorTree 触发了一个断言" msgid "SQL enhancements" @@ -17011,18 +17011,18 @@ msgstr "" "utf8=%E2%9C%93&q=milestone%3A%22Release%203.4.2%22>`_" msgid "" -"`#2394 `__: pgr_bdAstar " +"`#2394 `__ : pgr_bdAstar " "accumulates heuristic cost in visited node cost." msgstr "" -"`#2394 `__：pgr_bdAstar " +"`#2394 `__ ：pgr_bdAstar " "在访问的节点成本中累积了启发式成本。" msgid "" -"`#2427 `__: " +"`#2427 `__ : " "pgr_createVerticesTable & pgr_createTopology, variable should be of type " "Record." msgstr "" -"`#2427 `__: " +"`#2427 `__ : " "pgr_createVerticesTable & pgr_createTopology，变量应为 Record 类型。" msgid "pgRouting 3.4.1 Release Notes" @@ -17038,17 +17038,17 @@ msgstr "" "utf8=%E2%9C%93&q=milestone%3A%22Release%203.4.1%22>`_" msgid "" -"`#2401 `__: pgRouting " +"`#2401 `__ : pgRouting " "3.4.0 do not build docs when sphinx is too low or missing" msgstr "" -"`#2401 `__: pgRouting " +"`#2401 `__ : pgRouting " "3.4.0 在 sphinx 过低或丢失时不构建文档" msgid "" -"`#2398 `__: v3.4.0 does " +"`#2398 `__ : v3.4.0 does " "not upgrade from 3.3.3" msgstr "" -"`#2398 `__: v3.4.0 不能" +"`#2398 `__ : v3.4.0 不能" "从 3.3.3 升级" msgid "pgRouting 3.4.0 Release Notes" @@ -17064,10 +17064,10 @@ msgstr "" "utf8=%E2%9C%93&q=milestone%3A%22Release%203.4.0%22>`_" msgid "" -"`#1891 `__: pgr_ksp " +"`#1891 `__ : pgr_ksp " "doesn't give all correct shortest path" msgstr "" -"`#1891 `__: pgr_ksp 没有" +"`#1891 `__ : pgr_ksp 没有" "给出所有正确的最短路径" msgid "New proposed functions" @@ -17182,10 +17182,10 @@ msgstr "" "utf8=%E2%9C%93&q=milestone%3A%22Release%203.3.4%22>`_" msgid "" -"`#2400 `__: pgRouting " +"`#2400 `__ : pgRouting " "3.3.3 does not build in focal" msgstr "" -"`#2400 `__: pgRouting " +"`#2400 `__ : pgRouting " "3.3.3 在 Focal 上无法构建" msgid "pgRouting 3.3.3 Release Notes" @@ -17248,24 +17248,24 @@ msgid "Restructure of the pgRouting concepts page." msgstr "pgRouting概念页面的重构。" msgid "" -"`#2276 `__: " +"`#2276 `__ : " "edgeDisjointPaths issues with start_vid and combinations" msgstr "" -"`#2276 `__: " +"`#2276 `__ : " "edgeDisjointPaths 与 start_vid 和组合的问题" msgid "" -"`#2312 `__: " +"`#2312 `__ : " "pgr_extractVertices error when target is not BIGINT" msgstr "" -"`#2312 `__：当目标不是 " +"`#2312 `__ ：当目标不是 " "BIGINT 时 pgr_extractVertices 错误" msgid "" -"`#2357 `__: Apply clang-" +"`#2357 `__ : Apply clang-" "tidy performance-*" msgstr "" -"`#2357 `__：应用 clang-" +"`#2357 `__ ：应用 clang-" "tidy performance-*" msgid "pgRouting 3.3.1 Release Notes" @@ -17278,20 +17278,20 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 ` 3.3.1Git关闭里程" "碑 `_。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.3.1%22>`_ 。" msgid "" -"`#2216 `__: Warnings " +"`#2216 `__ : Warnings " "when using clang" msgstr "" -"`#2216 `__：使用 clang 时" +"`#2216 `__ ：使用 clang 时" "发出警告" msgid "" -"`#2266 `__: Error " +"`#2266 `__ : Error " "processing restrictions" msgstr "" -"`#2266 `__：错误处理限制" +"`#2266 `__ ：错误处理限制" msgid "pgRouting 3.3.0 Release Notes" msgstr "pgRouting 3.3.0 发布说明" @@ -17303,41 +17303,41 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 ` 3.3.0 Git关闭里程" "碑 `_。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.3.0%22>`_ 。" msgid "" -"`#2057 `__: trspViaEdges " +"`#2057 `__ : trspViaEdges " "columns in different order" msgstr "" -"`#2057 `__: trspViaEdges " +"`#2057 `__ : trspViaEdges " "列的顺序不同" msgid "" -"`#2087 `__: " +"`#2087 `__ : " "pgr_extractVertices to proposed" msgstr "" -"`#2087 `__:拟议的 " +"`#2087 `__ :拟议的 " "pgr_extractVertices" msgid "" -"`#2201 `__: " +"`#2201 `__ : " "pgr_depthFirstSearch to proposed" msgstr "" -"`#2201 `__: 拟议的" +"`#2201 `__ : 拟议的" "pgr_depthFirstSearch" msgid "" -"`#2202 `__: " +"`#2202 `__ : " "pgr_sequentialVertexColoring to proposed" msgstr "" -"`#2202 `__: 拟议的" +"`#2202 `__ : 拟议的" "pgr_sequentialVertexColoring" msgid "" -"`#2203 `__: " +"`#2203 `__ : " "pgr_dijkstraNear and pgr_dijkstraNearCost to proposed" msgstr "" -"`#2203 `__: 拟议的" +"`#2203 `__ : 拟议的" "pgr_dijkstraNear 和 pgr_dijkstraNearCost" msgid "Coloring" @@ -17407,20 +17407,20 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.2.2 Git关闭里程" "碑 `_。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.2.2%22>`_ 。" msgid "" -"`#2093 `__: Compilation " +"`#2093 `__ : Compilation " "on Visual Studio" msgstr "" -"`#2093 `__：在 Visual " +"`#2093 `__ ：在 Visual " "Studio 上编译" msgid "" -"`#2189 `__: Build error " +"`#2189 `__ : Build error " "on RHEL 7" msgstr "" -"`#2189 `__：RHEL 7 上的构" +"`#2189 `__ ：RHEL 7 上的构" "建错误" msgid "pgRouting 3.2.1 Release Notes" @@ -17433,13 +17433,13 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.2.1Git关闭里程碑 " "`_。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.2.1%22>`_ 。" msgid "" -"`#1883 `__: " +"`#1883 `__ : " "pgr_TSPEuclidean crashes connection on Windows" msgstr "" -"`#1883 `__:" +"`#1883 `__ :" "pgr_TSPEuclidean 在 Windows 上导致连接崩溃" msgid "The solution is to use Boost::graph::metric_tsp_approx" @@ -17463,16 +17463,16 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 ` 3.2.0Git关闭里程" "碑 `_。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.2.0%22>`_ 。" msgid "Build" msgstr "构建" msgid "" -"`#1850 `__: Change Boost " +"`#1850 `__ : Change Boost " "min version to 1.56" msgstr "" -"`#1850 `__：将 Boost 最低" +"`#1850 `__ ：将 Boost 最低" "版本更改为 1.56" msgid "Removing support for Boost v1.53, v1.54 & v1.55" @@ -17563,7 +17563,7 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.1.4Git关闭里程碑 " "`_。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.1.4%22>`_ 。" msgid "Issues fixes" msgstr "问题修复" @@ -17578,27 +17578,27 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.1.3 Git关闭里程" "碑 `_。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.1.3%22>`_ 。" msgid "" -"`#1825 `__: Boost " +"`#1825 `__ : Boost " "versions are not honored" msgstr "" -"`#1825 `__：Boost 版本不" +"`#1825 `__ ：Boost 版本不" "受支持" msgid "" -"`#1849 `__: Boost 1.75.0 " +"`#1849 `__ : Boost 1.75.0 " "geometry \"point_xy.hpp\" build error on macOS environment" msgstr "" -"`#1849 `__：macOS 环境中" +"`#1849 `__ ：macOS 环境中" "的 Boost 1.75.0 几何“point_xy.hpp”构建错误" msgid "" -"`#1861 `__: vrp " +"`#1861 `__ : vrp " "functions crash server" msgstr "" -"`#1861 `__：vrp功能使服务" +"`#1861 `__ ：vrp功能使服务" "器崩溃" msgid "pgRouting 3.1.2 Release Notes" @@ -17611,41 +17611,41 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.1.2Git关闭里程碑 " "`_。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.1.2%22>`_ 。" msgid "" -"`#1304 `__: FreeBSD 12 " +"`#1304 `__ : FreeBSD 12 " "64-bit crashes on pgr_vrOneDepot tests Experimental Function" msgstr "" -"`#1304 `__：FreeBSD 12 " +"`#1304 `__ ：FreeBSD 12 " "64 位在 pgr_vrOneDepot 测试实验功能上崩溃" msgid "" -"`#1356 `__: tools/" +"`#1356 `__ : tools/" "testers/pg_prove_tests.sh fails when PostgreSQL port is not passed" msgstr "" -"`#1356 `__：tools/" +"`#1356 `__ ：tools/" "testers/pg_prove_tests.sh 在未传递 PostgreSQL 端口时失败" msgid "" -"`#1725 `__: Server crash " +"`#1725 `__ : Server crash " "on pgr_pickDeliver and pgr_vrpOneDepot on openbsd" msgstr "" -"`#1725 `___：openbsd上的" +"`#1725 `__ _：openbsd上的" "pgr_pickDeliver和pgr_vrpOneDepot服务器崩溃" msgid "" -"`#1760 `__: TSP server " +"`#1760 `__ : TSP server " "crash on ubuntu 20.04 #1760" msgstr "" -"`#1760 `__：TSP 服务器在 " +"`#1760 `__ ：TSP 服务器在 " "ubuntu 20.04 上崩溃 #1760" msgid "" -"`#1770 `__: Remove " +"`#1770 `__ : Remove " "warnings when using clang compiler" msgstr "" -"`#1770 `__：删除使用 " +"`#1770 `__ ：删除使用 " "clang 编译器时的警告" msgid "pgRouting 3.1.1 Release Notes" @@ -17658,41 +17658,41 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.1.1 Git关闭里程" "碑 `_。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.1.1%22>`_ 。" msgid "" -"`#1733 `__: pgr_bdAstar " +"`#1733 `__ : pgr_bdAstar " "fails when source or target vertex does not exist in the graph" msgstr "" -"`#1733 `__：当图中不存在" +"`#1733 `__ ：当图中不存在" "源顶点或目标顶点时，pgr_bdAstar 失败" msgid "" -"`#1647 `__: Linear " +"`#1647 `__ : Linear " "Contraction contracts self loops" msgstr "" -"`#1647 `__：线性收缩收缩" +"`#1647 `__ ：线性收缩收缩" "自循环" msgid "" -"`#1640 `__: " +"`#1640 `__ : " "pgr_withPoints fails when points_sql is empty" msgstr "" -"`#1640 `__: " +"`#1640 `__ : " "pgr_withPoints 在 points_sql 为空时失败" msgid "" -"`#1616 `__: Path " +"`#1616 `__ : Path " "evaluation on C++ not updated before the results go back to C" msgstr "" -"`#1616 `___：C++ 上的路径" +"`#1616 `__ _：C++ 上的路径" "评估在结果返回 C 之前没有更新" msgid "" -"`#1300 `__: " +"`#1300 `__ : " "pgr_chinesePostman crash on test data" msgstr "" -"`#1300 `__:" +"`#1300 `__ :" "pgr_chinesePostman 在测试数据上崩溃" msgid "pgRouting 3.1.0 Release Notes" @@ -17705,7 +17705,7 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.1.0 Git关闭里程" "碑 `_。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.1.0%22>`_ 。" msgid "pgr_dijkstra(combinations)" msgstr "pgr_dijkstra(组合)" @@ -17732,7 +17732,7 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 ` 3.0.6Git关闭里程" "碑 `_。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.0.6%22>`_ 。" msgid "pgRouting 3.0.5 Release Notes" msgstr "pgRouting 3.0.5 发布说明" @@ -17744,7 +17744,7 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.0.5Git关闭里程碑 " "`_。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.0.5%22>`_ 。" msgid "Backport issue fixes" msgstr "回溯问题修复" @@ -17759,7 +17759,7 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 ` 3.0.4Git关闭里程" "碑 `_。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.0.4%22>`_ 。" msgid "pgRouting 3.0.3 Release Notes" msgstr "pgRouting 3.0.3 发布说明" @@ -17774,13 +17774,13 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.0.2Git关闭里程碑 " "`_。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.0.2%22>`_ 。" msgid "" -"`#1378 `__: Visual " +"`#1378 `__ : Visual " "Studio build failing" msgstr "" -"`#1378 `__：Visual " +"`#1378 `__ ：Visual " "Studio 构建失败" msgid "pgRouting 3.0.1 Release Notes" @@ -17793,13 +17793,13 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.0.1Git关闭里程碑 " "`_。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.0.1%22>`_ 。" msgid "" -"`#232 `__: Honor client " +"`#232 `__ : Honor client " "cancel requests in C /C++ code" msgstr "" -"`#232 `__：在 C /C++ 代码" +"`#232 `__ ：在 C /C++ 代码" "中尊重客户端取消请求" msgid "pgRouting 3.0.0 Release Notes" @@ -17812,50 +17812,50 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.0.0Git关闭里程碑 " "`_。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.0.0%22>`_ 。" msgid "Fixed Issues" msgstr "问题修复" msgid "" -"`#1153 `__: Renamed " +"`#1153 `__ : Renamed " "pgr_eucledianTSP to pgr_TSPeuclidean" msgstr "" -"`#1153 `__：将 " +"`#1153 `__ ：将 " "pgr_eucledianTSP 更名为 pgr_TSPeuclidean" msgid "" -"`#1188 `__: Removed CGAL " +"`#1188 `__ : Removed CGAL " "dependency" msgstr "" -"`#1188 `__：删除了 CGAL " +"`#1188 `__ ：删除了 CGAL " "依赖" msgid "" -"`#1002 `__: Fixed " +"`#1002 `__ : Fixed " "contraction issues:" msgstr "" -"`#1002 `__：修复收缩问" +"`#1002 `__ ：修复收缩问" "题：" msgid "" -"`#1004 `__: Contracts " +"`#1004 `__ : Contracts " "when forbidden vertices do not belong to graph" msgstr "" -"`#1004 `___：当禁止的顶点" +"`#1004 `__ _：当禁止的顶点" "不属于图时的收缩" msgid "" -"`#1005 `__: Intermideate " +"`#1005 `__ : Intermideate " "results eliminated" msgstr "" -"`#1005 `__：消除中间结果" +"`#1005 `__ ：消除中间结果" msgid "" -"`#1006 `__: No loss of " +"`#1006 `__ : No loss of " "information" msgstr "" -"`#1006 `__：无信息丢失" +"`#1006 `__ ：无信息丢失" msgid "New functions" msgstr "新函数" @@ -18194,7 +18194,7 @@ msgid "" msgstr "" "要查看此版本关闭的问题，请参阅 Github 上的 `2.6.3Git关闭里程碑 `_。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%202.6.3%22%20>`_ 。" msgid "" "`#1219 `__ Implicit cast " @@ -18227,13 +18227,13 @@ msgid "" msgstr "" "要查看此版本关闭的问题，请参阅 Github 上的 `2.6.2Git关闭里程碑 `_。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%202.6.2%22%20>`_ 。" msgid "" "`#1152 `__ Fixes driving " "distance when vertex is not part of the graph" msgstr "" -"`#1152 `__修复了顶点不属" +"`#1152 `__ 修复了顶点不属" "于图时的行驶距离问题" msgid "" @@ -18260,7 +18260,7 @@ msgid "" msgstr "" "要查看此版本关闭的问题，请参阅 Github 上的 `2.6.1Git关闭里程碑 `_。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%202.6.1%22%20>`_ 。" msgid "Fixes server crash on several functions." msgstr "修复了多个函数导致服务器崩溃的问题。" @@ -18356,7 +18356,7 @@ msgid "" msgstr "" "要查看此版本关闭的问题，请参阅 Github 上的 ` 2.6.0Git关闭里程碑 `_。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%202.6.0%22%20>`_ 。" msgid "pgr_lineGraphFull" msgstr "pgr_lineGraphFull" @@ -18413,7 +18413,7 @@ msgid "" msgstr "" "要查看此版本关闭的问题，请参阅 Github 上的 `2.5.5Git关闭里程碑 `_。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.5%22%20>`_ 。" msgid "Fixes driving distance when vertex is not part of the graph" msgstr "修复顶点不在图中时的行驶距离问题" @@ -18434,7 +18434,7 @@ msgid "" msgstr "" "要查看此版本关闭的问题，请参阅 Github 上的 `2.5.4 Git关闭里程碑 `_。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.4%22%20>`_ 。" msgid "pgRouting 2.5.3 Release Notes" msgstr "pgRouting 2.5.3 发布说明" @@ -18446,7 +18446,7 @@ msgid "" msgstr "" "要查看此版本关闭的问题，请参阅 Github 上的 ` 2.5.3Git关闭里程碑 `_。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.3%22%20>`_ 。" msgid "" "Fix for postgresql 11: Removed a compilation error when compiling with " @@ -18463,7 +18463,7 @@ msgid "" msgstr "" "要查看此版本关闭的问题，请参阅 Github 上的 `2.5.2Git关闭里程碑 `_。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.2%22%20>`_ 。" msgid "Fix for postgresql 10.1: Removed a compiler condition" msgstr "postgresql 10.1 的修复：删除了一个编译器条件" @@ -18478,7 +18478,7 @@ msgid "" msgstr "" "要查看此版本关闭的问题，请参阅 Github 上的 `2.5.1Git关闭里程碑 `_。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.1%22%20>`_ 。" msgid "Fixed prerequisite minimum version of: cmake" msgstr "修正了 cmake 的最低版本要求" @@ -18571,7 +18571,7 @@ msgid "" msgstr "" "要查看此版本关闭的问题，请参阅 Github 上的 `2.4.2Git关闭里程碑 `_。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%202.4.2%22%20>`_ 。" msgid "Improvement" msgstr "改进" @@ -18596,7 +18596,7 @@ msgid "" msgstr "" "要查看此版本关闭的问题，请参阅 Github 上的 `2.4.1Git关闭里程碑 `_。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%202.4.1%22%20>`_ 。" msgid "Fixed compiling error on macOS" msgstr "修正了 macOS 上的编译错误" @@ -19271,7 +19271,7 @@ msgid "" msgstr "" "要查看此版本关闭的问题，请参阅 Github 上的 `1.x Git 已关闭问题 `_。以下的发行说明已从之前的 ``RELEASE_NOTES`` 文件中复制，" +"x%22+is%3Aclosed>`_ 。以下的发行说明已从之前的 ``RELEASE_NOTES`` 文件中复制，" "并作为参考保留。" msgid "Changes for release 1.05" @@ -19599,13 +19599,13 @@ msgstr "对于不连通的图，不存在单棵树，而是由每个连通分量 msgid "" "pgRouting community support is available through the `pgRouting website " -"`_, `documentation `_, tutorials, mailing lists and others. If you’re looking " +"`_ , `documentation `_ , tutorials, mailing lists and others. If you’re looking " "for :ref:`commercial support `, find below a list of " "companies providing pgRouting development and consulting services." msgstr "" "pgRouting 社区支持可通过 `pgRouting 网站 `_、`文档 `_、教程、邮件列表等获得。 " +"html>`_ 、`文档 `_ 、教程、邮件列表等获得。 " "如果您正在寻求 :ref:`商业支持 `，请在下面找到提供 " "pgRouting 开发和咨询服务的公司列表。" @@ -19616,7 +19616,7 @@ msgid "" "Bugs are reported and managed in an `issue tracker `_. Please follow these steps:" msgstr "" -"错误在`问题跟踪器`_中报告和管" +"错误在`问题跟踪器`_ 中报告和管" "理。 请按照以下步骤操作：" msgid "" @@ -19687,7 +19687,7 @@ msgid "" msgstr "有关如何使用 pgRouting 的一般问题和主题，请写信给用户邮件列表。" msgid "" -"You can also ask at `GIS StackExchange `_ " +"You can also ask at `GIS StackExchange `_" "and tag the question with ``pgrouting``. Find all questions tagged with " "``pgrouting`` under https://gis.stackexchange.com/questions/tagged/pgrouting " "or subscribe to the `pgRouting questions feed `_ 上提问，并使" "用 ``pgrouting`` 标签。查找所有带有 ``pgrouting`` 标签的问题，请访问 https://" "gis.stackexchange.com/questions/tagged/pgrouting 或订阅 `pgRouting 问题订阅 " -"`_。" +"`_ 。" msgid "Commercial Support" msgstr "商业支持" From a5e17e73c82bb8c451c3401b25291fbf306ebd24 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 23 Sep 2024 19:08:05 -0600 Subject: [PATCH 361/428] Reducing to 305 warnings --- .../LC_MESSAGES/pgrouting_doc_strings.po | 102 +++++++++--------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 21a9828dbe..e6dd950318 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -831,7 +831,7 @@ msgid "Pick & deliver" msgstr "取货 & 送货" msgid "Used in :doc:`pgr_pickDeliverEuclidean`" -msgstr "用于:doc:`pgr_pickDeliverEuclidean`" +msgstr "用于 :doc:`pgr_pickDeliverEuclidean`" msgid "`Orders SQL`_" msgstr "`Orders SQL`_" @@ -846,7 +846,7 @@ msgid "`Vehicles SQL`_ as described below." msgstr "`Vehicles SQL`_ 如下所述。" msgid "Used in :doc:`pgr_pickDeliver`" -msgstr "用于:doc:`pgr_pickDeliver`" +msgstr "用于 :doc:`pgr_pickDeliver`" msgid "`Matrix SQL`_" msgstr "`Matrix SQL`_" @@ -973,7 +973,7 @@ msgstr "在交货地点卸货的持续时间。" msgid "" "For :doc:`pgr_pickDeliver` the pickup and delivery identifiers of the " "locations are needed:" -msgstr "对于:doc:`pgr_pickDeliver`，需要位置的取货和送货标识符：" +msgstr "对于 :doc:`pgr_pickDeliver`，需要位置的取货和送货标识符：" msgid "``p_node_id``" msgstr "``p_node_id``" @@ -1445,7 +1445,7 @@ msgid "The orders Have :math:`(x, y)` pairs for pickup and delivery locations." msgstr "订单有取货和送货地点 :math:`(x, y)` 对。" msgid "When using :doc:`pgr_pickDeliver`:" -msgstr "当使用:doc:`pgr_pickDeliver`:" +msgstr "当使用 :doc:`pgr_pickDeliver`:" msgid "The vehicles have identifiers for the start and ending locations." msgstr "车辆具有起始位置和结束位置的标识符。" @@ -1544,7 +1544,7 @@ msgid "When ``factor`` < 1 the travel times are slower" msgstr "当 ``因子`` < 1 时，行程时间会变慢" msgid "For the :doc:`pgr_pickDeliverEuclidean`:" -msgstr "用于:doc:`pgr_pickDeliverEuclidean`:" +msgstr "用于 :doc:`pgr_pickDeliverEuclidean`:" msgid "" "Working with time units in seconds, and x/y in lat/lon: Factor: would depend " @@ -1579,7 +1579,7 @@ msgid "4452 s" msgstr "4452 s" msgid "For the :doc:`pgr_pickDeliver`:" -msgstr "用于:doc:`pgr_pickDeliver`:" +msgstr "用于 :doc:`pgr_pickDeliver`:" msgid "" "Given :math:`v = d / t` therefore :math:`t = d / v` And the ``factor``" @@ -2818,7 +2818,7 @@ msgstr "" msgid "" "`Wikipedia: Graph coloring `__" -msgstr "`维基百科：图着色`__" +msgstr "`维基百科：图着色 `__" msgid "" "`Boost: is_bipartite ` when executed with the same parameters " "and can be calculated:" msgstr "" -"当使用相同参数执行时，通过图表的最大流量保证是:doc:`pgr_maxFlow " +"当使用相同参数执行时，通过图表的最大流量保证是 :doc:`pgr_maxFlow " "` 返回的值，并且可以计算：" msgid "By aggregation of the outgoing flow from the sources" @@ -5043,7 +5043,7 @@ msgid "" "Using `this `__" "example." msgstr "" -"使用`这个`__ 示例。" +"使用`这个 `__ 示例。" msgid "" "If needed filter out the added columns, for example, to return the original " @@ -5320,7 +5320,7 @@ msgid "" "Starting from `v3.6.0 `__ :" "doc:`pgr_withPointsKSP` result columns are being standardized." msgstr "" -"从`v3.6.0 `__ 开始 ，:doc:" +"从`v3.6.0 `__ 开始 ， :doc:" "`pgr_withPointsKSP`结果列正在标准化。" msgid "" @@ -5612,7 +5612,7 @@ msgid "Using the old structure of restrictions" msgstr "使用旧的限制结构" msgid "Use :doc:`pgr_trsp` (One to One) instead." -msgstr "请改用:doc:`pgr_trsp` (一对一）。" +msgstr "请改用 :doc:`pgr_trsp` (一对一）。" msgid "The new structure of restrictions is been used." msgstr "使用了新的限制结构。" @@ -5686,7 +5686,7 @@ msgid "Migrating ``pgr_trspViaVertices`` using ``pgr_dijkstraVia``" msgstr "使用 ``pgr_dijkstraVia``迁移 ``pgr_trspViaVertices``" msgid "Use :doc:`pgr_dijkstraVia` instead." -msgstr "请使用:doc:`pgr_dijkstraVia`。" +msgstr "请使用 :doc:`pgr_dijkstraVia`。" msgid ":doc:`pgr_dijkstraVia`:" msgstr ":doc:`pgr_dijkstraVia`:" @@ -6024,7 +6024,7 @@ msgid "" "Solve the example problem taken from `wikipedia `__):" msgstr "" -"解决来自 `维基百科`__ ）" +"解决来自 `维基百科 `__ ）" "的示例问题 ：" msgid "Problem is to find the shortest path from :math:`1` to :math:`5`." @@ -6216,7 +6216,7 @@ msgid "" "`pgr_contraction` to contract a graph." msgstr "" "准备图的步骤涉及使用`PostGIS `__ 进行几何操作，其他一些" -"步骤涉及诸如:doc:`pgr_contraction` 之类的图操作来收缩图。" +"步骤涉及诸如 :doc:`pgr_contraction` 之类的图操作来收缩图。" msgid "" "The `workshop `__ has a step by step " @@ -6612,7 +6612,7 @@ msgid "Contraction of a graph" msgstr "图的收缩" msgid "The graph can be reduced in size using :doc:`contraction-family`" -msgstr "可以使用:doc:`contraction-family`来减小图形的大小" +msgstr "可以使用 :doc:`contraction-family`来减小图形的大小" msgid "" "When to contract will depend on the size of the graph, processing times, " @@ -6697,7 +6697,7 @@ msgid "" "When there are many linear edges, to speed up, the :doc:`contraction-family` " "functions can be used to divide the problem." msgstr "" -"当线性边较多时，为了加快速度，可以使用:doc:`contraction-family`函数来划分问" +"当线性边较多时，为了加快速度，可以使用 :doc:`contraction-family`函数来划分问" "题。" msgid "Function's structure" @@ -6938,7 +6938,7 @@ msgid "Edges SQL for :doc:`flow-family`" msgstr "用于流数据系列 ( :doc:`flow-family`) 的Edges SQL" msgid "Edges SQL for the following functions of :doc:`flow-family`" -msgstr "Edges SQL 适用于:doc:`flow-family` 的以下函数" +msgstr "Edges SQL 适用于 :doc:`flow-family` 的以下函数" msgid "Used in combination signatures" msgstr "结合签名使用" @@ -7254,7 +7254,7 @@ msgid "" "Create a page on the `pgRouting Wiki `__" msgstr "" -"在 `pgRouting 维基`__ 上创建页面" +"在 `pgRouting 维基 `__ 上创建页面" msgid "Give the title an appropriate name" msgstr "给标题起一个合适的名称" @@ -7305,7 +7305,7 @@ msgid "" "wiki/Notes-on-Download%2C-Installation-and-building-pgRouting>`__" msgstr "" "有关下载和安装适用于不同操作系统的二进制文件的说明、本文档中未包含的其他注释" -"和更正，可以在 `安装维基`__ 中找到" msgid "" @@ -7703,7 +7703,7 @@ msgid "" "Most features of pgRouting are available under `GNU General Public License " "v2.0 or later `_." msgstr "" -"pgRouting 的大多数功能都可以在` GNU 通用公共许可证 v2.0 或更高版本`_ 下使用。" msgid "Boost Software License - Version 1.0" @@ -7713,7 +7713,7 @@ msgid "" "Some Boost extensions are available under `Boost Software License - Version " "1.0 `_." msgstr "" -"一些 Boost 扩展可根据` Boost 软件许可证 - 版本 1.0 获得`_ 。" msgid "MIT-X License" @@ -8096,7 +8096,7 @@ msgid "" "Can be Used with :doc:`costMatrix-category` functions preferably with " "`directed => false`." msgstr "" -"可以与:doc:`costMatrix-category` 函数一起使用，最好使用 `directed => false`。" +"可以与 :doc:`costMatrix-category` 函数一起使用，最好使用 `directed => false`。" msgid "With ``directed => false``" msgstr "使用 ``directed => false``" @@ -8189,7 +8189,7 @@ msgid "OR EMTPY SET" msgstr "OR EMTPY SET" msgid "Using :doc:`pgr_dijkstraCostMatrix` to generate the matrix information" -msgstr "使用:doc:`pgr_dijkstraCostMatrix` 生成矩阵信息" +msgstr "使用 :doc:`pgr_dijkstraCostMatrix` 生成矩阵信息" msgid "" "**Line 4** Vertices :math:`\\{2, 4, 13, 14\\}` are not included because they " @@ -8594,7 +8594,7 @@ msgstr "``pgr_aStarCostMatrix``" msgid "" "``pgr_aStarCostMatrix`` - Calculates the a cost matrix using :doc:" "`pgr_aStar`." -msgstr "``pgr_aStarCostMatrix`` -使用:doc:`pgr_aStar` 计算成本矩阵。" +msgstr "``pgr_aStarCostMatrix`` -使用 :doc:`pgr_aStar` 计算成本矩阵。" msgid "Using internaly the :doc:`pgr_aStar` algorithm" msgstr "内部使用 :doc:`pgr_aStar`算法" @@ -8777,11 +8777,11 @@ msgstr "" "息的顶点表_vertices_pgr。" msgid "Use :doc:`pgr_createVerticesTable` to create the vertices table." -msgstr "使用:doc:`pgr_createVerticesTable`建立顶点表。" +msgstr "使用 :doc:`pgr_createVerticesTable`建立顶点表。" msgid "" "Use :doc:`pgr_createTopology` to create the topology and the vertices table." -msgstr "使用:doc:`pgr_createTopology`建立拓扑和顶点表。" +msgstr "使用 :doc:`pgr_createTopology`建立拓扑和顶点表。" msgid "The analyze graph function accepts the following parameters:" msgstr "分析图函数接受以下参数：" @@ -9352,7 +9352,7 @@ msgstr "``pgr_bdAstarCostMatrix``" msgid "" "``pgr_bdAstarCostMatrix`` - Calculates the a cost matrix using :doc:" "`pgr_aStar`." -msgstr "``pgr_bdAstarCostMatrix`` - 使用:doc:`pgr_aStar` 计算成本矩阵。" +msgstr "``pgr_bdAstarCostMatrix`` - 使用 :doc:`pgr_aStar` 计算成本矩阵。" msgid "Using internaly the :doc:`pgr_bdAstar` algorithm" msgstr "内部使用 :doc:`pgr_bdAstar` 算法" @@ -9743,7 +9743,7 @@ msgid "" "Boost's `betweenness_centrality `_" msgstr "" -"`Boost：Hawick 电路算法`__" msgid "Queries use the :doc:`sampledata` network." @@ -9812,7 +9812,7 @@ msgid "" "Boost: `Biconnected components `__" msgstr "" -"Boost: `双连通分量`__" msgid "``pgr_binaryBreadthFirstSearch`` - Experimental" @@ -10571,7 +10571,7 @@ msgid "" "``integer`` Number of vertices in the edge_table that reference this vertex. " "See :doc:`pgr_analyzeGraph`." msgstr "" -"``integer`` edge_table 中引用该顶点的顶点数。 参见:doc:`pgr_analyzeGraph`。" +"``integer`` edge_table 中引用该顶点的顶点数。 参见 :doc:`pgr_analyzeGraph`。" msgid "" "``integer`` Indicator that the vertex might have a problem. See :doc:" @@ -10913,7 +10913,7 @@ msgid "The running time complexity is: :math:`O(m log(m)|V|)`" msgstr "运行时间复杂度为： :math:`O(m log(m)|V|)`" msgid "where :math:`|V|` is the number of vertices," -msgstr "其中 :math:`|V|`是顶点数，" +msgstr "其中 :math:`|V|` 是顶点数，" msgid ":math:`m` is the maximum degree of the vertices in the graph." msgstr ":math:`m` 是图中顶点的最大度数。" @@ -12922,7 +12922,7 @@ msgid "Find at most two routes to a given point" msgstr "最多找到两条到达给定点的路线" msgid "Using :doc:`pgr_withPoints`" -msgstr "使用:doc:`pgr_withPoints`" +msgstr "使用 :doc:`pgr_withPoints`" msgid "A point of interest table" msgstr "兴趣点表" @@ -13138,13 +13138,13 @@ msgid "Time Complexity: :math:`O((V + E) (c + 1))`" msgstr "时间复杂度： :math:`O((V + E) (c + 1))`" msgid ":math:`|c|` is the number of circuts in the graph." -msgstr ":math:`|c|`是图中的电路数量。" +msgstr ":math:`|c|` 是图中的电路数量。" msgid "pgr_hawickCircuits(`Edges SQL`_)" msgstr "pgr_hawickCircuits(`Edges SQL`_)" msgid "Returns set of |generic-result|" -msgstr "返回 |eneric-result| 的集合" +msgstr "返回 |generic-result| 的集合" msgid "Circuits present in the pgRouting :doc:`sampledata`" msgstr "pgRouting :doc:`sampledata` 中存在的电路" @@ -13168,7 +13168,7 @@ msgid "" "`Boost: Hawick Circuit Algorithm `__" msgstr "" -"`Boost：Hawick 电路算法`__" msgid "``pgr_isPlanar`` - Experimental" @@ -13220,10 +13220,10 @@ msgid "``pgr_isplanar``" msgstr "``pgr_isplanar``" msgid "`true` when the graph is planar." -msgstr "当图形是平面时为`true`。" +msgstr "当图形是平面时为 `true`。" msgid "`false` when the graph is not planar." -msgstr "当图形不是平面时为`false`。" +msgstr "当图形不是平面时为 `false`。" msgid "" "The following edges will make the subgraph with vertices {10, 15, 11, 16, " @@ -13249,7 +13249,7 @@ msgid "" "``pgr_johnson`` - Returns the sum of the costs of the shortest path for each " "pair of nodes in the graph using Floyd-Warshall algorithm." msgstr "" -"``pgr_johnson`` - 使用 Floyd-Warshall 算法返回图中每对节点的最短路径成本之" +"``pgr_johnson`` - 使用 Jhonson 算法返回图中每对节点的最短路径成本之" "和。." msgid "" @@ -13258,7 +13258,7 @@ msgid "" "It usees the Boost's implementation which runs in :math:`O(V E \\log V)` " "time," msgstr "" -"Johnson算法是计算图中每一对节点的最短路径成本之和的好选择，特别适用于*稀疏图" +"Johnson算法是计算图中每一对节点的最短路径成本之和的好选择，特别适用于 *稀疏图" "*。它使用了Boost的实现，其运行时间为 :math:`O(V E \\log V)`，" msgid "pgr johnson(`Edges SQL`_ , [``directed``])" @@ -13452,7 +13452,7 @@ msgid "" "`Wikipedia: dominator tree `__" msgstr "" -"`维基百科:支配树`__" +"`维基百科:支配树 `__" #, fuzzy msgid "pgr_lineGraph - Proposed" @@ -14095,7 +14095,7 @@ msgid "" msgstr "当最大流量为 **0** 时则没有流量，返回 **0** 。" msgid "Uses the :doc:`pgr_pushRelabel ` algorithm." -msgstr "使用:doc:`pgr_pushRelabel `算法。" +msgstr "使用 :doc:`pgr_pushRelabel `算法。" msgid "Running time: :math:`O( V ^ 3)`" msgstr "运行时间： :math:`O( V ^ 3)`" @@ -14208,7 +14208,7 @@ msgid "When the maximum flow is 0 then there is no flow and **0** is returned." msgstr "当最大流量为0时则没有流量，返回 **0** 。" msgid "Uses :doc:`pgr_maxFlowMinCost`." -msgstr "使用:doc:`pgr_maxFlowMinCost`。" +msgstr "使用 :doc:`pgr_maxFlowMinCost`。" msgid "pgr_maxFlowMinCost_Cost(`Edges SQL`_ , **start vid**, **end vid**)" msgstr "pgr_maxFlowMinCost_Cost(`Edges SQL`_ , **start vid**, **end vid**)" @@ -14498,7 +14498,7 @@ msgid "" "edge table." msgstr "" ":doc:`topology-functions`，用于概述路由算法的拓扑。 :doc:`pgr_analyzeOneWay` " -"分析边方向性的方法。:doc:`pgr_createTopology` 根据几何图创建拓扑。 :doc:" +"分析边方向性的方法。 :doc:`pgr_createTopology` 根据几何图创建拓扑。 :doc:" "`pgr_analyzeGraph`分析边表的边和顶点。" msgid "``pgr_pickDeliver`` - Experimental" @@ -14854,7 +14854,7 @@ msgid "" msgstr "提供要分配给图中存在的所有顶点的颜色。" msgid "Color identifiers values are in the Range :math:`[1, |V|]`" -msgstr "颜色标识符值在范围 :math:`[1, |V|]`内" +msgstr "颜色标识符值在范围 :math:`[1, |V|]` 内" msgid "The algorithm tries to assign the least possible color to every vertex." msgstr "该算法尝试为每个顶点分配尽可能少的颜色。" @@ -14876,10 +14876,10 @@ msgid "Sequential Vertex Coloring Running Time: :math:`O(|V|*(d + k))`" msgstr "顺序顶点着色运行时间： :math:`O(|V|*(d + k))`" msgid ":math:`d` is the maximum degree of the vertices in the graph," -msgstr ":math:`d`是图中顶点的最大度数，" +msgstr ":math:`d` 是图中顶点的最大度数，" msgid ":math:`k` is the number of colors used." -msgstr ":math:`k`是使用的颜色数量。" +msgstr ":math:`k` 是使用的颜色数量。" msgid "pgr_sequentialVertexColoring(`Edges SQL`_)" msgstr "pgr_sequentialVertexColoring(`Edges SQL`_)" @@ -14976,7 +14976,7 @@ msgid "min cut of an edge" msgstr "边的最小割" msgid "Using :doc:`pgr_connectedComponents`" -msgstr "使用:doc:`pgr_connectedComponents`" +msgstr "使用 :doc:`pgr_connectedComponents`" msgid "https://en.wikipedia.org/wiki/Stoer%E2%80%93Wagner_algorithm" msgstr "https://en.wikipedia.org/wiki/Stoer%E2%80%93Wagner_algorithm" @@ -15012,7 +15012,7 @@ msgid "" "Boost: `Strong components `__" msgstr "" -"Boost: `强大组件`__" msgid "" @@ -15101,7 +15101,7 @@ msgid "" "Reachability between vertices on an undirected graph happens when they " "belong to the same connected component. (see :doc:`pgr_connectedComponents`)" msgstr "" -"当无向图上的顶点属于同一连通分量时，就会发生它们之间的可达性。（参阅:doc:" +"当无向图上的顶点属于同一连通分量时，就会发生它们之间的可达性。（参阅 :doc:" "`pgr_connectedComponents`）" msgid "The returned values are not ordered" @@ -15484,7 +15484,7 @@ msgid "Use ``pgr_findCloseEdges`` for points on the fly" msgstr "对动态点使用 ``pgr_findCloseEdges``" msgid "Using :doc:`pgr_findCloseEdges`:" -msgstr "使用:doc:`pgr_findCloseEdges`:" +msgstr "使用 :doc:`pgr_findCloseEdges`:" msgid "" "Visit from vertex :math:`1` to the two locations on the graph of point " @@ -19616,7 +19616,7 @@ msgid "" "Bugs are reported and managed in an `issue tracker `_. Please follow these steps:" msgstr "" -"错误在`问题跟踪器`_ 中报告和管" +"错误在`问题跟踪器 `_ 中报告和管" "理。 请按照以下步骤操作：" msgid "" From c5a635e73603de24c8f72d1a91e65581a38d9251 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 23 Sep 2024 19:21:53 -0600 Subject: [PATCH 362/428] Reducing to 278 warnings --- .../LC_MESSAGES/pgrouting_doc_strings.po | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index e6dd950318..53b450bd82 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -2932,13 +2932,13 @@ msgstr "没有传入边缘，但至少有一个传出边缘。" msgid "" "When the conditions are true then the `Operation: Dead End Contraction`_ can " "be done." -msgstr "当条件成立时，可以进行当条件成立时，可以进行`操作: 死端收缩`_ 。" +msgstr "当条件成立时，可以进行当条件成立时，可以进行 `操作: 死端收缩`_ 。" msgid "Dead end vertex on undirected graph" msgstr "无向图上的死端顶点" msgid "The green nodes are `dead end`_ nodes" -msgstr "绿色节点是`死端`_ 节点" +msgstr "绿色节点是 `死端`_ 节点" msgid "The blue nodes have an unlimited number of edges." msgstr "蓝色节点具有无限数量的边。" @@ -3056,7 +3056,7 @@ msgid "Linear vertex on undirected graph" msgstr "无向图上的线性顶点" msgid "The green nodes are `linear`_ nodes" -msgstr "绿色节点是`线性`_ 节点" +msgstr "绿色节点是 `线性`_ 节点" msgid "The blue nodes have an unlimited number of incoming and outgoing edges." msgstr "蓝色节点具有无限数量的传入和传出边缘。" @@ -3144,7 +3144,7 @@ msgstr "插入一条新边 :math:`u \\rightarrow z`，以红色表示。" msgid "" "Edge :math:`u \\rightarrow z` has the information of nodes that were " "contracted." -msgstr "边 :math:`u \\rightarrow z`有收缩点的信息。" +msgstr "边 :math:`u \\rightarrow z` 有收缩点的信息。" msgid "The cycle" msgstr "循环" @@ -3202,7 +3202,7 @@ msgstr "结果不代表收缩图。 它们表示应用收缩算法后对图所 msgid "" "Observe that vertices, for example, :math:`6` do not appear in the results " "because it was not affected by the contraction algorithm." -msgstr "例如，观察到顶点 :math:`6`没有出现在结果中，因为它不受收缩算法的影响。" +msgstr "例如，观察到顶点 :math:`6` 没有出现在结果中，因为它不受收缩算法的影响。" msgid "After doing the dead end contraction operation:" msgstr "进行死端收缩操作后：" @@ -3262,7 +3262,7 @@ msgid "Store contraction information" msgstr "存储收缩信息" msgid "Store the `contraction results`_ in a table" -msgstr "将`收缩结果`_ 存储在表中" +msgstr "将 `收缩结果`_ 存储在表中" msgid "The vertex table update" msgstr "顶点表更新" @@ -3322,7 +3322,7 @@ msgstr "情况 3：源和/或目标属于一个顶点。" msgid "" "Using the `Edges that belong to the contracted graph.`_ on lines 11 to 20." -msgstr "使用`属于收缩图的边。`_ 第 11 至 20 行。" +msgstr "使用 `属于收缩图的边。`_ 第 11 至 20 行。" msgid "Case 1" msgstr "情况1" @@ -3354,7 +3354,7 @@ msgid "" "In this case, the contracted graph do not have an edge connecting with node :" "math:`7` and of node :math:`4` of the second case." msgstr "" -"在这种情况下，收缩图没有与第二种情况的节点 :math:`7` 和节点 :math:`4`连接的边。" +"在这种情况下，收缩图没有与第二种情况的节点 :math:`7` 和节点 :math:`4` 连接的边。" msgid "Refining the above function to include nodes that belong to an edge." msgstr "改进上述函数以包含属于边的节点。" @@ -3395,7 +3395,7 @@ msgid "When source and/or target belong to a vertex, now, a path is found." msgstr "当源和/或目标属于一个顶点时，现在就找到了一条路径。" msgid "Now, the routing graph has an edge connecting with node :math:`7`." -msgstr "现在，路由图有一条与节点 :math:`7`连接的边。" +msgstr "现在，路由图有一条与节点 :math:`7` 连接的边。" msgid ":doc:`sampledata`" msgstr ":doc:`sampledata`" @@ -10464,7 +10464,7 @@ msgid "Array of contracted vertex identifiers." msgstr "收缩顶点标识符数组。" msgid "When ``type`` = **'v'**: :math:`-1`" -msgstr "当 ``type`` = **'v'**: :math:`-1`时" +msgstr "当 ``type`` = **'v'**: :math:`-1` 时" msgid "" "When ``type`` = **'e'**: Identifier of the source vertex of the current edge " @@ -15708,7 +15708,7 @@ msgid "" "Which path (if any) passes in front of point :math:`6` or vertex :math:`11` " "with right side driving topology." msgstr "" -"哪条路径（如果有）通过右侧驱动拓扑的点 :math:`6`或顶点 :math:`11`前面。" +"哪条路径（如果有）通过右侧驱动拓扑的点 :math:`6` 或顶点 :math:`11` 前面。" msgid "Show details on undirected graph." msgstr "显示无向图的详细信息。" From 7ac5ece43b3ee472c7fad491eddda5f634be6d83 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 23 Sep 2024 19:39:05 -0600 Subject: [PATCH 363/428] Reducing to 225 warnings --- .../LC_MESSAGES/pgrouting_doc_strings.po | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 53b450bd82..8772840f5c 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.7.0-dev +#Copyright (C) pgRouting Contributors - Version v3.7.0-dev # This file is distributed under the same license as the pgRouting package. # Regina Obe , 2023. # Wangdapeng , 2023. @@ -1405,7 +1405,7 @@ msgid "" "Let: - :math:`f\\_boxes`: number of boxes needed for `1` kg of feathers. - :" "math:`a\\_weight`: weight of `1` box of apples." msgstr "" -"设：- :math:`f\\_boxes`：`1`公斤羽毛所需的箱子数量。- :math:`a\\_weight`：`1`" +"设：- :math:`f\\_boxes`：`1` 公斤羽毛所需的箱子数量。- :math:`a\\_weight`：`1`" "箱子苹果的重量。" msgid "Capacity Units" @@ -1529,7 +1529,7 @@ msgstr "因素处理" msgid "" "``factor`` acts as a multiplier to convert from distance values to time " "units the matrix values or the euclidean values." -msgstr "`因子``充当乘数，将距离值转换为时间单位、矩阵值或欧几里得值。" +msgstr "``因子`` 充当乘数，将距离值转换为时间单位、矩阵值或欧几里得值。" msgid "When the values are already in the desired time units" msgstr "当值已处于所需时间单位时" @@ -1541,7 +1541,7 @@ msgid "When ``factor`` > 1 the travel times are faster" msgstr "当 ``因子`` > 1 时，行程时间更快" msgid "When ``factor`` < 1 the travel times are slower" -msgstr "当 ``因子`` < 1 时，行程时间会变慢" +msgstr "当 ``因子`` < 1 时，行程时间会变慢" msgid "For the :doc:`pgr_pickDeliverEuclidean`:" msgstr "用于 :doc:`pgr_pickDeliverEuclidean`:" @@ -3504,7 +3504,7 @@ msgstr "可用作 :doc:`pgr_TSP` 的输入。" msgid "" "Use directly when the resulting matrix is symmetric and there is no :math:" "`\\infty` value." -msgstr "当得到的矩阵是对称且没有 :math:`\\infty`值时直接使用。" +msgstr "当得到的矩阵是对称且没有 :math:`\\infty` 值时直接使用。" msgid "It will be the users responsibility to make the matrix symmetric." msgstr "用户有责任使矩阵对称。" @@ -3524,7 +3524,7 @@ msgid "" msgstr "通过将下三角形设置为上三角形的镜像。" msgid "It is also the users responsibility to fix an :math:`\\infty` value." -msgstr "确定 :math:`\\infty`值也是用户的责任。" +msgstr "确定 :math:`\\infty` 值也是用户的责任。" msgid "" "Returns the sum of the costs of the shortest path for pair combination of " @@ -8558,10 +8558,10 @@ msgid "The returned values are ordered in ascending order:" msgstr "返回值按升序排列：" msgid "`start_vid` ascending" -msgstr "`start_vid`升序" +msgstr "`start_vid` 升序" msgid "`end_vid` ascending" -msgstr "`end_vid`升序" +msgstr "`end_vid` 升序" msgid "pgr_aStarCost(`Edges SQL`_ , **start vid**, **end vid**, [**options**])" msgstr "pgr_aStarCost(`Edges SQL`_ , **start vid**, **end vid**, [**options**])" @@ -8597,7 +8597,7 @@ msgid "" msgstr "``pgr_aStarCostMatrix`` -使用 :doc:`pgr_aStar` 计算成本矩阵。" msgid "Using internaly the :doc:`pgr_aStar` algorithm" -msgstr "内部使用 :doc:`pgr_aStar`算法" +msgstr "内部使用 :doc:`pgr_aStar` 算法" msgid "Returns a cost matrix." msgstr "返回成本矩阵。" @@ -8615,7 +8615,7 @@ msgid "cost from `v` to `u` is :math:`\\inf`" msgstr "从 `v` 到 `u` 的成本是 :math:`\\inf`" msgid "when :math:`v = u` then" -msgstr "当 :math:`v = u`时" +msgstr "当 :math:`v = u` 时" msgid "cost from `v` to `u` is :math:`0`" msgstr "从 `v` 到 `u` 的成本是 :math:`0`" From 5516ecf6631740f756f9c15e0e65fb1f40dc3502 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 23 Sep 2024 19:56:24 -0600 Subject: [PATCH 364/428] Reducing to 118 warnings --- .../LC_MESSAGES/pgrouting_doc_strings.po | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 8772840f5c..c49cff316c 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -1141,7 +1141,7 @@ msgid "Matrix SQL" msgstr "矩阵SQL" msgid "Set of |matrix-result|" -msgstr "|matrix-result|的集合" +msgstr "|matrix-result| 的集合" msgid "Identifier of the starting vertex." msgstr "起始顶点的标识符。" @@ -4390,14 +4390,14 @@ msgid "" "obtained by aggregating on the source or sink and summing the flow from/to " "it. In particular:" msgstr "" -":math:`\\boldsymbol{\\Phi}`是原始边及其剩余容量和流量的子集。 通过图的最大流" +":math:`\\boldsymbol{\\Phi}` 是原始边及其剩余容量和流量的子集。 通过图的最大流" "量可以通过在源或汇上聚合并对来自/到它的流量求和来获得。 尤其：" msgid ":math:`id_i = i`" msgstr ":math:`id_i = i`" msgid ":math:`edge\\_id = id_i` in edges_sql" -msgstr ":math:`edge\\_id = id_i`在edges_sql中" +msgstr ":math:`edge\\_id = id_i` 在edges_sql中" msgid ":math:`residual\\_capacity_i = capacity_i - flow_i`" msgstr ":math:`residual\\_capacity_i = capacity_i - flow_i`" @@ -5762,7 +5762,7 @@ msgid "A graph is an ordered pair :math:`G = (V ,E)` where:" msgstr "图是一个有序对 :math:`G = (V ,E)` ，其中：" msgid ":math:`V` is a set of vertices, also called nodes." -msgstr ":math:`V`是一组顶点，也称为节点。" +msgstr ":math:`V` 是一组顶点，也称为节点。" msgid ":math:`E \\subseteq \\{( u, v ) \\mid u , v \\in V \\}`" msgstr ":math:`E \\subseteq \\{( u, v ) \\mid u , v \\in V \\}`" @@ -6612,7 +6612,7 @@ msgid "Contraction of a graph" msgstr "图的收缩" msgid "The graph can be reduced in size using :doc:`contraction-family`" -msgstr "可以使用 :doc:`contraction-family`来减小图形的大小" +msgstr "可以使用 :doc:`contraction-family` 来减小图形的大小" msgid "" "When to contract will depend on the size of the graph, processing times, " @@ -6631,7 +6631,7 @@ msgid "" "A complete method on how to contract and how to use the contracted graph is " "described on :doc:`contraction-family`" msgstr "" -"有关如何收缩以及如何使用收缩图的完整方法在 :doc:`contraction-family`中进行了" +"有关如何收缩以及如何使用收缩图的完整方法在 :doc:`contraction-family` 中进行了" "描述" msgid "Dead ends" @@ -6697,7 +6697,7 @@ msgid "" "When there are many linear edges, to speed up, the :doc:`contraction-family` " "functions can be used to divide the problem." msgstr "" -"当线性边较多时，为了加快速度，可以使用 :doc:`contraction-family`函数来划分问" +"当线性边较多时，为了加快速度，可以使用 :doc:`contraction-family` 函数来划分问" "题。" msgid "Function's structure" @@ -6737,7 +6737,7 @@ msgid "" msgstr "强制参数是位置参数，可选参数是命名参数。" msgid "For example, for this :doc:`pgr_dijkstra` signature:" -msgstr "例如，对于这个 :doc:`pgr_dijkstra`签名：" +msgstr "例如，对于这个 :doc:`pgr_dijkstra` 签名：" msgid "" "pgr_dijkstra(`Edges SQL`_ , **start vids**, **end vids**, [``directed``])" @@ -7035,7 +7035,7 @@ msgid "" "agg_cost)``" msgstr "" "返回 ``(seq, path_seq [, start_vid] [, end_vid], node, edge, cost, agg_cost)``" -"的集合" +" 的集合" msgid "``path_seq``" msgstr "``path_seq``" @@ -7080,7 +7080,7 @@ msgid "" "agg_cost)``" msgstr "" "返回 ``(seq, path_seq [, start_pid] [, end_pid], node, edge, cost, agg_cost)``" -"的集合" +" 的集合" msgid "Relative position in the path." msgstr "路径中的相对位置。" @@ -7116,10 +7116,10 @@ msgid "When negative is the identifier of the ending point." msgstr "当负数时是终点的标识符。" msgid "Returned on `One to Many`_ and `Many to Many`_" -msgstr "返回`一对多`_ 和`多对多`_" +msgstr "返回 `一对多`_ 和 `多对多`_" msgid "Identifier of the node in the path from ``start_pid`` to ``end_pid``." -msgstr "从 ``start_pid`` 到``end_pid`` 路径中节点的标识符。" +msgstr "从 ``start_pid`` 到 ``end_pid`` 路径中节点的标识符。" msgid "When positive is the identifier of the a vertex." msgstr "当正数时是顶点的标识符。" @@ -7166,7 +7166,7 @@ msgid "" "cost, agg_cost)``" msgstr "" "``(seq, path_id, path_seq [, start_vid] [, end_vid], node, edge, cost, " -"agg_cost)``集合" +"agg_cost)`` 集合" msgid "``path_id``" msgstr "``path_id``" @@ -7245,7 +7245,7 @@ msgid "" "wiki>`__ page." msgstr "" "编辑现有的 `pgRouting 维基 `__" -"页面。" +" 页面。" msgid "Or create a new Wiki page" msgstr "或者创建一个新的维基 页面" @@ -7543,7 +7543,7 @@ msgid "Configuring" msgstr "配置" msgid "pgRouting uses the `cmake` system to do the configuration." -msgstr "pgRouting 使用 `cmake`系统进行配置。" +msgstr "pgRouting 使用 `cmake` 系统进行配置。" msgid "The build directory is different from the source directory" msgstr "构建目录与源目录不同" @@ -7626,7 +7626,7 @@ msgid "Using ``make`` to build the code and the documentation" msgstr "使用 ``make`` 构建代码和文档" msgid "The following instructions start from *path/to/pgrouting/build*" -msgstr "以下说明从*path/to/pgrouting/build*开始" +msgstr "以下说明从 *path/to/pgrouting/build* 开始" msgid "" "We have tested on several platforms, For installing or reinstalling all the " @@ -7643,7 +7643,7 @@ msgid "Linux" msgstr "Linux" msgid "The following instructions start from *path/to/pgrouting*" -msgstr "以下说明从 *path/to/pgrouting*开始" +msgstr "以下说明从 *path/to/pgrouting* 开始" msgid "" "To remove the build when the configuration changes, use the following code:" @@ -8777,11 +8777,11 @@ msgstr "" "息的顶点表_vertices_pgr。" msgid "Use :doc:`pgr_createVerticesTable` to create the vertices table." -msgstr "使用 :doc:`pgr_createVerticesTable`建立顶点表。" +msgstr "使用 :doc:`pgr_createVerticesTable` 建立顶点表。" msgid "" "Use :doc:`pgr_createTopology` to create the topology and the vertices table." -msgstr "使用 :doc:`pgr_createTopology`建立拓扑和顶点表。" +msgstr "使用 :doc:`pgr_createTopology` 建立拓扑和顶点表。" msgid "The analyze graph function accepts the following parameters:" msgstr "分析图函数接受以下参数：" @@ -8874,7 +8874,7 @@ msgid "" "` or :doc:`pgr_createTopology `" msgstr "" "顶点表可以使用 :doc:`pgr_createVerticesTable ` 或 :" -"doc:`pgr_createTopology `创建" +"doc:`pgr_createTopology ` 创建" msgid "The structure of the vertices table is:" msgstr "顶点表的结构为：" @@ -9026,7 +9026,7 @@ msgid ":doc:`pgr_createVerticesTable`" msgstr ":doc:`pgr_createVerticesTable`" msgid ":doc:`pgr_nodeNetwork` to create nodes to a not noded edge table." -msgstr ":doc:`pgr_nodeNetwork`创建节点到非节点边表。" +msgstr ":doc:`pgr_nodeNetwork` Full line graph of subgraph of edges :math:创建节点到非节点边表。" msgid "pgr_analyzeOneWay" msgstr "pgr_analyzeOneWay" @@ -13751,7 +13751,7 @@ msgid "Returns set of |result-linegf|" msgstr "返回 |result-linegf| 的集合" msgid "Full line graph of subgraph of edges :math:`\\{4, 7, 8, 10\\}`" -msgstr "边 :math:`\\{4, 7, 8, 10\\}`子图的全线图" +msgstr "边 :math:`\\{4, 7, 8, 10\\}` 子图的全线图" msgid "" "The examples of this section are based on the :doc:`sampledata` network. The " From 6fbc7334acd76c47bd84fb611bc551cdbc0a0384 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Mon, 23 Sep 2024 21:06:14 -0600 Subject: [PATCH 365/428] Restoring some changes on original message --- .../LC_MESSAGES/pgrouting_doc_strings.po | 1202 ++++++++--------- 1 file changed, 600 insertions(+), 602 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index c49cff316c..48a3c2b112 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -#Copyright (C) pgRouting Contributors - Version v3.7.0-dev +# Copyright (C) pgRouting Contributors - Version v3.7.0-dev # This file is distributed under the same license as the pgRouting package. # Regina Obe , 2023. # Wangdapeng , 2023. @@ -648,7 +648,7 @@ msgid "The traveling costs are symmetric:" msgstr "旅行费用是对称的：" msgid "" -"Traveling costs from ``u`` to ``v`` are just as much as traveling from ``v``" +"Traveling costs from ``u`` to ``v`` are just as much as traveling from ``v`` " "to ``u``" msgstr "从 ``u`` 到 ``v`` 的旅行费用与从 ``v`` 到 ``u`` 的旅行费用相同" @@ -1582,7 +1582,7 @@ msgid "For the :doc:`pgr_pickDeliver`:" msgstr "用于 :doc:`pgr_pickDeliver`:" msgid "" -"Given :math:`v = d / t` therefore :math:`t = d / v` And the ``factor``" +"Given :math:`v = d / t` therefore :math:`t = d / v` And the ``factor`` " "becomes :math:`1 / v`" msgstr "给定 :math:`v = d / t` 因此 :math:`t = d / v` 并且 ``因子`` 变为 :math:`1 / v`" @@ -3105,7 +3105,7 @@ msgstr "操作：线性收缩" msgid "" "The linear contraction will stop when there are no more linear nodes. For " -"example from the following graph where :math:`v` and :math:`w` are `linear`_" +"example from the following graph where :math:`v` and :math:`w` are `linear`_ " "nodes:" msgstr "" "当不再有线性节点时，线性收缩将停止。 例如，在下图中，其中 :math:`v` 和 :math:`w`" @@ -3160,7 +3160,7 @@ msgstr "" msgid "" "This implementation, cycles ``max_cycles`` times through " -"``operations_order``." +"``operations_order`` ." msgstr "此实现通过 ``operations_order``循环 ``max_cycles`` 次。" msgid "Contracting sample data" @@ -3217,7 +3217,7 @@ msgid "Add additional columns" msgstr "添加附加列" msgid "" -"Adding extra columns to the ``edge_table`` and ``edge_table_vertices_pgr``" +"Adding extra columns to the ``edge_table`` and ``edge_table_vertices_pgr`` " "tables, where:" msgstr "向 ``edge_table`` 和``edge_table_vertices_pgr`` 表添加额外的列，其中：" @@ -3766,15 +3766,15 @@ msgstr "边集 :math:`E`" 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 " +"\\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 "" ":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, " +"\\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 \\n" @@ -3786,15 +3786,15 @@ msgstr "无向图" msgid "The weighted undirected graph, :math:`G_u(V,E)`, is definied by:" msgstr "加权无向图， :math:`G_u(V,E)` 的定义如下：" -msgid ":math:`V = source \\cup target \\cup {start_v{vid}} \\cup {end_{vid}}`" +msgid ":math:`V = source \\cup target \\cup {start_v{vid}} \\cup {end_{vid}}`" msgstr "" -":math:`V = source \\cup target \\cup {start_v{vid}} \\cup {end_{vid}}`" +":math:`V = source \\cup target \\cup {start_v{vid}} \\cup {end_{vid}}`" 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{ 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) " @@ -3803,7 +3803,7 @@ msgid "" "\\text{ if } reverse\\_cost \\neq \\varnothing \\\\ \\end{cases}`" msgstr "" ":math:`E = \\begin{cases} \\text{ } \\{(source_i, target_i, cost_i) \\text{ " -"when } cost >=0 \\} & \\quad \\text{ } \\\\ \\cup \\{(target_i, source_i, " +"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{ } \\\\ " @@ -3858,8 +3858,8 @@ msgstr ":math:`node_i \\in V`" msgid ":math:`node_1 = start_{vid}`" msgstr ":math:`node_1 = start_{vid}`" -msgid ":math:`node_{| \\pi |} = end_{vid}`" -msgstr ":math:`node_{| \\pi |} = end_{vid}`" +msgid ":math:`node_{| \\pi |} = end_{vid}`" +msgstr ":math:`node_{| \\pi |} = end_{vid}`" msgid "" ":math:`\\forall i \\neq | \\pi |, \\quad (node_i, node_{i+1}, cost_i) \\in E`" @@ -3867,24 +3867,24 @@ msgstr "" ":math:`\\forall i \\neq | \\pi |, \\quad (node_i, node_{i+1}, cost_i) \\in E`" msgid "" -":math:`edge_i = \\begin{cases} id_{(node_i, node_{i+1},cost_i)} &\\quad " -"\\text{when } i \\neq | \\pi | \\\\ -1 &\\quad \\text{when } i = | \\pi | \\" +":math:`edge_i = \\begin{cases} id_{(node_i, node_{i+1},cost_i)} &\\quad " +"\\text{when } i \\neq | \\pi | \\\\ -1 &\\quad \\text{when } i = | \\pi | \\" "\\ \\end{cases}`" msgstr "" -":math:`edge_i = \\begin{cases} id_{(node_i, node_{i+1},cost_i)} &\\quad " -"\\text{when } i \\neq | \\pi | \\\\ -1 &\\quad \\text{when } i = | \\pi | \\" +":math:`edge_i = \\begin{cases} id_{(node_i, node_{i+1},cost_i)} &\\quad " +"\\text{when } i \\neq | \\pi | \\\\ -1 &\\quad \\text{when } i = | \\pi | \\" "\\ \\end{cases}`" msgid ":math:`cost_i = cost_{(node_i, node_{i+1})}`" msgstr ":math:`cost_i = cost_{(node_i, node_{i+1})}`" msgid "" -":math:`agg\\_cost_i = \\begin{cases} 0 &\\quad \\text{when } i = 1 \\" -"\\ \\displaystyle\\sum_{k=1}^{i} cost_{(node_{k-1}, node_k)} &\\quad " +":math:`agg\\_cost_i = \\begin{cases} 0 &\\quad \\text{when } i = 1 \\" +"\\ \\displaystyle\\sum_{k=1}^{i} cost_{(node_{k-1}, node_k)} &\\quad " "\\text{when } i \\neq 1 \\\\ \\end{cases}`" msgstr "" -":math:`agg\\_cost_i = \\begin{cases} 0 &\\quad \\text{when } i = 1 \\" -"\\ \\displaystyle\\sum_{k=1}^{i} cost_{(node_{k-1}, node_k)} &\\quad " +":math:`agg\\_cost_i = \\begin{cases} 0 &\\quad \\text{when } i = 1 \\" +"\\ \\displaystyle\\sum_{k=1}^{i} cost_{(node_{k-1}, node_k)} &\\quad " "\\text{when } i \\neq 1 \\\\ \\end{cases}`" msgid "" @@ -4335,19 +4335,19 @@ msgstr "图定义" msgid "The weighted directed graph, :math:`G(V,E)`, is defined as:" msgstr "加权有向图， :math:`G(V,E)` 定义为：" -msgid "the set of vertices :math:`V`" +msgid "the set of vertices :math:`V`" msgstr "顶点集 :math:`V`" msgid "" -":math:`source\\_vertex \\cup sink\\_vertex \\bigcup source_i \\bigcup " +":math:`source\\_vertex \\cup sink\\_vertex \\bigcup source_i \\bigcup " "target_i`" msgstr "" -":math:`source\\_vertex \\cup sink\\_vertex \\bigcup source_i \\bigcup " +":math:`source\\_vertex \\cup sink\\_vertex \\bigcup source_i \\bigcup " "target_i`" msgid "" ":math:`E = \\begin{cases} \\text{ } \\{(source_i, target_i, capacity_i) " -"\\text{ when } capacity > 0 \\} & \\quad \\text{ if } reverse\\_capacity = " +"\\text{ when } capacity > 0 \\} & \\quad \\text{ if } reverse\\_capacity = " "\\varnothing \\\\ \\text{ } & \\quad \\text{ } \\\\ \\{(source_i, target_i, " "capacity_i) \\text{ when } capacity > 0 \\} & \\text{ } \\\\ \\cup " "\\{(target_i, source_i, reverse\\_capacity_i) \\text{ when } " @@ -4355,7 +4355,7 @@ msgid "" "\\varnothing \\\\ \\end{cases}`" msgstr "" ":math:`E = \\begin{cases} \\text{ } \\{(source_i, target_i, capacity_i) " -"\\text{ when } capacity > 0 \\} & \\quad \\text{ if } reverse\\_capacity = " +"\\text{ when } capacity > 0 \\} & \\quad \\text{ if } reverse\\_capacity = " "\\varnothing \\\\ \\text{ } & \\quad \\text{ } \\\\ \\{(source_i, target_i, " "capacity_i) \\text{ when } capacity > 0 \\} & \\text{ } \\\\ \\cup " "\\{(target_i, source_i, reverse\\_capacity_i) \\text{ when } " @@ -4406,7 +4406,7 @@ msgid "https://en.wikipedia.org/wiki/Maximum_flow_problem" msgstr "https://en.wikipedia.org/wiki/Maximum_flow_problem" msgid "" -"pgRouting extends the `PostGIS `__ /`PostgreSQL `__/`PostgreSQL `__ geospatial database to provide geospatial routing and " "other network analysis functionality." msgstr "" @@ -4428,7 +4428,7 @@ msgid "" "`license` page." msgstr "" "pgRouting 手册根据`知识共享署名-相同方式共享3.0许可证 `_ 。 您可以随意使用本材料，但我们要求" +"creativecommons.org/licenses/by-sa/3.0/>`_。 您可以随意使用本材料，但我们要求" "您将功劳归功于 pgRouting 项目，并尽可能提供返回 https://pgrouting.org 的链" "接。 有关 pgRouting 中使用的其他许可证，请参阅 :ref:`license` page.。" @@ -4616,8 +4616,7 @@ msgid "" "`#2635 `__ pgr_LineGraph " "ignores directed flag and use negative values for identifiers." msgstr "" -"`#2516 `__ 标准化输出" -"pgr_aStar." +"" msgid "``pgr_lineGraph``" msgstr "``pgr_lineGraph``" @@ -4725,7 +4724,7 @@ msgid "Output columns were |old-generic-result|" msgstr "输出列是 |old-generic-result|" msgid "" -"Depending on the overload used, the columns ``start_vid`` and ``end_vid``" +"Depending on the overload used, the columns ``start_vid`` and ``end_vid`` " "might be missing:" msgstr "根据所使用的重载， ``start_vid`` 和``end_vid`` 列可能会丢失：" @@ -5093,7 +5092,7 @@ msgstr "迁移前" msgid "" "Columns used are ``going`` and ``coming`` to represent the existence of an " "edge." -msgstr "所使用的列是 ``going`` 和 ``coming`` ，用于表示边的存在。" +msgstr "所使用的列是 ``going`` 和 ``coming``，用于表示边的存在。" msgid "" "Flag ``directed`` was used to indicate if it was for a **directed** or " @@ -5297,7 +5296,7 @@ msgid "filter out the additional columns, for example;" msgstr "过滤掉额外的列，例如；" msgid "" -"When ``details => false`` to remove the points use `` WHERE node >= 0 OR cost " +"When ``details => false`` to remove the points use ``WHERE node >= 0 OR cost " "= 0``" msgstr "" "当设置 ``details => false`` 以移除点时，请使用 ``WHERE node >= 0 OR cost = 0``" @@ -5482,13 +5481,13 @@ msgstr "在此迁移指南中使用了 ``new_restrictions``。" msgid "" "For this migration pgRouting supplies an auxiliary function for reversal of " -"an array ``_ pgr_array_reverse`` needed for the migration." +"an array ``_pgr_array_reverse`` needed for the migration." msgstr "" "为了进行这次迁移，pgRouting 提供了一个用于反转数组的辅助函数 " "``_ pgr_array_reverse`` ，这在迁移过程中是必需的。" -msgid "``_ pgr_array_reverse`` :" -msgstr "``_ pgr_array_reverse`` :" +msgid "``_pgr_array_reverse``:" +msgstr "``_pgr_array_reverse``:" msgid "Was created temporally for this migration" msgstr "是为此迁移临时创建的" @@ -6236,7 +6235,7 @@ msgid "Have the identifiers columns indexed." msgstr "对标识符列建立索引。" msgid "" -"Please consult the `PostgreSQL `__" +"Please consult the `PostgreSQL `__ " "documentation and the `PostGIS `__ documentation." msgstr "" "请查阅`PostgreSQL `__ 文档和 `PostGIS " @@ -6303,7 +6302,7 @@ msgid "" "Data coming from OSM and using `osm2pgrouting `__ as an import tool, comes with the routing topology. See an " "example of using ``osm2pgrouting`` on the `workshop `__ ." +"pgrouting.org/latest/en/basic/data.html>`__." msgstr "" "来自 OSM 并使用 `osm2pgrouting `__ 作为导入工具的数据附带路由拓扑。 请参阅`workshop `__ ." +"the edges need to be `split `__." msgstr "" "对交叉点进行一一分析后，对于需要局部修复的交叉点，需要 `分割 `__ 边。" @@ -6574,7 +6573,7 @@ msgstr "" "`4`。 距离顶点 :math:`4` 最近的边是 边 :math:`14`。" msgid "" -"The ``edge`` can be used to connect the components, using the ``fraction``" +"The ``edge`` can be used to connect the components, using the ``fraction`` " "information about the edge :math:`14` to split the connecting edge." msgstr "" "``edge``可用于连接组件，利用边 :math:`14` 的``fraction`` 信息来分割连接边。" @@ -6713,12 +6712,12 @@ msgstr "pgRouting 函数调用的一般形式是：" msgid "\\ \\" msgstr "\\ \\" -msgid "pgr_(`Inner queries`_ , **parameters**, [``Optional parameters``)" +msgid "pgr_(`Inner queries`_, **parameters**, [ ``Optional parameters``)" msgstr "" "pgr_(`Inner queries`_ , **parameters**, [``Optional parameters``)" msgid "" -"`Inner queries`_ : Are compulsory parameters that are ``TEXT`` strings " +"`Inner queries`_: Are compulsory parameters that are ``TEXT`` strings " "containing SQL queries." msgstr "`Inner queries`_ ：是强制参数，是包含 SQL 查询的 ``TEXT`` 字符串。" @@ -6727,7 +6726,7 @@ msgid "" msgstr "**parameters**：函数需要的附加强制参数。" msgid "" -"``Optional parameters`` : Are non compulsory **named** parameters that have a " +"``Optional parameters``: Are non compulsory **named** parameters that have a " "default value when omitted." msgstr "``Optional parameters`` ：是非强制命名参数，省略时具有默认值。" @@ -6740,12 +6739,12 @@ msgid "For example, for this :doc:`pgr_dijkstra` signature:" msgstr "例如，对于这个 :doc:`pgr_dijkstra` 签名：" msgid "" -"pgr_dijkstra(`Edges SQL`_ , **start vids**, **end vids**, [``directed``])" +"pgr_dijkstra(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" msgstr "" "pgr_dijkstra(`Edges SQL`_ , **start vids**, **end vids**, [``directed``])" -msgid "`Edges SQL`_ :" -msgstr "`Edges SQL`_ :" +msgid "`Edges SQL`_:" +msgstr "`Edges SQL`_:" msgid "Is the first parameter." msgstr "是第一个参数。" @@ -6790,7 +6789,7 @@ msgid "It has a name." msgstr "它有一个名字。" msgid "" -"The full description of the parameters are found on the `Parameters`_" +"The full description of the parameters are found on the `Parameters`_ " "section of each function." msgstr "参数的完整描述可以在每个函数的 `Parameters`_ 部分找到。" @@ -6902,7 +6901,7 @@ msgstr "通常带有（X,Y)" msgid "" "When negative: edge (``source``, ``target``) does not exist, therefore it's " "not part of the graph." -msgstr "当为负时：边（ ``source``, ``target`` ）不存在，因此它不是图的一部分。" +msgstr "当为负时：边（``source``, ``target``）不存在，因此它不是图的一部分。" msgid "Weight of the edge (``target``, ``source``)," msgstr "边 (``target``, ``source``)的权重，" @@ -7666,9 +7665,9 @@ msgid "" "`PostgreSQL `__ geospatial database and adds " "routing and other network analysis functionality. A predecessor of pgRouting " "– pgDijkstra, written by Sylvain Pasche from `Camptocamp `__ , was later extended by Orkney and renamed to pgRouting. The project " +"com>`__, was later extended by Orkney and renamed to pgRouting. The project " "is now supported and maintained by `Georepublic `__ , `Paragon Corporation `__ and " +"info>`__, `Paragon Corporation `__ and " "a broad user community." msgstr "" "pgRouting 是 `PostGIS `__ 和 `PostgreSQL `_." msgstr "" "一些 Boost 扩展可根据` Boost 软件许可证 - 版本 1.0 获得 `_ 。" +"org/LICENSE_1_0.txt>`_。" msgid "MIT-X License" msgstr "MIT-X License" @@ -7728,7 +7727,7 @@ msgid "" "Alike 3.0 License `_." msgstr "" "pgRouting 手册根据`知识共享署名-相同方式共享 3.0 许可证获得许可 `_ 。" +"creativecommons.org/licenses/by-sa/3.0/>`_。" msgid "" "In general license information should be included in the header of each " @@ -7934,27 +7933,27 @@ msgstr "签名" msgid "Summary" msgstr "总结" -msgid "pgr_KSP(`Edges SQL`_ , **start vid**, **end vid**, **K**, [**options**])" +msgid "pgr_KSP(`Edges SQL`_, **start vid**, **end vid**, **K**, [**options**])" msgstr "" -"pgr_KSP(`Edges SQL`_ , **start vid**, **end vid**, **K**, [**options**])" +"pgr_KSP(`Edges SQL`_, **start vid**, **end vid**, **K**, [**options**])" msgid "" -"pgr_KSP(`Edges SQL`_ , **start vid**, **end vids**, **K**, [**options**])" +"pgr_KSP(`Edges SQL`_, **start vid**, **end vids**, **K**, [**options**])" msgstr "" -"pgr_KSP(`Edges SQL`_ , **start vid**, **end vids**, **K**, [**options**])" +"pgr_KSP(`Edges SQL`_, **start vid**, **end vids**, **K**, [**options**])" msgid "" -"pgr_KSP(`Edges SQL`_ , **start vids**, **end vid**, **K**, [**options**])" +"pgr_KSP(`Edges SQL`_, **start vids**, **end vid**, **K**, [**options**])" msgstr "" -"pgr_KSP(`Edges SQL`_ , **start vids**, **end vid**, **K**, [**options**])" +"pgr_KSP(`Edges SQL`_, **start vids**, **end vid**, **K**, [**options**])" msgid "" -"pgr_KSP(`Edges SQL`_ , **start vids**, **end vids**, **K**, [**options**])" +"pgr_KSP(`Edges SQL`_, **start vids**, **end vids**, **K**, [**options**])" msgstr "" -"pgr_KSP(`Edges SQL`_ , **start vids**, **end vids**, **K**, [**options**])" +"pgr_KSP(`Edges SQL`_, **start vids**, **end vids**, **K**, [**options**])" -msgid "pgr_KSP(`Edges SQL`_ , `Combinations SQL`_ , **K**, [**options**])" -msgstr "pgr_KSP(`Edges SQL`_ , `Combinations SQL`_ , **K**, [**options**])" +msgid "pgr_KSP(`Edges SQL`_, `Combinations SQL`_, **K**, [**options**])" +msgstr "pgr_KSP(`Edges SQL`_, `Combinations SQL`_, **K**, [**options**])" msgid "**options:** ``[directed, heap_paths]``" msgstr "**options:** ``[directed, heap_paths]``" @@ -8179,8 +8178,8 @@ msgstr "当数据不完整，但是是连通图时：" msgid "the missing values will be calculated with dijkstra algorithm." msgstr "缺失值将使用 dijkstra 算法计算。" -msgid "pgr_TSP(`Matrix SQL`_ , ``[start_id, end_id]``)" -msgstr "pgr_TSP(`Matrix SQL`_ , ``[start_id, end_id]``)" +msgid "pgr_TSP(`Matrix SQL`_, ``[start_id, end_id]``)" +msgstr "pgr_TSP(`Matrix SQL`_, ``[start_id, end_id]``)" msgid "Returns set of |tsp-result|" msgstr "返回 |tsp-result| 的集合" @@ -8366,7 +8365,7 @@ msgid "" msgstr "" "此示例展示了如何使用Waterloo大学的 `示例数据 `__ （使用西撒哈拉 29 个城市的数据集 `__ ）进行性能测试" +"math.uwaterloo.ca/tsp/world/wi29.tsp>`__）进行性能测试" msgid "Creating a table for the data and storing the data" msgstr "创建数据表并存储数据" @@ -8453,20 +8452,20 @@ msgid "" "`One to One`_ `)` on the:" msgstr "结果相当于 `pgr_aStar(` `一对一`_ `)` 结果的并集：" -msgid "pgr_aStar(`Edges SQL`_ , **start vid**, **end vid**, [**options**])" -msgstr "pgr_aStar(`Edges SQL`_ , **start vid**, **end vid**, [**options**])" +msgid "pgr_aStar(`Edges SQL`_, **start vid**, **end vid**, [**options**])" +msgstr "pgr_aStar(`Edges SQL`_, **start vid**, **end vid**, [**options**])" -msgid "pgr_aStar(`Edges SQL`_ , **start vid**, **end vids**, [**options**])" -msgstr "pgr_aStar(`Edges SQL`_ , **start vid**, **end vids**, [**options**])" +msgid "pgr_aStar(`Edges SQL`_, **start vid**, **end vids**, [**options**])" +msgstr "pgr_aStar(`Edges SQL`_, **start vid**, **end vids**, [**options**])" -msgid "pgr_aStar(`Edges SQL`_ , **start vids**, **end vid**, [**options**])" -msgstr "pgr_aStar(`Edges SQL`_ , **start vids**, **end vid**, [**options**])" +msgid "pgr_aStar(`Edges SQL`_, **start vids**, **end vid**, [**options**])" +msgstr "pgr_aStar(`Edges SQL`_, **start vids**, **end vid**, [**options**])" -msgid "pgr_aStar(`Edges SQL`_ , **start vids**, **end vids**, [**options**])" -msgstr "pgr_aStar(`Edges SQL`_ , **start vids**, **end vids**, [**options**])" +msgid "pgr_aStar(`Edges SQL`_, **start vids**, **end vids**, [**options**])" +msgstr "pgr_aStar(`Edges SQL`_, **start vids**, **end vids**, [**options**])" -msgid "pgr_aStar(`Edges SQL`_ , `Combinations SQL`_ , [**options**])" -msgstr "pgr_aStar(`Edges SQL`_ , `Combinations SQL`_ , [**options**])" +msgid "pgr_aStar(`Edges SQL`_, `Combinations SQL`_, [**options**])" +msgstr "pgr_aStar(`Edges SQL`_, `Combinations SQL`_, [**options**])" msgid "**options:** ``[directed, heuristic, factor, epsilon]``" msgstr "**options:** ``[directed, heuristic, factor, epsilon]``" @@ -8563,30 +8562,30 @@ msgstr "`start_vid` 升序" msgid "`end_vid` ascending" msgstr "`end_vid` 升序" -msgid "pgr_aStarCost(`Edges SQL`_ , **start vid**, **end vid**, [**options**])" -msgstr "pgr_aStarCost(`Edges SQL`_ , **start vid**, **end vid**, [**options**])" +msgid "pgr_aStarCost(`Edges SQL`_, **start vid**, **end vid**, [**options**])" +msgstr "pgr_aStarCost(`Edges SQL`_, **start vid**, **end vid**, [**options**])" -msgid "pgr_aStarCost(`Edges SQL`_ , **start vid**, **end vids**, [**options**])" +msgid "pgr_aStarCost(`Edges SQL`_, **start vid**, **end vids**, [**options**])" msgstr "" -"pgr_aStarCost(`Edges SQL`_ , **start vid**, **end vids**, [**options**])" +"pgr_aStarCost(`Edges SQL`_, **start vid**, **end vids**, [**options**])" -msgid "pgr_aStarCost(`Edges SQL`_ , **start vids**, **end vid**, [**options**])" +msgid "pgr_aStarCost(`Edges SQL`_, **start vids**, **end vid**, [**options**])" msgstr "" -"pgr_aStarCost(`Edges SQL`_ , **start vids**, **end vid**, [**options**])" +"pgr_aStarCost(`Edges SQL`_, **start vids**, **end vid**, [**options**])" msgid "" -"pgr_aStarCost(`Edges SQL`_ , **start vids**, **end vids**, [**options**])" +"pgr_aStarCost(`Edges SQL`_, **start vids**, **end vids**, [**options**])" msgstr "" -"pgr_aStarCost(`Edges SQL`_ , **start vids**, **end vids**, [**options**])" +"pgr_aStarCost(`Edges SQL`_, **start vids**, **end vids**, [**options**])" -msgid "pgr_aStarCost(`Edges SQL`_ , `Combinations SQL`_ , [**options**])" -msgstr "pgr_aStarCost(`Edges SQL`_ , `Combinations SQL`_ , [**options**])" +msgid "pgr_aStarCost(`Edges SQL`_, `Combinations SQL`_, [**options**])" +msgstr "pgr_aStarCost(`Edges SQL`_, `Combinations SQL`_, [**options**])" msgid "Returns set of |matrix-result|" msgstr "返回 |matrix-result| 的集合" -msgid "pgr_aStarCost(`Edges SQL`_ , **start vids**, **end vids**, [options])" -msgstr "pgr_aStarCost(`Edges SQL`_ , **start vids**, **end vids**, [options])" +msgid "pgr_aStarCost(`Edges SQL`_, **start vids**, **end vids**, [options])" +msgstr "pgr_aStarCost(`Edges SQL`_, **start vids**, **end vids**, [options])" msgid "``pgr_aStarCostMatrix``" msgstr "``pgr_aStarCostMatrix``" @@ -8623,8 +8622,8 @@ msgstr "从 `v` 到 `u` 的成本是 :math:`0`" msgid "When the graph is **undirected** the cost matrix is symmetric" msgstr "当图 **无向** 时，成本矩阵是对称的" -msgid "pgr_aStarCostMatrix(`Edges SQL`_ , **start vids**, [**options**])" -msgstr "pgr_aStarCostMatrix(`Edges SQL`_ , **start vids**, [**options**])" +msgid "pgr_aStarCostMatrix(`Edges SQL`_, **start vids**, [**options**])" +msgstr "pgr_aStarCostMatrix(`Edges SQL`_, **start vids**, [**options**])" msgid "" "Symmetric cost matrix for vertices :math:`\\{5, 6, 10, 15\\}` on an " @@ -9026,7 +9025,7 @@ msgid ":doc:`pgr_createVerticesTable`" msgstr ":doc:`pgr_createVerticesTable`" msgid ":doc:`pgr_nodeNetwork` to create nodes to a not noded edge table." -msgstr ":doc:`pgr_nodeNetwork` Full line graph of subgraph of edges :math:创建节点到非节点边表。" +msgstr ":doc:`pgr_nodeNetwork` 创建节点到非节点边表。" msgid "pgr_analyzeOneWay" msgstr "pgr_analyzeOneWay" @@ -9259,13 +9258,13 @@ msgstr "``pgr_bdAstar`` — 使用双向 A* 算法的最短路径。" msgid "" "``pgr_bdAstar`` (`One to One`_) added ``start_vid`` and ``end_vid`` columns." -msgstr "``pgr_bdAstar`` (`一对一`_) 增加``start_vid`` 和 ``end_vid`` 列。" +msgstr "``pgr_bdAstar`` (`一对一`_) 增加``start_vid`` 和 ``end_vid``列。" msgid "``pgr_bdAstar`` (`One to Many`_) added ``end_vid`` column." msgstr "``pgr_bdAstar`` (`一对多`_) 增加``end_vid`` 列。" msgid "``pgr_bdAstar`` (`Many to One`_) added ``start_vid`` column." -msgstr "``pgr_bdAstar`` (`多对一`_) 增加``start_vid`` 列。" +msgstr "``pgr_bdAstar`` (`多对一`_) 增加``start_vid``列。" msgid "``pgr_bdAstar`` (`Combinations`_)" msgstr "``pgr_bdAstar`` (`组合`_)" @@ -9290,20 +9289,20 @@ msgid "" "`One to One`_ `)` on the:" msgstr "结果相当于`pgr_bdAStar(` `一对一`_ `)` 结果的并集：" -msgid "pgr_bdAstar(`Edges SQL`_ , **start vid**, **end vid**, [**options**])" -msgstr "pgr_bdAstar(`Edges SQL`_ , **start vid**, **end vid**, [**options**])" +msgid "pgr_bdAstar(`Edges SQL`_, **start vid**, **end vid**, [**options**])" +msgstr "pgr_bdAstar(`Edges SQL`_, **start vid**, **end vid**, [**options**])" -msgid "pgr_bdAstar(`Edges SQL`_ , **start vid**, **end vids**, [**options**])" -msgstr "pgr_bdAstar(`Edges SQL`_ , **start vid**, **end vids**, [**options**])" +msgid "pgr_bdAstar(`Edges SQL`_, **start vid**, **end vids**, [**options**])" +msgstr "pgr_bdAstar(`Edges SQL`_, **start vid**, **end vids**, [**options**])" -msgid "pgr_bdAstar(`Edges SQL`_ , **start vids**, **end vid**, [**options**])" -msgstr "pgr_bdAstar(`Edges SQL`_ , **start vids**, **end vid**, [**options**])" +msgid "pgr_bdAstar(`Edges SQL`_, **start vids**, **end vid**, [**options**])" +msgstr "pgr_bdAstar(`Edges SQL`_, **start vids**, **end vid**, [**options**])" -msgid "pgr_bdAstar(`Edges SQL`_ , **start vids**, **end vids**, [**options**])" -msgstr "pgr_bdAstar(`Edges SQL`_ , **start vids**, **end vids**, [**options**])" +msgid "pgr_bdAstar(`Edges SQL`_, **start vids**, **end vids**, [**options**])" +msgstr "pgr_bdAstar(`Edges SQL`_, **start vids**, **end vids**, [**options**])" -msgid "pgr_bdAstar(`Edges SQL`_ , `Combinations SQL`_ , [**options**])" -msgstr "pgr_bdAstar(`Edges SQL`_ , `Combinations SQL`_ , [**options**])" +msgid "pgr_bdAstar(`Edges SQL`_, `Combinations SQL`_, [**options**])" +msgstr "pgr_bdAstar(`Edges SQL`_, `Combinations SQL`_, [**options**])" msgid "pgr_bdAstarCost" msgstr "pgr_bdAstarCost" @@ -9324,27 +9323,27 @@ msgid "" msgstr "``pgr_bdAstarCost`` 函数使用双向 A* 算法汇总最短路径的成本。" msgid "" -"pgr_bdAstarCost(`Edges SQL`_ , **start vid**, **end vid**, [**options**])" +"pgr_bdAstarCost(`Edges SQL`_, **start vid**, **end vid**, [**options**])" msgstr "" -"pgr_bdAstarCost(`Edges SQL`_ , **start vid**, **end vid**, [**options**])" +"pgr_bdAstarCost(`Edges SQL`_, **start vid**, **end vid**, [**options**])" msgid "" -"pgr_bdAstarCost(`Edges SQL`_ , **start vid**, **end vids**, [**options**])" +"pgr_bdAstarCost(`Edges SQL`_, **start vid**, **end vids**, [**options**])" msgstr "" -"pgr_bdAstarCost(`Edges SQL`_ , **start vid**, **end vids**, [**options**])" +"pgr_bdAstarCost(`Edges SQL`_, **start vid**, **end vids**, [**options**])" msgid "" -"pgr_bdAstarCost(`Edges SQL`_ , **start vids**, **end vid**, [**options**])" +"pgr_bdAstarCost(`Edges SQL`_, **start vids**, **end vid**, [**options**])" msgstr "" -"pgr_bdAstarCost(`Edges SQL`_ , **start vids**, **end vid**, [**options**])" +"pgr_bdAstarCost(`Edges SQL`_, **start vids**, **end vid**, [**options**])" msgid "" -"pgr_bdAstarCost(`Edges SQL`_ , **start vids**, **end vids**, [**options**])" +"pgr_bdAstarCost(`Edges SQL`_, **start vids**, **end vids**, [**options**])" msgstr "" -"pgr_bdAstarCost(`Edges SQL`_ , **start vids**, **end vids**, [**options**])" +"pgr_bdAstarCost(`Edges SQL`_, **start vids**, **end vids**, [**options**])" -msgid "pgr_bdAstarCost(`Edges SQL`_ , `Combinations SQL`_ , [**options**])" -msgstr "pgr_bdAstarCost(`Edges SQL`_ , `Combinations SQL`_ , [**options**])" +msgid "pgr_bdAstarCost(`Edges SQL`_, `Combinations SQL`_, [**options**])" +msgstr "pgr_bdAstarCost(`Edges SQL`_, `Combinations SQL`_, [**options**])" msgid "``pgr_bdAstarCostMatrix``" msgstr "``pgr_bdAstarCostMatrix``" @@ -9357,8 +9356,8 @@ msgstr "``pgr_bdAstarCostMatrix`` - 使用 :doc:`pgr_aStar` 计算成本矩阵 msgid "Using internaly the :doc:`pgr_bdAstar` algorithm" msgstr "内部使用 :doc:`pgr_bdAstar` 算法" -msgid "pgr_bdAstarCostMatrix(`Edges SQL`_ , **start vids**, [**options**])" -msgstr "pgr_bdAstarCostMatrix(`Edges SQL`_ , **start vids**, [**options**])" +msgid "pgr_bdAstarCostMatrix(`Edges SQL`_, **start vids**, [**options**])" +msgstr "pgr_bdAstarCostMatrix(`Edges SQL`_, **start vids**, [**options**])" msgid "``pgr_bdDijkstra``" msgstr "``pgr_bdDijkstra``" @@ -9391,27 +9390,27 @@ msgid "**Official** ``pgr_bdDijkstra`` (`One to One`_)" msgstr "**官方** ``pgr_bdDijkstra`` (`一对一`_)" msgid "" -"pgr_bdDijkstra(`Edges SQL`_ , **start vid**, **end vid**, [``directed``])" +"pgr_bdDijkstra(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" msgstr "" -"pgr_bdDijkstra(`Edges SQL`_ , **start vid**, **end vid**, [``directed``])" +"pgr_bdDijkstra(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" msgid "" -"pgr_bdDijkstra(`Edges SQL`_ , **start vid**, **end vids**, [``directed``])" +"pgr_bdDijkstra(`Edges SQL`_, **start vid**, **end vids**, [``directed``])" msgstr "" -"pgr_bdDijkstra(`Edges SQL`_ , **start vid**, **end vids**, [``directed``])" +"pgr_bdDijkstra(`Edges SQL`_, **start vid**, **end vids**, [``directed``])" msgid "" -"pgr_bdDijkstra(`Edges SQL`_ , **start vids**, **end vid**, [``directed``])" +"pgr_bdDijkstra(`Edges SQL`_, **start vids**, **end vid**, [``directed``])" msgstr "" -"pgr_bdDijkstra(`Edges SQL`_ , **start vids**, **end vid**, [``directed``])" +"pgr_bdDijkstra(`Edges SQL`_, **start vids**, **end vid**, [``directed``])" msgid "" -"pgr_bdDijkstra(`Edges SQL`_ , **start vids**, **end vids**, [``directed``])" +"pgr_bdDijkstra(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" msgstr "" -"pgr_bdDijkstra(`Edges SQL`_ , **start vids**, **end vids**, [``directed``])" +"pgr_bdDijkstra(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" -msgid "pgr_bdDijkstra(`Edges SQL`_ , `Combinations SQL`_ , [``directed``])" -msgstr "pgr_bdDijkstra(`Edges SQL`_ , `Combinations SQL`_ , [``directed``])" +msgid "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_, [``directed``])" +msgstr "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgid "Returns set of |old-generic-result|" msgstr "返回 |old-generic-result| 的集合" @@ -9473,34 +9472,34 @@ msgid "" msgstr "``pgr_bdDijkstraCost`` 函数使用双向 Dijkstra 算法汇总最短路径的成本。" msgid "" -"pgr_bdDijkstraCost(`Edges SQL`_ , **start vid**, **end vid** , [``directed``])" +"pgr_bdDijkstraCost(`Edges SQL`_, **start vid**, **end vid** , [``directed``])" msgstr "" -"pgr_bdDijkstraCost(`Edges SQL`_ , **start vid**, **end vid** , [``directed``])" +"pgr_bdDijkstraCost(`Edges SQL`_, **start vid**, **end vid** , [``directed``])" msgid "" -"pgr_bdDijkstraCost(`Edges SQL`_ , **start vid**, **end vids**, [``directed``])" +"pgr_bdDijkstraCost(`Edges SQL`_, **start vid**, **end vids**, [``directed``])" msgstr "" -"pgr_bdDijkstraCost(`Edges SQL`_ , **start vid**, **end vids**, [``directed``])" +"pgr_bdDijkstraCost(`Edges SQL`_, **start vid**, **end vids**, [``directed``])" msgid "" -"pgr_bdDijkstraCost(`Edges SQL`_ , **start vids**, **end vid** , " +"pgr_bdDijkstraCost(`Edges SQL`_, **start vids**, **end vid** , " "[``directed``])" msgstr "" -"pgr_bdDijkstraCost(`Edges SQL`_ , **start vids**, **end vid** , " +"pgr_bdDijkstraCost(`Edges SQL`_, **start vids**, **end vid** , " "[``directed``])" msgid "" -"pgr_bdDijkstraCost(`Edges SQL`_ , **start vids**, **end vids**, " +"pgr_bdDijkstraCost(`Edges SQL`_, **start vids**, **end vids**, " "[``directed``])" msgstr "" -"pgr_bdDijkstraCost(`Edges SQL`_ , **start vids**, **end vids**, " +"pgr_bdDijkstraCost(`Edges SQL`_, **start vids**, **end vids**, " "[``directed``])" -msgid "pgr_bdDijkstraCost(`Edges SQL`_ , `Combinations SQL`_ , [``directed``])" -msgstr "pgr_bdDijkstraCost(`Edges SQL`_ , `Combinations SQL`_ , [``directed``])" +msgid "pgr_bdDijkstraCost(`Edges SQL`_, `Combinations SQL`_, [ ``directed``])" +msgstr "pgr_bdDijkstraCost(`Edges SQL`_, `Combinations SQL`_, [ ``directed``])" -msgid "pgr_bdDijkstraCost(`Edges SQL`_ , `Combinations SQL`_ , [``directed``])" -msgstr "pgr_bdDijkstraCost(`Edges SQL`_ , `Combinations SQL`_ , [``directed``])" +msgid "pgr_bdDijkstraCost(`Edges SQL`_, `Combinations SQL`_, [``directed``])" +msgstr "pgr_bdDijkstraCost(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgid "``pgr_bdDijkstraCostMatrix``" msgstr "``pgr_bdDijkstraCostMatrix``" @@ -9515,8 +9514,8 @@ msgid "" "Using bidirectional Dijkstra algorithm, calculate and return a cost matrix." msgstr "使用双向Dijkstra算法，计算并返回成本矩阵。" -msgid "pgr_bdDijkstraCostMatrix(`Edges SQL`_ , **start vids**, [``directed``])" -msgstr "pgr_bdDijkstraCostMatrix(`Edges SQL`_ , **start vids**, [``directed``])" +msgid "pgr_bdDijkstraCostMatrix(`Edges SQL`_, **start vids**, [``directed``])" +msgstr "pgr_bdDijkstraCostMatrix(`Edges SQL`_, **start vids**, [``directed``])" msgid "" "Symmetric cost matrix for vertices :math:`\\{5, 6, 10, 15\\}` on an " @@ -9565,7 +9564,7 @@ msgid "" msgstr "" "Bellman-Ford算法以Richard Bellman和Lester Ford的名字命名，他们分别于1958年和" "1956年首次发表了这个算法。它是一种图搜索算法，用于计算从起始顶点" -"（ ``start_vid``）到终点顶点（``end_vid`` ）的最短路径，其中一些边的权重可以为" +"（``start_vid``）到终点顶点（``end_vid``）的最短路径，其中一些边的权重可以为" "负数。尽管它更加通用，但比Dijkstra算法更慢。这个实现可以用于有向图和无向图。" msgid "" @@ -9611,27 +9610,27 @@ msgid "Running time: :math:`O(| start\\_vids | * ( V * E))`" msgstr "运行时间： :math:`O(| start\\_vids | * ( V * E))`" msgid "" -"pgr_bellmanFord(`Edges SQL`_ , **start vid**, **end vid**, [``directed``])" +"pgr_bellmanFord(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" msgstr "" -"pgr_bellmanFord(`Edges SQL`_ , **start vid**, **end vid**, [``directed``])" +"pgr_bellmanFord(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" msgid "" -"pgr_bellmanFord(`Edges SQL`_ , **start vid**, **end vids**, [``directed``])" +"pgr_bellmanFord(`Edges SQL`_, **start vid**, **end vids**, [``directed``])" msgstr "" -"pgr_bellmanFord(`Edges SQL`_ , **start vid**, **end vids**, [``directed``])" +"pgr_bellmanFord(`Edges SQL`_, **start vid**, **end vids**, [``directed``])" msgid "" -"pgr_bellmanFord(`Edges SQL`_ , **start vids**, **end vid**, [``directed``])" +"pgr_bellmanFord(`Edges SQL`_, **start vids**, **end vid**, [``directed``])" msgstr "" -"pgr_bellmanFord(`Edges SQL`_ , **start vids**, **end vid**, [``directed``])" +"pgr_bellmanFord(`Edges SQL`_, **start vids**, **end vid**, [``directed``])" msgid "" -"pgr_bellmanFord(`Edges SQL`_ , **start vids**, **end vids**, [``directed``])" +"pgr_bellmanFord(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" msgstr "" -"pgr_bellmanFord(`Edges SQL`_ , **start vids**, **end vids**, [``directed``])" +"pgr_bellmanFord(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" -msgid "pgr_bellmanFord(`Edges SQL`_ , `Combinations SQL`_ , [``directed``])" -msgstr "pgr_bellmanFord(`Edges SQL`_ , `Combinations SQL`_ , [``directed``])" +msgid "pgr_bellmanFord(`Edges SQL`_, `Combinations SQL`_, [``directed``])" +msgstr "pgr_bellmanFord(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgid "" "From vertex :math:`6` to vertices :math:`\\{ 10, 17\\}` on a **directed**" @@ -9681,7 +9680,7 @@ msgid "This implementation work for both directed and undirected graphs." msgstr "该实现适用于 **有向** 图和 **无向** 图。" #, fuzzy -msgid "Running time: :math:`\\Theta(VE)`" +msgid "Running time: :math:`\\Theta(VE)`" msgstr "运行时间： :math:`O(V + E)`" #, fuzzy @@ -9692,9 +9691,8 @@ msgstr "运行时间： :math:`O(V + E)`" msgid "Throws when there are no edges in the graph" msgstr "当图中没有边时，返回 EMPTY SET。" -#, fuzzy -msgid "pgr_betweennessCentrality(`Edges SQL`_ , [``directed``])" -msgstr "pgr_lineGraph(`Edges SQL`_ , [``directed``])" +msgid "pgr_betweennessCentrality(`Edges SQL`_, [``directed``])" +msgstr "pgr_betweennessCentrality(`Edges SQL`_, [``directed``])" #, fuzzy msgid "Returns set of ``(vid, centrality)``" @@ -9885,38 +9883,38 @@ msgid "Running time: :math:`O(| start\\_vids | * |E|)`" msgstr "运行时间： :math:`O(| start\\_vids | * |E|)`" msgid "" -"pgr_binaryBreadthFirstSearch(`Edges SQL`_ , **start vid**, **end vid**, " +"pgr_binaryBreadthFirstSearch(`Edges SQL`_, **start vid**, **end vid**, " "[``directed``])" msgstr "" -"pgr_binaryBreadthFirstSearch(`Edges SQL`_ , **start vid**, **end vid**, " +"pgr_binaryBreadthFirstSearch(`Edges SQL`_, **start vid**, **end vid**, " "[``directed``])" msgid "" -"pgr_binaryBreadthFirstSearch(`Edges SQL`_ , **start vid**, **end vids**, " +"pgr_binaryBreadthFirstSearch(`Edges SQL`_, **start vid**, **end vids**, " "[``directed``])" msgstr "" -"pgr_binaryBreadthFirstSearch(`Edges SQL`_ , **start vid**, **end vids**, " +"pgr_binaryBreadthFirstSearch(`Edges SQL`_, **start vid**, **end vids**, " "[``directed``])" msgid "" -"pgr_binaryBreadthFirstSearch(`Edges SQL`_ , **start vids**, **end vid**, " +"pgr_binaryBreadthFirstSearch(`Edges SQL`_, **start vids**, **end vid**, " "[``directed``])" msgstr "" -"pgr_binaryBreadthFirstSearch(`Edges SQL`_ , **start vids**, **end vid**, " +"pgr_binaryBreadthFirstSearch(`Edges SQL`_, **start vids**, **end vid**, " "[``directed``])" msgid "" -"pgr_binaryBreadthFirstSearch(`Edges SQL`_ , **start vids**, **end vids**, " +"pgr_binaryBreadthFirstSearch(`Edges SQL`_, **start vids**, **end vids**, " "[``directed``])" msgstr "" -"pgr_binaryBreadthFirstSearch(`Edges SQL`_ , **start vids**, **end vids**, " +"pgr_binaryBreadthFirstSearch(`Edges SQL`_, **start vids**, **end vids**, " "[``directed``])" msgid "" -"pgr_binaryBreadthFirstSearch(`Edges SQL`_ , `Combinations SQL`_ , " +"pgr_binaryBreadthFirstSearch(`Edges SQL`_, `Combinations SQL`_, " "[``directed``])" msgstr "" -"pgr_binaryBreadthFirstSearch(`Edges SQL`_ , `Combinations SQL`_ , " +"pgr_binaryBreadthFirstSearch(`Edges SQL`_, `Combinations SQL`_, " "[``directed``])" msgid "" @@ -10026,20 +10024,20 @@ msgstr "新的 **实验** 函数" msgid "Running time: Polynomial" msgstr "运行时间：多项式时间" -msgid "pgr_boykovKolmogorov(`Edges SQL`_ , **start vid**, **end vid**)" -msgstr "pgr_boykovKolmogorov(`Edges SQL`_ , **start vid**, **end vid**)" +msgid "pgr_boykovKolmogorov(`Edges SQL`_, **start vid**, **end vid**)" +msgstr "pgr_boykovKolmogorov(`Edges SQL`_, **start vid**, **end vid**)" -msgid "pgr_boykovKolmogorov(`Edges SQL`_ , **start vid**, **end vids**)" -msgstr "pgr_boykovKolmogorov(`Edges SQL`_ , **start vid**, **end vids**)" +msgid "pgr_boykovKolmogorov(`Edges SQL`_, **start vid**, **end vids**)" +msgstr "pgr_boykovKolmogorov(`Edges SQL`_, **start vid**, **end vids**)" -msgid "pgr_boykovKolmogorov(`Edges SQL`_ , **start vids**, **end vid**)" -msgstr "pgr_boykovKolmogorov(`Edges SQL`_ , **start vids**, **end vid**)" +msgid "pgr_boykovKolmogorov(`Edges SQL`_, **start vids**, **end vid**)" +msgstr "pgr_boykovKolmogorov(`Edges SQL`_, **start vids**, **end vid**)" -msgid "pgr_boykovKolmogorov(`Edges SQL`_ , **start vids**, **end vids**)" -msgstr "pgr_boykovKolmogorov(`Edges SQL`_ , **start vids**, **end vids**)" +msgid "pgr_boykovKolmogorov(`Edges SQL`_, **start vids**, **end vids**)" +msgstr "pgr_boykovKolmogorov(`Edges SQL`_, **start vids**, **end vids**)" -msgid "pgr_boykovKolmogorov(`Edges SQL`_ , `Combinations SQL`_)" -msgstr "pgr_boykovKolmogorov(`Edges SQL`_ , `Combinations SQL`_)" +msgid "pgr_boykovKolmogorov(`Edges SQL`_, `Combinations SQL`_)" +msgstr "pgr_boykovKolmogorov(`Edges SQL`_, `Combinations SQL`_)" msgid "Returns set of |result-flow|" msgstr "Returns set of |result-flow|" @@ -10097,11 +10095,11 @@ msgstr "提供从源节点到目标深度级别的广度优先搜索遍历顺序 msgid "Running time: :math:`O(E + V)`" msgstr "运行时间： :math:`O(E + V)`" -msgid "pgr_breadthFirstSearch(`Edges SQL`_ , **root vid**, [**options**])" -msgstr "pgr_breadthFirstSearch(`Edges SQL`_ , **root vid**, [**options**])" +msgid "pgr_breadthFirstSearch(`Edges SQL`_, **root vid**, [**options**])" +msgstr "pgr_breadthFirstSearch(`Edges SQL`_, **root vid**, [**options**])" -msgid "pgr_breadthFirstSearch(`Edges SQL`_ , **root vids**, [**options**])" -msgstr "pgr_breadthFirstSearch(`Edges SQL`_ , **root vids**, [**options**])" +msgid "pgr_breadthFirstSearch(`Edges SQL`_, **root vids**, [**options**])" +msgstr "pgr_breadthFirstSearch(`Edges SQL`_, **root vids**, [**options**])" msgid "**options:** ``[max_depth, directed]``" msgstr "**options:** ``[max_depth, directed]``" @@ -10373,8 +10371,8 @@ msgstr "当类型为 ``e`` 时，按列``id`` 降序" msgid "The pgr_contraction function has the following signature:" msgstr "pgr_contraction 函数具有以下签名：" -msgid "pgr_contraction(`Edges SQL`_ , **contraction order**, [**options**])" -msgstr "pgr_contraction(`Edges SQL`_ , **contraction order**, [**options**])" +msgid "pgr_contraction(`Edges SQL`_, **contraction order**, [**options**])" +msgstr "pgr_contraction(`Edges SQL`_, **contraction order**, [**options**])" msgid "**options:** ``[ max_cycles, forbidden_vertices, directed]``" msgstr "**options:** ``[ max_cycles, forbidden_vertices, directed]``" @@ -10554,7 +10552,7 @@ msgid "Fills ``id`` and ``the_geom`` columns of the vertices table." msgstr "填充顶点表的 ``id`` 和 ``the_geom`` 列。" msgid "" -"Fills the source and target columns of the edge table referencing the ``id``" +"Fills the source and target columns of the edge table referencing the ``id`` " "of the vertices table." msgstr "引用顶点表的 ``id`` 填充边表的 source列和target列。" @@ -10776,7 +10774,7 @@ msgid "" "geometry column ``the_geom`` is passed to the function as the source column." msgstr "" "当参数没有按照适当的顺序提供时，将会发生错误：在这个例子中，表 ``mytable`` 的源" -"列 ``source``被错误地传递给函数作为几何列，而几何列``the_geom`` 被错误地传递给" +"列 ``source`` 被错误地传递给函数作为几何列，而几何列``the_geom`` 被错误地传递给" "函数作为源列。" msgid "Example 4" @@ -10815,7 +10813,7 @@ msgid "" "``mygeom`` is passed to the function as the source column." msgstr "" "当参数没有按照适当的顺序提供时，会发生错误。在这个例子中，表 ``mytable`` 的" -"``src``列被错误地传递给函数作为几何列，而几何列``mygeom`` 被错误地传递给函数作" +"``src`` 列被错误地传递给函数作为几何列，而几何列 ``mygeom`` 被错误地传递给函数作" "为源列。" msgid "Example 10" @@ -10972,7 +10970,7 @@ msgid "" "ending vertex (``end_vid``)." msgstr "" "有向无环图（DAG）的最短路径是一种图搜索算法，用于解决加权有向无环图的最短路径" -"问题，找到从起始顶点（ ``start_vid``）到结束顶点（``end_vid`` ）的最短路径。" +"问题，找到从起始顶点（``start_vid``）到结束顶点（``end_vid``）的最短路径。" msgid "" "This implementation can only be used with a **directed** graph with no " @@ -11001,20 +10999,20 @@ msgstr "`agg_cost`中未包括的值 `(u, v)`是数学符号中的 :math:`\\inft msgid "Running time: :math:`O(| start\\_vids | * (V + E))`" msgstr "运行时间： :math:`O(| start\\_vids | * (V + E))`" -msgid "pgr_dagShortestPath(`Edges SQL`_ , **start vid**, **end vid**)" -msgstr "pgr_dagShortestPath(`Edges SQL`_ , **start vid**, **end vid**)" +msgid "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vid**)" +msgstr "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vid**)" -msgid "pgr_dagShortestPath(`Edges SQL`_ , **start vid**, **end vids**)" -msgstr "pgr_dagShortestPath(`Edges SQL`_ , **start vid**, **end vids**)" +msgid "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vids**)" +msgstr "pgr_dagShortestPath(`Edges SQL`_, **start vid**, **end vids**)" -msgid "pgr_dagShortestPath(`Edges SQL`_ , **start vids**, **end vid**)" -msgstr "pgr_dagShortestPath(`Edges SQL`_ , **start vids**, **end vid**)" +msgid "pgr_dagShortestPath(`Edges SQL`_, **start vids**, **end vid**)" +msgstr "pgr_dagShortestPath(`Edges SQL`_, **start vids**, **end vid**)" -msgid "pgr_dagShortestPath(`Edges SQL`_ , **start vids**, **end vids**)" -msgstr "pgr_dagShortestPath(`Edges SQL`_ , **start vids**, **end vids**)" +msgid "pgr_dagShortestPath(`Edges SQL`_, **start vids**, **end vids**)" +msgstr "pgr_dagShortestPath(`Edges SQL`_, **start vids**, **end vids**)" -msgid "pgr_dagShortestPath(`Edges SQL`_ , `Combinations SQL`_)" -msgstr "pgr_dagShortestPath(`Edges SQL`_ , `Combinations SQL`_)" +msgid "pgr_dagShortestPath(`Edges SQL`_, `Combinations SQL`_)" +msgstr "pgr_dagShortestPath(`Edges SQL`_, `Combinations SQL`_)" msgid "From vertex :math:`5` to vertex :math:`11` on a **directed** graph" msgstr "在 **有向** 图上，从顶点 :math:`5` 到顶点 :math:`11`" @@ -11065,7 +11063,7 @@ msgid "" "best to prep your vertices table before hand and use that vertices table for " "pgr_degree calls." msgstr "" -"`pgr_degree`可以利用`pgr_extractVertices` 的输出，或者可以在调用中嵌入" +"`pgr_degree`可以利用 `pgr_extractVertices` 的输出，或者可以在调用中嵌入" "`pgr_extractVertices`。对于较大规模的网络，最好提前准备好顶点表并在" "`pgr_degree`调用中使用该顶点表。" @@ -11214,11 +11212,11 @@ msgstr "返回值按 `start_vid` 升序排列。" msgid "Depth First Search Running time: :math:`O(E + V)`" msgstr "深度优先搜索运行时间： :math:`O(E + V)`" -msgid "pgr_depthFirstSearch(`Edges SQL`_ , **root vid**, [**options**])" -msgstr "pgr_depthFirstSearch(`Edges SQL`_ , **root vid**, [**options**])" +msgid "pgr_depthFirstSearch(`Edges SQL`_, **root vid**, [**options**])" +msgstr "pgr_depthFirstSearch(`Edges SQL`_, **root vid**, [**options**])" -msgid "pgr_depthFirstSearch(`Edges SQL`_ , **root vids**, [**options**])" -msgstr "pgr_depthFirstSearch(`Edges SQL`_ , **root vids**, [**options**])" +msgid "pgr_depthFirstSearch(`Edges SQL`_, **root vids**, [**options**])" +msgstr "pgr_depthFirstSearch(`Edges SQL`_, **root vids**, [**options**])" msgid "**options:** ``[directed, max_depth]``" msgstr "**options:** ``[directed, max_depth]``" @@ -11297,18 +11295,18 @@ msgstr "``pgr_dijkstra`` (`一对一`_)的签名更改" msgid "**Official** ``pgr_dijkstra`` (`One to One`_)" msgstr "**官方** ``pgr_dijkstra`` (`一对一`_)" -msgid "pgr_dijkstra(`Edges SQL`_ , **start vid**, **end vid**, [``directed``])" -msgstr "pgr_dijkstra(`Edges SQL`_ , **start vid**, **end vid**, [``directed``])" +msgid "pgr_dijkstra(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" +msgstr "pgr_dijkstra(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" -msgid "pgr_dijkstra(`Edges SQL`_ , **start vid**, **end vids**, [``directed``])" +msgid "pgr_dijkstra(`Edges SQL`_, **start vid**, **end vids**, [``directed``])" msgstr "" -"pgr_dijkstra(`Edges SQL`_ , **start vid**, **end vids**, [``directed``])" +"pgr_dijkstra(`Edges SQL`_, **start vid**, **end vids**, [``directed``])" -msgid "pgr_dijkstra(`Edges SQL`_ , **start vids**, **end vid**, [``directed``])" -msgstr "pgr_dijkstra(`Edges SQL`_ , **start vid**, **end vid**, [``directed``])" +msgid "pgr_dijkstra(`Edges SQL`_, **start vids**, **end vid**, [``directed``])" +msgstr "pgr_dijkstra(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" -msgid "pgr_dijkstra(`Edges SQL`_ , `Combinations SQL`_ , [``directed``])" -msgstr "pgr_dijkstra(`Edges SQL`_ ,`Combinations SQL`_ , [``directed``])" +msgid "pgr_dijkstra(`Edges SQL`_, `Combinations SQL`_, [``directed``])" +msgstr "pgr_dijkstra(`Edges SQL`_,`Combinations SQL`_, [``directed``])" msgid "Breaking change on 3.5.0" msgstr "3.5.0 上的重大变更" @@ -11504,27 +11502,27 @@ msgid "" msgstr "``pgr_dijkstraCost`` 函数总结了使用Dijkstra算法的最短路径的成本。" msgid "" -"pgr_dijkstraCost(`Edges SQL`_ , **start vid**, **end vid**, [``directed``])" +"pgr_dijkstraCost(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" msgstr "" -"pgr_dijkstraCost(`Edges SQL`_ , **start vid**, **end vid**, [``directed``])" +"pgr_dijkstraCost(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" msgid "" -"pgr_dijkstraCost(`Edges SQL`_ , **start vid**, **end vids**, [``directed``])" +"pgr_dijkstraCost(`Edges SQL`_, **start vid**, **end vids**, [``directed``])" msgstr "" -"pgr_dijkstraCost(`Edges SQL`_ , **start vid**, **end vids**, [``directed``])" +"pgr_dijkstraCost(`Edges SQL`_, **start vid**, **end vids**, [``directed``])" msgid "" -"pgr_dijkstraCost(`Edges SQL`_ , **start vids**, **end vid**, [``directed``])" +"pgr_dijkstraCost(`Edges SQL`_, **start vids**, **end vid**, [``directed``])" msgstr "" -"pgr_dijkstraCost(`Edges SQL`_ , **start vid**, **end vid**, [``directed``])" +"pgr_dijkstraCost(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" msgid "" -"pgr_dijkstraCost(`Edges SQL`_ , **start vids**, **end vids**, [``directed``])" +"pgr_dijkstraCost(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" msgstr "" -"pgr_dijkstraCost(`Edges SQL`_ , **start vids**, **end vids**, [``directed``])" +"pgr_dijkstraCost(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" -msgid "pgr_dijkstraCost(`Edges SQL`_ , `Combinations SQL`_ , [``directed``])" -msgstr "pgr_dijkstraCost(`Edges SQL`_ ,`Combinations SQL`_ , [``directed``])" +msgid "pgr_dijkstraCost(`Edges SQL`_, `Combinations SQL`_, [``directed``])" +msgstr "pgr_dijkstraCost(`Edges SQL`_,`Combinations SQL`_, [``directed``])" msgid "``pgr_dijkstraCostMatrix``" msgstr "``pgr_dijkstraCostMatrix``" @@ -11537,8 +11535,8 @@ msgstr "``pgr_dijkstraCostMatrix`` - 使用 :doc:`pgr_dijkstra` 计算成本矩 msgid "Using Dijkstra algorithm, calculate and return a cost matrix." msgstr "使用 Dijkstra 算法，计算并返回成本矩阵。" -msgid "pgr_dijkstraCostMatrix(`Edges SQL`_ , **start vids**, [``directed``])" -msgstr "pgr_dijkstraCostMatrix(`Edges SQL`_ , **start vids**, [``directed`])" +msgid "pgr_dijkstraCostMatrix(`Edges SQL`_, **start vids**, [``directed``])" +msgstr "pgr_dijkstraCostMatrix(`Edges SQL`_, **start vids**, [``directed`])" msgid "``pgr_dijkstraNear`` - Proposed" msgstr "``pgr_dijkstraNear`` - 拟议" @@ -11602,22 +11600,22 @@ msgid "Combinations: :math:`drt * |Starting vids|`" msgstr "组合： :math:`drt * |Starting vids|`" msgid "" -"pgr_dijkstraNear(`Edges SQL`_ , **start vid**, **end vids**, [**options A**])" +"pgr_dijkstraNear(`Edges SQL`_, **start vid**, **end vids**, [**options A**])" msgstr "" -"pgr_dijkstraNear(`Edges SQL`_ , **start vid**, **end vids**, [**options A**])" +"pgr_dijkstraNear(`Edges SQL`_, **start vid**, **end vids**, [**options A**])" msgid "" -"pgr_dijkstraNear(`Edges SQL`_ , **start vids**, **end vid**, [**options A**])" +"pgr_dijkstraNear(`Edges SQL`_, **start vids**, **end vid**, [**options A**])" msgstr "" -"pgr_dijkstraNear(`Edges SQL`_ , **start vids**, **end vid**, [**options A**])" +"pgr_dijkstraNear(`Edges SQL`_, **start vids**, **end vid**, [**options A**])" msgid "" -"pgr_dijkstraNear(`Edges SQL`_ , **start vids**, **end vids**, [**options B**])" +"pgr_dijkstraNear(`Edges SQL`_, **start vids**, **end vids**, [**options B**])" msgstr "" -"pgr_dijkstraNear(`Edges SQL`_ , **start vids**, **end vids**, [**options B**])" +"pgr_dijkstraNear(`Edges SQL`_, **start vids**, **end vids**, [**options B**])" -msgid "pgr_dijkstraNear(`Edges SQL`_ , `Combinations SQL`_ , [**options B**])" -msgstr "pgr_dijkstraNear(`Edges SQL`_ ,`Combinations SQL`_ , [**options B**])" +msgid "pgr_dijkstraNear(`Edges SQL`_, `Combinations SQL`_, [**options B**])" +msgstr "pgr_dijkstraNear(`Edges SQL`_,`Combinations SQL`_, [**options B**])" msgid "**options A:** ``[directed, cap]``" msgstr "**选项A：** ``[directed, cap]``" @@ -11626,9 +11624,9 @@ msgid "**options B:** ``[directed, cap, global]``" msgstr "**选项B：** ``[directed, cap, global]``" msgid "" -"pgr_dijkstraNear(`Edges SQL`_ , **start vid**, **end vids**, [**options**])" +"pgr_dijkstraNear(`Edges SQL`_, **start vid**, **end vids**, [**options**])" msgstr "" -"pgr_dijkstraNear(`Edges SQL`_ , **start vid**, **end vids**, [**options**])" +"pgr_dijkstraNear(`Edges SQL`_, **start vid**, **end vids**, [**options**])" msgid "**options:** ``[directed, cap]``" msgstr "**选项：** ``[directed, cap]``" @@ -11656,9 +11654,9 @@ msgid "The result shows that station at vertex :math:`11` is the nearest." msgstr "结果显示，位于顶点 :math:`11` 的站最近。" msgid "" -"pgr_dijkstraNear(`Edges SQL`_ , **start vids**, **end vid**, [**options**])" +"pgr_dijkstraNear(`Edges SQL`_, **start vids**, **end vid**, [**options**])" msgstr "" -"pgr_dijkstraNear(`Edges SQL`_ , **start vids**, **end vid**, [**options**])" +"pgr_dijkstraNear(`Edges SQL`_, **start vids**, **end vid**, [**options**])" msgid "" "Departing on a car from a subway station find the nearest **two** stations " @@ -11677,9 +11675,9 @@ msgid "" msgstr "结果显示，位于顶点 :math:`10` 的站点最近，其次是 :math:`11`。" msgid "" -"pgr_dijkstraNear(`Edges SQL`_ , **start vids**, **end vids**, [**options**])" +"pgr_dijkstraNear(`Edges SQL`_, **start vids**, **end vids**, [**options**])" msgstr "" -"pgr_dijkstraNear(`Edges SQL`_ , **start vids**, **end vids**, [**options**])" +"pgr_dijkstraNear(`Edges SQL`_, **start vids**, **end vids**, [**options**])" msgid "**options:** ``[directed, cap, global]``" msgstr "**选项：** ``[定向、上限、全局]```" @@ -11714,8 +11712,8 @@ msgid "" "Only `one` route is returned because `global` is ``true`` and `cap` is ``1``" msgstr "只返回 `一条`路由，因为 `global` 为 `true` 且 `cap` 为 `1" -msgid "pgr_dijkstraNear(`Edges SQL`_ , `Combinations SQL`_ , [**options**])" -msgstr "pgr_dijkstraNear(`Edges SQL`_ ,`Combinations SQL`_ , [**options**])" +msgid "pgr_dijkstraNear(`Edges SQL`_, `Combinations SQL`_, [**options**])" +msgstr "pgr_dijkstraNear(`Edges SQL`_,`Combinations SQL`_, [**options**])" msgid "" "Find the best car connection between all the stations of two subway lines" @@ -11824,43 +11822,43 @@ msgid "" msgstr "`pgr_dijkstraNearCost`` - 使用 dijkstra 算法，找到通往最近顶点的路径。" msgid "" -"pgr_dijkstraNearCost(`Edges SQL`_ , **start vid**, **end vids**, [**options " +"pgr_dijkstraNearCost(`Edges SQL`_, **start vid**, **end vids**, [**options " "A**])" msgstr "" -"pgr_dijkstraNearCost(`Edges SQL`_ , **start vid**, **end vids**, [**options " +"pgr_dijkstraNearCost(`Edges SQL`_, **start vid**, **end vids**, [**options " "A**])" msgid "" -"pgr_dijkstraNearCost(`Edges SQL`_ , **start vids**, **end vid**, [**options " +"pgr_dijkstraNearCost(`Edges SQL`_, **start vids**, **end vid**, [**options " "A**])" msgstr "" -"pgr_dijkstraNearCost(`Edges SQL`_ , **start vids**, **end vid**, [**options " +"pgr_dijkstraNearCost(`Edges SQL`_, **start vids**, **end vid**, [**options " "A**])" msgid "" -"pgr_dijkstraNearCost(`Edges SQL`_ , **start vids**, **end vids**, [**options " +"pgr_dijkstraNearCost(`Edges SQL`_, **start vids**, **end vids**, [**options " "B**])" msgstr "" -"pgr_dijkstraNearCost(`Edges SQL`_ , **start vids**, **end vids**, [**options " +"pgr_dijkstraNearCost(`Edges SQL`_, **start vids**, **end vids**, [**options " "B**])" msgid "" -"pgr_dijkstraNearCost(`Edges SQL`_ , `Combinations SQL`_ , [**options B**])" +"pgr_dijkstraNearCost(`Edges SQL`_, `Combinations SQL`_, [**options B**])" msgstr "" -"pgr_dijkstraNearCost(`Edges SQL`_ ,`Combinations SQL`_ , [**options B**])" +"pgr_dijkstraNearCost(`Edges SQL`_,`Combinations SQL`_, [**options B**])" msgid "" -"pgr_dijkstraNearCost(`Edges SQL`_ , **start vid**, **end vids**, " +"pgr_dijkstraNearCost(`Edges SQL`_, **start vid**, **end vids**, " "[**options**])" msgstr "" -"pgr_dijkstraNearCost(`Edges SQL`_ , **start vid**, **end vids**, " +"pgr_dijkstraNearCost(`Edges SQL`_, **start vid**, **end vids**, " "[**options**])" msgid "" -"pgr_dijkstraNearCost(`Edges SQL`_ , **start vids**, **end vid**, " +"pgr_dijkstraNearCost(`Edges SQL`_, **start vids**, **end vid**, " "[**options**])" msgstr "" -"pgr_dijkstraNearCost(`Edges SQL`_ , **start vid**, **end vid**, [**options**])" +"pgr_dijkstraNearCost(`Edges SQL`_, **start vid**, **end vid**, [**options**])" msgid "" "Departing on a car from a subway station find the nearest **two** stations " @@ -11868,14 +11866,14 @@ msgid "" msgstr "从地铁站开车出发找到距离顶点 :math:`6` 最近的 **两个** 车站" msgid "" -"pgr_dijkstraNearCost(`Edges SQL`_ , **start vids**, **end vids**, " +"pgr_dijkstraNearCost(`Edges SQL`_, **start vids**, **end vids**, " "[**options**])" msgstr "" -"pgr_dijkstraNearCost(`Edges SQL`_ , **start vids**, **end vids**, " +"pgr_dijkstraNearCost(`Edges SQL`_, **start vids**, **end vids**, " "[**options**])" -msgid "pgr_dijkstraNearCost(`Edges SQL`_ , `Combinations SQL`_ , [**options**])" -msgstr "pgr_dijkstraNearCost(`Edges SQL`_ ,`Combinations SQL`_ , [**options**])" +msgid "pgr_dijkstraNearCost(`Edges SQL`_, `Combinations SQL`_, [**options**])" +msgstr "pgr_dijkstraNearCost(`Edges SQL`_,`Combinations SQL`_, [**options**])" msgid "" "lines `3~4` sets the start vertices to be from the fisrt subway line and the " @@ -11919,8 +11917,8 @@ msgstr "是路线的一段。" msgid "One Via" msgstr "一次通过" -msgid "pgr_dijkstraVia(`Edges SQL`_ , **via vertices**, [**options**])" -msgstr "pgr_dijkstraVia(`Edges SQL`_ , **via vertices**, [**options**])" +msgid "pgr_dijkstraVia(`Edges SQL`_, **via vertices**, [**options**])" +msgstr "pgr_dijkstraVia(`Edges SQL`_, **via vertices**, [**options**])" msgid "**options:** ``[directed, strict, U_turn_on_edge]``" msgstr "**选项：** ``[directed, strict, U_turn_on_edge]``" @@ -12022,14 +12020,14 @@ msgstr "" "相应的生成树。" msgid "" -"pgr_drivingDistance(`Edges SQL`_ , **Root vid**, **distance**, [``directed``])" +"pgr_drivingDistance(`Edges SQL`_, **Root vid**, **distance**, [``directed``])" msgstr "" -"pgr_drivingDistance(`Edges SQL`_ , **Root vid**, **distance**, [``directed``])" +"pgr_drivingDistance(`Edges SQL`_, **Root vid**, **distance**, [``directed``])" msgid "" -"pgr_drivingDistance(`Edges SQL`_ , **Root vids**, **distance**, [**options**])" +"pgr_drivingDistance(`Edges SQL`_, **Root vids**, **distance**, [**options**])" msgstr "" -"pgr_drivingDistance(`Edges SQL`_ , **Root vids**, **distance**, [**options**])" +"pgr_drivingDistance(`Edges SQL`_, **Root vids**, **distance**, [**options**])" msgid "**options:** [directed, equicost]" msgstr "**options:** [directed, equicost]" @@ -12188,36 +12186,36 @@ msgid "Uses :doc:`pgr_boykovKolmogorov` to calculate the paths." msgstr "使用 :doc:`pgr_boykovKolmogorov` 计算路径。" msgid "" -"pgr_edgeDisjointPaths(`Edges SQL`_ , **start vid**, **end vid**, " +"pgr_edgeDisjointPaths(`Edges SQL`_, **start vid**, **end vid**, " "[``directed``])" msgstr "" -"pgr_edgeDisjointPaths(`Edges SQL`_ , **start vid**, **end vid**, " +"pgr_edgeDisjointPaths(`Edges SQL`_, **start vid**, **end vid**, " "[``directed``])" msgid "" -"pgr_edgeDisjointPaths(`Edges SQL`_ , **start vid**, **end vids**, " +"pgr_edgeDisjointPaths(`Edges SQL`_, **start vid**, **end vids**, " "[``directed``])" msgstr "" -"pgr_edgeDisjointPaths(`Edges SQL`_ , **start vid**, **end vids**, " +"pgr_edgeDisjointPaths(`Edges SQL`_, **start vid**, **end vids**, " "[``directed``])" msgid "" -"pgr_edgeDisjointPaths(`Edges SQL`_ , **start vids**, **end vid**, " +"pgr_edgeDisjointPaths(`Edges SQL`_, **start vids**, **end vid**, " "[``directed``])" msgstr "" -"pgr_edgeDisjointPaths(`Edges SQL`_ , **start vid**, **end vid**, " +"pgr_edgeDisjointPaths(`Edges SQL`_, **start vid**, **end vid**, " "[``directed``])" msgid "" -"pgr_edgeDisjointPaths(`Edges SQL`_ , **start vids**, **end vids**, " +"pgr_edgeDisjointPaths(`Edges SQL`_, **start vids**, **end vids**, " "[``directed``])" msgstr "" -"pgr_edgeDisjointPaths(`Edges SQL`_ , **start vids**, **end vids**, " +"pgr_edgeDisjointPaths(`Edges SQL`_, **start vids**, **end vids**, " "[``directed``])" msgid "" -"pgr_edgeDisjointPaths(`Edges SQL`_ , `Combinations SQL`_ , [``directed``])" -msgstr "pgr_edgeDisjointPaths(`Edges SQL`_ ,`Combinations SQL`_ , [``directed`])" +"pgr_edgeDisjointPaths(`Edges SQL`_, `Combinations SQL`_, [``directed``])" +msgstr "pgr_edgeDisjointPaths(`Edges SQL`_,`Combinations SQL`_, [``directed`])" msgid "Returns set of |result-disjoint|" msgstr "Returns set of |result-disjoint|" @@ -12264,20 +12262,20 @@ msgstr "从 ``pgr_maxFlowEdmondsKarp`` 更名而来" msgid "Running time: :math:`O( V * E ^ 2)`" msgstr "运行时间： :math:`O( V * E ^ 2)`" -msgid "pgr_edmondsKarp(`Edges SQL`_ , **start vid**, **end vid**)" -msgstr "pgr_edmondsKarp(`Edges SQL`_ , **start vid**, **end vid**)" +msgid "pgr_edmondsKarp(`Edges SQL`_, **start vid**, **end vid**)" +msgstr "pgr_edmondsKarp(`Edges SQL`_, **start vid**, **end vid**)" -msgid "pgr_edmondsKarp(`Edges SQL`_ , **start vid**, **end vids**)" -msgstr "pgr_edmondsKarp(`Edges SQL`_ , **start vid**, **end vids**)" +msgid "pgr_edmondsKarp(`Edges SQL`_, **start vid**, **end vids**)" +msgstr "pgr_edmondsKarp(`Edges SQL`_, **start vid**, **end vids**)" -msgid "pgr_edmondsKarp(`Edges SQL`_ , **start vids**, **end vid**)" -msgstr "pgr_edmondsKarp(`Edges SQL`_ , **start vids**, **end vid**)" +msgid "pgr_edmondsKarp(`Edges SQL`_, **start vids**, **end vid**)" +msgstr "pgr_edmondsKarp(`Edges SQL`_, **start vids**, **end vid**)" -msgid "pgr_edmondsKarp(`Edges SQL`_ , **start vids**, **end vids**)" -msgstr "pgr_edmondsKarp(`Edges SQL`_ , **start vids**, **end vids**)" +msgid "pgr_edmondsKarp(`Edges SQL`_, **start vids**, **end vids**)" +msgstr "pgr_edmondsKarp(`Edges SQL`_, **start vids**, **end vids**)" -msgid "pgr_edmondsKarp(`Edges SQL`_ , `Combinations SQL`_)" -msgstr "pgr_edmondsKarp(`Edges SQL`_ ,`Combinations SQL`_)" +msgid "pgr_edmondsKarp(`Edges SQL`_, `Combinations SQL`_)" +msgstr "pgr_edmondsKarp(`Edges SQL`_,`Combinations SQL`_)" msgid "https://www.boost.org/libs/graph/doc/edmonds_karp_max_flow.html" msgstr "https://www.boost.org/libs/graph/doc/edmonds_karp_max_flow.html" @@ -12353,27 +12351,27 @@ msgid "Average case: :math:`O( | E | )`" msgstr "平均情况： :math:`O( | E | )`" msgid "" -"pgr_edwardMoore(`Edges SQL`_ , **start vid**, **end vid**, [``directed``])" +"pgr_edwardMoore(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" msgstr "" -"pgr_edwardMoore(`Edges SQL`_ , **start vid**, **end vid**, [``directed``])" +"pgr_edwardMoore(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" msgid "" -"pgr_edwardMoore(`Edges SQL`_ , **start vid**, **end vids**, [``directed``])" +"pgr_edwardMoore(`Edges SQL`_, **start vid**, **end vids**, [``directed``])" msgstr "" -"pgr_edwardMoore(`Edges SQL`_ , **start vid**, **end vids**, [``directed``])" +"pgr_edwardMoore(`Edges SQL`_, **start vid**, **end vids**, [``directed``])" msgid "" -"pgr_edwardMoore(`Edges SQL`_ , **start vids**, **end vid**, [``directed``])" +"pgr_edwardMoore(`Edges SQL`_, **start vids**, **end vid**, [``directed``])" msgstr "" -"pgr_edwardMoore(`Edges SQL`_ , **start vids**, **end vid**, [``directed``])" +"pgr_edwardMoore(`Edges SQL`_, **start vids**, **end vid**, [``directed``])" msgid "" -"pgr_edwardMoore(`Edges SQL`_ , **start vids**, **end vids**, [``directed``])" +"pgr_edwardMoore(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" msgstr "" -"pgr_edwardMoore(`Edges SQL`_ , **start vids**, **end vids**, [``directed``])" +"pgr_edwardMoore(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" -msgid "pgr_edwardMoore(`Edges SQL`_ , `Combinations SQL`_ , [``directed``])" -msgstr "pgr_edwardMoore(`Edges SQL`_ , `Combinations SQL`_ , [``directed``])" +msgid "pgr_edwardMoore(`Edges SQL`_, `Combinations SQL`_, [``directed``])" +msgstr "pgr_edwardMoore(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgid "https://en.wikipedia.org/wiki/Shortest_Path_Faster_Algorithm" msgstr "https://en.wikipedia.org/wiki/Shortest_Path_Faster_Algorithm" @@ -12397,8 +12395,8 @@ msgid "" "out edges" msgstr "当给出边标识符时，它也会计算出入边" -msgid "pgr_extractVertices(`Edges SQL`_ , [``dryrun``])" -msgstr "pgr_extractVertices(`Edges SQL`_ , [``dryrun``])" +msgid "pgr_extractVertices(`Edges SQL`_, [``dryrun``])" +msgstr "pgr_extractVertices(`Edges SQL`_, [``dryrun``])" msgid "RETURNS SETOF |result-extract|" msgstr "RETURNS SETOF |result-extract|" @@ -12518,14 +12516,14 @@ msgid "``EMTPY SET`` is returned on dryrun executions" msgstr "空运行执行时返回 ``EMTPY SET``" msgid "" -"pgr_findCloseEdges(`Edges SQL`_ , **point**, **tolerance**, [**options**])" +"pgr_findCloseEdges(`Edges SQL`_, **point**, **tolerance**, [**options**])" msgstr "" -"pgr_findCloseEdges(`Edges SQL`_ , **point**, **tolerance**, [**options**])" +"pgr_findCloseEdges(`Edges SQL`_, **point**, **tolerance**, [**options**])" msgid "" -"pgr_findCloseEdges(`Edges SQL`_ , **points**, **tolerance**, [**options**])" +"pgr_findCloseEdges(`Edges SQL`_, **points**, **tolerance**, [**options**])" msgstr "" -"pgr_findCloseEdges(`Edges SQL`_ , **points**, **tolerance**, [**options**])" +"pgr_findCloseEdges(`Edges SQL`_, **points**, **tolerance**, [**options**])" msgid "**options:** ``[cap, partial, dryrun]``" msgstr "**options:** ``[cap, partial, dryrun]``" @@ -12665,12 +12663,12 @@ msgid "``POINT`` geometry" msgstr "``POINT`` 几何" msgid "" -"`One Point`_ : Contains the point on the edge that is ``fraction`` away from " +"`One Point`_: Contains the point on the edge that is ``fraction`` away from " "the starting point of the edge." -msgstr "`一个点`_ ：包含边缘上距边缘起点一小部分的点。" +msgstr "`一个点`_：包含边缘上距边缘起点一小部分的点。" -msgid "`Many Points`_ : Contains the corresponding **original point**" -msgstr "`多个点`_ ：包含对应的 **原始点**" +msgid "`Many Points`_: Contains the corresponding **original point**" +msgstr "`多个点`_：包含对应的 **原始点**" msgid "" "``LINESTRING`` geometry from the **original point** to the closest point of " @@ -12742,41 +12740,41 @@ msgid "For edge :math:`5`:" msgstr "对于边 :math:`5`:" msgid "" -"``fraction`` : The closest point from the **original point** is at the :math:" +"``fraction``: The closest point from the **original point** is at the :math:" "`0.8` fraction of the edge :math:`5`." msgstr "" -"``fraction`` ：离 **原始点** 最近的点位于边 :math:`5` 处的 :math:`0.8` 分数位" +"``fraction``：离 **原始点** 最近的点位于边 :math:`5` 处的 :math:`0.8` 分数位" "置。" msgid "" -"``side`` : The **original point** is located to the left side of edge :math:" +"``side``: The **original point** is located to the left side of edge :math:" "`5`." -msgstr "``side`` ： **原始点** 位于边 :math:`5` 的左侧。" +msgstr "``side``： **原始点** 位于边 :math:`5` 的左侧。" msgid "" -"``distance`` : The **original point** is located :math:`0.1` length units " +"``distance``: The **original point** is located :math:`0.1` length units " "from edge :math:`5`." -msgstr "``distance`` ： **原始点** 位于边 :math:`5` 的 :math:`0.1` 长度单位处。" +msgstr "``distance``： **原始点** 位于边 :math:`5` 的 :math:`0.1` 长度单位处。" msgid "For edge :math:`8`:" msgstr "对于边 :math:`8`：" msgid "" -"``fraction`` : The closest point from the **original point** is at the :math:" +"``fraction``: The closest point from the **original point** is at the :math:" "`0.89..` fraction of the edge :math:`8`." msgstr "" -"``fraction`` ：离 **原始点** 最近的点位于边 :math:`8` 的 :math:`0.89..` 分数位" +"``fraction``：离 **原始点** 最近的点位于边 :math:`8` 的 :math:`0.89..` 分数位" "置。" msgid "" -"``side`` : The **original point** is located to the right side of edge :math:" +"``side``: The **original point** is located to the right side of edge :math:" "`8`." -msgstr "``side`` ： **原始点** 位于边 :math:`8` 的右侧。" +msgstr "``side``： **原始点** 位于边 :math:`8` 的右侧。" msgid "" -"``distance`` : The **original point** is located :math:`0.19..` length units " +"``distance``: The **original point** is located :math:`0.19..` length units " "from edge :math:`8`." -msgstr "``distance`` ： **原始点** 距离边 :math:`8` 有 :math:`0.19..` 长度单位。" +msgstr "``distance``： **原始点** 距离边 :math:`8` 有 :math:`0.19..` 长度单位。" msgid "One answer, all columns" msgstr "一个答案，所有列" @@ -12799,9 +12797,9 @@ msgstr "" "的一条。" msgid "" -"``geom`` : Contains the geometry of the closest point on edge :math:`5` from " +"``geom``: Contains the geometry of the closest point on edge :math:`5` from " "the **original point**." -msgstr "``geom`` :包含了从 **原始点** 到边 :math:`5` 上最近点的几何形状。" +msgstr "``geom``:包含了从 **原始点** 到边 :math:`5` 上最近点的几何形状。" msgid "" "``edge``: Contains the ``LINESTRING`` geometry of the **original point** to " @@ -12817,9 +12815,9 @@ msgid "Understanding the result:" msgstr "了解结果：" msgid "" -"``geom`` : Contains the geometry of the closest point on edge :math:`8` from " +"``geom``: Contains the geometry of the closest point on edge :math:`8` from " "the **original point**." -msgstr "``geom`` ：包含了从 **原始点** 到边 :math:`8` 上最近点的几何形状。" +msgstr "``geom``：包含了从 **原始点** 到边 :math:`8` 上最近点的几何形状。" msgid "" "``edge``: Contains the ``LINESTRING`` geometry of the **original point** to " @@ -12871,7 +12869,7 @@ msgstr "``edge``为``NULL``" msgid "" "``edge_id`` identifier of the edge close to a **original point** (``geom``)" -msgstr "``edge_id``是与一个 **原始点** （``geom`` ）靠近的边的标识符" +msgstr "``edge_id``是与一个 **原始点** （``geom``）靠近的边的标识符" msgid "" "Two edges at most withing :math:`0.5` distance units from each of the " @@ -12996,8 +12994,8 @@ msgstr "" "成本总和的一种良好选择，适用于*密集图*。我们使用Boost的实现，其运行时间为： :" "math:`\\Theta(V^3)`，" -msgid "pgr_floydWarshall(`Edges SQL`_ , [``directed``])" -msgstr "pgr_floydWarshall(`Edges SQL`_ , [``directed``])" +msgid "pgr_floydWarshall(`Edges SQL`_, [``directed``])" +msgstr "pgr_floydWarshall(`Edges SQL`_, [``directed``])" msgid "For a directed subgraph with edges :math:`\\{1, 2, 3, 4\\}`." msgstr "对于有边 :math:`\\{1, 2, 3, 4\\}` 的有向子图。" @@ -13261,8 +13259,8 @@ msgstr "" "Johnson算法是计算图中每一对节点的最短路径成本之和的好选择，特别适用于 *稀疏图" "*。它使用了Boost的实现，其运行时间为 :math:`O(V E \\log V)`，" -msgid "pgr johnson(`Edges SQL`_ , [``directed``])" -msgstr "pgr johnson(`Edges SQL`_ , [``directed``])" +msgid "pgr johnson(`Edges SQL`_, [``directed``])" +msgstr "pgr johnson(`Edges SQL`_, [``directed``])" msgid "" "Boost `Johnson `算法。" msgid "Running time: :math:`O( V ^ 3)`" msgstr "运行时间： :math:`O( V ^ 3)`" -msgid "pgr_maxFlow(`Edges SQL`_ , **start vid**, **end vid**)" -msgstr "pgr_maxFlow(`Edges SQL`_ , **start vid**, **end vid**)" +msgid "pgr_maxFlow(`Edges SQL`_, **start vid**, **end vid**)" +msgstr "pgr_maxFlow(`Edges SQL`_, **start vid**, **end vid**)" -msgid "pgr_maxFlow(`Edges SQL`_ , **start vid**, **end vids**)" -msgstr "pgr_maxFlow(`Edges SQL`_ , **start vid**, **end vids**)" +msgid "pgr_maxFlow(`Edges SQL`_, **start vid**, **end vids**)" +msgstr "pgr_maxFlow(`Edges SQL`_, **start vid**, **end vids**)" -msgid "pgr_maxFlow(`Edges SQL`_ , **start vids**, **end vid**)" -msgstr "pgr_maxFlow(`Edges SQL`_ , **start vids**, **end vid**)" +msgid "pgr_maxFlow(`Edges SQL`_, **start vids**, **end vid**)" +msgstr "pgr_maxFlow(`Edges SQL`_, **start vids**, **end vid**)" -msgid "pgr_maxFlow(`Edges SQL`_ , **start vids**, **end vids**)" -msgstr "pgr_maxFlow(`Edges SQL`_ , **start vids**, **end vids**)" +msgid "pgr_maxFlow(`Edges SQL`_, **start vids**, **end vids**)" +msgstr "pgr_maxFlow(`Edges SQL`_, **start vids**, **end vids**)" -msgid "pgr_maxFlow(`Edges SQL`_ , `Combinations SQL`_)" -msgstr "pgr_maxFlow(`Edges SQL`_ , `Combinations SQL`_)" +msgid "pgr_maxFlow(`Edges SQL`_, `Combinations SQL`_)" +msgstr "pgr_maxFlow(`Edges SQL`_, `Combinations SQL`_)" msgid "RETURNS ``BIGINT``" msgstr "RETURNS ``BIGINT``" @@ -14165,20 +14163,20 @@ msgstr "" ":math:`U`是迭代次数的上限。 在许多现实世界的情况下，迭代次数远小于 :math:" "`U` 。" -msgid "pgr_maxFlowMinCost(`Edges SQL`_ , **start vid**, **end vid**)" -msgstr "pgr_maxFlowMinCost(`Edges SQL`_ , **start vid**, **end vid**)" +msgid "pgr_maxFlowMinCost(`Edges SQL`_, **start vid**, **end vid**)" +msgstr "pgr_maxFlowMinCost(`Edges SQL`_, **start vid**, **end vid**)" -msgid "pgr_maxFlowMinCost(`Edges SQL`_ , **start vid**, **end vids**)" -msgstr "pgr_maxFlowMinCost(`Edges SQL`_ , **start vid**, **end vids**)" +msgid "pgr_maxFlowMinCost(`Edges SQL`_, **start vid**, **end vids**)" +msgstr "pgr_maxFlowMinCost(`Edges SQL`_, **start vid**, **end vids**)" -msgid "pgr_maxFlowMinCost(`Edges SQL`_ , **start vids**, **end vid**)" -msgstr "pgr_maxFlowMinCost(`Edges SQL`_ , **start vids**, **end vid**)" +msgid "pgr_maxFlowMinCost(`Edges SQL`_, **start vids**, **end vid**)" +msgstr "pgr_maxFlowMinCost(`Edges SQL`_, **start vids**, **end vid**)" -msgid "pgr_maxFlowMinCost(`Edges SQL`_ , **start vids**, **end vids**)" -msgstr "pgr_maxFlowMinCost(`Edges SQL`_ , **start vids**, **end vids**)" +msgid "pgr_maxFlowMinCost(`Edges SQL`_, **start vids**, **end vids**)" +msgstr "pgr_maxFlowMinCost(`Edges SQL`_, **start vids**, **end vids**)" -msgid "pgr_maxFlowMinCost(`Edges SQL`_ , `Combinations SQL`_)" -msgstr "pgr_maxFlowMinCost(`Edges SQL`_ , `Combinations SQL`_)" +msgid "pgr_maxFlowMinCost(`Edges SQL`_, `Combinations SQL`_)" +msgstr "pgr_maxFlowMinCost(`Edges SQL`_, `Combinations SQL`_)" msgid "Returns set of |result-flow-mincost|" msgstr "返回 |result-flow-mincost| 的集合" @@ -14210,20 +14208,20 @@ msgstr "当最大流量为0时则没有流量，返回 **0** 。" msgid "Uses :doc:`pgr_maxFlowMinCost`." msgstr "使用 :doc:`pgr_maxFlowMinCost`。" -msgid "pgr_maxFlowMinCost_Cost(`Edges SQL`_ , **start vid**, **end vid**)" -msgstr "pgr_maxFlowMinCost_Cost(`Edges SQL`_ , **start vid**, **end vid**)" +msgid "pgr_maxFlowMinCost_Cost(`Edges SQL`_, **start vid**, **end vid**)" +msgstr "pgr_maxFlowMinCost_Cost(`Edges SQL`_, **start vid**, **end vid**)" -msgid "pgr_maxFlowMinCost_Cost(`Edges SQL`_ , **start vid**, **end vids**)" -msgstr "pgr_maxFlowMinCost_Cost(`Edges SQL`_ , **start vid**, **end vids**)" +msgid "pgr_maxFlowMinCost_Cost(`Edges SQL`_, **start vid**, **end vids**)" +msgstr "pgr_maxFlowMinCost_Cost(`Edges SQL`_, **start vid**, **end vids**)" -msgid "pgr_maxFlowMinCost_Cost(`Edges SQL`_ , **start vids**, **end vid**)" -msgstr "pgr_maxFlowMinCost_Cost(`Edges SQL`_ , **start vids**, **end vid**)" +msgid "pgr_maxFlowMinCost_Cost(`Edges SQL`_, **start vids**, **end vid**)" +msgstr "pgr_maxFlowMinCost_Cost(`Edges SQL`_, **start vids**, **end vid**)" -msgid "pgr_maxFlowMinCost_Cost(`Edges SQL`_ , **start vids**, **end vids**)" -msgstr "pgr_maxFlowMinCost_Cost(`Edges SQL`_ , **start vids**, **end vids**)" +msgid "pgr_maxFlowMinCost_Cost(`Edges SQL`_, **start vids**, **end vids**)" +msgstr "pgr_maxFlowMinCost_Cost(`Edges SQL`_, **start vids**, **end vids**)" -msgid "pgr_maxFlowMinCost_Cost(`Edges SQL`_ , `Combinations SQL`_)" -msgstr "pgr_maxFlowMinCost_Cost(`Edges SQL`_ , `Combinations SQL`_)" +msgid "pgr_maxFlowMinCost_Cost(`Edges SQL`_, `Combinations SQL`_)" +msgstr "pgr_maxFlowMinCost_Cost(`Edges SQL`_, `Combinations SQL`_)" msgid "RETURNS FLOAT" msgstr "RETURNS FLOAT" @@ -14575,9 +14573,9 @@ msgid "Signature" msgstr "标识" msgid "" -"pgr_pickDeliver(`Orders SQL`_ , `Vehicles SQL`_ , `Matrix SQL`_ , [**options**])" +"pgr_pickDeliver(`Orders SQL`_, `Vehicles SQL`_, `Matrix SQL`_, [**options**])" msgstr "" -"pgr_pickDeliver(`Orders SQL`_ , `Vehicles SQL`_ , `Matrix SQL`_ , [**options**])" +"pgr_pickDeliver(`Orders SQL`_, `Vehicles SQL`_, `Matrix SQL`_, [**options**])" msgid "**options:** ``[factor, max_cycles, initial_sol]``" msgstr "**options:** ``[factor, max_cycles, initial_sol]``" @@ -14661,9 +14659,9 @@ msgstr "六种不同的可选不同初始解决方案" msgid "the best solution found will be result" msgstr "找到的最佳解决方案将作为结果" -msgid "pgr_pickDeliverEuclidean(`Orders SQL`_ , `Vehicles SQL`_ , [**options**])" +msgid "pgr_pickDeliverEuclidean(`Orders SQL`_, `Vehicles SQL`_, [**options**])" msgstr "" -"pgr_pickDeliverEuclidean(`Orders SQL`_ , `Vehicles SQL`_ , [**options**])" +"pgr_pickDeliverEuclidean(`Orders SQL`_, `Vehicles SQL`_, [**options**])" msgid "p_x, p_y, p_open, p_close, [p_service,]" msgstr "p_x, p_y, p_open, p_close, [p_service,]" @@ -14755,11 +14753,11 @@ msgid "" msgstr "" "访问并提取使用 Prims 算法创建的最小生成树的深度优先搜索顺序中的节点信息。" -msgid "pgr_primBFS(`Edges SQL`_ , **root vid**, [``max_depth``])" -msgstr "pgr_primBFS(`Edges SQL`_ , **root vid**, [``max_depth``])" +msgid "pgr_primBFS(`Edges SQL`_, **root vid**, [``max_depth``])" +msgstr "pgr_primBFS(`Edges SQL`_, **root vid**, [``max_depth``])" -msgid "pgr_primBFS(`Edges SQL`_ , **root vids**, [``max_depth``])" -msgstr "pgr_primBFS(`Edges SQL`_ , **root vids**, [``max_depth``])" +msgid "pgr_primBFS(`Edges SQL`_, **root vids**, [``max_depth``])" +msgstr "pgr_primBFS(`Edges SQL`_, **root vids**, [``max_depth``])" msgid "``pgr_primDD`` — Catchament nodes using Prim's algorithm." msgstr "``pgr_primDD`` — 使用 Prim 算法的集水区节点。" @@ -14773,11 +14771,11 @@ msgstr "" "使用 Prim 算法，在计算的最小生成树中提取总成本小于或等于距根顶点（或多个顶" "点）距离的节点。" -msgid "pgr_primDD(`Edges SQL`_ , **root vid**, **distance**)" -msgstr "pgr_primDD(`Edges SQL`_ , **root vid**, **distance**)" +msgid "pgr_primDD(`Edges SQL`_, **root vid**, **distance**)" +msgstr "pgr_primDD(`Edges SQL`_, **root vid**, **distance**)" -msgid "pgr_primDD(`Edges SQL`_ , **root vids**, **distance**)" -msgstr "pgr_primDD(`Edges SQL`_ , **root vids**, **distance**)" +msgid "pgr_primDD(`Edges SQL`_, **root vids**, **distance**)" +msgstr "pgr_primDD(`Edges SQL`_, **root vids**, **distance**)" msgid "" "``pgr_primDFS`` — Prim algorithm for Minimum Spanning Tree with Depth First " @@ -14790,11 +14788,11 @@ msgid "" msgstr "" "访问并提取使用 Prims 算法创建的最小生成树的深度优先搜索顺序中的节点信息。" -msgid "pgr_primDFS(`Edges SQL`_ , **root vid**, [``max_depth``])" -msgstr "pgr_primDFS(`Edges SQL`_ , **root vid**, [``max_depth``])" +msgid "pgr_primDFS(`Edges SQL`_, **root vid**, [``max_depth``])" +msgstr "pgr_primDFS(`Edges SQL`_, **root vid**, [``max_depth``])" -msgid "pgr_primDFS(`Edges SQL`_ , **root vids**, [``max_depth``])" -msgstr "pgr_primDFS(`Edges SQL`_ , **root vids**, [``max_depth``])" +msgid "pgr_primDFS(`Edges SQL`_, **root vids**, [``max_depth``])" +msgstr "pgr_primDFS(`Edges SQL`_, **root vids**, [``max_depth``])" msgid "``pgr_pushRelabel``" msgstr "``pgr_pushRelabel``" @@ -14812,20 +14810,20 @@ msgstr "``pgr_pushRelabel`` (`组合`_)" msgid "Renamed from ``pgr_maxFlowPushRelabel``" msgstr "由 ``pgr_maxFlowPushRelabel`` 重命名" -msgid "pgr_pushRelabel(`Edges SQL`_ , **start vid**, **end vid**)" -msgstr "pgr_pushRelabel(`Edges SQL`_ , **start vid**, **end vid**)" +msgid "pgr_pushRelabel(`Edges SQL`_, **start vid**, **end vid**)" +msgstr "pgr_pushRelabel(`Edges SQL`_, **start vid**, **end vid**)" -msgid "pgr_pushRelabel(`Edges SQL`_ , **start vid**, **end vids**)" -msgstr "pgr_pushRelabel(`Edges SQL`_ , **start vid**, **end vids**)" +msgid "pgr_pushRelabel(`Edges SQL`_, **start vid**, **end vids**)" +msgstr "pgr_pushRelabel(`Edges SQL`_, **start vid**, **end vids**)" -msgid "pgr_pushRelabel(`Edges SQL`_ , **start vids**, **end vid**)" -msgstr "pgr_pushRelabel(`Edges SQL`_ , **start vids**, **end vid**)" +msgid "pgr_pushRelabel(`Edges SQL`_, **start vids**, **end vid**)" +msgstr "pgr_pushRelabel(`Edges SQL`_, **start vids**, **end vid**)" -msgid "pgr_pushRelabel(`Edges SQL`_ , **start vids**, **end vids**)" -msgstr "pgr_pushRelabel(`Edges SQL`_ , **start vids**, **end vids**)" +msgid "pgr_pushRelabel(`Edges SQL`_, **start vids**, **end vids**)" +msgstr "pgr_pushRelabel(`Edges SQL`_, **start vids**, **end vids**)" -msgid "pgr_pushRelabel(`Edges SQL`_ , `Combinations SQL`_)" -msgstr "pgr_pushRelabel(`Edges SQL`_ , `Combinations SQL`_)" +msgid "pgr_pushRelabel(`Edges SQL`_, `Combinations SQL`_)" +msgstr "pgr_pushRelabel(`Edges SQL`_, `Combinations SQL`_)" msgid "pgr_sequentialVertexColoring - Proposed" msgstr "pgr_sequentialVertexColoring - 拟议" @@ -15215,38 +15213,38 @@ msgid "Execute the **TRSP** algorithm with restrictions." msgstr "有限制地执行 **TRSP** 算法。" msgid "" -"pgr_trsp(`Edges SQL`_ , `Restrictions SQL`_ , **start vid**, **end vid**, " +"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vid**, **end vid**, " "[``directed``])" msgstr "" -"pgr_trsp(`Edges SQL`_ , `Restrictions SQL`_ , **start vid**, **end vid**, " +"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vid**, **end vid**, " "[``directed``])" msgid "" -"pgr_trsp(`Edges SQL`_ , `Restrictions SQL`_ , **start vid**, **end vids**, " +"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vid**, **end vids**, " "[``directed``])" msgstr "" -"pgr_trsp(`Edges SQL`_ , `Restrictions SQL`_ , **start vid**, **end vids**, " +"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vid**, **end vids**, " "[``directed``])" msgid "" -"pgr_trsp(`Edges SQL`_ , `Restrictions SQL`_ , **start vids**, **end vid**, " +"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vids**, **end vid**, " "[``directed``])" msgstr "" -"pgr_trsp(`Edges SQL`_ , `Restrictions SQL`_ , **start vids**, **end vid**, " +"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vids**, **end vid**, " "[``directed``])" msgid "" -"pgr_trsp(`Edges SQL`_ , `Restrictions SQL`_ , **start vids**, **end vids**, " +"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vids**, **end vids**, " "[``directed``])" msgstr "" -"pgr_trsp(`Edges SQL`_ , `Restrictions SQL`_ , **start vids**, **end vids**, " +"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, **start vids**, **end vids**, " "[``directed``])" msgid "" -"pgr_trsp(`Edges SQL`_ , `Restrictions SQL`_ , `Combinations SQL`_ , " +"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, `Combinations SQL`_, " "[``directed``])" msgstr "" -"pgr_trsp(`Edges SQL`_ , `Restrictions SQL`_ , `Combinations SQL`_ , " +"pgr_trsp(`Edges SQL`_, `Restrictions SQL`_, `Combinations SQL`_, " "[``directed``])" msgid "From vertex :math:`6` to vertex :math:`10` on an undirected graph." @@ -15311,10 +15309,10 @@ msgid "**NOTE** when this is done, ``U_turn_on_edge`` flag is ignored." msgstr "**注意**，完成此操作后， ``U_turn_on_edge`` 标志将被忽略。" msgid "" -"pgr_trspVia(`Edges SQL`_ , `Restrictions SQL`_ , **via vertices**, " +"pgr_trspVia(`Edges SQL`_, `Restrictions SQL`_, **via vertices**, " "[**options**])" msgstr "" -"pgr_trspVia(`Edges SQL`_ , `Restrictions SQL`_ , **via vertices**, " +"pgr_trspVia(`Edges SQL`_, `Restrictions SQL`_, **via vertices**, " "[**options**])" msgid "" @@ -15335,7 +15333,7 @@ msgid "" "for the ``path_id = 5`` from ``6`` to ``3`` because the path :math:`15 " "\\rightarrow 1` is restricted." msgstr "" -"检测哪些子路径通过了限制，本例中是针对 ``path_id = 5``从``6`` 到 ``3`` ，因为该" +"检测哪些子路径通过了限制，本例中是针对 ``path_id = 5`` 从 ``6`` 到 ``3``，因为该" "路径 :math:`15 \\rightarrow 1`受到限制。" msgid "Executes the :doc:`pgr_trsp` algorithm for the conflicting paths." @@ -15348,7 +15346,7 @@ msgstr "" "从 :doc:`pgr_dijkstraVia` 提议的结果中，它删除了冲突路径，并使用 :doc:" "`pgr_trsp` 提议的算法的结果构建解决方案：" -msgid "Getting the same result as ``pgr_trspVia`` :" +msgid "Getting the same result as ``pgr_trspVia``:" msgstr "得到与 ``pgr_trspVia`` 相同的结果：" msgid "Sometimes ``U_turn_on_edge`` flag is ignored when is set to ``false``." @@ -15426,10 +15424,10 @@ msgid "Do not use negative values on identifiers of the inner queries." msgstr "不要在内部查询的标识符上使用负值。" msgid "" -"pgr_trspVia_withPoints(`Edges SQL`_ , `Restrictions SQL`_ , `Points SQL`_ , " +"pgr_trspVia_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " "**via vertices**, [**options**])" msgstr "" -"pgr_trspVia_withPoints(`Edges SQL`_ , `Restrictions SQL`_ , `Points SQL`_ , " +"pgr_trspVia_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " "**via vertices**, [**options**])" msgid "" @@ -15543,7 +15541,7 @@ msgstr "" "从 :doc:`pgr_withPointsVia` 的结果中移除冲突的路径，并使用 :doc:`pgr_trsp` 算" "法的结果构建解决方案：" -msgid "Getting the same result as ``pgr_trspVia_withPoints`` :" +msgid "Getting the same result as ``pgr_trspVia_withPoints``:" msgstr "得到与 ``pgr_trspVia_withPoints`` 相同的结果：" msgid "" @@ -15635,39 +15633,39 @@ msgid "Running time: :math:`O(|start\\_vids|\\times(V \\log V + E))`" msgstr "运行时间： :math:`O(|start\\_vids|\\times(V \\log V + E))`" msgid "" -"pgr_trsp_withPoints(`Edges SQL`_ , `Restrictions SQL`_ , `Points SQL`_ , " +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " "**start vid**, **end vid**, [**options**])" msgstr "" -"pgr_trsp_withPoints(`Edges SQL`_ , `Restrictions SQL`_ , `Points SQL`_ , " +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " "**start vid**, **end vid**, [**options**])" msgid "" -"pgr_trsp_withPoints(`Edges SQL`_ , `Restrictions SQL`_ , `Points SQL`_ , " +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " "**start vid**, **end vids**, [**options**])" msgstr "" -"pgr_trsp_withPoints(`Edges SQL`_ , `Restrictions SQL`_ , `Points SQL`_ , " +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " "**start vid**, **end vids**, [**options**])" msgid "" -"pgr_trsp_withPoints(`Edges SQL`_ , `Restrictions SQL`_ , `Points SQL`_ , " +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " "**start vids**, **end vid**, [**options**])" msgstr "" -"pgr_trsp_withPoints(`Edges SQL`_ , `Restrictions SQL`_ , `Points SQL`_ , " +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " "**start vids**, **end vid**, [**options**])" msgid "" -"pgr_trsp_withPoints(`Edges SQL`_ , `Restrictions SQL`_ , `Points SQL`_ , " +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " "**start vids**, **end vids**, [**options**])" msgstr "" -"pgr_trsp_withPoints(`Edges SQL`_ , `Restrictions SQL`_ , `Points SQL`_ , " +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Points SQL`_, " "**start vids**, **end vids**, [**options**])" msgid "" -"pgr_trsp_withPoints(`Edges SQL`_ , `Restrictions SQL`_ , `Combinations SQL`_ , " -"`Points SQL`_ , [**options**])" +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Combinations SQL`_, " +"`Points SQL`_, [**options**])" msgstr "" -"pgr_trsp_withPoints(`Edges SQL`_ , `Restrictions SQL`_ , `Combinations SQL`_ , " -"`Points SQL`_ , [**options**])" +"pgr_trsp_withPoints(`Edges SQL`_, `Restrictions SQL`_, `Combinations SQL`_, " +"`Points SQL`_, [**options**])" msgid "**options:** ``[directed, driving_side, details]``" msgstr "**options:** ``[directed, driving_side, details]``" @@ -15737,10 +15735,10 @@ msgid "" msgstr "利用Yen算法获得K条最短路径并对路径进行分析以选择不使用限制的路径" msgid "" -"pgr_turnRestrictedPath(`Edges SQL`_ , `Restrictions SQL`_ , **start vid**, " +"pgr_turnRestrictedPath(`Edges SQL`_, `Restrictions SQL`_, **start vid**, " "**end vid**, **K**, [**options**])" msgstr "" -"pgr_turnRestrictedPath(`Edges SQL`_ , `Restrictions SQL`_ , **start vid**, " +"pgr_turnRestrictedPath(`Edges SQL`_, `Restrictions SQL`_, **start vid**, " "**end vid**, **K**, [**options**])" msgid "**options:** ``[directed, heap_paths, stop_on_first, strict]``" @@ -15843,38 +15841,38 @@ msgstr "" "当起始顶点和结束顶点不同并且没有路径时： - 不包含的值 (u, v) 的 agg_cost 为 ∞" msgid "" -"pgr_withPoints(`Edges SQL`_ , `Points SQL`_ , **start vid**, **end vid**, " +"pgr_withPoints(`Edges SQL`_, `Points SQL`_, **start vid**, **end vid**, " "[**options**])" msgstr "" -"pgr_withPoints(`Edges SQL`_ , `Points SQL`_ , **start vid**, **end vid**, " +"pgr_withPoints(`Edges SQL`_, `Points SQL`_, **start vid**, **end vid**, " "[**options**])" msgid "" -"pgr_withPoints(`Edges SQL`_ , `Points SQL`_ , **start vid**, **end vids**, " +"pgr_withPoints(`Edges SQL`_, `Points SQL`_, **start vid**, **end vids**, " "[**options**])" msgstr "" -"pgr_withPoints(`Edges SQL`_ , `Points SQL`_ , **start vid**, **end vids**, " +"pgr_withPoints(`Edges SQL`_, `Points SQL`_, **start vid**, **end vids**, " "[**options**])" msgid "" -"pgr_withPoints(`Edges SQL`_ , `Points SQL`_ , **start vids**, **end vid**, " +"pgr_withPoints(`Edges SQL`_, `Points SQL`_, **start vids**, **end vid**, " "[**options**])" msgstr "" -"pgr_withPoints(`Edges SQL`_ , `Points SQL`_ , **start vids**, **end vid**, " +"pgr_withPoints(`Edges SQL`_, `Points SQL`_, **start vids**, **end vid**, " "[**options**])" msgid "" -"pgr_withPoints(`Edges SQL`_ , `Points SQL`_ , **start vids**, **end vids**, " +"pgr_withPoints(`Edges SQL`_, `Points SQL`_, **start vids**, **end vids**, " "[**options**])" msgstr "" -"pgr_withPoints(`Edges SQL`_ , `Points SQL`_ , **start vids**, **end vids**, " +"pgr_withPoints(`Edges SQL`_, `Points SQL`_, **start vids**, **end vids**, " "[**options**])" msgid "" -"pgr_withPoints(`Edges SQL`_ , `Points SQL`_ , `Combinations SQL`_ , " +"pgr_withPoints(`Edges SQL`_, `Points SQL`_, `Combinations SQL`_, " "[**options**])" msgstr "" -"pgr_withPoints(`Edges SQL`_ , `Points SQL`_ , `Combinations SQL`_ , " +"pgr_withPoints(`Edges SQL`_, `Points SQL`_, `Combinations SQL`_, " "[**options**])" msgid "**options:** ``[directed, driving_side, details])``" @@ -16026,38 +16024,38 @@ msgid "" msgstr "出于优化目的， `start_vids`或 `end_vids` 中的任何重复值都将被忽略。" msgid "" -"pgr_withPointsCost(`Edges SQL`_ , 'Points SQL`_ , **start vid**, **end vid**, " +"pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vid**, **end vid**, " "[**options**])" msgstr "" -"pgr_withPointsCost(`Edges SQL`_ , 'Points SQL`_ , **start vid**, **end vid**, " +"pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vid**, **end vid**, " "[**options**])" msgid "" -"pgr_withPointsCost(`Edges SQL`_ , 'Points SQL`_ , **start vid**, **end vids**, " +"pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vid**, **end vids**, " "[**options**])" msgstr "" -"pgr_withPointsCost(`Edges SQL`_ , 'Points SQL`_ , **start vid**, **end vids**, " +"pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vid**, **end vids**, " "[**options**])" msgid "" -"pgr_withPointsCost(`Edges SQL`_ , 'Points SQL`_ , **start vids**, **end vid**, " +"pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vids**, **end vid**, " "[**options**])" msgstr "" -"pgr_withPointsCost(`Edges SQL`_ , 'Points SQL`_ , **start vids**, **end vid**, " +"pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vids**, **end vid**, " "[**options**])" msgid "" -"pgr_withPointsCost(`Edges SQL`_ , 'Points SQL`_ , **start vids**, **end " +"pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vids**, **end " "vids**, [**options**])" msgstr "" -"pgr_withPointsCost(`Edges SQL`_ , 'Points SQL`_ , **start vids**, **end " +"pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vids**, **end " "vids**, [**options**])" msgid "" -"pgr_withPointsCost(`Edges SQL`_ , 'Points SQL`_ , `Combinations SQL`_ , " +"pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, `Combinations SQL`_, " "[**options**])" msgstr "" -"pgr_withPointsCost(`Edges SQL`_ , 'Points SQL`_ , `Combinations SQL`_ , " +"pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, `Combinations SQL`_, " "[**options**])" msgid "**options:** ``[directed, driving_side]``" @@ -16075,24 +16073,24 @@ msgid "From point :math:`1` to vertex :math:`10` with defaults" msgstr "使用默认值从点 :math:`1` 到顶点 :math:`10`" msgid "" -"pgr_withPointsCost(`Edges SQL`_ , `Points SQL`_ , **start vid**, **end vids**, " +"pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, **start vid**, **end vids**, " "[**options**])" msgstr "" -"pgr_withPointsCost(`Edges SQL`_ , `Points SQL`_ , **start vid**, **end vids**, " +"pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, **start vid**, **end vids**, " "[**options**])" msgid "" -"pgr_withPointsCost(`Edges SQL`_ , `Points SQL`_ , **start vids**, **end vid**, " +"pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, **start vids**, **end vid**, " "[**options**])" msgstr "" -"pgr_withPointsCost(`Edges SQL`_ , `Points SQL`_ , **start vids**, **end vid**, " +"pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, **start vids**, **end vid**, " "[**options**])" msgid "" -"pgr_withPointsCost(`Edges SQL`_ , `Points SQL`_ , **start vids**, **end " +"pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, **start vids**, **end " "vids**, [**options**])" msgstr "" -"pgr_withPointsCost(`Edges SQL`_ , `Points SQL`_ , **start vids**, **end " +"pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, **start vids**, **end " "vids**, [**options**])" msgid "" @@ -16101,10 +16099,10 @@ msgid "" msgstr "从点 :math:`15` 和顶点 :math:`6` 到点 :math:`3` 和顶点 :math:`1`" msgid "" -"pgr_withPointsCost(`Edges SQL`_ , `Points SQL`_ , `Combinations SQL`_ , " +"pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, `Combinations SQL`_, " "[**options**])" msgstr "" -"pgr_withPointsCost(`Edges SQL`_ , `Points SQL`_ , `Combinations SQL`_ , " +"pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, `Combinations SQL`_, " "[**options**])" msgid "Identifier of the starting vertex or point." @@ -16152,10 +16150,10 @@ msgid "" msgstr "``pgr_withPointsCostMatrix`` - 使用 :doc:`pgr_withPoints`计算成本矩阵." msgid "" -"pgr_withPointsCostMatrix(`Edges SQL`_ , `Points SQL`_ , **start vids**, " +"pgr_withPointsCostMatrix(`Edges SQL`_, `Points SQL`_, **start vids**, " "[**options**])" msgstr "" -"pgr_withPointsCostMatrix(`Edges SQL`_ , `Points SQL`_ , **start vids**, " +"pgr_withPointsCostMatrix(`Edges SQL`_, `Points SQL`_, **start vids**, " "[**options**])" msgid "" @@ -16194,7 +16192,7 @@ msgstr "" "**driving side**。" msgid "``pgr_withPointsDD`` (`Single vertex`)" -msgstr "``pgr_withPointsDD`` （`单顶点`）" +msgstr "``pgr_withPointsDD``（`单顶点`）" msgid "Added ``depth``, ``pred`` and ``start_vid`` column." msgstr "添加了 ``depth``、``pred`` 和 ``start_vid`` 列。" @@ -16236,17 +16234,17 @@ msgstr "" "的所有节点和点。 提取的边将符合相应的生成树。" msgid "" -"pgr_withPointsDD(`Edges SQL`_ , `Points SQL`_ , **root vid**, **distance**, " +"pgr_withPointsDD(`Edges SQL`_, `Points SQL`_, **root vid**, **distance**, " "**driving side**, [**options A**])" msgstr "" -"pgr_withPointsDD(`Edges SQL`_ , `Points SQL`_ , **root vid**, **distance**, " +"pgr_withPointsDD(`Edges SQL`_, `Points SQL`_, **root vid**, **distance**, " "**driving side**, [**options A**])" msgid "" -"pgr_withPointsDD(`Edges SQL`_ , `Points SQL`_ , **root vids**, **distance**, " +"pgr_withPointsDD(`Edges SQL`_, `Points SQL`_, **root vids**, **distance**, " "**driving side**, [**options B**])" msgstr "" -"pgr_withPointsDD(`Edges SQL`_ , `Points SQL`_ , **root vids**, **distance**, " +"pgr_withPointsDD(`Edges SQL`_, `Points SQL`_, **root vids**, **distance**, " "**driving side**, [**options B**])" msgid "**options A:** ``[directed, details]``" @@ -16256,10 +16254,10 @@ msgid "**options B:** ``[directed, details, equicost]``" msgstr "**options B:** ``[directed, details, equicost]``" msgid "" -"pgr_withPointsDD(`Edges SQL`_ , `Points SQL`_ , **root vid**, **distance**, " +"pgr_withPointsDD(`Edges SQL`_, `Points SQL`_, **root vid**, **distance**, " "**driving side**, [**options**])" msgstr "" -"pgr_withPointsDD(`Edges SQL`_ , `Points SQL`_ , **root vid**, **distance**, " +"pgr_withPointsDD(`Edges SQL`_, `Points SQL`_, **root vid**, **distance**, " "**driving side**, [**options**])" msgid "**options:** ``[directed, details]``" @@ -16272,10 +16270,10 @@ msgstr "" "右侧驾驶拓扑，从点 :math:`1` 开始，距离不超过 :math:`3.3`，并提供详细信息。" msgid "" -"pgr_withPointsDD(`Edges SQL`_ , `Points SQL`_ , **root vids**, **distance**, " +"pgr_withPointsDD(`Edges SQL`_, `Points SQL`_, **root vids**, **distance**, " "**driving side**, [**options**])" msgstr "" -"pgr_withPointsDD(`Edges SQL`_ , `Points SQL`_ , **root vids**, **distance**, " +"pgr_withPointsDD(`Edges SQL`_, `Points SQL`_, **root vids**, **distance**, " "**driving side**, [**options**])" msgid "**options:** ``[directed, details, equicost]``" @@ -16386,38 +16384,38 @@ msgid "" msgstr "修改图以包括 `Points SQL`_ 中定义的点并使用 Yen 算法查找 :math:`K`最短路径。" msgid "" -"pgr_withPointsKSP(`Edges SQL`_ , `Points SQL`_ , **start vid**, **end vid**, " +"pgr_withPointsKSP(`Edges SQL`_, `Points SQL`_, **start vid**, **end vid**, " "**K**, **driving_side**, [**options**])" msgstr "" -"pgr_withPointsKSP(`Edges SQL`_ , `Points SQL`_ , **start vid**, **end vid**, " +"pgr_withPointsKSP(`Edges SQL`_, `Points SQL`_, **start vid**, **end vid**, " "**K**, **driving_side**, [**options**])" msgid "" -"pgr_withPointsKSP(`Edges SQL`_ , `Points SQL`_ , **start vid**, **end vids**, " +"pgr_withPointsKSP(`Edges SQL`_, `Points SQL`_, **start vid**, **end vids**, " "**K**, **driving_side**, [**options**])" msgstr "" -"pgr_withPointsKSP(`Edges SQL`_ , `Points SQL`_ , **start vid**, **end vids**, " +"pgr_withPointsKSP(`Edges SQL`_, `Points SQL`_, **start vid**, **end vids**, " "**K**, **driving_side**, [**options**])" msgid "" -"pgr_withPointsKSP(`Edges SQL`_ , `Points SQL`_ , **start vids**, **end vid**, " +"pgr_withPointsKSP(`Edges SQL`_, `Points SQL`_, **start vids**, **end vid**, " "**K**, **driving_side**, [**options**])" msgstr "" -"pgr_withPointsKSP(`Edges SQL`_ , `Points SQL`_ , **start vids**, **end vid**, " +"pgr_withPointsKSP(`Edges SQL`_, `Points SQL`_, **start vids**, **end vid**, " "**K**, **driving_side**, [**options**])" msgid "" -"pgr_withPointsKSP(`Edges SQL`_ , `Points SQL`_ , **start vids**, **end vids**, " +"pgr_withPointsKSP(`Edges SQL`_, `Points SQL`_, **start vids**, **end vids**, " "**K**, **driving_side**, [**options**])" msgstr "" -"pgr_withPointsKSP(`Edges SQL`_ , `Points SQL`_ , **start vids**, **end vids**, " +"pgr_withPointsKSP(`Edges SQL`_, `Points SQL`_, **start vids**, **end vids**, " "**K**, **driving_side**, [**options**])" msgid "" -"pgr_withPointsKSP(`Edges SQL`_ , `Points SQL`_ , `Combinations SQL`_ , **K**, " +"pgr_withPointsKSP(`Edges SQL`_, `Points SQL`_, `Combinations SQL`_, **K**, " "**driving_side**, [**options**])" msgstr "" -"pgr_withPointsKSP(`Edges SQL`_ , `Points SQL`_ , `Combinations SQL`_ , **K**, " +"pgr_withPointsKSP(`Edges SQL`_, `Points SQL`_, `Combinations SQL`_, **K**, " "**driving_side**, [**options**])" msgid "**options:** ``[directed, heap_paths, details]``" @@ -16536,10 +16534,10 @@ msgstr "" "size\\_of(via\\;vertices)`。" msgid "" -"pgr_withPointsVia(`Edges SQL`_ , `Points SQL`_ , **via vertices**, " +"pgr_withPointsVia(`Edges SQL`_, `Points SQL`_, **via vertices**, " "[**options**])" msgstr "" -"pgr_withPointsVia(`Edges SQL`_ , `Points SQL`_ , **via vertices**, " +"pgr_withPointsVia(`Edges SQL`_, `Points SQL`_, **via vertices**, " "[**options**])" msgid "" @@ -16675,7 +16673,7 @@ msgid "" "github.com/pgRouting/pgrouting/commits>`_ on Github." msgstr "" "要查看完整的更改列表，请检查 Github 上的 `Git提交列表 `_ 。" +"pgRouting/pgrouting/commits>`_。" msgid "Mayors" msgstr "主要版本" @@ -16932,10 +16930,10 @@ msgid "Issue fixes" msgstr "问题修复" msgid "" -"`#2565 `__" +"`#2565 `__ " "pgr_pgr_lengauerTarjanDominatorTree triggers an assertion" msgstr "" -"`#2565 `__" +"`#2565 `__ " "pgr_pgr_lengauerTarjanDominatorTree 触发了一个断言" msgid "SQL enhancements" @@ -17011,18 +17009,18 @@ msgstr "" "utf8=%E2%9C%93&q=milestone%3A%22Release%203.4.2%22>`_" msgid "" -"`#2394 `__ : pgr_bdAstar " +"`#2394 `__: pgr_bdAstar " "accumulates heuristic cost in visited node cost." msgstr "" -"`#2394 `__ ：pgr_bdAstar " +"`#2394 `__：pgr_bdAstar " "在访问的节点成本中累积了启发式成本。" msgid "" -"`#2427 `__ : " +"`#2427 `__: " "pgr_createVerticesTable & pgr_createTopology, variable should be of type " "Record." msgstr "" -"`#2427 `__ : " +"`#2427 `__: " "pgr_createVerticesTable & pgr_createTopology，变量应为 Record 类型。" msgid "pgRouting 3.4.1 Release Notes" @@ -17038,17 +17036,17 @@ msgstr "" "utf8=%E2%9C%93&q=milestone%3A%22Release%203.4.1%22>`_" msgid "" -"`#2401 `__ : pgRouting " +"`#2401 `__: pgRouting " "3.4.0 do not build docs when sphinx is too low or missing" msgstr "" -"`#2401 `__ : pgRouting " +"`#2401 `__: pgRouting " "3.4.0 在 sphinx 过低或丢失时不构建文档" msgid "" -"`#2398 `__ : v3.4.0 does " +"`#2398 `__: v3.4.0 does " "not upgrade from 3.3.3" msgstr "" -"`#2398 `__ : v3.4.0 不能" +"`#2398 `__: v3.4.0 不能" "从 3.3.3 升级" msgid "pgRouting 3.4.0 Release Notes" @@ -17064,10 +17062,10 @@ msgstr "" "utf8=%E2%9C%93&q=milestone%3A%22Release%203.4.0%22>`_" msgid "" -"`#1891 `__ : pgr_ksp " +"`#1891 `__: pgr_ksp " "doesn't give all correct shortest path" msgstr "" -"`#1891 `__ : pgr_ksp 没有" +"`#1891 `__: pgr_ksp 没有" "给出所有正确的最短路径" msgid "New proposed functions" @@ -17182,10 +17180,10 @@ msgstr "" "utf8=%E2%9C%93&q=milestone%3A%22Release%203.3.4%22>`_" msgid "" -"`#2400 `__ : pgRouting " +"`#2400 `__: pgRouting " "3.3.3 does not build in focal" msgstr "" -"`#2400 `__ : pgRouting " +"`#2400 `__: pgRouting " "3.3.3 在 Focal 上无法构建" msgid "pgRouting 3.3.3 Release Notes" @@ -17248,24 +17246,24 @@ msgid "Restructure of the pgRouting concepts page." msgstr "pgRouting概念页面的重构。" msgid "" -"`#2276 `__ : " +"`#2276 `__: " "edgeDisjointPaths issues with start_vid and combinations" msgstr "" -"`#2276 `__ : " +"`#2276 `__: " "edgeDisjointPaths 与 start_vid 和组合的问题" msgid "" -"`#2312 `__ : " +"`#2312 `__: " "pgr_extractVertices error when target is not BIGINT" msgstr "" -"`#2312 `__ ：当目标不是 " +"`#2312 `__：当目标不是 " "BIGINT 时 pgr_extractVertices 错误" msgid "" -"`#2357 `__ : Apply clang-" +"`#2357 `__: Apply clang-" "tidy performance-*" msgstr "" -"`#2357 `__ ：应用 clang-" +"`#2357 `__：应用 clang-" "tidy performance-*" msgid "pgRouting 3.3.1 Release Notes" @@ -17278,20 +17276,20 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 ` 3.3.1Git关闭里程" "碑 `_ 。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.3.1%22>`_。" msgid "" -"`#2216 `__ : Warnings " +"`#2216 `__: Warnings " "when using clang" msgstr "" -"`#2216 `__ ：使用 clang 时" +"`#2216 `__：使用 clang 时" "发出警告" msgid "" -"`#2266 `__ : Error " +"`#2266 `__: Error " "processing restrictions" msgstr "" -"`#2266 `__ ：错误处理限制" +"`#2266 `__：错误处理限制" msgid "pgRouting 3.3.0 Release Notes" msgstr "pgRouting 3.3.0 发布说明" @@ -17306,38 +17304,38 @@ msgstr "" "utf8=%E2%9C%93&q=milestone%3A%22Release%203.3.0%22>`_ 。" msgid "" -"`#2057 `__ : trspViaEdges " +"`#2057 `__: trspViaEdges " "columns in different order" msgstr "" -"`#2057 `__ : trspViaEdges " +"`#2057 `__: trspViaEdges " "列的顺序不同" msgid "" -"`#2087 `__ : " +"`#2087 `__: " "pgr_extractVertices to proposed" msgstr "" -"`#2087 `__ :拟议的 " +"`#2087 `__:拟议的 " "pgr_extractVertices" msgid "" -"`#2201 `__ : " +"`#2201 `__: " "pgr_depthFirstSearch to proposed" msgstr "" -"`#2201 `__ : 拟议的" +"`#2201 `__: 拟议的" "pgr_depthFirstSearch" msgid "" -"`#2202 `__ : " +"`#2202 `__: " "pgr_sequentialVertexColoring to proposed" msgstr "" -"`#2202 `__ : 拟议的" +"`#2202 `__: 拟议的" "pgr_sequentialVertexColoring" msgid "" -"`#2203 `__ : " +"`#2203 `__: " "pgr_dijkstraNear and pgr_dijkstraNearCost to proposed" msgstr "" -"`#2203 `__ : 拟议的" +"`#2203 `__: 拟议的" "pgr_dijkstraNear 和 pgr_dijkstraNearCost" msgid "Coloring" @@ -17407,20 +17405,20 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.2.2 Git关闭里程" "碑 `_ 。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.2.2%22>`_。" msgid "" -"`#2093 `__ : Compilation " +"`#2093 `__: Compilation " "on Visual Studio" msgstr "" -"`#2093 `__ ：在 Visual " +"`#2093 `__：在 Visual " "Studio 上编译" msgid "" -"`#2189 `__ : Build error " +"`#2189 `__: Build error " "on RHEL 7" msgstr "" -"`#2189 `__ ：RHEL 7 上的构" +"`#2189 `__：RHEL 7 上的构" "建错误" msgid "pgRouting 3.2.1 Release Notes" @@ -17433,13 +17431,13 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.2.1Git关闭里程碑 " "`_ 。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.2.1%22>`_。" msgid "" -"`#1883 `__ : " +"`#1883 `__: " "pgr_TSPEuclidean crashes connection on Windows" msgstr "" -"`#1883 `__ :" +"`#1883 `__:" "pgr_TSPEuclidean 在 Windows 上导致连接崩溃" msgid "The solution is to use Boost::graph::metric_tsp_approx" @@ -17463,16 +17461,16 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 ` 3.2.0Git关闭里程" "碑 `_ 。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.2.0%22>`_。" msgid "Build" msgstr "构建" msgid "" -"`#1850 `__ : Change Boost " +"`#1850 `__: Change Boost " "min version to 1.56" msgstr "" -"`#1850 `__ ：将 Boost 最低" +"`#1850 `__：将 Boost 最低" "版本更改为 1.56" msgid "Removing support for Boost v1.53, v1.54 & v1.55" @@ -17578,27 +17576,27 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.1.3 Git关闭里程" "碑 `_ 。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.1.3%22>`_。" msgid "" -"`#1825 `__ : Boost " +"`#1825 `__: Boost " "versions are not honored" msgstr "" -"`#1825 `__ ：Boost 版本不" +"`#1825 `__：Boost 版本不" "受支持" msgid "" -"`#1849 `__ : Boost 1.75.0 " +"`#1849 `__: Boost 1.75.0 " "geometry \"point_xy.hpp\" build error on macOS environment" msgstr "" -"`#1849 `__ ：macOS 环境中" +"`#1849 `__：macOS 环境中" "的 Boost 1.75.0 几何“point_xy.hpp”构建错误" msgid "" -"`#1861 `__ : vrp " +"`#1861 `__: vrp " "functions crash server" msgstr "" -"`#1861 `__ ：vrp功能使服务" +"`#1861 `__：vrp功能使服务" "器崩溃" msgid "pgRouting 3.1.2 Release Notes" @@ -17611,41 +17609,41 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.1.2Git关闭里程碑 " "`_ 。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.1.2%22>`_。" msgid "" -"`#1304 `__ : FreeBSD 12 " +"`#1304 `__: FreeBSD 12 " "64-bit crashes on pgr_vrOneDepot tests Experimental Function" msgstr "" -"`#1304 `__ ：FreeBSD 12 " +"`#1304 `__：FreeBSD 12 " "64 位在 pgr_vrOneDepot 测试实验功能上崩溃" msgid "" -"`#1356 `__ : tools/" +"`#1356 `__: tools/" "testers/pg_prove_tests.sh fails when PostgreSQL port is not passed" msgstr "" -"`#1356 `__ ：tools/" +"`#1356 `__：tools/" "testers/pg_prove_tests.sh 在未传递 PostgreSQL 端口时失败" msgid "" -"`#1725 `__ : Server crash " +"`#1725 `__: Server crash " "on pgr_pickDeliver and pgr_vrpOneDepot on openbsd" msgstr "" -"`#1725 `__ _：openbsd上的" +"`#1725 `___：openbsd上的" "pgr_pickDeliver和pgr_vrpOneDepot服务器崩溃" msgid "" -"`#1760 `__ : TSP server " +"`#1760 `__: TSP server " "crash on ubuntu 20.04 #1760" msgstr "" -"`#1760 `__ ：TSP 服务器在 " +"`#1760 `__：TSP 服务器在 " "ubuntu 20.04 上崩溃 #1760" msgid "" -"`#1770 `__ : Remove " +"`#1770 `__: Remove " "warnings when using clang compiler" msgstr "" -"`#1770 `__ ：删除使用 " +"`#1770 `__：删除使用 " "clang 编译器时的警告" msgid "pgRouting 3.1.1 Release Notes" @@ -17658,41 +17656,41 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.1.1 Git关闭里程" "碑 `_ 。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.1.1%22>`_。" msgid "" -"`#1733 `__ : pgr_bdAstar " +"`#1733 `__: pgr_bdAstar " "fails when source or target vertex does not exist in the graph" msgstr "" -"`#1733 `__ ：当图中不存在" +"`#1733 `__：当图中不存在" "源顶点或目标顶点时，pgr_bdAstar 失败" msgid "" -"`#1647 `__ : Linear " +"`#1647 `__: Linear " "Contraction contracts self loops" msgstr "" -"`#1647 `__ ：线性收缩收缩" +"`#1647 `__：线性收缩收缩" "自循环" msgid "" -"`#1640 `__ : " +"`#1640 `__: " "pgr_withPoints fails when points_sql is empty" msgstr "" -"`#1640 `__ : " +"`#1640 `__: " "pgr_withPoints 在 points_sql 为空时失败" msgid "" -"`#1616 `__ : Path " +"`#1616 `__: Path " "evaluation on C++ not updated before the results go back to C" msgstr "" -"`#1616 `__ _：C++ 上的路径" +"`#1616 `___：C++ 上的路径" "评估在结果返回 C 之前没有更新" msgid "" -"`#1300 `__ : " +"`#1300 `__: " "pgr_chinesePostman crash on test data" msgstr "" -"`#1300 `__ :" +"`#1300 `__:" "pgr_chinesePostman 在测试数据上崩溃" msgid "pgRouting 3.1.0 Release Notes" @@ -17705,7 +17703,7 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.1.0 Git关闭里程" "碑 `_ 。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.1.0%22>`_。" msgid "pgr_dijkstra(combinations)" msgstr "pgr_dijkstra(组合)" @@ -17732,7 +17730,7 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 ` 3.0.6Git关闭里程" "碑 `_ 。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.0.6%22>`_。" msgid "pgRouting 3.0.5 Release Notes" msgstr "pgRouting 3.0.5 发布说明" @@ -17744,7 +17742,7 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.0.5Git关闭里程碑 " "`_ 。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.0.5%22>`_。" msgid "Backport issue fixes" msgstr "回溯问题修复" @@ -17759,7 +17757,7 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 ` 3.0.4Git关闭里程" "碑 `_ 。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.0.4%22>`_。" msgid "pgRouting 3.0.3 Release Notes" msgstr "pgRouting 3.0.3 发布说明" @@ -17774,13 +17772,13 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.0.2Git关闭里程碑 " "`_ 。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.0.2%22>`_。" msgid "" -"`#1378 `__ : Visual " +"`#1378 `__: Visual " "Studio build failing" msgstr "" -"`#1378 `__ ：Visual " +"`#1378 `__：Visual " "Studio 构建失败" msgid "pgRouting 3.0.1 Release Notes" @@ -17793,13 +17791,13 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.0.1Git关闭里程碑 " "`_ 。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.0.1%22>`_。" msgid "" -"`#232 `__ : Honor client " +"`#232 `__: Honor client " "cancel requests in C /C++ code" msgstr "" -"`#232 `__ ：在 C /C++ 代码" +"`#232 `__：在 C /C++ 代码" "中尊重客户端取消请求" msgid "pgRouting 3.0.0 Release Notes" @@ -17812,50 +17810,50 @@ msgid "" msgstr "" "要查看此版本关闭的所有问题和拉取请求，请参阅 Github 上的 `3.0.0Git关闭里程碑 " "`_ 。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%203.0.0%22>`_。" msgid "Fixed Issues" msgstr "问题修复" msgid "" -"`#1153 `__ : Renamed " +"`#1153 `__: Renamed " "pgr_eucledianTSP to pgr_TSPeuclidean" msgstr "" -"`#1153 `__ ：将 " +"`#1153 `__：将 " "pgr_eucledianTSP 更名为 pgr_TSPeuclidean" msgid "" -"`#1188 `__ : Removed CGAL " +"`#1188 `__: Removed CGAL " "dependency" msgstr "" -"`#1188 `__ ：删除了 CGAL " +"`#1188 `__：删除了 CGAL " "依赖" msgid "" -"`#1002 `__ : Fixed " +"`#1002 `__: Fixed " "contraction issues:" msgstr "" -"`#1002 `__ ：修复收缩问" +"`#1002 `__：修复收缩问" "题：" msgid "" -"`#1004 `__ : Contracts " +"`#1004 `__: Contracts " "when forbidden vertices do not belong to graph" msgstr "" -"`#1004 `__ _：当禁止的顶点" +"`#1004 `___：当禁止的顶点" "不属于图时的收缩" msgid "" -"`#1005 `__ : Intermideate " +"`#1005 `__: Intermideate " "results eliminated" msgstr "" -"`#1005 `__ ：消除中间结果" +"`#1005 `__：消除中间结果" msgid "" -"`#1006 `__ : No loss of " +"`#1006 `__: No loss of " "information" msgstr "" -"`#1006 `__ ：无信息丢失" +"`#1006 `__：无信息丢失" msgid "New functions" msgstr "新函数" @@ -18194,7 +18192,7 @@ msgid "" msgstr "" "要查看此版本关闭的问题，请参阅 Github 上的 `2.6.3Git关闭里程碑 `_ 。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%202.6.3%22%20>`_。" msgid "" "`#1219 `__ Implicit cast " @@ -18227,7 +18225,7 @@ msgid "" msgstr "" "要查看此版本关闭的问题，请参阅 Github 上的 `2.6.2Git关闭里程碑 `_ 。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%202.6.2%22%20>`_。" msgid "" "`#1152 `__ Fixes driving " @@ -18260,7 +18258,7 @@ msgid "" msgstr "" "要查看此版本关闭的问题，请参阅 Github 上的 `2.6.1Git关闭里程碑 `_ 。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%202.6.1%22%20>`_。" msgid "Fixes server crash on several functions." msgstr "修复了多个函数导致服务器崩溃的问题。" @@ -18356,7 +18354,7 @@ msgid "" msgstr "" "要查看此版本关闭的问题，请参阅 Github 上的 ` 2.6.0Git关闭里程碑 `_ 。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%202.6.0%22%20>`_。" msgid "pgr_lineGraphFull" msgstr "pgr_lineGraphFull" @@ -18413,7 +18411,7 @@ msgid "" msgstr "" "要查看此版本关闭的问题，请参阅 Github 上的 `2.5.5Git关闭里程碑 `_ 。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.5%22%20>`_。" msgid "Fixes driving distance when vertex is not part of the graph" msgstr "修复顶点不在图中时的行驶距离问题" @@ -18434,7 +18432,7 @@ msgid "" msgstr "" "要查看此版本关闭的问题，请参阅 Github 上的 `2.5.4 Git关闭里程碑 `_ 。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.4%22%20>`_。" msgid "pgRouting 2.5.3 Release Notes" msgstr "pgRouting 2.5.3 发布说明" @@ -18446,7 +18444,7 @@ msgid "" msgstr "" "要查看此版本关闭的问题，请参阅 Github 上的 ` 2.5.3Git关闭里程碑 `_ 。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.3%22%20>`_。" msgid "" "Fix for postgresql 11: Removed a compilation error when compiling with " @@ -18463,7 +18461,7 @@ msgid "" msgstr "" "要查看此版本关闭的问题，请参阅 Github 上的 `2.5.2Git关闭里程碑 `_ 。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.2%22%20>`_。" msgid "Fix for postgresql 10.1: Removed a compiler condition" msgstr "postgresql 10.1 的修复：删除了一个编译器条件" @@ -18478,7 +18476,7 @@ msgid "" msgstr "" "要查看此版本关闭的问题，请参阅 Github 上的 `2.5.1Git关闭里程碑 `_ 。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.1%22%20>`_。" msgid "Fixed prerequisite minimum version of: cmake" msgstr "修正了 cmake 的最低版本要求" @@ -18571,7 +18569,7 @@ msgid "" msgstr "" "要查看此版本关闭的问题，请参阅 Github 上的 `2.4.2Git关闭里程碑 `_ 。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%202.4.2%22%20>`_。" msgid "Improvement" msgstr "改进" @@ -18596,7 +18594,7 @@ msgid "" msgstr "" "要查看此版本关闭的问题，请参阅 Github 上的 `2.4.1Git关闭里程碑 `_ 。" +"utf8=%E2%9C%93&q=milestone%3A%22Release%202.4.1%22%20>`_。" msgid "Fixed compiling error on macOS" msgstr "修正了 macOS 上的编译错误" @@ -19271,7 +19269,7 @@ msgid "" msgstr "" "要查看此版本关闭的问题，请参阅 Github 上的 `1.x Git 已关闭问题 `_ 。以下的发行说明已从之前的 ``RELEASE_NOTES`` 文件中复制，" +"x%22+is%3Aclosed>`_。以下的发行说明已从之前的 ``RELEASE_NOTES`` 文件中复制，" "并作为参考保留。" msgid "Changes for release 1.05" @@ -19385,7 +19383,7 @@ msgid "" "which corresponds to the segment on the oposite direction of the geometry." msgstr "" "pgRouting文档的数据库设计将同一行中的两段保留在一个方向上，其中一个是与几何形" -"状相同方向的，另一个是与几何形状相反方向的。因此，一些信息具有 ``reverse_``" +"状相同方向的，另一个是与几何形状相反方向的。因此，一些信息具有 ``reverse_`` " "前缀，对应于几何形状相反方向的段。" msgid "Identifier of the starting vertex of the geometry ``geom``." @@ -19503,7 +19501,7 @@ msgid "" "This queries based on the vertices data create a topology by filling the " "``source`` and ``target`` columns in the edges table." msgstr "" -"此查询基于顶点数据，通过填充边表中的 ``source``列和``target`` 列来创建拓扑。" +"此查询基于顶点数据，通过填充边表中的 ``source`` 列和 ``target`` 列来创建拓扑。" msgid "Topology data" msgstr "拓扑数据" @@ -19518,7 +19516,7 @@ msgid "" "Many functions can be used with a combinations of ``(source, target)`` pairs " "when wanting a route from ``source`` to ``target``." msgstr "" -"当需要从 ``source`` 到 ``target`` 的路由时，许多函数都可以与 `` (source, " +"当需要从 ``source`` 到 ``target`` 的路由时，许多函数都可以与 ``(source, " "target)`` 对组合使用。" msgid "" @@ -19536,7 +19534,7 @@ msgid "Some functions accept soft restrictions about the segments." msgstr "一些函数接受关于段的软约束。" msgid "Red arrows correspond when ``cost`` > 0 in the edge table." -msgstr "红色箭头对应边表中 ``cost`` > 0的情况。" +msgstr "红色箭头对应边表中 ``cost`` > 0 的情况。" msgid "Blue arrows correspond when ``reverse_cost`` > 0 in the edge table." msgstr "蓝色箭头对应边表中的 ``reverse_cost`` > 0 的情况。" @@ -19599,13 +19597,13 @@ msgstr "对于不连通的图，不存在单棵树，而是由每个连通分量 msgid "" "pgRouting community support is available through the `pgRouting website " -"`_ , `documentation `_ , tutorials, mailing lists and others. If you’re looking " +"`_, `documentation `_, tutorials, mailing lists and others. If you’re looking " "for :ref:`commercial support `, find below a list of " "companies providing pgRouting development and consulting services." msgstr "" "pgRouting 社区支持可通过 `pgRouting 网站 `_ 、`文档 `_ 、教程、邮件列表等获得。 " +"html>`_、`文档 `_、教程、邮件列表等获得。 " "如果您正在寻求 :ref:`商业支持 `，请在下面找到提供 " "pgRouting 开发和咨询服务的公司列表。" @@ -19616,7 +19614,7 @@ msgid "" "Bugs are reported and managed in an `issue tracker `_. Please follow these steps:" msgstr "" -"错误在`问题跟踪器 `_ 中报告和管" +"错误在 `问题跟踪器 `_ 中报告和管" "理。 请按照以下步骤操作：" msgid "" @@ -19687,7 +19685,7 @@ msgid "" msgstr "有关如何使用 pgRouting 的一般问题和主题，请写信给用户邮件列表。" msgid "" -"You can also ask at `GIS StackExchange `_" +"You can also ask at `GIS StackExchange `_ " "and tag the question with ``pgrouting``. Find all questions tagged with " "``pgrouting`` under https://gis.stackexchange.com/questions/tagged/pgrouting " "or subscribe to the `pgRouting questions feed `_ 上提问，并使" "用 ``pgrouting`` 标签。查找所有带有 ``pgrouting`` 标签的问题，请访问 https://" "gis.stackexchange.com/questions/tagged/pgrouting 或订阅 `pgRouting 问题订阅 " -"`_ 。" +"`_。" msgid "Commercial Support" msgstr "商业支持" @@ -19774,7 +19772,7 @@ msgstr "收缩 - 函数族" msgid "" "This family of functions is used for transforming a given input graph :math:" "`G(V,E)` into a new graph :math:`G'(V',E')`." -msgstr "该函数族用于将给定的输入图 :math:`G(V,E)`转换为新图 :math:`G'(V',E')`。" +msgstr "该函数族用于将给定的输入图 :math:`G(V,E)` 转换为新图 :math:`G'(V',E')`。" msgid "Traversal - Family of functions" msgstr "Traversal - 函数族" @@ -20059,10 +20057,10 @@ msgid "Arrival to point ``-2`` can be achived only via vertex **16**." msgstr "只能通过顶点 **16** 才能到达点 ``-2``。" msgid "Does not affects edge ``(17, 16)``, therefore the edge is kept." -msgstr "不影响边 ``(17, 16)`` ，因此边被保留。" +msgstr "不影响边 ``(17, 16)``，因此边被保留。" msgid "It only affects the edge ``(16, 17)``, therefore the edge is removed." -msgstr "它只影响边 ``(16, 17)`` ，因此边被移除。" +msgstr "它只影响边 ``(16, 17)``，因此边被移除。" msgid "Create two new edges:" msgstr "创建两条新边：" @@ -20070,7 +20068,7 @@ msgstr "创建两条新边：" msgid "" "Edge ``(16, -2)`` with cost ``0.4`` (original cost * fraction == :math:`1 * " "0.4`)" -msgstr "边 ``(16, -2)`` 的成本为``0.4`` （原始成本*分数== :math:`1 * 0.4`）" +msgstr "边 ``(16, -2)`` 的成本为``0.4`` （原始成本*分数 == :math:`1 * 0.4`）" msgid "Edge ``(-2, 17)`` with cost ``0.6`` (the remaing cost)" msgstr "边 ``(-2, 17)`` 的成本为``0.6`` （剩余成本）" From 93412eac6175278cbc38a0a835d2b9179659f433 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Fri, 27 Sep 2024 00:13:38 -0600 Subject: [PATCH 366/428] (zh_Hans) removing all chinese errors --- .../LC_MESSAGES/pgrouting_doc_strings.po | 223 +++++++++--------- 1 file changed, 112 insertions(+), 111 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 48a3c2b112..d4199a30b6 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -757,7 +757,7 @@ msgid "" "goods need to be moved from certain pickup locations to other delivery " "locations." msgstr "" -"取货和送货的车辆路径问题`VRPPD`，其中大量货物需要从某些取货地点移动到其他送货" +"取货和送货的车辆路径问题 `VRPPD` ，其中大量货物需要从某些取货地点移动到其他送货" "地点。" msgid "Limitations" @@ -781,10 +781,10 @@ msgstr "取货 & 送货" msgid "" "Problem: `CVRPPDTW` Capacitated Pick and Delivery Vehicle Routing problem " "with Time Windows" -msgstr "问题：`CVRPPDTW` 具有时间窗口的有能力分拣和送货车辆路径问题" +msgstr "问题： `CVRPPDTW` 具有时间窗口的有能力分拣和送货车辆路径问题" msgid "Times are relative to `0`" -msgstr "时间是相对于`0` 的" +msgstr "时间是相对于 `0` 的" msgid "The vehicles" msgstr "车辆" @@ -867,7 +867,7 @@ msgid "1" msgstr "1" msgid "Travel time multiplier. See :ref:`pd_factor`" -msgstr "旅行时间乘数。 请参阅:ref:`pd_factor`" +msgstr "旅行时间乘数。 请参阅 :ref:`pd_factor`" msgid "``max_cycles``" msgstr "``max_cycles``" @@ -981,7 +981,7 @@ msgstr "``p_node_id``" msgid "" "The node identifier of the pickup, must match a vertex identifier in the " "`Matrix SQL`_." -msgstr "取货的节点标识符必须与`Matrix SQL`_ 中的顶点标识符匹配。" +msgstr "取货的节点标识符必须与 `Matrix SQL`_ 中的顶点标识符匹配。" msgid "``d_node_id``" msgstr "``d_node_id``" @@ -1380,7 +1380,7 @@ msgstr "车内座位数" msgid "" "The `demand` request of the pickup-deliver orders must use the same units as " "the units used in the vehicle's `capacity`." -msgstr "取货-送货订单的`需求`请求必须使用与车辆`容量`中使用的单位相同的单位。" +msgstr "取货-送货订单的 `需求` 请求必须使用与车辆 `容量` 中使用的单位相同的单位。" msgid "" "To handle problems like: 10 (equal dimension) boxes of apples and 5 kg of " @@ -1391,7 +1391,7 @@ msgid "" "If the vehicle's **capacity** is measured in `boxes`, a conversion of `kg of " "feathers` to `number of boxes` is needed." msgstr "" -"如果车辆的 **容量** 以`箱子`来衡量，则需要将`羽毛的千克`换算为`箱子的数量`。" +"如果车辆的 **容量** 以 `箱子` 来衡量，则需要将 `羽毛的千克` 换算为 `箱子的数量`。" msgid "" "If the vehicle's **capacity** is measured in `kg`, a conversion of `box of " @@ -1405,8 +1405,8 @@ msgid "" "Let: - :math:`f\\_boxes`: number of boxes needed for `1` kg of feathers. - :" "math:`a\\_weight`: weight of `1` box of apples." msgstr "" -"设：- :math:`f\\_boxes`：`1` 公斤羽毛所需的箱子数量。- :math:`a\\_weight`：`1`" -"箱子苹果的重量。" +"设：- :math:`f\\_boxes`： `1` 公斤羽毛所需的箱子数量。- :math:`a\\_weight`： `1`" +" 箱子苹果的重量。" msgid "Capacity Units" msgstr "容量单位" @@ -1894,7 +1894,7 @@ msgid "The `agg_cost` of `(u, v)` is the same as for `(v, u)`." msgstr "`(u, v)` 的 `agg_cost` 与 `(v, u)` 相同。" msgid "When `start_vid` = `end_vid`, the `agg_cost` = 0." -msgstr "当`start_vid` = `end_vid`时，`agg_cost`= 0。" +msgstr "当 `start_vid` = `end_vid` 时，`agg_cost` = 0。" msgid "**Recommended, use a bounding box of no more than 3500 edges.**" msgstr "**建议使用不超过 3500 条边的边界框。**" @@ -1912,7 +1912,7 @@ msgid "``true``" msgstr "``true``" msgid "When ``true`` the graph is considered `Directed`" -msgstr "当 ``true`` 时，该图被视为有`有向`" +msgstr "当 ``true`` 时，该图被视为有 `有向`" msgid "When ``false`` the graph is considered as `Undirected`." msgstr "如果为 ``false`` ，则该图被视为 `无向`。" @@ -3109,7 +3109,7 @@ msgid "" "nodes:" msgstr "" "当不再有线性节点时，线性收缩将停止。 例如，在下图中，其中 :math:`v` 和 :math:`w`" -"是`线性`_ 节点：" +" 是 `线性`_ 节点：" msgid "Contracting :math:`w`," msgstr "收缩 :math:`w`，" @@ -3536,7 +3536,7 @@ msgid "" msgstr "当起始顶点和结束顶点相同时，就没有路径。" msgid "The aggregate cost in the non included values `(v, v)` is `0`." -msgstr "未包含值`(v, v)` 中的总成本为`0`。" +msgstr "未包含值 `(v, v)` 中的总成本为 `0`。" msgid "" "When the starting vertex and ending vertex are the different and there is no " @@ -4730,7 +4730,7 @@ msgstr "根据所使用的重载， ``start_vid`` 和``end_vid`` 列可能会丢 msgid "" "``pgr_aStar`` (`One to One`) does not have ``start_vid`` and ``end_vid``." -msgstr "``pgr_aStar`` (`一对一`)没有``start_vid`` 和``end_vid``。" +msgstr "``pgr_aStar`` (`一对一`)没有 ``start_vid`` 和 ``end_vid``。" msgid "``pgr_aStar`` (`One to Many`) does not have ``start_vid``." msgstr "``pgr_aStar`` (`一对多`) 没有 ``start_vid``。" @@ -4840,13 +4840,13 @@ msgstr "``pgr_dijkstra`` (`多对一`)" msgid "" "``pgr_dijkstra`` (`One to One`) does not have ``start_vid`` and ``end_vid``." -msgstr "``pgr_dijkstra`` (`一对一`)没有``start_vid`` 和 ``end_vid``。" +msgstr "``pgr_dijkstra`` (`一对一`)没有 ``start_vid`` 和 ``end_vid``。" msgid "``pgr_dijkstra`` (`One to Many`) does not have ``start_vid``." msgstr "``pgr_dijkstra`` (`一对多`) 没有 ``start_vid``。" msgid "``pgr_dijkstra`` (`Many to One`) does not have ``end_vid``." -msgstr "``pgr_dijkstra`` (`多对一`) 没有``end_vid``。" +msgstr "``pgr_dijkstra`` (`多对一`) 没有 ``end_vid``。" msgid "In ``pgr_dijkstra`` (`One to One`)" msgstr "在 ``pgr_dijkstra`` (`一对一`)中" @@ -4912,10 +4912,10 @@ msgstr "" "vertex>`__ 示例。" msgid "``depth`` contains the depth of the ``node``." -msgstr "``depth``包含``node`` 的深度。" +msgstr "``depth`` 包含 ``node`` 的深度。" msgid "``pred`` contains the predecessor of the ``node``." -msgstr "``pred`` 包含``node`` 的前驱。" +msgstr "``pred`` 包含 ``node`` 的前驱。" msgid "" "If needed filter out the added columns, for example, to return the original " @@ -5188,7 +5188,7 @@ msgid "``pgr_withPointsDD`` (Multiple vertices)" msgstr "``pgr_withPointsDD`` (多个顶点)" msgid "Output columns were |result-1-1-no-seq|" -msgstr "输出列为|result-1-1-no-seq|" +msgstr "输出列为 |result-1-1-no-seq|" msgid "Does not have ``start_vid``, ``pred`` and ``depth`` result columns." msgstr "没有 ``start_vid``，``pred`` 和``depth`` 结果列。" @@ -5202,7 +5202,7 @@ msgid "``pgr_withPointsDD`` (`Multiple vertices`)" msgstr "``pgr_withPointsDD`` (`多个顶点`)" msgid "Output columns were |result-m-1-no-seq|" -msgstr "输出列为|result-m-1-no-seq|" +msgstr "输出列为 |result-m-1-no-seq|" msgid "Does not have ``depth`` and ``pred`` result columns." msgstr "没有 ``depth`` 和``pred`` 结果列。" @@ -5540,7 +5540,7 @@ msgid "Migrate by using:" msgstr "使用以下方式迁移：" msgid ":doc:`pgr_dijkstra` when there are no restrictions," -msgstr ":doc:`pgr_dijkstra`当没有限制时，" +msgstr ":doc:`pgr_dijkstra` 当没有限制时，" msgid ":doc:`pgr_trsp` (One to One) when there are restrictions." msgstr ":doc:`pgr_trsp` (一对一)当有限制时。" @@ -5626,16 +5626,16 @@ msgid "Migration of ``pgr_trsp`` (Edges)" msgstr "迁移 ``pgr_trsp`` （边）" msgid "The integral types of the ``sql`` can only be ``INTEGER``." -msgstr "``sql`` 的整型类型只能是``INTEGER``。" +msgstr "``sql`` 的整型类型只能是 ``INTEGER``。" msgid "The floating point type of the ``sql`` can only be ``FLOAT``." -msgstr "``sql`` 的浮点类型只能是``FLOAT``。" +msgstr "``sql`` 的浮点类型只能是 ``FLOAT``。" msgid "For these migration guide the following points will be used:" msgstr "对于这些迁移指南，将使用以下几点：" msgid ":doc:`pgr_withPoints` when there are no restrictions," -msgstr ":doc:`pgr_withPoints`当没有任何限制的时候，" +msgstr ":doc:`pgr_withPoints` 当没有任何限制的时候，" msgid ":doc:`pgr_trsp_withPoints` (One to One) when there are restrictions." msgstr ":doc:`pgr_trsp_withPoints` (一对一) 当有限制时。" @@ -5676,10 +5676,10 @@ msgid "The integral types of the ``Edges SQL`` can only be ``INTEGER``." msgstr "``Edges SQL`` 的整数类型只能是 ``INTEGER``。" msgid ":doc:`pgr_dijkstraVia` when there are no restrictions," -msgstr ":doc:`pgr_dijkstraVia`当无限制时，" +msgstr ":doc:`pgr_dijkstraVia` 当无限制时，" msgid ":doc:`pgr_trspVia` when there are restrictions." -msgstr ":doc:`pgr_trspVia`当有限制时。" +msgstr ":doc:`pgr_trspVia` 当有限制时。" msgid "Migrating ``pgr_trspViaVertices`` using ``pgr_dijkstraVia``" msgstr "使用 ``pgr_dijkstraVia``迁移 ``pgr_trspViaVertices``" @@ -5720,7 +5720,7 @@ msgid ":doc:`pgr_withPointsVia` when there are no restrictions," msgstr ":doc:`pgr_withPointsVia` 当没有限制时，" msgid ":doc:`pgr_trspVia_withPoints` when there are restrictions." -msgstr ":doc:`pgr_trspVia_withPoints`当有限制时。" +msgstr ":doc:`pgr_trspVia_withPoints` 当有限制时。" msgid "Migrating ``pgr_trspViaEdges`` using ``pgr_withPointsVia``" msgstr "使用 ``pgr_withPointsVia`` 迁移 ``pgr_trspViaEdges``" @@ -5735,7 +5735,7 @@ msgid "Migrating ``pgr_trspViaEdges`` using ``pgr_trspVia_withPoints``" msgstr "使用 ``pgr_trspVia_withPoints``迁移``pgr_trspViaEdges``" msgid "Use :doc:`pgr_trspVia_withPoints` instead." -msgstr "使用 :doc:`pgr_trspVia_withPoints`代替。" +msgstr "使用 :doc:`pgr_trspVia_withPoints` 代替。" msgid ":doc:`pgr_trspVia_withPoints`:" msgstr ":doc:`pgr_trspVia_withPoints`:" @@ -6305,9 +6305,9 @@ msgid "" "pgrouting.org/latest/en/basic/data.html>`__." msgstr "" "来自 OSM 并使用 `osm2pgrouting `__ 作为导入工具的数据附带路由拓扑。 请参阅`workshop `__ 作为导入工具的数据附带路由拓扑。 请参阅 `workshop `__ 上使用 ``osm2pgrouting``" -"的示例。" +" 的示例。" msgid "Adjust costs" msgstr "调整成本" @@ -6315,7 +6315,7 @@ msgstr "调整成本" msgid "" "For this example the ``cost`` and ``reverse_cost`` values are going to be " "the double of the length of the geometry." -msgstr "对于本示例， ``cost`` 和``reverse_cost`` 值将是几何体长度的两倍。" +msgstr "对于本示例， ``cost`` 和 ``reverse_cost`` 值将是几何体长度的两倍。" msgid "Update costs to length of geometry" msgstr "将成本更新为几何形状的长度" @@ -6323,7 +6323,7 @@ msgstr "将成本更新为几何形状的长度" msgid "" "Suppose that ``cost`` and ``reverse_cost`` columns in the sample data " "represent:" -msgstr "假设样本数据中的 ``cost`` 和``reverse_cost`` 列表示：" +msgstr "假设样本数据中的 ``cost`` 和 ``reverse_cost`` 列表示：" msgid ":math:`1` when the edge exists in the graph" msgstr "当边存在于图中时为 :math:`1`" @@ -6741,7 +6741,7 @@ msgstr "例如，对于这个 :doc:`pgr_dijkstra` 签名：" msgid "" "pgr_dijkstra(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" msgstr "" -"pgr_dijkstra(`Edges SQL`_ , **start vids**, **end vids**, [``directed``])" +"pgr_dijkstra(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" msgid "`Edges SQL`_:" msgstr "`Edges SQL`_:" @@ -7312,7 +7312,7 @@ msgid "" "about installation in this `Install Guide `__" msgstr "" -"使用pgRouting需要安装PostGIS，请阅读本`安装指南 `__ 中有关安装的信息" msgid "Short Version" @@ -7655,10 +7655,10 @@ msgid "Testing" msgstr "测试" msgid "Currently there is no :code:`make test` and testing is done as follows" -msgstr "目前没有:code:`make test`，测试如下" +msgstr "目前没有 :code:`make test`，测试如下" msgid "The following instructions start from *path/to/pgrouting/*" -msgstr "以下指令从*path/to/pgrouting/*开始" +msgstr "以下指令从 *path/to/pgrouting/* 开始" msgid "" "pgRouting is an extension of `PostGIS `__ and " @@ -7884,13 +7884,13 @@ msgid "Version 3.6.0" msgstr "版本3.6.0" msgid "Result columns standarized to: |nksp-result|" -msgstr "结果列标准化为|nksp-result|" +msgstr "结果列标准化为 |nksp-result|" msgid "``pgr_ksp`` (One to One)" msgstr "``pgr_ksp`` (一对一)" msgid "Added ``start_vid`` and ``end_vid`` result columns." -msgstr "增加 ``start_vid`` 和``end_vid`` 结果列。" +msgstr "增加 ``start_vid`` 和 ``end_vid`` 结果列。" msgid "New overload functions:" msgstr "新的重载函数：" @@ -7959,7 +7959,7 @@ msgid "**options:** ``[directed, heap_paths]``" msgstr "**options:** ``[directed, heap_paths]``" msgid "Returns set of |nksp-result|" -msgstr "返回集合|nksp-result|" +msgstr "返回集合 |nksp-result|" msgid "OR EMPTY SET" msgstr "OR EMPTY SET" @@ -8593,7 +8593,7 @@ msgstr "``pgr_aStarCostMatrix``" msgid "" "``pgr_aStarCostMatrix`` - Calculates the a cost matrix using :doc:" "`pgr_aStar`." -msgstr "``pgr_aStarCostMatrix`` -使用 :doc:`pgr_aStar` 计算成本矩阵。" +msgstr "``pgr_aStarCostMatrix`` - 使用 :doc:`pgr_aStar` 计算成本矩阵。" msgid "Using internaly the :doc:`pgr_aStar` algorithm" msgstr "内部使用 :doc:`pgr_aStar` 算法" @@ -9077,7 +9077,7 @@ msgid "" "of your network to make repairs and/or report the problem back to your data " "vendor." msgstr "" -"因此，通过计算进入和退出每个节点的边数，我们可以识别 `source`节点和`sink`节" +"因此，通过计算进入和退出每个节点的边数，我们可以识别 `source` 节点和 `sink` 节" "点，以便您可以查看网络的这些区域以进行修复和/或将问题报告给数据供应商。" msgid "" @@ -9159,7 +9159,7 @@ msgid "" "The vertices table can be created with :doc:`pgr_createVerticesTable` or :" "doc:`pgr_createTopology`" msgstr "" -"顶点表可以使用 :doc:`pgr_createVerticesTable` 或 :doc:`pgr_createTopology`创" +"顶点表可以使用 :doc:`pgr_createVerticesTable` 或 :doc:`pgr_createTopology` 创" "建" msgid "" @@ -9258,13 +9258,13 @@ msgstr "``pgr_bdAstar`` — 使用双向 A* 算法的最短路径。" msgid "" "``pgr_bdAstar`` (`One to One`_) added ``start_vid`` and ``end_vid`` columns." -msgstr "``pgr_bdAstar`` (`一对一`_) 增加``start_vid`` 和 ``end_vid``列。" +msgstr "``pgr_bdAstar`` (`一对一`_) 增加 ``start_vid`` 和 ``end_vid`` 列。" msgid "``pgr_bdAstar`` (`One to Many`_) added ``end_vid`` column." -msgstr "``pgr_bdAstar`` (`一对多`_) 增加``end_vid`` 列。" +msgstr "``pgr_bdAstar`` (`一对多`_) 增加 ``end_vid`` 列。" msgid "``pgr_bdAstar`` (`Many to One`_) added ``start_vid`` column." -msgstr "``pgr_bdAstar`` (`多对一`_) 增加``start_vid``列。" +msgstr "``pgr_bdAstar`` (`多对一`_) 增加 ``start_vid`` 列。" msgid "``pgr_bdAstar`` (`Combinations`_)" msgstr "``pgr_bdAstar`` (`组合`_)" @@ -9520,7 +9520,7 @@ msgstr "pgr_bdDijkstraCostMatrix(`Edges SQL`_, **start vids**, [``directed``])" msgid "" "Symmetric cost matrix for vertices :math:`\\{5, 6, 10, 15\\}` on an " "**undirected** graph" -msgstr "在一个* *无向** 图上的顶点集合 :math:`\\{5, 6, 10, 15\\}` 的对称成本矩阵" +msgstr "在一个 **无向** 图上的顶点集合 :math:`\\{5, 6, 10, 15\\}` 的对称成本矩阵" msgid "Use with :doc:`pgr_TSP`." msgstr "与 :doc:`pgr_TSP` 一起使用。" @@ -10059,7 +10059,7 @@ msgid "" "Using a combinations table, equivalent to calculating result from vertices :" "math:`\\{5, 6\\}` to vertices :math:`\\{10, 15, 14\\}`." msgstr "" -"使用组合表，相当于计算从顶点 :math:`{5, 6\\}` 到顶点 :math:`{10, 15, 14\\}` 的" +"使用组合表，相当于计算从顶点 :math:`\\{5, 6\\}` 到顶点 :math:`{\\10, 15, 14\\}` 的" "结果。" msgid "https://www.boost.org/libs/graph/doc/boykov_kolmogorov_max_flow.html" @@ -10216,7 +10216,7 @@ msgid "pgr_chinesePostman(`Edges SQL`_)" msgstr "pgr_chinesePostman(`Edges SQL`_)" msgid "Returns set of |result-1-1-no-seq|" -msgstr "返回|result-1-1-no-seq|的集合" +msgstr "返回 |result-1-1-no-seq| 的集合" msgid "Returns set of ``(seq, node, edge, cost, agg_cost)``" msgstr "Returns set of ``(seq, node, edge, cost, agg_cost)``" @@ -10285,7 +10285,7 @@ msgid "pgr_connectedComponents(`Edges SQL`_)" msgstr "pgr_connectedComponents(`Edges SQL`_)" msgid "Returns set of |result-component-V|" -msgstr "返回集合|result-component-V|" +msgstr "返回集合 |result-component-V|" msgid "The connected components of the graph" msgstr "图的连通分量" @@ -10563,7 +10563,7 @@ msgid "" "The vertices table is a requirement of the :doc:`pgr_analyzeGraph` and the :" "doc:`pgr_analyzeOneWay` functions." msgstr "" -"顶点表是 :doc:`pgr_analyzeGraph` 和 :doc:`pgr_analyzeOneWay`函数的必需条件。" +"顶点表是 :doc:`pgr_analyzeGraph` 和 :doc:`pgr_analyzeOneWay` 函数的必需条件。" msgid "" "``integer`` Number of vertices in the edge_table that reference this vertex. " @@ -10655,7 +10655,7 @@ msgstr "创建路由拓扑" msgid "" "An alternate method to create a routing topology use :doc:" "`pgr_extractVertices`" -msgstr "使用 :doc:`pgr_extractVertices`创建路由拓扑的替代方法" +msgstr "使用 :doc:`pgr_extractVertices` 创建路由拓扑的替代方法" msgid "Make sure the database does not have the ``vertices_table``" msgstr "确保数据库没有 ``vertices_table``" @@ -10862,7 +10862,7 @@ msgstr ":doc:`topology-functions` 用于路由算法的拓扑概述。" msgid "" ":doc:`pgr_createTopology` ` to create a topology based " "on the geometry." -msgstr ":doc:`pgr_createTopology` `根据几何图形创建拓扑。" +msgstr ":doc:`pgr_createTopology` ` 根据几何图形创建拓扑。" msgid "" ":doc:`pgr_analyzeGraph` to analyze the edges and vertices of the edge table." @@ -11141,8 +11141,8 @@ msgid "" "pgr_degree and work with the ``in_edges`` and ``out_edges`` columns directly." msgstr "" "如果您已经使用 ``pgr_extractVertices`` 构建了一个顶点表，并且想要整个图的度而" -"不是子集，则可以放弃使用 pgr_ Degree 并直接使用 ``in_edges`` 和 ``out_edges``" -"列。" +"不是子集，则可以放弃使用 pgr_degree 并直接使用 ``in_edges`` 和 ``out_edges``" +" 列。" msgid ":doc:`pgr_extractVertices`" msgstr ":doc:`pgr_extractVertices`" @@ -11246,7 +11246,7 @@ msgstr "" "first_search>`__" msgid "``pgr_dijkstra``" -msgstr "`pgr_dijkstra```" +msgstr "`pgr_dijkstra``" #, fuzzy msgid "``pgr_dijkstra`` — Shortest path using Dijkstra algorithm." @@ -11306,7 +11306,7 @@ msgid "pgr_dijkstra(`Edges SQL`_, **start vids**, **end vid**, [``directed``])" msgstr "pgr_dijkstra(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" msgid "pgr_dijkstra(`Edges SQL`_, `Combinations SQL`_, [``directed``])" -msgstr "pgr_dijkstra(`Edges SQL`_,`Combinations SQL`_, [``directed``])" +msgstr "pgr_dijkstra(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgid "Breaking change on 3.5.0" msgstr "3.5.0 上的重大变更" @@ -11522,7 +11522,7 @@ msgstr "" "pgr_dijkstraCost(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" msgid "pgr_dijkstraCost(`Edges SQL`_, `Combinations SQL`_, [``directed``])" -msgstr "pgr_dijkstraCost(`Edges SQL`_,`Combinations SQL`_, [``directed``])" +msgstr "pgr_dijkstraCost(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgid "``pgr_dijkstraCostMatrix``" msgstr "``pgr_dijkstraCostMatrix``" @@ -11536,7 +11536,7 @@ msgid "Using Dijkstra algorithm, calculate and return a cost matrix." msgstr "使用 Dijkstra 算法，计算并返回成本矩阵。" msgid "pgr_dijkstraCostMatrix(`Edges SQL`_, **start vids**, [``directed``])" -msgstr "pgr_dijkstraCostMatrix(`Edges SQL`_, **start vids**, [``directed`])" +msgstr "pgr_dijkstraCostMatrix(`Edges SQL`_, **start vids**, [``directed``])" msgid "``pgr_dijkstraNear`` - Proposed" msgstr "``pgr_dijkstraNear`` - 拟议" @@ -11615,7 +11615,7 @@ msgstr "" "pgr_dijkstraNear(`Edges SQL`_, **start vids**, **end vids**, [**options B**])" msgid "pgr_dijkstraNear(`Edges SQL`_, `Combinations SQL`_, [**options B**])" -msgstr "pgr_dijkstraNear(`Edges SQL`_,`Combinations SQL`_, [**options B**])" +msgstr "pgr_dijkstraNear(`Edges SQL`_, `Combinations SQL`_, [**options B**])" msgid "**options A:** ``[directed, cap]``" msgstr "**选项A：** ``[directed, cap]``" @@ -11632,14 +11632,14 @@ msgid "**options:** ``[directed, cap]``" msgstr "**选项：** ``[directed, cap]``" msgid "Departing on car from vertex :math:`6` find the nearest subway station." -msgstr "从顶点 :math:`6`乘车出发，找到最近的地铁站。" +msgstr "从顶点 :math:`6` 乘车出发，找到最近的地铁站。" msgid "Using a **directed** graph for car routing." msgstr "使用 **有向** 图进行汽车路线规划。" msgid "" "The subway stations are on the following vertices :math:`\\{1, 10, 11\\}`" -msgstr "地铁站位于以下顶点上 :math:``{1, 10, 11\\}`" +msgstr "地铁站位于以下顶点上 :math:`\\{1, 10, 11\\}`" msgid "The defaults used:" msgstr "使用的默认值：" @@ -11661,10 +11661,10 @@ msgstr "" msgid "" "Departing on a car from a subway station find the nearest **two** stations " "to vertex :math:`2`" -msgstr "从地铁站开车出发，找到距离顶点 :math:`2`最近的 **两个** 车站" +msgstr "从地铁站开车出发，找到距离顶点 :math:`2` 最近的 **两个** 车站" msgid "On line `4`: using the positional parameter: `directed` set to ``true``" -msgstr "第`4`行：使用位置参数：`directed`设置为`true`" +msgstr "第 `4` 行：使用位置参数： `directed` 设置为`true`" msgid "In line `5`: using named parameter `cap => 2`" msgstr "第 `5` 行：使用命名参数 `cap => 2`" @@ -11680,7 +11680,7 @@ msgstr "" "pgr_dijkstraNear(`Edges SQL`_, **start vids**, **end vids**, [**options**])" msgid "**options:** ``[directed, cap, global]``" -msgstr "**选项：** ``[定向、上限、全局]```" +msgstr "**选项：** ``[定向、上限、全局]``" msgid "Find the best pedestrian connection between two lines of buses" msgstr "在两条公交线路之间寻找最佳的行人通道" @@ -11710,10 +11710,10 @@ msgstr "" msgid "" "Only `one` route is returned because `global` is ``true`` and `cap` is ``1``" -msgstr "只返回 `一条`路由，因为 `global` 为 `true` 且 `cap` 为 `1" +msgstr "只返回 `一条` 路由，因为 `global` 为 `true` 且 `cap` 为 ``1``" msgid "pgr_dijkstraNear(`Edges SQL`_, `Combinations SQL`_, [**options**])" -msgstr "pgr_dijkstraNear(`Edges SQL`_,`Combinations SQL`_, [**options**])" +msgstr "pgr_dijkstraNear(`Edges SQL`_, `Combinations SQL`_, [**options**])" msgid "" "Find the best car connection between all the stations of two subway lines" @@ -11845,7 +11845,7 @@ msgstr "" msgid "" "pgr_dijkstraNearCost(`Edges SQL`_, `Combinations SQL`_, [**options B**])" msgstr "" -"pgr_dijkstraNearCost(`Edges SQL`_,`Combinations SQL`_, [**options B**])" +"pgr_dijkstraNearCost(`Edges SQL`_, `Combinations SQL`_, [**options B**])" msgid "" "pgr_dijkstraNearCost(`Edges SQL`_, **start vid**, **end vids**, " @@ -11873,7 +11873,7 @@ msgstr "" "[**options**])" msgid "pgr_dijkstraNearCost(`Edges SQL`_, `Combinations SQL`_, [**options**])" -msgstr "pgr_dijkstraNearCost(`Edges SQL`_,`Combinations SQL`_, [**options**])" +msgstr "pgr_dijkstraNearCost(`Edges SQL`_, `Combinations SQL`_, [**options**])" msgid "" "lines `3~4` sets the start vertices to be from the fisrt subway line and the " @@ -11899,8 +11899,9 @@ msgid "" "the shortest path between :math:`vertex_i` and :math:`vertex_{i+1}` for all :" "math:`i < size\\_of(via\\;vertices)`." msgstr "" -"给定一个顶点列表和一个图，该函数等价于为所有 :math:`i < size\\of(via\\;" -"vertices)` 的 :math:`vertex_i` 和 :math:`vertex_{i+1}` 之间找到最短路径。" +"给定一个顶点列表和一个图，该函数等价于为所有 " +":math:`i < size\\_of(via\\;vertices)`" +"的 :math:`vertex_i` 和 :math:`vertex_{i+1}` 之间找到最短路径。" msgid "Route" msgstr "路线" @@ -11953,7 +11954,7 @@ msgstr "``route_agg_cost``" msgid "" "Total cost from ``start_vid`` of ``seq = 1`` to ``end_vid`` of the current " "``seq``." -msgstr "从 `seq = 1` 的 ``start_vid`` 到当前 `seq` 的 `` end_vid` 的总费用。" +msgstr "从 `seq = 1` 的 ``start_vid`` 到当前 `seq` 的 ``end_vid`` 的总费用。" msgid "" "All this examples are about the route that visits the vertices :math:`\\{5, " @@ -12215,13 +12216,13 @@ msgstr "" msgid "" "pgr_edgeDisjointPaths(`Edges SQL`_, `Combinations SQL`_, [``directed``])" -msgstr "pgr_edgeDisjointPaths(`Edges SQL`_,`Combinations SQL`_, [``directed`])" +msgstr "pgr_edgeDisjointPaths(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgid "Returns set of |result-disjoint|" msgstr "Returns set of |result-disjoint|" msgid "Returns set of |result-disjoint-1-1|" -msgstr "返回 |result-disjoint-1-1|的集合" +msgstr "返回 |result-disjoint-1-1| 的集合" msgid "Returns set of |result-disjoint-1-m|" msgstr "返回|result-disjoint-1-m|的集合" @@ -12275,7 +12276,7 @@ msgid "pgr_edmondsKarp(`Edges SQL`_, **start vids**, **end vids**)" msgstr "pgr_edmondsKarp(`Edges SQL`_, **start vids**, **end vids**)" msgid "pgr_edmondsKarp(`Edges SQL`_, `Combinations SQL`_)" -msgstr "pgr_edmondsKarp(`Edges SQL`_,`Combinations SQL`_)" +msgstr "pgr_edmondsKarp(`Edges SQL`_, `Combinations SQL`_)" msgid "https://www.boost.org/libs/graph/doc/edmonds_karp_max_flow.html" msgstr "https://www.boost.org/libs/graph/doc/edmonds_karp_max_flow.html" @@ -12284,7 +12285,7 @@ msgid "https://en.wikipedia.org/wiki/Edmonds%E2%80%93Karp_algorithm" msgstr "https://en.wikipedia.org/wiki/Edmonds%E2%80%93Karp_algorithm" msgid "``pgr_edwardMoore - Experimental``" -msgstr "``pgr_edwardMoore -实验``" +msgstr "``pgr_edwardMoore - 实验``" msgid "" "``pgr_edwardMoore`` — Returns the shortest path using Edward-Moore algorithm." @@ -12657,7 +12658,7 @@ msgid "Distance from point to edge." msgstr "点到边缘的距离。" msgid "``NULL`` when ``cap = 1`` on the `One point`_ signature" -msgstr "``NULL``当在 `一个点`_ 签名，``cap = 1`` 时" +msgstr "``NULL`` 当在 `一个点`_ 签名，``cap = 1`` 时" msgid "``POINT`` geometry" msgstr "``POINT`` 几何" @@ -12805,7 +12806,7 @@ msgid "" "``edge``: Contains the ``LINESTRING`` geometry of the **original point** to " "the closest point on on edge :math:`5` ``geom``" msgstr "" -"``edge``：包含了从 **原始点** 到边 :math:`5```geom`` 上最近点的 ``LINESTRING`` 几" +"``edge``：包含了从 **原始点** 到边 :math:`5` ``geom`` 上最近点的 ``LINESTRING`` 几" "何形状" msgid "At most two answers with all columns" @@ -12843,7 +12844,7 @@ msgid "" "shown on the PostgreSQL ``NOTICE``." msgstr "" "由于这是一次 **模拟** 执行，所有计算的代码都显示在 PostgreSQL 的 ``NOTICE``" -"中。" +" 中。" msgid "``dryrun => true``" msgstr "``dryrun => true``" @@ -12900,7 +12901,7 @@ msgid "For the **original point** ``POINT(2.9 1.8)``" msgstr "对于 **原始点** ``POINT(2.9 1.8)``" msgid "Edge :math:`5` is the closest edge to the **original point**" -msgstr "边 :math:`5`是距离 **原始点** 最近的边" +msgstr "边 :math:`5` 是距离 **原始点** 最近的边" msgid "" "``geom``: Contains the geometry of the **original point** ``POINT(2.9 1.8)``" @@ -13256,8 +13257,8 @@ msgid "" "It usees the Boost's implementation which runs in :math:`O(V E \\log V)` " "time," msgstr "" -"Johnson算法是计算图中每一对节点的最短路径成本之和的好选择，特别适用于 *稀疏图" -"*。它使用了Boost的实现，其运行时间为 :math:`O(V E \\log V)`，" +"Johnson算法是计算图中每一对节点的最短路径成本之和的好选择，特别适用于 *稀疏图*。" +"它使用了Boost的实现，其运行时间为 :math:`O(V E \\log V)`" msgid "pgr johnson(`Edges SQL`_, [``directed``])" msgstr "pgr johnson(`Edges SQL`_, [``directed``])" @@ -14035,7 +14036,7 @@ msgid "Running time: :math:`O( E*V * \\alpha(E,V))`" msgstr "运行时间： :math:`O( E*V * \\alpha(E,V))`" msgid ":math:`\\alpha(E,V)` is the inverse of the `Ackermann function`_." -msgstr ":math:`\\alpha(E,V)`与`Ackermann function`_ 相反。" +msgstr ":math:`\\alpha(E,V)` 与 `Ackermann function`_ 相反。" msgid "pgr_maxCardinalityMatch(`Edges SQL`_)" msgstr "pgr_maxCardinalityMatch(`Edges SQL`_)" @@ -14093,7 +14094,7 @@ msgid "" msgstr "当最大流量为 **0** 时则没有流量，返回 **0** 。" msgid "Uses the :doc:`pgr_pushRelabel ` algorithm." -msgstr "使用 :doc:`pgr_pushRelabel `算法。" +msgstr "使用 :doc:`pgr_pushRelabel ` 算法。" msgid "Running time: :math:`O( V ^ 3)`" msgstr "运行时间： :math:`O( V ^ 3)`" @@ -14154,7 +14155,7 @@ msgid "Running time: :math:`O(U * (E + V * logV))`" msgstr "运行时间： :math:`O(U * (E + V * logV))`" msgid "where :math:`U` is the value of the max flow." -msgstr "其中 :math:`U`是最大流量的值。" +msgstr "其中 :math:`U` 是最大流量的值。" msgid "" ":math:`U` is upper bound on number of iterations. In many real world cases " @@ -14495,9 +14496,9 @@ msgid "" "geometry. :doc:`pgr_analyzeGraph` to analyze the edges and vertices of the " "edge table." msgstr "" -":doc:`topology-functions`，用于概述路由算法的拓扑。 :doc:`pgr_analyzeOneWay` " +":doc:`topology-functions` 用于概述路由算法的拓扑。 :doc:`pgr_analyzeOneWay` " "分析边方向性的方法。 :doc:`pgr_createTopology` 根据几何图创建拓扑。 :doc:" -"`pgr_analyzeGraph`分析边表的边和顶点。" +"`pgr_analyzeGraph` 分析边表的边和顶点。" msgid "``pgr_pickDeliver`` - Experimental" msgstr "``pgr_pickDeliver`` - 实验" @@ -14947,7 +14948,7 @@ msgid "pgr_stoerWagner(`Edges SQL`_)" msgstr "pgr_stoerWagner(`Edges SQL`_)" msgid "Returns set of |result-mincut|" -msgstr "返回|result-mincut|的集合" +msgstr "返回 |result-mincut| 的集合" msgid "min cut of the main subgraph" msgstr "主子图的最小割" @@ -15289,7 +15290,7 @@ msgid "" "math:`i < size\\_of(via\\;vertices)` trying not to use restricted paths." msgstr "" "给定一个顶点列表和一个图，这个函数等同于在所有 :math:`i < size\\_of(via\\;" -"vertices)` 的情况下找到从 :math:`vertex_i` 到 :math:`vertex_{i+1}`的最短路径，" +"vertices)` 的情况下找到从 :math:`vertex_i` 到 :math:`vertex_{i+1}` 的最短路径，" "尽量避免使用受限路径。" msgid "The paths represents the sections of the route." @@ -15334,7 +15335,7 @@ msgid "" "\\rightarrow 1` is restricted." msgstr "" "检测哪些子路径通过了限制，本例中是针对 ``path_id = 5`` 从 ``6`` 到 ``3``，因为该" -"路径 :math:`15 \\rightarrow 1`受到限制。" +"路径 :math:`15 \\rightarrow 1` 受到限制。" msgid "Executes the :doc:`pgr_trsp` algorithm for the conflicting paths." msgstr "执行 :doc:`pgr_trsp` 针对冲突路径建议的算法。" @@ -15357,8 +15358,8 @@ msgid "" "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 "" -"第一步，进行 :doc:`pgr_dijkstraVia`不考虑在同一边上掉头。 但路径 :math:`16 " -"\\rightarrow 13`（第 4 行和第 5 行）受到限制，结果正在使用它。" +"第一步，进行 :doc:`pgr_dijkstraVia` 不考虑在同一边上掉头。 但路径 :math:`16 " +"\\rightarrow 13` （第 4 行和第 5 行）受到限制，结果正在使用它。" msgid "" "When executing the :doc:`pgr_trsp` algorithm for the conflicting path, there " @@ -15394,9 +15395,9 @@ msgid "" "`i < size\\_of(via\\;vertices)` trying not to use restricted paths." msgstr "" "给定一个图、对图边的一组限制、图边上的一组点和一个顶点列表，该函数相当于查" -"找 :math:`vertex_i` 和 :math:`vertex_{i+1}`之间的最短路径（其中 :math:" -"`vertex` 可以是图上的顶点或点） ）对于所有 :math:`i < size\\_of(via\\;" -"vertices)`尝试不使用受限路径的人。" +"找 :math:`vertex_i` 和 :math:`vertex_{i+1}` 之间的最短路径（其中 " +":math:`vertex` 可以是图上的顶点或点） 对于所有 " +":math:`i < size\\_of(via\\;vertices)` 尝试不使用受限路径的人。" msgid "is a sequence of paths" msgstr "是一系列路径" @@ -15476,7 +15477,7 @@ msgid "" "When ``start_vid``, ``end_vid`` and ``node`` columns have negative values, " "the identifier is for a Point." msgstr "" -"当 ``start_vid``、 ``end_vid`` 和``node`` 列具有负值时，该标识符用于Point。" +"当 ``start_vid``、 ``end_vid`` 和 ``node`` 列具有负值时，该标识符用于Point。" msgid "Use ``pgr_findCloseEdges`` for points on the fly" msgstr "对动态点使用 ``pgr_findCloseEdges``" @@ -15528,11 +15529,11 @@ msgid "" "\\rightarrow 16` is restricted." msgstr "" "检测哪些路径通过了限制，在本例中是针对从 ``-6`` 到 ``15`` 的 ``path_id = 1`` ，" -"因为路径 :math:`9 \\rightarrow 16`受到限制。" +"因为路径 :math:`9 \\rightarrow 16` 受到限制。" msgid "" "Executes the :ref:`TRSP-family:TRSP algorithm` for the conflicting paths." -msgstr "对冲突路径执行 :ref:`TRSP-family:TRSP 算法`。" +msgstr "对冲突路径执行 :ref:`TRSP-family:TRSP algorithm`。" msgid "" "From the :doc:`pgr_withPointsVia` result it removes the conflicting paths " @@ -16004,10 +16005,10 @@ msgid "" msgstr "返回值的形式为一组`(start_vid, end_vid, agg_cost)`。" msgid "The `agg_cost` in the non included values `(v, v)` is `0`" -msgstr "非包含值`(v, v)`中的`agg_cost`为`0`" +msgstr "非包含值 `(v, v)` 中的 `agg_cost` 为`0`" msgid "The `agg_cost` in the non included values `(u, v)` is :math:`\\infty`" -msgstr "非包含值 `(u, v)`中的 `agg_cost`为 :math:`\\infty`" +msgstr "非包含值 `(u, v)` 中的 `agg_cost` 为 :math:`\\infty`" msgid "" "If the values returned are stored in a table, the unique index would be the " @@ -16062,7 +16063,7 @@ msgid "**options:** ``[directed, driving_side]``" msgstr "**options:** ``[directed, driving_side]``" msgid "Returns set of |matrix-pid|" -msgstr "返回|matrix-pid|的集合" +msgstr "返回 |matrix-pid| 的集合" msgid "" "There is no **details** flag, unlike the other members of the withPoints " @@ -16147,7 +16148,7 @@ msgstr "``pgr_withPointsCostMatrix`` - 拟议" msgid "" "``pgr_withPointsCostMatrix`` - Calculates a cost matrix using :doc:" "`pgr_withPoints`." -msgstr "``pgr_withPointsCostMatrix`` - 使用 :doc:`pgr_withPoints`计算成本矩阵." +msgstr "``pgr_withPointsCostMatrix`` - 使用 :doc:`pgr_withPoints` 计算成本矩阵." msgid "" "pgr_withPointsCostMatrix(`Edges SQL`_, `Points SQL`_, **start vids**, " @@ -16189,10 +16190,10 @@ msgid "" "unnamed compulsory **driving side**." msgstr "" "签名更改： ``driving_side`` 参数从已命名的可选参数改为未命名的必选参数" -"**driving side**。" +" **driving side**。" msgid "``pgr_withPointsDD`` (`Single vertex`)" -msgstr "``pgr_withPointsDD``（`单顶点`）" +msgstr "``pgr_withPointsDD`` （`单顶点`）" msgid "Added ``depth``, ``pred`` and ``start_vid`` column." msgstr "添加了 ``depth``、``pred`` 和 ``start_vid`` 列。" @@ -16381,7 +16382,7 @@ msgstr "" msgid "" "Modifies the graph to include the points defined in the `Points SQL`_ and " "using Yen algorithm, finds the :math:`K` shortest paths." -msgstr "修改图以包括 `Points SQL`_ 中定义的点并使用 Yen 算法查找 :math:`K`最短路径。" +msgstr "修改图以包括 `Points SQL`_ 中定义的点并使用 Yen 算法查找 :math:`K` 最短路径。" msgid "" "pgr_withPointsKSP(`Edges SQL`_, `Points SQL`_, **start vid**, **end vid**, " @@ -17629,7 +17630,7 @@ msgid "" "`#1725 `__: Server crash " "on pgr_pickDeliver and pgr_vrpOneDepot on openbsd" msgstr "" -"`#1725 `___：openbsd上的" +"`#1725 `__：openbsd上的" "pgr_pickDeliver和pgr_vrpOneDepot服务器崩溃" msgid "" @@ -17683,7 +17684,7 @@ msgid "" "`#1616 `__: Path " "evaluation on C++ not updated before the results go back to C" msgstr "" -"`#1616 `___：C++ 上的路径" +"`#1616 `__：C++ 上的路径" "评估在结果返回 C 之前没有更新" msgid "" @@ -17840,7 +17841,7 @@ msgid "" "`#1004 `__: Contracts " "when forbidden vertices do not belong to graph" msgstr "" -"`#1004 `___：当禁止的顶点" +"`#1004 `__：当禁止的顶点" "不属于图时的收缩" msgid "" @@ -20031,7 +20032,7 @@ msgid "Point **2** located on edge ``(17, 16)``and ``16, 17``" msgstr "点 **2** 位于边 ``(17, 16)`` 和 ``16, 17``" msgid "Point **4** located on edge ``(3, 1)`` and ``(1, 3)``" -msgstr "点 **4** 位于边 ``(3, 1)`` 和``(1, 3)``" +msgstr "点 **4** 位于边 ``(3, 1)`` 和 ``(1, 3)``" msgid "Creating temporary vertices" msgstr "创建临时顶点" @@ -20103,7 +20104,7 @@ msgstr "翻转边并将它们添加到图中：" msgid "" "Edge ``(17, -2)`` becomes ``(-2, 16)`` with cost ``0.4`` and is added to the " "graph." -msgstr "边 ``(17, -2)``变为 ``(-2, 16)``，成本为``0.4`` ，并添加到图中。" +msgstr "边 ``(17, -2)`` 变为 ``(-2, 16)``，成本为``0.4`` ，并添加到图中。" msgid "" "Edge ``(-2, 16)`` becomes ``(17, -2)`` with cost ``0.6`` and is added to the " @@ -20136,12 +20137,12 @@ msgstr "边 ``(-2, 17)`` 被添加到图中。" msgid "" "Edge ``(16, -2)`` becomes ``(-2, 16)`` with cost ``0.4`` and is added to the " "graph." -msgstr "边 ``(16, -2)``变为 ``(-2, 16)`` ，成本为 0.4，并添加到图中。" +msgstr "边 ``(16, -2)`` 变为 ``(-2, 16)`` ，成本为 0.4，并添加到图中。" msgid "" "Edge ``(-2, 17)`` becomes ``(17, -2)`` with cost ``0.6`` and is added to the " "graph." -msgstr "边 ``(-2, 17)``变为``(17, -2)``，成本为``0.6`` ，并添加到图中。" +msgstr "边 ``(-2, 17)`` 变为``(17, -2)``，成本为 ``0.6`` ，并添加到图中。" msgid "withPoints - Family of functions" msgstr "withPoints - 函数族" From d711ec6b2b5e4a278ebe5a59f0f817a47192b049 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Fri, 27 Sep 2024 10:52:08 -0600 Subject: [PATCH 367/428] (CI/website) processing zh_Hans simplified chinese for the documentation --- .github/workflows/website.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml index e653cc8b5a..e92f43c232 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -83,7 +83,8 @@ jobs: export PATH=/usr/lib/postgresql/${PGVER}/bin:$PATH mkdir build cd build - cmake -DPOSTGRESQL_VERSION=${PGVER} -DDOC_USE_BOOTSTRAP=ON -DWITH_DOC=ON -DBUILD_DOXY=ON -DCMAKE_BUILD_TYPE=Release -DES=ON .. + cmake -DPOSTGRESQL_VERSION=${PGVER} -DDOC_USE_BOOTSTRAP=ON -DWITH_DOC=ON -DBUILD_DOXY=ON \ + -DCMAKE_BUILD_TYPE=Release -DES=ON -DZH_HANS=ON .. make doc - name: Initialize mandatory git config From c32df45cad6f30a8121620a2bf348bad6cd7e842 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Fri, 27 Sep 2024 11:55:59 -0600 Subject: [PATCH 368/428] Adding page history to zh-Hans --- doc/_static/page_history.js | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/doc/_static/page_history.js b/doc/_static/page_history.js index 90a26de1f0..c29bbf5d25 100644 --- a/doc/_static/page_history.js +++ b/doc/_static/page_history.js @@ -9,10 +9,13 @@ var unsuportedArr = ['2.6', '2.5', '2.4', '2.3', '2.2', '2.1', '2.0']; var titles = [ {k: 'en', v: ['Supported versions', 'Unsupported versions']}, {k: 'es', v: ['Versiones soportadas', 'Versiones no soportadas']}, + {k: 'zh-Hans', v: ['Supported versions', 'Unsupported versions']}, ]; var newpages = [ + {v: '3.7', pages: ['metrics-family', 'pgr_betweennessCentrality']}, + {v: '3.4', pages: ['TRSP-family', 'pgr_withPointsVia', 'pgr_trsp_withPoints', 'pgr_trspVia_withPoints', 'pgr_trspVia', 'pgr_hawickCircuits', 'pgr_findCloseEdges', 'pgr_cuthillMckeeOrdering', 'ordering-family', 'migration']}, @@ -356,20 +359,29 @@ function get_history(name, lang) { result += home + 'latest/' + validlang + '/' + data.file + '.html"> latest '; latest = versionsArr[0]; for (var i = 0; i < versionsArr.length; i++) { + validlang = lang; + if (versionsArr[i] < data.newat) break; + + /* for zh-Hans non translated versions use english */ + validlang = (lang == 'zh-Hans' && versionsArr[i] == '3.7')? lang : 'en'; + var link = home + versionsArr[i] + '/'; link += validlang + '/' + data.file + '.html">' + versionsArr[i] + ''; if (versionsArr[i] == latest) result += '(' + link + ') '; else result += link + ' '; } - result += home + 'main/' + validlang + '/' + data.file + '.html"> main '; - result += home + 'dev/' + validlang + '/' + data.file + '.html"> dev '; + result += home + 'main/' + lang + '/' + data.file + '.html"> main '; + result += home + 'dev/' + lang + '/' + data.file + '.html"> dev '; if (data.newat <= unsuportedArr[0]) { result += '
' + title.v[1] + ':'; for (var i = 0; i < unsuportedArr.length; i++) { + /* basically 2.x has only english */ + validlang = 'en'; + /* for spanish non translated versions use english */ - validlang = (lang == 'es' && unsuportedArr[i] == '2.0')? lang : 'en'; + validlang = (lang == 'es' && unsuportedArr[i] == '2.0')? 'es' : validlang; if (data.newat > unsuportedArr[i]) break; var link = home + unsuportedArr[i] + '/'; From 2bc5510a9db006b0641c3cfe83d760378d42a196 Mon Sep 17 00:00:00 2001 From: Ko Nagase Date: Thu, 15 Feb 2024 23:48:33 +0900 Subject: [PATCH 369/428] Adjust CI macos build and test --- .github/workflows/macos.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 2386333f2b..83fa72f54b 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -66,24 +66,20 @@ jobs: run: | cd build make -j - sudo make install + make install - name: Install pgTAP - if: false run: | git clone https://github.com/theory/pgtap.git pgTapExtension cd pgTapExtension make -j - sudo make install - sudo cpan TAP::Parser::SourceHandler::pgTAP - sudo find /usr/local -name pg_prove - sudo ln -s /usr/local/Cellar/perl/5.32.1_1/bin/pg_prove symlink it into /usr/local/bin + make install + cpan TAP::Parser::SourceHandler::pgTAP - name: Test - if: false run: | - export PATH=/usr/local/Cellar/perl/$(perl -e 'print substr($^V, 1)')/bin:$PATH - pg_ctl -D /usr/local/var/postgres start + export PATH=$(brew --prefix)/Cellar/perl/$(perl -e 'print substr($^V, 1)')/bin:$PATH + pg_ctl -D $(brew --prefix)/var/postgres start createuser -s postgres createdb ___pgr___test___ bash ./tools/testers/pg_prove_tests.sh postgres 5432 Release From 5e669873703e8a6ce53246d7422aa2ec461e12da Mon Sep 17 00:00:00 2001 From: Ko Nagase Date: Fri, 16 Feb 2024 00:09:34 +0900 Subject: [PATCH 370/428] Start postgresql by brew services in macos CI --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 83fa72f54b..ca45256249 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -79,7 +79,7 @@ jobs: - name: Test run: | export PATH=$(brew --prefix)/Cellar/perl/$(perl -e 'print substr($^V, 1)')/bin:$PATH - pg_ctl -D $(brew --prefix)/var/postgres start + brew services start postgresql createuser -s postgres createdb ___pgr___test___ bash ./tools/testers/pg_prove_tests.sh postgres 5432 Release From a0c6cb9e117e72cba991694328018f7c09b64a3a Mon Sep 17 00:00:00 2001 From: Ko Nagase Date: Fri, 16 Feb 2024 00:40:12 +0900 Subject: [PATCH 371/428] Use postgresql@14 as macos postgresql data location --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index ca45256249..f7a1641592 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -79,7 +79,7 @@ jobs: - name: Test run: | export PATH=$(brew --prefix)/Cellar/perl/$(perl -e 'print substr($^V, 1)')/bin:$PATH - brew services start postgresql + pg_ctl -D $(brew --prefix)/var/postgresql@14 start createuser -s postgres createdb ___pgr___test___ bash ./tools/testers/pg_prove_tests.sh postgres 5432 Release From daee09b838e9a58bc27b192a39d3704390e6a8e7 Mon Sep 17 00:00:00 2001 From: Ko Nagase Date: Fri, 16 Feb 2024 01:18:34 +0900 Subject: [PATCH 372/428] Add pg_prove symbolic link into homebrew bin --- .github/workflows/macos.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index f7a1641592..acff96fbaa 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -75,6 +75,7 @@ jobs: make -j make install cpan TAP::Parser::SourceHandler::pgTAP + ln -s $(find `brew --prefix` -name pg_prove) symlink it into $(brew --prefix)/bin - name: Test run: | From 01fd6dde17177054eb7b23f6af79e89e5ed665c9 Mon Sep 17 00:00:00 2001 From: Ko Nagase Date: Sun, 16 Jun 2024 18:40:01 +0900 Subject: [PATCH 373/428] Use only macos-latest (=macos-14) --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index acff96fbaa..95921e88fb 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -46,7 +46,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, macos-14] + os: [macos-latest] steps: - name: Checkout repository From 98bc041d387bdc03e9c88ac974243b0b53bf3793 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 9 Oct 2024 14:30:46 -0600 Subject: [PATCH 374/428] (lint) removing unused developer tool --- tools/developer/translate.sh | 51 ------------------------------------ 1 file changed, 51 deletions(-) delete mode 100755 tools/developer/translate.sh diff --git a/tools/developer/translate.sh b/tools/developer/translate.sh deleted file mode 100755 index 1d72664024..0000000000 --- a/tools/developer/translate.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash -# /*PGR-GNU***************************************************************** -# File: translate.sh -# Copyright (c) 2017 pgRouting developers -# Mail: project@pgrouting.org -# ------ -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# ********************************************************************PGR-GNU*/ -set -e - - -cd build/ -rm -rf ./* -cmake -DHTML=ON -DDOC_USE_BOOTSTRAP=ON .. -make doc -cd .. - - -#tools/testers/doc_queries_generator.pl -alg pickDeliver - -#tools/testers/doc_queries_generator.pl -documentation -cd build -#make doc -cd .. - - - -exit 0 - -gource --seconds-per-day 0.1 \ - --auto-skip-seconds 0.3 \ - --max-file-lag 0.1 \ - --logo doc/static/images/pgrouting-logo.png ---date-format "%B %Y" \ - --hide filenames,dirnames \ - --start-position 0.1 \ - --disable-auto-rotate \ - ----file-idle-time 10 \ - -f -1280x720 \ - --output-ppm-stream release-2.4.ppm - -ffmpeg -y -r 60 -f image2pipe -vcodec ppm -i release-2.4.ppm -vcodec libx264 -preset ultrafast -pix_fmt yuv420p -crf 1 -threads 0 -bf 0 release-2.4.mp4 From 19d7b8283c8e9d5bb67dffe251e9d34c8f1d32eb Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 9 Oct 2024 14:35:59 -0600 Subject: [PATCH 375/428] (build) postgres min version 13.0.0 & numeric value for postgres version --- CMakeLists.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f1b31e765e..45040f396b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,9 +61,9 @@ include(pgr/Configure) #--------------------------------------------- set(DOXYGEN_MINIMUM_VERSION "1.7") set(SPHINX_MINIMUM_VERSION "4.0") -set(POSTGRESQL_MINIMUM_VERSION "9.2.0") +set(POSTGRESQL_MINIMUM_VERSION "13.0.0") set(BOOST_MINIMUM_VERSION "1.56.0") -set(POSTGIS_MINIMUM_VERSION "2.0.0") +set(POSTGIS_MINIMUM_VERSION "3.0.0") message(STATUS "DOXYGEN_MINIMUM_VERSION=${DOXYGEN_MINIMUM_VERSION}") message(STATUS "SPHINX_MINIMUM_VERSION=${SPHINX_MINIMUM_VERSION}") @@ -172,25 +172,25 @@ endif() # PostgreSQL #--------------------------------------------- #--------------------------------------------- -find_package(PostgreSQL) -if(NOT POSTGRESQL_FOUND OR NOT POSTGRESQL_VERSION_STRING) - message(FATAL_ERROR "PostgreSQL not found - Please check your PostgreSQL installation.") -endif() +find_package(PostgreSQL "${POSTGRESQL_MINIMUM_VERSION}") +# removing type of release on postgres version # for XbetaY XalphaY XrcY -> X.Y string(REGEX REPLACE "([0-9]+)[beta|alpha|rc|devel].*" "\\1.0" POSTGRESQL_VERSION_STRING ${POSTGRESQL_VERSION_STRING}) message(STATUS "POSTGRESQL_VERSION_STRING=${POSTGRESQL_VERSION_STRING}") +# calcualte mayor.micro STRING(REGEX MATCH "([0-9]+)\.([0-9]+)" POSTGRESQL_VERSION "${POSTGRESQL_VERSION_STRING}") message(STATUS "POSTGRESQL_VERSION=${POSTGRESQL_VERSION}") -#for X.Y.Z -> XY Y<10 -string(REGEX REPLACE "^([0-9]+)\\.([0-9]+).*" "\\1\\2" PGSQL_VERSION ${POSTGRESQL_VERSION}) -#message(STATUS "PGSQL_VERSION=${PGSQL_VERSION}") +# split mayor minor +string(REPLACE "." ";" VERSION_LIST ${POSTGRESQL_VERSION}) +list(GET VERSION_LIST 0 POSTGRESQL_VERSION_MAYOR) +list(GET VERSION_LIST 1 POSTGRESQL_VERSION_MINOR) -if("${POSTGRESQL_VERSION}" VERSION_LESS "${POSTGRESQL_MINIMUM_VERSION}") - message(FATAL_ERROR " PostgreSQL ${POSTGRESQL_MINIMUM_VERSION} or greater is required.") -endif("${POSTGRESQL_VERSION}" VERSION_LESS "${POSTGRESQL_MINIMUM_VERSION}") +# calculate math value of postgres version +math(EXPR PGSQL_VERSION "${POSTGRESQL_VERSION_MAYOR} * 1000 + ${POSTGRESQL_VERSION_MINOR}") +message(STATUS "PGSQL_VERSION=${PGSQL_VERSION}") #------- include_directories(SYSTEM ${POSTGRESQL_INCLUDE_DIR}) From 9f2ec2b1163903feb92a47424be94a7963f590c8 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 9 Oct 2024 14:39:35 -0600 Subject: [PATCH 376/428] (winnie) removing unused parameter --- ci/winnie/build_pgrouting.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/winnie/build_pgrouting.sh b/ci/winnie/build_pgrouting.sh index db8a10a7c5..72ca229af9 100644 --- a/ci/winnie/build_pgrouting.sh +++ b/ci/winnie/build_pgrouting.sh @@ -162,7 +162,6 @@ cmake --version cmake -G "MSYS Makefiles" -DCMAKE_VERBOSE_MAKEFILE=ON \ -DBOOST_ROOT:PATH="${BOOSTROOT_PATH}" \ -DBoost_USE_STATIC_LIBS=ON \ - -DBoost_USE_MULTITHREADED=ON \ -DCMAKE_BUILD_TYPE=Release \ "../branches/${PGROUTING_VER}" From 48f3d850d2ecffd6fc5e8f9316067ee8254a29d2 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 9 Oct 2024 14:43:31 -0600 Subject: [PATCH 377/428] (CI) Adjusting workflows including ubuntu-22.04 --- .github/workflows/boost_version.yml | 9 +-------- .github/workflows/check-queries.yml | 5 ++++- .github/workflows/ubuntu.yml | 4 ++-- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/boost_version.yml b/.github/workflows/boost_version.yml index f1d2b748c9..c7a82760ba 100644 --- a/.github/workflows/boost_version.yml +++ b/.github/workflows/boost_version.yml @@ -95,11 +95,6 @@ jobs: sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ \ $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' - - name: Install python - uses: actions/setup-python@v4 - with: - python-version: '3.x' - - name: Install dependencies run: | sudo apt-get update @@ -111,8 +106,6 @@ jobs: postgresql-${PGVER}-postgis-${PGIS}-scripts \ postgresql-server-dev-${PGVER} - python -m pip install --upgrade pip - pip install -r requirements.txt wget https://sourceforge.net/projects/boost/files/boost/1.${{ matrix.boost_minor }}.0/boost_1_${{ matrix.boost_minor }}_0.tar.bz2 #wget https://dl.bintray.com/boostorg/release/1.${{ matrix.boost_minor }}.0/source/boost_1_${{ matrix.boost_minor }}_0.tar.bz2 sudo tar --bzip2 -xf boost_1_${{ matrix.boost_minor }}_0.tar.bz2 @@ -124,7 +117,7 @@ jobs: export PATH=/usr/lib/postgresql/${PGVER}/bin:$PATH mkdir build cd build - cmake -DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_BUILD_TYPE=Debug -DWITH_DOC=OFF .. + cmake -DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_BUILD_TYPE=Debug .. - name: Build run: | diff --git a/.github/workflows/check-queries.yml b/.github/workflows/check-queries.yml index efb1be5722..432d50cde5 100644 --- a/.github/workflows/check-queries.yml +++ b/.github/workflows/check-queries.yml @@ -111,7 +111,10 @@ jobs: - name: Test documentation queries are up to date run: | sudo -u postgres createdb -p ${PGPORT} pgr_test__db__test - TESTDIRS="version" + # queries that might change + # version: will catch the current version + # mincut: results change depending on boost + TESTDIRS="version mincut" for d in ${TESTDIRS} do ./tools/testers/doc_queries_generator.pl -pgver "${PGVER}" -pguser runner -documentation -alg "docqueries/${d}" diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 60711b3860..4a023e06d4 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -29,9 +29,9 @@ jobs: strategy: fail-fast: false matrix: - psql: [12,13,14,15,16] + psql: [13,14,15,16] postgis: [3] - os: [ubuntu-latest, ubuntu-20.04] + os: [ubuntu-latest, ubuntu-22.04, ubuntu-20.04] steps: - uses: actions/checkout@v4 From 46408bac3f8e7f11fd793e9b1bf5ab24448cbb50 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 9 Oct 2024 14:49:18 -0600 Subject: [PATCH 378/428] (doc) Stopping support of PostgreSQL 12 --- NEWS.md | 8 ++++++++ README.md | 1 + doc/src/release_notes.rst | 8 ++++++++ 3 files changed, 17 insertions(+) diff --git a/NEWS.md b/NEWS.md index 545ce4eda0..299c71e502 100644 --- a/NEWS.md +++ b/NEWS.md @@ -12,6 +12,14 @@ To see all issues & pull requests closed by this release see the [Git closed milestone for 3.7.0 ](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.7.0%22) +**Support** + +* [#2656](https://github.com/pgRouting/pgrouting/pull/2656) Stop support of + PostgreSQL12 on pgrouting v3.7 + + * Stopping support of PostgreSQL 12 + * CI does not test for PostgreSQL 12 + **New experimental functions** * Metrics diff --git a/README.md b/README.md index ce6604abc2..3b4a0e0b17 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,7 @@ The latest documentation: https://docs.pgrouting.org/latest * Compiling with Boost 1.56 up to Boost 1.74 requires C++ Compiler with C++03 or C++11 standard support * Compiling with Boost 1.75 requires C++ Compiler with C++14 standard support * Postgresql = Supported [version](https://www.postgresql.org/support/versioning/) by PostgreSQL + * Not supporting v12 & under * The Boost Graph Library (BGL) >= 1.56 * CMake >= 3.2 * 7.0 > Sphinx >= 4.0.0 diff --git a/doc/src/release_notes.rst b/doc/src/release_notes.rst index 453042d49c..7d61e54d11 100644 --- a/doc/src/release_notes.rst +++ b/doc/src/release_notes.rst @@ -43,6 +43,14 @@ To see all issues & pull requests closed by this release see the `Git closed milestone for 3.7.0 `__ +.. rubric:: Support + +* `#2656 `__ Stop support of + PostgreSQL12 on pgrouting v3.7 + + * Stopping support of PostgreSQL 12 + * CI does not test for PostgreSQL 12 + .. rubric:: New experimental functions * Metrics From dee50b47fcc1ddceb7515496f21840f4ff2a9e7c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2024 02:39:48 +0000 Subject: [PATCH 379/428] Update locale: commit 46408bac3f --- .../en/LC_MESSAGES/pgrouting_doc_strings.po | 19 +++++++++++++++---- locale/pot/pgrouting_doc_strings.pot | 17 +++++++++++++---- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po index bd57f93000..e091465ade 100644 --- a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-09-23 01:17+0000\n" +"POT-Creation-Date: 2024-10-10 02:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -4396,6 +4396,20 @@ msgid "" "`__" msgstr "" +msgid "Support" +msgstr "" + +msgid "" +"`#2656 `__ Stop support" +" of PostgreSQL12 on pgrouting v3.7" +msgstr "" + +msgid "Stopping support of PostgreSQL 12" +msgstr "" + +msgid "CI does not test for PostgreSQL 12" +msgstr "" + msgid "New experimental functions" msgstr "" @@ -8221,9 +8235,6 @@ msgstr "" msgid "Renamed from version 1.x" msgstr "" -msgid "Support" -msgstr "" - msgid "Returns the polygon part of an alpha shape." msgstr "" diff --git a/locale/pot/pgrouting_doc_strings.pot b/locale/pot/pgrouting_doc_strings.pot index c5423ab80a..9ea59504b1 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-09-23 01:17+0000\n" +"POT-Creation-Date: 2024-10-10 02:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3943,6 +3943,18 @@ msgstr "" msgid "To see all issues & pull requests closed by this release see the `Git closed milestone for 3.7.0 `__" msgstr "" +msgid "Support" +msgstr "" + +msgid "`#2656 `__ Stop support of PostgreSQL12 on pgrouting v3.7" +msgstr "" + +msgid "Stopping support of PostgreSQL 12" +msgstr "" + +msgid "CI does not test for PostgreSQL 12" +msgstr "" + msgid "New experimental functions" msgstr "" @@ -7201,9 +7213,6 @@ msgstr "" msgid "Renamed from version 1.x" msgstr "" -msgid "Support" -msgstr "" - msgid "Returns the polygon part of an alpha shape." msgstr "" From 0b3dcd69ff59e54f496b6813b4e1c65d39a583c7 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 9 Oct 2024 19:17:32 -0600 Subject: [PATCH 380/428] (doc) updating 3.6.3 release notes and NEWS --- NEWS.md | 36 ++++++++++++++++++++++++++++++++++++ doc/src/release_notes.rst | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/NEWS.md b/NEWS.md index 299c71e502..feb7c7789b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -70,6 +70,42 @@ milestone for 3.7.0 ## pgRouting 3.6 +### pgRouting 3.6.3 Release Notes + +To see all issues & pull requests closed by this release see the [Git closed +milestone for 3.6.3 +](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.6.3%22) + +**Build** + +* Explicit minimum requirements: + + * postgres 11.0.0 + * postgis 3.0.0 + +**Code fixes** + +* Fix warnings from cpplint. +* Fix warnings from clang 18. + +**CI tests** + +* Add a clang tidy test on changed files. +* Update test not done on versions: 3.0.1, 3.0.2, 3.0.3, 3.0.4, 3.1.0, 3.1.1, + 3.1.2 + +**Documentation** + +* Results of documentation queries adujsted to boost 1.83.0 version: + + * pgr_edgeDisjointPaths + * pgr_stoerWagner + +**pgtap tests** + +* bug fixes + + ### pgRouting 3.6.2 Release Notes To see all issues & pull requests closed by this release see the [Git closed diff --git a/doc/src/release_notes.rst b/doc/src/release_notes.rst index 7d61e54d11..ff53e86be6 100644 --- a/doc/src/release_notes.rst +++ b/doc/src/release_notes.rst @@ -102,6 +102,43 @@ pgRouting 3.6 :local: :depth: 1 +pgRouting 3.6.3 Release Notes +------------------------------------------------------------------------------- + +To see all issues & pull requests closed by this release see the `Git closed +milestone for 3.6.3 +`__ + +.. rubric:: Build + +* Explicit minimum requirements: + + * postgres 11.0.0 + * postgis 3.0.0 + +.. rubric:: Code fixes + +* Fix warnings from cpplint. +* Fix warnings from clang 18. + +.. rubric:: CI tests + +* Add a clang tidy test on changed files. +* Update test not done on versions: 3.0.1, 3.0.2, 3.0.3, 3.0.4, 3.1.0, 3.1.1, + 3.1.2 + +.. rubric:: Documentation + +* Results of documentation queries adujsted to boost 1.83.0 version: + + * pgr_edgeDisjointPaths + * pgr_stoerWagner + +.. rubric:: pgtap tests + +* bug fixes + + pgRouting 3.6.2 Release Notes ------------------------------------------------------------------------------- From abea1a2d8eaf9f30bc3c8d86eb1d0d7e2575f9b5 Mon Sep 17 00:00:00 2001 From: vslashg Date: Tue, 3 Oct 2023 21:01:23 +0000 Subject: [PATCH 381/428] Remove the Boost_VERSION_MACRO define from C++ Boost provides a header, , which provides a BOOST_VERSION macro with the same semantics. This change simplifies the build process and makes this project easier to incorporate in other build systems. --- CMakeLists.txt | 1 - include/coloring/pgr_edgeColoring.hpp | 3 ++- include/tsp/tsp.hpp | 3 ++- src/alpha_shape/pgr_alphaShape.cpp | 3 ++- src/tsp/tsp.cpp | 3 ++- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 45040f396b..b50b854ea5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,7 +87,6 @@ find_package(Boost ${BOOST_MINIMUM_VERSION} REQUIRED) if (NOT Boost_VERSION_MACRO) set(Boost_VERSION_MACRO ${Boost_VERSION}) endif() -add_definitions(-DBoost_VERSION_MACRO=${Boost_VERSION_MACRO}) set(BOOST_VERSION "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}") include(CheckCCompilerFlag) diff --git a/include/coloring/pgr_edgeColoring.hpp b/include/coloring/pgr_edgeColoring.hpp index eeb6a53f15..f697ea967a 100644 --- a/include/coloring/pgr_edgeColoring.hpp +++ b/include/coloring/pgr_edgeColoring.hpp @@ -33,6 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include +#include #include "cpp_common/edge_t.hpp" #include "c_types/ii_t_rt.h" @@ -59,7 +60,7 @@ class Pgr_edgeColoring : public Pgr_messages { explicit Pgr_edgeColoring(const std::vector&); Pgr_edgeColoring() = delete; -#if Boost_VERSION_MACRO >= 106800 +#if BOOST_VERSION >= 106800 friend std::ostream& operator<<(std::ostream &, const Pgr_edgeColoring&); #endif diff --git a/include/tsp/tsp.hpp b/include/tsp/tsp.hpp index ef9e549c33..8933af6b77 100644 --- a/include/tsp/tsp.hpp +++ b/include/tsp/tsp.hpp @@ -37,6 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include +#include #include "c_types/iid_t_rt.h" #include "cpp_common/coordinate_t.hpp" @@ -77,7 +78,7 @@ class TSP : public Pgr_messages { explicit TSP(const std::vector&); TSP() = delete; -#if Boost_VERSION_MACRO >= 106800 +#if BOOST_VERSION >= 106800 friend std::ostream& operator<<(std::ostream &, const TSP&); #endif bool has_vertex(int64_t id) const; diff --git a/src/alpha_shape/pgr_alphaShape.cpp b/src/alpha_shape/pgr_alphaShape.cpp index b6bad91ee2..adbe522ea0 100644 --- a/src/alpha_shape/pgr_alphaShape.cpp +++ b/src/alpha_shape/pgr_alphaShape.cpp @@ -41,7 +41,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include -#if Boost_VERSION_MACRO >= 107500 +#include +#if BOOST_VERSION >= 107500 # include #else # include diff --git a/src/tsp/tsp.cpp b/src/tsp/tsp.cpp index 67f7258a85..e969897135 100644 --- a/src/tsp/tsp.cpp +++ b/src/tsp/tsp.cpp @@ -37,6 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include +#include #include "cpp_common/identifiers.hpp" #include "cpp_common/pgr_messages.hpp" @@ -503,7 +504,7 @@ TSP::get_edge_id(E e) const { -#if Boost_VERSION_MACRO >= 106800 +#if BOOST_VERSION >= 106800 std::ostream& operator<<(std::ostream &log, const TSP& data) { log << "Number of Vertices is:" << num_vertices(data.graph) << "\n"; log << "Number of Edges is:" << num_edges(data.graph) << "\n"; From c9d5f5eae1aff4ca0ed07c8c7f6153e948cb4b22 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2024 03:40:49 +0000 Subject: [PATCH 382/428] Update locale: commit abea1a2d8e --- .../en/LC_MESSAGES/pgrouting_doc_strings.po | 77 +++++++++++++++---- locale/pot/pgrouting_doc_strings.pot | 71 +++++++++++++---- 2 files changed, 116 insertions(+), 32 deletions(-) diff --git a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po index e091465ade..cf1cce3c88 100644 --- a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-10-10 02:39+0000\n" +"POT-Creation-Date: 2024-10-10 03:40+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -15597,6 +15597,66 @@ msgstr "" msgid "pgRouting 3.6" msgstr "" +msgid "pgRouting 3.6.3 Release Notes" +msgstr "" + +#, python-format +msgid "" +"To see all issues & pull requests closed by this release see the `Git " +"closed milestone for 3.6.3 " +"`__" +msgstr "" + +msgid "Build" +msgstr "" + +msgid "Explicit minimum requirements:" +msgstr "" + +msgid "postgres 11.0.0" +msgstr "" + +msgid "postgis 3.0.0" +msgstr "" + +msgid "Code fixes" +msgstr "" + +msgid "Fix warnings from cpplint." +msgstr "" + +msgid "Fix warnings from clang 18." +msgstr "" + +msgid "CI tests" +msgstr "" + +msgid "Add a clang tidy test on changed files." +msgstr "" + +msgid "" +"Update test not done on versions: 3.0.1, 3.0.2, 3.0.3, 3.0.4, 3.1.0, " +"3.1.1, 3.1.2" +msgstr "" + +msgid "Documentation" +msgstr "" + +msgid "Results of documentation queries adujsted to boost 1.83.0 version:" +msgstr "" + +msgid "pgr_edgeDisjointPaths" +msgstr "" + +msgid "pgr_stoerWagner" +msgstr "" + +msgid "pgtap tests" +msgstr "" + +msgid "bug fixes" +msgstr "" + msgid "pgRouting 3.6.2 Release Notes" msgstr "" @@ -15613,9 +15673,6 @@ msgstr "" msgid "The upgrade was failing for same minor" msgstr "" -msgid "Code fixes" -msgstr "" - msgid "Fix warnings from cpplint" msgstr "" @@ -15742,9 +15799,6 @@ msgid "" " simplification." msgstr "" -msgid "Documentation" -msgstr "" - msgid "" "`#2490 `__ Automatic " "page history links." @@ -15813,9 +15867,6 @@ msgid "" "wildcards on SQL" msgstr "" -msgid "pgtap tests" -msgstr "" - msgid "" "`#2559 `__ pgtap test" " using sampledata" @@ -16273,9 +16324,6 @@ msgid "" " on Github." msgstr "" -msgid "Build" -msgstr "" - msgid "" "`#1850 `__: Change " "Boost min version to 1.56" @@ -16847,9 +16895,6 @@ msgstr "" msgid "pgr_turnRestrictedPath" msgstr "" -msgid "pgr_stoerWagner" -msgstr "" - msgid "pgr_dagShortestpath" msgstr "" diff --git a/locale/pot/pgrouting_doc_strings.pot b/locale/pot/pgrouting_doc_strings.pot index 9ea59504b1..e1b0f03a2f 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-10-10 02:39+0000\n" +"POT-Creation-Date: 2024-10-10 03:40+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -13249,6 +13249,60 @@ msgstr "" msgid "pgRouting 3.6" msgstr "" +msgid "pgRouting 3.6.3 Release Notes" +msgstr "" + +msgid "To see all issues & pull requests closed by this release see the `Git closed milestone for 3.6.3 `__" +msgstr "" + +msgid "Build" +msgstr "" + +msgid "Explicit minimum requirements:" +msgstr "" + +msgid "postgres 11.0.0" +msgstr "" + +msgid "postgis 3.0.0" +msgstr "" + +msgid "Code fixes" +msgstr "" + +msgid "Fix warnings from cpplint." +msgstr "" + +msgid "Fix warnings from clang 18." +msgstr "" + +msgid "CI tests" +msgstr "" + +msgid "Add a clang tidy test on changed files." +msgstr "" + +msgid "Update test not done on versions: 3.0.1, 3.0.2, 3.0.3, 3.0.4, 3.1.0, 3.1.1, 3.1.2" +msgstr "" + +msgid "Documentation" +msgstr "" + +msgid "Results of documentation queries adujsted to boost 1.83.0 version:" +msgstr "" + +msgid "pgr_edgeDisjointPaths" +msgstr "" + +msgid "pgr_stoerWagner" +msgstr "" + +msgid "pgtap tests" +msgstr "" + +msgid "bug fixes" +msgstr "" + msgid "pgRouting 3.6.2 Release Notes" msgstr "" @@ -13261,9 +13315,6 @@ msgstr "" msgid "The upgrade was failing for same minor" msgstr "" -msgid "Code fixes" -msgstr "" - msgid "Fix warnings from cpplint" msgstr "" @@ -13354,9 +13405,6 @@ msgstr "" msgid "`#2522 `__ bdAstar code simplification." msgstr "" -msgid "Documentation" -msgstr "" - msgid "`#2490 `__ Automatic page history links." msgstr "" @@ -13411,9 +13459,6 @@ msgstr "" msgid "`#2561 `__ Not use wildcards on SQL" msgstr "" -msgid "pgtap tests" -msgstr "" - msgid "`#2559 `__ pgtap test using sampledata" msgstr "" @@ -13771,9 +13816,6 @@ msgstr "" msgid "To see all issues & pull requests closed by this release see the `Git closed milestone for 3.2.0 `_ on Github." msgstr "" -msgid "Build" -msgstr "" - msgid "`#1850 `__: Change Boost min version to 1.56" msgstr "" @@ -14245,9 +14287,6 @@ msgstr "" msgid "pgr_turnRestrictedPath" msgstr "" -msgid "pgr_stoerWagner" -msgstr "" - msgid "pgr_dagShortestpath" msgstr "" From b7deb665b2ebd5b5267e31147e35c65ce59109dd Mon Sep 17 00:00:00 2001 From: Weblate Date: Thu, 10 Oct 2024 19:40:49 +0000 Subject: [PATCH 383/428] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Co-authored-by: Weblate Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/ Translation: pgRouting/pgRouting --- .../de/LC_MESSAGES/pgrouting_doc_strings.po | 93 ++- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 577 +++++++++-------- .../ja/LC_MESSAGES/pgrouting_doc_strings.po | 96 ++- .../ko/LC_MESSAGES/pgrouting_doc_strings.po | 97 ++- .../LC_MESSAGES/pgrouting_doc_strings.po | 578 +++++++++++------- 5 files changed, 897 insertions(+), 544 deletions(-) diff --git a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po index 33f5f49b0a..82f6b47678 100644 --- a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-09-23 01:17+0000\n" +"POT-Creation-Date: 2024-10-10 03:40+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -4384,6 +4384,20 @@ msgid "" "utf8=%E2%9C%93&q=milestone%3A%22Release%203.7.0%22>`__" msgstr "" +msgid "Support" +msgstr "" + +msgid "" +"`#2656 `__ Stop support of " +"PostgreSQL12 on pgrouting v3.7" +msgstr "" + +msgid "Stopping support of PostgreSQL 12" +msgstr "" + +msgid "CI does not test for PostgreSQL 12" +msgstr "" + msgid "New experimental functions" msgstr "" @@ -8192,9 +8206,6 @@ msgstr "" msgid "Renamed from version 1.x" msgstr "" -msgid "Support" -msgstr "" - msgid "Returns the polygon part of an alpha shape." msgstr "" @@ -15534,6 +15545,65 @@ msgstr "" msgid "pgRouting 3.6" msgstr "" +msgid "pgRouting 3.6.3 Release Notes" +msgstr "" + +msgid "" +"To see all issues & pull requests closed by this release see the `Git closed " +"milestone for 3.6.3 `__" +msgstr "" + +msgid "Build" +msgstr "" + +msgid "Explicit minimum requirements:" +msgstr "" + +msgid "postgres 11.0.0" +msgstr "" + +msgid "postgis 3.0.0" +msgstr "" + +msgid "Code fixes" +msgstr "" + +msgid "Fix warnings from cpplint." +msgstr "" + +msgid "Fix warnings from clang 18." +msgstr "" + +msgid "CI tests" +msgstr "" + +msgid "Add a clang tidy test on changed files." +msgstr "" + +msgid "" +"Update test not done on versions: 3.0.1, 3.0.2, 3.0.3, 3.0.4, 3.1.0, 3.1.1, " +"3.1.2" +msgstr "" + +msgid "Documentation" +msgstr "" + +msgid "Results of documentation queries adujsted to boost 1.83.0 version:" +msgstr "" + +msgid "pgr_edgeDisjointPaths" +msgstr "" + +msgid "pgr_stoerWagner" +msgstr "" + +msgid "pgtap tests" +msgstr "" + +msgid "bug fixes" +msgstr "" + msgid "pgRouting 3.6.2 Release Notes" msgstr "" @@ -15549,9 +15619,6 @@ msgstr "" msgid "The upgrade was failing for same minor" msgstr "" -msgid "Code fixes" -msgstr "" - msgid "Fix warnings from cpplint" msgstr "" @@ -15675,9 +15742,6 @@ msgid "" "simplification." msgstr "" -msgid "Documentation" -msgstr "" - msgid "" "`#2490 `__ Automatic page " "history links." @@ -15744,9 +15808,6 @@ msgid "" "wildcards on SQL" msgstr "" -msgid "pgtap tests" -msgstr "" - msgid "" "`#2559 `__ pgtap test " "using sampledata" @@ -16186,9 +16247,6 @@ msgid "" "utf8=%E2%9C%93&q=milestone%3A%22Release%203.2.0%22>`_ on Github." msgstr "" -msgid "Build" -msgstr "" - msgid "" "`#1850 `__: Change Boost " "min version to 1.56" @@ -16737,9 +16795,6 @@ msgstr "" msgid "pgr_turnRestrictedPath" msgstr "" -msgid "pgr_stoerWagner" -msgstr "" - msgid "pgr_dagShortestpath" msgstr "" diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 194ffbd28b..535d341828 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-08-26 11:20+0000\n" +"POT-Creation-Date: 2024-10-10 03:40+0000\n" "PO-Revision-Date: 2024-09-23 19:49+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish `__" -msgid "" -"`Wikipedia: Graph Coloring `__" -msgstr "" -"`Wikipedia: Coloración de grafos `__" - msgid "Components - Family of functions" msgstr "Componentes - Familia de funciones" @@ -4502,14 +4496,11 @@ msgstr "" "Cuando el flujo máximo es 0 entonces no hay flujo, se devolverá: **EMPTY " "SET**." -msgid "There is no flow when a **source** is the same as a **target**." -msgstr "" -"No hay ningún flujo cuando el **orígen** es el mismo que el **destino**." +msgid "There is no flow when source has the same vaule as target." +msgstr "No hay flujo cuando el origen tiene el mismo valor que el destino." -msgid "Any duplicated value in the source(s) or target(s) are ignored." -msgstr "" -"Cualquier valor duplicado en el/los orígen(es) o en el/los destino(s) será " -"ignorado." +msgid "Any duplicated values in source or target are ignored." +msgstr "Los valores duplicados en origen o destino se ignoran." msgid "Calculates the flow/residual capacity for each edge. In the output" msgstr "Calcula la capacidad de flujo/residuo para cada arista. En la salida" @@ -4517,12 +4508,14 @@ msgstr "Calcula la capacidad de flujo/residuo para cada arista. En la salida" msgid "Edges with zero flow are omitted." msgstr "Se omiten las aristas con flujo cero." -msgid "" -"Creates a **super source** and edges to all the source(s), and a **super " -"target** and the edges from all the targets(s)." -msgstr "" -"Crea una **súper origen**, con aristas para todos las fuentes(es), y un " -"**súper destino** con aristas para todos los destino(s)." +msgid "Creates" +msgstr "Crea" + +msgid "a **super source** and edges from it to all the sources," +msgstr "una **super fuente** y aristas desde ella a todas las fuentes," + +msgid "a **super target** and edges from it to all the targetss." +msgstr "un **super objetivo** y aristas desde él a todos los objetivos." msgid "" "The maximum flow through the graph is guaranteed to be the value returned " @@ -4945,6 +4938,25 @@ msgstr "" "versión, consulte la `meta cerrada 3.7.0 `_" +msgid "Support" +msgstr "Soporte" + +#, fuzzy +msgid "" +"`#2656 `__ Stop support of " +"PostgreSQL12 on pgrouting v3.7" +msgstr "" +"`#2607 `__ Leer datos " +"postgresql en C++" + +#, fuzzy +msgid "Stopping support of PostgreSQL 12" +msgstr "A partir de PostgreSQL 12::" + +#, fuzzy +msgid "CI does not test for PostgreSQL 12" +msgstr "Funciona para postgreSQL 10" + msgid "New experimental functions" msgstr "Nuevas funciones experimentales" @@ -7439,13 +7451,13 @@ msgstr "Necesita una `SQL de combinaciones`_" msgid "" "There are several kinds of valid inner queries and also the columns returned " "are depending of the function. Which kind of inner query will depend on the " -"function(s) requirements. To simplify variety of types, **ANY-INTEGER** and " -"**ANY-NUMERICAL** is used." +"function's requirements. To simplify the variety of types, **ANY-INTEGER** " +"and **ANY-NUMERICAL** is used." msgstr "" -"Hay varios tipos de consultas internas válidas y también las columnas " +"Existen varios tipos de consultas internas válidas y también las columnas " "devueltas dependen de la función. El tipo de consulta interna dependerá de " -"los requisitos de las funcion(es). Para simplificar la variedad de tipos, se " -"utiliza **ENTEROS** y **FLOTANTES**." +"los requisitos de la función. Para simplificar la variedad de tipos, se " +"utiliza **ANY-INTEGER** y **ANY-NUMERICAL**." msgid "Edges SQL for" msgstr "SQL de aristas para" @@ -7939,9 +7951,6 @@ msgstr "" "La última versión de pgRouting se puede encontrar en https://github.com/" "pgRouting/pgrouting/releases/latest" -msgid "wget" -msgstr "wget" - msgid "To download this release:" msgstr "Para descargar esta versión:" @@ -9254,10 +9263,10 @@ msgid "pgr_aStarCost" msgstr "pgr_aStarCost" msgid "" -"``pgr_aStarCost`` - Total cost of the shortest path(s) using the A* " -"algorithm." +"``pgr_aStarCost`` - Total cost of the shortest path using the A* algorithm." msgstr "" -"``pgr_aStarCost`` —Costo total de la ruta más corta usando el algoritmo :A*." +"``pgr_aStarCost`` - Coste total del camino más corto utilizando el algoritmo " +"A*." msgid "``pgr_aStarCost`` (`Combinations`_)" msgstr "``pgr_aStarCost`` (`Combinaciones`_)" @@ -9266,10 +9275,10 @@ msgid "New **proposed** function" msgstr "Nueva función **propuesta**" msgid "" -"The ``pgr_aStarCost`` function sumarizes of the cost of the shortest path(s) " +"The ``pgr_aStarCost`` function sumarizes of the cost of the shortest path " "using the A* algorithm." msgstr "" -"La función ``pgr_aStarCost`` sumarisa el costo de la ruta más corta usando " +"La función ``pgr_aStarCost`` suma el coste del camino más corto utilizando " "el algoritmo A*." msgid "" @@ -9397,9 +9406,6 @@ msgstr "Soporte para devolver múltiples anillos exteriores/interiores" msgid "Renamed from version 1.x" msgstr "Renombrado desde la versión 1.x" -msgid "Support" -msgstr "Soporte" - msgid "Returns the polygon part of an alpha shape." msgstr "Devuelve la parte poligonal de una forma alfa." @@ -10129,21 +10135,21 @@ msgid "pgr_bdAstarCost" msgstr "pgr_bdAstarCost" msgid "" -"``pgr_bdAstarCost`` - Total cost of the shortest path(s) using the " +"``pgr_bdAstarCost`` - Total cost of the shortest path using the " "bidirectional A* algorithm." msgstr "" -"``pgr_bdAstarCost`` - Devuelve el costo agregado de la ruta más corta usando " -"el algoritmo bidireccional A*." +"``pgr_bdAstarCost`` - Coste total del camino más corto utilizando el " +"algoritmo bidireccional A*." msgid "``pgr_bdAstarCost`` (`Combinations`_)" msgstr "``pgr_bdAstarCost`` (`Combinaciones`_)" msgid "" -"The ``pgr_bdAstarCost`` function sumarizes of the cost of the shortest " -"path(s) using the bidirectional A* algorithm." +"The ``pgr_bdAstarCost`` function sumarizes of the cost of the shortest path " +"using the bidirectional A* algorithm." msgstr "" -"La función ``pgr_bdAstarCost`` Sumariza el costo del camino más corto " -"utilizando el algoritmo bidireccional A*." +"La función ``pgr_bdAstarCost`` suma el coste del camino más corto utilizando " +"el algoritmo bidireccional A*." msgid "" "pgr_bdAstarCost(`Edges SQL`_, **start vid**, **end vid**, [**options**])" @@ -10189,11 +10195,11 @@ msgid "``pgr_bdDijkstra``" msgstr "``pgr_bdDijkstra``" msgid "" -"``pgr_bdDijkstra`` — Returns the shortest path(s) using Bidirectional " -"Dijkstra algorithm." +"``pgr_bdDijkstra`` — Returns the shortest path using Bidirectional Dijkstra " +"algorithm." msgstr "" -"``pgr_bdDijkstra`` — Devuelve la(s) rutas más cortas mediante el algoritmo " -"Bidirectional Dijkstra." +"``pgr_bdDijkstra`` - Devuelve el camino más corto utilizando el algoritmo " +"Bidireccional de Dijkstra." msgid "pgr_bdDijkstra(`Combinations`_)" msgstr "pgr_bdDijkstra(`Combinaciones`_)" @@ -10236,7 +10242,7 @@ msgid "" msgstr "" "pgr_bdDijkstra(`SQL de aristas`_, **salidas**, **destinos**, [``directed``])" -msgid "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_ , [``directed``])" +msgid "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgstr "" "pgr_bdDijkstra(`SQL de aristas`_, `SQL de combinaciones`_, [``directed``])" @@ -10275,10 +10281,6 @@ msgstr "" "De los vértices :math:`\\{6, 1\\}` a los vértices :math:`\\{10, 17\\}` en un " "grafo **no dirigido**" -msgid "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_, [``directed``])" -msgstr "" -"pgr_bdDijkstra(`SQL de aristas`_, `SQL de combinaciones`_, [``directed``])" - msgid "Using a combinations table on an **undirected** graph" msgstr "Usando una tabla de combinaciones en un grafo **no dirigido**" @@ -10296,11 +10298,11 @@ msgid "``pgr_bdDijkstraCost``" msgstr "``pgr_bdDijkstraCost``" msgid "" -"``pgr_bdDijkstraCost`` — Returns the shortest path(s)'s cost using " +"``pgr_bdDijkstraCost`` — Returns the shortest path's cost using " "Bidirectional Dijkstra algorithm." msgstr "" -"``pgr_bdDijkstraCost`` — Devuelve la ruta(s) más corta utilizando el " -"algoritmo de Dijkstra Bidireccional." +"``pgr_bdDijkstraCost`` - Devuelve el coste del camino más corto utilizando " +"el algoritmo Bidireccional de Dijkstra." msgid "``pgr_bdDijkstraCost`` (`Combinations`_)" msgstr "``pgr_bdDijkstraCost`` (`Combinaciones`_)" @@ -10381,9 +10383,10 @@ msgstr "Usar con :doc:`pgr_TSP`." msgid "``pgr_bellmanFord - Experimental``" msgstr "``pgr_bellmanFord`` - Experimental" -msgid "``pgr_bellmanFord`` — Shortest path(s) using Bellman-Ford algorithm." +msgid "``pgr_bellmanFord`` — Shortest path using Bellman-Ford algorithm." msgstr "" -"``pgr_bellmanFord`` —Camino m+as corto usando el algoritmo de Bellman-Ford." +"``pgr_bellmanFord`` - Camino más corto utilizando el algoritmo de Bellman-" +"Ford." msgid "New **experimental** signature:" msgstr "Nueva firma **experimental**:" @@ -10601,9 +10604,6 @@ msgstr "" msgid "``vid``" msgstr "``vid``" -msgid "Identifier of the vertex" -msgstr "Identificador del vértice" - msgid "``centrality``" msgstr "``centrality``" @@ -10698,11 +10698,11 @@ msgid "``pgr_binaryBreadthFirstSearch`` - Experimental" msgstr "``pgr_binaryBreadthFirstSearch`` - Experimental" msgid "" -"``pgr_binaryBreadthFirstSearch`` — Returns the shortest path(s) in a binary " +"``pgr_binaryBreadthFirstSearch`` — Returns the shortest path in a binary " "graph." msgstr "" -"``pgr_binaryBreadthFirstSearch`` — Regresa los caminos más cortos en un " -"grafo binario." +"``pgr_binaryBreadthFirstSearch`` - Devuelve el camino más corto en un grafo " +"binario." msgid "" "Any graph whose edge-weights belongs to the set {0,X}, where 'X' is any non-" @@ -11943,13 +11943,13 @@ msgid "pgr_dagShortestPath - Experimental" msgstr "pgr_dagShortestPath - Experimental" msgid "" -"``pgr_dagShortestPath`` — Returns the shortest path(s) for weighted directed " +"``pgr_dagShortestPath`` — Returns the shortest path for weighted directed " "acyclic graphs(DAG). In particular, the DAG shortest paths algorithm " "implemented by Boost.Graph." msgstr "" -"``pgr_dagShortestPath`` — Devuelve la(s) rutas más cortas para los grafos " -"acíclicos dirigidos ponderados (DAG). En particular, el algoritmo de rutas " -"más cortas de DAG implementado por Boost.Graph." +"``pgr_dagShortestPath`` - Devuelve el camino más corto para grafos acíclicos " +"dirigidos ponderados (DAG). En particular, el algoritmo de caminos más " +"cortos DAG implementado por Boost.Graph." msgid "pgr_dagShortestPath(Combinations)" msgstr "pgr_dagShortestPath(Combinaciones)" @@ -12275,8 +12275,9 @@ msgstr "" msgid "``pgr_dijkstra``" msgstr "``pgr_dijkstra``" -msgid "``pgr_dijkstra`` — Shortest path(s) using Dijkstra algorithm." -msgstr "``pgr_dijkstra`` — Ruta(s) más corta(s) usando el algoritmo Dijkstra." +msgid "``pgr_dijkstra`` — Shortest path using Dijkstra algorithm." +msgstr "" +"``pgr_dijkstra`` - Camino más corto utilizando el algoritmo de Dijkstra." msgid "Version 3.5.0" msgstr "Versión 3.5.0" @@ -12542,21 +12543,21 @@ msgid "``pgr_dijkstraCost``" msgstr "``pgr_dijkstraCost``" msgid "" -"``pgr_dijkstraCost`` - Total cost of the shortest path(s) using Dijkstra " +"``pgr_dijkstraCost`` - Total cost of the shortest path using Dijkstra " "algorithm." msgstr "" -"``pgr_dijkstraCost`` - Costo total de los caminos más cortos usando el " +"``pgr_dijkstraCost`` - Coste total del camino más corto utilizando el " "algoritmo de Dijkstra." msgid "``pgr_dijkstraCost`` (`Combinations`_)" msgstr "``pgr_dijkstraCost`` (`Combinaciones`_)" msgid "" -"The ``pgr_dijkstraCost`` function sumarizes of the cost of the shortest " -"path(s) using Dijkstra Algorithm." +"The ``pgr_dijkstraCost`` function sumarizes of the cost of the shortest path " +"using Dijkstra Algorithm." msgstr "" -"La función ``pgr_dijkstraCost`` function sumarizes el costo de los caminos " -"más cortos usando el algoritmo de Dijkstra." +"La función ``pgr_dijkstraCost`` suma el coste del camino más corto " +"utilizando el Algoritmo de Dijkstra." msgid "" "pgr_dijkstraCost(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" @@ -13044,10 +13045,10 @@ msgstr "Regresa el conjunto de |via-result|" msgid "" "Find the route that visits the vertices :math:`\\{5, 1, 8\\}` in that order " -"on an **directed** graph." +"on an directed graph." msgstr "" -"Encontrar la ruta que visita los vértices :math:`\\{ 5, 1, 8\\}` en ese " -"orden, en un grafo dirigido." +"Encontrar la ruta que visita los vértices :math:`{5, 1, 8\\}` en ese orden " +"en un grafo dirigido." msgid "Via optional parameters" msgstr "Parámetros opcionales Vía" @@ -15401,8 +15402,8 @@ msgstr "``pgr_maxFlow`` (`Combinaciones`_)" msgid "New **Proposed** function" msgstr "Nueva función **Propuesta**" -msgid "Calculates the maximum flow from the `source(s)` to the `target(s)`." -msgstr "Calcula el flujo máximo desde `source(s)` a `target(s)`." +msgid "Calculates the maximum flow from the sources to the targets." +msgstr "Calcula el flujo máximo de las fuentes a los objetivos." msgid "" "When the maximum flow is **0** then there is no flow and **0** is returned." @@ -16720,13 +16721,6 @@ msgstr "" "pgr_trsp(`SQL de aristas`_, `SQL de restricciones`_,**vértices**, " "[``directed``])" -msgid "" -"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." - 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." @@ -16985,10 +16979,10 @@ msgstr "" msgid "" "Modify the graph to include points defined by points_sql. Using Dijkstra " -"algorithm, find the shortest path(s)" +"algorithm, find the shortest path" 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 los puntos definidos por points_sql. " +"Utilizando el algoritmo de Dijkstra, encontrar el camino más corto" msgid "Characteristics:" msgstr "Características:" @@ -17401,23 +17395,23 @@ msgstr "``pgr_withPointsCost`` - Propuesto" msgid "" "``pgr_withPointsCost`` - Calculates the shortest path and returns only the " -"aggregate cost of the shortest path(s) found, for the combination of points " +"aggregate cost of the shortest path found, for the combination of points " "given." msgstr "" -"``pgr_withPointsCost`` - Calcula la ruta más corta y devuelve solo el costo " -"agregado de la(s) rutas más cortas encontradas, para la combinación de " -"puntos dados." +"``pgr_withPointsCost`` - Calcula el camino más corto y devuelve sólo el " +"coste agregado del camino más corto encontrado, para la combinación de " +"puntos dada." msgid "pgr_withPointsCost(Combinations)" msgstr "pgr_withPointsCost(Combinaciones)" msgid "" "Modify the graph to include points defined by points_sql. Using Dijkstra " -"algorithm, return only the aggregate cost of the shortest path(s) found." +"algorithm, return only the aggregate cost of the shortest path found." msgstr "" -"Modifica el grafo para incluir puntos definidos por points_sql. Con el " -"algoritmo Dijkstra, devuelva solo el costo agregado de la(s) rutas más " -"cortas encontradas." +"Modificar el grafo para incluir los puntos definidos por points_sql. " +"Utilizando el algoritmo de Dijkstra, devolver sólo el coste agregado del " +"camino más corto encontrado." msgid "" "Returns the sum of the costs of the shortest path for pair combination of " @@ -18168,6 +18162,74 @@ msgstr "pgRouting 3.7" msgid "pgRouting 3.6" msgstr "pgRouting 3.6" +#, fuzzy +msgid "pgRouting 3.6.3 Release Notes" +msgstr "Notas de la versión de pgRouting 3.6.2" + +#, fuzzy +msgid "" +"To see all issues & pull requests closed by this release see the `Git closed " +"milestone for 3.6.3 `__" +msgstr "" +"Para ver todas las incidencias y pull requests cerrados por esta versión, " +"consulte `Git closed milestone for 3.6.2 `__" + +msgid "Build" +msgstr "Construir" + +msgid "Explicit minimum requirements:" +msgstr "" + +msgid "postgres 11.0.0" +msgstr "" + +#, fuzzy +msgid "postgis 3.0.0" +msgstr "Versión 3.0.0" + +msgid "Code fixes" +msgstr "Corrección de código" + +msgid "Fix warnings from cpplint." +msgstr "" + +msgid "Fix warnings from clang 18." +msgstr "" + +#, fuzzy +msgid "CI tests" +msgstr "Pruebas pgtap" + +msgid "Add a clang tidy test on changed files." +msgstr "" + +msgid "" +"Update test not done on versions: 3.0.1, 3.0.2, 3.0.3, 3.0.4, 3.1.0, 3.1.1, " +"3.1.2" +msgstr "" + +msgid "Documentation" +msgstr "Documentación" + +msgid "Results of documentation queries adujsted to boost 1.83.0 version:" +msgstr "" + +#, fuzzy +msgid "pgr_edgeDisjointPaths" +msgstr "pgr_edgeDisjointPaths:" + +msgid "pgr_stoerWagner" +msgstr "pgr_stoerWagner" + +msgid "pgtap tests" +msgstr "Pruebas pgtap" + +#, fuzzy +msgid "bug fixes" +msgstr "Correcciones" + msgid "pgRouting 3.6.2 Release Notes" msgstr "Notas de la versión de pgRouting 3.6.2" @@ -18186,9 +18248,6 @@ msgstr "" msgid "The upgrade was failing for same minor" msgstr "" -msgid "Code fixes" -msgstr "Corrección de código" - msgid "Fix warnings from cpplint" msgstr "" @@ -18348,9 +18407,6 @@ msgstr "" "`#2522 `__ Simplificación " "del código de bdAstar." -msgid "Documentation" -msgstr "Documentación" - msgid "" "`#2490 `__ Automatic page " "history links." @@ -18428,9 +18484,6 @@ msgstr "" "`#2561 `__ No usar " "comodines en SQL" -msgid "pgtap tests" -msgstr "Pruebas pgtap" - msgid "" "`#2559 `__ pgtap test " "using sampledata" @@ -18950,9 +19003,6 @@ msgstr "" "pgRouting/pgrouting/issues?" "utf8=%E2%9C%93&q=milestone%3A%22Release%203.2.0%22>`_ en Github." -msgid "Build" -msgstr "Construir" - msgid "" "`#1850 `__: Change Boost " "min version to 1.56" @@ -19586,9 +19636,6 @@ msgstr "pgr_maxFlowMinCost_Cost" msgid "pgr_turnRestrictedPath" msgstr "pgr_turnRestrictedPath" -msgid "pgr_stoerWagner" -msgstr "pgr_stoerWagner" - msgid "pgr_dagShortestpath" msgstr "pgr_dagShortestpath" @@ -21778,142 +21825,168 @@ msgstr "pgr_withPointsDD es pgr_drivingDistance **con puntos**" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "pgr_withPoints es pgr_dijkstraVia **con puntos**" -msgid "There is no flow when source has the same vaule as target." -msgstr "No hay flujo cuando el origen tiene el mismo valor que el destino." - -msgid "Any duplicated values in source or target are ignored." -msgstr "Los valores duplicados en origen o destino se ignoran." - -msgid "Creates" -msgstr "Crea" - -msgid "a **super source** and edges from it to all the sources," -msgstr "una **super fuente** y aristas desde ella a todas las fuentes," - -msgid "a **super target** and edges from it to all the targetss." -msgstr "un **super objetivo** y aristas desde él a todos los objetivos." - -msgid "" -"There are several kinds of valid inner queries and also the columns returned " -"are depending of the function. Which kind of inner query will depend on the " -"function's requirements. To simplify the variety of types, **ANY-INTEGER** " -"and **ANY-NUMERICAL** is used." -msgstr "" -"Existen varios tipos de consultas internas válidas y también las columnas " -"devueltas dependen de la función. El tipo de consulta interna dependerá de " -"los requisitos de la función. Para simplificar la variedad de tipos, se " -"utiliza **ANY-INTEGER** y **ANY-NUMERICAL**." - -msgid "" -"``pgr_aStarCost`` - Total cost of the shortest path using the A* algorithm." -msgstr "" -"``pgr_aStarCost`` - Coste total del camino más corto utilizando el algoritmo " -"A*." - -msgid "" -"The ``pgr_aStarCost`` function sumarizes of the cost of the shortest path " -"using the A* algorithm." -msgstr "" -"La función ``pgr_aStarCost`` suma el coste del camino más corto utilizando " -"el algoritmo A*." - -msgid "" -"``pgr_bdAstarCost`` - Total cost of the shortest path using the " -"bidirectional A* algorithm." -msgstr "" -"``pgr_bdAstarCost`` - Coste total del camino más corto utilizando el " -"algoritmo bidireccional A*." - -msgid "" -"The ``pgr_bdAstarCost`` function sumarizes of the cost of the shortest path " -"using the bidirectional A* algorithm." -msgstr "" -"La función ``pgr_bdAstarCost`` suma el coste del camino más corto utilizando " -"el algoritmo bidireccional A*." - -msgid "" -"``pgr_bdDijkstra`` — Returns the shortest path using Bidirectional Dijkstra " -"algorithm." -msgstr "" -"``pgr_bdDijkstra`` - Devuelve el camino más corto utilizando el algoritmo " -"Bidireccional de Dijkstra." - -msgid "" -"``pgr_bdDijkstraCost`` — Returns the shortest path's cost using " -"Bidirectional Dijkstra algorithm." -msgstr "" -"``pgr_bdDijkstraCost`` - Devuelve el coste del camino más corto utilizando " -"el algoritmo Bidireccional de Dijkstra." - -msgid "``pgr_bellmanFord`` — Shortest path using Bellman-Ford algorithm." -msgstr "" -"``pgr_bellmanFord`` - Camino más corto utilizando el algoritmo de Bellman-" -"Ford." - -msgid "" -"``pgr_binaryBreadthFirstSearch`` — Returns the shortest path in a binary " -"graph." -msgstr "" -"``pgr_binaryBreadthFirstSearch`` - Devuelve el camino más corto en un grafo " -"binario." - -msgid "" -"``pgr_dagShortestPath`` — Returns the shortest path for weighted directed " -"acyclic graphs(DAG). In particular, the DAG shortest paths algorithm " -"implemented by Boost.Graph." -msgstr "" -"``pgr_dagShortestPath`` - Devuelve el camino más corto para grafos acíclicos " -"dirigidos ponderados (DAG). En particular, el algoritmo de caminos más " -"cortos DAG implementado por Boost.Graph." - -msgid "``pgr_dijkstra`` — Shortest path using Dijkstra algorithm." -msgstr "" -"``pgr_dijkstra`` - Camino más corto utilizando el algoritmo de Dijkstra." - -msgid "" -"``pgr_dijkstraCost`` - Total cost of the shortest path using Dijkstra " -"algorithm." -msgstr "" -"``pgr_dijkstraCost`` - Coste total del camino más corto utilizando el " -"algoritmo de Dijkstra." - -msgid "" -"The ``pgr_dijkstraCost`` function sumarizes of the cost of the shortest path " -"using Dijkstra Algorithm." -msgstr "" -"La función ``pgr_dijkstraCost`` suma el coste del camino más corto " -"utilizando el Algoritmo de Dijkstra." - -msgid "" -"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." - -msgid "Calculates the maximum flow from the sources to the targets." -msgstr "Calcula el flujo máximo de las fuentes a los objetivos." - -msgid "" -"Modify the graph to include points defined by points_sql. Using Dijkstra " -"algorithm, find the shortest path" -msgstr "" -"Modificar el grafo para incluir los puntos definidos por points_sql. " -"Utilizando el algoritmo de Dijkstra, encontrar el camino más corto" - -msgid "" -"``pgr_withPointsCost`` - Calculates the shortest path and returns only the " -"aggregate cost of the shortest path found, for the combination of points " -"given." -msgstr "" -"``pgr_withPointsCost`` - Calcula el camino más corto y devuelve sólo el " -"coste agregado del camino más corto encontrado, para la combinación de " -"puntos dada." - -msgid "" -"Modify the graph to include points defined by points_sql. Using Dijkstra " -"algorithm, return only the aggregate cost of the shortest path found." -msgstr "" -"Modificar el grafo para incluir los puntos definidos por points_sql. " -"Utilizando el algoritmo de Dijkstra, devolver sólo el coste agregado del " -"camino más corto encontrado." +#~ msgid "" +#~ "`Wikipedia: Graph Coloring `__" +#~ msgstr "" +#~ "`Wikipedia: Coloración de grafos `__" + +#~ msgid "There is no flow when a **source** is the same as a **target**." +#~ msgstr "" +#~ "No hay ningún flujo cuando el **orígen** es el mismo que el **destino**." + +#~ msgid "Any duplicated value in the source(s) or target(s) are ignored." +#~ msgstr "" +#~ "Cualquier valor duplicado en el/los orígen(es) o en el/los destino(s) " +#~ "será ignorado." + +#~ msgid "" +#~ "Creates a **super source** and edges to all the source(s), and a **super " +#~ "target** and the edges from all the targets(s)." +#~ msgstr "" +#~ "Crea una **súper origen**, con aristas para todos las fuentes(es), y un " +#~ "**súper destino** con aristas para todos los destino(s)." + +#~ msgid "" +#~ "There are several kinds of valid inner queries and also the columns " +#~ "returned are depending of the function. Which kind of inner query will " +#~ "depend on the function(s) requirements. To simplify variety of types, " +#~ "**ANY-INTEGER** and **ANY-NUMERICAL** is used." +#~ msgstr "" +#~ "Hay varios tipos de consultas internas válidas y también las columnas " +#~ "devueltas dependen de la función. El tipo de consulta interna dependerá " +#~ "de los requisitos de las funcion(es). Para simplificar la variedad de " +#~ "tipos, se utiliza **ENTEROS** y **FLOTANTES**." + +#~ msgid "wget" +#~ msgstr "wget" + +#~ msgid "" +#~ "``pgr_aStarCost`` - Total cost of the shortest path(s) using the A* " +#~ "algorithm." +#~ msgstr "" +#~ "``pgr_aStarCost`` —Costo total de la ruta más corta usando el algoritmo :" +#~ "A*." + +#~ msgid "" +#~ "The ``pgr_aStarCost`` function sumarizes of the cost of the shortest " +#~ "path(s) using the A* algorithm." +#~ msgstr "" +#~ "La función ``pgr_aStarCost`` sumarisa el costo de la ruta más corta " +#~ "usando el algoritmo A*." + +#~ msgid "" +#~ "``pgr_bdAstarCost`` - Total cost of the shortest path(s) using the " +#~ "bidirectional A* algorithm." +#~ msgstr "" +#~ "``pgr_bdAstarCost`` - Devuelve el costo agregado de la ruta más corta " +#~ "usando el algoritmo bidireccional A*." + +#~ msgid "" +#~ "The ``pgr_bdAstarCost`` function sumarizes of the cost of the shortest " +#~ "path(s) using the bidirectional A* algorithm." +#~ msgstr "" +#~ "La función ``pgr_bdAstarCost`` Sumariza el costo del camino más corto " +#~ "utilizando el algoritmo bidireccional A*." + +#~ msgid "" +#~ "``pgr_bdDijkstra`` — Returns the shortest path(s) using Bidirectional " +#~ "Dijkstra algorithm." +#~ msgstr "" +#~ "``pgr_bdDijkstra`` — Devuelve la(s) rutas más cortas mediante el " +#~ "algoritmo Bidirectional Dijkstra." + +#~ msgid "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_ , [``directed``])" +#~ msgstr "" +#~ "pgr_bdDijkstra(`SQL de aristas`_, `SQL de combinaciones`_, [``directed``])" + +#~ msgid "" +#~ "``pgr_bdDijkstraCost`` — Returns the shortest path(s)'s cost using " +#~ "Bidirectional Dijkstra algorithm." +#~ msgstr "" +#~ "``pgr_bdDijkstraCost`` — Devuelve la ruta(s) más corta utilizando el " +#~ "algoritmo de Dijkstra Bidireccional." + +#~ msgid "``pgr_bellmanFord`` — Shortest path(s) using Bellman-Ford algorithm." +#~ msgstr "" +#~ "``pgr_bellmanFord`` —Camino m+as corto usando el algoritmo de Bellman-" +#~ "Ford." + +#~ msgid "Identifier of the vertex" +#~ msgstr "Identificador del vértice" + +#~ msgid "" +#~ "``pgr_binaryBreadthFirstSearch`` — Returns the shortest path(s) in a " +#~ "binary graph." +#~ msgstr "" +#~ "``pgr_binaryBreadthFirstSearch`` — Regresa los caminos más cortos en un " +#~ "grafo binario." + +#~ msgid "" +#~ "``pgr_dagShortestPath`` — Returns the shortest path(s) for weighted " +#~ "directed acyclic graphs(DAG). In particular, the DAG shortest paths " +#~ "algorithm implemented by Boost.Graph." +#~ msgstr "" +#~ "``pgr_dagShortestPath`` — Devuelve la(s) rutas más cortas para los grafos " +#~ "acíclicos dirigidos ponderados (DAG). En particular, el algoritmo de " +#~ "rutas más cortas de DAG implementado por Boost.Graph." + +#~ msgid "``pgr_dijkstra`` — Shortest path(s) using Dijkstra algorithm." +#~ msgstr "" +#~ "``pgr_dijkstra`` — Ruta(s) más corta(s) usando el algoritmo Dijkstra." + +#~ msgid "" +#~ "``pgr_dijkstraCost`` - Total cost of the shortest path(s) using Dijkstra " +#~ "algorithm." +#~ msgstr "" +#~ "``pgr_dijkstraCost`` - Costo total de los caminos más cortos usando el " +#~ "algoritmo de Dijkstra." + +#~ msgid "" +#~ "The ``pgr_dijkstraCost`` function sumarizes of the cost of the shortest " +#~ "path(s) using Dijkstra Algorithm." +#~ msgstr "" +#~ "La función ``pgr_dijkstraCost`` function sumarizes el costo de los " +#~ "caminos más cortos usando el algoritmo de Dijkstra." + +#~ msgid "" +#~ "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." + +#~ msgid "Calculates the maximum flow from the `source(s)` to the `target(s)`." +#~ msgstr "Calcula el flujo máximo desde `source(s)` a `target(s)`." + +#~ msgid "" +#~ "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." + +#~ 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" + +#~ msgid "" +#~ "``pgr_withPointsCost`` - Calculates the shortest path and returns only " +#~ "the aggregate cost of the shortest path(s) found, for the combination of " +#~ "points given." +#~ msgstr "" +#~ "``pgr_withPointsCost`` - Calcula la ruta más corta y devuelve solo el " +#~ "costo agregado de la(s) rutas más cortas encontradas, para la combinación " +#~ "de puntos dados." + +#~ msgid "" +#~ "Modify the graph to include points defined by points_sql. Using Dijkstra " +#~ "algorithm, return only the aggregate cost of the shortest path(s) found." +#~ msgstr "" +#~ "Modifica el grafo para incluir puntos definidos por points_sql. Con el " +#~ "algoritmo Dijkstra, devuelva solo el costo agregado de la(s) rutas más " +#~ "cortas encontradas." diff --git a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po index 43112e3b7b..d700309bb5 100644 --- a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-09-23 01:17+0000\n" +"POT-Creation-Date: 2024-10-10 03:40+0000\n" "PO-Revision-Date: 2024-09-23 01:16+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Japanese `__" msgstr "" +msgid "Support" +msgstr "サポート" + +msgid "" +"`#2656 `__ Stop support of " +"PostgreSQL12 on pgrouting v3.7" +msgstr "" + +msgid "Stopping support of PostgreSQL 12" +msgstr "" + +msgid "CI does not test for PostgreSQL 12" +msgstr "" + msgid "New experimental functions" msgstr "" @@ -8311,9 +8325,6 @@ msgstr "" msgid "Renamed from version 1.x" msgstr "" -msgid "Support" -msgstr "サポート" - msgid "Returns the polygon part of an alpha shape." msgstr "" @@ -15700,6 +15711,66 @@ msgstr "" msgid "pgRouting 3.6" msgstr "" +msgid "pgRouting 3.6.3 Release Notes" +msgstr "" + +msgid "" +"To see all issues & pull requests closed by this release see the `Git closed " +"milestone for 3.6.3 `__" +msgstr "" + +msgid "Build" +msgstr "" + +msgid "Explicit minimum requirements:" +msgstr "" + +msgid "postgres 11.0.0" +msgstr "" + +#, fuzzy +msgid "postgis 3.0.0" +msgstr "バージョン 3.0.0" + +msgid "Code fixes" +msgstr "" + +msgid "Fix warnings from cpplint." +msgstr "" + +msgid "Fix warnings from clang 18." +msgstr "" + +msgid "CI tests" +msgstr "" + +msgid "Add a clang tidy test on changed files." +msgstr "" + +msgid "" +"Update test not done on versions: 3.0.1, 3.0.2, 3.0.3, 3.0.4, 3.1.0, 3.1.1, " +"3.1.2" +msgstr "" + +msgid "Documentation" +msgstr "" + +msgid "Results of documentation queries adujsted to boost 1.83.0 version:" +msgstr "" + +msgid "pgr_edgeDisjointPaths" +msgstr "" + +msgid "pgr_stoerWagner" +msgstr "" + +msgid "pgtap tests" +msgstr "" + +msgid "bug fixes" +msgstr "" + msgid "pgRouting 3.6.2 Release Notes" msgstr "" @@ -15715,9 +15786,6 @@ msgstr "" msgid "The upgrade was failing for same minor" msgstr "" -msgid "Code fixes" -msgstr "" - msgid "Fix warnings from cpplint" msgstr "" @@ -15842,9 +15910,6 @@ msgid "" "simplification." msgstr "" -msgid "Documentation" -msgstr "" - msgid "" "`#2490 `__ Automatic page " "history links." @@ -15912,9 +15977,6 @@ msgid "" "wildcards on SQL" msgstr "" -msgid "pgtap tests" -msgstr "" - msgid "" "`#2559 `__ pgtap test " "using sampledata" @@ -16354,9 +16416,6 @@ msgid "" "utf8=%E2%9C%93&q=milestone%3A%22Release%203.2.0%22>`_ on Github." msgstr "" -msgid "Build" -msgstr "" - msgid "" "`#1850 `__: Change Boost " "min version to 1.56" @@ -16905,9 +16964,6 @@ msgstr "" msgid "pgr_turnRestrictedPath" msgstr "" -msgid "pgr_stoerWagner" -msgstr "" - msgid "pgr_dagShortestpath" msgstr "" @@ -18854,5 +18910,3 @@ msgstr "" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "" - -#, fuzzy diff --git a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po index ca5a127369..15f6feab3a 100644 --- a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-09-23 01:17+0000\n" +"POT-Creation-Date: 2024-10-10 03:40+0000\n" "PO-Revision-Date: 2022-12-13 12:30+0000\n" "Last-Translator: Hyung-Gyu Ryoo \n" "Language-Team: Korean `__" msgstr "" +msgid "Support" +msgstr "" + +msgid "" +"`#2656 `__ Stop support of " +"PostgreSQL12 on pgrouting v3.7" +msgstr "" + +#, fuzzy +msgid "Stopping support of PostgreSQL 12" +msgstr "PostgreSQL 설정" + +msgid "CI does not test for PostgreSQL 12" +msgstr "" + msgid "New experimental functions" msgstr "" @@ -8235,9 +8250,6 @@ msgstr "" msgid "Renamed from version 1.x" msgstr "" -msgid "Support" -msgstr "" - msgid "Returns the polygon part of an alpha shape." msgstr "" @@ -15592,6 +15604,67 @@ msgstr "" msgid "pgRouting 3.6" msgstr "" +msgid "pgRouting 3.6.3 Release Notes" +msgstr "" + +msgid "" +"To see all issues & pull requests closed by this release see the `Git closed " +"milestone for 3.6.3 `__" +msgstr "" + +msgid "Build" +msgstr "" + +msgid "Explicit minimum requirements:" +msgstr "" + +msgid "postgres 11.0.0" +msgstr "" + +msgid "postgis 3.0.0" +msgstr "" + +msgid "Code fixes" +msgstr "" + +msgid "Fix warnings from cpplint." +msgstr "" + +msgid "Fix warnings from clang 18." +msgstr "" + +msgid "CI tests" +msgstr "" + +msgid "Add a clang tidy test on changed files." +msgstr "" + +msgid "" +"Update test not done on versions: 3.0.1, 3.0.2, 3.0.3, 3.0.4, 3.1.0, 3.1.1, " +"3.1.2" +msgstr "" + +msgid "Documentation" +msgstr "" + +msgid "Results of documentation queries adujsted to boost 1.83.0 version:" +msgstr "" + +#, fuzzy +msgid "pgr_edgeDisjointPaths" +msgstr ":doc:`pgr_edgeDisjointPaths`" + +msgid "pgr_stoerWagner" +msgstr "" + +msgid "pgtap tests" +msgstr "" + +#, fuzzy +msgid "bug fixes" +msgstr "빌드" + msgid "pgRouting 3.6.2 Release Notes" msgstr "" @@ -15607,9 +15680,6 @@ msgstr "" msgid "The upgrade was failing for same minor" msgstr "" -msgid "Code fixes" -msgstr "" - msgid "Fix warnings from cpplint" msgstr "" @@ -15733,9 +15803,6 @@ msgid "" "simplification." msgstr "" -msgid "Documentation" -msgstr "" - msgid "" "`#2490 `__ Automatic page " "history links." @@ -15802,9 +15869,6 @@ msgid "" "wildcards on SQL" msgstr "" -msgid "pgtap tests" -msgstr "" - msgid "" "`#2559 `__ pgtap test " "using sampledata" @@ -16245,9 +16309,6 @@ msgid "" "utf8=%E2%9C%93&q=milestone%3A%22Release%203.2.0%22>`_ on Github." msgstr "" -msgid "Build" -msgstr "" - msgid "" "`#1850 `__: Change Boost " "min version to 1.56" @@ -16796,9 +16857,6 @@ msgstr "" msgid "pgr_turnRestrictedPath" msgstr "" -msgid "pgr_stoerWagner" -msgstr "" - msgid "pgr_dagShortestpath" msgstr "" @@ -18742,4 +18800,3 @@ msgstr "" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "" - diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index d4199a30b6..7f63579e45 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-09-23 01:17+0000\n" +"POT-Creation-Date: 2024-10-10 03:40+0000\n" "PO-Revision-Date: 2024-09-23 14:18+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Chinese (Simplified) ` available and :ref:`factor " "` handling." msgstr "" -"查看可用的 :ref:`heuristics ` 和 :ref:`factor ` " -"处理。" +"查看可用的 :ref:`heuristics ` 和 :ref:`factor " +"` 处理。" msgid "Advanced documentation" msgstr "高级文档" @@ -1874,8 +1879,8 @@ msgid "" "Boost returns a :math:`V \\times V` matrix, where the infinity values. " "Represent the distance between vertices for which there is no path." msgstr "" -"Boost 返回一个 :math:`V \\times V` 矩阵，其中无穷大值。 表示没有路径的顶点之间" -"的距离。" +"Boost 返回一个 :math:`V \\times V` 矩阵，其中无穷大值。 表示没有路径的顶点之" +"间的距离。" msgid "" "We return only the non infinity values in form of a set of `(start_vid, " @@ -2649,8 +2654,8 @@ msgid "" msgstr "" "基于A*算法，双向搜索找到从起始顶点(``start_vid``)到结束顶点(``end_vid``)的最" "短路径。 它同时运行两项搜索：一项从 ``start_vid`` 向前搜索，一项从 " -"``end_vid`` 向后搜索，当两者在中间相遇时停止。 " -"该实现可以与有向图和无向图一起使用。" +"``end_vid`` 向后搜索，当两者在中间相遇时停止。 该实现可以与有向图和无向图一起" +"使用。" msgid "" "For large graphs where there is a path bewtween the starting vertex and " @@ -3002,8 +3007,8 @@ msgid "" "From above, nodes :math:`\\{a, b, d\\}` are dead ends because the number of " "adjacent vertices is 1. No further checks are needed for those nodes." msgstr "" -"从上面来看，节点 :math:`\\{a, b, d\\}` 是死端，因为相邻顶点的数量为 1。不需要对" -"这些节点进行进一步检查。" +"从上面来看，节点 :math:`\\{a, b, d\\}` 是死端，因为相邻顶点的数量为 1。不需要" +"对这些节点进行进一步检查。" msgid "" "On the following table, nodes :math:`\\{c, e\\}` because the even that the " @@ -3017,8 +3022,8 @@ msgid "" "The dead end contraction will stop until there are no more dead end nodes. " "For example from the following graph where :math:`w` is the `dead end`_ node:" msgstr "" -"死端收缩将停止，直到不再有死端节点。 例如，从下图中，其中 :math:`w` 是 `死端`_ 节" -"点：" +"死端收缩将停止，直到不再有死端节点。 例如，从下图中，其中 :math:`w` 是 `死端" +"`_ 节点：" msgid "" "After contracting :math:`w`, node :math:`v` is now a `dead end`_ node and is " @@ -3108,8 +3113,8 @@ msgid "" "example from the following graph where :math:`v` and :math:`w` are `linear`_ " "nodes:" msgstr "" -"当不再有线性节点时，线性收缩将停止。 例如，在下图中，其中 :math:`v` 和 :math:`w`" -" 是 `线性`_ 节点：" +"当不再有线性节点时，线性收缩将停止。 例如，在下图中，其中 :math:`v` 和 :math:" +"`w` 是 `线性`_ 节点：" msgid "Contracting :math:`w`," msgstr "收缩 :math:`w`，" @@ -3202,7 +3207,8 @@ msgstr "结果不代表收缩图。 它们表示应用收缩算法后对图所 msgid "" "Observe that vertices, for example, :math:`6` do not appear in the results " "because it was not affected by the contraction algorithm." -msgstr "例如，观察到顶点 :math:`6` 没有出现在结果中，因为它不受收缩算法的影响。" +msgstr "" +"例如，观察到顶点 :math:`6` 没有出现在结果中，因为它不受收缩算法的影响。" msgid "After doing the dead end contraction operation:" msgstr "进行死端收缩操作后：" @@ -3354,7 +3360,8 @@ msgid "" "In this case, the contracted graph do not have an edge connecting with node :" "math:`7` and of node :math:`4` of the second case." msgstr "" -"在这种情况下，收缩图没有与第二种情况的节点 :math:`7` 和节点 :math:`4` 连接的边。" +"在这种情况下，收缩图没有与第二种情况的节点 :math:`7` 和节点 :math:`4` 连接的" +"边。" msgid "Refining the above function to include nodes that belong to an edge." msgstr "改进上述函数以包含属于边的节点。" @@ -3757,8 +3764,10 @@ msgstr "加权有向图， :math:`G_d(V,E)` 的定义如下：" msgid "the set of vertices :math:`V`" msgstr "顶点集 :math:`V`" -msgid ":math:`V = source \\cup target \\cup {start_{vid}} \\cup {end_{vid}}`" -msgstr ":math:`V = source \\cup target \\cup {start_{vid}} \\cup {end_{vid}}`" +#, fuzzy +msgid ":math:`V = source \\cup target \\cup {start_{vid}} \\cup {end_{vid}}`" +msgstr "" +":math:`V = source \\cup target \\cup {start_v{vid}} \\cup {end_{vid}}`" msgid "the set of edges :math:`E`" msgstr "边集 :math:`E`" @@ -3772,13 +3781,13 @@ msgid "" "\\text{ when } reverse\\_cost_i>=0 \\} & \\quad \\text{if } reverse\\_cost " "\\neq \\varnothing \\\\ \\end{cases}`" msgstr "" -":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 \\n" -"eq \\varnothing \\\\ \\end{cases}`" +":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 "Undirected graph" msgstr "无向图" @@ -3802,17 +3811,16 @@ msgid "" "target_i, reverse\\_cost_i) \\text{ when } reverse\\_cost_i >=0)\\} & \\quad " "\\text{ if } reverse\\_cost \\neq \\varnothing \\\\ \\end{cases}`" msgstr "" -":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 \\n" -"eq \\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}`" msgid "The problem" msgstr "问题" @@ -3892,13 +3900,14 @@ msgid "" "`start_{vid}` and :math:`end_{vid}`, if it exists, in terms of a sequence of " "nodes and of edges," msgstr "" -"换句话说：如果 :math:`start_{vid}` 和 :math:`end_{vid}` 之间存在最短路径，算法会" -"根据节点和边的序列返回该路径、" +"换句话说：如果 :math:`start_{vid}` 和 :math:`end_{vid}` 之间存在最短路径，算" +"法会根据节点和边的序列返回该路径、" msgid "" ":math:`path\\_seq` indicates the relative position in the path of the :math:" "`node` or :math:`edge`." -msgstr ":math:`path\\_seq` 表示 :math:`node` 或 :math:`edge` 的路径中的相对位置。" +msgstr "" +":math:`path\\_seq` 表示 :math:`node` 或 :math:`edge` 的路径中的相对位置。" msgid ":math:`cost` is the cost of the edge to be used to go to the next node." msgstr ":math:`cost` 是用于转到下一个节点的边的成本。" @@ -4562,6 +4571,25 @@ msgstr "" "pgRouting/pgrouting/issues?" "utf8=%E2%9C%93&q=milestone%3A%22Release%203.7.0%22>`__ 的 Git 关闭里程碑" +msgid "Support" +msgstr "支持" + +#, fuzzy +msgid "" +"`#2656 `__ Stop support of " +"PostgreSQL12 on pgrouting v3.7" +msgstr "" +"`#2607 `__ 在 C++ 上读取 " +"postgresql 数据" + +#, fuzzy +msgid "Stopping support of PostgreSQL 12" +msgstr "从 PostgreSQL 12 开始：：" + +#, fuzzy +msgid "CI does not test for PostgreSQL 12" +msgstr "适用于 postgreSQL 10" + msgid "New experimental functions" msgstr "新的实验函数" @@ -4611,12 +4639,10 @@ msgstr "添加了 ``depth`` 和``pred`` 结果列。" msgid "Experimental promoted to proposed." msgstr "实验提升为拟议。" -#, fuzzy msgid "" "`#2635 `__ pgr_LineGraph " "ignores directed flag and use negative values for identifiers." msgstr "" -"" msgid "``pgr_lineGraph``" msgstr "``pgr_lineGraph``" @@ -4633,7 +4659,8 @@ msgstr "代码改进" msgid "" "`#2599 `__ Driving " "distance cleanup" -msgstr "`#2599 `__ 行车距离清理" +msgstr "" +"`#2599 `__ 行车距离清理" msgid "" "`#2607 `__ Read postgresql " @@ -4646,8 +4673,8 @@ msgid "" "`#2614 `__ Clang tidy does " "not work" msgstr "" -"`#2614 `__ Clang tidy " -"不工作" +"`#2614 `__ Clang tidy 不工" +"作" msgid "All releases" msgstr "所有版本" @@ -4867,8 +4894,8 @@ msgid "" "Starting from `v3.6.0 `__ :" "doc:`pgr_drivingDistance` result columns are being standardized." msgstr "" -"从 `v3.6.0 `__ 开始， " -":doc:`pgr_drivingDistance` 结果列正在标准化。" +"从 `v3.6.0 `__ 开始， :doc:" +"`pgr_drivingDistance` 结果列正在标准化。" msgid "from" msgstr "从" @@ -5038,11 +5065,13 @@ msgstr "``start_vid`` 和 ``end_vid`` 列不存在。" msgid "``pgr_KSP`` (One to One) does not have ``start_vid`` and ``end_vid``." msgstr "``pgr_KSP`` (一对一) 没有 ``start_vid`` 和``end_vid``。" +#, fuzzy msgid "" -"Using `this `__" +"Using `this `__ " "example." msgstr "" -"使用`这个 `__ 示例。" +"使用`这个 `__ 示" +"例。" msgid "" "If needed filter out the added columns, for example, to return the original " @@ -5178,8 +5207,8 @@ msgid "" "compulsory **driving side** and its validity differ for directed and " "undirected graphs." msgstr "" -"并且 ``driving_side`` 参数从命名可选变为未命名强制 **driving side** ，其有效性" -"对于有向图和无向图是不同的。" +"并且 ``driving_side`` 参数从命名可选变为未命名强制 **driving side** ，其有效" +"性对于有向图和无向图是不同的。" msgid "``pgr_withPointsDD`` (Single vertex)" msgstr "``pgr_withPointsDD`` (单个顶点)" @@ -5299,7 +5328,8 @@ msgid "" "When ``details => false`` to remove the points use ``WHERE node >= 0 OR cost " "= 0``" msgstr "" -"当设置 ``details => false`` 以移除点时，请使用 ``WHERE node >= 0 OR cost = 0``" +"当设置 ``details => false`` 以移除点时，请使用 ``WHERE node >= 0 OR cost = " +"0``" msgid "" "Using `this `__):" msgstr "" -"解决来自 `维基百科 `__ ）" -"的示例问题 ：" +"解决来自 `维基百科 `__ ）的示例问题 ：" msgid "Problem is to find the shortest path from :math:`1` to :math:`5`." msgstr "问题是找到从 :math:`1` 到 :math:`5` 的最短路径。" @@ -6177,8 +6208,8 @@ msgid "" "When missing, add columns and assign values to ``source``, ``target``, " "``cost``, ``reverse_cost``." msgstr "" -"如果缺少，请添加列并为 ``source``, ``target``, ``cost``, ``reverse_cost`` 分配" -"值。" +"如果缺少，请添加列并为 ``source``, ``target``, ``cost``, ``reverse_cost`` 分" +"配值。" msgid "Connect a disconnected graph." msgstr "连接断开的图。" @@ -6222,8 +6253,8 @@ msgid "" "on how to prepare a graph using Open Street Map data, for a small " "application." msgstr "" -"该 `workshop `__ 逐步介绍了如何使用开放" -"街道地图数据为小型应用程序准备图。" +"该 `workshop `__ 逐步介绍了如何使用开" +"放街道地图数据为小型应用程序准备图。" msgid "The use of indexes on the database design in general:" msgstr "数据库设计上索引的使用一般：" @@ -6273,8 +6304,8 @@ msgid "" "traversing the edge in both directions." msgstr "" "几何图的所有开始和结束顶点都需要一个标识符，该标识符将存储在数据表的" -"``source``列和``target``列中。 同样，``cost`` 和 ``reverse_cost`` 需要具有在两" -"个方向上遍历边的值。" +"``source``列和``target``列中。 同样，``cost`` 和 ``reverse_cost`` 需要具有在" +"两个方向上遍历边的值。" msgid "" "If the columns do not exist they need to be added to the table in question. " @@ -6306,8 +6337,8 @@ msgid "" msgstr "" "来自 OSM 并使用 `osm2pgrouting `__ 作为导入工具的数据附带路由拓扑。 请参阅 `workshop `__ 上使用 ``osm2pgrouting``" -" 的示例。" +"workshop.pgrouting.org/latest/en/basic/data.html>`__ 上使用 " +"``osm2pgrouting`` 的示例。" msgid "Adjust costs" msgstr "调整成本" @@ -7007,8 +7038,8 @@ msgid "" "the edge used to reach it. In other words, U turn using the edge with same " "identifier is used when no other path is found." msgstr "" -"当为 ``false`` 时，从已访问的顶点出发，尝试避免使用用于到达它的边。换句话说，只" -"有在找不到其他路径时才使用具有相同标识符的边来进行掉头。" +"当为 ``false`` 时，从已访问的顶点出发，尝试避免使用用于到达它的边。换句话说，" +"只有在找不到其他路径时才使用具有相同标识符的边来进行掉头。" msgid "For the TRSP functions" msgstr "对于 TRSP 函数" @@ -7033,8 +7064,8 @@ msgid "" "Returns set of ``(seq, path_seq [, start_vid] [, end_vid], node, edge, cost, " "agg_cost)``" msgstr "" -"返回 ``(seq, path_seq [, start_vid] [, end_vid], node, edge, cost, agg_cost)``" -" 的集合" +"返回 ``(seq, path_seq [, start_vid] [, end_vid], node, edge, cost, " +"agg_cost)`` 的集合" msgid "``path_seq``" msgstr "``path_seq``" @@ -7060,8 +7091,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 "" -"用于从路径序列中的 ``node`` 到下一个节点的边的标识符。 **-1** 表示路径的最后一" -"个节点。" +"用于从路径序列中的 ``node`` 到下一个节点的边的标识符。 **-1** 表示路径的最后" +"一个节点。" msgid "" "Cost to traverse from ``node`` using ``edge`` to the next node in the path " @@ -7078,8 +7109,8 @@ msgid "" "Returns set of ``(seq, path_seq [, start_pid] [, end_pid], node, edge, cost, " "agg_cost)``" msgstr "" -"返回 ``(seq, path_seq [, start_pid] [, end_pid], node, edge, cost, agg_cost)``" -" 的集合" +"返回 ``(seq, path_seq [, start_pid] [, end_pid], node, edge, cost, " +"agg_cost)`` 的集合" msgid "Relative position in the path." msgstr "路径中的相对位置。" @@ -7243,8 +7274,8 @@ msgid "" "Edit an existing `pgRouting Wiki `__ page." msgstr "" -"编辑现有的 `pgRouting 维基 `__" -" 页面。" +"编辑现有的 `pgRouting 维基 `__ " +"页面。" msgid "Or create a new Wiki page" msgstr "或者创建一个新的维基 页面" @@ -7253,7 +7284,8 @@ msgid "" "Create a page on the `pgRouting Wiki `__" msgstr "" -"在 `pgRouting 维基 `__ 上创建页面" +"在 `pgRouting 维基 `__ 上创建页" +"面" msgid "Give the title an appropriate name" msgstr "给标题起一个合适的名称" @@ -7345,7 +7377,8 @@ msgstr "要下载此版本：" msgid "" "Go to :ref:`install-short` for more instructions on extracting tar ball and " "compiling pgRouting." -msgstr "转到 :ref:`install-short` 以获取有关提取 tar 包和编译 pgRouting 的更多说明。" +msgstr "" +"转到 :ref:`install-short` 以获取有关提取 tar 包和编译 pgRouting 的更多说明。" msgid "git" msgstr "git" @@ -7677,10 +7710,11 @@ msgstr "" "`Georepublic `__ 、`Paragon Corporation `__ 和广大用户社区的支持和维护。" +#, fuzzy msgid "" "pgRouting is part of `OSGeo Community Projects `__ from the `OSGeo Foundation `__ and included on `OSGeoLive `__ ." +"org>`__ and included on `OSGeoLive `__." msgstr "" "pgRouting 是 `OSGeo 基金会 `__ `OSGeo 社区项目 " "`__ 的一部分，并包含在 " @@ -7984,7 +8018,8 @@ msgid "" "Get 2 paths vertices :math:`\\{6, 1\\}` to vertices :math:`\\{10, 17\\}` on " "a directed graph." msgstr "" -"在有向图中得到从顶点 :math:`\\{6, 1\\}` 到顶点 :math:`\\{10, 17\\}` 的2条路经。" +"在有向图中得到从顶点 :math:`\\{6, 1\\}` 到顶点 :math:`\\{10, 17\\}` 的2条路" +"经。" msgid "Using a combinations table on an directed graph" msgstr "在有向图上使用组合表" @@ -8072,8 +8107,8 @@ msgid "" "Metric Algorithm from `Boost library `__" msgstr "" -"`Boost库 `__ 中的" -"度量算法" +"`Boost库 `__ 中" +"的度量算法" msgid "Simulated Annealing Algorithm no longer supported" msgstr "Simulated Annealing算法不再受支持" @@ -8095,7 +8130,8 @@ msgid "" "Can be Used with :doc:`costMatrix-category` functions preferably with " "`directed => false`." msgstr "" -"可以与 :doc:`costMatrix-category` 函数一起使用，最好使用 `directed => false`。" +"可以与 :doc:`costMatrix-category` 函数一起使用，最好使用 `directed => " +"false`。" msgid "With ``directed => false``" msgstr "使用 ``directed => false``" @@ -8128,8 +8164,8 @@ msgid "" "as long as the optimal tour, due to the fact that `end_vid` is forced to be " "in a fixed position." msgstr "" -"在最坏情况下， **不能保证** 解决方案将是最优路径的两倍长，因为 `end_vid` 被强制" -"设置在固定位置。" +"在最坏情况下， **不能保证** 解决方案将是最优路径的两倍长，因为 `end_vid` 被强" +"制设置在固定位置。" msgid "With ``directed => true``" msgstr "当 ``directed => true``" @@ -8327,7 +8363,8 @@ msgid "" "The coordinates are quite different for the same identifier, for example ::" msgstr "对于相同的标识符，坐标有很大不同，例如::" -msgid "pgr_TSPeuclidean(`Coordinates SQL`_ , ``[start_id, end_id]``)" +#, fuzzy +msgid "pgr_TSPeuclidean(`Coordinates SQL`_, ``[start_id, end_id]``)" msgstr "pgr_TSPeuclidean(`Coordinates SQL`_ , ``[start_id, end_id]``)" msgid "With default values" @@ -8480,21 +8517,22 @@ msgid "" "From vertex :math:`6` to vertex :math:`12` on a **directed** graph with " "heuristic :math:`2`" msgstr "" -"在具有heuristic :math:`2` 的 **有向** 图上，从顶点 :math:`6` 到顶点 :math:`12`" +"在具有heuristic :math:`2` 的 **有向** 图上，从顶点 :math:`6` 到顶点 :math:" +"`12`" msgid "" "From vertex :math:`6` to vertices :math:`\\{10, 12\\}` on a **directed** " "graph with heuristic :math:`3` and factor :math:`3.5`" msgstr "" -"在具有heuristic :math:`3` 和factor :math:`3.5` 的 **有向** 图上，从顶点 :math:" -"`6` 到顶点 :math:`\\{10, 12\\}`" +"在具有heuristic :math:`3` 和factor :math:`3.5` 的 **有向** 图上，从顶点 :" +"math:`6` 到顶点 :math:`\\{10, 12\\}`" msgid "" "From vertices :math:`\\{6, 8\\}` to vertex :math:`10` on an **undirected** " "graph with heuristic :math:`4`" msgstr "" -"在具有heuristic :math:`4` 的 **无向** 图上，从顶点 :math:`\\{6, 8\\}` 到顶点 " -":math:`10`" +"在具有heuristic :math:`4` 的 **无向** 图上，从顶点 :math:`\\{6, 8\\}` 到顶" +"点 :math:`10`" msgid "" "From vertices :math:`\\{6, 8\\}` to vertices :math:`\\{10, 12\\}` on a " @@ -8662,9 +8700,6 @@ msgstr "支持返回多个外/内圈" msgid "Renamed from version 1.x" msgstr "从版本1.X重命名" -msgid "Support" -msgstr "支持" - msgid "Returns the polygon part of an alpha shape." msgstr "返回 alpha 形状的多边形部分。" @@ -9077,8 +9112,8 @@ msgid "" "of your network to make repairs and/or report the problem back to your data " "vendor." msgstr "" -"因此，通过计算进入和退出每个节点的边数，我们可以识别 `source` 节点和 `sink` 节" -"点，以便您可以查看网络的这些区域以进行修复和/或将问题报告给数据供应商。" +"因此，通过计算进入和退出每个节点的边数，我们可以识别 `source` 节点和 `sink` " +"节点，以便您可以查看网络的这些区域以进行修复和/或将问题报告给数据供应商。" msgid "" "pgr_analyzeOneWay(**geom_table**, **s_in_rules**, **s_out_rules**, " @@ -9152,8 +9187,8 @@ msgid "" "``oneway`` value would be counted as ``true`` for the source or target " "**in** or **out** condition." msgstr "" -"这些规则被定义为文本字符串数组，如果与 ``oneway`` 值匹配，则 source或 target **" -"输入** 或 **输出** 条件将被视为 ``true``。" +"这些规则被定义为文本字符串数组，如果与 ``oneway`` 值匹配，则 source或 target " +"**输入** 或 **输出** 条件将被视为 ``true``。" msgid "" "The vertices table can be created with :doc:`pgr_createVerticesTable` or :" @@ -9520,7 +9555,8 @@ msgstr "pgr_bdDijkstraCostMatrix(`Edges SQL`_, **start vids**, [``directed``])" msgid "" "Symmetric cost matrix for vertices :math:`\\{5, 6, 10, 15\\}` on an " "**undirected** graph" -msgstr "在一个 **无向** 图上的顶点集合 :math:`\\{5, 6, 10, 15\\}` 的对称成本矩阵" +msgstr "" +"在一个 **无向** 图上的顶点集合 :math:`\\{5, 6, 10, 15\\}` 的对称成本矩阵" msgid "Use with :doc:`pgr_TSP`." msgstr "与 :doc:`pgr_TSP` 一起使用。" @@ -9632,10 +9668,11 @@ msgstr "" msgid "pgr_bellmanFord(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgstr "pgr_bellmanFord(`Edges SQL`_, `Combinations SQL`_, [``directed``])" +#, fuzzy msgid "" -"From vertex :math:`6` to vertices :math:`\\{ 10, 17\\}` on a **directed**" +"From vertex :math:`6` to vertices :math:`\\{ 10, 17\\}` on a **directed** " "graph" -msgstr "在 **有向** 图上从顶点 :math:`6` 到顶点 :math:`\\{ 10, 17\\}`" +msgstr "在 **有向** 图上从顶点 :math:`6` 到顶点 :math:`\\{10, 17\\}`" msgid "Using a combinations table on an **undirected** graph." msgstr "在 **无向** 图上使用组合表。" @@ -9741,8 +9778,8 @@ msgid "" "Boost's `betweenness_centrality `_" msgstr "" -"`Boost：Hawick 电路算法 `__" +"`Boost：Hawick 电路算法 `__" msgid "Queries use the :doc:`sampledata` network." msgstr "查询使用 :doc:`sampledata` 网络。" @@ -10059,8 +10096,8 @@ msgid "" "Using a combinations table, equivalent to calculating result from vertices :" "math:`\\{5, 6\\}` to vertices :math:`\\{10, 15, 14\\}`." msgstr "" -"使用组合表，相当于计算从顶点 :math:`\\{5, 6\\}` 到顶点 :math:`{\\10, 15, 14\\}` 的" -"结果。" +"使用组合表，相当于计算从顶点 :math:`\\{5, 6\\}` 到顶点 :math:`{\\10, 15, " +"14\\}` 的结果。" msgid "https://www.boost.org/libs/graph/doc/boykov_kolmogorov_max_flow.html" msgstr "https://www.boost.org/libs/graph/doc/boykov_kolmogorov_max_flow.html" @@ -10228,8 +10265,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 "" -"用于从路径序列中的 ``节点`` 到下一个节点的边的标识符。``-1`` 表示路径的最后一个" -"节点。" +"用于从路径序列中的 ``节点`` 到下一个节点的边的标识符。``-1`` 表示路径的最后一" +"个节点。" msgid "Aggregate cost from ``start_v`` to ``node``." msgstr "从 ``start_v`` 到 ``node`` 的总成本。" @@ -10468,7 +10505,8 @@ msgid "" "When ``type`` = **'e'**: Identifier of the source vertex of the current edge " "(``source``, ``target``)." msgstr "" -"当 ``type`` = **'e'** 时：当前边（``source``，``target`` ）的source顶点标识符。" +"当 ``type`` = **'e'** 时：当前边（``source``，``target`` ）的source顶点标识" +"符。" msgid "" "When ``type`` = **'e'**: Identifier of the target vertex of the current edge " @@ -10605,8 +10643,8 @@ msgid "" "passed to the function as the geometry column, and the geometry column " "``the_geom`` is passed to the function as the id column." msgstr "" -"当参数未按适当顺序给出时会导致错误：在此示例中，表 ``ege_table`` 的列``id``" -"被错误地传递给函数作为几何列，而几何列 ``the_geom`` 被错误地传递给函数作为 id " +"当参数未按适当顺序给出时会导致错误：在此示例中，表 ``ege_table`` 的列``id``被" +"错误地传递给函数作为几何列，而几何列 ``the_geom`` 被错误地传递给函数作为 id " "列。" msgid "" @@ -10773,9 +10811,9 @@ msgid "" "``mytable`` is passed to the function as the geometry column, and the " "geometry column ``the_geom`` is passed to the function as the source column." msgstr "" -"当参数没有按照适当的顺序提供时，将会发生错误：在这个例子中，表 ``mytable`` 的源" -"列 ``source`` 被错误地传递给函数作为几何列，而几何列``the_geom`` 被错误地传递给" -"函数作为源列。" +"当参数没有按照适当的顺序提供时，将会发生错误：在这个例子中，表 ``mytable`` 的" +"源列 ``source`` 被错误地传递给函数作为几何列，而几何列``the_geom`` 被错误地传" +"递给函数作为源列。" msgid "Example 4" msgstr "示例 4" @@ -10813,8 +10851,8 @@ msgid "" "``mygeom`` is passed to the function as the source column." msgstr "" "当参数没有按照适当的顺序提供时，会发生错误。在这个例子中，表 ``mytable`` 的" -"``src`` 列被错误地传递给函数作为几何列，而几何列 ``mygeom`` 被错误地传递给函数作" -"为源列。" +"``src`` 列被错误地传递给函数作为几何列，而几何列 ``mygeom`` 被错误地传递给函" +"数作为源列。" msgid "Example 10" msgstr "示例 10" @@ -10862,7 +10900,8 @@ msgstr ":doc:`topology-functions` 用于路由算法的拓扑概述。" msgid "" ":doc:`pgr_createTopology` ` to create a topology based " "on the geometry." -msgstr ":doc:`pgr_createTopology` ` 根据几何图形创建拓扑。" +msgstr "" +":doc:`pgr_createTopology` ` 根据几何图形创建拓扑。" msgid "" ":doc:`pgr_analyzeGraph` to analyze the edges and vertices of the edge table." @@ -11026,7 +11065,8 @@ msgstr "从顶点 :math:`\\{5, 10\\}` 到顶点 :math:`11`" msgid "" "From vertices :math:`\\{5, 15\\}` to vertices :math:`\\{11, 17\\}` on an " "**undirected** graph" -msgstr "在 **无向** 图上，从顶点 :math:`\\{5, 15\\} ` 到顶点 :math:`\\{11, 17\\}`" +msgstr "" +"在 **无向** 图上，从顶点 :math:`\\{5, 15\\} ` 到顶点 :math:`\\{11, 17\\}`" msgid "Return columns" msgstr "返回列" @@ -11048,7 +11088,8 @@ msgstr "``pgr_degree`` —对于无向图中的每个顶点，返回与该顶点 msgid "Calculates the degree of the vertices of an **undirected** graph" msgstr "计算 **无向** 图顶点的度数" -msgid "pgr_degree(`Edges SQL`_ , `Vertex SQL`_ , [``dryrun``])" +#, fuzzy +msgid "pgr_degree(`Edges SQL`_ , `Vertex SQL`_, [``dryrun``])" msgstr "pgr_degree(`Edges SQL`_ , `Vertex SQL`_ , [``dryrun``])" msgid "RETURNS SETOF |result-degree|" @@ -11141,8 +11182,8 @@ msgid "" "pgr_degree and work with the ``in_edges`` and ``out_edges`` columns directly." msgstr "" "如果您已经使用 ``pgr_extractVertices`` 构建了一个顶点表，并且想要整个图的度而" -"不是子集，则可以放弃使用 pgr_degree 并直接使用 ``in_edges`` 和 ``out_edges``" -" 列。" +"不是子集，则可以放弃使用 pgr_degree 并直接使用 ``in_edges`` 和 ``out_edges`` " +"列。" msgid ":doc:`pgr_extractVertices`" msgstr ":doc:`pgr_extractVertices`" @@ -11784,7 +11825,8 @@ msgid "" "Both are equaly good as they have the same cost. (lines: `13` and `14` and " "lines: `15` and `16`)" msgstr "" -"它们都一样好，因为它们具有相同的成本（线路：`13` 和`14`以及线路：`15` 和`16`）" +"它们都一样好，因为它们具有相同的成本（线路：`13` 和`14`以及线路：`15` 和" +"`16`）" msgid "Dijkstra optional parameters" msgstr "Dijkstra 可选参数" @@ -11899,9 +11941,8 @@ msgid "" "the shortest path between :math:`vertex_i` and :math:`vertex_{i+1}` for all :" "math:`i < size\\_of(via\\;vertices)`." msgstr "" -"给定一个顶点列表和一个图，该函数等价于为所有 " -":math:`i < size\\_of(via\\;vertices)`" -"的 :math:`vertex_i` 和 :math:`vertex_{i+1}` 之间找到最短路径。" +"给定一个顶点列表和一个图，该函数等价于为所有 :math:`i < size\\_of(via\\;" +"vertices)`的 :math:`vertex_i` 和 :math:`vertex_{i+1}` 之间找到最短路径。" msgid "Route" msgstr "路线" @@ -11960,8 +12001,8 @@ 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 "" -"所有这些示例都是关于在 **有向** 图上按顺序访问顶点 :math:`\\{5, 7, 1, 8, 15\\}" -"` 的路径。" +"所有这些示例都是关于在 **有向** 图上按顺序访问顶点 :math:`\\{5, 7, 1, 8, " +"15\\}` 的路径。" msgid "The main query" msgstr "主查询" @@ -12017,8 +12058,8 @@ msgid "" "than or equal to the value ``distance``. The edges extracted will conform to " "the corresponding spaning tree." msgstr "" -"使用Dijkstra算法，提取所有成本小于或等于值 ``distance`` 的节点。提取的边将符合" -"相应的生成树。" +"使用Dijkstra算法，提取所有成本小于或等于值 ``distance`` 的节点。提取的边将符" +"合相应的生成树。" msgid "" "pgr_drivingDistance(`Edges SQL`_, **Root vid**, **distance**, [``directed``])" @@ -12116,8 +12157,8 @@ msgid "" "proper edge coloring of graph) is equal to the degree :math:`\\Delta + 1` of " "the graph, (:math:`x'(G) = \\Delta`)" msgstr "" -"色数（chromatic number） :math:`x'(G)`（用于图的适当边着色所需的最小颜色数）等" -"于图的度 :math:`\\Delta + 1`（ :math:`x'(G) = \\Delta`）" +"色数（chromatic number） :math:`x'(G)`（用于图的适当边着色所需的最小颜色数）" +"等于图的度 :math:`\\Delta + 1`（ :math:`x'(G) = \\Delta`）" msgid "The algorithm tries to assign the least possible color to every edge." msgstr "该算法尝试为每条边分配尽可能少的颜色。" @@ -12216,7 +12257,8 @@ msgstr "" msgid "" "pgr_edgeDisjointPaths(`Edges SQL`_, `Combinations SQL`_, [``directed``])" -msgstr "pgr_edgeDisjointPaths(`Edges SQL`_, `Combinations SQL`_, [``directed``])" +msgstr "" +"pgr_edgeDisjointPaths(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgid "Returns set of |result-disjoint|" msgstr "Returns set of |result-disjoint|" @@ -12323,9 +12365,9 @@ msgid "" "complexity of :math:`O( | E | )` for random graphs. This is significantly " "faster in terms of computation speed." msgstr "" -"该算法的最坏运行时间为 :math:`O(| V | * | E |)` ，类似于Bellman-Ford算法的时间" -"复杂度。然而，实验表明，对于随机图，该算法的平均运行时间复杂度为 :math:`O( | " -"E | )`。这在计算速度上明显更快。" +"该算法的最坏运行时间为 :math:`O(| V | * | E |)` ，类似于Bellman-Ford算法的时" +"间复杂度。然而，实验表明，对于随机图，该算法的平均运行时间复杂度为 :math:" +"`O( | E | )`。这在计算速度上明显更快。" msgid "" "Thus, the algorithm is at-best, significantly faster than Bellman-Ford " @@ -12464,8 +12506,8 @@ msgid "" "To use this inner query the columns ``geom``, ``startpoint`` and " "``endpoint`` should not be part of the set of columns." msgstr "" -"要使用此内部查询，列 ``geom``、``startpoint`` 和``endpoint`` 不应成为列集的一部" -"分。" +"要使用此内部查询，列 ``geom``、``startpoint`` 和``endpoint`` 不应成为列集的一" +"部分。" msgid "``NULL`` When the ``id`` is not part of the inner query" msgstr "``NULL`` 当 ``id`` 不是内部查询的一部分时" @@ -12625,8 +12667,8 @@ msgid "" "When ``true`` calculations are not performed and the query to do the " "calculations is exposed in a PostgreSQL ``NOTICE``." msgstr "" -"当为 ``true`` 时，不执行计算，并在 PostgreSQL 的 ``NOTICE`` 中显示执行计算的查" -"询。" +"当为 ``true`` 时，不执行计算，并在 PostgreSQL 的 ``NOTICE`` 中显示执行计算的" +"查询。" msgid "The ``LINESTRING`` geometry of the edge." msgstr "边的 ``LINESTRING`` 几何。" @@ -12775,7 +12817,8 @@ msgstr "``side``： **原始点** 位于边 :math:`8` 的右侧。" msgid "" "``distance``: The **original point** is located :math:`0.19..` length units " "from edge :math:`8`." -msgstr "``distance``： **原始点** 距离边 :math:`8` 有 :math:`0.19..` 长度单位。" +msgstr "" +"``distance``： **原始点** 距离边 :math:`8` 有 :math:`0.19..` 长度单位。" msgid "One answer, all columns" msgstr "一个答案，所有列" @@ -12794,8 +12837,8 @@ msgid "" "From all edges within :math:`0.5` distance units from the **original " "point**: :math:`{5}` is the closest one." msgstr "" -"从距离 **原始点** 不超过 :math:`0.5` 距离单位的所有边中，边 :math:`{5}` 是最近" -"的一条。" +"从距离 **原始点** 不超过 :math:`0.5` 距离单位的所有边中，边 :math:`{5}` 是最" +"近的一条。" msgid "" "``geom``: Contains the geometry of the closest point on edge :math:`5` from " @@ -12806,8 +12849,8 @@ msgid "" "``edge``: Contains the ``LINESTRING`` geometry of the **original point** to " "the closest point on on edge :math:`5` ``geom``" msgstr "" -"``edge``：包含了从 **原始点** 到边 :math:`5` ``geom`` 上最近点的 ``LINESTRING`` 几" -"何形状" +"``edge``：包含了从 **原始点** 到边 :math:`5` ``geom`` 上最近点的 " +"``LINESTRING`` 几何形状" msgid "At most two answers with all columns" msgstr "所有列最多有两个答案" @@ -12824,8 +12867,8 @@ msgid "" "``edge``: Contains the ``LINESTRING`` geometry of the **original point** to " "the closest point on on edge :math:`8` ``geom``" msgstr "" -"``edge``：包含了从 **原始点** 到边 :math:`8` ``geom`` 上最近点的 ``LINESTRING`` 几" -"何形状" +"``edge``：包含了从 **原始点** 到边 :math:`8` ``geom`` 上最近点的 " +"``LINESTRING`` 几何形状" msgid "One point dry run execution" msgstr "单点模拟执行" @@ -12843,8 +12886,8 @@ msgid "" "Because it is a **dry run** excecution, the code for all calculations are " "shown on the PostgreSQL ``NOTICE``." msgstr "" -"由于这是一次 **模拟** 执行，所有计算的代码都显示在 PostgreSQL 的 ``NOTICE``" -" 中。" +"由于这是一次 **模拟** 执行，所有计算的代码都显示在 PostgreSQL 的 ``NOTICE`` " +"中。" msgid "``dryrun => true``" msgstr "``dryrun => true``" @@ -12891,8 +12934,8 @@ msgid "" "Edge :math:`5` is before :math:`8` therefore edge :math:`5` has the shortest " "distance to ``POINT(2.9 1.8)``." msgstr "" -"边 :math:`5` 在 :math:`8` 之前，因此边 :math:`5` 到 ``POINT(2.9 1.8)`` 的距离最" -"短。" +"边 :math:`5` 在 :math:`8` 之前，因此边 :math:`5` 到 ``POINT(2.9 1.8)`` 的距离" +"最短。" msgid "One answer per point, all columns" msgstr "每点一个答案，所有列" @@ -12911,8 +12954,8 @@ msgid "" "``edge``: Contains the ``LINESTRING`` geometry of the **original point** " "(``geom``) to the closest point on on edge." msgstr "" -"``edge``：包含了 **原始点** （``geom``）到最接近的边上的 ``LINESTRING`` 几何形" -"状。" +"``edge``：包含了 **原始点** （``geom``）到最接近的边上的 ``LINESTRING`` 几何" +"形状。" msgid "Many points dry run execution" msgstr "多点模拟执行" @@ -13167,8 +13210,8 @@ msgid "" "`Boost: Hawick Circuit Algorithm `__" msgstr "" -"`Boost：Hawick 电路算法 `__" +"`Boost：Hawick 电路算法 `__" msgid "``pgr_isPlanar`` - Experimental" msgstr "``pgr_isPlanar`` - 实验" @@ -13248,8 +13291,7 @@ msgid "" "``pgr_johnson`` - Returns the sum of the costs of the shortest path for each " "pair of nodes in the graph using Floyd-Warshall algorithm." msgstr "" -"``pgr_johnson`` - 使用 Jhonson 算法返回图中每对节点的最短路径成本之" -"和。." +"``pgr_johnson`` - 使用 Jhonson 算法返回图中每对节点的最短路径成本之和。." msgid "" "The Johnson algorithm, is a good choice to calculate the sum of the costs of " @@ -13257,8 +13299,8 @@ msgid "" "It usees the Boost's implementation which runs in :math:`O(V E \\log V)` " "time," msgstr "" -"Johnson算法是计算图中每一对节点的最短路径成本之和的好选择，特别适用于 *稀疏图*。" -"它使用了Boost的实现，其运行时间为 :math:`O(V E \\log V)`" +"Johnson算法是计算图中每一对节点的最短路径成本之和的好选择，特别适用于 *稀疏图" +"*。它使用了Boost的实现，其运行时间为 :math:`O(V E \\log V)`" msgid "pgr johnson(`Edges SQL`_, [``directed``])" msgstr "pgr johnson(`Edges SQL`_, [``directed``])" @@ -13333,8 +13375,8 @@ msgid "" "than or equal to a **distance** from a **root** vertex (or vertices) within " "the calculated minimum spanning tree." msgstr "" -"使用 Kruskal 算法，在计算的最小生成树中提取总成本小于或等于距 **根** 顶点（或多" -"个顶点） **距离** 的节点。" +"使用 Kruskal 算法，在计算的最小生成树中提取总成本小于或等于距 **根** 顶点（或" +"多个顶点） **距离** 的节点。" msgid "Returned tree nodes from a root vertex are on Depth First Search order." msgstr "从根顶点返回的树节点遵循深度优先搜索顺序。" @@ -13394,8 +13436,8 @@ msgid "" "**idom**, once **idom** of each vertex is calculated then by making every " "**idom** of each vertex as its parent, the dominator tree can be built." msgstr "" -"该算法计算每个顶点的 **直接支配者**（称为 **idom**），一旦计算出每个顶点的" -" **idom**，然后通过将每个顶点的 **idom** 作为其父节点，可以构建支配树。" +"该算法计算每个顶点的 **直接支配者**（称为 **idom**），一旦计算出每个顶点的 " +"**idom**，然后通过将每个顶点的 **idom** 作为其父节点，可以构建支配树。" msgid "The algorithm works in directed graph only." msgstr "该算法仅适用于有向图。" @@ -13757,8 +13799,8 @@ msgid "" "examples include the subgraph including edges 4, 7, 8, and 10 with " "``reverse_cost``." msgstr "" -"本节的示例基于 :doc:`sampledata` 网络。 这些示例包括包含具有 ``reverse_cost``" -" 的边 4、7、8 和 10 的子图。" +"本节的示例基于 :doc:`sampledata` 网络。 这些示例包括包含具有 " +"``reverse_cost`` 的边 4、7、8 和 10 的子图。" msgid "The data" msgstr "数据" @@ -14280,8 +14322,8 @@ msgid "" "nodes within the tolerance are considered the same node." msgstr "" "该函数读取 ``edge_table``表，该表具有主键列 ``id`` 和名为``the_geom`` 的几何" -"列，并将其中的所有段与所有其他段相交，然后创建表 ``edge_table_noded``。 它使用" -"``tolerance`` 来决定容差内的多个节点被视为同一节点。" +"列，并将其中的所有段与所有其他段相交，然后创建表 ``edge_table_noded``。 它使" +"用``tolerance`` 来决定容差内的多个节点被视为同一节点。" msgid "``float8`` tolerance for coincident points (in projection unit)dd" msgstr "``float8`` 重合点公差（以投影单位表示）dd" @@ -15290,8 +15332,8 @@ msgid "" "math:`i < size\\_of(via\\;vertices)` trying not to use restricted paths." msgstr "" "给定一个顶点列表和一个图，这个函数等同于在所有 :math:`i < size\\_of(via\\;" -"vertices)` 的情况下找到从 :math:`vertex_i` 到 :math:`vertex_{i+1}` 的最短路径，" -"尽量避免使用受限路径。" +"vertices)` 的情况下找到从 :math:`vertex_i` 到 :math:`vertex_{i+1}` 的最短路" +"径，尽量避免使用受限路径。" msgid "The paths represents the sections of the route." msgstr "路径代表路线的各个部分。" @@ -15334,8 +15376,8 @@ msgid "" "for the ``path_id = 5`` from ``6`` to ``3`` because the path :math:`15 " "\\rightarrow 1` is restricted." msgstr "" -"检测哪些子路径通过了限制，本例中是针对 ``path_id = 5`` 从 ``6`` 到 ``3``，因为该" -"路径 :math:`15 \\rightarrow 1` 受到限制。" +"检测哪些子路径通过了限制，本例中是针对 ``path_id = 5`` 从 ``6`` 到 ``3``，因" +"为该路径 :math:`15 \\rightarrow 1` 受到限制。" msgid "Executes the :doc:`pgr_trsp` algorithm for the conflicting paths." msgstr "执行 :doc:`pgr_trsp` 针对冲突路径建议的算法。" @@ -15395,9 +15437,9 @@ msgid "" "`i < size\\_of(via\\;vertices)` trying not to use restricted paths." msgstr "" "给定一个图、对图边的一组限制、图边上的一组点和一个顶点列表，该函数相当于查" -"找 :math:`vertex_i` 和 :math:`vertex_{i+1}` 之间的最短路径（其中 " -":math:`vertex` 可以是图上的顶点或点） 对于所有 " -":math:`i < size\\_of(via\\;vertices)` 尝试不使用受限路径的人。" +"找 :math:`vertex_i` 和 :math:`vertex_{i+1}` 之间的最短路径（其中 :math:" +"`vertex` 可以是图上的顶点或点） 对于所有 :math:`i < size\\_of(via\\;" +"vertices)` 尝试不使用受限路径的人。" msgid "is a sequence of paths" msgstr "是一系列路径" @@ -15504,8 +15546,8 @@ 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 "" -"点 :math:`-2`在从顶点 :math:`1` 到点 :math:`-1` 的路线上被访问（参见行 ，其中:" -"math:`seq = 4`）。" +"点 :math:`-2`在从顶点 :math:`1` 到点 :math:`-1` 的路线上被访问（参见行 ，其" +"中:math:`seq = 4`）。" msgid "Usage variations" msgstr "用法变化" @@ -15514,8 +15556,8 @@ 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 "" -"所有这些示例都是关于按有向图上的顺序访问顶点 :math:`\\{-6, 7, -4, 8, -2\\}` 的" -"路线。" +"所有这些示例都是关于按有向图上的顺序访问顶点 :math:`\\{-6, 7, -4, 8, -2\\}` " +"的路线。" msgid "Status of \"passes in front\" or \"visits\" of the nodes and points." msgstr "节点、点的\"通过\"或\"访问\"状态。" @@ -15528,8 +15570,8 @@ msgid "" "the ``path_id = 1`` from ``-6`` to ``15`` because the path :math:`9 " "\\rightarrow 16` is restricted." msgstr "" -"检测哪些路径通过了限制，在本例中是针对从 ``-6`` 到 ``15`` 的 ``path_id = 1`` ，" -"因为路径 :math:`9 \\rightarrow 16` 受到限制。" +"检测哪些路径通过了限制，在本例中是针对从 ``-6`` 到 ``15`` 的 ``path_id = " +"1`` ，因为路径 :math:`9 \\rightarrow 16` 受到限制。" msgid "" "Executes the :ref:`TRSP-family:TRSP algorithm` for the conflicting paths." @@ -15692,8 +15734,8 @@ msgid "" "From point :math:`1` to vertex :math:`10` and from vertex :math:`6` to " "point :math:`3` with right side driving configuration." msgstr "" -"从点 :math:`1` 到顶点 :math:`10`以及从顶点 :math:`6`到点 :math:`3`，采用右侧驾" -"驶配置。" +"从点 :math:`1` 到顶点 :math:`10`以及从顶点 :math:`6`到点 :math:`3`，采用右侧" +"驾驶配置。" msgid "" "Find the routes from vertex :math:`1` to the two closest locations on the " @@ -15716,8 +15758,8 @@ msgid "" "From point :math:`1` and vertex :math:`6` to point :math:`3` to vertex :math:" "`1` on an undirected graph, with details." msgstr "" -"无向图上从点 :math:`1` 和顶点 :math:`6` 到点 :math:`3`到顶点 :math:`1` 的详细信" -"息。" +"无向图上从点 :math:`1` 和顶点 :math:`6` 到点 :math:`3`到顶点 :math:`1` 的详细" +"信息。" msgid "pgr_turnRestrictedPath - Experimental" msgstr "pgr_turnRestrictedPath - 实验性" @@ -15917,8 +15959,8 @@ msgid "" "From point :math:`1` to vertex :math:`10`, and from vertex :math:`6` to " "point :math:`3` with **right** side driving." msgstr "" -"从点 :math:`1` 到顶点 :math:`10`，以及从顶点 :math:`6` 到点 :math:`3` ，**右侧" -"** 行驶。" +"从点 :math:`1` 到顶点 :math:`10`，以及从顶点 :math:`6` 到点 :math:`3` ，**右" +"侧** 行驶。" msgid "" "Identifier of the starting vertex of the path. Negative value is for point’s " @@ -15959,8 +16001,8 @@ msgid "" "All the examples are about traveling from point :math:`1` and vertex :math:" "`5` to points :math:`\\{2, 3, 6\\}` and vertices :math:`\\{10, 11\\}`" msgstr "" -"所有示例都是关于从点 :math:`1` 和顶点 :math:`5` 到点 :math:`\\{2, 3, 6\\}` 和顶" -"点 :math:`\\{10, 11\\}` 的旅行" +"所有示例都是关于从点 :math:`1` 和顶点 :math:`5` 到点 :math:`\\{2, 3, 6\\}` 和" +"顶点 :math:`\\{10, 11\\}` 的旅行" msgid "Passes in front or visits with right side driving." msgstr "从前方超车或右侧行驶来访。" @@ -16148,7 +16190,8 @@ msgstr "``pgr_withPointsCostMatrix`` - 拟议" msgid "" "``pgr_withPointsCostMatrix`` - Calculates a cost matrix using :doc:" "`pgr_withPoints`." -msgstr "``pgr_withPointsCostMatrix`` - 使用 :doc:`pgr_withPoints` 计算成本矩阵." +msgstr "" +"``pgr_withPointsCostMatrix`` - 使用 :doc:`pgr_withPoints` 计算成本矩阵." msgid "" "pgr_withPointsCostMatrix(`Edges SQL`_, `Points SQL`_, **start vids**, " @@ -16160,7 +16203,8 @@ msgstr "" msgid "" "Cost matrix for points :math:`\\{1, 6\\}` and vertices :math:`\\{10, 11\\}` " "on an **undirected** graph" -msgstr "**无向** 图上的点 :math:`\\{1, 6\\}` 和顶点 :math:`\\{10, 11\\}` 的成本矩阵" +msgstr "" +"**无向** 图上的点 :math:`\\{1, 6\\}` 和顶点 :math:`\\{10, 11\\}` 的成本矩阵" msgid "Returning a **symmetrical** cost matrix" msgstr "返回 **对称** 成本矩阵" @@ -16189,8 +16233,8 @@ msgid "" "Signature change: ``driving_side`` parameter changed from named optional to " "unnamed compulsory **driving side**." msgstr "" -"签名更改： ``driving_side`` 参数从已命名的可选参数改为未命名的必选参数" -" **driving side**。" +"签名更改： ``driving_side`` 参数从已命名的可选参数改为未命名的必选参数 " +"**driving side**。" msgid "``pgr_withPointsDD`` (`Single vertex`)" msgstr "``pgr_withPointsDD`` （`单顶点`）" @@ -16201,7 +16245,8 @@ msgstr "添加了 ``depth``、``pred`` 和 ``start_vid`` 列。" msgid "Added ``depth``, ``pred`` columns." msgstr "添加了 ``depth``，``pred`` 列。" -msgid "When ``details`` is ``false`` :" +#, fuzzy +msgid "When ``details`` is ``false``:" msgstr "当 ``details`` 为``false`` 时：" msgid "" @@ -16231,8 +16276,8 @@ msgid "" "``**distance**`` from the starting point. The edges extracted will conform " "the corresponding spanning tree." msgstr "" -"修改图以包含点，并使用 Dijkstra 算法，提取成本小于或等于距起点 ``**距离**`` 值" -"的所有节点和点。 提取的边将符合相应的生成树。" +"修改图以包含点，并使用 Dijkstra 算法，提取成本小于或等于距起点 ``**距离**`` " +"值的所有节点和点。 提取的边将符合相应的生成树。" msgid "" "pgr_withPointsDD(`Edges SQL`_, `Points SQL`_, **root vid**, **distance**, " @@ -16382,7 +16427,8 @@ msgstr "" msgid "" "Modifies the graph to include the points defined in the `Points SQL`_ and " "using Yen algorithm, finds the :math:`K` shortest paths." -msgstr "修改图以包括 `Points SQL`_ 中定义的点并使用 Yen 算法查找 :math:`K` 最短路径。" +msgstr "" +"修改图以包括 `Points SQL`_ 中定义的点并使用 Yen 算法查找 :math:`K` 最短路径。" msgid "" "pgr_withPointsKSP(`Edges SQL`_, `Points SQL`_, **start vid**, **end vid**, " @@ -16447,16 +16493,16 @@ msgid "" "**directed** graph with **right** side driving and **details** set to " "**True**" msgstr "" -"在具有 **右侧** 驾驶的 **有向** 图上，从点 :math:`1` 和顶点 :math:`6` 到点 :math:" -"`3` 获取一条路径，且 **details** 设置为 **True**" +"在具有 **右侧** 驾驶的 **有向** 图上，从点 :math:`1` 和顶点 :math:`6` 到点 :" +"math:`3` 获取一条路径，且 **details** 设置为 **True**" msgid "" "Get a path from point :math:`1` and vertex :math:`6` to point :math:`3` and " "vertex :math:`1` on a **directed** graph with **left** side driving and " "**heap_paths** set to **True**" msgstr "" -"在具有 **左侧** 驾驶的 **有向** 图上，从点 :math:`1` 和顶点 :math:`6` 到点 :math:" -"`3` 和顶点 :math:`1` 获取一条路径，且 **heap_paths** 设置为 **True**" +"在具有 **左侧** 驾驶的 **有向** 图上，从点 :math:`1` 和顶点 :math:`6` 到点 :" +"math:`3` 和顶点 :math:`1` 获取一条路径，且 **heap_paths** 设置为 **True**" msgid "Using a combinations table on an **directed** graph" msgstr "在 **有向** 图上使用组合表" @@ -16691,6 +16737,74 @@ msgstr "pgRouting 3.7" msgid "pgRouting 3.6" msgstr "pgRouting 3.6" +#, fuzzy +msgid "pgRouting 3.6.3 Release Notes" +msgstr "pgRouting 3.6.1 发布说明" + +#, fuzzy +msgid "" +"To see all issues & pull requests closed by this release see the `Git closed " +"milestone for 3.6.3 `__" +msgstr "" +"要查看此版本关闭的所有问题和拉取请求，请参阅 `3.6.1Git 关闭里程碑 `_" + +msgid "Build" +msgstr "构建" + +msgid "Explicit minimum requirements:" +msgstr "" + +msgid "postgres 11.0.0" +msgstr "" + +#, fuzzy +msgid "postgis 3.0.0" +msgstr "版本3.0.0" + +msgid "Code fixes" +msgstr "代码修正" + +msgid "Fix warnings from cpplint." +msgstr "" + +msgid "Fix warnings from clang 18." +msgstr "" + +#, fuzzy +msgid "CI tests" +msgstr "pgtap 测试" + +msgid "Add a clang tidy test on changed files." +msgstr "" + +msgid "" +"Update test not done on versions: 3.0.1, 3.0.2, 3.0.3, 3.0.4, 3.1.0, 3.1.1, " +"3.1.2" +msgstr "" + +msgid "Documentation" +msgstr "文档" + +msgid "Results of documentation queries adujsted to boost 1.83.0 version:" +msgstr "" + +#, fuzzy +msgid "pgr_edgeDisjointPaths" +msgstr "pgr_edgeDisjointPaths：" + +msgid "pgr_stoerWagner" +msgstr "pgr_stoerWagner" + +msgid "pgtap tests" +msgstr "pgtap 测试" + +#, fuzzy +msgid "bug fixes" +msgstr "Bug修复" + #, fuzzy msgid "pgRouting 3.6.2 Release Notes" msgstr "pgRouting 3.6.1 发布说明" @@ -16711,9 +16825,6 @@ msgstr "" msgid "The upgrade was failing for same minor" msgstr "" -msgid "Code fixes" -msgstr "代码修正" - msgid "Fix warnings from cpplint" msgstr "" @@ -16867,9 +16978,6 @@ msgstr "" "`#2522 `__ bdAstar 代码简" "化。" -msgid "Documentation" -msgstr "文档" - msgid "" "`#2490 `__ Automatic page " "history links." @@ -16947,9 +17055,6 @@ msgstr "" "`#2561 `__ 在 SQL 中不使" "用通配符" -msgid "pgtap tests" -msgstr "pgtap 测试" - msgid "" "`#2559 `__ pgtap test " "using sampledata" @@ -17464,9 +17569,6 @@ msgstr "" "碑 `_。" -msgid "Build" -msgstr "构建" - msgid "" "`#1850 `__: Change Boost " "min version to 1.56" @@ -18090,9 +18192,6 @@ msgstr "pgr_maxFlowMinCost_Cost" msgid "pgr_turnRestrictedPath" msgstr "pgr_turnRestrictedPath" -msgid "pgr_stoerWagner" -msgstr "pgr_stoerWagner" - msgid "pgr_dagShortestpath" msgstr "pgr_dagShortestpath" @@ -19417,7 +19516,8 @@ msgstr ":math:`x` 几何图形起始顶点的坐标。" msgid "" "For convinience it is saved on the table but can be calculated as " "``ST_X(ST_StartPoint(geom))``." -msgstr "为了方便起见，它被保存在表格中，但也可以计算为 " +msgstr "" +"为了方便起见，它被保存在表格中，但也可以计算为 " "``ST_X(ST_StartPoint(geom))``。" msgid ":math:`y` coordinate of the ending vertex of the geometry." @@ -19426,7 +19526,8 @@ msgstr ":math:`y` 几何图形结束顶点的坐标。" msgid "" "For convinience it is saved on the table but can be calculated as " "``ST_Y(ST_EndPoint(geom))``." -msgstr "为方便起见，它保存在表格中，但也可以计算为 ``ST_Y(ST_EndPoint(geom))``。" +msgstr "" +"为方便起见，它保存在表格中，但也可以计算为 ``ST_Y(ST_EndPoint(geom))``。" msgid "The geometry of the segments." msgstr "分段的几何形状。" @@ -19502,7 +19603,8 @@ msgid "" "This queries based on the vertices data create a topology by filling the " "``source`` and ``target`` columns in the edges table." msgstr "" -"此查询基于顶点数据，通过填充边表中的 ``source`` 列和 ``target`` 列来创建拓扑。" +"此查询基于顶点数据，通过填充边表中的 ``source`` 列和 ``target`` 列来创建拓" +"扑。" msgid "Topology data" msgstr "拓扑数据" @@ -19604,9 +19706,9 @@ msgid "" "companies providing pgRouting development and consulting services." msgstr "" "pgRouting 社区支持可通过 `pgRouting 网站 `_、`文档 `_、教程、邮件列表等获得。 " -"如果您正在寻求 :ref:`商业支持 `，请在下面找到提供 " -"pgRouting 开发和咨询服务的公司列表。" +"html>`_、`文档 `_、教程、邮件列表等获得。 如果您" +"正在寻求 :ref:`商业支持 `，请在下面找到提供 pgRouting 开" +"发和咨询服务的公司列表。" msgid "Reporting Problems" msgstr "报告问题" @@ -19615,8 +19717,8 @@ msgid "" "Bugs are reported and managed in an `issue tracker `_. Please follow these steps:" msgstr "" -"错误在 `问题跟踪器 `_ 中报告和管" -"理。 请按照以下步骤操作：" +"错误在 `问题跟踪器 `_ 中报告和" +"管理。 请按照以下步骤操作：" msgid "" "Search the tickets to see if your problem has already been reported. If so, " @@ -19773,7 +19875,8 @@ msgstr "收缩 - 函数族" msgid "" "This family of functions is used for transforming a given input graph :math:" "`G(V,E)` into a new graph :math:`G'(V',E')`." -msgstr "该函数族用于将给定的输入图 :math:`G(V,E)` 转换为新图 :math:`G'(V',E')`。" +msgstr "" +"该函数族用于将给定的输入图 :math:`G(V,E)` 转换为新图 :math:`G'(V',E')`。" msgid "Traversal - Family of functions" msgstr "Traversal - 函数族" @@ -19941,8 +20044,9 @@ msgid "" "For this section the following city (see :doc:`sampledata`) some interesing " "points such as restaurant, supermarket, post office, etc. will be used as " "example." -msgstr "对于本节，将使用以下城市（参见 " -":doc:`sampledata`）一些有趣的点（例如餐馆、超市、邮局等）作为示例。" +msgstr "" +"对于本节，将使用以下城市（参见 :doc:`sampledata`）一些有趣的点（例如餐馆、超" +"市、邮局等）作为示例。" msgid "The graph is **directed**" msgstr "图是 **有向** 的" @@ -20151,7 +20255,8 @@ msgid "" "This family of functions belongs to the :doc:`withPoints-category` and the " "functions that compose them are based one way or another on dijkstra " "algorithm." -msgstr "这一系列函数属于 :doc:`withPoints-category`，组成它们的函数以某种方式基于 " +msgstr "" +"这一系列函数属于 :doc:`withPoints-category`，组成它们的函数以某种方式基于 " "dijkstra 算法。" msgid "Depending on the name:" @@ -20176,3 +20281,12 @@ msgstr "pgr_withPointsDD 是 **带有点** 的 pgr_drivenDistance" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "pgr_withPointsvia 是 **带有点** 的" +#~ msgid "" +#~ ":math:`V = source \\cup target \\cup {start_{vid}} \\cup {end_{vid}}`" +#~ msgstr "" +#~ ":math:`V = source \\cup target \\cup {start_{vid}} \\cup {end_{vid}}`" + +#~ msgid "" +#~ "From vertex :math:`6` to vertices :math:`\\{ 10, 17\\}` on a " +#~ "**directed**graph" +#~ msgstr "在 **有向** 图上从顶点 :math:`6` 到顶点 :math:`\\{ 10, 17\\}`" From 34cb4d48cc57cfdc680fb77f2e984b730b324f4d Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Thu, 10 Oct 2024 19:40:49 +0000 Subject: [PATCH 384/428] Translated using Weblate (Spanish) Currently translated at 94.2% (5008 of 5316 strings) Co-authored-by: Celia Virginia Vergara Castillo Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ Translation: pgRouting/pgRouting --- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 37 ++++++++----------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 535d341828..63a3f94fd3 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-10-10 03:40+0000\n" -"PO-Revision-Date: 2024-09-23 19:49+0000\n" +"PO-Revision-Date: 2024-10-10 19:40+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" @@ -4941,21 +4941,18 @@ msgstr "" msgid "Support" msgstr "Soporte" -#, fuzzy msgid "" "`#2656 `__ Stop support of " "PostgreSQL12 on pgrouting v3.7" msgstr "" -"`#2607 `__ Leer datos " -"postgresql en C++" +"`#2656 `__ PostgreSQL 12 " +"no se apya en pgrouting v3.7" -#, fuzzy msgid "Stopping support of PostgreSQL 12" -msgstr "A partir de PostgreSQL 12::" +msgstr "PostgreSQL 12 ya no es soportado" -#, fuzzy msgid "CI does not test for PostgreSQL 12" -msgstr "Funciona para postgreSQL 10" +msgstr "CI no hace pruebas con PostgreSQL 12" msgid "New experimental functions" msgstr "Nuevas funciones experimentales" @@ -14122,7 +14119,7 @@ msgid "For the **original point** ``POINT(2.9 1.8)``" msgstr "Para el **punto original** ``POINT(2.9 1.8)``" msgid "Edge :math:`5` is the closest edge to the **original point**" -msgstr "La arista :math:`5` es la más cercana al **punto original**." +msgstr "La arista :math:`5` es la más cercana al **punto original**" msgid "" "``geom``: Contains the geometry of the **original point** ``POINT(2.9 1.8)``" @@ -14187,7 +14184,7 @@ msgstr "" msgid "Is it on the left, right or both sides of the segment ``edge_id``" msgstr "" -"¿Está a la izquierda, a la derecha o a ambos lados del segmento ``edge_id``?" +"Está a la izquierda, a la derecha o a ambos lados del segmento ``edge_id``" msgid "Where in the segment is the point located." msgstr "En qué parte del segmento se encuentra el punto." @@ -14832,6 +14829,9 @@ msgid "" "\\rightarrow 3, 3 \\rightarrow 1, 3 \\rightarrow 2, 3 \\rightarrow 4, 4 " "\\rightarrow 3\\})`" msgstr "" +":math:`G(V,E) = G(\\{1,2,3,4\\},\\{ 1 \\rightarrow 2, 1 \\rightarrow 4, 2 " +"\\rightarrow 3, 3 \\rightarrow 1, 3 \\rightarrow 2, 3 \\rightarrow 4, 4 " +"\\rightarrow 3\\})`" msgid "Representation as directed with shared edge identifiers" msgstr "" @@ -18162,19 +18162,17 @@ msgstr "pgRouting 3.7" msgid "pgRouting 3.6" msgstr "pgRouting 3.6" -#, fuzzy msgid "pgRouting 3.6.3 Release Notes" -msgstr "Notas de la versión de pgRouting 3.6.2" +msgstr "Notas de la versión de pgRouting 3.6.3" -#, fuzzy msgid "" "To see all issues & pull requests closed by this release see the `Git closed " "milestone for 3.6.3 `__" msgstr "" "Para ver todas las incidencias y pull requests cerrados por esta versión, " -"consulte `Git closed milestone for 3.6.2 `__" +"consulte `Git closed milestone for 3.6.3 `__" msgid "Build" msgstr "Construir" @@ -18185,9 +18183,8 @@ msgstr "" msgid "postgres 11.0.0" msgstr "" -#, fuzzy msgid "postgis 3.0.0" -msgstr "Versión 3.0.0" +msgstr "postgis 3.0.0" msgid "Code fixes" msgstr "Corrección de código" @@ -18198,9 +18195,8 @@ msgstr "" msgid "Fix warnings from clang 18." msgstr "" -#, fuzzy msgid "CI tests" -msgstr "Pruebas pgtap" +msgstr "Pruebas CI" msgid "Add a clang tidy test on changed files." msgstr "" @@ -18216,9 +18212,8 @@ msgstr "Documentación" msgid "Results of documentation queries adujsted to boost 1.83.0 version:" msgstr "" -#, fuzzy msgid "pgr_edgeDisjointPaths" -msgstr "pgr_edgeDisjointPaths:" +msgstr "pgr_edgeDisjointPaths" msgid "pgr_stoerWagner" msgstr "pgr_stoerWagner" From e462066126fc1084dde51760ccd4e617ea737cbb Mon Sep 17 00:00:00 2001 From: DeepL Date: Thu, 10 Oct 2024 19:40:49 +0000 Subject: [PATCH 385/428] Translated using Weblate (Spanish) Currently translated at 94.2% (5009 of 5316 strings) Translated using Weblate (Spanish) Currently translated at 94.2% (5008 of 5316 strings) Co-authored-by: DeepL Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ Translation: pgRouting/pgRouting --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 63a3f94fd3..61acfbb0e0 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-10-10 03:40+0000\n" "PO-Revision-Date: 2024-10-10 19:40+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"Last-Translator: DeepL \n" "Language-Team: Spanish \n" "Language: es\n" @@ -14831,10 +14831,10 @@ msgid "" msgstr "" ":math:`G(V,E) = G(\\{1,2,3,4\\},\\{ 1 \\rightarrow 2, 1 \\rightarrow 4, 2 " "\\rightarrow 3, 3 \\rightarrow 1, 3 \\rightarrow 2, 3 \\rightarrow 4, 4 " -"\\rightarrow 3\\})`" +"\\rightarrow 3})`" msgid "Representation as directed with shared edge identifiers" -msgstr "" +msgstr "Representación dirigida con identificadores de arista compartidos" msgid "" "For the simplicity, the design of the edges table on the database, has the " @@ -18221,9 +18221,8 @@ msgstr "pgr_stoerWagner" msgid "pgtap tests" msgstr "Pruebas pgtap" -#, fuzzy msgid "bug fixes" -msgstr "Correcciones" +msgstr "corrección de errores" msgid "pgRouting 3.6.2 Release Notes" msgstr "Notas de la versión de pgRouting 3.6.2" From d3e8bd5febd7059b8da08c57ccd4486a8105fb5b Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Thu, 10 Oct 2024 19:40:50 +0000 Subject: [PATCH 386/428] Translated using Weblate (Spanish) Currently translated at 94.3% (5014 of 5316 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 61acfbb0e0..d1224e3559 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-10-10 03:40+0000\n" -"PO-Revision-Date: 2024-10-10 19:40+0000\n" -"Last-Translator: DeepL \n" +"PO-Revision-Date: 2024-10-10 19:42+0000\n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" "Language: es\n" @@ -14834,7 +14834,7 @@ msgstr "" "\\rightarrow 3})`" msgid "Representation as directed with shared edge identifiers" -msgstr "Representación dirigida con identificadores de arista compartidos" +msgstr "Representación como dirigida con identificadores de arista compartidos" msgid "" "For the simplicity, the design of the edges table on the database, has the " From 378f2ec6e3bde7a6c1a767b4172fe019d1b3850f Mon Sep 17 00:00:00 2001 From: DeepL Date: Thu, 10 Oct 2024 19:41:06 +0000 Subject: [PATCH 387/428] Translated using Weblate (Spanish) Currently translated at 94.3% (5014 of 5316 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index d1224e3559..f462034065 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-10-10 03:40+0000\n" "PO-Revision-Date: 2024-10-10 19:42+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"Last-Translator: DeepL \n" "Language-Team: Spanish \n" "Language: es\n" @@ -14842,16 +14842,16 @@ msgid "" msgstr "" msgid "hundreds" -msgstr "" +msgstr "cientos" msgid "the source vertex" msgstr "el vértice de origen" msgid "tens" -msgstr "" +msgstr "decenas" msgid "always 0, acts as a separator" -msgstr "" +msgstr "siempre 0, actúa como separador" msgid "units" msgstr "unidades" @@ -14860,11 +14860,13 @@ msgid "the target vertex" msgstr "el vértice de destino" msgid "In this image," -msgstr "" +msgstr "En esta imagen," msgid "" "Single or double head arrows represent one edge (row) on the edges table." msgstr "" +"Las flechas de cabeza simple o doble representan una arista (fila) en la " +"tabla de aristas." msgid "The numbers in the yellow shadow are the edge identifiers." msgstr "" From 4437046b044a67685850134fefa3a1bfceb02ff4 Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Thu, 10 Oct 2024 19:42:18 +0000 Subject: [PATCH 388/428] Translated using Weblate (Spanish) Currently translated at 94.3% (5018 of 5316 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index f462034065..0147c0cc2a 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-10-10 03:40+0000\n" -"PO-Revision-Date: 2024-10-10 19:42+0000\n" -"Last-Translator: DeepL \n" +"PO-Revision-Date: 2024-10-10 19:43+0000\n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" "Language: es\n" @@ -14865,7 +14865,7 @@ msgstr "En esta imagen," msgid "" "Single or double head arrows represent one edge (row) on the edges table." msgstr "" -"Las flechas de cabeza simple o doble representan una arista (fila) en la " +"Las puntas de flechas simples o dobles representan una arista (fila) en la " "tabla de aristas." msgid "The numbers in the yellow shadow are the edge identifiers." From aeb2e47d31d430b6c2a5e3208d0a0a0db8ac7024 Mon Sep 17 00:00:00 2001 From: DeepL Date: Thu, 10 Oct 2024 19:42:35 +0000 Subject: [PATCH 389/428] Translated using Weblate (Spanish) Currently translated at 94.3% (5018 of 5316 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 0147c0cc2a..84892c6471 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-10-10 03:40+0000\n" "PO-Revision-Date: 2024-10-10 19:43+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"Last-Translator: DeepL \n" "Language-Team: Spanish \n" "Language: es\n" @@ -14876,6 +14876,8 @@ msgid "" "Two pair of edges share the same identifier when the ``reverse_cost`` column " "is used." msgstr "" +"Dos pares de aristas comparten el mismo identificador cuando se utiliza la " +"columna ``reverse_cost``." msgid "" "Edges :math:`{2 \\rightarrow 3, 3 \\rightarrow 2}` are represented with one " @@ -14907,7 +14909,7 @@ msgstr "" "arsitas" msgid "For all the other values of ``seq`` represent one edge." -msgstr "" +msgstr "Todos los demás valores de ``seq`` representan una arista." msgid "" "The ``cost`` and ``reverse_cost`` values represent the existence of the edge." @@ -14922,7 +14924,7 @@ msgid "When negative: the edge does not exist." msgstr "Cuando es negativo: la arista no existe." msgid "Representation as directed with unique edge identifiers" -msgstr "" +msgstr "Representación dirigida con identificadores de arista únicos" msgid "Single head arrows represent one edge (row) on the edges table." msgstr "" @@ -14930,7 +14932,7 @@ msgstr "" "aristas." msgid "There are no double head arrows" -msgstr "" +msgstr "No hay flechas de doble cabeza" msgid "" "Two pair of edges share the same ending nodes and the ``reverse_cost`` " From 86762f512d62354a093650076ea1fd31ac293cbc Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Thu, 10 Oct 2024 19:43:10 +0000 Subject: [PATCH 390/428] Translated using Weblate (Spanish) Currently translated at 94.4% (5020 of 5316 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 84892c6471..9f8f14a0d0 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-10-10 03:40+0000\n" "PO-Revision-Date: 2024-10-10 19:43+0000\n" -"Last-Translator: DeepL \n" +"Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Spanish \n" "Language: es\n" @@ -14932,7 +14932,7 @@ msgstr "" "aristas." msgid "There are no double head arrows" -msgstr "No hay flechas de doble cabeza" +msgstr "No hay flechas de doble punta" msgid "" "Two pair of edges share the same ending nodes and the ``reverse_cost`` " From 1792c14fe4b296a7e7e257ff8538cc5c0fd72085 Mon Sep 17 00:00:00 2001 From: DeepL Date: Thu, 10 Oct 2024 19:43:24 +0000 Subject: [PATCH 391/428] Translated using Weblate (Spanish) Currently translated at 94.4% (5020 of 5316 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/ --- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 9f8f14a0d0..8b1cdfd5a6 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-10-10 03:40+0000\n" "PO-Revision-Date: 2024-10-10 19:43+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"Last-Translator: DeepL \n" "Language-Team: Spanish \n" "Language: es\n" @@ -14938,11 +14938,15 @@ msgid "" "Two pair of edges share the same ending nodes and the ``reverse_cost`` " "column is not used." msgstr "" +"Dos pares de aristas comparten los mismos nodos finales y no se utiliza la " +"columna ``reverse_cost``." msgid "" "Edges :math:`{2 \\rightarrow 3, 3 \\rightarrow 2}` are represented with two " "edges :math:`id=203` and :math:`id=302` respectively." msgstr "" +"Las aristas :math:`{2 \\rightarrow 3, 3 \\rightarrow 2}` se representan con " +"dos aristas :math:`id=203` y :math:`id=302` respectivamente." msgid "" "Edges :math:`{3 \\rightarrow 4, 4 \\rightarrow 3}` are represented with two " From 07224383fc3c7e29ddfeac2a1e8a0174a1455610 Mon Sep 17 00:00:00 2001 From: Celia Virginia Vergara Castillo Date: Thu, 10 Oct 2024 19:44:52 +0000 Subject: [PATCH 392/428] Translated using Weblate (Chinese (Simplified)) Currently translated at 97.0% (5158 of 5316 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ --- locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 7f63579e45..8456e6fe7b 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-10-10 03:40+0000\n" -"PO-Revision-Date: 2024-09-23 14:18+0000\n" +"PO-Revision-Date: 2024-10-10 19:47+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Chinese (Simplified) \n" @@ -1544,7 +1544,7 @@ msgid "When ``factor`` > 1 the travel times are faster" msgstr "当 ``因子`` > 1 时，行程时间更快" msgid "When ``factor`` < 1 the travel times are slower" -msgstr "当 ``因子`` < 1 时，行程时间会变慢" +msgstr "当 ``因子`` < 1 时，行程时间会变慢" msgid "For the :doc:`pgr_pickDeliverEuclidean`:" msgstr "用于 :doc:`pgr_pickDeliverEuclidean`:" @@ -3764,10 +3764,8 @@ msgstr "加权有向图， :math:`G_d(V,E)` 的定义如下：" msgid "the set of vertices :math:`V`" msgstr "顶点集 :math:`V`" -#, fuzzy msgid ":math:`V = source \\cup target \\cup {start_{vid}} \\cup {end_{vid}}`" -msgstr "" -":math:`V = source \\cup target \\cup {start_v{vid}} \\cup {end_{vid}}`" +msgstr ":math:`V = source \\cup target \\cup {start_v{vid}} \\cup {end_{vid}}`" msgid "the set of edges :math:`E`" msgstr "边集 :math:`E`" @@ -16791,9 +16789,8 @@ msgstr "文档" msgid "Results of documentation queries adujsted to boost 1.83.0 version:" msgstr "" -#, fuzzy msgid "pgr_edgeDisjointPaths" -msgstr "pgr_edgeDisjointPaths：" +msgstr "pgr_edgeDisjointPaths" msgid "pgr_stoerWagner" msgstr "pgr_stoerWagner" From dd787ba1fd76db488174f8dd253209c7fdf5e7d9 Mon Sep 17 00:00:00 2001 From: DeepL Date: Thu, 10 Oct 2024 19:46:21 +0000 Subject: [PATCH 393/428] Translated using Weblate (Chinese (Simplified)) Currently translated at 97.0% (5158 of 5316 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ --- locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 8456e6fe7b..4df70aa15f 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-10-10 03:40+0000\n" "PO-Revision-Date: 2024-10-10 19:47+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"Last-Translator: DeepL \n" "Language-Team: Chinese (Simplified) \n" "Language: zh_Hans\n" @@ -12187,7 +12187,7 @@ msgid "Returns set of |result-edge-color|" msgstr "Returns set of |result-edge-color|" msgid "Graph coloring of pgRouting :doc:`sampledata`" -msgstr "" +msgstr "pgRouting :doc:`sampledata` 的图形着色" msgid "``pgr_edgeDisjointPaths``" msgstr "``pgr_edgeDisjointPaths``" @@ -20012,7 +20012,7 @@ msgid "**Temporal**: for example points given through a web application" msgstr "**时间**：例如通过 Web 应用程序给出的点" msgid "The numbering of the points are handled with negative sign." -msgstr "" +msgstr "点的编号用负号处理。" msgid "" "This sign change is to avoid confusion when there is a vertex with the same " From a8122b7e5de9c302fd990b8403cd066f03065446 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2024 20:41:37 +0000 Subject: [PATCH 394/428] Update locale: commit dd787ba1fd --- .../es/LC_MESSAGES/pgrouting_doc_strings.po | 165 ------------------ .../LC_MESSAGES/pgrouting_doc_strings.po | 9 - 2 files changed, 174 deletions(-) diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 8b1cdfd5a6..65d475d05e 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -21827,168 +21827,3 @@ msgstr "pgr_withPointsDD es pgr_drivingDistance **con puntos**" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "pgr_withPoints es pgr_dijkstraVia **con puntos**" -#~ msgid "" -#~ "`Wikipedia: Graph Coloring `__" -#~ msgstr "" -#~ "`Wikipedia: Coloración de grafos `__" - -#~ msgid "There is no flow when a **source** is the same as a **target**." -#~ msgstr "" -#~ "No hay ningún flujo cuando el **orígen** es el mismo que el **destino**." - -#~ msgid "Any duplicated value in the source(s) or target(s) are ignored." -#~ msgstr "" -#~ "Cualquier valor duplicado en el/los orígen(es) o en el/los destino(s) " -#~ "será ignorado." - -#~ msgid "" -#~ "Creates a **super source** and edges to all the source(s), and a **super " -#~ "target** and the edges from all the targets(s)." -#~ msgstr "" -#~ "Crea una **súper origen**, con aristas para todos las fuentes(es), y un " -#~ "**súper destino** con aristas para todos los destino(s)." - -#~ msgid "" -#~ "There are several kinds of valid inner queries and also the columns " -#~ "returned are depending of the function. Which kind of inner query will " -#~ "depend on the function(s) requirements. To simplify variety of types, " -#~ "**ANY-INTEGER** and **ANY-NUMERICAL** is used." -#~ msgstr "" -#~ "Hay varios tipos de consultas internas válidas y también las columnas " -#~ "devueltas dependen de la función. El tipo de consulta interna dependerá " -#~ "de los requisitos de las funcion(es). Para simplificar la variedad de " -#~ "tipos, se utiliza **ENTEROS** y **FLOTANTES**." - -#~ msgid "wget" -#~ msgstr "wget" - -#~ msgid "" -#~ "``pgr_aStarCost`` - Total cost of the shortest path(s) using the A* " -#~ "algorithm." -#~ msgstr "" -#~ "``pgr_aStarCost`` —Costo total de la ruta más corta usando el algoritmo :" -#~ "A*." - -#~ msgid "" -#~ "The ``pgr_aStarCost`` function sumarizes of the cost of the shortest " -#~ "path(s) using the A* algorithm." -#~ msgstr "" -#~ "La función ``pgr_aStarCost`` sumarisa el costo de la ruta más corta " -#~ "usando el algoritmo A*." - -#~ msgid "" -#~ "``pgr_bdAstarCost`` - Total cost of the shortest path(s) using the " -#~ "bidirectional A* algorithm." -#~ msgstr "" -#~ "``pgr_bdAstarCost`` - Devuelve el costo agregado de la ruta más corta " -#~ "usando el algoritmo bidireccional A*." - -#~ msgid "" -#~ "The ``pgr_bdAstarCost`` function sumarizes of the cost of the shortest " -#~ "path(s) using the bidirectional A* algorithm." -#~ msgstr "" -#~ "La función ``pgr_bdAstarCost`` Sumariza el costo del camino más corto " -#~ "utilizando el algoritmo bidireccional A*." - -#~ msgid "" -#~ "``pgr_bdDijkstra`` — Returns the shortest path(s) using Bidirectional " -#~ "Dijkstra algorithm." -#~ msgstr "" -#~ "``pgr_bdDijkstra`` — Devuelve la(s) rutas más cortas mediante el " -#~ "algoritmo Bidirectional Dijkstra." - -#~ msgid "pgr_bdDijkstra(`Edges SQL`_, `Combinations SQL`_ , [``directed``])" -#~ msgstr "" -#~ "pgr_bdDijkstra(`SQL de aristas`_, `SQL de combinaciones`_, [``directed``])" - -#~ msgid "" -#~ "``pgr_bdDijkstraCost`` — Returns the shortest path(s)'s cost using " -#~ "Bidirectional Dijkstra algorithm." -#~ msgstr "" -#~ "``pgr_bdDijkstraCost`` — Devuelve la ruta(s) más corta utilizando el " -#~ "algoritmo de Dijkstra Bidireccional." - -#~ msgid "``pgr_bellmanFord`` — Shortest path(s) using Bellman-Ford algorithm." -#~ msgstr "" -#~ "``pgr_bellmanFord`` —Camino m+as corto usando el algoritmo de Bellman-" -#~ "Ford." - -#~ msgid "Identifier of the vertex" -#~ msgstr "Identificador del vértice" - -#~ msgid "" -#~ "``pgr_binaryBreadthFirstSearch`` — Returns the shortest path(s) in a " -#~ "binary graph." -#~ msgstr "" -#~ "``pgr_binaryBreadthFirstSearch`` — Regresa los caminos más cortos en un " -#~ "grafo binario." - -#~ msgid "" -#~ "``pgr_dagShortestPath`` — Returns the shortest path(s) for weighted " -#~ "directed acyclic graphs(DAG). In particular, the DAG shortest paths " -#~ "algorithm implemented by Boost.Graph." -#~ msgstr "" -#~ "``pgr_dagShortestPath`` — Devuelve la(s) rutas más cortas para los grafos " -#~ "acíclicos dirigidos ponderados (DAG). En particular, el algoritmo de " -#~ "rutas más cortas de DAG implementado por Boost.Graph." - -#~ msgid "``pgr_dijkstra`` — Shortest path(s) using Dijkstra algorithm." -#~ msgstr "" -#~ "``pgr_dijkstra`` — Ruta(s) más corta(s) usando el algoritmo Dijkstra." - -#~ msgid "" -#~ "``pgr_dijkstraCost`` - Total cost of the shortest path(s) using Dijkstra " -#~ "algorithm." -#~ msgstr "" -#~ "``pgr_dijkstraCost`` - Costo total de los caminos más cortos usando el " -#~ "algoritmo de Dijkstra." - -#~ msgid "" -#~ "The ``pgr_dijkstraCost`` function sumarizes of the cost of the shortest " -#~ "path(s) using Dijkstra Algorithm." -#~ msgstr "" -#~ "La función ``pgr_dijkstraCost`` function sumarizes el costo de los " -#~ "caminos más cortos usando el algoritmo de Dijkstra." - -#~ msgid "" -#~ "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." - -#~ msgid "Calculates the maximum flow from the `source(s)` to the `target(s)`." -#~ msgstr "Calcula el flujo máximo desde `source(s)` a `target(s)`." - -#~ msgid "" -#~ "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." - -#~ 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" - -#~ msgid "" -#~ "``pgr_withPointsCost`` - Calculates the shortest path and returns only " -#~ "the aggregate cost of the shortest path(s) found, for the combination of " -#~ "points given." -#~ msgstr "" -#~ "``pgr_withPointsCost`` - Calcula la ruta más corta y devuelve solo el " -#~ "costo agregado de la(s) rutas más cortas encontradas, para la combinación " -#~ "de puntos dados." - -#~ msgid "" -#~ "Modify the graph to include points defined by points_sql. Using Dijkstra " -#~ "algorithm, return only the aggregate cost of the shortest path(s) found." -#~ msgstr "" -#~ "Modifica el grafo para incluir puntos definidos por points_sql. Con el " -#~ "algoritmo Dijkstra, devuelva solo el costo agregado de la(s) rutas más " -#~ "cortas encontradas." diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 4df70aa15f..299244464c 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -20278,12 +20278,3 @@ msgstr "pgr_withPointsDD 是 **带有点** 的 pgr_drivenDistance" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "pgr_withPointsvia 是 **带有点** 的" -#~ msgid "" -#~ ":math:`V = source \\cup target \\cup {start_{vid}} \\cup {end_{vid}}`" -#~ msgstr "" -#~ ":math:`V = source \\cup target \\cup {start_{vid}} \\cup {end_{vid}}`" - -#~ msgid "" -#~ "From vertex :math:`6` to vertices :math:`\\{ 10, 17\\}` on a " -#~ "**directed**graph" -#~ msgstr "在 **有向** 图上从顶点 :math:`6` 到顶点 :math:`\\{ 10, 17\\}`" From a29e74e7103f07d2a21e3405aeb29596dc881fd4 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Date: Wed, 16 Oct 2024 16:40:06 +0200 Subject: [PATCH 395/428] Update release actions --- .github/workflows/release.yml | 56 ++++++++++++----------------------- 1 file changed, 19 insertions(+), 37 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f4c79c9b65..0048a62fd3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,10 +1,7 @@ name: Release on: - push: - tags: - - 'v*.*.*' - + workflow_dispatch: permissions: contents: read @@ -25,6 +22,11 @@ jobs: with: fetch-depth: 0 + - name: Initialize mandatory git config + run: | + git config user.name "github-actions[bot]" + git config user.email "41898282+github-actions[bot]@users.noreply.github.com" + - name: Get postgres version run: | sudo service postgresql start @@ -34,17 +36,14 @@ jobs: echo "PGPORT=5432" >> $GITHUB_ENV echo "PGIS=3" >> $GITHUB_ENV echo "PGROUTING_VERSION=${PGROUTING_VERSION}" >> $GITHUB_ENV + echo "TAG_NAME=v${PGROUTING_VERSION}" >> $GITHUB_ENV - - name: Verify Tag Name + - name: Create and Push Tag run: | - TAG_NAME=${GITHUB_REF#refs/*/} - echo "TAG_NAME=${TAG_NAME}" >> $GITHUB_ENV - echo ${TAG_NAME} - echo ${PGROUTING_VERSION} - if [ "${TAG_NAME}" != "v${PGROUTING_VERSION}" ]; then - echo "Tag name should be v${PGROUTING_VERSION}" - exit 1 - fi + git tag -a "${TAG_NAME}" -m "Release version ${TAG_NAME}" + git push origin "${TAG_NAME}" + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Extract branch name and commit hash run: | @@ -62,7 +61,7 @@ jobs: $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' - name: Install python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.x' @@ -87,7 +86,8 @@ jobs: export PATH=/usr/lib/postgresql/${PGVER}/bin:$PATH mkdir build cd build - cmake -DPOSTGRESQL_VERSION=${PGVER} -DDOC_USE_BOOTSTRAP=ON -DWITH_DOC=ON -DBUILD_DOXY=ON -DCMAKE_BUILD_TYPE=Release -DES=ON .. + cmake -DPOSTGRESQL_VERSION=${PGVER} -DDOC_USE_BOOTSTRAP=ON -DWITH_DOC=ON -DBUILD_DOXY=ON -DCMAKE_BUILD_TYPE=Release \ + -DES=ON -DZH_HANS=ON .. - name: Build run: | @@ -97,11 +97,6 @@ jobs: sudo make install make doxy - - name: Initialize mandatory git config - run: | - git config user.name "github-actions[bot]" - git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - - name: Update Users Documentation run: | git checkout origin/gh-pages @@ -140,26 +135,15 @@ jobs: run: | cd build/doc - cp -r html doc-v${PGROUTING_VERSION}-en-es - tar -zcvf doc-v${PGROUTING_VERSION}-en-es.tar.gz doc-v${PGROUTING_VERSION}-en-es - - cp -r html doc-v${PGROUTING_VERSION}-en - rm -rf doc-v${PGROUTING_VERSION}-en/es - tar -zcvf doc-v${PGROUTING_VERSION}-en.tar.gz doc-v${PGROUTING_VERSION}-en - - cp -r html doc-v${PGROUTING_VERSION}-es - rm -rf doc-v${PGROUTING_VERSION}-es/en - perl -pi -e 's/en\/index.html/es\/index.html/g' doc-v${PGROUTING_VERSION}-es/index.html - tar -zcvf doc-v${PGROUTING_VERSION}-es.tar.gz doc-v${PGROUTING_VERSION}-es + cp -r html doc-v${PGROUTING_VERSION} + tar -zcvf doc-v${PGROUTING_VERSION}.tar.gz doc-v${PGROUTING_VERSION} cd ../.. grep -Pzo "(?s)pgRouting ${PGROUTING_VERSION//./\\.} Release Notes.*?(?=pgRouting .\..\.. Release Notes)" NEWS.md | tr '\0' '\n' > release_body.txt echo "**Attachments**" >> release_body.txt echo "File | Contents" >> release_body.txt echo "| --- | --- |" >> release_body.txt - echo "| \`doc-v${PGROUTING_VERSION}-en-es.tar.gz\` | English and Spanish documentation. Redirection to English" >> release_body.txt - echo "| \`doc-v${PGROUTING_VERSION}-en.tar.gz\`|English documentation. Redirection to English" >> release_body.txt - echo "| \`doc-v${PGROUTING_VERSION}-es.tar.gz\`|Spanish documentation. Redirection to Spanish" >> release_body.txt + echo "| \`doc-v${PGROUTING_VERSION}tar.gz\` | English and Spanish documentation. Redirection to English" >> release_body.txt echo "| \`pgrouting-${PGROUTING_VERSION}.tar.gz\` | tar.gz of the release" >> release_body.txt echo "| \`pgrouting-${PGROUTING_VERSION}.zip\`| zip of the release" >> release_body.txt cat release_body.txt @@ -172,9 +156,7 @@ jobs: draft: true prerelease: false files: | - build/doc/doc-v${{ env.PGROUTING_VERSION }}-en-es.tar.gz - build/doc/doc-v${{ env.PGROUTING_VERSION }}-en.tar.gz - build/doc/doc-v${{ env.PGROUTING_VERSION }}-es.tar.gz + build/doc/doc-v${{ env.PGROUTING_VERSION }}.tar.gz ${{ github.event.repository.name }}-${{ env.PGROUTING_VERSION }}.zip ${{ github.event.repository.name }}-${{ env.PGROUTING_VERSION }}.tar.gz From 17e518493c3810875d162466d4e01b049d34a0bc Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 12 Oct 2024 10:25:22 -0600 Subject: [PATCH 396/428] (C++) adding missing include to be fully compatible with C++13 (cherry picked from commit c5cb8f9cc9da57e2dd23d901ee75e9743af6e562) --- include/cpp_common/rule.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/include/cpp_common/rule.hpp b/include/cpp_common/rule.hpp index 29d414291d..97e45aad5b 100644 --- a/include/cpp_common/rule.hpp +++ b/include/cpp_common/rule.hpp @@ -28,6 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include +#include typedef struct Restriction_t Restriction_t; From a7e75abdc4bfb837e4b6caf5fbbfeca2a63ca172 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 12 Oct 2024 10:50:32 -0600 Subject: [PATCH 397/428] (doc) documenting changes (cherry picked from commit 4dc28137efa98f11df6cde34646bfa3486e45140) --- NEWS.md | 2 ++ doc/src/release_notes.rst | 2 ++ 2 files changed, 4 insertions(+) diff --git a/NEWS.md b/NEWS.md index feb7c7789b..4e7ec2b817 100644 --- a/NEWS.md +++ b/NEWS.md @@ -83,6 +83,8 @@ milestone for 3.6.3 * postgres 11.0.0 * postgis 3.0.0 +* g++ 13+ is supported + **Code fixes** * Fix warnings from cpplint. diff --git a/doc/src/release_notes.rst b/doc/src/release_notes.rst index ff53e86be6..3fac319973 100644 --- a/doc/src/release_notes.rst +++ b/doc/src/release_notes.rst @@ -116,6 +116,8 @@ milestone for 3.6.3 * postgres 11.0.0 * postgis 3.0.0 +* g++ 13+ is supported + .. rubric:: Code fixes * Fix warnings from cpplint. From 4bbb8cc887d047e795a5e7b3b178b5ea8a94c3a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Oct 2023 15:59:12 +0000 Subject: [PATCH 398/428] Bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] (cherry picked from commit c89addc82c8e78581a31f2ec1a7c1947733b429b) --- .github/workflows/centos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/centos.yml b/.github/workflows/centos.yml index 497209954b..d7adcf5ad6 100644 --- a/.github/workflows/centos.yml +++ b/.github/workflows/centos.yml @@ -32,7 +32,7 @@ jobs: - centos-7 gcc-4.8.5 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: get postgres version run: | From 7dd94448bdc93f0a044ccd8a57b1184930a5338b Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 10 Oct 2024 09:50:38 -0600 Subject: [PATCH 399/428] (license test) fix docqueries license test --- tools/scripts/test_license.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/scripts/test_license.sh b/tools/scripts/test_license.sh index d0b8e9b13b..0bb937e1a6 100755 --- a/tools/scripts/test_license.sh +++ b/tools/scripts/test_license.sh @@ -25,13 +25,12 @@ mylicensecheck() { } DIR=$(git rev-parse --show-toplevel) - pushd "${DIR}" > /dev/null || exit -missing=$(! { mylicensecheck src & mylicensecheck sql & mylicensecheck include & mylicensecheck pgtap;} | grep "No copyright\|UNKNOWN") +{ mylicensecheck src & mylicensecheck sql & mylicensecheck include & mylicensecheck pgtap;} | grep "No copyright\|UNKNOWN" missing1=$(mylicensecheck doc | grep "No copyright") missing2=$(grep --files-without-match 'Creative Commons' doc/*/*.rst) missing3=$(mylicensecheck docqueries | grep "No copyright") -missing4=$(grep --files-without-match 'Creative Commons' "$(git ls-files docqueries | grep '.sql')") +missing4=$(grep --files-without-match 'Creative Commons' docqueries/*/*.sql) popd > /dev/null || exit #mylicensecheck doc From 323e0ea493db4badc40f5168faa66041a18f1103 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 13 Oct 2024 10:50:37 -0600 Subject: [PATCH 400/428] (license test) on docqueries Adjust to .pg extension --- tools/scripts/test_license.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/scripts/test_license.sh b/tools/scripts/test_license.sh index 0bb937e1a6..c4c0e7553f 100755 --- a/tools/scripts/test_license.sh +++ b/tools/scripts/test_license.sh @@ -30,7 +30,7 @@ pushd "${DIR}" > /dev/null || exit missing1=$(mylicensecheck doc | grep "No copyright") missing2=$(grep --files-without-match 'Creative Commons' doc/*/*.rst) missing3=$(mylicensecheck docqueries | grep "No copyright") -missing4=$(grep --files-without-match 'Creative Commons' docqueries/*/*.sql) +missing4=$(grep --files-without-match 'Creative Commons' docqueries/*/*.pg) popd > /dev/null || exit #mylicensecheck doc From 3c09f3d1dc1826f14894e219f8f3c8d9d3f3ebee Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 9 Oct 2024 09:34:38 -0600 Subject: [PATCH 401/428] (clan-tidy) fix script not finding postgres.h --- .github/scripts/tidy-vs-commit.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/scripts/tidy-vs-commit.sh b/.github/scripts/tidy-vs-commit.sh index 2b0db9f07b..ae8328a74a 100755 --- a/.github/scripts/tidy-vs-commit.sh +++ b/.github/scripts/tidy-vs-commit.sh @@ -6,7 +6,7 @@ readonly BUILD_DIR=build MODIFIED_FILES=$(git diff-tree --no-commit-id --diff-filter=d --name-only -r "$BASE" HEAD | grep '\.c') MODIFIED_HEADERS=$(git diff-tree --no-commit-id --diff-filter=d --name-only -r "$BASE" HEAD | grep '\.h') -POSTGRES_SERVER=$(grep -o -m1 '\-isystem .*' "${BUILD_DIR}/compile_commands.json" | head -1 | awk '{print $1" "$2}') +POSTGRES_SERVER=$(grep -o -m1 '\-isystem .*' "${BUILD_DIR}/compile_commands.json" | head -1 | awk '{print $2}') echo "POSTGRES_SERVER ${POSTGRES_SERVER}" @@ -34,6 +34,6 @@ if [ ${#MODIFIED_HEADERS[@]} != 0 ] ; then do echo "${f}" clang-tidy "${CHECKS}" -header-filter=.* "${f}" \ - -- -I./include "${POSTGRES_SERVER}" + -- -I./include -isystem "${POSTGRES_SERVER}" done fi From 098079b5c0767d84ae8d6d811832e66af9e2616c Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 12 Oct 2024 22:48:00 -0600 Subject: [PATCH 402/428] (CI) boost graph v0.86 has fixes in functions we use (cherry picked from commit 54bc91015dc041daab163a56272c64728b5faa73) --- .github/workflows/boost_version.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/boost_version.yml b/.github/workflows/boost_version.yml index c7a82760ba..b5c697698f 100644 --- a/.github/workflows/boost_version.yml +++ b/.github/workflows/boost_version.yml @@ -19,6 +19,7 @@ name: Boost supported versions # - boost::geometry has not changed anything we use # # boost::graph +# - 1.86 does not support C++11 (Aug 2024) # - 1.84 is failing its own tests (Jul 2022) # - 1.83 transitive closure & stoer wagner changed on 83 (Jul 2022) # - 1.80 changed on 1.80 (Aug 2022) @@ -69,7 +70,7 @@ jobs: strategy: fail-fast: false matrix: - boost_minor: [56, 68, 75, 76, 77, 78, 79, 80, 83, 84] + boost_minor: [56, 68, 75, 76, 77, 78, 79, 80, 83, 84, 86] steps: - uses: actions/checkout@v4 From 992f4d2ead7e306bf9313e51bc53b226cb2af712 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 16 Oct 2024 12:33:08 -0600 Subject: [PATCH 403/428] (CI) Using python-v5 --- .github/workflows/doc-check.yml | 4 +--- .github/workflows/macos.yml | 2 +- .github/workflows/update-locale.yml | 2 +- .github/workflows/update.yml | 2 +- .github/workflows/website.yml | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/doc-check.yml b/.github/workflows/doc-check.yml index 1c22de909c..7bf3f60a79 100644 --- a/.github/workflows/doc-check.yml +++ b/.github/workflows/doc-check.yml @@ -65,8 +65,6 @@ 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 @@ -95,7 +93,7 @@ jobs: - name: Install python if: env.PROCESS == 'true' - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.x' diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 95921e88fb..acff96fbaa 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -46,7 +46,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest] + os: [macos-latest, macos-14] steps: - name: Checkout repository diff --git a/.github/workflows/update-locale.yml b/.github/workflows/update-locale.yml index efea648f01..9e93208483 100644 --- a/.github/workflows/update-locale.yml +++ b/.github/workflows/update-locale.yml @@ -55,7 +55,7 @@ jobs: $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' - name: Install python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.x' diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 828b6937d2..aff82b1e59 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -55,7 +55,7 @@ jobs: $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' - name: Install python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.x' diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml index e92f43c232..abcab337e1 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -57,7 +57,7 @@ jobs: $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' - name: Install python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.x' From 6186e8fc1053c5d9dc97d8a145280c9c26b9f823 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 12 Oct 2024 10:50:32 -0600 Subject: [PATCH 404/428] (CI/macos) Remove warning --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index acff96fbaa..3e1fceedec 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -54,7 +54,7 @@ jobs: - name: install deps run: | - brew install postgresql postgis boost + brew install postgresql@14 postgis boost - name: Configure run: | From d73eff01eb4675cd82357fab1846db22b8f85e5f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 08:31:44 +0000 Subject: [PATCH 405/428] Bump softprops/action-gh-release from 1 to 2 Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 1 to 2. - [Release notes](https://github.com/softprops/action-gh-release/releases) - [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md) - [Commits](https://github.com/softprops/action-gh-release/compare/v1...v2) --- updated-dependencies: - dependency-name: softprops/action-gh-release dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] (cherry picked from commit ac71b4efce47f26e4e942f4dcabca80e2404bc00) --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0048a62fd3..59ce4f79f0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -149,7 +149,7 @@ jobs: cat release_body.txt - name: Create Draft Release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: body_path: release_body.txt name: ${{ env.TAG_NAME }} From e14c3f904ec58a725b2fe920bc9248365438509a Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 16 Oct 2024 13:31:33 -0600 Subject: [PATCH 406/428] (CI) dependabot to work also on develop --- .github/dependabot.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 203f3c889b..afe66d47eb 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,3 +4,11 @@ updates: directory: "/" schedule: interval: "weekly" + target-branch: main + +#develop branch starts here +- package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + target-branch: develop From 499dbc724e3b5efa0ca7ea6595d96fe7df497f7c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 00:51:03 +0000 Subject: [PATCH 407/428] Update locale: commit e14c3f904e --- locale/en/LC_MESSAGES/pgrouting_doc_strings.po | 5 ++++- locale/pot/pgrouting_doc_strings.pot | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po index cf1cce3c88..ec5ebab896 100644 --- a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-10-10 03:40+0000\n" +"POT-Creation-Date: 2024-10-17 00:50+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -15619,6 +15619,9 @@ msgstr "" msgid "postgis 3.0.0" msgstr "" +msgid "g++ 13+ is supported" +msgstr "" + msgid "Code fixes" msgstr "" diff --git a/locale/pot/pgrouting_doc_strings.pot b/locale/pot/pgrouting_doc_strings.pot index e1b0f03a2f..66803356b1 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-10-10 03:40+0000\n" +"POT-Creation-Date: 2024-10-17 00:50+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -13267,6 +13267,9 @@ msgstr "" msgid "postgis 3.0.0" msgstr "" +msgid "g++ 13+ is supported" +msgstr "" + msgid "Code fixes" msgstr "" From 236d8f991b00c45df53e4f2522105b64c121512c Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 10 Oct 2024 11:50:45 -0600 Subject: [PATCH 408/428] (lint) emoving unused files --- include/cpp_common/signalhandler.hpp | 155 --------------------------- include/vrp/book_keeping.hpp | 114 -------------------- src/cpp_common/arrays_input.cpp | 151 -------------------------- 3 files changed, 420 deletions(-) delete mode 100644 include/cpp_common/signalhandler.hpp delete mode 100644 include/vrp/book_keeping.hpp delete mode 100644 src/cpp_common/arrays_input.cpp diff --git a/include/cpp_common/signalhandler.hpp b/include/cpp_common/signalhandler.hpp deleted file mode 100644 index db799ae886..0000000000 --- a/include/cpp_common/signalhandler.hpp +++ /dev/null @@ -1,155 +0,0 @@ -/*PGR-GNU***************************************************************** -File: signalhandler.hpp - -Copyright (c) 2015 pgRouting developers -Mail: project@pgrouting.org - ------- - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - ********************************************************************PGR-GNU*/ -/*PGR-MIT****************************************************************** - * - * file signalhandler.h - * - * Copyright 2014 Stephen Woodbridge - * Copyright 2014 Vicky Vergara - * - * This is free software; you can redistribute and/or modify it under - * the terms of the MIT License. Please file MIT-LICENSE for details. - * - *****************************************************************PGR-MIT*/ - -#ifndef INCLUDE_CPP_COMMON_SIGNALHANDLER_HPP_ -#define INCLUDE_CPP_COMMON_SIGNALHANDLER_HPP_ -#pragma once - -// defines NULL -#include -#include -#include - -// #include "./pgr_assert.hpp" - -class UserQuitException: public std::exception { - private: - const char *str; ///< str Holds the what() string for the exception. - - public: - virtual const char *what() const throw() { - return str; - } - - explicit UserQuitException(const char *_str): str(_str) {} -}; - - -class EventHandler { - public: - // Hook method for the signal hook method. - virtual void handleSignal(int signum) = 0; - - // ... other hook methods for other types of - // events such as timers, I/O, and - // synchronization objects. -}; - - -class SignalHandler { - public: - // Entry point. - static SignalHandler *instance(void); - - // Register an event handler for - // and return a pointer to any existing - // that was previously registered to handle . - EventHandler *registerHandler(int signum, EventHandler *eh); - - // Remove the for - // by setting the slot in the - // table to NULL. - void removeHandler(int signum); - - private: - // Ensure we're a Singleton. - SignalHandler(void) {} - - // Singleton pointer. - static SignalHandler *instance_; - - // Entry point adapter installed into - // (must be a static method or a stand-alone - // extern "C" function). - static void dispatcher(int signum); - - // Table of pointers to concrete s - // registered by applications. NSIG is the number of - // signals defined in . - static EventHandler *signalHandlers_[NSIG]; -}; - - -// --------------------------------------------------------- -// -- some concrete signal handlers -// --------------------------------------------------------- - -class SIGINT_Handler: public EventHandler { - public: - SIGINT_Handler(void): graceful_quit_(0) {} - - // Hook method. - virtual void handleSignal(int signum) { - if (signum == SIGINT) this->graceful_quit_ = 1; - } - - // Accessor. - sig_atomic_t gracefulQuit(void) { return this->graceful_quit_;} - - private: - sig_atomic_t graceful_quit_; -}; - - -class SIGQUIT_Handler: public EventHandler { - public: - SIGQUIT_Handler(void): abortive_quit_(0) {} - - // Hook method. - virtual void handleSignal(int signum) { - if (signum == SIGQUIT) this->abortive_quit_ = 1; - } - - // Accessor. - sig_atomic_t abortiveQuit(void) { return this->abortive_quit_;} - - private: - sig_atomic_t abortive_quit_; -}; - - -#define REG_SIGINT SIGINT_Handler sigint_handler; \ - SignalHandler::instance()->registerHandler(SIGINT, &sigint_handler); - -#define REG_SIGQUIT SIGQUIT_Handler sigquit_handler; \ - SignalHandler::instance()->registerHandler(SIGQUIT, &sigquit_handler); - -#define THROW_ON_SIGINT do { \ - if ( sigint_handler.gracefulQuit() == 1 ) \ - throw(UserQuitException("Abort on User Request!")); \ - } while (0); - -#endif // INCLUDE_CPP_COMMON_SIGNALHANDLER_HPP_ - diff --git a/include/vrp/book_keeping.hpp b/include/vrp/book_keeping.hpp deleted file mode 100644 index 0f205ad759..0000000000 --- a/include/vrp/book_keeping.hpp +++ /dev/null @@ -1,114 +0,0 @@ -/*PGR-GNU***************************************************************** -File: book_keeping.hpp - - * Copyright (c) 2017 pgRouting developers - * Mail: project@pgrouting.org - * - * ------ - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - ********************************************************************PGR-GNU*/ - -/*! @file */ - -#ifndef INCLUDE_VRP_BOOK_KEEPING_HPP_ -#define INCLUDE_VRP_BOOK_KEEPING_HPP_ -#pragma once - -#include -#include -#include -#include "vrp/vehicle_pickDeliver.hpp" -/** - * Book keeping class for swapping orders between vehicles - */ - -namespace pgrouting { -namespace vrp { - -class Swap_bk; -class Swap_info { - friend class Swap_bk; - - public: - Swap_info() = delete; - Swap_info(const Swap_info &) = default; - Swap_info(const Vehicle_pickDeliver &from, - const Vehicle_pickDeliver &to, - size_t from_o, - size_t to_o, - double delta); - friend std::ostream& operator << (std::ostream& log, const Swap_info &d); -#if 0 - { - log - << "\n" << d.from_truck.tau() << " --> " - << d.from_order - << "(" - << d.from_truck.orders()[d.from_order].pickup().original_id() - << ")" - << "\n" << d.to_truck.tau() << " --> " - << d.to_order - << "(" - << d.to_truck.orders()[d.to_order].pickup().original_id() - << ")" - << "\n" << "delta = " << d.estimated_delta; - return log; - } -#endif - - public: - Vehicle_pickDeliver from_truck; - Vehicle_pickDeliver to_truck; - size_t from_order; - size_t to_order; - double estimated_delta; -}; - - -class Swap_bk { - private: - class Compare { - public: - bool operator() (const Swap_info &lhs, const Swap_info rhs) { - return lhs.estimated_delta > rhs.estimated_delta; - } - }; - - public: - typedef std::priority_queue< - Swap_info, - std::vector, - Compare > Swaps_queue; - - - Swaps_queue m_swaps; - friend std::ostream& operator<< (std::ostream &log, const Swap_bk &data); - - public: - Swap_bk() = default; - Swap_bk(const Swap_bk &bk) = default; - Swaps_queue& possible_swaps() {return m_swaps;} - void push(const Swap_info& data) {m_swaps.push(data);} - Swap_info top() {return m_swaps.top();} - void pop() {return m_swaps.pop();} - bool empty() {return m_swaps.empty();} -}; - -} // namespace vrp -} // namespace pgrouting - -#endif // INCLUDE_VRP_BOOK_KEEPING_HPP_ diff --git a/src/cpp_common/arrays_input.cpp b/src/cpp_common/arrays_input.cpp deleted file mode 100644 index 68e12b1d80..0000000000 --- a/src/cpp_common/arrays_input.cpp +++ /dev/null @@ -1,151 +0,0 @@ -/*PGR-GNU***************************************************************** -File: arrays_input.cpp - -Copyright (c) 2015 pgRouting developers -Mail: project@pgrouting.org - -Copyright (c) 2023 Celia Virginia Vergara Castillo -Copyright (c) 2015 Celia Virginia Vergara Castillo -mail: vicky at erosion.dev - ------- - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - ********************************************************************PGR-GNU*/ - -#include "c_common/arrays_input.h" - -extern "C" { -#include -#include -} - -#include "cpp_common/pgr_alloc.hpp" - -namespace { - -/** @brief get the array contents from postgres - * - * @details This function generates the array inputs according to their type - * received through @a ArrayType *v parameter and store them in @a c_array. It - * can be empty also if received @a allow_empty true. The cases of failure are:- - * 1. When @a ndim is not equal to one dimension. - * 2. When no element is found i.e. nitems is zero or negative. - * 3. If the element type doesn't lie in switch cases, give the error of expected array of any integer type - * 4. When size of @a c_array is out of range or memory. - * 5. When null value is found in the array. - * - * All these failures are represented as error through @a elog. - * @param[in] v Pointer to the postgres C array - * @param[out] arrlen size of the C array - * @param[in] allow_empty flag to allow empty arrays - * - * @pre the array has to be one dimension - * @pre Must have elements (when allow_empty is false) - * - * @returns The resultant array - */ -int64_t* -get_bigIntArr(ArrayType *v, size_t *arrlen, bool allow_empty) { - int64_t *c_array = nullptr; - - auto element_type = ARR_ELEMTYPE(v); - auto dim = ARR_DIMS(v); - auto ndim = ARR_NDIM(v); - auto nitems = ArrayGetNItems(ndim, dim); - Datum *elements = nullptr; - bool *nulls = nullptr; - int16 typlen; - bool typbyval; - char typalign; - - - if (allow_empty && (ndim == 0 || nitems <= 0)) { - return nullptr; - } - - if (ndim != 1) { - elog(ERROR, "One dimension expected"); - return nullptr; - } - - if (nitems <= 0) { - elog(ERROR, "No elements found"); - return nullptr; - } - - get_typlenbyvalalign(element_type, - &typlen, &typbyval, &typalign); - - /* validate input data type */ - switch (element_type) { - case INT2OID: - case INT4OID: - case INT8OID: - break; - default: - elog(ERROR, "Expected array of ANY-INTEGER"); - return nullptr; - break; - } - - deconstruct_array(v, element_type, typlen, typbyval, - typalign, &elements, &nulls, - &nitems); - - c_array = pgrouting::pgr_alloc(static_cast(nitems), (c_array)); - if (!c_array) { - elog(ERROR, "Out of memory!"); - } - - - for (int i = 0; i < nitems; i++) { - if (nulls[i]) { - pfree(c_array); - elog(ERROR, "NULL value found in Array!"); - } else { - switch (element_type) { - case INT2OID: - c_array[i] = static_cast(DatumGetInt16(elements[i])); - break; - case INT4OID: - c_array[i] = static_cast(DatumGetInt32(elements[i])); - break; - case INT8OID: - c_array[i] = DatumGetInt64(elements[i]); - break; - } - } - } - (*arrlen) = static_cast(nitems); - - pfree(elements); - pfree(nulls); - return c_array; -} - -} // namespace - -/** - * @param[out] arrlen Length of the array - * @param[in] input the postgres array - * @param[in] allow_empty when true, empty arrays are accepted. - * @returns Returns a C array of integers - */ - -int64_t* pgr_get_bigIntArray(size_t *arrlen, ArrayType *input, bool allow_empty) { - return get_bigIntArr(input, arrlen, allow_empty); -} From 516b65aacb715888fdb6ed0e91484f512df30747 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 9 Oct 2024 22:31:05 -0600 Subject: [PATCH 409/428] (sql) Removing pgr_ prefix from filenames pgr_filename.* -> filename.* --- sql/chinese/{pgr_chinesePostman.sql => chinesePostman.sql} | 0 .../{pgr_chinesePostmanCost.sql => chinesePostmanCost.sql} | 0 sql/common/{pgr_parameter_check.sql => parameter_check.sql} | 0 sql/trsp/{pgr_trspViaEdges.sql => trspViaEdges.sql} | 0 sql/trsp/{pgr_trspViaVertices.sql => trspViaVertices.sql} | 0 sql/vrp_basic/{pgr_vrpOneDepot.sql => vrpOneDepot.sql} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename sql/chinese/{pgr_chinesePostman.sql => chinesePostman.sql} (100%) rename sql/chinese/{pgr_chinesePostmanCost.sql => chinesePostmanCost.sql} (100%) rename sql/common/{pgr_parameter_check.sql => parameter_check.sql} (100%) rename sql/trsp/{pgr_trspViaEdges.sql => trspViaEdges.sql} (100%) rename sql/trsp/{pgr_trspViaVertices.sql => trspViaVertices.sql} (100%) rename sql/vrp_basic/{pgr_vrpOneDepot.sql => vrpOneDepot.sql} (100%) diff --git a/sql/chinese/pgr_chinesePostman.sql b/sql/chinese/chinesePostman.sql similarity index 100% rename from sql/chinese/pgr_chinesePostman.sql rename to sql/chinese/chinesePostman.sql diff --git a/sql/chinese/pgr_chinesePostmanCost.sql b/sql/chinese/chinesePostmanCost.sql similarity index 100% rename from sql/chinese/pgr_chinesePostmanCost.sql rename to sql/chinese/chinesePostmanCost.sql diff --git a/sql/common/pgr_parameter_check.sql b/sql/common/parameter_check.sql similarity index 100% rename from sql/common/pgr_parameter_check.sql rename to sql/common/parameter_check.sql diff --git a/sql/trsp/pgr_trspViaEdges.sql b/sql/trsp/trspViaEdges.sql similarity index 100% rename from sql/trsp/pgr_trspViaEdges.sql rename to sql/trsp/trspViaEdges.sql diff --git a/sql/trsp/pgr_trspViaVertices.sql b/sql/trsp/trspViaVertices.sql similarity index 100% rename from sql/trsp/pgr_trspViaVertices.sql rename to sql/trsp/trspViaVertices.sql diff --git a/sql/vrp_basic/pgr_vrpOneDepot.sql b/sql/vrp_basic/vrpOneDepot.sql similarity index 100% rename from sql/vrp_basic/pgr_vrpOneDepot.sql rename to sql/vrp_basic/vrpOneDepot.sql From abb847f92c33e39db4efe8b219547fc44c5a04a2 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 9 Oct 2024 22:31:04 -0600 Subject: [PATCH 410/428] (include) Removing pgr_ prefix from filenames pgr_filename.* -> filename.* --- include/allpairs/{pgr_allpairs.hpp => allpairs.hpp} | 0 include/alphaShape/{pgr_alphaShape.hpp => alphaShape.hpp} | 0 include/bdDijkstra/{pgr_bdDijkstra.hpp => bdDijkstra.hpp} | 0 include/bellman_ford/{pgr_bellman_ford.hpp => bellman_ford.hpp} | 0 include/bellman_ford/{pgr_edwardMoore.hpp => edwardMoore.hpp} | 0 ..._binaryBreadthFirstSearch.hpp => binaryBreadthFirstSearch.hpp} | 0 .../{pgr_breadthFirstSearch.hpp => breadthFirstSearch.hpp} | 0 include/chinese/{pgr_chinesePostman.hpp => chinesePostman.hpp} | 0 .../coloring/{pgr_bipartite_driver.hpp => bipartite_driver.hpp} | 0 include/coloring/{pgr_edgeColoring.hpp => edgeColoring.hpp} | 0 ..._sequentialVertexColoring.hpp => sequentialVertexColoring.hpp} | 0 include/components/{pgr_components.hpp => components.hpp} | 0 include/components/{pgr_makeConnected.hpp => makeConnected.hpp} | 0 include/contraction/{pgr_contract.hpp => contract.hpp} | 0 .../{pgr_contractionGraph.hpp => contractionGraph.hpp} | 0 .../{pgr_deadEndContraction.hpp => deadEndContraction.hpp} | 0 .../{pgr_linearContraction.hpp => linearContraction.hpp} | 0 include/cpp_common/{pgr_alloc.hpp => alloc.hpp} | 0 include/cpp_common/{pgr_assert.hpp => assert.hpp} | 0 include/cpp_common/{pgr_base_graph.hpp => base_graph.hpp} | 0 include/cpp_common/{pgr_bidirectional.hpp => bidirectional.hpp} | 0 include/cpp_common/{pgr_messages.hpp => messages.hpp} | 0 .../{pgr_dagShortestPath.hpp => dagShortestPath.hpp} | 0 include/dijkstra/{pgr_dijkstraVia.hpp => dijkstraVia.hpp} | 0 ...atorTree_driver.hpp => lengauerTarjanDominatorTree_driver.hpp} | 0 include/lineGraph/{pgr_lineGraphFull.hpp => lineGraphFull.hpp} | 0 include/max_flow/{pgr_costFlowGraph.hpp => costFlowGraph.hpp} | 0 include/max_flow/{pgr_flowgraph.hpp => flowgraph.hpp} | 0 include/max_flow/{pgr_maxflow.hpp => maxflow.hpp} | 0 ...imumcardinalitymatching.hpp => maximumcardinalitymatching.hpp} | 0 include/max_flow/{pgr_minCostMaxFlow.hpp => minCostMaxFlow.hpp} | 0 include/mincut/{pgr_stoerWagner.hpp => stoerWagner.hpp} | 0 include/planar/{pgr_boyerMyrvold.hpp => boyerMyrvold.hpp} | 0 include/spanningTree/{pgr_kruskal.hpp => kruskal.hpp} | 0 include/spanningTree/{pgr_mst.hpp => mst.hpp} | 0 include/spanningTree/{pgr_prim.hpp => prim.hpp} | 0 .../{pgr_topologicalSort.hpp => topologicalSort.hpp} | 0 .../{pgr_transitiveClosure.hpp => transitiveClosure.hpp} | 0 .../traversal/{pgr_depthFirstSearch.hpp => depthFirstSearch.hpp} | 0 include/trsp/{pgr_trspHandler.hpp => trspHandler.hpp} | 0 include/vrp/{pgr_pickDeliver.hpp => pickDeliver.hpp} | 0 include/withPoints/{pgr_withPoints.hpp => withPoints.hpp} | 0 include/yen/{pgr_ksp.hpp => ksp.hpp} | 0 .../yen/{pgr_turnRestrictedPath.hpp => turnRestrictedPath.hpp} | 0 44 files changed, 0 insertions(+), 0 deletions(-) rename include/allpairs/{pgr_allpairs.hpp => allpairs.hpp} (100%) rename include/alphaShape/{pgr_alphaShape.hpp => alphaShape.hpp} (100%) rename include/bdDijkstra/{pgr_bdDijkstra.hpp => bdDijkstra.hpp} (100%) rename include/bellman_ford/{pgr_bellman_ford.hpp => bellman_ford.hpp} (100%) rename include/bellman_ford/{pgr_edwardMoore.hpp => edwardMoore.hpp} (100%) rename include/breadthFirstSearch/{pgr_binaryBreadthFirstSearch.hpp => binaryBreadthFirstSearch.hpp} (100%) rename include/breadthFirstSearch/{pgr_breadthFirstSearch.hpp => breadthFirstSearch.hpp} (100%) rename include/chinese/{pgr_chinesePostman.hpp => chinesePostman.hpp} (100%) rename include/coloring/{pgr_bipartite_driver.hpp => bipartite_driver.hpp} (100%) rename include/coloring/{pgr_edgeColoring.hpp => edgeColoring.hpp} (100%) rename include/coloring/{pgr_sequentialVertexColoring.hpp => sequentialVertexColoring.hpp} (100%) rename include/components/{pgr_components.hpp => components.hpp} (100%) rename include/components/{pgr_makeConnected.hpp => makeConnected.hpp} (100%) rename include/contraction/{pgr_contract.hpp => contract.hpp} (100%) rename include/contraction/{pgr_contractionGraph.hpp => contractionGraph.hpp} (100%) rename include/contraction/{pgr_deadEndContraction.hpp => deadEndContraction.hpp} (100%) rename include/contraction/{pgr_linearContraction.hpp => linearContraction.hpp} (100%) rename include/cpp_common/{pgr_alloc.hpp => alloc.hpp} (100%) rename include/cpp_common/{pgr_assert.hpp => assert.hpp} (100%) rename include/cpp_common/{pgr_base_graph.hpp => base_graph.hpp} (100%) rename include/cpp_common/{pgr_bidirectional.hpp => bidirectional.hpp} (100%) rename include/cpp_common/{pgr_messages.hpp => messages.hpp} (100%) rename include/dagShortestPath/{pgr_dagShortestPath.hpp => dagShortestPath.hpp} (100%) rename include/dijkstra/{pgr_dijkstraVia.hpp => dijkstraVia.hpp} (100%) rename include/dominator/{pgr_lengauerTarjanDominatorTree_driver.hpp => lengauerTarjanDominatorTree_driver.hpp} (100%) rename include/lineGraph/{pgr_lineGraphFull.hpp => lineGraphFull.hpp} (100%) rename include/max_flow/{pgr_costFlowGraph.hpp => costFlowGraph.hpp} (100%) rename include/max_flow/{pgr_flowgraph.hpp => flowgraph.hpp} (100%) rename include/max_flow/{pgr_maxflow.hpp => maxflow.hpp} (100%) rename include/max_flow/{pgr_maximumcardinalitymatching.hpp => maximumcardinalitymatching.hpp} (100%) rename include/max_flow/{pgr_minCostMaxFlow.hpp => minCostMaxFlow.hpp} (100%) rename include/mincut/{pgr_stoerWagner.hpp => stoerWagner.hpp} (100%) rename include/planar/{pgr_boyerMyrvold.hpp => boyerMyrvold.hpp} (100%) rename include/spanningTree/{pgr_kruskal.hpp => kruskal.hpp} (100%) rename include/spanningTree/{pgr_mst.hpp => mst.hpp} (100%) rename include/spanningTree/{pgr_prim.hpp => prim.hpp} (100%) rename include/topologicalSort/{pgr_topologicalSort.hpp => topologicalSort.hpp} (100%) rename include/transitiveClosure/{pgr_transitiveClosure.hpp => transitiveClosure.hpp} (100%) rename include/traversal/{pgr_depthFirstSearch.hpp => depthFirstSearch.hpp} (100%) rename include/trsp/{pgr_trspHandler.hpp => trspHandler.hpp} (100%) rename include/vrp/{pgr_pickDeliver.hpp => pickDeliver.hpp} (100%) rename include/withPoints/{pgr_withPoints.hpp => withPoints.hpp} (100%) rename include/yen/{pgr_ksp.hpp => ksp.hpp} (100%) rename include/yen/{pgr_turnRestrictedPath.hpp => turnRestrictedPath.hpp} (100%) diff --git a/include/allpairs/pgr_allpairs.hpp b/include/allpairs/allpairs.hpp similarity index 100% rename from include/allpairs/pgr_allpairs.hpp rename to include/allpairs/allpairs.hpp diff --git a/include/alphaShape/pgr_alphaShape.hpp b/include/alphaShape/alphaShape.hpp similarity index 100% rename from include/alphaShape/pgr_alphaShape.hpp rename to include/alphaShape/alphaShape.hpp diff --git a/include/bdDijkstra/pgr_bdDijkstra.hpp b/include/bdDijkstra/bdDijkstra.hpp similarity index 100% rename from include/bdDijkstra/pgr_bdDijkstra.hpp rename to include/bdDijkstra/bdDijkstra.hpp diff --git a/include/bellman_ford/pgr_bellman_ford.hpp b/include/bellman_ford/bellman_ford.hpp similarity index 100% rename from include/bellman_ford/pgr_bellman_ford.hpp rename to include/bellman_ford/bellman_ford.hpp diff --git a/include/bellman_ford/pgr_edwardMoore.hpp b/include/bellman_ford/edwardMoore.hpp similarity index 100% rename from include/bellman_ford/pgr_edwardMoore.hpp rename to include/bellman_ford/edwardMoore.hpp diff --git a/include/breadthFirstSearch/pgr_binaryBreadthFirstSearch.hpp b/include/breadthFirstSearch/binaryBreadthFirstSearch.hpp similarity index 100% rename from include/breadthFirstSearch/pgr_binaryBreadthFirstSearch.hpp rename to include/breadthFirstSearch/binaryBreadthFirstSearch.hpp diff --git a/include/breadthFirstSearch/pgr_breadthFirstSearch.hpp b/include/breadthFirstSearch/breadthFirstSearch.hpp similarity index 100% rename from include/breadthFirstSearch/pgr_breadthFirstSearch.hpp rename to include/breadthFirstSearch/breadthFirstSearch.hpp diff --git a/include/chinese/pgr_chinesePostman.hpp b/include/chinese/chinesePostman.hpp similarity index 100% rename from include/chinese/pgr_chinesePostman.hpp rename to include/chinese/chinesePostman.hpp diff --git a/include/coloring/pgr_bipartite_driver.hpp b/include/coloring/bipartite_driver.hpp similarity index 100% rename from include/coloring/pgr_bipartite_driver.hpp rename to include/coloring/bipartite_driver.hpp diff --git a/include/coloring/pgr_edgeColoring.hpp b/include/coloring/edgeColoring.hpp similarity index 100% rename from include/coloring/pgr_edgeColoring.hpp rename to include/coloring/edgeColoring.hpp diff --git a/include/coloring/pgr_sequentialVertexColoring.hpp b/include/coloring/sequentialVertexColoring.hpp similarity index 100% rename from include/coloring/pgr_sequentialVertexColoring.hpp rename to include/coloring/sequentialVertexColoring.hpp diff --git a/include/components/pgr_components.hpp b/include/components/components.hpp similarity index 100% rename from include/components/pgr_components.hpp rename to include/components/components.hpp diff --git a/include/components/pgr_makeConnected.hpp b/include/components/makeConnected.hpp similarity index 100% rename from include/components/pgr_makeConnected.hpp rename to include/components/makeConnected.hpp diff --git a/include/contraction/pgr_contract.hpp b/include/contraction/contract.hpp similarity index 100% rename from include/contraction/pgr_contract.hpp rename to include/contraction/contract.hpp diff --git a/include/contraction/pgr_contractionGraph.hpp b/include/contraction/contractionGraph.hpp similarity index 100% rename from include/contraction/pgr_contractionGraph.hpp rename to include/contraction/contractionGraph.hpp diff --git a/include/contraction/pgr_deadEndContraction.hpp b/include/contraction/deadEndContraction.hpp similarity index 100% rename from include/contraction/pgr_deadEndContraction.hpp rename to include/contraction/deadEndContraction.hpp diff --git a/include/contraction/pgr_linearContraction.hpp b/include/contraction/linearContraction.hpp similarity index 100% rename from include/contraction/pgr_linearContraction.hpp rename to include/contraction/linearContraction.hpp diff --git a/include/cpp_common/pgr_alloc.hpp b/include/cpp_common/alloc.hpp similarity index 100% rename from include/cpp_common/pgr_alloc.hpp rename to include/cpp_common/alloc.hpp diff --git a/include/cpp_common/pgr_assert.hpp b/include/cpp_common/assert.hpp similarity index 100% rename from include/cpp_common/pgr_assert.hpp rename to include/cpp_common/assert.hpp diff --git a/include/cpp_common/pgr_base_graph.hpp b/include/cpp_common/base_graph.hpp similarity index 100% rename from include/cpp_common/pgr_base_graph.hpp rename to include/cpp_common/base_graph.hpp diff --git a/include/cpp_common/pgr_bidirectional.hpp b/include/cpp_common/bidirectional.hpp similarity index 100% rename from include/cpp_common/pgr_bidirectional.hpp rename to include/cpp_common/bidirectional.hpp diff --git a/include/cpp_common/pgr_messages.hpp b/include/cpp_common/messages.hpp similarity index 100% rename from include/cpp_common/pgr_messages.hpp rename to include/cpp_common/messages.hpp diff --git a/include/dagShortestPath/pgr_dagShortestPath.hpp b/include/dagShortestPath/dagShortestPath.hpp similarity index 100% rename from include/dagShortestPath/pgr_dagShortestPath.hpp rename to include/dagShortestPath/dagShortestPath.hpp diff --git a/include/dijkstra/pgr_dijkstraVia.hpp b/include/dijkstra/dijkstraVia.hpp similarity index 100% rename from include/dijkstra/pgr_dijkstraVia.hpp rename to include/dijkstra/dijkstraVia.hpp diff --git a/include/dominator/pgr_lengauerTarjanDominatorTree_driver.hpp b/include/dominator/lengauerTarjanDominatorTree_driver.hpp similarity index 100% rename from include/dominator/pgr_lengauerTarjanDominatorTree_driver.hpp rename to include/dominator/lengauerTarjanDominatorTree_driver.hpp diff --git a/include/lineGraph/pgr_lineGraphFull.hpp b/include/lineGraph/lineGraphFull.hpp similarity index 100% rename from include/lineGraph/pgr_lineGraphFull.hpp rename to include/lineGraph/lineGraphFull.hpp diff --git a/include/max_flow/pgr_costFlowGraph.hpp b/include/max_flow/costFlowGraph.hpp similarity index 100% rename from include/max_flow/pgr_costFlowGraph.hpp rename to include/max_flow/costFlowGraph.hpp diff --git a/include/max_flow/pgr_flowgraph.hpp b/include/max_flow/flowgraph.hpp similarity index 100% rename from include/max_flow/pgr_flowgraph.hpp rename to include/max_flow/flowgraph.hpp diff --git a/include/max_flow/pgr_maxflow.hpp b/include/max_flow/maxflow.hpp similarity index 100% rename from include/max_flow/pgr_maxflow.hpp rename to include/max_flow/maxflow.hpp diff --git a/include/max_flow/pgr_maximumcardinalitymatching.hpp b/include/max_flow/maximumcardinalitymatching.hpp similarity index 100% rename from include/max_flow/pgr_maximumcardinalitymatching.hpp rename to include/max_flow/maximumcardinalitymatching.hpp diff --git a/include/max_flow/pgr_minCostMaxFlow.hpp b/include/max_flow/minCostMaxFlow.hpp similarity index 100% rename from include/max_flow/pgr_minCostMaxFlow.hpp rename to include/max_flow/minCostMaxFlow.hpp diff --git a/include/mincut/pgr_stoerWagner.hpp b/include/mincut/stoerWagner.hpp similarity index 100% rename from include/mincut/pgr_stoerWagner.hpp rename to include/mincut/stoerWagner.hpp diff --git a/include/planar/pgr_boyerMyrvold.hpp b/include/planar/boyerMyrvold.hpp similarity index 100% rename from include/planar/pgr_boyerMyrvold.hpp rename to include/planar/boyerMyrvold.hpp diff --git a/include/spanningTree/pgr_kruskal.hpp b/include/spanningTree/kruskal.hpp similarity index 100% rename from include/spanningTree/pgr_kruskal.hpp rename to include/spanningTree/kruskal.hpp diff --git a/include/spanningTree/pgr_mst.hpp b/include/spanningTree/mst.hpp similarity index 100% rename from include/spanningTree/pgr_mst.hpp rename to include/spanningTree/mst.hpp diff --git a/include/spanningTree/pgr_prim.hpp b/include/spanningTree/prim.hpp similarity index 100% rename from include/spanningTree/pgr_prim.hpp rename to include/spanningTree/prim.hpp diff --git a/include/topologicalSort/pgr_topologicalSort.hpp b/include/topologicalSort/topologicalSort.hpp similarity index 100% rename from include/topologicalSort/pgr_topologicalSort.hpp rename to include/topologicalSort/topologicalSort.hpp diff --git a/include/transitiveClosure/pgr_transitiveClosure.hpp b/include/transitiveClosure/transitiveClosure.hpp similarity index 100% rename from include/transitiveClosure/pgr_transitiveClosure.hpp rename to include/transitiveClosure/transitiveClosure.hpp diff --git a/include/traversal/pgr_depthFirstSearch.hpp b/include/traversal/depthFirstSearch.hpp similarity index 100% rename from include/traversal/pgr_depthFirstSearch.hpp rename to include/traversal/depthFirstSearch.hpp diff --git a/include/trsp/pgr_trspHandler.hpp b/include/trsp/trspHandler.hpp similarity index 100% rename from include/trsp/pgr_trspHandler.hpp rename to include/trsp/trspHandler.hpp diff --git a/include/vrp/pgr_pickDeliver.hpp b/include/vrp/pickDeliver.hpp similarity index 100% rename from include/vrp/pgr_pickDeliver.hpp rename to include/vrp/pickDeliver.hpp diff --git a/include/withPoints/pgr_withPoints.hpp b/include/withPoints/withPoints.hpp similarity index 100% rename from include/withPoints/pgr_withPoints.hpp rename to include/withPoints/withPoints.hpp diff --git a/include/yen/pgr_ksp.hpp b/include/yen/ksp.hpp similarity index 100% rename from include/yen/pgr_ksp.hpp rename to include/yen/ksp.hpp diff --git a/include/yen/pgr_turnRestrictedPath.hpp b/include/yen/turnRestrictedPath.hpp similarity index 100% rename from include/yen/pgr_turnRestrictedPath.hpp rename to include/yen/turnRestrictedPath.hpp From 09818dc45868db99fbcafe49998f91a7ad8263bb Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 9 Oct 2024 22:31:05 -0600 Subject: [PATCH 411/428] (src) Removing pgr_ prefix from filenames pgr_filename.* -> filename.* --- src/alpha_shape/{pgr_alphaShape.cpp => alphaShape.cpp} | 0 src/coloring/{pgr_edgeColoring.cpp => edgeColoring.cpp} | 0 src/common/{pgr_alloc.cpp => alloc.cpp} | 0 src/common/{pgr_assert.cpp => assert.cpp} | 0 src/components/{pgr_components.cpp => components.cpp} | 0 src/contraction/{pgr_contract.cpp => contract.cpp} | 0 src/cpp_common/{pgr_messages.cpp => messages.cpp} | 0 src/max_flow/{pgr_flowgraph.cpp => flowgraph.cpp} | 0 src/max_flow/{pgr_maxflow.cpp => maxflow.cpp} | 0 src/max_flow/{pgr_minCostMaxFlow.cpp => minCostMaxFlow.cpp} | 0 src/pickDeliver/{pgr_pickDeliver.cpp => pickDeliver.cpp} | 0 src/trsp/{pgr_trspHandler.cpp => trspHandler.cpp} | 0 src/withPoints/{pgr_withPoints.cpp => withPoints.cpp} | 0 13 files changed, 0 insertions(+), 0 deletions(-) rename src/alpha_shape/{pgr_alphaShape.cpp => alphaShape.cpp} (100%) rename src/coloring/{pgr_edgeColoring.cpp => edgeColoring.cpp} (100%) rename src/common/{pgr_alloc.cpp => alloc.cpp} (100%) rename src/common/{pgr_assert.cpp => assert.cpp} (100%) rename src/components/{pgr_components.cpp => components.cpp} (100%) rename src/contraction/{pgr_contract.cpp => contract.cpp} (100%) rename src/cpp_common/{pgr_messages.cpp => messages.cpp} (100%) rename src/max_flow/{pgr_flowgraph.cpp => flowgraph.cpp} (100%) rename src/max_flow/{pgr_maxflow.cpp => maxflow.cpp} (100%) rename src/max_flow/{pgr_minCostMaxFlow.cpp => minCostMaxFlow.cpp} (100%) rename src/pickDeliver/{pgr_pickDeliver.cpp => pickDeliver.cpp} (100%) rename src/trsp/{pgr_trspHandler.cpp => trspHandler.cpp} (100%) rename src/withPoints/{pgr_withPoints.cpp => withPoints.cpp} (100%) diff --git a/src/alpha_shape/pgr_alphaShape.cpp b/src/alpha_shape/alphaShape.cpp similarity index 100% rename from src/alpha_shape/pgr_alphaShape.cpp rename to src/alpha_shape/alphaShape.cpp diff --git a/src/coloring/pgr_edgeColoring.cpp b/src/coloring/edgeColoring.cpp similarity index 100% rename from src/coloring/pgr_edgeColoring.cpp rename to src/coloring/edgeColoring.cpp diff --git a/src/common/pgr_alloc.cpp b/src/common/alloc.cpp similarity index 100% rename from src/common/pgr_alloc.cpp rename to src/common/alloc.cpp diff --git a/src/common/pgr_assert.cpp b/src/common/assert.cpp similarity index 100% rename from src/common/pgr_assert.cpp rename to src/common/assert.cpp diff --git a/src/components/pgr_components.cpp b/src/components/components.cpp similarity index 100% rename from src/components/pgr_components.cpp rename to src/components/components.cpp diff --git a/src/contraction/pgr_contract.cpp b/src/contraction/contract.cpp similarity index 100% rename from src/contraction/pgr_contract.cpp rename to src/contraction/contract.cpp diff --git a/src/cpp_common/pgr_messages.cpp b/src/cpp_common/messages.cpp similarity index 100% rename from src/cpp_common/pgr_messages.cpp rename to src/cpp_common/messages.cpp diff --git a/src/max_flow/pgr_flowgraph.cpp b/src/max_flow/flowgraph.cpp similarity index 100% rename from src/max_flow/pgr_flowgraph.cpp rename to src/max_flow/flowgraph.cpp diff --git a/src/max_flow/pgr_maxflow.cpp b/src/max_flow/maxflow.cpp similarity index 100% rename from src/max_flow/pgr_maxflow.cpp rename to src/max_flow/maxflow.cpp diff --git a/src/max_flow/pgr_minCostMaxFlow.cpp b/src/max_flow/minCostMaxFlow.cpp similarity index 100% rename from src/max_flow/pgr_minCostMaxFlow.cpp rename to src/max_flow/minCostMaxFlow.cpp diff --git a/src/pickDeliver/pgr_pickDeliver.cpp b/src/pickDeliver/pickDeliver.cpp similarity index 100% rename from src/pickDeliver/pgr_pickDeliver.cpp rename to src/pickDeliver/pickDeliver.cpp diff --git a/src/trsp/pgr_trspHandler.cpp b/src/trsp/trspHandler.cpp similarity index 100% rename from src/trsp/pgr_trspHandler.cpp rename to src/trsp/trspHandler.cpp diff --git a/src/withPoints/pgr_withPoints.cpp b/src/withPoints/withPoints.cpp similarity index 100% rename from src/withPoints/pgr_withPoints.cpp rename to src/withPoints/withPoints.cpp From f5a21379c2ff0f1bc537523c24af83246777d5d4 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 10 Oct 2024 08:39:54 -0600 Subject: [PATCH 412/428] (src) Removing other prefixes on filenames --- .../{drivedist_driver.h => driving_distance_driver.h} | 0 ...ithPoints_dd_driver.h => driving_distance_withPoints_driver.h} | 0 .../{many_to_dist_driving_distance.c => driving_distance.c} | 0 .../{drivedist_driver.cpp => driving_distance_driver.cpp} | 0 ...{many_to_dist_withPointsDD.c => driving_distance_withPoints.c} | 0 ...oints_dd_driver.cpp => driving_distance_withPoints_driver.cpp} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename include/drivers/driving_distance/{drivedist_driver.h => driving_distance_driver.h} (100%) rename include/drivers/driving_distance/{withPoints_dd_driver.h => driving_distance_withPoints_driver.h} (100%) rename src/driving_distance/{many_to_dist_driving_distance.c => driving_distance.c} (100%) rename src/driving_distance/{drivedist_driver.cpp => driving_distance_driver.cpp} (100%) rename src/driving_distance/{many_to_dist_withPointsDD.c => driving_distance_withPoints.c} (100%) rename src/driving_distance/{withPoints_dd_driver.cpp => driving_distance_withPoints_driver.cpp} (100%) diff --git a/include/drivers/driving_distance/drivedist_driver.h b/include/drivers/driving_distance/driving_distance_driver.h similarity index 100% rename from include/drivers/driving_distance/drivedist_driver.h rename to include/drivers/driving_distance/driving_distance_driver.h diff --git a/include/drivers/driving_distance/withPoints_dd_driver.h b/include/drivers/driving_distance/driving_distance_withPoints_driver.h similarity index 100% rename from include/drivers/driving_distance/withPoints_dd_driver.h rename to include/drivers/driving_distance/driving_distance_withPoints_driver.h diff --git a/src/driving_distance/many_to_dist_driving_distance.c b/src/driving_distance/driving_distance.c similarity index 100% rename from src/driving_distance/many_to_dist_driving_distance.c rename to src/driving_distance/driving_distance.c diff --git a/src/driving_distance/drivedist_driver.cpp b/src/driving_distance/driving_distance_driver.cpp similarity index 100% rename from src/driving_distance/drivedist_driver.cpp rename to src/driving_distance/driving_distance_driver.cpp diff --git a/src/driving_distance/many_to_dist_withPointsDD.c b/src/driving_distance/driving_distance_withPoints.c similarity index 100% rename from src/driving_distance/many_to_dist_withPointsDD.c rename to src/driving_distance/driving_distance_withPoints.c diff --git a/src/driving_distance/withPoints_dd_driver.cpp b/src/driving_distance/driving_distance_withPoints_driver.cpp similarity index 100% rename from src/driving_distance/withPoints_dd_driver.cpp rename to src/driving_distance/driving_distance_withPoints_driver.cpp From 16cd445cec5032c1424e929a48739d312cdceb41 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 9 Oct 2024 23:29:41 -0600 Subject: [PATCH 413/428] (src) Adjusting code to filename changes --- src/allpairs/floydWarshall_driver.cpp | 4 ++-- src/allpairs/johnson_driver.cpp | 4 ++-- src/alpha_shape/alphaShape.cpp | 4 ++-- src/alpha_shape/alphaShape_driver.cpp | 8 ++++---- src/astar/astar_driver.cpp | 4 ++-- src/bdAstar/bdAstar_driver.cpp | 4 ++-- src/bdDijkstra/bdDijkstra_driver.cpp | 8 ++++---- src/bellman_ford/bellman_ford_driver.cpp | 6 +++--- src/bellman_ford/bellman_ford_neg.c | 14 +++++++++----- src/bellman_ford/bellman_ford_neg_driver.cpp | 6 +++--- src/bellman_ford/edwardMoore_driver.cpp | 8 ++++---- .../binaryBreadthFirstSearch_driver.cpp | 6 +++--- .../breadthFirstSearch_driver.cpp | 6 +++--- src/chinese/chinesePostman_driver.cpp | 6 +++--- src/circuits/hawickCircuits_driver.cpp | 4 ++-- src/coloring/bipartite_driver.cpp | 6 +++--- src/coloring/edgeColoring.cpp | 6 +++--- src/coloring/edgeColoring_driver.cpp | 6 +++--- src/coloring/sequentialVertexColoring_driver.cpp | 6 +++--- src/common/alloc.cpp | 4 ++-- src/common/assert.cpp | 4 ++-- src/common/basePath_SSEC.cpp | 2 +- src/common/basic_vertex.cpp | 2 +- src/common/xy_vertex.cpp | 2 +- src/components/articulationPoints_driver.cpp | 8 ++++---- src/components/biconnectedComponents_driver.cpp | 8 ++++---- src/components/bridges_driver.cpp | 8 ++++---- src/components/components.cpp | 4 ++-- src/components/connectedComponents_driver.cpp | 8 ++++---- src/components/makeConnected_driver.cpp | 8 ++++---- src/components/strongComponents_driver.cpp | 8 ++++---- src/contraction/contract.cpp | 4 ++-- src/contraction/contractGraph_driver.cpp | 4 ++-- src/cpp_common/Dmatrix.cpp | 2 +- src/cpp_common/compPaths.cpp | 2 +- src/cpp_common/get_check_data.cpp | 2 +- src/cpp_common/messages.cpp | 4 ++-- src/cpp_common/trsp_pgget.cpp | 2 +- src/dagShortestPath/dagShortestPath_driver.cpp | 6 +++--- src/dijkstra/dijkstraVia_driver.cpp | 6 +++--- src/dijkstra/dijkstra_driver.cpp | 4 ++-- .../lengauerTarjanDominatorTree_driver.cpp | 6 +++--- src/driving_distance/driving_distance.c | 4 ++-- src/driving_distance/driving_distance_driver.cpp | 8 ++++---- src/driving_distance/driving_distance_withPoints.c | 4 ++-- .../driving_distance_withPoints_driver.cpp | 8 ++++---- src/ksp/ksp_driver.cpp | 6 +++--- src/ksp/turnRestrictedPath_driver.cpp | 6 +++--- src/ksp/withPoints_ksp_driver.cpp | 8 ++++---- src/lineGraph/lineGraphFull_driver.cpp | 6 +++--- src/lineGraph/lineGraph_driver.cpp | 6 +++--- src/max_flow/edge_disjoint_paths_driver.cpp | 6 +++--- src/max_flow/flowgraph.cpp | 4 ++-- src/max_flow/max_flow_driver.cpp | 6 +++--- src/max_flow/maxflow.cpp | 4 ++-- .../maximum_cardinality_matching_driver.cpp | 6 +++--- src/max_flow/minCostMaxFlow.cpp | 4 ++-- src/max_flow/minCostMaxFlow_driver.cpp | 6 +++--- src/metrics/betweennessCentrality_driver.cpp | 2 +- src/mincut/stoerWagner_driver.cpp | 6 +++--- src/ordering/cuthillMckeeOrdering_driver.cpp | 4 ++-- src/pickDeliver/dnode.cpp | 2 +- src/pickDeliver/fleet.cpp | 2 +- src/pickDeliver/initial_solution.cpp | 4 ++-- src/pickDeliver/optimize.cpp | 4 ++-- src/pickDeliver/pd_orders.cpp | 2 +- src/pickDeliver/pickDeliver.cpp | 6 +++--- src/pickDeliver/pickDeliverEuclidean_driver.cpp | 6 +++--- src/pickDeliver/pickDeliver_driver.cpp | 6 +++--- src/pickDeliver/solution.cpp | 2 +- src/pickDeliver/tw_node.cpp | 4 ++-- src/pickDeliver/vehicle.cpp | 4 ++-- src/pickDeliver/vehicle_pickDeliver.cpp | 4 ++-- src/planar/isPlanar_driver.cpp | 8 ++++---- src/spanningTree/kruskal_driver.cpp | 6 +++--- src/spanningTree/mst_common.cpp | 4 ++-- src/spanningTree/prim_driver.cpp | 6 +++--- src/spanningTree/randomSpanningTree_driver.cpp | 6 +++--- src/topologicalSort/topologicalSort_driver.cpp | 6 +++--- src/transitiveClosure/transitiveClosure_driver.cpp | 6 +++--- src/traversal/depthFirstSearch_driver.cpp | 6 +++--- src/trsp/trspHandler.cpp | 6 +++--- src/trsp/trspVia_driver.cpp | 8 ++++---- src/trsp/trspVia_withPoints_driver.cpp | 10 +++++----- src/trsp/trsp_driver.cpp | 8 ++++---- src/trsp/trsp_withPoints_driver.cpp | 8 ++++---- src/tsp/TSP_driver.cpp | 4 ++-- src/tsp/euclideanTSP_driver.cpp | 4 ++-- src/tsp/tsp.cpp | 4 ++-- src/withPoints/get_new_queries.cpp | 2 +- src/withPoints/withPoints.cpp | 6 +++--- src/withPoints/withPointsVia_driver.cpp | 8 ++++---- src/withPoints/withPoints_driver.cpp | 6 +++--- 93 files changed, 250 insertions(+), 246 deletions(-) diff --git a/src/allpairs/floydWarshall_driver.cpp b/src/allpairs/floydWarshall_driver.cpp index 5fb330bccb..a016e03d09 100644 --- a/src/allpairs/floydWarshall_driver.cpp +++ b/src/allpairs/floydWarshall_driver.cpp @@ -34,10 +34,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "allpairs/pgr_allpairs.hpp" +#include "allpairs/allpairs.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" void diff --git a/src/allpairs/johnson_driver.cpp b/src/allpairs/johnson_driver.cpp index ff9337a977..dea9c9f8f1 100644 --- a/src/allpairs/johnson_driver.cpp +++ b/src/allpairs/johnson_driver.cpp @@ -34,10 +34,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "allpairs/pgr_allpairs.hpp" +#include "allpairs/allpairs.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" void diff --git a/src/alpha_shape/alphaShape.cpp b/src/alpha_shape/alphaShape.cpp index adbe522ea0..e85c8b90a2 100644 --- a/src/alpha_shape/alphaShape.cpp +++ b/src/alpha_shape/alphaShape.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_alphaShape.cpp +File: alphaShape.cpp Copyright (c) 2018 pgRouting developers Mail: project@pgrouting.org @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "alphaShape/pgr_alphaShape.hpp" +#include "alphaShape/alphaShape.hpp" #include #include diff --git a/src/alpha_shape/alphaShape_driver.cpp b/src/alpha_shape/alphaShape_driver.cpp index c7f2834913..e3441771d8 100644 --- a/src/alpha_shape/alphaShape_driver.cpp +++ b/src/alpha_shape/alphaShape_driver.cpp @@ -39,13 +39,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "c_types/geom_text_rt.h" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "alphaShape/pgr_alphaShape.hpp" +#include "alphaShape/alphaShape.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/bpoint.hpp" #include "cpp_common/bline.hpp" diff --git a/src/astar/astar_driver.cpp b/src/astar/astar_driver.cpp index 1eb607ceb3..6a14a78f90 100644 --- a/src/astar/astar_driver.cpp +++ b/src/astar/astar_driver.cpp @@ -39,8 +39,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/edge_xy_t.hpp" #include "c_types/ii_t_rt.h" diff --git a/src/bdAstar/bdAstar_driver.cpp b/src/bdAstar/bdAstar_driver.cpp index d478193b17..8f685608e4 100644 --- a/src/bdAstar/bdAstar_driver.cpp +++ b/src/bdAstar/bdAstar_driver.cpp @@ -40,8 +40,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/edge_xy_t.hpp" #include "c_types/ii_t_rt.h" diff --git a/src/bdDijkstra/bdDijkstra_driver.cpp b/src/bdDijkstra/bdDijkstra_driver.cpp index 7943d58a52..1411dd50fd 100644 --- a/src/bdDijkstra/bdDijkstra_driver.cpp +++ b/src/bdDijkstra/bdDijkstra_driver.cpp @@ -40,10 +40,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "cpp_common/pgr_base_graph.hpp" -#include "bdDijkstra/pgr_bdDijkstra.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" +#include "cpp_common/base_graph.hpp" +#include "bdDijkstra/bdDijkstra.hpp" #include "c_types/ii_t_rt.h" diff --git a/src/bellman_ford/bellman_ford_driver.cpp b/src/bellman_ford/bellman_ford_driver.cpp index 2e31ebc781..bb196d7826 100644 --- a/src/bellman_ford/bellman_ford_driver.cpp +++ b/src/bellman_ford/bellman_ford_driver.cpp @@ -37,12 +37,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "bellman_ford/pgr_bellman_ford.hpp" +#include "bellman_ford/bellman_ford.hpp" #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "c_types/ii_t_rt.h" diff --git a/src/bellman_ford/bellman_ford_neg.c b/src/bellman_ford/bellman_ford_neg.c index 103ec18b34..87313253b5 100644 --- a/src/bellman_ford/bellman_ford_neg.c +++ b/src/bellman_ford/bellman_ford_neg.c @@ -66,6 +66,7 @@ process( neg_edges_sql, combinations_sql, starts, ends, + directed, only_cost, @@ -89,9 +90,10 @@ process( pgr_SPI_finish(); } -PGDLLEXPORT Datum _pgr_bellmanfordneg(PG_FUNCTION_ARGS) { +PGDLLEXPORT Datum +_pgr_bellmanfordneg(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; - TupleDesc tuple_desc; + TupleDesc tuple_desc; Path_rt *result_tuples = NULL; size_t result_count = 0; @@ -159,14 +161,15 @@ PGDLLEXPORT Datum _pgr_bellmanfordneg(PG_FUNCTION_ARGS) { values = palloc(numb * sizeof(Datum)); nulls = palloc(numb * sizeof(bool)); - size_t i; for (i = 0; i < numb; ++i) { nulls[i] = false; } - values[0] = Int32GetDatum((int32_t)funcctx->call_cntr + 1); - values[1] = Int32GetDatum(result_tuples[funcctx->call_cntr].seq); + int64_t seq = funcctx->call_cntr == 0? 1 : result_tuples[funcctx->call_cntr - 1].start_id; + + values[0] = Int32GetDatum(funcctx->call_cntr + 1); + values[1] = Int32GetDatum(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); @@ -174,6 +177,7 @@ PGDLLEXPORT Datum _pgr_bellmanfordneg(PG_FUNCTION_ARGS) { values[6] = Float8GetDatum(result_tuples[funcctx->call_cntr].cost); values[7] = Float8GetDatum(result_tuples[funcctx->call_cntr].agg_cost); + result_tuples[funcctx->call_cntr].start_id = result_tuples[funcctx->call_cntr].edge < 0? 1 : seq + 1; tuple = heap_form_tuple(tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); diff --git a/src/bellman_ford/bellman_ford_neg_driver.cpp b/src/bellman_ford/bellman_ford_neg_driver.cpp index 9b97b980bf..5407134cc9 100644 --- a/src/bellman_ford/bellman_ford_neg_driver.cpp +++ b/src/bellman_ford/bellman_ford_neg_driver.cpp @@ -37,13 +37,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "bellman_ford/pgr_bellman_ford.hpp" +#include "bellman_ford/bellman_ford.hpp" #include "c_types/ii_t_rt.h" #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" namespace { diff --git a/src/bellman_ford/edwardMoore_driver.cpp b/src/bellman_ford/edwardMoore_driver.cpp index 196c4c6fa5..082e5845b3 100644 --- a/src/bellman_ford/edwardMoore_driver.cpp +++ b/src/bellman_ford/edwardMoore_driver.cpp @@ -38,14 +38,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "bellman_ford/pgr_edwardMoore.hpp" +#include "bellman_ford/edwardMoore.hpp" #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/base_graph.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "c_types/ii_t_rt.h" diff --git a/src/breadthFirstSearch/binaryBreadthFirstSearch_driver.cpp b/src/breadthFirstSearch/binaryBreadthFirstSearch_driver.cpp index cb0afaed83..d2a0d9fa77 100644 --- a/src/breadthFirstSearch/binaryBreadthFirstSearch_driver.cpp +++ b/src/breadthFirstSearch/binaryBreadthFirstSearch_driver.cpp @@ -38,12 +38,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "breadthFirstSearch/pgr_binaryBreadthFirstSearch.hpp" +#include "breadthFirstSearch/binaryBreadthFirstSearch.hpp" #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" namespace { diff --git a/src/breadthFirstSearch/breadthFirstSearch_driver.cpp b/src/breadthFirstSearch/breadthFirstSearch_driver.cpp index 0e6a3e8921..6dfabead04 100644 --- a/src/breadthFirstSearch/breadthFirstSearch_driver.cpp +++ b/src/breadthFirstSearch/breadthFirstSearch_driver.cpp @@ -35,10 +35,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" -#include "breadthFirstSearch/pgr_breadthFirstSearch.hpp" +#include "breadthFirstSearch/breadthFirstSearch.hpp" namespace { diff --git a/src/chinese/chinesePostman_driver.cpp b/src/chinese/chinesePostman_driver.cpp index 742716ed49..6685c91627 100644 --- a/src/chinese/chinesePostman_driver.cpp +++ b/src/chinese/chinesePostman_driver.cpp @@ -37,10 +37,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // work for only directed #include "cpp_common/pgdata_getters.hpp" -#include "chinese/pgr_chinesePostman.hpp" +#include "chinese/chinesePostman.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" void pgr_do_directedChPP( diff --git a/src/circuits/hawickCircuits_driver.cpp b/src/circuits/hawickCircuits_driver.cpp index e9a504ffb2..b506deee1b 100644 --- a/src/circuits/hawickCircuits_driver.cpp +++ b/src/circuits/hawickCircuits_driver.cpp @@ -37,8 +37,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "circuits/hawickcircuits.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" namespace { diff --git a/src/coloring/bipartite_driver.cpp b/src/coloring/bipartite_driver.cpp index 90f01dfcdb..29e2014ffd 100644 --- a/src/coloring/bipartite_driver.cpp +++ b/src/coloring/bipartite_driver.cpp @@ -36,11 +36,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "c_types/ii_t_rt.h" #include "cpp_common/identifiers.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "drivers/coloring/bipartite_driver.h" -#include "coloring/pgr_bipartite_driver.hpp" +#include "coloring/bipartite_driver.hpp" void diff --git a/src/coloring/edgeColoring.cpp b/src/coloring/edgeColoring.cpp index 29ac78e3b6..1f427a8939 100644 --- a/src/coloring/edgeColoring.cpp +++ b/src/coloring/edgeColoring.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_edgeColoring.cpp +File: edgeColoring.cpp Generated with Template by: Copyright (c) 2021 pgRouting developers @@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "coloring/pgr_edgeColoring.hpp" +#include "coloring/edgeColoring.hpp" #include #include @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/interruption.hpp" diff --git a/src/coloring/edgeColoring_driver.cpp b/src/coloring/edgeColoring_driver.cpp index 0172463296..a69188ad68 100644 --- a/src/coloring/edgeColoring_driver.cpp +++ b/src/coloring/edgeColoring_driver.cpp @@ -31,11 +31,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "coloring/pgr_edgeColoring.hpp" +#include "coloring/edgeColoring.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" void pgr_do_edgeColoring( char *edges_sql, diff --git a/src/coloring/sequentialVertexColoring_driver.cpp b/src/coloring/sequentialVertexColoring_driver.cpp index 1f24d0f078..40cb7908da 100644 --- a/src/coloring/sequentialVertexColoring_driver.cpp +++ b/src/coloring/sequentialVertexColoring_driver.cpp @@ -34,10 +34,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" -#include "coloring/pgr_sequentialVertexColoring.hpp" +#include "coloring/sequentialVertexColoring.hpp" /** @file sequentialVertexColoring_driver.cpp */ diff --git a/src/common/alloc.cpp b/src/common/alloc.cpp index 6081ade658..1ff667663e 100644 --- a/src/common/alloc.cpp +++ b/src/common/alloc.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_alloc.cpp +File: alloc.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" #include #include diff --git a/src/common/assert.cpp b/src/common/assert.cpp index 98e1b41295..cddcae8b89 100644 --- a/src/common/assert.cpp +++ b/src/common/assert.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_assert.cpp +File: assert.cpp Copyright (c) 2014 pgRouting developers Mail: project@pgrouting.org @@ -25,7 +25,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" #include #include diff --git a/src/common/basePath_SSEC.cpp b/src/common/basePath_SSEC.cpp index 7e99667e5f..ef08cfef66 100644 --- a/src/common/basePath_SSEC.cpp +++ b/src/common/basePath_SSEC.cpp @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/path_rt.h" #include "c_types/mst_rt.h" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" namespace pgrouting { diff --git a/src/common/basic_vertex.cpp b/src/common/basic_vertex.cpp index a5bfc39335..c5d1e92ff9 100644 --- a/src/common/basic_vertex.cpp +++ b/src/common/basic_vertex.cpp @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" namespace pgrouting { diff --git a/src/common/xy_vertex.cpp b/src/common/xy_vertex.cpp index 9d27448bac..20902cb273 100644 --- a/src/common/xy_vertex.cpp +++ b/src/common/xy_vertex.cpp @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" namespace { diff --git a/src/components/articulationPoints_driver.cpp b/src/components/articulationPoints_driver.cpp index 649891eceb..7feb62160e 100644 --- a/src/components/articulationPoints_driver.cpp +++ b/src/components/articulationPoints_driver.cpp @@ -34,12 +34,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "components/pgr_components.hpp" +#include "components/components.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" +#include "cpp_common/base_graph.hpp" void diff --git a/src/components/biconnectedComponents_driver.cpp b/src/components/biconnectedComponents_driver.cpp index ab18531c84..58bef62d84 100644 --- a/src/components/biconnectedComponents_driver.cpp +++ b/src/components/biconnectedComponents_driver.cpp @@ -34,13 +34,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "components/pgr_components.hpp" +#include "components/components.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" void diff --git a/src/components/bridges_driver.cpp b/src/components/bridges_driver.cpp index 07660042ca..6cf50be12c 100644 --- a/src/components/bridges_driver.cpp +++ b/src/components/bridges_driver.cpp @@ -34,12 +34,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "components/pgr_components.hpp" +#include "components/components.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" +#include "cpp_common/base_graph.hpp" void diff --git a/src/components/components.cpp b/src/components/components.cpp index eced42ed06..f38c183c62 100644 --- a/src/components/components.cpp +++ b/src/components/components.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_components.cpp +File: components.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "components/pgr_components.hpp" +#include "components/components.hpp" #include #include diff --git a/src/components/connectedComponents_driver.cpp b/src/components/connectedComponents_driver.cpp index ac0590bbb9..3145192392 100644 --- a/src/components/connectedComponents_driver.cpp +++ b/src/components/connectedComponents_driver.cpp @@ -35,11 +35,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" +#include "cpp_common/base_graph.hpp" -#include "components/pgr_components.hpp" +#include "components/components.hpp" void diff --git a/src/components/makeConnected_driver.cpp b/src/components/makeConnected_driver.cpp index 0a103b9f57..ecfd615543 100644 --- a/src/components/makeConnected_driver.cpp +++ b/src/components/makeConnected_driver.cpp @@ -34,11 +34,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" -#include "components/pgr_makeConnected.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "components/makeConnected.hpp" +#include "cpp_common/base_graph.hpp" void pgr_do_makeConnected( diff --git a/src/components/strongComponents_driver.cpp b/src/components/strongComponents_driver.cpp index c88e8a433a..fb12e1d14e 100644 --- a/src/components/strongComponents_driver.cpp +++ b/src/components/strongComponents_driver.cpp @@ -36,11 +36,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" +#include "cpp_common/base_graph.hpp" -#include "components/pgr_components.hpp" +#include "components/components.hpp" void diff --git a/src/contraction/contract.cpp b/src/contraction/contract.cpp index 0f313ddeb2..a957214da0 100644 --- a/src/contraction/contract.cpp +++ b/src/contraction/contract.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_contract.cpp +File: contract.cpp Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "contraction/pgr_contract.hpp" +#include "contraction/contract.hpp" namespace pgrouting { namespace contraction { diff --git a/src/contraction/contractGraph_driver.cpp b/src/contraction/contractGraph_driver.cpp index ceabccdf9b..fcd6a8d258 100644 --- a/src/contraction/contractGraph_driver.cpp +++ b/src/contraction/contractGraph_driver.cpp @@ -37,11 +37,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "contraction/ch_graphs.hpp" -#include "contraction/pgr_contract.hpp" +#include "contraction/contract.hpp" #include "c_types/contracted_rt.h" #include "cpp_common/identifiers.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" namespace { diff --git a/src/cpp_common/Dmatrix.cpp b/src/cpp_common/Dmatrix.cpp index 53368bab0c..2acc3092c7 100644 --- a/src/cpp_common/Dmatrix.cpp +++ b/src/cpp_common/Dmatrix.cpp @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" #include "c_types/iid_t_rt.h" diff --git a/src/cpp_common/compPaths.cpp b/src/cpp_common/compPaths.cpp index 5b805fd11a..31bb11368c 100644 --- a/src/cpp_common/compPaths.cpp +++ b/src/cpp_common/compPaths.cpp @@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/compPaths.hpp" #include "cpp_common/basePath_SSEC.hpp" diff --git a/src/cpp_common/get_check_data.cpp b/src/cpp_common/get_check_data.cpp index a8f1139a39..e4a8bf0fc3 100644 --- a/src/cpp_common/get_check_data.cpp +++ b/src/cpp_common/get_check_data.cpp @@ -39,7 +39,7 @@ extern "C" { #include #include "cpp_common/undefPostgresDefine.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" #include "cpp_common/info_t.hpp" diff --git a/src/cpp_common/messages.cpp b/src/cpp_common/messages.cpp index 43b13a1f19..25bf1ca686 100644 --- a/src/cpp_common/messages.cpp +++ b/src/cpp_common/messages.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_messages.cpp +File: messages.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_messages.hpp" +#include "cpp_common/messages.hpp" namespace pgrouting { diff --git a/src/cpp_common/trsp_pgget.cpp b/src/cpp_common/trsp_pgget.cpp index 7d46ebdbeb..59dfe49a16 100644 --- a/src/cpp_common/trsp_pgget.cpp +++ b/src/cpp_common/trsp_pgget.cpp @@ -57,7 +57,7 @@ The old version of TRSP #include "cpp_common/get_data.hpp" #include "cpp_common/get_check_data.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" #include "cpp_common/trsp_pgfetch.hpp" #include "cpp_common/info_t.hpp" diff --git a/src/dagShortestPath/dagShortestPath_driver.cpp b/src/dagShortestPath/dagShortestPath_driver.cpp index a71700e08c..10923ae6ea 100644 --- a/src/dagShortestPath/dagShortestPath_driver.cpp +++ b/src/dagShortestPath/dagShortestPath_driver.cpp @@ -37,12 +37,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "dagShortestPath/pgr_dagShortestPath.hpp" +#include "dagShortestPath/dagShortestPath.hpp" #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" namespace { diff --git a/src/dijkstra/dijkstraVia_driver.cpp b/src/dijkstra/dijkstraVia_driver.cpp index e73f6e3556..0fb0842e17 100644 --- a/src/dijkstra/dijkstraVia_driver.cpp +++ b/src/dijkstra/dijkstraVia_driver.cpp @@ -34,9 +34,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/routes_t.h" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "dijkstra/pgr_dijkstraVia.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" +#include "dijkstra/dijkstraVia.hpp" namespace { diff --git a/src/dijkstra/dijkstra_driver.cpp b/src/dijkstra/dijkstra_driver.cpp index 6f294173f7..5c9aecc51f 100644 --- a/src/dijkstra/dijkstra_driver.cpp +++ b/src/dijkstra/dijkstra_driver.cpp @@ -44,8 +44,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/combinations.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "dijkstra/dijkstra.hpp" diff --git a/src/dominator/lengauerTarjanDominatorTree_driver.cpp b/src/dominator/lengauerTarjanDominatorTree_driver.cpp index 4c4f9a11d0..b9d014dc2b 100644 --- a/src/dominator/lengauerTarjanDominatorTree_driver.cpp +++ b/src/dominator/lengauerTarjanDominatorTree_driver.cpp @@ -37,11 +37,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/identifiers.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "c_types/ii_t_rt.h" -#include "dominator/pgr_lengauerTarjanDominatorTree_driver.hpp" +#include "dominator/lengauerTarjanDominatorTree_driver.hpp" void diff --git a/src/driving_distance/driving_distance.c b/src/driving_distance/driving_distance.c index 3fa5a97001..c60255f819 100644 --- a/src/driving_distance/driving_distance.c +++ b/src/driving_distance/driving_distance.c @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: many_to_dist_driving_distance.c +File: driving_distance.c Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" -#include "drivers/driving_distance/drivedist_driver.h" +#include "drivers/driving_distance/driving_distance_driver.h" PGDLLEXPORT Datum _pgr_drivingdistance(PG_FUNCTION_ARGS); diff --git a/src/driving_distance/driving_distance_driver.cpp b/src/driving_distance/driving_distance_driver.cpp index b6fa1b4521..e41e38967d 100644 --- a/src/driving_distance/driving_distance_driver.cpp +++ b/src/driving_distance/driving_distance_driver.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: drivedist_driver.cpp +File: driving_distance_driver.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "drivers/driving_distance/drivedist_driver.h" +#include "drivers/driving_distance/driving_distance_driver.h" #include #include @@ -39,8 +39,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "dijkstra/drivingDist.hpp" #include "c_types/mst_rt.h" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" void diff --git a/src/driving_distance/driving_distance_withPoints.c b/src/driving_distance/driving_distance_withPoints.c index 8071d29b82..b320009d35 100644 --- a/src/driving_distance/driving_distance_withPoints.c +++ b/src/driving_distance/driving_distance_withPoints.c @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: many_to_dist_withPointsDD.c +File: driving_distance_withPoints.c Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_common/e_report.h" #include "c_common/time_msg.h" #include "drivers/withPoints/get_new_queries.h" -#include "drivers/driving_distance/withPoints_dd_driver.h" +#include "drivers/driving_distance/driving_distance_withPoints_driver.h" PGDLLEXPORT Datum _pgr_withpointsddv4(PG_FUNCTION_ARGS); PG_FUNCTION_INFO_V1(_pgr_withpointsddv4); diff --git a/src/driving_distance/driving_distance_withPoints_driver.cpp b/src/driving_distance/driving_distance_withPoints_driver.cpp index d8101d738f..6816f2589a 100644 --- a/src/driving_distance/driving_distance_withPoints_driver.cpp +++ b/src/driving_distance/driving_distance_withPoints_driver.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: withPoints_dd_driver.cpp +File: driving_distance_withPoints.cpp Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "drivers/driving_distance/withPoints_dd_driver.h" +#include "drivers/driving_distance/driving_distance_withPoints_driver.h" #include #include @@ -41,10 +41,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "dijkstra/drivingDist.hpp" -#include "withPoints/pgr_withPoints.hpp" +#include "withPoints/withPoints.hpp" #include "c_types/mst_rt.h" #include "cpp_common/combinations.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" void diff --git a/src/ksp/ksp_driver.cpp b/src/ksp/ksp_driver.cpp index 9376cf311d..96a8a5fd1d 100644 --- a/src/ksp/ksp_driver.cpp +++ b/src/ksp/ksp_driver.cpp @@ -36,12 +36,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "yen/pgr_ksp.hpp" +#include "yen/ksp.hpp" #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "c_types/ii_t_rt.h" diff --git a/src/ksp/turnRestrictedPath_driver.cpp b/src/ksp/turnRestrictedPath_driver.cpp index ef52b11dc4..d79b49a9c5 100644 --- a/src/ksp/turnRestrictedPath_driver.cpp +++ b/src/ksp/turnRestrictedPath_driver.cpp @@ -35,14 +35,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/rule.hpp" #include "cpp_common/basePath_SSEC.hpp" #include "cpp_common/restriction_t.hpp" -#include "yen/pgr_turnRestrictedPath.hpp" +#include "yen/turnRestrictedPath.hpp" namespace { diff --git a/src/ksp/withPoints_ksp_driver.cpp b/src/ksp/withPoints_ksp_driver.cpp index 180b3fdf4e..dae3a9e856 100644 --- a/src/ksp/withPoints_ksp_driver.cpp +++ b/src/ksp/withPoints_ksp_driver.cpp @@ -40,11 +40,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/combinations.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "withPoints/pgr_withPoints.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" +#include "withPoints/withPoints.hpp" -#include "yen/pgr_ksp.hpp" +#include "yen/ksp.hpp" void pgr_do_withPointsKsp( diff --git a/src/lineGraph/lineGraphFull_driver.cpp b/src/lineGraph/lineGraphFull_driver.cpp index 26dd1ffb08..ac19b177dc 100644 --- a/src/lineGraph/lineGraphFull_driver.cpp +++ b/src/lineGraph/lineGraphFull_driver.cpp @@ -36,10 +36,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/line_graph_full_rt.h" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" -#include "lineGraph/pgr_lineGraphFull.hpp" +#include "lineGraph/lineGraphFull.hpp" #include "cpp_common/linear_directed_graph.hpp" #include "dijkstra/dijkstra.hpp" diff --git a/src/lineGraph/lineGraph_driver.cpp b/src/lineGraph/lineGraph_driver.cpp index ad19950ff3..2f837e5282 100644 --- a/src/lineGraph/lineGraph_driver.cpp +++ b/src/lineGraph/lineGraph_driver.cpp @@ -38,9 +38,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "bgraph/line_graph.hpp" #include "bgraph/graph_to_edges.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" +#include "cpp_common/base_graph.hpp" #include "c_types/edge_rt.h" namespace { diff --git a/src/max_flow/edge_disjoint_paths_driver.cpp b/src/max_flow/edge_disjoint_paths_driver.cpp index 0f301a174d..35fadb4069 100644 --- a/src/max_flow/edge_disjoint_paths_driver.cpp +++ b/src/max_flow/edge_disjoint_paths_driver.cpp @@ -34,13 +34,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "max_flow/pgr_maxflow.hpp" +#include "max_flow/maxflow.hpp" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/combinations.hpp" #include "cpp_common/identifiers.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/assert.hpp" +#include "cpp_common/alloc.hpp" #include "c_types/ii_t_rt.h" diff --git a/src/max_flow/flowgraph.cpp b/src/max_flow/flowgraph.cpp index fd40129885..f41b042033 100644 --- a/src/max_flow/flowgraph.cpp +++ b/src/max_flow/flowgraph.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_flowgraph.cpp +File: flowgraph.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,4 +25,4 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "max_flow/pgr_flowgraph.hpp" +#include "max_flow/flowgraph.hpp" diff --git a/src/max_flow/max_flow_driver.cpp b/src/max_flow/max_flow_driver.cpp index fa4475b21c..7f7fd67cd6 100644 --- a/src/max_flow/max_flow_driver.cpp +++ b/src/max_flow/max_flow_driver.cpp @@ -34,12 +34,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "max_flow/pgr_maxflow.hpp" +#include "max_flow/maxflow.hpp" #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/assert.hpp" +#include "cpp_common/alloc.hpp" #include "c_types/ii_t_rt.h" diff --git a/src/max_flow/maxflow.cpp b/src/max_flow/maxflow.cpp index dad55491ed..e7dc626b94 100644 --- a/src/max_flow/maxflow.cpp +++ b/src/max_flow/maxflow.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_maxflow.cpp +File: maxflow.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "max_flow/pgr_maxflow.hpp" +#include "max_flow/maxflow.hpp" #include #include diff --git a/src/max_flow/maximum_cardinality_matching_driver.cpp b/src/max_flow/maximum_cardinality_matching_driver.cpp index 2e8ea3e139..fc1587e7dd 100644 --- a/src/max_flow/maximum_cardinality_matching_driver.cpp +++ b/src/max_flow/maximum_cardinality_matching_driver.cpp @@ -40,9 +40,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/edge_bool_t_rt.h" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "max_flow/pgr_maximumcardinalitymatching.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" +#include "max_flow/maximumcardinalitymatching.hpp" void diff --git a/src/max_flow/minCostMaxFlow.cpp b/src/max_flow/minCostMaxFlow.cpp index abcd245279..8bf71c61b3 100644 --- a/src/max_flow/minCostMaxFlow.cpp +++ b/src/max_flow/minCostMaxFlow.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_minCostMaxFlow.cpp +File: minCostMaxFlow.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "max_flow/pgr_minCostMaxFlow.hpp" +#include "max_flow/minCostMaxFlow.hpp" #include #include diff --git a/src/max_flow/minCostMaxFlow_driver.cpp b/src/max_flow/minCostMaxFlow_driver.cpp index 416c978375..512b39c227 100644 --- a/src/max_flow/minCostMaxFlow_driver.cpp +++ b/src/max_flow/minCostMaxFlow_driver.cpp @@ -40,10 +40,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" -#include "max_flow/pgr_minCostMaxFlow.hpp" +#include "max_flow/minCostMaxFlow.hpp" void pgr_do_minCostMaxFlow( diff --git a/src/metrics/betweennessCentrality_driver.cpp b/src/metrics/betweennessCentrality_driver.cpp index 6c6a1aa1ce..5b71b13234 100644 --- a/src/metrics/betweennessCentrality_driver.cpp +++ b/src/metrics/betweennessCentrality_driver.cpp @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "metrics/betweennessCentrality.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" void diff --git a/src/mincut/stoerWagner_driver.cpp b/src/mincut/stoerWagner_driver.cpp index e27120b08e..14200fddf8 100644 --- a/src/mincut/stoerWagner_driver.cpp +++ b/src/mincut/stoerWagner_driver.cpp @@ -33,11 +33,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "mincut/pgr_stoerWagner.hpp" +#include "mincut/stoerWagner.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "c_types/stoerWagner_t.h" namespace { diff --git a/src/ordering/cuthillMckeeOrdering_driver.cpp b/src/ordering/cuthillMckeeOrdering_driver.cpp index d36480cf9a..cc2315d7a1 100644 --- a/src/ordering/cuthillMckeeOrdering_driver.cpp +++ b/src/ordering/cuthillMckeeOrdering_driver.cpp @@ -32,8 +32,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "c_types/ii_t_rt.h" #include "ordering/cuthillMckeeOrdering.hpp" diff --git a/src/pickDeliver/dnode.cpp b/src/pickDeliver/dnode.cpp index 010e02f772..a6fe2b4d9e 100644 --- a/src/pickDeliver/dnode.cpp +++ b/src/pickDeliver/dnode.cpp @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "vrp/dnode.hpp" -#include "vrp/pgr_pickDeliver.hpp" +#include "vrp/pickDeliver.hpp" namespace pgrouting { namespace vrp { diff --git a/src/pickDeliver/fleet.cpp b/src/pickDeliver/fleet.cpp index fa4165cc3c..f61fd5a4f1 100644 --- a/src/pickDeliver/fleet.cpp +++ b/src/pickDeliver/fleet.cpp @@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "vrp/dnode.hpp" -#include "vrp/pgr_pickDeliver.hpp" +#include "vrp/pickDeliver.hpp" namespace pgrouting { namespace vrp { diff --git a/src/pickDeliver/initial_solution.cpp b/src/pickDeliver/initial_solution.cpp index b591b84840..08924c85ee 100644 --- a/src/pickDeliver/initial_solution.cpp +++ b/src/pickDeliver/initial_solution.cpp @@ -27,9 +27,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" #include "vrp/solution.hpp" -#include "vrp/pgr_pickDeliver.hpp" +#include "vrp/pickDeliver.hpp" namespace pgrouting { namespace vrp { diff --git a/src/pickDeliver/optimize.cpp b/src/pickDeliver/optimize.cpp index 03160246e9..540b78d00c 100644 --- a/src/pickDeliver/optimize.cpp +++ b/src/pickDeliver/optimize.cpp @@ -27,11 +27,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" #include "vrp/solution.hpp" #include "vrp/optimize.hpp" -#include "vrp/pgr_pickDeliver.hpp" +#include "vrp/pickDeliver.hpp" namespace pgrouting { namespace vrp { diff --git a/src/pickDeliver/pd_orders.cpp b/src/pickDeliver/pd_orders.cpp index 5092a81a06..f53b8ce081 100644 --- a/src/pickDeliver/pd_orders.cpp +++ b/src/pickDeliver/pd_orders.cpp @@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "vrp/pgr_pickDeliver.hpp" +#include "vrp/pickDeliver.hpp" #include "vrp/dnode.hpp" namespace pgrouting { diff --git a/src/pickDeliver/pickDeliver.cpp b/src/pickDeliver/pickDeliver.cpp index c60ba84a73..b72bebb2e3 100644 --- a/src/pickDeliver/pickDeliver.cpp +++ b/src/pickDeliver/pickDeliver.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_pickDeliver.cpp +File: pickDeliver.cpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "vrp/pgr_pickDeliver.hpp" +#include "vrp/pickDeliver.hpp" #include #include @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/schedule_rt.h" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" #include "vrp/initials_code.hpp" #include "vrp/vehicle_node.hpp" diff --git a/src/pickDeliver/pickDeliverEuclidean_driver.cpp b/src/pickDeliver/pickDeliverEuclidean_driver.cpp index 862f2c7d03..f21e95d4f4 100644 --- a/src/pickDeliver/pickDeliverEuclidean_driver.cpp +++ b/src/pickDeliver/pickDeliverEuclidean_driver.cpp @@ -39,11 +39,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/schedule_rt.h" -#include "vrp/pgr_pickDeliver.hpp" +#include "vrp/pickDeliver.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/assert.hpp" +#include "cpp_common/alloc.hpp" void pgr_do_pickDeliverEuclidean( diff --git a/src/pickDeliver/pickDeliver_driver.cpp b/src/pickDeliver/pickDeliver_driver.cpp index 720b82dd24..275f0ff056 100644 --- a/src/pickDeliver/pickDeliver_driver.cpp +++ b/src/pickDeliver/pickDeliver_driver.cpp @@ -36,13 +36,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "vrp/pgr_pickDeliver.hpp" +#include "vrp/pickDeliver.hpp" #include "vrp/initials_code.hpp" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/Dmatrix.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/assert.hpp" +#include "cpp_common/alloc.hpp" #include "c_types/iid_t_rt.h" #include "cpp_common/orders_t.hpp" diff --git a/src/pickDeliver/solution.cpp b/src/pickDeliver/solution.cpp index 0bd22c62a0..c4a8dedadd 100644 --- a/src/pickDeliver/solution.cpp +++ b/src/pickDeliver/solution.cpp @@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/schedule_rt.h" -#include "vrp/pgr_pickDeliver.hpp" +#include "vrp/pickDeliver.hpp" namespace pgrouting { diff --git a/src/pickDeliver/tw_node.cpp b/src/pickDeliver/tw_node.cpp index 52e820e310..76f6c9d875 100644 --- a/src/pickDeliver/tw_node.cpp +++ b/src/pickDeliver/tw_node.cpp @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.hpp" -#include "vrp/pgr_pickDeliver.hpp" +#include "cpp_common/assert.hpp" +#include "vrp/pickDeliver.hpp" namespace pgrouting { diff --git a/src/pickDeliver/vehicle.cpp b/src/pickDeliver/vehicle.cpp index 163442071b..24c3cca2ee 100644 --- a/src/pickDeliver/vehicle.cpp +++ b/src/pickDeliver/vehicle.cpp @@ -35,9 +35,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/schedule_rt.h" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" -#include "vrp/pgr_pickDeliver.hpp" +#include "vrp/pickDeliver.hpp" namespace pgrouting { diff --git a/src/pickDeliver/vehicle_pickDeliver.cpp b/src/pickDeliver/vehicle_pickDeliver.cpp index 43a94daa68..4560f5bb62 100644 --- a/src/pickDeliver/vehicle_pickDeliver.cpp +++ b/src/pickDeliver/vehicle_pickDeliver.cpp @@ -32,10 +32,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" #include "vrp/order.hpp" #include "vrp/vehicle.hpp" -#include "vrp/pgr_pickDeliver.hpp" +#include "vrp/pickDeliver.hpp" diff --git a/src/planar/isPlanar_driver.cpp b/src/planar/isPlanar_driver.cpp index d1401570d6..bc707f9859 100644 --- a/src/planar/isPlanar_driver.cpp +++ b/src/planar/isPlanar_driver.cpp @@ -33,12 +33,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/pgdata_getters.hpp" -#include "planar/pgr_boyerMyrvold.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "planar/boyerMyrvold.hpp" +#include "cpp_common/base_graph.hpp" diff --git a/src/spanningTree/kruskal_driver.cpp b/src/spanningTree/kruskal_driver.cpp index 9ca1691934..05c4714824 100644 --- a/src/spanningTree/kruskal_driver.cpp +++ b/src/spanningTree/kruskal_driver.cpp @@ -34,10 +34,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" -#include "spanningTree/pgr_kruskal.hpp" +#include "spanningTree/kruskal.hpp" #include "spanningTree/details.hpp" diff --git a/src/spanningTree/mst_common.cpp b/src/spanningTree/mst_common.cpp index cc1258962c..1f2a4f6818 100644 --- a/src/spanningTree/mst_common.cpp +++ b/src/spanningTree/mst_common.cpp @@ -30,8 +30,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/assert.hpp" +#include "cpp_common/alloc.hpp" int get_order(char * fn_suffix, char ** err_msg) { diff --git a/src/spanningTree/prim_driver.cpp b/src/spanningTree/prim_driver.cpp index 4a7eb2f12d..e5a124bc9d 100644 --- a/src/spanningTree/prim_driver.cpp +++ b/src/spanningTree/prim_driver.cpp @@ -34,12 +34,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "c_types/mst_rt.h" -#include "spanningTree/pgr_prim.hpp" +#include "spanningTree/prim.hpp" #include "spanningTree/details.hpp" diff --git a/src/spanningTree/randomSpanningTree_driver.cpp b/src/spanningTree/randomSpanningTree_driver.cpp index e3161bbb4e..9c5fca8549 100644 --- a/src/spanningTree/randomSpanningTree_driver.cpp +++ b/src/spanningTree/randomSpanningTree_driver.cpp @@ -35,9 +35,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "spanningTree/pgr_randomSpanningTree.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" +#include "spanningTree/randomSpanningTree.hpp" template < class G > static diff --git a/src/topologicalSort/topologicalSort_driver.cpp b/src/topologicalSort/topologicalSort_driver.cpp index 8cf0b7013d..8e98f706af 100644 --- a/src/topologicalSort/topologicalSort_driver.cpp +++ b/src/topologicalSort/topologicalSort_driver.cpp @@ -35,12 +35,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "topologicalSort/pgr_topologicalSort.hpp" +#include "topologicalSort/topologicalSort.hpp" #include "c_types/i_rt.h" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" namespace { diff --git a/src/transitiveClosure/transitiveClosure_driver.cpp b/src/transitiveClosure/transitiveClosure_driver.cpp index 13a13ba072..d2e0dd9278 100644 --- a/src/transitiveClosure/transitiveClosure_driver.cpp +++ b/src/transitiveClosure/transitiveClosure_driver.cpp @@ -28,13 +28,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "transitiveClosure/pgr_transitiveClosure.hpp" +#include "transitiveClosure/transitiveClosure.hpp" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/identifiers.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "c_types/transitiveClosure_rt.h" diff --git a/src/traversal/depthFirstSearch_driver.cpp b/src/traversal/depthFirstSearch_driver.cpp index 8068f2084e..7f23c2c17f 100644 --- a/src/traversal/depthFirstSearch_driver.cpp +++ b/src/traversal/depthFirstSearch_driver.cpp @@ -33,11 +33,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "spanningTree/details.hpp" -#include "traversal/pgr_depthFirstSearch.hpp" +#include "traversal/depthFirstSearch.hpp" /** @file depthFirstSearch_driver.cpp * @brief Handles actual calling of function in the `pgr_depthFirstSearch.hpp` file. diff --git a/src/trsp/trspHandler.cpp b/src/trsp/trspHandler.cpp index 29a822b6dc..ed1d58f35a 100644 --- a/src/trsp/trspHandler.cpp +++ b/src/trsp/trspHandler.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_trspHandler.cpp +File: trspHandler.cpp Copyright (c) 2011 pgRouting developers Mail: project@pgrouting.org @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "trsp/pgr_trspHandler.hpp" +#include "trsp/trspHandler.hpp" #include #include @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" namespace pgrouting { namespace trsp { diff --git a/src/trsp/trspVia_driver.cpp b/src/trsp/trspVia_driver.cpp index 6fb22cf54a..9c5a0cf39b 100644 --- a/src/trsp/trspVia_driver.cpp +++ b/src/trsp/trspVia_driver.cpp @@ -33,16 +33,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "dijkstra/pgr_dijkstraVia.hpp" +#include "dijkstra/dijkstraVia.hpp" #include "c_types/routes_t.h" #include "cpp_common/restriction_t.hpp" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/rule.hpp" #include "cpp_common/combinations.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" -#include "trsp/pgr_trspHandler.hpp" +#include "trsp/trspHandler.hpp" namespace { diff --git a/src/trsp/trspVia_withPoints_driver.cpp b/src/trsp/trspVia_withPoints_driver.cpp index a6811c832e..5c057cb13f 100644 --- a/src/trsp/trspVia_withPoints_driver.cpp +++ b/src/trsp/trspVia_withPoints_driver.cpp @@ -33,14 +33,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/routes_t.h" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/rule.hpp" #include "cpp_common/combinations.hpp" -#include "dijkstra/pgr_dijkstraVia.hpp" -#include "withPoints/pgr_withPoints.hpp" -#include "trsp/pgr_trspHandler.hpp" +#include "dijkstra/dijkstraVia.hpp" +#include "withPoints/withPoints.hpp" +#include "trsp/trspHandler.hpp" namespace { diff --git a/src/trsp/trsp_driver.cpp b/src/trsp/trsp_driver.cpp index 6f79f480c4..c9b289565c 100644 --- a/src/trsp/trsp_driver.cpp +++ b/src/trsp/trsp_driver.cpp @@ -40,15 +40,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "trsp/pgr_trspHandler.hpp" +#include "trsp/trspHandler.hpp" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/rule.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/assert.hpp" +#include "cpp_common/alloc.hpp" #include "cpp_common/combinations.hpp" #include "cpp_common/restriction_t.hpp" #include "c_types/ii_t_rt.h" -#include "withPoints/pgr_withPoints.hpp" +#include "withPoints/withPoints.hpp" #include "dijkstra/dijkstra.hpp" diff --git a/src/trsp/trsp_withPoints_driver.cpp b/src/trsp/trsp_withPoints_driver.cpp index cec7757748..0bcc7453b5 100644 --- a/src/trsp/trsp_withPoints_driver.cpp +++ b/src/trsp/trsp_withPoints_driver.cpp @@ -41,12 +41,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/rule.hpp" #include "cpp_common/combinations.hpp" -#include "withPoints/pgr_withPoints.hpp" -#include "trsp/pgr_trspHandler.hpp" +#include "withPoints/withPoints.hpp" +#include "trsp/trspHandler.hpp" #include "dijkstra/dijkstra.hpp" diff --git a/src/tsp/TSP_driver.cpp b/src/tsp/TSP_driver.cpp index f381c8a85d..8c5c19d70a 100644 --- a/src/tsp/TSP_driver.cpp +++ b/src/tsp/TSP_driver.cpp @@ -39,8 +39,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/tsp_tour_rt.h" #include "c_types/ii_t_rt.h" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "tsp/tsp.hpp" diff --git a/src/tsp/euclideanTSP_driver.cpp b/src/tsp/euclideanTSP_driver.cpp index 5b55eb39a8..5d03b48257 100644 --- a/src/tsp/euclideanTSP_driver.cpp +++ b/src/tsp/euclideanTSP_driver.cpp @@ -39,8 +39,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/tsp_tour_rt.h" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" void pgr_do_euclideanTSP( diff --git a/src/tsp/tsp.cpp b/src/tsp/tsp.cpp index e969897135..5fb12ec4be 100644 --- a/src/tsp/tsp.cpp +++ b/src/tsp/tsp.cpp @@ -40,8 +40,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/identifiers.hpp" -#include "cpp_common/pgr_messages.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/messages.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/interruption.hpp" #include "visitors/dijkstra_visitors.hpp" diff --git a/src/withPoints/get_new_queries.cpp b/src/withPoints/get_new_queries.cpp index e7d55fceba..0aa4b4cd71 100644 --- a/src/withPoints/get_new_queries.cpp +++ b/src/withPoints/get_new_queries.cpp @@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "drivers/withPoints/get_new_queries.h" #include #include -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" char estimate_drivingSide(char driving_side) { diff --git a/src/withPoints/withPoints.cpp b/src/withPoints/withPoints.cpp index ba8aab30ae..df4c9f6a83 100644 --- a/src/withPoints/withPoints.cpp +++ b/src/withPoints/withPoints.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_withPoints.cpp +File: withPoints.cpp Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "withPoints/pgr_withPoints.hpp" +#include "withPoints/withPoints.hpp" #include #include @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" namespace pgrouting { diff --git a/src/withPoints/withPointsVia_driver.cpp b/src/withPoints/withPointsVia_driver.cpp index b02c33c82c..9551c5a9bd 100644 --- a/src/withPoints/withPointsVia_driver.cpp +++ b/src/withPoints/withPointsVia_driver.cpp @@ -35,10 +35,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/routes_t.h" #include "cpp_common/pgdata_getters.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" -#include "dijkstra/pgr_dijkstraVia.hpp" -#include "withPoints/pgr_withPoints.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" +#include "dijkstra/dijkstraVia.hpp" +#include "withPoints/withPoints.hpp" namespace { diff --git a/src/withPoints/withPoints_driver.cpp b/src/withPoints/withPoints_driver.cpp index 46774782d8..914a258474 100644 --- a/src/withPoints/withPoints_driver.cpp +++ b/src/withPoints/withPoints_driver.cpp @@ -39,11 +39,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "withPoints/pgr_withPoints.hpp" +#include "withPoints/withPoints.hpp" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/combinations.hpp" -#include "cpp_common/pgr_alloc.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/alloc.hpp" +#include "cpp_common/assert.hpp" #include "dijkstra/dijkstra.hpp" From 1a43627d08f47a54c79dfe95f26e66cd8e0418c1 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 9 Oct 2024 23:31:14 -0600 Subject: [PATCH 414/428] (include) Adjusting includes to filename changes --- include/allpairs/allpairs.hpp | 12 ++++++------ include/alphaShape/alphaShape.hpp | 12 ++++++------ include/astar/astar.hpp | 8 ++++---- include/bdAstar/bdAstar.hpp | 8 ++++---- include/bdDijkstra/bdDijkstra.hpp | 12 +++++------- include/bellman_ford/bellman_ford.hpp | 12 ++++++------ include/bellman_ford/edwardMoore.hpp | 10 +++++----- .../binaryBreadthFirstSearch.hpp | 12 ++++++------ .../breadthFirstSearch/breadthFirstSearch.hpp | 10 +++++----- include/chinese/chinesePostman.hpp | 12 ++++++------ include/circuits/hawickcircuits.hpp | 4 ++-- include/coloring/bipartite_driver.hpp | 12 ++++++------ include/coloring/edgeColoring.hpp | 12 ++++++------ include/coloring/sequentialVertexColoring.hpp | 10 +++++----- include/components/components.hpp | 10 +++++----- include/components/makeConnected.hpp | 12 ++++++------ include/contraction/ch_graphs.hpp | 4 ++-- include/contraction/contract.hpp | 16 ++++++++-------- include/contraction/contractionGraph.hpp | 10 +++++----- include/contraction/deadEndContraction.hpp | 8 ++++---- include/contraction/linearContraction.hpp | 8 ++++---- include/cpp_common/alloc.hpp | 8 ++++---- include/cpp_common/assert.hpp | 10 +++++----- include/cpp_common/basePath_SSEC.hpp | 2 +- include/cpp_common/base_graph.hpp | 10 +++++----- include/cpp_common/bidirectional.hpp | 12 ++++++------ include/cpp_common/get_data.hpp | 2 +- include/cpp_common/messages.hpp | 8 ++++---- include/cpp_common/orders_t.hpp | 6 +++--- include/cpp_common/pgdata_getters.hpp | 2 +- include/cpp_common/vehicle_t.hpp | 6 +++--- include/dagShortestPath/dagShortestPath.hpp | 10 +++++----- include/dijkstra/dijkstra.hpp | 8 ++++---- include/dijkstra/dijkstraVia.hpp | 10 +++++----- include/dijkstra/drivingDist.hpp | 8 ++++---- .../lengauerTarjanDominatorTree_driver.hpp | 12 ++++++------ include/lineGraph/lineGraphFull.hpp | 10 +++++----- include/max_flow/costFlowGraph.hpp | 8 ++++---- include/max_flow/flowgraph.hpp | 8 ++++---- include/max_flow/maxflow.hpp | 10 +++++----- include/max_flow/maximumcardinalitymatching.hpp | 8 ++++---- include/max_flow/minCostMaxFlow.hpp | 10 +++++----- include/metrics/betweennessCentrality.hpp | 4 ++-- include/mincut/stoerWagner.hpp | 10 +++++----- include/ordering/cuthillMckeeOrdering.hpp | 4 ++-- include/planar/boyerMyrvold.hpp | 12 ++++++------ include/spanningTree/kruskal.hpp | 10 +++++----- include/spanningTree/mst.hpp | 10 +++++----- include/spanningTree/prim.hpp | 10 +++++----- include/topologicalSort/topologicalSort.hpp | 10 +++++----- include/transitiveClosure/transitiveClosure.hpp | 10 +++++----- include/traversal/depthFirstSearch.hpp | 10 +++++----- include/trsp/edgeInfo.hpp | 2 +- include/trsp/trspHandler.hpp | 10 +++++----- include/tsp/tsp.hpp | 4 ++-- include/visitors/dijkstra_visitors.hpp | 2 +- include/vrp/dnode.hpp | 2 +- include/vrp/optimize.hpp | 2 +- include/vrp/pd_problem.hpp | 2 +- include/vrp/pickDeliver.hpp | 8 ++++---- include/vrp/tw_node.hpp | 2 +- include/withPoints/withPoints.hpp | 10 +++++----- include/yen/ksp.hpp | 12 ++++++------ include/yen/turnRestrictedPath.hpp | 15 +++++++-------- src/bellman_ford/bellman_ford_neg_driver.cpp | 13 ++++++------- 65 files changed, 276 insertions(+), 280 deletions(-) diff --git a/include/allpairs/allpairs.hpp b/include/allpairs/allpairs.hpp index aad39324a0..a5058c96f9 100644 --- a/include/allpairs/allpairs.hpp +++ b/include/allpairs/allpairs.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_allpairs.hpp +File: allpairs.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // http://www.cs.rpi.edu/~musser/archive/2005/gsd/restricted/FloydWarshall/FloydWarshall.pdf -#ifndef INCLUDE_ALLPAIRS_PGR_ALLPAIRS_HPP_ -#define INCLUDE_ALLPAIRS_PGR_ALLPAIRS_HPP_ +#ifndef INCLUDE_ALLPAIRS_ALLPAIRS_HPP_ +#define INCLUDE_ALLPAIRS_ALLPAIRS_HPP_ #pragma once #include @@ -44,11 +44,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/iid_t_rt.h" #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" // TODO(vicky) don't keep it here -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" namespace pgrouting { template < class G > class Pgr_allpairs; @@ -263,4 +263,4 @@ class Pgr_allpairs { } // namespace pgrouting -#endif // INCLUDE_ALLPAIRS_PGR_ALLPAIRS_HPP_ +#endif // INCLUDE_ALLPAIRS_ALLPAIRS_HPP_ diff --git a/include/alphaShape/alphaShape.hpp b/include/alphaShape/alphaShape.hpp index ba79bb3c27..2dd463180c 100644 --- a/include/alphaShape/alphaShape.hpp +++ b/include/alphaShape/alphaShape.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_alphaShape.hpp +File: alphaShape.hpp Copyright (c) 2018 pgRouting developers Mail: project@pgrouting.org @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_ALPHASHAPE_PGR_ALPHASHAPE_HPP_ -#define INCLUDE_ALPHASHAPE_PGR_ALPHASHAPE_HPP_ +#ifndef INCLUDE_ALPHASHAPE_ALPHASHAPE_HPP_ +#define INCLUDE_ALPHASHAPE_ALPHASHAPE_HPP_ #pragma once #ifndef __cplusplus @@ -40,9 +40,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/edge_xy_t.hpp" -#include "cpp_common/pgr_messages.hpp" +#include "cpp_common/messages.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/bline.hpp" @@ -99,4 +99,4 @@ class Pgr_alphaShape : public Pgr_messages { } // namespace alphashape } // namespace pgrouting -#endif // INCLUDE_ALPHASHAPE_PGR_ALPHASHAPE_HPP_ +#endif // INCLUDE_ALPHASHAPE_ALPHASHAPE_HPP_ diff --git a/include/astar/astar.hpp b/include/astar/astar.hpp index 10e466e62e..32736025f0 100644 --- a/include/astar/astar.hpp +++ b/include/astar/astar.hpp @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_ASTAR_PGR_ASTAR_HPP_ -#define INCLUDE_ASTAR_PGR_ASTAR_HPP_ +#ifndef INCLUDE_ASTAR_ASTAR_HPP_ +#define INCLUDE_ASTAR_ASTAR_HPP_ #pragma once #include @@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "visitors/astar_visitors.hpp" #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" #include "c_types/ii_t_rt.h" @@ -206,4 +206,4 @@ std::deque astar( } // namespace algorithms } // namespace pgrouting -#endif // INCLUDE_ASTAR_PGR_ASTAR_HPP_ +#endif // INCLUDE_ASTAR_ASTAR_HPP_ diff --git a/include/bdAstar/bdAstar.hpp b/include/bdAstar/bdAstar.hpp index 3834486b76..cbaa86a308 100644 --- a/include/bdAstar/bdAstar.hpp +++ b/include/bdAstar/bdAstar.hpp @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_BDASTAR_PGR_BDASTAR_HPP_ -#define INCLUDE_BDASTAR_PGR_BDASTAR_HPP_ +#ifndef INCLUDE_BDASTAR_BDASTAR_HPP_ +#define INCLUDE_BDASTAR_BDASTAR_HPP_ #pragma once @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_bidirectional.hpp" +#include "cpp_common/bidirectional.hpp" #include "cpp_common/basePath_SSEC.hpp" namespace pgrouting { @@ -223,4 +223,4 @@ std::deque bdastar( } // namespace algorithms } // namespace pgrouting -#endif // INCLUDE_BDASTAR_PGR_BDASTAR_HPP_ +#endif // INCLUDE_BDASTAR_BDASTAR_HPP_ diff --git a/include/bdDijkstra/bdDijkstra.hpp b/include/bdDijkstra/bdDijkstra.hpp index 8bd5c444c6..c698430b97 100644 --- a/include/bdDijkstra/bdDijkstra.hpp +++ b/include/bdDijkstra/bdDijkstra.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_bdDijkstra.hpp +File: bdDijkstra.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,13 +25,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_BDDIJKSTRA_PGR_BDDIJKSTRA_HPP_ -#define INCLUDE_BDDIJKSTRA_PGR_BDDIJKSTRA_HPP_ +#ifndef INCLUDE_BDDIJKSTRA_BDDIJKSTRA_HPP_ +#define INCLUDE_BDDIJKSTRA_BDDIJKSTRA_HPP_ #pragma once - -#include "cpp_common/pgr_bidirectional.hpp" - #include #include #include @@ -40,6 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include +#include "cpp_common/bidirectional.hpp" #include "cpp_common/basePath_SSEC.hpp" @@ -145,4 +143,4 @@ class Pgr_bdDijkstra : public Pgr_bidirectional { } // namespace bidirectional } // namespace pgrouting -#endif // INCLUDE_BDDIJKSTRA_PGR_BDDIJKSTRA_HPP_ +#endif // INCLUDE_BDDIJKSTRA_BDDIJKSTRA_HPP_ diff --git a/include/bellman_ford/bellman_ford.hpp b/include/bellman_ford/bellman_ford.hpp index f182536e12..4595f457d9 100644 --- a/include/bellman_ford/bellman_ford.hpp +++ b/include/bellman_ford/bellman_ford.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_bellman_ford.hpp +File: bellman_ford.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_BELLMAN_FORD_PGR_BELLMAN_FORD_HPP_ -#define INCLUDE_BELLMAN_FORD_PGR_BELLMAN_FORD_HPP_ +#ifndef INCLUDE_BELLMAN_FORD_BELLMAN_FORD_HPP_ +#define INCLUDE_BELLMAN_FORD_BELLMAN_FORD_HPP_ #pragma once #include @@ -41,9 +41,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include -#include "cpp_common/pgr_messages.hpp" +#include "cpp_common/messages.hpp" #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" #include "c_types/ii_t_rt.h" @@ -334,4 +334,4 @@ class Pgr_bellman_ford : public pgrouting::Pgr_messages { } // namespace pgrouting -#endif // INCLUDE_BELLMAN_FORD_PGR_BELLMAN_FORD_HPP_ +#endif // INCLUDE_BELLMAN_FORD_BELLMAN_FORD_HPP_ diff --git a/include/bellman_ford/edwardMoore.hpp b/include/bellman_ford/edwardMoore.hpp index db02c5facd..30a235dd05 100644 --- a/include/bellman_ford/edwardMoore.hpp +++ b/include/bellman_ford/edwardMoore.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_edwardMoore.hpp +File: edwardMoore.hpp Copyright (c) 2019 pgRouting developers Mail: project@pgrouting.org @@ -20,8 +20,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_BELLMAN_FORD_PGR_EDWARDMOORE_HPP_ -#define INCLUDE_BELLMAN_FORD_PGR_EDWARDMOORE_HPP_ +#ifndef INCLUDE_BELLMAN_FORD_EDWARDMOORE_HPP_ +#define INCLUDE_BELLMAN_FORD_EDWARDMOORE_HPP_ #pragma once #include @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" #include "c_types/ii_t_rt.h" @@ -262,4 +262,4 @@ class Pgr_edwardMoore { } // namespace functions } // namespace pgrouting -#endif // INCLUDE_BELLMAN_FORD_PGR_EDWARDMOORE_HPP_ +#endif // INCLUDE_BELLMAN_FORD_EDWARDMOORE_HPP_ diff --git a/include/breadthFirstSearch/binaryBreadthFirstSearch.hpp b/include/breadthFirstSearch/binaryBreadthFirstSearch.hpp index 6fd53e63b4..37821181c0 100644 --- a/include/breadthFirstSearch/binaryBreadthFirstSearch.hpp +++ b/include/breadthFirstSearch/binaryBreadthFirstSearch.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_binaryBreadthFirstSearch.hpp +File: binaryBreadthFirstSearch.hpp Copyright (c) 2019 pgRouting developers Mail: project@pgrouting.org @@ -21,8 +21,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_BREADTHFIRSTSEARCH_PGR_BINARYBREADTHFIRSTSEARCH_HPP_ -#define INCLUDE_BREADTHFIRSTSEARCH_PGR_BINARYBREADTHFIRSTSEARCH_HPP_ +#ifndef INCLUDE_BREADTHFIRSTSEARCH_BINARYBREADTHFIRSTSEARCH_HPP_ +#define INCLUDE_BREADTHFIRSTSEARCH_BINARYBREADTHFIRSTSEARCH_HPP_ #pragma once #include @@ -34,8 +34,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/base_graph.hpp" +#include "cpp_common/assert.hpp" #include "c_types/ii_t_rt.h" @@ -243,4 +243,4 @@ class Pgr_binaryBreadthFirstSearch { } // namespace functions } // namespace pgrouting -#endif // INCLUDE_BREADTHFIRSTSEARCH_PGR_BINARYBREADTHFIRSTSEARCH_HPP_ +#endif // INCLUDE_BREADTHFIRSTSEARCH_BINARYBREADTHFIRSTSEARCH_HPP_ diff --git a/include/breadthFirstSearch/breadthFirstSearch.hpp b/include/breadthFirstSearch/breadthFirstSearch.hpp index 3a123fed47..7dd474b04e 100644 --- a/include/breadthFirstSearch/breadthFirstSearch.hpp +++ b/include/breadthFirstSearch/breadthFirstSearch.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_breadthFirstSearch.hpp +File: breadthFirstSearch.hpp Copyright (c) 2019 pgRouting developers Mail: project@pgrouting.org @@ -21,8 +21,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_BREADTHFIRSTSEARCH_PGR_BREADTHFIRSTSEARCH_HPP_ -#define INCLUDE_BREADTHFIRSTSEARCH_PGR_BREADTHFIRSTSEARCH_HPP_ +#ifndef INCLUDE_BREADTHFIRSTSEARCH_BREADTHFIRSTSEARCH_HPP_ +#define INCLUDE_BREADTHFIRSTSEARCH_BREADTHFIRSTSEARCH_HPP_ #pragma once #include @@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" #include "c_types/mst_rt.h" @@ -111,4 +111,4 @@ class Pgr_breadthFirstSearch { } // namespace functions } // namespace pgrouting -#endif // INCLUDE_BREADTHFIRSTSEARCH_PGR_BREADTHFIRSTSEARCH_HPP_ +#endif // INCLUDE_BREADTHFIRSTSEARCH_BREADTHFIRSTSEARCH_HPP_ diff --git a/include/chinese/chinesePostman.hpp b/include/chinese/chinesePostman.hpp index 274407d203..fe4d529a1e 100644 --- a/include/chinese/chinesePostman.hpp +++ b/include/chinese/chinesePostman.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_chinesePostman.hpp +File: chinesePostman.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_CHINESE_PGR_CHINESEPOSTMAN_HPP_ -#define INCLUDE_CHINESE_PGR_CHINESEPOSTMAN_HPP_ +#ifndef INCLUDE_CHINESE_CHINESEPOSTMAN_HPP_ +#define INCLUDE_CHINESE_CHINESEPOSTMAN_HPP_ #pragma once #include @@ -36,11 +36,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "max_flow/pgr_minCostMaxFlow.hpp" +#include "max_flow/minCostMaxFlow.hpp" #include "c_types/path_rt.h" #include "cpp_common/edge_t.hpp" #include "c_types/flow_t.h" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/identifiers.hpp" @@ -332,4 +332,4 @@ PgrDirectedChPPGraph::BuildResultGraph() { } // namespace graph } // namespace pgrouting -#endif // INCLUDE_CHINESE_PGR_CHINESEPOSTMAN_HPP_ +#endif // INCLUDE_CHINESE_CHINESEPOSTMAN_HPP_ diff --git a/include/circuits/hawickcircuits.hpp b/include/circuits/hawickcircuits.hpp index e9c06a427c..2367ecbe73 100644 --- a/include/circuits/hawickcircuits.hpp +++ b/include/circuits/hawickcircuits.hpp @@ -38,9 +38,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" #include "c_types/circuits_rt.h" /** diff --git a/include/coloring/bipartite_driver.hpp b/include/coloring/bipartite_driver.hpp index 50fc21b6e2..10589a5523 100644 --- a/include/coloring/bipartite_driver.hpp +++ b/include/coloring/bipartite_driver.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_bipartite_driver.hpp +File: bipartite_driver.hpp Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -28,8 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_COLORING_PGR_BIPARTITE_DRIVER_HPP_ -#define INCLUDE_COLORING_PGR_BIPARTITE_DRIVER_HPP_ +#ifndef INCLUDE_COLORING_BIPARTITE_DRIVER_HPP_ +#define INCLUDE_COLORING_BIPARTITE_DRIVER_HPP_ #pragma once #include @@ -41,8 +41,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_base_graph.hpp" -#include "cpp_common/pgr_messages.hpp" +#include "cpp_common/base_graph.hpp" +#include "cpp_common/messages.hpp" #include "cpp_common/interruption.hpp" typedef struct II_t_rt II_t_rt; #include "c_types/ii_t_rt.h" @@ -93,4 +93,4 @@ class Pgr_Bipartite : public pgrouting::Pgr_messages { }; } // namespace functions } // namespace pgrouting -#endif // INCLUDE_COLORING_PGR_BIPARTITE_DRIVER_HPP_ +#endif // INCLUDE_COLORING_BIPARTITE_DRIVER_HPP_ diff --git a/include/coloring/edgeColoring.hpp b/include/coloring/edgeColoring.hpp index f697ea967a..897b3f4ace 100644 --- a/include/coloring/edgeColoring.hpp +++ b/include/coloring/edgeColoring.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_edgeColoring.hpp +File: edgeColoring.hpp Generated with Template by: Copyright (c) 2021 pgRouting developers @@ -23,8 +23,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_COLORING_PGR_EDGECOLORING_HPP_ -#define INCLUDE_COLORING_PGR_EDGECOLORING_HPP_ +#ifndef INCLUDE_COLORING_EDGECOLORING_HPP_ +#define INCLUDE_COLORING_EDGECOLORING_HPP_ #pragma once #include @@ -37,8 +37,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/edge_t.hpp" #include "c_types/ii_t_rt.h" -#include "cpp_common/pgr_assert.hpp" -#include "cpp_common/pgr_messages.hpp" +#include "cpp_common/assert.hpp" +#include "cpp_common/messages.hpp" namespace pgrouting { namespace functions { @@ -80,4 +80,4 @@ class Pgr_edgeColoring : public Pgr_messages { } // namespace functions } // namespace pgrouting -#endif // INCLUDE_COLORING_PGR_EDGECOLORING_HPP_ +#endif // INCLUDE_COLORING_EDGECOLORING_HPP_ diff --git a/include/coloring/sequentialVertexColoring.hpp b/include/coloring/sequentialVertexColoring.hpp index 4e05132800..d9d3d117aa 100644 --- a/include/coloring/sequentialVertexColoring.hpp +++ b/include/coloring/sequentialVertexColoring.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_sequentialVertexColoring.hpp +File: sequentialVertexColoring.hpp Copyright (c) 2020 pgRouting developers Mail: project@pgrouting.org @@ -21,8 +21,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_COLORING_PGR_SEQUENTIALVERTEXCOLORING_HPP_ -#define INCLUDE_COLORING_PGR_SEQUENTIALVERTEXCOLORING_HPP_ +#ifndef INCLUDE_COLORING_SEQUENTIALVERTEXCOLORING_HPP_ +#define INCLUDE_COLORING_SEQUENTIALVERTEXCOLORING_HPP_ #pragma once #include @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" #include "c_types/ii_t_rt.h" @@ -146,4 +146,4 @@ class Pgr_sequentialVertexColoring { } // namespace functions } // namespace pgrouting -#endif // INCLUDE_COLORING_PGR_SEQUENTIALVERTEXCOLORING_HPP_ +#endif // INCLUDE_COLORING_SEQUENTIALVERTEXCOLORING_HPP_ diff --git a/include/components/components.hpp b/include/components/components.hpp index 09f500c837..350bcc1738 100644 --- a/include/components/components.hpp +++ b/include/components/components.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_components.hpp +File: components.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_COMPONENTS_PGR_COMPONENTS_HPP_ -#define INCLUDE_COMPONENTS_PGR_COMPONENTS_HPP_ +#ifndef INCLUDE_COMPONENTS_COMPONENTS_HPP_ +#define INCLUDE_COMPONENTS_COMPONENTS_HPP_ #pragma once #include @@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/identifiers.hpp" #include "components/componentsResult.hpp" @@ -72,4 +72,4 @@ bridges(pgrouting::UndirectedGraph &graph); } // namespace algorithms } // namespace pgrouting -#endif // INCLUDE_COMPONENTS_PGR_COMPONENTS_HPP_ +#endif // INCLUDE_COMPONENTS_COMPONENTS_HPP_ diff --git a/include/components/makeConnected.hpp b/include/components/makeConnected.hpp index 822d8c2b71..89dbc3272b 100644 --- a/include/components/makeConnected.hpp +++ b/include/components/makeConnected.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_makeConnected.hpp +File: makeConnected.hpp Copyright (c) 2020 pgRouting developers Mail: project@pgrouting.org @@ -21,8 +21,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_COMPONENTS_PGR_MAKECONNECTED_HPP_ -#define INCLUDE_COMPONENTS_PGR_MAKECONNECTED_HPP_ +#ifndef INCLUDE_COMPONENTS_MAKECONNECTED_HPP_ +#define INCLUDE_COMPONENTS_MAKECONNECTED_HPP_ #pragma once #include @@ -38,8 +38,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "c_types/ii_t_rt.h" -#include "cpp_common/pgr_messages.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/messages.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" //****************************************** @@ -99,4 +99,4 @@ class Pgr_makeConnected : public pgrouting::Pgr_messages { } // namespace functions } // namespace pgrouting -#endif // INCLUDE_COMPONENTS_PGR_MAKECONNECTED_HPP_ +#endif // INCLUDE_COMPONENTS_MAKECONNECTED_HPP_ diff --git a/include/contraction/ch_graphs.hpp b/include/contraction/ch_graphs.hpp index 8d22a4b12d..c71b99d06d 100644 --- a/include/contraction/ch_graphs.hpp +++ b/include/contraction/ch_graphs.hpp @@ -36,8 +36,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "contraction/pgr_contractionGraph.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "contraction/contractionGraph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/ch_vertex.hpp" #include "cpp_common/ch_edge.hpp" diff --git a/include/contraction/contract.hpp b/include/contraction/contract.hpp index 15daf4274a..474b6f5fa5 100644 --- a/include/contraction/contract.hpp +++ b/include/contraction/contract.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_contract.hpp +File: contract.hpp Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -27,18 +27,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_CONTRACTION_PGR_CONTRACT_HPP_ -#define INCLUDE_CONTRACTION_PGR_CONTRACT_HPP_ +#ifndef INCLUDE_CONTRACTION_CONTRACT_HPP_ +#define INCLUDE_CONTRACTION_CONTRACT_HPP_ #pragma once #include #include -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" -#include "contraction/pgr_contractionGraph.hpp" +#include "contraction/contractionGraph.hpp" #include "contraction/ch_graphs.hpp" -#include "contraction/pgr_linearContraction.hpp" -#include "contraction/pgr_deadEndContraction.hpp" +#include "contraction/linearContraction.hpp" +#include "contraction/deadEndContraction.hpp" namespace pgrouting { namespace contraction { @@ -131,4 +131,4 @@ class Pgr_contract { } // namespace contraction } // namespace pgrouting -#endif // INCLUDE_CONTRACTION_PGR_CONTRACT_HPP_ +#endif // INCLUDE_CONTRACTION_CONTRACT_HPP_ diff --git a/include/contraction/contractionGraph.hpp b/include/contraction/contractionGraph.hpp index 6c7df2d658..75cd790ec9 100644 --- a/include/contraction/contractionGraph.hpp +++ b/include/contraction/contractionGraph.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_contractionGraph.hpp +File: contractionGraph.hpp Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_CONTRACTION_PGR_CONTRACTIONGRAPH_HPP_ -#define INCLUDE_CONTRACTION_PGR_CONTRACTIONGRAPH_HPP_ +#ifndef INCLUDE_CONTRACTION_CONTRACTIONGRAPH_HPP_ +#define INCLUDE_CONTRACTION_CONTRACTIONGRAPH_HPP_ #pragma once #include @@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/ch_vertex.hpp" #include "cpp_common/ch_edge.hpp" @@ -259,4 +259,4 @@ class Pgr_contractionGraph : public Pgr_base_graph @@ -69,7 +69,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * Example: * @code #include - #include "cpp_common/pgr_assert.hpp" + #include "cpp_common/assert.hpp" int main() { @@ -148,4 +148,4 @@ class AssertFailedException : public std::exception { virtual ~AssertFailedException() throw() {} }; -#endif // INCLUDE_CPP_COMMON_PGR_ASSERT_HPP_ +#endif // INCLUDE_CPP_COMMON_ASSERT_HPP_ diff --git a/include/cpp_common/basePath_SSEC.hpp b/include/cpp_common/basePath_SSEC.hpp index 9423648e71..aa7d4017fc 100644 --- a/include/cpp_common/basePath_SSEC.hpp +++ b/include/cpp_common/basePath_SSEC.hpp @@ -45,7 +45,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/path_rt.h" #include "c_types/mst_rt.h" #include "cpp_common/path_t.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/rule.hpp" namespace pgrouting { diff --git a/include/cpp_common/base_graph.hpp b/include/cpp_common/base_graph.hpp index bfad93febc..72efb41d13 100644 --- a/include/cpp_common/base_graph.hpp +++ b/include/cpp_common/base_graph.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_base_graph.hpp +File: base_graph.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /** @file */ -#ifndef INCLUDE_CPP_COMMON_PGR_BASE_GRAPH_HPP_ -#define INCLUDE_CPP_COMMON_PGR_BASE_GRAPH_HPP_ +#ifndef INCLUDE_CPP_COMMON_BASE_GRAPH_HPP_ +#define INCLUDE_CPP_COMMON_BASE_GRAPH_HPP_ #pragma once #include @@ -46,7 +46,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/xy_vertex.hpp" #include "cpp_common/basic_edge.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" namespace pgrouting { @@ -874,4 +874,4 @@ class Pgr_base_graph { } // namespace graph } // namespace pgrouting -#endif // INCLUDE_CPP_COMMON_PGR_BASE_GRAPH_HPP_ +#endif // INCLUDE_CPP_COMMON_BASE_GRAPH_HPP_ diff --git a/include/cpp_common/bidirectional.hpp b/include/cpp_common/bidirectional.hpp index aa8a2f9d1f..ded4d8129b 100644 --- a/include/cpp_common/bidirectional.hpp +++ b/include/cpp_common/bidirectional.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_bidirectional.hpp +File: bidirectional.hpp Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -29,8 +29,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_CPP_COMMON_PGR_BIDIRECTIONAL_HPP_ -#define INCLUDE_CPP_COMMON_PGR_BIDIRECTIONAL_HPP_ +#ifndef INCLUDE_CPP_COMMON_BIDIRECTIONAL_HPP_ +#define INCLUDE_CPP_COMMON_BIDIRECTIONAL_HPP_ #pragma once @@ -46,10 +46,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" namespace pgrouting { @@ -241,4 +241,4 @@ class Pgr_bidirectional { } // namespace bidirectional } // namespace pgrouting -#endif // INCLUDE_CPP_COMMON_PGR_BIDIRECTIONAL_HPP_ +#endif // INCLUDE_CPP_COMMON_BIDIRECTIONAL_HPP_ diff --git a/include/cpp_common/get_data.hpp b/include/cpp_common/get_data.hpp index 851dd232f6..b9b93393c0 100644 --- a/include/cpp_common/get_data.hpp +++ b/include/cpp_common/get_data.hpp @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/info_t.hpp" #include "cpp_common/get_check_data.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" namespace pgrouting { diff --git a/include/cpp_common/messages.hpp b/include/cpp_common/messages.hpp index f85bdf7978..2f87b1075e 100644 --- a/include/cpp_common/messages.hpp +++ b/include/cpp_common/messages.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_messages.hpp +File: messages.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -24,8 +24,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_CPP_COMMON_PGR_MESSAGES_HPP_ -#define INCLUDE_CPP_COMMON_PGR_MESSAGES_HPP_ +#ifndef INCLUDE_CPP_COMMON_MESSAGES_HPP_ +#define INCLUDE_CPP_COMMON_MESSAGES_HPP_ #pragma once @@ -98,4 +98,4 @@ class Pgr_messages { } // namespace pgrouting -#endif // INCLUDE_CPP_COMMON_PGR_MESSAGES_HPP_ +#endif // INCLUDE_CPP_COMMON_MESSAGES_HPP_ diff --git a/include/cpp_common/orders_t.hpp b/include/cpp_common/orders_t.hpp index 9c124d274f..1c6e58897c 100644 --- a/include/cpp_common/orders_t.hpp +++ b/include/cpp_common/orders_t.hpp @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_CPP_COMMON_PICKDELIVER_ORDERS_T_HPP_ -#define INCLUDE_CPP_COMMON_PICKDELIVER_ORDERS_T_HPP_ +#ifndef INCLUDE_CPP_COMMON_ORDERS_T_HPP_ +#define INCLUDE_CPP_COMMON_ORDERS_T_HPP_ #pragma once #include @@ -53,4 +53,4 @@ struct Orders_t { double deliver_service_t; }; -#endif // INCLUDE_CPP_COMMON_PICKDELIVER_ORDERS_T_HPP_ +#endif // INCLUDE_CPP_COMMON_ORDERS_T_HPP_ diff --git a/include/cpp_common/pgdata_getters.hpp b/include/cpp_common/pgdata_getters.hpp index 9d47bb5f52..dcbd8c9e5b 100644 --- a/include/cpp_common/pgdata_getters.hpp +++ b/include/cpp_common/pgdata_getters.hpp @@ -112,4 +112,4 @@ std::vector get_vehicles(const std::string&, bool); } // namespace pgget } // namespace pgrouting -#endif // INCLUDE_CPP_COMMON_PGGET_HPP_ +#endif // INCLUDE_CPP_COMMON_PGDATA_GETTERS_HPP_ diff --git a/include/cpp_common/vehicle_t.hpp b/include/cpp_common/vehicle_t.hpp index 7af8224a2c..c469d86a0b 100644 --- a/include/cpp_common/vehicle_t.hpp +++ b/include/cpp_common/vehicle_t.hpp @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ /*! @file */ -#ifndef INCLUDE_CPP_COMMON_VEHICLE_T_H_ -#define INCLUDE_CPP_COMMON_VEHICLE_T_H_ +#ifndef INCLUDE_CPP_COMMON_VEHICLE_T_HPP_ +#define INCLUDE_CPP_COMMON_VEHICLE_T_HPP_ #pragma once #include @@ -57,4 +57,4 @@ struct Vehicle_t { }; -#endif // INCLUDE_CPP_COMMON_VEHICLE_T_H_ +#endif // INCLUDE_CPP_COMMON_VEHICLE_T_HPP_ diff --git a/include/dagShortestPath/dagShortestPath.hpp b/include/dagShortestPath/dagShortestPath.hpp index a42bc70846..bdd75989da 100644 --- a/include/dagShortestPath/dagShortestPath.hpp +++ b/include/dagShortestPath/dagShortestPath.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_dagShortestPath.hpp +File: dagShortestPath.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_DAGSHORTESTPATH_PGR_DAGSHORTESTPATH_HPP_ -#define INCLUDE_DAGSHORTESTPATH_PGR_DAGSHORTESTPATH_HPP_ +#ifndef INCLUDE_DAGSHORTESTPATH_DAGSHORTESTPATH_HPP_ +#define INCLUDE_DAGSHORTESTPATH_DAGSHORTESTPATH_HPP_ #pragma once #include @@ -44,7 +44,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" #include "c_types/ii_t_rt.h" @@ -349,4 +349,4 @@ class Pgr_dag { } // namespace pgrouting -#endif // INCLUDE_DAGSHORTESTPATH_PGR_DAGSHORTESTPATH_HPP_ +#endif // INCLUDE_DAGSHORTESTPATH_DAGSHORTESTPATH_HPP_ diff --git a/include/dijkstra/dijkstra.hpp b/include/dijkstra/dijkstra.hpp index b8330604f5..a51505d7fa 100644 --- a/include/dijkstra/dijkstra.hpp +++ b/include/dijkstra/dijkstra.hpp @@ -31,8 +31,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_DIJKSTRA_PGR_DIJKSTRA_HPP_ -#define INCLUDE_DIJKSTRA_PGR_DIJKSTRA_HPP_ +#ifndef INCLUDE_DIJKSTRA_DIJKSTRA_HPP_ +#define INCLUDE_DIJKSTRA_DIJKSTRA_HPP_ #pragma once #include @@ -51,7 +51,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/ii_t_rt.h" #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" #include "visitors/dijkstra_visitors.hpp" @@ -191,4 +191,4 @@ Path dijkstra( } // namespace pgrouting -#endif // INCLUDE_DIJKSTRA_PGR_DIJKSTRA_HPP_ +#endif // INCLUDE_DIJKSTRA_DIJKSTRA_HPP_ diff --git a/include/dijkstra/dijkstraVia.hpp b/include/dijkstra/dijkstraVia.hpp index d00f4da9bb..0287870f90 100644 --- a/include/dijkstra/dijkstraVia.hpp +++ b/include/dijkstra/dijkstraVia.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_dijkstraVia.hpp +File: dijkstraVia.hpp Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_DIJKSTRA_PGR_DIJKSTRAVIA_HPP_ -#define INCLUDE_DIJKSTRA_PGR_DIJKSTRAVIA_HPP_ +#ifndef INCLUDE_DIJKSTRA_DIJKSTRAVIA_HPP_ +#define INCLUDE_DIJKSTRA_DIJKSTRAVIA_HPP_ #pragma once #include @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "dijkstra/dijkstra.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" namespace pgrouting { @@ -122,4 +122,4 @@ pgr_dijkstraVia( } // namespace pgrouting -#endif // INCLUDE_DIJKSTRA_PGR_DIJKSTRAVIA_HPP_ +#endif // INCLUDE_DIJKSTRA_DIJKSTRAVIA_HPP_ diff --git a/include/dijkstra/drivingDist.hpp b/include/dijkstra/drivingDist.hpp index 856eddad4d..39858e4bf5 100644 --- a/include/dijkstra/drivingDist.hpp +++ b/include/dijkstra/drivingDist.hpp @@ -33,8 +33,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_DIJKSTRA_DRIVEDIST_HPP_ -#define INCLUDE_DIJKSTRA_DRIVEDIST_HPP_ +#ifndef INCLUDE_DIJKSTRA_DRIVINGDIST_HPP_ +#define INCLUDE_DIJKSTRA_DRIVINGDIST_HPP_ #pragma once #include @@ -51,7 +51,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" #include "visitors/dijkstra_visitors.hpp" @@ -512,4 +512,4 @@ std::deque drivingDistance( } // namespace pgrouting -#endif // INCLUDE_DIJKSTRA_DRIVEDIST_HPP_ +#endif // INCLUDE_DIJKSTRA_DRIVINGDIST_HPP_ diff --git a/include/dominator/lengauerTarjanDominatorTree_driver.hpp b/include/dominator/lengauerTarjanDominatorTree_driver.hpp index 75f01ae137..52c1d844a8 100644 --- a/include/dominator/lengauerTarjanDominatorTree_driver.hpp +++ b/include/dominator/lengauerTarjanDominatorTree_driver.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_lengauerTarjanDominatorTree_driver.hpp +File: lengauerTarjanDominatorTree_driver.hpp Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -28,8 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_DOMINATOR_PGR_LENGAUERTARJANDOMINATORTREE_DRIVER_HPP_ -#define INCLUDE_DOMINATOR_PGR_LENGAUERTARJANDOMINATORTREE_DRIVER_HPP_ +#ifndef INCLUDE_DOMINATOR_LENGAUERTARJANDOMINATORTREE_DRIVER_HPP_ +#define INCLUDE_DOMINATOR_LENGAUERTARJANDOMINATORTREE_DRIVER_HPP_ #pragma once #include @@ -42,8 +42,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/interruption.hpp" -#include "cpp_common/pgr_messages.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/messages.hpp" +#include "cpp_common/base_graph.hpp" #include "c_types/ii_t_rt.h" @@ -92,5 +92,5 @@ class Pgr_LTDTree : public pgrouting::Pgr_messages { }; } // namespace functions } // namespace pgrouting -#endif // INCLUDE_DOMINATOR_PGR_LENGAUERTARJANDOMINATORTREE_DRIVER_HPP_ +#endif // INCLUDE_DOMINATOR_LENGAUERTARJANDOMINATORTREE_DRIVER_HPP_ diff --git a/include/lineGraph/lineGraphFull.hpp b/include/lineGraph/lineGraphFull.hpp index 01a9bb87a0..c645e8ac33 100644 --- a/include/lineGraph/lineGraphFull.hpp +++ b/include/lineGraph/lineGraphFull.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_lineGraphFull.hpp +File: lineGraphFull.hpp Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_LINEGRAPH_PGR_LINEGRAPHFULL_HPP_ -#define INCLUDE_LINEGRAPH_PGR_LINEGRAPHFULL_HPP_ +#ifndef INCLUDE_LINEGRAPH_LINEGRAPHFULL_HPP_ +#define INCLUDE_LINEGRAPH_LINEGRAPHFULL_HPP_ #pragma once @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include"c_types/line_graph_full_rt.h" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/line_vertex.hpp" namespace pgrouting { @@ -307,4 +307,4 @@ class Pgr_lineGraphFull : public Pgr_base_graph { } // namespace graph } // namespace pgrouting -#endif // INCLUDE_LINEGRAPH_PGR_LINEGRAPHFULL_HPP_ +#endif // INCLUDE_LINEGRAPH_LINEGRAPHFULL_HPP_ diff --git a/include/max_flow/costFlowGraph.hpp b/include/max_flow/costFlowGraph.hpp index 9a6ea25bf4..73c45c0036 100644 --- a/include/max_flow/costFlowGraph.hpp +++ b/include/max_flow/costFlowGraph.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_costFlowGraph.hpp +File: costFlowGraph.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_MAX_FLOW_PGR_COSTFLOWGRAPH_HPP_ -#define INCLUDE_MAX_FLOW_PGR_COSTFLOWGRAPH_HPP_ +#ifndef INCLUDE_MAX_FLOW_COSTFLOWGRAPH_HPP_ +#define INCLUDE_MAX_FLOW_COSTFLOWGRAPH_HPP_ #pragma once #include @@ -58,4 +58,4 @@ typedef boost::property_map < CostFlowGraph, } // namespace pgrouting -#endif // INCLUDE_MAX_FLOW_PGR_COSTFLOWGRAPH_HPP_ +#endif // INCLUDE_MAX_FLOW_COSTFLOWGRAPH_HPP_ diff --git a/include/max_flow/flowgraph.hpp b/include/max_flow/flowgraph.hpp index 316d4de95f..dfd9b2fe36 100644 --- a/include/max_flow/flowgraph.hpp +++ b/include/max_flow/flowgraph.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_flowgraph.hpp +File: flowgraph.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_MAX_FLOW_PGR_FLOWGRAPH_HPP_ -#define INCLUDE_MAX_FLOW_PGR_FLOWGRAPH_HPP_ +#ifndef INCLUDE_MAX_FLOW_FLOWGRAPH_HPP_ +#define INCLUDE_MAX_FLOW_FLOWGRAPH_HPP_ #pragma once #include @@ -52,4 +52,4 @@ typedef boost::adjacency_list @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "max_flow/pgr_flowgraph.hpp" +#include "max_flow/flowgraph.hpp" #include #include #include @@ -198,4 +198,4 @@ class PgrFlowGraph { } // namespace graph } // namespace pgrouting -#endif // INCLUDE_MAX_FLOW_PGR_MAXFLOW_HPP_ +#endif // INCLUDE_MAX_FLOW_MAXFLOW_HPP_ diff --git a/include/max_flow/maximumcardinalitymatching.hpp b/include/max_flow/maximumcardinalitymatching.hpp index 22c85e28ac..f10b2bd0e7 100644 --- a/include/max_flow/maximumcardinalitymatching.hpp +++ b/include/max_flow/maximumcardinalitymatching.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_maximumcardinalitymatching.hpp +File: maximumcardinalitymatching.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -30,8 +30,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_MAX_FLOW_PGR_MAXIMUMCARDINALITYMATCHING_HPP_ -#define INCLUDE_MAX_FLOW_PGR_MAXIMUMCARDINALITYMATCHING_HPP_ +#ifndef INCLUDE_MAX_FLOW_MAXIMUMCARDINALITYMATCHING_HPP_ +#define INCLUDE_MAX_FLOW_MAXIMUMCARDINALITYMATCHING_HPP_ #pragma once #include @@ -152,4 +152,4 @@ class PgrCardinalityGraph { } // namespace flow } // namespace pgrouting -#endif // INCLUDE_MAX_FLOW_PGR_MAXIMUMCARDINALITYMATCHING_HPP_ +#endif // INCLUDE_MAX_FLOW_MAXIMUMCARDINALITYMATCHING_HPP_ diff --git a/include/max_flow/minCostMaxFlow.hpp b/include/max_flow/minCostMaxFlow.hpp index 596e72f96e..3d91bb2683 100644 --- a/include/max_flow/minCostMaxFlow.hpp +++ b/include/max_flow/minCostMaxFlow.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_minCostMaxFlow.hpp +File: minCostMaxFlow.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_MAX_FLOW_PGR_MINCOSTMAXFLOW_HPP_ -#define INCLUDE_MAX_FLOW_PGR_MINCOSTMAXFLOW_HPP_ +#ifndef INCLUDE_MAX_FLOW_MINCOSTMAXFLOW_HPP_ +#define INCLUDE_MAX_FLOW_MINCOSTMAXFLOW_HPP_ #pragma once #include @@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/flow_t.h" #include "cpp_common/costFlow_t.hpp" -#include "max_flow/pgr_costFlowGraph.hpp" +#include "max_flow/costFlowGraph.hpp" namespace pgrouting { namespace graph { @@ -146,4 +146,4 @@ class PgrCostFlowGraph { } // namespace graph } // namespace pgrouting -#endif // INCLUDE_MAX_FLOW_PGR_MINCOSTMAXFLOW_HPP_ +#endif // INCLUDE_MAX_FLOW_MINCOSTMAXFLOW_HPP_ diff --git a/include/metrics/betweennessCentrality.hpp b/include/metrics/betweennessCentrality.hpp index 1277e94caa..8b145c0986 100644 --- a/include/metrics/betweennessCentrality.hpp +++ b/include/metrics/betweennessCentrality.hpp @@ -41,9 +41,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/iid_t_rt.h" #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" -#include "cpp_common/pgr_alloc.hpp" +#include "cpp_common/alloc.hpp" namespace pgrouting { template class Pgr_metrics; diff --git a/include/mincut/stoerWagner.hpp b/include/mincut/stoerWagner.hpp index e8ca146950..a70a401969 100644 --- a/include/mincut/stoerWagner.hpp +++ b/include/mincut/stoerWagner.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_stoerWagner.hpp +File: stoerWagner.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_MINCUT_PGR_STOERWAGNER_HPP_ -#define INCLUDE_MINCUT_PGR_STOERWAGNER_HPP_ +#ifndef INCLUDE_MINCUT_STOERWAGNER_HPP_ +#define INCLUDE_MINCUT_STOERWAGNER_HPP_ #pragma once #include @@ -45,7 +45,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "c_types/stoerWagner_t.h" @@ -118,4 +118,4 @@ Pgr_stoerWagner< G >::stoerWagner( } -#endif // INCLUDE_MINCUT_PGR_STOERWAGNER_HPP_ +#endif // INCLUDE_MINCUT_STOERWAGNER_HPP_ diff --git a/include/ordering/cuthillMckeeOrdering.hpp b/include/ordering/cuthillMckeeOrdering.hpp index b923031777..29997bf3fd 100644 --- a/include/ordering/cuthillMckeeOrdering.hpp +++ b/include/ordering/cuthillMckeeOrdering.hpp @@ -42,9 +42,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" -#include "cpp_common/pgr_messages.hpp" +#include "cpp_common/messages.hpp" #include "c_types/ii_t_rt.h" diff --git a/include/planar/boyerMyrvold.hpp b/include/planar/boyerMyrvold.hpp index 35cb8ae985..2c8258df5b 100644 --- a/include/planar/boyerMyrvold.hpp +++ b/include/planar/boyerMyrvold.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_boyerMyrvold.hpp +File: boyerMyrvold.hpp Copyright (c) 2020 pgRouting developers Mail: project@pgrouting.org @@ -21,8 +21,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_PLANAR_PGR_BOYERMYRVOLD_HPP_ -#define INCLUDE_PLANAR_PGR_BOYERMYRVOLD_HPP_ +#ifndef INCLUDE_PLANAR_BOYERMYRVOLD_HPP_ +#define INCLUDE_PLANAR_BOYERMYRVOLD_HPP_ #pragma once #include @@ -35,8 +35,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_messages.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/messages.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" #include "c_types/iid_t_rt.h" //****************************************** @@ -89,4 +89,4 @@ class Pgr_boyerMyrvold : public pgrouting::Pgr_messages { } // namespace functions } // namespace pgrouting -#endif // INCLUDE_PLANAR_PGR_BOYERMYRVOLD_HPP_ +#endif // INCLUDE_PLANAR_BOYERMYRVOLD_HPP_ diff --git a/include/spanningTree/kruskal.hpp b/include/spanningTree/kruskal.hpp index 034644d068..23d588301a 100644 --- a/include/spanningTree/kruskal.hpp +++ b/include/spanningTree/kruskal.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_kruskal.hpp +File: kruskal.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -25,13 +25,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_SPANNINGTREE_PGR_KRUSKAL_HPP_ -#define INCLUDE_SPANNINGTREE_PGR_KRUSKAL_HPP_ +#ifndef INCLUDE_SPANNINGTREE_KRUSKAL_HPP_ +#define INCLUDE_SPANNINGTREE_KRUSKAL_HPP_ #pragma once #include #include -#include "spanningTree/pgr_mst.hpp" +#include "spanningTree/mst.hpp" #include "cpp_common/interruption.hpp" namespace pgrouting { @@ -119,4 +119,4 @@ Pgr_kruskal::kruskalDD( } // namespace functions } // namespace pgrouting -#endif // INCLUDE_SPANNINGTREE_PGR_KRUSKAL_HPP_ +#endif // INCLUDE_SPANNINGTREE_KRUSKAL_HPP_ diff --git a/include/spanningTree/mst.hpp b/include/spanningTree/mst.hpp index e5e8440e60..af0e24b426 100644 --- a/include/spanningTree/mst.hpp +++ b/include/spanningTree/mst.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_mst.hpp +File: mst.hpp Copyright (c) 2018 pgRouting developers Mail: project@pgrouting.org @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_SPANNINGTREE_PGR_MST_HPP_ -#define INCLUDE_SPANNINGTREE_PGR_MST_HPP_ +#ifndef INCLUDE_SPANNINGTREE_MST_HPP_ +#define INCLUDE_SPANNINGTREE_MST_HPP_ #pragma once #include @@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" #include "spanningTree/details.hpp" @@ -370,4 +370,4 @@ class Pgr_mst { } // namespace functions } // namespace pgrouting -#endif // INCLUDE_SPANNINGTREE_PGR_MST_HPP_ +#endif // INCLUDE_SPANNINGTREE_MST_HPP_ diff --git a/include/spanningTree/prim.hpp b/include/spanningTree/prim.hpp index fbf5178015..48b21a6452 100644 --- a/include/spanningTree/prim.hpp +++ b/include/spanningTree/prim.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_prim.hpp +File: prim.hpp Copyright (c) 2018 pgRouting developers Mail: project@pgrouting.org @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_SPANNINGTREE_PGR_PRIM_HPP_ -#define INCLUDE_SPANNINGTREE_PGR_PRIM_HPP_ +#ifndef INCLUDE_SPANNINGTREE_PRIM_HPP_ +#define INCLUDE_SPANNINGTREE_PRIM_HPP_ #pragma once #include @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "spanningTree/pgr_mst.hpp" +#include "spanningTree/mst.hpp" #include "cpp_common/interruption.hpp" //****************************************** @@ -199,4 +199,4 @@ Pgr_prim::primDD( } // namespace functions } // namespace pgrouting -#endif // INCLUDE_SPANNINGTREE_PGR_PRIM_HPP_ +#endif // INCLUDE_SPANNINGTREE_PRIM_HPP_ diff --git a/include/topologicalSort/topologicalSort.hpp b/include/topologicalSort/topologicalSort.hpp index 837b5ec941..9b0044546a 100644 --- a/include/topologicalSort/topologicalSort.hpp +++ b/include/topologicalSort/topologicalSort.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_topologicalSort.hpp +File: topologicalSort.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -22,8 +22,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_TOPOLOGICALSORT_PGR_TOPOLOGICALSORT_HPP_ -#define INCLUDE_TOPOLOGICALSORT_PGR_TOPOLOGICALSORT_HPP_ +#ifndef INCLUDE_TOPOLOGICALSORT_TOPOLOGICALSORT_HPP_ +#define INCLUDE_TOPOLOGICALSORT_TOPOLOGICALSORT_HPP_ #pragma once @@ -42,7 +42,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "cpp_common/basePath_SSEC.hpp" -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" #include "c_types//i_rt.h" @@ -98,4 +98,4 @@ Pgr_topologicalSort< G >::topologicalSort( } -#endif // INCLUDE_TOPOLOGICALSORT_PGR_TOPOLOGICALSORT_HPP_ +#endif // INCLUDE_TOPOLOGICALSORT_TOPOLOGICALSORT_HPP_ diff --git a/include/transitiveClosure/transitiveClosure.hpp b/include/transitiveClosure/transitiveClosure.hpp index a9e0e9758b..214d1e8556 100644 --- a/include/transitiveClosure/transitiveClosure.hpp +++ b/include/transitiveClosure/transitiveClosure.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_transitiveClosure.hpp +File: transitiveClosure.hpp Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_TRANSITIVECLOSURE_PGR_TRANSITIVECLOSURE_HPP_ -#define INCLUDE_TRANSITIVECLOSURE_PGR_TRANSITIVECLOSURE_HPP_ +#ifndef INCLUDE_TRANSITIVECLOSURE_TRANSITIVECLOSURE_HPP_ +#define INCLUDE_TRANSITIVECLOSURE_TRANSITIVECLOSURE_HPP_ #pragma once @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" template < class G > class Pgr_transitiveClosure; @@ -72,4 +72,4 @@ Pgr_transitiveClosure< G >::transitiveClosure( -#endif // INCLUDE_TRANSITIVECLOSURE_PGR_TRANSITIVECLOSURE_HPP_ +#endif // INCLUDE_TRANSITIVECLOSURE_TRANSITIVECLOSURE_HPP_ diff --git a/include/traversal/depthFirstSearch.hpp b/include/traversal/depthFirstSearch.hpp index ae49de0b06..30c10b708b 100644 --- a/include/traversal/depthFirstSearch.hpp +++ b/include/traversal/depthFirstSearch.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_depthFirstSearch.hpp +File: depthFirstSearch.hpp Copyright (c) 2020 pgRouting developers Mail: project@pgrouting.org @@ -21,8 +21,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_TRAVERSAL_PGR_DEPTHFIRSTSEARCH_HPP_ -#define INCLUDE_TRAVERSAL_PGR_DEPTHFIRSTSEARCH_HPP_ +#ifndef INCLUDE_TRAVERSAL_DEPTHFIRSTSEARCH_HPP_ +#define INCLUDE_TRAVERSAL_DEPTHFIRSTSEARCH_HPP_ #pragma once #include @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include "cpp_common/pgr_base_graph.hpp" +#include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" #include "c_types/mst_rt.h" @@ -213,4 +213,4 @@ class Pgr_depthFirstSearch { } // namespace functions } // namespace pgrouting -#endif // INCLUDE_TRAVERSAL_PGR_DEPTHFIRSTSEARCH_HPP_ +#endif // INCLUDE_TRAVERSAL_DEPTHFIRSTSEARCH_HPP_ diff --git a/include/trsp/edgeInfo.hpp b/include/trsp/edgeInfo.hpp index fea4835fb9..d015008c9c 100644 --- a/include/trsp/edgeInfo.hpp +++ b/include/trsp/edgeInfo.hpp @@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/edge_t.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" namespace pgrouting { namespace trsp { diff --git a/include/trsp/trspHandler.hpp b/include/trsp/trspHandler.hpp index 5508e19e0d..772f666697 100644 --- a/include/trsp/trspHandler.hpp +++ b/include/trsp/trspHandler.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_trspHandler.hpp +File: trspHandler.hpp Copyright (c) 2017 pgRouting developers Mail: project@pgrouting.org @@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_TRSP_PGR_TRSPHANDLER_HPP_ -#define INCLUDE_TRSP_PGR_TRSPHANDLER_HPP_ +#ifndef INCLUDE_TRSP_TRSPHANDLER_HPP_ +#define INCLUDE_TRSP_TRSPHANDLER_HPP_ #include @@ -42,7 +42,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/basePath_SSEC.hpp" #include "trsp/edgeInfo.hpp" #include "cpp_common/rule.hpp" -#include "cpp_common/pgr_messages.hpp" +#include "cpp_common/messages.hpp" namespace pgrouting { namespace trsp { @@ -245,4 +245,4 @@ class Pgr_trspHandler : public pgrouting::Pgr_messages { } // namespace trsp } // namespace pgrouting -#endif // INCLUDE_TRSP_PGR_TRSPHANDLER_HPP_ +#endif // INCLUDE_TRSP_TRSPHANDLER_HPP_ diff --git a/include/tsp/tsp.hpp b/include/tsp/tsp.hpp index 8933af6b77..9f35c6ea22 100644 --- a/include/tsp/tsp.hpp +++ b/include/tsp/tsp.hpp @@ -41,8 +41,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/iid_t_rt.h" #include "cpp_common/coordinate_t.hpp" -#include "cpp_common/pgr_messages.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/messages.hpp" +#include "cpp_common/assert.hpp" namespace pgrouting { diff --git a/include/visitors/dijkstra_visitors.hpp b/include/visitors/dijkstra_visitors.hpp index 8026bb6fe8..0acc99ac8e 100644 --- a/include/visitors/dijkstra_visitors.hpp +++ b/include/visitors/dijkstra_visitors.hpp @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include "visitors/found_goals.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" namespace pgrouting { namespace visitors { diff --git a/include/vrp/dnode.hpp b/include/vrp/dnode.hpp index bc7f0f476f..9954b6a857 100644 --- a/include/vrp/dnode.hpp +++ b/include/vrp/dnode.hpp @@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include #include "cpp_common/identifier.hpp" -#include "cpp_common/pgr_messages.hpp" +#include "cpp_common/messages.hpp" namespace pgrouting { namespace vrp { diff --git a/include/vrp/optimize.hpp b/include/vrp/optimize.hpp index 735f937a1c..88bf57844e 100644 --- a/include/vrp/optimize.hpp +++ b/include/vrp/optimize.hpp @@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #pragma once #include "vrp/solution.hpp" -#include "vrp/pgr_pickDeliver.hpp" +#include "vrp/pickDeliver.hpp" namespace pgrouting { namespace vrp { diff --git a/include/vrp/pd_problem.hpp b/include/vrp/pd_problem.hpp index 51bc8241bc..717347daa8 100644 --- a/include/vrp/pd_problem.hpp +++ b/include/vrp/pd_problem.hpp @@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #define INCLUDE_VRP_PD_PROBLEM_HPP_ #pragma once -#include "cpp_common/pgr_messages.hpp" +#include "cpp_common/messages.hpp" #include "vrp/initials_code.hpp" diff --git a/include/vrp/pickDeliver.hpp b/include/vrp/pickDeliver.hpp index 22e5dba71c..fb316636ad 100644 --- a/include/vrp/pickDeliver.hpp +++ b/include/vrp/pickDeliver.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_pickDeliver.hpp +File: pickDeliver.hpp Copyright (c) 2017 pgRouting developers Mail: project@pgrouting.org @@ -24,8 +24,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. /*! @file */ -#ifndef INCLUDE_VRP_PGR_PICKDELIVER_HPP_ -#define INCLUDE_VRP_PGR_PICKDELIVER_HPP_ +#ifndef INCLUDE_VRP_PICKDELIVER_HPP_ +#define INCLUDE_VRP_PICKDELIVER_HPP_ #pragma once @@ -116,4 +116,4 @@ class Pgr_pickDeliver : public PD_problem { } // namespace vrp } // namespace pgrouting -#endif // INCLUDE_VRP_PGR_PICKDELIVER_HPP_ +#endif // INCLUDE_VRP_PICKDELIVER_HPP_ diff --git a/include/vrp/tw_node.hpp b/include/vrp/tw_node.hpp index 67d2c0db26..812edfff8a 100644 --- a/include/vrp/tw_node.hpp +++ b/include/vrp/tw_node.hpp @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "cpp_common/orders_t.hpp" #include "cpp_common/vehicle_t.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/identifier.hpp" #include "vrp/pd_problem.hpp" diff --git a/include/withPoints/withPoints.hpp b/include/withPoints/withPoints.hpp index 0c3fd78030..6fa13398b2 100644 --- a/include/withPoints/withPoints.hpp +++ b/include/withPoints/withPoints.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_withPoints.hpp +File: withPoints.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -26,13 +26,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_WITHPOINTS_PGR_WITHPOINTS_HPP_ -#define INCLUDE_WITHPOINTS_PGR_WITHPOINTS_HPP_ +#ifndef INCLUDE_WITHPOINTS_WITHPOINTS_HPP_ +#define INCLUDE_WITHPOINTS_WITHPOINTS_HPP_ #pragma once #include #include "cpp_common/point_on_edge_t.hpp" -#include "cpp_common/pgr_messages.hpp" +#include "cpp_common/messages.hpp" #include "cpp_common/basePath_SSEC.hpp" namespace pgrouting { @@ -98,4 +98,4 @@ class Pg_points_graph : public Pgr_messages { } // namespace pgrouting -#endif // INCLUDE_WITHPOINTS_PGR_WITHPOINTS_HPP_ +#endif // INCLUDE_WITHPOINTS_WITHPOINTS_HPP_ diff --git a/include/yen/ksp.hpp b/include/yen/ksp.hpp index b2a69363c6..11b10e36d7 100644 --- a/include/yen/ksp.hpp +++ b/include/yen/ksp.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_ksp.hpp +File: ksp.hpp Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -30,8 +30,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_YEN_PGR_KSP_HPP_ -#define INCLUDE_YEN_PGR_KSP_HPP_ +#ifndef INCLUDE_YEN_KSP_HPP_ +#define INCLUDE_YEN_KSP_HPP_ #pragma once #include @@ -43,9 +43,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include "dijkstra/dijkstra.hpp" -#include "cpp_common/pgr_assert.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/compPaths.hpp" -#include "cpp_common/pgr_messages.hpp" +#include "cpp_common/messages.hpp" #include "cpp_common/basePath_SSEC.hpp" namespace pgrouting { @@ -277,4 +277,4 @@ namespace algorithms { } // namespace pgrouting -#endif // INCLUDE_YEN_PGR_KSP_HPP_ +#endif // INCLUDE_YEN_KSP_HPP_ diff --git a/include/yen/turnRestrictedPath.hpp b/include/yen/turnRestrictedPath.hpp index bcc55589ce..a314b3a462 100644 --- a/include/yen/turnRestrictedPath.hpp +++ b/include/yen/turnRestrictedPath.hpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: pgr_turnRestrictedPath.hpp +File: turnRestrictedPath.hpp Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -26,22 +26,21 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_YEN_PGR_TURNRESTRICTEDPATH_HPP_ -#define INCLUDE_YEN_PGR_TURNRESTRICTEDPATH_HPP_ +#ifndef INCLUDE_YEN_TURNRESTRICTEDPATH_HPP_ +#define INCLUDE_YEN_TURNRESTRICTEDPATH_HPP_ #pragma once -#include "yen/pgr_ksp.hpp" - #include #include #include #include #include -#include "cpp_common/pgr_assert.hpp" +#include "yen/ksp.hpp" +#include "cpp_common/assert.hpp" #include "cpp_common/basePath_SSEC.hpp" #include "cpp_common/compPaths.hpp" -#include "cpp_common/pgr_messages.hpp" +#include "cpp_common/messages.hpp" #include "cpp_common/rule.hpp" namespace pgrouting { @@ -265,4 +264,4 @@ class Pgr_turnRestrictedPath : public Pgr_ksp< G > { -#endif // INCLUDE_YEN_PGR_TURNRESTRICTEDPATH_HPP_ +#endif // INCLUDE_YEN_TURNRESTRICTEDPATH_HPP_ diff --git a/src/bellman_ford/bellman_ford_neg_driver.cpp b/src/bellman_ford/bellman_ford_neg_driver.cpp index 5407134cc9..351ba3c2f4 100644 --- a/src/bellman_ford/bellman_ford_neg_driver.cpp +++ b/src/bellman_ford/bellman_ford_neg_driver.cpp @@ -39,12 +39,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "bellman_ford/bellman_ford.hpp" -#include "c_types/ii_t_rt.h" #include "cpp_common/combinations.hpp" #include "cpp_common/pgdata_getters.hpp" #include "cpp_common/alloc.hpp" #include "cpp_common/assert.hpp" +#include "c_types/ii_t_rt.h" namespace { #if 0 @@ -76,6 +76,7 @@ pgr_bellman_ford( } #endif + template std::deque bellman_ford( @@ -128,7 +129,7 @@ pgr_do_bellman_ford_neg( hint = combinations_sql; - auto combinations = get_combinations(combinations_sql, starts, ends, normal); + auto combinations = get_combinations(combinations_sql, starts, ends, true); hint = nullptr; if (combinations.empty() && combinations_sql) { @@ -143,8 +144,6 @@ pgr_do_bellman_ford_neg( hint = neg_edges_sql; auto neg_edges = get_edges(std::string(neg_edges_sql), true, false); - - if (edges.size() + neg_edges.empty()) { *notice_msg = pgr_msg("No edges found"); *log_msg = hint? pgr_msg(hint) : pgr_msg(log.str().c_str()); @@ -154,15 +153,15 @@ pgr_do_bellman_ford_neg( std::deque paths; if (directed) { - pgrouting::DirectedGraph digraph(directed); + pgrouting::DirectedGraph digraph; digraph.insert_edges(edges); digraph.insert_negative_edges(neg_edges); paths = bellman_ford(digraph, combinations, only_cost); } else { - pgrouting::UndirectedGraph undigraph(directed); + pgrouting::UndirectedGraph undigraph; undigraph.insert_edges(edges); undigraph.insert_negative_edges(neg_edges); - paths = pgr_bellman_ford(undigraph, combinations, only_cost); + paths = bellman_ford(undigraph, combinations, only_cost); } size_t count(0); From 5ef896e9c446cf0b864babfd7313ae45d49d9fd2 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 9 Oct 2024 23:08:19 -0600 Subject: [PATCH 415/428] (build) Adjusting CMakelists to name changes --- sql/chinese/CMakeLists.txt | 4 ++-- sql/common/CMakeLists.txt | 2 +- sql/trsp/CMakeLists.txt | 4 ++-- sql/vrp_basic/CMakeLists.txt | 2 +- src/alpha_shape/CMakeLists.txt | 2 +- src/coloring/CMakeLists.txt | 2 +- src/common/CMakeLists.txt | 4 ++-- src/components/CMakeLists.txt | 2 +- src/contraction/CMakeLists.txt | 2 +- src/cpp_common/CMakeLists.txt | 2 +- src/driving_distance/CMakeLists.txt | 10 +++++----- src/max_flow/CMakeLists.txt | 6 +++--- src/pickDeliver/CMakeLists.txt | 2 +- src/trsp/CMakeLists.txt | 2 +- src/withPoints/CMakeLists.txt | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/sql/chinese/CMakeLists.txt b/sql/chinese/CMakeLists.txt index bbe1e78d19..242a069dfd 100644 --- a/sql/chinese/CMakeLists.txt +++ b/sql/chinese/CMakeLists.txt @@ -1,8 +1,8 @@ SET(LOCAL_FILES _pgr_chinesePostman.sql - pgr_chinesePostman.sql - pgr_chinesePostmanCost.sql) + chinesePostman.sql + chinesePostmanCost.sql) foreach (f ${LOCAL_FILES}) configure_file(${f} ${f}) diff --git a/sql/common/CMakeLists.txt b/sql/common/CMakeLists.txt index 5678072f13..ede4090c6d 100644 --- a/sql/common/CMakeLists.txt +++ b/sql/common/CMakeLists.txt @@ -5,7 +5,7 @@ SET(LOCAL_FILES _startPoint.sql _endPoint.sql pgrouting_utilities.sql - pgr_parameter_check.sql + parameter_check.sql utilities_pgr.sql createIndex.sql _checkquery.sql diff --git a/sql/trsp/CMakeLists.txt b/sql/trsp/CMakeLists.txt index e66117c87a..204e964531 100644 --- a/sql/trsp/CMakeLists.txt +++ b/sql/trsp/CMakeLists.txt @@ -7,9 +7,9 @@ SET(LOCAL_FILES pgr_trsp.sql _pgr_trspViaVertices.sql - pgr_trspViaVertices.sql + trspViaVertices.sql - pgr_trspViaEdges.sql + trspViaEdges.sql _trsp_withPoints.sql trsp_withPoints.sql diff --git a/sql/vrp_basic/CMakeLists.txt b/sql/vrp_basic/CMakeLists.txt index ff07128698..670a9d3b36 100644 --- a/sql/vrp_basic/CMakeLists.txt +++ b/sql/vrp_basic/CMakeLists.txt @@ -2,7 +2,7 @@ SET(LOCAL_FILES #routing_vrp.sql _pgr_vrpOneDepot.sql - pgr_vrpOneDepot.sql + vrpOneDepot.sql ) foreach (f ${LOCAL_FILES}) diff --git a/src/alpha_shape/CMakeLists.txt b/src/alpha_shape/CMakeLists.txt index 22148dd4eb..f7e04dfea9 100644 --- a/src/alpha_shape/CMakeLists.txt +++ b/src/alpha_shape/CMakeLists.txt @@ -1,5 +1,5 @@ ADD_LIBRARY(alpha_shape OBJECT - pgr_alphaShape.cpp + alphaShape.cpp alphaShape.c alphaShape_driver.cpp ) diff --git a/src/coloring/CMakeLists.txt b/src/coloring/CMakeLists.txt index 50ca5613c7..e46b889efc 100644 --- a/src/coloring/CMakeLists.txt +++ b/src/coloring/CMakeLists.txt @@ -5,5 +5,5 @@ ADD_LIBRARY(coloring OBJECT bipartite_driver.cpp edgeColoring.c edgeColoring_driver.cpp - pgr_edgeColoring.cpp + edgeColoring.cpp ) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 0d9cce841d..824ad178b0 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -6,7 +6,7 @@ ADD_LIBRARY(common OBJECT check_parameters.c time_msg.c - pgr_assert.cpp + assert.cpp identifier.cpp basic_vertex.cpp @@ -14,5 +14,5 @@ ADD_LIBRARY(common OBJECT ch_vertex.cpp ch_edge.cpp basic_edge.cpp - pgr_alloc.cpp + alloc.cpp ) diff --git a/src/components/CMakeLists.txt b/src/components/CMakeLists.txt index 33f3016468..467bbaa986 100644 --- a/src/components/CMakeLists.txt +++ b/src/components/CMakeLists.txt @@ -8,7 +8,7 @@ ADD_LIBRARY(components OBJECT makeConnected_driver.cpp componentsResult.cpp - pgr_components.cpp + components.cpp connectedComponents_driver.cpp strongComponents_driver.cpp biconnectedComponents_driver.cpp diff --git a/src/contraction/CMakeLists.txt b/src/contraction/CMakeLists.txt index fcbe0469c7..97ec200e47 100644 --- a/src/contraction/CMakeLists.txt +++ b/src/contraction/CMakeLists.txt @@ -1,5 +1,5 @@ ADD_LIBRARY(contraction OBJECT contractGraph.c contractGraph_driver.cpp - pgr_contract.cpp + contract.cpp ) diff --git a/src/cpp_common/CMakeLists.txt b/src/cpp_common/CMakeLists.txt index a05eb5dbfb..f45cce63ba 100644 --- a/src/cpp_common/CMakeLists.txt +++ b/src/cpp_common/CMakeLists.txt @@ -3,7 +3,7 @@ ADD_LIBRARY(cpp_common OBJECT compPaths.cpp rule.cpp bpoint.cpp - pgr_messages.cpp + messages.cpp combinations.cpp get_check_data.cpp diff --git a/src/driving_distance/CMakeLists.txt b/src/driving_distance/CMakeLists.txt index 9d568dfd70..ff953c003d 100644 --- a/src/driving_distance/CMakeLists.txt +++ b/src/driving_distance/CMakeLists.txt @@ -1,7 +1,7 @@ ADD_LIBRARY(driving_distance OBJECT - many_to_dist_driving_distance.c - many_to_dist_withPointsDD.c + driving_distance.c + driving_distance_withPoints.c - drivedist_driver.cpp - withPoints_dd_driver.cpp - ) + driving_distance_driver.cpp + driving_distance_withPoints_driver.cpp +) diff --git a/src/max_flow/CMakeLists.txt b/src/max_flow/CMakeLists.txt index 971691528e..26a5a99bd1 100644 --- a/src/max_flow/CMakeLists.txt +++ b/src/max_flow/CMakeLists.txt @@ -9,7 +9,7 @@ ADD_LIBRARY(max_flow OBJECT edge_disjoint_paths_driver.cpp minCostMaxFlow_driver.cpp - pgr_maxflow.cpp - pgr_flowgraph.cpp - pgr_minCostMaxFlow.cpp + maxflow.cpp + flowgraph.cpp + minCostMaxFlow.cpp ) diff --git a/src/pickDeliver/CMakeLists.txt b/src/pickDeliver/CMakeLists.txt index 13891c4ecd..ae22c9adb3 100644 --- a/src/pickDeliver/CMakeLists.txt +++ b/src/pickDeliver/CMakeLists.txt @@ -1,7 +1,7 @@ ADD_LIBRARY(pickDeliver OBJECT pd_orders.cpp fleet.cpp - pgr_pickDeliver.cpp + pickDeliver.cpp dnode.cpp vehicle_pickDeliver.cpp solution.cpp diff --git a/src/trsp/CMakeLists.txt b/src/trsp/CMakeLists.txt index 533f3e2ed6..6e8540a8f6 100644 --- a/src/trsp/CMakeLists.txt +++ b/src/trsp/CMakeLists.txt @@ -7,7 +7,7 @@ add_library(trsp OBJECT new_trsp.c edgeInfo.cpp - pgr_trspHandler.cpp + trspHandler.cpp trsp_driver.cpp trsp_withPoints.c trsp_withPoints_driver.cpp diff --git a/src/withPoints/CMakeLists.txt b/src/withPoints/CMakeLists.txt index a9f5435a69..d5fe066cb5 100644 --- a/src/withPoints/CMakeLists.txt +++ b/src/withPoints/CMakeLists.txt @@ -3,7 +3,7 @@ ADD_LIBRARY(withPoints OBJECT get_new_queries.cpp withPoints_driver.cpp - pgr_withPoints.cpp + withPoints.cpp withPointsVia.c withPointsVia_driver.cpp From dbd3920e5316263eb93bd32145d09582acaefda2 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 10 Oct 2024 09:56:57 -0600 Subject: [PATCH 416/428] (trsp) Renaming files with deprecated code --- include/drivers/trsp/{trsp_core.h => trsp_deprecated_driver.h} | 0 .../{_pgr_trspViaVertices.sql => _trspViaVertices_deprecated.sql} | 0 sql/trsp/{_pgr_trsp.sql => _trsp_deprecated.sql} | 0 sql/trsp/{trspViaEdges.sql => trspViaEdges_deprecated.sql} | 0 sql/trsp/{trspViaVertices.sql => trspViaVertices_deprecated.sql} | 0 sql/trsp/{pgr_trsp.sql => trsp_deprecated.sql} | 0 src/trsp/{trsp.c => trsp_deprecated.c} | 0 src/trsp/{trsp_core.cpp => trsp_deprecated_driver.cpp} | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename include/drivers/trsp/{trsp_core.h => trsp_deprecated_driver.h} (100%) rename sql/trsp/{_pgr_trspViaVertices.sql => _trspViaVertices_deprecated.sql} (100%) rename sql/trsp/{_pgr_trsp.sql => _trsp_deprecated.sql} (100%) rename sql/trsp/{trspViaEdges.sql => trspViaEdges_deprecated.sql} (100%) rename sql/trsp/{trspViaVertices.sql => trspViaVertices_deprecated.sql} (100%) rename sql/trsp/{pgr_trsp.sql => trsp_deprecated.sql} (100%) rename src/trsp/{trsp.c => trsp_deprecated.c} (100%) rename src/trsp/{trsp_core.cpp => trsp_deprecated_driver.cpp} (100%) diff --git a/include/drivers/trsp/trsp_core.h b/include/drivers/trsp/trsp_deprecated_driver.h similarity index 100% rename from include/drivers/trsp/trsp_core.h rename to include/drivers/trsp/trsp_deprecated_driver.h diff --git a/sql/trsp/_pgr_trspViaVertices.sql b/sql/trsp/_trspViaVertices_deprecated.sql similarity index 100% rename from sql/trsp/_pgr_trspViaVertices.sql rename to sql/trsp/_trspViaVertices_deprecated.sql diff --git a/sql/trsp/_pgr_trsp.sql b/sql/trsp/_trsp_deprecated.sql similarity index 100% rename from sql/trsp/_pgr_trsp.sql rename to sql/trsp/_trsp_deprecated.sql diff --git a/sql/trsp/trspViaEdges.sql b/sql/trsp/trspViaEdges_deprecated.sql similarity index 100% rename from sql/trsp/trspViaEdges.sql rename to sql/trsp/trspViaEdges_deprecated.sql diff --git a/sql/trsp/trspViaVertices.sql b/sql/trsp/trspViaVertices_deprecated.sql similarity index 100% rename from sql/trsp/trspViaVertices.sql rename to sql/trsp/trspViaVertices_deprecated.sql diff --git a/sql/trsp/pgr_trsp.sql b/sql/trsp/trsp_deprecated.sql similarity index 100% rename from sql/trsp/pgr_trsp.sql rename to sql/trsp/trsp_deprecated.sql diff --git a/src/trsp/trsp.c b/src/trsp/trsp_deprecated.c similarity index 100% rename from src/trsp/trsp.c rename to src/trsp/trsp_deprecated.c diff --git a/src/trsp/trsp_core.cpp b/src/trsp/trsp_deprecated_driver.cpp similarity index 100% rename from src/trsp/trsp_core.cpp rename to src/trsp/trsp_deprecated_driver.cpp From 9130e32a3482e1ef863e2234b1cfa3669ab6cea7 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 10 Oct 2024 09:58:06 -0600 Subject: [PATCH 417/428] (src/trsp) new_trsp.c -> trsp.c --- src/trsp/{new_trsp.c => trsp.c} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/trsp/{new_trsp.c => trsp.c} (100%) diff --git a/src/trsp/new_trsp.c b/src/trsp/trsp.c similarity index 100% rename from src/trsp/new_trsp.c rename to src/trsp/trsp.c From 39f7a7e2275bf89521d2b8393006c03042945265 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sun, 13 Oct 2024 11:55:43 -0600 Subject: [PATCH 418/428] (trsp) Adjusting code to file renames --- .../drivers/driving_distance/driving_distance_driver.h | 6 +++--- .../driving_distance/driving_distance_withPoints_driver.h | 6 +++--- include/drivers/trsp/trsp_deprecated_driver.h | 8 ++++---- sql/trsp/_array_reverse.sql | 1 + sql/trsp/_trsp.sql | 1 + sql/trsp/_trspViaVertices_deprecated.sql | 1 + sql/trsp/_trsp_deprecated.sql | 1 + sql/trsp/trsp.sql | 1 + sql/trsp/trspViaEdges_deprecated.sql | 1 + sql/trsp/trspViaVertices_deprecated.sql | 1 + sql/trsp/trsp_deprecated.sql | 1 + src/trsp/trsp_deprecated.c | 4 ++-- src/trsp/trsp_deprecated_driver.cpp | 4 ++-- 13 files changed, 22 insertions(+), 14 deletions(-) diff --git a/include/drivers/driving_distance/driving_distance_driver.h b/include/drivers/driving_distance/driving_distance_driver.h index d82a977f63..7a37facf8c 100644 --- a/include/drivers/driving_distance/driving_distance_driver.h +++ b/include/drivers/driving_distance/driving_distance_driver.h @@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_DRIVERS_DRIVING_DISTANCE_DRIVEDIST_DRIVER_H_ -#define INCLUDE_DRIVERS_DRIVING_DISTANCE_DRIVEDIST_DRIVER_H_ +#ifndef INCLUDE_DRIVERS_DRIVING_DISTANCE_DRIVING_DISTANCE_DRIVER_H_ +#define INCLUDE_DRIVERS_DRIVING_DISTANCE_DRIVING_DISTANCE_DRIVER_H_ #ifdef __cplusplus extern "C" { @@ -68,4 +68,4 @@ void pgr_do_drivingDistance( } #endif -#endif // INCLUDE_DRIVERS_DRIVING_DISTANCE_DRIVEDIST_DRIVER_H_ +#endif // INCLUDE_DRIVERS_DRIVING_DISTANCE_DRIVING_DISTANCE_DRIVER_H_ diff --git a/include/drivers/driving_distance/driving_distance_withPoints_driver.h b/include/drivers/driving_distance/driving_distance_withPoints_driver.h index 64bd4636ca..c4d1c8fba2 100644 --- a/include/drivers/driving_distance/driving_distance_withPoints_driver.h +++ b/include/drivers/driving_distance/driving_distance_withPoints_driver.h @@ -29,8 +29,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_DRIVERS_DRIVING_DISTANCE_WITHPOINTS_DD_DRIVER_H_ -#define INCLUDE_DRIVERS_DRIVING_DISTANCE_WITHPOINTS_DD_DRIVER_H_ +#ifndef INCLUDE_DRIVERS_DRIVING_DISTANCE_DRIVING_DISTANCE_WITHPOINTS_DRIVER_H_ +#define INCLUDE_DRIVERS_DRIVING_DISTANCE_DRIVING_DISTANCE_WITHPOINTS_DRIVER_H_ #pragma once @@ -76,4 +76,4 @@ void pgr_do_withPointsDD( } #endif -#endif // INCLUDE_DRIVERS_DRIVING_DISTANCE_WITHPOINTS_DD_DRIVER_H_ +#endif // INCLUDE_DRIVERS_DRIVING_DISTANCE_DRIVING_DISTANCE_WITHPOINTS_DRIVER_H_ diff --git a/include/drivers/trsp/trsp_deprecated_driver.h b/include/drivers/trsp/trsp_deprecated_driver.h index 39d734b488..ba4c0bb64e 100644 --- a/include/drivers/trsp/trsp_deprecated_driver.h +++ b/include/drivers/trsp/trsp_deprecated_driver.h @@ -1,6 +1,6 @@ /*PGR-GNU***************************************************************** -FILE: trsp.h +FILE: trsp_deprecated_driver.h Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org @@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#ifndef INCLUDE_DRIVERS_TRSP_TRSP_CORE_H_ -#define INCLUDE_DRIVERS_TRSP_TRSP_CORE_H_ +#ifndef INCLUDE_DRIVERS_TRSP_TRSP_DEPRECATED_DRIVER_H_ +#define INCLUDE_DRIVERS_TRSP_TRSP_DEPRECATED_DRIVER_H_ #ifdef __cplusplus # include @@ -63,4 +63,4 @@ int trsp_edge_wrapper( } #endif -#endif // INCLUDE_DRIVERS_TRSP_TRSP_CORE_H_ +#endif // INCLUDE_DRIVERS_TRSP_TRSP_DEPRECATED_DRIVER_H_ diff --git a/sql/trsp/_array_reverse.sql b/sql/trsp/_array_reverse.sql index 64802a33a4..7f322d027b 100644 --- a/sql/trsp/_array_reverse.sql +++ b/sql/trsp/_array_reverse.sql @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: _array_reverse.sql Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/sql/trsp/_trsp.sql b/sql/trsp/_trsp.sql index ffe008c615..4bafa32838 100644 --- a/sql/trsp/_trsp.sql +++ b/sql/trsp/_trsp.sql @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: _trsp.sql Copyright (c) 2017 pgRouting developers Mail: project@pgrouting.org diff --git a/sql/trsp/_trspViaVertices_deprecated.sql b/sql/trsp/_trspViaVertices_deprecated.sql index bebd6bc87f..2ee513c579 100644 --- a/sql/trsp/_trspViaVertices_deprecated.sql +++ b/sql/trsp/_trspViaVertices_deprecated.sql @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: _trspViaVertices_deprecated.sql Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/sql/trsp/_trsp_deprecated.sql b/sql/trsp/_trsp_deprecated.sql index 2290b89442..fd81e5e382 100644 --- a/sql/trsp/_trsp_deprecated.sql +++ b/sql/trsp/_trsp_deprecated.sql @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: _trsp_deprecated.sql Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/sql/trsp/trsp.sql b/sql/trsp/trsp.sql index 1acc96f6bf..80ced40202 100644 --- a/sql/trsp/trsp.sql +++ b/sql/trsp/trsp.sql @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: trsp.sql Copyright (c) 2021 pgRouting developers Mail: project@pgrouting.org diff --git a/sql/trsp/trspViaEdges_deprecated.sql b/sql/trsp/trspViaEdges_deprecated.sql index cb4840478a..3bb7028dbf 100644 --- a/sql/trsp/trspViaEdges_deprecated.sql +++ b/sql/trsp/trspViaEdges_deprecated.sql @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: trspViaEdges_deprecated.sql Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/sql/trsp/trspViaVertices_deprecated.sql b/sql/trsp/trspViaVertices_deprecated.sql index cf9761a2c0..e4f712e972 100644 --- a/sql/trsp/trspViaVertices_deprecated.sql +++ b/sql/trsp/trspViaVertices_deprecated.sql @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: trspViaVertices_deprecated.sql Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/sql/trsp/trsp_deprecated.sql b/sql/trsp/trsp_deprecated.sql index 0933442a4c..011b937334 100644 --- a/sql/trsp/trsp_deprecated.sql +++ b/sql/trsp/trsp_deprecated.sql @@ -1,4 +1,5 @@ /*PGR-GNU***************************************************************** +File: trsp_deprecated.sql Copyright (c) 2015 pgRouting developers Mail: project@pgrouting.org diff --git a/src/trsp/trsp_deprecated.c b/src/trsp/trsp_deprecated.c index 3092d2fce5..00f450914c 100644 --- a/src/trsp/trsp_deprecated.c +++ b/src/trsp/trsp_deprecated.c @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: trsp.c +File: trsp_deprecated.c Generated with Template by: Copyright (c) 2013 pgRouting developers @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/trsp/trsp.h" #include "c_types/edge_rt.h" #include "c_common/trsp_pgget.h" -#include "drivers/trsp/trsp_core.h" +#include "drivers/trsp/trsp_deprecated_driver.h" typedef struct restrict_t restrict_t; typedef struct Edge_rt Edge_t; diff --git a/src/trsp/trsp_deprecated_driver.cpp b/src/trsp/trsp_deprecated_driver.cpp index 8f52c2b2dc..342a5cf2f0 100644 --- a/src/trsp/trsp_deprecated_driver.cpp +++ b/src/trsp/trsp_deprecated_driver.cpp @@ -1,5 +1,5 @@ /*PGR-GNU***************************************************************** -File: trsp_core.cpp +File: trsp_deprecated_driver.cpp Generated with Template by: Copyright (c) 2015 pgRouting developers @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -#include "drivers/trsp/trsp_core.h" +#include "drivers/trsp/trsp_deprecated_driver.h" #ifdef __MINGW32__ #include From fddc49eb99d79da23cdec65ce18221083b017880 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 10 Oct 2024 09:16:35 -0600 Subject: [PATCH 419/428] (Build) Adjusting CMakeLists to file renames --- sql/trsp/CMakeLists.txt | 10 +++++----- src/trsp/CMakeLists.txt | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sql/trsp/CMakeLists.txt b/sql/trsp/CMakeLists.txt index 204e964531..c2b60d62ee 100644 --- a/sql/trsp/CMakeLists.txt +++ b/sql/trsp/CMakeLists.txt @@ -2,14 +2,14 @@ SET(LOCAL_FILES _trsp.sql trsp.sql - _pgr_trsp.sql + _trsp_deprecated.sql _array_reverse.sql - pgr_trsp.sql + trsp_deprecated.sql - _pgr_trspViaVertices.sql - trspViaVertices.sql + _trspViaVertices_deprecated.sql + trspViaVertices_deprecated.sql - trspViaEdges.sql + trspViaEdges_deprecated.sql _trsp_withPoints.sql trsp_withPoints.sql diff --git a/src/trsp/CMakeLists.txt b/src/trsp/CMakeLists.txt index 6e8540a8f6..981520e675 100644 --- a/src/trsp/CMakeLists.txt +++ b/src/trsp/CMakeLists.txt @@ -1,14 +1,14 @@ add_library(trsp OBJECT # keeping these for backwards compatibility - trsp.c - trsp_core.cpp + trsp_deprecated.c + trsp_deprecated_driver.cpp GraphDefinition.cpp - - - new_trsp.c edgeInfo.cpp trspHandler.cpp + + trsp.c trsp_driver.cpp + trsp_withPoints.c trsp_withPoints_driver.cpp From 48eea30080aeb6b311afc489169f7ebee83824bf Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 10 Oct 2024 10:55:16 -0600 Subject: [PATCH 420/428] (C/C++) removing unused code --- include/bellman_ford/bellman_ford.hpp | 152 ------------------ include/bellman_ford/edwardMoore.hpp | 73 --------- .../binaryBreadthFirstSearch.hpp | 30 ---- include/cpp_common/ch_vertex.hpp | 9 -- include/cpp_common/xy_vertex.hpp | 9 -- include/dagShortestPath/dagShortestPath.hpp | 130 --------------- include/lineGraph/lineGraphFull.hpp | 5 - src/bellman_ford/bellman_ford_driver.cpp | 31 ---- src/bellman_ford/bellman_ford_neg.c | 2 +- src/bellman_ford/bellman_ford_neg_driver.cpp | 28 ---- src/bellman_ford/edwardMoore_driver.cpp | 26 --- .../breadthFirstSearch_driver.cpp | 19 --- src/common/basePath_SSEC.cpp | 3 - src/common/postgres_connection.c | 12 -- src/common/xy_vertex.cpp | 34 ---- src/cpp_common/Dmatrix.cpp | 25 --- src/pickDeliver/fleet.cpp | 7 - src/pickDeliver/initial_solution.cpp | 15 -- src/pickDeliver/optimize.cpp | 15 -- src/pickDeliver/pd_orders.cpp | 7 - src/pickDeliver/pickDeliver.cpp | 47 ------ src/pickDeliver/vehicle.cpp | 10 -- src/pickDeliver/vehicle_pickDeliver.cpp | 13 -- src/trsp/trspHandler.cpp | 20 --- src/tsp/tsp.cpp | 8 - 25 files changed, 1 insertion(+), 729 deletions(-) diff --git a/include/bellman_ford/bellman_ford.hpp b/include/bellman_ford/bellman_ford.hpp index 4595f457d9..06e704cfcc 100644 --- a/include/bellman_ford/bellman_ford.hpp +++ b/include/bellman_ford/bellman_ford.hpp @@ -56,43 +56,6 @@ class Pgr_bellman_ford : public pgrouting::Pgr_messages { typedef typename G::E E; //@{ -#if 0 - //! @name BellmanFord - //@{ - //! BellmanFord 1 to 1 - Path bellman_ford( - G &graph, - int64_t start_vertex, - int64_t end_vertex, - bool only_cost = false) { - clear(); - log << std::string(__FUNCTION__) << "\n"; - - // adjust predecessors and distances vectors - predecessors.resize(graph.num_vertices()); - distances.resize(graph.num_vertices()); - - - if (!graph.has_vertex(start_vertex) - || !graph.has_vertex(end_vertex)) { - return Path(start_vertex, end_vertex); - } - - // get the graphs source and target - auto v_source(graph.get_V(start_vertex)); - auto v_target(graph.get_V(end_vertex)); - - // perform the algorithm - bellman_ford_1_to_1(graph, v_source, v_target); - - // get the results - return Path( - graph, - v_source, v_target, - predecessors, distances, - only_cost, true); - } -#endif /** @brief bellman_ford one to a set of many @@ -135,91 +98,6 @@ class Pgr_bellman_ford : public pgrouting::Pgr_messages { return paths; } -#if 0 - // BellmanFord many to 1 - std::deque bellman_ford( - G &graph, - const std::vector < int64_t > &start_vertex, - int64_t end_vertex, - bool only_cost = false) { - std::deque paths; - log << std::string(__FUNCTION__) << "\n"; - for (const auto &start : start_vertex) { - paths.push_back( - bellman_ford(graph, start, end_vertex, only_cost)); - } - - std::stable_sort(paths.begin(), paths.end(), - [](const Path &e1, const Path &e2)->bool { - return e1.start_id() < e2.start_id(); - }); - return paths; - } - - - // BellmanFord many to many - std::deque bellman_ford( - G &graph, - const std::vector< int64_t > &start_vertex, - const std::vector< int64_t > &end_vertex, - bool only_cost = false) { - // a call to 1 to many is faster for each of the sources - std::deque paths; - log << std::string(__FUNCTION__) << "\n"; - - for (const auto &start : start_vertex) { - auto r_paths = bellman_ford(graph, start, end_vertex, only_cost); - paths.insert(paths.begin(), r_paths.begin(), r_paths.end()); - } - - - std::sort(paths.begin(), paths.end(), - [](const Path &e1, const Path &e2)->bool { - return e1.end_id() < e2.end_id(); - }); - std::stable_sort(paths.begin(), paths.end(), - [](const Path &e1, const Path &e2)->bool { - return e1.start_id() < e2.start_id(); - }); - return paths; - } - - // BellmanFord combinations - std::deque bellman_ford( - G &graph, - const std::vector &combinations, - bool only_cost = false) { - // a call to 1 to many is faster for each of the sources - std::deque paths; - log << std::string(__FUNCTION__) << "\n"; - - // group targets per distinct source - std::map< int64_t, std::vector > vertex_map; - for (const II_t_rt &comb : combinations) { - std::map< int64_t, std::vector >::iterator it = vertex_map.find(comb.d1.source); - if (it != vertex_map.end()) { - it->second.push_back(comb.d2.target); - } else { - std::vector targets{comb.d2.target}; - vertex_map[comb.d1.source] = targets; - } - } - - for (const auto &start_ends : vertex_map) { - std::deque result_paths = bellman_ford( - graph, - start_ends.first, - start_ends.second, - only_cost); - paths.insert( - paths.end(), - std::make_move_iterator(result_paths.begin()), - std::make_move_iterator(result_paths.end())); - } - - return paths; - } -#endif /** @brief BellmanFord combinations **/ std::deque bellman_ford( @@ -240,36 +118,6 @@ class Pgr_bellman_ford : public pgrouting::Pgr_messages { //@} private: -#if 0 - //! Call to BellmanFord 1 source to 1 target - bool bellman_ford_1_to_1( - G &graph, - V source - ) { - log << std::string(__FUNCTION__) << "\n"; - /* abort in case of an interruption occurs (e.g. the query is being cancelled) */ - CHECK_FOR_INTERRUPTS(); - try { - boost::bellman_ford_shortest_paths( - graph.graph, - static_cast(graph.num_vertices()), - boost::predecessor_map(&predecessors[0]) - .weight_map(get(&G::G_T_E::cost, graph.graph)) - .distance_map(&distances[0]) - .root_vertex(source)); - } catch (boost::exception const& ex) { - (void)ex; - throw; - } catch (std::exception &e) { - (void)e; - throw; - } catch (...) { - throw; - } - return true; - } -#endif - //! Call to BellmanFord 1 source to many targets bool bellman_ford_1_to_many( G &graph, diff --git a/include/bellman_ford/edwardMoore.hpp b/include/bellman_ford/edwardMoore.hpp index 30a235dd05..d85ef2e2d7 100644 --- a/include/bellman_ford/edwardMoore.hpp +++ b/include/bellman_ford/edwardMoore.hpp @@ -47,79 +47,6 @@ class Pgr_edwardMoore { typedef typename G::E E; typedef typename G::EO_i EO_i; -#if 0 - std::deque edwardMoore( - G &graph, - const std::vector &start_vertex, - const std::vector &end_vertex) { - std::deque paths; - - for (const auto &source : start_vertex) { - std::deque result_paths = one_to_many_edwardMoore( - graph, - source, - end_vertex); - - paths.insert( - paths.begin(), - std::make_move_iterator(result_paths.begin()), - std::make_move_iterator(result_paths.end())); - } - - std::sort(paths.begin(), paths.end(), - [](const Path &e1, const Path &e2) -> bool { - return e1.end_id() < e2.end_id(); - }); - std::stable_sort(paths.begin(), paths.end(), - [](const Path &e1, const Path &e2) -> bool { - return e1.start_id() < e2.start_id(); - }); - - return paths; - } - - // preparation for the parallel arrays - std::deque edwardMoore( - G &graph, - const std::vector &combinations) { - std::deque paths; - - // group targets per distinct source - std::map< int64_t, std::vector > vertex_map; - for (const II_t_rt &comb : combinations) { - std::map< int64_t, std::vector >::iterator it = vertex_map.find(comb.d1.source); - if (it != vertex_map.end()) { - it->second.push_back(comb.d2.target); - } else { - std::vector targets{comb.d2.target}; - vertex_map[comb.d1.source] = targets; - } - } - - for (const auto &start_ends : vertex_map) { - std::deque result_paths = one_to_many_edwardMoore( - graph, - start_ends.first, - start_ends.second); - - paths.insert( - paths.end(), - std::make_move_iterator(result_paths.begin()), - std::make_move_iterator(result_paths.end())); - } - - std::sort(paths.begin(), paths.end(), - [](const Path &e1, const Path &e2) -> bool { - return e1.end_id() < e2.end_id(); - }); - std::stable_sort(paths.begin(), paths.end(), - [](const Path &e1, const Path &e2) -> bool { - return e1.start_id() < e2.start_id(); - }); - - return paths; - } -#endif /** @brief edwardMoore for combinations */ std::deque edwardMoore( diff --git a/include/breadthFirstSearch/binaryBreadthFirstSearch.hpp b/include/breadthFirstSearch/binaryBreadthFirstSearch.hpp index 37821181c0..605733b53b 100644 --- a/include/breadthFirstSearch/binaryBreadthFirstSearch.hpp +++ b/include/breadthFirstSearch/binaryBreadthFirstSearch.hpp @@ -51,36 +51,6 @@ class Pgr_binaryBreadthFirstSearch { typedef typename G::EO_i EO_i; typedef typename G::E_i E_i; -#if 0 - std::deque binaryBreadthFirstSearch( - G &graph, - const std::vector &start_vertex, - const std::vector &end_vertex) { - std::deque paths; - - for (const auto &source : start_vertex) { - std::deque result_paths = one_to_many_binaryBreadthFirstSearch( - graph, - source, - end_vertex); - paths.insert( - paths.begin(), - std::make_move_iterator(result_paths.begin()), - std::make_move_iterator(result_paths.end())); - } - - std::sort(paths.begin(), paths.end(), - [](const Path &e1, const Path &e2) -> bool { - return e1.end_id() < e2.end_id(); - }); - std::stable_sort(paths.begin(), paths.end(), - [](const Path &e1, const Path &e2) -> bool { - return e1.start_id() < e2.start_id(); - }); - - return paths; - } -#endif std::deque binaryBreadthFirstSearch( G &graph, diff --git a/include/cpp_common/ch_vertex.hpp b/include/cpp_common/ch_vertex.hpp index f6c7a3a838..2de3697d5b 100644 --- a/include/cpp_common/ch_vertex.hpp +++ b/include/cpp_common/ch_vertex.hpp @@ -62,15 +62,6 @@ class CH_vertex { size_t check_vertices(std::vector < CH_vertex > vertices); -#if 0 -std::vector < CH_vertex > -extract_vertices( - const Edge_t *data_edges, int64_t count); - -std::vector < CH_vertex > -extract_vertices( - const std::vector < Edge_t > &data_edges); -#endif } // namespace pgrouting #endif // INCLUDE_CPP_COMMON_CH_VERTEX_HPP_ diff --git a/include/cpp_common/xy_vertex.hpp b/include/cpp_common/xy_vertex.hpp index a9924b7fec..50b475aeac 100644 --- a/include/cpp_common/xy_vertex.hpp +++ b/include/cpp_common/xy_vertex.hpp @@ -80,15 +80,6 @@ std::vector < XY_vertex > extract_vertices( const std::vector &data_edges); -#if 0 -std::vector < XY_vertex > extract_vertices( - std::vector < XY_vertex > vertices, - const Edge_xy_t *data_edges, int64_t count); - -std::vector < XY_vertex > extract_vertices( - std::vector < XY_vertex > vertices, - const std::vector data_edges); -#endif } // namespace pgrouting diff --git a/include/dagShortestPath/dagShortestPath.hpp b/include/dagShortestPath/dagShortestPath.hpp index bdd75989da..89797f1300 100644 --- a/include/dagShortestPath/dagShortestPath.hpp +++ b/include/dagShortestPath/dagShortestPath.hpp @@ -57,42 +57,6 @@ class Pgr_dag { typedef typename G::V V; typedef typename G::E E; -#if 0 - //! Dijkstra 1 to 1 - Path dag( - G &graph, - int64_t start_vertex, - int64_t end_vertex, - bool only_cost = false) { - clear(); - - // adjust predecessors and distances vectors - predecessors.resize(graph.num_vertices()); - distances.resize( - graph.num_vertices(), - std::numeric_limits::infinity()); - - - if (!graph.has_vertex(start_vertex) - || !graph.has_vertex(end_vertex)) { - return Path(start_vertex, end_vertex); - } - - // get the graphs source and target - auto v_source(graph.get_V(start_vertex)); - auto v_target(graph.get_V(end_vertex)); - - // perform the algorithm - dag_1_to_1(graph, v_source, v_target); - - // get the results - return Path( - graph, - v_source, v_target, - predecessors, distances, - only_cost, true); - } -#endif /** dag 1 to many */ std::deque dag( @@ -133,55 +97,6 @@ class Pgr_dag { return paths; } -#if 0 - // preparation for many to 1 - std::deque dag( - G &graph, - const std::vector < int64_t > &start_vertex, - int64_t end_vertex, - bool only_cost) { - std::deque paths; - - for (const auto &start : start_vertex) { - paths.push_back( - dag(graph, start, end_vertex, only_cost)); - } - - std::stable_sort(paths.begin(), paths.end(), - [](const Path &e1, const Path &e2)->bool { - return e1.start_id() < e2.start_id(); - }); - return paths; - } - - // preparation for many to many - std::deque dag( - G &graph, - const std::vector< int64_t > &start_vertex, - const std::vector< int64_t > &end_vertex, - bool only_cost) { - // a call to 1 to many is faster for each of the sources - std::deque paths; - - for (const auto &start : start_vertex) { - auto r_paths = dag( - graph, - start, end_vertex, - only_cost); - paths.insert(paths.begin(), r_paths.begin(), r_paths.end()); - } - - std::sort(paths.begin(), paths.end(), - [](const Path &e1, const Path &e2)->bool { - return e1.end_id() < e2.end_id(); - }); - std::stable_sort(paths.begin(), paths.end(), - [](const Path &e1, const Path &e2)->bool { - return e1.start_id() < e2.start_id(); - }); - return paths; - } -#endif /** combinations */ std::deque dag( @@ -204,35 +119,6 @@ class Pgr_dag { //@} private: -#if 0 - //! Call to Dijkstra 1 source to 1 target - bool dag_1_to_1( - G &graph, - V source, - V target) { - /* abort in case of an interruption occurs (e.g. the query is being cancelled) */ - CHECK_FOR_INTERRUPTS(); - try { - boost::dag_shortest_paths(graph.graph, source, - boost::predecessor_map(&predecessors[0]) - .weight_map(get(&G::G_T_E::cost, graph.graph)) - .distance_map(&distances[0]) - .visitor(dijkstra_one_goal_visitor(target))); - } catch(found_goals &) { - return true; - } catch (boost::exception const& ex) { - (void)ex; - throw; - } catch (std::exception &e) { - (void)e; - throw; - } catch (...) { - throw; - } - return true; - } -#endif - /** DAG 1 source to many targets */ bool dag_1_to_many( G &graph, @@ -300,22 +186,6 @@ class Pgr_dag { //@} -#if 0 - //! @name Stopping classes - //@{ - //! class for stopping when 1 target is found - - class dijkstra_one_goal_visitor : public boost::default_dijkstra_visitor { - public: - explicit dijkstra_one_goal_visitor(V goal) : m_goal(goal) {} - template - void examine_vertex(V &u, B_G &) { - if (u == m_goal) throw found_goals(); - } - private: - V m_goal; - }; -#endif //! class for stopping when all targets are found class dijkstra_many_goal_visitor : public boost::default_dijkstra_visitor { diff --git a/include/lineGraph/lineGraphFull.hpp b/include/lineGraph/lineGraphFull.hpp index c645e8ac33..c433f3ad31 100644 --- a/include/lineGraph/lineGraphFull.hpp +++ b/include/lineGraph/lineGraphFull.hpp @@ -144,11 +144,6 @@ class Pgr_lineGraphFull : public Pgr_base_graph { } } -#if 0 - log << "e_source = " << e_source - << " e_target = " << e_target - << "\n"; -#endif Line_graph_full_rt edge = { ++count, vertex_id_map[e_source], diff --git a/src/bellman_ford/bellman_ford_driver.cpp b/src/bellman_ford/bellman_ford_driver.cpp index bb196d7826..2203aad4a6 100644 --- a/src/bellman_ford/bellman_ford_driver.cpp +++ b/src/bellman_ford/bellman_ford_driver.cpp @@ -48,37 +48,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. namespace { -#if 0 -template -std::deque -pgr_bellman_ford( - G &graph, - std::vector &combinations, - std::vector < int64_t > sources, - std::vector < int64_t > targets, - std::string &log, - bool only_cost = false) { - std::sort(sources.begin(), sources.end()); - sources.erase( - std::unique(sources.begin(), sources.end()), - sources.end()); - - std::sort(targets.begin(), targets.end()); - targets.erase( - std::unique(targets.begin(), targets.end()), - targets.end()); - - pgrouting::Pgr_bellman_ford< G > fn_bellman_ford; - auto paths = combinations.empty() ? - fn_bellman_ford.bellman_ford(graph, sources, targets, only_cost) - : fn_bellman_ford.bellman_ford(graph, combinations, only_cost); - log += fn_bellman_ford.get_log(); - for (auto &p : paths) { - p.recalculate_agg_cost(); - } - return paths; -} -#endif template std::deque diff --git a/src/bellman_ford/bellman_ford_neg.c b/src/bellman_ford/bellman_ford_neg.c index 87313253b5..c922f781a5 100644 --- a/src/bellman_ford/bellman_ford_neg.c +++ b/src/bellman_ford/bellman_ford_neg.c @@ -90,7 +90,7 @@ process( pgr_SPI_finish(); } -PGDLLEXPORT Datum +PGDLLEXPORT Datum _pgr_bellmanfordneg(PG_FUNCTION_ARGS) { FuncCallContext *funcctx; TupleDesc tuple_desc; diff --git a/src/bellman_ford/bellman_ford_neg_driver.cpp b/src/bellman_ford/bellman_ford_neg_driver.cpp index 351ba3c2f4..200946d105 100644 --- a/src/bellman_ford/bellman_ford_neg_driver.cpp +++ b/src/bellman_ford/bellman_ford_neg_driver.cpp @@ -47,34 +47,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "c_types/ii_t_rt.h" namespace { -#if 0 -template < class G > -std::deque -pgr_bellman_ford( - G &graph, - std::vector &combinations, - std::vector < int64_t > sources, - std::vector < int64_t > targets, - std::string &log, - bool only_cost = false) { - std::sort(sources.begin(), sources.end()); - sources.erase( - std::unique(sources.begin(), sources.end()), - sources.end()); - - std::sort(targets.begin(), targets.end()); - targets.erase( - std::unique(targets.begin(), targets.end()), - targets.end()); - - pgrouting::Pgr_bellman_ford< G > fn_bellman_ford; - auto paths = combinations.empty() ? - fn_bellman_ford.bellman_ford(graph, sources, targets, only_cost) - : fn_bellman_ford.bellman_ford(graph, combinations, only_cost); - log += fn_bellman_ford.get_log(); - return paths; -} -#endif template diff --git a/src/bellman_ford/edwardMoore_driver.cpp b/src/bellman_ford/edwardMoore_driver.cpp index 082e5845b3..1905212205 100644 --- a/src/bellman_ford/edwardMoore_driver.cpp +++ b/src/bellman_ford/edwardMoore_driver.cpp @@ -51,32 +51,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. namespace { -#if 0 -template < class G > -std::deque< pgrouting::Path > -pgr_edwardMoore( - G &graph, - std::vector &combinations, - std::vector < int64_t > sources, - std::vector < int64_t > targets) { - std::sort(sources.begin(), sources.end()); - sources.erase( - std::unique(sources.begin(), sources.end()), - sources.end()); - - std::sort(targets.begin(), targets.end()); - targets.erase( - std::unique(targets.begin(), targets.end()), - targets.end()); - - pgrouting::functions::Pgr_edwardMoore< G > fn_edwardMoore; - auto paths = combinations.empty() ? - fn_edwardMoore.edwardMoore(graph, sources, targets) - : fn_edwardMoore.edwardMoore(graph, combinations); - - return paths; -} -#endif template std::deque diff --git a/src/breadthFirstSearch/breadthFirstSearch_driver.cpp b/src/breadthFirstSearch/breadthFirstSearch_driver.cpp index 6dfabead04..728a454945 100644 --- a/src/breadthFirstSearch/breadthFirstSearch_driver.cpp +++ b/src/breadthFirstSearch/breadthFirstSearch_driver.cpp @@ -42,25 +42,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. namespace { -#if 0 -template < class G > -std::vector -pgr_breadthFirstSearch( - G &graph, - std::vector < int64_t > sources, - int64_t max_depth) { - std::sort(sources.begin(), sources.end()); - sources.erase( - std::unique(sources.begin(), sources.end()), - sources.end()); - - - pgrouting::functions::Pgr_breadthFirstSearch< G > fn_breadthFirstSearch; - auto results = fn_breadthFirstSearch.breadthFirstSearch( - graph, sources, max_depth); - return results; -} -#endif template std::vector breadthFirstSearch( G &graph, diff --git a/src/common/basePath_SSEC.cpp b/src/common/basePath_SSEC.cpp index ef08cfef66..d80d0caf42 100644 --- a/src/common/basePath_SSEC.cpp +++ b/src/common/basePath_SSEC.cpp @@ -216,9 +216,6 @@ void Path::append(const Path &other) { *this = other; return; } -#if 0 - pgassert(path.back().cost == 0); -#endif pgassert(path.back().edge == -1); m_end_id = other.m_end_id; diff --git a/src/common/postgres_connection.c b/src/common/postgres_connection.c index 47e6a8d27e..774c112274 100644 --- a/src/common/postgres_connection.c +++ b/src/common/postgres_connection.c @@ -56,9 +56,6 @@ pgr_send_error(int errcode) { // http://www.postgresql.org/docs/9.4/static/spi-spi-finish.html void pgr_SPI_finish(void) { -#if 0 - PGR_DBG("Disconnecting SPI"); -#endif int code = SPI_finish(); if (code != SPI_OK_FINISH) { // SPI_ERROR_UNCONNECTED elog(ERROR, "There was no connection to SPI"); @@ -67,9 +64,6 @@ pgr_SPI_finish(void) { void pgr_SPI_connect(void) { -#if 0 - PGR_DBG("Connecting to SPI"); -#endif int SPIcode; SPIcode = SPI_connect(); if (SPIcode != SPI_OK_CONNECT) { @@ -79,9 +73,6 @@ pgr_SPI_connect(void) { SPIPlanPtr pgr_SPI_prepare(const char* sql) { -#if 0 - PGR_DBG("Preparing Plan"); -#endif SPIPlanPtr SPIplan; SPIplan = SPI_prepare(sql, 0, NULL); if (SPIplan == NULL) { @@ -92,9 +83,6 @@ pgr_SPI_prepare(const char* sql) { Portal pgr_SPI_cursor_open(SPIPlanPtr SPIplan) { -#if 0 - PGR_DBG("Opening Portal"); -#endif Portal SPIportal; SPIportal = SPI_cursor_open(NULL, SPIplan, NULL, NULL, true); if (SPIportal == NULL) { diff --git a/src/common/xy_vertex.cpp b/src/common/xy_vertex.cpp index 20902cb273..5ded779820 100644 --- a/src/common/xy_vertex.cpp +++ b/src/common/xy_vertex.cpp @@ -120,39 +120,5 @@ extract_vertices( std::vector (data_edges, data_edges + count)); } -#if 0 -/* the following might be needed when using withPoints */ -std::vector < XY_vertex > extract_vertices( - std::vector < XY_vertex > vertices, - const std::vector data_edges) { - if (data_edges.empty()) return vertices; - - vertices.reserve(vertices.size() + data_edges.size() * 2); - - for (const auto edge : data_edges) { - vertices.push_back(XY_vertex(edge.source, edge.x1, edge.y1)); - vertices.push_back(XY_vertex(edge.target, edge.x2, edge.y2)); - } - - /* - * sort and delete duplicates - */ - std::stable_sort(vertices.begin(), vertices.end(), - [](const XY_vertex &lhs, const XY_vertex &rhs) - {return lhs.id < rhs.id;}); - - vertices.erase( - std::unique(vertices.begin(), vertices.end(), - [](const XY_vertex &lhs, const XY_vertex &rhs) - {return lhs.id == rhs.id;}), vertices.end()); - return vertices; -} -std::vector < XY_vertex > extract_vertices( - std::vector < XY_vertex > vertices, - const Edge_xy_t *data_edges, int64_t count) { - return extract_vertices(vertices, - std::vector (data_edges, data_edges + count)); -} -#endif } // namespace pgrouting diff --git a/src/cpp_common/Dmatrix.cpp b/src/cpp_common/Dmatrix.cpp index 2acc3092c7..8a97de2f9c 100644 --- a/src/cpp_common/Dmatrix.cpp +++ b/src/cpp_common/Dmatrix.cpp @@ -205,36 +205,11 @@ std::ostream& operator<<(std::ostream &log, const Dmatrix &matrix) { log << "Internal(" << i << "," << j << ")" << "\tUsers(" << matrix.ids[i] << "," << matrix.ids[j] << ")" << "\t = " << cost -#if 0 - << "\t(" << matrix.get_index(matrix.ids[i]) - << "," << matrix.get_index(matrix.ids[j]) << ")" - << "\t = " << matrix.costs[i][j] - << "\t = " << matrix.costs[j][i] - << "=inf:" - << (matrix.costs[i][j] == - (std::numeric_limits::infinity)()) - << "=inf:" - << (matrix.costs[j][i] == - (std::numeric_limits::infinity)()) -#endif << "\n"; ++j; } ++i; } -#if 0 - for (size_t i = 0; i < matrix.costs.size(); ++i) { - for (size_t j = 0; j < matrix.costs.size(); ++j) { - for (size_t k = 0; k < matrix.costs.size(); ++k) { - log << matrix.costs[i][k] << " <= (" - << matrix.costs[i][j] << " + " << matrix.costs[j][k] << ")" - << (matrix.costs[i][k] - <= (matrix.costs[i][j] + matrix.costs[j][k])) - << "\n"; - } - } - } -#endif return log; } diff --git a/src/pickDeliver/fleet.cpp b/src/pickDeliver/fleet.cpp index f61fd5a4f1..d3646db335 100644 --- a/src/pickDeliver/fleet.cpp +++ b/src/pickDeliver/fleet.cpp @@ -80,10 +80,6 @@ Fleet::get_truck() { Vehicle_pickDeliver Fleet::get_truck(size_t order) { -#if 0 - msg().log << "Available vehicles: " << m_un_used << "\n"; - msg().log << "NOT Available vehicles: " << m_used << "\n"; -#endif size_t idx{0}; for (const auto &i : m_un_used) { @@ -138,9 +134,6 @@ Fleet::add_vehicle( vehicle.capacity, vehicle.speed, factor)); -#if 0 - msg().log << "inserting vehicle: " << m_trucks.back().tau() << "\n"; -#endif pgassert((m_trucks.back().idx() + 1) == m_trucks.size()); pgassert(m_trucks.back().is_ok()); } diff --git a/src/pickDeliver/initial_solution.cpp b/src/pickDeliver/initial_solution.cpp index 08924c85ee..2bc78b5034 100644 --- a/src/pickDeliver/initial_solution.cpp +++ b/src/pickDeliver/initial_solution.cpp @@ -78,30 +78,15 @@ Initial_solution::do_while_foo(int kind) { invariant(); pgassert(kind > 0 && kind <= OneDepot); -#if 0 - msg().log << "\nInitial_solution::do_while_foo\n"; -#endif Identifiers notused; while (!m_unassigned.empty()) { -#if 0 - msg().log << m_unassigned.size() << " m_unassigned: " << m_unassigned << "\n"; - msg().log << m_assigned.size() << " m_assigned:" << m_assigned << "\n"; -#endif auto current = m_unassigned.size(); auto truck = trucks.get_truck(m_unassigned.front()); -#if 0 - msg().log << "got truck:" << truck.tau() << "\n"; -#endif /* * kind 1 to 7 work with the same code structure */ truck.do_while_feasable((Initials_code)kind, m_unassigned, m_assigned); -#if 0 - msg().log << m_unassigned.size() << " m_unassigned: " << m_unassigned << "\n"; - msg().log << m_assigned.size() << " m_assigned:" << m_assigned << "\n"; - msg().log << "current" << current << " m_unassigned: " << m_unassigned.size(); -#endif pgassertwm(current > m_unassigned.size(), msg().get_log().c_str()); fleet.push_back(truck); diff --git a/src/pickDeliver/optimize.cpp b/src/pickDeliver/optimize.cpp index 540b78d00c..5331753b7f 100644 --- a/src/pickDeliver/optimize.cpp +++ b/src/pickDeliver/optimize.cpp @@ -102,17 +102,8 @@ Optimize::inter_swap() { for (auto &to : fleet) { if (&from == &to) break; -#if 0 - msg().log - << "\n to " << to.id() - << "from " << from.id(); - auto swapped = false; -#endif swap_worse(to, from); move_reduce_cost(from, to); -#if 0 - msg().log << "++++++++" << p_swaps; -#endif } } @@ -492,17 +483,11 @@ Optimize::save_if_best() { best_solution = (*this); msg().log << "\n*********** best by duration" << best_solution.cost_str(); -#if 0 - msg().dbg_log << best_solution.tau("best by duration"); -#endif } if (fleet.size() < best_solution.fleet.size()) { best_solution = (*this); msg().log << "\n*********** best by fleet size" << best_solution.cost_str(); -#if 0 - msg().dbg_log << best_solution.tau("best by fleet size"); -#endif } } diff --git a/src/pickDeliver/pd_orders.cpp b/src/pickDeliver/pd_orders.cpp index f53b8ce081..656ea1b99f 100644 --- a/src/pickDeliver/pd_orders.cpp +++ b/src/pickDeliver/pd_orders.cpp @@ -63,9 +63,6 @@ void PD_Orders::build_orders( const std::vector &pd_orders ) { -#if 0 - ENTERING(); -#endif for (const auto &order : pd_orders) { /* * SAMPLE CORRECT INFORMATION @@ -92,10 +89,6 @@ PD_Orders::build_orders( add_order(order, pickup, delivery); } // for (creating orders) - -#if 0 - EXITING(); -#endif } diff --git a/src/pickDeliver/pickDeliver.cpp b/src/pickDeliver/pickDeliver.cpp index b72bebb2e3..8872a04f5e 100644 --- a/src/pickDeliver/pickDeliver.cpp +++ b/src/pickDeliver/pickDeliver.cpp @@ -80,11 +80,7 @@ Pgr_pickDeliver::solve() { return rhs < lhs; }); -#if 1 solutions.push_back(Optimize(initial_sols.back(), m_max_cycles)); -#else - solutions.push_back(initial_sols.back()); -#endif pgassert(!solutions.empty()); msg.log << "best solution duration = " << solutions.back().duration(); @@ -162,30 +158,14 @@ Pgr_pickDeliver::Pgr_pickDeliver( return; } -#if 0 - pgassert(m_trucks.msg().get_error().empty()); - pgassert(msg().get_error().empty()); -#endif msg.log << "\n Checking fleet ..."; if (!m_trucks.is_fleet_ok()) { pgassert(msg.get_error().empty()); -#if 0 - pgassert(!m_trucks.msg.get_error().empty()); - msg.error << m_trucks.msg.get_error(); -#endif return; } msg.log << "fleet OK \n"; -#if 0 - for (const auto t : m_trucks) { - msg.log << t << "\n"; - } - for (const auto &o : m_orders) { - msg.log << o << "\n"; - } -#endif /* * check the (S, P, D, E) order on all vehicles @@ -199,39 +179,12 @@ Pgr_pickDeliver::Pgr_pickDeliver( << o.id() << " is not feasible on any truck"; msg.log << "\n" << o; -#if 0 - double old_speed(0); - for (auto t : m_trucks) { - if (old_speed == t.speed()) continue; - old_speed = t.speed(); - msg.log << "****** With speed: " << t.speed() << "\n"; - msg.log << t.start_site() << "\n"; - msg.log << o.pickup() << "\n"; - msg.log << "travel time to " - << t.start_site().travel_time_to( - o.pickup(), t.speed()) << "\n"; - - msg.log << o.delivery() << "\n"; - msg.log << t.end_site() << "\n"; - msg.log << "travel time to " - << t.start_site().travel_time_to( - o.delivery(), t.speed()) - << "\n"; - t.push_back(o); - } -#endif return; } } msg.log << "orders OK \n"; m_trucks.set_compatibles(m_orders); -#if 0 - msg.error << "foo"; - for (const auto t : m_trucks) { - msg.log << t << "\n"; - } -#endif EXITING(msg); } // constructor diff --git a/src/pickDeliver/vehicle.cpp b/src/pickDeliver/vehicle.cpp index 24c3cca2ee..6813eff026 100644 --- a/src/pickDeliver/vehicle.cpp +++ b/src/pickDeliver/vehicle.cpp @@ -429,17 +429,10 @@ Vehicle::Vehicle( m_capacity(p_m_capacity), m_factor(p_factor), m_speed(p_speed) { -#if 0 - ENTERING(); -#endif m_path.clear(); pgassert(starting_site.opens() <= starting_site.closes()); pgassert(ending_site.opens() <= ending_site.closes()); pgassert(capacity() > 0); -#if 0 - msg().log << "p_idx: " << p_idx << "\t idx(): " << idx() << "\n"; - msg().log << "p_id: " << p_id << "\tid(): " << id() << "\n"; -#endif m_path.push_back(starting_site); m_path.push_back(ending_site); @@ -447,9 +440,6 @@ Vehicle::Vehicle( evaluate(0); msg().log << tau() << "\n"; invariant(); -#if 0 - EXITING(); -#endif } diff --git a/src/pickDeliver/vehicle_pickDeliver.cpp b/src/pickDeliver/vehicle_pickDeliver.cpp index 4560f5bb62..5aa62b8d42 100644 --- a/src/pickDeliver/vehicle_pickDeliver.cpp +++ b/src/pickDeliver/vehicle_pickDeliver.cpp @@ -57,13 +57,7 @@ Vehicle_pickDeliver::Vehicle_pickDeliver( m_orders_in_vehicle(), m_orders(), m_feasable_orders() { -#if 0 - ENTERING(); -#endif invariant(); -#if 0 - EXITING(); -#endif } @@ -228,16 +222,9 @@ Vehicle_pickDeliver::do_while_feasable( Identifiers &unassigned, Identifiers &assigned) { pgassert(is_feasable()); -#if 0 - msg.log << "unasigned" << unassigned << "\n"; - msg.log << "m_feasable_orders" << m_feasable_orders << "\n"; -#endif auto current_feasable = m_feasable_orders * unassigned; while (!current_feasable.empty()) { -#if 0 - msg.log << "current_feasable" << current_feasable << "\n"; -#endif auto order = m_orders[current_feasable.front()]; switch (kind) { diff --git a/src/trsp/trspHandler.cpp b/src/trsp/trspHandler.cpp index ed1d58f35a..29963e5407 100644 --- a/src/trsp/trspHandler.cpp +++ b/src/trsp/trspHandler.cpp @@ -688,19 +688,6 @@ bool Pgr_trspHandler::addEdge(Edge_t edgeIn, bool directed) { } } -#if 0 - /* - * The edge was already inserted - * - * If the user has rows with repeated edge id, the subsequent edges will be ignored - * - * When changing to boost graph, the additional edges are to be added - */ - - if (m_mapEdgeId2Index.find(edgeIn.id) != m_mapEdgeId2Index.end()) { - return false; - } -#endif /* * the index of this new edge in the edges container is @@ -708,13 +695,6 @@ bool Pgr_trspHandler::addEdge(Edge_t edgeIn, bool directed) { */ EdgeInfo edge(edgeIn, m_edges.size()); -#if 0 - // Adding edge to the list - m_mapEdgeId2Index.insert( - std::make_pair( - edge.edgeID(), - m_edges.size())); -#endif m_edges.push_back(edge); diff --git a/src/tsp/tsp.cpp b/src/tsp/tsp.cpp index 5fb12ec4be..cfb0a1887a 100644 --- a/src/tsp/tsp.cpp +++ b/src/tsp/tsp.cpp @@ -510,14 +510,6 @@ std::ostream& operator<<(std::ostream &log, const TSP& data) { log << "Number of Edges is:" << num_edges(data.graph) << "\n"; log << "\n the print_graph\n"; boost::print_graph(data.graph, boost::get(boost::vertex_index, data.graph), log); -#if 0 - // to print with edge weights: - for (auto v : boost::make_iterator_range(boost::vertices(data.graph))) { - for (auto oe : boost::make_iterator_range(boost::out_edges(v, data.graph))) { - log << "Edge " << oe << " weight " << get(boost::edge_weight, data.graph)[oe] << "\n"; - } - } -#endif return log; } #endif From 39fce9c0391d004894396b9c6537eb67652fc337 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 12 Oct 2024 23:04:21 -0600 Subject: [PATCH 421/428] (cpplint) ignoring flag because of clang-tidy fixes --- tools/scripts/code_checker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/scripts/code_checker.sh b/tools/scripts/code_checker.sh index 920c91c221..a7ef24cf22 100755 --- a/tools/scripts/code_checker.sh +++ b/tools/scripts/code_checker.sh @@ -54,7 +54,7 @@ if test -z "$DIRECTORY"; then echo "------ *.cpp ------" echo "--------------------" code_linter/cpplint/cpplint.py --linelength=120 \ - --filter=-runtime/references,-whitespace/indent_namespace,"${INCLUDE_ORDER}" \ + --filter=-readability/nolint,-runtime/references,-whitespace/indent_namespace,"${INCLUDE_ORDER}" \ --linelength=120 src/*/*.cpp echo "--------------------" From 27041cc05f8cb258bce2c872d09206f5c36f6ebe Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 10 Oct 2024 12:18:00 -0600 Subject: [PATCH 422/428] (tidy) Fixing errors --- include/breadthFirstSearch/breadthFirstSearch.hpp | 3 ++- include/lineGraph/lineGraphFull.hpp | 2 +- src/breadthFirstSearch/breadthFirstSearch_driver.cpp | 2 ++ src/coloring/bipartite_driver.cpp | 2 ++ src/coloring/edgeColoring.cpp | 2 ++ src/components/components.cpp | 1 + src/driving_distance/driving_distance_withPoints.c | 2 +- src/pickDeliver/optimize.cpp | 2 +- src/spanningTree/kruskal_driver.cpp | 2 ++ src/spanningTree/prim_driver.cpp | 2 ++ 10 files changed, 16 insertions(+), 4 deletions(-) diff --git a/include/breadthFirstSearch/breadthFirstSearch.hpp b/include/breadthFirstSearch/breadthFirstSearch.hpp index 7dd474b04e..83e139ad58 100644 --- a/include/breadthFirstSearch/breadthFirstSearch.hpp +++ b/include/breadthFirstSearch/breadthFirstSearch.hpp @@ -28,12 +28,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include #include -#include +#include #include #include "cpp_common/base_graph.hpp" #include "cpp_common/interruption.hpp" #include "c_types/mst_rt.h" +#include "visitors/edges_order_bfs_visitor.hpp" //****************************************** diff --git a/include/lineGraph/lineGraphFull.hpp b/include/lineGraph/lineGraphFull.hpp index c433f3ad31..a6cf3dff59 100644 --- a/include/lineGraph/lineGraphFull.hpp +++ b/include/lineGraph/lineGraphFull.hpp @@ -55,7 +55,7 @@ class Pgr_lineGraphFull : public Pgr_base_graph { typedef typename boost::graph_traits < G >::in_edge_iterator EI_i; - explicit Pgr_lineGraphFull< G, T_V, T_E, t_directed>(bool directed) + explicit Pgr_lineGraphFull< G, T_V, T_E, t_directed>() : Pgr_base_graph(), m_num_edges(0) { } diff --git a/src/breadthFirstSearch/breadthFirstSearch_driver.cpp b/src/breadthFirstSearch/breadthFirstSearch_driver.cpp index 728a454945..06eb026f2a 100644 --- a/src/breadthFirstSearch/breadthFirstSearch_driver.cpp +++ b/src/breadthFirstSearch/breadthFirstSearch_driver.cpp @@ -77,11 +77,13 @@ pgr_do_breadthFirstSearch( char *hint = nullptr; try { + // NOLINTBEGIN(clang-analyzer-cplusplus.NewDelete) pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); + // NOLINTEND(clang-analyzer-cplusplus.NewDelete) diff --git a/src/coloring/bipartite_driver.cpp b/src/coloring/bipartite_driver.cpp index 29e2014ffd..66f1f779eb 100644 --- a/src/coloring/bipartite_driver.cpp +++ b/src/coloring/bipartite_driver.cpp @@ -63,11 +63,13 @@ pgr_do_bipartite( try { + // NOLINTBEGIN(clang-analyzer-cplusplus.NewDelete) pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); + // NOLINTEND(clang-analyzer-cplusplus.NewDelete) hint = edges_sql; auto edges = pgrouting::pgget::get_edges(std::string(edges_sql), true, false); diff --git a/src/coloring/edgeColoring.cpp b/src/coloring/edgeColoring.cpp index 1f427a8939..35ff877b0e 100644 --- a/src/coloring/edgeColoring.cpp +++ b/src/coloring/edgeColoring.cpp @@ -89,6 +89,7 @@ Pgr_edgeColoring::Pgr_edgeColoring(const std::vector &edges) { auto v1 = get_boost_vertex(edge.source); auto v2 = get_boost_vertex(edge.target); auto e_exists = boost::edge(v1, v2, graph); + // NOLINTNEXTLINE if (e_exists.second) continue; if (edge.source == edge.target) continue; @@ -96,6 +97,7 @@ Pgr_edgeColoring::Pgr_edgeColoring(const std::vector &edges) { if (edge.cost < 0 && edge.reverse_cost < 0) continue; E e; + // NOLINTNEXTLINE boost::tie(e, added) = boost::add_edge(v1, v2, graph); E_to_id.insert(std::make_pair(e, edge.id)); diff --git a/src/components/components.cpp b/src/components/components.cpp index f38c183c62..c2dbf824ad 100644 --- a/src/components/components.cpp +++ b/src/components/components.cpp @@ -110,6 +110,7 @@ biconnectedComponents( boost::associative_property_map bimap(bicmp_map); size_t num_comps; try { + // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDelete) num_comps = biconnected_components(graph.graph, bimap); } catch (...) { throw; diff --git a/src/driving_distance/driving_distance_withPoints.c b/src/driving_distance/driving_distance_withPoints.c index b320009d35..130e633f97 100644 --- a/src/driving_distance/driving_distance_withPoints.c +++ b/src/driving_distance/driving_distance_withPoints.c @@ -70,7 +70,7 @@ process( } } else { /* TODO remove on v4 */ - char d_side = (char)tolower(driving_side[0]); + d_side = (char)tolower(driving_side[0]); if (!((d_side == 'r') || (d_side == 'l'))) d_side = 'b'; } diff --git a/src/pickDeliver/optimize.cpp b/src/pickDeliver/optimize.cpp index 5331753b7f..983aeb5290 100644 --- a/src/pickDeliver/optimize.cpp +++ b/src/pickDeliver/optimize.cpp @@ -249,7 +249,7 @@ Optimize::swap_worse(Vehicle_pickDeliver &to, Vehicle_pickDeliver &from) { } } - return false && swapped; + return swapped; } diff --git a/src/spanningTree/kruskal_driver.cpp b/src/spanningTree/kruskal_driver.cpp index 05c4714824..91d9b2328a 100644 --- a/src/spanningTree/kruskal_driver.cpp +++ b/src/spanningTree/kruskal_driver.cpp @@ -68,11 +68,13 @@ pgr_do_kruskal( char *hint = nullptr; try { + // NOLINTBEGIN(clang-analyzer-cplusplus.NewDelete) pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); + // NOLINTEND(clang-analyzer-cplusplus.NewDelete) auto roots = get_intArray(starts, false); diff --git a/src/spanningTree/prim_driver.cpp b/src/spanningTree/prim_driver.cpp index e5a124bc9d..de2f06b5ff 100644 --- a/src/spanningTree/prim_driver.cpp +++ b/src/spanningTree/prim_driver.cpp @@ -70,11 +70,13 @@ pgr_do_prim( char *hint = nullptr; try { + // NOLINTBEGIN(clang-analyzer-cplusplus.NewDelete) pgassert(!(*log_msg)); pgassert(!(*notice_msg)); pgassert(!(*err_msg)); pgassert(!(*return_tuples)); pgassert(*return_count == 0); + // NOLINTEND(clang-analyzer-cplusplus.NewDelete) auto roots = get_intArray(starts, false); From 6b9c4451b8fb867bc04b007fbe15567a1cf5b11f Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 12 Oct 2024 23:14:55 -0600 Subject: [PATCH 423/428] (C++) fix warning on C++13.2 --- include/chinese/chinesePostman.hpp | 2 -- src/astar/astar.c | 2 +- src/bdAstar/bdAstar.c | 4 ++-- src/bdDijkstra/bdDijkstra.c | 4 ++-- src/bellman_ford/bellman_ford.c | 4 ++-- src/bellman_ford/bellman_ford_neg.c | 2 +- src/bellman_ford/edwardMoore.c | 4 ++-- src/breadthFirstSearch/binaryBreadthFirstSearch.c | 4 ++-- src/common/basePath_SSEC.cpp | 2 -- src/dagShortestPath/dagShortestPath.c | 4 ++-- src/dijkstra/dijkstra.c | 4 ++-- src/driving_distance/driving_distance.c | 2 +- src/driving_distance/driving_distance_withPoints.c | 2 +- src/ksp/ksp.c | 6 +++--- src/ksp/turnRestrictedPath.c | 6 +++--- src/ksp/withPoints_ksp.c | 6 +++--- src/trsp/trsp.c | 8 ++++---- src/trsp/trsp_withPoints.c | 4 ++-- src/tsp/tsp.cpp | 8 ++++---- src/withPoints/withPoints.c | 4 ++-- src/withPoints/withPoints.cpp | 2 -- 21 files changed, 39 insertions(+), 45 deletions(-) diff --git a/include/chinese/chinesePostman.hpp b/include/chinese/chinesePostman.hpp index fe4d529a1e..501769a111 100644 --- a/include/chinese/chinesePostman.hpp +++ b/include/chinese/chinesePostman.hpp @@ -139,7 +139,6 @@ PgrDirectedChPPGraph::PgrDirectedChPPGraph(const std::vector &dataEdges) // calcu deg & build part of edges std::map deg; - size_t i(0); for (const auto &e : originalEdges) { pgassert(e.cost > 0); /* has out going edge */ @@ -165,7 +164,6 @@ PgrDirectedChPPGraph::PgrDirectedChPPGraph(const std::vector &dataEdges) edge.capacity = (std::numeric_limits::max)(); edge.cost = e.cost; edges.push_back(edge); - ++i; } superSource = deg.rbegin()->first + 1; diff --git a/src/astar/astar.c b/src/astar/astar.c index 444a29b754..1bf9284269 100644 --- a/src/astar/astar.c +++ b/src/astar/astar.c @@ -184,7 +184,7 @@ _pgr_astar(PG_FUNCTION_ARGS) { int64_t seq = call_cntr == 0? 1 : result_tuples[call_cntr - 1].start_id; values[0] = Int32GetDatum((int32_t)call_cntr + 1); - values[1] = Int32GetDatum(seq); + values[1] = Int32GetDatum((int32_t)seq); values[2] = Int64GetDatum(result_tuples[call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[call_cntr].node); diff --git a/src/bdAstar/bdAstar.c b/src/bdAstar/bdAstar.c index 06f2404c0a..64359b91dd 100644 --- a/src/bdAstar/bdAstar.c +++ b/src/bdAstar/bdAstar.c @@ -179,8 +179,8 @@ _pgr_bdastar(PG_FUNCTION_ARGS) { int64_t seq = call_cntr == 0? 1 : result_tuples[call_cntr - 1].start_id; - values[0] = Int32GetDatum(call_cntr + 1); - values[1] = Int32GetDatum(seq); + values[0] = Int32GetDatum((int32_t)call_cntr + 1); + values[1] = Int32GetDatum((int32_t)seq); values[2] = Int64GetDatum(result_tuples[call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[call_cntr].node); diff --git a/src/bdDijkstra/bdDijkstra.c b/src/bdDijkstra/bdDijkstra.c index ec75c82317..843efdf289 100644 --- a/src/bdDijkstra/bdDijkstra.c +++ b/src/bdDijkstra/bdDijkstra.c @@ -161,8 +161,8 @@ PGDLLEXPORT Datum _pgr_bddijkstra(PG_FUNCTION_ARGS) { int64_t seq = call_cntr == 0? 1 : result_tuples[call_cntr - 1].start_id; - values[0] = Int32GetDatum(call_cntr + 1); - values[1] = Int32GetDatum(seq); + values[0] = Int32GetDatum((int32_t)call_cntr + 1); + values[1] = Int32GetDatum((int32_t)seq); values[2] = Int64GetDatum(result_tuples[call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[call_cntr].node); diff --git a/src/bellman_ford/bellman_ford.c b/src/bellman_ford/bellman_ford.c index a26e0e6303..60962c06de 100644 --- a/src/bellman_ford/bellman_ford.c +++ b/src/bellman_ford/bellman_ford.c @@ -165,8 +165,8 @@ _pgr_bellmanford(PG_FUNCTION_ARGS) { int64_t seq = funcctx->call_cntr == 0? 1 : result_tuples[funcctx->call_cntr - 1].start_id; - values[0] = Int32GetDatum(funcctx->call_cntr + 1); - values[1] = Int32GetDatum(seq); + values[0] = Int32GetDatum((int32_t)funcctx->call_cntr + 1); + values[1] = Int32GetDatum((int32_t)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); diff --git a/src/bellman_ford/bellman_ford_neg.c b/src/bellman_ford/bellman_ford_neg.c index c922f781a5..d5c9f1fe4b 100644 --- a/src/bellman_ford/bellman_ford_neg.c +++ b/src/bellman_ford/bellman_ford_neg.c @@ -169,7 +169,7 @@ _pgr_bellmanfordneg(PG_FUNCTION_ARGS) { int64_t seq = funcctx->call_cntr == 0? 1 : result_tuples[funcctx->call_cntr - 1].start_id; values[0] = Int32GetDatum(funcctx->call_cntr + 1); - values[1] = Int32GetDatum(seq); + values[1] = Int32GetDatum((int32_t)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); diff --git a/src/bellman_ford/edwardMoore.c b/src/bellman_ford/edwardMoore.c index 7e14b5dd3a..929dacf36d 100644 --- a/src/bellman_ford/edwardMoore.c +++ b/src/bellman_ford/edwardMoore.c @@ -158,8 +158,8 @@ PGDLLEXPORT Datum _pgr_edwardmoore(PG_FUNCTION_ARGS) { int64_t seq = funcctx->call_cntr == 0? 1 : result_tuples[funcctx->call_cntr - 1].start_id; - values[0] = Int32GetDatum(funcctx->call_cntr + 1); - values[1] = Int32GetDatum(seq); + values[0] = Int32GetDatum((int32_t) funcctx->call_cntr + 1); + values[1] = Int32GetDatum((int32_t)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); diff --git a/src/breadthFirstSearch/binaryBreadthFirstSearch.c b/src/breadthFirstSearch/binaryBreadthFirstSearch.c index 423628c0c2..e8a5734a29 100644 --- a/src/breadthFirstSearch/binaryBreadthFirstSearch.c +++ b/src/breadthFirstSearch/binaryBreadthFirstSearch.c @@ -158,8 +158,8 @@ PGDLLEXPORT Datum _pgr_binarybreadthfirstsearch(PG_FUNCTION_ARGS) { int64_t seq = funcctx->call_cntr == 0? 1 : result_tuples[funcctx->call_cntr - 1].start_id; - values[0] = Int32GetDatum(funcctx->call_cntr + 1); - values[1] = Int32GetDatum(seq); + values[0] = Int32GetDatum((int32_t)funcctx->call_cntr + 1); + values[1] = Int32GetDatum((int32_t)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); diff --git a/src/common/basePath_SSEC.cpp b/src/common/basePath_SSEC.cpp index d80d0caf42..c2f62c6825 100644 --- a/src/common/basePath_SSEC.cpp +++ b/src/common/basePath_SSEC.cpp @@ -234,7 +234,6 @@ void Path::append(const Path &other) { void Path::generate_postgres_data( Path_rt **postgres_data, size_t &sequence) const { - int i = 1; for (const auto e : path) { auto agg_cost = std::fabs( e.agg_cost - (std::numeric_limits::max)()) < 1? @@ -243,7 +242,6 @@ void Path::generate_postgres_data( std::numeric_limits::infinity() : e.cost; (*postgres_data)[sequence] = {start_id(), end_id(), e.node, e.edge, cost, agg_cost}; - ++i; ++sequence; } } diff --git a/src/dagShortestPath/dagShortestPath.c b/src/dagShortestPath/dagShortestPath.c index 8e50d3fe1e..74295b2a90 100644 --- a/src/dagShortestPath/dagShortestPath.c +++ b/src/dagShortestPath/dagShortestPath.c @@ -165,8 +165,8 @@ PGDLLEXPORT Datum _pgr_dagshortestpath(PG_FUNCTION_ARGS) { int64_t seq = funcctx->call_cntr == 0? 1 : result_tuples[funcctx->call_cntr - 1].start_id; - values[0] = Int32GetDatum(funcctx->call_cntr + 1); - values[1] = Int32GetDatum(seq); + values[0] = Int32GetDatum((int32_t)funcctx->call_cntr + 1); + values[1] = Int32GetDatum((int32_t)seq); values[2] = Int64GetDatum(result_tuples[funcctx->call_cntr].node); values[3] = Int64GetDatum(result_tuples[funcctx->call_cntr].edge); values[4] = Float8GetDatum(result_tuples[funcctx->call_cntr].cost); diff --git a/src/dijkstra/dijkstra.c b/src/dijkstra/dijkstra.c index 2dc6c82993..0e47f3a641 100644 --- a/src/dijkstra/dijkstra.c +++ b/src/dijkstra/dijkstra.c @@ -218,8 +218,8 @@ _pgr_dijkstra(PG_FUNCTION_ARGS) { int64_t seq = call_cntr == 0? 1 : result_tuples[call_cntr - 1].start_id; - values[0] = Int32GetDatum(call_cntr + 1); - values[1] = Int32GetDatum(seq); + values[0] = Int32GetDatum((int32_t)call_cntr + 1); + values[1] = Int32GetDatum((int32_t)seq); values[2] = Int64GetDatum(result_tuples[call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[call_cntr].node); diff --git a/src/driving_distance/driving_distance.c b/src/driving_distance/driving_distance.c index c60255f819..d687beb3da 100644 --- a/src/driving_distance/driving_distance.c +++ b/src/driving_distance/driving_distance.c @@ -142,7 +142,7 @@ _pgr_drivingdistancev4(PG_FUNCTION_ARGS) { for (i = 0; i < numb; ++i) { nulls[i] = false; } - values[0] = Int32GetDatum(funcctx->call_cntr + 1); + values[0] = Int32GetDatum((int32_t)funcctx->call_cntr + 1); values[1] = Int64GetDatum(result_tuples[funcctx->call_cntr].depth); values[2] = Int64GetDatum(result_tuples[funcctx->call_cntr].from_v); values[3] = Int64GetDatum(result_tuples[funcctx->call_cntr].pred); diff --git a/src/driving_distance/driving_distance_withPoints.c b/src/driving_distance/driving_distance_withPoints.c index 130e633f97..236f23546c 100644 --- a/src/driving_distance/driving_distance_withPoints.c +++ b/src/driving_distance/driving_distance_withPoints.c @@ -176,7 +176,7 @@ _pgr_withpointsddv4(PG_FUNCTION_ARGS) { nulls[i] = false; } - values[0] = Int64GetDatum(funcctx->call_cntr + 1); + values[0] = Int64GetDatum((int64_t)funcctx->call_cntr + 1); values[1] = Int64GetDatum(result_tuples[funcctx->call_cntr].depth); values[2] = Int64GetDatum(result_tuples[funcctx->call_cntr].from_v); values[3] = Int64GetDatum(result_tuples[funcctx->call_cntr].pred); diff --git a/src/ksp/ksp.c b/src/ksp/ksp.c index 100b6708a2..5476f588bd 100644 --- a/src/ksp/ksp.c +++ b/src/ksp/ksp.c @@ -197,9 +197,9 @@ _pgr_ksp(PG_FUNCTION_ARGS) { } int64_t seq = funcctx->call_cntr == 0? 1 : path[funcctx->call_cntr - 1].end_id; - values[0] = Int32GetDatum(funcctx->call_cntr + 1); - values[1] = Int32GetDatum(path_id); - values[2] = Int32GetDatum(seq); + values[0] = Int32GetDatum((int32_t)funcctx->call_cntr + 1); + values[1] = Int32GetDatum((int32_t)path_id); + values[2] = Int32GetDatum((int32_t)seq); if (PG_NARGS() != 6) { values[3] = Int64GetDatum(path[funcctx->call_cntr].start_id); values[4] = Int64GetDatum(path[funcctx->call_cntr].end_id); diff --git a/src/ksp/turnRestrictedPath.c b/src/ksp/turnRestrictedPath.c index 34eb7eb90e..e0de7adbf8 100644 --- a/src/ksp/turnRestrictedPath.c +++ b/src/ksp/turnRestrictedPath.c @@ -175,9 +175,9 @@ _pgr_turnrestrictedpath(PG_FUNCTION_ARGS) { int64_t seq = funcctx->call_cntr == 0? 1 : path[funcctx->call_cntr - 1].start_id; - values[0] = Int32GetDatum(funcctx->call_cntr + 1); - values[1] = Int32GetDatum(path[funcctx->call_cntr].start_id + 1); - values[2] = Int32GetDatum(seq); + values[0] = Int32GetDatum((int32_t)funcctx->call_cntr + 1); + values[1] = Int32GetDatum((int32_t)path[funcctx->call_cntr].start_id + 1); + values[2] = Int32GetDatum((int32_t)seq); values[3] = Int64GetDatum(path[funcctx->call_cntr].node); values[4] = Int64GetDatum(path[funcctx->call_cntr].edge); values[5] = Float8GetDatum(path[funcctx->call_cntr].cost); diff --git a/src/ksp/withPoints_ksp.c b/src/ksp/withPoints_ksp.c index 0632ef6854..316bf102b5 100644 --- a/src/ksp/withPoints_ksp.c +++ b/src/ksp/withPoints_ksp.c @@ -249,9 +249,9 @@ PGDLLEXPORT Datum _pgr_withpointsksp(PG_FUNCTION_ARGS) { } int64_t seq = funcctx->call_cntr == 0? 1 : result_tuples[funcctx->call_cntr - 1].end_id; - values[0] = Int32GetDatum(funcctx->call_cntr + 1); - values[1] = Int32GetDatum(path_id); - values[2] = Int32GetDatum(seq); + values[0] = Int32GetDatum((int32_t)funcctx->call_cntr + 1); + values[1] = Int32GetDatum((int32_t)path_id); + values[2] = Int32GetDatum((int32_t)seq); if (PG_NARGS() != 9) { values[3] = Int64GetDatum(result_tuples[funcctx->call_cntr].start_id); values[4] = Int64GetDatum(result_tuples[funcctx->call_cntr].end_id); diff --git a/src/trsp/trsp.c b/src/trsp/trsp.c index fe7a6cd3bc..8a221bd575 100644 --- a/src/trsp/trsp.c +++ b/src/trsp/trsp.c @@ -161,7 +161,7 @@ _pgr_trspv4(PG_FUNCTION_ARGS) { int64_t path_seq = call_cntr == 0? 1 : result_tuples[call_cntr - 1].start_id; values[0] = Int32GetDatum((int32_t)call_cntr + 1); - values[1] = Int32GetDatum(path_seq); + values[1] = Int32GetDatum((int32_t)path_seq); values[2] = Int64GetDatum(result_tuples[call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[call_cntr].node); @@ -257,7 +257,7 @@ _v4trsp(PG_FUNCTION_ARGS) { int64_t path_seq = call_cntr == 0? 1 : result_tuples[call_cntr - 1].start_id; values[0] = Int32GetDatum((int32_t)call_cntr + 1); - values[1] = Int32GetDatum(path_seq); + values[1] = Int32GetDatum((int32_t)path_seq); values[2] = Int64GetDatum(result_tuples[call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[call_cntr].node); @@ -341,8 +341,8 @@ _trsp(PG_FUNCTION_ARGS) { int64_t path_seq = call_cntr == 0? 1 : result_tuples[call_cntr - 1].start_id; - values[0] = Int32GetDatum(call_cntr + 1); - values[1] = Int32GetDatum(path_seq); + values[0] = Int32GetDatum((int32_t)call_cntr + 1); + values[1] = Int32GetDatum((int32_t)path_seq); values[2] = Int64GetDatum(result_tuples[call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[call_cntr].node); diff --git a/src/trsp/trsp_withPoints.c b/src/trsp/trsp_withPoints.c index 5f0f04cee5..87052fd311 100644 --- a/src/trsp/trsp_withPoints.c +++ b/src/trsp/trsp_withPoints.c @@ -206,8 +206,8 @@ _pgr_trsp_withpoints(PG_FUNCTION_ARGS) { } int64_t seq = call_cntr == 0? 1 : result_tuples[call_cntr - 1].start_id; - values[0] = Int32GetDatum(call_cntr + 1); - values[1] = Int32GetDatum(seq); + values[0] = Int32GetDatum((int32_t)call_cntr + 1); + values[1] = Int32GetDatum((int32_t)seq); values[2] = Int64GetDatum(result_tuples[call_cntr].start_id); values[3] = Int64GetDatum(result_tuples[call_cntr].end_id); values[4] = Int64GetDatum(result_tuples[call_cntr].node); diff --git a/src/tsp/tsp.cpp b/src/tsp/tsp.cpp index cfb0a1887a..8023905861 100644 --- a/src/tsp/tsp.cpp +++ b/src/tsp/tsp.cpp @@ -230,7 +230,7 @@ TSP::tsp( auto u = get_boost_vertex(start_vid); auto v = get_boost_vertex(end_vid); - auto dummy_node = add_vertex(num_vertices(graph), graph); + auto dummy_node = add_vertex(static_cast(num_vertices(graph)), graph); id_to_V.insert(std::make_pair(0, dummy_node)); V_to_id.insert(std::make_pair(dummy_node, 0)); boost::add_edge(u, dummy_node, 0, graph); @@ -299,8 +299,8 @@ TSP::TSP(std::vector &distances) { } } - size_t i {0}; - for (const auto id : ids) { + int i {0}; + for (const auto &id : ids) { auto v = add_vertex(i, graph); id_to_V.insert(std::make_pair(id, v)); V_to_id.insert(std::make_pair(v, id)); @@ -384,7 +384,7 @@ TSP::TSP(const std::vector &coordinates) { /* * Inserting vertices */ - size_t i{0}; + int i{0}; for (const auto &id : ids) { auto v = add_vertex(i, graph); id_to_V.insert(std::make_pair(id, v)); diff --git a/src/withPoints/withPoints.c b/src/withPoints/withPoints.c index 4325e8ce30..6a2036bab8 100644 --- a/src/withPoints/withPoints.c +++ b/src/withPoints/withPoints.c @@ -200,8 +200,8 @@ _pgr_withpoints(PG_FUNCTION_ARGS) { int64_t seq = funcctx->call_cntr == 0? 1 : result_tuples[funcctx->call_cntr - 1].start_id; - values[0] = Int32GetDatum(funcctx->call_cntr + 1); - values[1] = Int32GetDatum(seq); + values[0] = Int32GetDatum((int32_t)funcctx->call_cntr + 1); + values[1] = Int32GetDatum((int32_t)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); diff --git a/src/withPoints/withPoints.cpp b/src/withPoints/withPoints.cpp index df4c9f6a83..9123fed8de 100644 --- a/src/withPoints/withPoints.cpp +++ b/src/withPoints/withPoints.cpp @@ -341,7 +341,6 @@ Pg_points_graph::create_new_edges() { << point.vertex_id << "\n"; } - int64_t vertex_id = 1; std::vector< Point_on_edge_t > new_points; for (const auto edge : m_edges_of_points) { std::set< Point_on_edge_t, pointCompare> points_on_edge; @@ -400,7 +399,6 @@ Pg_points_graph::create_new_edges() { if (point.fraction > 0 && point.fraction < 1) { log << "vertex_id of the point is " << -point.pid << "\n"; point.vertex_id = -point.pid; - ++vertex_id; } new_points.push_back(point); From 002343b2001e21e7dd11b8e347584ac2b3c39d2f Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 22 Oct 2024 09:08:17 -0600 Subject: [PATCH 424/428] (CI) Testing update from new 3.6.3 version --- .github/workflows/update.yml | 2 +- CMakeLists.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index aff82b1e59..2678618ec9 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.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] + old_pgr: [3.6.3, 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 b50b854ea5..f10a3566dd 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.3 3.6.2 3.6.1 3.6.0 From f9dd97944f167bbcb07b8127c9823fb43b89b8de Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 22 Oct 2024 12:57:48 -0600 Subject: [PATCH 425/428] (tool) remove trailing space on NEWS.md --- NEWS.md | 35 ----------------------------- tools/release-scripts/notes2news.pl | 2 +- 2 files changed, 1 insertion(+), 36 deletions(-) diff --git a/NEWS.md b/NEWS.md index 4e7ec2b817..f376a82821 100644 --- a/NEWS.md +++ b/NEWS.md @@ -40,11 +40,8 @@ milestone for 3.7.0 * ``pgr_primDFS`` * ``pgr_primBFS`` - * Standarizing output columns to ``(seq, depth, start_vid, pred, node, edge, cost, agg_cost)`` - * Added ``pred`` result columns. - **Experimental promoted to proposed.** @@ -53,10 +50,8 @@ milestone for 3.7.0 * ``pgr_lineGraph`` - * Promoted to **proposed** signature. * Works for directed and undirected graphs. - **Code enhancement** @@ -167,91 +162,61 @@ milestone for 3.6.0 * [#2547](https://github.com/pgRouting/pgrouting/pull/2547) Standarize output and modifying signature pgr_KSP - * Result columns standarized to: ``(seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)`` * ``pgr_ksp`` (One to One) - * Added ``start_vid`` and ``end_vid`` result columns. - * New overload functions: - * ``pgr_ksp`` (One to Many) * ``pgr_ksp`` (Many to One) * ``pgr_ksp`` (Many to Many) * ``pgr_ksp`` (Combinations) - * [#2548](https://github.com/pgRouting/pgrouting/pull/2548) Standarize output pgr_drivingdistance - * Standarizing output columns to ``(seq, depth, start_vid, pred, node, edge, cost, agg_cost)`` - * ``pgr_drivingdistance`` (Single vertex) - * Added ``depth`` and ``start_vid`` result columns. - * ``pgr_drivingdistance`` (Multiple vertices) - * Result column name change: ``from_v`` to ``start_vid``. * Added ``depth`` and ``pred`` result columns. - **Proposed functions changes** * [#2544](https://github.com/pgRouting/pgrouting/pull/2544) Standarize output and modifying signature pgr_withPointsDD - * Signature change: ``driving_side`` parameter changed from named optional to unnamed compulsory **driving side**. - * ``pgr_withPointsDD`` (`Single vertex`) * ``pgr_withPointsDD`` (`Multiple vertices`) - * Standarizing output columns to ``(seq, depth, start_vid, pred, node, edge, cost, agg_cost)`` - * ``pgr_withPointsDD`` (`Single vertex`) - * Added ``depth``, ``pred`` and ``start_vid`` column. - * ``pgr_withPointsDD`` (`Multiple vertices`) - * Added ``depth``, ``pred`` columns. - * When ``details`` is ``false``: - * Only points that are visited are removed, that is, points reached within the distance are included - * Deprecated signatures - * ``pgr_withpointsdd(text,text,bigint,double precision,boolean,character,boolean)`` * ``pgr_withpointsdd(text,text,anyarray,double precision,boolean,character,boolean,boolean)`` - * [#2546](https://github.com/pgRouting/pgrouting/pull/2546) Standarize output and modifying signature pgr_withPointsKSP - * Standarizing output columns to ``(seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)`` * ``pgr_withPointsKSP`` (One to One) - * Signature change: ``driving_side`` parameter changed from named optional to unnamed compulsory **driving side**. * Added ``start_vid`` and ``end_vid`` result columns. - * New overload functions - * ``pgr_withPointsKSP`` (One to Many) * ``pgr_withPointsKSP`` (Many to One) * ``pgr_withPointsKSP`` (Many to Many) * ``pgr_withPointsKSP`` (Combinations) - * Deprecated signature - * ``pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,char,boolean)`` - **C/C++ code enhancements** diff --git a/tools/release-scripts/notes2news.pl b/tools/release-scripts/notes2news.pl index 8789dc3539..b02d084ff0 100755 --- a/tools/release-scripts/notes2news.pl +++ b/tools/release-scripts/notes2news.pl @@ -143,7 +143,7 @@ sub find_stuff { next if $line =~ /$mstart/; $line =~ s/[\|]+//g; $line =~ s/($check)/$conversions{$1}/go; - print $ofh " $line" if $line !~ /$mend/; + print $ofh " $line" if $line !~ /$mend/ && $line ne "\n"; last if $line =~ /$mend/; } close($fh); From e77a4271d0f0ce53e58b38824808372bff07c432 Mon Sep 17 00:00:00 2001 From: Weblate Date: Thu, 17 Oct 2024 00:51:10 +0000 Subject: [PATCH 426/428] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Co-authored-by: Weblate Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/ Translation: pgRouting/pgRouting --- locale/de/LC_MESSAGES/pgrouting_doc_strings.po | 5 ++++- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 6 ++++-- locale/ja/LC_MESSAGES/pgrouting_doc_strings.po | 5 ++++- locale/ko/LC_MESSAGES/pgrouting_doc_strings.po | 5 ++++- locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po | 6 ++++-- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po index 82f6b47678..dd4ae30cde 100644 --- a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.6.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-10-10 03:40+0000\n" +"POT-Creation-Date: 2024-10-17 00:50+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -15566,6 +15566,9 @@ msgstr "" msgid "postgis 3.0.0" msgstr "" +msgid "g++ 13+ is supported" +msgstr "" + msgid "Code fixes" msgstr "" diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 65d475d05e..ebb01542c1 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-10-10 03:40+0000\n" +"POT-Creation-Date: 2024-10-17 00:50+0000\n" "PO-Revision-Date: 2024-10-10 19:43+0000\n" "Last-Translator: DeepL \n" "Language-Team: Spanish \n" "Language-Team: Japanese \n" "Language-Team: Korean \n" "Language-Team: Chinese (Simplified) Date: Thu, 24 Oct 2024 10:43:06 -0600 Subject: [PATCH 427/428] Remove -dev before PR to main --- CMakeLists.txt | 2 +- locale/de/LC_MESSAGES/index.po | 2 +- locale/de/LC_MESSAGES/pgrouting_doc_strings.po | 2 +- locale/en/LC_MESSAGES/index.po | 2 +- locale/en/LC_MESSAGES/pgrouting_doc_strings.po | 2 +- locale/es/LC_MESSAGES/index.po | 2 +- locale/es/LC_MESSAGES/pgrouting_doc_strings.po | 2 +- locale/ja/LC_MESSAGES/index.po | 2 +- locale/ja/LC_MESSAGES/pgrouting_doc_strings.po | 2 +- locale/ko/LC_MESSAGES/index.po | 2 +- locale/ko/LC_MESSAGES/pgrouting_doc_strings.po | 2 +- locale/pot/index.pot | 2 +- locale/pot/pgrouting_doc_strings.pot | 4 ++-- locale/zh_Hans/LC_MESSAGES/index.po | 2 +- locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f10a3566dd..8735fba9e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ include(pgr/BuildType) project(PGROUTING VERSION 3.7.0 LANGUAGES C CXX ) -set(PROJECT_VERSION_DEV "-dev") +set(PROJECT_VERSION_DEV "") string(TOLOWER "${PROJECT_NAME}" PROJECT_NAME_LOWER) include(pgr/GitInfo) diff --git a/locale/de/LC_MESSAGES/index.po b/locale/de/LC_MESSAGES/index.po index 12a82e826a..97ead8a321 100644 --- a/locale/de/LC_MESSAGES/index.po +++ b/locale/de/LC_MESSAGES/index.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.7.0-dev +# Copyright (C) pgRouting Contributors - Version v3.7.0 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , YEAR. # diff --git a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po index dd4ae30cde..07fc7bba47 100644 --- a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.7.0-dev +# Copyright (C) pgRouting Contributors - Version v3.7.0 # This file is distributed under the same license as the pgRouting package. # Regina Obe , 2023. msgid "" diff --git a/locale/en/LC_MESSAGES/index.po b/locale/en/LC_MESSAGES/index.po index 8c31f33526..e7cda20a63 100644 --- a/locale/en/LC_MESSAGES/index.po +++ b/locale/en/LC_MESSAGES/index.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.7.0-dev +# Copyright (C) pgRouting Contributors - Version v3.7.0 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , 2022. # diff --git a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po index ec5ebab896..b1d5880009 100644 --- a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.7.0-dev +# Copyright (C) pgRouting Contributors - Version v3.7.0 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , 2022. # diff --git a/locale/es/LC_MESSAGES/index.po b/locale/es/LC_MESSAGES/index.po index 83100a6434..e82b4d45a9 100644 --- a/locale/es/LC_MESSAGES/index.po +++ b/locale/es/LC_MESSAGES/index.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.7.0-dev +# Copyright (C) pgRouting Contributors - Version v3.7.0 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , 2022. # diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index ebb01542c1..ba05a8015d 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.7.0-dev +# Copyright (C) pgRouting Contributors - Version v3.7.0 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , 2022. # Pedro Jose Rios Vergara , 2022. diff --git a/locale/ja/LC_MESSAGES/index.po b/locale/ja/LC_MESSAGES/index.po index f61ee5cf7e..cc99899084 100644 --- a/locale/ja/LC_MESSAGES/index.po +++ b/locale/ja/LC_MESSAGES/index.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.7.0-dev +# Copyright (C) pgRouting Contributors - Version v3.7.0 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , 2022. # diff --git a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po index 550fbfb805..c113bc9e15 100644 --- a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po @@ -1,6 +1,6 @@ # #-#-#-#-# allpairs-family.po (pgRouting v3.4.0-dev) #-#-#-#-# # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.7.0-dev +# Copyright (C) pgRouting Contributors - Version v3.7.0 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , 2022. # Translators: diff --git a/locale/ko/LC_MESSAGES/index.po b/locale/ko/LC_MESSAGES/index.po index 65102c4152..e2eb741f36 100644 --- a/locale/ko/LC_MESSAGES/index.po +++ b/locale/ko/LC_MESSAGES/index.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.7.0-dev +# Copyright (C) pgRouting Contributors - Version v3.7.0 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , YEAR. # diff --git a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po index 4484e58d37..4ff70c4dd3 100644 --- a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.7.0-dev +# Copyright (C) pgRouting Contributors - Version v3.7.0 # This file is distributed under the same license as the pgRouting package. # Regina Obe , 2022. # Hyung-Gyu Ryoo , 2022. diff --git a/locale/pot/index.pot b/locale/pot/index.pot index 1fbf292309..1dc6d3e329 100644 --- a/locale/pot/index.pot +++ b/locale/pot/index.pot @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.7.0-dev +# Copyright (C) pgRouting Contributors - Version v3.7.0 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , YEAR. # diff --git a/locale/pot/pgrouting_doc_strings.pot b/locale/pot/pgrouting_doc_strings.pot index 66803356b1..c62a4180f2 100644 --- a/locale/pot/pgrouting_doc_strings.pot +++ b/locale/pot/pgrouting_doc_strings.pot @@ -1,12 +1,12 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.7.0-dev +# Copyright (C) pgRouting Contributors - Version v3.7.0 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: pgRouting v3.7.0-dev\n" +"Project-Id-Version: pgRouting v3.7.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-10-17 00:50+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/locale/zh_Hans/LC_MESSAGES/index.po b/locale/zh_Hans/LC_MESSAGES/index.po index 225a3549e6..d8afe8a4e4 100644 --- a/locale/zh_Hans/LC_MESSAGES/index.po +++ b/locale/zh_Hans/LC_MESSAGES/index.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.7.0-dev +# Copyright (C) pgRouting Contributors - Version v3.7.0 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , YEAR. # diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index 8c8ba707e3..0c09277213 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v3.7.0-dev +# Copyright (C) pgRouting Contributors - Version v3.7.0 # This file is distributed under the same license as the pgRouting package. # Regina Obe , 2023. # Wangdapeng , 2023. From 84c23999a9ba39618e300c9159e944ac83a739af Mon Sep 17 00:00:00 2001 From: cvvergara Date: Thu, 24 Oct 2024 13:21:08 -0600 Subject: [PATCH 428/428] Some changes that were not marked as conflicts --- .github/workflows/macos.yml | 2 - docqueries/max_flow/edgeDisjointPaths.result | 196 +++++++++---------- docqueries/mincut/stoerWagner.result | 2 +- include/cpp_common/basic_vertex.hpp | 8 +- 4 files changed, 103 insertions(+), 105 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 31c19f9203..3e1fceedec 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -69,7 +69,6 @@ jobs: make install - name: Install pgTAP - if: false run: | git clone https://github.com/theory/pgtap.git pgTapExtension cd pgTapExtension @@ -79,7 +78,6 @@ jobs: ln -s $(find `brew --prefix` -name pg_prove) symlink it into $(brew --prefix)/bin - name: Test - if: false run: | export PATH=$(brew --prefix)/Cellar/perl/$(perl -e 'print substr($^V, 1)')/bin:$PATH pg_ctl -D $(brew --prefix)/var/postgresql@14 start diff --git a/docqueries/max_flow/edgeDisjointPaths.result b/docqueries/max_flow/edgeDisjointPaths.result index 520a08a30a..7fbb762a49 100644 --- a/docqueries/max_flow/edgeDisjointPaths.result +++ b/docqueries/max_flow/edgeDisjointPaths.result @@ -9,12 +9,12 @@ SELECT * FROM pgr_edgeDisjointPaths( 11, 12); seq | path_id | path_seq | node | edge | cost | agg_cost -----+---------+----------+------+------+------+---------- - 1 | 1 | 1 | 11 | 8 | 1 | 1 - 2 | 1 | 2 | 7 | 10 | 1 | 2 - 3 | 1 | 3 | 8 | 12 | 1 | 3 - 4 | 1 | 4 | 12 | -1 | 0 | 4 - 5 | 2 | 1 | 11 | 11 | 1 | 4 - 6 | 2 | 2 | 12 | -1 | 0 | 5 + 1 | 1 | 1 | 11 | 8 | 1 | 0 + 2 | 1 | 2 | 7 | 10 | 1 | 1 + 3 | 1 | 3 | 8 | 12 | 1 | 2 + 4 | 1 | 4 | 12 | -1 | 0 | 3 + 5 | 2 | 1 | 11 | 11 | 1 | 0 + 6 | 2 | 2 | 12 | -1 | 0 | 1 (6 rows) /* -- q2 */ @@ -24,20 +24,20 @@ SELECT * FROM pgr_edgeDisjointPaths( 11, ARRAY[5, 10, 12]); seq | path_id | path_seq | end_vid | node | edge | cost | agg_cost -----+---------+----------+---------+------+------+------+---------- - 1 | 1 | 1 | 5 | 11 | 8 | 1 | 1 - 2 | 1 | 2 | 5 | 7 | 4 | 1 | 2 - 3 | 1 | 3 | 5 | 6 | 1 | 1 | 3 - 4 | 1 | 4 | 5 | 5 | -1 | 0 | 4 - 5 | 2 | 1 | 10 | 11 | 9 | 1 | 4 - 6 | 2 | 2 | 10 | 16 | 16 | 1 | 5 - 7 | 2 | 3 | 10 | 15 | 3 | 1 | 6 - 8 | 2 | 4 | 10 | 10 | -1 | 0 | 7 - 9 | 3 | 1 | 12 | 11 | 8 | 1 | 7 - 10 | 3 | 2 | 12 | 7 | 10 | 1 | 8 - 11 | 3 | 3 | 12 | 8 | 12 | 1 | 9 - 12 | 3 | 4 | 12 | 12 | -1 | 0 | 10 - 13 | 4 | 1 | 12 | 11 | 11 | 1 | 10 - 14 | 4 | 2 | 12 | 12 | -1 | 0 | 11 + 1 | 1 | 1 | 5 | 11 | 8 | 1 | 0 + 2 | 1 | 2 | 5 | 7 | 4 | 1 | 1 + 3 | 1 | 3 | 5 | 6 | 1 | 1 | 2 + 4 | 1 | 4 | 5 | 5 | -1 | 0 | 3 + 5 | 2 | 1 | 10 | 11 | 9 | 1 | 0 + 6 | 2 | 2 | 10 | 16 | 16 | 1 | 1 + 7 | 2 | 3 | 10 | 15 | 3 | 1 | 2 + 8 | 2 | 4 | 10 | 10 | -1 | 0 | 3 + 9 | 3 | 1 | 12 | 11 | 8 | 1 | 0 + 10 | 3 | 2 | 12 | 7 | 10 | 1 | 1 + 11 | 3 | 3 | 12 | 8 | 12 | 1 | 2 + 12 | 3 | 4 | 12 | 12 | -1 | 0 | 3 + 13 | 4 | 1 | 12 | 11 | 11 | 1 | 0 + 14 | 4 | 2 | 12 | 12 | -1 | 0 | 1 (14 rows) /* -- q3 */ @@ -47,20 +47,20 @@ SELECT * FROM pgr_edgeDisjointPaths( ARRAY[11, 3, 17], 12); seq | path_id | path_seq | start_vid | node | edge | cost | agg_cost -----+---------+----------+-----------+------+------+------+---------- - 1 | 1 | 1 | 3 | 3 | 7 | 1 | 1 - 2 | 1 | 2 | 3 | 7 | 8 | 1 | 2 - 3 | 1 | 3 | 3 | 11 | 11 | 1 | 3 - 4 | 1 | 4 | 3 | 12 | -1 | 0 | 4 - 5 | 2 | 1 | 11 | 11 | 8 | 1 | 4 - 6 | 2 | 2 | 11 | 7 | 10 | 1 | 5 - 7 | 2 | 3 | 11 | 8 | 12 | 1 | 6 - 8 | 2 | 4 | 11 | 12 | -1 | 0 | 7 - 9 | 3 | 1 | 11 | 11 | 11 | 1 | 7 - 10 | 3 | 2 | 11 | 12 | -1 | 0 | 8 - 11 | 4 | 1 | 17 | 17 | 15 | 1 | 8 - 12 | 4 | 2 | 17 | 16 | 9 | 1 | 9 - 13 | 4 | 3 | 17 | 11 | 11 | 1 | 10 - 14 | 4 | 4 | 17 | 12 | -1 | 0 | 11 + 1 | 1 | 1 | 3 | 3 | 7 | 1 | 0 + 2 | 1 | 2 | 3 | 7 | 8 | 1 | 1 + 3 | 1 | 3 | 3 | 11 | 11 | 1 | 2 + 4 | 1 | 4 | 3 | 12 | -1 | 0 | 3 + 5 | 2 | 1 | 11 | 11 | 8 | 1 | 0 + 6 | 2 | 2 | 11 | 7 | 10 | 1 | 1 + 7 | 2 | 3 | 11 | 8 | 12 | 1 | 2 + 8 | 2 | 4 | 11 | 12 | -1 | 0 | 3 + 9 | 3 | 1 | 11 | 11 | 11 | 1 | 0 + 10 | 3 | 2 | 11 | 12 | -1 | 0 | 1 + 11 | 4 | 1 | 17 | 17 | 15 | 1 | 0 + 12 | 4 | 2 | 17 | 16 | 9 | 1 | 1 + 13 | 4 | 3 | 17 | 11 | 11 | 1 | 2 + 14 | 4 | 4 | 17 | 12 | -1 | 0 | 3 (14 rows) /* -- q4 */ @@ -70,48 +70,48 @@ SELECT * FROM pgr_edgeDisjointPaths( ARRAY[11, 3, 17], ARRAY[5, 10, 12]); seq | path_id | path_seq | start_vid | end_vid | node | edge | cost | agg_cost -----+---------+----------+-----------+---------+------+------+------+---------- - 1 | 1 | 1 | 3 | 5 | 3 | 7 | 1 | 1 - 2 | 1 | 2 | 3 | 5 | 7 | 4 | 1 | 2 - 3 | 1 | 3 | 3 | 5 | 6 | 1 | 1 | 3 - 4 | 1 | 4 | 3 | 5 | 5 | -1 | 0 | 4 - 5 | 2 | 1 | 3 | 10 | 3 | 7 | 1 | 4 - 6 | 2 | 2 | 3 | 10 | 7 | 8 | 1 | 5 - 7 | 2 | 3 | 3 | 10 | 11 | 9 | 1 | 6 - 8 | 2 | 4 | 3 | 10 | 16 | 16 | 1 | 7 - 9 | 2 | 5 | 3 | 10 | 15 | 3 | 1 | 8 - 10 | 2 | 6 | 3 | 10 | 10 | -1 | 0 | 9 - 11 | 3 | 1 | 3 | 12 | 3 | 7 | 1 | 9 - 12 | 3 | 2 | 3 | 12 | 7 | 8 | 1 | 10 - 13 | 3 | 3 | 3 | 12 | 11 | 11 | 1 | 11 - 14 | 3 | 4 | 3 | 12 | 12 | -1 | 0 | 12 - 15 | 4 | 1 | 11 | 5 | 11 | 8 | 1 | 12 - 16 | 4 | 2 | 11 | 5 | 7 | 4 | 1 | 13 - 17 | 4 | 3 | 11 | 5 | 6 | 1 | 1 | 14 - 18 | 4 | 4 | 11 | 5 | 5 | -1 | 0 | 15 - 19 | 5 | 1 | 11 | 10 | 11 | 9 | 1 | 15 - 20 | 5 | 2 | 11 | 10 | 16 | 16 | 1 | 16 - 21 | 5 | 3 | 11 | 10 | 15 | 3 | 1 | 17 - 22 | 5 | 4 | 11 | 10 | 10 | -1 | 0 | 18 - 23 | 6 | 1 | 11 | 12 | 11 | 8 | 1 | 18 - 24 | 6 | 2 | 11 | 12 | 7 | 10 | 1 | 19 - 25 | 6 | 3 | 11 | 12 | 8 | 12 | 1 | 20 - 26 | 6 | 4 | 11 | 12 | 12 | -1 | 0 | 21 - 27 | 7 | 1 | 11 | 12 | 11 | 11 | 1 | 21 - 28 | 7 | 2 | 11 | 12 | 12 | -1 | 0 | 22 - 29 | 8 | 1 | 17 | 5 | 17 | 15 | 1 | 22 - 30 | 8 | 2 | 17 | 5 | 16 | 16 | 1 | 23 - 31 | 8 | 3 | 17 | 5 | 15 | 3 | 1 | 24 - 32 | 8 | 4 | 17 | 5 | 10 | 2 | 1 | 25 - 33 | 8 | 5 | 17 | 5 | 6 | 1 | 1 | 26 - 34 | 8 | 6 | 17 | 5 | 5 | -1 | 0 | 27 - 35 | 9 | 1 | 17 | 10 | 17 | 15 | 1 | 27 - 36 | 9 | 2 | 17 | 10 | 16 | 16 | 1 | 28 - 37 | 9 | 3 | 17 | 10 | 15 | 3 | 1 | 29 - 38 | 9 | 4 | 17 | 10 | 10 | -1 | 0 | 30 - 39 | 10 | 1 | 17 | 12 | 17 | 15 | 1 | 30 - 40 | 10 | 2 | 17 | 12 | 16 | 9 | 1 | 31 - 41 | 10 | 3 | 17 | 12 | 11 | 11 | 1 | 32 - 42 | 10 | 4 | 17 | 12 | 12 | -1 | 0 | 33 + 1 | 1 | 1 | 3 | 5 | 3 | 7 | 1 | 0 + 2 | 1 | 2 | 3 | 5 | 7 | 4 | 1 | 1 + 3 | 1 | 3 | 3 | 5 | 6 | 1 | 1 | 2 + 4 | 1 | 4 | 3 | 5 | 5 | -1 | 0 | 3 + 5 | 2 | 1 | 3 | 10 | 3 | 7 | 1 | 0 + 6 | 2 | 2 | 3 | 10 | 7 | 8 | 1 | 1 + 7 | 2 | 3 | 3 | 10 | 11 | 9 | 1 | 2 + 8 | 2 | 4 | 3 | 10 | 16 | 16 | 1 | 3 + 9 | 2 | 5 | 3 | 10 | 15 | 3 | 1 | 4 + 10 | 2 | 6 | 3 | 10 | 10 | -1 | 0 | 5 + 11 | 3 | 1 | 3 | 12 | 3 | 7 | 1 | 0 + 12 | 3 | 2 | 3 | 12 | 7 | 8 | 1 | 1 + 13 | 3 | 3 | 3 | 12 | 11 | 11 | 1 | 2 + 14 | 3 | 4 | 3 | 12 | 12 | -1 | 0 | 3 + 15 | 4 | 1 | 11 | 5 | 11 | 8 | 1 | 0 + 16 | 4 | 2 | 11 | 5 | 7 | 4 | 1 | 1 + 17 | 4 | 3 | 11 | 5 | 6 | 1 | 1 | 2 + 18 | 4 | 4 | 11 | 5 | 5 | -1 | 0 | 3 + 19 | 5 | 1 | 11 | 10 | 11 | 9 | 1 | 0 + 20 | 5 | 2 | 11 | 10 | 16 | 16 | 1 | 1 + 21 | 5 | 3 | 11 | 10 | 15 | 3 | 1 | 2 + 22 | 5 | 4 | 11 | 10 | 10 | -1 | 0 | 3 + 23 | 6 | 1 | 11 | 12 | 11 | 8 | 1 | 0 + 24 | 6 | 2 | 11 | 12 | 7 | 10 | 1 | 1 + 25 | 6 | 3 | 11 | 12 | 8 | 12 | 1 | 2 + 26 | 6 | 4 | 11 | 12 | 12 | -1 | 0 | 3 + 27 | 7 | 1 | 11 | 12 | 11 | 11 | 1 | 0 + 28 | 7 | 2 | 11 | 12 | 12 | -1 | 0 | 1 + 29 | 8 | 1 | 17 | 5 | 17 | 15 | 1 | 0 + 30 | 8 | 2 | 17 | 5 | 16 | 16 | 1 | 1 + 31 | 8 | 3 | 17 | 5 | 15 | 3 | 1 | 2 + 32 | 8 | 4 | 17 | 5 | 10 | 2 | 1 | 3 + 33 | 8 | 5 | 17 | 5 | 6 | 1 | 1 | 4 + 34 | 8 | 6 | 17 | 5 | 5 | -1 | 0 | 5 + 35 | 9 | 1 | 17 | 10 | 17 | 15 | 1 | 0 + 36 | 9 | 2 | 17 | 10 | 16 | 16 | 1 | 1 + 37 | 9 | 3 | 17 | 10 | 15 | 3 | 1 | 2 + 38 | 9 | 4 | 17 | 10 | 10 | -1 | 0 | 3 + 39 | 10 | 1 | 17 | 12 | 17 | 15 | 1 | 0 + 40 | 10 | 2 | 17 | 12 | 16 | 9 | 1 | 1 + 41 | 10 | 3 | 17 | 12 | 11 | 11 | 1 | 2 + 42 | 10 | 4 | 17 | 12 | 12 | -1 | 0 | 3 (42 rows) /* -- q5 */ @@ -132,17 +132,17 @@ SELECT * FROM pgr_edgeDisjointPaths( directed => false); seq | path_id | path_seq | start_vid | end_vid | node | edge | cost | agg_cost -----+---------+----------+-----------+---------+------+------+------+---------- - 1 | 1 | 1 | 5 | 10 | 5 | 1 | 1 | 1 - 2 | 1 | 2 | 5 | 10 | 6 | 2 | -1 | 2 - 3 | 1 | 3 | 5 | 10 | 10 | -1 | 0 | 1 - 4 | 2 | 1 | 6 | 15 | 6 | 4 | 1 | 1 - 5 | 2 | 2 | 6 | 15 | 7 | 8 | 1 | 2 - 6 | 2 | 3 | 6 | 15 | 11 | 9 | 1 | 3 - 7 | 2 | 4 | 6 | 15 | 16 | 16 | 1 | 4 - 8 | 2 | 5 | 6 | 15 | 15 | -1 | 0 | 5 - 9 | 3 | 1 | 6 | 15 | 6 | 2 | -1 | 5 - 10 | 3 | 2 | 6 | 15 | 10 | 3 | -1 | 4 - 11 | 3 | 3 | 6 | 15 | 15 | -1 | 0 | 3 + 1 | 1 | 1 | 5 | 10 | 5 | 1 | 1 | 0 + 2 | 1 | 2 | 5 | 10 | 6 | 2 | -1 | 1 + 3 | 1 | 3 | 5 | 10 | 10 | -1 | 0 | 0 + 4 | 2 | 1 | 6 | 15 | 6 | 4 | 1 | 0 + 5 | 2 | 2 | 6 | 15 | 7 | 8 | 1 | 1 + 6 | 2 | 3 | 6 | 15 | 11 | 9 | 1 | 2 + 7 | 2 | 4 | 6 | 15 | 16 | 16 | 1 | 3 + 8 | 2 | 5 | 6 | 15 | 15 | -1 | 0 | 4 + 9 | 3 | 1 | 6 | 15 | 6 | 2 | -1 | 0 + 10 | 3 | 2 | 6 | 15 | 10 | 3 | -1 | -1 + 11 | 3 | 3 | 6 | 15 | 15 | -1 | 0 | -2 (11 rows) /* -- q6 */ @@ -153,17 +153,17 @@ SELECT * FROM pgr_edgeDisjointPaths( directed => false); seq | path_id | path_seq | start_vid | end_vid | node | edge | cost | agg_cost -----+---------+----------+-----------+---------+------+------+------+---------- - 1 | 1 | 1 | 5 | 10 | 5 | 1 | 1 | 1 - 2 | 1 | 2 | 5 | 10 | 6 | 2 | -1 | 2 - 3 | 1 | 3 | 5 | 10 | 10 | -1 | 0 | 1 - 4 | 2 | 1 | 6 | 15 | 6 | 4 | 1 | 1 - 5 | 2 | 2 | 6 | 15 | 7 | 8 | 1 | 2 - 6 | 2 | 3 | 6 | 15 | 11 | 9 | 1 | 3 - 7 | 2 | 4 | 6 | 15 | 16 | 16 | 1 | 4 - 8 | 2 | 5 | 6 | 15 | 15 | -1 | 0 | 5 - 9 | 3 | 1 | 6 | 15 | 6 | 2 | -1 | 5 - 10 | 3 | 2 | 6 | 15 | 10 | 3 | -1 | 4 - 11 | 3 | 3 | 6 | 15 | 15 | -1 | 0 | 3 + 1 | 1 | 1 | 5 | 10 | 5 | 1 | 1 | 0 + 2 | 1 | 2 | 5 | 10 | 6 | 2 | -1 | 1 + 3 | 1 | 3 | 5 | 10 | 10 | -1 | 0 | 0 + 4 | 2 | 1 | 6 | 15 | 6 | 4 | 1 | 0 + 5 | 2 | 2 | 6 | 15 | 7 | 8 | 1 | 1 + 6 | 2 | 3 | 6 | 15 | 11 | 9 | 1 | 2 + 7 | 2 | 4 | 6 | 15 | 16 | 16 | 1 | 3 + 8 | 2 | 5 | 6 | 15 | 15 | -1 | 0 | 4 + 9 | 3 | 1 | 6 | 15 | 6 | 2 | -1 | 0 + 10 | 3 | 2 | 6 | 15 | 10 | 3 | -1 | -1 + 11 | 3 | 3 | 6 | 15 | 15 | -1 | 0 | -2 (11 rows) /* -- q7 */ diff --git a/docqueries/mincut/stoerWagner.result b/docqueries/mincut/stoerWagner.result index b2da1eba4b..bba70d6369 100644 --- a/docqueries/mincut/stoerWagner.result +++ b/docqueries/mincut/stoerWagner.result @@ -8,7 +8,7 @@ SELECT * FROM pgr_stoerWagner( FROM edges WHERE id < 17'); seq | edge | cost | mincut -----+------+------+-------- - 1 | 14 | 1 | 1 + 1 | 6 | 1 | 1 (1 row) /* -- q2 */ diff --git a/include/cpp_common/basic_vertex.hpp b/include/cpp_common/basic_vertex.hpp index 774c31b10e..e4300311e2 100644 --- a/include/cpp_common/basic_vertex.hpp +++ b/include/cpp_common/basic_vertex.hpp @@ -43,17 +43,17 @@ namespace pgrouting { class Basic_vertex { public: Basic_vertex() : - id(0), vertex_index(0) {} + id(0) {} Basic_vertex(const Basic_vertex &v) : - id(v.id), vertex_index(0) {} + id(v.id) {} explicit Basic_vertex(const int64_t _id) : - id(_id), vertex_index(0) {} + id(_id) {} Basic_vertex& operator=(const Basic_vertex&) = default; Basic_vertex(const Edge_t &other, bool is_source) : - id(is_source? other.source : other.target), vertex_index(0) {} + id(is_source? other.source : other.target) {} void cp_members(const Basic_vertex &other) { this->id = other.id;