diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 59ce4f79f03..b06cc6b955f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -79,6 +79,7 @@ jobs: python -m pip install --upgrade pip pip install Sphinx pip install sphinx-bootstrap-theme + pip install sphinx-collapse pip list - name: Configure diff --git a/.github/workflows/update-locale.yml b/.github/workflows/update-locale.yml index 912abe38be6..65c7fe2a305 100644 --- a/.github/workflows/update-locale.yml +++ b/.github/workflows/update-locale.yml @@ -77,6 +77,7 @@ jobs: pip install Sphinx pip install sphinx-bootstrap-theme pip install sphinx-intl[transifex] + pip install sphinx-collapse pip list - name: Initialize mandatory git config diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 713394aff54..d781f1edcad 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -29,7 +29,7 @@ jobs: fail-fast: false matrix: boost_minor: [56] - old_pgr: [3.7.3 3.7.2, 3.7.1, 3.7.0, 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] + old_pgr: [3.8.0, 3.7.3, 3.7.2, 3.7.1, 3.7.0, 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/.github/workflows/website.yml b/.github/workflows/website.yml index abcab337e1c..536dd5be24f 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -76,6 +76,7 @@ jobs: pip install Sphinx pip install sphinx-bootstrap-theme pip install sphinx-intl[transifex] + pip install sphinx-collapse pip list - name: Configure and build documentation diff --git a/CMakeLists.txt b/CMakeLists.txt index f51a1bdc64c..329125b24de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,8 +43,9 @@ set(PROJECT_LIB_NAME "${PROJECT_NAME_LOWER}-${PROJECT_LIB_VERSION}") string(TIMESTAMP COMPILATION_DATE "%Y/%m/%d" UTC) -set(MINORS 4.0 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0 2.6) +set(MINORS 4.0 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0 2.6) set(OLD_SIGNATURES + 3.8.0 3.7.3 3.7.2 3.7.1 diff --git a/NEWS.md b/NEWS.md index 83c58946b5a..c1591e7ed50 100644 --- a/NEWS.md +++ b/NEWS.md @@ -88,6 +88,32 @@ milestone for 4.0.0 # pgRouting 3 +## pgRouting 3.8 + + +.. current + +### pgRouting 3.8.0 Release Notes + +**Promotion to official function of pgRouting.** + +* pgr_extractVertices + + * Error messages adjustment. + * Function promoted to official. + +* pgr_degree + + * Error messages adjustment. + * New signature with only Edges SQL. + * Function promoted to official. + +* pgr_findCloseEdges + + * Error messages adjustment. + * ``partial`` option is removed. + * Function promoted to official. + ## pgRouting 3.7 @@ -159,7 +185,7 @@ milestone for 3.7.0 **Official functions changes** -* [#2605](https://github.com/pgRouting/pgrouting/pull/2605) Standarize +* [#2605](https://github.com/pgRouting/pgrouting/pull/2605) Standardize spanning tree functions output * Functions: @@ -271,26 +297,26 @@ milestone for 3.6.0 **Official functions changes** -* [#2516](https://github.com/pgRouting/pgrouting/pull/2516) Standarize output +* [#2516](https://github.com/pgRouting/pgrouting/pull/2516) Standardize output pgr_aStar - * Standarizing output columns to ``(seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)`` + * Standardize 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 +* [#2523](https://github.com/pgRouting/pgrouting/pull/2523) Standardize output pgr_bdAstar - * Standarizing output columns to ``(seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)`` + * Standardize 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 +* [#2547](https://github.com/pgRouting/pgrouting/pull/2547) Standardize output and modifying signature pgr_KSP * Result columns standarized to: ``(seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)`` @@ -302,7 +328,7 @@ milestone for 3.6.0 * pgr_ksp(Many to Many) * pgr_ksp(Combinations) -* [#2548](https://github.com/pgRouting/pgrouting/pull/2548) Standarize output +* [#2548](https://github.com/pgRouting/pgrouting/pull/2548) Standardize output pgr_drivingDistance * Standarizing output columns to ``(seq, depth, start_vid, pred, node, edge, cost, agg_cost)`` @@ -314,7 +340,7 @@ milestone for 3.6.0 **Proposed functions changes** -* [#2544](https://github.com/pgRouting/pgrouting/pull/2544) Standarize output +* [#2544](https://github.com/pgRouting/pgrouting/pull/2544) Standardize output and modifying signature pgr_withPointsDD * Signature change: ``driving_side`` parameter changed from named optional to @@ -333,7 +359,7 @@ milestone for 3.6.0 * 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 +* [#2546](https://github.com/pgRouting/pgrouting/pull/2546) Standardize output and modifying signature pgr_withPointsKSP * Standarizing output columns to ``(seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)`` @@ -371,9 +397,9 @@ milestone for 3.6.0 * [#2490](https://github.com/pgRouting/pgrouting/pull/2490) Automatic page history links. -* ..rubric:: SQL standarization +* ..rubric:: Standardize SQL -* [#2555](https://github.com/pgRouting/pgrouting/pull/2555) standarize +* [#2555](https://github.com/pgRouting/pgrouting/pull/2555) Standardize deprecated messages * On new internal function: do not use named parameters and default parameters. @@ -431,7 +457,7 @@ milestone for 3.5.0 * Dijkstra - * Standarizing output columns to ``(seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost)`` + * Standardize 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. diff --git a/doc/_static/page_history.js b/doc/_static/page_history.js index 0c9f0bdc0a0..ca90ed41d07 100644 --- a/doc/_static/page_history.js +++ b/doc/_static/page_history.js @@ -1,10 +1,11 @@ -function createInfo(file, newat, altnames = '') { +function createInfo(file, newat, altnames = '', removedat = '') { this.file = file; this.newat = newat; this.altnames = altnames; + this.removedat = removedat; } -var versionsArr = ['4.0', '3.7', '3.6', '3.5', '3.4', '3.3', '3.2', '3.1', '3.0']; +const versionsArr = ['3.8','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']}, @@ -18,7 +19,7 @@ var newpages = [ {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']}, + 'migration', 'pgr_degree']}, {v: '3.3', pages: ['withPoints-category', 'via-category', 'reference', 'pgr_edgeColoring', 'DFS-category', 'BFS-category']}, @@ -46,276 +47,219 @@ var newpages = [ var filesArr = [ + new createInfo('spanningTree-category', '3.0', [ + { v: '3.7', n: 'spanningTree-family'}, + ]), + + /* Documentation from version 2.3 */ new createInfo('TSP-family', '2.3', [ - { v: '2.3', n: 'tsp', d: 'tsp'}, + { v: '2.3', n: 'src/tsp/doc/tsp', d: 'tsp'}, ]), + new createInfo('pgr_withPointsCostMatrix', '2.3', [ - { v: '2.3', n: 'pgr_withPointsCostMatrix', d: 'costMatrix'}, + { v: '2.3', n: 'src/costMatrix/doc/pgr_withPointsCostMatrix'}, ]), + new createInfo('pgr_maxCardinalityMatch', '2.3', [ - { v: '2.3', n: 'pgr_maximumCardinalityMatching', d: 'max_flow'}, - { v: '2.4', n: 'pgr_maximumCardinalityMatching', d: ''}, + { v: '2.3', n: 'src/max_flow/doc/pgr_maximumCardinalityMatching'}, + { v: '2.4', n: 'pgr_maximumCardinalityMatching'}, ]), new createInfo('pgr_pushRelabel', '2.3', [ - { v: '2.3', n: 'pgr_maxFlowPushRelabel', d: 'max_flow'}, - { v: '2.4', n: 'pgr_maxFlowPushRelabel', d: ''}, + { v: '2.3', n: 'src/max_flow/doc/pgr_maxFlowPushRelabel'}, + { v: '2.4', n: 'pgr_maxFlowPushRelabel'}, ]), new createInfo('pgr_edmondsKarp', '2.3', [ - { v: '2.3', n: 'pgr_maxFlowEdmondsKarp', d: 'max_flow'}, - { v: '2.4', n: 'pgr_maxFlowEdmondsKarp', d: ''}, + { v: '2.3', n: 'src/max_flow/doc/pgr_maxFlowEdmondsKarp'}, + { v: '2.4', n: 'pgr_maxFlowEdmondsKarp'}, ]), new createInfo('pgr_boykovKolmogorov', '2.3', [ - { v: '2.3', n: 'pgr_maxFlowBoykovKolmogorov', d: 'max_flow'}, - { v: '2.4', n: 'pgr_maxFlowBoykovKolmogorov', d: ''}, + { v: '2.3', n: 'src/max_flow/doc/pgr_maxFlowBoykovKolmogorov'}, + { v: '2.4', n: 'pgr_maxFlowBoykovKolmogorov'}, ]), new createInfo('pgr_TSPeuclidean', '2.3', [ - { v: '2.3', n: 'pgr_eucledianTSP', d: 'tsp'}, - { v: '2.4', n: 'pgr_eucledianTSP', d: ''}, - { v: '2.5', n: 'pgr_eucledianTSP', d: ''}, - { v: '2.6', n: 'pgr_eucledianTSP', d: ''}, + { v: '2.3', n: 'src/tsp/doc/pgr_eucledianTSP'}, + { v: '2.6', n: 'pgr_eucledianTSP'}, ]), new createInfo('pgr_edgeDisjointPaths', '2.3', [ - { v: '2.3', n: 'pgr_edgeDisjointPaths', d: 'max_flow'}, + { v: '2.3', n: 'src/max_flow/doc/pgr_edgeDisjointPaths'}, ]), new createInfo('pgr_dijkstraCostMatrix', '2.3', [ - { v: '2.3', n: 'pgr_dijkstraCostMatrix', d: 'costMatrix'}, + { v: '2.3', n: 'src/costMatrix/doc/pgr_dijkstraCostMatrix'}, ]), new createInfo('pgr_contraction', '2.3', [ - { v: '2.3', n: 'pgr_contractGraph', d: 'contraction'}, - { v: '2.4', n: 'pgr_contractGraph', d: ''}, - { v: '2.5', n: 'pgr_contractGraph', d: ''}, - { v: '2.6', n: 'pgr_contractGraph', d: ''}, + { v: '2.3', n: 'src/contraction/doc/pgr_contractGraph'}, + { v: '2.6', n: 'pgr_contractGraph'}, ]), new createInfo('flow-family', '2.3', [ - { v: '2.3', n: 'maxFlow', d: 'max_flow'}, + { v: '2.3', n: 'src/max_flow/doc/maxFlow'}, ]), + + /* Documentation from version 2.2 */ new createInfo('withPoints-family', '2.2', [ - { v: '2.2', n: 'withPoints', d: 'withPoints'}, - { v: '2.3', n: 'withPoints', d: 'withPoints'}, + { v: '2.3', n: 'src/withPoints/doc/withPoints'}, ]), new createInfo('withPoints-family', '2.2', [ - { v: '2.2', n: 'withPoints', d: 'withPoints'}, - { v: '2.3', n: 'withPoints', d: 'withPoints'}, + { v: '2.3', n: 'src/withPoints/doc/withPoints'}, ]), new createInfo('experimental', '2.2', [ - { v: '2.2', n: 'src/proposed', d: ''}, - { v: '2.3', n: 'src/proposed', d: ''}, - { v: '2.4', n: 'proposed', d: ''}, - { v: '2.5', n: 'proposed', d: ''}, - { v: '2.6', n: 'proposed', d: ''}, + { v: '2.2', n: 'src/proposed'}, + { v: '2.3', n: 'src/proposed'}, + { v: '2.4', n: 'proposed'}, + { v: '2.5', n: 'proposed'}, + { v: '2.6', n: 'proposed'}, ]), new createInfo('proposed', '2.2', [ - { v: '2.2', n: 'src/proposed', d: ''}, - { v: '2.3', n: 'src/proposed', d: ''}, + { v: '2.2', n: 'src/proposed'}, + { v: '2.3', n: 'src/proposed'}, ]), new createInfo('pgr_withPointsKSP', '2.2', [ - { v: '2.2', n: 'pgr_withPointsKSP', d: 'withPoints'}, - { v: '2.3', n: 'pgr_withPointsKSP', d: 'withPoints'}, + { v: '2.3', n: 'src/withPoints/doc/pgr_withPointsKSP'}, ]), new createInfo('pgr_withPoints', '2.2', [ - { v: '2.2', n: 'pgr_withPoints', d: 'withPoints'}, - { v: '2.3', n: 'pgr_withPoints', d: 'withPoints'}, + { v: '2.3', n: 'src/withPoints/doc/pgr_withPoints'}, ]), new createInfo('pgr_withPointsDD', '2.2', [ - { v: '2.2', n: 'pgr_withPointsDD', d: 'withPoints'}, - { v: '2.3', n: 'pgr_withPointsDD', d: 'withPoints'}, + { v: '2.3', n: 'src/withPoints/doc/pgr_withPointsDD'}, ]), new createInfo('pgr_withPointsCost', '2.2', [ - { v: '2.2', n: 'pgr_withPointsCost', d: 'withPoints'}, - { v: '2.3', n: 'pgr_withPointsCost', d: 'withPoints'}, + { v: '2.3', n: 'src/withPoints/doc/pgr_withPointsCost'}, ]), new createInfo('pgr_withPointsCost', '2.2', [ - { v: '2.2', n: 'pgr_withPointsCost', d: 'withPoints'}, - { v: '2.3', n: 'pgr_withPointsCost', d: 'withPoints'}, + { v: '2.3', n: 'src/withPoints/doc/pgr_withPointsCost'}, ]), new createInfo('pgr_dijkstraVia', '2.2', [ - { v: '2.2', n: 'pgr_dijkstraVia', d: 'dijkstra'}, - { v: '2.3', n: 'pgr_dijkstraVia', d: 'dijkstra'}, + { v: '2.3', n: 'src/dijkstra/doc/pgr_dijkstraVia'}, ]), new createInfo('pgr_dijkstraCost', '2.2', [ - { v: '2.2', n: 'pgr_dijkstraCost', d: 'dijkstra'}, - { v: '2.3', n: 'pgr_dijkstraCost', d: 'dijkstra'}, + { v: '2.3', n: 'src/dijkstra/doc/pgr_dijkstraCost'}, ]), new createInfo('dijkstra-family', '2.2', [ - { v: '2.2', n: 'dijkstra', d: 'dijkstra'}, - { v: '2.3', n: 'dijkstra', d: 'dijkstra'}, + { v: '2.3', n: 'src/dijkstra/doc/dijkstra'}, ]), new createInfo('contraction-family', '2.2', [ - { v: '2.2', n: 'contraction', d: 'contraction'}, - { v: '2.3', n: 'contraction', d: 'contraction'}, + { v: '2.3', n: 'src/contraction/doc/contraction'}, ]), new createInfo('allpairs-family', '2.2', [ - { v: '2.2', n: 'allpairs', d: 'allpairs'}, - { v: '2.3', n: 'allpairs', d: 'allpairs'}, + { v: '2.3', n: 'src/allpairs/doc/allpairs'}, ]), + + /* Documentation from version 2.1 */ new createInfo('pgr_pickDeliverEuclidean', '2.1', [ - { v: '2.1', n: 'index', d: 'vrppdtw'}, - { v: '2.2', n: 'index', d: 'vrppdtw'}, - { v: '2.3', n: 'pgr_gsoc_vrppdtw', d: 'vrppdtw'}, - { v: '2.4', n: 'pgr_gsoc_vrppdtw', d: ''}, - { v: '2.5', n: 'pgr_gsoc_vrppdtw', d: ''}, - { v: '2.6', n: 'pgr_gsoc_vrppdtw', d: ''}, + { v: '2.2', n: 'src/vrppdtw/doc/index'}, + { v: '2.3', n: 'src/vrppdtw/doc/pgr_gsoc_vrppdtw'}, + { v: '2.6', n: 'pgr_gsoc_vrppdtw'}, ]), new createInfo('pgr_vrpOneDepot', '2.1', [ - { v: '2.1', n: 'index', d: 'vrp_basic'}, - { v: '2.2', n: 'pgr_vrpOneDepot', d: 'vrp_basic'}, - { v: '2.3', n: 'pgr_vrpOneDepot', d: 'vrp_basic'}, + { v: '2.1', n: 'src/vrp_basic/doc/index'}, + { v: '2.3', n: 'src/vrp_basic/doc/pgr_vrpOneDepot'}, ]), + + /* Documentation from version 2.0 */ new createInfo('pgr_version', '2.0', [ - { v: '2.0', n: 'utilities/version', d: 'common'}, - { v: '2.1', n: 'utilities/version', d: 'common'}, - { v: '2.2', n: 'pgr_version', d: 'common'}, - { v: '2.3', n: 'pgr_version', d: 'common'}, + { v: '2.1', n: 'src/common/doc/utilities/version'}, + { v: '2.3', n: 'src/common/doc/pgr_version'}, ]), new createInfo('routingFunctions', '2.0', [ - { v: '2.0', n: 'src/index', d: ''}, - { v: '2.1', n: 'src/index', d: ''}, - { v: '2.2', n: 'src/routingFunctions', d: ''}, - { v: '2.3', n: 'src/routingFunctions', d: ''}, + { v: '2.1', n: 'src/index'}, + { v: '2.3', n: 'src/routingFunctions'}, ]), new createInfo('index', '2.0', [ - { v: '2.0', n: 'index', d: ''}, - { v: '2.1', n: 'index', d: ''}, - { v: '2.2', n: 'index', d: ''}, - { v: '2.3', n: 'index', d: ''}, + { v: '2.3', n: 'doc/index'}, ]), new createInfo('pgr_TSP', '2.0', [ - { v: '2.0', n: 'index', d: 'tsp'}, - { v: '2.1', n: 'index', d: 'tsp'}, - { v: '2.2', n: 'pgr_tsp', d: 'tsp'}, - { v: '2.3', n: 'pgr_tsp', d: 'tsp'}, + { v: '2.1', n: 'src/tsp/doc/index'}, + { v: '2.3', n: 'src/tsp/doc/pgr_tsp'}, ]), new createInfo('pgr_trsp', '2.0', [ - { v: '2.0', n: 'index', d: 'trsp'}, - { v: '2.1', n: 'index', d: 'trsp'}, - { v: '2.2', n: 'pgr_trsp', d: 'trsp'}, - { v: '2.3', n: 'pgr_trsp', d: 'trsp'} + { v: '2.1', n: 'src/trsp/doc/index'}, + { v: '2.3', n: 'src/trsp/doc/pgr_trsp'} ]), new createInfo('pgr_KSP', '2.0', [ - { v: '2.0', n: 'index', d: 'ksp'}, - { v: '2.1', n: 'index', d: 'ksp'}, - { v: '2.2', n: 'pgr_ksp', d: 'ksp'}, - { v: '2.3', n: 'pgr_ksp', d: 'ksp'}, + { v: '2.0', n: 'src/ksp/doc/index'}, + { v: '2.1', n: 'src/ksp/doc/ksp_v3'}, + { v: '2.3', n: 'src/ksp/doc/pgr_ksp'}, ]), new createInfo('pgr_dijkstra', '2.0', [ - { v: '2.0', n: 'index', d: 'dijkstra'}, - { v: '2.1', n: 'index', d: 'dijkstra'}, - { v: '2.2', n: 'pgr_dijkstra', d: 'dijkstra'}, - { v: '2.3', n: 'pgr_dijkstra', d: 'dijkstra'} + { v: '2.0', n: 'src/dijkstra/doc/index'}, + { v: '2.1', n: 'src/dijkstra/doc/dijkstra_v3'}, + { v: '2.3', n: 'src/dijkstra/doc/pgr_dijkstra'} ]), new createInfo('pgr_bdDijkstra', '2.0', [ - { v: '2.0', n: 'index', d: 'bd_dijkstra'}, - { v: '2.1', n: 'index', d: 'bd_dijkstra'}, - { v: '2.2', n: 'pgr_bdDijkstra', d: 'bd_dijkstra'}, - { v: '2.3', n: 'pgr_bdDijkstra', d: 'bd_dijkstra'} + { v: '2.1', n: 'src/bd_dijkstra/doc/index'}, + { v: '2.3', n: 'src/bd_dijkstra/doc/pgr_bdDijkstra'} ]), new createInfo('pgr_bdAstar', '2.0', [ - { v: '2.0', n: 'index', d: 'bd_astar'}, - { v: '2.1', n: 'index', d: 'bd_astar'}, - { v: '2.2', n: 'pgr_bdAstar', d: 'bd_astar'}, - { v: '2.3', n: 'pgr_bdAstar', d: 'bd_astar'} + { v: '2.1', n: 'src/bd_astar/doc/index'}, + { v: '2.3', n: 'src/bd_astar/doc/pgr_bdAstar'} ]), new createInfo('pgr_aStar', '2.0', [ - { v: '2.0', n: 'index', d: 'astar'}, - { v: '2.1', n: 'index', d: 'astar'}, - { v: '2.2', n: 'pgr_astar', d: 'astar'}, - { v: '2.3', n: 'pgr_astar', d: 'astar'}, + { v: '2.1', n: 'src/astar/doc/index'}, + { v: '2.3', n: 'src/astar/doc/pgr_astar'}, ]), new createInfo('pgr_floydWarshall', '2.0', [ - { v: '2.0', n: 'index', d: 'apsp_warshall'}, - { v: '2.1', n: 'index', d: 'apsp_warshall'}, - { v: '2.2', n: 'pgr_floydWarshall', d: 'allpairs'}, - { v: '2.3', n: 'pgr_floydWarshall', d: 'allpairs'} + { v: '2.1', n: 'src/apsp_warshall/doc/index'}, + { v: '2.3', n: 'src/allpairs/doc/pgr_floydWarshall'} ]), new createInfo('pgr_johnson', '2.0', [ - { v: '2.0', n: 'index', d: 'apsp_johnson'}, - { v: '2.1', n: 'index', d: 'apsp_johnson'}, - { v: '2.2', n: 'pgr_johnson', d: 'allpairs'}, - { v: '2.3', n: 'pgr_johnson', d: 'allpairs'} + { v: '2.1', n: 'src/apsp_johnson/doc/index'}, + { v: '2.3', n: 'src/allpairs/doc/pgr_johnson'} ]), new createInfo('pgr_nodeNetwork', '2.0', [ - { v: '2.0', n: 'functions/node_network', d: 'common'}, - { v: '2.1', n: 'functions/node_network', d: 'common'}, - { v: '2.2', n: 'pgr_nodeNetwork', d: 'topology'}, - { v: '2.3', n: 'pgr_nodeNetwork', d: 'topology'}, + { v: '2.1', n: 'src/common/doc/functions/node_network'}, + { v: '2.3', n: 'src/topology/doc/pgr_nodeNetwork'}, ]), new createInfo('topology-functions', '2.0', [ - { v: '2.0', n: 'functions/index', d: 'common'}, - { v: '2.1', n: 'functions/index', d: 'common'}, - { v: '2.2', n: 'topology', d: 'topology'}, - { v: '2.3', n: 'topology', d: 'topology'}, + { v: '2.1', n: 'src/common/doc/functions/index'}, + { v: '2.3', n: 'src/topology/doc/topology'}, ]), new createInfo('pgr_createVerticesTable', '2.0', [ - { v: '2.0', n: 'functions/create_vert_table', d: 'common'}, - { v: '2.1', n: 'functions/create_vert_table', d: 'common'}, - { v: '2.2', n: 'pgr_createVerticesTable', d: 'topology'}, - { v: '2.3', n: 'pgr_createVerticesTable', d: 'topology'}, + { v: '2.1', n: 'src/common/doc/functions/create_vert_table'}, + { v: '2.3', n: 'src/topology/doc/pgr_createVerticesTable'}, ]), new createInfo('pgr_createTopology', '2.0', [ - { v: '2.0', n: 'functions/create_topology', d: 'common'}, - { v: '2.1', n: 'functions/create_topology', d: 'common'}, - { v: '2.2', n: 'pgr_createTopology', d: 'topology'}, - { v: '2.3', n: 'pgr_createTopology', d: 'topology'}, + { v: '2.1', n: 'src/common/doc/functions/create_topology'}, + { v: '2.3', n: 'src/topology/doc/pgr_createTopology'}, ]), new createInfo('pgr_analyzeOneWay', '2.0', [ - { v: '2.0', n: 'functions/analyze_oneway', d: 'common'}, - { v: '2.1', n: 'functions/analyze_oneway', d: 'common'}, - { v: '2.2', n: 'pgr_analyzeOneWay', d: 'topology'}, - { v: '2.3', n: 'pgr_analyzeOneWay', d: 'topology'}, + { v: '2.1', n: 'src/common/doc/functions/analyze_oneway'}, + { v: '2.3', n: 'src/topology/doc/pgr_analyzeOneWay'}, ]), new createInfo('pgr_analyzeGraph', '2.0', [ - { v: '2.0', n: 'functions/analyze_graph', d: 'common'}, - { v: '2.1', n: 'functions/analyze_graph', d: 'common'}, - { v: '2.2', n: 'pgr_analyzeGraph', d: 'topology'}, - { v: '2.3', n: 'pgr_analyzeGraph', d: 'topology'}, + { v: '2.1', n: 'src/common/doc/functions/analyze_graph'}, + { v: '2.3', n: 'src/topology/doc/pgr_analyzeGraph'}, ]), new createInfo('pgRouting-concepts', '2.0', [ - { v: '2.0', n: 'doc/src/tutorial/tutorial', d: ''}, - { v: '2.1', n: 'doc/src/tutorial/tutorial', d: ''}, - { v: '2.2', n: 'doc/src/tutorial/tutorial', d: ''}, - { v: '2.3', n: 'doc/src/tutorial/tutorial', d: ''}, + { v: '2.3', n: 'doc/src/tutorial/tutorial'}, ]), new createInfo('support', '2.0', [ - { v: '2.0', n: 'doc/src/introduction/support', d: ''}, - { v: '2.1', n: 'doc/src/introduction/support', d: ''}, - { v: '2.2', n: 'doc/src/introduction/support', d: ''}, - { v: '2.3', n: 'doc/src/introduction/support', d: ''}, + { v: '2.3', n: 'doc/src/introduction/support'}, ]), new createInfo('pgRouting-introduction', '2.0', [ - { v: '2.0', n: 'doc/src/introduction/introduction', d: ''}, - { v: '2.1', n: 'doc/src/introduction/introduction', d: ''}, - { v: '2.2', n: 'doc/src/introduction/introduction', d: ''}, - { v: '2.3', n: 'doc/src/introduction/introduction', d: ''}, + { v: '2.3', n: 'doc/src/introduction/introduction'}, ]), new createInfo('pgRouting-installation', '2.0', [ - { v: '2.0', n: 'doc/src/installation/index', d: ''}, - { v: '2.1', n: 'doc/src/installation/index', d: ''}, - { v: '2.2', n: 'doc/src/installation/installation', d: ''}, - { v: '2.3', n: 'doc/src/installation/installation', d: ''}, + { v: '2.1', n: 'doc/src/installation/index'}, + { v: '2.3', n: 'doc/src/installation/installation'}, ]), new createInfo('sampledata', '2.0', [ - { v: '2.0', n: 'doc/src/developer/sampledata', d: ''}, - { v: '2.1', n: 'doc/src/developer/sampledata', d: ''}, - { v: '2.2', n: 'doc/src/developer/sampledata', d: ''}, - { v: '2.3', n: 'doc/src/developer/sampledata', d: ''}, + { v: '2.3', n: 'doc/src/developer/sampledata'}, ]), new createInfo('release_notes', '2.0', [ - { v: '2.0', n: 'doc/src/changelog/index', d: ''}, - { v: '2.1', n: 'doc/src/changelog/index', d: ''}, - { v: '2.2', n: 'doc/src/changelog/index', d: ''}, - { v: '2.3', n: 'doc/src/changelog/release_notes', d: ''}, + { v: '2.2', n: 'doc/src/changelog/index'}, + { v: '2.3', n: 'doc/src/changelog/release_notes'}, + ]), + new createInfo('drivingDistance-category', '2.0', [ + { v: '2.1', n: 'src/driving_distance/doc/index'}, + { v: '2.3', n: 'src/driving_distance/doc/drivingDistance'}, ]), new createInfo('pgr_drivingDistance', '2.0', [ - { v: '2.0', n: 'dd_driving_distance', d: 'driving_distance'}, - { v: '2.1', n: 'dd_driving_distance_v3', d: 'driving_distance'}, - { v: '2.2', n: 'pgr_drivingDistance', d: 'driving_distance'}, - { v: '2.3', n: 'pgr_drivingDistance', d: 'driving_distance'} + { v: '2.0', n: 'src/driving_distance/doc/dd_driving_distance'}, + { v: '2.1', n: 'src/driving_distance/doc/dd_driving_distance_v3'}, + { v: '2.3', n: 'src/driving_distance/doc/pgr_drivingDistance'} ]), new createInfo('pgr_alphaShape', '2.0', [ - { v: '2.0', n: 'dd_alphashape', d: 'driving_distance'}, - { v: '2.1', n: 'dd_alphashape', d: 'driving_distance'}, - { v: '2.2', n: 'pgr_alphaShape', d: 'alpha_shape'}, - { v: '2.3', n: 'pgr_alphaShape', d: 'alpha_shape'} + { v: '2.1', n: 'src/driving_distance/doc/dd_alphashape'}, + { v: '2.3', n: 'src/alpha_shape/doc/pgr_alphaShape'} ]), ]; @@ -326,11 +270,19 @@ function get_titles(data, k) { } return ''; } -function get_vdata(data, v) { + +function get_vdata(data, v, file, lang) { + let info = ''; + let link = ''; for (var i = 0; i < data.length; i++) { - if (data[i].v == v) { return data[i]; } + if (v <= data[i].v) { info = data[i]; break; } } - return ''; + if (info === '') { + link = `${lang}/${file}.html">${v}`; + } else { + link = `${lang}/${info.n}.html">${v}`; + } + return link; } function get(name) { @@ -362,12 +314,13 @@ function get_history(name, lang) { validlang = lang; if (versionsArr[i] < data.newat) break; + if (data.removedat != '' && versionsArr[i] > data.newat) break; /* for zh-Hans non translated versions use english */ - validlang = (lang == 'zh-Hans' && versionsArr[i] == '3.7')? lang : 'en'; + validlang = (lang == 'zh-Hans' && versionsArr[i] >= '3.7')? 'zh_Hans' : 'en'; - var link = home + versionsArr[i] + '/'; - link += validlang + '/' + data.file + '.html">' + versionsArr[i] + ''; + let link = `${home}${versionsArr[i]}/` + link += get_vdata(data.altnames, versionsArr[i], data.file, validlang); if (versionsArr[i] == latest) result += '(' + link + ') '; else result += link + ' '; } @@ -385,29 +338,7 @@ function get_history(name, lang) { if (data.newat > unsuportedArr[i]) break; var link = home + unsuportedArr[i] + '/'; - switch(unsuportedArr[i]) { - case '2.4': - var info = get_vdata(data.altnames, unsuportedArr[i]); - if (info === '') { - link += validlang + '/' + data.file + '.html">' + unsuportedArr[i] + ''; - } else { - link += validlang + '/' + info.n + '.html">' + unsuportedArr[i] + ''; - } - break; - case '2.3': - case '2.2': - case '2.1': - case '2.0': - var info = get_vdata(data.altnames, unsuportedArr[i]); - if (info.d == '') { - link += validlang + '/' + info.n + '.html">' + unsuportedArr[i] + ''; - } else { - link += validlang + '/src/' + info.d + '/doc/' + info.n + '.html">' + unsuportedArr[i] + ''; - } - break; - default: - link += validlang + '/' + data.file + '.html">' + unsuportedArr[i] + ''; - } + link += get_vdata(data.altnames, unsuportedArr[i], data.file, validlang); result += link + ' '; } } diff --git a/doc/categories/CMakeLists.txt b/doc/categories/CMakeLists.txt index bcbf8e2d211..ccb9af99eea 100644 --- a/doc/categories/CMakeLists.txt +++ b/doc/categories/CMakeLists.txt @@ -6,7 +6,7 @@ SET(LOCAL_FILES DFS-category.rst drivingDistance-category.rst KSP-category.rst - spanningTree-family.rst + spanningTree-category.rst via-category.rst VRP-category.rst withPoints-category.rst diff --git a/doc/categories/DFS-category.rst b/doc/categories/DFS-category.rst index 58da1b32756..fad9334a645 100644 --- a/doc/categories/DFS-category.rst +++ b/doc/categories/DFS-category.rst @@ -24,8 +24,6 @@ Traversal using Depth First Search. .. official-end -.. rubric:: Proposed - .. include:: proposed.rst :start-after: warning-begin :end-before: end-warning diff --git a/doc/categories/KSP-category.rst b/doc/categories/KSP-category.rst index 15a46920879..8416fcb0b83 100644 --- a/doc/categories/KSP-category.rst +++ b/doc/categories/KSP-category.rst @@ -20,8 +20,6 @@ K shortest paths - Category .. official-end -.. rubric:: Proposed - .. include:: proposed.rst :start-after: warning-begin :end-before: end-warning diff --git a/doc/categories/cost-category.rst b/doc/categories/cost-category.rst index b4740caf9ad..305cda32776 100644 --- a/doc/categories/cost-category.rst +++ b/doc/categories/cost-category.rst @@ -26,8 +26,6 @@ Cost - Category .. official-end -.. rubric:: Proposed - .. include:: proposed.rst :start-after: warning-begin :end-before: end-warning diff --git a/doc/categories/costMatrix-category.rst b/doc/categories/costMatrix-category.rst index c4c28b1e720..1ea0a043803 100644 --- a/doc/categories/costMatrix-category.rst +++ b/doc/categories/costMatrix-category.rst @@ -24,8 +24,6 @@ Cost Matrix - Category .. official-end -.. rubric:: proposed - .. include:: proposed.rst :start-after: warning-begin :end-before: end-warning diff --git a/doc/categories/drivingDistance-category.rst b/doc/categories/drivingDistance-category.rst index 5efdadd935b..3439eb3c352 100644 --- a/doc/categories/drivingDistance-category.rst +++ b/doc/categories/drivingDistance-category.rst @@ -19,14 +19,12 @@ Driving Distance - Category * :doc:`pgr_drivingDistance` - Driving Distance based on Dijkstra's algorithm * :doc:`pgr_primDD` - Driving Distance based on Prim's algorithm * :doc:`pgr_kruskalDD` - Driving Distance based on Kruskal's algorithm -* Post pocessing +* Post processing * :doc:`pgr_alphaShape` - Alpha shape computation .. official-end -.. rubric:: Proposed - .. include:: proposed.rst :start-after: warning-begin :end-before: end-warning diff --git a/doc/categories/spanningTree-family.rst b/doc/categories/spanningTree-category.rst similarity index 100% rename from doc/categories/spanningTree-family.rst rename to doc/categories/spanningTree-category.rst diff --git a/doc/categories/via-category.rst b/doc/categories/via-category.rst index 5f7a69f40f5..6fec87e3d83 100644 --- a/doc/categories/via-category.rst +++ b/doc/categories/via-category.rst @@ -14,8 +14,6 @@ Via - Category =============================================================================== -.. rubric:: proposed - .. include:: proposed.rst :start-after: warning-begin :end-before: end-warning @@ -37,7 +35,7 @@ This category intends to solve the general problem: Given a graph and a list of vertices, find the shortest path between :math:`vertex_i` and :math:`vertex_{i+1}` for all vertices -In other words, find a continuos route that visits all the vertices in the order +In other words, find a continuous route that visits all the vertices in the order given. :path: represents a section of a **route**. diff --git a/doc/circuits/pgr_hawickCircuits.rst b/doc/circuits/pgr_hawickCircuits.rst index 7c5853213e8..30a7c42fdda 100644 --- a/doc/circuits/pgr_hawickCircuits.rst +++ b/doc/circuits/pgr_hawickCircuits.rst @@ -16,7 +16,7 @@ ``pgr_hawickCircuits`` - Experimental =============================================================================== -``pgr_hawickCircuits`` — Returns the list of cirucits using hawick circuits algorithm. +``pgr_hawickCircuits`` — Returns the list of ciruits using hawick circuits algorithm. .. include:: experimental.rst :start-after: warning-begin diff --git a/doc/coloring/coloring-family.rst b/doc/coloring/coloring-family.rst index 96babb6bfa5..38014ae0d45 100644 --- a/doc/coloring/coloring-family.rst +++ b/doc/coloring/coloring-family.rst @@ -14,8 +14,6 @@ Coloring - Family of functions =============================================================================== -.. rubric:: Proposed - .. include:: proposed.rst :start-after: warning-begin :end-before: end-warning @@ -27,8 +25,6 @@ Coloring - Family of functions .. proposed-end -.. rubric:: Experimental - .. include:: experimental.rst :start-after: warning-begin :end-before: end-warning diff --git a/doc/components/components-family.rst b/doc/components/components-family.rst index 3225c95f568..1222b10fe8c 100644 --- a/doc/components/components-family.rst +++ b/doc/components/components-family.rst @@ -27,8 +27,6 @@ Components - Family of functions .. official-end -.. rubric:: Experimental - .. include:: experimental.rst :start-after: warning-begin :end-before: end-warning diff --git a/doc/conf.py.in b/doc/conf.py.in index c78c78653bc..563eb984ff2 100644 --- a/doc/conf.py.in +++ b/doc/conf.py.in @@ -54,6 +54,7 @@ extensions = [ 'sphinx.ext.mathjax', 'sphinx.ext.graphviz', 'sphinx.ext.autosectionlabel', + 'sphinx_collapse', ] autosectionlabel_prefix_document = True diff --git a/doc/dijkstra/dijkstra-family.rst b/doc/dijkstra/dijkstra-family.rst index 65c23da0f88..b7582a3185c 100644 --- a/doc/dijkstra/dijkstra-family.rst +++ b/doc/dijkstra/dijkstra-family.rst @@ -26,8 +26,6 @@ Dijkstra - Family of functions .. official-end -.. rubric:: Proposed - .. include:: proposed.rst :start-after: warning-begin :end-before: end-warning @@ -35,7 +33,7 @@ Dijkstra - Family of functions .. proposed-start -* :doc:`pgr_dijkstraVia` - Get a route of a seuence of vertices. +* :doc:`pgr_dijkstraVia` - Get a route of a sequence of vertices. * :doc:`pgr_dijkstraNear` - Get the route to the nearest vertex. * :doc:`pgr_dijkstraNearCost` - Get the cost to the nearest vertex. @@ -192,7 +190,7 @@ The graphs are defined as follows: .. rubric:: Directed graph -The weighted directed graph, :math:`G_d(V,E)`, is definied by: +The weighted directed graph, :math:`G_d(V,E)`, is defined by: * the set of vertices :math:`V` @@ -211,7 +209,7 @@ The weighted directed graph, :math:`G_d(V,E)`, is definied by: .. rubric:: Undirected graph -The weighted undirected graph, :math:`G_u(V,E)`, is definied by: +The weighted undirected graph, :math:`G_u(V,E)`, is defined by: * the set of vertices :math:`V` diff --git a/doc/max_flow/flow-family.rst b/doc/max_flow/flow-family.rst index 8c09e321b66..2e2b782c5b7 100644 --- a/doc/max_flow/flow-family.rst +++ b/doc/max_flow/flow-family.rst @@ -33,8 +33,6 @@ Flow - Family of functions .. official-end -.. rubric:: Experimental - .. include:: experimental.rst :start-after: warning-begin :end-before: end-warning @@ -71,7 +69,7 @@ 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 source has the same vaule as target. + - There is no flow when source has the same value as target. - Any duplicated values in source or target are ignored. - Calculates the flow/residual capacity for each edge. In the output diff --git a/doc/metrics/CMakeLists.txt b/doc/metrics/CMakeLists.txt index 5adba5a42a6..d668b5a950c 100644 --- a/doc/metrics/CMakeLists.txt +++ b/doc/metrics/CMakeLists.txt @@ -2,6 +2,7 @@ SET(LOCAL_FILES metrics-family.rst pgr_betweennessCentrality.rst + pgr_degree.rst ) foreach (f ${LOCAL_FILES}) diff --git a/doc/metrics/metrics-family.rst b/doc/metrics/metrics-family.rst index 7485598441d..5b5ec524d6b 100644 --- a/doc/metrics/metrics-family.rst +++ b/doc/metrics/metrics-family.rst @@ -15,22 +15,30 @@ Metrics - Family of functions =============================================================================== -.. rubric:: Experimental +.. official-start -.. include:: experimental.rst - :start-after: warning-begin - :end-before: end-warning +- :doc:`pgr_degree` - Returns a set of vertices and corresponding count of + incident edges to the vertex. + +.. official-end + +.. collapse:: Experimental + + .. include:: experimental.rst + :start-after: warning-begin + :end-before: end-warning .. experimental-start -* :doc:`pgr_betweennessCentrality` - Calculates relative betweenness centrality using Brandes Algorithm +* :doc:`pgr_betweennessCentrality` - Calculates relative betweenness centrality + using Brandes Algorithm .. experimental-end - .. toctree:: :hidden: + pgr_degree pgr_betweennessCentrality See Also diff --git a/doc/metrics/pgr_degree.rst b/doc/metrics/pgr_degree.rst new file mode 100644 index 00000000000..6bab5575d48 --- /dev/null +++ b/doc/metrics/pgr_degree.rst @@ -0,0 +1,383 @@ +.. + **************************************************************************** + 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/ + **************************************************************************** + +.. index:: + single: Metrics Family ; pgr_degree + single: degree + +| + +``pgr_degree`` +=============================================================================== + +``pgr_degree`` — For each vertex in an undirected graph, return the count of +edges incident to the vertex. + + +.. include:: proposed.rst + :start-after: warning-begin + :end-before: end-warning + +.. rubric:: Availability + +.. rubric:: Version 3.8.0 + +* Error messages adjustment. +* New signature with only Edges SQL. +* Function promoted to official. + +.. rubric:: Version 3.4.0 + +* New proposed function. + + +Description +------------------------------------------------------------------------------- + +Calculates the degree of the vertices of an undirected graph + +The degree (or valency) of a vertex of a graph is the number of edges that are +incident to the vertex. + +- Works for **undirected** graphs. +- A loop contributes 2 to a vertex's degree. +- A vertex with degree 0 is called an isolated vertex. + + - Isolated vertex is not part of the result + +- Vertex not participating on the subgraph is considered and isolated vertex. +- There can be a ``dryrun`` execution and the code used to get the answer will + be shown in a PostgreSQL ``NOTICE``. + + - The code can be used as base code for the particular application + requirements. + +- No ordering is performed. + +Signatures +------------------------------------------------------------------------------- + +.. admonition:: \ \ + :class: signatures + + | pgr_degree(`Edges SQL`_ , [``dryrun``]) + | pgr_degree(`Edges SQL`_ , `Vertex SQL`_, [``dryrun``]) + + | RETURNS SETOF |result-degree| + | OR EMPTY SET + +.. index:: + single: degree ; Edges and Vertices + +Edges +............................................................................... + +.. admonition:: \ \ + :class: signatures + + | pgr_degree(`Edges SQL`_ , [``dryrun``]) + + | RETURNS SETOF |result-degree| + | OR EMPTY SET + +:example: Get the degree of the vertices defined on the edges table + +.. literalinclude:: degree.queries + :start-after: -- q1 + :end-before: -- q2 + +Edges and Vertices +............................................................................... + +.. admonition:: \ \ + :class: signatures + + | pgr_degree(`Edges SQL`_ , `Vertex SQL`_, [``dryrun``]) + + | RETURNS SETOF |result-degree| + | OR EMPTY SET + +:Example: Extracting the vertex information + +``pgr_degree`` can use :doc:`pgr_extractVertices` embedded in the call. + +For decent size networks, it is best to prepare your vertices table before hand +and use it on ``pgr_degree`` calls. (See `Using a vertex table`_) + +Calculate the degree of the nodes: + +.. literalinclude:: degree.queries + :start-after: -- q2 + :end-before: -- q3 + +.. index:: + single: degree ; Edges + + +Parameters +------------------------------------------------------------------------------- + +============== ======== ================================ +Parameter Type Description +============== ======== ================================ +`Edges SQL`_ ``TEXT`` `Edges SQL`_ as described below +`Vertex SQL`_ ``TEXT`` `Vertex SQL`_ as described below +============== ======== ================================ + +Optional parameters +------------------------------------------------------------------------------- + +=========== ============= ========== ======================================= +Parameter Type Default Description +=========== ============= ========== ======================================= +``dryrun`` ``BOOLEAN`` ``false`` * When true do not process and get in a + NOTICE the resulting query. +=========== ============= ========== ======================================= + +Inner Queries +------------------------------------------------------------------------------- + +.. contents:: + :local: + +Edges SQL +............................................................................... + +.. rubric:: For the `Edges and Vertices`_ signature: + +.. list-table:: + :width: 81 + :widths: auto + :header-rows: 1 + + * - Column + - Type + - Description + * - ``id`` + - ``BIGINT`` + - Identifier of the edge. + +For the `Edges`_ signature: + +.. list-table:: + :width: 81 + :widths: auto + :header-rows: 1 + + * - Column + - Type + - Description + * - ``id`` + - ``BIGINT`` + - Identifier of the edge. + * - ``source`` + - ``BIGINT`` + - Identifier of the first end point vertex of the edge. + * - ``target`` + - ``BIGINT`` + - Identifier of the second end point vertex of the edge. + +Vertex SQL +............................................................................... + +.. rubric:: For the `Edges and Vertices`_ signature: + +.. list-table:: + :width: 81 + :widths: auto + :header-rows: 1 + + * - Column + - Type + - Description + * - ``id`` + - ``BIGINT`` + - Identifier of the first end point vertex of the edge. + * - ``in_edges`` + - ``BIGINT[]`` + - Array of identifiers of the edges that have the vertex ``id`` as *first + end point*. + + * When missing, ``out_edges`` must exist. + * - ``out_edges`` + - ``BIGINT[]`` + - Array of identifiers of the edges that have the vertex ``id`` as *second + end point*. + + * When missing, ``in_edges`` must exist. + + +Result columns +------------------------------------------------------------------------------- + +.. list-table:: + :width: 81 + :widths: auto + :header-rows: 1 + + * - Column + - Type + - Description + * - ``node`` + - ``BIGINT`` + - Vertex identifier + * - ``degree`` + - ``BIGINT`` + - Number of edges that are incident to the vertex ``id`` + +Additional Examples +------------------------------------------------------------------------------- + +.. contents:: + :local: + +Degree of a loop +............................................................................... + +A loop contributes 2 to a vertex's degree. + +.. graphviz:: + + graph G { + 2 [shape=circle;style=filled;color=green;fontsize=8;width=0.3;fixedsize=true]; + 2 -- 2 [label="1",fontsize=8]; + } + +.. rubric:: Using the `Edges`_ signature. + +.. literalinclude:: degree.queries + :start-after: -- q3 + :end-before: -- q4 + +.. rubric:: Using the `Edges and Vertices`_ signature. + +.. literalinclude:: degree.queries + :start-after: -- q4 + :end-before: -- q5 + +Degree of a sub graph +............................................................................... + +For the following is a subgraph of the :doc:`sampledata`: + +- :math:`E = \{(1, 5 \leftrightarrow 6), (1, 6 \leftrightarrow 10)\}` +- :math:`V = \{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17\}` + + +.. graphviz:: + + graph G { + 5,6,10 [shape=circle;style=filled;color=lightgreen;fontsize=8;width=0.3;fixedsize=true]; + 1,2,3,4,7,8,9,11,12,13,14,15,16,17 [shape=circle;style=filled;color=cyan;fontsize=8;width=0.3;fixedsize=true]; + + 5 -- 6 [label="1",fontsize=8]; + 10 -- 6 [label="2",fontsize=8]; + + 1 [pos="0,2!"]; + 2 [pos="0.5,3.5!"]; + 3 [pos="1,2!"]; + 4 [pos="2,3.5!"]; + 5 [pos="2,0!"]; + 6 [pos="2,1!"]; + 7 [pos="2,2!"]; + 8 [pos="2,3!"]; + 9 [pos="2,4!"]; + 10 [pos="3,1!"]; + 11 [pos="3,2!"]; + 12 [pos="3,3!"]; + 13 [pos="3.5,2.3!"]; + 14 [pos="3.5,4!"]; + 15 [pos="4,1!"]; + 16 [pos="4,2!"]; + 17 [pos="4,3!"]; + } + +The vertices not participating on the edge are considered isolated + +- their degree is 0 in the subgraph and +- their degree is not shown in the output. + +.. rubric:: Using the `Edges`_ signature. + +.. literalinclude:: degree.queries + :start-after: -- q5 + :end-before: -- q6 + +.. rubric:: Using the `Edges and Vertices`_ signature. + +.. literalinclude:: degree.queries + :start-after: -- q6 + :end-before: -- q7 + +Using a vertex table +............................................................................... + +For decent size networks, it is best to prepare your vertices table before hand +and use it on ``pgr_degree`` calls. + +Extract the vertex information and save into a table: + +.. literalinclude:: degree.queries + :start-after: -- q8 + :end-before: -- q9 + +Calculate the degree of the nodes: + +.. literalinclude:: degree.queries + :start-after: -- q9 + :end-before: -- q10 + +Dry run execution +............................................................................... + +To get the query generated used to get the vertex information, use ``dryrun => +true``. + +The results can be used as base code to make a refinement based on the backend +development needs. + +.. literalinclude:: degree.queries + :start-after: -- q10 + :end-before: -- q11 + +Finding dead ends +............................................................................... + +If there is a vertices table already built using ``pgr_extractVertices`` +and want the degree of the whole graph rather than a subset, it can be forgo using +``pgr_degree`` and work with the ``in_edges`` and ``out_edges`` columns +directly. + +The degree of a dead end is 1. + +.. include:: pgRouting-concepts.rst + :start-after: degree_from_table_start + :end-before: degree_from_table_end + +Finding linear vertices +............................................................................... + +The degree of a linear vertex is 2. + +If there is a vertices table already built using the ``pgr_extractVertices`` + +.. include:: pgRouting-concepts.rst + :start-after: linear_degree_from_table_start + :end-before: linear_degree_from_table_end + +See Also +------------------------------------------------------------------------------- + +* :doc:`topology-functions` +* :doc:`pgr_extractVertices` + +.. rubric:: Indices and tables + +* :ref:`genindex` +* :ref:`search` diff --git a/doc/ordering/ordering-family.rst b/doc/ordering/ordering-family.rst index 272780d1401..04cd2677b07 100644 --- a/doc/ordering/ordering-family.rst +++ b/doc/ordering/ordering-family.rst @@ -14,8 +14,6 @@ Ordering - Family of functions =============================================================================== -.. rubric:: Experimental - .. include:: experimental.rst :start-after: warning-begin :end-before: end-warning diff --git a/doc/spanningTree/kruskal-family.rst b/doc/spanningTree/kruskal-family.rst index eea7f750b65..8b182ae71df 100644 --- a/doc/spanningTree/kruskal-family.rst +++ b/doc/spanningTree/kruskal-family.rst @@ -44,7 +44,7 @@ two trees in the forest. .. kruskal-description-start -.. include:: spanningTree-family.rst +.. include:: spanningTree-category.rst :start-after: spanntree_traits_start :end-before: spanntree_traits_end @@ -63,7 +63,7 @@ Inner Queries See Also ------------------------------------------------------------------------------- -* :doc:`spanningTree-family` +* :doc:`spanningTree-category` * `Boost: Kruskal's algorithm `__ * `Boost: Prim's algorithm `__ * `Wikipedia: Kruskal's algorithm `__ diff --git a/doc/spanningTree/pgr_kruskal.rst b/doc/spanningTree/pgr_kruskal.rst index 2b2a6855e54..f1f60944733 100644 --- a/doc/spanningTree/pgr_kruskal.rst +++ b/doc/spanningTree/pgr_kruskal.rst @@ -86,7 +86,7 @@ Result columns See Also ------------------------------------------------------------------------------- -* :doc:`spanningTree-family` +* :doc:`spanningTree-category` * :doc:`kruskal-family` * :doc:`sampledata` * `Boost: Kruskal's algorithm diff --git a/doc/spanningTree/pgr_kruskalBFS.rst b/doc/spanningTree/pgr_kruskalBFS.rst index 2e2114f0c99..6b7fe05e707 100644 --- a/doc/spanningTree/pgr_kruskalBFS.rst +++ b/doc/spanningTree/pgr_kruskalBFS.rst @@ -132,7 +132,7 @@ Result columns See Also ------------------------------------------------------------------------------- -* :doc:`spanningTree-family` +* :doc:`spanningTree-category` * :doc:`kruskal-family` * :doc:`sampledata` * `Boost: Kruskal's algorithm diff --git a/doc/spanningTree/pgr_kruskalDD.rst b/doc/spanningTree/pgr_kruskalDD.rst index 43d6bd0e056..48e712e464c 100644 --- a/doc/spanningTree/pgr_kruskalDD.rst +++ b/doc/spanningTree/pgr_kruskalDD.rst @@ -133,7 +133,7 @@ Result columns See Also ------------------------------------------------------------------------------- -* :doc:`spanningTree-family` +* :doc:`spanningTree-category` * :doc:`kruskal-family` * :doc:`sampledata` * `Boost: Kruskal's algorithm diff --git a/doc/spanningTree/pgr_kruskalDFS.rst b/doc/spanningTree/pgr_kruskalDFS.rst index 31fc9be98b0..5def6ca23c4 100644 --- a/doc/spanningTree/pgr_kruskalDFS.rst +++ b/doc/spanningTree/pgr_kruskalDFS.rst @@ -135,7 +135,7 @@ Result columns See Also ------------------------------------------------------------------------------- -* :doc:`spanningTree-family` +* :doc:`spanningTree-category` * :doc:`kruskal-family` * :doc:`sampledata` * `Boost: Kruskal's algorithm diff --git a/doc/spanningTree/pgr_prim.rst b/doc/spanningTree/pgr_prim.rst index d67df544fbb..12250007435 100644 --- a/doc/spanningTree/pgr_prim.rst +++ b/doc/spanningTree/pgr_prim.rst @@ -88,7 +88,7 @@ Result columns See Also ------------------------------------------------------------------------------- -* :doc:`spanningTree-family` +* :doc:`spanningTree-category` * :doc:`prim-family` * :doc:`sampledata` * `Boost: Prim's algorithm documentation diff --git a/doc/spanningTree/pgr_primBFS.rst b/doc/spanningTree/pgr_primBFS.rst index 34a0fdac876..3cf9c4cdb6e 100644 --- a/doc/spanningTree/pgr_primBFS.rst +++ b/doc/spanningTree/pgr_primBFS.rst @@ -134,7 +134,7 @@ Result columns See Also ------------------------------------------------------------------------------- -* :doc:`spanningTree-family` +* :doc:`spanningTree-category` * :doc:`prim-family` * :doc:`sampledata` * `Boost: Prim's algorithm diff --git a/doc/spanningTree/pgr_primDD.rst b/doc/spanningTree/pgr_primDD.rst index 5cd56315e57..a0196cc2b64 100644 --- a/doc/spanningTree/pgr_primDD.rst +++ b/doc/spanningTree/pgr_primDD.rst @@ -132,7 +132,7 @@ Result columns See Also ------------------------------------------------------------------------------- -* :doc:`spanningTree-family` +* :doc:`spanningTree-category` * :doc:`prim-family` * :doc:`sampledata` * `Boost: Prim's algorithm diff --git a/doc/spanningTree/pgr_primDFS.rst b/doc/spanningTree/pgr_primDFS.rst index 5d7231539db..1b32d3b37ec 100644 --- a/doc/spanningTree/pgr_primDFS.rst +++ b/doc/spanningTree/pgr_primDFS.rst @@ -134,7 +134,7 @@ Result columns See Also ------------------------------------------------------------------------------- -* :doc:`spanningTree-family` +* :doc:`spanningTree-category` * :doc:`prim-family` * :doc:`sampledata` * `Boost: Prim's algorithm diff --git a/doc/spanningTree/prim-family.rst b/doc/spanningTree/prim-family.rst index 97d2f80a3f0..229ed80faeb 100644 --- a/doc/spanningTree/prim-family.rst +++ b/doc/spanningTree/prim-family.rst @@ -55,7 +55,7 @@ forest. .. prim-description-start -.. include:: spanningTree-family.rst +.. include:: spanningTree-category.rst :start-after: spanntree_traits_start :end-before: spanntree_traits_end @@ -78,7 +78,7 @@ Inner Queries See Also ------------------------------------------------------------------------------- -* :doc:`spanningTree-family` +* :doc:`spanningTree-category` * Boost: `Prim's algorithm `__ * Wikipedia: `Prim's algorithm diff --git a/doc/src/experimental.rst b/doc/src/experimental.rst index 97940012918..495c906dba6 100644 --- a/doc/src/experimental.rst +++ b/doc/src/experimental.rst @@ -14,27 +14,29 @@ Experimental Functions .. warning-begin -.. warning:: Possible server crash +.. collapse:: Experimental - - These functions might create a server crash + .. warning:: Possible server crash -.. warning:: Experimental functions + - These functions might create a server crash - - They are not officially of the current release. - - They likely will not be officially be part of the next release: + .. warning:: Experimental functions - - The functions might not make use of ANY-INTEGER and ANY-NUMERICAL - - Name might change. - - Signature might change. - - Functionality might change. - - pgTap tests might be missing. - - Might need c/c++ coding. - - May lack documentation. - - Documentation if any might need to be rewritten. - - Documentation examples might need to be automatically generated. - - Might need a lot of feedback from the comunity. - - Might depend on a proposed function of pgRouting - - Might depend on a deprecated function of pgRouting + - They are not officially of the current release. + - They likely will not be officially be part of the next release: + + - The functions might not make use of ANY-INTEGER and ANY-NUMERICAL + - Name might change. + - Signature might change. + - Functionality might change. + - pgTap tests might be missing. + - Might need c/c++ coding. + - May lack documentation. + - Documentation if any might need to be rewritten. + - Documentation examples might need to be automatically generated. + - Might need a lot of feedback from the community. + - Might depend on a proposed function of pgRouting + - Might depend on a deprecated function of pgRouting .. end-warning @@ -101,7 +103,6 @@ Experimental Functions transformation-family components-family ordering-family - metrics-family .. rubric:: categories @@ -138,7 +139,7 @@ Experimental Functions pgr_isPlanar -.. rubric:: Miscellaneous Algoritms +.. rubric:: Miscellaneous Algorithms - :doc:`pgr_lengauerTarjanDominatorTree` - :doc:`pgr_stoerWagner` diff --git a/doc/src/pgRouting-concepts.rst b/doc/src/pgRouting-concepts.rst index 07177a3b5e9..6ae64e634d6 100644 --- a/doc/src/pgRouting-concepts.rst +++ b/doc/src/pgRouting-concepts.rst @@ -830,23 +830,62 @@ the number of dead ends and/or the number of linear edges. A complete method on how to contract and how to use the contracted graph is described on :doc:`contraction-family` -.. degree_from_table_start Dead ends +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +.. degree_from_table_start + To get the dead ends: .. literalinclude:: concepts.queries :start-after: -- contract1 :end-before: -- contract2 -That information is correct, for example, when the dead end is on the limit of -the imported graph. +A dead end happens when + +- The vertex is the limit of a cul-de-sac, a no-through road or a no-exit + road. +- The vertex is on the limit of the imported graph. -Visually node :math:`4` looks to be as start/ending of 3 edges, but it is not. + - If a larger graph is imported then the vertex might not be a dead end -Is that correct? +Node :math:`4`, is a dead end on the query, even that it visually looks like an +end point of 3 edges. + +.. image:: images/Fig1-originalData.png + :scale: 20% + +.. rubric:: Is node :math:`4` a dead end or not? + +.. graphviz:: + + graph G { + 1,2,4,5,9,13,14 [shape=circle;style=filled;color=lightgreen;fontsize=8;width=0.3;fixedsize=true]; + 3,6,7,8,10,11,12,15,16,17 [shape=circle;style=filled;color=cyan;fontsize=8;width=0.3;fixedsize=true]; + + 5 -- 6 [label="1",fontsize=8]; 6 -- 10 [label="2",fontsize=8]; + 10 -- 15 [label="3",fontsize=8]; 6 -- 7 [label="4",fontsize=8]; + 10 -- 11 [label="5",fontsize=8]; 1 -- 3 [label="6",fontsize=8]; + 3 -- 7 [label="7",fontsize=8]; 7 -- 11 [label="8",fontsize=8]; + 11 -- 16 [label="9",fontsize=8]; 7 -- 8 [label="10",fontsize=8]; + 11 -- 12 [label="11",fontsize=8]; 8 -- 12 [label="12",fontsize=8]; + 12 -- 17 [label="13",fontsize=8]; 8 -- 9 [label="",fontsize=8]; + 16 -- 17 [label="15",fontsize=8]; 15 -- 16 [label="16",fontsize=8]; + 2 -- 4 [label="17",fontsize=8]; 13 -- 14 [label="18",fontsize=8]; + + 1 [pos="0,2!"]; 2 [pos="0.5,3.5!"]; + 3 [pos="1,2!"]; 4 [pos="2,3.5!"]; + 5 [pos="2,0!"]; 6 [pos="2,1!"]; + 7 [pos="2,2!"]; 8 [pos="2,3!"]; + 9 [pos="2,4!"]; 10 [pos="3,1!"]; + 11 [pos="3,2!"]; 12 [pos="3,3!"]; + 13 [pos="3.5,2.3!"]; 14 [pos="3.5,4!"]; + 15 [pos="4,1!"]; 16 [pos="4,2!"]; + 17 [pos="4,3!"]; + } + +The answer to that question will depend on the application. * Is there such a small curb: @@ -859,25 +898,59 @@ Is that correct? * Is there a big cliff and from eagles view look like the dead end is close to the segment? -When there are many dead ends, to speed up, the :doc:`contraction-family` -functions can be used to divide the problem. +Depending on the answer, modification of the data might be needed. + +When there are many dead ends, to speed up processing, the :doc:`contraction-family` +functions can be used to contract the graph. + +.. degree_from_table_end Linear edges +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +.. linear_degree_from_table_start + To get the linear edges: .. literalinclude:: concepts.queries :start-after: -- contract2 :end-before: -- contract3 -This information is correct, for example, when the application is taking into -account speed bumps, stop signals. +.. graphviz:: -When there are many linear edges, to speed up, the :doc:`contraction-family` -functions can be used to divide the problem. + graph G { + 3,15,17 [shape=circle;style=filled;color=lightgreen;fontsize=8;width=0.3;fixedsize=true]; + 1,2,4,5,6,7,8,9,10,11,12,13,14,16 [shape=circle;style=filled;color=cyan;fontsize=8;width=0.3;fixedsize=true]; + + 5 -- 6 [label="1",fontsize=8]; 6 -- 10 [label="2",fontsize=8]; + 10 -- 15 [label="3",fontsize=8]; 6 -- 7 [label="4",fontsize=8]; + 10 -- 11 [label="5",fontsize=8]; 1 -- 3 [label="6",fontsize=8]; + 3 -- 7 [label="7",fontsize=8]; 7 -- 11 [label="8",fontsize=8]; + 11 -- 16 [label="9",fontsize=8]; 7 -- 8 [label="10",fontsize=8]; + 11 -- 12 [label="11",fontsize=8]; 8 -- 12 [label="12",fontsize=8]; + 12 -- 17 [label="13",fontsize=8]; 8 -- 9 [label="",fontsize=8]; + 16 -- 17 [label="15",fontsize=8]; 15 -- 16 [label="16",fontsize=8]; + 2 -- 4 [label="17",fontsize=8]; 13 -- 14 [label="18",fontsize=8]; + + 1 [pos="0,2!"]; 2 [pos="0.5,3.5!"]; + 3 [pos="1,2!"]; 4 [pos="2,3.5!"]; + 5 [pos="2,0!"]; 6 [pos="2,1!"]; + 7 [pos="2,2!"]; 8 [pos="2,3!"]; + 9 [pos="2,4!"]; 10 [pos="3,1!"]; + 11 [pos="3,2!"]; 12 [pos="3,3!"]; + 13 [pos="3.5,2.3!"]; 14 [pos="3.5,4!"]; + 15 [pos="4,1!"]; 16 [pos="4,2!"]; + 17 [pos="4,3!"]; + } -.. degree_from_table_end +These linear vertices are correct, for example, when those the vertices are speed +bumps, stop signals and the application is taking them into account. + +When there are many linear vertices, that need not to be taken into account, to +speed up the processing, the :doc:`contraction-family` functions can be used to +contract the problem. + +.. linear_degree_from_table_end Function's structure ------------------------------------------------------------------------------- @@ -889,7 +962,7 @@ The general form of a pgRouting function call is: .. admonition:: \ \ :class: signatures - pgr_(`Inner queries`_, **parameters**, [ ``Optional parameters``) + pgr_(`Inner queries`_, **parameters**, [ ``Optional parameters``) Where: @@ -1896,10 +1969,18 @@ To get faster results bound the queries to an area of interest of routing. In this example Use an inner query SQL that does not include some edges in the routing function and is within the area of the results. +Given this area: + .. literalinclude:: concepts.queries :start-after: -- performance1 :end-before: -- performance2 +Calculate a route: + +.. literalinclude:: concepts.queries + :start-after: -- performance2 + :end-before: -- performance3 + How to contribute ------------------------------------------------------------------------------- @@ -1917,7 +1998,7 @@ How to contribute * `Example `__ -.. rubric:: Adding Functionaity to pgRouting +.. rubric:: Adding Functionality to pgRouting Consult the `developer's documentation diff --git a/doc/src/proposed.rst b/doc/src/proposed.rst index 6b67f28f4d4..aa84255963d 100644 --- a/doc/src/proposed.rst +++ b/doc/src/proposed.rst @@ -15,17 +15,19 @@ Proposed Functions .. warning-begin -.. warning:: Proposed functions for next mayor release. +.. collapse:: Proposed - - They are not officially in the current release. - - They will likely officially be part of the next mayor release: + .. warning:: Proposed functions for next mayor release. - - The functions make use of ANY-INTEGER and ANY-NUMERICAL - - Name might not change. (But still can) - - Signature might not change. (But still can) - - Functionality might not change. (But still can) - - pgTap tests have being done. But might need more. - - Documentation might need refinement. + - They are not officially in the current release. + - They will likely officially be part of the next mayor release: + + - The functions make use of ANY-INTEGER and ANY-NUMERICAL + - Name might not change. (But still can) + - Signature might not change. (But still can) + - Functionality might not change. (But still can) + - pgTap tests have being done. But might need more. + - Documentation might need refinement. .. end-warning @@ -54,12 +56,6 @@ Proposed Functions TRSP-family -:doc:`topology-functions` - -.. include:: topology-functions.rst - :start-after: proposed-start - :end-before: proposed-end - :doc:`transformation-family` .. include:: transformation-family.rst @@ -130,15 +126,6 @@ Proposed Functions via-category withPoints-category -.. rubric:: Utilities Category - -:doc:`pgr_findCloseEdges` - -.. toctree:: - :hidden: - - pgr_findCloseEdges - See Also ------------------------------------------------------------------------------- diff --git a/doc/src/release_notes.rst b/doc/src/release_notes.rst index f357d14c287..56044e790a9 100644 --- a/doc/src/release_notes.rst +++ b/doc/src/release_notes.rst @@ -123,6 +123,38 @@ pgRouting 3 :local: :depth: 1 +pgRouting 3.8 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +.. contents:: Contents + :local: + :depth: 1 + +.. current + +pgRouting 3.8.0 Release Notes +------------------------------------------------------------------------------- + +.. rubric:: Promotion to official function of pgRouting. + +* pgr_extractVertices + + .. include:: pgr_extractVertices.rst + :start-after: Version 3.8.0 + :end-before: .. rubric + +* pgr_degree + + .. include:: pgr_degree.rst + :start-after: Version 3.8.0 + :end-before: .. rubric + +* pgr_findCloseEdges + + .. include:: pgr_findCloseEdges.rst + :start-after: Version 3.8.0 + :end-before: .. rubric + pgRouting 3.7 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -202,7 +234,7 @@ milestone for 3.7.0 .. rubric:: Official functions changes -* `#2605 `__ Standarize +* `#2605 `__ Standardize spanning tree functions output * Functions: @@ -324,33 +356,33 @@ milestone for 3.6.0 .. rubric:: Official functions changes -* `#2516 `__ Standarize output +* `#2516 `__ Standardize output pgr_aStar - * Standarizing output columns to |short-generic-result| + * Standardize 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 `__ Standarize output +* `#2523 `__ Standardize output pgr_bdAstar - * Standarizing output columns to |short-generic-result| + * Standardize 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 `__ Standarize output +* `#2547 `__ Standardize output and modifying signature pgr_KSP .. include:: pgr_KSP.rst :start-after: Version 3.6.0 :end-before: .. rubric -* `#2548 `__ Standarize output +* `#2548 `__ Standardize output pgr_drivingDistance .. include:: pgr_drivingDistance.rst @@ -359,14 +391,14 @@ milestone for 3.6.0 .. rubric:: Proposed functions changes -* `#2544 `__ Standarize output +* `#2544 `__ Standardize output and modifying signature pgr_withPointsDD .. include:: pgr_withPointsDD.rst :start-after: Version 3.6.0 :end-before: .. rubric -* `#2546 `__ Standarize output +* `#2546 `__ Standardize output and modifying signature pgr_withPointsKSP .. include:: pgr_withPointsKSP.rst @@ -395,9 +427,9 @@ milestone for 3.6.0 * `#2490 `__ Automatic page history links. -* ..rubric:: SQL standarization +* ..rubric:: Standardize SQL -* `#2555 `__ standarize +* `#2555 `__ Standardize deprecated messages * On new internal function: do not use named parameters and default parameters. @@ -461,7 +493,7 @@ milestone for 3.5.0 * Dijkstra - * Standarizing output columns to |short-generic-result| + * Standardize 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. diff --git a/doc/src/routingFunctions.rst b/doc/src/routingFunctions.rst index b8579f25722..86708040472 100644 --- a/doc/src/routingFunctions.rst +++ b/doc/src/routingFunctions.rst @@ -71,6 +71,12 @@ Function Families :start-after: official-start :end-before: official-end +:doc:`metrics-family` + +.. include:: metrics-family.rst + :start-after: official-start + :end-before: official-end + :doc:`prim-family` .. include:: prim-family.rst @@ -97,6 +103,9 @@ Function Families :doc:`pgr_trsp` - Turn Restriction Shortest Path (TRSP) +.. rubric:: Utilities family + +:doc:`pgr_findCloseEdges` Functions by categories =============================================================================== @@ -126,9 +135,9 @@ Functions by categories :start-after: official-start :end-before: official-end -:doc:`spanningTree-family` +:doc:`spanningTree-category` -.. include:: spanningTree-family.rst +.. include:: spanningTree-category.rst :start-after: official-start :end-before: official-end @@ -158,10 +167,12 @@ Functions by categories dijkstra-family flow-family kruskal-family + metrics-family prim-family reference topology-functions TSP-family + pgr_findCloseEdges .. toctree:: :hidden: @@ -172,7 +183,7 @@ Functions by categories DFS-category drivingDistance-category KSP-category - spanningTree-family + spanningTree-category via-category VRP-category withPoints-category diff --git a/doc/src/sampledata.rst b/doc/src/sampledata.rst index 7535489873a..cc496274315 100644 --- a/doc/src/sampledata.rst +++ b/doc/src/sampledata.rst @@ -15,8 +15,8 @@ Sample Data 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. +To be able to execute the majority of the examples queries, follow the +instructions below. .. contents:: :local: @@ -31,7 +31,7 @@ The following city is to be inserted into the database: .. figure:: /images/Fig1-originalData.png 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. +capacity values, category values and some locations that are not in the graph. The process to have working topology starts by inserting the edges. After that everything else is calculated. @@ -40,9 +40,9 @@ Edges ............................................................................... The database design for the documentation of pgRouting, keeps in the same row 2 -segments, one in the direction of the geometry and the second in the oposite -direction. Therfore some information has the ``reverse_`` prefix which -corresponds to the segment on the oposite direction of the geometry. +segments, one in the direction of the geometry and the second in the opposite +direction. Therefore some information has the ``reverse_`` prefix which +corresponds to the segment on the opposite direction of the geometry. .. list-table:: :width: 81 @@ -72,12 +72,12 @@ corresponds to the segment on the oposite direction of the geometry. * - ``x1`` - :math:`x` coordinate of the starting vertex of the geometry. - - For convinience it is saved on the table but can be calculated as + - For convenience it is saved on the table but can be calculated as ``ST_X(ST_StartPoint(geom))``. * - ``y2`` - :math:`y` coordinate of the ending vertex of the geometry. - - For convinience it is saved on the table but can be calculated as + - For convenience it is saved on the table but can be calculated as ``ST_Y(ST_EndPoint(geom))``. * - ``geom`` - The geometry of the segments. @@ -96,11 +96,11 @@ Starting on PostgreSQL 12:: ... Optionally indexes on different columns can be created. -The recomendation is to have +The recommendation is to have * ``id`` indexed. * ``source`` and ``target`` columns indexed to speed up pgRouting queries. -* ``geom`` indexed to speed up gemetry processes that might be needed in the +* ``geom`` indexed to speed up geometry processes that might be needed in the front end. For this small example the indexes are skipped, except for ``id`` @@ -197,27 +197,53 @@ will be stored on a table. * - ``pid`` - A unique identifier. * - ``edge_id`` - - Identifier of the edge nearest edge that allows an arrival to the point. + - Identifier of the nearest segment. * - ``side`` - - Is it on the left, right or both sides of the segment ``edge_id`` + - Is it on the left, right or both sides of the segment ``edge_id``. * - ``fraction`` - Where in the segment is the point located. * - ``geom`` - The geometry of the points. + * - ``distance`` + - The distance between ``geom`` and the segment ``edge_id``. + * - ``edge`` + - A segment that connects the ``geom`` of the point to the closest point + on the segment ``edge_id``. * - ``newPoint`` - - The geometry of the points moved on top of the segment. + - A point on segment ``edge_id`` that is the closest to ``geom``. .. literalinclude:: sampledata.queries :start-after: -- p1 :end-before: -- p2 -Points of interest fillup +Points of interest fill up +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +Inserting the points of interest. + .. literalinclude:: sampledata.queries :start-after: -- p2 :end-before: -- p3 +Filling the rest of the table. + +.. literalinclude:: sampledata.queries + :start-after: -- p3 + :end-before: -- p4 + +Any other additional modification: In this manual, point :math:`6` can be +reached from both sides. + +.. literalinclude:: sampledata.queries + :start-after: -- p4 + :end-before: -- p5 + +The points of interest: + +.. literalinclude:: sampledata.queries + :start-after: -- p6 + :end-before: -- p7 + .. pois_end Support tables @@ -229,7 +255,7 @@ Combinations Many functions can be used with a combinations of ``(source, target)`` pairs when wanting a route from ``source`` to ``target``. -For convinence of this documentations, some combinations will be stored on a +For convenience of this documentation, some combinations will be stored on a table: .. literalinclude:: sampledata.queries @@ -347,7 +373,7 @@ https://www.sintef.no/projectweb/top/pdptw/li-lim-benchmark/ The vehicles ............................................................................... -There are 25 vehciles in the problem all with the same characteristics. +There are 25 vehicles in the problem all with the same characteristics. .. literalinclude:: lc101.queries :start-after: -- q1 @@ -366,7 +392,7 @@ order. The orders ............................................................................... -The original data needs to be converted to an appropiate table: +The original data needs to be converted to an appropriate table: .. literalinclude:: lc101.queries :start-after: -- q3 diff --git a/doc/topology/CMakeLists.txt b/doc/topology/CMakeLists.txt index 6f5b114abf2..332f7a90bbd 100644 --- a/doc/topology/CMakeLists.txt +++ b/doc/topology/CMakeLists.txt @@ -7,7 +7,6 @@ SET(LOCAL_FILES pgr_createVerticesTable.rst pgr_extractVertices.rst topology-functions.rst - pgr_degree.rst ) foreach (f ${LOCAL_FILES}) diff --git a/doc/topology/pgr_degree.rst b/doc/topology/pgr_degree.rst deleted file mode 100644 index 8eea85a7df0..00000000000 --- a/doc/topology/pgr_degree.rst +++ /dev/null @@ -1,199 +0,0 @@ -.. - **************************************************************************** - 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/ - **************************************************************************** - -.. index:: - single: Topology Family ; pgr_degree - Proposed - single: degree - Proposed on v3.4 - -| - -``pgr_degree`` -- Proposed -=============================================================================== - -``pgr_degree`` — For each vertex in an undirected graph, return the count of edges incident to the vertex. - - -.. include:: proposed.rst - :start-after: warning-begin - :end-before: end-warning - -.. rubric:: Availability - -* Version 3.4.0 - - * New proposed function. - - -Description -------------------------------------------------------------------------------- - -Calculates the degree of the vertices of an **undirected** graph - - -|Boost| Boost Graph Inside - -Signatures -------------------------------------------------------------------------------- - -.. admonition:: \ \ - :class: signatures - - | pgr_degree(`Edges SQL`_ , `Vertex SQL`_, [``dryrun``]) - - | RETURNS SETOF |result-degree| - | OR EMTPY SET - -:Example: Extracting the vertex information - -pgr_degree can utilize output from `pgr_extractVertices` or can have `pgr_extractVertices` embedded in the call. -For decent size networks, it is best to prep your vertices table before hand and use that vertices table -for pgr_degree calls. - -.. literalinclude:: degree.queries - :start-after: -- q1 - :end-before: -- q2 - - -Parameters -------------------------------------------------------------------------------- - -============== ======== ================================ -Parameter Type Description -============== ======== ================================ -`Edges SQL`_ ``TEXT`` `Edges SQL`_ as described below -`Vertex SQL`_ ``TEXT`` `Vertex SQL`_ as described below -============== ======== ================================ - -Optional parameters -------------------------------------------------------------------------------- - -.. TODO move to pgRouting concepts - -=========== ============= ========== ======================================= -Parameter Type Default Description -=========== ============= ========== ======================================= -``dryrun`` ``BOOLEAN`` ``false`` * When true do not process and get in a - NOTICE the resulting query. -=========== ============= ========== ======================================= - -Inner Queries -------------------------------------------------------------------------------- - -.. contents:: - :local: - -Edges SQL -............................................................................... - -.. TODO move to pgRouting concepts - -================= =================== =================================== -Column Type Description -================= =================== =================================== -``id`` ``BIGINT`` Identifier of the edge. -================= =================== =================================== - -Vertex SQL -............................................................................... - -.. TODO move to pgRouting concepts - -.. list-table:: - :width: 81 - :widths: auto - :header-rows: 1 - - * - Column - - Type - - Description - * - ``id`` - - ``BIGINT`` - - Identifier of the first end point vertex of the edge. - * - ``in_edges`` - - ``BIGINT[]`` - - Array of identifiers of the edges that have the vertex ``id`` as *first - end point*. - - * When missing, ``out_edges`` must exist. - * - ``out_edges`` - - ``BIGINT[]`` - - Array of identifiers of the edges that have the vertex ``id`` as *second - end point*. - - * When missing, ``in_edges`` must exist. - - -Result columns -------------------------------------------------------------------------------- - -.. TODO move to pgRouting concepts - -.. list-table:: - :width: 81 - :widths: auto - :header-rows: 1 - - * - Column - - Type - - Description - * - ``node`` - - ``BIGINT`` - - Vertex identifier - * - ``degree`` - - ``BIGINT`` - - Number of edges that are incident to the vertex ``id`` - -Additional Examples -------------------------------------------------------------------------------- - -.. contents:: - :local: - -Degree of a sub graph -............................................................................... - -.. literalinclude:: degree.queries - :start-after: -- q2 - :end-before: -- q3 - -Dry run execution -............................................................................... - -To get the query generated used to get the vertex information, use ``dryrun => -true``. - -The results can be used as base code to make a refinement based on the backend -development needs. - -.. literalinclude:: degree.queries - :start-after: -- q3 - :end-before: -- q4 - -Degree from an existing table -............................................................................... -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. - - -.. include:: pgRouting-concepts.rst - :start-after: degree_from_table_start - :end-before: degree_from_table_end - - -See Also -------------------------------------------------------------------------------- - -* :doc:`topology-functions` -* :doc:`pgr_extractVertices` - -.. rubric:: Indices and tables - -* :ref:`genindex` -* :ref:`search` diff --git a/doc/topology/pgr_extractVertices.rst b/doc/topology/pgr_extractVertices.rst index 2787f5c7192..d0e0e5c42fb 100644 --- a/doc/topology/pgr_extractVertices.rst +++ b/doc/topology/pgr_extractVertices.rst @@ -9,29 +9,29 @@ .. index:: single: Topology Family ; pgr_extractVertices - single: extractVertices - Proposed on v3.3 + single: extractVertices | -``pgr_extractVertices`` -- Proposed +``pgr_extractVertices`` =============================================================================== ``pgr_extractVertices`` — Extracts the vertices information +.. rubric:: Availability -.. include:: proposed.rst - :start-after: warning-begin - :end-before: end-warning +.. rubric:: Version 3.8.0 -.. rubric:: Availability +* Error messages adjustment. +* Function promoted to official. -* Version 3.3.0 +.. rubric:: Version 3.3.0 - * Classified as **proposed** function +* Function promoted to proposed. -* Version 3.0.0 +.. rubric:: Version 3.0.0 - * New experimental function. +* New experimental function. Description diff --git a/doc/topology/topology-functions.rst b/doc/topology/topology-functions.rst index 41c2563e331..d44694828ce 100644 --- a/doc/topology/topology-functions.rst +++ b/doc/topology/topology-functions.rst @@ -34,6 +34,8 @@ have special permissions given by the administrators to use them. table. - :doc:`pgr_analyzeOneWay` - to analyze directionality of the edges. - :doc:`pgr_nodeNetwork` - to create nodes to a not noded edge table. +- :doc:`pgr_extractVertices` - Extracts vertex information based on the edge + table information. .. official-end @@ -48,21 +50,6 @@ Additional functions to analyze a graph: * :doc:`components-family` - -.. rubric:: Proposed - -.. include:: proposed.rst - :start-after: warning-begin - :end-before: end-warning - -.. proposed-start - -These proposed functions do not modify the database. - -- :doc:`pgr_degree` - Returns a set of vertices and corresponding count of incidet edges to the vertex. -- :doc:`pgr_extractVertices` - Extracts vertex information based on the edge - table information. - .. proposed-end .. toctree:: @@ -74,7 +61,6 @@ These proposed functions do not modify the database. pgr_analyzeOneWay pgr_nodeNetwork pgr_extractVertices - pgr_degree See Also ------------------------------------------------------------------------------- diff --git a/doc/traversal/traversal-family.rst b/doc/traversal/traversal-family.rst index ea986999aed..ec3be222f37 100644 --- a/doc/traversal/traversal-family.rst +++ b/doc/traversal/traversal-family.rst @@ -14,8 +14,6 @@ Traversal - Family of functions =============================================================================== -.. rubric:: Proposed - .. include:: proposed.rst :start-after: warning-begin :end-before: end-warning @@ -26,8 +24,6 @@ Traversal - Family of functions .. official-end -.. rubric:: Experimental - .. include:: experimental.rst :start-after: warning-begin :end-before: end-warning @@ -40,7 +36,7 @@ Traversal - Family of functions .. experimental-end -Aditionaly there are 2 categories under this family +Additionally there are 2 categories under this family * :doc:`BFS-category` * :doc:`DFS-category` diff --git a/doc/trsp/TRSP-family.rst b/doc/trsp/TRSP-family.rst index ceb782c39f9..f0e2c17044a 100644 --- a/doc/trsp/TRSP-family.rst +++ b/doc/trsp/TRSP-family.rst @@ -16,8 +16,6 @@ TRSP - Family of functions When points are also given as input: -.. rubric:: Proposed - .. include:: proposed.rst :start-after: warning-begin :end-before: end-warning @@ -34,8 +32,6 @@ When points are also given as input: .. Warning:: Read the :doc:`migration` about how to migrate from the deprecated TRSP functionality to the new signatures or replacement functions. -.. rubric:: Experimental - .. include:: experimental.rst :start-after: warning-begin :end-before: end-warning diff --git a/doc/tsp/pgr_TSP.rst b/doc/tsp/pgr_TSP.rst index 53d059e1640..28feb2bc26d 100644 --- a/doc/tsp/pgr_TSP.rst +++ b/doc/tsp/pgr_TSP.rst @@ -16,7 +16,7 @@ ``pgr_TSP`` =============================================================================== -* ``pgr_TSP`` - Aproximation using *metric* algorithm. +* ``pgr_TSP`` - Approximation using *metric* algorithm. .. rubric:: Availability: diff --git a/doc/tsp/pgr_TSPeuclidean.rst b/doc/tsp/pgr_TSPeuclidean.rst index 06c7cfd3424..8de9f3817c6 100644 --- a/doc/tsp/pgr_TSPeuclidean.rst +++ b/doc/tsp/pgr_TSPeuclidean.rst @@ -16,7 +16,7 @@ ``pgr_TSPeuclidean`` ============================================================================= -* ``pgr_TSPeuclidean`` - Aproximation using *metric* algorithm. +* ``pgr_TSPeuclidean`` - Approximation using *metric* algorithm. .. rubric:: Availability: diff --git a/doc/utilities/pgr_findCloseEdges.rst b/doc/utilities/pgr_findCloseEdges.rst index 87f2a4284cf..502ab2989d3 100644 --- a/doc/utilities/pgr_findCloseEdges.rst +++ b/doc/utilities/pgr_findCloseEdges.rst @@ -8,21 +8,27 @@ **************************************************************************** .. index:: - single: Utilities ; pgr_findCloseEdges - Proposed + single: Utilities ; pgr_findCloseEdges single: findCloseEdges | -``pgr_findCloseEdges`` - Proposed +``pgr_findCloseEdges`` =============================================================================== ``pgr_findCloseEdges`` - Finds the close edges to a point geometry. .. rubric:: Availability -* Version 3.4.0 +.. rubric:: Version 3.8.0 - * New proposed function. +* Error messages adjustment. +* ``partial`` option is removed. +* Function promoted to official. + +.. rubric:: Version 3.4.0 + +* New proposed function. Description ------------------------------------------------------------------------------- @@ -33,7 +39,7 @@ point geometry. * The geometries must be in the same coordinate system (have the same SRID). * The code to do the calculations can be obtained for further specific adjustments needed by the application. -* ``EMTPY SET`` is returned on dryrun executions +* ``EMPTY SET`` is returned on dryrun executions |Boost| Boost Graph Inside @@ -47,13 +53,13 @@ Signatures | pgr_findCloseEdges(`Edges SQL`_, **point**, **tolerance**, [**options**]) | pgr_findCloseEdges(`Edges SQL`_, **points**, **tolerance**, [**options**]) - | **options:** ``[cap, partial, dryrun]`` + | **options:** ``[cap, dryrun]`` | Returns set of |result-find| | OR EMPTY SET .. index:: - single: findCloseEdges - Proposed ; One point - Proposed on 3.4 + single: findCloseEdges ; One point One point ............................................................................... @@ -62,33 +68,21 @@ One point :class: signatures | pgr_findCloseEdges(`Edges SQL`_, **point**, **tolerance**, [**options**]) - | **options:** ``[cap, partial, dryrun]`` + | **options:** ``[cap, dryrun]`` | Returns set of |result-find| | OR EMPTY SET -:Example: With default values - -* Default: ``cap => 1`` - - * Maximum one row answer. -* Default: ``partial => true`` +:Example: Get two close edges to points of interest with :math:`pid = 5` - * With less calculations as possible. -* Default: ``dryrun => false`` - - * Process query -* Returns - - * values on ``edge_id``, ``fraction``, ``side`` columns. - * ``NULL`` on ``distance``, ``geom``, ``edge`` columns. +* ``cap => 2`` .. literalinclude:: findCloseEdges.queries :start-after: -- q1 :end-before: -- q2 .. index:: - single: findCloseEdges - Proposed ; Many points - Proposed on 3.4 + single: findCloseEdges ; Many points Many points ............................................................................... @@ -97,26 +91,17 @@ Many points :class: signatures | pgr_findCloseEdges(`Edges SQL`_, **points**, **tolerance**, [**options**]) - | **options:** ``[cap, partial, dryrun]`` + | **options:** ``[cap, dryrun]`` | Returns set of |result-find| | OR EMPTY SET -:Example: Find at most :math:`2` edges close to all vertices on the points of - interest table. - -One answer per point, as small as possible. +:Example: For each points of interests, find the closest edge. .. literalinclude:: findCloseEdges.queries :start-after: -- q2 :end-before: -- q3 -Columns ``edge_id``, ``fraction``, ``side`` and ``geom`` are returned with -values. - -``geom`` contains the original point geometry to assist on deterpartialing to which -point geometry the row belongs to. - Parameters ------------------------------------------------------------------------------- @@ -158,12 +143,6 @@ Optional parameters - ``INTEGER`` - :math:`1` - Limit output rows - * - ``partial`` - - ``BOOLEAN`` - - ``true`` - - * When ``true`` only columns needed for :doc:`withPoints-category` are - calculated. - * When ``false`` all columns are calculated * - ``dryrun`` - ``BOOLEAN`` - ``false`` @@ -212,127 +191,26 @@ Returns set of |result-find| * When :math:`cap = 1`, it is the closest edge. * - ``fraction`` - ``FLOAT`` - - Value in <0,1> that indicates the relative postition from the first + - Value in <0,1> that indicates the relative position from the first end-point of the edge. * - ``side`` - ``CHAR`` - Value in ``[r, l]`` indicating if the point is: - * In the right ``r``. - * In the left ``l``. + * At the right ``r`` of the segment. * When the point is on the line it is considered to be on the right. + * At the left ``l`` of the segment. * - ``distance`` - ``FLOAT`` - - Distance from point to edge. - - * ``NULL`` when ``cap = 1`` on the `One point`_ signature + - Distance from the point to the edge. * - ``geom`` - ``geometry`` - - ``POINT`` geometry - - * `One Point`_: Contains the point on the edge that is ``fraction`` away - from the starting point of the edge. - * `Many Points`_: Contains the corresponding **original point** + - Original ``POINT`` geometry. * - ``edge`` - ``geometry`` - - ``LINESTRING`` geometry from the **original point** to the closest point - of the edge with identifier ``edge_id`` - - -.. rubric:: One point results - -* The green nodes is the **original point** -* The geometry ``geom`` is a point on the :math:`sp \rightarrow ep` edge. -* The geometry ``edge`` is a line that connects the **original point** with - ``geom`` - -.. graphviz:: - - digraph G { - splines=false; - subgraph cluster0 { - point [shape=circle;style=filled;color=green]; - geom [shape=point;color=black;size=0]; - sp, ep; - - edge[weight=0]; - point -> geom [dir=none; penwidth=0, color=red]; - edge[weight=2]; - sp -> geom -> ep [dir=none;penwidth=3 ]; - - {rank=same; point, geom} - } - - subgraph cluster1 { - point1 [shape=circle;style=filled;color=green;label=point]; - geom1 [shape=point;color=deepskyblue; xlabel="geom"; width=0.3]; - sp1 [label=sp]; ep1 [label=ep]; - - edge[weight=0]; - point1 -> geom1 [weight=0, penwidth=3, color=red, - label="edge"]; - edge[weight=2]; - sp1 -> geom1 -> ep1 [dir=none;weight=1, penwidth=3 ]; - - - geom1 -> point1 [dir=none;weight=0, penwidth=0, color=red]; - {rank=same; point1, geom1} - } - } - -.. rubric:: Many point results - -* The green nodes are the **original points** -* The geometry ``geom``, marked as **g1** and **g2** are the **original - points** -* 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. - -.. graphviz:: - - digraph G { - splines = false; - subgraph cluster0 { - p1 [shape=circle;style=filled;color=green]; - g1 [shape=point;color=black;size=0]; - g2 [shape=point;color=black;size=0]; - sp, ep; - p2 [shape=circle;style=filled;color=green]; - - sp -> g1 [dir=none;weight=1, penwidth=3 ]; - g1 -> g2 [dir=none;weight=1, penwidth=3 ]; - g2 -> ep [weight=1, penwidth=3 ]; - - g2 -> p2 [dir=none;weight=0, penwidth=0, color=red, partiallen=3]; - p1 -> g1 [dir=none;weight=0, penwidth=0, color=red, partiallen=3]; - p1 -> {g1, g2} [dir=none;weight=0, penwidth=0, color=red;] - - {rank=same; p1; g1} - {rank=same; p2; g2} - } - subgraph cluster1 { - p3 [shape=circle;style=filled;color=deepskyblue;label=g1]; - g3 [shape=point;color=black;size=0]; - g4 [shape=point;color=black;size=0]; - sp1 [label=sp]; ep1 [label=ep]; - p4 [shape=circle;style=filled;color=deepskyblue;label=g2]; - - sp1 -> g3 [dir=none;weight=1, penwidth=3 ]; - g3 -> g4 [dir=none;weight=1, penwidth=3,len=10]; - g4 -> ep1 [weight=1, penwidth=3, len=10]; - - g4 -> p4 [dir=back;weight=0, penwidth=3, color=red, partiallen=3, - label="edge2"]; - p3 -> g3 [weight=0, penwidth=3, color=red, partiallen=3, - label="edge1"]; - p3 -> {g3, g4} [dir=none;weight=0, penwidth=0, color=red]; - - {rank=same; p3; g3} - {rank=same; p4; g4} - } - } + - ``LINESTRING`` geometry that connects the original **point** to the + closest point of the edge with identifier ``edge_id`` Additional Examples @@ -341,261 +219,128 @@ Additional Examples .. contents:: :local: -One point examples +One point in an edge ............................................................................... -At most two answers -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -* ``cap => 2`` - - * Maximum two row answer. -* Default: ``partial => true`` - - * With less calculations as possible. -* Default: ``dryrun => false`` - - * Process query - .. literalinclude:: findCloseEdges.queries - :start-after: -- o1 - :end-before: -- o2 - -.. rubric:: Understanding the result - -* ``NULL`` on ``geom``, ``edge`` -* ``edge_id`` identifier of the edge close to the **original point** - - * Two edges are withing :math:`0.5` distance units from the **original - point**: :math:`{5, 8}` -* For edge :math:`5`: - - * ``fraction``: The closest point from the **original point** is at the - :math:`0.8` fraction of the edge :math:`5`. - * ``side``: The **original point** is located to the left side of edge - :math:`5`. - * ``distance``: The **original point** is located :math:`0.1` length units - from edge :math:`5`. -* For edge :math:`8`: - - * ``fraction``: The closest point from the **original point** is at the - :math:`0.89..` fraction of the edge :math:`8`. - * ``side``: The **original point** is located to the right side of edge - :math:`8`. - * ``distance``: The **original point** is located :math:`0.19..` length units - from edge :math:`8`. - -One answer, all columns -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + :start-after: -- o0 + :end-before: -- o1 -* Default: ``cap => 1`` - - * Maximum one row answer. -* ``partial => false`` - - * Calculate all columns -* Default: ``dryrun => false`` - - * Process query - -.. literalinclude:: findCloseEdges.queries - :start-after: -- o2 - :end-before: -- o3 - -.. rubric:: Understanding the result - -* ``edge_id`` identifier of the edge **closest** to the **original point** +.. graphviz:: - * From all edges within :math:`0.5` distance units from the **original - point**: :math:`{5}` is the closest one. -* For edge :math:`5`: + digraph D { + subgraph cluster0 { + label="data"; + point [shape=circle;style=filled;color=green;fontsize=8;width=0.3;fixedsize=true]; + point [pos="0,1.5!"] - * ``fraction``: The closest point from the **original point** is at the - :math:`0.8` fraction of the edge :math:`5`. - * ``side``: The **original point** is located to the left side of edge - :math:`5`. - * ``distance``: The **original point** is located :math:`0.1` length units - from edge :math:`5`. - * ``geom``: Contains the geometry of the closest point on edge :math:`5` from - the **original point**. - * ``edge``: Contains the ``LINESTRING`` geometry of the **original point** to - the closest point on on edge :math:`5` ``geom`` + sp, ep [shape=circle;fontsize=8;width=0.3;fixedsize=true]; + sp[pos="2,0!"] + ep[pos="2,3!"] -At most two answers with all columns -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + sp -> ep:s + } + subgraph cluster1 { + label="results"; + geom [shape=circle;style=filled;color=green;fontsize=8;width=0.3;fixedsize=true]; + geom [pos="3,1.5!"] -* ``cap => 2`` + np11 [shape=point;color=black;size=0;fontsize=8;fixedsize=true]; + np11 [pos="5,1.5!";xlabel="fraction=0.5"]; - * Maximum two row answer. -* ``partial => false`` + sp1, ep1 [shape=circle;fontsize=8;width=0.3;fixedsize=true]; + sp1[pos="5,0!"] + ep1[pos="5,3!"] - * Calculate all columns -* Default: ``dryrun => false`` + sp1:n -> np11:s [dir=none] + np11:n -> ep1:s - * Process query + geom -> np11 [color=red,label="edge"]; + } + } -.. literalinclude:: findCloseEdges.queries - :start-after: -- o3 - :end-before: -- o4 - -.. rubric:: Understanding the result: - -* ``edge_id`` identifier of the edge close to the **original point** - - * Two edges are withing :math:`0.5` distance units from the **original - point**: :math:`{5, 8}` -* For edge :math:`5`: - - * ``fraction``: The closest point from the **original point** is at the - :math:`0.8` fraction of the edge :math:`5`. - * ``side``: The **original point** is located to the left side of edge - :math:`5`. - * ``distance``: The **original point** is located :math:`0.1` length units - from edge :math:`5`. - * ``geom``: Contains the geometry of the closest point on edge :math:`5` from - the **original point**. - * ``edge``: Contains the ``LINESTRING`` geometry of the **original point** to - the closest point on on edge :math:`5` ``geom`` -* For edge :math:`8`: - - * ``fraction``: The closest point from the **original point** is at the - :math:`0.89..` fraction of the edge :math:`8`. - * ``side``: The **original point** is located to the right side of edge - :math:`8`. - * ``distance``: The **original point** is located :math:`0.19..` length units - from edge :math:`8`. - * ``geom``: Contains the geometry of the closest point on edge :math:`8` from - the **original point**. - * ``edge``: Contains the ``LINESTRING`` geometry of the **original point** to - the closest point on on edge :math:`8` ``geom`` +* The green node is the original point. +* ``geom`` has the value of the original point. +* The geometry ``edge`` is a line that connects the original point with the edge + :math:`sp \rightarrow ep` edge. +* The point is located at the left of the edge. One point dry run execution -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -* Returns ``EMPTY SET``. - +............................................................................... -* ``partial => true`` +Using the query from the previous example: - * Is ignored - * Because it is a **dry run** excecution, the code for all calculations are - shown on the PostgreSQL ``NOTICE``. +* Returns ``EMPTY SET``. * ``dryrun => true`` - * Do not process query - * Generate a PostgreSQL ``NOTICE`` with the code used to calculate all columns - - * ``cap`` and **original point** are used in the code + * Generates a PostgreSQL ``NOTICE`` with the code used. + * The generated code can be used as a starting base code for additional + requirements, like taking into consideration the SRID. .. literalinclude:: findCloseEdges.queries :start-after: -- o5 :end-before: -- o6 -Many points examples +Many points in an edge ............................................................................... -At most two answers per point -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -* ``cap => 2`` - - * Maximum two row answer. -* Default: ``partial => true`` - - * With less calculations as possible. -* Default: ``dryrun => false`` - - * Process query +* The green nodes are the **original points** +* The geometry ``geom``, marked as **g1** and **g2** are the **original + points** +* 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. .. literalinclude:: findCloseEdges.queries - :start-after: -- m1 - :end-before: -- m2 - -.. rubric:: Understanding the result - -* ``NULL`` on ``edge`` -* ``edge_id`` identifier of the edge close to a **original point** (``geom``) - - * Two edges at most withing :math:`0.5` distance units from each of the - **original points**: - - * For ``POINT(1.8 0.4)`` and ``POINT(0.3 1.8)`` only one edge was found. - * For the rest of the points two edges were found. -* For point ``POINT(2.9 1.8)`` + :start-after: -- m0 + :end-before: -- m1 - * Edge :math:`5` is before :math:`8` therefore edge :math:`5` has the shortest - distance to ``POINT(2.9 1.8)``. - * For edge :math:`5`: - - * ``fraction``: The closest point from the **original point** is at the - :math:`0.8` fraction of the edge :math:`5`. - * ``side``: The **original point** is located to the left side of edge - :math:`5`. - * ``distance``: The **original point** is located :math:`0.1` length units - from edge :math:`5`. - * For edge :math:`8`: - - * ``fraction``: The closest point from the **original point** is at the - :math:`0.89..` fraction of the edge :math:`8`. - * ``side``: The **original point** is located to the right side of edge - :math:`8`. - * ``distance``: The **original point** is located :math:`0.19..` length - units from edge :math:`8`. - -One answer per point, all columns -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -* Default: ``cap => 1`` +.. graphviz:: - * Maximum one row answer. -* ``partial => false`` + digraph G { + subgraph cluster0 { + p1,p2 [shape=circle;style=filled;color=green;fontsize=8;width=0.3;fixedsize=true]; + p1 [pos="0,2!"] + p2 [pos="3,1!"] - * Calculate all columns -* Default: ``dryrun => false`` + sp, ep [shape=circle;fontsize=8;width=0.3;fixedsize=true]; + sp[pos="1,0!"] + ep[pos="1,3!"] - * Process query + sp -> ep:s + } -.. literalinclude:: findCloseEdges.queries - :start-after: -- m2 - :end-before: -- m3 + subgraph cluster1 { + g1, g2 [shape=circle;style=filled;color=green;fontsize=8;width=0.3;fixedsize=true]; + g1 [pos="4,2!"] + g2 [pos="7,1!"] -.. rubric:: Understanding the result + np11,np21 [shape=point;color=black;size=0;fontsize=8;fixedsize=true]; + np11 [pos="5,2!";xlabel="fraction=0.63"]; + np21 [pos="5,1!";xlabel="fraction=0.33"]; -* ``edge_id`` identifier of the edge **closest** to the **original point** + sp1, ep1 [shape=circle;fontsize=8;width=0.3;fixedsize=true]; + sp1[pos="5,0!"] + ep1[pos="5,3!"] - * From all edges within :math:`0.5` distance units from the **original - point**: :math:`{5}` is the closest one. -* For the **original point** ``POINT(2.9 1.8)`` + sp1:n -> np21:s [dir=none] + np21:n -> np11:s [dir=none] + np11:n -> ep1:s - * Edge :math:`5` is the closest edge to the **original point** - * ``fraction``: The closest point from the **original point** is at the - :math:`0.8` fraction of the edge :math:`5`. - * ``side``: The **original point** is located to the left side of edge - :math:`5`. - * ``distance``: The **original point** is located :math:`0.1` length units - from edge :math:`5`. - * ``geom``: Contains the geometry of the **original point** ``POINT(2.9 1.8)`` - * ``edge``: Contains the ``LINESTRING`` geometry of the **original point** - (``geom``) to the closest point on on edge. + g1 -> np11 [color=red;label="edge"]; + g2 -> np21 [color=red;label="edge"] + } + } Many points dry run execution -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +............................................................................... * Returns ``EMPTY SET``. - - -* ``partial => true`` - - * Is ignored - * Because it is a **dry run** excecution, the code for all calculations are - shown on the PostgreSQL ``NOTICE``. * ``dryrun => true`` * Do not process query * Generate a PostgreSQL ``NOTICE`` with the code used to calculate all columns - * ``cap`` and **original point** are used in the code - .. literalinclude:: findCloseEdges.queries :start-after: -- m4 :end-before: -- m5 @@ -618,14 +363,6 @@ Handling points outside the graph. :start-after: pois_start :end-before: pois_end -Connecting disconnected components -............................................................................... - -.. include:: pgRouting-concepts.rst - :start-after: connecting_graph_start - :end-before: connecting_graph_end - - See Also ------------------------------------------------------------------------------- diff --git a/docqueries/metrics/CMakeLists.txt b/docqueries/metrics/CMakeLists.txt index 27f1bdae576..010b2229c9c 100644 --- a/docqueries/metrics/CMakeLists.txt +++ b/docqueries/metrics/CMakeLists.txt @@ -1,6 +1,7 @@ # Do not use extensions SET(LOCAL_FILES - betweennessCentrality + betweennessCentrality + degree ) foreach (f ${LOCAL_FILES}) diff --git a/docqueries/metrics/degree.pg b/docqueries/metrics/degree.pg new file mode 100644 index 00000000000..1fb89b6e555 --- /dev/null +++ b/docqueries/metrics/degree.pg @@ -0,0 +1,39 @@ +-- CopyRight(c) pgRouting developers +-- Creative Commons Attribution-Share Alike 3.0 License : https://creativecommons.org/licenses/by-sa/3.0/ +/* -- q1 */ +SELECT * FROM pgr_degree($$SELECT id, source, target FROM edges$$) +ORDER BY node; +/* -- q2 */ +SELECT * FROM pgr_degree( + $$SELECT id FROM edges$$, + $$SELECT id, in_edges, out_edges + FROM pgr_extractVertices('SELECT id, geom FROM edges')$$); +/* -- q3 */ +SELECT * from pgr_degree('SELECT 1 as id, 2 as source, 2 as target'); +/* -- q4 */ +SELECT * FROM pgr_degree( + $$SELECT 1 AS id$$, + $$SELECT id, in_edges, out_edges + FROM pgr_extractVertices('SELECT 1 as id, 2 as source, 2 as target')$$); +/* -- q5 */ +SELECT * FROM pgr_degree($$SELECT * FROM edges WHERE id IN (1, 2)$$); +/* -- q6 */ +SELECT * FROM pgr_degree( + $$SELECT * FROM edges WHERE id IN (1, 2)$$, + $$SELECT id, in_edges, out_edges FROM vertices$$); +/* -- q7 */ +DROP TABLE IF EXISTS vertices; +/* -- q8*/ +CREATE TABLE vertices AS +SELECT id, in_edges, out_edges +FROM pgr_extractVertices('SELECT id, geom FROM edges'); +/* -- q9 */ +SELECT * FROM pgr_degree( + $$SELECT id FROM edges$$, + $$SELECT id, in_edges, out_edges FROM vertices$$); +/* -- q10 */ +SELECT * FROM pgr_degree( + $$SELECT id FROM edges WHERE id < 17$$, + $$SELECT id, in_edges, out_edges FROM vertices$$, + dryrun => true); +/* -- q11 */ diff --git a/docqueries/metrics/degree.result b/docqueries/metrics/degree.result new file mode 100644 index 00000000000..d2e101a4f29 --- /dev/null +++ b/docqueries/metrics/degree.result @@ -0,0 +1,166 @@ +BEGIN; +BEGIN +SET client_min_messages TO NOTICE; +SET +/* -- q1 */ +SELECT * FROM pgr_degree($$SELECT id, source, target FROM edges$$) +ORDER BY node; + node | degree +------+-------- + 1 | 1 + 2 | 1 + 3 | 2 + 4 | 1 + 5 | 1 + 6 | 3 + 7 | 4 + 8 | 3 + 9 | 1 + 10 | 3 + 11 | 4 + 12 | 3 + 13 | 1 + 14 | 1 + 15 | 2 + 16 | 3 + 17 | 2 +(17 rows) + +/* -- q2 */ +SELECT * FROM pgr_degree( + $$SELECT id FROM edges$$, + $$SELECT id, in_edges, out_edges + FROM pgr_extractVertices('SELECT id, geom FROM edges')$$); + node | degree +------+-------- + 1 | 1 + 2 | 1 + 3 | 2 + 4 | 1 + 5 | 1 + 6 | 3 + 7 | 4 + 8 | 3 + 9 | 1 + 10 | 3 + 11 | 4 + 12 | 3 + 13 | 1 + 14 | 1 + 15 | 2 + 16 | 3 + 17 | 2 +(17 rows) + +/* -- q3 */ +SELECT * from pgr_degree('SELECT 1 as id, 2 as source, 2 as target'); + node | degree +------+-------- + 2 | 2 +(1 row) + +/* -- q4 */ +SELECT * FROM pgr_degree( + $$SELECT 1 AS id$$, + $$SELECT id, in_edges, out_edges + FROM pgr_extractVertices('SELECT 1 as id, 2 as source, 2 as target')$$); + node | degree +------+-------- + 2 | 2 +(1 row) + +/* -- q5 */ +SELECT * FROM pgr_degree($$SELECT * FROM edges WHERE id IN (1, 2)$$); + node | degree +------+-------- + 10 | 1 + 6 | 2 + 5 | 1 +(3 rows) + +/* -- q6 */ +SELECT * FROM pgr_degree( + $$SELECT * FROM edges WHERE id IN (1, 2)$$, + $$SELECT id, in_edges, out_edges FROM vertices$$); + node | degree +------+-------- + 5 | 1 + 6 | 2 + 10 | 1 +(3 rows) + +/* -- q7 */ +DROP TABLE IF EXISTS vertices; +DROP TABLE +/* -- q8*/ +CREATE TABLE vertices AS +SELECT id, in_edges, out_edges +FROM pgr_extractVertices('SELECT id, geom FROM edges'); +SELECT 17 +/* -- q9 */ +SELECT * FROM pgr_degree( + $$SELECT id FROM edges$$, + $$SELECT id, in_edges, out_edges FROM vertices$$); + node | degree +------+-------- + 1 | 1 + 2 | 1 + 3 | 2 + 4 | 1 + 5 | 1 + 6 | 3 + 7 | 4 + 8 | 3 + 9 | 1 + 10 | 3 + 11 | 4 + 12 | 3 + 13 | 1 + 14 | 1 + 15 | 2 + 16 | 3 + 17 | 2 +(17 rows) + +/* -- q10 */ +SELECT * FROM pgr_degree( + $$SELECT id FROM edges WHERE id < 17$$, + $$SELECT id, in_edges, out_edges FROM vertices$$, + dryrun => true); +NOTICE: + WITH + + -- a sub set of edges of the graph goes here + g_edges AS ( + SELECT id FROM edges WHERE id < 17 + ), + + -- sub set of vertices of the graph goes here + all_vertices AS ( + SELECT id, in_edges, out_edges FROM vertices + ), + + g_vertices AS ( + SELECT id, + unnest( + coalesce(in_edges::BIGINT[], '{}'::BIGINT[]) + || + coalesce(out_edges::BIGINT[], '{}'::BIGINT[])) AS eid + FROM all_vertices + ), + + totals AS ( + SELECT v.id, count(*) + FROM g_vertices v + JOIN g_edges e ON (v.eid = e.id) GROUP BY v.id + ) + + SELECT id::BIGINT, count::BIGINT FROM all_vertices JOIN totals USING (id) + ; + node | degree +------+-------- +(0 rows) + +/* -- q11 */ +ROLLBACK; +ROLLBACK diff --git a/docqueries/metrics/test.conf b/docqueries/metrics/test.conf index 6afe7ec483b..252681dc40f 100644 --- a/docqueries/metrics/test.conf +++ b/docqueries/metrics/test.conf @@ -4,6 +4,7 @@ 'any' => { 'files' => [qw( betweennessCentrality.pg + degree.pg )] }, diff --git a/docqueries/src/concepts.pg b/docqueries/src/concepts.pg index ca96938fdff..3ea5eae5073 100644 --- a/docqueries/src/concepts.pg +++ b/docqueries/src/concepts.pg @@ -10,9 +10,6 @@ FROM (VALUES (1, 1, 2, 5, 2), (2, 1, 3, -3, 4), (3, 2, 3, 7, -1)) AS t(id, source, target, cost, reverse_cost); /* -- g3 */ - - - DROP TABLE IF EXISTS wiki; /* -- q1 */ CREATE TABLE wiki ( @@ -183,7 +180,7 @@ SELECT edge_id, fraction, ST_AsText(edge) AS edge, id AS closest_vertex FROM pgr_findCloseEdges( $$SELECT id, geom FROM edges WHERE component = 1$$, (SELECT array_agg(geom) FROM vertices WHERE component = 2), - 2, partial => false) JOIN vertices USING (geom) ORDER BY distance LIMIT 1; + 2) JOIN vertices USING (geom) ORDER BY distance LIMIT 1; /* -- connect7 */ WITH info AS ( @@ -193,7 +190,7 @@ info AS ( FROM pgr_findCloseEdges( $$SELECT id, geom FROM edges WHERE component = 1$$, (SELECT array_agg(geom) FROM vertices WHERE component = 2), - 2, partial => false) AS ce + 2) AS ce JOIN vertices AS v USING (geom) JOIN edges AS e ON (edge_id = e.id) ORDER BY distance LIMIT 1), @@ -245,9 +242,17 @@ WHERE array_length(in_edges || out_edges, 1) = 2; /* -- contract3 */ /* -- performance1 */ -SELECT * FROM pgr_dijkstra($$ - SELECT id, source, target, cost, reverse_cost from edges - WHERE geom && (SELECT st_buffer(geom, 1) AS myarea - FROM edges WHERE id = 2)$$, - 1, 2); +SELECT id, source, target, cost, reverse_cost +FROM edges +WHERE geom && ( + SELECT st_buffer(geom, 1) as myarea + FROM edges where id = 6) ORDER BY id; /* -- performance2 */ +SELECT * FROM pgr_dijkstra($$ + SELECT id, source, target, cost, reverse_cost + FROM edges + WHERE geom && ( + SELECT st_buffer(geom, 1) AS myarea + FROM edges WHERE id = 6)$$, + 7, 8); +/* -- performance3 */ diff --git a/docqueries/src/concepts.result b/docqueries/src/concepts.result index aa3e79b7673..39b66bb980b 100644 --- a/docqueries/src/concepts.result +++ b/docqueries/src/concepts.result @@ -308,7 +308,7 @@ SELECT edge_id, fraction, ST_AsText(edge) AS edge, id AS closest_vertex FROM pgr_findCloseEdges( $$SELECT id, geom FROM edges WHERE component = 1$$, (SELECT array_agg(geom) FROM vertices WHERE component = 2), - 2, partial => false) JOIN vertices USING (geom) ORDER BY distance LIMIT 1; + 2) JOIN vertices USING (geom) ORDER BY distance LIMIT 1; edge_id | fraction | edge | closest_vertex ---------+----------+--------------------------------------+---------------- 14 | 0.5 | LINESTRING(1.999999999999 3.5,2 3.5) | 4 @@ -323,7 +323,7 @@ info AS ( FROM pgr_findCloseEdges( $$SELECT id, geom FROM edges WHERE component = 1$$, (SELECT array_agg(geom) FROM vertices WHERE component = 2), - 2, partial => false) AS ce + 2) AS ce JOIN vertices AS v USING (geom) JOIN edges AS e ON (edge_id = e.id) ORDER BY distance LIMIT 1), @@ -414,15 +414,39 @@ WHERE array_length(in_edges || out_edges, 1) = 2; /* -- contract3 */ /* -- performance1 */ +SELECT id, source, target, cost, reverse_cost +FROM edges +WHERE geom && ( + SELECT st_buffer(geom, 1) as myarea + FROM edges where id = 6) ORDER BY id; + id | source | target | cost | reverse_cost +----+--------+--------+------+-------------- + 1 | 5 | 6 | 1 | 1 + 2 | 6 | 10 | -1 | 1 + 4 | 6 | 7 | 1 | 1 + 6 | 1 | 3 | 1 | 1 + 7 | 3 | 7 | 1 | 1 + 8 | 7 | 11 | 1 | 1 + 10 | 7 | 8 | 1 | 1 + 12 | 8 | 12 | 1 | -1 + 14 | 8 | 9 | 1 | 1 + 23 | 4 | 8 | 0 | 0 +(10 rows) + +/* -- performance2 */ SELECT * FROM pgr_dijkstra($$ - SELECT id, source, target, cost, reverse_cost from edges - WHERE geom && (SELECT st_buffer(geom, 1) AS myarea - FROM edges WHERE id = 2)$$, - 1, 2); + SELECT id, source, target, cost, reverse_cost + FROM edges + WHERE geom && ( + SELECT st_buffer(geom, 1) AS myarea + FROM edges WHERE id = 6)$$, + 7, 8); seq | path_seq | start_vid | end_vid | node | edge | cost | agg_cost -----+----------+-----------+---------+------+------+------+---------- -(0 rows) + 1 | 1 | 7 | 8 | 7 | 10 | 1 | 0 + 2 | 2 | 7 | 8 | 8 | -1 | 0 | 1 +(2 rows) -/* -- performance2 */ +/* -- performance3 */ ROLLBACK; ROLLBACK diff --git a/docqueries/src/sampledata.result b/docqueries/src/sampledata.result index e2f362aa791..38b896538f7 100644 --- a/docqueries/src/sampledata.result +++ b/docqueries/src/sampledata.result @@ -150,15 +150,46 @@ FROM edges ORDER BY id; /* -- q5 */ /* --POINTS CREATE start */ +DO LANGUAGE plpgsql $BODY$ +DECLARE v FLOAT; +BEGIN +SELECT (parts[1]||'.'||parts[2])::FLOAT FROM STRING_TO_ARRAY(pgr_version(), '.') AS parts INTO v; /* -- p1 */ CREATE TABLE pointsOfInterest( pid BIGSERIAL PRIMARY KEY, edge_id BIGINT, side CHAR, fraction FLOAT, + distance FLOAT, + edge geometry, + newPoint geometry, geom geometry); -CREATE TABLE +IF v > 3.4 THEN /* -- p2 */ +INSERT INTO pointsOfInterest (geom) VALUES +(ST_Point(1.8, 0.4)), +(ST_Point(4.2, 2.4)), +(ST_Point(2.6, 3.2)), +(ST_Point(0.3, 1.8)), +(ST_Point(2.9, 1.8)), +(ST_Point(2.2, 1.7)); +/* -- p3 */ +UPDATE pointsofinterest SET + edge_id = poi.edge_id, + side = poi.side, + fraction = round(poi.fraction::numeric, 2), + distance = round(poi.distance::numeric, 2), + edge = poi.edge, + newPoint = ST_EndPoint(poi.edge) +FROM ( + SELECT * + FROM pgr_findCloseEdges( + $$SELECT id, geom FROM edges$$,(SELECT array_agg(geom) FROM pointsOfInterest), 0.5) ) AS poi +WHERE pointsOfInterest.geom = poi.geom; +/* -- p4 */ +UPDATE pointsOfInterest SET side = 'b' WHERE pid = 6; +/* -- p5 */ +ELSE INSERT INTO pointsOfInterest (edge_id, side, fraction, geom) VALUES (1, 'l' , 0.4, ST_POINT(1.8, 0.4)), (15, 'r' , 0.4, ST_POINT(4.2, 2.4)), @@ -166,8 +197,27 @@ INSERT INTO pointsOfInterest (edge_id, side, fraction, geom) VALUES (6, 'r' , 0.3, ST_POINT(0.3, 1.8)), (5, 'l' , 0.8, ST_POINT(2.9, 1.8)), (4, 'b' , 0.7, ST_POINT(2.2, 1.7)); -INSERT 0 6 -/* -- p3 */ +END IF; +END; +$BODY$; +DO +/* -- p6 */ +SELECT + pid, ST_AsText(geom) geom, + edge_id, fraction AS frac, side, distance AS dist, + ST_AsText(edge) edge, ST_AsText(newPoint) newPoint +FROM pointsOfInterest; + pid | geom | edge_id | frac | side | dist | edge | newpoint +-----+----------------+---------+------+------+------+---------------------------+-------------- + 1 | POINT(1.8 0.4) | 1 | 0.4 | l | 0.2 | LINESTRING(1.8 0.4,2 0.4) | POINT(2 0.4) + 4 | POINT(0.3 1.8) | 6 | 0.3 | r | 0.2 | LINESTRING(0.3 1.8,0.3 2) | POINT(0.3 2) + 3 | POINT(2.6 3.2) | 12 | 0.6 | l | 0.2 | LINESTRING(2.6 3.2,2.6 3) | POINT(2.6 3) + 2 | POINT(4.2 2.4) | 15 | 0.4 | r | 0.2 | LINESTRING(4.2 2.4,4 2.4) | POINT(4 2.4) + 5 | POINT(2.9 1.8) | 5 | 0.8 | l | 0.1 | LINESTRING(2.9 1.8,3 1.8) | POINT(3 1.8) + 6 | POINT(2.2 1.7) | 4 | 0.7 | b | 0.2 | LINESTRING(2.2 1.7,2 1.7) | POINT(2 1.7) +(6 rows) + +/* -- p7 */ /* --POINTS CREATE end */ /* --COMBINATIONS CREATE start */ /* -- c1 */ diff --git a/docqueries/src/test.conf b/docqueries/src/test.conf index 2eb35118beb..dc67159148d 100644 --- a/docqueries/src/test.conf +++ b/docqueries/src/test.conf @@ -4,9 +4,6 @@ 'any' => { 'files' => [qw( sampledata.pg - withPoints-category.pg - migration.pg - concepts.pg )], }, ); diff --git a/docqueries/src/withPoints-category.result b/docqueries/src/withPoints-category.result index 20deee8b5b2..44e1f236cf6 100644 --- a/docqueries/src/withPoints-category.result +++ b/docqueries/src/withPoints-category.result @@ -7,9 +7,9 @@ SELECT pid, edge_id, fraction, side FROM pointsOfInterest; pid | edge_id | fraction | side -----+---------+----------+------ 1 | 1 | 0.4 | l - 2 | 15 | 0.4 | r - 3 | 12 | 0.6 | l 4 | 6 | 0.3 | r + 3 | 12 | 0.6 | l + 2 | 15 | 0.4 | r 5 | 5 | 0.8 | l 6 | 4 | 0.7 | b (6 rows) diff --git a/docqueries/topology/CMakeLists.txt b/docqueries/topology/CMakeLists.txt index 0d78f52ed87..abf97a73c91 100644 --- a/docqueries/topology/CMakeLists.txt +++ b/docqueries/topology/CMakeLists.txt @@ -6,7 +6,6 @@ SET(LOCAL_FILES createVerticesTable extractVertices nodeNetwork - degree ) foreach (f ${LOCAL_FILES}) diff --git a/docqueries/topology/degree.pg b/docqueries/topology/degree.pg deleted file mode 100644 index 95b2e3ba056..00000000000 --- a/docqueries/topology/degree.pg +++ /dev/null @@ -1,23 +0,0 @@ --- CopyRight(c) pgRouting developers --- Creative Commons Attribution-Share Alike 3.0 License : https://creativecommons.org/licenses/by-sa/3.0/ -/* -- q1 */ -DROP TABLE IF EXISTS tmp_edges_vertices_pgr; -CREATE TEMP TABLE tmp_edges_vertices_pgr AS -SELECT id, in_edges, out_edges - FROM pgr_extractVertices('SELECT id, geom FROM edges'); -SELECT * FROM pgr_degree( - $$SELECT id FROM edges$$, - $$SELECT id, in_edges, out_edges - FROM tmp_edges_vertices_pgr$$); -/* -- q2 */ -SELECT * FROM pgr_degree( - $$SELECT id FROM edges WHERE id < 17$$, - $$SELECT id, in_edges, out_edges - FROM pgr_extractVertices('SELECT id, geom FROM edges')$$); -/* -- q3 */ -SELECT * FROM pgr_degree( - $$SELECT id FROM edges WHERE id < 17$$, - $$SELECT id, in_edges, out_edges - FROM pgr_extractVertices('SELECT id, geom FROM edges')$$, - dryrun => true); -/* -- q4 */ diff --git a/docqueries/topology/degree.result b/docqueries/topology/degree.result deleted file mode 100644 index 340dbf44646..00000000000 --- a/docqueries/topology/degree.result +++ /dev/null @@ -1,107 +0,0 @@ -BEGIN; -BEGIN -SET client_min_messages TO NOTICE; -SET -/* -- q1 */ -DROP TABLE IF EXISTS tmp_edges_vertices_pgr; -NOTICE: table "tmp_edges_vertices_pgr" does not exist, skipping -DROP TABLE -CREATE TEMP TABLE tmp_edges_vertices_pgr AS -SELECT id, in_edges, out_edges - FROM pgr_extractVertices('SELECT id, geom FROM edges'); -SELECT 17 -SELECT * FROM pgr_degree( - $$SELECT id FROM edges$$, - $$SELECT id, in_edges, out_edges - FROM tmp_edges_vertices_pgr$$); - node | degree -------+-------- - 1 | 1 - 2 | 1 - 3 | 2 - 4 | 1 - 5 | 1 - 6 | 3 - 7 | 4 - 8 | 3 - 9 | 1 - 10 | 3 - 11 | 4 - 12 | 3 - 13 | 1 - 14 | 1 - 15 | 2 - 16 | 3 - 17 | 2 -(17 rows) - -/* -- q2 */ -SELECT * FROM pgr_degree( - $$SELECT id FROM edges WHERE id < 17$$, - $$SELECT id, in_edges, out_edges - FROM pgr_extractVertices('SELECT id, geom FROM edges')$$); - node | degree -------+-------- - 1 | 1 - 2 | 0 - 3 | 2 - 4 | 0 - 5 | 1 - 6 | 3 - 7 | 4 - 8 | 3 - 9 | 1 - 10 | 3 - 11 | 4 - 12 | 3 - 13 | 0 - 14 | 0 - 15 | 2 - 16 | 3 - 17 | 2 -(17 rows) - -/* -- q3 */ -SELECT * FROM pgr_degree( - $$SELECT id FROM edges WHERE id < 17$$, - $$SELECT id, in_edges, out_edges - FROM pgr_extractVertices('SELECT id, geom FROM edges')$$, - dryrun => true); -NOTICE: - WITH - - -- a sub set of edges of the graph goes here - g_edges AS ( - SELECT id FROM edges WHERE id < 17 - ), - - -- sub set of vertices of the graph goes here - all_vertices AS ( - SELECT id, in_edges, out_edges - FROM pgr_extractVertices('SELECT id, geom FROM edges') - ), - - g_vertices AS ( - SELECT id, - unnest( - coalesce(in_edges::BIGINT[], '{}'::BIGINT[]) - || - coalesce(out_edges::BIGINT[], '{}'::BIGINT[])) AS eid - FROM all_vertices - ), - - totals AS ( - SELECT v.id, count(*) - FROM g_vertices AS v - JOIN g_edges AS e ON (e.id = eid) GROUP BY v.id - ) - - SELECT id::BIGINT, coalesce(count, 0)::BIGINT FROM all_vertices LEFT JOIN totals USING (id) - ; - node | degree -------+-------- -(0 rows) - -/* -- q4 */ -ROLLBACK; -ROLLBACK diff --git a/docqueries/topology/test.conf b/docqueries/topology/test.conf index de6a9bfd292..f40233fbec7 100644 --- a/docqueries/topology/test.conf +++ b/docqueries/topology/test.conf @@ -11,7 +11,6 @@ analyzeOneWay.pg nodeNetwork.pg extractVertices.pg - degree.pg )], }, ); diff --git a/docqueries/utilities/findCloseEdges.pg b/docqueries/utilities/findCloseEdges.pg index c0aaf27194f..e46d13e32a3 100644 --- a/docqueries/utilities/findCloseEdges.pg +++ b/docqueries/utilities/findCloseEdges.pg @@ -1,45 +1,35 @@ -- CopyRight(c) pgRouting developers -- Creative Commons Attribution-Share Alike 3.0 License : https://creativecommons.org/licenses/by-sa/3.0/ +SET extra_float_digits=-3; /* -- q1 */ -SELECT * +SELECT + edge_id, fraction, side, distance, + distance, ST_AsText(geom) AS point, ST_AsText(edge) As edge FROM pgr_findCloseEdges( $$SELECT id, geom FROM edges$$, (SELECT geom FROM pointsOfInterest WHERE pid = 5), - 0.5); + 0.5, cap => 2); /* -- q2 */ -SELECT edge_id, round(fraction::numeric, 2) AS fraction, side, ST_AsText(geom) AS original_point +SELECT +edge_id, fraction, side, distance, +ST_AsText(geom) AS point, +ST_AsText(edge) AS edge FROM pgr_findCloseEdges( $$SELECT id, geom FROM edges$$, (SELECT array_agg(geom) FROM pointsOfInterest), 0.5); /* -- q3 */ /* One point signature */ -/* -- o1 */ -SELECT * -FROM pgr_findCloseEdges( - $$SELECT id, geom FROM edges$$, - (SELECT geom FROM pointsOfInterest WHERE pid = 5), - 0.5, cap => 2); -/* -- o2 */ -SELECT edge_id, round(fraction::numeric, 2) AS fraction, side, round(distance::numeric, 3) AS distance, - ST_AsText(geom) AS new_point, - ST_AsText(edge) AS original_to_new_point +/* -- o0 */ +SELECT edge_id, fraction, side, distance, ST_AsText(geom) geom, ST_AsText(edge) edge FROM pgr_findCloseEdges( - $$SELECT id, geom FROM edges$$, - (SELECT geom FROM pointsOfInterest WHERE pid = 5), - 0.5, partial => false); -/* -- o3 */ -SELECT edge_id, round(fraction::numeric, 2) AS fraction, side, round(distance::numeric, 3) AS distance, - ST_AsText(geom) AS new_point, - ST_AsText(edge) AS original_to_new_point -FROM pgr_findCloseEdges( - $$SELECT id, geom FROM edges$$, - (SELECT geom FROM pointsOfInterest WHERE pid = 5), - 0.5, cap => 2, partial => false); +$$SELECT 1 AS id, ST_MakeLine(ST_makePoint(2,0), ST_MakePoint(2,3)) AS geom$$, +ST_MakePoint(0,1.5), 5); +/* -- o1 */ /* -- o4 */ SELECT * FROM pgr_withPoints( $e$ SELECT * FROM edges $e$, - $p$ SELECT edge_id, round(fraction::numeric, 2) AS fraction, side + $p$ SELECT edge_id, fraction, side FROM pgr_findCloseEdges( $$SELECT id, geom FROM edges$$, (SELECT geom FROM pointsOfInterest WHERE pid = 5), @@ -47,44 +37,23 @@ SELECT * FROM pgr_withPoints( $p$, 1, ARRAY[-1, -2]); /* -- o5 */ -SELECT * +SELECT edge_id, fraction, side, distance, ST_AsText(geom) geom, ST_AsText(edge) edge FROM pgr_findCloseEdges( - $$SELECT id, geom FROM edges$$, - (SELECT geom FROM pointsOfInterest WHERE pid = 5), - 0.5, - dryrun => true); +$$SELECT 1 AS id, ST_MakeLine(ST_makePoint(2,0), ST_MakePoint(2,3)) AS geom$$, +ST_MakePoint(0,1.5), 5, dryrun => true); /* -- o6 */ /* Many point signature */ -/* -- m1 */ -SELECT edge_id, round(fraction::numeric, 2) AS fraction, side, round(distance::numeric, 3) AS distance, - ST_AsText(geom) AS geom_is_original, edge -FROM pgr_findCloseEdges( - $$SELECT id, geom FROM edges$$, - (SELECT array_agg(geom) FROM pointsOfInterest), - 0.5, cap => 2); -/* -- m2 */ -SELECT edge_id, round(fraction::numeric, 2) AS fraction, side, round(distance::numeric, 3) AS distance, - ST_AsText(geom) AS geom_is_original, - ST_AsText(edge) AS original_to_new_point -FROM pgr_findCloseEdges( - $$SELECT id, geom FROM edges$$, - (SELECT array_agg(geom) FROM pointsOfInterest), - 0.5, partial => false); -/* -- m3 */ -SELECT edge_id, round(fraction::numeric, 2) AS fraction, side, round(distance::numeric, 3) AS distance, - ST_AsText(geom) AS geom_is_original, - ST_AsText(edge) AS original_to_new_point +/* -- m0 */ +SELECT edge_id, fraction, side, distance, ST_AsText(geom) geom, ST_AsText(edge) edge FROM pgr_findCloseEdges( - $$SELECT id, geom FROM edges$$, - (SELECT array_agg(geom) FROM pointsOfInterest), - 0.5, cap => 2, partial => false); +$$SELECT 1 AS id, ST_MakeLine(ST_makePoint(1,0), ST_MakePoint(1,3)) AS geom$$, +ARRAY[ST_MakePoint(0,2), ST_MakePoint(3,1)]::GEOMETRY[], 5); +/* -- m1 */ /* -- m4 */ -SELECT * +SELECT edge_id, fraction, side, distance, ST_AsText(geom) geom, ST_AsText(edge) edge FROM pgr_findCloseEdges( - $$SELECT id, geom FROM edges$$, - (SELECT array_agg(geom) FROM pointsOfInterest), - 0.5, - dryrun => true); +$$SELECT 1 AS id, ST_MakeLine(ST_makePoint(1,0), ST_MakePoint(1,3)) AS geom$$, +ARRAY[ST_MakePoint(0,2), ST_MakePoint(3,1)]::GEOMETRY[], 5, dryrun=>true); /* -- m5 */ diff --git a/docqueries/utilities/findCloseEdges.result b/docqueries/utilities/findCloseEdges.result index 185071edbd1..1541de9cd6c 100644 --- a/docqueries/utilities/findCloseEdges.result +++ b/docqueries/utilities/findCloseEdges.result @@ -2,78 +2,58 @@ BEGIN; BEGIN SET client_min_messages TO NOTICE; SET +SET extra_float_digits=-3; +SET /* -- q1 */ -SELECT * +SELECT + edge_id, fraction, side, distance, + distance, ST_AsText(geom) AS point, ST_AsText(edge) As edge FROM pgr_findCloseEdges( $$SELECT id, geom FROM edges$$, (SELECT geom FROM pointsOfInterest WHERE pid = 5), - 0.5); - edge_id | fraction | side | distance | geom | edge ----------+----------+------+----------+------+------ - 5 | 0.8 | l | | | -(1 row) + 0.5, cap => 2); + edge_id | fraction | side | distance | distance | point | edge +---------+----------+------+----------+----------+----------------+--------------------------- + 5 | 0.8 | l | 0.1 | 0.1 | POINT(2.9 1.8) | LINESTRING(2.9 1.8,3 1.8) + 8 | 0.9 | r | 0.2 | 0.2 | POINT(2.9 1.8) | LINESTRING(2.9 1.8,2.9 2) +(2 rows) /* -- q2 */ -SELECT edge_id, round(fraction::numeric, 2) AS fraction, side, ST_AsText(geom) AS original_point +SELECT +edge_id, fraction, side, distance, +ST_AsText(geom) AS point, +ST_AsText(edge) AS edge FROM pgr_findCloseEdges( $$SELECT id, geom FROM edges$$, (SELECT array_agg(geom) FROM pointsOfInterest), 0.5); - edge_id | fraction | side | original_point ----------+----------+------+---------------- - 1 | 0.40 | l | POINT(1.8 0.4) - 6 | 0.30 | r | POINT(0.3 1.8) - 12 | 0.60 | l | POINT(2.6 3.2) - 15 | 0.40 | r | POINT(4.2 2.4) - 5 | 0.80 | l | POINT(2.9 1.8) - 4 | 0.70 | r | POINT(2.2 1.7) + edge_id | fraction | side | distance | point | edge +---------+----------+------+----------+----------------+--------------------------- + 1 | 0.4 | l | 0.2 | POINT(1.8 0.4) | LINESTRING(1.8 0.4,2 0.4) + 6 | 0.3 | r | 0.2 | POINT(0.3 1.8) | LINESTRING(0.3 1.8,0.3 2) + 12 | 0.6 | l | 0.2 | POINT(2.6 3.2) | LINESTRING(2.6 3.2,2.6 3) + 15 | 0.4 | r | 0.2 | POINT(4.2 2.4) | LINESTRING(4.2 2.4,4 2.4) + 5 | 0.8 | l | 0.1 | POINT(2.9 1.8) | LINESTRING(2.9 1.8,3 1.8) + 4 | 0.7 | r | 0.2 | POINT(2.2 1.7) | LINESTRING(2.2 1.7,2 1.7) (6 rows) /* -- q3 */ /* One point signature */ -/* -- o1 */ -SELECT * +/* -- o0 */ +SELECT edge_id, fraction, side, distance, ST_AsText(geom) geom, ST_AsText(edge) edge FROM pgr_findCloseEdges( - $$SELECT id, geom FROM edges$$, - (SELECT geom FROM pointsOfInterest WHERE pid = 5), - 0.5, cap => 2); - edge_id | fraction | side | distance | geom | edge ----------+--------------------+------+---------------------+------+------ - 5 | 0.8 | l | 0.10000000000000009 | | - 8 | 0.8999999999999999 | r | 0.19999999999999996 | | -(2 rows) - -/* -- o2 */ -SELECT edge_id, round(fraction::numeric, 2) AS fraction, side, round(distance::numeric, 3) AS distance, - ST_AsText(geom) AS new_point, - ST_AsText(edge) AS original_to_new_point -FROM pgr_findCloseEdges( - $$SELECT id, geom FROM edges$$, - (SELECT geom FROM pointsOfInterest WHERE pid = 5), - 0.5, partial => false); - edge_id | fraction | side | distance | new_point | original_to_new_point ----------+----------+------+----------+--------------+--------------------------- - 5 | 0.80 | l | 0.100 | POINT(3 1.8) | LINESTRING(2.9 1.8,3 1.8) +$$SELECT 1 AS id, ST_MakeLine(ST_makePoint(2,0), ST_MakePoint(2,3)) AS geom$$, +ST_MakePoint(0,1.5), 5); + edge_id | fraction | side | distance | geom | edge +---------+----------+------+----------+--------------+------------------------- + 1 | 0.5 | l | 2 | POINT(0 1.5) | LINESTRING(0 1.5,2 1.5) (1 row) -/* -- o3 */ -SELECT edge_id, round(fraction::numeric, 2) AS fraction, side, round(distance::numeric, 3) AS distance, - ST_AsText(geom) AS new_point, - ST_AsText(edge) AS original_to_new_point -FROM pgr_findCloseEdges( - $$SELECT id, geom FROM edges$$, - (SELECT geom FROM pointsOfInterest WHERE pid = 5), - 0.5, cap => 2, partial => false); - edge_id | fraction | side | distance | new_point | original_to_new_point ----------+----------+------+----------+--------------+--------------------------- - 5 | 0.80 | l | 0.100 | POINT(3 1.8) | LINESTRING(2.9 1.8,3 1.8) - 8 | 0.90 | r | 0.200 | POINT(2.9 2) | LINESTRING(2.9 1.8,2.9 2) -(2 rows) - +/* -- o1 */ /* -- o4 */ SELECT * FROM pgr_withPoints( $e$ SELECT * FROM edges $e$, - $p$ SELECT edge_id, round(fraction::numeric, 2) AS fraction, side + $p$ SELECT edge_id, fraction, side FROM pgr_findCloseEdges( $$SELECT id, geom FROM edges$$, (SELECT geom FROM pointsOfInterest WHERE pid = 5), @@ -97,31 +77,33 @@ SELECT * FROM pgr_withPoints( (12 rows) /* -- o5 */ -SELECT * +SELECT edge_id, fraction, side, distance, ST_AsText(geom) geom, ST_AsText(edge) edge FROM pgr_findCloseEdges( - $$SELECT id, geom FROM edges$$, - (SELECT geom FROM pointsOfInterest WHERE pid = 5), - 0.5, - dryrun => true); +$$SELECT 1 AS id, ST_MakeLine(ST_makePoint(2,0), ST_MakePoint(2,3)) AS geom$$, +ST_MakePoint(0,1.5), 5, dryrun => true); NOTICE: - WITH - edges_sql AS (SELECT id, geom FROM edges), - point_sql AS (SELECT '01010000003333333333330740CDCCCCCCCCCCFC3F'::geometry AS point) - - SELECT - id::BIGINT AS edge_id, - ST_LineLocatePoint(geom, point) AS fraction, - CASE WHEN ST_Intersects(ST_Buffer(geom, 0.5, 'side=right endcap=flat'), point) - THEN 'r' - ELSE 'l' END::CHAR AS side, - - geom <-> point AS distance, - ST_ClosestPoint(geom, point) AS new_point, - ST_MakeLine(point, ST_ClosestPoint(geom, point)) AS new_line - - FROM edges_sql, point_sql - WHERE ST_DWithin(geom, point, 0.5) - ORDER BY geom <-> point LIMIT 1 +WITH +edges_sql AS (SELECT 1 AS id, ST_MakeLine(ST_makePoint(2,0), ST_MakePoint(2,3)) AS geom), +point_sql AS (SELECT unnest('{01010000000000000000000000000000000000F83F}'::geometry[]) AS point), +results AS ( + SELECT + id::BIGINT AS edge_id, + ST_LineLocatePoint(geom, point) AS fraction, + CASE WHEN ST_Intersects(ST_Buffer(geom, 5, 'side=right endcap=flat'), point) + THEN 'r' + ELSE 'l' END::CHAR AS side, + geom <-> point AS distance, + point, + ST_MakeLine(point, ST_ClosestPoint(geom, point)) AS new_line + FROM edges_sql, point_sql + WHERE ST_DWithin(geom, point, 5) + ORDER BY geom <-> point), +prepare_cap AS ( + SELECT row_number() OVER (PARTITION BY point ORDER BY point, distance) AS rn, * + FROM results) +SELECT edge_id, fraction, side, distance, point, new_line +FROM prepare_cap +WHERE rn <= 1 edge_id | fraction | side | distance | geom | edge ---------+----------+------+----------+------+------ @@ -129,90 +111,39 @@ NOTICE: /* -- o6 */ /* Many point signature */ -/* -- m1 */ -SELECT edge_id, round(fraction::numeric, 2) AS fraction, side, round(distance::numeric, 3) AS distance, - ST_AsText(geom) AS geom_is_original, edge +/* -- m0 */ +SELECT edge_id, fraction, side, distance, ST_AsText(geom) geom, ST_AsText(edge) edge FROM pgr_findCloseEdges( - $$SELECT id, geom FROM edges$$, - (SELECT array_agg(geom) FROM pointsOfInterest), - 0.5, cap => 2); - edge_id | fraction | side | distance | geom_is_original | edge ----------+----------+------+----------+------------------+------ - 1 | 0.40 | l | 0.200 | POINT(1.8 0.4) | - 6 | 0.30 | r | 0.200 | POINT(0.3 1.8) | - 12 | 0.60 | l | 0.200 | POINT(2.6 3.2) | - 11 | 1.00 | l | 0.447 | POINT(2.6 3.2) | - 15 | 0.40 | r | 0.200 | POINT(4.2 2.4) | - 9 | 1.00 | l | 0.447 | POINT(4.2 2.4) | - 5 | 0.80 | l | 0.100 | POINT(2.9 1.8) | - 8 | 0.90 | r | 0.200 | POINT(2.9 1.8) | - 4 | 0.70 | r | 0.200 | POINT(2.2 1.7) | - 8 | 0.20 | r | 0.300 | POINT(2.2 1.7) | -(10 rows) - -/* -- m2 */ -SELECT edge_id, round(fraction::numeric, 2) AS fraction, side, round(distance::numeric, 3) AS distance, - ST_AsText(geom) AS geom_is_original, - ST_AsText(edge) AS original_to_new_point -FROM pgr_findCloseEdges( - $$SELECT id, geom FROM edges$$, - (SELECT array_agg(geom) FROM pointsOfInterest), - 0.5, partial => false); - edge_id | fraction | side | distance | geom_is_original | original_to_new_point ----------+----------+------+----------+------------------+--------------------------- - 1 | 0.40 | l | 0.200 | POINT(1.8 0.4) | LINESTRING(1.8 0.4,2 0.4) - 6 | 0.30 | r | 0.200 | POINT(0.3 1.8) | LINESTRING(0.3 1.8,0.3 2) - 12 | 0.60 | l | 0.200 | POINT(2.6 3.2) | LINESTRING(2.6 3.2,2.6 3) - 15 | 0.40 | r | 0.200 | POINT(4.2 2.4) | LINESTRING(4.2 2.4,4 2.4) - 5 | 0.80 | l | 0.100 | POINT(2.9 1.8) | LINESTRING(2.9 1.8,3 1.8) - 4 | 0.70 | r | 0.200 | POINT(2.2 1.7) | LINESTRING(2.2 1.7,2 1.7) -(6 rows) - -/* -- m3 */ -SELECT edge_id, round(fraction::numeric, 2) AS fraction, side, round(distance::numeric, 3) AS distance, - ST_AsText(geom) AS geom_is_original, - ST_AsText(edge) AS original_to_new_point -FROM pgr_findCloseEdges( - $$SELECT id, geom FROM edges$$, - (SELECT array_agg(geom) FROM pointsOfInterest), - 0.5, cap => 2, partial => false); - edge_id | fraction | side | distance | geom_is_original | original_to_new_point ----------+----------+------+----------+------------------+--------------------------- - 1 | 0.40 | l | 0.200 | POINT(1.8 0.4) | LINESTRING(1.8 0.4,2 0.4) - 6 | 0.30 | r | 0.200 | POINT(0.3 1.8) | LINESTRING(0.3 1.8,0.3 2) - 12 | 0.60 | l | 0.200 | POINT(2.6 3.2) | LINESTRING(2.6 3.2,2.6 3) - 11 | 1.00 | l | 0.447 | POINT(2.6 3.2) | LINESTRING(2.6 3.2,3 3) - 15 | 0.40 | r | 0.200 | POINT(4.2 2.4) | LINESTRING(4.2 2.4,4 2.4) - 9 | 1.00 | l | 0.447 | POINT(4.2 2.4) | LINESTRING(4.2 2.4,4 2) - 5 | 0.80 | l | 0.100 | POINT(2.9 1.8) | LINESTRING(2.9 1.8,3 1.8) - 8 | 0.90 | r | 0.200 | POINT(2.9 1.8) | LINESTRING(2.9 1.8,2.9 2) - 4 | 0.70 | r | 0.200 | POINT(2.2 1.7) | LINESTRING(2.2 1.7,2 1.7) - 8 | 0.20 | r | 0.300 | POINT(2.2 1.7) | LINESTRING(2.2 1.7,2.2 2) -(10 rows) +$$SELECT 1 AS id, ST_MakeLine(ST_makePoint(1,0), ST_MakePoint(1,3)) AS geom$$, +ARRAY[ST_MakePoint(0,2), ST_MakePoint(3,1)]::GEOMETRY[], 5); + edge_id | fraction | side | distance | geom | edge +---------+----------------+------+----------+------------+--------------------- + 1 | 0.666666666667 | l | 1 | POINT(0 2) | LINESTRING(0 2,1 2) + 1 | 0.333333333333 | r | 2 | POINT(3 1) | LINESTRING(3 1,1 1) +(2 rows) +/* -- m1 */ /* -- m4 */ -SELECT * +SELECT edge_id, fraction, side, distance, ST_AsText(geom) geom, ST_AsText(edge) edge FROM pgr_findCloseEdges( - $$SELECT id, geom FROM edges$$, - (SELECT array_agg(geom) FROM pointsOfInterest), - 0.5, - dryrun => true); +$$SELECT 1 AS id, ST_MakeLine(ST_makePoint(1,0), ST_MakePoint(1,3)) AS geom$$, +ARRAY[ST_MakePoint(0,2), ST_MakePoint(3,1)]::GEOMETRY[], 5, dryrun=>true); NOTICE: WITH -edges_sql AS (SELECT id, geom FROM edges), -point_sql AS (SELECT unnest('{0101000000CDCCCCCCCCCCFC3F9A9999999999D93F:0101000000CDCCCCCCCCCC10403333333333330340:0101000000CDCCCCCCCCCC04409A99999999990940:0101000000333333333333D33FCDCCCCCCCCCCFC3F:01010000003333333333330740CDCCCCCCCCCCFC3F:01010000009A99999999990140333333333333FB3F}'::geometry[]) AS point), +edges_sql AS (SELECT 1 AS id, ST_MakeLine(ST_makePoint(1,0), ST_MakePoint(1,3)) AS geom), +point_sql AS (SELECT unnest('{010100000000000000000000000000000000000040:01010000000000000000000840000000000000F03F}'::geometry[]) AS point), results AS ( SELECT id::BIGINT AS edge_id, ST_LineLocatePoint(geom, point) AS fraction, - CASE WHEN ST_Intersects(ST_Buffer(geom, 0.5, 'side=right endcap=flat'), point) + CASE WHEN ST_Intersects(ST_Buffer(geom, 5, 'side=right endcap=flat'), point) THEN 'r' ELSE 'l' END::CHAR AS side, geom <-> point AS distance, point, ST_MakeLine(point, ST_ClosestPoint(geom, point)) AS new_line FROM edges_sql, point_sql - WHERE ST_DWithin(geom, point, 0.5) + WHERE ST_DWithin(geom, point, 5) ORDER BY geom <-> point), prepare_cap AS ( SELECT row_number() OVER (PARTITION BY point ORDER BY point, distance) AS rn, * diff --git a/locale/de/LC_MESSAGES/index.po b/locale/de/LC_MESSAGES/index.po index 0492cdedcc0..1536bd3127e 100644 --- a/locale/de/LC_MESSAGES/index.po +++ b/locale/de/LC_MESSAGES/index.po @@ -1,11 +1,11 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v4.0 +# Copyright (C) pgRouting Contributors - Version v3.8 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , YEAR. # msgid "" msgstr "" -"Project-Id-Version: pgRouting v4.0\n" +"Project-Id-Version: pgRouting v3.8\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-06-25 12:55-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po index deb889a328a..167f0c0d453 100644 --- a/locale/de/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/de/LC_MESSAGES/pgrouting_doc_strings.po @@ -1,12 +1,12 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v4.0 +# Copyright (C) pgRouting Contributors - Version v3.8 # This file is distributed under the same license as the pgRouting package. # Regina Obe , 2023. msgid "" msgstr "" -"Project-Id-Version: pgRouting v4.0\n" +"Project-Id-Version: pgRouting v3.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-12 01:00+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" @@ -652,8 +652,8 @@ msgid "References" msgstr "" msgid "" -"`Boost: metric TSP approx `__" +"`Boost's metric appro's metric approximation `__" msgstr "" msgid "`University of Waterloo TSP `__" @@ -664,7 +664,7 @@ msgid "" "Traveling_salesman_problem>`__" msgstr "" -msgid "Vehicle Routing Functions - Category" +msgid "Vehicle Routing Functions - Category (Experimental)" msgstr "" msgid "Pickup and delivery problem" @@ -1613,7 +1613,7 @@ msgstr "" msgid "https://en.wikipedia.org/wiki/Vehicle_routing_problem" msgstr "" -msgid ":doc:`sampledata`" +msgid "The queries use the :doc:`sampledata` network." msgstr "" msgid "A* - Family of functions" @@ -1775,8 +1775,7 @@ msgstr "" msgid ":doc:`bdAstar-family`" msgstr "" -msgid "" -"`Boost: A* search `__" +msgid "https://www.boost.org/libs/graph/doc/astar_search.html" msgstr "" msgid "https://en.wikipedia.org/wiki/A*_search_algorithm" @@ -2580,12 +2579,15 @@ msgid "" "ending vertex:" msgstr "" -msgid "It is expected to terminate faster than pgr_aStar" +msgid "It is expected to terminate faster than pgr_astar" msgstr "" msgid ":doc:`aStar-family`" msgstr "" +msgid "Previous versions of this page" +msgstr "" + msgid "Bidirectional Dijkstra - Family of functions" msgstr "" @@ -2727,7 +2729,27 @@ msgid "Identifier of the color of the edge." msgstr "" msgid "" -"`Boost: `__" +"`Boost: Sequential Vertex Coloring algorithm documentation `__" +msgstr "" + +msgid "" +"`Wikipedia: Graph coloring `__" +msgstr "" + +msgid "" +"`Boost: is_bipartite `__" +msgstr "" + +msgid "" +"`Wikipedia: bipartite graph `__" +msgstr "" + +msgid "" +"`Boost: Edge Coloring Algorithm documentation `__" msgstr "" msgid "Components - Family of functions" @@ -2834,7 +2856,7 @@ msgstr "" msgid "Node" msgstr "" -msgid "Adjacent nodes" +msgid "Adjecent nodes" msgstr "" msgid "Number of adjacent nodes" @@ -3275,6 +3297,9 @@ msgstr "" msgid "Now, the routing graph has an edge connecting with node :math:`7`." msgstr "" +msgid ":doc:`sampledata`" +msgstr "" + msgid "" "https://www.cs.cmu.edu/afs/cs/academic/class/15210-f12/www/lectures/" "lecture16.pdf" @@ -3879,11 +3904,6 @@ msgid "" "an undirected graph." msgstr "" -msgid "" -":doc:`pgr_topologicalSort` - Linear ordering of the vertices for directed " -"acyclic graph." -msgstr "" - msgid ":doc:`metrics-family`" msgstr "" @@ -3901,7 +3921,7 @@ msgstr "" msgid ":doc:`VRP-category`" msgstr "" -msgid "Shortest Path Category" +msgid "Unclassified" msgstr "" msgid ":doc:`pgr_bellmanFord`" @@ -3913,22 +3933,19 @@ msgstr "" msgid ":doc:`pgr_edwardMoore`" msgstr "" -msgid "Planar Family" -msgstr "" - msgid ":doc:`pgr_isPlanar`" msgstr "" -msgid "Miscellaneous Algoritms" +msgid ":doc:`pgr_stoerWagner`" msgstr "" -msgid ":doc:`pgr_lengauerTarjanDominatorTree`" +msgid ":doc:`pgr_topologicalSort`" msgstr "" -msgid ":doc:`pgr_stoerWagner`" +msgid ":doc:`pgr_transitiveClosure`" msgstr "" -msgid ":doc:`pgr_transitiveClosure`" +msgid ":doc:`pgr_lengauerTarjanDominatorTree`" msgstr "" msgid ":doc:`pgr_hawickCircuits`" @@ -4358,177 +4375,106 @@ msgstr "" msgid ":doc:`release_notes`" msgstr "" -msgid "pgRouting 4.0.0 Release Notes" +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 4.0.0 `__" -msgstr "" - -msgid "Functions promoted to official" -msgstr "" - -msgid "pgr_trsp" -msgstr "" - -msgid "pgr_trspVia" -msgstr "" - -msgid "pgr_trspVia_withPoints" +"milestone for 3.7.0 `__" msgstr "" -msgid "pgr_trsp_withPoints" +msgid "Support" msgstr "" -msgid "pgr_withPoints" +msgid "" +"`#2656 `__ Stop support of " +"PostgreSQL12 on pgrouting v3.7" msgstr "" -msgid "pgr_withPointsCost" +msgid "Stopping support of PostgreSQL 12" msgstr "" -msgid "pgr_withPointsCostMatrix" +msgid "CI does not test for PostgreSQL 12" msgstr "" -msgid "pgr_withPointsDD" +msgid "New experimental functions" msgstr "" -msgid "pgr_withPointsKSP" +msgid "Metrics" msgstr "" -msgid "pgr_withPointsVia" +msgid "pgr_betweennessCentrality" msgstr "" -msgid "Signatures promoted to official" +msgid "Official functions changes" msgstr "" -msgid "pgr_aStar(Combinations)" +msgid "" +"`#2605 `__ Standarize " +"spanning tree functions output" msgstr "" -msgid "pgr_aStarCost(Combinations)" +msgid "Functions:" msgstr "" -msgid "pgr_bdAstar(Combinations)" +msgid "``pgr_kruskalDD``" msgstr "" -msgid "pgr_bdAstarCost(Combinations)" +msgid "``pgr_kruskalDFS``" msgstr "" -msgid "pgr_bdDijkstra(Combinations)" +msgid "``pgr_kruskalBFS``" msgstr "" -msgid "pgr_bdDijkstraCost(Combinations)" +msgid "``pgr_primDD``" msgstr "" -msgid "pgr_dijkstra(Combinations)" +msgid "``pgr_primDFS``" msgstr "" -msgid "pgr_dijkstraCost(Combinations)" +msgid "``pgr_primBFS``" msgstr "" -msgid "pgr_KSP(All signatures)" +msgid "Standarizing output columns to |result-spantree|" msgstr "" -msgid "pgr_boykovKolmogorov(Combinations)" +msgid "Added ``pred`` result columns." msgstr "" -msgid "pgr_edmondsKarp(Combinations)" +msgid "Experimental promoted to proposed." msgstr "" -msgid "pgr_maxFlow(Combinations)" +msgid "" +"`#2635 `__ pgr_LineGraph " +"ignores directed flag and use negative values for identifiers." msgstr "" -msgid "pgr_pushRelabel(Combinations)" +msgid "``pgr_lineGraph``" msgstr "" -msgid "code enhancements:" +msgid "Promoted to **proposed** signature." msgstr "" -msgid "Removal of unused C/C++ code" +msgid "Works for directed and undirected graphs." msgstr "" -msgid "Removal of SQL deprecated functions" +msgid "Code enhancement" msgstr "" msgid "" -"pgr_trsp(text,integer,double precision,integer,double precision,boolean," -"boolean,text)" -msgstr "" - -msgid "pgr_trsp(text,integer,integer,boolean,boolean,text)" +"`#2599 `__ Driving " +"distance cleanup" msgstr "" msgid "" -"pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)" -msgstr "" - -msgid "pgr_trspviavertices(text,anyarray,boolean,boolean,text)" -msgstr "" - -msgid "Removal of SQL deprecated internal functions" -msgstr "" - -msgid "_pgr_dijkstranear(text,anyarray,anyarray,bigint,boolean)" -msgstr "" - -msgid "_pgr_dijkstranear(text,anyarray,bigint,bigint,boolean)" -msgstr "" - -msgid "_pgr_dijkstranear(text,bigint,anyarray,bigint,boolean)" -msgstr "" - -msgid "_pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean,bigint)" -msgstr "" - -msgid "_pgr_dijkstra(text,text,boolean,boolean,boolean)" -msgstr "" - -msgid "_pgr_drivingdistance(text,anyarray,double precision,boolean,boolean)" -msgstr "" - -msgid "_pgr_kruskal(text,anyarray,text,bigint,double precision)" -msgstr "" - -msgid "_pgr_prim(text,anyarray,text,bigint,double precision)" +"`#2607 `__ Read postgresql " +"data on C++" msgstr "" msgid "" -"_pgr_trsp(text,integer,double precision,integer,double precision,boolean," -"boolean,text)" -msgstr "" - -msgid "_pgr_trsp(text,text,anyarray,anyarray,boolean)" -msgstr "" - -msgid "_pgr_trsp(text,text,anyarray,bigint,boolean)" -msgstr "" - -msgid "_pgr_trsp(text,text,bigint,anyarray,boolean)" -msgstr "" - -msgid "_pgr_trsp(text,text,bigint,bigint,boolean)" -msgstr "" - -msgid "_pgr_trspviavertices(text,integer[],boolean,boolean,text)" -msgstr "" - -msgid "_pgr_withpointsvia(text,bigint[],double precision[],boolean)" -msgstr "" - -msgid "_trsp(text,text,anyarray,anyarray,boolean)" -msgstr "" - -msgid "_v4trsp(text,text,anyarray,anyarray,boolean)" -msgstr "" - -msgid "_v4trsp(text,text,text,boolean)" -msgstr "" - -msgid "Deprecation of internal C/C++ functions" -msgstr "" - -msgid "Internal C/C++ functions in legacy" +"`#2614 `__ Clang tidy does " +"not work" msgstr "" msgid "All releases" @@ -4537,6 +4483,9 @@ msgstr "" msgid "Kruskal - Family of functions" msgstr "" +msgid "Boost Graph Inside" +msgstr "" + msgid "" "Kruskal's algorithm is a greedy minimum spanning tree algorithm that in each " "cycle finds and adds the edge of the least possible weight that connects any " @@ -4569,6 +4518,12 @@ msgstr "" msgid "All deprecated functions will be removed on next mayor version 4.0.0" msgstr "" +msgid "Migration of functions" +msgstr "" + +msgid "Migrating functions" +msgstr "" + msgid "Migration of ``pgr_aStar``" msgstr "" @@ -4721,7 +4676,7 @@ msgstr "" msgid "If needed add the new columns, for example:" msgstr "" -msgid "Migration of ``pgr_drivingDistance``" +msgid "Migration of ``pgr_drivingdistance``" msgstr "" msgid "" @@ -4741,10 +4696,10 @@ msgstr "" msgid "|result-spantree|" msgstr "" -msgid "pgr_drivingDistance(Single vertex)" +msgid "``pgr_drivingdistance`` (Single vertex)" msgstr "" -msgid "pgr_drivingDistance(Multiple vertices)" +msgid "``pgr_drivingdistance`` (Multiple vertices)" msgstr "" msgid "Output columns were |result-dij-dd|" @@ -4804,21 +4759,12 @@ msgstr "" msgid "|result-bfs|" msgstr "" -msgid "``pgr_kruskalDD``" -msgstr "" - msgid "Single vertex" msgstr "" msgid "Multiple vertices" msgstr "" -msgid "``pgr_kruskalDFS``" -msgstr "" - -msgid "``pgr_kruskalBFS``" -msgstr "" - msgid "Output columns were |result-bfs|" msgstr "" @@ -4972,15 +4918,6 @@ msgid "" "are being standardized." msgstr "" -msgid "``pgr_primDD``" -msgstr "" - -msgid "``pgr_primDFS``" -msgstr "" - -msgid "``pgr_primBFS``" -msgstr "" - msgid "Prim single vertex" msgstr "" @@ -5173,269 +5110,389 @@ msgid "" "original columns:" msgstr "" -msgid "Migration of ``pgr_trsp`` (Vertices)" +msgid "Migration of turn restrictions" msgstr "" -msgid "Signature:" +msgid "Migration of restrictions" msgstr "" -msgid "Deprecated" +msgid "The structure of the restrictions have changed:" msgstr "" -msgid "`v3.4.0 `__" +msgid "Old restrictions structure" msgstr "" -msgid "Removed" +msgid "On the deprecated signatures:" msgstr "" -msgid "`v4.0.0 `__" +msgid "Column ``rid`` is ignored" msgstr "" -msgid ":doc:`pgr_dijkstra`" +msgid "``via_path``" msgstr "" -msgid ":doc:`pgr_trsp`" +msgid "Must be in reverse order." msgstr "" -msgid "`Migration of restrictions`_" +msgid "Is of type ``TEXT``." msgstr "" -msgid "Use ``pgr_dijkstra`` when there are no restrictions." +msgid "When more than one via edge must be separated with ``,``." msgstr "" -msgid "Use :doc:`pgr_dijkstra` instead." +msgid "``target_id``" msgstr "" -msgid "To get the original column names:" +msgid "Is the last edge of the forbidden path." msgstr "" -msgid "``id1`` is the node" +msgid "Is of type ``INTEGER``." msgstr "" -msgid "``id2`` is the edge" +msgid "``to_cost``" msgstr "" -msgid "Use ``pgr_trsp`` when there are restrictions." +msgid "Is of type ``FLOAT``." msgstr "" -msgid "Use :doc:`pgr_trsp` (One to One) instead." +msgid "Creation of the old restrictions table" msgstr "" -msgid "Migration of ``pgr_trsp`` (Edges)" +msgid "Old restrictions fill up" msgstr "" -msgid ":doc:`pgr_withPoints`" +msgid "Old restrictions contents" msgstr "" -msgid ":doc:`pgr_trsp_withPoints`" +msgid "" +"The restriction with ``rid = 2`` is representing :math:`3 \\rightarrow 5 " +"\\rightarrow9`" msgstr "" -msgid "Use ``pgr_withPoints`` when there are no restrictions." +msgid ":math:`3\\rightarrow5`" msgstr "" -msgid "Use :doc:`pgr_withPoints` (One to One) instead." +msgid "is on column ``via_path`` in reverse order" msgstr "" -msgid "Use ``pgr_trsp_withPoints`` when there are restrictions." +msgid "is of type ``TEXT``" msgstr "" -msgid "Use :doc:`pgr_trsp_withPoints` instead." +msgid ":math:`9`" msgstr "" -msgid "Migration of ``pgr_trspViaVertices``" +msgid "is on column ``target_id``" msgstr "" -msgid ":doc:`pgr_dijkstraVia`" +msgid "is of type ``INTEGER``" msgstr "" -msgid ":doc:`pgr_trspVia`" +msgid "New restrictions structure" msgstr "" -msgid "Use ``pgr_dijkstraVia`` when there are no restrictions" +msgid "Column ``id`` is ignored" msgstr "" -msgid "Use :doc:`pgr_dijkstraVia` instead." +msgid "Column ``path``" msgstr "" -msgid "``id1`` is the path identifier" +msgid "Is of type ``ARRAY[ANY-INTEGER]``." msgstr "" -msgid "``id2`` is the node" +msgid "Contains all the edges involved on the restriction." msgstr "" -msgid "``id3`` is the edge" +msgid "The array has the ordered edges of the restriction." msgstr "" -msgid "Use ``pgr_trspVia`` when there are restrictions" +msgid "Column ``cost``" msgstr "" -msgid "Use :doc:`pgr_trspVia` instead." +msgid "Is of type ``ANY-NUMERICAL``" msgstr "" -msgid "Migration of ``pgr_trspViaEdges``" +msgid "The creation of the restrictions table" msgstr "" -msgid ":doc:`pgr_withPointsVia`" +msgid "Adding the restrictions" msgstr "" -msgid ":doc:`pgr_trspVia_withPoints`" +msgid "Restrictions data" msgstr "" -msgid "Use ``pgr_withPointsVia`` when there are no restrictions" +msgid "" +"The restriction with ``rid = 2`` represents the path :math:`3 \\rightarrow5 " +"\\rightarrow9`." msgstr "" -msgid "Use :doc:`pgr_withPointsVia` instead." +msgid "By inspection the path is clear." msgstr "" -msgid "Use ``pgr_trspVia_withPoints`` when there are restrictions" +msgid "" +"To transform the old restrictions table to the new restrictions structure," msgstr "" -msgid "Use :doc:`pgr_trspVia_withPoints` instead." +msgid "Create a new table with the new restrictions structure." msgstr "" -msgid "Migration of restrictions" +msgid "In this migration guide ``new_restrictions`` is been used." msgstr "" -msgid "The structure of the restrictions have changed:" +msgid "" +"For this migration pgRouting supplies an auxiliary function for reversal of " +"an array ``_pgr_array_reverse`` needed for the migration." msgstr "" -msgid "Old restrictions structure" +msgid "``_pgr_array_reverse``:" msgstr "" -msgid "On the deprecated signatures:" +msgid "Was created temporally for this migration" msgstr "" -msgid "Column ``rid`` is ignored" +msgid "Is not documented." msgstr "" -msgid "``via_path``" +msgid "Will be removed on the next mayor version 4.0.0" msgstr "" -msgid "Must be in reverse order." +msgid "The migrated table contents:" msgstr "" -msgid "Is of type ``TEXT``." +msgid "Migration of ``pgr_trsp`` (Vertices)" msgstr "" -msgid "When more than one via edge must be separated with ``,``." +msgid "" +":doc:`pgr_trsp` signatures have changed and many issues have been fixed in " +"the new signatures. This section will show how to migrate from the old " +"signatures to the new replacement functions. This also affects the " +"restrictions." msgstr "" -msgid "``target_id``" +msgid "The integral type of the ``Edges SQL`` can only be ``INTEGER``." msgstr "" -msgid "Is the last edge of the forbidden path." +msgid "The floating point type of the ``Edges SQL`` can only be ``FLOAT``." msgstr "" -msgid "Is of type ``INTEGER``." +msgid "``directed`` flag is compulsory." msgstr "" -msgid "``to_cost``" +msgid "Does not autodetect if ``reverse_cost`` column exist." msgstr "" -msgid "Is of type ``FLOAT``." +msgid "" +"User must be careful to match the existence of the column with the value of " +"``has_rcost`` parameter." msgstr "" -msgid "Creation of the old restrictions table" +msgid "The restrictions inner query is optional." msgstr "" -msgid "Old restrictions fill up" +msgid "The output column names are meaningless" msgstr "" -msgid "Old restrictions contents" +msgid "Migrate by using:" +msgstr "" + +msgid ":doc:`pgr_dijkstra` when there are no restrictions," +msgstr "" + +msgid ":doc:`pgr_trsp` (One to One) when there are restrictions." +msgstr "" + +msgid "Migrating ``pgr_trsp`` (Vertices) using ``pgr_dijkstra``" +msgstr "" + +msgid "The following query does not have restrictions." +msgstr "" + +msgid "A message about deprecation is shown" +msgstr "" + +msgid "Deprecated functions will be removed on the next mayor version 4.0.0" +msgstr "" + +msgid "Use :doc:`pgr_dijkstra` instead." +msgstr "" + +msgid "The types casting has been removed." +msgstr "" + +msgid ":doc:`pgr_dijkstra`:" +msgstr "" + +msgid "Autodetects if ``reverse_cost`` column is in the edges SQL." +msgstr "" + +msgid "Accepts ``ANY-INTEGER`` on integral types" +msgstr "" + +msgid "Accepts ``ANY-NUMERICAL`` on floating point types" +msgstr "" + +msgid "``directed`` flag has a default value of ``true``." +msgstr "" + +msgid "Use the same value that on the original query." +msgstr "" + +msgid "In this example it is ``true`` which is the default value." +msgstr "" + +msgid "The flag has been omitted and the default is been used." msgstr "" msgid "" -"The restriction with ``rid = 2`` is representing :math:`3 \\rightarrow 5 " -"\\rightarrow9`" +"When the need of using strictly the same (meaningless) names and types of " +"the function been migrated then:" msgstr "" -msgid ":math:`3\\rightarrow5`" +msgid "``id1`` is the node" msgstr "" -msgid "is on column ``via_path`` in reverse order" +msgid "``id2`` is the edge" msgstr "" -msgid "is of type ``TEXT``" +msgid "Migrating ``pgr_trsp`` (Vertices) using ``pgr_trsp``" msgstr "" -msgid ":math:`9`" +msgid "The following query has restrictions." msgstr "" -msgid "is on column ``target_id``" +msgid "The restrictions are the last parameter of the function" msgstr "" -msgid "is of type ``INTEGER``" +msgid "Using the old structure of restrictions" msgstr "" -msgid "New restrictions structure" +msgid "Use :doc:`pgr_trsp` (One to One) instead." msgstr "" -msgid "Column ``id`` is ignored" +msgid "The new structure of restrictions is been used." msgstr "" -msgid "Column ``path``" +msgid "It is the second parameter." msgstr "" -msgid "Is of type ``ARRAY[ANY-INTEGER]``." +msgid ":doc:`pgr_trsp`:" msgstr "" -msgid "Contains all the edges involved on the restriction." +msgid "Migration of ``pgr_trsp`` (Edges)" msgstr "" -msgid "The array has the ordered edges of the restriction." +msgid "The integral types of the ``sql`` can only be ``INTEGER``." msgstr "" -msgid "Column ``cost``" +msgid "The floating point type of the ``sql`` can only be ``FLOAT``." msgstr "" -msgid "Is of type ``ANY-NUMERICAL``" +msgid "For these migration guide the following points will be used:" msgstr "" -msgid "The creation of the restrictions table" +msgid ":doc:`pgr_withPoints` when there are no restrictions," msgstr "" -msgid "Adding the restrictions" +msgid ":doc:`pgr_trsp_withPoints` (One to One) when there are restrictions." msgstr "" -msgid "Restrictions data" +msgid "Migrating ``pgr_trsp`` (Edges) using ``pgr_withPoints``" msgstr "" -msgid "" -"The restriction with ``rid = 2`` represents the path :math:`3 \\rightarrow5 " -"\\rightarrow9`." +msgid "Use :doc:`pgr_withPoints` instead." msgstr "" -msgid "By inspection the path is clear." +msgid "Do not show details, as the deprecated function does not show details." +msgstr "" + +msgid ":doc:`pgr_withPoints`:" +msgstr "" + +msgid "On the points query do not include the ``side`` column." msgstr "" msgid "" -"To transform the old restrictions table to the new restrictions structure," +"When the need of using strictly the same (meaningless) names and types, and " +"node values of the function been migrated then:" msgstr "" -msgid "Create a new table with the new restrictions structure." +msgid "Migrating ``pgr_trsp`` (Edges) using ``pgr_trsp_withPoints``" msgstr "" -msgid "In this migration guide ``new_restrictions`` is been used." +msgid "Use :doc:`pgr_trsp_withPoints` instead." +msgstr "" + +msgid ":doc:`pgr_trsp_withPoints`:" +msgstr "" + +msgid "Migration of ``pgr_trspViaVertices``" +msgstr "" + +msgid "The integral types of the ``Edges SQL`` can only be ``INTEGER``." +msgstr "" + +msgid ":doc:`pgr_dijkstraVia` when there are no restrictions," +msgstr "" + +msgid ":doc:`pgr_trspVia` when there are restrictions." +msgstr "" + +msgid "Migrating ``pgr_trspViaVertices`` using ``pgr_dijkstraVia``" +msgstr "" + +msgid "Use :doc:`pgr_dijkstraVia` instead." +msgstr "" + +msgid ":doc:`pgr_dijkstraVia`:" +msgstr "" + +msgid "``id1`` is the path identifier" +msgstr "" + +msgid "``id2`` is the node" +msgstr "" + +msgid "``id3`` is the edge" +msgstr "" + +msgid "Migrating ``pgr_trspViaVertices`` using ``pgr_trspVia``" +msgstr "" + +msgid "Use :doc:`pgr_trspVia` instead." +msgstr "" + +msgid ":doc:`pgr_trspVia`:" +msgstr "" + +msgid "Migration of ``pgr_trspViaEdges``" msgstr "" msgid "" -"For this migration pgRouting supplies an auxiliary function for reversal of " -"an array ``_pgr_array_reverse`` needed for the migration." +"And will travel thru the following Via points :math:" +"`4\\rightarrow3\\rightarrow6`" msgstr "" -msgid "``_pgr_array_reverse``:" +msgid ":doc:`pgr_withPointsVia` when there are no restrictions," msgstr "" -msgid "Was created temporally for this migration" +msgid ":doc:`pgr_trspVia_withPoints` when there are restrictions." msgstr "" -msgid "Is not documented." +msgid "Migrating ``pgr_trspViaEdges`` using ``pgr_withPointsVia``" msgstr "" -msgid "Will be removed on the next mayor version 4.0.0" +msgid "Use :doc:`pgr_withPointsVia` instead." msgstr "" -msgid "The migrated table contents:" +msgid ":doc:`pgr_withPointsVia`:" +msgstr "" + +msgid "Migrating ``pgr_trspViaEdges`` using ``pgr_trspVia_withPoints``" +msgstr "" + +msgid "Use :doc:`pgr_trspVia_withPoints` instead." +msgstr "" + +msgid ":doc:`pgr_trspVia_withPoints`:" msgstr "" msgid ":doc:`withPoints-category`" @@ -6571,6 +6628,9 @@ msgstr "" msgid "Parameters for the Via functions" msgstr "" +msgid ":doc:`pgr_dijkstraVia`" +msgstr "" + msgid "SQL query as described." msgstr "" @@ -6610,6 +6670,9 @@ msgstr "" msgid "For the TRSP functions" msgstr "" +msgid ":doc:`pgr_trsp`" +msgstr "" + msgid "Array of identifiers of destination vertices." msgstr "" @@ -6661,6 +6724,9 @@ msgstr "" msgid "Used in functions the following:" msgstr "" +msgid ":doc:`pgr_withPoints`" +msgstr "" + msgid "" "Returns set of ``(seq, path_seq [, start_pid] [, end_pid], node, edge, cost, " "agg_cost)``" @@ -6945,7 +7011,7 @@ msgid "Upgrading the database" msgstr "" msgid "" -"To upgrade pgRouting in the database to version 4.0.0 use the following " +"To upgrade pgRouting in the database to version 3.7.0 use the following " "command:" msgstr "" @@ -7393,7 +7459,7 @@ msgstr "" msgid ":doc:`migration`" msgstr "" -msgid "``pgr_KSP``" +msgid "pgr_KSP" msgstr "" msgid "``pgr_KSP`` — Yen's algorithm for K shortest paths using Dijkstra." @@ -7402,37 +7468,31 @@ msgstr "" msgid "Availability" msgstr "" -msgid "Version 4.0.0" -msgstr "" - -msgid "All signatures promoted to official." -msgstr "" - msgid "Version 3.6.0" msgstr "" msgid "Result columns standarized to: |nksp-result|" msgstr "" -msgid "pgr_ksp(One to One)" +msgid "``pgr_ksp`` (One to One)" msgstr "" msgid "Added ``start_vid`` and ``end_vid`` result columns." msgstr "" -msgid "New proposed signatures:" +msgid "New overload functions:" msgstr "" -msgid "pgr_ksp(One to Many)" +msgid "``pgr_ksp`` (One to Many)" msgstr "" -msgid "pgr_ksp(Many to One)" +msgid "``pgr_ksp`` (Many to One)" msgstr "" -msgid "pgr_ksp(Many to Many)" +msgid "``pgr_ksp`` (Many to Many)" msgstr "" -msgid "pgr_ksp(Combinations)" +msgid "``pgr_ksp`` (Combinations)" msgstr "" msgid "Version 2.1.0" @@ -7447,7 +7507,7 @@ msgstr "" msgid "Version 2.0.0" msgstr "" -msgid "Official function." +msgid "**Official** function" msgstr "" msgid "" @@ -7455,12 +7515,6 @@ msgid "" "number of shortest paths desired." msgstr "" -msgid "|Boost| Boost Graph Inside" -msgstr "" - -msgid "Boost Graph Inside" -msgstr "" - msgid "Signatures" msgstr "" @@ -7805,11 +7859,6 @@ msgstr "" msgid "``pgr_TSPeuclidean`` - Aproximation using *metric* algorithm." msgstr "" -msgid "" -"Using `Boost: metric TSP approx `__" -msgstr "" - msgid "" "The Simulated Annealing Algorithm related parameters are ignored: " "`max_processing_time`, `tries_per_temperature`, " @@ -7823,7 +7872,7 @@ msgstr "" msgid "Name change from pgr_eucledianTSP" msgstr "" -msgid "New official function." +msgid "New **Official** function" msgstr "" msgid "" @@ -7904,49 +7953,56 @@ msgid "" "obtained with ``pgr_TSPeuclidean``." msgstr "" -msgid "``pgr_aStar``" +msgid ":doc:`sampledata` network." msgstr "" -msgid "``pgr_aStar`` — Shortest path using the A* algorithm." +msgid "``pgr_aStar``" msgstr "" -msgid "Combinations signature promoted to official." +msgid "``pgr_aStar`` — Shortest path using the A* algorithm." msgstr "" msgid "Standarizing output columns to |short-generic-result|" msgstr "" -msgid "pgr_aStar(One to One) added ``start_vid`` and ``end_vid`` columns." +msgid "" +"``pgr_aStar`` (`One to One`_) added ``start_vid`` and ``end_vid`` columns." msgstr "" -msgid "pgr_aStar(One to Many) added ``end_vid`` column." +msgid "``pgr_aStar`` (`One to Many`_) added ``end_vid`` column." msgstr "" -msgid "pgr_aStar(Many to One) added ``start_vid`` column." +msgid "``pgr_aStar`` (`Many to One`_) added ``start_vid`` column." msgstr "" msgid "Version 3.2.0" msgstr "" -msgid "New proposed signature:" +msgid "New **proposed** signature:" msgstr "" -msgid "Function promoted to official." +msgid "``pgr_aStar`` (`Combinations`_)" msgstr "" msgid "Version 2.4.0" msgstr "" -msgid "pgr_aStar(One to Many)" +msgid "New **Proposed** signatures:" msgstr "" -msgid "pgr_aStar(Many to One)" +msgid "``pgr_aStar`` (`One to Many`_)" msgstr "" -msgid "pgr_aStar(Many to Many)" +msgid "``pgr_aStar`` (`Many to One`_)" msgstr "" -msgid "Signature change on pgr_aStar(One to One)" +msgid "``pgr_aStar`` (`Many to Many`_)" +msgstr "" + +msgid "Signature change on ``pgr_astar`` (`One to One`_)" +msgstr "" + +msgid "**Official** ``pgr_aStar`` (`One to One`_)" msgstr "" msgid "" @@ -8020,14 +8076,17 @@ msgstr "" msgid "Manually assigned vertex combinations." msgstr "" -msgid "``pgr_aStarCost``" +msgid "pgr_aStarCost" msgstr "" msgid "" "``pgr_aStarCost`` - Total cost of the shortest path using the A* algorithm." msgstr "" -msgid "New proposed function." +msgid "``pgr_aStarCost`` (`Combinations`_)" +msgstr "" + +msgid "New **proposed** function" msgstr "" msgid "" @@ -8147,9 +8206,6 @@ msgstr "" msgid "Renamed from version 1.x" msgstr "" -msgid "Support" -msgstr "" - msgid "Returns the polygon part of an alpha shape." msgstr "" @@ -8222,7 +8278,7 @@ msgstr "" msgid "`ST_ConcaveHull `__" msgstr "" -msgid "``pgr_analyzeGraph``" +msgid "pgr_analyzeGraph" msgstr "" msgid "``pgr_analyzeGraph`` — Analyzes the network topology." @@ -8484,6 +8540,9 @@ msgid "" "table ``othertable``. (note the use of quote_literal)" msgstr "" +msgid "The examples use the :doc:`sampledata` network." +msgstr "" + msgid ":doc:`pgr_analyzeOneWay`" msgstr "" @@ -8493,7 +8552,7 @@ msgstr "" msgid ":doc:`pgr_nodeNetwork` to create nodes to a not noded edge table." msgstr "" -msgid "``pgr_analyzeOneWay``" +msgid "pgr_analyzeOneWay" msgstr "" msgid "" @@ -8645,7 +8704,7 @@ msgstr "" msgid "Version 2.5.0" msgstr "" -msgid "New experimental function." +msgid "New **experimental** function" msgstr "" msgid "" @@ -8677,7 +8736,7 @@ msgid "Nodes in red are the articulation points." msgstr "" msgid "" -"`Boost: Biconnected components & articulation points `__" msgstr "" @@ -8692,30 +8751,37 @@ msgstr "" msgid "``pgr_bdAstar`` — Shortest path using the bidirectional A* algorithm." msgstr "" -msgid "pgr_bdAstar(One to One) added ``start_vid`` and ``end_vid`` columns." +msgid "" +"``pgr_bdAstar`` (`One to One`_) added ``start_vid`` and ``end_vid`` columns." +msgstr "" + +msgid "``pgr_bdAstar`` (`One to Many`_) added ``end_vid`` column." +msgstr "" + +msgid "``pgr_bdAstar`` (`Many to One`_) added ``start_vid`` column." msgstr "" -msgid "pgr_bdAstar(One to Many) added ``end_vid`` column." +msgid "``pgr_bdAstar`` (`Combinations`_)" msgstr "" -msgid "pgr_bdAstar(Many to One) added ``start_vid`` column." +msgid "``pgr_bdAstar`` (`One to Many`_)" msgstr "" -msgid "pgr_bdAstar(One to Many)" +msgid "``pgr_bdAstar`` (`Many to One`_)" msgstr "" -msgid "pgr_bdAstar(Many to One)" +msgid "``pgr_bdAstar`` (`Many to Many`_)" msgstr "" -msgid "pgr_bdAstar(Many to Many)" +msgid "Signature change on ``pgr_bdAstar`` (`One to One`_)" msgstr "" -msgid "Signature change on pgr_bdAstar(One to One)" +msgid "**Official** ``pgr_bdAstar`` (`One to One`_)" msgstr "" msgid "" -"The results are equivalent to the union of the results of the " -"pgr_bdAStar(One to One) on the:" +"The results are equivalent to the union of the results of the `pgr_bdAStar(` " +"`One to One`_ `)` on the:" msgstr "" msgid "pgr_bdAstar(`Edges SQL`_, **start vid**, **end vid**, [**options**])" @@ -8733,7 +8799,7 @@ msgstr "" msgid "pgr_bdAstar(`Edges SQL`_, `Combinations SQL`_, [**options**])" msgstr "" -msgid "``pgr_bdAstarCost``" +msgid "pgr_bdAstarCost" msgstr "" msgid "" @@ -8741,6 +8807,9 @@ msgid "" "bidirectional A* algorithm." msgstr "" +msgid "``pgr_bdAstarCost`` (`Combinations`_)" +msgstr "" + msgid "" "The ``pgr_bdAstarCost`` function sumarizes of the cost of the shortest path " "using the bidirectional A* algorithm." @@ -8787,16 +8856,25 @@ msgid "" "algorithm." msgstr "" -msgid "pgr_bdDijkstra(One to Many)" +msgid "pgr_bdDijkstra(`Combinations`_)" +msgstr "" + +msgid "New **Proposed** functions:" +msgstr "" + +msgid "``pgr_bdDijkstra`` (`One to Many`_)" +msgstr "" + +msgid "``pgr_bdDijkstra`` (`Many to One`_)" msgstr "" -msgid "pgr_bdDijkstra(Many to One)" +msgid "``pgr_bdDijkstra`` (`Many to Many`_)" msgstr "" -msgid "pgr_bdDijkstra(Many to Many)" +msgid "Signature change on ``pgr_bdDijsktra`` (`One to One`_)" msgstr "" -msgid "Signature change on pgr_bdDijsktra(One to One)" +msgid "**Official** ``pgr_bdDijkstra`` (`One to One`_)" msgstr "" msgid "" @@ -8850,6 +8928,11 @@ msgstr "" 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" +msgstr "" + msgid "https://en.wikipedia.org/wiki/Bidirectional_search" msgstr "" @@ -8861,6 +8944,9 @@ msgid "" "Bidirectional Dijkstra algorithm." msgstr "" +msgid "``pgr_bdDijkstraCost`` (`Combinations`_)" +msgstr "" + msgid "" "The ``pgr_bdDijkstraCost`` function sumarizes of the cost of the shortest " "path using the bidirectional Dijkstra Algorithm." @@ -8919,10 +9005,25 @@ msgstr "" msgid "``pgr_bellmanFord`` — Shortest path using Bellman-Ford algorithm." msgstr "" -msgid "New experimental signature:" +msgid "New **experimental** signature:" msgstr "" -msgid "pgr_bellmanFord(Combinations)" +msgid "``pgr_bellmanFord`` (`Combinations`_)" +msgstr "" + +msgid "New **experimental** signatures:" +msgstr "" + +msgid "``pgr_bellmanFord`` (`One to One`_)" +msgstr "" + +msgid "``pgr_bellmanFord`` (`One to Many`_)" +msgstr "" + +msgid "``pgr_bellmanFord`` (`Many to One`_)" +msgstr "" + +msgid "``pgr_bellmanFord`` (`Many to Many`_)" msgstr "" msgid "" @@ -8997,25 +9098,23 @@ msgstr "" msgid "Using a combinations table on an **undirected** graph." msgstr "" -msgid "" -"`Boost: Bellman Ford `__" -msgstr "" - msgid "https://en.wikipedia.org/wiki/Bellman%E2%80%93Ford_algorithm" msgstr "" -msgid "``pgr_betweennessCentrality`` - Experimental" +msgid "``pgr_betweennessCentrality``" msgstr "" msgid "" -"``pgr_betweennessCentrality`` - Calculates the relative betweenness " +"``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." @@ -9085,8 +9184,11 @@ msgid "" msgstr "" msgid "" -"`Boost: betweenness centrality `_" +"Boost's `betweenness_centrality `_" +msgstr "" + +msgid "Queries use the :doc:`sampledata` network." msgstr "" msgid "``pgr_biconnectedComponents``" @@ -9145,6 +9247,11 @@ msgstr "" msgid "Identifier of the edge that belongs to the ``component``." msgstr "" +msgid "" +"Boost: `Biconnected components `__" +msgstr "" + msgid "``pgr_binaryBreadthFirstSearch`` - Experimental" msgstr "" @@ -9158,7 +9265,19 @@ msgid "" "negative integer, is termed as a 'binary graph'." msgstr "" -msgid "pgr_binaryBreadthFirstSearch(Combinations)" +msgid "pgr_binaryBreadthFirstSearch(`Combinations`_)" +msgstr "" + +msgid "pgr_binaryBreadthFirstSearch(`One to One`_)" +msgstr "" + +msgid "pgr_binaryBreadthFirstSearch(`One to Many`_)" +msgstr "" + +msgid "pgr_binaryBreadthFirstSearch(`Many to One`_)" +msgstr "" + +msgid "pgr_binaryBreadthFirstSearch(`Many to Many`_)" msgstr "" msgid "" @@ -9220,11 +9339,6 @@ msgid "" "math:`1``)" msgstr "" -msgid "" -"`Boost: Breadth First Search `__" -msgstr "" - msgid "https://cp-algorithms.com/graph/01_bfs.html" msgstr "" @@ -9232,7 +9346,7 @@ msgid "" "https://en.wikipedia.org/wiki/Dijkstra%27s_algorithm#Specialized_variants" msgstr "" -msgid "``pgr_bipartite`` - Experimental" +msgid "pgr_bipartite -Experimental" msgstr "" msgid "" @@ -9240,6 +9354,9 @@ msgid "" "within the same set are adjacent." msgstr "" +msgid "New **experimental** signature" +msgstr "" + msgid "" "A bipartite graph is a graph with two sets of vertices which are connected " "to each other, but not within themselves. A bipartite graph is possible if " @@ -9286,16 +9403,6 @@ msgstr "" msgid "Edges in blue represent odd length cycle subgraph." msgstr "" -msgid "" -"`Boost: is_bipartite `__" -msgstr "" - -msgid "" -"`Wikipedia: bipartite graph `__" -msgstr "" - msgid "``pgr_boykovKolmogorov``" msgstr "" @@ -9305,10 +9412,19 @@ msgid "" "algorithm." msgstr "" +msgid "New **proposed** signature" +msgstr "" + +msgid "``pgr_boykovKolmogorov`` (`Combinations`_)" +msgstr "" + msgid "Renamed from ``pgr_maxFlowBoykovKolmogorov``" msgstr "" -msgid "Function promoted to proposed." +msgid "**Proposed** function" +msgstr "" + +msgid "New **Experimental** function" msgstr "" msgid "Running time: Polynomial" @@ -9350,9 +9466,7 @@ msgid "" "math:`\\{5, 6\\}` to vertices :math:`\\{10, 15, 14\\}`." msgstr "" -msgid "" -"`Boost: Boykov Kolmogorov max flow `__" +msgid "https://www.boost.org/libs/graph/doc/boykov_kolmogorov_max_flow.html" msgstr "" msgid "``pgr_breadthFirstSearch`` - Experimental" @@ -9363,6 +9477,12 @@ msgid "" "First Search algorithm." msgstr "" +msgid "``pgr_breadthFirstSearch`` (`Single Vertex`_)" +msgstr "" + +msgid "``pgr_breadthFirstSearch`` (`Multiple Vertices`_)" +msgstr "" + msgid "" "Provides the Breadth First Search traversal order from a root vertex to a " "particular depth." @@ -9427,6 +9547,11 @@ msgstr "" msgid "descending" msgstr "" +msgid "" +"`Boost: Breadth First Search algorithm documentation `__" +msgstr "" + msgid "" "`Wikipedia: Breadth First Search algorithm `__" @@ -9465,9 +9590,7 @@ msgstr "" msgid "https://en.wikipedia.org/wiki/Bridge_%28graph_theory%29" msgstr "" -msgid "" -"`Boost: Connected components `__" +msgid "**Supported versions**" msgstr "" msgid "``pgr_chinesePostman`` - Experimental" @@ -9525,7 +9648,7 @@ msgstr "" msgid "Minimum costs of a circuit path." msgstr "" -msgid "``pgr_connectedComponents``" +msgid "pgr_connectedComponents" msgstr "" msgid "" @@ -9562,6 +9685,11 @@ msgstr "" msgid "Connecting disconnected components" msgstr "" +msgid "" +"Boost: `Connected components `__" +msgstr "" + msgid "" "wikipedia: `Connected component `__" @@ -9736,7 +9864,7 @@ msgstr "" msgid "Only linear contraction" msgstr "" -msgid "``pgr_createTopology``" +msgid "pgr_createTopology" msgstr "" msgid "" @@ -9939,7 +10067,10 @@ msgid "" "to the rest of the edges." msgstr "" -msgid "``pgr_createVerticesTable``" +msgid "The example uses the :doc:`sampledata` network." +msgstr "" + +msgid "pgr_createVerticesTable" msgstr "" msgid "" @@ -10155,7 +10286,7 @@ msgid "" "Cuthill%E2%80%93McKee_algorithm>`__" msgstr "" -msgid "``pgr_dagShortestPath`` - Experimental" +msgid "pgr_dagShortestPath - Experimental" msgstr "" msgid "" @@ -10234,11 +10365,6 @@ msgstr "" msgid "Making **start_vids** the same as **end_vids**" msgstr "" -msgid "" -"`Boost: DAG shortest paths `__" -msgstr "" - msgid "https://en.wikipedia.org/wiki/Topological_sorting" msgstr "" @@ -10357,9 +10483,18 @@ msgstr "" msgid "Version 3.3.0" msgstr "" -msgid "" -"Depth First Search algorithm is a traversal algorithm which starts from a " -"root vertex, goes as deep as possible, and backtracks once a vertex is " +msgid "Promoted to **proposed** function" +msgstr "" + +msgid "``pgr_depthFirstSearch`` (`Single Vertex`_)" +msgstr "" + +msgid "``pgr_depthFirstSearch`` (`Multiple Vertices`_)" +msgstr "" + +msgid "" +"Depth First Search algorithm is a traversal algorithm which starts from a " +"root vertex, goes as deep as possible, and backtracks once a vertex is " "reached with no adjacent vertices or with all visited adjacent vertices. The " "traversal continues until all the vertices reachable from the root vertex " "are visited." @@ -10410,13 +10545,13 @@ msgid "Same as `Single vertex`_ but with edges in descending order of ``id``." msgstr "" msgid "" -"`Boost: Depth First Search `__" +"`Boost: Depth First Search algorithm documentation `__" msgstr "" msgid "" -"`Boost: Undirected DFS `__" +"`Boost: Undirected DFS algorithm documentation `__" msgstr "" msgid "" @@ -10433,31 +10568,44 @@ msgstr "" msgid "Version 3.5.0" msgstr "" -msgid "pgr_dijkstra(One to One) added ``start_vid`` and ``end_vid`` columns." +msgid "" +"``pgr_dijkstra`` (`One to One`_) added ``start_vid`` and ``end_vid`` columns." msgstr "" -msgid "pgr_dijkstra(One to Many) added ``end_vid`` column." +msgid "``pgr_dijkstra`` (`One to Many`_) added ``end_vid`` column." msgstr "" -msgid "pgr_dijkstra(Many to One) added ``start_vid`` column." +msgid "``pgr_dijkstra`` (`Many to One`_) added ``start_vid`` column." msgstr "" msgid "Version 3.1.0" msgstr "" +msgid "``pgr_dijkstra`` (`Combinations`_)" +msgstr "" + +msgid "**Official** functions" +msgstr "" + msgid "Version 2.2.0" msgstr "" -msgid "pgr_dijkstra(One to Many)" +msgid "New **proposed** functions:" msgstr "" -msgid "pgr_dijkstra(Many to One)" +msgid "``pgr_dijkstra`` (`One to Many`_)" msgstr "" -msgid "pgr_dijkstra(Many to Many)" +msgid "``pgr_dijkstra`` (`Many to One`_)" msgstr "" -msgid "Signature change on pgr_dijkstra(One to One)" +msgid "``pgr_dijkstra`` (`Many to Many`_)" +msgstr "" + +msgid "Signature change on ``pgr_dijkstra`` (`One to One`_)" +msgstr "" + +msgid "**Official** ``pgr_dijkstra`` (`One to One`_)" msgstr "" msgid "pgr_dijkstra(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" @@ -10643,11 +10791,6 @@ msgstr "" msgid "37) Using `Combinations`_" msgstr "" -msgid "" -"`Boost: Dijkstra shortest paths `__" -msgstr "" - msgid "https://en.wikipedia.org/wiki/Dijkstra%27s_algorithm" msgstr "" @@ -10659,6 +10802,9 @@ msgid "" "algorithm." msgstr "" +msgid "``pgr_dijkstraCost`` (`Combinations`_)" +msgstr "" + msgid "" "The ``pgr_dijkstraCost`` function sumarizes of the cost of the shortest path " "using Dijkstra Algorithm." @@ -10944,6 +11090,9 @@ msgstr "" msgid "When ``false``: ``cap`` limit per ``Start vid`` will be returned" msgstr "" +msgid "boost: https://www.boost.org/libs/graph/doc/table_of_contents.html" +msgstr "" + msgid "Wikipedia: https://en.wikipedia.org/wiki/Dijkstra%27s_algorithm" msgstr "" @@ -11110,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 "" @@ -11122,16 +11268,13 @@ msgstr "" msgid "Added ``depth`` and ``pred`` result columns." msgstr "" -msgid "Signature change:" +msgid "Signature change pgr_drivingDistance(single vertex)" msgstr "" -msgid "pgr_drivingDistance(single vertex)" -msgstr "" - -msgid "New official signature:" +msgid "New **Official** pgr_drivingDistance(multiple vertices)" msgstr "" -msgid "pgr_drivingDistance(multiple vertices)" +msgid "Official:: pgr_drivingDistance(single vertex)" msgstr "" msgid "" @@ -11186,7 +11329,7 @@ msgid "" "undirected graph" msgstr "" -msgid "``pgr_edgeColoring`` - Experimental" +msgid "pgr_edgeColoring - Experimental" msgstr "" msgid "" @@ -11260,15 +11403,6 @@ msgstr "" msgid "Graph coloring of pgRouting :doc:`sampledata`" msgstr "" -msgid "" -"`Boost: Edge Coloring `__" -msgstr "" - -msgid "" -"`Wikipedia: Graph coloring `__" -msgstr "" - msgid "``pgr_edgeDisjointPaths``" msgstr "" @@ -11277,6 +11411,9 @@ msgid "" "groups of vertices." msgstr "" +msgid "New **proposed** function:" +msgstr "" + msgid "pgr_edgeDisjointPaths(Combinations)" msgstr "" @@ -11358,6 +11495,9 @@ msgid "" "the flow from the sources to the targets using Edmonds Karp Algorithm." msgstr "" +msgid "``pgr_edmondsKarp`` (`Combinations`_)" +msgstr "" + msgid "Renamed from ``pgr_maxFlowEdmondsKarp``" msgstr "" @@ -11379,22 +11519,32 @@ msgstr "" msgid "pgr_edmondsKarp(`Edges SQL`_, `Combinations SQL`_)" msgstr "" -msgid "" -"`Boost: Edmonds Karp max flow `__" +msgid "https://www.boost.org/libs/graph/doc/edmonds_karp_max_flow.html" msgstr "" msgid "https://en.wikipedia.org/wiki/Edmonds%E2%80%93Karp_algorithm" msgstr "" -msgid "``pgr_edwardMoore`` - Experimental" +msgid "``pgr_edwardMoore - Experimental``" msgstr "" msgid "" "``pgr_edwardMoore`` — Returns the shortest path using Edward-Moore algorithm." msgstr "" -msgid "pgr_edwardMoore(Combinations)" +msgid "``pgr_edwardMoore`` (`Combinations`_)" +msgstr "" + +msgid "``pgr_edwardMoore`` (`One to One`_)" +msgstr "" + +msgid "``pgr_edwardMoore`` (`One to Many`_)" +msgstr "" + +msgid "``pgr_edwardMoore`` (`Many to One`_)" +msgstr "" + +msgid "``pgr_edwardMoore`` (`Many to Many`_)" msgstr "" msgid "" @@ -11456,7 +11606,7 @@ msgstr "" msgid "https://en.wikipedia.org/wiki/Shortest_Path_Faster_Algorithm" msgstr "" -msgid "``pgr_extractVertices`` -- Proposed" +msgid "pgr_extractVertices -- Proposed" msgstr "" msgid "``pgr_extractVertices`` — Extracts the vertices information" @@ -11557,12 +11707,21 @@ msgid "" "= true``." msgstr "" -msgid "``pgr_findCloseEdges`` - Proposed" +msgid "``pgr_findCloseEdges``" msgstr "" msgid "``pgr_findCloseEdges`` - Finds the close edges to a point geometry." msgstr "" +msgid "New **proposed** signatures:" +msgstr "" + +msgid "``pgr_findCloseEdges`` (`One point`_)" +msgstr "" + +msgid "``pgr_findCloseEdges`` (`Many points`_)" +msgstr "" + msgid "" "``pgr_findCloseEdges`` - An utility function that finds the closest edge to " "a point geometry." @@ -12039,6 +12198,9 @@ msgid "" "floyd_warshall_shortest.html>`_" msgstr "" +msgid "Queries uses the :doc:`sampledata` network." +msgstr "" + msgid "``pgr_full_version``" msgstr "" @@ -12046,6 +12208,9 @@ msgid "" "``pgr_full_version`` — Get the details of pgRouting version information." msgstr "" +msgid "New **official** function" +msgstr "" + msgid "Get complete details of pgRouting version information" msgstr "" @@ -12112,7 +12277,7 @@ msgstr "" msgid "Git hash of pgRouting build" msgstr "" -msgid "``pgr_hawickCircuits`` - Experimental" +msgid "``pgr_hawickCircuits - Experimental``" msgstr "" msgid "" @@ -12120,6 +12285,9 @@ msgid "" "algorithm." msgstr "" +msgid "``pgr_hawickCircuits``" +msgstr "" + msgid "" "Hawick Circuit algorithm, is published in 2008 by Ken Hawick and Health A. " "James. This algorithm solves the problem of detecting and enumerating " @@ -12242,9 +12410,7 @@ msgid "" "blue represent :math:`K_5` subgraph." msgstr "" -msgid "" -"`Boost: Boyer Myrvold `__" +msgid "https://www.boost.org/libs/graph/doc/boyer_myrvold.html" msgstr "" msgid "``pgr_johnson``" @@ -12299,9 +12465,6 @@ msgid "" "breadth First Search ordering." msgstr "" -msgid "Added ``pred`` result columns." -msgstr "" - msgid "" "Visits and extracts the nodes information in Breath First Search ordering of " "the Minimum Spanning Tree created using Kruskal's algorithm." @@ -12377,7 +12540,7 @@ msgstr "" msgid "pgr_kruskalDFS(`Edges SQL`_, **root vids**, [``max_depth``])" msgstr "" -msgid "``pgr_lengauerTarjanDominatorTree`` - Experimental" +msgid "pgr_lengauerTarjanDominatorTree -Experimental" msgstr "" msgid "" @@ -12435,8 +12598,8 @@ msgid "Dominator tree of another component." msgstr "" msgid "" -"`Boost: Lengauer-Tarjan dominator `__" +"`Boost: Lengauer-Tarjan dominator tree algorithm `__" msgstr "" msgid "" @@ -12444,7 +12607,7 @@ msgid "" "Dominator_(graph_theory)>`__" msgstr "" -msgid "``pgr_lineGraph`` - Proposed" +msgid "pgr_lineGraph - Proposed" msgstr "" msgid "" @@ -12452,9 +12615,6 @@ msgid "" "based graph." msgstr "" -msgid "Works for directed and undirected graphs." -msgstr "" - msgid "" "Given a graph :math:`G`, its line graph :math:`L(G)` is a graph such that:" msgstr "" @@ -12715,7 +12875,8 @@ msgid "Full line graph of subgraph of edges :math:`\\{4, 7, 8, 10\\}`" msgstr "" msgid "" -"The examples include the subgraph including edges 4, 7, 8, and 10 with " +"The examples of this section are based on the :doc:`sampledata` network. The " +"examples include the subgraph including edges 4, 7, 8, and 10 with " "``reverse_cost``." msgstr "" @@ -12934,15 +13095,15 @@ msgstr "" msgid "Returns set of |result-component-make|" msgstr "" -msgid "List of edges that are needed to connect the graph." +msgid "" +"Query done on :doc:`sampledata` network gives the list of edges that are " +"needed to connect the graph." msgstr "" -msgid "" -"`Boost: make connected `__" +msgid "https://www.boost.org/libs/graph/doc/make_connected.html" msgstr "" -msgid "``pgr_maxCardinalityMatch``" +msgid "pgr_maxCardinalityMatch" msgstr "" msgid "" @@ -12950,16 +13111,13 @@ msgid "" "graph." msgstr "" -msgid "pgr_maxCardinalityMatch(text) returns only ``edge`` column." -msgstr "" - msgid "Deprecated signature" msgstr "" -msgid "pgr_maxCardinalityMatch(text,boolean)" +msgid "``pgr_maxCardinalityMatch(text,boolean)``" msgstr "" -msgid "directed => ``false`` when used." +msgid "``directed => false`` when used." msgstr "" msgid "Renamed from ``pgr_maximumCardinalityMatching``" @@ -13010,9 +13168,7 @@ msgstr "" msgid "Identifier of the edge in the original query." msgstr "" -msgid "" -"`Boost: maximum_matching `__" +msgid "https://www.boost.org/libs/graph/doc/maximum_matching.html" msgstr "" msgid "https://en.wikipedia.org/wiki/Matching_%28graph_theory%29" @@ -13029,6 +13185,12 @@ msgid "" "source(s) to the targets(s) using the Push Relabel algorithm." msgstr "" +msgid "``pgr_maxFlow`` (`Combinations`_)" +msgstr "" + +msgid "New **Proposed** function" +msgstr "" + msgid "Calculates the maximum flow from the sources to the targets." msgstr "" @@ -13063,9 +13225,7 @@ msgstr "" msgid "Maximum flow possible from the source(s) to the target(s)" msgstr "" -msgid "" -"`Boost: push relabel max flow `__" +msgid "https://www.boost.org/libs/graph/doc/push_relabel_max_flow.html" msgstr "" msgid "" @@ -13080,10 +13240,7 @@ msgid "" "of the maximum flow on a graph" msgstr "" -msgid "pgr_maxFlowMinCost(Combinations)" -msgstr "" - -msgid "|boost| graph inside." +msgid "``pgr_maxFlowMinCost`` (`Combinations`_)" msgstr "" msgid "**TODO** check which statement is true:" @@ -13127,6 +13284,11 @@ msgstr "" msgid "Returns set of |result-flow-mincost|" msgstr "" +msgid "" +"https://www.boost.org/libs/graph/doc/" +"successive_shortest_path_nonnegative_weights.html" +msgstr "" + msgid "``pgr_maxFlowMinCost_Cost`` - Experimental" msgstr "" @@ -13135,7 +13297,7 @@ msgid "" "maximum flow on a graph" msgstr "" -msgid "pgr_maxFlowMinCost_Cost(Combinations)" +msgid "``pgr_maxFlowMinCost_Cost`` (`Combinations`_)" msgstr "" msgid "**The cost value of all input edges must be nonnegative.**" @@ -13168,7 +13330,7 @@ msgstr "" msgid "Minimum Cost Maximum Flow possible from the source(s) to the target(s)" msgstr "" -msgid "``pgr_nodeNetwork``" +msgid "pgr_nodeNetwork" msgstr "" msgid "``pgr_nodeNetwork`` - Nodes an network edge table." @@ -13706,6 +13868,9 @@ msgid "" "the flow from the sources to the targets using Push Relabel Algorithm." msgstr "" +msgid "``pgr_pushRelabel`` (`Combinations`_)" +msgstr "" + msgid "Renamed from ``pgr_maxFlowPushRelabel``" msgstr "" @@ -13724,7 +13889,7 @@ msgstr "" msgid "pgr_pushRelabel(`Edges SQL`_, `Combinations SQL`_)" msgstr "" -msgid "``pgr_sequentialVertexColoring`` - Proposed" +msgid "pgr_sequentialVertexColoring - Proposed" msgstr "" msgid "" @@ -13732,6 +13897,9 @@ msgid "" "undirected graph, using greedy approach." msgstr "" +msgid "Promoted to **proposed** signature" +msgstr "" + msgid "" "Sequential vertex coloring algorithm is a graph coloring algorithm in which " "color identifiers are assigned to the vertices of a graph in a sequential " @@ -13774,12 +13942,7 @@ msgstr "" msgid "pgr_sequentialVertexColoring(`Edges SQL`_)" msgstr "" -msgid "" -"`Boost: Sequential Vertex Coloring `__" -msgstr "" - -msgid "``pgr_stoerWagner`` - Experimental" +msgid "pgr_stoerWagner - Experimental" msgstr "" msgid "``pgr_stoerWagner`` — The min-cut of graph using stoerWagner algorithm." @@ -13863,11 +14026,6 @@ msgstr "" msgid "Using :doc:`pgr_connectedComponents`" msgstr "" -msgid "" -"`Boost: Stoer Wagner min cut `__" -msgstr "" - msgid "https://en.wikipedia.org/wiki/Stoer%E2%80%93Wagner_algorithm" msgstr "" @@ -13897,7 +14055,7 @@ msgid "The strong components of the graph" msgstr "" msgid "" -"`Boost: Strong components `__" msgstr "" @@ -13962,11 +14120,6 @@ msgstr "" msgid "Graph is not a DAG" msgstr "" -msgid "" -"`Boost: topological sort `__" -msgstr "" - msgid "``pgr_transitiveClosure`` - Experimental" msgstr "" @@ -14022,51 +14175,56 @@ msgstr "" msgid "Identifiers of the vertices that are reachable from vertex v." msgstr "" -msgid "" -"`Boost: transitive closure `__" -msgstr "" - msgid "https://en.wikipedia.org/wiki/Transitive_closure" msgstr "" -msgid "``pgr_trsp``" +msgid "pgr_trsp - Proposed" msgstr "" msgid "``pgr_trsp`` - routing vertices with restrictions." msgstr "" -msgid "pgr_trsp(One to One)" +msgid "New proposed signatures" +msgstr "" + +msgid "``pgr_trsp`` (`One to One`_)" msgstr "" -msgid "pgr_trsp(One to Many)" +msgid "``pgr_trsp`` (`One to Many`_)" msgstr "" -msgid "pgr_trsp(Many to One)" +msgid "``pgr_trsp`` (`Many to One`_)" msgstr "" -msgid "pgr_trsp(Many to Many)" +msgid "``pgr_trsp`` (`Many to Many`_)" msgstr "" -msgid "pgr_trsp(Combinations)" +msgid "``pgr_trsp`` (`Combinations`_)" msgstr "" msgid "Deprecated signatures" msgstr "" -msgid "pgr_trsp(text,integer,float,integer,float,boolean,boolean,text)" +msgid "``pgr_trsp(text,integer,integer,boolean,boolean,text)``" +msgstr "" + +msgid "``pgr_trsp(text,integer,float,integer,float,boolean,boolean,text)``" +msgstr "" + +msgid "``pgr_trspViaVertices(text,anyarray,boolean,boolean,text)``" msgstr "" -msgid "pgr_trspViaVertices(text,anyarray,boolean,boolean,text)" +msgid "" +"``pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)``" msgstr "" msgid "New prototypes" msgstr "" -msgid "pgr_trspViaVertices" +msgid "``pgr_trspViaVertices``" msgstr "" -msgid "pgr_trspViaEdges" +msgid "``pgr_trspViaEdges``" msgstr "" msgid "" @@ -14139,13 +14297,19 @@ msgid "" "`Deprecated documentation `_" msgstr "" -msgid "``pgr_trspVia``" +msgid "``pgr_trspVia`` - Proposed" msgstr "" msgid "" "``pgr_trspVia`` Route that goes through a list of vertices with restrictions." msgstr "" +msgid "New proposed function:" +msgstr "" + +msgid "``pgr_trspVia`` (`One Via`_)" +msgstr "" + 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 :" @@ -14223,7 +14387,7 @@ msgstr "" msgid ":doc:`via-category`" msgstr "" -msgid "``pgr_trspVia_withPoints``" +msgid "``pgr_trspVia_withPoints`` - Proposed" msgstr "" msgid "" @@ -14231,6 +14395,9 @@ msgid "" "or points with restrictions." msgstr "" +msgid "``pgr_trspVia_withPoints`` (`One Via`_)" +msgstr "" + msgid "" "Given a graph, a set of restriction on the graph edges, a set of points on " "the graphs edges and a list of vertices, this function is equivalent to " @@ -14390,12 +14557,30 @@ msgid "" "`pgr_trsp` algorithm. In this case a U turn is been done using the same edge." msgstr "" -msgid "``pgr_trsp_withPoints``" +msgid "pgr_trsp_withPoints - Proposed" msgstr "" msgid "``pgr_trsp_withPoints`` Routing Vertex/Point with restrictions." msgstr "" +msgid "New proposed signatures:" +msgstr "" + +msgid "``pgr_trsp_withPoints`` (`One to One`_)" +msgstr "" + +msgid "``pgr_trsp_withPoints`` (`One to Many`_)" +msgstr "" + +msgid "``pgr_trsp_withPoints`` (`Many to One`_)" +msgstr "" + +msgid "``pgr_trsp_withPoints`` (`Many to Many`_)" +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" @@ -14504,12 +14689,15 @@ msgid "" "`1` on an undirected graph, with details." msgstr "" -msgid "``pgr_turnRestrictedPath`` - Experimental" +msgid "pgr_turnRestrictedPath - Experimental" msgstr "" msgid "" -"``pgr_turnRestrictedPath`` Using Yen's algorithm Vertex - Vertex routing " -"with restrictions" +"``pgr_turnRestrictedPath`` Using Yen's algorithm Vertex -Vertex routing with " +"restrictions" +msgstr "" + +msgid "New experimental function" msgstr "" msgid "" @@ -14583,7 +14771,7 @@ msgstr "" msgid "pgRouting Version for this documentation" msgstr "" -msgid "``pgr_vrpOneDepot`` - Experimental" +msgid "pgr_vrpOneDepot - Experimental" msgstr "" msgid "**No documentation available**" @@ -14592,7 +14780,7 @@ msgstr "" msgid "**TBD**" msgstr "" -msgid "``pgr_withPoints``" +msgid "``pgr_withPoints`` - Proposed" msgstr "" msgid "" @@ -14735,7 +14923,7 @@ msgstr "" msgid "Passes in front or visits with left side driving." msgstr "" -msgid "``pgr_withPointsCost``" +msgid "``pgr_withPointsCost`` - Proposed" msgstr "" msgid "" @@ -14879,7 +15067,7 @@ msgstr "" msgid "Does not matter driving side driving topology" msgstr "" -msgid "``pgr_withPointsCostMatrix``" +msgid "``pgr_withPointsCostMatrix`` - proposed" msgstr "" msgid "" @@ -14911,7 +15099,7 @@ msgid "" "locations on the graph of point `(2.9, 1.8)`." msgstr "" -msgid "``pgr_withPointsDD``" +msgid "``pgr_withPointsDD`` - Proposed" msgstr "" msgid "" @@ -14924,10 +15112,7 @@ msgid "" "unnamed compulsory **driving side**." msgstr "" -msgid "pgr_withPointsDD(Single vertex)" -msgstr "" - -msgid "pgr_withPointsDD(Multiple vertices)" +msgid "``pgr_withPointsDD`` (`Single vertex`)" msgstr "" msgid "Added ``depth``, ``pred`` and ``start_vid`` column." @@ -14945,12 +15130,13 @@ msgid "" msgstr "" msgid "" -"pgr_withpointsdd(text,text,bigint,double precision,boolean,character,boolean)" +"``pgr_withpointsdd(text,text,bigint,double precision,boolean,character," +"boolean)``" msgstr "" msgid "" -"pgr_withpointsdd(text,text,anyarray,double precision,boolean,character," -"boolean,boolean)" +"``pgr_withpointsdd(text,text,anyarray,double precision,boolean,character," +"boolean,boolean)``" msgstr "" msgid "" @@ -15057,7 +15243,7 @@ msgstr "" msgid ":doc:`pgr_alphaShape`" msgstr "" -msgid "``pgr_withPointsKSP``" +msgid "pgr_withPointsKSP - Proposed" msgstr "" msgid "" @@ -15067,23 +15253,26 @@ msgstr "" msgid "Standarizing output columns to |nksp-result|" msgstr "" -msgid "pgr_withPointsKSP(One to One)" +msgid "``pgr_withPointsKSP`` (One to One)" +msgstr "" + +msgid "New overload functions" msgstr "" -msgid "pgr_withPointsKSP(One to Many)" +msgid "``pgr_withPointsKSP`` (One to Many)" msgstr "" -msgid "pgr_withPointsKSP(Many to One)" +msgid "``pgr_withPointsKSP`` (Many to One)" msgstr "" -msgid "pgr_withPointsKSP(Many to Many)" +msgid "``pgr_withPointsKSP`` (Many to Many)" msgstr "" -msgid "pgr_withPointsKSP(Combinations)" +msgid "``pgr_withPointsKSP`` (Combinations)" msgstr "" msgid "" -"pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,char," +"``pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,char," "boolean)``" msgstr "" @@ -15199,7 +15388,7 @@ msgid "" "to point :math:`2` with heap paths and details." msgstr "" -msgid "``pgr_withPointsVia``" +msgid "``pgr_withPointsVia`` - Proposed" msgstr "" msgid "" @@ -15207,6 +15396,9 @@ msgid "" "points." msgstr "" +msgid "New **proposed** function ``pgr_withPointsVia`` (`One Via`_)" +msgstr "" + msgid "" "Given a graph, a set of points on the graphs edges and a list of vertices, " "this function is equivalent to finding the shortest path between :math:" @@ -15306,13 +15498,22 @@ msgid "" ":doc:`pgr_lineGraph` - Transformation algorithm for generating a Line Graph." msgstr "" +msgid ":doc:`pgr_withPointsVia`" +msgstr "" + +msgid ":doc:`pgr_trspVia`" +msgstr "" + +msgid ":doc:`pgr_trspVia_withPoints`" +msgstr "" + msgid ":doc:`withPoints-family` - Functions based on Dijkstra algorithm." msgstr "" msgid "From the :doc:`TRSP-family`:" msgstr "" -msgid "Utilities Category" +msgid "Utilities" msgstr "" msgid ":doc:`pgr_findCloseEdges`" @@ -15332,15 +15533,6 @@ msgstr "" msgid "Mayors" msgstr "" -msgid "pgRouting 4" -msgstr "" - -msgid "Minors 4.x" -msgstr "" - -msgid "pgRouting 4.0" -msgstr "" - msgid "pgRouting 3" msgstr "" @@ -15350,147 +15542,6 @@ msgstr "" msgid "pgRouting 3.7" msgstr "" -msgid "pgRouting 3.7.3 Release Notes" -msgstr "" - -msgid "" -"To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.7.3 `__" -msgstr "" - -msgid "" -"`#2731 `__ Build Failure " -"on Ubuntu 22" -msgstr "" - -msgid "pgRouting 3.7.2 Release Notes" -msgstr "" - -msgid "" -"To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.7.2 `__" -msgstr "" - -msgid "Build" -msgstr "" - -msgid "" -"`#2713 `__ cmake missing " -"some policies and min version" -msgstr "" - -msgid "Using OLD policies: CMP0148, CMP0144, CMP0167" -msgstr "" - -msgid "Minimum cmake version 3.12" -msgstr "" - -msgid "" -"`#2707 `__ Build failure " -"in pgRouting 3.7.1 on Alpine" -msgstr "" - -msgid "" -"`#2706 `__ winnie crashing " -"on pgr_betweennessCentrality" -msgstr "" - -msgid "pgRouting 3.7.1 Release Notes" -msgstr "" - -msgid "" -"To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.7.1 `__" -msgstr "" - -msgid "" -"`#2680 `__ fails to " -"compile under mingw64 gcc 13.2" -msgstr "" - -msgid "" -"`#2689 `__ When point is a " -"vertex, the withPoints family do not return results." -msgstr "" - -msgid "C/C++ code enhancemet" -msgstr "" - -msgid "TRSP family" -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 "" -"`#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 "" - -msgid "Metrics" -msgstr "" - -msgid "pgr_betweennessCentrality" -msgstr "" - -msgid "Official functions changes" -msgstr "" - -msgid "" -"`#2605 `__ Standarize " -"spanning tree functions output" -msgstr "" - -msgid "Functions:" -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 "Code enhancement" -msgstr "" - -msgid "" -"`#2599 `__ Driving " -"distance cleanup" -msgstr "" - -msgid "" -"`#2607 `__ Read postgresql " -"data on C++" -msgstr "" - -msgid "" -"`#2614 `__ Clang tidy does " -"not work" -msgstr "" - msgid "pgRouting 3.6" msgstr "" @@ -15503,6 +15554,9 @@ msgid "" "utf8=%E2%9C%93&q=milestone%3A%22Release%203.6.3%22>`__" msgstr "" +msgid "Build" +msgstr "" + msgid "Explicit minimum requirements:" msgstr "" @@ -15608,11 +15662,31 @@ msgid "" "output pgr_aStar" msgstr "" +msgid "" +"``pgr_aStar`` (`One to One`) added ``start_vid`` and ``end_vid`` columns." +msgstr "" + +msgid "``pgr_aStar`` (`One to Many`) added ``end_vid`` column." +msgstr "" + +msgid "``pgr_aStar`` (`Many to One`) added ``start_vid`` column." +msgstr "" + msgid "" "`#2523 `__ Standarize " "output pgr_bdAstar" msgstr "" +msgid "" +"``pgr_bdAstar`` (`One to One`) added ``start_vid`` and ``end_vid`` columns." +msgstr "" + +msgid "``pgr_bdAstar`` (`One to Many`) added ``end_vid`` column." +msgstr "" + +msgid "``pgr_bdAstar`` (`Many to One`) added ``start_vid`` column." +msgstr "" + msgid "" "`#2547 `__ Standarize " "output and modifying signature pgr_KSP" @@ -15620,7 +15694,7 @@ msgstr "" msgid "" "`#2548 `__ Standarize " -"output pgr_drivingDistance" +"output pgr_drivingdistance" msgstr "" msgid "Proposed functions changes" @@ -15726,7 +15800,7 @@ msgstr "" msgid "" "`#2565 `__ " -"pgr_lengauerTarjanDominatorTree triggers an assertion" +"pgr_pgr_lengauerTarjanDominatorTree triggers an assertion" msgstr "" msgid "SQL enhancements" @@ -15766,6 +15840,16 @@ msgstr "" msgid "Dijkstra" msgstr "" +msgid "" +"``pgr_dijkstra`` (`One to One`) added ``start_vid`` and ``end_vid`` columns." +msgstr "" + +msgid "``pgr_dijkstra`` (`One to Many`) added ``end_vid`` column." +msgstr "" + +msgid "``pgr_dijkstra`` (`Many to One`) added ``start_vid`` column." +msgstr "" + msgid "pgRouting 3.4" msgstr "" @@ -15822,13 +15906,13 @@ msgid "" "doesn't give all correct shortest path" msgstr "" -msgid "New proposed functions." +msgid "New proposed functions" msgstr "" msgid "With points" msgstr "" -msgid "pgr_withPointsVia(One Via)" +msgid "``pgr_withPointsVia`` (One Via)" msgstr "" msgid "Turn Restrictions" @@ -15837,67 +15921,82 @@ msgstr "" msgid "Via with turn restrictions" msgstr "" -msgid "pgr_trspVia(One Via)" +msgid "``pgr_trspVia`` (One Via)" msgstr "" -msgid "pgr_trspVia_withPoints(One Via)" +msgid "``pgr_trspVia_withPoints`` (One Via)" msgstr "" -msgid "pgr_trsp_withPoints(One to One)" +msgid "``pgr_trsp``" msgstr "" -msgid "pgr_trsp_withPoints(One to Many)" +msgid "``pgr_trsp`` (One to One)" msgstr "" -msgid "pgr_trsp_withPoints(Many to One)" +msgid "``pgr_trsp`` (One to Many)" msgstr "" -msgid "pgr_trsp_withPoints(Many to Many)" +msgid "``pgr_trsp`` (Many to One)" msgstr "" -msgid "pgr_trsp_withPoints(Combinations)" +msgid "``pgr_trsp`` (Many to Many)" msgstr "" -msgid "Topology" +msgid "``pgr_trsp`` (Combinations)" msgstr "" -msgid "Utilities" +msgid "``pgr_trsp_withPoints``" msgstr "" -msgid "pgr_findCloseEdges(One point)" +msgid "``pgr_trsp_withPoints`` (One to One)" msgstr "" -msgid "pgr_findCloseEdges(Many points)" +msgid "``pgr_trsp_withPoints`` (One to Many)" msgstr "" -msgid "Ordering" +msgid "``pgr_trsp_withPoints`` (Many to One)" msgstr "" -msgid "pgr_cuthillMckeeOrdering" +msgid "``pgr_trsp_withPoints`` (Many to Many)" msgstr "" -msgid "Unclassified" +msgid "``pgr_trsp_withPoints`` (Combinations)" +msgstr "" + +msgid "Topology" +msgstr "" + +msgid "``pgr_degree``" +msgstr "" + +msgid "``pgr_findCloseEdges`` (One point)" +msgstr "" + +msgid "``pgr_findCloseEdges`` (Many points)" +msgstr "" + +msgid "Ordering" msgstr "" -msgid "pgr_hawickCircuits" +msgid "``pgr_cuthillMckeeOrdering``" msgstr "" msgid "Flow functions" msgstr "" -msgid "pgr_maxCardinalityMatch(text)" +msgid "``pgr_maxCardinalityMatch(text)``" msgstr "" -msgid "Deprecating: pgr_maxCardinalityMatch(text,boolean)" +msgid "Deprecating ``pgr_maxCardinalityMatch(text,boolean)``" msgstr "" msgid "Deprecated Functions" msgstr "" -msgid "pgr_trsp(text,integer,float8,integer,float8,boolean,boolean,text)" +msgid "``pgr_trsp(text,integer,float8,integer,float8,boolean,boolean,text)``" msgstr "" -msgid "pgr_trspViaEdges(text,integer[],float[],boolean,boolean,text)" +msgid "``pgr_trspViaEdges(text,integer[],float[],boolean,boolean,text)``" msgstr "" msgid "pgRouting 3.3" @@ -16159,6 +16258,12 @@ msgstr "" msgid "Removing support for Boost v1.53, v1.54 & v1.55" msgstr "" +msgid "pgr_bellmanFord(Combinations)" +msgstr "" + +msgid "pgr_binaryBreadthFirstSearch(Combinations)" +msgstr "" + msgid "pgr_bipartite" msgstr "" @@ -16168,6 +16273,9 @@ msgstr "" msgid "Dijkstra Near" msgstr "" +msgid "pgr_edwardMoore(Combinations)" +msgstr "" + msgid "pgr_isPlanar" msgstr "" @@ -16177,15 +16285,51 @@ msgstr "" msgid "pgr_makeConnected" msgstr "" +msgid "pgr_maxFlowMinCost(Combinations)" +msgstr "" + +msgid "pgr_maxFlowMinCost_Cost(Combinations)" +msgstr "" + msgid "Astar" msgstr "" +msgid "pgr_aStar(Combinations)" +msgstr "" + +msgid "pgr_aStarCost(Combinations)" +msgstr "" + msgid "Bidirectional Astar" msgstr "" +msgid "pgr_bdAstar(Combinations)" +msgstr "" + +msgid "pgr_bdAstarCost(Combinations)" +msgstr "" + msgid "Bidirectional Dijkstra" msgstr "" +msgid "pgr_bdDijkstra(Combinations)" +msgstr "" + +msgid "pgr_bdDijkstraCost(Combinations)" +msgstr "" + +msgid "pgr_boykovKolmogorov(Combinations)" +msgstr "" + +msgid "pgr_edmondsKarp(Combinations)" +msgstr "" + +msgid "pgr_maxFlow(Combinations)" +msgstr "" + +msgid "pgr_pushRelabel(Combinations)" +msgstr "" + msgid "pgRouting 3.1" msgstr "" @@ -16420,7 +16564,7 @@ msgid "" "information" msgstr "" -msgid "New Functions" +msgid "New functions" msgstr "" msgid "Kruskal family" @@ -16459,94 +16603,148 @@ msgstr "" msgid "aStar Family" msgstr "" -msgid "pgr_aStarCost(One to One)" +msgid "pgr_aStar(one to many)" +msgstr "" + +msgid "pgr_aStar(many to one)" +msgstr "" + +msgid "pgr_aStar(many to many)" +msgstr "" + +msgid "pgr_aStarCost(one to one)" +msgstr "" + +msgid "pgr_aStarCost(one to many)" +msgstr "" + +msgid "pgr_aStarCost(many to one)" msgstr "" -msgid "pgr_aStarCost(One to Many)" +msgid "pgr_aStarCost(many to many)" msgstr "" -msgid "pgr_aStarCost(Many to One)" +msgid "pgr_aStarCostMatrix(one to one)" msgstr "" -msgid "pgr_aStarCost(Many to Many)" +msgid "pgr_aStarCostMatrix(one to many)" msgstr "" -msgid "pgr_aStarCostMatrix" +msgid "pgr_aStarCostMatrix(many to one)" +msgstr "" + +msgid "pgr_aStarCostMatrix(many to many)" msgstr "" msgid "bdAstar Family" msgstr "" -msgid "pgr_bdAstarCost(One to One)" +msgid "pgr_bdAstar(one to many)" msgstr "" -msgid "pgr_bdAstarCost(One to Many)" +msgid "pgr_bdAstar(many to one)" msgstr "" -msgid "pgr_bdAstarCost(Many to One)" +msgid "pgr_bdAstar(many to many)" msgstr "" -msgid "pgr_bdAstarCost(Many to Many)" +msgid "pgr_bdAstarCost(one to one)" msgstr "" -msgid "pgr_bdAstarCostMatrix" +msgid "pgr_bdAstarCost(one to many)" +msgstr "" + +msgid "pgr_bdAstarCost(many to one)" +msgstr "" + +msgid "pgr_bdAstarCost(many to many)" +msgstr "" + +msgid "pgr_bdAstarCostMatrix(one to one)" +msgstr "" + +msgid "pgr_bdAstarCostMatrix(one to many)" +msgstr "" + +msgid "pgr_bdAstarCostMatrix(many to one)" +msgstr "" + +msgid "pgr_bdAstarCostMatrix(many to many)" msgstr "" msgid "bdDijkstra Family" msgstr "" -msgid "pgr_bdDijkstraCost(One to One)" +msgid "pgr_bdDijkstra(one to many)" msgstr "" -msgid "pgr_bdDijkstraCost(One to Many)" +msgid "pgr_bdDijkstra(many to one)" msgstr "" -msgid "pgr_bdDijkstraCost(Many to One)" +msgid "pgr_bdDijkstra(many to many)" msgstr "" -msgid "pgr_bdDijkstraCost(Many to Many)" +msgid "pgr_bdDijkstraCost(one to one)" msgstr "" -msgid "pgr_bdDijkstraCostMatrix" +msgid "pgr_bdDijkstraCost(one to many)" +msgstr "" + +msgid "pgr_bdDijkstraCost(many to one)" +msgstr "" + +msgid "pgr_bdDijkstraCost(many to many)" +msgstr "" + +msgid "pgr_bdDijkstraCostMatrix(one to one)" +msgstr "" + +msgid "pgr_bdDijkstraCostMatrix(one to many)" +msgstr "" + +msgid "pgr_bdDijkstraCostMatrix(many to one)" +msgstr "" + +msgid "pgr_bdDijkstraCostMatrix(many to many)" msgstr "" msgid "Flow Family" msgstr "" -msgid "pgr_pushRelabel(One to One)" +msgid "pgr_pushRelabel(one to one)" msgstr "" -msgid "pgr_pushRelabel(One to Many)" +msgid "pgr_pushRelabel(one to many)" msgstr "" -msgid "pgr_pushRelabel(Many to One)" +msgid "pgr_pushRelabel(many to one)" msgstr "" -msgid "pgr_pushRelabel(Many to Many)" +msgid "pgr_pushRelabel(many to many)" msgstr "" -msgid "pgr_edmondsKarp(One to One)" +msgid "pgr_edmondsKarp(one to one)" msgstr "" -msgid "pgr_edmondsKarp(One to Many)" +msgid "pgr_edmondsKarp(one to many)" msgstr "" -msgid "pgr_edmondsKarp(Many to One)" +msgid "pgr_edmondsKarp(many to one)" msgstr "" -msgid "pgr_edmondsKarp(Many to Many)" +msgid "pgr_edmondsKarp(many to many)" msgstr "" -msgid "pgr_boykovKolmogorov (One to One)" +msgid "pgr_boykovKolmogorov (one to one)" msgstr "" -msgid "pgr_boykovKolmogorov (One to Many)" +msgid "pgr_boykovKolmogorov (one to many)" msgstr "" -msgid "pgr_boykovKolmogorov (Many to One)" +msgid "pgr_boykovKolmogorov (many to one)" msgstr "" -msgid "pgr_boykovKolmogorov (Many to Many)" +msgid "pgr_boykovKolmogorov (many to many)" msgstr "" msgid "pgr_maxCardinalityMatching" @@ -16555,24 +16753,21 @@ msgstr "" msgid "pgr_maxFlow" msgstr "" -msgid "pgr_edgeDisjointPaths(One to One)" +msgid "pgr_edgeDisjointPaths(one to one)" msgstr "" -msgid "pgr_edgeDisjointPaths(One to Many)" +msgid "pgr_edgeDisjointPaths(one to many)" msgstr "" -msgid "pgr_edgeDisjointPaths(Many to One)" +msgid "pgr_edgeDisjointPaths(many to one)" msgstr "" -msgid "pgr_edgeDisjointPaths(Many to Many)" +msgid "pgr_edgeDisjointPaths(many to many)" msgstr "" msgid "Components family" msgstr "" -msgid "pgr_connectedComponents" -msgstr "" - msgid "pgr_strongComponents" msgstr "" @@ -16759,7 +16954,7 @@ msgstr "" msgid "pgr_johnson" msgstr "" -msgid "pgr_aStar" +msgid "pgr_astar" msgstr "" msgid "pgr_bdAstar" @@ -16780,9 +16975,6 @@ msgstr "" msgid "pgr_drivingDistance" msgstr "" -msgid "pgr_KSP" -msgstr "" - msgid "pgr_dijkstraVia (proposed)" msgstr "" @@ -16981,13 +17173,22 @@ msgstr "" msgid "Parameter names changed" msgstr "" -msgid "The many version results are the union of the One to One version" +msgid "The many version results are the union of the one to one version" msgstr "" msgid "New Signatures" msgstr "" -msgid "pgr_bdAstar(One to One)" +msgid "pgr_bdAstar(one to one)" +msgstr "" + +msgid "New Proposed functions" +msgstr "" + +msgid "pgr_bdAstarCostMatrix" +msgstr "" + +msgid "pgr_bdDijkstraCostMatrix" msgstr "" msgid "pgr_lineGraph" @@ -17069,7 +17270,31 @@ msgstr "" msgid "pgr_bdDijkstra" msgstr "" -msgid "Deprecated signatures." +msgid "New Proposed Signatures" +msgstr "" + +msgid "pgr_astar(one to many)" +msgstr "" + +msgid "pgr_astar(many to one)" +msgstr "" + +msgid "pgr_astar(many to many)" +msgstr "" + +msgid "pgr_astarCost(one to one)" +msgstr "" + +msgid "pgr_astarCost(one to many)" +msgstr "" + +msgid "pgr_astarCost(many to one)" +msgstr "" + +msgid "pgr_astarCost(many to many)" +msgstr "" + +msgid "pgr_astarCostMatrix" msgstr "" msgid "pgr_bddijkstra - use pgr_bdDijkstra instead" @@ -17141,43 +17366,52 @@ msgstr "" msgid "pgr_TSP" msgstr "" +msgid "pgr_aStar" +msgstr "" + +msgid "New Functions" +msgstr "" + msgid "pgr_eucledianTSP" msgstr "" -msgid "pgr_maxFlowPushRelabel(One to One)" +msgid "pgr_withPointsCostMatrix" +msgstr "" + +msgid "pgr_maxFlowPushRelabel(one to one)" msgstr "" -msgid "pgr_maxFlowPushRelabel(One to Many)" +msgid "pgr_maxFlowPushRelabel(one to many)" msgstr "" -msgid "pgr_maxFlowPushRelabel(Many to One)" +msgid "pgr_maxFlowPushRelabel(many to one)" msgstr "" -msgid "pgr_maxFlowPushRelabel(Many to Many)" +msgid "pgr_maxFlowPushRelabel(many to many)" msgstr "" -msgid "pgr_maxFlowEdmondsKarp(One to One)" +msgid "pgr_maxFlowEdmondsKarp(one to one)" msgstr "" -msgid "pgr_maxFlowEdmondsKarp(One to Many)" +msgid "pgr_maxFlowEdmondsKarp(one to many)" msgstr "" -msgid "pgr_maxFlowEdmondsKarp(Many to One)" +msgid "pgr_maxFlowEdmondsKarp(many to one)" msgstr "" -msgid "pgr_maxFlowEdmondsKarp(Many to Many)" +msgid "pgr_maxFlowEdmondsKarp(many to many)" msgstr "" -msgid "pgr_maxFlowBoykovKolmogorov (One to One)" +msgid "pgr_maxFlowBoykovKolmogorov (one to one)" msgstr "" -msgid "pgr_maxFlowBoykovKolmogorov (One to Many)" +msgid "pgr_maxFlowBoykovKolmogorov (one to many)" msgstr "" -msgid "pgr_maxFlowBoykovKolmogorov (Many to One)" +msgid "pgr_maxFlowBoykovKolmogorov (many to one)" msgstr "" -msgid "pgr_maxFlowBoykovKolmogorov (Many to Many)" +msgid "pgr_maxFlowBoykovKolmogorov (many to many)" msgstr "" msgid "pgr_maximumCardinalityMatching" @@ -17189,7 +17423,7 @@ msgstr "" msgid "pgr_tsp - use pgr_TSP or pgr_eucledianTSP instead" msgstr "" -msgid "pgr_aStar - use pgr_aStar instead" +msgid "pgr_astar - use pgr_aStar instead" msgstr "" msgid "pgr_flip_edges" @@ -17276,9 +17510,6 @@ msgstr "" msgid "Improvements" msgstr "" -msgid "pgr_nodeNetwork" -msgstr "" - msgid "Adding a row_where and outall optional parameters" msgstr "" @@ -17291,43 +17522,43 @@ msgstr "" msgid "pgr_Johnson" msgstr "" -msgid "pgr_dijkstraCost(One to One)" +msgid "pgr_dijkstraCost(one to one)" msgstr "" -msgid "pgr_dijkstraCost(One to Many)" +msgid "pgr_dijkstraCost(one to many)" msgstr "" -msgid "pgr_dijkstraCost(Many to One)" +msgid "pgr_dijkstraCost(many to one)" msgstr "" -msgid "pgr_dijkstraCost(Many to Many)" +msgid "pgr_dijkstraCost(many to many)" msgstr "" msgid "Proposed Functionality" msgstr "" -msgid "pgr_withPoints(One to One)" +msgid "pgr_withPoints(one to one)" msgstr "" -msgid "pgr_withPoints(One to Many)" +msgid "pgr_withPoints(one to many)" msgstr "" -msgid "pgr_withPoints(Many to One)" +msgid "pgr_withPoints(many to one)" msgstr "" -msgid "pgr_withPoints(Many to Many)" +msgid "pgr_withPoints(many to many)" msgstr "" -msgid "pgr_withPointsCost(One to One)" +msgid "pgr_withPointsCost(one to one)" msgstr "" -msgid "pgr_withPointsCost(One to Many)" +msgid "pgr_withPointsCost(one to many)" msgstr "" -msgid "pgr_withPointsCost(Many to One)" +msgid "pgr_withPointsCost(many to one)" msgstr "" -msgid "pgr_withPointsCost(Many to Many)" +msgid "pgr_withPointsCost(many to many)" msgstr "" msgid "pgr_withPointsDD(single vertex)" @@ -17336,6 +17567,9 @@ msgstr "" msgid "pgr_withPointsDD(multiple vertices)" msgstr "" +msgid "pgr_withPointsKSP" +msgstr "" + msgid "pgr_dijkstraVia" msgstr "" @@ -17369,10 +17603,25 @@ msgid "" "q=is%3Aissue+milestone%3A%22Release+2.1.0%22+is%3Aclosed>`_ on Github." msgstr "" +msgid "pgr_dijkstra(one to many)" +msgstr "" + +msgid "pgr_dijkstra(many to one)" +msgstr "" + +msgid "pgr_dijkstra(many to many)" +msgstr "" + +msgid "pgr_drivingDistance(multiple vertices)" +msgstr "" + msgid "Refactored" msgstr "" -msgid "pgr_dijkstra(One to One)" +msgid "pgr_dijkstra(one to one)" +msgstr "" + +msgid "pgr_drivingDistance(single vertex)" msgstr "" msgid "" @@ -18082,8 +18331,8 @@ msgid "" msgstr "" msgid "" -"pgRouting supplies some functions to create a routing topology and to " -"analyze the topology." +"pgRouting suplies some functions to create a routing topology and to analyze " +"the topology." msgstr "" msgid "Additional functions to create a graph:" diff --git a/locale/en/LC_MESSAGES/index.po b/locale/en/LC_MESSAGES/index.po index abf3787cadf..f1a267e61db 100644 --- a/locale/en/LC_MESSAGES/index.po +++ b/locale/en/LC_MESSAGES/index.po @@ -1,12 +1,12 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v4.0 +# Copyright (C) pgRouting Contributors - Version v3.8 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , 2022. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: pgRouting v4.0\n" +"Project-Id-Version: pgRouting v3.8\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-06-25 12:55-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" @@ -150,7 +150,7 @@ msgstr "" #: ../../build/doc/bdDijkstra-family.rst:7 msgid "" -":doc:`pgr_bdDijkstraCostMatrix` - Bidirectional Dijkstra algorithm to " +":doc:`pgr_bdDijkstraCostMatrix` - Bidirectional Dijkstra algorithm to " "create a matrix of costs of the shortest paths." msgstr "" @@ -331,7 +331,7 @@ msgid "" 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 @@ -342,7 +342,7 @@ msgstr "" #: ../../build/doc/topology-functions.rst:9 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 "" @@ -351,7 +351,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/en/LC_MESSAGES/pgrouting_doc_strings.po b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po index d3874dbaa68..85bf160908c 100644 --- a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v4.0 +# Copyright (C) pgRouting Contributors - Version v3.8 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , 2022. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: pgRouting v4.0\n" +"Project-Id-Version: pgRouting v3.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-12 01:00+0000\n" +"POT-Creation-Date: 2025-02-27 16:46+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -4401,177 +4401,10 @@ msgstr "" msgid ":doc:`release_notes`" msgstr "" -msgid "pgRouting 4.0.0 Release Notes" +msgid "pgRouting 3.8.0 Release Notes" msgstr "" -#, python-format -msgid "" -"To see all issues & pull requests closed by this release see the `Git " -"closed milestone for 4.0.0 " -"`__" -msgstr "" - -msgid "Functions promoted to official" -msgstr "" - -msgid "pgr_trsp" -msgstr "" - -msgid "pgr_trspVia" -msgstr "" - -msgid "pgr_trspVia_withPoints" -msgstr "" - -msgid "pgr_trsp_withPoints" -msgstr "" - -msgid "pgr_withPoints" -msgstr "" - -msgid "pgr_withPointsCost" -msgstr "" - -msgid "pgr_withPointsCostMatrix" -msgstr "" - -msgid "pgr_withPointsDD" -msgstr "" - -msgid "pgr_withPointsKSP" -msgstr "" - -msgid "pgr_withPointsVia" -msgstr "" - -msgid "Signatures promoted to official" -msgstr "" - -msgid "pgr_aStar(Combinations)" -msgstr "" - -msgid "pgr_aStarCost(Combinations)" -msgstr "" - -msgid "pgr_bdAstar(Combinations)" -msgstr "" - -msgid "pgr_bdAstarCost(Combinations)" -msgstr "" - -msgid "pgr_bdDijkstra(Combinations)" -msgstr "" - -msgid "pgr_bdDijkstraCost(Combinations)" -msgstr "" - -msgid "pgr_dijkstra(Combinations)" -msgstr "" - -msgid "pgr_dijkstraCost(Combinations)" -msgstr "" - -msgid "pgr_KSP(All signatures)" -msgstr "" - -msgid "pgr_boykovKolmogorov(Combinations)" -msgstr "" - -msgid "pgr_edmondsKarp(Combinations)" -msgstr "" - -msgid "pgr_maxFlow(Combinations)" -msgstr "" - -msgid "pgr_pushRelabel(Combinations)" -msgstr "" - -msgid "code enhancements:" -msgstr "" - -msgid "Removal of unused C/C++ code" -msgstr "" - -msgid "Removal of SQL deprecated functions" -msgstr "" - -msgid "" -"pgr_trsp(text,integer,double precision,integer,double " -"precision,boolean,boolean,text)" -msgstr "" - -msgid "pgr_trsp(text,integer,integer,boolean,boolean,text)" -msgstr "" - -msgid "pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)" -msgstr "" - -msgid "pgr_trspviavertices(text,anyarray,boolean,boolean,text)" -msgstr "" - -msgid "Removal of SQL deprecated internal functions" -msgstr "" - -msgid "_pgr_dijkstranear(text,anyarray,anyarray,bigint,boolean)" -msgstr "" - -msgid "_pgr_dijkstranear(text,anyarray,bigint,bigint,boolean)" -msgstr "" - -msgid "_pgr_dijkstranear(text,bigint,anyarray,bigint,boolean)" -msgstr "" - -msgid "_pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean,bigint)" -msgstr "" - -msgid "_pgr_dijkstra(text,text,boolean,boolean,boolean)" -msgstr "" - -msgid "_pgr_drivingdistance(text,anyarray,double precision,boolean,boolean)" -msgstr "" - -msgid "_pgr_kruskal(text,anyarray,text,bigint,double precision)" -msgstr "" - -msgid "_pgr_prim(text,anyarray,text,bigint,double precision)" -msgstr "" - -msgid "" -"_pgr_trsp(text,integer,double precision,integer,double " -"precision,boolean,boolean,text)" -msgstr "" - -msgid "_pgr_trsp(text,text,anyarray,anyarray,boolean)" -msgstr "" - -msgid "_pgr_trsp(text,text,anyarray,bigint,boolean)" -msgstr "" - -msgid "_pgr_trsp(text,text,bigint,anyarray,boolean)" -msgstr "" - -msgid "_pgr_trsp(text,text,bigint,bigint,boolean)" -msgstr "" - -msgid "_pgr_trspviavertices(text,integer[],boolean,boolean,text)" -msgstr "" - -msgid "_pgr_withpointsvia(text,bigint[],double precision[],boolean)" -msgstr "" - -msgid "_trsp(text,text,anyarray,anyarray,boolean)" -msgstr "" - -msgid "_v4trsp(text,text,anyarray,anyarray,boolean)" -msgstr "" - -msgid "_v4trsp(text,text,text,boolean)" -msgstr "" - -msgid "Deprecation of internal C/C++ functions" -msgstr "" - -msgid "Internal C/C++ functions in legacy" +msgid "No Changes Yet" msgstr "" msgid "All releases" @@ -5240,12 +5073,6 @@ msgstr "" msgid "`v3.4.0 `__" msgstr "" -msgid "Removed" -msgstr "" - -msgid "`v4.0.0 `__" -msgstr "" - msgid ":doc:`pgr_dijkstra`" msgstr "" @@ -7019,7 +6846,7 @@ msgid "Upgrading the database" msgstr "" msgid "" -"To upgrade pgRouting in the database to version 4.0.0 use the following " +"To upgrade pgRouting in the database to version 3.8.0 use the following " "command:" msgstr "" @@ -7481,12 +7308,6 @@ msgstr "" msgid "Availability" msgstr "" -msgid "Version 4.0.0" -msgstr "" - -msgid "All signatures promoted to official." -msgstr "" - msgid "Version 3.6.0" msgstr "" @@ -7537,7 +7358,7 @@ msgstr "" msgid "|Boost| Boost Graph Inside" msgstr "" -msgid "Boost Graph Inside" +msgid "Boost Graph inside" msgstr "" msgid "Signatures" @@ -7665,7 +7486,7 @@ msgstr "" msgid "``pgr_TSP``" msgstr "" -msgid "``pgr_TSP`` - Aproximation using *metric* algorithm." +msgid "``pgr_TSP`` - Approximation using *metric* algorithm." msgstr "" msgid "Availability:" @@ -7883,7 +7704,7 @@ msgstr "" msgid "``pgr_TSPeuclidean``" msgstr "" -msgid "``pgr_TSPeuclidean`` - Aproximation using *metric* algorithm." +msgid "``pgr_TSPeuclidean`` - Approximation using *metric* algorithm." msgstr "" msgid "" @@ -7993,9 +7814,6 @@ msgstr "" msgid "``pgr_aStar`` — Shortest path using the A* algorithm." msgstr "" -msgid "Combinations signature promoted to official." -msgstr "" - msgid "Standarizing output columns to |short-generic-result|" msgstr "" @@ -8014,6 +7832,9 @@ msgstr "" msgid "New proposed signature:" msgstr "" +msgid "pgr_aStar(Combinations)" +msgstr "" + msgid "Function promoted to official." msgstr "" @@ -8115,6 +7936,9 @@ msgid "" "algorithm." msgstr "" +msgid "pgr_aStarCost(Combinations)" +msgstr "" + msgid "New proposed function." msgstr "" @@ -8789,6 +8613,9 @@ msgstr "" msgid "pgr_bdAstar(Many to One) added ``start_vid`` column." msgstr "" +msgid "pgr_bdAstar(Combinations)" +msgstr "" + msgid "pgr_bdAstar(One to Many)" msgstr "" @@ -8829,6 +8656,9 @@ msgid "" "bidirectional A* algorithm." msgstr "" +msgid "pgr_bdAstarCost(Combinations)" +msgstr "" + msgid "" "The ``pgr_bdAstarCost`` function sumarizes of the cost of the shortest " "path using the bidirectional A* algorithm." @@ -8871,6 +8701,9 @@ msgid "" "Dijkstra algorithm." msgstr "" +msgid "pgr_bdDijkstra(Combinations)" +msgstr "" + msgid "pgr_bdDijkstra(One to Many)" msgstr "" @@ -8945,6 +8778,9 @@ msgid "" "Bidirectional Dijkstra algorithm." msgstr "" +msgid "pgr_bdDijkstraCost(Combinations)" +msgstr "" + msgid "" "The ``pgr_bdDijkstraCost`` function sumarizes of the cost of the shortest" " path using the bidirectional Dijkstra Algorithm." @@ -9092,6 +8928,9 @@ msgstr "" msgid "https://en.wikipedia.org/wiki/Bellman%E2%80%93Ford_algorithm" msgstr "" +msgid "Boost Graph Inside" +msgstr "" + msgid "``pgr_betweennessCentrality`` - Experimental" msgstr "" @@ -9399,6 +9238,9 @@ msgid "" "Kolmogorov algorithm." msgstr "" +msgid "pgr_boykovKolmogorov(Combinations)" +msgstr "" + msgid "Renamed from ``pgr_maxFlowBoykovKolmogorov``" msgstr "" @@ -10554,6 +10396,9 @@ msgstr "" msgid "Version 3.1.0" msgstr "" +msgid "pgr_dijkstra(Combinations)" +msgstr "" + msgid "Version 2.2.0" msgstr "" @@ -10758,6 +10603,9 @@ msgstr "" msgid "37) Using `Combinations`_" msgstr "" +msgid "e Also" +msgstr "" + msgid "" "`Boost: Dijkstra shortest paths " "`__" @@ -10775,6 +10623,9 @@ msgid "" "algorithm." msgstr "" +msgid "pgr_dijkstraCost(Combinations)" +msgstr "" + msgid "" "The ``pgr_dijkstraCost`` function sumarizes of the cost of the shortest " "path using Dijkstra Algorithm." @@ -11492,6 +11343,9 @@ msgid "" "Algorithm." msgstr "" +msgid "pgr_edmondsKarp(Combinations)" +msgstr "" + msgid "Renamed from ``pgr_maxFlowEdmondsKarp``" msgstr "" @@ -11514,7 +11368,7 @@ msgid "pgr_edmondsKarp(`Edges SQL`_, `Combinations SQL`_)" msgstr "" msgid "" -"`Boost: Edmonds Karp max flow " +"`Boost: edmonds_karp_max_flow " "`__" msgstr "" @@ -11730,6 +11584,9 @@ msgstr "" msgid "One point" msgstr "" +msgid "**options:** [cap, partial, dryrun]``" +msgstr "" + msgid "Default: ``cap => 1``" msgstr "" @@ -12251,7 +12108,7 @@ msgid "``pgr_hawickCircuits`` - Experimental" msgstr "" msgid "" -"``pgr_hawickCircuits`` — Returns the list of cirucits using hawick " +"``pgr_hawickCircuits`` — Returns the list of ciruits using hawick " "circuits algorithm." msgstr "" @@ -13177,6 +13034,9 @@ msgid "" "the source(s) to the targets(s) using the Push Relabel algorithm." msgstr "" +msgid "pgr_maxFlow(Combinations)" +msgstr "" + msgid "Calculates the maximum flow from the sources to the targets." msgstr "" @@ -13855,6 +13715,9 @@ msgid "" "Algorithm." msgstr "" +msgid "pgr_pushRelabel(Combinations)" +msgstr "" + msgid "Renamed from ``pgr_maxFlowPushRelabel``" msgstr "" @@ -14185,7 +14048,7 @@ msgstr "" msgid "https://en.wikipedia.org/wiki/Transitive_closure" msgstr "" -msgid "``pgr_trsp``" +msgid "``pgr_trsp`` - Proposed" msgstr "" msgid "``pgr_trsp`` - routing vertices with restrictions." @@ -14209,12 +14072,18 @@ msgstr "" msgid "Deprecated signatures" msgstr "" +msgid "pgr_trsp(text,integer,integer,boolean,boolean,text)" +msgstr "" + msgid "pgr_trsp(text,integer,float,integer,float,boolean,boolean,text)" msgstr "" msgid "pgr_trspViaVertices(text,anyarray,boolean,boolean,text)" msgstr "" +msgid "pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)" +msgstr "" + msgid "New prototypes" msgstr "" @@ -14299,7 +14168,7 @@ msgid "" "`_" msgstr "" -msgid "``pgr_trspVia``" +msgid "``pgr_trspVia`` - Proposed" msgstr "" msgid "" @@ -14389,7 +14258,7 @@ msgstr "" msgid ":doc:`via-category`" msgstr "" -msgid "``pgr_trspVia_withPoints``" +msgid "``pgr_trspVia_withPoints`` - Proposed" msgstr "" msgid "" @@ -14561,7 +14430,7 @@ msgid "" "same edge." msgstr "" -msgid "``pgr_trsp_withPoints``" +msgid "``pgr_trsp_withPoints`` - Proposed" msgstr "" msgid "``pgr_trsp_withPoints`` Routing Vertex/Point with restrictions." @@ -14761,7 +14630,7 @@ msgstr "" msgid "**TBD**" msgstr "" -msgid "``pgr_withPoints``" +msgid "``pgr_withPoints`` - Proposed" msgstr "" msgid "" @@ -14906,7 +14775,7 @@ msgstr "" msgid "Passes in front or visits with left side driving." msgstr "" -msgid "``pgr_withPointsCost``" +msgid "``pgr_withPointsCost`` - Proposed" msgstr "" msgid "" @@ -15051,7 +14920,7 @@ msgstr "" msgid "Does not matter driving side driving topology" msgstr "" -msgid "``pgr_withPointsCostMatrix``" +msgid "``pgr_withPointsCostMatrix`` - proposed" msgstr "" msgid "" @@ -15084,7 +14953,7 @@ msgid "" "closest locations on the graph of point `(2.9, 1.8)`." msgstr "" -msgid "``pgr_withPointsDD``" +msgid "``pgr_withPointsDD`` - Proposed" msgstr "" msgid "" @@ -15119,12 +14988,12 @@ msgstr "" msgid "" "pgr_withpointsdd(text,text,bigint,double " -"precision,boolean,character,boolean)" +"precision,boolean,character,boolean)``" msgstr "" msgid "" "pgr_withpointsdd(text,text,anyarray,double " -"precision,boolean,character,boolean,boolean)" +"precision,boolean,character,boolean,boolean)``" msgstr "" msgid "" @@ -15231,7 +15100,7 @@ msgstr "" msgid ":doc:`pgr_alphaShape`" msgstr "" -msgid "``pgr_withPointsKSP``" +msgid "``pgr_withPointsKSP`` - Proposed" msgstr "" msgid "" @@ -15372,7 +15241,7 @@ msgid "" ":math:`1` to point :math:`2` with heap paths and details." msgstr "" -msgid "``pgr_withPointsVia``" +msgid "``pgr_withPointsVia`` - Proposed" msgstr "" msgid "" @@ -15512,21 +15381,15 @@ msgstr "" msgid "Mayors" msgstr "" -msgid "pgRouting 4" -msgstr "" - -msgid "Minors 4.x" -msgstr "" - -msgid "pgRouting 4.0" -msgstr "" - msgid "pgRouting 3" msgstr "" msgid "Minors 3.x" msgstr "" +msgid "pgRouting 3.8" +msgstr "" + msgid "pgRouting 3.7" msgstr "" @@ -16039,6 +15902,12 @@ msgstr "" msgid "pgr_trspVia_withPoints(One Via)" msgstr "" +msgid "pgr_trsp" +msgstr "" + +msgid "``pgr_trsp_withPoints``" +msgstr "" + msgid "pgr_trsp_withPoints(One to One)" msgstr "" @@ -17402,6 +17271,9 @@ msgstr "" msgid "pgr_eucledianTSP" msgstr "" +msgid "pgr_withPointsCostMatrix" +msgstr "" + msgid "pgr_maxFlowPushRelabel(One to One)" msgstr "" @@ -17599,6 +17471,9 @@ msgstr "" msgid "pgr_withPointsDD(multiple vertices)" msgstr "" +msgid "pgr_withPointsKSP" +msgstr "" + msgid "pgr_dijkstraVia" msgstr "" diff --git a/locale/es/LC_MESSAGES/index.po b/locale/es/LC_MESSAGES/index.po index 20a012c0d43..1f7a4e7c0e6 100644 --- a/locale/es/LC_MESSAGES/index.po +++ b/locale/es/LC_MESSAGES/index.po @@ -1,11 +1,11 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v4.0 +# Copyright (C) pgRouting Contributors - Version v3.8 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , 2022. # msgid "" msgstr "" -"Project-Id-Version: pgRouting v4.0\n" +"Project-Id-Version: pgRouting v3.8\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-06-25 12:55-0500\n" "PO-Revision-Date: 2022-09-29 16:37+0000\n" diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 3e8ed5e7248..a518ce74faf 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -1,18 +1,18 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v4.0 +# Copyright (C) pgRouting Contributors - Version v3.8 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , 2022. # Pedro Jose Rios Vergara , 2022. # Celia Virginia Vergara Castillo , 2022. -# Celia Virginia Vergara Castillo , 2023, 2024, 2025. +# Celia Virginia Vergara Castillo , 2023, 2024. # DeepL , 2024. msgid "" msgstr "" -"Project-Id-Version: pgRouting v4.0\n" +"Project-Id-Version: pgRouting v3.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-12 01:00+0000\n" -"PO-Revision-Date: 2025-02-12 01:39+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \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: es\n" @@ -726,11 +726,11 @@ msgid "References" msgstr "Referencias" msgid "" -"`Boost: metric TSP approx `__" +"`Boost's metric appro's metric approximation `__" msgstr "" -"`Boost: aproximación métrica de TSP `__" +"`Algoritmo Métrico de la Librería Boost `__" msgid "`University of Waterloo TSP `__" msgstr "`Universided de Waterloo TSP `__" @@ -742,8 +742,8 @@ msgstr "" "`Wikipedia: Problema del viajante `__" -msgid "Vehicle Routing Functions - Category" -msgstr "Funciones de Ruteo de Vehículos - Categoría" +msgid "Vehicle Routing Functions - Category (Experimental)" +msgstr "Funciones de Ruteo de Vehículos - Categoría (Experimental)" msgid "Pickup and delivery problem" msgstr "Problema de recogida y entrega" @@ -1788,8 +1788,8 @@ msgstr ":math:`1km * 0.0277hr/km = 0.0277hr`" msgid "https://en.wikipedia.org/wiki/Vehicle_routing_problem" msgstr "https://en.wikipedia.org/wiki/Vehicle_routing_problem" -msgid ":doc:`sampledata`" -msgstr ":doc:`sampledata`" +msgid "The queries use the :doc:`sampledata` network." +msgstr "Las consultas utilizan la red :doc:`sampledata` ." msgid "A* - Family of functions" msgstr "A* - Familia de Funciones" @@ -1969,11 +1969,8 @@ msgstr "" msgid ":doc:`bdAstar-family`" msgstr ":doc:`bdAstar-family`" -msgid "" -"`Boost: A* search `__" -msgstr "" -"`Boost: Búsqueda A* `__" +msgid "https://www.boost.org/libs/graph/doc/astar_search.html" +msgstr "https://www.boost.org/libs/graph/doc/astar_search.html" msgid "https://en.wikipedia.org/wiki/A*_search_algorithm" msgstr "https://en.wikipedia.org/wiki/A*_search_algorithm" @@ -2809,12 +2806,15 @@ msgstr "" "Para grandes gráficos donde hay un camino entre el vértice inicial y el " "vértice final:" -msgid "It is expected to terminate faster than pgr_aStar" -msgstr "Se espera que termine más rápido que pgr_aStar" +msgid "It is expected to terminate faster than pgr_astar" +msgstr "Se espera que termine más rápido que pgr_astar" msgid ":doc:`aStar-family`" msgstr ":doc:`aStar-family`" +msgid "Previous versions of this page" +msgstr "Versiones anteriores de esta página" + msgid "Bidirectional Dijkstra - Family of functions" msgstr "Bidirectional Dijkstra - Familia de funciones" @@ -2984,9 +2984,38 @@ msgid "Identifier of the color of the edge." msgstr "Identificador del color del segmento." msgid "" -"`Boost: `__" +"`Boost: Sequential Vertex Coloring algorithm documentation `__" +msgstr "" +"`Boost: Documentacion de Algoritmo de Coloración Secuencial de Vertices " +"`__" + +msgid "" +"`Wikipedia: Graph coloring `__" +msgstr "" +"`Wikipedia: Coloración de grafos `__" + +msgid "" +"`Boost: is_bipartite `__" +msgstr "" +"`Boost: es bipartido `__" + +msgid "" +"`Wikipedia: bipartite graph `__" +msgstr "" +"`Wikipedia: grafo bipartito `__" + +msgid "" +"`Boost: Edge Coloring Algorithm documentation `__" msgstr "" -"`Boost: `__" +"`Boost: Algoritmo de Coloración de Segmentos `__" msgid "Components - Family of functions" msgstr "Componentes - Familia de funciones" @@ -3113,7 +3142,7 @@ msgstr "Los nodos azules tienen un número ilimitado de aristas." msgid "Node" msgstr "Nodo" -msgid "Adjacent nodes" +msgid "Adjecent nodes" msgstr "Nodos adyacentes" msgid "Number of adjacent nodes" @@ -3639,6 +3668,9 @@ msgstr "" "Ahora, el grafo de ruteo tiene un arista que se conecta con el nodo :math:" "`7`." +msgid ":doc:`sampledata`" +msgstr ":doc:`sampledata`" + msgid "" "https://www.cs.cmu.edu/afs/cs/academic/class/15210-f12/www/lectures/" "lecture16.pdf" @@ -4351,13 +4383,6 @@ msgstr "" ":doc:`pgr_cuthillMckeeOrdering` - Ordenamiento Cuthill-McKee de grafo sin no " "dirigido." -msgid "" -":doc:`pgr_topologicalSort` - Linear ordering of the vertices for directed " -"acyclic graph." -msgstr "" -":doc:`pgr_topologicalSort` - Orden lineal de los vértices para grafos " -"acíclicos dirigidos." - msgid ":doc:`metrics-family`" msgstr ":doc:`metrics-family`" @@ -4377,8 +4402,8 @@ msgstr "Categorías" msgid ":doc:`VRP-category`" msgstr ":doc:`VRP-category`" -msgid "Shortest Path Category" -msgstr "Rutas más cortas Categoría" +msgid "Unclassified" +msgstr "No clasificado" msgid ":doc:`pgr_bellmanFord`" msgstr ":doc:`pgr_bellmanFord`" @@ -4389,24 +4414,21 @@ msgstr ":doc:`pgr_dagShortestPath`" msgid ":doc:`pgr_edwardMoore`" msgstr ":doc:`pgr_edwardMoore`" -msgid "Planar Family" -msgstr "Familia Planar" - msgid ":doc:`pgr_isPlanar`" msgstr ":doc:`pgr_isPlanar`" -msgid "Miscellaneous Algoritms" -msgstr "Algoritmos diversos" - -msgid ":doc:`pgr_lengauerTarjanDominatorTree`" -msgstr ":doc:`pgr_lengauerTarjanDominatorTree`" - msgid ":doc:`pgr_stoerWagner`" msgstr ":doc:`pgr_stoerWagner`" +msgid ":doc:`pgr_topologicalSort`" +msgstr ":doc:`pgr_topologicalSort`" + msgid ":doc:`pgr_transitiveClosure`" msgstr ":doc:`pgr_transitiveClosure`" +msgid ":doc:`pgr_lengauerTarjanDominatorTree`" +msgstr ":doc:`pgr_lengauerTarjanDominatorTree`" + msgid ":doc:`pgr_hawickCircuits`" msgstr ":doc:`pgr_hawickCircuits`" @@ -4904,186 +4926,122 @@ msgstr ":doc:`experimental`" msgid ":doc:`release_notes`" msgstr ":doc:`release_notes`" -msgid "pgRouting 4.0.0 Release Notes" -msgstr "Notas de la versión de pgRouting 4.0.0" +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 4.0.0 `__" +"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 4.0.0 `__" - -msgid "Functions promoted to official" -msgstr "Funciones promovidas a oficial" - -msgid "pgr_trsp" -msgstr "pgr_trsp" - -msgid "pgr_trspVia" -msgstr "pgr_trspVia" - -msgid "pgr_trspVia_withPoints" -msgstr "pgr_trspVia_withPoints" +"versión, consulte la `meta cerrada 3.7.0 `_" -msgid "pgr_trsp_withPoints" -msgstr "pgr_trsp_withPoints" +msgid "Support" +msgstr "Soporte" -msgid "pgr_withPoints" -msgstr "pgr_withPoints" +msgid "" +"`#2656 `__ Stop support of " +"PostgreSQL12 on pgrouting v3.7" +msgstr "" +"`#2656 `__ PostgreSQL 12 " +"no se apya en pgrouting v3.7" -msgid "pgr_withPointsCost" -msgstr "pgr_withPointsCost" +msgid "Stopping support of PostgreSQL 12" +msgstr "PostgreSQL 12 ya no es soportado" -msgid "pgr_withPointsCostMatrix" -msgstr "pgr_withPointsCostMatrix" +msgid "CI does not test for PostgreSQL 12" +msgstr "CI no hace pruebas con PostgreSQL 12" -msgid "pgr_withPointsDD" -msgstr "pgr_withPointsDD" +msgid "New experimental functions" +msgstr "Nuevas funciones experimentales" -msgid "pgr_withPointsKSP" -msgstr "pgr_withPointsKSP" +msgid "Metrics" +msgstr "Métricas" -msgid "pgr_withPointsVia" -msgstr "pgr_withPointsVia" +msgid "pgr_betweennessCentrality" +msgstr "pgr_betweennessCentrality" -msgid "Signatures promoted to official" -msgstr "Firmas promovidas a oficial" +msgid "Official functions changes" +msgstr "Cambios en las funciones oficiales" -msgid "pgr_aStar(Combinations)" -msgstr "pgr_aStar(Combinaciones)" +msgid "" +"`#2605 `__ Standarize " +"spanning tree functions output" +msgstr "" +"`#2605 `__ Estandarización " +"de las salida de las funciones de árbol de expansión" -msgid "pgr_aStarCost(Combinations)" -msgstr "pgr_aStarCost(Combinaciones)" +msgid "Functions:" +msgstr "Funciones:" -msgid "pgr_bdAstar(Combinations)" -msgstr "pgr_bdAstar(Combinaciones)" +msgid "``pgr_kruskalDD``" +msgstr "``pgr_kruskalDD``" -msgid "pgr_bdAstarCost(Combinations)" -msgstr "pgr_bdAstarCost(Combinaciones)" +msgid "``pgr_kruskalDFS``" +msgstr "``pgr_kruskalDFS``" -msgid "pgr_bdDijkstra(Combinations)" -msgstr "pgr_bdDijkstra(Combinaciones)" +msgid "``pgr_kruskalBFS``" +msgstr "``pgr_kruskalBFS``" -msgid "pgr_bdDijkstraCost(Combinations)" -msgstr "pgr_bdDijkstraCost(Combinaciones)" +msgid "``pgr_primDD``" +msgstr "``pgr_primDD``" -msgid "pgr_dijkstra(Combinations)" -msgstr "pgr_dijkstra(Combinaciones)" +msgid "``pgr_primDFS``" +msgstr "``pgr_primDFS``" -msgid "pgr_dijkstraCost(Combinations)" -msgstr "pgr_dijkstraCost(Combinaciones)" +msgid "``pgr_primBFS``" +msgstr "``pgr_primBFS``" -msgid "pgr_KSP(All signatures)" -msgstr "pgr_KSP(todas las firmas)" +msgid "Standarizing output columns to |result-spantree|" +msgstr "Estandarización de columnas de resultados a |result-spantree|" -msgid "pgr_boykovKolmogorov(Combinations)" -msgstr "pgr_boykovKolmogorov(Combinaciones)" +msgid "Added ``pred`` result columns." +msgstr "Agregado columna de resultados ``pred``." -msgid "pgr_edmondsKarp(Combinations)" -msgstr "pgr_edmondsKarp(Combinaciones)" +msgid "Experimental promoted to proposed." +msgstr "Experimental promovido a propuesto." -msgid "pgr_maxFlow(Combinations)" -msgstr "pgr_maxFlow(Combinaciones)" +msgid "" +"`#2635 `__ pgr_LineGraph " +"ignores directed flag and use negative values for identifiers." +msgstr "" +"`#2635 `__ pgr_LineGraph " +"ignora la bandera directed y usa valores negatives para identificadores." -msgid "pgr_pushRelabel(Combinations)" -msgstr "pgr_pushRelabel(Combinaciones)" +msgid "``pgr_lineGraph``" +msgstr "``pgr_lineGraph``" -msgid "code enhancements:" -msgstr "Mejora del código:" +msgid "Promoted to **proposed** signature." +msgstr "Promovido a firma **propuesta**." -msgid "Removal of unused C/C++ code" -msgstr "Eliminación de código C/C++ no utilizado" +msgid "Works for directed and undirected graphs." +msgstr "Funciona para grafos dirigidos y no dirigidos." -msgid "Removal of SQL deprecated functions" -msgstr "Eliminación de funciones obsoletas" +msgid "Code enhancement" +msgstr "Mejora del código" msgid "" -"pgr_trsp(text,integer,double precision,integer,double precision,boolean," -"boolean,text)" +"`#2599 `__ Driving " +"distance cleanup" msgstr "" -"pgr_trsp(text,integer,double precision,integer,double precision,boolean," -"boolean,text)" - -msgid "pgr_trsp(text,integer,integer,boolean,boolean,text)" -msgstr "pgr_trsp(text,integer,integer,boolean,boolean,text)" +"`#2599 `__ Limpieza de la " +"distancia de conducción" msgid "" -"pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)" +"`#2607 `__ Read postgresql " +"data on C++" msgstr "" -"pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)" - -msgid "pgr_trspviavertices(text,anyarray,boolean,boolean,text)" -msgstr "pgr_trspviavertices(text,anyarray,boolean,boolean,text)" - -msgid "Removal of SQL deprecated internal functions" -msgstr "Eliminación de funciones internas SQL obsoletas" - -msgid "_pgr_dijkstranear(text,anyarray,anyarray,bigint,boolean)" -msgstr "_pgr_dijkstranear(text,anyarray,anyarray,bigint,boolean)" - -msgid "_pgr_dijkstranear(text,anyarray,bigint,bigint,boolean)" -msgstr "_pgr_dijkstranear(text,anyarray,bigint,bigint,boolean)" - -msgid "_pgr_dijkstranear(text,bigint,anyarray,bigint,boolean)" -msgstr "_pgr_dijkstranear(text,bigint,anyarray,bigint,boolean)" - -msgid "_pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean,bigint)" -msgstr "_pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean,bigint)" - -msgid "_pgr_dijkstra(text,text,boolean,boolean,boolean)" -msgstr "_pgr_dijkstra(text,text,boolean,boolean,boolean)" - -msgid "_pgr_drivingdistance(text,anyarray,double precision,boolean,boolean)" -msgstr "_pgr_drivingdistance(text,anyarray,double precision,boolean,boolean)" - -msgid "_pgr_kruskal(text,anyarray,text,bigint,double precision)" -msgstr "_pgr_kruskal(text,anyarray,text,bigint,double precision)" - -msgid "_pgr_prim(text,anyarray,text,bigint,double precision)" -msgstr "_pgr_prim(text,anyarray,text,bigint,double precision)" +"`#2607 `__ Leer datos " +"postgresql en C++" msgid "" -"_pgr_trsp(text,integer,double precision,integer,double precision,boolean," -"boolean,text)" +"`#2614 `__ Clang tidy does " +"not work" msgstr "" -"_pgr_trsp(text,integer,double precision,integer,double precision,boolean," -"boolean,text)" - -msgid "_pgr_trsp(text,text,anyarray,anyarray,boolean)" -msgstr "_pgr_trsp(text,text,anyarray,anyarray,boolean)" - -msgid "_pgr_trsp(text,text,anyarray,bigint,boolean)" -msgstr "_pgr_trsp(text,text,anyarray,bigint,boolean)" - -msgid "_pgr_trsp(text,text,bigint,anyarray,boolean)" -msgstr "_pgr_trsp(text,text,bigint,anyarray,boolean)" - -msgid "_pgr_trsp(text,text,bigint,bigint,boolean)" -msgstr "_pgr_trsp(text,text,bigint,bigint,boolean)" - -msgid "_pgr_trspviavertices(text,integer[],boolean,boolean,text)" -msgstr "_pgr_trspviavertices(text,integer[],boolean,boolean,text)" - -msgid "_pgr_withpointsvia(text,bigint[],double precision[],boolean)" -msgstr "_pgr_withpointsvia(text,bigint[],double precision[],boolean)" - -msgid "_trsp(text,text,anyarray,anyarray,boolean)" -msgstr "_trsp(text,text,anyarray,anyarray,boolean)" - -msgid "_v4trsp(text,text,anyarray,anyarray,boolean)" -msgstr "_v4trsp(text,text,anyarray,anyarray,boolean)" - -msgid "_v4trsp(text,text,text,boolean)" -msgstr "_v4trsp(text,text,text,boolean)" - -msgid "Deprecation of internal C/C++ functions" -msgstr "Obsolescencia de funciones internas C/C++" - -msgid "Internal C/C++ functions in legacy" -msgstr "Funciones C/C++ internas en legado" +"`#2614 `__ Clang tidy no " +"funciona" msgid "All releases" msgstr "Todas las versiones" @@ -5091,6 +5049,9 @@ msgstr "Todas las versiones" msgid "Kruskal - Family of functions" msgstr "Kruskal - Familia de funciones" +msgid "Boost Graph Inside" +msgstr "Adentro: Boost Graph" + msgid "" "Kruskal's algorithm is a greedy minimum spanning tree algorithm that in each " "cycle finds and adds the edge of the least possible weight that connects any " @@ -5130,6 +5091,12 @@ msgstr "" "Todas las funciones obsoletas serán removidas en las siguiente versión mayor " "4.0.0" +msgid "Migration of functions" +msgstr "Migración de funciones" + +msgid "Migrating functions" +msgstr "Migrando funciones" + msgid "Migration of ``pgr_aStar``" msgstr "Migración de ``pgr_aStar``" @@ -5296,7 +5263,7 @@ msgstr "En ``pgr_dijkstra`` (`Muchos a Uno`)" msgid "If needed add the new columns, for example:" msgstr "Si es necesario, añadir las nuevas columnas, por ejemplo:" -msgid "Migration of ``pgr_drivingDistance``" +msgid "Migration of ``pgr_drivingdistance``" msgstr "Migración de ``pgr_drivingDistance``" msgid "" @@ -5318,11 +5285,11 @@ msgstr "a" msgid "|result-spantree|" msgstr "|result-spantree|" -msgid "pgr_drivingDistance(Single vertex)" -msgstr "pgr_drivingDistance(Vértice único)" +msgid "``pgr_drivingdistance`` (Single vertex)" +msgstr "``pgr_drivingDistance`` (Vértice único)" -msgid "pgr_drivingDistance(Multiple vertices)" -msgstr "pgr_drivingDistance(Múltiples vértices)" +msgid "``pgr_drivingdistance`` (Multiple vertices)" +msgstr "``pgr_drivingDistance`` (Múltiples vértices)" msgid "Output columns were |result-dij-dd|" msgstr "Columnas de resultados eran |old-generic-result|" @@ -5396,21 +5363,12 @@ msgstr "" msgid "|result-bfs|" msgstr "|result-bfs|" -msgid "``pgr_kruskalDD``" -msgstr "``pgr_kruskalDD``" - msgid "Single vertex" msgstr "Vértice único" msgid "Multiple vertices" msgstr "Múltiples vértices" -msgid "``pgr_kruskalDFS``" -msgstr "``pgr_kruskalDFS``" - -msgid "``pgr_kruskalBFS``" -msgstr "``pgr_kruskalBFS``" - msgid "Output columns were |result-bfs|" msgstr "Las columnas de salida fueron |result-bfs|" @@ -5592,15 +5550,6 @@ msgstr "" "estandarizan las columnas de resultados :doc:`pgr_primDD`, :doc:" "`pgr_primBFS` y :doc:`pgr_primDFS`." -msgid "``pgr_primDD``" -msgstr "``pgr_primDD``" - -msgid "``pgr_primDFS``" -msgstr "``pgr_primDFS``" - -msgid "``pgr_primBFS``" -msgstr "``pgr_primBFS``" - msgid "Prim single vertex" msgstr "Prim vértice único" @@ -5652,7 +5601,7 @@ msgstr "" "dirigidos." msgid "``pgr_withPointsDD`` (Single vertex)" -msgstr "``pgr_withPointsDD`` (Vértice único)" +msgstr "``pgr_withPointsDD`` (vértice único)" msgid "``pgr_withPointsDD`` (Multiple vertices)" msgstr "``pgr_withPointsDD`` (Múltiples vértices)" @@ -5830,186 +5779,69 @@ msgstr "" "Si es necesario, filtrar las columnas adicionales, por ejemplo, para " "devolver las columnas originales:" -msgid "Migration of ``pgr_trsp`` (Vertices)" -msgstr "Migración de `pgr_trsp`` (Vértices)" +msgid "Migration of turn restrictions" +msgstr "Migración de las restricciones de giro" -msgid "Signature:" -msgstr "Firma:" +msgid "Migration of restrictions" +msgstr "Migración de restricciones" -msgid "Deprecated" -msgstr "Obsoleto" +msgid "The structure of the restrictions have changed:" +msgstr "La estructura de las restricciones ha cambiado:" -msgid "`v3.4.0 `__" -msgstr "`v3.4.0 `__" +msgid "Old restrictions structure" +msgstr "Estructura de restricciones vieja" -msgid "Removed" -msgstr "Eliminado" +msgid "On the deprecated signatures:" +msgstr "Sobre las firmas obsoletas:" -msgid "`v4.0.0 `__" -msgstr "`v4.0.0 `__" +msgid "Column ``rid`` is ignored" +msgstr "La columna ``rid`` es ignorada" -msgid ":doc:`pgr_dijkstra`" -msgstr ":doc:`pgr_dijkstra`" +msgid "``via_path``" +msgstr "``via_path``" -msgid ":doc:`pgr_trsp`" -msgstr ":doc:`pgr_trsp`" +msgid "Must be in reverse order." +msgstr "Debe de estar en orden reverso." -msgid "`Migration of restrictions`_" -msgstr "`Migración de restricciones`_" +msgid "Is of type ``TEXT``." +msgstr "Es de tipo ``TEXT``." -msgid "Use ``pgr_dijkstra`` when there are no restrictions." -msgstr "Usar ``pgr_dijkstra`` cuando no hay restricciones." +msgid "When more than one via edge must be separated with ``,``." +msgstr "Cuando hay más de una arista debe de ser separada con ``,``." -msgid "Use :doc:`pgr_dijkstra` instead." -msgstr "Usa en vez :doc:`pgr_dijkstra`." +msgid "``target_id``" +msgstr "``target_id``" -msgid "To get the original column names:" -msgstr "Para obtener los nombres originales de las columnas:" +msgid "Is the last edge of the forbidden path." +msgstr "Es la última arista del camino prohibido." -msgid "``id1`` is the node" -msgstr "``id1`` es el nodo" +msgid "Is of type ``INTEGER``." +msgstr "Es de tipo de ``INTEGER``." -msgid "``id2`` is the edge" -msgstr "``id2`` es la arista" +msgid "``to_cost``" +msgstr "``to_cost``" -msgid "Use ``pgr_trsp`` when there are restrictions." -msgstr "Usar ``pgr_trspVia`` cuando hay restricciones." +msgid "Is of type ``FLOAT``." +msgstr "Es de tipo ``FLOAT``." -msgid "Use :doc:`pgr_trsp` (One to One) instead." -msgstr "Utilice en su lugar :doc:`pgr_trsp` (Uno a Uno)." +msgid "Creation of the old restrictions table" +msgstr "Creación de la vieja table de restricciones" -msgid "Migration of ``pgr_trsp`` (Edges)" -msgstr "Migración de ``pgr_trsp`` (Aristas)" +msgid "Old restrictions fill up" +msgstr "Las viejas restricciones se llenan" -msgid ":doc:`pgr_withPoints`" -msgstr ":doc:`pgr_withPoints`" +msgid "Old restrictions contents" +msgstr "Contenido de viejas restricciones" -msgid ":doc:`pgr_trsp_withPoints`" -msgstr ":doc:`pgr_trsp_withPoints`" +msgid "" +"The restriction with ``rid = 2`` is representing :math:`3 \\rightarrow 5 " +"\\rightarrow9`" +msgstr "" +"La restricción con ``rid = 2`` representa :math:`3 \\rightarrow 5 " +"\\rightarrow9`" -msgid "Use ``pgr_withPoints`` when there are no restrictions." -msgstr "Usar ``pgr_withPoints`` cuando no hay restricciones." - -msgid "Use :doc:`pgr_withPoints` (One to One) instead." -msgstr "Utilizar en su lugar :doc:`pgr_withPoints` (Uno a Uno)." - -msgid "Use ``pgr_trsp_withPoints`` when there are restrictions." -msgstr "Usar ``pgr_trsp_withPoints`` cuando hay restricciones." - -msgid "Use :doc:`pgr_trsp_withPoints` instead." -msgstr "Utilizar en su lugar :doc:`pgr_trsp_withPoints`." - -msgid "Migration of ``pgr_trspViaVertices``" -msgstr "Migración de ``pgr_trspViaVertices``" - -msgid ":doc:`pgr_dijkstraVia`" -msgstr ":doc:`pgr_dijkstraVia`" - -msgid ":doc:`pgr_trspVia`" -msgstr ":doc:`pgr_trspVia`" - -msgid "Use ``pgr_dijkstraVia`` when there are no restrictions" -msgstr "Usar ``pgr_dijkstraVia`` cuando no hay restricciones" - -msgid "Use :doc:`pgr_dijkstraVia` instead." -msgstr "Usar :doc:`pgr_dijkstraVia` en su lugar." - -msgid "``id1`` is the path identifier" -msgstr "``id1`` es el identificador de camino" - -msgid "``id2`` is the node" -msgstr "``id2`` es el nodo" - -msgid "``id3`` is the edge" -msgstr "``id3`` es la arista" - -msgid "Use ``pgr_trspVia`` when there are restrictions" -msgstr "Usar ``pgr_trspVia`` cuando hay restricciones" - -msgid "Use :doc:`pgr_trspVia` instead." -msgstr "Usar :doc:`pgr_trspVia` en su lugar." - -msgid "Migration of ``pgr_trspViaEdges``" -msgstr "Migración de ``pgr_trspViaEdges``" - -msgid ":doc:`pgr_withPointsVia`" -msgstr ":doc:`pgr_withPointsVia`" - -msgid ":doc:`pgr_trspVia_withPoints`" -msgstr ":doc:`pgr_trspVia_withPoints`" - -msgid "Use ``pgr_withPointsVia`` when there are no restrictions" -msgstr "Usar ``pgr_withPointsVia`` cuando no hay restricciones" - -msgid "Use :doc:`pgr_withPointsVia` instead." -msgstr "Usar :doc:`pgr_withPointsVia` en su lugar." - -msgid "Use ``pgr_trspVia_withPoints`` when there are restrictions" -msgstr "Usar ``pgr_trspVia_withPoints`` cuando hay restricciones" - -msgid "Use :doc:`pgr_trspVia_withPoints` instead." -msgstr "Usar :doc:`pgr_trspVia_withPoints` en su lugar." - -msgid "Migration of restrictions" -msgstr "Migración de restricciones" - -msgid "The structure of the restrictions have changed:" -msgstr "La estructura de las restricciones ha cambiado:" - -msgid "Old restrictions structure" -msgstr "Estructura de restricciones vieja" - -msgid "On the deprecated signatures:" -msgstr "Sobre las firmas obsoletas:" - -msgid "Column ``rid`` is ignored" -msgstr "La columna ``rid`` es ignorada" - -msgid "``via_path``" -msgstr "``via_path``" - -msgid "Must be in reverse order." -msgstr "Debe de estar en orden reverso." - -msgid "Is of type ``TEXT``." -msgstr "Es de tipo ``TEXT``." - -msgid "When more than one via edge must be separated with ``,``." -msgstr "Cuando hay más de una arista debe de ser separada con ``,``." - -msgid "``target_id``" -msgstr "``target_id``" - -msgid "Is the last edge of the forbidden path." -msgstr "Es la última arista del camino prohibido." - -msgid "Is of type ``INTEGER``." -msgstr "Es de tipo de ``INTEGER``." - -msgid "``to_cost``" -msgstr "``to_cost``" - -msgid "Is of type ``FLOAT``." -msgstr "Es de tipo ``FLOAT``." - -msgid "Creation of the old restrictions table" -msgstr "Creación de la vieja table de restricciones" - -msgid "Old restrictions fill up" -msgstr "Las viejas restricciones se llenan" - -msgid "Old restrictions contents" -msgstr "Contenido de viejas restricciones" - -msgid "" -"The restriction with ``rid = 2`` is representing :math:`3 \\rightarrow 5 " -"\\rightarrow9`" -msgstr "" -"La restricción con ``rid = 2`` representa :math:`3 \\rightarrow 5 " -"\\rightarrow9`" - -msgid ":math:`3\\rightarrow5`" -msgstr ":math:`3\\rightarrow5`" +msgid ":math:`3\\rightarrow5`" +msgstr ":math:`3\\rightarrow5`" msgid "is on column ``via_path`` in reverse order" msgstr "esta en la columna ``via_path`` en orden reverso" @@ -6103,6 +5935,257 @@ msgstr "Se eliminara en la próxima versión mayor 4.0.0" msgid "The migrated table contents:" msgstr "El contenido de la tabla de migración:" +msgid "Migration of ``pgr_trsp`` (Vertices)" +msgstr "Migración de `pgr_trsp`` (Vértices)" + +msgid "" +":doc:`pgr_trsp` signatures have changed and many issues have been fixed in " +"the new signatures. This section will show how to migrate from the old " +"signatures to the new replacement functions. This also affects the " +"restrictions." +msgstr "" +":doc:`pgr_trsp` firmas han cambiando y varios problemas han sido arreglados " +"en las nuevas firmas. Esta sección enseñara como migrar las viejas firmas a " +"la nueva función de reemplazo. Esto también afecta las restricciones ." + +msgid "The integral type of the ``Edges SQL`` can only be ``INTEGER``." +msgstr "El tipo integral de ``Edges SQL`` sólo puede ser ``INTEGER``." + +msgid "The floating point type of the ``Edges SQL`` can only be ``FLOAT``." +msgstr "El tipo de punto flotante del ``Edges SQL`` solo puede ser ``FLOAT``." + +msgid "``directed`` flag is compulsory." +msgstr "La bandera ``directed`` es obligatoria." + +msgid "Does not autodetect if ``reverse_cost`` column exist." +msgstr "No auto-detecta si la columna``reverse_cost`` existe." + +msgid "" +"User must be careful to match the existence of the column with the value of " +"``has_rcost`` parameter." +msgstr "" +"El usuario debe de tener cuidado al coincidir la existencia de la columna " +"con el valor del parámetro ``has_rcost``." + +msgid "The restrictions inner query is optional." +msgstr "Las restricciones de consulta interna son opcionales." + +msgid "The output column names are meaningless" +msgstr "Los nombres de la columna de salida no tienen importancia" + +msgid "Migrate by using:" +msgstr "Migra al user:" + +msgid ":doc:`pgr_dijkstra` when there are no restrictions," +msgstr ":doc:`pgr_dijkstra` cuando no hay restricciones," + +msgid ":doc:`pgr_trsp` (One to One) when there are restrictions." +msgstr ":doc:`pgr_trsp` (Uno a Uno) cuando hay restricciones." + +msgid "Migrating ``pgr_trsp`` (Vertices) using ``pgr_dijkstra``" +msgstr "Migrar ``pgr_trsp`` (Vértices) usando ``pgr_dijkstra``" + +msgid "The following query does not have restrictions." +msgstr "La siguiente consulta no tiene restricciones." + +msgid "A message about deprecation is shown" +msgstr "Un mensaje sobre lo obsoleto se enseña" + +msgid "Deprecated functions will be removed on the next mayor version 4.0.0" +msgstr "Funciones obsoletas se eliminaran en la siguiente versión mayor 4.0.0" + +msgid "Use :doc:`pgr_dijkstra` instead." +msgstr "Usa en vez :doc:`pgr_dijkstra`." + +msgid "The types casting has been removed." +msgstr "Se han eliminado la fundición de tipos." + +msgid ":doc:`pgr_dijkstra`:" +msgstr ":doc:`pgr_dijkstra`:" + +msgid "Autodetects if ``reverse_cost`` column is in the edges SQL." +msgstr "Auto-detecta si la columna``reverse_cost`` está en la SQL de aristas." + +msgid "Accepts ``ANY-INTEGER`` on integral types" +msgstr "Acepta ``ANY-INTEGER`` sobre tipos integrales" + +msgid "Accepts ``ANY-NUMERICAL`` on floating point types" +msgstr "Acepta ``ANY-NUMERICAL`` sobre tipos de puntos flotantes" + +msgid "``directed`` flag has a default value of ``true``." +msgstr "La bandera ``directed`` tiene valor de facto de ``true``." + +msgid "Use the same value that on the original query." +msgstr "Usa el mismo valor de la consulta original." + +msgid "In this example it is ``true`` which is the default value." +msgstr "En este ejemplo ``true`` que es el valor de facto." + +msgid "The flag has been omitted and the default is been used." +msgstr "Se ha omitido la bandera y se ha utilizado el valor por defecto." + +msgid "" +"When the need of using strictly the same (meaningless) names and types of " +"the function been migrated then:" +msgstr "" +"Cuando la necesidad de utilizar estrictamente los mismos nombres (sin " +"importancia) y los tipos de la función han sido migradas entonces:" + +msgid "``id1`` is the node" +msgstr "``id1`` es el nodo" + +msgid "``id2`` is the edge" +msgstr "``id2`` es la arista" + +msgid "Migrating ``pgr_trsp`` (Vertices) using ``pgr_trsp``" +msgstr "Migrando ``pgr_trsp`` (Vértices) usando ``pgr_trsp``" + +msgid "The following query has restrictions." +msgstr "La siguiente consulta tiene restricciones." + +msgid "The restrictions are the last parameter of the function" +msgstr "Las restricciones son el último parámetro de la función" + +msgid "Using the old structure of restrictions" +msgstr "Usando la antigua estructura de restricciones" + +msgid "Use :doc:`pgr_trsp` (One to One) instead." +msgstr "Utilice en su lugar :doc:`pgr_trsp` (Uno a Uno)." + +msgid "The new structure of restrictions is been used." +msgstr "La nueva estructura de restricciones han sido utilizados." + +msgid "It is the second parameter." +msgstr "Es el segundo parámetro." + +msgid ":doc:`pgr_trsp`:" +msgstr ":doc:`pgr_trsp`:" + +msgid "Migration of ``pgr_trsp`` (Edges)" +msgstr "Migración de ``pgr_trsp`` (Aristas)" + +msgid "The integral types of the ``sql`` can only be ``INTEGER``." +msgstr "Los tipos integrales de ``sql`` solo pueden ser ``INTEGER``." + +msgid "The floating point type of the ``sql`` can only be ``FLOAT``." +msgstr "El tipo de punto flotante del ``sql`` solo pueden ser ``FLOAT``." + +msgid "For these migration guide the following points will be used:" +msgstr "Para los siguientes puntos la guía de migración se utilizara:" + +msgid ":doc:`pgr_withPoints` when there are no restrictions," +msgstr ":doc:`pgr_withPoints` cuando no hay restricciones," + +msgid ":doc:`pgr_trsp_withPoints` (One to One) when there are restrictions." +msgstr ":doc:`pgr_trsp_withPoints` (Uno a Uno) cuando hay restricciones." + +msgid "Migrating ``pgr_trsp`` (Edges) using ``pgr_withPoints``" +msgstr "Migrando ``pgr_trsp`` (Aristas) usando ``pgr_withPoints``" + +msgid "Use :doc:`pgr_withPoints` instead." +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." + +msgid ":doc:`pgr_withPoints`:" +msgstr ":doc:`pgr_withPoints`:" + +msgid "On the points query do not include the ``side`` column." +msgstr "La consulta de puntos con incluye la columna ``side``." + +msgid "" +"When the need of using strictly the same (meaningless) names and types, and " +"node values of the function been migrated then:" +msgstr "" +"Cuando la necesidad de utilizar estrictamente los mismos nombres (sin " +"importancia) y tipos , y los valores de nodo de la función han sido migradas " +"entonces:" + +msgid "Migrating ``pgr_trsp`` (Edges) using ``pgr_trsp_withPoints``" +msgstr "Migrando``pgr_trsp`` (Aristas) utilizando ``pgr_trsp_withPoints``" + +msgid "Use :doc:`pgr_trsp_withPoints` instead." +msgstr "Utilizar en su lugar :doc:`pgr_trsp_withPoints`." + +msgid ":doc:`pgr_trsp_withPoints`:" +msgstr ":doc:`pgr_trsp_withPoints`:" + +msgid "Migration of ``pgr_trspViaVertices``" +msgstr "Migraciones de ``pgr_trspViaVertices``" + +msgid "The integral types of the ``Edges SQL`` can only be ``INTEGER``." +msgstr "" +"Los tipos enteros de las ``Consultas de Aristas`` solo pueden ser " +"``ENTEROS``." + +msgid ":doc:`pgr_dijkstraVia` when there are no restrictions," +msgstr ":doc:`pgr_dijkstraVia` cuando no hay restricciones," + +msgid ":doc:`pgr_trspVia` when there are restrictions." +msgstr ":doc:`pgr_trspVia` cuando hay restricciones." + +msgid "Migrating ``pgr_trspViaVertices`` using ``pgr_dijkstraVia``" +msgstr "Migrando ``pgr_trspViaVertices`` usando ``pgr_dijkstraVia``" + +msgid "Use :doc:`pgr_dijkstraVia` instead." +msgstr "Usar :doc:`pgr_dijkstraVia` en su lugar." + +msgid ":doc:`pgr_dijkstraVia`:" +msgstr ":doc:`pgr_dijkstraVia`:" + +msgid "``id1`` is the path identifier" +msgstr "``id1`` es el identificador de camino" + +msgid "``id2`` is the node" +msgstr "``id2`` es el nodo" + +msgid "``id3`` is the edge" +msgstr "``id3`` es la arista" + +msgid "Migrating ``pgr_trspViaVertices`` using ``pgr_trspVia``" +msgstr "Migrando ``pgr_trspViaVertices`` usando ``pgr_trspVia``" + +msgid "Use :doc:`pgr_trspVia` instead." +msgstr "Usar :doc:`pgr_trspVia` en su lugar." + +msgid ":doc:`pgr_trspVia`:" +msgstr ":doc:`pgr_trspVia`:" + +msgid "Migration of ``pgr_trspViaEdges``" +msgstr "Migración de ``pgr_trspViaEdges``" + +msgid "" +"And will travel thru the following Via points :math:" +"`4\\rightarrow3\\rightarrow6`" +msgstr "" +"Viajará a travez de los siguientes puntos de la vía :math:" +"`4\\rightarrow3\\rightarrow6`" + +msgid ":doc:`pgr_withPointsVia` when there are no restrictions," +msgstr ":doc:`pgr_withPointsVia` cuando no hay restricciones," + +msgid ":doc:`pgr_trspVia_withPoints` when there are restrictions." +msgstr ":doc:`pgr_trspVia_withPoints` cuando hay restricciones." + +msgid "Migrating ``pgr_trspViaEdges`` using ``pgr_withPointsVia``" +msgstr "Migrando ``pgr_trspViaEdges`` usando ``pgr_withPointsVia``" + +msgid "Use :doc:`pgr_withPointsVia` instead." +msgstr "Usar :doc:`pgr_withPointsVia` en su lugar." + +msgid ":doc:`pgr_withPointsVia`:" +msgstr ":doc:`pgr_withPointsVia`:" + +msgid "Migrating ``pgr_trspViaEdges`` using ``pgr_trspVia_withPoints``" +msgstr "Migrando ``pgr_trspViaEdges`` usando ``pgr_trspVia_withPoints``" + +msgid "Use :doc:`pgr_trspVia_withPoints` instead." +msgstr "Usar :doc:`pgr_trspVia_withPoints` en su lugar." + +msgid ":doc:`pgr_trspVia_withPoints`:" +msgstr ":doc:`pgr_trspVia_withPoints`:" + msgid ":doc:`withPoints-category`" msgstr ":doc:`withPoints-category`" @@ -7463,6 +7546,9 @@ msgstr "" msgid "Parameters for the Via functions" msgstr "Párametros para las funciones Via" +msgid ":doc:`pgr_dijkstraVia`" +msgstr ":doc:`pgr_dijkstraVia`" + msgid "SQL query as described." msgstr "Consulta SQL como se describe." @@ -7511,6 +7597,9 @@ msgstr "" msgid "For the TRSP functions" msgstr "Para las funciones de TRSP" +msgid ":doc:`pgr_trsp`" +msgstr ":doc:`pgr_trsp`" + msgid "Array of identifiers of destination vertices." msgstr "Arreglo de identificadores de vértices destino." @@ -7574,6 +7663,9 @@ msgstr "" msgid "Used in functions the following:" msgstr "Se utiliza en las funciones siguientes:" +msgid ":doc:`pgr_withPoints`" +msgstr ":doc:`pgr_withPoints`" + msgid "" "Returns set of ``(seq, path_seq [, start_pid] [, end_pid], node, edge, cost, " "agg_cost)``" @@ -7906,10 +7998,10 @@ msgid "Upgrading the database" msgstr "Actualización de la base de datos" msgid "" -"To upgrade pgRouting in the database to version 4.0.0 use the following " +"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 4.0.0 utilice el " +"Para actualizar pgRouting en la base de datos a la versión 3.7.0 utilice el " "siguiente comando:" msgid "" @@ -8438,8 +8530,8 @@ msgstr "Bibliotecas de código Boost C++ en https://www.boost.org." msgid ":doc:`migration`" msgstr ":doc:`migration`" -msgid "``pgr_KSP``" -msgstr "``pgr_KSP``" +msgid "pgr_KSP" +msgstr "pgr_KSP" msgid "``pgr_KSP`` — Yen's algorithm for K shortest paths using Dijkstra." msgstr "``pgr_KSP`` — Devuelve las K rutas más cortas usando Dijkstra ." @@ -8447,38 +8539,32 @@ msgstr "``pgr_KSP`` — Devuelve las K rutas más cortas usando Dijkstra ." msgid "Availability" msgstr "Disponibilidad" -msgid "Version 4.0.0" -msgstr "Versión 4.0.0" - -msgid "All signatures promoted to official." -msgstr "Todas las firmas promovidas a oficial." - msgid "Version 3.6.0" msgstr "Versión 3.6.0" 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)" +msgid "``pgr_ksp`` (One to One)" +msgstr "``pgr_ksp`` (Uno a Uno)" msgid "Added ``start_vid`` and ``end_vid`` result columns." msgstr "Añadidas las columnas de resultados ``start_vid`` y ``end_vid``." -msgid "New proposed signatures:" -msgstr "Nuevas firmas propuestas:" +msgid "New overload functions:" +msgstr "Nuevas funciones de sobrecarga:" -msgid "pgr_ksp(One to Many)" -msgstr "pgr_ksp(Uno a muchos)" +msgid "``pgr_ksp`` (One to Many)" +msgstr "``pgr_ksp`` (Uno a muchos)" -msgid "pgr_ksp(Many to One)" -msgstr "pgr_ksp(Muchos a uno)" +msgid "``pgr_ksp`` (Many to One)" +msgstr "``pgr_ksp`` (Muchos a uno)" -msgid "pgr_ksp(Many to Many)" -msgstr "pgr_ksp(Muchos a muchos)" +msgid "``pgr_ksp`` (Many to Many)" +msgstr "``pgr_ksp`` (Muchos a muchos)" -msgid "pgr_ksp(Combinations)" -msgstr "pgr_ksp(Combinaciones)" +msgid "``pgr_ksp`` (Combinations)" +msgstr "``pgr_ksp`` (Combinaciones)" msgid "Version 2.1.0" msgstr "Versión 2.1.0" @@ -8492,8 +8578,8 @@ msgstr "Firma antigua ya no soportada" msgid "Version 2.0.0" msgstr "Versión 2.0.0" -msgid "Official function." -msgstr "Función oficial." +msgid "**Official** function" +msgstr "Función **oficial**" msgid "" "The K shortest path routing algorithm based on Yen's algorithm. \"K\" is the " @@ -8502,12 +8588,6 @@ msgstr "" "El algoritmo de ruteo para obtener la ruta más corta K basado en el " "algoritmo de Yen . \"K\" es el número de rutas más cortas deseadas." -msgid "|Boost| Boost Graph Inside" -msgstr "|Boost| Adentro: Boost Graph" - -msgid "Boost Graph Inside" -msgstr "Adentro: Boost Graph" - msgid "Signatures" msgstr "Firmas" @@ -8919,13 +8999,6 @@ msgstr "``pgr_TSPeuclidean``" msgid "``pgr_TSPeuclidean`` - Aproximation using *metric* algorithm." msgstr "``pgr_TSPeuclidean`` - Aproximación usando el algoritmo *metric*." -msgid "" -"Using `Boost: metric TSP approx `__" -msgstr "" -"Usando `Boost: Algoritmo de aproximación Métrica de TSP `__" - msgid "" "The Simulated Annealing Algorithm related parameters are ignored: " "`max_processing_time`, `tries_per_temperature`, " @@ -8943,8 +9016,8 @@ msgstr "Versión 3.0.0" msgid "Name change from pgr_eucledianTSP" msgstr "Cambio de nombre de pgr_eucledianTSP" -msgid "New official function." -msgstr "Nueva función oficial." +msgid "New **Official** function" +msgstr "Nueva función **Oficial**" msgid "" "Any duplicated identifier will be ignored. The coordinates that will be kept" @@ -9039,51 +9112,59 @@ msgstr "" "uwaterloo.ca/tsp/world/witour.html>`__ y la segunda imagen es la solución " "obtenida con ``pgr_TSPeuclidean``." +msgid ":doc:`sampledata` network." +msgstr ":doc:`sampledata` ." + msgid "``pgr_aStar``" msgstr "``pgr_aStar``" msgid "``pgr_aStar`` — Shortest path using the A* algorithm." msgstr "``pgr_aStar`` — La ruta más corta utilizando el algoritmo A*." -msgid "Combinations signature promoted to official." -msgstr "Firmas de combinaciones promovidas a oficial." - msgid "Standarizing output columns to |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." +msgid "" +"``pgr_aStar`` (`One to One`_) added ``start_vid`` and ``end_vid`` columns." msgstr "" -"pgr_aStar(Uno a Uno) ha añadido las columnas ``start_vid`` y ``end_vid``." +"``pgr_aStar`` (`Uno a Uno`_) ha añadido las columnas ``start_vid`` y " +"``end_vid``." -msgid "pgr_aStar(One to Many) added ``end_vid`` column." -msgstr "pgr_aStar(Uno a Muchos) ha añadido la columna ``end_vid``." +msgid "``pgr_aStar`` (`One to Many`_) added ``end_vid`` column." +msgstr "``pgr_aStar`` (`Uno a Muchos`_) ha añadido la columna ``end_vid``." -msgid "pgr_aStar(Many to One) added ``start_vid`` column." -msgstr "pgr_aStar(Muchos a Uno) ha añadido la columna ``start_vid``." +msgid "``pgr_aStar`` (`Many to One`_) added ``start_vid`` column." +msgstr "``pgr_aStar`` (`Muchos a Uno`_) ha añadido la columna ``start_vid``." msgid "Version 3.2.0" msgstr "Versión 3.2.0" -msgid "New proposed signature:" -msgstr "Nuevas firmas propuesta:" +msgid "New **proposed** signature:" +msgstr "Nueva firma **propuesta**:" -msgid "Function promoted to official." -msgstr "Función promovida a oficial." +msgid "``pgr_aStar`` (`Combinations`_)" +msgstr "``pgr_aStar`` (`Combinaciones`_)" msgid "Version 2.4.0" msgstr "Versión 2.4.0" -msgid "pgr_aStar(One to Many)" -msgstr "pgr_aStar(Uno a Muchos)" +msgid "New **Proposed** signatures:" +msgstr "Nuevas firmas **propuestas**:" -msgid "pgr_aStar(Many to One)" -msgstr "pgr_aStar(Muchos a Uno)" +msgid "``pgr_aStar`` (`One to Many`_)" +msgstr "``pgr_aStar`` (`Uno a Muchos`_)" -msgid "pgr_aStar(Many to Many)" -msgstr "pgr_aStar(Muchos a Muchos)" +msgid "``pgr_aStar`` (`Many to One`_)" +msgstr "``pgr_aStar`` (`Muchos a Uno`_)" -msgid "Signature change on pgr_aStar(One to One)" -msgstr "Cambio de firma en pgr_aStar(Uno a Uno)" +msgid "``pgr_aStar`` (`Many to Many`_)" +msgstr "``pgr_aStar`` (`Muchos a Muchos`_)" + +msgid "Signature change on ``pgr_astar`` (`One to One`_)" +msgstr "Cambio de firma en ``pgr_astar`` (`Uno a Uno`_)" + +msgid "**Official** ``pgr_aStar`` (`One to One`_)" +msgstr "**Oficial** ``pgr_aStar`` (`Uno a Uno`_)" msgid "" "The results are equivalent to the union of the results of the `pgr_aStar(` " @@ -9175,8 +9256,8 @@ msgstr "Ejemplo 3" msgid "Manually assigned vertex combinations." msgstr "Manualmente asignar combinaciones de vértices." -msgid "``pgr_aStarCost``" -msgstr "``pgr_aStarCost``" +msgid "pgr_aStarCost" +msgstr "pgr_aStarCost" msgid "" "``pgr_aStarCost`` - Total cost of the shortest path using the A* algorithm." @@ -9184,8 +9265,11 @@ msgstr "" "``pgr_aStarCost`` - Coste total del camino más corto utilizando el algoritmo " "A*." -msgid "New proposed function." -msgstr "Nueva función propuesta." +msgid "``pgr_aStarCost`` (`Combinations`_)" +msgstr "``pgr_aStarCost`` (`Combinaciones`_)" + +msgid "New **proposed** function" +msgstr "Nueva función **propuesta**" msgid "" "The ``pgr_aStarCost`` function sumarizes of the cost of the shortest path " @@ -9319,9 +9403,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." @@ -9401,8 +9482,8 @@ msgstr ":doc:`pgr_drivingDistance`" msgid "`ST_ConcaveHull `__" msgstr "`ST_ConcaveHull `__" -msgid "``pgr_analyzeGraph``" -msgstr "``pgr_analyzeGraph``" +msgid "pgr_analyzeGraph" +msgstr "pgr_analyzeGraph" msgid "``pgr_analyzeGraph`` — Analyzes the network topology." msgstr "``pgr_analyzeGraph`` — analiza la topología de red." @@ -9719,6 +9800,9 @@ msgstr "" "Seleccionar las filas donde la geometría está cerca de la place='myhouse' de " "la tabla ``othertable``. (Nótese el uso de quote_literal)" +msgid "The examples use the :doc:`sampledata` network." +msgstr "Los ejemplos usan la red de ejemplo :doc:`sampledata`." + msgid ":doc:`pgr_analyzeOneWay`" msgstr ":doc:`pgr_analyzeOneWay`" @@ -9728,8 +9812,8 @@ msgstr ":doc:`pgr_createVerticesTable`" msgid ":doc:`pgr_nodeNetwork` to create nodes to a not noded edge table." msgstr ":doc:`pgr_nodeNetwork` para crear nodos en una tabla sin nodos." -msgid "``pgr_analyzeOneWay``" -msgstr "``pgr_analyzeOneWay``" +msgid "pgr_analyzeOneWay" +msgstr "pgr_analyzeOneWay" msgid "" "``pgr_analyzeOneWay`` — Analyzes oneway Sstreets and identifies flipped " @@ -9929,8 +10013,8 @@ msgstr "Cambio de columnas de resultados: ``seq`` se elimina" msgid "Version 2.5.0" msgstr "Versión 2.5.0" -msgid "New experimental function." -msgstr "Nueva función experimental." +msgid "New **experimental** function" +msgstr "Nueva función **experimental**" msgid "" "Those vertices that belong to more than one biconnected component are called " @@ -9966,11 +10050,11 @@ msgid "Nodes in red are the articulation points." msgstr "Nodos en rojo son los puntos de articulación." msgid "" -"`Boost: Biconnected components & articulation points `__" msgstr "" -"`Boost: Componentes biconectados y puntos de articulación `__" +"Boost: `Componentes biconectados & y puntos de articulación `__" msgid "" "wikipedia: `Biconnected component `__" -msgstr "" -"`Boost: Bellman Ford `__" - 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`` - Experimental" -msgstr "``pgr_betweennessCentrality`` - Experimental" +msgid "``pgr_betweennessCentrality``" +msgstr "``pgr_betweennessCentrality``" msgid "" -"``pgr_betweennessCentrality`` - Calculates the relative betweenness " +"``pgr_betweennessCentrality`` - Calculates the relative betweeness " "centrality using Brandes Algorithm" msgstr "" "``pgr_betweennessCentrality`` - Calcula la centralidad intermedia relativa " @@ -10402,6 +10524,9 @@ 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." @@ -10485,11 +10610,14 @@ msgstr "" "Puntuación relativa de centralidad entre vértices (estará en el rango [0,1])" msgid "" -"`Boost: betweenness centrality `_" +"Boost's `betweenness_centrality `_" msgstr "" -"`Boost: Centralidad de intermediación `__" +"`Boost: Centralidad de intermediación `__" + +msgid "Queries use the :doc:`sampledata` network." +msgstr "Las consultas utilizan la red :doc:`sampledata`." msgid "``pgr_biconnectedComponents``" msgstr "``pgr_biconnectedComponents``" @@ -10556,6 +10684,13 @@ msgstr "Contiene el identificador mínimo de arista en el componente." msgid "Identifier of the edge that belongs to the ``component``." msgstr "Identificador de arista que pertenece a ``component``." +msgid "" +"Boost: `Biconnected components `__" +msgstr "" +"Boost: `Componentes Biconectados `__" + msgid "``pgr_binaryBreadthFirstSearch`` - Experimental" msgstr "``pgr_binaryBreadthFirstSearch`` - Experimental" @@ -10573,8 +10708,20 @@ msgstr "" "Un grafo cuyos pesos de las aristas pertenece al conjunto {0, X}, donde 'X' " "es un entero no negativo, se le llama 'grafo binario'." -msgid "pgr_binaryBreadthFirstSearch(Combinations)" -msgstr "pgr_binaryBreadthFirstSearch(Combinaciones)" +msgid "pgr_binaryBreadthFirstSearch(`Combinations`_)" +msgstr "pgr_binaryBreadthFirstSearch(`Combinaciones`_)" + +msgid "pgr_binaryBreadthFirstSearch(`One to One`_)" +msgstr "pgr_binaryBreadthFirstSearch(`Uno a Uno`_)" + +msgid "pgr_binaryBreadthFirstSearch(`One to Many`_)" +msgstr "pgr_binaryBreadthFirstSearch(`Uno a Muchos`_)" + +msgid "pgr_binaryBreadthFirstSearch(`Many to One`_)" +msgstr "pgr_binaryBreadthFirstSearch(`Muchos a Uno`_)" + +msgid "pgr_binaryBreadthFirstSearch(`Many to Many`_)" +msgstr "pgr_binaryBreadthFirstSearch(`Muchos a Muchos`_)" msgid "" "It is well-known that the shortest paths between a single source and all " @@ -10665,13 +10812,6 @@ msgstr "" "**Nota:** Usando la red de :doc:`sampledata` como todos los pesos son los " "mismos (i.e :math:`1``)" -msgid "" -"`Boost: Breadth First Search `__" -msgstr "" -"`Boost: Primera búsqueda en amplitud `__" - msgid "https://cp-algorithms.com/graph/01_bfs.html" msgstr "https://cp-algorithms.com/graph/01_bfs.html" @@ -10680,8 +10820,8 @@ msgid "" msgstr "" "https://en.wikipedia.org/wiki/Dijkstra%27s_algorithm#Specialized_variants" -msgid "``pgr_bipartite`` - Experimental" -msgstr "``pgr_bipartite`` - Experimental" +msgid "pgr_bipartite -Experimental" +msgstr "pgr_bipartite - Experimental" msgid "" "``pgr_bipartite`` — Disjoint sets of vertices such that no two vertices " @@ -10690,6 +10830,9 @@ msgstr "" "``pgr_bipartite`` — Conjuntos disjuntos tal que ningun par de vertices en el " "mismo conjunto son adjacentes." +msgid "New **experimental** signature" +msgstr "Nueva firma **experimental**" + msgid "" "A bipartite graph is a graph with two sets of vertices which are connected " "to each other, but not within themselves. A bipartite graph is possible if " @@ -10746,20 +10889,6 @@ msgstr "" msgid "Edges in blue represent odd length cycle subgraph." msgstr "Aristas en azul representan un grafo de ciclo impar." -msgid "" -"`Boost: is_bipartite `__" -msgstr "" -"`Boost: es bipartido `__" - -msgid "" -"`Wikipedia: bipartite graph `__" -msgstr "" -"`Wikipedia: grafo bipartito `__" - msgid "``pgr_boykovKolmogorov``" msgstr "``pgr_boykovKolmogorov``" @@ -10772,11 +10901,20 @@ msgstr "" "maximiza el flujo de las fuentes a los objetivos utilizando el algoritmo " "Boykov Kolmogorov." +msgid "New **proposed** signature" +msgstr "Nueva firma **propuesta**" + +msgid "``pgr_boykovKolmogorov`` (`Combinations`_)" +msgstr "``pgr_boykovKolmogorov`` (`Combinaciones`_)" + msgid "Renamed from ``pgr_maxFlowBoykovKolmogorov``" msgstr "Renombrado de ``pgr_maxFlowBoykovKolmogorov``" -msgid "Function promoted to proposed." -msgstr "Función promovida a propuesta." +msgid "**Proposed** function" +msgstr "Función **propuesta**" + +msgid "New **Experimental** function" +msgstr "Nueva función **Experimental**" msgid "Running time: Polynomial" msgstr "Tiempo de ejecución: Polinomio" @@ -10821,12 +10959,8 @@ msgstr "" "Usando una tabla de combinaciones, equivalente a calcular el resultado de " "los vértices :math:`\\{5, 6\\}` a los vértices :math:`\\{10, 15, 14\\}`." -msgid "" -"`Boost: Boykov Kolmogorov max flow `__" -msgstr "" -"`Boost: Flujo máximo Boykov Kolmogorov `__" +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" msgid "``pgr_breadthFirstSearch`` - Experimental" msgstr "``pgr_breadthFirstSearch`` - Experimental" @@ -10838,6 +10972,12 @@ msgstr "" "``pgr_breadthFirstSearch`` — Devuelve los orden(es) transversales mediante " "el algoritmo Breadth First Search." +msgid "``pgr_breadthFirstSearch`` (`Single Vertex`_)" +msgstr "``pgr_breadthFirstSearch`` (`Vértice único`_)" + +msgid "``pgr_breadthFirstSearch`` (`Multiple Vertices`_)" +msgstr "``pgr_breadthFirstSearch`` (`Múltiples Vértices`_)" + msgid "" "Provides the Breadth First Search traversal order from a root vertex to a " "particular depth." @@ -10914,6 +11054,13 @@ msgstr "ascendente" msgid "descending" msgstr "descendente" +msgid "" +"`Boost: Breadth First Search algorithm documentation `__" +msgstr "" +"`Boost: Breadth First Search `__" + msgid "" "`Wikipedia: Breadth First Search algorithm `__" @@ -10957,12 +11104,8 @@ msgstr "Identificador del borde que es un puente." msgid "https://en.wikipedia.org/wiki/Bridge_%28graph_theory%29" msgstr "https://en.wikipedia.org/wiki/Bridge_%28graph_theory%29" -msgid "" -"`Boost: Connected components `__" -msgstr "" -"`Boost: Componentes conectados `__" +msgid "**Supported versions**" +msgstr "** Versions soportadas**" msgid "``pgr_chinesePostman`` - Experimental" msgstr "``pgr_chinesePostman`` - Experimental" @@ -11026,8 +11169,8 @@ msgstr "``pgr_chinesepostmancost``" msgid "Minimum costs of a circuit path." msgstr "Costes mínimos de una trayectoria de circuito." -msgid "``pgr_connectedComponents``" -msgstr "``pgr_connectedComponents``" +msgid "pgr_connectedComponents" +msgstr "pgr_connectedComponents" msgid "" "``pgr_connectedComponents`` — Connected components of an undirected graph " @@ -11067,6 +11210,13 @@ msgstr "Identificador del vértice que pertenece al ``component``." msgid "Connecting disconnected components" msgstr "Conectando componentes desconectados" +msgid "" +"Boost: `Connected components `__" +msgstr "" +"Boost: `Componente conectado `__" + msgid "" "wikipedia: `Connected component `__" @@ -11262,8 +11412,8 @@ msgstr "Sólo contracción sin salida" msgid "Only linear contraction" msgstr "Sólo contracción lineal" -msgid "``pgr_createTopology``" -msgstr "``pgr_createTopology``" +msgid "pgr_createTopology" +msgstr "pgr_createTopology" msgid "" "``pgr_createTopology`` — Builds a network topology based on the geometry " @@ -11517,8 +11667,11 @@ msgstr "" "En este ejemplo se inicia una topología limpia, con 5 aristas y, a " "continuación, se incrementa al resto de los bordes." -msgid "``pgr_createVerticesTable``" -msgstr "``pgr_createVerticesTable``" +msgid "The example uses the :doc:`sampledata` network." +msgstr "En el ejemplo se utiliza la red :doc:`sampledata`." + +msgid "pgr_createVerticesTable" +msgstr "pgr_createVerticesTable" msgid "" "``pgr_createVerticesTable`` — Reconstructs the vertices table based on the " @@ -11783,8 +11936,8 @@ msgstr "" "`Wikipedia: Ordenamiento Cuthill-McKee `__" -msgid "``pgr_dagShortestPath`` - Experimental" -msgstr "``pgr_dagShortestPath`` - Experimental" +msgid "pgr_dagShortestPath - Experimental" +msgstr "pgr_dagShortestPath - Experimental" msgid "" "``pgr_dagShortestPath`` — Returns the shortest path for weighted directed " @@ -11879,13 +12032,6 @@ msgstr "Columnas de Resultados" msgid "Making **start_vids** the same as **end_vids**" msgstr "Haciendo **vértices de salida** igual que **vértices destino**" -msgid "" -"`Boost: DAG shortest paths `__" -msgstr "" -"`Boost: Caminos mas cortos en DAG `__" - msgid "https://en.wikipedia.org/wiki/Topological_sorting" msgstr "https://en.wikipedia.org/wiki/Topological_sorting" @@ -12025,6 +12171,15 @@ msgstr "" msgid "Version 3.3.0" msgstr "Versión 3.3.0" +msgid "Promoted to **proposed** function" +msgstr "Promovido a función **propuesta**" + +msgid "``pgr_depthFirstSearch`` (`Single Vertex`_)" +msgstr "``pgr_depthFirstSearch`` (`Vértice único`_)" + +msgid "``pgr_depthFirstSearch`` (`Multiple Vertices`_)" +msgstr "``pgr_depthFirstSearch`` (`Vértices multiples`_)" + msgid "" "Depth First Search algorithm is a traversal algorithm which starts from a " "root vertex, goes as deep as possible, and backtracks once a vertex is " @@ -12094,18 +12249,18 @@ msgstr "" "Igual que `Vértice único`_ pero con aristas en orden descendente de ``id``." msgid "" -"`Boost: Depth First Search `__" +"`Boost: Depth First Search algorithm documentation `__" msgstr "" -"`Boost: Primera Búsqueda de Profundidad `__" +"`Boost: Documentación del algoritmo de Primera Búsqueda de Profundidad " +"`__" msgid "" -"`Boost: Undirected DFS `__" +"`Boost: Undirected DFS algorithm documentation `__" msgstr "" -"`Boost: DFS No dirigido `__" +"`Boost: Documentación del algoritmo DFS No dirigido `__" msgid "" "`Wikipedia: Depth First Search algorithm `__" -msgstr "" -"`Boost: Camino mas corto Dijkstra `__" - msgid "https://en.wikipedia.org/wiki/Dijkstra%27s_algorithm" msgstr "https://en.wikipedia.org/wiki/Dijkstra%27s_algorithm" @@ -12383,6 +12546,9 @@ msgstr "" "``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 " "using Dijkstra Algorithm." @@ -12740,6 +12906,9 @@ msgstr "Cuando ``true``: solo se devolverán los resultados del límite ``cap``" msgid "When ``false``: ``cap`` limit per ``Start vid`` will be returned" msgstr "Cuando ``false``: ``cap`` límite por ``Start vid`` será devuelto" +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" + msgid "Wikipedia: https://en.wikipedia.org/wiki/Dijkstra%27s_algorithm" msgstr "Wikipedia: https://en.wikipedia.org/wiki/Dijkstra%27s_algorithm" @@ -12944,9 +13113,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``." @@ -12957,17 +13123,14 @@ msgstr "" msgid "Added ``depth`` and ``pred`` result columns." msgstr "Agregado las columnas de resultados``depth`` y ``pred``." -msgid "Signature change:" -msgstr "Cambio de firma:" - -msgid "pgr_drivingDistance(single vertex)" -msgstr "pgr_drivingDistance(vértice único)" +msgid "Signature change pgr_drivingDistance(single vertex)" +msgstr "Cambio de firma pgr_drivingDistance(vértice único)" -msgid "New official signature:" -msgstr "Nueva firma oficial:" +msgid "New **Official** pgr_drivingDistance(multiple vertices)" +msgstr "Nuevo **Oficial** pgr_drivingDistance(multiples vértices)" -msgid "pgr_drivingDistance(multiple vertices)" -msgstr "pgr_drivingDistance(múltiples vértices)" +msgid "Official:: pgr_drivingDistance(single vertex)" +msgstr "Oficial:: pgr_drivingDistance(vértice único)" msgid "" "Using the Dijkstra algorithm, extracts all the nodes that have costs less " @@ -13036,8 +13199,8 @@ msgstr "" "Desde vértices math:`\\{11, 16\\}` con una distancia de :math:`3.0` en un " "grafo no dirigido" -msgid "``pgr_edgeColoring`` - Experimental" -msgstr "``pgr_edgeColoring`` - Experimental" +msgid "pgr_edgeColoring - Experimental" +msgstr "pgr_edgeColoring - Experimental" msgid "" "``pgr_edgeColoring`` — Returns the edge coloring of undirected and loop-free " @@ -13123,19 +13286,6 @@ msgstr "Regresa el conjunto de |result-edge-color|" msgid "Graph coloring of pgRouting :doc:`sampledata`" msgstr "Coloración de grafos de pgRouting :doc:`sampledata`" -msgid "" -"`Boost: Edge Coloring `__" -msgstr "" -"`Boost: Coloración de Segmentos `__" - -msgid "" -"`Wikipedia: Graph coloring `__" -msgstr "" -"`Wikipedia: Coloración de grafos `__" - msgid "``pgr_edgeDisjointPaths``" msgstr "``pgr_edgeDisjointPaths``" @@ -13146,6 +13296,9 @@ msgstr "" "``pgr_edgeDisjointPaths`` — Calcula las rutas de aristas desarticuladas " "entre dos grupos de vértices." +msgid "New **proposed** function:" +msgstr "Nueva función **propuesta**:" + msgid "pgr_edgeDisjointPaths(Combinations)" msgstr "pgr_edgeDisjointPaths(Combinaciones)" @@ -13250,6 +13403,9 @@ msgstr "" "maximizan el flujo de las fuentes a los destinos usando el algoritmo de " "Edmonds Karp." +msgid "``pgr_edmondsKarp`` (`Combinations`_)" +msgstr "``pgr_edmondsKarp`` (`Combinaciones`_)" + msgid "Renamed from ``pgr_maxFlowEdmondsKarp``" msgstr "Renombrado desde ``pgr_maxFlowEdmondsKarp``" @@ -13271,17 +13427,13 @@ msgstr "pgr_edmondsKarp(`SQL de aristas`_, **salidas**, **destinos**)" msgid "pgr_edmondsKarp(`Edges SQL`_, `Combinations SQL`_)" msgstr "pgr_edmondsKarp(`SQL de aristas`_, `SQL de combinaciones`_)" -msgid "" -"`Boost: Edmonds Karp max flow `__" -msgstr "" -"`Boost: Flujo máximo Edmonds Karp `__" +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" 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" +msgid "``pgr_edwardMoore - Experimental``" msgstr "``pgr_edwardMoore`` - Experimental" msgid "" @@ -13290,8 +13442,20 @@ msgstr "" "``pgr_edwardMoore`` — Devuelve la ruta más cortas usando el algoritmo Edward-" "Moore." -msgid "pgr_edwardMoore(Combinations)" -msgstr "pgr_edwardMoore(Combinaciones)" +msgid "``pgr_edwardMoore`` (`Combinations`_)" +msgstr "``pgr_edwardMoore`` (`Combinaciones`_)" + +msgid "``pgr_edwardMoore`` (`One to One`_)" +msgstr "``pgr_edwardMoore`` (`Uno a Uno`_)" + +msgid "``pgr_edwardMoore`` (`One to Many`_)" +msgstr "``pgr_edwardMoore`` (`Uno a Muchos`_)" + +msgid "``pgr_edwardMoore`` (`Many to One`_)" +msgstr "``pgr_edwardMoore`` (`Muchos a Uno`_)" + +msgid "``pgr_edwardMoore`` (`Many to Many`_)" +msgstr "``pgr_edwardMoore`` (`Muchos a Muchos`_)" msgid "" "Edward Moore’s Algorithm is an improvement of the Bellman-Ford Algorithm. It " @@ -13373,8 +13537,8 @@ msgstr "" msgid "https://en.wikipedia.org/wiki/Shortest_Path_Faster_Algorithm" msgstr "https://en.wikipedia.org/wiki/Shortest_Path_Faster_Algorithm" -msgid "``pgr_extractVertices`` -- Proposed" -msgstr "``pgr_extractVertices``-- Propuesto" +msgid "pgr_extractVertices -- Proposed" +msgstr "pgr_extractVertices -- Propuesto" msgid "``pgr_extractVertices`` — Extracts the vertices information" msgstr "``pgr_extractVertices`` — Extrae la información de los vértices" @@ -13490,14 +13654,23 @@ msgstr "" "Para obtener la consulta generada que se usa para obtener la información de " "vértices, utilice ``dryrun := true``." -msgid "``pgr_findCloseEdges`` - Proposed" -msgstr "``pgr_findCloseEdges`` - Propuesto" +msgid "``pgr_findCloseEdges``" +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 "Nuevas firmas **propuestas**:" + +msgid "``pgr_findCloseEdges`` (`One point`_)" +msgstr "``pgr_findCloseEdges`` (`Un punto`_)" + +msgid "``pgr_findCloseEdges`` (`Many points`_)" +msgstr "``pgr_findCloseEdges`` (`Muchos puntos`_)" + msgid "" "``pgr_findCloseEdges`` - An utility function that finds the closest edge to " "a point geometry." @@ -14062,6 +14235,9 @@ msgstr "" "Boost `Algoritmo floyd-Warshall `_" +msgid "Queries uses the :doc:`sampledata` network." +msgstr "Consultas utilizan la red :doc:`sampledata`." + msgid "``pgr_full_version``" msgstr "``pgr_full_version``" @@ -14071,6 +14247,9 @@ msgstr "" "``pgr_full_version`` — Obtener los detalles de la información de la versión " "de pgRouting." +msgid "New **official** function" +msgstr "Nueva función **oficial**" + msgid "Get complete details of pgRouting version information" msgstr "Obtener los detalles de la información de la versión de pgRouting" @@ -14137,8 +14316,8 @@ msgstr "``hash``" msgid "Git hash of pgRouting build" msgstr "Hash de Git de pgRouting" -msgid "``pgr_hawickCircuits`` - Experimental" -msgstr "``pgr_hawickCircuits`` - Experimental" +msgid "``pgr_hawickCircuits - Experimental``" +msgstr "``pgr_hawickCircuits - Experimental``" msgid "" "``pgr_hawickCircuits`` — Returns the list of cirucits using hawick circuits " @@ -14147,6 +14326,9 @@ msgstr "" "``pgr_hawickCircuits`` — Enumeración de los circuitos usando el algoritmo de " "circutos de Hawick." +msgid "``pgr_hawickCircuits``" +msgstr "``pgr_hawickCircuits``" + msgid "" "Hawick Circuit algorithm, is published in 2008 by Ken Hawick and Health A. " "James. This algorithm solves the problem of detecting and enumerating " @@ -14298,12 +14480,8 @@ msgstr "" "El nuevo grafo no es planar porque tiene un subgráfico :math:`K_5`. Las " "aristas en azul representan el subgrafo :math:`K_5`." -msgid "" -"`Boost: Boyer Myrvold `__" -msgstr "" -"`Boost: Boyer Myrvold `__" +msgid "https://www.boost.org/libs/graph/doc/boyer_myrvold.html" +msgstr "https://www.boost.org/libs/graph/doc/boyer_myrvold.html" msgid "``pgr_johnson``" msgstr "``pgr_johnson``" @@ -14371,9 +14549,6 @@ msgstr "" "``pgr_kruskalBFS`` — Algoritmo de Kruskal para el Árbol de Expansión Mínimo " "con orden de Primera Búsqueda en Anchura." -msgid "Added ``pred`` result columns." -msgstr "Agregado columna de resultados ``pred``." - msgid "" "Visits and extracts the nodes information in Breath First Search ordering of " "the Minimum Spanning Tree created using Kruskal's algorithm." @@ -14473,8 +14648,8 @@ msgstr "pgr_kruskalDFS(`SQL de aristas`_, **raíz**, [``max_depth``])" msgid "pgr_kruskalDFS(`Edges SQL`_, **root vids**, [``max_depth``])" msgstr "pgr_kruskalDFS(`SQL de aristas`_, **raices**, [``max_depth``])" -msgid "``pgr_lengauerTarjanDominatorTree`` - Experimental" -msgstr "``pgr_lengauerTarjanDominatorTree`` - Experimental" +msgid "pgr_lengauerTarjanDominatorTree -Experimental" +msgstr "pgr_lengauerTarjanDominatorTree -Experimental" msgid "" "``pgr_lengauerTarjanDominatorTree`` — Returns the immediate dominator of all " @@ -14539,11 +14714,11 @@ msgid "Dominator tree of another component." msgstr "Árbnol dominante de otro componente." msgid "" -"`Boost: Lengauer-Tarjan dominator `__" +"`Boost: Lengauer-Tarjan dominator tree algorithm `__" msgstr "" -"`Boost: Árbol dominante Lengauer-Tarjan `__" +"`Boost: Algoritmo Lengauer-Tarjan de árbol dominante `__" msgid "" "`Wikipedia: dominator tree `__" -msgid "``pgr_lineGraph`` - Proposed" -msgstr "``pgr_lineGraph`` - Propuesto" +msgid "pgr_lineGraph - Proposed" +msgstr "pgr_lineGraph - Propuesto" msgid "" "``pgr_lineGraph`` — Transforms the given graph into its corresponding edge-" @@ -14562,9 +14737,6 @@ msgstr "" "``pgr_lineGraph`` — Transforma un grafo dado en su grafo correspondiente " "basado en aristas." -msgid "Works for directed and undirected graphs." -msgstr "Funciona para grafos dirigidos y no dirigidos." - msgid "" "Given a graph :math:`G`, its line graph :math:`L(G)` is a graph such that:" msgstr "" @@ -14882,14 +15054,16 @@ msgstr "" "Grafo de línea completa del subgrafo de las aristas :math:`\\{4, 7, 8, 10\\}`" msgid "" -"The examples include the subgraph including edges 4, 7, 8, and 10 with " +"The examples of this section are based on the :doc:`sampledata` network. The " +"examples include the subgraph including edges 4, 7, 8, and 10 with " "``reverse_cost``." msgstr "" -"Los ejemplos incluyen el sub-grafo que incluye las aristas 4, 7, 8 y 10 con " +"Los ejemplos de esta sección se basan en la red :doc:`sampledata`. Los " +"ejemplos incluyen el subgrafo que incluye las aristas 4, 7, 8 y 10 con " "``reverse_cost``." msgid "The data" -msgstr "Los datos" +msgstr "" msgid "" "This example displays how this graph transformation works to create " @@ -14905,7 +15079,7 @@ msgid "first" msgstr "primero" msgid "The transformation" -msgstr "La transformación" +msgstr "" msgid "|second|" msgstr "|second|" @@ -14948,7 +15122,7 @@ msgid "" msgstr "" msgid "Store edge results" -msgstr "Almacenar resultados de aristas" +msgstr "" msgid "" "The first step is to store the results of the ``pgr_lineGraphFull`` call " @@ -14962,7 +15136,7 @@ msgid "From the original graph's vertex information" msgstr "" msgid "Add the new vertices" -msgstr "Agregar nuevos vértices" +msgstr "" msgid "Filling the mapping table" msgstr "" @@ -14982,7 +15156,7 @@ msgid "Updating values from self loops" msgstr "" msgid "Inspecting the vertices table" -msgstr "Inspeccionando la tabla de vértices" +msgstr "" msgid "Updating from inner self loops" msgstr "" @@ -15124,18 +15298,18 @@ msgstr "pgr_makeConnected(`SQL de aristas`_)" msgid "Returns set of |result-component-make|" msgstr "Regresa conjunto de |result-component-make|" -msgid "List of edges that are needed to connect the graph." -msgstr "Lista de aristas que se necesitan para conectar el grafo." - msgid "" -"`Boost: make connected `__" +"Query done on :doc:`sampledata` network gives the list of edges that are " +"needed to connect the graph." msgstr "" -"`Boost: conectar `__" +"La consulta realizada en la red de :doc:`sampledata` proporciona la lista de " +"aristas que se necesitan en el grafo para conectarlo." -msgid "``pgr_maxCardinalityMatch``" -msgstr "``pgr_maxCardinalityMatch``" +msgid "https://www.boost.org/libs/graph/doc/make_connected.html" +msgstr "https://www.boost.org/libs/graph/doc/make_connected.html" + +msgid "pgr_maxCardinalityMatch" +msgstr "pgr_maxCardinalityMatch" msgid "" "``pgr_maxCardinalityMatch`` — Calculates a maximum cardinality matching in a " @@ -15144,17 +15318,14 @@ msgstr "" "``pgr_maxCardinalityMatch`` — Calcula una coincidencia de cardinalidad " "máxima en un grafo." -msgid "pgr_maxCardinalityMatch(text) returns only ``edge`` column." -msgstr "pgr_maxCardinalityMatch(text) regresa solamente la columna ``edge``." - msgid "Deprecated signature" msgstr "" -msgid "pgr_maxCardinalityMatch(text,boolean)" -msgstr "pgr_maxCardinalityMatch(text,boolean)" +msgid "``pgr_maxCardinalityMatch(text,boolean)``" +msgstr "``pgr_maxCardinalityMatch(text,boolean)``" -msgid "directed => ``false`` when used." -msgstr "Con directed => `` false`` cuando se usa." +msgid "``directed => false`` when used." +msgstr "" msgid "Renamed from ``pgr_maximumCardinalityMatching``" msgstr "Renombrado de ``pgr_maximumCardinalityMatching``" @@ -15214,12 +15385,8 @@ msgstr "" msgid "Identifier of the edge in the original query." msgstr "Identificador de la arista en la consulta original." -msgid "" -"`Boost: maximum_matching `__" -msgstr "" -"`Boost: Coincidencia máxima `__" +msgid "https://www.boost.org/libs/graph/doc/maximum_matching.html" +msgstr "https://www.boost.org/libs/graph/doc/maximum_matching.html" msgid "https://en.wikipedia.org/wiki/Matching_%28graph_theory%29" msgstr "https://en.wikipedia.org/wiki/Matching_%28graph_theory%29" @@ -15237,6 +15404,12 @@ msgstr "" "``pgr_maxFlow`` — Calcula el flujo máximo en un gráfico dirigido desde los " "orígene(s) a los destino(s) mediante el algoritmo Push Relabel." +msgid "``pgr_maxFlow`` (`Combinations`_)" +msgstr "``pgr_maxFlow`` (`Combinaciones`_)" + +msgid "New **Proposed** function" +msgstr "Nueva función **Propuesta**" + msgid "Calculates the maximum flow from the sources to the targets." msgstr "Calcula el flujo máximo de las fuentes a los objetivos." @@ -15272,12 +15445,8 @@ msgstr "" msgid "Maximum flow possible from the source(s) to the target(s)" msgstr "Flujo máximo posible desde el/los orígen(es) hacia el/los destino(s)" -msgid "" -"`Boost: push relabel max flow `__" -msgstr "" -"`Boost: Flujo máximo empujar reetiquetar `__" +msgid "https://www.boost.org/libs/graph/doc/push_relabel_max_flow.html" +msgstr "https://www.boost.org/libs/graph/doc/push_relabel_max_flow.html" msgid "" "https://en.wikipedia.org/wiki/Push%E2%80%93relabel_maximum_flow_algorithm" @@ -15294,11 +15463,8 @@ msgstr "" "``pgr_maxFlowMinCost`` — Calcula las aristas que minimiza el costo del flujo " "maximo en un grafo" -msgid "pgr_maxFlowMinCost(Combinations)" -msgstr "pgr_maxFlowMinCost(Combinaciones)" - -msgid "|boost| graph inside." -msgstr "|boost| graph adentro." +msgid "``pgr_maxFlowMinCost`` (`Combinations`_)" +msgstr "``pgr_maxFlowMinCost`` (`Combinaciones`_)" msgid "**TODO** check which statement is true:" msgstr "**Por hacer** comprobar qué declaración es verdadera:" @@ -15347,6 +15513,13 @@ msgstr "pgr_maxFlowMinCost(`SQL de aristas`_, `SQL de combinaciones`_)" msgid "Returns set of |result-flow-mincost|" msgstr "Regresa el conjunto de |result-flow-mincost|" +msgid "" +"https://www.boost.org/libs/graph/doc/" +"successive_shortest_path_nonnegative_weights.html" +msgstr "" +"https://www.boost.org/libs/graph/doc/" +"successive_shortest_path_nonnegative_weights.html" + msgid "``pgr_maxFlowMinCost_Cost`` - Experimental" msgstr "``pgr_maxFlowMinCost_Cost`` - Experimental" @@ -15357,8 +15530,8 @@ msgstr "" "``pgr_maxFlowMinCost_Cost`` — Calcula el costo mínimo para el máximo flujo " "en un grafo" -msgid "pgr_maxFlowMinCost_Cost(Combinations)" -msgstr "pgr_maxFlowMinCost_Cost(Combinaciones)" +msgid "``pgr_maxFlowMinCost_Cost`` (`Combinations`_)" +msgstr "``pgr_maxFlowMinCost_Cost`` (`Combinaciones`_)" msgid "**The cost value of all input edges must be nonnegative.**" msgstr "" @@ -15394,8 +15567,8 @@ msgstr "" "Coste Mínimo Flujo Máximo posible desde el/los origen(es) hasta el/los " "objetivo(s)" -msgid "``pgr_nodeNetwork``" -msgstr "``pgr_nodeNetwork``" +msgid "pgr_nodeNetwork" +msgstr "pgr_nodeNetwork" msgid "``pgr_nodeNetwork`` - Nodes an network edge table." msgstr "" @@ -15779,8 +15952,6 @@ msgstr "Firma" msgid "" "pgr_pickDeliver(`Orders SQL`_, `Vehicles SQL`_, `Matrix SQL`_, [**options**])" msgstr "" -"pgr_pickDeliver(`SQL de ordenes`_, `SQL de vehículos`_, `SQL de matriz`_, " -"[**opciones**])" msgid "**options:** ``[factor, max_cycles, initial_sol]``" msgstr "**opcionales:** ``[factor, max_cycles, initial_sol]``" @@ -16020,6 +16191,9 @@ msgstr "" "``pgr_pushRelabel`` — Calcula el flujo en los bordes del grafo que maximiza " "el flujo de los orígenes a los destinos mediante el Algoritmo Push Relabel." +msgid "``pgr_pushRelabel`` (`Combinations`_)" +msgstr "``pgr_pushRelabel`` (`Combinaciones`_)" + msgid "Renamed from ``pgr_maxFlowPushRelabel``" msgstr "Renombrado de ``pgr_maxFlowPushRelabel``" @@ -16038,8 +16212,8 @@ msgstr "pgr_pushRelabel(`SQL de aristas`_, **salidas**, **destinos**)" msgid "pgr_pushRelabel(`Edges SQL`_, `Combinations SQL`_)" msgstr "pgr_pushRelabel(`SQL de aristas`_, `SQL de combinaciones`_)" -msgid "``pgr_sequentialVertexColoring`` - Proposed" -msgstr "``pgr_sequentialVertexColoring`` - Propuesto" +msgid "pgr_sequentialVertexColoring - Proposed" +msgstr "pgr_sequentialVertexColoring - Propuesto" msgid "" "``pgr_sequentialVertexColoring`` — Returns the vertex coloring of an " @@ -16048,6 +16222,9 @@ msgstr "" "``pgr_sequentialVertexColoring`` — Devuelve el color de vértice de un grafo " "no dirigido, utilizando un enfoque codicioso." +msgid "Promoted to **proposed** signature" +msgstr "Promovido a firma **propuesta**" + msgid "" "Sequential vertex coloring algorithm is a graph coloring algorithm in which " "color identifiers are assigned to the vertices of a graph in a sequential " @@ -16106,15 +16283,8 @@ msgstr ":math:`k` es el número de colores utilizados." msgid "pgr_sequentialVertexColoring(`Edges SQL`_)" msgstr "pgr_sequentialVertexColoring(`SQL de aristas`_)" -msgid "" -"`Boost: Sequential Vertex Coloring `__" -msgstr "" -"`Boost: Coloración Secuencial de Vértices `__" - -msgid "``pgr_stoerWagner`` - Experimental" -msgstr "``pgr_stoerWagner`` - Experimental" +msgid "pgr_stoerWagner - Experimental" +msgstr "pgr_stoerWagner - Experimental" msgid "``pgr_stoerWagner`` — The min-cut of graph using stoerWagner algorithm." msgstr "" @@ -16220,13 +16390,6 @@ msgstr "corte mínimo de una arista" msgid "Using :doc:`pgr_connectedComponents`" msgstr "Usando :doc:`pgr_connectedComponents`" -msgid "" -"`Boost: Stoer Wagner min cut `__" -msgstr "" -"`Boost: Corte mínimo Stoer Wagner `__" - msgid "https://en.wikipedia.org/wiki/Stoer%E2%80%93Wagner_algorithm" msgstr "https://en.wikipedia.org/wiki/Stoer%E2%80%93Wagner_algorithm" @@ -16260,10 +16423,10 @@ msgid "The strong components of the graph" msgstr "Los componentes fuertes del grafo" msgid "" -"`Boost: Strong components `__" msgstr "" -"`Boost: Componentes fuertemente conectados `__" msgid "" @@ -16336,13 +16499,6 @@ msgstr "" msgid "Graph is not a DAG" msgstr "" -msgid "" -"`Boost: topological sort `__" -msgstr "" -"`Boost: Ordenamiento topológico `__" - msgid "``pgr_transitiveClosure`` - Experimental" msgstr "``pgr_transitiveClosure`` - Experimental" @@ -16399,54 +16555,57 @@ msgid "Identifiers of the vertices that are reachable from vertex v." msgstr "" "Identificadores de los vértices que son alcanzables desde el vértice v." -msgid "" -"`Boost: transitive closure `__" -msgstr "" -"`Boost: Cierre transitivo `__" - msgid "https://en.wikipedia.org/wiki/Transitive_closure" msgstr "https://en.wikipedia.org/wiki/Transitive_closure" -msgid "``pgr_trsp``" -msgstr "``pgr_trsp``" +msgid "pgr_trsp - Proposed" +msgstr "" msgid "``pgr_trsp`` - routing vertices with restrictions." msgstr "``pgr_trsp`` - Ruteo con restricciones." -msgid "pgr_trsp(One to One)" -msgstr "pgr_trsp(Uno a Uno)" +msgid "New proposed signatures" +msgstr "Nuevas firmas propuestas" + +msgid "``pgr_trsp`` (`One to One`_)" +msgstr "``pgr_trsp`` (`Uno a Uno`_)" -msgid "pgr_trsp(One to Many)" -msgstr "pgr_trsp(Uno a Muchos)" +msgid "``pgr_trsp`` (`One to Many`_)" +msgstr "" -msgid "pgr_trsp(Many to One)" -msgstr "pgr_trsp(Muchos a Uno)" +msgid "``pgr_trsp`` (`Many to One`_)" +msgstr "" -msgid "pgr_trsp(Many to Many)" -msgstr "pgr_trsp(Muchos a Muchos)" +msgid "``pgr_trsp`` (`Many to Many`_)" +msgstr "" -msgid "pgr_trsp(Combinations)" -msgstr "pgr_trsp(Combinaciones)" +msgid "``pgr_trsp`` (`Combinations`_)" +msgstr "" msgid "Deprecated signatures" msgstr "Firmas obsoletas" -msgid "pgr_trsp(text,integer,float,integer,float,boolean,boolean,text)" -msgstr "pgr_trsp(text,integer,float,integer,float,boolean,boolean,text)" +msgid "``pgr_trsp(text,integer,integer,boolean,boolean,text)``" +msgstr "``pgr_trsp(text,integer,integer,boolean,boolean,text)``" + +msgid "``pgr_trsp(text,integer,float,integer,float,boolean,boolean,text)``" +msgstr "" + +msgid "``pgr_trspViaVertices(text,anyarray,boolean,boolean,text)``" +msgstr "" -msgid "pgr_trspViaVertices(text,anyarray,boolean,boolean,text)" -msgstr "pgr_trspViaVertices(text,anyarray,boolean,boolean,text)" +msgid "" +"``pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)``" +msgstr "" msgid "New prototypes" msgstr "Nuevos prototipos" -msgid "pgr_trspViaVertices" -msgstr "pgr_trspViaVertices" +msgid "``pgr_trspViaVertices``" +msgstr "``pgr_trspViaVertices``" -msgid "pgr_trspViaEdges" -msgstr "pgr_trspViaEdges" +msgid "``pgr_trspViaEdges``" +msgstr "``pgr_trspViaEdges``" msgid "" "Turn restricted shortest path (TRSP) is an algorithm that receives turn " @@ -16527,15 +16686,20 @@ msgstr "Usando una tabla de combinaciones en un grafo no dirigido." msgid "" "`Deprecated documentation `_" msgstr "" -"`Documentación obsoleta `_" -msgid "``pgr_trspVia``" -msgstr "``pgr_trspVia``" +msgid "``pgr_trspVia`` - Proposed" +msgstr "" msgid "" "``pgr_trspVia`` Route that goes through a list of vertices with restrictions." msgstr "" +msgid "New proposed function:" +msgstr "" + +msgid "``pgr_trspVia`` (`One Via`_)" +msgstr "" + 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 :" @@ -16546,7 +16710,7 @@ msgid "The paths represents the sections of the route." msgstr "Las trayectorias representan los tramos de la ruta." msgid "Execute a :doc:`pgr_dijkstraVia`." -msgstr "Ejecutar un :doc:`pgr_dijkstraVia`." +msgstr "" msgid "" "For the set of sub paths of the solution that pass through a restriction then" @@ -16617,14 +16781,17 @@ msgstr "" msgid ":doc:`via-category`" msgstr ":doc:`via-category`" -msgid "``pgr_trspVia_withPoints``" -msgstr "``pgr_trspVia_withPoints``" +msgid "``pgr_trspVia_withPoints`` - Proposed" +msgstr "" msgid "" "``pgr_trspVia_withPoints`` - Route that goes through a list of vertices and/" "or points with restrictions." msgstr "" +msgid "``pgr_trspVia_withPoints`` (`One Via`_)" +msgstr "" + msgid "" "Given a graph, a set of restriction on the graph edges, a set of points on " "the graphs edges and a list of vertices, this function is equivalent to " @@ -16756,7 +16923,7 @@ msgid "Status of \"passes in front\" or \"visits\" of the nodes and points." msgstr "" msgid "The algorithm performs a :doc:`pgr_withPointsVia`" -msgstr "El algoritmo realiza una :doc:`pgr_withPointsVia`" +msgstr "" msgid "" "Detects which of the paths pass through a restriction in this case is for " @@ -16794,12 +16961,30 @@ msgid "" "`pgr_trsp` algorithm. In this case a U turn is been done using the same edge." msgstr "" -msgid "``pgr_trsp_withPoints``" -msgstr "``pgr_trsp_withPoints``" +msgid "pgr_trsp_withPoints - Proposed" +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`_)" + +msgid "``pgr_trsp_withPoints`` (`One to Many`_)" +msgstr "" + +msgid "``pgr_trsp_withPoints`` (`Many to One`_)" +msgstr "" + +msgid "``pgr_trsp_withPoints`` (`Many to Many`_)" +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" @@ -16943,15 +17128,16 @@ msgstr "" "Desde el punto :math:`1` y el vértice :math:`6` al punto :math:`3` y el " "vértice :math:`1` en un grafo no dirigido, con detalles." -msgid "``pgr_turnRestrictedPath`` - Experimental" -msgstr "``pgr_turnRestrictedPath`` - Experimental" +msgid "pgr_turnRestrictedPath - Experimental" +msgstr "pgr_turnRestrictedPath - Experimental" msgid "" -"``pgr_turnRestrictedPath`` Using Yen's algorithm Vertex - Vertex routing " -"with restrictions" +"``pgr_turnRestrictedPath`` Using Yen's algorithm Vertex -Vertex routing with " +"restrictions" msgstr "" -"``pgr_turnRestrictedPath`` Usando el algoritmo vértice -vértice de Yen para " -"ruteo con restricciones" + +msgid "New experimental function" +msgstr "Nueva función Experimental" msgid "" "Using Yen's algorithm to obtain K shortest paths and analyze the paths to " @@ -17027,8 +17213,8 @@ msgstr "pgr_version()" msgid "pgRouting Version for this documentation" msgstr "Versión de pgRouting para esta documentación" -msgid "``pgr_vrpOneDepot`` - Experimental" -msgstr "``pgr_vrpOneDepot`` - Experimental" +msgid "pgr_vrpOneDepot - Experimental" +msgstr "pgr_vrpOneDepot - Experimental" msgid "**No documentation available**" msgstr "**No hay documentación disponible**" @@ -17036,8 +17222,8 @@ msgstr "**No hay documentación disponible**" msgid "**TBD**" msgstr "**TBD**" -msgid "``pgr_withPoints``" -msgstr "``pgr_withPoints``" +msgid "``pgr_withPoints`` - Proposed" +msgstr "``pgr_withPoints`` - Propuesto" msgid "" "``pgr_withPoints`` - Returns the shortest path in a graph with additional " @@ -17212,8 +17398,8 @@ msgstr "Del punto :math:`6` al vértice :math:`11`." msgid "Passes in front or visits with left side driving." msgstr "Pasa enfrente o visita con lado izquierdo de manejo." -msgid "``pgr_withPointsCost``" -msgstr "``pgr_withPointsCost``" +msgid "``pgr_withPointsCost`` - Proposed" +msgstr "``pgr_withPointsCost`` - Propuesto" msgid "" "``pgr_withPointsCost`` - Calculates the shortest path and returns only the " @@ -17396,8 +17582,8 @@ msgstr "Topología de manejo del lado izquierdo" msgid "Does not matter driving side driving topology" msgstr "No importa el lado de manejo" -msgid "``pgr_withPointsCostMatrix``" -msgstr "``pgr_withPointsCostMatrix``" +msgid "``pgr_withPointsCostMatrix`` - proposed" +msgstr "``pgr_withPointsCostMatrix`` - propuesto" msgid "" "``pgr_withPointsCostMatrix`` - Calculates a cost matrix using :doc:" @@ -17436,8 +17622,8 @@ msgstr "" "Encontrar la matriz de costos de las rutas desde el vértice :math:`1` y las " "dos ubicaciones más cercanas en el grafo al punto `(2.9, 1.8)`." -msgid "``pgr_withPointsDD``" -msgstr "``pgr_withPointsDD``" +msgid "``pgr_withPointsDD`` - Proposed" +msgstr "``pgr_withPointsDD`` - Propuesto" msgid "" "``pgr_withPointsDD`` - Returns the driving **distance** from a starting " @@ -17451,11 +17637,8 @@ msgid "" "unnamed compulsory **driving side**." msgstr "" -msgid "pgr_withPointsDD(Single vertex)" -msgstr "pgr_withPointsDD(Vértice único)" - -msgid "pgr_withPointsDD(Multiple vertices)" -msgstr "pgr_withPointsDD(Múltiples vértices)" +msgid "``pgr_withPointsDD`` (`Single vertex`)" +msgstr "``pgr_withPointsDD`` (`Vértice único`)" msgid "Added ``depth``, ``pred`` and ``start_vid`` column." msgstr "Agregado las columnas ``depth``, ``pred`` y ``start_vid``." @@ -17472,16 +17655,18 @@ msgid "" msgstr "" msgid "" -"pgr_withpointsdd(text,text,bigint,double precision,boolean,character,boolean)" +"``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)" +"``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 " @@ -17613,8 +17798,8 @@ msgstr "" msgid ":doc:`pgr_alphaShape`" msgstr ":doc:`pgr_alphaShape`" -msgid "``pgr_withPointsKSP``" -msgstr "``pgr_withPointsKSP``" +msgid "pgr_withPointsKSP - Proposed" +msgstr "pgr_withPointsKSP - Propuesto" msgid "" "``pgr_withPointsKSP`` — Yen's algorithm for K shortest paths using Dijkstra." @@ -17625,26 +17810,29 @@ msgstr "" msgid "Standarizing output columns to |nksp-result|" msgstr "" -msgid "pgr_withPointsKSP(One to One)" -msgstr "pgr_withPointsKSP(Uno a Uno)" +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)" +msgid "``pgr_withPointsKSP`` (One to Many)" +msgstr "``pgr_withPointsKSP`` (Uno a Muchos)" -msgid "pgr_withPointsKSP(Many to One)" -msgstr "pgr_withPointsKSP(Muchos a Uno)" +msgid "``pgr_withPointsKSP`` (Many to One)" +msgstr "``pgr_withPointsKSP`` (Muchos a Uno)" -msgid "pgr_withPointsKSP(Many to Many)" -msgstr "pgr_withPointsKSP(Muchos a Muchos)" +msgid "``pgr_withPointsKSP`` (Many to Many)" +msgstr "``pgr_withPointsKSP`` (Muchos a Muchos)" -msgid "pgr_withPointsKSP(Combinations)" -msgstr "pgr_withPointsKSP(Combinaciones)" +msgid "``pgr_withPointsKSP`` (Combinations)" +msgstr "``pgr_withPointsKSP`` (Combinaciones)" msgid "" -"pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,char," +"``pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,char," "boolean)``" msgstr "" -"pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,char," +"``pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,char," "boolean)``" msgid "" @@ -17797,14 +17985,16 @@ msgstr "" "Obtener :math:`2` rutas, usando topología de manejo por la derecha, desde el " "punto :math:`1` al punto :math:`2`, detallado y con rutas procesadas." -msgid "``pgr_withPointsVia``" -msgstr "``pgr_withPointsVia``" +msgid "``pgr_withPointsVia`` - Proposed" +msgstr "" msgid "" "``pgr_withPointsVia`` - Route that goes through a list of vertices and/or " "points." msgstr "" -"``pgr_withPointsVia`` - Ruta que recorre una lista de vértices y/o puntos." + +msgid "New **proposed** function ``pgr_withPointsVia`` (`One Via`_)" +msgstr "" msgid "" "Given a graph, a set of points on the graphs edges and a list of vertices, " @@ -17817,7 +18007,7 @@ msgid "" "pgr_withPointsVia(`Edges SQL`_, `Points SQL`_, **via vertices**, " "[**options**])" msgstr "" -"pgr_withPointsVia(`SQL de aristas`_, `SQL de puntos`_, ** via de vértices**, " +"pgr_withPointsVia(`SQL de aristas`_, `SQL de puntos`_, ****vértices****, " "[**opciones**])" msgid "" @@ -17905,7 +18095,7 @@ msgid ":doc:`pgr_withPointsKSP` - K shortest paths." msgstr ":doc:`pgr_withPointsKSP` - rutas más cortas K." msgid ":doc:`pgr_withPointsDD` - Driving distance." -msgstr ":doc:`pgr_withPointsDD` - Distancia de manejo." +msgstr ":doc:`pgr_withPointsDD` - Distancia de conducción." msgid ":doc:`pgr_withPointsVia` - Via routing" msgstr ":doc:`pgr_withPointsVia` - Ruteo vía ubicaciones" @@ -17916,243 +18106,66 @@ msgstr "Estas funciones propuestas no modifican la base de datos." msgid "" ":doc:`pgr_degree` - Returns a set of vertices and corresponding count of " "incidet edges to the vertex." -msgstr "" - -msgid "" -":doc:`pgr_extractVertices` - Extracts vertex information based on the edge " -"table information." -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:`withPoints-family` - Functions based on Dijkstra algorithm." -msgstr ":doc:`withPoints-family` - Funciones basadas en el algoritmo Dijkstra." - -msgid "From the :doc:`TRSP-family`:" -msgstr "Desde :doc:`TRSP-family` :" - -msgid "Utilities Category" -msgstr "Utilidades - Categoría" - -msgid ":doc:`pgr_findCloseEdges`" -msgstr ":doc:`pgr_findCloseEdges`" - -msgid "Reference" -msgstr "Referencia" - -msgid "Release Notes" -msgstr "Notas de versión" - -msgid "" -"To see the full list of changes check the list of `Git commits `_ on Github." -msgstr "" -"Para ver la lista completa de cambios, consulte la lista de `Git commits " -"`_ en Github." - -msgid "Mayors" -msgstr "" - -msgid "pgRouting 4" -msgstr "pgRouting 4" - -msgid "Minors 4.x" -msgstr "" - -msgid "pgRouting 4.0" -msgstr "pgRouting 4.0" - -msgid "pgRouting 3" -msgstr "pgRouting 3" - -msgid "Minors 3.x" -msgstr "" - -msgid "pgRouting 3.7" -msgstr "pgRouting 3.7" - -msgid "pgRouting 3.7.3 Release Notes" -msgstr "Notas de la versión de pgRouting 3.7.3" - -msgid "" -"To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.7.3 `__" -msgstr "" -"Para ver todos los problemas y solicitudes de extracción cerrados para ésta " -"versión, consulte la `meta cerrada 3.7.3 `__" - -msgid "" -"`#2731 `__ Build Failure " -"on Ubuntu 22" -msgstr "" -"`#2731 `__ Construcción " -"falla en Ubuntu 22" - -msgid "pgRouting 3.7.2 Release Notes" -msgstr "Notas de la versión de pgRouting 3.7.2" - -msgid "" -"To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.7.2 `__" -msgstr "" -"Para ver todos los problemas y solicitudes de extracción cerrados para ésta " -"versión, consulte la `meta cerrada 3.7.2 `__" - -msgid "Build" -msgstr "Construir" - -msgid "" -"`#2713 `__ cmake missing " -"some policies and min version" -msgstr "" -"`#2713 `__ cmake le falta " -"algunas políticas y versión minima" - -msgid "Using OLD policies: CMP0148, CMP0144, CMP0167" -msgstr "" - -msgid "Minimum cmake version 3.12" -msgstr "" - -msgid "" -"`#2707 `__ Build failure " -"in pgRouting 3.7.1 on Alpine" -msgstr "" -"`#2707 `__ Falla de " -"construcción en Alpine para pgRouting 3.7.1" - -msgid "" -"`#2706 `__ winnie crashing " -"on pgr_betweennessCentrality" -msgstr "" -"`#2706 `__ winnie falla en " -"pgr_betweennessCentrality" - -msgid "pgRouting 3.7.1 Release Notes" -msgstr "Notas de la versión de pgRouting 3.7.1" - -msgid "" -"To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.7.1 `__" -msgstr "" -"Para ver todos los problemas y solicitudes de extracción cerrados para ésta " -"versión, consulte la `meta cerrada 3.7.1 `__" - -msgid "" -"`#2680 `__ fails to " -"compile under mingw64 gcc 13.2" -msgstr "" -"`#2680 `__ Compilación " -"falla bajo mingw64 gcc 13.2" - -msgid "" -"`#2689 `__ When point is a " -"vertex, the withPoints family do not return results." -msgstr "" -"`#2689 `__ Cuando el punto " -"es un vértice, la familia withPoints no devuelve resultados." - -msgid "C/C++ code enhancemet" -msgstr "Mejora del código C/C++" - -msgid "TRSP family" -msgstr "Familia TRSP" - -msgid "pgRouting 3.7.0 Release Notes" -msgstr "Notas de la versión de pgRouting 3.7.0" +msgstr "" msgid "" -"To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.7.0 `__" +":doc:`pgr_extractVertices` - Extracts vertex information based on the edge " +"table information." msgstr "" -"Para ver todos los problemas y solicitudes de extracción cerrados para ésta " -"versión, consulte la `meta cerrada 3.7.0 `_" +":doc:`pgr_extractVertices` - Extrae información de vértices basada en la " +"tabla de aristas." msgid "" -"`#2656 `__ Stop support of " -"PostgreSQL12 on pgrouting v3.7" +":doc:`pgr_lineGraph` - Transformation algorithm for generating a Line Graph." msgstr "" -"`#2656 `__ PostgreSQL 12 " -"no se apya en pgrouting v3.7" +":doc:`pgr_lineGraph` - Algoritmo de transformación para generar un grafo de " +"líneas." -msgid "Stopping support of PostgreSQL 12" -msgstr "PostgreSQL 12 ya no es soportado" +msgid ":doc:`pgr_withPointsVia`" +msgstr ":doc:`pgr_withPointsVia`" -msgid "CI does not test for PostgreSQL 12" -msgstr "CI no hace pruebas con PostgreSQL 12" +msgid ":doc:`pgr_trspVia`" +msgstr ":doc:`pgr_trspVia`" -msgid "New experimental functions" -msgstr "Nuevas funciones experimentales" +msgid ":doc:`pgr_trspVia_withPoints`" +msgstr ":doc:`pgr_trspVia_withPoints`" -msgid "Metrics" -msgstr "Métricas" +msgid ":doc:`withPoints-family` - Functions based on Dijkstra algorithm." +msgstr ":doc:`withPoints-family` - Funciones basadas en el algoritmo Dijkstra." -msgid "pgr_betweennessCentrality" -msgstr "pgr_betweennessCentrality" +msgid "From the :doc:`TRSP-family`:" +msgstr "Desde :doc:`TRSP-family` :" -msgid "Official functions changes" -msgstr "Cambios en las funciones oficiales" +msgid "Utilities" +msgstr "Utilidades" -msgid "" -"`#2605 `__ Standarize " -"spanning tree functions output" -msgstr "" -"`#2605 `__ Estandarización " -"de las salida de las funciones de árbol de expansión" +msgid ":doc:`pgr_findCloseEdges`" +msgstr ":doc:`pgr_findCloseEdges`" -msgid "Functions:" -msgstr "Funciones:" +msgid "Reference" +msgstr "Referencia" -msgid "Experimental promoted to proposed." -msgstr "Experimental promovido a propuesto." +msgid "Release Notes" +msgstr "Notas de versión" msgid "" -"`#2635 `__ pgr_LineGraph " -"ignores directed flag and use negative values for identifiers." +"To see the full list of changes check the list of `Git commits `_ on Github." msgstr "" -"`#2635 `__ pgr_LineGraph " -"ignora la bandera directed y usa valores negatives para identificadores." - -msgid "``pgr_lineGraph``" -msgstr "``pgr_lineGraph``" - -msgid "Code enhancement" -msgstr "Mejora del código" +"Para ver la lista completa de cambios, consulte la lista de `Git commits " +"`_ en Github." -msgid "" -"`#2599 `__ Driving " -"distance cleanup" +msgid "Mayors" msgstr "" -"`#2599 `__ Limpieza de la " -"distancia de conducción" -msgid "" -"`#2607 `__ Read postgresql " -"data on C++" -msgstr "" -"`#2607 `__ Leer datos " -"postgresql en C++" +msgid "pgRouting 3" +msgstr "pgRouting 3" -msgid "" -"`#2614 `__ Clang tidy does " -"not work" +msgid "Minors 3.x" msgstr "" -"`#2614 `__ Clang tidy no " -"funciona" + +msgid "pgRouting 3.7" +msgstr "pgRouting 3.7" msgid "pgRouting 3.6" msgstr "pgRouting 3.6" @@ -18169,6 +18182,9 @@ msgstr "" "consulte `Git closed milestone for 3.6.3 `__" +msgid "Build" +msgstr "Construir" + msgid "Explicit minimum requirements:" msgstr "" @@ -18287,6 +18303,18 @@ msgstr "" "`#2516 `__ estandarización " "de resultados de pgr_aStar" +msgid "" +"``pgr_aStar`` (`One to One`) added ``start_vid`` and ``end_vid`` columns." +msgstr "" +"``pgr_aStar`` (`Uno a Uno`) ha añadido las columnas ``start_vid`` y " +"``end_vid``." + +msgid "``pgr_aStar`` (`One to Many`) added ``end_vid`` column." +msgstr "``pgr_aStar`` (`Uno a Muchos`) ha añadido la columna ``end_vid``." + +msgid "``pgr_aStar`` (`Many to One`) added ``start_vid`` column." +msgstr "``pgr_aStar`` (`Muchos a Uno`) ha añadido la columna ``start_vid``." + msgid "" "`#2523 `__ Standarize " "output pgr_bdAstar" @@ -18294,6 +18322,18 @@ msgstr "" "`#2523 `__ Estandarización " "de resultados de pgr_bdAstar" +msgid "" +"``pgr_bdAstar`` (`One to One`) added ``start_vid`` and ``end_vid`` columns." +msgstr "" +"``pgr_bdAstar`` (`Uno a Uno`) ha añadido las columnas ``start_vid`` y " +"``end_vid``." + +msgid "``pgr_bdAstar`` (`One to Many`) added ``end_vid`` column." +msgstr "``pgr_bdAstar`` (`Uno a Muchos`) ha añadido la columna ``end_vid``." + +msgid "``pgr_bdAstar`` (`Many to One`) added ``start_vid`` column." +msgstr "``pgr_bdAstar`` (`Muchos a Uno`) ha añadido la columna ``start_vid``." + msgid "" "`#2547 `__ Standarize " "output and modifying signature pgr_KSP" @@ -18303,10 +18343,10 @@ msgstr "" msgid "" "`#2548 `__ Standarize " -"output pgr_drivingDistance" +"output pgr_drivingdistance" msgstr "" "`#2548 `__ Estandarización " -"de resultados de pgr_drivingDistance" +"de resultados de pgr_drivingdistance" msgid "Proposed functions changes" msgstr "Cambios en funciones propuestas" @@ -18434,10 +18474,10 @@ msgstr "Corrección de problema" msgid "" "`#2565 `__ " -"pgr_lengauerTarjanDominatorTree triggers an assertion" +"pgr_pgr_lengauerTarjanDominatorTree triggers an assertion" msgstr "" "`#2565 `__ " -"pgr_lengauerTarjanDominatorTree genera un error de afirmación" +"pgr_pgr_lengauerTarjanDominatorTree genera un error de afirmación" msgid "SQL enhancements" msgstr "Mejoras SQL" @@ -18483,6 +18523,18 @@ msgstr "" msgid "Dijkstra" msgstr "Dijkstra" +msgid "" +"``pgr_dijkstra`` (`One to One`) added ``start_vid`` and ``end_vid`` columns." +msgstr "" +"``pgr_dijkstra`` (`Uno a Uno`) ha añadido las columnas ``start_vid`` y " +"``end_vid``." + +msgid "``pgr_dijkstra`` (`One to Many`) added ``end_vid`` column." +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``." + msgid "pgRouting 3.4" msgstr "pgRouting 3.4" @@ -18557,14 +18609,14 @@ msgid "" "doesn't give all correct shortest path" msgstr "" -msgid "New proposed functions." -msgstr "Nuevas funciones propuestas." +msgid "New proposed functions" +msgstr "Nuevas funciones propuestas" msgid "With points" msgstr "Con puntos" -msgid "pgr_withPointsVia(One Via)" -msgstr "pgr_withPointsVia(Una Vía)" +msgid "``pgr_withPointsVia`` (One Via)" +msgstr "``pgr_withPointsVia`` (Una trayectoria)" msgid "Turn Restrictions" msgstr "Restricciones de giro" @@ -18572,68 +18624,83 @@ msgstr "Restricciones de giro" msgid "Via with turn restrictions" msgstr "Trayectoria con restricciones de giro" -msgid "pgr_trspVia(One Via)" -msgstr "pgr_trspVia(Una Vía)" +msgid "``pgr_trspVia`` (One Via)" +msgstr "" + +msgid "``pgr_trspVia_withPoints`` (One Via)" +msgstr "``pgr_trspVia_withPoints`` (Muchas trayectorias)" + +msgid "``pgr_trsp``" +msgstr "``pgr_trsp``" + +msgid "``pgr_trsp`` (One to One)" +msgstr "``pgr_trsp`` (Uno a Uno)" + +msgid "``pgr_trsp`` (One to Many)" +msgstr "``pgr_trsp`` (Uno a Muchos)" -msgid "pgr_trspVia_withPoints(One Via)" -msgstr "pgr_trspVia_withPoints(Una Vía)" +msgid "``pgr_trsp`` (Many to One)" +msgstr "``pgr_trsp`` (Muchos a Uno)" -msgid "pgr_trsp_withPoints(One to One)" -msgstr "pgr_trsp_withPoints(Uno a Uno)" +msgid "``pgr_trsp`` (Many to Many)" +msgstr "``pgr_trsp`` (Muchos a Muchos)" -msgid "pgr_trsp_withPoints(One to Many)" -msgstr "pgr_trsp_withPoints(Uno a Muchos)" +msgid "``pgr_trsp`` (Combinations)" +msgstr "``pgr_trsp`` (Combinaciones)" -msgid "pgr_trsp_withPoints(Many to One)" -msgstr "pgr_trsp_withPoints(Muchos a Uno)" +msgid "``pgr_trsp_withPoints``" +msgstr "``pgr_trsp_withPoints``" + +msgid "``pgr_trsp_withPoints`` (One to One)" +msgstr "``pgr_trsp_withPoints`` (Uno a Uno)" + +msgid "``pgr_trsp_withPoints`` (One to Many)" +msgstr "``pgr_trsp_withPoints`` (Uno a Muchos)" -msgid "pgr_trsp_withPoints(Many to Many)" -msgstr "pgr_trsp_withPoints(Muchos a Muchos)" +msgid "``pgr_trsp_withPoints`` (Many to One)" +msgstr "``pgr_trsp_withPoints`` (Muchos a Uno)" -msgid "pgr_trsp_withPoints(Combinations)" -msgstr "pgr_trsp_withPoints(Combinaciones)" +msgid "``pgr_trsp_withPoints`` (Many to Many)" +msgstr "``pgr_trsp_withPoints`` (Muchos a Muchos)" + +msgid "``pgr_trsp_withPoints`` (Combinations)" +msgstr "``pgr_trsp_withPoints`` (Combinaciones)" msgid "Topology" msgstr "Topología" -msgid "Utilities" -msgstr "Utilidades" +msgid "``pgr_degree``" +msgstr "" -msgid "pgr_findCloseEdges(One point)" -msgstr "pgr_findCloseEdges(Un punto)" +msgid "``pgr_findCloseEdges`` (One point)" +msgstr "" -msgid "pgr_findCloseEdges(Many points)" -msgstr "pgr_findCloseEdges(Muchos puntos)" +msgid "``pgr_findCloseEdges`` (Many points)" +msgstr "" msgid "Ordering" msgstr "Ordenamiento" -msgid "pgr_cuthillMckeeOrdering" -msgstr "pgr_cuthillMckeeOrdering" - -msgid "Unclassified" -msgstr "No clasificado" - -msgid "pgr_hawickCircuits" -msgstr "pgr_hawickCircuits" +msgid "``pgr_cuthillMckeeOrdering``" +msgstr "``pgr_cuthillMckeeOrdering``" msgid "Flow functions" msgstr "Funciones de flujo" -msgid "pgr_maxCardinalityMatch(text)" -msgstr "pgr_maxCardinalityMatch(text)" +msgid "``pgr_maxCardinalityMatch(text)``" +msgstr "``pgr_maxCardinalityMatch(text)``" -msgid "Deprecating: pgr_maxCardinalityMatch(text,boolean)" -msgstr "Ossoleto: pgr_maxCardinalityMatch(text,boolean)" +msgid "Deprecating ``pgr_maxCardinalityMatch(text,boolean)``" +msgstr "" msgid "Deprecated Functions" msgstr "Funciones obsoletas" -msgid "pgr_trsp(text,integer,float8,integer,float8,boolean,boolean,text)" -msgstr "pgr_trsp(text,integer,float8,integer,float8,boolean,boolean,text)" +msgid "``pgr_trsp(text,integer,float8,integer,float8,boolean,boolean,text)``" +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)" +msgid "``pgr_trspViaEdges(text,integer[],float[],boolean,boolean,text)``" +msgstr "" msgid "pgRouting 3.3" msgstr "pgRouting 3.3" @@ -18951,6 +19018,12 @@ msgstr "" msgid "Removing support for Boost v1.53, v1.54 & v1.55" msgstr "Eliminación de soporte para Boost v1.53, v1.54 & v1.55" +msgid "pgr_bellmanFord(Combinations)" +msgstr "pgr_bellmanFord(Combinaciones)" + +msgid "pgr_binaryBreadthFirstSearch(Combinations)" +msgstr "pgr_binaryBreadthFirstSearch(Combinaciones)" + msgid "pgr_bipartite" msgstr "pgr_bipartite" @@ -18960,6 +19033,9 @@ msgstr "pgr_depthFirstSearch" msgid "Dijkstra Near" msgstr "Dijkstra Cercano" +msgid "pgr_edwardMoore(Combinations)" +msgstr "pgr_edwardMoore(Combinaciones)" + msgid "pgr_isPlanar" msgstr "pgr_isPlanar" @@ -18969,15 +19045,51 @@ msgstr "pgr_lengauerTarjanDominatorTree" msgid "pgr_makeConnected" msgstr "pgr_makeConnected" +msgid "pgr_maxFlowMinCost(Combinations)" +msgstr "pgr_maxFlowMinCost(Combinaciones)" + +msgid "pgr_maxFlowMinCost_Cost(Combinations)" +msgstr "pgr_maxFlowMinCost_Cost(Combinaciones)" + msgid "Astar" msgstr "Astar" +msgid "pgr_aStar(Combinations)" +msgstr "pgr_aStar(Combinaciones)" + +msgid "pgr_aStarCost(Combinations)" +msgstr "pgr_aStarCost(Combinaciones)" + msgid "Bidirectional Astar" msgstr "Astar Bidireccional" +msgid "pgr_bdAstar(Combinations)" +msgstr "pgr_bdAstar(Combinaciones)" + +msgid "pgr_bdAstarCost(Combinations)" +msgstr "pgr_bdAstarCost(Combinaciones)" + msgid "Bidirectional Dijkstra" msgstr "Dijkstra Bidireccional" +msgid "pgr_bdDijkstra(Combinations)" +msgstr "pgr_bdDijkstra(Combinaciones)" + +msgid "pgr_bdDijkstraCost(Combinations)" +msgstr "pgr_bdDijkstraCost(Combinaciones)" + +msgid "pgr_boykovKolmogorov(Combinations)" +msgstr "pgr_boykovKolmogorov(Combinaciones)" + +msgid "pgr_edmondsKarp(Combinations)" +msgstr "pgr_edmondsKarp(Combinaciones)" + +msgid "pgr_maxFlow(Combinations)" +msgstr "pgr_maxFlow(Combinaciones)" + +msgid "pgr_pushRelabel(Combinations)" +msgstr "pgr_pushRelabel(Combinaciones)" + msgid "pgRouting 3.1" msgstr "pgRouting 3.1" @@ -19295,8 +19407,8 @@ msgstr "" "`#1006 `__: No hay " "pérdida de información2" -msgid "New Functions" -msgstr "Nuevas Funciones" +msgid "New functions" +msgstr "Nuevas funciones" msgid "Kruskal family" msgstr "Familia Kruskal" @@ -19334,95 +19446,149 @@ msgstr "Propuesta cambió a oficial en pgRouting" msgid "aStar Family" msgstr "Familia aStar" -msgid "pgr_aStarCost(One to One)" +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_aStarCost(one to one)" msgstr "pgr_aStarCost(Uno a Uno)" -msgid "pgr_aStarCost(One to Many)" +msgid "pgr_aStarCost(one to many)" msgstr "pgr_aStarCost(Uno a Muchos)" -msgid "pgr_aStarCost(Many to One)" -msgstr "pgr_aStarCost(Muchos a Uno)" +msgid "pgr_aStarCost(many to one)" +msgstr "pgr_aStarCost(muchos a uno)" + +msgid "pgr_aStarCost(many to many)" +msgstr "pgr_aStarCost(muchos a muchos)" -msgid "pgr_aStarCost(Many to Many)" -msgstr "pgr_aStarCost(Muchos a Muchos)" +msgid "pgr_aStarCostMatrix(one to one)" +msgstr "pgr_aStarCostMatrix(Uno a Uno)" -msgid "pgr_aStarCostMatrix" -msgstr "pgr_aStarCostMatrix" +msgid "pgr_aStarCostMatrix(one to many)" +msgstr "pgr_aStarCostMatrix(Uno a Muchos)" + +msgid "pgr_aStarCostMatrix(many to one)" +msgstr "pgr_aStarCostMatrix(muchos a uno)" + +msgid "pgr_aStarCostMatrix(many to many)" +msgstr "pgr_aStarCostMatrix(muchos a muchos)" msgid "bdAstar Family" msgstr "Familia bdAstar" -msgid "pgr_bdAstarCost(One to One)" +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_bdAstarCost(one to one)" msgstr "pgr_bdAstarCost(Uno a Uno)" -msgid "pgr_bdAstarCost(One to Many)" +msgid "pgr_bdAstarCost(one to many)" msgstr "pgr_bdAstarCost(Uno a Muchos)" -msgid "pgr_bdAstarCost(Many to One)" -msgstr "pgr_bdAstarCost(Muchos a Uno)" +msgid "pgr_bdAstarCost(many to one)" +msgstr "pgr_bdAstarCost(muchos a uno)" -msgid "pgr_bdAstarCost(Many to Many)" -msgstr "pgr_bdAstarCost(Muchos a Muchos)" +msgid "pgr_bdAstarCost(many to many)" +msgstr "pgr_bdAstarCost(muchos a muchos)" -msgid "pgr_bdAstarCostMatrix" -msgstr "pgr_bdAstarCostMatrix" +msgid "pgr_bdAstarCostMatrix(one to one)" +msgstr "pgr_bdAstarCostMatrix(Uno a Uno)" + +msgid "pgr_bdAstarCostMatrix(one to many)" +msgstr "pgr_bdAstarCostMatrix(Uno a Muchos)" + +msgid "pgr_bdAstarCostMatrix(many to one)" +msgstr "pgr_bdAstarCostMatrix(muchos a uno)" + +msgid "pgr_bdAstarCostMatrix(many to many)" +msgstr "pgr_bdAstarCostMatrix(muchos a muchos)" msgid "bdDijkstra Family" msgstr "bdDijkstra Familia" -msgid "pgr_bdDijkstraCost(One to One)" -msgstr "pgr_bdDijkstraCost(Uno a Uno)" +msgid "pgr_bdDijkstra(one to many)" +msgstr "pgr_bdDijkstra(Uno a Muchos)" + +msgid "pgr_bdDijkstra(many to one)" +msgstr "pgr_bdDijkstra(muchos a uno)" -msgid "pgr_bdDijkstraCost(One to Many)" -msgstr "pgr_bdDijkstraCost(Uno a Muchos)" +msgid "pgr_bdDijkstra(many to many)" +msgstr "pgr_bdDijkstra(muchos a muchos)" -msgid "pgr_bdDijkstraCost(Many to One)" -msgstr "pgr_bdDijkstraCost(Muchos a Uno)" +msgid "pgr_bdDijkstraCost(one to one)" +msgstr "pgr_bdDijkstraCost(uno a uno)" -msgid "pgr_bdDijkstraCost(Many to Many)" -msgstr "pgr_bdDijkstraCost(Muchos a Muchos)" +msgid "pgr_bdDijkstraCost(one to many)" +msgstr "pgr_bdDijkstraCost(uno a muchos)" -msgid "pgr_bdDijkstraCostMatrix" -msgstr "pgr_bdDijkstraCostMatrix" +msgid "pgr_bdDijkstraCost(many to one)" +msgstr "pgr_bdDijkstraCost(muchos a uno)" + +msgid "pgr_bdDijkstraCost(many to many)" +msgstr "pgr_bdDijkstraCost(muchos a muchos)" + +msgid "pgr_bdDijkstraCostMatrix(one to one)" +msgstr "pgr_bdDijkstraCostMatrix(uno a uno)" + +msgid "pgr_bdDijkstraCostMatrix(one to many)" +msgstr "pgr_bdDijkstraCostMatrix(uno a muchos)" + +msgid "pgr_bdDijkstraCostMatrix(many to one)" +msgstr "pgr_bdDijkstraCostMatrix(muchos a uno)" + +msgid "pgr_bdDijkstraCostMatrix(many to many)" +msgstr "pgr_bdDijkstraCostMatrix(muchos a muchos)" msgid "Flow Family" msgstr "Familia Flow" -msgid "pgr_pushRelabel(One to One)" +msgid "pgr_pushRelabel(one to one)" msgstr "pgr_pushRelabel(Uno a Uno)" -msgid "pgr_pushRelabel(One to Many)" +msgid "pgr_pushRelabel(one to many)" msgstr "pgr_pushRelabel(Uno a Muchos)" -msgid "pgr_pushRelabel(Many to One)" -msgstr "pgr_pushRelabel(Muchos a Uno)" +msgid "pgr_pushRelabel(many to one)" +msgstr "pgr_pushRelabel(muchos a uno)" -msgid "pgr_pushRelabel(Many to Many)" -msgstr "pgr_pushRelabel(Muchos a Muchos)" +msgid "pgr_pushRelabel(many to many)" +msgstr "pgr_pushRelabel(muchos a muchos)" -msgid "pgr_edmondsKarp(One to One)" +msgid "pgr_edmondsKarp(one to one)" msgstr "pgr_edmondsKarp(Uno a Uno)" -msgid "pgr_edmondsKarp(One to Many)" +msgid "pgr_edmondsKarp(one to many)" msgstr "pgr_edmondsKarp(Uno a Muchos)" -msgid "pgr_edmondsKarp(Many to One)" -msgstr "pgr_edmondsKarp(Muchos a Uno)" +msgid "pgr_edmondsKarp(many to one)" +msgstr "pgr_edmondsKarp(muchos a uno)" -msgid "pgr_edmondsKarp(Many to Many)" -msgstr "pgr_edmondsKarp(Muchos a Muchos)" +msgid "pgr_edmondsKarp(many to many)" +msgstr "pgr_edmondsKarp(muchos a muchos)" -msgid "pgr_boykovKolmogorov (One to One)" +msgid "pgr_boykovKolmogorov (one to one)" msgstr "pgr_boykovKolmogorov(Uno a Uno)" -msgid "pgr_boykovKolmogorov (One to Many)" +msgid "pgr_boykovKolmogorov (one to many)" msgstr "pgr_boykovKolmogorov(Uno a Muchos)" -msgid "pgr_boykovKolmogorov (Many to One)" -msgstr "pgr_boykovKolmogorov (Muchos a Uno)" +msgid "pgr_boykovKolmogorov (many to one)" +msgstr "pgr_boykovKolmogorov (muchos a uno)" -msgid "pgr_boykovKolmogorov (Many to Many)" -msgstr "pgr_boykovKolmogorov (Muchos a Muchos)" +msgid "pgr_boykovKolmogorov (many to many)" +msgstr "pgr_boykovKolmogorov (muchos a muchos)" msgid "pgr_maxCardinalityMatching" msgstr "pgr_maxCardinalityMatching" @@ -19430,24 +19596,21 @@ msgstr "pgr_maxCardinalityMatching" msgid "pgr_maxFlow" msgstr "pgr_maxFlow" -msgid "pgr_edgeDisjointPaths(One to One)" +msgid "pgr_edgeDisjointPaths(one to one)" msgstr "pgr_edgeDisjointPaths(Uno a Uno)" -msgid "pgr_edgeDisjointPaths(One to Many)" +msgid "pgr_edgeDisjointPaths(one to many)" msgstr "pgr_edgeDisjointPaths(Uno a Muchos)" -msgid "pgr_edgeDisjointPaths(Many to One)" -msgstr "pgr_edgeDisjointPaths(Muchos a Uno)" +msgid "pgr_edgeDisjointPaths(many to one)" +msgstr "pgr_edgeDisjointPaths(muchos a uno)" -msgid "pgr_edgeDisjointPaths(Many to Many)" -msgstr "pgr_edgeDisjointPaths(Muchos a Muchos)" +msgid "pgr_edgeDisjointPaths(many to many)" +msgstr "pgr_edgeDisjointPaths(muchos a muchos)" msgid "Components family" msgstr "Familia de Componentes" -msgid "pgr_connectedComponents" -msgstr "pgr_connectedComponents" - msgid "pgr_strongComponents" msgstr "pgr_strongComponents" @@ -19651,8 +19814,8 @@ msgstr "pgr_floydWarshall" msgid "pgr_johnson" msgstr "pgr_johnson" -msgid "pgr_aStar" -msgstr "pgr_aStar" +msgid "pgr_astar" +msgstr "pgr_astar" msgid "pgr_bdAstar" msgstr "pgr_bdAstar" @@ -19672,9 +19835,6 @@ msgstr "pgr_dijkstraCost" msgid "pgr_drivingDistance" msgstr "pgr_drivingDistance" -msgid "pgr_KSP" -msgstr "pgr_KSP" - msgid "pgr_dijkstraVia (proposed)" msgstr "pgr_dijkstraVia (proposed)" @@ -19703,7 +19863,7 @@ msgid "pgr_withPointsKSP (proposed)" msgstr "pgr_withPointsKSP (proposed)" msgid "pgr_withPointsDD (proposed)" -msgstr "pgr_withPointsDD (propuesta)" +msgstr "pgr_withPointsDD (proposed)" msgid "pgr_withPointsCostMatrix (proposed)" msgstr "pgr_withPointsCostMatrix (propuesto)" @@ -19905,16 +20065,25 @@ msgstr "Columnas path_id, cost y agg_cost añadidas al resultado" msgid "Parameter names changed" msgstr "Nombres de parámetros cambiados" -msgid "The many version results are the union of the One to One version" +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" +"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 "pgr_bdAstar(One to One)" +msgid "pgr_bdAstar(one to one)" msgstr "pgr_bdAstar(Uno a Uno)" +msgid "New Proposed functions" +msgstr "Nuevas Funciones Propuestas" + +msgid "pgr_bdAstarCostMatrix" +msgstr "pgr_bdAstarCostMatrix" + +msgid "pgr_bdDijkstraCostMatrix" +msgstr "pgr_bdDijkstraCostMatrix" + msgid "pgr_lineGraph" msgstr "pgr_lineGraph" @@ -20006,8 +20175,32 @@ msgstr "" msgid "pgr_bdDijkstra" msgstr "pgr_bdDijkstra" -msgid "Deprecated signatures." -msgstr "Firmas obsoletas." +msgid "New Proposed Signatures" +msgstr "Nuevas Firmas Propuestas" + +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_astarCost(one to one)" +msgstr "pgr_astarCost(Uno a Uno)" + +msgid "pgr_astarCost(one to many)" +msgstr "pgr_astarCost(uno a muchos)" + +msgid "pgr_astarCost(many to one)" +msgstr "pgr_astarCost(muchos a uno)" + +msgid "pgr_astarCost(many to many)" +msgstr "pgr_astarCost(muchos a muchos)" + +msgid "pgr_astarCostMatrix" +msgstr "pgr_astarCostMatrix" msgid "pgr_bddijkstra - use pgr_bdDijkstra instead" msgstr "pgr_bddijkstra - utilizar pgr_bdDijkstra en su lugar" @@ -20092,44 +20285,53 @@ msgstr "" msgid "pgr_TSP" msgstr "pgr_TSP" +msgid "pgr_aStar" +msgstr "pgr_aStar" + +msgid "New Functions" +msgstr "Nuevas Funciones" + msgid "pgr_eucledianTSP" msgstr "pgr_eucledianTSP" -msgid "pgr_maxFlowPushRelabel(One to One)" +msgid "pgr_withPointsCostMatrix" +msgstr "pgr_withPointsCostMatrix" + +msgid "pgr_maxFlowPushRelabel(one to one)" msgstr "pgr_maxFlowPushRelabel(Uno a Uno)" -msgid "pgr_maxFlowPushRelabel(One to Many)" -msgstr "pgr_maxFlowPushRelabel(Uno a Muchos)" +msgid "pgr_maxFlowPushRelabel(one to many)" +msgstr "pgr_maxFlowPushRelabel(uno a muchos)" -msgid "pgr_maxFlowPushRelabel(Many to One)" -msgstr "pgr_maxFlowPushRelabel(Muchos a Uno)" +msgid "pgr_maxFlowPushRelabel(many to one)" +msgstr "pgr_maxFlowPushRelabel(muchos a uno)" -msgid "pgr_maxFlowPushRelabel(Many to Many)" -msgstr "pgr_maxFlowPushRelabel(Muchos a Muchos)" +msgid "pgr_maxFlowPushRelabel(many to many)" +msgstr "pgr_maxFlowPushRelabel(muchos a muchos)" -msgid "pgr_maxFlowEdmondsKarp(One to One)" +msgid "pgr_maxFlowEdmondsKarp(one to one)" msgstr "pgr_maxFlowEdmondsKarp(Uno a Uno)" -msgid "pgr_maxFlowEdmondsKarp(One to Many)" -msgstr "pgr_maxFlowEdmondsKarp(Uno a Muchos)" +msgid "pgr_maxFlowEdmondsKarp(one to many)" +msgstr "pgr_maxFlowEdmondsKarp(uno a muchos)" -msgid "pgr_maxFlowEdmondsKarp(Many to One)" -msgstr "pgr_maxFlowEdmondsKarp(Muchos a Uno)" +msgid "pgr_maxFlowEdmondsKarp(many to one)" +msgstr "pgr_maxFlowEdmondsKarp(muchos a uno)" -msgid "pgr_maxFlowEdmondsKarp(Many to Many)" -msgstr "pgr_maxFlowEdmondsKarp(Muchos a Muchos)" +msgid "pgr_maxFlowEdmondsKarp(many to many)" +msgstr "pgr_maxFlowEdmondsKarp(muchos a muchos)" -msgid "pgr_maxFlowBoykovKolmogorov (One to One)" +msgid "pgr_maxFlowBoykovKolmogorov (one to one)" msgstr "pgr_maxFlowBoykovKolmogorov(Uno a Uno)" -msgid "pgr_maxFlowBoykovKolmogorov (One to Many)" -msgstr "pgr_maxFlowBoykovKolmogorov (Uno a Muchos)" +msgid "pgr_maxFlowBoykovKolmogorov (one to many)" +msgstr "pgr_maxFlowBoykovKolmogorov (uno a muchos)" -msgid "pgr_maxFlowBoykovKolmogorov (Many to One)" -msgstr "pgr_maxFlowBoykovKolmogorov (Muchos a Uno)" +msgid "pgr_maxFlowBoykovKolmogorov (many to one)" +msgstr "pgr_maxFlowBoykovKolmogorov (muchos a uno)" -msgid "pgr_maxFlowBoykovKolmogorov (Many to Many)" -msgstr "pgr_maxFlowBoykovKolmogorov (Muchos a Muchos)" +msgid "pgr_maxFlowBoykovKolmogorov (many to many)" +msgstr "pgr_maxFlowBoykovKolmogorov (muchos a muchos)" msgid "pgr_maximumCardinalityMatching" msgstr "pgr_maximumCardinalityMatching" @@ -20140,8 +20342,8 @@ msgstr "pgr_contractGraph" msgid "pgr_tsp - use pgr_TSP or pgr_eucledianTSP instead" msgstr "pgr_tsp - utilice pgr_TSP o pgr_eucledianTSP en su lugar" -msgid "pgr_aStar - use pgr_aStar instead" -msgstr "pgr_aStar - utilice pgr_aStar en su lugar" +msgid "pgr_astar - use pgr_aStar instead" +msgstr "pgr_astar - utilice pgr_aStar en su lugar" msgid "pgr_flip_edges" msgstr "pgr_flip_edges" @@ -20242,9 +20444,6 @@ msgstr "" msgid "Improvements" msgstr "Mejoras" -msgid "pgr_nodeNetwork" -msgstr "pgr_nodeNetwork" - msgid "Adding a row_where and outall optional parameters" msgstr "Adición de un row_where y todos los parámetros opcionales" @@ -20257,44 +20456,44 @@ msgstr "pgr_dijkstra -- para que coincida con lo documentado" msgid "pgr_Johnson" msgstr "pgr_Johnson" -msgid "pgr_dijkstraCost(One to One)" +msgid "pgr_dijkstraCost(one to one)" msgstr "pgr_dijkstraCost(Uno a Uno)" -msgid "pgr_dijkstraCost(One to Many)" -msgstr "pgr_dijkstraCost(Uno a Muchos)" +msgid "pgr_dijkstraCost(one to many)" +msgstr "pgr_dijkstraCost(uno a muchos)" -msgid "pgr_dijkstraCost(Many to One)" -msgstr "pgr_dijkstraCost(Muchos a Uno)" +msgid "pgr_dijkstraCost(many to one)" +msgstr "pgr_dijkstraCost(muchos a uno)" -msgid "pgr_dijkstraCost(Many to Many)" -msgstr "pgr_dijkstraCost(Muchos a Muchos)" +msgid "pgr_dijkstraCost(many to many)" +msgstr "pgr_dijkstraCost(muchos a muchos)" msgid "Proposed Functionality" msgstr "Funcionalidad Propuesta" -msgid "pgr_withPoints(One to One)" +msgid "pgr_withPoints(one to one)" msgstr "pgr_withPoints(Uno a Uno)" -msgid "pgr_withPoints(One to Many)" -msgstr "pgr_withPoints(Uno a Muchos)" +msgid "pgr_withPoints(one to many)" +msgstr "pgr_withPoints(uno a muchos)" -msgid "pgr_withPoints(Many to One)" -msgstr "pgr_withPoints(Muchos a Uno)" +msgid "pgr_withPoints(many to one)" +msgstr "pgr_withPoints(muchos a uno)" -msgid "pgr_withPoints(Many to Many)" -msgstr "pgr_withPoints(Muchos a Muchos)" +msgid "pgr_withPoints(many to many)" +msgstr "pgr_withPoints(muchos a muchos)" -msgid "pgr_withPointsCost(One to One)" +msgid "pgr_withPointsCost(one to one)" msgstr "pgr_withPointsCost(Uno a Uno)" -msgid "pgr_withPointsCost(One to Many)" -msgstr "pgr_withPointsCost(Uno a Muchos)" +msgid "pgr_withPointsCost(one to many)" +msgstr "pgr_withPointsCost(uno a muchos)" -msgid "pgr_withPointsCost(Many to One)" -msgstr "pgr_withPointsCost(Muchos a Uno)" +msgid "pgr_withPointsCost(many to one)" +msgstr "pgr_withPointsCost(muchos a uno)" -msgid "pgr_withPointsCost(Many to Many)" -msgstr "pgr_withPointsCost(Muchos a Muchos)" +msgid "pgr_withPointsCost(many to many)" +msgstr "pgr_withPointsCost(muchos a muchos)" msgid "pgr_withPointsDD(single vertex)" msgstr "pgr_withPointsDD(vértice único)" @@ -20302,6 +20501,9 @@ msgstr "pgr_withPointsDD(vértice único)" msgid "pgr_withPointsDD(multiple vertices)" msgstr "pgr_withPointsDD(múltiples vértices)" +msgid "pgr_withPointsKSP" +msgstr "pgr_withPointsKSP" + msgid "pgr_dijkstraVia" msgstr "pgr_dijkstraVia" @@ -20338,12 +20540,27 @@ msgstr "" "issues for 2.1.0 `_ en Github." +msgid "pgr_dijkstra(one to many)" +msgstr "pgr_dijkstra(uno a muchos)" + +msgid "pgr_dijkstra(many to one)" +msgstr "pgr_dijkstra(muchos a uno)" + +msgid "pgr_dijkstra(many to many)" +msgstr "pgr_dijkstra(muchos a muchos)" + +msgid "pgr_drivingDistance(multiple vertices)" +msgstr "pgr_drivingDistance(múltiples vértices)" + msgid "Refactored" msgstr "Refactorizado" -msgid "pgr_dijkstra(One to One)" +msgid "pgr_dijkstra(one to one)" msgstr "pgr_dijkstra(Uno a Uno)" +msgid "pgr_drivingDistance(single vertex)" +msgstr "pgr_drivingDistance(vértice único)" + msgid "" "pgr_alphaShape function now can generate better (multi)polygon with holes " "and alpha parameter." @@ -21160,8 +21377,8 @@ msgid "" msgstr "" msgid "" -"pgRouting supplies some functions to create a routing topology and to " -"analyze the topology." +"pgRouting suplies some functions to create a routing topology and to analyze " +"the topology." msgstr "" msgid "Additional functions to create a graph:" @@ -21611,5 +21828,4 @@ msgid "pgr_withPointsDD is pgr_drivingDistance **with points**" msgstr "pgr_withPointsDD es pgr_drivingDistance **con puntos**" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" -msgstr "pgr_withPointsvia es pgr_dijkstraVia **con puntos**" - +msgstr "pgr_withPoints es pgr_dijkstraVia **con puntos**" diff --git a/locale/ja/LC_MESSAGES/index.po b/locale/ja/LC_MESSAGES/index.po index 1d39024f917..bcd74129d65 100644 --- a/locale/ja/LC_MESSAGES/index.po +++ b/locale/ja/LC_MESSAGES/index.po @@ -1,11 +1,11 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v4.0 +# Copyright (C) pgRouting Contributors - Version v3.8 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , 2022. # msgid "" msgstr "" -"Project-Id-Version: pgRouting v4.0\n" +"Project-Id-Version: pgRouting v3.8\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-06-25 12:55-0500\n" "PO-Revision-Date: 2024-05-01 03:45+0000\n" diff --git a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po index f5db01b88e6..b066408dc9a 100644 --- a/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ja/LC_MESSAGES/pgrouting_doc_strings.po @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v4.0 +# Copyright (C) pgRouting Contributors - Version v3.8 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , 2022. # Translators: @@ -18,9 +18,9 @@ # Celia Virginia Vergara Castillo , 2024. msgid "" msgstr "" -"Project-Id-Version: pgRouting v4.0\n" +"Project-Id-Version: pgRouting v3.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-12 01:00+0000\n" +"POT-Creation-Date: 2024-10-17 00:50+0000\n" "PO-Revision-Date: 2024-09-23 01:16+0000\n" "Last-Translator: Celia Virginia Vergara Castillo \n" "Language-Team: Japanese `__" +"`Boost's metric appro's metric approximation `__" msgstr "" msgid "`University of Waterloo TSP `__" @@ -698,7 +698,7 @@ msgstr "" "`Wikipedia: 巡回セールスマン問題 `__" -msgid "Vehicle Routing Functions - Category" +msgid "Vehicle Routing Functions - Category (Experimental)" msgstr "" msgid "Pickup and delivery problem" @@ -1647,8 +1647,8 @@ msgstr "" msgid "https://en.wikipedia.org/wiki/Vehicle_routing_problem" msgstr "" -msgid ":doc:`sampledata`" -msgstr "" +msgid "The queries use the :doc:`sampledata` network." +msgstr "クエリは :doc:`sampledata` ネットワークを使用します。" msgid "A* - Family of functions" msgstr "" @@ -1810,8 +1810,7 @@ msgstr "" msgid ":doc:`bdAstar-family`" msgstr "" -msgid "" -"`Boost: A* search `__" +msgid "https://www.boost.org/libs/graph/doc/astar_search.html" msgstr "" msgid "https://en.wikipedia.org/wiki/A*_search_algorithm" @@ -2615,12 +2614,15 @@ msgid "" "ending vertex:" msgstr "" -msgid "It is expected to terminate faster than pgr_aStar" +msgid "It is expected to terminate faster than pgr_astar" msgstr "" msgid ":doc:`aStar-family`" msgstr "" +msgid "Previous versions of this page" +msgstr "このページの以前のバージョン" + msgid "Bidirectional Dijkstra - Family of functions" msgstr "" @@ -2763,7 +2765,27 @@ msgid "Identifier of the color of the edge." msgstr "" msgid "" -"`Boost: `__" +"`Boost: Sequential Vertex Coloring algorithm documentation `__" +msgstr "" + +msgid "" +"`Wikipedia: Graph coloring `__" +msgstr "" + +msgid "" +"`Boost: is_bipartite `__" +msgstr "" + +msgid "" +"`Wikipedia: bipartite graph `__" +msgstr "" + +msgid "" +"`Boost: Edge Coloring Algorithm documentation `__" msgstr "" msgid "Components - Family of functions" @@ -2870,7 +2892,7 @@ msgstr "" msgid "Node" msgstr "" -msgid "Adjacent nodes" +msgid "Adjecent nodes" msgstr "" msgid "Number of adjacent nodes" @@ -3311,6 +3333,9 @@ msgstr "" msgid "Now, the routing graph has an edge connecting with node :math:`7`." msgstr "" +msgid ":doc:`sampledata`" +msgstr "" + msgid "" "https://www.cs.cmu.edu/afs/cs/academic/class/15210-f12/www/lectures/" "lecture16.pdf" @@ -3961,11 +3986,6 @@ msgid "" "an undirected graph." msgstr "" -msgid "" -":doc:`pgr_topologicalSort` - Linear ordering of the vertices for directed " -"acyclic graph." -msgstr "" - #, fuzzy msgid ":doc:`metrics-family`" msgstr ":doc:`ordering-family`" @@ -3984,9 +4004,8 @@ msgstr "" msgid ":doc:`VRP-category`" msgstr "" -#, fuzzy -msgid "Shortest Path Category" -msgstr "BFS - カテゴリ" +msgid "Unclassified" +msgstr "" msgid ":doc:`pgr_bellmanFord`" msgstr "" @@ -3997,22 +4016,19 @@ msgstr "" msgid ":doc:`pgr_edwardMoore`" msgstr "" -msgid "Planar Family" -msgstr "" - msgid ":doc:`pgr_isPlanar`" msgstr "" -msgid "Miscellaneous Algoritms" +msgid ":doc:`pgr_stoerWagner`" msgstr "" -msgid ":doc:`pgr_lengauerTarjanDominatorTree`" +msgid ":doc:`pgr_topologicalSort`" msgstr "" -msgid ":doc:`pgr_stoerWagner`" +msgid ":doc:`pgr_transitiveClosure`" msgstr "" -msgid ":doc:`pgr_transitiveClosure`" +msgid ":doc:`pgr_lengauerTarjanDominatorTree`" msgstr "" msgid ":doc:`pgr_hawickCircuits`" @@ -4442,184 +4458,107 @@ msgstr "" msgid ":doc:`release_notes`" msgstr "" -msgid "pgRouting 4.0.0 Release Notes" +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 4.0.0 `__" -msgstr "" - -msgid "Functions promoted to official" -msgstr "" - -msgid "pgr_trsp" -msgstr "" - -msgid "pgr_trspVia" -msgstr "" - -#, fuzzy -msgid "pgr_trspVia_withPoints" -msgstr ":doc:`pgr_kruskalBFS`" - -#, fuzzy -msgid "pgr_trsp_withPoints" -msgstr ":doc:`pgr_kruskalBFS`" - -#, fuzzy -msgid "pgr_withPoints" -msgstr ":doc:`pgr_kruskalBFS`" - -#, fuzzy -msgid "pgr_withPointsCost" -msgstr ":doc:`pgr_kruskalBFS`" - -msgid "pgr_withPointsCostMatrix" -msgstr "" - -#, fuzzy -msgid "pgr_withPointsDD" -msgstr ":doc:`pgr_kruskalBFS`" - -msgid "pgr_withPointsKSP" -msgstr "" - -#, fuzzy -msgid "pgr_withPointsVia" -msgstr ":doc:`pgr_kruskalBFS`" - -msgid "Signatures promoted to official" -msgstr "" - -msgid "pgr_aStar(Combinations)" -msgstr "" - -msgid "pgr_aStarCost(Combinations)" -msgstr "" - -msgid "pgr_bdAstar(Combinations)" -msgstr "" - -msgid "pgr_bdAstarCost(Combinations)" -msgstr "" - -msgid "pgr_bdDijkstra(Combinations)" -msgstr "" - -msgid "pgr_bdDijkstraCost(Combinations)" -msgstr "" - -msgid "pgr_dijkstra(Combinations)" -msgstr "" - -msgid "pgr_dijkstraCost(Combinations)" -msgstr "" - -#, fuzzy -msgid "pgr_KSP(All signatures)" -msgstr "機能" - -msgid "pgr_boykovKolmogorov(Combinations)" +"milestone for 3.7.0 `__" msgstr "" -msgid "pgr_edmondsKarp(Combinations)" -msgstr "" +msgid "Support" +msgstr "サポート" -msgid "pgr_maxFlow(Combinations)" +msgid "" +"`#2656 `__ Stop support of " +"PostgreSQL12 on pgrouting v3.7" msgstr "" -msgid "pgr_pushRelabel(Combinations)" +msgid "Stopping support of PostgreSQL 12" msgstr "" -msgid "code enhancements:" +msgid "CI does not test for PostgreSQL 12" msgstr "" -msgid "Removal of unused C/C++ code" +msgid "New experimental functions" msgstr "" -msgid "Removal of SQL deprecated functions" +msgid "Metrics" msgstr "" -msgid "" -"pgr_trsp(text,integer,double precision,integer,double precision,boolean," -"boolean,text)" +msgid "pgr_betweennessCentrality" msgstr "" -msgid "pgr_trsp(text,integer,integer,boolean,boolean,text)" +msgid "Official functions changes" msgstr "" msgid "" -"pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)" +"`#2605 `__ Standarize " +"spanning tree functions output" msgstr "" -msgid "pgr_trspviavertices(text,anyarray,boolean,boolean,text)" +msgid "Functions:" msgstr "" -msgid "Removal of SQL deprecated internal functions" +msgid "``pgr_kruskalDD``" msgstr "" -msgid "_pgr_dijkstranear(text,anyarray,anyarray,bigint,boolean)" +msgid "``pgr_kruskalDFS``" msgstr "" -msgid "_pgr_dijkstranear(text,anyarray,bigint,bigint,boolean)" +msgid "``pgr_kruskalBFS``" msgstr "" -msgid "_pgr_dijkstranear(text,bigint,anyarray,bigint,boolean)" +msgid "``pgr_primDD``" msgstr "" -msgid "_pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean,bigint)" +msgid "``pgr_primDFS``" msgstr "" -msgid "_pgr_dijkstra(text,text,boolean,boolean,boolean)" +msgid "``pgr_primBFS``" msgstr "" -msgid "_pgr_drivingdistance(text,anyarray,double precision,boolean,boolean)" +msgid "Standarizing output columns to |result-spantree|" msgstr "" -msgid "_pgr_kruskal(text,anyarray,text,bigint,double precision)" +msgid "Added ``pred`` result columns." msgstr "" -msgid "_pgr_prim(text,anyarray,text,bigint,double precision)" +msgid "Experimental promoted to proposed." msgstr "" msgid "" -"_pgr_trsp(text,integer,double precision,integer,double precision,boolean," -"boolean,text)" -msgstr "" - -msgid "_pgr_trsp(text,text,anyarray,anyarray,boolean)" -msgstr "" - -msgid "_pgr_trsp(text,text,anyarray,bigint,boolean)" -msgstr "" - -msgid "_pgr_trsp(text,text,bigint,anyarray,boolean)" -msgstr "" - -msgid "_pgr_trsp(text,text,bigint,bigint,boolean)" +"`#2635 `__ pgr_LineGraph " +"ignores directed flag and use negative values for identifiers." msgstr "" -msgid "_pgr_trspviavertices(text,integer[],boolean,boolean,text)" +msgid "``pgr_lineGraph``" msgstr "" -msgid "_pgr_withpointsvia(text,bigint[],double precision[],boolean)" +msgid "Promoted to **proposed** signature." msgstr "" -msgid "_trsp(text,text,anyarray,anyarray,boolean)" -msgstr "" +#, fuzzy +msgid "Works for directed and undirected graphs." +msgstr "導かれないグラフ。" -msgid "_v4trsp(text,text,anyarray,anyarray,boolean)" +msgid "Code enhancement" msgstr "" -msgid "_v4trsp(text,text,text,boolean)" +msgid "" +"`#2599 `__ Driving " +"distance cleanup" msgstr "" -msgid "Deprecation of internal C/C++ functions" +msgid "" +"`#2607 `__ Read postgresql " +"data on C++" msgstr "" -msgid "Internal C/C++ functions in legacy" +msgid "" +"`#2614 `__ Clang tidy does " +"not work" msgstr "" msgid "All releases" @@ -4628,6 +4567,9 @@ msgstr "" msgid "Kruskal - Family of functions" msgstr "" +msgid "Boost Graph Inside" +msgstr "" + msgid "" "Kruskal's algorithm is a greedy minimum spanning tree algorithm that in each " "cycle finds and adds the edge of the least possible weight that connects any " @@ -4661,6 +4603,13 @@ msgstr "" msgid "All deprecated functions will be removed on next mayor version 4.0.0" msgstr "" +#, fuzzy +msgid "Migration of functions" +msgstr "ダイクストラ関連機能" + +msgid "Migrating functions" +msgstr "" + msgid "Migration of ``pgr_aStar``" msgstr "" @@ -4814,9 +4763,8 @@ msgstr "" msgid "If needed add the new columns, for example:" msgstr "" -#, fuzzy -msgid "Migration of ``pgr_drivingDistance``" -msgstr "ダイクストラ関連機能" +msgid "Migration of ``pgr_drivingdistance``" +msgstr "" msgid "" "Starting from `v3.6.0 `__ :" @@ -4835,10 +4783,10 @@ msgstr "" msgid "|result-spantree|" msgstr "" -msgid "pgr_drivingDistance(Single vertex)" +msgid "``pgr_drivingdistance`` (Single vertex)" msgstr "" -msgid "pgr_drivingDistance(Multiple vertices)" +msgid "``pgr_drivingdistance`` (Multiple vertices)" msgstr "" msgid "Output columns were |result-dij-dd|" @@ -4900,21 +4848,12 @@ msgstr "" msgid "|result-bfs|" msgstr "" -msgid "``pgr_kruskalDD``" -msgstr "" - msgid "Single vertex" msgstr "" msgid "Multiple vertices" msgstr "" -msgid "``pgr_kruskalDFS``" -msgstr "" - -msgid "``pgr_kruskalBFS``" -msgstr "" - msgid "Output columns were |result-bfs|" msgstr "" @@ -5071,15 +5010,6 @@ msgid "" "are being standardized." msgstr "" -msgid "``pgr_primDD``" -msgstr "" - -msgid "``pgr_primDFS``" -msgstr "" - -msgid "``pgr_primBFS``" -msgstr "" - msgid "Prim single vertex" msgstr "" @@ -5276,279 +5206,390 @@ msgid "" "original columns:" msgstr "" -msgid "Migration of ``pgr_trsp`` (Vertices)" +msgid "Migration of turn restrictions" msgstr "" -#, fuzzy -msgid "Signature:" -msgstr "機能" - -msgid "Deprecated" +msgid "Migration of restrictions" msgstr "" -msgid "`v3.4.0 `__" +msgid "The structure of the restrictions have changed:" msgstr "" -msgid "Removed" +msgid "Old restrictions structure" msgstr "" -msgid "`v4.0.0 `__" +msgid "On the deprecated signatures:" msgstr "" -#, fuzzy -msgid ":doc:`pgr_dijkstra`" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "Column ``rid`` is ignored" +msgstr "" -msgid ":doc:`pgr_trsp`" +msgid "``via_path``" msgstr "" -#, fuzzy -msgid "`Migration of restrictions`_" -msgstr "ダイクストラ関連機能" +msgid "Must be in reverse order." +msgstr "" -msgid "Use ``pgr_dijkstra`` when there are no restrictions." +msgid "Is of type ``TEXT``." msgstr "" -msgid "Use :doc:`pgr_dijkstra` instead." +msgid "When more than one via edge must be separated with ``,``." msgstr "" -msgid "To get the original column names:" +msgid "``target_id``" msgstr "" -msgid "``id1`` is the node" +msgid "Is the last edge of the forbidden path." msgstr "" -msgid "``id2`` is the edge" +msgid "Is of type ``INTEGER``." msgstr "" -msgid "Use ``pgr_trsp`` when there are restrictions." +msgid "``to_cost``" msgstr "" -msgid "Use :doc:`pgr_trsp` (One to One) instead." +msgid "Is of type ``FLOAT``." msgstr "" -msgid "Migration of ``pgr_trsp`` (Edges)" +msgid "Creation of the old restrictions table" msgstr "" -msgid ":doc:`pgr_withPoints`" +msgid "Old restrictions fill up" msgstr "" -#, fuzzy -msgid ":doc:`pgr_trsp_withPoints`" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "Old restrictions contents" +msgstr "" -msgid "Use ``pgr_withPoints`` when there are no restrictions." +msgid "" +"The restriction with ``rid = 2`` is representing :math:`3 \\rightarrow 5 " +"\\rightarrow9`" msgstr "" -#, fuzzy -msgid "Use :doc:`pgr_withPoints` (One to One) instead." -msgstr ":doc:`pgr_kruskalBFS`" +msgid ":math:`3\\rightarrow5`" +msgstr "" -msgid "Use ``pgr_trsp_withPoints`` when there are restrictions." +msgid "is on column ``via_path`` in reverse order" msgstr "" -msgid "Use :doc:`pgr_trsp_withPoints` instead." +msgid "is of type ``TEXT``" msgstr "" -#, fuzzy -msgid "Migration of ``pgr_trspViaVertices``" -msgstr "ダイクストラ関連機能" +msgid ":math:`9`" +msgstr ":math:`9`" -msgid ":doc:`pgr_dijkstraVia`" +msgid "is on column ``target_id``" msgstr "" -msgid ":doc:`pgr_trspVia`" +msgid "is of type ``INTEGER``" msgstr "" -msgid "Use ``pgr_dijkstraVia`` when there are no restrictions" +msgid "New restrictions structure" msgstr "" -#, fuzzy -msgid "Use :doc:`pgr_dijkstraVia` instead." -msgstr ":doc:`pgr_kruskalBFS`" +msgid "Column ``id`` is ignored" +msgstr "" -msgid "``id1`` is the path identifier" +msgid "Column ``path``" msgstr "" -msgid "``id2`` is the node" +msgid "Is of type ``ARRAY[ANY-INTEGER]``." msgstr "" -msgid "``id3`` is the edge" +msgid "Contains all the edges involved on the restriction." msgstr "" -msgid "Use ``pgr_trspVia`` when there are restrictions" +msgid "The array has the ordered edges of the restriction." msgstr "" -#, fuzzy -msgid "Use :doc:`pgr_trspVia` instead." -msgstr ":doc:`pgr_kruskalBFS`" +msgid "Column ``cost``" +msgstr "" -#, fuzzy -msgid "Migration of ``pgr_trspViaEdges``" -msgstr "ダイクストラ関連機能" +msgid "Is of type ``ANY-NUMERICAL``" +msgstr "" -msgid ":doc:`pgr_withPointsVia`" +msgid "The creation of the restrictions table" msgstr "" -msgid ":doc:`pgr_trspVia_withPoints`" +msgid "Adding the restrictions" msgstr "" -msgid "Use ``pgr_withPointsVia`` when there are no restrictions" +msgid "Restrictions data" msgstr "" -#, fuzzy -msgid "Use :doc:`pgr_withPointsVia` instead." -msgstr ":doc:`pgr_kruskalBFS`" +msgid "" +"The restriction with ``rid = 2`` represents the path :math:`3 \\rightarrow5 " +"\\rightarrow9`." +msgstr "" -msgid "Use ``pgr_trspVia_withPoints`` when there are restrictions" +msgid "By inspection the path is clear." msgstr "" -msgid "Use :doc:`pgr_trspVia_withPoints` instead." +msgid "" +"To transform the old restrictions table to the new restrictions structure," msgstr "" -msgid "Migration of restrictions" +msgid "Create a new table with the new restrictions structure." msgstr "" -msgid "The structure of the restrictions have changed:" +msgid "In this migration guide ``new_restrictions`` is been used." msgstr "" -msgid "Old restrictions structure" +msgid "" +"For this migration pgRouting supplies an auxiliary function for reversal of " +"an array ``_pgr_array_reverse`` needed for the migration." msgstr "" -msgid "On the deprecated signatures:" +msgid "``_pgr_array_reverse``:" msgstr "" -msgid "Column ``rid`` is ignored" +msgid "Was created temporally for this migration" msgstr "" -msgid "``via_path``" +msgid "Is not documented." msgstr "" -msgid "Must be in reverse order." +msgid "Will be removed on the next mayor version 4.0.0" msgstr "" -msgid "Is of type ``TEXT``." +msgid "The migrated table contents:" msgstr "" -msgid "When more than one via edge must be separated with ``,``." +msgid "Migration of ``pgr_trsp`` (Vertices)" msgstr "" -msgid "``target_id``" +msgid "" +":doc:`pgr_trsp` signatures have changed and many issues have been fixed in " +"the new signatures. This section will show how to migrate from the old " +"signatures to the new replacement functions. This also affects the " +"restrictions." msgstr "" -msgid "Is the last edge of the forbidden path." +msgid "The integral type of the ``Edges SQL`` can only be ``INTEGER``." msgstr "" -msgid "Is of type ``INTEGER``." +msgid "The floating point type of the ``Edges SQL`` can only be ``FLOAT``." msgstr "" -msgid "``to_cost``" +msgid "``directed`` flag is compulsory." msgstr "" -msgid "Is of type ``FLOAT``." +msgid "Does not autodetect if ``reverse_cost`` column exist." msgstr "" -msgid "Creation of the old restrictions table" +msgid "" +"User must be careful to match the existence of the column with the value of " +"``has_rcost`` parameter." msgstr "" -msgid "Old restrictions fill up" +msgid "The restrictions inner query is optional." msgstr "" -msgid "Old restrictions contents" +msgid "The output column names are meaningless" +msgstr "" + +msgid "Migrate by using:" +msgstr "" + +msgid ":doc:`pgr_dijkstra` when there are no restrictions," +msgstr "" + +msgid ":doc:`pgr_trsp` (One to One) when there are restrictions." +msgstr "" + +msgid "Migrating ``pgr_trsp`` (Vertices) using ``pgr_dijkstra``" +msgstr "" + +msgid "The following query does not have restrictions." +msgstr "" + +msgid "A message about deprecation is shown" +msgstr "" + +msgid "Deprecated functions will be removed on the next mayor version 4.0.0" +msgstr "" + +msgid "Use :doc:`pgr_dijkstra` instead." +msgstr "" + +msgid "The types casting has been removed." +msgstr "" + +msgid ":doc:`pgr_dijkstra`:" +msgstr "" + +msgid "Autodetects if ``reverse_cost`` column is in the edges SQL." +msgstr "" + +msgid "Accepts ``ANY-INTEGER`` on integral types" +msgstr "" + +msgid "Accepts ``ANY-NUMERICAL`` on floating point types" +msgstr "" + +msgid "``directed`` flag has a default value of ``true``." +msgstr "" + +msgid "Use the same value that on the original query." +msgstr "" + +msgid "In this example it is ``true`` which is the default value." +msgstr "" + +msgid "The flag has been omitted and the default is been used." msgstr "" msgid "" -"The restriction with ``rid = 2`` is representing :math:`3 \\rightarrow 5 " -"\\rightarrow9`" +"When the need of using strictly the same (meaningless) names and types of " +"the function been migrated then:" msgstr "" -msgid ":math:`3\\rightarrow5`" +msgid "``id1`` is the node" msgstr "" -msgid "is on column ``via_path`` in reverse order" +msgid "``id2`` is the edge" msgstr "" -msgid "is of type ``TEXT``" +msgid "Migrating ``pgr_trsp`` (Vertices) using ``pgr_trsp``" msgstr "" -msgid ":math:`9`" -msgstr ":math:`9`" +#, fuzzy +msgid "The following query has restrictions." +msgstr "次のクエリを実行します。" -msgid "is on column ``target_id``" +msgid "The restrictions are the last parameter of the function" msgstr "" -msgid "is of type ``INTEGER``" +msgid "Using the old structure of restrictions" msgstr "" -msgid "New restrictions structure" +msgid "Use :doc:`pgr_trsp` (One to One) instead." msgstr "" -msgid "Column ``id`` is ignored" +msgid "The new structure of restrictions is been used." msgstr "" -msgid "Column ``path``" +msgid "It is the second parameter." msgstr "" -msgid "Is of type ``ARRAY[ANY-INTEGER]``." +msgid ":doc:`pgr_trsp`:" msgstr "" -msgid "Contains all the edges involved on the restriction." +msgid "Migration of ``pgr_trsp`` (Edges)" msgstr "" -msgid "The array has the ordered edges of the restriction." +msgid "The integral types of the ``sql`` can only be ``INTEGER``." msgstr "" -msgid "Column ``cost``" +msgid "The floating point type of the ``sql`` can only be ``FLOAT``." msgstr "" -msgid "Is of type ``ANY-NUMERICAL``" +msgid "For these migration guide the following points will be used:" msgstr "" -msgid "The creation of the restrictions table" +msgid ":doc:`pgr_withPoints` when there are no restrictions," msgstr "" -msgid "Adding the restrictions" +msgid ":doc:`pgr_trsp_withPoints` (One to One) when there are restrictions." msgstr "" -msgid "Restrictions data" +msgid "Migrating ``pgr_trsp`` (Edges) using ``pgr_withPoints``" msgstr "" -msgid "" -"The restriction with ``rid = 2`` represents the path :math:`3 \\rightarrow5 " -"\\rightarrow9`." +msgid "Use :doc:`pgr_withPoints` instead." msgstr "" -msgid "By inspection the path is clear." +msgid "Do not show details, as the deprecated function does not show details." +msgstr "" + +msgid ":doc:`pgr_withPoints`:" +msgstr "" + +msgid "On the points query do not include the ``side`` column." msgstr "" msgid "" -"To transform the old restrictions table to the new restrictions structure," +"When the need of using strictly the same (meaningless) names and types, and " +"node values of the function been migrated then:" msgstr "" -msgid "Create a new table with the new restrictions structure." +msgid "Migrating ``pgr_trsp`` (Edges) using ``pgr_trsp_withPoints``" msgstr "" -msgid "In this migration guide ``new_restrictions`` is been used." +msgid "Use :doc:`pgr_trsp_withPoints` instead." +msgstr "" + +msgid ":doc:`pgr_trsp_withPoints`:" +msgstr "" + +msgid "Migration of ``pgr_trspViaVertices``" +msgstr "" + +msgid "The integral types of the ``Edges SQL`` can only be ``INTEGER``." +msgstr "" + +msgid ":doc:`pgr_dijkstraVia` when there are no restrictions," +msgstr "" + +msgid ":doc:`pgr_trspVia` when there are restrictions." +msgstr "" + +msgid "Migrating ``pgr_trspViaVertices`` using ``pgr_dijkstraVia``" +msgstr "" + +msgid "Use :doc:`pgr_dijkstraVia` instead." +msgstr "" + +msgid ":doc:`pgr_dijkstraVia`:" +msgstr "" + +msgid "``id1`` is the path identifier" +msgstr "" + +msgid "``id2`` is the node" +msgstr "" + +msgid "``id3`` is the edge" +msgstr "" + +msgid "Migrating ``pgr_trspViaVertices`` using ``pgr_trspVia``" +msgstr "" + +msgid "Use :doc:`pgr_trspVia` instead." +msgstr "" + +msgid ":doc:`pgr_trspVia`:" +msgstr "" + +msgid "Migration of ``pgr_trspViaEdges``" msgstr "" msgid "" -"For this migration pgRouting supplies an auxiliary function for reversal of " -"an array ``_pgr_array_reverse`` needed for the migration." +"And will travel thru the following Via points :math:" +"`4\\rightarrow3\\rightarrow6`" msgstr "" -msgid "``_pgr_array_reverse``:" +msgid ":doc:`pgr_withPointsVia` when there are no restrictions," msgstr "" -msgid "Was created temporally for this migration" +msgid ":doc:`pgr_trspVia_withPoints` when there are restrictions." msgstr "" -msgid "Is not documented." +msgid "Migrating ``pgr_trspViaEdges`` using ``pgr_withPointsVia``" msgstr "" -msgid "Will be removed on the next mayor version 4.0.0" +msgid "Use :doc:`pgr_withPointsVia` instead." msgstr "" -msgid "The migrated table contents:" +msgid ":doc:`pgr_withPointsVia`:" +msgstr "" + +msgid "Migrating ``pgr_trspViaEdges`` using ``pgr_trspVia_withPoints``" +msgstr "" + +msgid "Use :doc:`pgr_trspVia_withPoints` instead." +msgstr "" + +msgid ":doc:`pgr_trspVia_withPoints`:" msgstr "" msgid ":doc:`withPoints-category`" @@ -6686,6 +6727,9 @@ msgstr "" msgid "Parameters for the Via functions" msgstr "" +msgid ":doc:`pgr_dijkstraVia`" +msgstr "" + msgid "SQL query as described." msgstr "" @@ -6725,6 +6769,9 @@ msgstr "" msgid "For the TRSP functions" msgstr "" +msgid ":doc:`pgr_trsp`" +msgstr "" + msgid "Array of identifiers of destination vertices." msgstr "" @@ -6777,6 +6824,9 @@ msgstr "" msgid "Used in functions the following:" msgstr "" +msgid ":doc:`pgr_withPoints`" +msgstr "" + msgid "" "Returns set of ``(seq, path_seq [, start_pid] [, end_pid], node, edge, cost, " "agg_cost)``" @@ -7062,7 +7112,7 @@ msgid "Upgrading the database" msgstr "" msgid "" -"To upgrade pgRouting in the database to version 4.0.0 use the following " +"To upgrade pgRouting in the database to version 3.7.0 use the following " "command:" msgstr "" @@ -7517,9 +7567,8 @@ msgstr "" msgid ":doc:`migration`" msgstr "" -#, fuzzy -msgid "``pgr_KSP``" -msgstr "pgr_TSP" +msgid "pgr_KSP" +msgstr "" msgid "``pgr_KSP`` — Yen's algorithm for K shortest paths using Dijkstra." msgstr "" @@ -7527,13 +7576,6 @@ msgstr "" msgid "Availability" msgstr "使用可能なバージョン" -#, fuzzy -msgid "Version 4.0.0" -msgstr "バージョン 2.0.0" - -msgid "All signatures promoted to official." -msgstr "" - #, fuzzy msgid "Version 3.6.0" msgstr "バージョン 3.0.0" @@ -7541,25 +7583,25 @@ msgstr "バージョン 3.0.0" msgid "Result columns standarized to: |nksp-result|" msgstr "" -msgid "pgr_ksp(One to One)" +msgid "``pgr_ksp`` (One to One)" msgstr "" msgid "Added ``start_vid`` and ``end_vid`` result columns." msgstr "" -msgid "New proposed signatures:" -msgstr "" +msgid "New overload functions:" +msgstr "新しい **公式** 機能:" -msgid "pgr_ksp(One to Many)" +msgid "``pgr_ksp`` (One to Many)" msgstr "" -msgid "pgr_ksp(Many to One)" +msgid "``pgr_ksp`` (Many to One)" msgstr "" -msgid "pgr_ksp(Many to Many)" +msgid "``pgr_ksp`` (Many to Many)" msgstr "" -msgid "pgr_ksp(Combinations)" +msgid "``pgr_ksp`` (Combinations)" msgstr "" msgid "Version 2.1.0" @@ -7574,8 +7616,7 @@ msgstr "" msgid "Version 2.0.0" msgstr "バージョン 2.0.0" -#, fuzzy -msgid "Official function." +msgid "**Official** function" msgstr "**公式** 機能" msgid "" @@ -7583,12 +7624,6 @@ msgid "" "number of shortest paths desired." msgstr "" -msgid "|Boost| Boost Graph Inside" -msgstr "" - -msgid "Boost Graph Inside" -msgstr "" - msgid "Signatures" msgstr "機能" @@ -7941,11 +7976,6 @@ msgstr "" msgid "``pgr_TSPeuclidean`` - Aproximation using *metric* algorithm." msgstr "" -msgid "" -"Using `Boost: metric TSP approx `__" -msgstr "" - msgid "" "The Simulated Annealing Algorithm related parameters are ignored: " "`max_processing_time`, `tries_per_temperature`, " @@ -7959,8 +7989,7 @@ msgstr "バージョン 3.0.0" msgid "Name change from pgr_eucledianTSP" msgstr "名称が pgr_eucledianTSP から変わりました" -#, fuzzy -msgid "New official function." +msgid "New **Official** function" msgstr "新しい **公式** 機能" msgid "" @@ -8041,51 +8070,57 @@ msgid "" "obtained with ``pgr_TSPeuclidean``." msgstr "" -msgid "``pgr_aStar``" +msgid ":doc:`sampledata` network." msgstr "" -msgid "``pgr_aStar`` — Shortest path using the A* algorithm." +msgid "``pgr_aStar``" msgstr "" -msgid "Combinations signature promoted to official." +msgid "``pgr_aStar`` — Shortest path using the A* algorithm." msgstr "" msgid "Standarizing output columns to |short-generic-result|" msgstr "" -msgid "pgr_aStar(One to One) added ``start_vid`` and ``end_vid`` columns." +msgid "" +"``pgr_aStar`` (`One to One`_) added ``start_vid`` and ``end_vid`` columns." msgstr "" -msgid "pgr_aStar(One to Many) added ``end_vid`` column." +msgid "``pgr_aStar`` (`One to Many`_) added ``end_vid`` column." msgstr "" -msgid "pgr_aStar(Many to One) added ``start_vid`` column." +msgid "``pgr_aStar`` (`Many to One`_) added ``start_vid`` column." msgstr "" msgid "Version 3.2.0" msgstr "" -msgid "New proposed signature:" +msgid "New **proposed** signature:" msgstr "" -msgid "Function promoted to official." +msgid "``pgr_aStar`` (`Combinations`_)" msgstr "" msgid "Version 2.4.0" msgstr "" -msgid "pgr_aStar(One to Many)" +msgid "New **Proposed** signatures:" msgstr "" -msgid "pgr_aStar(Many to One)" +msgid "``pgr_aStar`` (`One to Many`_)" msgstr "" -msgid "pgr_aStar(Many to Many)" +msgid "``pgr_aStar`` (`Many to One`_)" msgstr "" -#, fuzzy -msgid "Signature change on pgr_aStar(One to One)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "``pgr_aStar`` (`Many to Many`_)" +msgstr "" + +msgid "Signature change on ``pgr_astar`` (`One to One`_)" +msgstr "" + +msgid "**Official** ``pgr_aStar`` (`One to One`_)" +msgstr "" msgid "" "The results are equivalent to the union of the results of the `pgr_aStar(` " @@ -8158,7 +8193,7 @@ msgstr "" msgid "Manually assigned vertex combinations." msgstr "" -msgid "``pgr_aStarCost``" +msgid "pgr_aStarCost" msgstr "" #, fuzzy @@ -8166,9 +8201,11 @@ msgid "" "``pgr_aStarCost`` - Total cost of the shortest path using the A* algorithm." msgstr ":doc:`pgr_dijkstraCost` - 最短経路の総コストを集計します。" -#, fuzzy -msgid "New proposed function." -msgstr "新しい **公式** 機能" +msgid "``pgr_aStarCost`` (`Combinations`_)" +msgstr "" + +msgid "New **proposed** function" +msgstr "" msgid "" "The ``pgr_aStarCost`` function sumarizes of the cost of the shortest path " @@ -8287,9 +8324,6 @@ msgstr "" msgid "Renamed from version 1.x" msgstr "" -msgid "Support" -msgstr "サポート" - msgid "Returns the polygon part of an alpha shape." msgstr "" @@ -8362,7 +8396,7 @@ msgstr "" msgid "`ST_ConcaveHull `__" msgstr "" -msgid "``pgr_analyzeGraph``" +msgid "pgr_analyzeGraph" msgstr "" msgid "``pgr_analyzeGraph`` — Analyzes the network topology." @@ -8624,6 +8658,9 @@ msgid "" "table ``othertable``. (note the use of quote_literal)" msgstr "" +msgid "The examples use the :doc:`sampledata` network." +msgstr "" + msgid ":doc:`pgr_analyzeOneWay`" msgstr "" @@ -8633,7 +8670,7 @@ msgstr "" msgid ":doc:`pgr_nodeNetwork` to create nodes to a not noded edge table." msgstr "" -msgid "``pgr_analyzeOneWay``" +msgid "pgr_analyzeOneWay" msgstr "" msgid "" @@ -8785,9 +8822,8 @@ msgstr "" msgid "Version 2.5.0" msgstr "" -#, fuzzy -msgid "New experimental function." -msgstr "新しい **公式** 機能" +msgid "New **experimental** function" +msgstr "" msgid "" "Those vertices that belong to more than one biconnected component are called " @@ -8818,7 +8854,7 @@ msgid "Nodes in red are the articulation points." msgstr "" msgid "" -"`Boost: Biconnected components & articulation points `__" msgstr "" @@ -8833,30 +8869,37 @@ msgstr "" msgid "``pgr_bdAstar`` — Shortest path using the bidirectional A* algorithm." msgstr "" -msgid "pgr_bdAstar(One to One) added ``start_vid`` and ``end_vid`` columns." +msgid "" +"``pgr_bdAstar`` (`One to One`_) added ``start_vid`` and ``end_vid`` columns." +msgstr "" + +msgid "``pgr_bdAstar`` (`One to Many`_) added ``end_vid`` column." +msgstr "" + +msgid "``pgr_bdAstar`` (`Many to One`_) added ``start_vid`` column." msgstr "" -msgid "pgr_bdAstar(One to Many) added ``end_vid`` column." +msgid "``pgr_bdAstar`` (`Combinations`_)" msgstr "" -msgid "pgr_bdAstar(Many to One) added ``start_vid`` column." +msgid "``pgr_bdAstar`` (`One to Many`_)" msgstr "" -msgid "pgr_bdAstar(One to Many)" +msgid "``pgr_bdAstar`` (`Many to One`_)" msgstr "" -msgid "pgr_bdAstar(Many to One)" +msgid "``pgr_bdAstar`` (`Many to Many`_)" msgstr "" -msgid "pgr_bdAstar(Many to Many)" +msgid "Signature change on ``pgr_bdAstar`` (`One to One`_)" msgstr "" -msgid "Signature change on pgr_bdAstar(One to One)" +msgid "**Official** ``pgr_bdAstar`` (`One to One`_)" msgstr "" msgid "" -"The results are equivalent to the union of the results of the " -"pgr_bdAStar(One to One) on the:" +"The results are equivalent to the union of the results of the `pgr_bdAStar(` " +"`One to One`_ `)` on the:" msgstr "" msgid "pgr_bdAstar(`Edges SQL`_, **start vid**, **end vid**, [**options**])" @@ -8874,7 +8917,7 @@ msgstr "" msgid "pgr_bdAstar(`Edges SQL`_, `Combinations SQL`_, [**options**])" msgstr "" -msgid "``pgr_bdAstarCost``" +msgid "pgr_bdAstarCost" msgstr "" msgid "" @@ -8882,6 +8925,9 @@ msgid "" "bidirectional A* algorithm." msgstr "" +msgid "``pgr_bdAstarCost`` (`Combinations`_)" +msgstr "" + msgid "" "The ``pgr_bdAstarCost`` function sumarizes of the cost of the shortest path " "using the bidirectional A* algorithm." @@ -8928,16 +8974,25 @@ msgid "" "algorithm." msgstr "" -msgid "pgr_bdDijkstra(One to Many)" +msgid "pgr_bdDijkstra(`Combinations`_)" +msgstr "" + +msgid "New **Proposed** functions:" +msgstr "" + +msgid "``pgr_bdDijkstra`` (`One to Many`_)" +msgstr "" + +msgid "``pgr_bdDijkstra`` (`Many to One`_)" msgstr "" -msgid "pgr_bdDijkstra(Many to One)" +msgid "``pgr_bdDijkstra`` (`Many to Many`_)" msgstr "" -msgid "pgr_bdDijkstra(Many to Many)" +msgid "Signature change on ``pgr_bdDijsktra`` (`One to One`_)" msgstr "" -msgid "Signature change on pgr_bdDijsktra(One to One)" +msgid "**Official** ``pgr_bdDijkstra`` (`One to One`_)" msgstr "" msgid "" @@ -8991,6 +9046,11 @@ msgstr "" 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" +msgstr "" + msgid "https://en.wikipedia.org/wiki/Bidirectional_search" msgstr "" @@ -9002,6 +9062,9 @@ msgid "" "Bidirectional Dijkstra algorithm." msgstr "" +msgid "``pgr_bdDijkstraCost`` (`Combinations`_)" +msgstr "" + msgid "" "The ``pgr_bdDijkstraCost`` function sumarizes of the cost of the shortest " "path using the bidirectional Dijkstra Algorithm." @@ -9060,11 +9123,25 @@ msgstr "" msgid "``pgr_bellmanFord`` — Shortest path using Bellman-Ford algorithm." msgstr "" -#, fuzzy -msgid "New experimental signature:" -msgstr "新しい **公式** 機能" +msgid "New **experimental** signature:" +msgstr "" -msgid "pgr_bellmanFord(Combinations)" +msgid "``pgr_bellmanFord`` (`Combinations`_)" +msgstr "" + +msgid "New **experimental** signatures:" +msgstr "" + +msgid "``pgr_bellmanFord`` (`One to One`_)" +msgstr "" + +msgid "``pgr_bellmanFord`` (`One to Many`_)" +msgstr "" + +msgid "``pgr_bellmanFord`` (`Many to One`_)" +msgstr "" + +msgid "``pgr_bellmanFord`` (`Many to Many`_)" msgstr "" msgid "" @@ -9139,20 +9216,14 @@ msgstr "" msgid "Using a combinations table on an **undirected** graph." msgstr "" -msgid "" -"`Boost: Bellman Ford `__" -msgstr "" - msgid "https://en.wikipedia.org/wiki/Bellman%E2%80%93Ford_algorithm" msgstr "" -#, fuzzy -msgid "``pgr_betweennessCentrality`` - Experimental" -msgstr "p" +msgid "``pgr_betweennessCentrality``" +msgstr "" msgid "" -"``pgr_betweennessCentrality`` - Calculates the relative betweenness " +"``pgr_betweennessCentrality`` - Calculates the relative betweeness " "centrality using Brandes Algorithm" msgstr "" @@ -9160,6 +9231,9 @@ msgstr "" 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." @@ -9232,10 +9306,14 @@ msgid "" msgstr "" msgid "" -"`Boost: betweenness centrality `_" +"Boost's `betweenness_centrality `_" msgstr "" +#, fuzzy +msgid "Queries use the :doc:`sampledata` network." +msgstr "クエリは :doc:`sampledata` ネットワークを使用します。" + msgid "``pgr_biconnectedComponents``" msgstr "" @@ -9293,6 +9371,11 @@ msgstr "" msgid "Identifier of the edge that belongs to the ``component``." msgstr "" +msgid "" +"Boost: `Biconnected components `__" +msgstr "" + msgid "``pgr_binaryBreadthFirstSearch`` - Experimental" msgstr "" @@ -9306,7 +9389,19 @@ msgid "" "negative integer, is termed as a 'binary graph'." msgstr "" -msgid "pgr_binaryBreadthFirstSearch(Combinations)" +msgid "pgr_binaryBreadthFirstSearch(`Combinations`_)" +msgstr "" + +msgid "pgr_binaryBreadthFirstSearch(`One to One`_)" +msgstr "" + +msgid "pgr_binaryBreadthFirstSearch(`One to Many`_)" +msgstr "" + +msgid "pgr_binaryBreadthFirstSearch(`Many to One`_)" +msgstr "" + +msgid "pgr_binaryBreadthFirstSearch(`Many to Many`_)" msgstr "" msgid "" @@ -9368,11 +9463,6 @@ msgid "" "math:`1``)" msgstr "" -msgid "" -"`Boost: Breadth First Search `__" -msgstr "" - msgid "https://cp-algorithms.com/graph/01_bfs.html" msgstr "" @@ -9380,7 +9470,7 @@ msgid "" "https://en.wikipedia.org/wiki/Dijkstra%27s_algorithm#Specialized_variants" msgstr "" -msgid "``pgr_bipartite`` - Experimental" +msgid "pgr_bipartite -Experimental" msgstr "" msgid "" @@ -9388,6 +9478,9 @@ msgid "" "within the same set are adjacent." msgstr "" +msgid "New **experimental** signature" +msgstr "" + msgid "" "A bipartite graph is a graph with two sets of vertices which are connected " "to each other, but not within themselves. A bipartite graph is possible if " @@ -9434,16 +9527,6 @@ msgstr "" msgid "Edges in blue represent odd length cycle subgraph." msgstr "" -msgid "" -"`Boost: is_bipartite `__" -msgstr "" - -msgid "" -"`Wikipedia: bipartite graph `__" -msgstr "" - msgid "``pgr_boykovKolmogorov``" msgstr "" @@ -9453,10 +9536,19 @@ msgid "" "algorithm." msgstr "" +msgid "New **proposed** signature" +msgstr "" + +msgid "``pgr_boykovKolmogorov`` (`Combinations`_)" +msgstr "" + msgid "Renamed from ``pgr_maxFlowBoykovKolmogorov``" msgstr "" -msgid "Function promoted to proposed." +msgid "**Proposed** function" +msgstr "" + +msgid "New **Experimental** function" msgstr "" msgid "Running time: Polynomial" @@ -9498,9 +9590,7 @@ msgid "" "math:`\\{5, 6\\}` to vertices :math:`\\{10, 15, 14\\}`." msgstr "" -msgid "" -"`Boost: Boykov Kolmogorov max flow `__" +msgid "https://www.boost.org/libs/graph/doc/boykov_kolmogorov_max_flow.html" msgstr "" msgid "``pgr_breadthFirstSearch`` - Experimental" @@ -9511,6 +9601,12 @@ msgid "" "First Search algorithm." msgstr "" +msgid "``pgr_breadthFirstSearch`` (`Single Vertex`_)" +msgstr "" + +msgid "``pgr_breadthFirstSearch`` (`Multiple Vertices`_)" +msgstr "" + msgid "" "Provides the Breadth First Search traversal order from a root vertex to a " "particular depth." @@ -9575,6 +9671,11 @@ msgstr "" msgid "descending" msgstr "" +msgid "" +"`Boost: Breadth First Search algorithm documentation `__" +msgstr "" + msgid "" "`Wikipedia: Breadth First Search algorithm `__" @@ -9613,9 +9714,7 @@ msgstr "" msgid "https://en.wikipedia.org/wiki/Bridge_%28graph_theory%29" msgstr "" -msgid "" -"`Boost: Connected components `__" +msgid "**Supported versions**" msgstr "" msgid "``pgr_chinesePostman`` - Experimental" @@ -9673,7 +9772,7 @@ msgstr "" msgid "Minimum costs of a circuit path." msgstr "" -msgid "``pgr_connectedComponents``" +msgid "pgr_connectedComponents" msgstr "" msgid "" @@ -9710,6 +9809,11 @@ msgstr "" msgid "Connecting disconnected components" msgstr "" +msgid "" +"Boost: `Connected components `__" +msgstr "" + msgid "" "wikipedia: `Connected component `__" @@ -9884,7 +9988,7 @@ msgstr "" msgid "Only linear contraction" msgstr "" -msgid "``pgr_createTopology``" +msgid "pgr_createTopology" msgstr "" msgid "" @@ -10087,7 +10191,10 @@ msgid "" "to the rest of the edges." msgstr "" -msgid "``pgr_createVerticesTable``" +msgid "The example uses the :doc:`sampledata` network." +msgstr "" + +msgid "pgr_createVerticesTable" msgstr "" msgid "" @@ -10305,7 +10412,7 @@ msgid "" "Cuthill%E2%80%93McKee_algorithm>`__" msgstr "" -msgid "``pgr_dagShortestPath`` - Experimental" +msgid "pgr_dagShortestPath - Experimental" msgstr "" msgid "" @@ -10387,11 +10494,6 @@ msgstr "結果として返却されるカラム" msgid "Making **start_vids** the same as **end_vids**" msgstr "" -msgid "" -"`Boost: DAG shortest paths `__" -msgstr "" - msgid "https://en.wikipedia.org/wiki/Topological_sorting" msgstr "" @@ -10510,6 +10612,15 @@ msgstr "" msgid "Version 3.3.0" msgstr "" +msgid "Promoted to **proposed** function" +msgstr "" + +msgid "``pgr_depthFirstSearch`` (`Single Vertex`_)" +msgstr "" + +msgid "``pgr_depthFirstSearch`` (`Multiple Vertices`_)" +msgstr "" + msgid "" "Depth First Search algorithm is a traversal algorithm which starts from a " "root vertex, goes as deep as possible, and backtracks once a vertex is " @@ -10563,13 +10674,13 @@ msgid "Same as `Single vertex`_ but with edges in descending order of ``id``." msgstr "" msgid "" -"`Boost: Depth First Search `__" +"`Boost: Depth First Search algorithm documentation `__" msgstr "" msgid "" -"`Boost: Undirected DFS `__" +"`Boost: Undirected DFS algorithm documentation `__" msgstr "" msgid "" @@ -10587,31 +10698,44 @@ msgstr "" msgid "Version 3.5.0" msgstr "バージョン 3.0.0" -msgid "pgr_dijkstra(One to One) added ``start_vid`` and ``end_vid`` columns." +msgid "" +"``pgr_dijkstra`` (`One to One`_) added ``start_vid`` and ``end_vid`` columns." msgstr "" -msgid "pgr_dijkstra(One to Many) added ``end_vid`` column." +msgid "``pgr_dijkstra`` (`One to Many`_) added ``end_vid`` column." msgstr "" -msgid "pgr_dijkstra(Many to One) added ``start_vid`` column." +msgid "``pgr_dijkstra`` (`Many to One`_) added ``start_vid`` column." msgstr "" msgid "Version 3.1.0" msgstr "" +msgid "``pgr_dijkstra`` (`Combinations`_)" +msgstr "" + +msgid "**Official** functions" +msgstr "" + msgid "Version 2.2.0" msgstr "" -msgid "pgr_dijkstra(One to Many)" +msgid "New **proposed** functions:" +msgstr "" + +msgid "``pgr_dijkstra`` (`One to Many`_)" +msgstr "" + +msgid "``pgr_dijkstra`` (`Many to One`_)" msgstr "" -msgid "pgr_dijkstra(Many to One)" +msgid "``pgr_dijkstra`` (`Many to Many`_)" msgstr "" -msgid "pgr_dijkstra(Many to Many)" +msgid "Signature change on ``pgr_dijkstra`` (`One to One`_)" msgstr "" -msgid "Signature change on pgr_dijkstra(One to One)" +msgid "**Official** ``pgr_dijkstra`` (`One to One`_)" msgstr "" #, fuzzy @@ -10800,11 +10924,6 @@ msgstr "" msgid "37) Using `Combinations`_" msgstr "" -msgid "" -"`Boost: Dijkstra shortest paths `__" -msgstr "" - msgid "https://en.wikipedia.org/wiki/Dijkstra%27s_algorithm" msgstr "" @@ -10817,6 +10936,9 @@ msgid "" "algorithm." msgstr ":doc:`pgr_dijkstraCost` - 最短経路の総コストを集計します。" +msgid "``pgr_dijkstraCost`` (`Combinations`_)" +msgstr "" + #, fuzzy msgid "" "The ``pgr_dijkstraCost`` function sumarizes of the cost of the shortest path " @@ -11105,6 +11227,9 @@ msgstr "" msgid "When ``false``: ``cap`` limit per ``Start vid`` will be returned" msgstr "" +msgid "boost: https://www.boost.org/libs/graph/doc/table_of_contents.html" +msgstr "" + msgid "Wikipedia: https://en.wikipedia.org/wiki/Dijkstra%27s_algorithm" msgstr "" @@ -11271,9 +11396,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 "" @@ -11283,17 +11405,13 @@ msgstr "" msgid "Added ``depth`` and ``pred`` result columns." msgstr "" -#, fuzzy -msgid "Signature change:" -msgstr "変更機能" - -msgid "pgr_drivingDistance(single vertex)" +msgid "Signature change pgr_drivingDistance(single vertex)" msgstr "" -msgid "New official signature:" +msgid "New **Official** pgr_drivingDistance(multiple vertices)" msgstr "" -msgid "pgr_drivingDistance(multiple vertices)" +msgid "Official:: pgr_drivingDistance(single vertex)" msgstr "" msgid "" @@ -11349,7 +11467,7 @@ msgid "" "undirected graph" msgstr "" -msgid "``pgr_edgeColoring`` - Experimental" +msgid "pgr_edgeColoring - Experimental" msgstr "" msgid "" @@ -11423,15 +11541,6 @@ msgstr "" msgid "Graph coloring of pgRouting :doc:`sampledata`" msgstr "" -msgid "" -"`Boost: Edge Coloring `__" -msgstr "" - -msgid "" -"`Wikipedia: Graph coloring `__" -msgstr "" - msgid "``pgr_edgeDisjointPaths``" msgstr "" @@ -11440,6 +11549,9 @@ msgid "" "groups of vertices." msgstr "" +msgid "New **proposed** function:" +msgstr "" + msgid "pgr_edgeDisjointPaths(Combinations)" msgstr "" @@ -11521,6 +11633,9 @@ msgid "" "the flow from the sources to the targets using Edmonds Karp Algorithm." msgstr "" +msgid "``pgr_edmondsKarp`` (`Combinations`_)" +msgstr "" + msgid "Renamed from ``pgr_maxFlowEdmondsKarp``" msgstr "" @@ -11542,22 +11657,32 @@ msgstr "" msgid "pgr_edmondsKarp(`Edges SQL`_, `Combinations SQL`_)" msgstr "" -msgid "" -"`Boost: Edmonds Karp max flow `__" +msgid "https://www.boost.org/libs/graph/doc/edmonds_karp_max_flow.html" msgstr "" msgid "https://en.wikipedia.org/wiki/Edmonds%E2%80%93Karp_algorithm" msgstr "" -msgid "``pgr_edwardMoore`` - Experimental" +msgid "``pgr_edwardMoore - Experimental``" msgstr "" msgid "" "``pgr_edwardMoore`` — Returns the shortest path using Edward-Moore algorithm." msgstr "" -msgid "pgr_edwardMoore(Combinations)" +msgid "``pgr_edwardMoore`` (`Combinations`_)" +msgstr "" + +msgid "``pgr_edwardMoore`` (`One to One`_)" +msgstr "" + +msgid "``pgr_edwardMoore`` (`One to Many`_)" +msgstr "" + +msgid "``pgr_edwardMoore`` (`Many to One`_)" +msgstr "" + +msgid "``pgr_edwardMoore`` (`Many to Many`_)" msgstr "" msgid "" @@ -11619,7 +11744,7 @@ msgstr "" msgid "https://en.wikipedia.org/wiki/Shortest_Path_Faster_Algorithm" msgstr "" -msgid "``pgr_extractVertices`` -- Proposed" +msgid "pgr_extractVertices -- Proposed" msgstr "" msgid "``pgr_extractVertices`` — Extracts the vertices information" @@ -11720,12 +11845,21 @@ msgid "" "= true``." msgstr "" -msgid "``pgr_findCloseEdges`` - Proposed" +msgid "``pgr_findCloseEdges``" msgstr "" msgid "``pgr_findCloseEdges`` - Finds the close edges to a point geometry." msgstr "" +msgid "New **proposed** signatures:" +msgstr "" + +msgid "``pgr_findCloseEdges`` (`One point`_)" +msgstr "" + +msgid "``pgr_findCloseEdges`` (`Many points`_)" +msgstr "" + msgid "" "``pgr_findCloseEdges`` - An utility function that finds the closest edge to " "a point geometry." @@ -12203,6 +12337,9 @@ msgid "" "floyd_warshall_shortest.html>`_" msgstr "" +msgid "Queries uses the :doc:`sampledata` network." +msgstr "" + msgid "``pgr_full_version``" msgstr "" @@ -12210,6 +12347,9 @@ msgid "" "``pgr_full_version`` — Get the details of pgRouting version information." msgstr "" +msgid "New **official** function" +msgstr "" + msgid "Get complete details of pgRouting version information" msgstr "" @@ -12276,15 +12416,17 @@ msgstr "" msgid "Git hash of pgRouting build" msgstr "" -#, fuzzy -msgid "``pgr_hawickCircuits`` - Experimental" -msgstr "p" +msgid "``pgr_hawickCircuits - Experimental``" +msgstr "" msgid "" "``pgr_hawickCircuits`` — Returns the list of cirucits using hawick circuits " "algorithm." msgstr "" +msgid "``pgr_hawickCircuits``" +msgstr "" + msgid "" "Hawick Circuit algorithm, is published in 2008 by Ken Hawick and Health A. " "James. This algorithm solves the problem of detecting and enumerating " @@ -12409,9 +12551,7 @@ msgid "" "blue represent :math:`K_5` subgraph." msgstr "" -msgid "" -"`Boost: Boyer Myrvold `__" +msgid "https://www.boost.org/libs/graph/doc/boyer_myrvold.html" msgstr "" msgid "``pgr_johnson``" @@ -12466,9 +12606,6 @@ msgid "" "breadth First Search ordering." msgstr "" -msgid "Added ``pred`` result columns." -msgstr "" - msgid "" "Visits and extracts the nodes information in Breath First Search ordering of " "the Minimum Spanning Tree created using Kruskal's algorithm." @@ -12544,9 +12681,8 @@ msgstr "" msgid "pgr_kruskalDFS(`Edges SQL`_, **root vids**, [``max_depth``])" msgstr "" -#, fuzzy -msgid "``pgr_lengauerTarjanDominatorTree`` - Experimental" -msgstr "p" +msgid "pgr_lengauerTarjanDominatorTree -Experimental" +msgstr "" msgid "" "``pgr_lengauerTarjanDominatorTree`` — Returns the immediate dominator of all " @@ -12603,8 +12739,8 @@ msgid "Dominator tree of another component." msgstr "" msgid "" -"`Boost: Lengauer-Tarjan dominator `__" +"`Boost: Lengauer-Tarjan dominator tree algorithm `__" msgstr "" msgid "" @@ -12612,7 +12748,7 @@ msgid "" "Dominator_(graph_theory)>`__" msgstr "" -msgid "``pgr_lineGraph`` - Proposed" +msgid "pgr_lineGraph - Proposed" msgstr "" msgid "" @@ -12620,10 +12756,6 @@ msgid "" "based graph." msgstr "" -#, fuzzy -msgid "Works for directed and undirected graphs." -msgstr "導かれないグラフ。" - msgid "" "Given a graph :math:`G`, its line graph :math:`L(G)` is a graph such that:" msgstr "" @@ -12890,7 +13022,8 @@ msgid "Full line graph of subgraph of edges :math:`\\{4, 7, 8, 10\\}`" msgstr "" msgid "" -"The examples include the subgraph including edges 4, 7, 8, and 10 with " +"The examples of this section are based on the :doc:`sampledata` network. The " +"examples include the subgraph including edges 4, 7, 8, and 10 with " "``reverse_cost``." msgstr "" @@ -13109,15 +13242,15 @@ msgstr "" msgid "Returns set of |result-component-make|" msgstr "" -msgid "List of edges that are needed to connect the graph." +msgid "" +"Query done on :doc:`sampledata` network gives the list of edges that are " +"needed to connect the graph." msgstr "" -msgid "" -"`Boost: make connected `__" +msgid "https://www.boost.org/libs/graph/doc/make_connected.html" msgstr "" -msgid "``pgr_maxCardinalityMatch``" +msgid "pgr_maxCardinalityMatch" msgstr "" msgid "" @@ -13125,16 +13258,13 @@ msgid "" "graph." msgstr "" -msgid "pgr_maxCardinalityMatch(text) returns only ``edge`` column." -msgstr "" - msgid "Deprecated signature" msgstr "" -msgid "pgr_maxCardinalityMatch(text,boolean)" +msgid "``pgr_maxCardinalityMatch(text,boolean)``" msgstr "" -msgid "directed => ``false`` when used." +msgid "``directed => false`` when used." msgstr "" msgid "Renamed from ``pgr_maximumCardinalityMatching``" @@ -13185,9 +13315,7 @@ msgstr "" msgid "Identifier of the edge in the original query." msgstr "" -msgid "" -"`Boost: maximum_matching `__" +msgid "https://www.boost.org/libs/graph/doc/maximum_matching.html" msgstr "" msgid "https://en.wikipedia.org/wiki/Matching_%28graph_theory%29" @@ -13204,6 +13332,12 @@ msgid "" "source(s) to the targets(s) using the Push Relabel algorithm." msgstr "" +msgid "``pgr_maxFlow`` (`Combinations`_)" +msgstr "" + +msgid "New **Proposed** function" +msgstr "" + msgid "Calculates the maximum flow from the sources to the targets." msgstr "" @@ -13238,9 +13372,7 @@ msgstr "" msgid "Maximum flow possible from the source(s) to the target(s)" msgstr "" -msgid "" -"`Boost: push relabel max flow `__" +msgid "https://www.boost.org/libs/graph/doc/push_relabel_max_flow.html" msgstr "" msgid "" @@ -13255,10 +13387,7 @@ msgid "" "of the maximum flow on a graph" msgstr "" -msgid "pgr_maxFlowMinCost(Combinations)" -msgstr "" - -msgid "|boost| graph inside." +msgid "``pgr_maxFlowMinCost`` (`Combinations`_)" msgstr "" msgid "**TODO** check which statement is true:" @@ -13302,6 +13431,11 @@ msgstr "" msgid "Returns set of |result-flow-mincost|" msgstr "" +msgid "" +"https://www.boost.org/libs/graph/doc/" +"successive_shortest_path_nonnegative_weights.html" +msgstr "" + msgid "``pgr_maxFlowMinCost_Cost`` - Experimental" msgstr "" @@ -13310,7 +13444,7 @@ msgid "" "maximum flow on a graph" msgstr "" -msgid "pgr_maxFlowMinCost_Cost(Combinations)" +msgid "``pgr_maxFlowMinCost_Cost`` (`Combinations`_)" msgstr "" msgid "**The cost value of all input edges must be nonnegative.**" @@ -13343,7 +13477,7 @@ msgstr "" msgid "Minimum Cost Maximum Flow possible from the source(s) to the target(s)" msgstr "" -msgid "``pgr_nodeNetwork``" +msgid "pgr_nodeNetwork" msgstr "" msgid "``pgr_nodeNetwork`` - Nodes an network edge table." @@ -13884,6 +14018,9 @@ msgid "" "the flow from the sources to the targets using Push Relabel Algorithm." msgstr "" +msgid "``pgr_pushRelabel`` (`Combinations`_)" +msgstr "" + msgid "Renamed from ``pgr_maxFlowPushRelabel``" msgstr "" @@ -13902,7 +14039,7 @@ msgstr "" msgid "pgr_pushRelabel(`Edges SQL`_, `Combinations SQL`_)" msgstr "" -msgid "``pgr_sequentialVertexColoring`` - Proposed" +msgid "pgr_sequentialVertexColoring - Proposed" msgstr "" msgid "" @@ -13910,6 +14047,9 @@ msgid "" "undirected graph, using greedy approach." msgstr "" +msgid "Promoted to **proposed** signature" +msgstr "" + msgid "" "Sequential vertex coloring algorithm is a graph coloring algorithm in which " "color identifiers are assigned to the vertices of a graph in a sequential " @@ -13952,12 +14092,7 @@ msgstr "" msgid "pgr_sequentialVertexColoring(`Edges SQL`_)" msgstr "" -msgid "" -"`Boost: Sequential Vertex Coloring `__" -msgstr "" - -msgid "``pgr_stoerWagner`` - Experimental" +msgid "pgr_stoerWagner - Experimental" msgstr "" msgid "``pgr_stoerWagner`` — The min-cut of graph using stoerWagner algorithm." @@ -14042,11 +14177,6 @@ msgstr "" msgid "Using :doc:`pgr_connectedComponents`" msgstr "" -msgid "" -"`Boost: Stoer Wagner min cut `__" -msgstr "" - msgid "https://en.wikipedia.org/wiki/Stoer%E2%80%93Wagner_algorithm" msgstr "" @@ -14076,7 +14206,7 @@ msgid "The strong components of the graph" msgstr "" msgid "" -"`Boost: Strong components `__" msgstr "" @@ -14141,11 +14271,6 @@ msgstr "" msgid "Graph is not a DAG" msgstr "" -msgid "" -"`Boost: topological sort `__" -msgstr "" - msgid "``pgr_transitiveClosure`` - Experimental" msgstr "" @@ -14201,54 +14326,57 @@ msgstr "" msgid "Identifiers of the vertices that are reachable from vertex v." msgstr "" -msgid "" -"`Boost: transitive closure `__" -msgstr "" - msgid "https://en.wikipedia.org/wiki/Transitive_closure" msgstr "" -msgid "``pgr_trsp``" +msgid "pgr_trsp - Proposed" msgstr "" msgid "``pgr_trsp`` - routing vertices with restrictions." msgstr "" -msgid "pgr_trsp(One to One)" +msgid "New proposed signatures" +msgstr "" + +msgid "``pgr_trsp`` (`One to One`_)" msgstr "" -msgid "pgr_trsp(One to Many)" +msgid "``pgr_trsp`` (`One to Many`_)" msgstr "" -msgid "pgr_trsp(Many to One)" +msgid "``pgr_trsp`` (`Many to One`_)" msgstr "" -msgid "pgr_trsp(Many to Many)" +msgid "``pgr_trsp`` (`Many to Many`_)" msgstr "" -msgid "pgr_trsp(Combinations)" +msgid "``pgr_trsp`` (`Combinations`_)" msgstr "" msgid "Deprecated signatures" msgstr "" -msgid "pgr_trsp(text,integer,float,integer,float,boolean,boolean,text)" +msgid "``pgr_trsp(text,integer,integer,boolean,boolean,text)``" +msgstr "" + +msgid "``pgr_trsp(text,integer,float,integer,float,boolean,boolean,text)``" +msgstr "" + +msgid "``pgr_trspViaVertices(text,anyarray,boolean,boolean,text)``" msgstr "" -msgid "pgr_trspViaVertices(text,anyarray,boolean,boolean,text)" +msgid "" +"``pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)``" msgstr "" msgid "New prototypes" msgstr "" -#, fuzzy -msgid "pgr_trspViaVertices" -msgstr "ダイクストラ関連機能" +msgid "``pgr_trspViaVertices``" +msgstr "" -#, fuzzy -msgid "pgr_trspViaEdges" -msgstr "ダイクストラ関連機能" +msgid "``pgr_trspViaEdges``" +msgstr "" msgid "" "Turn restricted shortest path (TRSP) is an algorithm that receives turn " @@ -14320,14 +14448,19 @@ msgid "" "`Deprecated documentation `_" msgstr "" -#, fuzzy -msgid "``pgr_trspVia``" -msgstr "ダイクストラ関連機能" +msgid "``pgr_trspVia`` - Proposed" +msgstr "" msgid "" "``pgr_trspVia`` Route that goes through a list of vertices with restrictions." msgstr "" +msgid "New proposed function:" +msgstr "" + +msgid "``pgr_trspVia`` (`One Via`_)" +msgstr "" + 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 :" @@ -14405,15 +14538,17 @@ msgstr "" msgid ":doc:`via-category`" msgstr "" -#, fuzzy -msgid "``pgr_trspVia_withPoints``" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "``pgr_trspVia_withPoints`` - Proposed" +msgstr "" msgid "" "``pgr_trspVia_withPoints`` - Route that goes through a list of vertices and/" "or points with restrictions." msgstr "" +msgid "``pgr_trspVia_withPoints`` (`One Via`_)" +msgstr "" + msgid "" "Given a graph, a set of restriction on the graph edges, a set of points on " "the graphs edges and a list of vertices, this function is equivalent to " @@ -14573,12 +14708,30 @@ msgid "" "`pgr_trsp` algorithm. In this case a U turn is been done using the same edge." msgstr "" -msgid "``pgr_trsp_withPoints``" +msgid "pgr_trsp_withPoints - Proposed" msgstr "" msgid "``pgr_trsp_withPoints`` Routing Vertex/Point with restrictions." msgstr "" +msgid "New proposed signatures:" +msgstr "" + +msgid "``pgr_trsp_withPoints`` (`One to One`_)" +msgstr "" + +msgid "``pgr_trsp_withPoints`` (`One to Many`_)" +msgstr "" + +msgid "``pgr_trsp_withPoints`` (`Many to One`_)" +msgstr "" + +msgid "``pgr_trsp_withPoints`` (`Many to Many`_)" +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" @@ -14688,14 +14841,18 @@ msgid "" "`1` on an undirected graph, with details." msgstr "" -msgid "``pgr_turnRestrictedPath`` - Experimental" +msgid "pgr_turnRestrictedPath - Experimental" msgstr "" msgid "" -"``pgr_turnRestrictedPath`` Using Yen's algorithm Vertex - Vertex routing " -"with restrictions" +"``pgr_turnRestrictedPath`` Using Yen's algorithm Vertex -Vertex routing with " +"restrictions" msgstr "" +#, fuzzy +msgid "New experimental function" +msgstr "新しい **公式** 機能" + msgid "" "Using Yen's algorithm to obtain K shortest paths and analyze the paths to " "select the paths that do not use the restrictions" @@ -14767,7 +14924,7 @@ msgstr "" msgid "pgRouting Version for this documentation" msgstr "" -msgid "``pgr_vrpOneDepot`` - Experimental" +msgid "pgr_vrpOneDepot - Experimental" msgstr "" msgid "**No documentation available**" @@ -14776,9 +14933,8 @@ msgstr "" msgid "**TBD**" msgstr "" -#, fuzzy -msgid "``pgr_withPoints``" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "``pgr_withPoints`` - Proposed" +msgstr "" msgid "" "``pgr_withPoints`` - Returns the shortest path in a graph with additional " @@ -14920,9 +15076,8 @@ msgstr "" msgid "Passes in front or visits with left side driving." msgstr "" -#, fuzzy -msgid "``pgr_withPointsCost``" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "``pgr_withPointsCost`` - Proposed" +msgstr "" msgid "" "``pgr_withPointsCost`` - Calculates the shortest path and returns only the " @@ -15065,7 +15220,7 @@ msgstr "" msgid "Does not matter driving side driving topology" msgstr "" -msgid "``pgr_withPointsCostMatrix``" +msgid "``pgr_withPointsCostMatrix`` - proposed" msgstr "" msgid "" @@ -15097,9 +15252,8 @@ msgid "" "locations on the graph of point `(2.9, 1.8)`." msgstr "" -#, fuzzy -msgid "``pgr_withPointsDD``" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "``pgr_withPointsDD`` - Proposed" +msgstr "" msgid "" "``pgr_withPointsDD`` - Returns the driving **distance** from a starting " @@ -15111,10 +15265,7 @@ msgid "" "unnamed compulsory **driving side**." msgstr "" -msgid "pgr_withPointsDD(Single vertex)" -msgstr "" - -msgid "pgr_withPointsDD(Multiple vertices)" +msgid "``pgr_withPointsDD`` (`Single vertex`)" msgstr "" msgid "Added ``depth``, ``pred`` and ``start_vid`` column." @@ -15132,12 +15283,13 @@ msgid "" msgstr "" msgid "" -"pgr_withpointsdd(text,text,bigint,double precision,boolean,character,boolean)" +"``pgr_withpointsdd(text,text,bigint,double precision,boolean,character," +"boolean)``" msgstr "" msgid "" -"pgr_withpointsdd(text,text,anyarray,double precision,boolean,character," -"boolean,boolean)" +"``pgr_withpointsdd(text,text,anyarray,double precision,boolean,character," +"boolean,boolean)``" msgstr "" msgid "" @@ -15248,9 +15400,8 @@ msgstr "" msgid ":doc:`pgr_alphaShape`" msgstr "" -#, fuzzy -msgid "``pgr_withPointsKSP``" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_withPointsKSP - Proposed" +msgstr "" msgid "" "``pgr_withPointsKSP`` — Yen's algorithm for K shortest paths using Dijkstra." @@ -15259,23 +15410,27 @@ msgstr "" msgid "Standarizing output columns to |nksp-result|" msgstr "" -msgid "pgr_withPointsKSP(One to One)" +msgid "``pgr_withPointsKSP`` (One to One)" msgstr "" -msgid "pgr_withPointsKSP(One to Many)" +#, fuzzy +msgid "New overload functions" +msgstr "新しい **公式** 機能" + +msgid "``pgr_withPointsKSP`` (One to Many)" msgstr "" -msgid "pgr_withPointsKSP(Many to One)" +msgid "``pgr_withPointsKSP`` (Many to One)" msgstr "" -msgid "pgr_withPointsKSP(Many to Many)" +msgid "``pgr_withPointsKSP`` (Many to Many)" msgstr "" -msgid "pgr_withPointsKSP(Combinations)" +msgid "``pgr_withPointsKSP`` (Combinations)" msgstr "" msgid "" -"pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,char," +"``pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,char," "boolean)``" msgstr "" @@ -15397,15 +15552,17 @@ msgid "" "to point :math:`2` with heap paths and details." msgstr "" -#, fuzzy -msgid "``pgr_withPointsVia``" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "``pgr_withPointsVia`` - Proposed" +msgstr "" msgid "" "``pgr_withPointsVia`` - Route that goes through a list of vertices and/or " "points." msgstr "" +msgid "New **proposed** function ``pgr_withPointsVia`` (`One Via`_)" +msgstr "" + msgid "" "Given a graph, a set of points on the graphs edges and a list of vertices, " "this function is equivalent to finding the shortest path between :math:" @@ -15505,13 +15662,22 @@ msgid "" ":doc:`pgr_lineGraph` - Transformation algorithm for generating a Line Graph." msgstr "" +msgid ":doc:`pgr_withPointsVia`" +msgstr "" + +msgid ":doc:`pgr_trspVia`" +msgstr "" + +msgid ":doc:`pgr_trspVia_withPoints`" +msgstr "" + msgid ":doc:`withPoints-family` - Functions based on Dijkstra algorithm." msgstr "" msgid "From the :doc:`TRSP-family`:" msgstr "" -msgid "Utilities Category" +msgid "Utilities" msgstr "" msgid ":doc:`pgr_findCloseEdges`" @@ -15532,15 +15698,6 @@ msgstr "" msgid "Mayors" msgstr "" -msgid "pgRouting 4" -msgstr "" - -msgid "Minors 4.x" -msgstr "" - -msgid "pgRouting 4.0" -msgstr "" - msgid "pgRouting 3" msgstr "" @@ -15550,148 +15707,6 @@ msgstr "" msgid "pgRouting 3.7" msgstr "" -msgid "pgRouting 3.7.3 Release Notes" -msgstr "" - -msgid "" -"To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.7.3 `__" -msgstr "" - -msgid "" -"`#2731 `__ Build Failure " -"on Ubuntu 22" -msgstr "" - -msgid "pgRouting 3.7.2 Release Notes" -msgstr "" - -msgid "" -"To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.7.2 `__" -msgstr "" - -msgid "Build" -msgstr "" - -msgid "" -"`#2713 `__ cmake missing " -"some policies and min version" -msgstr "" - -msgid "Using OLD policies: CMP0148, CMP0144, CMP0167" -msgstr "" - -msgid "Minimum cmake version 3.12" -msgstr "" - -msgid "" -"`#2707 `__ Build failure " -"in pgRouting 3.7.1 on Alpine" -msgstr "" - -msgid "" -"`#2706 `__ winnie crashing " -"on pgr_betweennessCentrality" -msgstr "" - -msgid "pgRouting 3.7.1 Release Notes" -msgstr "" - -msgid "" -"To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.7.1 `__" -msgstr "" - -msgid "" -"`#2680 `__ fails to " -"compile under mingw64 gcc 13.2" -msgstr "" - -msgid "" -"`#2689 `__ When point is a " -"vertex, the withPoints family do not return results." -msgstr "" - -msgid "C/C++ code enhancemet" -msgstr "" - -#, fuzzy -msgid "TRSP family" -msgstr ":doc:`TSP-family`" - -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 "" -"`#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 "" - -msgid "Metrics" -msgstr "" - -msgid "pgr_betweennessCentrality" -msgstr "" - -msgid "Official functions changes" -msgstr "" - -msgid "" -"`#2605 `__ Standarize " -"spanning tree functions output" -msgstr "" - -msgid "Functions:" -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 "Code enhancement" -msgstr "" - -msgid "" -"`#2599 `__ Driving " -"distance cleanup" -msgstr "" - -msgid "" -"`#2607 `__ Read postgresql " -"data on C++" -msgstr "" - -msgid "" -"`#2614 `__ Clang tidy does " -"not work" -msgstr "" - msgid "pgRouting 3.6" msgstr "" @@ -15704,6 +15719,9 @@ msgid "" "utf8=%E2%9C%93&q=milestone%3A%22Release%203.6.3%22>`__" msgstr "" +msgid "Build" +msgstr "" + msgid "Explicit minimum requirements:" msgstr "" @@ -15810,11 +15828,31 @@ msgid "" "output pgr_aStar" msgstr "" +msgid "" +"``pgr_aStar`` (`One to One`) added ``start_vid`` and ``end_vid`` columns." +msgstr "" + +msgid "``pgr_aStar`` (`One to Many`) added ``end_vid`` column." +msgstr "" + +msgid "``pgr_aStar`` (`Many to One`) added ``start_vid`` column." +msgstr "" + msgid "" "`#2523 `__ Standarize " "output pgr_bdAstar" msgstr "" +msgid "" +"``pgr_bdAstar`` (`One to One`) added ``start_vid`` and ``end_vid`` columns." +msgstr "" + +msgid "``pgr_bdAstar`` (`One to Many`) added ``end_vid`` column." +msgstr "" + +msgid "``pgr_bdAstar`` (`Many to One`) added ``start_vid`` column." +msgstr "" + msgid "" "`#2547 `__ Standarize " "output and modifying signature pgr_KSP" @@ -15822,7 +15860,7 @@ msgstr "" msgid "" "`#2548 `__ Standarize " -"output pgr_drivingDistance" +"output pgr_drivingdistance" msgstr "" #, fuzzy @@ -15930,7 +15968,7 @@ msgstr "" msgid "" "`#2565 `__ " -"pgr_lengauerTarjanDominatorTree triggers an assertion" +"pgr_pgr_lengauerTarjanDominatorTree triggers an assertion" msgstr "" msgid "SQL enhancements" @@ -15970,6 +16008,16 @@ msgstr "" msgid "Dijkstra" msgstr "" +msgid "" +"``pgr_dijkstra`` (`One to One`) added ``start_vid`` and ``end_vid`` columns." +msgstr "" + +msgid "``pgr_dijkstra`` (`One to Many`) added ``end_vid`` column." +msgstr "" + +msgid "``pgr_dijkstra`` (`Many to One`) added ``start_vid`` column." +msgstr "" + msgid "pgRouting 3.4" msgstr "" @@ -16026,16 +16074,14 @@ msgid "" "doesn't give all correct shortest path" msgstr "" -#, fuzzy -msgid "New proposed functions." -msgstr "新しい **公式** 機能" +msgid "New proposed functions" +msgstr "" msgid "With points" msgstr "" -#, fuzzy -msgid "pgr_withPointsVia(One Via)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "``pgr_withPointsVia`` (One Via)" +msgstr "" msgid "Turn Restrictions" msgstr "" @@ -16043,73 +16089,82 @@ msgstr "" msgid "Via with turn restrictions" msgstr "" -msgid "pgr_trspVia(One Via)" +msgid "``pgr_trspVia`` (One Via)" msgstr "" -#, fuzzy -msgid "pgr_trspVia_withPoints(One Via)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "``pgr_trspVia_withPoints`` (One Via)" +msgstr "" -#, fuzzy -msgid "pgr_trsp_withPoints(One to One)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "``pgr_trsp``" +msgstr "" -#, fuzzy -msgid "pgr_trsp_withPoints(One to Many)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "``pgr_trsp`` (One to One)" +msgstr "" -#, fuzzy -msgid "pgr_trsp_withPoints(Many to One)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "``pgr_trsp`` (One to Many)" +msgstr "" -#, fuzzy -msgid "pgr_trsp_withPoints(Many to Many)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "``pgr_trsp`` (Many to One)" +msgstr "" -#, fuzzy -msgid "pgr_trsp_withPoints(Combinations)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "``pgr_trsp`` (Many to Many)" +msgstr "" -msgid "Topology" +msgid "``pgr_trsp`` (Combinations)" msgstr "" -msgid "Utilities" +msgid "``pgr_trsp_withPoints``" msgstr "" -msgid "pgr_findCloseEdges(One point)" +msgid "``pgr_trsp_withPoints`` (One to One)" msgstr "" -msgid "pgr_findCloseEdges(Many points)" +msgid "``pgr_trsp_withPoints`` (One to Many)" msgstr "" -msgid "Ordering" +msgid "``pgr_trsp_withPoints`` (Many to One)" msgstr "" -msgid "pgr_cuthillMckeeOrdering" +msgid "``pgr_trsp_withPoints`` (Many to Many)" msgstr "" -msgid "Unclassified" +msgid "``pgr_trsp_withPoints`` (Combinations)" +msgstr "" + +msgid "Topology" +msgstr "" + +msgid "``pgr_degree``" +msgstr "" + +msgid "``pgr_findCloseEdges`` (One point)" msgstr "" -msgid "pgr_hawickCircuits" +msgid "``pgr_findCloseEdges`` (Many points)" +msgstr "" + +msgid "Ordering" +msgstr "" + +msgid "``pgr_cuthillMckeeOrdering``" msgstr "" msgid "Flow functions" msgstr "" -msgid "pgr_maxCardinalityMatch(text)" +msgid "``pgr_maxCardinalityMatch(text)``" msgstr "" -msgid "Deprecating: pgr_maxCardinalityMatch(text,boolean)" +msgid "Deprecating ``pgr_maxCardinalityMatch(text,boolean)``" msgstr "" msgid "Deprecated Functions" msgstr "" -msgid "pgr_trsp(text,integer,float8,integer,float8,boolean,boolean,text)" +msgid "``pgr_trsp(text,integer,float8,integer,float8,boolean,boolean,text)``" msgstr "" -msgid "pgr_trspViaEdges(text,integer[],float[],boolean,boolean,text)" +msgid "``pgr_trspViaEdges(text,integer[],float[],boolean,boolean,text)``" msgstr "" msgid "pgRouting 3.3" @@ -16371,6 +16426,12 @@ msgstr "" msgid "Removing support for Boost v1.53, v1.54 & v1.55" msgstr "" +msgid "pgr_bellmanFord(Combinations)" +msgstr "" + +msgid "pgr_binaryBreadthFirstSearch(Combinations)" +msgstr "" + msgid "pgr_bipartite" msgstr "" @@ -16380,6 +16441,9 @@ msgstr "" msgid "Dijkstra Near" msgstr "" +msgid "pgr_edwardMoore(Combinations)" +msgstr "" + msgid "pgr_isPlanar" msgstr "" @@ -16389,15 +16453,51 @@ msgstr "" msgid "pgr_makeConnected" msgstr "" +msgid "pgr_maxFlowMinCost(Combinations)" +msgstr "" + +msgid "pgr_maxFlowMinCost_Cost(Combinations)" +msgstr "" + msgid "Astar" msgstr "" +msgid "pgr_aStar(Combinations)" +msgstr "" + +msgid "pgr_aStarCost(Combinations)" +msgstr "" + msgid "Bidirectional Astar" msgstr "" +msgid "pgr_bdAstar(Combinations)" +msgstr "" + +msgid "pgr_bdAstarCost(Combinations)" +msgstr "" + msgid "Bidirectional Dijkstra" msgstr "" +msgid "pgr_bdDijkstra(Combinations)" +msgstr "" + +msgid "pgr_bdDijkstraCost(Combinations)" +msgstr "" + +msgid "pgr_boykovKolmogorov(Combinations)" +msgstr "" + +msgid "pgr_edmondsKarp(Combinations)" +msgstr "" + +msgid "pgr_maxFlow(Combinations)" +msgstr "" + +msgid "pgr_pushRelabel(Combinations)" +msgstr "" + msgid "pgRouting 3.1" msgstr "" @@ -16632,7 +16732,7 @@ msgid "" "information" msgstr "" -msgid "New Functions" +msgid "New functions" msgstr "" msgid "Kruskal family" @@ -16671,115 +16771,148 @@ msgstr "" msgid "aStar Family" msgstr "" -#, fuzzy -msgid "pgr_aStarCost(One to One)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_aStar(one to many)" +msgstr "" -#, fuzzy -msgid "pgr_aStarCost(One to Many)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_aStar(many to one)" +msgstr "" -#, fuzzy -msgid "pgr_aStarCost(Many to One)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_aStar(many to many)" +msgstr "" -#, fuzzy -msgid "pgr_aStarCost(Many to Many)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_aStarCost(one to one)" +msgstr "" -#, fuzzy -msgid "pgr_aStarCostMatrix" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_aStarCost(one to many)" +msgstr "" + +msgid "pgr_aStarCost(many to one)" +msgstr "" + +msgid "pgr_aStarCost(many to many)" +msgstr "" + +msgid "pgr_aStarCostMatrix(one to one)" +msgstr "" + +msgid "pgr_aStarCostMatrix(one to many)" +msgstr "" + +msgid "pgr_aStarCostMatrix(many to one)" +msgstr "" + +msgid "pgr_aStarCostMatrix(many to many)" +msgstr "" msgid "bdAstar Family" msgstr "" -#, fuzzy -msgid "pgr_bdAstarCost(One to One)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_bdAstar(one to many)" +msgstr "" -#, fuzzy -msgid "pgr_bdAstarCost(One to Many)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_bdAstar(many to one)" +msgstr "" -#, fuzzy -msgid "pgr_bdAstarCost(Many to One)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_bdAstar(many to many)" +msgstr "" -#, fuzzy -msgid "pgr_bdAstarCost(Many to Many)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_bdAstarCost(one to one)" +msgstr "" -msgid "pgr_bdAstarCostMatrix" +msgid "pgr_bdAstarCost(one to many)" +msgstr "" + +msgid "pgr_bdAstarCost(many to one)" +msgstr "" + +msgid "pgr_bdAstarCost(many to many)" +msgstr "" + +msgid "pgr_bdAstarCostMatrix(one to one)" +msgstr "" + +msgid "pgr_bdAstarCostMatrix(one to many)" +msgstr "" + +msgid "pgr_bdAstarCostMatrix(many to one)" +msgstr "" + +msgid "pgr_bdAstarCostMatrix(many to many)" msgstr "" msgid "bdDijkstra Family" msgstr "" -#, fuzzy -msgid "pgr_bdDijkstraCost(One to One)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_bdDijkstra(one to many)" +msgstr "" -#, fuzzy -msgid "pgr_bdDijkstraCost(One to Many)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_bdDijkstra(many to one)" +msgstr "" -#, fuzzy -msgid "pgr_bdDijkstraCost(Many to One)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_bdDijkstra(many to many)" +msgstr "" -#, fuzzy -msgid "pgr_bdDijkstraCost(Many to Many)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_bdDijkstraCost(one to one)" +msgstr "" -msgid "pgr_bdDijkstraCostMatrix" +msgid "pgr_bdDijkstraCost(one to many)" +msgstr "" + +msgid "pgr_bdDijkstraCost(many to one)" +msgstr "" + +msgid "pgr_bdDijkstraCost(many to many)" +msgstr "" + +msgid "pgr_bdDijkstraCostMatrix(one to one)" +msgstr "" + +msgid "pgr_bdDijkstraCostMatrix(one to many)" +msgstr "" + +msgid "pgr_bdDijkstraCostMatrix(many to one)" +msgstr "" + +msgid "pgr_bdDijkstraCostMatrix(many to many)" msgstr "" msgid "Flow Family" msgstr "" -#, fuzzy -msgid "pgr_pushRelabel(One to One)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_pushRelabel(one to one)" +msgstr "" -#, fuzzy -msgid "pgr_pushRelabel(One to Many)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_pushRelabel(one to many)" +msgstr "" -#, fuzzy -msgid "pgr_pushRelabel(Many to One)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_pushRelabel(many to one)" +msgstr "" -#, fuzzy -msgid "pgr_pushRelabel(Many to Many)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_pushRelabel(many to many)" +msgstr "" -#, fuzzy -msgid "pgr_edmondsKarp(One to One)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_edmondsKarp(one to one)" +msgstr "" -#, fuzzy -msgid "pgr_edmondsKarp(One to Many)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_edmondsKarp(one to many)" +msgstr "" -#, fuzzy -msgid "pgr_edmondsKarp(Many to One)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_edmondsKarp(many to one)" +msgstr "" -#, fuzzy -msgid "pgr_edmondsKarp(Many to Many)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_edmondsKarp(many to many)" +msgstr "" -msgid "pgr_boykovKolmogorov (One to One)" +msgid "pgr_boykovKolmogorov (one to one)" msgstr "" -msgid "pgr_boykovKolmogorov (One to Many)" +msgid "pgr_boykovKolmogorov (one to many)" msgstr "" -msgid "pgr_boykovKolmogorov (Many to One)" +msgid "pgr_boykovKolmogorov (many to one)" msgstr "" -msgid "pgr_boykovKolmogorov (Many to Many)" +msgid "pgr_boykovKolmogorov (many to many)" msgstr "" msgid "pgr_maxCardinalityMatching" @@ -16788,26 +16921,19 @@ msgstr "" msgid "pgr_maxFlow" msgstr "" -#, fuzzy -msgid "pgr_edgeDisjointPaths(One to One)" -msgstr ":doc:`pgr_kruskalBFS`" - -#, fuzzy -msgid "pgr_edgeDisjointPaths(One to Many)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_edgeDisjointPaths(one to one)" +msgstr "" -#, fuzzy -msgid "pgr_edgeDisjointPaths(Many to One)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_edgeDisjointPaths(one to many)" +msgstr "" -#, fuzzy -msgid "pgr_edgeDisjointPaths(Many to Many)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_edgeDisjointPaths(many to one)" +msgstr "" -msgid "Components family" +msgid "pgr_edgeDisjointPaths(many to many)" msgstr "" -msgid "pgr_connectedComponents" +msgid "Components family" msgstr "" msgid "pgr_strongComponents" @@ -16996,7 +17122,7 @@ msgstr "" msgid "pgr_johnson" msgstr "" -msgid "pgr_aStar" +msgid "pgr_astar" msgstr "" msgid "pgr_bdAstar" @@ -17017,9 +17143,6 @@ msgstr "" msgid "pgr_drivingDistance" msgstr "" -msgid "pgr_KSP" -msgstr "" - msgid "pgr_dijkstraVia (proposed)" msgstr "" @@ -17218,15 +17341,23 @@ msgstr "" msgid "Parameter names changed" msgstr "" -msgid "The many version results are the union of the One to One version" +msgid "The many version results are the union of the one to one version" msgstr "" msgid "New Signatures" msgstr "" -#, fuzzy -msgid "pgr_bdAstar(One to One)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_bdAstar(one to one)" +msgstr "" + +msgid "New Proposed functions" +msgstr "" + +msgid "pgr_bdAstarCostMatrix" +msgstr "" + +msgid "pgr_bdDijkstraCostMatrix" +msgstr "" msgid "pgr_lineGraph" msgstr "" @@ -17308,7 +17439,31 @@ msgstr "" msgid "pgr_bdDijkstra" msgstr "" -msgid "Deprecated signatures." +msgid "New Proposed Signatures" +msgstr "" + +msgid "pgr_astar(one to many)" +msgstr "" + +msgid "pgr_astar(many to one)" +msgstr "" + +msgid "pgr_astar(many to many)" +msgstr "" + +msgid "pgr_astarCost(one to one)" +msgstr "" + +msgid "pgr_astarCost(one to many)" +msgstr "" + +msgid "pgr_astarCost(many to one)" +msgstr "" + +msgid "pgr_astarCost(many to many)" +msgstr "" + +msgid "pgr_astarCostMatrix" msgstr "" msgid "pgr_bddijkstra - use pgr_bdDijkstra instead" @@ -17380,48 +17535,52 @@ msgstr "" msgid "pgr_TSP" msgstr "pgr_TSP" +msgid "pgr_aStar" +msgstr "" + +msgid "New Functions" +msgstr "" + msgid "pgr_eucledianTSP" msgstr "" -msgid "pgr_maxFlowPushRelabel(One to One)" +msgid "pgr_withPointsCostMatrix" msgstr "" -msgid "pgr_maxFlowPushRelabel(One to Many)" +msgid "pgr_maxFlowPushRelabel(one to one)" msgstr "" -msgid "pgr_maxFlowPushRelabel(Many to One)" +msgid "pgr_maxFlowPushRelabel(one to many)" msgstr "" -#, fuzzy -msgid "pgr_maxFlowPushRelabel(Many to Many)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_maxFlowPushRelabel(many to one)" +msgstr "" -#, fuzzy -msgid "pgr_maxFlowEdmondsKarp(One to One)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_maxFlowPushRelabel(many to many)" +msgstr "" -#, fuzzy -msgid "pgr_maxFlowEdmondsKarp(One to Many)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_maxFlowEdmondsKarp(one to one)" +msgstr "" -#, fuzzy -msgid "pgr_maxFlowEdmondsKarp(Many to One)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_maxFlowEdmondsKarp(one to many)" +msgstr "" -#, fuzzy -msgid "pgr_maxFlowEdmondsKarp(Many to Many)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_maxFlowEdmondsKarp(many to one)" +msgstr "" + +msgid "pgr_maxFlowEdmondsKarp(many to many)" +msgstr "" -msgid "pgr_maxFlowBoykovKolmogorov (One to One)" +msgid "pgr_maxFlowBoykovKolmogorov (one to one)" msgstr "" -msgid "pgr_maxFlowBoykovKolmogorov (One to Many)" +msgid "pgr_maxFlowBoykovKolmogorov (one to many)" msgstr "" -msgid "pgr_maxFlowBoykovKolmogorov (Many to One)" +msgid "pgr_maxFlowBoykovKolmogorov (many to one)" msgstr "" -msgid "pgr_maxFlowBoykovKolmogorov (Many to Many)" +msgid "pgr_maxFlowBoykovKolmogorov (many to many)" msgstr "" msgid "pgr_maximumCardinalityMatching" @@ -17433,7 +17592,7 @@ msgstr "" msgid "pgr_tsp - use pgr_TSP or pgr_eucledianTSP instead" msgstr "" -msgid "pgr_aStar - use pgr_aStar instead" +msgid "pgr_astar - use pgr_aStar instead" msgstr "" msgid "pgr_flip_edges" @@ -17520,9 +17679,6 @@ msgstr "" msgid "Improvements" msgstr "" -msgid "pgr_nodeNetwork" -msgstr "" - msgid "Adding a row_where and outall optional parameters" msgstr "" @@ -17535,57 +17691,45 @@ msgstr "" msgid "pgr_Johnson" msgstr "" -#, fuzzy -msgid "pgr_dijkstraCost(One to One)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_dijkstraCost(one to one)" +msgstr "" -#, fuzzy -msgid "pgr_dijkstraCost(One to Many)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_dijkstraCost(one to many)" +msgstr "" -#, fuzzy -msgid "pgr_dijkstraCost(Many to One)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_dijkstraCost(many to one)" +msgstr "" -#, fuzzy -msgid "pgr_dijkstraCost(Many to Many)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_dijkstraCost(many to many)" +msgstr "" #, fuzzy msgid "Proposed Functionality" msgstr "次期リリース予定の機能。" -#, fuzzy -msgid "pgr_withPoints(One to One)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_withPoints(one to one)" +msgstr "" -#, fuzzy -msgid "pgr_withPoints(One to Many)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_withPoints(one to many)" +msgstr "" -#, fuzzy -msgid "pgr_withPoints(Many to One)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_withPoints(many to one)" +msgstr "" -#, fuzzy -msgid "pgr_withPoints(Many to Many)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_withPoints(many to many)" +msgstr "" -#, fuzzy -msgid "pgr_withPointsCost(One to One)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_withPointsCost(one to one)" +msgstr "" -#, fuzzy -msgid "pgr_withPointsCost(One to Many)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_withPointsCost(one to many)" +msgstr "" -#, fuzzy -msgid "pgr_withPointsCost(Many to One)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_withPointsCost(many to one)" +msgstr "" -#, fuzzy -msgid "pgr_withPointsCost(Many to Many)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_withPointsCost(many to many)" +msgstr "" msgid "pgr_withPointsDD(single vertex)" msgstr "" @@ -17593,6 +17737,9 @@ msgstr "" msgid "pgr_withPointsDD(multiple vertices)" msgstr "" +msgid "pgr_withPointsKSP" +msgstr "" + msgid "pgr_dijkstraVia" msgstr "" @@ -17626,12 +17773,26 @@ msgid "" "q=is%3Aissue+milestone%3A%22Release+2.1.0%22+is%3Aclosed>`_ on Github." msgstr "" +msgid "pgr_dijkstra(one to many)" +msgstr "" + +msgid "pgr_dijkstra(many to one)" +msgstr "" + +msgid "pgr_dijkstra(many to many)" +msgstr "" + +msgid "pgr_drivingDistance(multiple vertices)" +msgstr "" + msgid "Refactored" msgstr "" -#, fuzzy -msgid "pgr_dijkstra(One to One)" -msgstr ":doc:`pgr_kruskalBFS`" +msgid "pgr_dijkstra(one to one)" +msgstr "" + +msgid "pgr_drivingDistance(single vertex)" +msgstr "" msgid "" "pgr_alphaShape function now can generate better (multi)polygon with holes " @@ -18340,8 +18501,8 @@ msgid "" msgstr "" msgid "" -"pgRouting supplies some functions to create a routing topology and to " -"analyze the topology." +"pgRouting suplies some functions to create a routing topology and to analyze " +"the topology." msgstr "" msgid "Additional functions to create a graph:" @@ -18751,5 +18912,3 @@ msgstr "" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "" - -#, fuzzy diff --git a/locale/ko/LC_MESSAGES/index.po b/locale/ko/LC_MESSAGES/index.po index cf1f2f73ed9..9b4ec98d7ae 100644 --- a/locale/ko/LC_MESSAGES/index.po +++ b/locale/ko/LC_MESSAGES/index.po @@ -1,11 +1,11 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v4.0 +# Copyright (C) pgRouting Contributors - Version v3.8 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , YEAR. # msgid "" msgstr "" -"Project-Id-Version: pgRouting v4.0\n" +"Project-Id-Version: pgRouting v3.8\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-06-25 12:55-0500\n" "PO-Revision-Date: 2022-11-15 15:30+0000\n" diff --git a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po index ec441380428..ceb795f6991 100644 --- a/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/ko/LC_MESSAGES/pgrouting_doc_strings.po @@ -1,13 +1,13 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v4.0 +# Copyright (C) pgRouting Contributors - Version v3.8 # This file is distributed under the same license as the pgRouting package. # Regina Obe , 2022. # Hyung-Gyu Ryoo , 2022. msgid "" msgstr "" -"Project-Id-Version: pgRouting v4.0\n" +"Project-Id-Version: pgRouting v3.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-12 01:00+0000\n" +"POT-Creation-Date: 2024-10-17 00:50+0000\n" "PO-Revision-Date: 2022-12-13 12:30+0000\n" "Last-Translator: Hyung-Gyu Ryoo \n" "Language-Team: Korean `__" +"`Boost's metric appro's metric approximation `__" msgstr "" msgid "`University of Waterloo TSP `__" @@ -669,7 +669,7 @@ msgid "" "Traveling_salesman_problem>`__" msgstr "" -msgid "Vehicle Routing Functions - Category" +msgid "Vehicle Routing Functions - Category (Experimental)" msgstr "" msgid "Pickup and delivery problem" @@ -1618,8 +1618,8 @@ msgstr "" msgid "https://en.wikipedia.org/wiki/Vehicle_routing_problem" msgstr "" -msgid ":doc:`sampledata`" -msgstr ":doc:`sampledata`" +msgid "The queries use the :doc:`sampledata` network." +msgstr "" msgid "A* - Family of functions" msgstr "" @@ -1780,8 +1780,7 @@ msgstr "" msgid ":doc:`bdAstar-family`" msgstr ":doc:`bdAstar-family`" -msgid "" -"`Boost: A* search `__" +msgid "https://www.boost.org/libs/graph/doc/astar_search.html" msgstr "" msgid "https://en.wikipedia.org/wiki/A*_search_algorithm" @@ -2588,12 +2587,15 @@ msgid "" "ending vertex:" msgstr "" -msgid "It is expected to terminate faster than pgr_aStar" +msgid "It is expected to terminate faster than pgr_astar" msgstr "" msgid ":doc:`aStar-family`" msgstr ":doc:`aStar-family`" +msgid "Previous versions of this page" +msgstr "" + msgid "Bidirectional Dijkstra - Family of functions" msgstr "" @@ -2740,7 +2742,27 @@ msgid "Identifier of the color of the edge." msgstr "" msgid "" -"`Boost: `__" +"`Boost: Sequential Vertex Coloring algorithm documentation `__" +msgstr "" + +msgid "" +"`Wikipedia: Graph coloring `__" +msgstr "" + +msgid "" +"`Boost: is_bipartite `__" +msgstr "" + +msgid "" +"`Wikipedia: bipartite graph `__" +msgstr "" + +msgid "" +"`Boost: Edge Coloring Algorithm documentation `__" msgstr "" msgid "Components - Family of functions" @@ -2847,7 +2869,7 @@ msgstr "" msgid "Node" msgstr "" -msgid "Adjacent nodes" +msgid "Adjecent nodes" msgstr "" msgid "Number of adjacent nodes" @@ -3288,6 +3310,9 @@ msgstr "" msgid "Now, the routing graph has an edge connecting with node :math:`7`." msgstr "" +msgid ":doc:`sampledata`" +msgstr ":doc:`sampledata`" + msgid "" "https://www.cs.cmu.edu/afs/cs/academic/class/15210-f12/www/lectures/" "lecture16.pdf" @@ -3893,11 +3918,6 @@ msgid "" "an undirected graph." msgstr "" -msgid "" -":doc:`pgr_topologicalSort` - Linear ordering of the vertices for directed " -"acyclic graph." -msgstr "" - #, fuzzy msgid ":doc:`metrics-family`" msgstr ":doc:`prim-family`" @@ -3916,9 +3936,8 @@ msgstr "" msgid ":doc:`VRP-category`" msgstr ":doc:`VRP-category`" -#, fuzzy -msgid "Shortest Path Category" -msgstr "BFS - 카테고리" +msgid "Unclassified" +msgstr "" msgid ":doc:`pgr_bellmanFord`" msgstr ":doc:`pgr_bellmanFord`" @@ -3929,24 +3948,21 @@ msgstr ":doc:`pgr_dagShortestPath`" msgid ":doc:`pgr_edwardMoore`" msgstr ":doc:`pgr_edwardMoore`" -msgid "Planar Family" -msgstr "" - msgid ":doc:`pgr_isPlanar`" msgstr ":doc:`pgr_isPlanar`" -msgid "Miscellaneous Algoritms" -msgstr "" - -msgid ":doc:`pgr_lengauerTarjanDominatorTree`" -msgstr ":doc:`pgr_lengauerTarjanDominatorTree`" - msgid ":doc:`pgr_stoerWagner`" msgstr ":doc:`pgr_stoerWagner`" +msgid ":doc:`pgr_topologicalSort`" +msgstr ":doc:`pgr_topologicalSort`" + msgid ":doc:`pgr_transitiveClosure`" msgstr ":doc:`pgr_transitiveClosure`" +msgid ":doc:`pgr_lengauerTarjanDominatorTree`" +msgstr ":doc:`pgr_lengauerTarjanDominatorTree`" + msgid ":doc:`pgr_hawickCircuits`" msgstr ":doc:`pgr_hawickCircuits`" @@ -4379,187 +4395,109 @@ msgstr ":doc:`experimental`" msgid ":doc:`release_notes`" msgstr ":doc:`release_notes`" -msgid "pgRouting 4.0.0 Release Notes" +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 4.0.0 `__" -msgstr "" - -msgid "Functions promoted to official" -msgstr "" - -#, fuzzy -msgid "pgr_trsp" -msgstr ":doc:`pgr_trsp`" - -#, fuzzy -msgid "pgr_trspVia" -msgstr ":doc:`pgr_trspVia`" - -#, fuzzy -msgid "pgr_trspVia_withPoints" -msgstr ":doc:`pgr_trspVia_withPoints`" - -#, fuzzy -msgid "pgr_trsp_withPoints" -msgstr ":doc:`pgr_trspVia_withPoints`" - -#, fuzzy -msgid "pgr_withPoints" -msgstr ":doc:`pgr_withPoints`" - -#, fuzzy -msgid "pgr_withPointsCost" -msgstr ":doc:`pgr_withPointsCost`" - -msgid "pgr_withPointsCostMatrix" -msgstr "" - -#, fuzzy -msgid "pgr_withPointsDD" -msgstr ":doc:`pgr_withPoints`" - -msgid "pgr_withPointsKSP" -msgstr "" - -#, fuzzy -msgid "pgr_withPointsVia" -msgstr ":doc:`pgr_withPointsVia`" - -msgid "Signatures promoted to official" -msgstr "" - -msgid "pgr_aStar(Combinations)" -msgstr "" - -msgid "pgr_aStarCost(Combinations)" -msgstr "" - -msgid "pgr_bdAstar(Combinations)" -msgstr "" - -msgid "pgr_bdAstarCost(Combinations)" +"milestone for 3.7.0 `__" msgstr "" -msgid "pgr_bdDijkstra(Combinations)" +msgid "Support" msgstr "" -msgid "pgr_bdDijkstraCost(Combinations)" +msgid "" +"`#2656 `__ Stop support of " +"PostgreSQL12 on pgrouting v3.7" msgstr "" #, fuzzy -msgid "pgr_dijkstra(Combinations)" -msgstr ":doc:`pgr_withPointsCostMatrix`" - -#, fuzzy -msgid "pgr_dijkstraCost(Combinations)" -msgstr ":doc:`pgr_withPointsCostMatrix`" - -msgid "pgr_KSP(All signatures)" -msgstr "" - -msgid "pgr_boykovKolmogorov(Combinations)" -msgstr "" - -msgid "pgr_edmondsKarp(Combinations)" -msgstr "" - -msgid "pgr_maxFlow(Combinations)" -msgstr "" - -msgid "pgr_pushRelabel(Combinations)" -msgstr "" +msgid "Stopping support of PostgreSQL 12" +msgstr "PostgreSQL 설정" -msgid "code enhancements:" +msgid "CI does not test for PostgreSQL 12" msgstr "" -msgid "Removal of unused C/C++ code" +msgid "New experimental functions" msgstr "" -msgid "Removal of SQL deprecated functions" +msgid "Metrics" msgstr "" -msgid "" -"pgr_trsp(text,integer,double precision,integer,double precision,boolean," -"boolean,text)" +msgid "pgr_betweennessCentrality" msgstr "" -msgid "pgr_trsp(text,integer,integer,boolean,boolean,text)" +msgid "Official functions changes" msgstr "" msgid "" -"pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)" +"`#2605 `__ Standarize " +"spanning tree functions output" msgstr "" -msgid "pgr_trspviavertices(text,anyarray,boolean,boolean,text)" +msgid "Functions:" msgstr "" -msgid "Removal of SQL deprecated internal functions" +msgid "``pgr_kruskalDD``" msgstr "" -msgid "_pgr_dijkstranear(text,anyarray,anyarray,bigint,boolean)" +msgid "``pgr_kruskalDFS``" msgstr "" -msgid "_pgr_dijkstranear(text,anyarray,bigint,bigint,boolean)" +msgid "``pgr_kruskalBFS``" msgstr "" -msgid "_pgr_dijkstranear(text,bigint,anyarray,bigint,boolean)" +msgid "``pgr_primDD``" msgstr "" -msgid "_pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean,bigint)" +msgid "``pgr_primDFS``" msgstr "" -msgid "_pgr_dijkstra(text,text,boolean,boolean,boolean)" +msgid "``pgr_primBFS``" msgstr "" -msgid "_pgr_drivingdistance(text,anyarray,double precision,boolean,boolean)" +msgid "Standarizing output columns to |result-spantree|" msgstr "" -msgid "_pgr_kruskal(text,anyarray,text,bigint,double precision)" +msgid "Added ``pred`` result columns." msgstr "" -msgid "_pgr_prim(text,anyarray,text,bigint,double precision)" +msgid "Experimental promoted to proposed." msgstr "" msgid "" -"_pgr_trsp(text,integer,double precision,integer,double precision,boolean," -"boolean,text)" -msgstr "" - -msgid "_pgr_trsp(text,text,anyarray,anyarray,boolean)" -msgstr "" - -msgid "_pgr_trsp(text,text,anyarray,bigint,boolean)" -msgstr "" - -msgid "_pgr_trsp(text,text,bigint,anyarray,boolean)" -msgstr "" - -msgid "_pgr_trsp(text,text,bigint,bigint,boolean)" +"`#2635 `__ pgr_LineGraph " +"ignores directed flag and use negative values for identifiers." msgstr "" -msgid "_pgr_trspviavertices(text,integer[],boolean,boolean,text)" -msgstr "" +#, fuzzy +msgid "``pgr_lineGraph``" +msgstr ":doc:`pgr_analyzeGraph`" -msgid "_pgr_withpointsvia(text,bigint[],double precision[],boolean)" +msgid "Promoted to **proposed** signature." msgstr "" -msgid "_trsp(text,text,anyarray,anyarray,boolean)" -msgstr "" +#, fuzzy +msgid "Works for directed and undirected graphs." +msgstr ":doc:`pgr_bridges` - 무방향 그래프의 브릿지." -msgid "_v4trsp(text,text,anyarray,anyarray,boolean)" +msgid "Code enhancement" msgstr "" -msgid "_v4trsp(text,text,text,boolean)" +msgid "" +"`#2599 `__ Driving " +"distance cleanup" msgstr "" -msgid "Deprecation of internal C/C++ functions" +msgid "" +"`#2607 `__ Read postgresql " +"data on C++" msgstr "" -msgid "Internal C/C++ functions in legacy" +msgid "" +"`#2614 `__ Clang tidy does " +"not work" msgstr "" msgid "All releases" @@ -4568,6 +4506,9 @@ msgstr "" msgid "Kruskal - Family of functions" msgstr "" +msgid "Boost Graph Inside" +msgstr "" + msgid "" "Kruskal's algorithm is a greedy minimum spanning tree algorithm that in each " "cycle finds and adds the edge of the least possible weight that connects any " @@ -4601,6 +4542,14 @@ msgstr "" msgid "All deprecated functions will be removed on next mayor version 4.0.0" msgstr "" +#, fuzzy +msgid "Migration of functions" +msgstr ":doc:`pgr_withPoints`" + +#, fuzzy +msgid "Migrating functions" +msgstr ":doc:`routingFunctions`" + msgid "Migration of ``pgr_aStar``" msgstr "" @@ -4754,7 +4703,7 @@ msgid "If needed add the new columns, for example:" msgstr "" #, fuzzy -msgid "Migration of ``pgr_drivingDistance``" +msgid "Migration of ``pgr_drivingdistance``" msgstr ":doc:`pgr_withPoints`" msgid "" @@ -4775,12 +4724,11 @@ msgid "|result-spantree|" msgstr "" #, fuzzy -msgid "pgr_drivingDistance(Single vertex)" +msgid "``pgr_drivingdistance`` (Single vertex)" msgstr ":doc:`pgr_drivingDistance`" -#, fuzzy -msgid "pgr_drivingDistance(Multiple vertices)" -msgstr ":doc:`pgr_drivingDistance`" +msgid "``pgr_drivingdistance`` (Multiple vertices)" +msgstr "" msgid "Output columns were |result-dij-dd|" msgstr "" @@ -4839,21 +4787,12 @@ msgstr "" msgid "|result-bfs|" msgstr "" -msgid "``pgr_kruskalDD``" -msgstr "" - msgid "Single vertex" msgstr "" msgid "Multiple vertices" msgstr "" -msgid "``pgr_kruskalDFS``" -msgstr "" - -msgid "``pgr_kruskalBFS``" -msgstr "" - msgid "Output columns were |result-bfs|" msgstr "" @@ -5009,15 +4948,6 @@ msgid "" "are being standardized." msgstr "" -msgid "``pgr_primDD``" -msgstr "" - -msgid "``pgr_primDFS``" -msgstr "" - -msgid "``pgr_primBFS``" -msgstr "" - msgid "Prim single vertex" msgstr "" @@ -5215,278 +5145,389 @@ msgid "" "original columns:" msgstr "" -msgid "Migration of ``pgr_trsp`` (Vertices)" +msgid "Migration of turn restrictions" msgstr "" -msgid "Signature:" +msgid "Migration of restrictions" msgstr "" -msgid "Deprecated" +msgid "The structure of the restrictions have changed:" msgstr "" -msgid "`v3.4.0 `__" +msgid "Old restrictions structure" msgstr "" -msgid "Removed" +msgid "On the deprecated signatures:" msgstr "" -msgid "`v4.0.0 `__" +msgid "Column ``rid`` is ignored" msgstr "" -#, fuzzy -msgid ":doc:`pgr_dijkstra`" -msgstr ":doc:`pgr_dijkstraVia`" - -msgid ":doc:`pgr_trsp`" -msgstr ":doc:`pgr_trsp`" - -#, fuzzy -msgid "`Migration of restrictions`_" -msgstr ":doc:`pgr_withPoints`" - -msgid "Use ``pgr_dijkstra`` when there are no restrictions." +msgid "``via_path``" msgstr "" -msgid "Use :doc:`pgr_dijkstra` instead." +msgid "Must be in reverse order." msgstr "" -msgid "To get the original column names:" +msgid "Is of type ``TEXT``." msgstr "" -msgid "``id1`` is the node" +msgid "When more than one via edge must be separated with ``,``." msgstr "" -msgid "``id2`` is the edge" +msgid "``target_id``" msgstr "" -msgid "Use ``pgr_trsp`` when there are restrictions." +msgid "Is the last edge of the forbidden path." msgstr "" -msgid "Use :doc:`pgr_trsp` (One to One) instead." +msgid "Is of type ``INTEGER``." msgstr "" -msgid "Migration of ``pgr_trsp`` (Edges)" +msgid "``to_cost``" msgstr "" -msgid ":doc:`pgr_withPoints`" -msgstr ":doc:`pgr_withPoints`" +msgid "Is of type ``FLOAT``." +msgstr "" -#, fuzzy -msgid ":doc:`pgr_trsp_withPoints`" -msgstr ":doc:`pgr_trspVia_withPoints`" +msgid "Creation of the old restrictions table" +msgstr "" -msgid "Use ``pgr_withPoints`` when there are no restrictions." +msgid "Old restrictions fill up" msgstr "" -#, fuzzy -msgid "Use :doc:`pgr_withPoints` (One to One) instead." -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "Old restrictions contents" +msgstr "" -msgid "Use ``pgr_trsp_withPoints`` when there are restrictions." +msgid "" +"The restriction with ``rid = 2`` is representing :math:`3 \\rightarrow 5 " +"\\rightarrow9`" msgstr "" -msgid "Use :doc:`pgr_trsp_withPoints` instead." +msgid ":math:`3\\rightarrow5`" msgstr "" -#, fuzzy -msgid "Migration of ``pgr_trspViaVertices``" -msgstr ":doc:`pgr_withPoints`" +msgid "is on column ``via_path`` in reverse order" +msgstr "" -msgid ":doc:`pgr_dijkstraVia`" -msgstr ":doc:`pgr_dijkstraVia`" +msgid "is of type ``TEXT``" +msgstr "" -msgid ":doc:`pgr_trspVia`" -msgstr ":doc:`pgr_trspVia`" +msgid ":math:`9`" +msgstr "" -msgid "Use ``pgr_dijkstraVia`` when there are no restrictions" +msgid "is on column ``target_id``" msgstr "" -#, fuzzy -msgid "Use :doc:`pgr_dijkstraVia` instead." -msgstr ":doc:`pgr_dijkstraVia`" - -msgid "``id1`` is the path identifier" +msgid "is of type ``INTEGER``" msgstr "" -msgid "``id2`` is the node" +msgid "New restrictions structure" msgstr "" -msgid "``id3`` is the edge" +msgid "Column ``id`` is ignored" msgstr "" -msgid "Use ``pgr_trspVia`` when there are restrictions" +msgid "Column ``path``" msgstr "" -#, fuzzy -msgid "Use :doc:`pgr_trspVia` instead." -msgstr ":doc:`pgr_trspVia`" +msgid "Is of type ``ARRAY[ANY-INTEGER]``." +msgstr "" -#, fuzzy -msgid "Migration of ``pgr_trspViaEdges``" -msgstr ":doc:`pgr_withPoints`" +msgid "Contains all the edges involved on the restriction." +msgstr "" -msgid ":doc:`pgr_withPointsVia`" -msgstr ":doc:`pgr_withPointsVia`" +msgid "The array has the ordered edges of the restriction." +msgstr "" -msgid ":doc:`pgr_trspVia_withPoints`" -msgstr ":doc:`pgr_trspVia_withPoints`" +msgid "Column ``cost``" +msgstr "" -msgid "Use ``pgr_withPointsVia`` when there are no restrictions" +msgid "Is of type ``ANY-NUMERICAL``" msgstr "" -#, fuzzy -msgid "Use :doc:`pgr_withPointsVia` instead." -msgstr ":doc:`pgr_withPointsVia`" +msgid "The creation of the restrictions table" +msgstr "" -msgid "Use ``pgr_trspVia_withPoints`` when there are restrictions" +msgid "Adding the restrictions" msgstr "" -msgid "Use :doc:`pgr_trspVia_withPoints` instead." +msgid "Restrictions data" msgstr "" -msgid "Migration of restrictions" +msgid "" +"The restriction with ``rid = 2`` represents the path :math:`3 \\rightarrow5 " +"\\rightarrow9`." msgstr "" -msgid "The structure of the restrictions have changed:" +msgid "By inspection the path is clear." msgstr "" -msgid "Old restrictions structure" +msgid "" +"To transform the old restrictions table to the new restrictions structure," msgstr "" -msgid "On the deprecated signatures:" +msgid "Create a new table with the new restrictions structure." msgstr "" -msgid "Column ``rid`` is ignored" +msgid "In this migration guide ``new_restrictions`` is been used." msgstr "" -msgid "``via_path``" +msgid "" +"For this migration pgRouting supplies an auxiliary function for reversal of " +"an array ``_pgr_array_reverse`` needed for the migration." msgstr "" -msgid "Must be in reverse order." +msgid "``_pgr_array_reverse``:" msgstr "" -msgid "Is of type ``TEXT``." +msgid "Was created temporally for this migration" msgstr "" -msgid "When more than one via edge must be separated with ``,``." +msgid "Is not documented." msgstr "" -msgid "``target_id``" +msgid "Will be removed on the next mayor version 4.0.0" msgstr "" -msgid "Is the last edge of the forbidden path." +msgid "The migrated table contents:" msgstr "" -msgid "Is of type ``INTEGER``." +msgid "Migration of ``pgr_trsp`` (Vertices)" msgstr "" -msgid "``to_cost``" +msgid "" +":doc:`pgr_trsp` signatures have changed and many issues have been fixed in " +"the new signatures. This section will show how to migrate from the old " +"signatures to the new replacement functions. This also affects the " +"restrictions." msgstr "" -msgid "Is of type ``FLOAT``." +msgid "The integral type of the ``Edges SQL`` can only be ``INTEGER``." msgstr "" -msgid "Creation of the old restrictions table" +msgid "The floating point type of the ``Edges SQL`` can only be ``FLOAT``." msgstr "" -msgid "Old restrictions fill up" +msgid "``directed`` flag is compulsory." msgstr "" -msgid "Old restrictions contents" +msgid "Does not autodetect if ``reverse_cost`` column exist." msgstr "" msgid "" -"The restriction with ``rid = 2`` is representing :math:`3 \\rightarrow 5 " -"\\rightarrow9`" +"User must be careful to match the existence of the column with the value of " +"``has_rcost`` parameter." msgstr "" -msgid ":math:`3\\rightarrow5`" +msgid "The restrictions inner query is optional." msgstr "" -msgid "is on column ``via_path`` in reverse order" +msgid "The output column names are meaningless" msgstr "" -msgid "is of type ``TEXT``" +msgid "Migrate by using:" msgstr "" -msgid ":math:`9`" +msgid ":doc:`pgr_dijkstra` when there are no restrictions," msgstr "" -msgid "is on column ``target_id``" +msgid ":doc:`pgr_trsp` (One to One) when there are restrictions." msgstr "" -msgid "is of type ``INTEGER``" +msgid "Migrating ``pgr_trsp`` (Vertices) using ``pgr_dijkstra``" msgstr "" -msgid "New restrictions structure" +msgid "The following query does not have restrictions." msgstr "" -msgid "Column ``id`` is ignored" +msgid "A message about deprecation is shown" msgstr "" -msgid "Column ``path``" +msgid "Deprecated functions will be removed on the next mayor version 4.0.0" msgstr "" -msgid "Is of type ``ARRAY[ANY-INTEGER]``." +msgid "Use :doc:`pgr_dijkstra` instead." msgstr "" -msgid "Contains all the edges involved on the restriction." +msgid "The types casting has been removed." msgstr "" -msgid "The array has the ordered edges of the restriction." +msgid ":doc:`pgr_dijkstra`:" msgstr "" -msgid "Column ``cost``" +msgid "Autodetects if ``reverse_cost`` column is in the edges SQL." msgstr "" -msgid "Is of type ``ANY-NUMERICAL``" +msgid "Accepts ``ANY-INTEGER`` on integral types" msgstr "" -msgid "The creation of the restrictions table" +msgid "Accepts ``ANY-NUMERICAL`` on floating point types" msgstr "" -msgid "Adding the restrictions" +msgid "``directed`` flag has a default value of ``true``." msgstr "" -msgid "Restrictions data" +msgid "Use the same value that on the original query." +msgstr "" + +msgid "In this example it is ``true`` which is the default value." +msgstr "" + +msgid "The flag has been omitted and the default is been used." msgstr "" msgid "" -"The restriction with ``rid = 2`` represents the path :math:`3 \\rightarrow5 " -"\\rightarrow9`." +"When the need of using strictly the same (meaningless) names and types of " +"the function been migrated then:" msgstr "" -msgid "By inspection the path is clear." +msgid "``id1`` is the node" +msgstr "" + +msgid "``id2`` is the edge" +msgstr "" + +msgid "Migrating ``pgr_trsp`` (Vertices) using ``pgr_trsp``" +msgstr "" + +msgid "The following query has restrictions." +msgstr "" + +msgid "The restrictions are the last parameter of the function" +msgstr "" + +msgid "Using the old structure of restrictions" +msgstr "" + +msgid "Use :doc:`pgr_trsp` (One to One) instead." +msgstr "" + +msgid "The new structure of restrictions is been used." +msgstr "" + +msgid "It is the second parameter." +msgstr "" + +msgid ":doc:`pgr_trsp`:" +msgstr "" + +msgid "Migration of ``pgr_trsp`` (Edges)" +msgstr "" + +msgid "The integral types of the ``sql`` can only be ``INTEGER``." +msgstr "" + +msgid "The floating point type of the ``sql`` can only be ``FLOAT``." +msgstr "" + +msgid "For these migration guide the following points will be used:" +msgstr "" + +msgid ":doc:`pgr_withPoints` when there are no restrictions," +msgstr "" + +msgid ":doc:`pgr_trsp_withPoints` (One to One) when there are restrictions." +msgstr "" + +msgid "Migrating ``pgr_trsp`` (Edges) using ``pgr_withPoints``" +msgstr "" + +msgid "Use :doc:`pgr_withPoints` instead." +msgstr "" + +msgid "Do not show details, as the deprecated function does not show details." +msgstr "" + +msgid ":doc:`pgr_withPoints`:" +msgstr "" + +msgid "On the points query do not include the ``side`` column." msgstr "" msgid "" -"To transform the old restrictions table to the new restrictions structure," +"When the need of using strictly the same (meaningless) names and types, and " +"node values of the function been migrated then:" msgstr "" -msgid "Create a new table with the new restrictions structure." +msgid "Migrating ``pgr_trsp`` (Edges) using ``pgr_trsp_withPoints``" msgstr "" -msgid "In this migration guide ``new_restrictions`` is been used." +msgid "Use :doc:`pgr_trsp_withPoints` instead." +msgstr "" + +msgid ":doc:`pgr_trsp_withPoints`:" +msgstr "" + +msgid "Migration of ``pgr_trspViaVertices``" +msgstr "" + +msgid "The integral types of the ``Edges SQL`` can only be ``INTEGER``." +msgstr "" + +msgid ":doc:`pgr_dijkstraVia` when there are no restrictions," +msgstr "" + +msgid ":doc:`pgr_trspVia` when there are restrictions." +msgstr "" + +msgid "Migrating ``pgr_trspViaVertices`` using ``pgr_dijkstraVia``" +msgstr "" + +msgid "Use :doc:`pgr_dijkstraVia` instead." +msgstr "" + +msgid ":doc:`pgr_dijkstraVia`:" +msgstr "" + +msgid "``id1`` is the path identifier" +msgstr "" + +msgid "``id2`` is the node" +msgstr "" + +msgid "``id3`` is the edge" +msgstr "" + +msgid "Migrating ``pgr_trspViaVertices`` using ``pgr_trspVia``" +msgstr "" + +msgid "Use :doc:`pgr_trspVia` instead." +msgstr "" + +msgid ":doc:`pgr_trspVia`:" +msgstr "" + +msgid "Migration of ``pgr_trspViaEdges``" msgstr "" msgid "" -"For this migration pgRouting supplies an auxiliary function for reversal of " -"an array ``_pgr_array_reverse`` needed for the migration." +"And will travel thru the following Via points :math:" +"`4\\rightarrow3\\rightarrow6`" msgstr "" -msgid "``_pgr_array_reverse``:" +msgid ":doc:`pgr_withPointsVia` when there are no restrictions," msgstr "" -msgid "Was created temporally for this migration" +msgid ":doc:`pgr_trspVia_withPoints` when there are restrictions." msgstr "" -msgid "Is not documented." +msgid "Migrating ``pgr_trspViaEdges`` using ``pgr_withPointsVia``" msgstr "" -msgid "Will be removed on the next mayor version 4.0.0" +msgid "Use :doc:`pgr_withPointsVia` instead." msgstr "" -msgid "The migrated table contents:" +msgid ":doc:`pgr_withPointsVia`:" +msgstr "" + +msgid "Migrating ``pgr_trspViaEdges`` using ``pgr_trspVia_withPoints``" +msgstr "" + +msgid "Use :doc:`pgr_trspVia_withPoints` instead." +msgstr "" + +msgid ":doc:`pgr_trspVia_withPoints`:" msgstr "" msgid ":doc:`withPoints-category`" @@ -6623,6 +6664,9 @@ msgstr "" msgid "Parameters for the Via functions" msgstr "" +msgid ":doc:`pgr_dijkstraVia`" +msgstr ":doc:`pgr_dijkstraVia`" + msgid "SQL query as described." msgstr "" @@ -6662,6 +6706,9 @@ msgstr "" msgid "For the TRSP functions" msgstr "" +msgid ":doc:`pgr_trsp`" +msgstr ":doc:`pgr_trsp`" + msgid "Array of identifiers of destination vertices." msgstr "" @@ -6714,6 +6761,9 @@ msgstr "" msgid "Used in functions the following:" msgstr "" +msgid ":doc:`pgr_withPoints`" +msgstr ":doc:`pgr_withPoints`" + msgid "" "Returns set of ``(seq, path_seq [, start_pid] [, end_pid], node, edge, cost, " "agg_cost)``" @@ -6998,7 +7048,7 @@ msgid "Upgrading the database" msgstr "데이터베이스 업그레이드" msgid "" -"To upgrade pgRouting in the database to version 4.0.0 use the following " +"To upgrade pgRouting in the database to version 3.7.0 use the following " "command:" msgstr "" @@ -7446,9 +7496,8 @@ msgstr "" msgid ":doc:`migration`" msgstr ":doc:`migration`" -#, fuzzy -msgid "``pgr_KSP``" -msgstr ":doc:`pgr_withPoints`" +msgid "pgr_KSP" +msgstr "" msgid "``pgr_KSP`` — Yen's algorithm for K shortest paths using Dijkstra." msgstr "" @@ -7456,12 +7505,6 @@ msgstr "" msgid "Availability" msgstr "" -msgid "Version 4.0.0" -msgstr "" - -msgid "All signatures promoted to official." -msgstr "" - msgid "Version 3.6.0" msgstr "" @@ -7469,29 +7512,29 @@ msgid "Result columns standarized to: |nksp-result|" msgstr "" #, fuzzy -msgid "pgr_ksp(One to One)" +msgid "``pgr_ksp`` (One to One)" msgstr ":doc:`pgr_withPointsCostMatrix`" msgid "Added ``start_vid`` and ``end_vid`` result columns." msgstr "" -msgid "New proposed signatures:" +msgid "New overload functions:" msgstr "" #, fuzzy -msgid "pgr_ksp(One to Many)" +msgid "``pgr_ksp`` (One to Many)" msgstr ":doc:`pgr_withPointsCostMatrix`" #, fuzzy -msgid "pgr_ksp(Many to One)" +msgid "``pgr_ksp`` (Many to One)" msgstr ":doc:`pgr_withPointsCostMatrix`" #, fuzzy -msgid "pgr_ksp(Many to Many)" +msgid "``pgr_ksp`` (Many to Many)" msgstr ":doc:`pgr_withPointsCostMatrix`" #, fuzzy -msgid "pgr_ksp(Combinations)" +msgid "``pgr_ksp`` (Combinations)" msgstr ":doc:`pgr_withPointsCostMatrix`" msgid "Version 2.1.0" @@ -7506,7 +7549,7 @@ msgstr "" msgid "Version 2.0.0" msgstr "" -msgid "Official function." +msgid "**Official** function" msgstr "" msgid "" @@ -7514,12 +7557,6 @@ msgid "" "number of shortest paths desired." msgstr "" -msgid "|Boost| Boost Graph Inside" -msgstr "" - -msgid "Boost Graph Inside" -msgstr "" - msgid "Signatures" msgstr "" @@ -7864,11 +7901,6 @@ msgstr "" msgid "``pgr_TSPeuclidean`` - Aproximation using *metric* algorithm." msgstr "" -msgid "" -"Using `Boost: metric TSP approx `__" -msgstr "" - msgid "" "The Simulated Annealing Algorithm related parameters are ignored: " "`max_processing_time`, `tries_per_temperature`, " @@ -7882,7 +7914,7 @@ msgstr "" msgid "Name change from pgr_eucledianTSP" msgstr "" -msgid "New official function." +msgid "New **Official** function" msgstr "" msgid "" @@ -7963,54 +7995,57 @@ msgid "" "obtained with ``pgr_TSPeuclidean``." msgstr "" -msgid "``pgr_aStar``" +msgid ":doc:`sampledata` network." msgstr "" -msgid "``pgr_aStar`` — Shortest path using the A* algorithm." +msgid "``pgr_aStar``" msgstr "" -msgid "Combinations signature promoted to official." +msgid "``pgr_aStar`` — Shortest path using the A* algorithm." msgstr "" msgid "Standarizing output columns to |short-generic-result|" msgstr "" -msgid "pgr_aStar(One to One) added ``start_vid`` and ``end_vid`` columns." +msgid "" +"``pgr_aStar`` (`One to One`_) added ``start_vid`` and ``end_vid`` columns." msgstr "" -msgid "pgr_aStar(One to Many) added ``end_vid`` column." +msgid "``pgr_aStar`` (`One to Many`_) added ``end_vid`` column." msgstr "" -msgid "pgr_aStar(Many to One) added ``start_vid`` column." +msgid "``pgr_aStar`` (`Many to One`_) added ``start_vid`` column." msgstr "" msgid "Version 3.2.0" msgstr "" -msgid "New proposed signature:" +msgid "New **proposed** signature:" msgstr "" -msgid "Function promoted to official." +msgid "``pgr_aStar`` (`Combinations`_)" msgstr "" msgid "Version 2.4.0" msgstr "" -#, fuzzy -msgid "pgr_aStar(One to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "New **Proposed** signatures:" +msgstr "" -#, fuzzy -msgid "pgr_aStar(Many to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "``pgr_aStar`` (`One to Many`_)" +msgstr "" -#, fuzzy -msgid "pgr_aStar(Many to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "``pgr_aStar`` (`Many to One`_)" +msgstr "" -#, fuzzy -msgid "Signature change on pgr_aStar(One to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "``pgr_aStar`` (`Many to Many`_)" +msgstr "" + +msgid "Signature change on ``pgr_astar`` (`One to One`_)" +msgstr "" + +msgid "**Official** ``pgr_aStar`` (`One to One`_)" +msgstr "" msgid "" "The results are equivalent to the union of the results of the `pgr_aStar(` " @@ -8083,18 +8118,19 @@ msgstr "" msgid "Manually assigned vertex combinations." msgstr "" -#, fuzzy -msgid "``pgr_aStarCost``" -msgstr ":doc:`pgr_aStarCost`" +msgid "pgr_aStarCost" +msgstr "" #, fuzzy msgid "" "``pgr_aStarCost`` - Total cost of the shortest path using the A* algorithm." msgstr ":doc:`pgr_aStarCost` - 최단 경로의 집계 비용 반환." -#, fuzzy -msgid "New proposed function." -msgstr ":doc:`routingFunctions`" +msgid "``pgr_aStarCost`` (`Combinations`_)" +msgstr "" + +msgid "New **proposed** function" +msgstr "" #, fuzzy msgid "" @@ -8214,9 +8250,6 @@ msgstr "" msgid "Renamed from version 1.x" msgstr "" -msgid "Support" -msgstr "" - msgid "Returns the polygon part of an alpha shape." msgstr "" @@ -8289,9 +8322,8 @@ msgstr ":doc:`pgr_drivingDistance`" msgid "`ST_ConcaveHull `__" msgstr "" -#, fuzzy -msgid "``pgr_analyzeGraph``" -msgstr ":doc:`pgr_analyzeGraph`" +msgid "pgr_analyzeGraph" +msgstr "" msgid "``pgr_analyzeGraph`` — Analyzes the network topology." msgstr "" @@ -8552,6 +8584,9 @@ msgid "" "table ``othertable``. (note the use of quote_literal)" msgstr "" +msgid "The examples use the :doc:`sampledata` network." +msgstr "" + msgid ":doc:`pgr_analyzeOneWay`" msgstr ":doc:`pgr_analyzeOneWay`" @@ -8561,9 +8596,8 @@ msgstr ":doc:`pgr_createVerticesTable`" msgid ":doc:`pgr_nodeNetwork` to create nodes to a not noded edge table." msgstr "" -#, fuzzy -msgid "``pgr_analyzeOneWay``" -msgstr ":doc:`pgr_analyzeOneWay`" +msgid "pgr_analyzeOneWay" +msgstr "" msgid "" "``pgr_analyzeOneWay`` — Analyzes oneway Sstreets and identifies flipped " @@ -8714,7 +8748,7 @@ msgstr "" msgid "Version 2.5.0" msgstr "" -msgid "New experimental function." +msgid "New **experimental** function" msgstr "" msgid "" @@ -8746,7 +8780,7 @@ msgid "Nodes in red are the articulation points." msgstr "" msgid "" -"`Boost: Biconnected components & articulation points `__" msgstr "" @@ -8761,33 +8795,37 @@ msgstr "" msgid "``pgr_bdAstar`` — Shortest path using the bidirectional A* algorithm." msgstr "" -msgid "pgr_bdAstar(One to One) added ``start_vid`` and ``end_vid`` columns." +msgid "" +"``pgr_bdAstar`` (`One to One`_) added ``start_vid`` and ``end_vid`` columns." msgstr "" -msgid "pgr_bdAstar(One to Many) added ``end_vid`` column." +msgid "``pgr_bdAstar`` (`One to Many`_) added ``end_vid`` column." msgstr "" -msgid "pgr_bdAstar(Many to One) added ``start_vid`` column." +msgid "``pgr_bdAstar`` (`Many to One`_) added ``start_vid`` column." msgstr "" -#, fuzzy -msgid "pgr_bdAstar(One to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "``pgr_bdAstar`` (`Combinations`_)" +msgstr "" -#, fuzzy -msgid "pgr_bdAstar(Many to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "``pgr_bdAstar`` (`One to Many`_)" +msgstr "" -#, fuzzy -msgid "pgr_bdAstar(Many to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "``pgr_bdAstar`` (`Many to One`_)" +msgstr "" + +msgid "``pgr_bdAstar`` (`Many to Many`_)" +msgstr "" + +msgid "Signature change on ``pgr_bdAstar`` (`One to One`_)" +msgstr "" -msgid "Signature change on pgr_bdAstar(One to One)" +msgid "**Official** ``pgr_bdAstar`` (`One to One`_)" msgstr "" msgid "" -"The results are equivalent to the union of the results of the " -"pgr_bdAStar(One to One) on the:" +"The results are equivalent to the union of the results of the `pgr_bdAStar(` " +"`One to One`_ `)` on the:" msgstr "" msgid "pgr_bdAstar(`Edges SQL`_, **start vid**, **end vid**, [**options**])" @@ -8805,15 +8843,17 @@ msgstr "" msgid "pgr_bdAstar(`Edges SQL`_, `Combinations SQL`_, [**options**])" msgstr "" -#, fuzzy -msgid "``pgr_bdAstarCost``" -msgstr ":doc:`pgr_bdAstarCost`" +msgid "pgr_bdAstarCost" +msgstr "" 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 " "using the bidirectional A* algorithm." @@ -8861,19 +8901,25 @@ msgid "" "algorithm." msgstr ":doc:`pgr_bdDijkstra` - 최단 경로를 위한 양방향 다익스트라 알고리즘." -#, fuzzy -msgid "pgr_bdDijkstra(One to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_bdDijkstra(`Combinations`_)" +msgstr "" -#, fuzzy -msgid "pgr_bdDijkstra(Many to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "New **Proposed** functions:" +msgstr "" -#, fuzzy -msgid "pgr_bdDijkstra(Many to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "``pgr_bdDijkstra`` (`One to Many`_)" +msgstr "" -msgid "Signature change on pgr_bdDijsktra(One to One)" +msgid "``pgr_bdDijkstra`` (`Many to One`_)" +msgstr "" + +msgid "``pgr_bdDijkstra`` (`Many to Many`_)" +msgstr "" + +msgid "Signature change on ``pgr_bdDijsktra`` (`One to One`_)" +msgstr "" + +msgid "**Official** ``pgr_bdDijkstra`` (`One to One`_)" msgstr "" msgid "" @@ -8927,6 +8973,11 @@ msgstr "" 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" +msgstr "" + msgid "https://en.wikipedia.org/wiki/Bidirectional_search" msgstr "" @@ -8938,6 +8989,9 @@ msgid "" "Bidirectional Dijkstra algorithm." msgstr "" +msgid "``pgr_bdDijkstraCost`` (`Combinations`_)" +msgstr "" + msgid "" "The ``pgr_bdDijkstraCost`` function sumarizes of the cost of the shortest " "path using the bidirectional Dijkstra Algorithm." @@ -8996,10 +9050,25 @@ msgstr "" msgid "``pgr_bellmanFord`` — Shortest path using Bellman-Ford algorithm." msgstr "" -msgid "New experimental signature:" +msgid "New **experimental** signature:" msgstr "" -msgid "pgr_bellmanFord(Combinations)" +msgid "``pgr_bellmanFord`` (`Combinations`_)" +msgstr "" + +msgid "New **experimental** signatures:" +msgstr "" + +msgid "``pgr_bellmanFord`` (`One to One`_)" +msgstr "" + +msgid "``pgr_bellmanFord`` (`One to Many`_)" +msgstr "" + +msgid "``pgr_bellmanFord`` (`Many to One`_)" +msgstr "" + +msgid "``pgr_bellmanFord`` (`Many to Many`_)" msgstr "" msgid "" @@ -9074,25 +9143,23 @@ msgstr "" msgid "Using a combinations table on an **undirected** graph." msgstr "" -msgid "" -"`Boost: Bellman Ford `__" -msgstr "" - msgid "https://en.wikipedia.org/wiki/Bellman%E2%80%93Ford_algorithm" msgstr "" -msgid "``pgr_betweennessCentrality`` - Experimental" +msgid "``pgr_betweennessCentrality``" msgstr "" msgid "" -"``pgr_betweennessCentrality`` - Calculates the relative betweenness " +"``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." @@ -9163,8 +9230,11 @@ msgid "" msgstr "" msgid "" -"`Boost: betweenness centrality `_" +"Boost's `betweenness_centrality `_" +msgstr "" + +msgid "Queries use the :doc:`sampledata` network." msgstr "" msgid "``pgr_biconnectedComponents``" @@ -9224,6 +9294,11 @@ msgstr "" msgid "Identifier of the edge that belongs to the ``component``." msgstr "" +msgid "" +"Boost: `Biconnected components `__" +msgstr "" + msgid "``pgr_binaryBreadthFirstSearch`` - Experimental" msgstr "" @@ -9237,7 +9312,19 @@ msgid "" "negative integer, is termed as a 'binary graph'." msgstr "" -msgid "pgr_binaryBreadthFirstSearch(Combinations)" +msgid "pgr_binaryBreadthFirstSearch(`Combinations`_)" +msgstr "" + +msgid "pgr_binaryBreadthFirstSearch(`One to One`_)" +msgstr "" + +msgid "pgr_binaryBreadthFirstSearch(`One to Many`_)" +msgstr "" + +msgid "pgr_binaryBreadthFirstSearch(`Many to One`_)" +msgstr "" + +msgid "pgr_binaryBreadthFirstSearch(`Many to Many`_)" msgstr "" msgid "" @@ -9299,11 +9386,6 @@ msgid "" "math:`1``)" msgstr "" -msgid "" -"`Boost: Breadth First Search `__" -msgstr "" - msgid "https://cp-algorithms.com/graph/01_bfs.html" msgstr "" @@ -9311,7 +9393,7 @@ msgid "" "https://en.wikipedia.org/wiki/Dijkstra%27s_algorithm#Specialized_variants" msgstr "" -msgid "``pgr_bipartite`` - Experimental" +msgid "pgr_bipartite -Experimental" msgstr "" msgid "" @@ -9319,6 +9401,9 @@ msgid "" "within the same set are adjacent." msgstr "" +msgid "New **experimental** signature" +msgstr "" + msgid "" "A bipartite graph is a graph with two sets of vertices which are connected " "to each other, but not within themselves. A bipartite graph is possible if " @@ -9365,16 +9450,6 @@ msgstr "" msgid "Edges in blue represent odd length cycle subgraph." msgstr "" -msgid "" -"`Boost: is_bipartite `__" -msgstr "" - -msgid "" -"`Wikipedia: bipartite graph `__" -msgstr "" - msgid "``pgr_boykovKolmogorov``" msgstr "" @@ -9384,10 +9459,19 @@ msgid "" "algorithm." msgstr "" +msgid "New **proposed** signature" +msgstr "" + +msgid "``pgr_boykovKolmogorov`` (`Combinations`_)" +msgstr "" + msgid "Renamed from ``pgr_maxFlowBoykovKolmogorov``" msgstr "" -msgid "Function promoted to proposed." +msgid "**Proposed** function" +msgstr "" + +msgid "New **Experimental** function" msgstr "" msgid "Running time: Polynomial" @@ -9429,9 +9513,7 @@ msgid "" "math:`\\{5, 6\\}` to vertices :math:`\\{10, 15, 14\\}`." msgstr "" -msgid "" -"`Boost: Boykov Kolmogorov max flow `__" +msgid "https://www.boost.org/libs/graph/doc/boykov_kolmogorov_max_flow.html" msgstr "" msgid "``pgr_breadthFirstSearch`` - Experimental" @@ -9442,6 +9524,12 @@ msgid "" "First Search algorithm." msgstr "" +msgid "``pgr_breadthFirstSearch`` (`Single Vertex`_)" +msgstr "" + +msgid "``pgr_breadthFirstSearch`` (`Multiple Vertices`_)" +msgstr "" + msgid "" "Provides the Breadth First Search traversal order from a root vertex to a " "particular depth." @@ -9506,6 +9594,11 @@ msgstr "" msgid "descending" msgstr "" +msgid "" +"`Boost: Breadth First Search algorithm documentation `__" +msgstr "" + msgid "" "`Wikipedia: Breadth First Search algorithm `__" @@ -9544,10 +9637,9 @@ msgstr "" msgid "https://en.wikipedia.org/wiki/Bridge_%28graph_theory%29" msgstr "" -msgid "" -"`Boost: Connected components `__" -msgstr "" +#, fuzzy +msgid "**Supported versions**" +msgstr "짧은 버전" msgid "``pgr_chinesePostman`` - Experimental" msgstr "" @@ -9604,7 +9696,7 @@ msgstr "" msgid "Minimum costs of a circuit path." msgstr "" -msgid "``pgr_connectedComponents``" +msgid "pgr_connectedComponents" msgstr "" msgid "" @@ -9641,6 +9733,11 @@ msgstr "" msgid "Connecting disconnected components" msgstr "" +msgid "" +"Boost: `Connected components `__" +msgstr "" + msgid "" "wikipedia: `Connected component `__" @@ -9815,7 +9912,7 @@ msgstr "" msgid "Only linear contraction" msgstr "" -msgid "``pgr_createTopology``" +msgid "pgr_createTopology" msgstr "" msgid "" @@ -10018,9 +10115,11 @@ msgid "" "to the rest of the edges." msgstr "" -#, fuzzy -msgid "``pgr_createVerticesTable``" -msgstr ":doc:`pgr_createVerticesTable`" +msgid "The example uses the :doc:`sampledata` network." +msgstr "" + +msgid "pgr_createVerticesTable" +msgstr "" msgid "" "``pgr_createVerticesTable`` — Reconstructs the vertices table based on the " @@ -10235,9 +10334,8 @@ msgid "" "Cuthill%E2%80%93McKee_algorithm>`__" msgstr "" -#, fuzzy -msgid "``pgr_dagShortestPath`` - Experimental" -msgstr ":doc:`pgr_dagShortestPath`" +msgid "pgr_dagShortestPath - Experimental" +msgstr "" msgid "" "``pgr_dagShortestPath`` — Returns the shortest path for weighted directed " @@ -10316,11 +10414,6 @@ msgstr "결과 컬럼" msgid "Making **start_vids** the same as **end_vids**" msgstr "" -msgid "" -"`Boost: DAG shortest paths `__" -msgstr "" - msgid "https://en.wikipedia.org/wiki/Topological_sorting" msgstr "" @@ -10439,6 +10532,15 @@ msgstr "" msgid "Version 3.3.0" msgstr "" +msgid "Promoted to **proposed** function" +msgstr "" + +msgid "``pgr_depthFirstSearch`` (`Single Vertex`_)" +msgstr "" + +msgid "``pgr_depthFirstSearch`` (`Multiple Vertices`_)" +msgstr "" + msgid "" "Depth First Search algorithm is a traversal algorithm which starts from a " "root vertex, goes as deep as possible, and backtracks once a vertex is " @@ -10492,13 +10594,13 @@ msgid "Same as `Single vertex`_ but with edges in descending order of ``id``." msgstr "" msgid "" -"`Boost: Depth First Search `__" +"`Boost: Depth First Search algorithm documentation `__" msgstr "" msgid "" -"`Boost: Undirected DFS `__" +"`Boost: Undirected DFS algorithm documentation `__" msgstr "" msgid "" @@ -10515,34 +10617,44 @@ msgstr "" msgid "Version 3.5.0" msgstr "" -msgid "pgr_dijkstra(One to One) added ``start_vid`` and ``end_vid`` columns." +msgid "" +"``pgr_dijkstra`` (`One to One`_) added ``start_vid`` and ``end_vid`` columns." msgstr "" -msgid "pgr_dijkstra(One to Many) added ``end_vid`` column." +msgid "``pgr_dijkstra`` (`One to Many`_) added ``end_vid`` column." msgstr "" -msgid "pgr_dijkstra(Many to One) added ``start_vid`` column." +msgid "``pgr_dijkstra`` (`Many to One`_) added ``start_vid`` column." msgstr "" msgid "Version 3.1.0" msgstr "" +msgid "``pgr_dijkstra`` (`Combinations`_)" +msgstr "" + +msgid "**Official** functions" +msgstr "" + msgid "Version 2.2.0" msgstr "" -#, fuzzy -msgid "pgr_dijkstra(One to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "New **proposed** functions:" +msgstr "" -#, fuzzy -msgid "pgr_dijkstra(Many to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "``pgr_dijkstra`` (`One to Many`_)" +msgstr "" -#, fuzzy -msgid "pgr_dijkstra(Many to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "``pgr_dijkstra`` (`Many to One`_)" +msgstr "" -msgid "Signature change on pgr_dijkstra(One to One)" +msgid "``pgr_dijkstra`` (`Many to Many`_)" +msgstr "" + +msgid "Signature change on ``pgr_dijkstra`` (`One to One`_)" +msgstr "" + +msgid "**Official** ``pgr_dijkstra`` (`One to One`_)" msgstr "" msgid "pgr_dijkstra(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" @@ -10728,11 +10840,6 @@ msgstr "" msgid "37) Using `Combinations`_" msgstr "" -msgid "" -"`Boost: Dijkstra shortest paths `__" -msgstr "" - msgid "https://en.wikipedia.org/wiki/Dijkstra%27s_algorithm" msgstr "" @@ -10745,6 +10852,9 @@ msgid "" "algorithm." msgstr ":doc:`pgr_aStarCost` - 최단 경로의 집계 비용 반환." +msgid "``pgr_dijkstraCost`` (`Combinations`_)" +msgstr "" + #, fuzzy msgid "" "The ``pgr_dijkstraCost`` function sumarizes of the cost of the shortest path " @@ -11033,6 +11143,9 @@ msgstr "" msgid "When ``false``: ``cap`` limit per ``Start vid`` will be returned" msgstr "" +msgid "boost: https://www.boost.org/libs/graph/doc/table_of_contents.html" +msgstr "" + msgid "Wikipedia: https://en.wikipedia.org/wiki/Dijkstra%27s_algorithm" msgstr "" @@ -11199,9 +11312,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 "" @@ -11211,16 +11321,13 @@ msgstr "" msgid "Added ``depth`` and ``pred`` result columns." msgstr "" -msgid "Signature change:" -msgstr "" - -msgid "pgr_drivingDistance(single vertex)" +msgid "Signature change pgr_drivingDistance(single vertex)" msgstr "" -msgid "New official signature:" +msgid "New **Official** pgr_drivingDistance(multiple vertices)" msgstr "" -msgid "pgr_drivingDistance(multiple vertices)" +msgid "Official:: pgr_drivingDistance(single vertex)" msgstr "" msgid "" @@ -11275,7 +11382,7 @@ msgid "" "undirected graph" msgstr "" -msgid "``pgr_edgeColoring`` - Experimental" +msgid "pgr_edgeColoring - Experimental" msgstr "" msgid "" @@ -11349,15 +11456,6 @@ msgstr "" msgid "Graph coloring of pgRouting :doc:`sampledata`" msgstr "" -msgid "" -"`Boost: Edge Coloring `__" -msgstr "" - -msgid "" -"`Wikipedia: Graph coloring `__" -msgstr "" - msgid "``pgr_edgeDisjointPaths``" msgstr "" @@ -11366,6 +11464,9 @@ msgid "" "groups of vertices." msgstr "" +msgid "New **proposed** function:" +msgstr "" + msgid "pgr_edgeDisjointPaths(Combinations)" msgstr "" @@ -11447,6 +11548,9 @@ msgid "" "the flow from the sources to the targets using Edmonds Karp Algorithm." msgstr "" +msgid "``pgr_edmondsKarp`` (`Combinations`_)" +msgstr "" + msgid "Renamed from ``pgr_maxFlowEdmondsKarp``" msgstr "" @@ -11468,23 +11572,32 @@ msgstr "" msgid "pgr_edmondsKarp(`Edges SQL`_, `Combinations SQL`_)" msgstr "" -msgid "" -"`Boost: Edmonds Karp max flow `__" +msgid "https://www.boost.org/libs/graph/doc/edmonds_karp_max_flow.html" msgstr "" msgid "https://en.wikipedia.org/wiki/Edmonds%E2%80%93Karp_algorithm" msgstr "" -#, fuzzy -msgid "``pgr_edwardMoore`` - Experimental" -msgstr ":doc:`pgr_edwardMoore`" +msgid "``pgr_edwardMoore - Experimental``" +msgstr "" msgid "" "``pgr_edwardMoore`` — Returns the shortest path using Edward-Moore algorithm." msgstr "" -msgid "pgr_edwardMoore(Combinations)" +msgid "``pgr_edwardMoore`` (`Combinations`_)" +msgstr "" + +msgid "``pgr_edwardMoore`` (`One to One`_)" +msgstr "" + +msgid "``pgr_edwardMoore`` (`One to Many`_)" +msgstr "" + +msgid "``pgr_edwardMoore`` (`Many to One`_)" +msgstr "" + +msgid "``pgr_edwardMoore`` (`Many to Many`_)" msgstr "" msgid "" @@ -11546,9 +11659,8 @@ msgstr "" msgid "https://en.wikipedia.org/wiki/Shortest_Path_Faster_Algorithm" msgstr "" -#, fuzzy -msgid "``pgr_extractVertices`` -- Proposed" -msgstr ":doc:`pgr_extractVertices`" +msgid "pgr_extractVertices -- Proposed" +msgstr "" msgid "``pgr_extractVertices`` — Extracts the vertices information" msgstr "" @@ -11648,13 +11760,21 @@ msgid "" "= true``." msgstr "" -#, fuzzy -msgid "``pgr_findCloseEdges`` - Proposed" -msgstr ":doc:`pgr_findCloseEdges`" +msgid "``pgr_findCloseEdges``" +msgstr "" msgid "``pgr_findCloseEdges`` - Finds the close edges to a point geometry." msgstr "" +msgid "New **proposed** signatures:" +msgstr "" + +msgid "``pgr_findCloseEdges`` (`One point`_)" +msgstr "" + +msgid "``pgr_findCloseEdges`` (`Many points`_)" +msgstr "" + msgid "" "``pgr_findCloseEdges`` - An utility function that finds the closest edge to " "a point geometry." @@ -12131,6 +12251,9 @@ msgid "" "floyd_warshall_shortest.html>`_" msgstr "" +msgid "Queries uses the :doc:`sampledata` network." +msgstr "" + msgid "``pgr_full_version``" msgstr "" @@ -12138,6 +12261,9 @@ msgid "" "``pgr_full_version`` — Get the details of pgRouting version information." msgstr "" +msgid "New **official** function" +msgstr "" + msgid "Get complete details of pgRouting version information" msgstr "" @@ -12204,15 +12330,17 @@ msgstr "" msgid "Git hash of pgRouting build" msgstr "" -#, fuzzy -msgid "``pgr_hawickCircuits`` - Experimental" -msgstr ":doc:`pgr_dagShortestPath`" +msgid "``pgr_hawickCircuits - Experimental``" +msgstr "" msgid "" "``pgr_hawickCircuits`` — Returns the list of cirucits using hawick circuits " "algorithm." msgstr "" +msgid "``pgr_hawickCircuits``" +msgstr "" + msgid "" "Hawick Circuit algorithm, is published in 2008 by Ken Hawick and Health A. " "James. This algorithm solves the problem of detecting and enumerating " @@ -12335,9 +12463,7 @@ msgid "" "blue represent :math:`K_5` subgraph." msgstr "" -msgid "" -"`Boost: Boyer Myrvold `__" +msgid "https://www.boost.org/libs/graph/doc/boyer_myrvold.html" msgstr "" msgid "``pgr_johnson``" @@ -12392,9 +12518,6 @@ msgid "" "breadth First Search ordering." msgstr "" -msgid "Added ``pred`` result columns." -msgstr "" - msgid "" "Visits and extracts the nodes information in Breath First Search ordering of " "the Minimum Spanning Tree created using Kruskal's algorithm." @@ -12470,9 +12593,8 @@ msgstr "" msgid "pgr_kruskalDFS(`Edges SQL`_, **root vids**, [``max_depth``])" msgstr "" -#, fuzzy -msgid "``pgr_lengauerTarjanDominatorTree`` - Experimental" -msgstr ":doc:`pgr_lengauerTarjanDominatorTree`" +msgid "pgr_lengauerTarjanDominatorTree -Experimental" +msgstr "" msgid "" "``pgr_lengauerTarjanDominatorTree`` — Returns the immediate dominator of all " @@ -12529,8 +12651,8 @@ msgid "Dominator tree of another component." msgstr "" msgid "" -"`Boost: Lengauer-Tarjan dominator `__" +"`Boost: Lengauer-Tarjan dominator tree algorithm `__" msgstr "" msgid "" @@ -12538,19 +12660,14 @@ msgid "" "Dominator_(graph_theory)>`__" msgstr "" -#, fuzzy -msgid "``pgr_lineGraph`` - Proposed" -msgstr ":doc:`pgr_analyzeGraph`" +msgid "pgr_lineGraph - Proposed" +msgstr "" msgid "" "``pgr_lineGraph`` — Transforms the given graph into its corresponding edge-" "based graph." msgstr "" -#, fuzzy -msgid "Works for directed and undirected graphs." -msgstr ":doc:`pgr_bridges` - 무방향 그래프의 브릿지." - msgid "" "Given a graph :math:`G`, its line graph :math:`L(G)` is a graph such that:" msgstr "" @@ -12812,7 +12929,8 @@ msgid "Full line graph of subgraph of edges :math:`\\{4, 7, 8, 10\\}`" msgstr "" msgid "" -"The examples include the subgraph including edges 4, 7, 8, and 10 with " +"The examples of this section are based on the :doc:`sampledata` network. The " +"examples include the subgraph including edges 4, 7, 8, and 10 with " "``reverse_cost``." msgstr "" @@ -13031,15 +13149,15 @@ msgstr "" msgid "Returns set of |result-component-make|" msgstr "" -msgid "List of edges that are needed to connect the graph." +msgid "" +"Query done on :doc:`sampledata` network gives the list of edges that are " +"needed to connect the graph." msgstr "" -msgid "" -"`Boost: make connected `__" +msgid "https://www.boost.org/libs/graph/doc/make_connected.html" msgstr "" -msgid "``pgr_maxCardinalityMatch``" +msgid "pgr_maxCardinalityMatch" msgstr "" msgid "" @@ -13047,16 +13165,13 @@ msgid "" "graph." msgstr "" -msgid "pgr_maxCardinalityMatch(text) returns only ``edge`` column." -msgstr "" - msgid "Deprecated signature" msgstr "" -msgid "pgr_maxCardinalityMatch(text,boolean)" +msgid "``pgr_maxCardinalityMatch(text,boolean)``" msgstr "" -msgid "directed => ``false`` when used." +msgid "``directed => false`` when used." msgstr "" msgid "Renamed from ``pgr_maximumCardinalityMatching``" @@ -13107,9 +13222,7 @@ msgstr "" msgid "Identifier of the edge in the original query." msgstr "" -msgid "" -"`Boost: maximum_matching `__" +msgid "https://www.boost.org/libs/graph/doc/maximum_matching.html" msgstr "" msgid "https://en.wikipedia.org/wiki/Matching_%28graph_theory%29" @@ -13126,6 +13239,12 @@ msgid "" "source(s) to the targets(s) using the Push Relabel algorithm." msgstr "" +msgid "``pgr_maxFlow`` (`Combinations`_)" +msgstr "" + +msgid "New **Proposed** function" +msgstr "" + msgid "Calculates the maximum flow from the sources to the targets." msgstr "" @@ -13160,9 +13279,7 @@ msgstr "" msgid "Maximum flow possible from the source(s) to the target(s)" msgstr "" -msgid "" -"`Boost: push relabel max flow `__" +msgid "https://www.boost.org/libs/graph/doc/push_relabel_max_flow.html" msgstr "" msgid "" @@ -13177,10 +13294,7 @@ msgid "" "of the maximum flow on a graph" msgstr "" -msgid "pgr_maxFlowMinCost(Combinations)" -msgstr "" - -msgid "|boost| graph inside." +msgid "``pgr_maxFlowMinCost`` (`Combinations`_)" msgstr "" msgid "**TODO** check which statement is true:" @@ -13224,6 +13338,11 @@ msgstr "" msgid "Returns set of |result-flow-mincost|" msgstr "" +msgid "" +"https://www.boost.org/libs/graph/doc/" +"successive_shortest_path_nonnegative_weights.html" +msgstr "" + msgid "``pgr_maxFlowMinCost_Cost`` - Experimental" msgstr "" @@ -13232,7 +13351,7 @@ msgid "" "maximum flow on a graph" msgstr "" -msgid "pgr_maxFlowMinCost_Cost(Combinations)" +msgid "``pgr_maxFlowMinCost_Cost`` (`Combinations`_)" msgstr "" msgid "**The cost value of all input edges must be nonnegative.**" @@ -13265,9 +13384,8 @@ msgstr "" msgid "Minimum Cost Maximum Flow possible from the source(s) to the target(s)" msgstr "" -#, fuzzy -msgid "``pgr_nodeNetwork``" -msgstr ":doc:`pgr_analyzeGraph`" +msgid "pgr_nodeNetwork" +msgstr "" msgid "``pgr_nodeNetwork`` - Nodes an network edge table." msgstr "" @@ -13804,6 +13922,9 @@ msgid "" "the flow from the sources to the targets using Push Relabel Algorithm." msgstr "" +msgid "``pgr_pushRelabel`` (`Combinations`_)" +msgstr "" + msgid "Renamed from ``pgr_maxFlowPushRelabel``" msgstr "" @@ -13822,7 +13943,7 @@ msgstr "" msgid "pgr_pushRelabel(`Edges SQL`_, `Combinations SQL`_)" msgstr "" -msgid "``pgr_sequentialVertexColoring`` - Proposed" +msgid "pgr_sequentialVertexColoring - Proposed" msgstr "" msgid "" @@ -13830,7 +13951,10 @@ msgid "" "undirected graph, using greedy approach." msgstr "" -msgid "" +msgid "Promoted to **proposed** signature" +msgstr "" + +msgid "" "Sequential vertex coloring algorithm is a graph coloring algorithm in which " "color identifiers are assigned to the vertices of a graph in a sequential " "manner, such that no edge connects two identically colored vertices." @@ -13872,15 +13996,9 @@ msgstr "" msgid "pgr_sequentialVertexColoring(`Edges SQL`_)" msgstr "" -msgid "" -"`Boost: Sequential Vertex Coloring `__" +msgid "pgr_stoerWagner - Experimental" msgstr "" -#, fuzzy -msgid "``pgr_stoerWagner`` - Experimental" -msgstr ":doc:`pgr_stoerWagner`" - msgid "``pgr_stoerWagner`` — The min-cut of graph using stoerWagner algorithm." msgstr "" @@ -13962,11 +14080,6 @@ msgstr "" msgid "Using :doc:`pgr_connectedComponents`" msgstr "" -msgid "" -"`Boost: Stoer Wagner min cut `__" -msgstr "" - msgid "https://en.wikipedia.org/wiki/Stoer%E2%80%93Wagner_algorithm" msgstr "" @@ -13996,7 +14109,7 @@ msgid "The strong components of the graph" msgstr "" msgid "" -"`Boost: Strong components `__" msgstr "" @@ -14061,11 +14174,6 @@ msgstr "" msgid "Graph is not a DAG" msgstr "" -msgid "" -"`Boost: topological sort `__" -msgstr "" - msgid "``pgr_transitiveClosure`` - Experimental" msgstr "" @@ -14121,59 +14229,57 @@ msgstr "" msgid "Identifiers of the vertices that are reachable from vertex v." msgstr "" -msgid "" -"`Boost: transitive closure `__" -msgstr "" - msgid "https://en.wikipedia.org/wiki/Transitive_closure" msgstr "" -msgid "``pgr_trsp``" +msgid "pgr_trsp - Proposed" msgstr "" msgid "``pgr_trsp`` - routing vertices with restrictions." msgstr "" -#, fuzzy -msgid "pgr_trsp(One to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "New proposed signatures" +msgstr "" -#, fuzzy -msgid "pgr_trsp(One to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "``pgr_trsp`` (`One to One`_)" +msgstr "" -#, fuzzy -msgid "pgr_trsp(Many to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "``pgr_trsp`` (`One to Many`_)" +msgstr "" -#, fuzzy -msgid "pgr_trsp(Many to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "``pgr_trsp`` (`Many to One`_)" +msgstr "" -#, fuzzy -msgid "pgr_trsp(Combinations)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "``pgr_trsp`` (`Many to Many`_)" +msgstr "" + +msgid "``pgr_trsp`` (`Combinations`_)" +msgstr "" msgid "Deprecated signatures" msgstr "" -msgid "pgr_trsp(text,integer,float,integer,float,boolean,boolean,text)" +msgid "``pgr_trsp(text,integer,integer,boolean,boolean,text)``" msgstr "" -msgid "pgr_trspViaVertices(text,anyarray,boolean,boolean,text)" +msgid "``pgr_trsp(text,integer,float,integer,float,boolean,boolean,text)``" +msgstr "" + +msgid "``pgr_trspViaVertices(text,anyarray,boolean,boolean,text)``" +msgstr "" + +msgid "" +"``pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)``" msgstr "" msgid "New prototypes" msgstr "" -#, fuzzy -msgid "pgr_trspViaVertices" -msgstr ":doc:`pgr_withPoints`" +msgid "``pgr_trspViaVertices``" +msgstr "" -#, fuzzy -msgid "pgr_trspViaEdges" -msgstr ":doc:`pgr_withPoints`" +msgid "``pgr_trspViaEdges``" +msgstr "" msgid "" "Turn restricted shortest path (TRSP) is an algorithm that receives turn " @@ -14245,14 +14351,19 @@ msgid "" "`Deprecated documentation `_" msgstr "" -#, fuzzy -msgid "``pgr_trspVia``" -msgstr ":doc:`pgr_trspVia`" +msgid "``pgr_trspVia`` - Proposed" +msgstr "" msgid "" "``pgr_trspVia`` Route that goes through a list of vertices with restrictions." msgstr "" +msgid "New proposed function:" +msgstr "" + +msgid "``pgr_trspVia`` (`One Via`_)" +msgstr "" + 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 :" @@ -14330,15 +14441,17 @@ msgstr "" msgid ":doc:`via-category`" msgstr ":doc:`via-category`" -#, fuzzy -msgid "``pgr_trspVia_withPoints``" -msgstr ":doc:`pgr_trspVia_withPoints`" +msgid "``pgr_trspVia_withPoints`` - Proposed" +msgstr "" msgid "" "``pgr_trspVia_withPoints`` - Route that goes through a list of vertices and/" "or points with restrictions." msgstr "" +msgid "``pgr_trspVia_withPoints`` (`One Via`_)" +msgstr "" + msgid "" "Given a graph, a set of restriction on the graph edges, a set of points on " "the graphs edges and a list of vertices, this function is equivalent to " @@ -14498,12 +14611,30 @@ msgid "" "`pgr_trsp` algorithm. In this case a U turn is been done using the same edge." msgstr "" -msgid "``pgr_trsp_withPoints``" +msgid "pgr_trsp_withPoints - Proposed" msgstr "" msgid "``pgr_trsp_withPoints`` Routing Vertex/Point with restrictions." msgstr "" +msgid "New proposed signatures:" +msgstr "" + +msgid "``pgr_trsp_withPoints`` (`One to One`_)" +msgstr "" + +msgid "``pgr_trsp_withPoints`` (`One to Many`_)" +msgstr "" + +msgid "``pgr_trsp_withPoints`` (`Many to One`_)" +msgstr "" + +msgid "``pgr_trsp_withPoints`` (`Many to Many`_)" +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" @@ -14612,12 +14743,15 @@ msgid "" "`1` on an undirected graph, with details." msgstr "" -msgid "``pgr_turnRestrictedPath`` - Experimental" +msgid "pgr_turnRestrictedPath - Experimental" msgstr "" msgid "" -"``pgr_turnRestrictedPath`` Using Yen's algorithm Vertex - Vertex routing " -"with restrictions" +"``pgr_turnRestrictedPath`` Using Yen's algorithm Vertex -Vertex routing with " +"restrictions" +msgstr "" + +msgid "New experimental function" msgstr "" msgid "" @@ -14691,7 +14825,7 @@ msgstr "" msgid "pgRouting Version for this documentation" msgstr "" -msgid "``pgr_vrpOneDepot`` - Experimental" +msgid "pgr_vrpOneDepot - Experimental" msgstr "" msgid "**No documentation available**" @@ -14700,9 +14834,8 @@ msgstr "" msgid "**TBD**" msgstr "" -#, fuzzy -msgid "``pgr_withPoints``" -msgstr ":doc:`pgr_withPoints`" +msgid "``pgr_withPoints`` - Proposed" +msgstr "" msgid "" "``pgr_withPoints`` - Returns the shortest path in a graph with additional " @@ -14844,9 +14977,8 @@ msgstr "" msgid "Passes in front or visits with left side driving." msgstr "" -#, fuzzy -msgid "``pgr_withPointsCost``" -msgstr ":doc:`pgr_withPointsCost`" +msgid "``pgr_withPointsCost`` - Proposed" +msgstr "" msgid "" "``pgr_withPointsCost`` - Calculates the shortest path and returns only the " @@ -14989,9 +15121,8 @@ msgstr "" msgid "Does not matter driving side driving topology" msgstr "" -#, fuzzy -msgid "``pgr_withPointsCostMatrix``" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "``pgr_withPointsCostMatrix`` - proposed" +msgstr "" msgid "" "``pgr_withPointsCostMatrix`` - Calculates a cost matrix using :doc:" @@ -15022,9 +15153,8 @@ msgid "" "locations on the graph of point `(2.9, 1.8)`." msgstr "" -#, fuzzy -msgid "``pgr_withPointsDD``" -msgstr ":doc:`pgr_withPoints`" +msgid "``pgr_withPointsDD`` - Proposed" +msgstr "" msgid "" "``pgr_withPointsDD`` - Returns the driving **distance** from a starting " @@ -15036,13 +15166,8 @@ msgid "" "unnamed compulsory **driving side**." msgstr "" -#, fuzzy -msgid "pgr_withPointsDD(Single vertex)" -msgstr ":doc:`pgr_withPointsCostMatrix`" - -#, fuzzy -msgid "pgr_withPointsDD(Multiple vertices)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "``pgr_withPointsDD`` (`Single vertex`)" +msgstr "" msgid "Added ``depth``, ``pred`` and ``start_vid`` column." msgstr "" @@ -15059,12 +15184,13 @@ msgid "" msgstr "" msgid "" -"pgr_withpointsdd(text,text,bigint,double precision,boolean,character,boolean)" +"``pgr_withpointsdd(text,text,bigint,double precision,boolean,character," +"boolean)``" msgstr "" msgid "" -"pgr_withpointsdd(text,text,anyarray,double precision,boolean,character," -"boolean,boolean)" +"``pgr_withpointsdd(text,text,anyarray,double precision,boolean,character," +"boolean,boolean)``" msgstr "" msgid "" @@ -15171,9 +15297,8 @@ msgstr "" msgid ":doc:`pgr_alphaShape`" msgstr ":doc:`pgr_alphaShape`" -#, fuzzy -msgid "``pgr_withPointsKSP``" -msgstr ":doc:`pgr_withPoints`" +msgid "pgr_withPointsKSP - Proposed" +msgstr "" msgid "" "``pgr_withPointsKSP`` — Yen's algorithm for K shortest paths using Dijkstra." @@ -15183,27 +15308,30 @@ msgid "Standarizing output columns to |nksp-result|" msgstr "" #, fuzzy -msgid "pgr_withPointsKSP(One to One)" +msgid "``pgr_withPointsKSP`` (One to One)" msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "New overload functions" +msgstr "" + #, fuzzy -msgid "pgr_withPointsKSP(One to Many)" +msgid "``pgr_withPointsKSP`` (One to Many)" msgstr ":doc:`pgr_withPointsCostMatrix`" #, fuzzy -msgid "pgr_withPointsKSP(Many to One)" +msgid "``pgr_withPointsKSP`` (Many to One)" msgstr ":doc:`pgr_withPointsCostMatrix`" #, fuzzy -msgid "pgr_withPointsKSP(Many to Many)" +msgid "``pgr_withPointsKSP`` (Many to Many)" msgstr ":doc:`pgr_withPointsCostMatrix`" #, fuzzy -msgid "pgr_withPointsKSP(Combinations)" +msgid "``pgr_withPointsKSP`` (Combinations)" msgstr ":doc:`pgr_withPointsCostMatrix`" msgid "" -"pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,char," +"``pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,char," "boolean)``" msgstr "" @@ -15319,15 +15447,17 @@ msgid "" "to point :math:`2` with heap paths and details." msgstr "" -#, fuzzy -msgid "``pgr_withPointsVia``" -msgstr ":doc:`pgr_withPointsVia`" +msgid "``pgr_withPointsVia`` - Proposed" +msgstr "" msgid "" "``pgr_withPointsVia`` - Route that goes through a list of vertices and/or " "points." msgstr "" +msgid "New **proposed** function ``pgr_withPointsVia`` (`One Via`_)" +msgstr "" + msgid "" "Given a graph, a set of points on the graphs edges and a list of vertices, " "this function is equivalent to finding the shortest path between :math:" @@ -15427,13 +15557,22 @@ msgid "" ":doc:`pgr_lineGraph` - Transformation algorithm for generating a Line Graph." msgstr "" +msgid ":doc:`pgr_withPointsVia`" +msgstr ":doc:`pgr_withPointsVia`" + +msgid ":doc:`pgr_trspVia`" +msgstr ":doc:`pgr_trspVia`" + +msgid ":doc:`pgr_trspVia_withPoints`" +msgstr ":doc:`pgr_trspVia_withPoints`" + msgid ":doc:`withPoints-family` - Functions based on Dijkstra algorithm." msgstr "" msgid "From the :doc:`TRSP-family`:" msgstr "" -msgid "Utilities Category" +msgid "Utilities" msgstr "" msgid ":doc:`pgr_findCloseEdges`" @@ -15453,15 +15592,6 @@ msgstr "" msgid "Mayors" msgstr "" -msgid "pgRouting 4" -msgstr "" - -msgid "Minors 4.x" -msgstr "" - -msgid "pgRouting 4.0" -msgstr "" - msgid "pgRouting 3" msgstr "" @@ -15471,150 +15601,6 @@ msgstr "" msgid "pgRouting 3.7" msgstr "" -msgid "pgRouting 3.7.3 Release Notes" -msgstr "" - -msgid "" -"To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.7.3 `__" -msgstr "" - -msgid "" -"`#2731 `__ Build Failure " -"on Ubuntu 22" -msgstr "" - -msgid "pgRouting 3.7.2 Release Notes" -msgstr "" - -msgid "" -"To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.7.2 `__" -msgstr "" - -msgid "Build" -msgstr "" - -msgid "" -"`#2713 `__ cmake missing " -"some policies and min version" -msgstr "" - -msgid "Using OLD policies: CMP0148, CMP0144, CMP0167" -msgstr "" - -msgid "Minimum cmake version 3.12" -msgstr "" - -msgid "" -"`#2707 `__ Build failure " -"in pgRouting 3.7.1 on Alpine" -msgstr "" - -msgid "" -"`#2706 `__ winnie crashing " -"on pgr_betweennessCentrality" -msgstr "" - -msgid "pgRouting 3.7.1 Release Notes" -msgstr "" - -msgid "" -"To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.7.1 `__" -msgstr "" - -msgid "" -"`#2680 `__ fails to " -"compile under mingw64 gcc 13.2" -msgstr "" - -msgid "" -"`#2689 `__ When point is a " -"vertex, the withPoints family do not return results." -msgstr "" - -msgid "C/C++ code enhancemet" -msgstr "" - -#, fuzzy -msgid "TRSP family" -msgstr ":doc:`TRSP-family`" - -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 "" -"`#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 "" - -msgid "Metrics" -msgstr "" - -msgid "pgr_betweennessCentrality" -msgstr "" - -msgid "Official functions changes" -msgstr "" - -msgid "" -"`#2605 `__ Standarize " -"spanning tree functions output" -msgstr "" - -msgid "Functions:" -msgstr "" - -msgid "Experimental promoted to proposed." -msgstr "" - -msgid "" -"`#2635 `__ pgr_LineGraph " -"ignores directed flag and use negative values for identifiers." -msgstr "" - -#, fuzzy -msgid "``pgr_lineGraph``" -msgstr ":doc:`pgr_analyzeGraph`" - -msgid "Code enhancement" -msgstr "" - -msgid "" -"`#2599 `__ Driving " -"distance cleanup" -msgstr "" - -msgid "" -"`#2607 `__ Read postgresql " -"data on C++" -msgstr "" - -msgid "" -"`#2614 `__ Clang tidy does " -"not work" -msgstr "" - msgid "pgRouting 3.6" msgstr "" @@ -15627,6 +15613,9 @@ msgid "" "utf8=%E2%9C%93&q=milestone%3A%22Release%203.6.3%22>`__" msgstr "" +msgid "Build" +msgstr "" + msgid "Explicit minimum requirements:" msgstr "" @@ -15734,11 +15723,31 @@ msgid "" "output pgr_aStar" msgstr "" +msgid "" +"``pgr_aStar`` (`One to One`) added ``start_vid`` and ``end_vid`` columns." +msgstr "" + +msgid "``pgr_aStar`` (`One to Many`) added ``end_vid`` column." +msgstr "" + +msgid "``pgr_aStar`` (`Many to One`) added ``start_vid`` column." +msgstr "" + msgid "" "`#2523 `__ Standarize " "output pgr_bdAstar" msgstr "" +msgid "" +"``pgr_bdAstar`` (`One to One`) added ``start_vid`` and ``end_vid`` columns." +msgstr "" + +msgid "``pgr_bdAstar`` (`One to Many`) added ``end_vid`` column." +msgstr "" + +msgid "``pgr_bdAstar`` (`Many to One`) added ``start_vid`` column." +msgstr "" + msgid "" "`#2547 `__ Standarize " "output and modifying signature pgr_KSP" @@ -15746,7 +15755,7 @@ msgstr "" msgid "" "`#2548 `__ Standarize " -"output pgr_drivingDistance" +"output pgr_drivingdistance" msgstr "" msgid "Proposed functions changes" @@ -15852,7 +15861,7 @@ msgstr "" msgid "" "`#2565 `__ " -"pgr_lengauerTarjanDominatorTree triggers an assertion" +"pgr_pgr_lengauerTarjanDominatorTree triggers an assertion" msgstr "" msgid "SQL enhancements" @@ -15893,6 +15902,16 @@ msgstr "" msgid "Dijkstra" msgstr "" +msgid "" +"``pgr_dijkstra`` (`One to One`) added ``start_vid`` and ``end_vid`` columns." +msgstr "" + +msgid "``pgr_dijkstra`` (`One to Many`) added ``end_vid`` column." +msgstr "" + +msgid "``pgr_dijkstra`` (`Many to One`) added ``start_vid`` column." +msgstr "" + msgid "pgRouting 3.4" msgstr "" @@ -15949,16 +15968,14 @@ msgid "" "doesn't give all correct shortest path" msgstr "" -#, fuzzy -msgid "New proposed functions." -msgstr ":doc:`routingFunctions`" +msgid "New proposed functions" +msgstr "" msgid "With points" msgstr "" -#, fuzzy -msgid "pgr_withPointsVia(One Via)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "``pgr_withPointsVia`` (One Via)" +msgstr "" msgid "Turn Restrictions" msgstr "" @@ -15966,76 +15983,82 @@ msgstr "" msgid "Via with turn restrictions" msgstr "" -msgid "pgr_trspVia(One Via)" +msgid "``pgr_trspVia`` (One Via)" msgstr "" -#, fuzzy -msgid "pgr_trspVia_withPoints(One Via)" -msgstr ":doc:`pgr_trspVia_withPoints`" +msgid "``pgr_trspVia_withPoints`` (One Via)" +msgstr "" -#, fuzzy -msgid "pgr_trsp_withPoints(One to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "``pgr_trsp``" +msgstr "" -#, fuzzy -msgid "pgr_trsp_withPoints(One to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "``pgr_trsp`` (One to One)" +msgstr "" -#, fuzzy -msgid "pgr_trsp_withPoints(Many to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "``pgr_trsp`` (One to Many)" +msgstr "" -#, fuzzy -msgid "pgr_trsp_withPoints(Many to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "``pgr_trsp`` (Many to One)" +msgstr "" -#, fuzzy -msgid "pgr_trsp_withPoints(Combinations)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "``pgr_trsp`` (Many to Many)" +msgstr "" -msgid "Topology" +msgid "``pgr_trsp`` (Combinations)" msgstr "" -msgid "Utilities" +msgid "``pgr_trsp_withPoints``" msgstr "" -#, fuzzy -msgid "pgr_findCloseEdges(One point)" -msgstr ":doc:`pgr_findCloseEdges`" +msgid "``pgr_trsp_withPoints`` (One to One)" +msgstr "" -#, fuzzy -msgid "pgr_findCloseEdges(Many points)" -msgstr ":doc:`pgr_findCloseEdges`" +msgid "``pgr_trsp_withPoints`` (One to Many)" +msgstr "" -msgid "Ordering" +msgid "``pgr_trsp_withPoints`` (Many to One)" msgstr "" -msgid "pgr_cuthillMckeeOrdering" +msgid "``pgr_trsp_withPoints`` (Many to Many)" msgstr "" -msgid "Unclassified" +msgid "``pgr_trsp_withPoints`` (Combinations)" msgstr "" -#, fuzzy -msgid "pgr_hawickCircuits" -msgstr ":doc:`pgr_hawickCircuits`" +msgid "Topology" +msgstr "" + +msgid "``pgr_degree``" +msgstr "" + +msgid "``pgr_findCloseEdges`` (One point)" +msgstr "" + +msgid "``pgr_findCloseEdges`` (Many points)" +msgstr "" + +msgid "Ordering" +msgstr "" + +msgid "``pgr_cuthillMckeeOrdering``" +msgstr "" msgid "Flow functions" msgstr "" -msgid "pgr_maxCardinalityMatch(text)" +msgid "``pgr_maxCardinalityMatch(text)``" msgstr "" -msgid "Deprecating: pgr_maxCardinalityMatch(text,boolean)" +msgid "Deprecating ``pgr_maxCardinalityMatch(text,boolean)``" msgstr "" msgid "Deprecated Functions" msgstr "" -msgid "pgr_trsp(text,integer,float8,integer,float8,boolean,boolean,text)" +msgid "``pgr_trsp(text,integer,float8,integer,float8,boolean,boolean,text)``" msgstr "" -msgid "pgr_trspViaEdges(text,integer[],float[],boolean,boolean,text)" +msgid "``pgr_trspViaEdges(text,integer[],float[],boolean,boolean,text)``" msgstr "" msgid "pgRouting 3.3" @@ -16297,6 +16320,12 @@ msgstr "" msgid "Removing support for Boost v1.53, v1.54 & v1.55" msgstr "" +msgid "pgr_bellmanFord(Combinations)" +msgstr "" + +msgid "pgr_binaryBreadthFirstSearch(Combinations)" +msgstr "" + msgid "pgr_bipartite" msgstr "" @@ -16306,6 +16335,9 @@ msgstr "" msgid "Dijkstra Near" msgstr "" +msgid "pgr_edwardMoore(Combinations)" +msgstr "" + msgid "pgr_isPlanar" msgstr "" @@ -16315,15 +16347,51 @@ msgstr "" msgid "pgr_makeConnected" msgstr "" +msgid "pgr_maxFlowMinCost(Combinations)" +msgstr "" + +msgid "pgr_maxFlowMinCost_Cost(Combinations)" +msgstr "" + msgid "Astar" msgstr "" +msgid "pgr_aStar(Combinations)" +msgstr "" + +msgid "pgr_aStarCost(Combinations)" +msgstr "" + msgid "Bidirectional Astar" msgstr "" +msgid "pgr_bdAstar(Combinations)" +msgstr "" + +msgid "pgr_bdAstarCost(Combinations)" +msgstr "" + msgid "Bidirectional Dijkstra" msgstr "" +msgid "pgr_bdDijkstra(Combinations)" +msgstr "" + +msgid "pgr_bdDijkstraCost(Combinations)" +msgstr "" + +msgid "pgr_boykovKolmogorov(Combinations)" +msgstr "" + +msgid "pgr_edmondsKarp(Combinations)" +msgstr "" + +msgid "pgr_maxFlow(Combinations)" +msgstr "" + +msgid "pgr_pushRelabel(Combinations)" +msgstr "" + msgid "pgRouting 3.1" msgstr "" @@ -16533,184 +16601,213 @@ msgid "" "pgr_eucledianTSP to pgr_TSPeuclidean" msgstr "" -msgid "" -"`#1188 `__: Removed CGAL " -"dependency" +msgid "" +"`#1188 `__: Removed CGAL " +"dependency" +msgstr "" + +msgid "" +"`#1002 `__: Fixed " +"contraction issues:" +msgstr "" + +msgid "" +"`#1004 `__: Contracts " +"when forbidden vertices do not belong to graph" +msgstr "" + +msgid "" +"`#1005 `__: Intermideate " +"results eliminated" +msgstr "" + +msgid "" +"`#1006 `__: No loss of " +"information" +msgstr "" + +msgid "New functions" +msgstr "" + +msgid "Kruskal family" +msgstr "" + +msgid "pgr_kruskal" +msgstr "" + +msgid "pgr_kruskalBFS" +msgstr "" + +msgid "pgr_kruskalDD" +msgstr "" + +msgid "pgr_kruskalDFS" +msgstr "" + +msgid "Prim family" +msgstr "" + +msgid "pgr_prim" +msgstr "" + +msgid "pgr_primDD" +msgstr "" + +msgid "pgr_primDFS" +msgstr "" + +msgid "pgr_primBFS" +msgstr "" + +msgid "Proposed moved to official on pgRouting" +msgstr "" + +msgid "aStar Family" +msgstr "" + +msgid "pgr_aStar(one to many)" msgstr "" -msgid "" -"`#1002 `__: Fixed " -"contraction issues:" +msgid "pgr_aStar(many to one)" msgstr "" -msgid "" -"`#1004 `__: Contracts " -"when forbidden vertices do not belong to graph" +msgid "pgr_aStar(many to many)" msgstr "" -msgid "" -"`#1005 `__: Intermideate " -"results eliminated" +msgid "pgr_aStarCost(one to one)" msgstr "" -msgid "" -"`#1006 `__: No loss of " -"information" +msgid "pgr_aStarCost(one to many)" msgstr "" -msgid "New Functions" +msgid "pgr_aStarCost(many to one)" msgstr "" -msgid "Kruskal family" +msgid "pgr_aStarCost(many to many)" msgstr "" -msgid "pgr_kruskal" +msgid "pgr_aStarCostMatrix(one to one)" msgstr "" -msgid "pgr_kruskalBFS" +msgid "pgr_aStarCostMatrix(one to many)" msgstr "" -msgid "pgr_kruskalDD" +msgid "pgr_aStarCostMatrix(many to one)" msgstr "" -msgid "pgr_kruskalDFS" +msgid "pgr_aStarCostMatrix(many to many)" msgstr "" -msgid "Prim family" +msgid "bdAstar Family" msgstr "" -msgid "pgr_prim" +msgid "pgr_bdAstar(one to many)" msgstr "" -msgid "pgr_primDD" +msgid "pgr_bdAstar(many to one)" msgstr "" -msgid "pgr_primDFS" +msgid "pgr_bdAstar(many to many)" msgstr "" -msgid "pgr_primBFS" +msgid "pgr_bdAstarCost(one to one)" msgstr "" -msgid "Proposed moved to official on pgRouting" +msgid "pgr_bdAstarCost(one to many)" msgstr "" -msgid "aStar Family" +msgid "pgr_bdAstarCost(many to one)" msgstr "" -#, fuzzy -msgid "pgr_aStarCost(One to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_bdAstarCost(many to many)" +msgstr "" -#, fuzzy -msgid "pgr_aStarCost(One to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_bdAstarCostMatrix(one to one)" +msgstr "" -#, fuzzy -msgid "pgr_aStarCost(Many to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_bdAstarCostMatrix(one to many)" +msgstr "" -#, fuzzy -msgid "pgr_aStarCost(Many to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_bdAstarCostMatrix(many to one)" +msgstr "" -#, fuzzy -msgid "pgr_aStarCostMatrix" -msgstr ":doc:`pgr_aStarCostMatrix`" +msgid "pgr_bdAstarCostMatrix(many to many)" +msgstr "" -msgid "bdAstar Family" +msgid "bdDijkstra Family" msgstr "" -#, fuzzy -msgid "pgr_bdAstarCost(One to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_bdDijkstra(one to many)" +msgstr "" -#, fuzzy -msgid "pgr_bdAstarCost(One to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_bdDijkstra(many to one)" +msgstr "" -#, fuzzy -msgid "pgr_bdAstarCost(Many to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_bdDijkstra(many to many)" +msgstr "" -#, fuzzy -msgid "pgr_bdAstarCost(Many to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_bdDijkstraCost(one to one)" +msgstr "" -msgid "pgr_bdAstarCostMatrix" +msgid "pgr_bdDijkstraCost(one to many)" msgstr "" -msgid "bdDijkstra Family" +msgid "pgr_bdDijkstraCost(many to one)" msgstr "" -#, fuzzy -msgid "pgr_bdDijkstraCost(One to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_bdDijkstraCost(many to many)" +msgstr "" -#, fuzzy -msgid "pgr_bdDijkstraCost(One to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_bdDijkstraCostMatrix(one to one)" +msgstr "" -#, fuzzy -msgid "pgr_bdDijkstraCost(Many to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_bdDijkstraCostMatrix(one to many)" +msgstr "" -#, fuzzy -msgid "pgr_bdDijkstraCost(Many to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_bdDijkstraCostMatrix(many to one)" +msgstr "" -msgid "pgr_bdDijkstraCostMatrix" +msgid "pgr_bdDijkstraCostMatrix(many to many)" msgstr "" msgid "Flow Family" msgstr "" -#, fuzzy -msgid "pgr_pushRelabel(One to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_pushRelabel(one to one)" +msgstr "" -#, fuzzy -msgid "pgr_pushRelabel(One to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_pushRelabel(one to many)" +msgstr "" -#, fuzzy -msgid "pgr_pushRelabel(Many to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_pushRelabel(many to one)" +msgstr "" -#, fuzzy -msgid "pgr_pushRelabel(Many to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_pushRelabel(many to many)" +msgstr "" -#, fuzzy -msgid "pgr_edmondsKarp(One to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_edmondsKarp(one to one)" +msgstr "" -#, fuzzy -msgid "pgr_edmondsKarp(One to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_edmondsKarp(one to many)" +msgstr "" -#, fuzzy -msgid "pgr_edmondsKarp(Many to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_edmondsKarp(many to one)" +msgstr "" -#, fuzzy -msgid "pgr_edmondsKarp(Many to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_edmondsKarp(many to many)" +msgstr "" -#, fuzzy -msgid "pgr_boykovKolmogorov (One to One)" -msgstr ":doc:`pgr_boykovKolmogorov`" +msgid "pgr_boykovKolmogorov (one to one)" +msgstr "" -#, fuzzy -msgid "pgr_boykovKolmogorov (One to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_boykovKolmogorov (one to many)" +msgstr "" -#, fuzzy -msgid "pgr_boykovKolmogorov (Many to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_boykovKolmogorov (many to one)" +msgstr "" -#, fuzzy -msgid "pgr_boykovKolmogorov (Many to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_boykovKolmogorov (many to many)" +msgstr "" msgid "pgr_maxCardinalityMatching" msgstr "" @@ -16718,26 +16815,19 @@ msgstr "" msgid "pgr_maxFlow" msgstr "" -#, fuzzy -msgid "pgr_edgeDisjointPaths(One to One)" -msgstr ":doc:`pgr_edgeDisjointPaths`" - -#, fuzzy -msgid "pgr_edgeDisjointPaths(One to Many)" -msgstr ":doc:`pgr_edgeDisjointPaths`" +msgid "pgr_edgeDisjointPaths(one to one)" +msgstr "" -#, fuzzy -msgid "pgr_edgeDisjointPaths(Many to One)" -msgstr ":doc:`pgr_edgeDisjointPaths`" +msgid "pgr_edgeDisjointPaths(one to many)" +msgstr "" -#, fuzzy -msgid "pgr_edgeDisjointPaths(Many to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_edgeDisjointPaths(many to one)" +msgstr "" -msgid "Components family" +msgid "pgr_edgeDisjointPaths(many to many)" msgstr "" -msgid "pgr_connectedComponents" +msgid "Components family" msgstr "" msgid "pgr_strongComponents" @@ -16926,7 +17016,7 @@ msgstr "" msgid "pgr_johnson" msgstr "" -msgid "pgr_aStar" +msgid "pgr_astar" msgstr "" msgid "pgr_bdAstar" @@ -16947,9 +17037,6 @@ msgstr "" msgid "pgr_drivingDistance" msgstr "" -msgid "pgr_KSP" -msgstr "" - msgid "pgr_dijkstraVia (proposed)" msgstr "" @@ -17148,15 +17235,23 @@ msgstr "" msgid "Parameter names changed" msgstr "" -msgid "The many version results are the union of the One to One version" +msgid "The many version results are the union of the one to one version" msgstr "" msgid "New Signatures" msgstr "" -#, fuzzy -msgid "pgr_bdAstar(One to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_bdAstar(one to one)" +msgstr "" + +msgid "New Proposed functions" +msgstr "" + +msgid "pgr_bdAstarCostMatrix" +msgstr "" + +msgid "pgr_bdDijkstraCostMatrix" +msgstr "" msgid "pgr_lineGraph" msgstr "" @@ -17238,7 +17333,31 @@ msgstr "" msgid "pgr_bdDijkstra" msgstr "" -msgid "Deprecated signatures." +msgid "New Proposed Signatures" +msgstr "" + +msgid "pgr_astar(one to many)" +msgstr "" + +msgid "pgr_astar(many to one)" +msgstr "" + +msgid "pgr_astar(many to many)" +msgstr "" + +msgid "pgr_astarCost(one to one)" +msgstr "" + +msgid "pgr_astarCost(one to many)" +msgstr "" + +msgid "pgr_astarCost(many to one)" +msgstr "" + +msgid "pgr_astarCost(many to many)" +msgstr "" + +msgid "pgr_astarCostMatrix" msgstr "" msgid "pgr_bddijkstra - use pgr_bdDijkstra instead" @@ -17310,55 +17429,53 @@ msgstr "" msgid "pgr_TSP" msgstr "" +msgid "pgr_aStar" +msgstr "" + +msgid "New Functions" +msgstr "" + msgid "pgr_eucledianTSP" msgstr "" -#, fuzzy -msgid "pgr_maxFlowPushRelabel(One to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_withPointsCostMatrix" +msgstr "" -#, fuzzy -msgid "pgr_maxFlowPushRelabel(One to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_maxFlowPushRelabel(one to one)" +msgstr "" -#, fuzzy -msgid "pgr_maxFlowPushRelabel(Many to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_maxFlowPushRelabel(one to many)" +msgstr "" -#, fuzzy -msgid "pgr_maxFlowPushRelabel(Many to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_maxFlowPushRelabel(many to one)" +msgstr "" -#, fuzzy -msgid "pgr_maxFlowEdmondsKarp(One to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_maxFlowPushRelabel(many to many)" +msgstr "" -#, fuzzy -msgid "pgr_maxFlowEdmondsKarp(One to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_maxFlowEdmondsKarp(one to one)" +msgstr "" -#, fuzzy -msgid "pgr_maxFlowEdmondsKarp(Many to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_maxFlowEdmondsKarp(one to many)" +msgstr "" -#, fuzzy -msgid "pgr_maxFlowEdmondsKarp(Many to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_maxFlowEdmondsKarp(many to one)" +msgstr "" -msgid "pgr_maxFlowBoykovKolmogorov (One to One)" +msgid "pgr_maxFlowEdmondsKarp(many to many)" msgstr "" -#, fuzzy -msgid "pgr_maxFlowBoykovKolmogorov (One to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_maxFlowBoykovKolmogorov (one to one)" +msgstr "" -#, fuzzy -msgid "pgr_maxFlowBoykovKolmogorov (Many to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_maxFlowBoykovKolmogorov (one to many)" +msgstr "" -#, fuzzy -msgid "pgr_maxFlowBoykovKolmogorov (Many to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_maxFlowBoykovKolmogorov (many to one)" +msgstr "" + +msgid "pgr_maxFlowBoykovKolmogorov (many to many)" +msgstr "" msgid "pgr_maximumCardinalityMatching" msgstr "" @@ -17369,7 +17486,7 @@ msgstr "" msgid "pgr_tsp - use pgr_TSP or pgr_eucledianTSP instead" msgstr "" -msgid "pgr_aStar - use pgr_aStar instead" +msgid "pgr_astar - use pgr_aStar instead" msgstr "" msgid "pgr_flip_edges" @@ -17456,9 +17573,6 @@ msgstr "" msgid "Improvements" msgstr "" -msgid "pgr_nodeNetwork" -msgstr "" - msgid "Adding a row_where and outall optional parameters" msgstr "" @@ -17471,56 +17585,44 @@ msgstr "" msgid "pgr_Johnson" msgstr "" -#, fuzzy -msgid "pgr_dijkstraCost(One to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_dijkstraCost(one to one)" +msgstr "" -#, fuzzy -msgid "pgr_dijkstraCost(One to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_dijkstraCost(one to many)" +msgstr "" -#, fuzzy -msgid "pgr_dijkstraCost(Many to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_dijkstraCost(many to one)" +msgstr "" -#, fuzzy -msgid "pgr_dijkstraCost(Many to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_dijkstraCost(many to many)" +msgstr "" msgid "Proposed Functionality" msgstr "" -#, fuzzy -msgid "pgr_withPoints(One to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_withPoints(one to one)" +msgstr "" -#, fuzzy -msgid "pgr_withPoints(One to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_withPoints(one to many)" +msgstr "" -#, fuzzy -msgid "pgr_withPoints(Many to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_withPoints(many to one)" +msgstr "" -#, fuzzy -msgid "pgr_withPoints(Many to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_withPoints(many to many)" +msgstr "" -#, fuzzy -msgid "pgr_withPointsCost(One to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_withPointsCost(one to one)" +msgstr "" -#, fuzzy -msgid "pgr_withPointsCost(One to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_withPointsCost(one to many)" +msgstr "" -#, fuzzy -msgid "pgr_withPointsCost(Many to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_withPointsCost(many to one)" +msgstr "" -#, fuzzy -msgid "pgr_withPointsCost(Many to Many)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_withPointsCost(many to many)" +msgstr "" msgid "pgr_withPointsDD(single vertex)" msgstr "" @@ -17528,6 +17630,9 @@ msgstr "" msgid "pgr_withPointsDD(multiple vertices)" msgstr "" +msgid "pgr_withPointsKSP" +msgstr "" + msgid "pgr_dijkstraVia" msgstr "" @@ -17561,12 +17666,26 @@ msgid "" "q=is%3Aissue+milestone%3A%22Release+2.1.0%22+is%3Aclosed>`_ on Github." msgstr "" +msgid "pgr_dijkstra(one to many)" +msgstr "" + +msgid "pgr_dijkstra(many to one)" +msgstr "" + +msgid "pgr_dijkstra(many to many)" +msgstr "" + +msgid "pgr_drivingDistance(multiple vertices)" +msgstr "" + msgid "Refactored" msgstr "" -#, fuzzy -msgid "pgr_dijkstra(One to One)" -msgstr ":doc:`pgr_withPointsCostMatrix`" +msgid "pgr_dijkstra(one to one)" +msgstr "" + +msgid "pgr_drivingDistance(single vertex)" +msgstr "" msgid "" "pgr_alphaShape function now can generate better (multi)polygon with holes " @@ -18276,8 +18395,8 @@ msgid "" msgstr "" msgid "" -"pgRouting supplies some functions to create a routing topology and to " -"analyze the topology." +"pgRouting suplies some functions to create a routing topology and to analyze " +"the topology." msgstr "" msgid "Additional functions to create a graph:" @@ -18684,5 +18803,3 @@ msgstr "" msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" msgstr "" - -#, fuzzy diff --git a/locale/pot/index.pot b/locale/pot/index.pot index 0f5254b6659..5eb079c0e4d 100644 --- a/locale/pot/index.pot +++ b/locale/pot/index.pot @@ -1,12 +1,12 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v4.0 +# Copyright (C) pgRouting Contributors - Version v3.8 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: pgRouting v4.0\n" +"Project-Id-Version: pgRouting v3.8\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-06-25 12:55-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/locale/pot/pgrouting_doc_strings.pot b/locale/pot/pgrouting_doc_strings.pot index 26b223de1e6..ad5e96c11a4 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 v4.0 +# Copyright (C) pgRouting Contributors - Version v3.8 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: pgRouting v4.0\n" +"Project-Id-Version: pgRouting v3.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-12 01:00+0000\n" +"POT-Creation-Date: 2025-02-27 16:46+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3925,169 +3925,10 @@ msgstr "" msgid ":doc:`release_notes`" msgstr "" -msgid "pgRouting 4.0.0 Release Notes" +msgid "pgRouting 3.8.0 Release Notes" msgstr "" -msgid "To see all issues & pull requests closed by this release see the `Git closed milestone for 4.0.0 `__" -msgstr "" - -msgid "Functions promoted to official" -msgstr "" - -msgid "pgr_trsp" -msgstr "" - -msgid "pgr_trspVia" -msgstr "" - -msgid "pgr_trspVia_withPoints" -msgstr "" - -msgid "pgr_trsp_withPoints" -msgstr "" - -msgid "pgr_withPoints" -msgstr "" - -msgid "pgr_withPointsCost" -msgstr "" - -msgid "pgr_withPointsCostMatrix" -msgstr "" - -msgid "pgr_withPointsDD" -msgstr "" - -msgid "pgr_withPointsKSP" -msgstr "" - -msgid "pgr_withPointsVia" -msgstr "" - -msgid "Signatures promoted to official" -msgstr "" - -msgid "pgr_aStar(Combinations)" -msgstr "" - -msgid "pgr_aStarCost(Combinations)" -msgstr "" - -msgid "pgr_bdAstar(Combinations)" -msgstr "" - -msgid "pgr_bdAstarCost(Combinations)" -msgstr "" - -msgid "pgr_bdDijkstra(Combinations)" -msgstr "" - -msgid "pgr_bdDijkstraCost(Combinations)" -msgstr "" - -msgid "pgr_dijkstra(Combinations)" -msgstr "" - -msgid "pgr_dijkstraCost(Combinations)" -msgstr "" - -msgid "pgr_KSP(All signatures)" -msgstr "" - -msgid "pgr_boykovKolmogorov(Combinations)" -msgstr "" - -msgid "pgr_edmondsKarp(Combinations)" -msgstr "" - -msgid "pgr_maxFlow(Combinations)" -msgstr "" - -msgid "pgr_pushRelabel(Combinations)" -msgstr "" - -msgid "code enhancements:" -msgstr "" - -msgid "Removal of unused C/C++ code" -msgstr "" - -msgid "Removal of SQL deprecated functions" -msgstr "" - -msgid "pgr_trsp(text,integer,double precision,integer,double precision,boolean,boolean,text)" -msgstr "" - -msgid "pgr_trsp(text,integer,integer,boolean,boolean,text)" -msgstr "" - -msgid "pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)" -msgstr "" - -msgid "pgr_trspviavertices(text,anyarray,boolean,boolean,text)" -msgstr "" - -msgid "Removal of SQL deprecated internal functions" -msgstr "" - -msgid "_pgr_dijkstranear(text,anyarray,anyarray,bigint,boolean)" -msgstr "" - -msgid "_pgr_dijkstranear(text,anyarray,bigint,bigint,boolean)" -msgstr "" - -msgid "_pgr_dijkstranear(text,bigint,anyarray,bigint,boolean)" -msgstr "" - -msgid "_pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean,bigint)" -msgstr "" - -msgid "_pgr_dijkstra(text,text,boolean,boolean,boolean)" -msgstr "" - -msgid "_pgr_drivingdistance(text,anyarray,double precision,boolean,boolean)" -msgstr "" - -msgid "_pgr_kruskal(text,anyarray,text,bigint,double precision)" -msgstr "" - -msgid "_pgr_prim(text,anyarray,text,bigint,double precision)" -msgstr "" - -msgid "_pgr_trsp(text,integer,double precision,integer,double precision,boolean,boolean,text)" -msgstr "" - -msgid "_pgr_trsp(text,text,anyarray,anyarray,boolean)" -msgstr "" - -msgid "_pgr_trsp(text,text,anyarray,bigint,boolean)" -msgstr "" - -msgid "_pgr_trsp(text,text,bigint,anyarray,boolean)" -msgstr "" - -msgid "_pgr_trsp(text,text,bigint,bigint,boolean)" -msgstr "" - -msgid "_pgr_trspviavertices(text,integer[],boolean,boolean,text)" -msgstr "" - -msgid "_pgr_withpointsvia(text,bigint[],double precision[],boolean)" -msgstr "" - -msgid "_trsp(text,text,anyarray,anyarray,boolean)" -msgstr "" - -msgid "_v4trsp(text,text,anyarray,anyarray,boolean)" -msgstr "" - -msgid "_v4trsp(text,text,text,boolean)" -msgstr "" - -msgid "Deprecation of internal C/C++ functions" -msgstr "" - -msgid "Internal C/C++ functions in legacy" +msgid "No Changes Yet" msgstr "" msgid "All releases" @@ -4648,12 +4489,6 @@ msgstr "" msgid "`v3.4.0 `__" msgstr "" -msgid "Removed" -msgstr "" - -msgid "`v4.0.0 `__" -msgstr "" - msgid ":doc:`pgr_dijkstra`" msgstr "" @@ -6133,7 +5968,7 @@ msgstr "" msgid "Upgrading the database" msgstr "" -msgid "To upgrade pgRouting in the database to version 4.0.0 use the following command:" +msgid "To upgrade pgRouting in the database to version 3.8.0 use the following command:" msgstr "" msgid "More information can be found in https://www.postgresql.org/docs/current/sql-createextension.html" @@ -6526,12 +6361,6 @@ msgstr "" msgid "Availability" msgstr "" -msgid "Version 4.0.0" -msgstr "" - -msgid "All signatures promoted to official." -msgstr "" - msgid "Version 3.6.0" msgstr "" @@ -6580,7 +6409,7 @@ msgstr "" msgid "|Boost| Boost Graph Inside" msgstr "" -msgid "Boost Graph Inside" +msgid "Boost Graph inside" msgstr "" msgid "Signatures" @@ -6694,7 +6523,7 @@ msgstr "" msgid "``pgr_TSP``" msgstr "" -msgid "``pgr_TSP`` - Aproximation using *metric* algorithm." +msgid "``pgr_TSP`` - Approximation using *metric* algorithm." msgstr "" msgid "Availability:" @@ -6871,7 +6700,7 @@ msgstr "" msgid "``pgr_TSPeuclidean``" msgstr "" -msgid "``pgr_TSPeuclidean`` - Aproximation using *metric* algorithm." +msgid "``pgr_TSPeuclidean`` - Approximation using *metric* algorithm." msgstr "" msgid "Using `Boost: metric TSP approx `__" @@ -6961,9 +6790,6 @@ msgstr "" msgid "``pgr_aStar`` — Shortest path using the A* algorithm." msgstr "" -msgid "Combinations signature promoted to official." -msgstr "" - msgid "Standarizing output columns to |short-generic-result|" msgstr "" @@ -6982,6 +6808,9 @@ msgstr "" msgid "New proposed signature:" msgstr "" +msgid "pgr_aStar(Combinations)" +msgstr "" + msgid "Function promoted to official." msgstr "" @@ -7066,6 +6895,9 @@ msgstr "" msgid "``pgr_aStarCost`` - Total cost of the shortest path using the A* algorithm." msgstr "" +msgid "pgr_aStarCost(Combinations)" +msgstr "" + msgid "New proposed function." msgstr "" @@ -7621,6 +7453,9 @@ msgstr "" msgid "pgr_bdAstar(Many to One) added ``start_vid`` column." msgstr "" +msgid "pgr_bdAstar(Combinations)" +msgstr "" + msgid "pgr_bdAstar(One to Many)" msgstr "" @@ -7657,6 +7492,9 @@ msgstr "" 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 using the bidirectional A* algorithm." msgstr "" @@ -7693,6 +7531,9 @@ msgstr "" msgid "``pgr_bdDijkstra`` — Returns the shortest path using Bidirectional Dijkstra algorithm." msgstr "" +msgid "pgr_bdDijkstra(Combinations)" +msgstr "" + msgid "pgr_bdDijkstra(One to Many)" msgstr "" @@ -7756,6 +7597,9 @@ msgstr "" msgid "``pgr_bdDijkstraCost`` — Returns the shortest path's cost using Bidirectional Dijkstra algorithm." msgstr "" +msgid "pgr_bdDijkstraCost(Combinations)" +msgstr "" + msgid "The ``pgr_bdDijkstraCost`` function sumarizes of the cost of the shortest path using the bidirectional Dijkstra Algorithm." msgstr "" @@ -7858,6 +7702,9 @@ msgstr "" msgid "https://en.wikipedia.org/wiki/Bellman%E2%80%93Ford_algorithm" msgstr "" +msgid "Boost Graph Inside" +msgstr "" + msgid "``pgr_betweennessCentrality`` - Experimental" msgstr "" @@ -8080,6 +7927,9 @@ msgstr "" 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 "" +msgid "pgr_boykovKolmogorov(Combinations)" +msgstr "" + msgid "Renamed from ``pgr_maxFlowBoykovKolmogorov``" msgstr "" @@ -9022,6 +8872,9 @@ msgstr "" msgid "Version 3.1.0" msgstr "" +msgid "pgr_dijkstra(Combinations)" +msgstr "" + msgid "Version 2.2.0" msgstr "" @@ -9214,6 +9067,9 @@ msgstr "" msgid "37) Using `Combinations`_" msgstr "" +msgid "e Also" +msgstr "" + msgid "`Boost: Dijkstra shortest paths `__" msgstr "" @@ -9226,6 +9082,9 @@ msgstr "" 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 using Dijkstra Algorithm." msgstr "" @@ -9799,6 +9658,9 @@ msgstr "" 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 "" +msgid "pgr_edmondsKarp(Combinations)" +msgstr "" + msgid "Renamed from ``pgr_maxFlowEdmondsKarp``" msgstr "" @@ -9820,7 +9682,7 @@ msgstr "" msgid "pgr_edmondsKarp(`Edges SQL`_, `Combinations SQL`_)" msgstr "" -msgid "`Boost: Edmonds Karp max flow `__" +msgid "`Boost: edmonds_karp_max_flow `__" msgstr "" msgid "https://en.wikipedia.org/wiki/Edmonds%E2%80%93Karp_algorithm" @@ -9997,6 +9859,9 @@ msgstr "" msgid "One point" msgstr "" +msgid "**options:** [cap, partial, dryrun]``" +msgstr "" + msgid "Default: ``cap => 1``" msgstr "" @@ -10438,7 +10303,7 @@ msgstr "" msgid "``pgr_hawickCircuits`` - Experimental" msgstr "" -msgid "``pgr_hawickCircuits`` — Returns the list of cirucits using hawick circuits algorithm." +msgid "``pgr_hawickCircuits`` — Returns the list of ciruits using hawick circuits algorithm." msgstr "" msgid "Hawick Circuit algorithm, is published in 2008 by Ken Hawick and Health A. James. This algorithm solves the problem of detecting and enumerating circuits in graphs. It is capable of circuit enumeration in graphs with directed-arcs, multiple-arcs and self-arcs with a memory efficient and high-performance im-plementation. It is an extension of Johnson's Algorithm of finding all the elementary circuits of a directed graph." @@ -11173,6 +11038,9 @@ msgstr "" msgid "``pgr_maxFlow`` — Calculates the maximum flow in a directed graph from the source(s) to the targets(s) using the Push Relabel algorithm." msgstr "" +msgid "pgr_maxFlow(Combinations)" +msgstr "" + msgid "Calculates the maximum flow from the sources to the targets." msgstr "" @@ -11761,6 +11629,9 @@ msgstr "" msgid "``pgr_pushRelabel`` — Calculates the flow on the graph edges that maximizes the flow from the sources to the targets using Push Relabel Algorithm." msgstr "" +msgid "pgr_pushRelabel(Combinations)" +msgstr "" + msgid "Renamed from ``pgr_maxFlowPushRelabel``" msgstr "" @@ -12031,7 +11902,7 @@ msgstr "" msgid "https://en.wikipedia.org/wiki/Transitive_closure" msgstr "" -msgid "``pgr_trsp``" +msgid "``pgr_trsp`` - Proposed" msgstr "" msgid "``pgr_trsp`` - routing vertices with restrictions." @@ -12055,12 +11926,18 @@ msgstr "" msgid "Deprecated signatures" msgstr "" +msgid "pgr_trsp(text,integer,integer,boolean,boolean,text)" +msgstr "" + msgid "pgr_trsp(text,integer,float,integer,float,boolean,boolean,text)" msgstr "" msgid "pgr_trspViaVertices(text,anyarray,boolean,boolean,text)" msgstr "" +msgid "pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)" +msgstr "" + msgid "New prototypes" msgstr "" @@ -12121,7 +11998,7 @@ msgstr "" msgid "`Deprecated documentation `_" msgstr "" -msgid "``pgr_trspVia``" +msgid "``pgr_trspVia`` - Proposed" msgstr "" msgid "``pgr_trspVia`` Route that goes through a list of vertices with restrictions." @@ -12184,7 +12061,7 @@ msgstr "" msgid ":doc:`via-category`" msgstr "" -msgid "``pgr_trspVia_withPoints``" +msgid "``pgr_trspVia_withPoints`` - Proposed" msgstr "" msgid "``pgr_trspVia_withPoints`` - Route that goes through a list of vertices and/or points with restrictions." @@ -12313,7 +12190,7 @@ msgstr "" msgid "Therefore the result ignores the ``U_turn_on_edge`` flag when set to ``false``. From the :doc:`pgr_withPointsVia` result it removes the conflicting paths and builds the solution with the results of the :doc:`pgr_trsp` algorithm. In this case a U turn is been done using the same edge." msgstr "" -msgid "``pgr_trsp_withPoints``" +msgid "``pgr_trsp_withPoints`` - Proposed" msgstr "" msgid "``pgr_trsp_withPoints`` Routing Vertex/Point with restrictions." @@ -12481,7 +12358,7 @@ msgstr "" msgid "**TBD**" msgstr "" -msgid "``pgr_withPoints``" +msgid "``pgr_withPoints`` - Proposed" msgstr "" msgid "``pgr_withPoints`` - Returns the shortest path in a graph with additional temporary vertices." @@ -12592,7 +12469,7 @@ msgstr "" msgid "Passes in front or visits with left side driving." msgstr "" -msgid "``pgr_withPointsCost``" +msgid "``pgr_withPointsCost`` - Proposed" msgstr "" msgid "``pgr_withPointsCost`` - Calculates the shortest path and returns only the aggregate cost of the shortest path found, for the combination of points given." @@ -12697,7 +12574,7 @@ msgstr "" msgid "Does not matter driving side driving topology" msgstr "" -msgid "``pgr_withPointsCostMatrix``" +msgid "``pgr_withPointsCostMatrix`` - proposed" msgstr "" msgid "``pgr_withPointsCostMatrix`` - Calculates a cost matrix using :doc:`pgr_withPoints`." @@ -12721,7 +12598,7 @@ msgstr "" 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 "" -msgid "``pgr_withPointsDD``" +msgid "``pgr_withPointsDD`` - Proposed" msgstr "" msgid "``pgr_withPointsDD`` - Returns the driving **distance** from a starting point." @@ -12748,10 +12625,10 @@ msgstr "" msgid "Only points that are visited are removed, that is, points reached within the distance are included" msgstr "" -msgid "pgr_withpointsdd(text,text,bigint,double precision,boolean,character,boolean)" +msgid "pgr_withpointsdd(text,text,bigint,double precision,boolean,character,boolean)``" msgstr "" -msgid "pgr_withpointsdd(text,text,anyarray,double precision,boolean,character,boolean,boolean)" +msgid "pgr_withpointsdd(text,text,anyarray,double precision,boolean,character,boolean,boolean)``" msgstr "" msgid "Modify the graph to include points and using Dijkstra algorithm, extracts all the nodes and points that have costs less than or equal to the value ``**distance**`` from the starting point. The edges extracted will conform the corresponding spanning tree." @@ -12832,7 +12709,7 @@ msgstr "" msgid ":doc:`pgr_alphaShape`" msgstr "" -msgid "``pgr_withPointsKSP``" +msgid "``pgr_withPointsKSP`` - Proposed" msgstr "" msgid "``pgr_withPointsKSP`` — Yen's algorithm for K shortest paths using Dijkstra." @@ -12943,7 +12820,7 @@ msgstr "" msgid "Get :math:`2` paths using right side driving topology from, point :math:`1` to point :math:`2` with heap paths and details." msgstr "" -msgid "``pgr_withPointsVia``" +msgid "``pgr_withPointsVia`` - Proposed" msgstr "" msgid "``pgr_withPointsVia`` - Route that goes through a list of vertices and/or points." @@ -13039,21 +12916,15 @@ msgstr "" msgid "Mayors" msgstr "" -msgid "pgRouting 4" -msgstr "" - -msgid "Minors 4.x" -msgstr "" - -msgid "pgRouting 4.0" -msgstr "" - msgid "pgRouting 3" msgstr "" msgid "Minors 3.x" msgstr "" +msgid "pgRouting 3.8" +msgstr "" + msgid "pgRouting 3.7" msgstr "" @@ -13438,6 +13309,12 @@ msgstr "" msgid "pgr_trspVia_withPoints(One Via)" msgstr "" +msgid "pgr_trsp" +msgstr "" + +msgid "``pgr_trsp_withPoints``" +msgstr "" + msgid "pgr_trsp_withPoints(One to One)" msgstr "" @@ -14539,6 +14416,9 @@ msgstr "" msgid "pgr_eucledianTSP" msgstr "" +msgid "pgr_withPointsCostMatrix" +msgstr "" + msgid "pgr_maxFlowPushRelabel(One to One)" msgstr "" @@ -14716,6 +14596,9 @@ msgstr "" msgid "pgr_withPointsDD(multiple vertices)" msgstr "" +msgid "pgr_withPointsKSP" +msgstr "" + msgid "pgr_dijkstraVia" msgstr "" diff --git a/locale/zh_Hans/LC_MESSAGES/index.po b/locale/zh_Hans/LC_MESSAGES/index.po index ca5d954c9bb..dcb38e1c1a7 100644 --- a/locale/zh_Hans/LC_MESSAGES/index.po +++ b/locale/zh_Hans/LC_MESSAGES/index.po @@ -1,15 +1,15 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v4.0 +# Copyright (C) pgRouting Contributors - Version v3.8 # This file is distributed under the same license as the pgRouting package. # FIRST AUTHOR , YEAR. # msgid "" msgstr "" -"Project-Id-Version: pgRouting v4.0\n" +"Project-Id-Version: pgRouting v3.8\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-06-25 12:55-0500\n" -"PO-Revision-Date: 2024-12-19 08:23+0000\n" -"Last-Translator: Dapeng Wang \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" @@ -45,8 +45,8 @@ msgstr "目录" #: ../../build/doc/index.rst:32 msgid "pgRouting extends the `PostGIS `__/`PostgreSQL `__ geospatial database to provide geospatial routing and other network analysis functionality." msgstr "" -"pgRouting 扩展了`PostGIS `__/`PostgreSQL `__ 地理空间数据库，提供地理空间路由和其他网络分析功能。" +"pgRouting 扩展了 `PostGIS `__/`PostgreSQL `__ 地理空间数据库，以提供地理空间路由和其他网络分析功能。" #: ../../build/doc/index.rst:36 msgid "This is the manual for pgRouting |release|." @@ -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 手册采用`Creative Commons Attribution-Share Alike 3.0 License " -"`_ " -"。您可以随意使用这些资料，但我们要求您注明 pgRouting 项目的出处，" -"并在可能的情况下提供链接回 https://pgrouting.org。有关 pgRouting " -"中使用的其他许可证，请参阅 :ref:`license` page.。" +"pgRouting 手册根据 `知识共享署名-相同方式共享3.0许可证 " +"`_。 您可以随意使用本材料，" +"但我们要求您将功劳归功于 pgRouting 项目，并尽可能提供返回 https://" +"pgrouting.org 的链接。 有关 pgRouting 中使用的其他许可证，请参阅 " +":ref:`license` page.。" #: ../../build/doc/index.rst:50 msgid "General" diff --git a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po index ee92565a266..801fd089369 100644 --- a/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/zh_Hans/LC_MESSAGES/pgrouting_doc_strings.po @@ -1,20 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) pgRouting Contributors - Version v4.0 +# Copyright (C) pgRouting Contributors - Version v3.8 # This file is distributed under the same license as the pgRouting package. # Regina Obe , 2023. # Wangdapeng , 2023. # Zuochenwei , 2023, 2024. -# Celia Virginia Vergara Castillo , 2023, 2024, 2025. +# Celia Virginia Vergara Castillo , 2023, 2024. # Wang Dapeng , 2023. # DeepL , 2024. -# Dapeng Wang , 2024. msgid "" msgstr "" -"Project-Id-Version: pgRouting v4.0\n" +"Project-Id-Version: pgRouting v3.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-12 01:00+0000\n" -"PO-Revision-Date: 2025-02-12 01:27+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" +"POT-Creation-Date: 2024-10-17 00:50+0000\n" +"PO-Revision-Date: 2024-10-10 19:47+0000\n" +"Last-Translator: DeepL \n" "Language-Team: Chinese (Simplified) \n" "Language: zh_Hans\n" @@ -25,7 +24,7 @@ msgstr "" "X-Generator: Weblate 5.4.3\n" msgid "BFS - Category" -msgstr "BFS（广度优先搜索） - 类别" +msgstr "BFS - 类别" msgid ":doc:`pgr_kruskalBFS`" msgstr ":doc:`pgr_kruskalBFS`" @@ -85,7 +84,7 @@ msgid "``BIGINT``" msgstr "``BIGINT``" msgid "Identifier of the root vertex of the tree." -msgstr "树的根顶点标识符。" +msgstr "树的根顶点的标识符。" msgid "" "When value is :math:`0` then gets the spanning forest starting in aleatory " @@ -295,7 +294,7 @@ msgid ":ref:`search`" msgstr ":ref:`search`" msgid "DFS - Category" -msgstr "DFS（深度优先搜索） - 类别" +msgstr "DFS - 类别" msgid "Traversal using Depth First Search." msgstr "使用深度优先搜索进行遍历。" @@ -687,10 +686,9 @@ msgstr "当 ``NOT 0`` 且 ``start_id = 0`` 时，它是第一个和最后一个 msgid "References" msgstr "参考" -#, fuzzy msgid "" -"`Boost: metric TSP approx `__" +"`Boost's metric appro's metric approximation `__" msgstr "" "`Boost 的 metric appro 的 metric 近似 `__" @@ -707,8 +705,7 @@ msgstr "" "`维基百科：旅行商问题 `__" -#, fuzzy -msgid "Vehicle Routing Functions - Category" +msgid "Vehicle Routing Functions - Category (Experimental)" msgstr "车辆路由功能 - 类别（实验）" msgid "Pickup and delivery problem" @@ -1677,8 +1674,8 @@ msgstr ":math:`1km * 0.0277hr/km = 0.0277hr`" msgid "https://en.wikipedia.org/wiki/Vehicle_routing_problem" msgstr "https://en.wikipedia.org/wiki/Vehicle_routing_problem" -msgid ":doc:`sampledata`" -msgstr ":doc:`sampledata`" +msgid "The queries use the :doc:`sampledata` network." +msgstr "查询使用 :doc:`sampledata` 网络。" msgid "A* - Family of functions" msgstr "A* - 函数族" @@ -1849,9 +1846,7 @@ msgstr "" msgid ":doc:`bdAstar-family`" msgstr ":doc:`bdAstar-family`" -#, fuzzy -msgid "" -"`Boost: A* search `__" +msgid "https://www.boost.org/libs/graph/doc/astar_search.html" msgstr "https://www.boost.org/libs/graph/doc/astar_search.html" msgid "https://en.wikipedia.org/wiki/A*_search_algorithm" @@ -2667,13 +2662,15 @@ msgid "" "ending vertex:" msgstr "对于起始顶点和结束顶点之间存在路径的大型图:" -#, fuzzy -msgid "It is expected to terminate faster than pgr_aStar" +msgid "It is expected to terminate faster than pgr_astar" msgstr "预计终止速度比 pgr_astar 更快" msgid ":doc:`aStar-family`" msgstr ":doc:`aStar-family`" +msgid "Previous versions of this page" +msgstr "此页面的先前版本" + msgid "Bidirectional Dijkstra - Family of functions" msgstr "双向 Dijkstra - 函数族" @@ -2817,10 +2814,35 @@ msgstr "``edge_id``" msgid "Identifier of the color of the edge." msgstr "边颜色的标识符。" -#, fuzzy msgid "" -"`Boost: `__" -msgstr "boost: https://www.boost.org/libs/graph/doc/table_of_contents.html" +"`Boost: Sequential Vertex Coloring algorithm documentation `__" +msgstr "" +"`Boost：顺序顶点着色算法文档 `__" + +msgid "" +"`Wikipedia: Graph coloring `__" +msgstr "`维基百科：图着色 `__" + +msgid "" +"`Boost: is_bipartite `__" +msgstr "" +"`Boost: is_bipartite `__" + +msgid "" +"`Wikipedia: bipartite graph `__" +msgstr "`维基百科：二分图 `__" + +msgid "" +"`Boost: Edge Coloring Algorithm documentation `__" +msgstr "" +"`Boost：边缘着色算法文档 `__" msgid "Components - Family of functions" msgstr "分量 - 函数族" @@ -2929,7 +2951,7 @@ msgstr "蓝色节点具有无限数量的边。" msgid "Node" msgstr "节点" -msgid "Adjacent nodes" +msgid "Adjecent nodes" msgstr "相邻节点" msgid "Number of adjacent nodes" @@ -3382,6 +3404,9 @@ msgstr "当源和/或目标属于一个顶点时，现在就找到了一条路 msgid "Now, the routing graph has an edge connecting with node :math:`7`." msgstr "现在，路由图有一条与节点 :math:`7` 连接的边。" +msgid ":doc:`sampledata`" +msgstr ":doc:`sampledata`" + msgid "" "https://www.cs.cmu.edu/afs/cs/academic/class/15210-f12/www/lectures/" "lecture16.pdf" @@ -3740,7 +3765,7 @@ 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}}`" +msgstr ":math:`V = source \\cup target \\cup {start_v{vid}} \\cup {end_{vid}}`" msgid "the set of edges :math:`E`" msgstr "边集 :math:`E`" @@ -3757,7 +3782,7 @@ 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 " +"\\{(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}`" @@ -3786,8 +3811,8 @@ msgid "" 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{ } \\\\ " +"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) " @@ -4028,18 +4053,13 @@ msgid "" "an undirected graph." msgstr ":doc:`pgr_cuthillMckeeOrdering` -返回无向图的反向 Cuthill-McKee 排序。" -msgid "" -":doc:`pgr_topologicalSort` - Linear ordering of the vertices for directed " -"acyclic graph." -msgstr ":doc:`pgr_topologicalSort` — 有向无环图 (DAG) 的顶点的线性排序。" - msgid ":doc:`metrics-family`" msgstr ":doc:`metrics-family`" msgid "" ":doc:`pgr_betweennessCentrality` - Calculates relative betweenness " "centrality using Brandes Algorithm" -msgstr ":doc:`pgr_betweennessCentrality` - 使用布兰德斯算法计算相对介度中心性" +msgstr "" msgid ":doc:`TRSP-family`" msgstr ":doc:`TRSP-family`" @@ -4050,9 +4070,8 @@ msgstr "类别" msgid ":doc:`VRP-category`" msgstr ":doc:`VRP-category`" -#, fuzzy -msgid "Shortest Path Category" -msgstr "K最短路径 - 类别" +msgid "Unclassified" +msgstr "未分类" msgid ":doc:`pgr_bellmanFord`" msgstr ":doc:`pgr_bellmanFord`" @@ -4063,25 +4082,21 @@ msgstr ":doc:`pgr_dagShortestPath`" msgid ":doc:`pgr_edwardMoore`" msgstr ":doc:`pgr_edwardMoore`" -#, fuzzy -msgid "Planar Family" -msgstr "aStar族" - msgid ":doc:`pgr_isPlanar`" msgstr ":doc:`pgr_isPlanar`" -msgid "Miscellaneous Algoritms" -msgstr "" - -msgid ":doc:`pgr_lengauerTarjanDominatorTree`" -msgstr ":doc:`pgr_lengauerTarjanDominatorTree`" - msgid ":doc:`pgr_stoerWagner`" msgstr ":doc:`pgr_stoerWagner`" +msgid ":doc:`pgr_topologicalSort`" +msgstr ":doc:`pgr_topologicalSort`" + msgid ":doc:`pgr_transitiveClosure`" msgstr ":doc:`pgr_transitiveClosure`" +msgid ":doc:`pgr_lengauerTarjanDominatorTree`" +msgstr ":doc:`pgr_lengauerTarjanDominatorTree`" + msgid ":doc:`pgr_hawickCircuits`" msgstr ":doc:`pgr_hawickCircuits`" @@ -4135,9 +4150,11 @@ msgid "" "returned." 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或target 中的任何重复值都将被忽略。" @@ -4148,13 +4165,13 @@ msgid "Edges with zero flow are omitted." msgstr "流量为零的边被忽略。" msgid "Creates" -msgstr "创建" +msgstr "" msgid "a **super source** and edges from it to all the sources," -msgstr "一个**超级源**和从它到所有源的边，" +msgstr "" msgid "a **super target** and edges from it to all the targetss." -msgstr "一个**超级目标**和从它到所有目标的边。" +msgstr "" msgid "" "The maximum flow through the graph is guaranteed to be the value returned " @@ -4400,8 +4417,8 @@ msgid "" "www.postgresql.org>`__ geospatial database to provide geospatial routing and " "other network analysis functionality." msgstr "" -"pgRouting 扩展了`PostGIS `__/`PostgreSQL `__ 地理空间数据库，提供地理空间路由和其他网络分析功能。" +"pgRouting 扩展了 `PostGIS `__ /`PostgreSQL `__ 地理空间数据库，以提供地理空间路由和其他网络分析功能。" msgid "This is the manual for pgRouting |release|." msgstr "这是pgRouting|release|的手册。" @@ -4417,11 +4434,10 @@ msgid "" "https://pgrouting.org. For other licenses used in pgRouting see the :ref:" "`license` page." msgstr "" -"pgRouting 手册采用`Creative Commons Attribution-Share Alike 3.0 License " -"`_ 。您可以随意使用这些资" -"料，但我们要求您注明 pgRouting 项目的出处，并在可能的情况下提供链接回 " -"https://pgrouting.org。有关 pgRouting 中使用的其他许可证，请参阅 :ref:" -"`license` page.。" +"pgRouting 手册根据`知识共享署名-相同方式共享3.0许可证 `_。 您可以随意使用本材料，但我们要求" +"您将功劳归功于 pgRouting 项目，并尽可能提供返回 https://pgrouting.org 的链" +"接。 有关 pgRouting 中使用的其他许可证，请参阅 :ref:`license` page.。" msgid "General" msgstr "常规" @@ -4541,198 +4557,132 @@ msgstr ":doc:`experimental`" msgid ":doc:`release_notes`" msgstr ":doc:`release_notes`" -msgid "pgRouting 4.0.0 Release Notes" -msgstr "pgRouting 4.0.0 发布说明" +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 4.0.0 `__" -msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 `Git closed milestone for 3.7.0 " -"`__" - -msgid "Functions promoted to official" msgstr "" +"要查看此版本关闭的所有问题和拉取请求，请参阅 `3.7.0 `__ 的 Git 关闭里程碑" -msgid "pgr_trsp" -msgstr "pgr_trsp" - -msgid "pgr_trspVia" -msgstr "pgr_trspVia" - -msgid "pgr_trspVia_withPoints" -msgstr "pgr_trspVia_withPoints" - -msgid "pgr_trsp_withPoints" -msgstr "pgr_trsp_withPoints" - -msgid "pgr_withPoints" -msgstr "pgr_withPoints" - -msgid "pgr_withPointsCost" -msgstr "pgr_withPointsCost" - -msgid "pgr_withPointsCostMatrix" -msgstr "pgr_withPointsCostMatrix" - -msgid "pgr_withPointsDD" -msgstr "pgr_withPointsDD" - -msgid "pgr_withPointsKSP" -msgstr "pgr_withPointsKSP" - -msgid "pgr_withPointsVia" -msgstr "pgr_withPointsVia" +msgid "Support" +msgstr "支持" -msgid "Signatures promoted to official" +#, fuzzy +msgid "" +"`#2656 `__ Stop support of " +"PostgreSQL12 on pgrouting v3.7" msgstr "" - -msgid "pgr_aStar(Combinations)" -msgstr "pgr_aStar(组合)" - -msgid "pgr_aStarCost(Combinations)" -msgstr "pgr_aStarCost(组合)" - -msgid "pgr_bdAstar(Combinations)" -msgstr "pgr_bdAstar(组合)" - -msgid "pgr_bdAstarCost(Combinations)" -msgstr "pgr_bdAstarCost(组合)" - -msgid "pgr_bdDijkstra(Combinations)" -msgstr "pgr_bdDijkstra(组合)" - -msgid "pgr_bdDijkstraCost(Combinations)" -msgstr "pgr_bdDijkstraCost(组合)" - -msgid "pgr_dijkstra(Combinations)" -msgstr "pgr_dijkstra(组合)" - -msgid "pgr_dijkstraCost(Combinations)" -msgstr "pgr_dijkstraCost(组合)" +"`#2607 `__ 在 C++ 上读取 " +"postgresql 数据" #, fuzzy -msgid "pgr_KSP(All signatures)" -msgstr "TSP 旧签名" - -msgid "pgr_boykovKolmogorov(Combinations)" -msgstr "pgr_boykovKolmogorov (组合)" - -msgid "pgr_edmondsKarp(Combinations)" -msgstr "pgr_edmondsKarp(组合)" - -msgid "pgr_maxFlow(Combinations)" -msgstr "pgr_maxFlow(组合)" - -msgid "pgr_pushRelabel(Combinations)" -msgstr "pgr_pushRelabel(组合)" +msgid "Stopping support of PostgreSQL 12" +msgstr "从 PostgreSQL 12 开始：：" -msgid "code enhancements:" -msgstr "代码改进：" +#, fuzzy +msgid "CI does not test for PostgreSQL 12" +msgstr "适用于 postgreSQL 10" -msgid "Removal of unused C/C++ code" -msgstr "" +msgid "New experimental functions" +msgstr "新的实验函数" #, fuzzy -msgid "Removal of SQL deprecated functions" -msgstr "移除已弃用的函数和签名" +msgid "Metrics" +msgstr "限制" -msgid "" -"pgr_trsp(text,integer,double precision,integer,double precision,boolean," -"boolean,text)" +msgid "pgr_betweennessCentrality" msgstr "" -"pgr_trsp(text,integer,double precision,integer,double precision,boolean," -"boolean,text)" -msgid "pgr_trsp(text,integer,integer,boolean,boolean,text)" -msgstr "pgr_trsp(text,integer,integer,boolean,boolean,text)" +msgid "Official functions changes" +msgstr "官方功能变更" msgid "" -"pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)" +"`#2605 `__ Standarize " +"spanning tree functions output" msgstr "" -"pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)" -msgid "pgr_trspviavertices(text,anyarray,boolean,boolean,text)" -msgstr "pgr_trspviavertices(text,anyarray,boolean,boolean,text)" +msgid "Functions:" +msgstr "新函数:" -#, fuzzy -msgid "Removal of SQL deprecated internal functions" -msgstr "移除已弃用的函数和签名" +msgid "``pgr_kruskalDD``" +msgstr "``pgr_kruskalDD``" -msgid "_pgr_dijkstranear(text,anyarray,anyarray,bigint,boolean)" -msgstr "_pgr_dijkstranear(text,anyarray,anyarray,bigint,boolean)" +msgid "``pgr_kruskalDFS``" +msgstr "``pgr_kruskalDFS``" -msgid "_pgr_dijkstranear(text,anyarray,bigint,bigint,boolean)" -msgstr "_pgr_dijkstranear(text,anyarray,bigint,bigint,boolean)" +msgid "``pgr_kruskalBFS``" +msgstr "``pgr_kruskalBFS``" -msgid "_pgr_dijkstranear(text,bigint,anyarray,bigint,boolean)" -msgstr "_pgr_dijkstranear(text,bigint,anyarray,bigint,boolean)" +msgid "``pgr_primDD``" +msgstr "``pgr_primDD``" -msgid "_pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean,bigint)" -msgstr "_pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean,bigint)" +msgid "``pgr_primDFS``" +msgstr "``pgr_primDFS``" -msgid "_pgr_dijkstra(text,text,boolean,boolean,boolean)" -msgstr "_pgr_dijkstra(text,text,boolean,boolean,boolean)" +msgid "``pgr_primBFS``" +msgstr "``pgr_primBFS``" -msgid "_pgr_drivingdistance(text,anyarray,double precision,boolean,boolean)" -msgstr "_pgr_drivingdistance(text,anyarray,double precision,boolean,boolean)" +msgid "Standarizing output columns to |result-spantree|" +msgstr "将输出列标准化为 |result-spantree|" -msgid "_pgr_kruskal(text,anyarray,text,bigint,double precision)" -msgstr "_pgr_kruskal(text,anyarray,text,bigint,double precision)" +#, fuzzy +msgid "Added ``pred`` result columns." +msgstr "添加了 ``depth`` 和``pred`` 结果列。" -msgid "_pgr_prim(text,anyarray,text,bigint,double precision)" -msgstr "_pgr_prim(text,anyarray,text,bigint,double precision)" +msgid "Experimental promoted to proposed." +msgstr "实验提升为拟议。" msgid "" -"_pgr_trsp(text,integer,double precision,integer,double precision,boolean," -"boolean,text)" +"`#2635 `__ pgr_LineGraph " +"ignores directed flag and use negative values for identifiers." msgstr "" -"_pgr_trsp(text,integer,double precision,integer,double precision,boolean," -"boolean,text)" - -msgid "_pgr_trsp(text,text,anyarray,anyarray,boolean)" -msgstr "_pgr_trsp(text,text,anyarray,anyarray,boolean)" - -msgid "_pgr_trsp(text,text,anyarray,bigint,boolean)" -msgstr "_pgr_trsp(text,text,anyarray,bigint,boolean)" -msgid "_pgr_trsp(text,text,bigint,anyarray,boolean)" -msgstr "_pgr_trsp(text,text,bigint,anyarray,boolean)" - -msgid "_pgr_trsp(text,text,bigint,bigint,boolean)" -msgstr "_pgr_trsp(text,text,bigint,bigint,boolean)" - -msgid "_pgr_trspviavertices(text,integer[],boolean,boolean,text)" -msgstr "_pgr_trspviavertices(text,integer[],boolean,boolean,text)" +msgid "``pgr_lineGraph``" +msgstr "``pgr_lineGraph``" -msgid "_pgr_withpointsvia(text,bigint[],double precision[],boolean)" -msgstr "_pgr_withpointsvia(text,bigint[],double precision[],boolean)" +msgid "Promoted to **proposed** signature." +msgstr "晋升为 **拟议** 签名。" -msgid "_trsp(text,text,anyarray,anyarray,boolean)" -msgstr "_trsp(text,text,anyarray,anyarray,boolean)" +msgid "Works for directed and undirected graphs." +msgstr "适用于有向和无向图。" -msgid "_v4trsp(text,text,anyarray,anyarray,boolean)" -msgstr "_v4trsp(text,text,anyarray,anyarray,boolean)" +msgid "Code enhancement" +msgstr "代码改进" -msgid "_v4trsp(text,text,text,boolean)" -msgstr "_v4trsp(text,text,text,boolean)" +msgid "" +"`#2599 `__ Driving " +"distance cleanup" +msgstr "" +"`#2599 `__ 行车距离清理" -#, fuzzy -msgid "Deprecation of internal C/C++ functions" -msgstr "已废弃的函数" +msgid "" +"`#2607 `__ Read postgresql " +"data on C++" +msgstr "" +"`#2607 `__ 在 C++ 上读取 " +"postgresql 数据" -msgid "Internal C/C++ functions in legacy" +msgid "" +"`#2614 `__ Clang tidy does " +"not work" msgstr "" +"`#2614 `__ Clang tidy 不工" +"作" msgid "All releases" -msgstr "All releases" +msgstr "所有版本" msgid "Kruskal - Family of functions" msgstr "Kruskal - 函数族" +msgid "Boost Graph Inside" +msgstr "Boost 图内部" + msgid "" "Kruskal's algorithm is a greedy minimum spanning tree algorithm that in each " "cycle finds and adds the edge of the least possible weight that connects any " @@ -4751,7 +4701,7 @@ msgid "Kruskal's running time: :math:`O(E * log E)`" msgstr "克鲁斯卡尔的运行时间： :math:`O(E * log E)`" msgid "Metrics - Family of functions" -msgstr "度量 - 功能系列" +msgstr "" msgid "Migration guide" msgstr "迁移指南" @@ -4767,6 +4717,12 @@ msgstr "结果可能会因变化而不同。" msgid "All deprecated functions will be removed on next mayor version 4.0.0" msgstr "所有已弃用的函数将在下一个主要版本 4.0.0 中被移除" +msgid "Migration of functions" +msgstr "函数迁移" + +msgid "Migrating functions" +msgstr "迁移函数" + msgid "Migration of ``pgr_aStar``" msgstr "``pgr_aStar`` 迁移" @@ -4810,8 +4766,9 @@ msgstr "``pgr_aStar`` (`多对一`)没有 ``end_vid``。" msgid "Migration" msgstr "迁移" +#, fuzzy msgid "Be aware of the existence of the additional columns." -msgstr "注意附加栏的存在。" +msgstr "请注意附加列的存在。" msgid "In ``pgr_aStar`` (`One to One`)" msgstr "在 ``pgr_aStar`` (`一对一`)中" @@ -4928,16 +4885,15 @@ msgstr "在 ``pgr_dijkstra`` (`多对一`)中" msgid "If needed add the new columns, for example:" msgstr "如果需要，过滤掉添加的列，例如：" -#, fuzzy -msgid "Migration of ``pgr_drivingDistance``" +msgid "Migration of ``pgr_drivingdistance``" msgstr "迁移 ``pgr_drivingdistance``" 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 "从" @@ -4951,13 +4907,11 @@ msgstr "到" msgid "|result-spantree|" msgstr "|result-spantree|" -#, fuzzy -msgid "pgr_drivingDistance(Single vertex)" -msgstr "pgr_drivingDistance （单顶点）" +msgid "``pgr_drivingdistance`` (Single vertex)" +msgstr "``pgr_drivingdistance`` (单个顶点)" -#, fuzzy -msgid "pgr_drivingDistance(Multiple vertices)" -msgstr "pgr_drivingDistance （多顶点）" +msgid "``pgr_drivingdistance`` (Multiple vertices)" +msgstr "``pgr_drivingdistance`` (多个顶点)" msgid "Output columns were |result-dij-dd|" msgstr "输出列是 |result-dij-dd|" @@ -4971,8 +4925,9 @@ msgstr "有 ``from_v`` 而不是 ``start_vid`` 结果列。" msgid "does not have ``depth`` result column." msgstr "没有 ``depth`` 结果列。" +#, fuzzy msgid "Be aware of the existence and name change of the result columns." -msgstr "注意结果列的存在和名称变化。" +msgstr "请注意结果列的存在和名称更改。" msgid "" "Using `this `__ :" "doc:`pgr_kruskalDD`, :doc:`pgr_kruskalBFS` and :doc:`pgr_kruskalDFS` result " "columns are being standardized." msgstr "" -"Starting from `v3.7.0 `__ :" -"doc:`pgr_kruskalDD`, :doc:`pgr_kruskalBFS` and :doc:`pgr_kruskalDFS` result " -"columns are being standardized." msgid "|result-bfs|" msgstr "|result-bfs|" -msgid "``pgr_kruskalDD``" -msgstr "``pgr_kruskalDD``" - msgid "Single vertex" msgstr "单顶点" msgid "Multiple vertices" msgstr "多个顶点" -msgid "``pgr_kruskalDFS``" -msgstr "``pgr_kruskalDFS``" - -msgid "``pgr_kruskalBFS``" -msgstr "``pgr_kruskalBFS``" - msgid "Output columns were |result-bfs|" -msgstr "输出列为 |result-bfs|" +msgstr "" +#, fuzzy msgid "Single vertex and Multiple vertices" -msgstr "单顶点和多顶点" +msgstr "多个顶点" msgid "Do not have ``pred`` result column." -msgstr "没有 ``pred`` 结果列。" +msgstr "" +#, fuzzy msgid "Be aware of the existence of `pred` result columns." -msgstr "注意`pred`结果列的存在。" +msgstr "注意附加结果列的存在。" +#, fuzzy msgid "If needed filter out the added columns" -msgstr "如果需要，可过滤掉添加的列" +msgstr "如果需要，过滤掉添加的列，例如" +#, fuzzy msgid "Kruskal single vertex" -msgstr "Kruskal 单顶点" +msgstr "单顶点" msgid "" "Using ``pgr_KruskalDD`` as example. Migration is similar to al the affected " "functions." -msgstr "以 ``pgr_KruskalDD`` 为例。迁移与所有受影响的函数类似。" +msgstr "" +#, fuzzy msgid "" "Comparing with `this `__ example." msgstr "" -"与 `this `__ 示例比较。" +"使用`这个 `__ 示例。" +#, fuzzy msgid "" "Now column ``pred`` exists and contains the predecessor of the ``node``." -msgstr "现在列 ``pred`` 已经存在，并包含了 ``node`` 的前置节点。" +msgstr "``pred`` 包含``node`` 的前驱。" +#, fuzzy msgid "Kruskal multiple vertices" -msgstr "Kruskal 多顶点" +msgstr "多个顶点" +#, fuzzy msgid "" "Comparing with `this `__ example." msgstr "" -"与 `this `__ 示例比较。" +"使用`这个 `__ 示例。" msgid "Migration of ``pgr_KSP``" msgstr "迁移 ``pgr_KSP``" +#, fuzzy msgid "" "Starting from `v3.6.0 `__ :" "doc:`pgr_KSP` result columns are being standardized." msgstr "" -"从 `v3.6.0 `__ :doc:" -"`pgr_KSP` 开始，结果列被标准化。" +"从 `v3.6.0 `__ 开始， :doc:" +"`pgr_KSP`结果列正在标准化。" msgid "|ksp-result|" msgstr "|ksp-result|" @@ -5110,11 +5063,12 @@ 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 `__ " "example." msgstr "" -"使用 `this `__ 示" +"使用`这个 `__ 示" "例。" msgid "" @@ -5192,7 +5146,7 @@ msgid "In the query returns only ``edge`` column." msgstr "查询中仅返回 ``边`` 列。" msgid "Migration of ``pgr_primDD`` / ``pgr_primBFS`` / ``pgr_primDFS``" -msgstr "`pgr_primDD`` / `pgr_primBFS`` / `pgr_primDFS`` 的迁移" +msgstr "" #, fuzzy msgid "" @@ -5200,53 +5154,48 @@ msgid "" "doc:`pgr_primDD`, :doc:`pgr_primBFS` and :doc:`pgr_primDFS` result columns " "are being standardized." msgstr "" -"Starting from `v3.7.0 `__ " -":doc:`pgr_primDD`, :doc:`pgr_primBFS` and :doc:`pgr_primDFS` result columns " -"are being standardized." - -msgid "``pgr_primDD``" -msgstr "``pgr_primDD``" - -msgid "``pgr_primDFS``" -msgstr "``pgr_primDFS``" - -msgid "``pgr_primBFS``" -msgstr "``pgr_primBFS``" +"从 `v3.6.0 `__ 开始， :doc:" +"`pgr_drivingDistance`结果列正在标准化。" +#, fuzzy msgid "Prim single vertex" -msgstr "Prim 单一节点" +msgstr "单顶点" msgid "" "Using ``pgr_primDD`` as example. Migration is similar to al the affected " "functions." -msgstr "以 ``pgr_primDD`` 为例。迁移与所有受影响的函数类似。" +msgstr "" +#, fuzzy msgid "" "Comparing with `this `__ example." msgstr "" -"与 `this `__ 例子比较。" +"使用`这个 `__ 示例。" +#, fuzzy msgid "Prim multiple vertices" -msgstr "Prim 多个顶点" +msgstr "多个顶点" +#, fuzzy msgid "" "Comparing with `this `__ example." msgstr "" -"与 `this `__ 例子比较。" +"使用`这个 `__ 示例。" msgid "Migration of ``pgr_withPointsDD``" msgstr "迁移 ``pgr_withPointsDD``" +#, fuzzy msgid "" "Starting from `v3.6.0 `__ :" "doc:`pgr_withPointsDD` result columns are being standardized." msgstr "" -"从 `v3.6.0 `__ :doc:" -"`pgr_withPointsDD` 结果列开始标准化。" +"从`v3.6.0 `__ 开始 :doc:" +"`pgr_withPointsDD`结果列正在标准化。" msgid "|result-generic-no-seq|" msgstr "|result-generic-no-seq|" @@ -5271,9 +5220,10 @@ 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 unnamed." -msgstr "``driving_side`` 参数以前被命名为可选，现在是强制性的未命名参数。" +msgstr "``driving_side`` 参数被命名为可选，现在强制未命名。" msgid "``pgr_withPointsDD`` (`Multiple vertices`)" msgstr "``pgr_withPointsDD`` (`多个顶点`)" @@ -5323,6 +5273,7 @@ msgstr "此外， ``l`` 也可用作 **驾驶侧**" msgid "After Migration" msgstr "迁移后" +#, fuzzy msgid "Be aware of the existence of the additional result Columns." msgstr "注意附加结果列的存在。" @@ -5391,12 +5342,13 @@ msgstr "过滤掉额外的列" msgid "Migration of ``pgr_withPointsKSP``" msgstr "迁移 ``pgr_withPointsKSP``" +#, fuzzy msgid "" "Starting from `v3.6.0 `__ :" "doc:`pgr_withPointsKSP` result columns are being standardized." msgstr "" -"从 `v3.6.0 `__ :doc:" -"`pgr_withPointsKSP` 开始对结果列进行标准化。" +"从`v3.6.0 `__ 开始 ， :doc:" +"`pgr_withPointsKSP`结果列正在标准化。" msgid "" "And ``driving side`` parameter changed from named optional to unnamed " @@ -5427,139 +5379,8 @@ msgid "" "original columns:" msgstr "如果需要，过滤掉附加列，例如，返回原始列：" -msgid "Migration of ``pgr_trsp`` (Vertices)" -msgstr "迁移 ``pgr_trsp`` （顶点）" - -msgid "Signature:" -msgstr "标识：" - -#, fuzzy -msgid "Deprecated" -msgstr "已废弃的功能" - -msgid "`v3.4.0 `__" -msgstr "`v3.4.0 `__" - -msgid "Removed" -msgstr "" - -msgid "`v4.0.0 `__" -msgstr "`v4.0.0 `__" - -msgid ":doc:`pgr_dijkstra`" -msgstr ":doc:`pgr_dijkstra`" - -msgid ":doc:`pgr_trsp`" -msgstr ":doc:`pgr_trsp`" - -#, fuzzy -msgid "`Migration of restrictions`_" -msgstr "限制迁移" - -#, fuzzy -msgid "Use ``pgr_dijkstra`` when there are no restrictions." -msgstr ":doc:`pgr_dijkstra` 当没有限制时，" - -msgid "Use :doc:`pgr_dijkstra` instead." -msgstr "请改用 :doc:`pgr_dijkstra`。" - -#, fuzzy -msgid "To get the original column names:" -msgstr "要获取图的连通性：" - -msgid "``id1`` is the node" -msgstr "``id1`` 是节点" - -msgid "``id2`` is the edge" -msgstr "``id2`` 是边" - -#, fuzzy -msgid "Use ``pgr_trsp`` when there are restrictions." -msgstr ":doc:`pgr_trspVia` 当有限制时。" - -msgid "Use :doc:`pgr_trsp` (One to One) instead." -msgstr "请改用 :doc:`pgr_trsp` (一对一）。" - -msgid "Migration of ``pgr_trsp`` (Edges)" -msgstr "迁移 ``pgr_trsp`` （边）" - -msgid ":doc:`pgr_withPoints`" -msgstr ":doc:`pgr_withPoints`" - -msgid ":doc:`pgr_trsp_withPoints`" -msgstr ":doc:`pgr_trsp_withPoints`" - -#, fuzzy -msgid "Use ``pgr_withPoints`` when there are no restrictions." -msgstr ":doc:`pgr_withPoints` 当没有任何限制的时候，" - -#, fuzzy -msgid "Use :doc:`pgr_withPoints` (One to One) instead." -msgstr "请改用 :doc:`pgr_trsp` (一对一）。" - -#, fuzzy -msgid "Use ``pgr_trsp_withPoints`` when there are restrictions." -msgstr ":doc:`pgr_trspVia_withPoints` 当有限制时。" - -msgid "Use :doc:`pgr_trsp_withPoints` instead." -msgstr "请使用 :doc:`pgr_trsp_withPoints`。" - -#, fuzzy -msgid "Migration of ``pgr_trspViaVertices``" -msgstr "pgr_trspViaVertices 的迁移" - -msgid ":doc:`pgr_dijkstraVia`" -msgstr ":doc:`pgr_dijkstraVia`" - -msgid ":doc:`pgr_trspVia`" -msgstr ":doc:`pgr_trspVia`" - -#, fuzzy -msgid "Use ``pgr_dijkstraVia`` when there are no restrictions" -msgstr ":doc:`pgr_dijkstraVia` 当无限制时，" - -msgid "Use :doc:`pgr_dijkstraVia` instead." -msgstr "请使用 :doc:`pgr_dijkstraVia`。" - -msgid "``id1`` is the path identifier" -msgstr "``id1`` 是路径标识符" - -msgid "``id2`` is the node" -msgstr "``id2`` 是节点" - -msgid "``id3`` is the edge" -msgstr "``id3`` 是边" - -#, fuzzy -msgid "Use ``pgr_trspVia`` when there are restrictions" -msgstr ":doc:`pgr_trspVia` 当有限制时。" - -msgid "Use :doc:`pgr_trspVia` instead." -msgstr "使用 :doc:`pgr_trspVia`。" - -#, fuzzy -msgid "Migration of ``pgr_trspViaEdges``" -msgstr "pgr_trspViaEdges 的迁移" - -msgid ":doc:`pgr_withPointsVia`" -msgstr ":doc:`pgr_withPointsVia`" - -msgid ":doc:`pgr_trspVia_withPoints`" -msgstr ":doc:`pgr_trspVia_withPoints`" - -#, fuzzy -msgid "Use ``pgr_withPointsVia`` when there are no restrictions" -msgstr ":doc:`pgr_withPointsVia` 当没有限制时，" - -msgid "Use :doc:`pgr_withPointsVia` instead." -msgstr "请使用 :doc:`pgr_withPointsVia`。" - -#, fuzzy -msgid "Use ``pgr_trspVia_withPoints`` when there are restrictions" -msgstr ":doc:`pgr_trspVia_withPoints` 当有限制时。" - -msgid "Use :doc:`pgr_trspVia_withPoints` instead." -msgstr "使用 :doc:`pgr_trspVia_withPoints` 代替。" +msgid "Migration of turn restrictions" +msgstr "转弯限制的迁移" msgid "Migration of restrictions" msgstr "限制迁移" @@ -5708,6 +5529,245 @@ msgstr "将在下一个正式版本 4.0.0 中删除" msgid "The migrated table contents:" msgstr "迁移后的表内容：" +msgid "Migration of ``pgr_trsp`` (Vertices)" +msgstr "迁移 ``pgr_trsp`` （顶点）" + +msgid "" +":doc:`pgr_trsp` signatures have changed and many issues have been fixed in " +"the new signatures. This section will show how to migrate from the old " +"signatures to the new replacement functions. This also affects the " +"restrictions." +msgstr "" +":doc:`pgr_trsp` 的签名已更改，并且新签名中已修复许多问题。 本节将展示如何从旧" +"签名迁移到新的替换函数。 这也会影响限制。" + +msgid "The integral type of the ``Edges SQL`` can only be ``INTEGER``." +msgstr "``Edges SQL`` 的整数类型只能是 ``INTEGER``。" + +msgid "The floating point type of the ``Edges SQL`` can only be ``FLOAT``." +msgstr "``Edges SQL`` 的浮点类型只能是 ``FLOAT``。" + +msgid "``directed`` flag is compulsory." +msgstr "``directed`` 标志是强制性的。" + +msgid "Does not autodetect if ``reverse_cost`` column exist." +msgstr "不自动检测 ``reverse_cost`` 列是否存在。" + +msgid "" +"User must be careful to match the existence of the column with the value of " +"``has_rcost`` parameter." +msgstr "用户必须小心地将列的存在与 ``has_rcost`` 参数的值相匹配。" + +msgid "The restrictions inner query is optional." +msgstr "内部查询的限制是可选的。" + +msgid "The output column names are meaningless" +msgstr "输出列名没有意义" + +msgid "Migrate by using:" +msgstr "使用以下方式迁移：" + +msgid ":doc:`pgr_dijkstra` when there are no restrictions," +msgstr ":doc:`pgr_dijkstra` 当没有限制时，" + +msgid ":doc:`pgr_trsp` (One to One) when there are restrictions." +msgstr ":doc:`pgr_trsp` (一对一)当有限制时。" + +msgid "Migrating ``pgr_trsp`` (Vertices) using ``pgr_dijkstra``" +msgstr "使用 ``pgr_dijkstra`` 迁移 ``pgr_trsp`` （顶点）" + +msgid "The following query does not have restrictions." +msgstr "以下查询没有限制。" + +msgid "A message about deprecation is shown" +msgstr "显示有关弃用的消息" + +msgid "Deprecated functions will be removed on the next mayor version 4.0.0" +msgstr "已弃用的功能将在下一个正式版本 4.0.0 中删除" + +msgid "Use :doc:`pgr_dijkstra` instead." +msgstr "请改用 :doc:`pgr_dijkstra`。" + +msgid "The types casting has been removed." +msgstr "类型强制转换已被删除。" + +msgid ":doc:`pgr_dijkstra`:" +msgstr ":doc:`pgr_dijkstra`:" + +msgid "Autodetects if ``reverse_cost`` column is in the edges SQL." +msgstr "自动检测 ``reverse_cost`` 列是否在边SQL中。" + +msgid "Accepts ``ANY-INTEGER`` on integral types" +msgstr "接受整数类型 ``ANY-INTEGER``" + +msgid "Accepts ``ANY-NUMERICAL`` on floating point types" +msgstr "接受浮点类型 ``ANY-NUMERICAL``" + +msgid "``directed`` flag has a default value of ``true``." +msgstr "``directed`` 标志的默认值为``true``。" + +msgid "Use the same value that on the original query." +msgstr "使用与原始查询相同的值。" + +msgid "In this example it is ``true`` which is the default value." +msgstr "在此示例中，默认值为 ``true``。" + +msgid "The flag has been omitted and the default is been used." +msgstr "该标志已被省略，并使用默认值。" + +msgid "" +"When the need of using strictly the same (meaningless) names and types of " +"the function been migrated then:" +msgstr "当需要使用严格相同（无意义）的函数名称和类型进行迁移时：" + +msgid "``id1`` is the node" +msgstr "``id1`` 是节点" + +msgid "``id2`` is the edge" +msgstr "``id2`` 是边" + +msgid "Migrating ``pgr_trsp`` (Vertices) using ``pgr_trsp``" +msgstr "使用 ``pgr_trsp``迁移 ``pgr_trsp`` （顶点）" + +msgid "The following query has restrictions." +msgstr "以下查询有限制。" + +msgid "The restrictions are the last parameter of the function" +msgstr "限制是函数的最后一个参数" + +msgid "Using the old structure of restrictions" +msgstr "使用旧的限制结构" + +msgid "Use :doc:`pgr_trsp` (One to One) instead." +msgstr "请改用 :doc:`pgr_trsp` (一对一）。" + +msgid "The new structure of restrictions is been used." +msgstr "使用了新的限制结构。" + +msgid "It is the second parameter." +msgstr "这是第二个参数。" + +msgid ":doc:`pgr_trsp`:" +msgstr ":doc:`pgr_trsp`:" + +msgid "Migration of ``pgr_trsp`` (Edges)" +msgstr "迁移 ``pgr_trsp`` （边）" + +msgid "The integral types of the ``sql`` can only be ``INTEGER``." +msgstr "``sql`` 的整型类型只能是 ``INTEGER``。" + +msgid "The floating point type of the ``sql`` can only be ``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` 当没有任何限制的时候，" + +msgid ":doc:`pgr_trsp_withPoints` (One to One) when there are restrictions." +msgstr ":doc:`pgr_trsp_withPoints` (一对一) 当有限制时。" + +msgid "Migrating ``pgr_trsp`` (Edges) using ``pgr_withPoints``" +msgstr "使用 ``pgr_withPoints``迁移 ``pgr_trsp`` （边）" + +msgid "Use :doc:`pgr_withPoints` instead." +msgstr "请使用 :doc:`pgr_withPoints`。" + +msgid "Do not show details, as the deprecated function does not show details." +msgstr "不显示详细信息，因为已弃用的函数不显示详细信息。" + +msgid ":doc:`pgr_withPoints`:" +msgstr ":doc:`pgr_withPoints`:" + +msgid "On the points query do not include the ``side`` column." +msgstr "在点查询中不包括 ``side`` 列。" + +msgid "" +"When the need of using strictly the same (meaningless) names and types, and " +"node values of the function been migrated then:" +msgstr "当需要使用严格相同（无意义）的名称和类型，并且函数的节点值被迁移时：" + +msgid "Migrating ``pgr_trsp`` (Edges) using ``pgr_trsp_withPoints``" +msgstr "使用 ``pgr_trsp_withPoints`` 迁移 ``pgr_trsp`` （边）" + +msgid "Use :doc:`pgr_trsp_withPoints` instead." +msgstr "请使用 :doc:`pgr_trsp_withPoints`。" + +msgid ":doc:`pgr_trsp_withPoints`:" +msgstr ":doc:`pgr_trsp_withPoints`:" + +msgid "Migration of ``pgr_trspViaVertices``" +msgstr "迁移 ``pgr_trspViaVertices``" + +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` 当无限制时，" + +msgid ":doc:`pgr_trspVia` when there are restrictions." +msgstr ":doc:`pgr_trspVia` 当有限制时。" + +msgid "Migrating ``pgr_trspViaVertices`` using ``pgr_dijkstraVia``" +msgstr "使用 ``pgr_dijkstraVia``迁移 ``pgr_trspViaVertices``" + +msgid "Use :doc:`pgr_dijkstraVia` instead." +msgstr "请使用 :doc:`pgr_dijkstraVia`。" + +msgid ":doc:`pgr_dijkstraVia`:" +msgstr ":doc:`pgr_dijkstraVia`:" + +msgid "``id1`` is the path identifier" +msgstr "``id1`` 是路径标识符" + +msgid "``id2`` is the node" +msgstr "``id2`` 是节点" + +msgid "``id3`` is the edge" +msgstr "``id3`` 是边" + +msgid "Migrating ``pgr_trspViaVertices`` using ``pgr_trspVia``" +msgstr "使用 ``pgr_trspVia``迁移 ``pgr_trspViaVertices``" + +msgid "Use :doc:`pgr_trspVia` instead." +msgstr "使用 :doc:`pgr_trspVia`。" + +msgid ":doc:`pgr_trspVia`:" +msgstr ":doc:`pgr_trspVia`:" + +msgid "Migration of ``pgr_trspViaEdges``" +msgstr "迁移 ``pgr_trspViaEdges``" + +msgid "" +"And will travel thru the following Via points :math:" +"`4\\rightarrow3\\rightarrow6`" +msgstr "并将途经以下途经点： :math:`4\\rightarrow3\\rightarrow6`" + +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` 当有限制时。" + +msgid "Migrating ``pgr_trspViaEdges`` using ``pgr_withPointsVia``" +msgstr "使用 ``pgr_withPointsVia`` 迁移 ``pgr_trspViaEdges``" + +msgid "Use :doc:`pgr_withPointsVia` instead." +msgstr "请使用 :doc:`pgr_withPointsVia`。" + +msgid ":doc:`pgr_withPointsVia`:" +msgstr ":doc:`pgr_withPointsVia`:" + +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` 代替。" + +msgid ":doc:`pgr_trspVia_withPoints`:" +msgstr ":doc:`pgr_trspVia_withPoints`:" + msgid ":doc:`withPoints-category`" msgstr ":doc:`withPoints-category`" @@ -6842,14 +6902,15 @@ 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 the variety of types, **ANY-INTEGER** " "and **ANY-NUMERICAL** is used." msgstr "" -"有几种有效的内部查询类型，返回的列也取决于函数。哪种类型的内部查询将取决于函" -"数的要求。为了简化类型的种类，使用了 **ANY-INTEGER**和**ANY-NUMERICAL**。" +"有多种有效的内部查询，返回的列也取决于函数。 哪种内部查询取决于函数的要求。 " +"为了简化各种类型，使用 **ANY-INTEGER** 和 **ANY-NUMERICAL** 。" msgid "Edges SQL for" msgstr "边 SQL" @@ -6935,6 +6996,9 @@ msgstr "" msgid "Parameters for the Via functions" msgstr "Via 函数的参数" +msgid ":doc:`pgr_dijkstraVia`" +msgstr ":doc:`pgr_dijkstraVia`" + msgid "SQL query as described." msgstr "如所述的 SQL 查询。" @@ -6978,6 +7042,9 @@ msgstr "" msgid "For the TRSP functions" msgstr "对于 TRSP 函数" +msgid ":doc:`pgr_trsp`" +msgstr ":doc:`pgr_trsp`" + msgid "Array of identifiers of destination vertices." msgstr "目标顶点的标识符数组。" @@ -7033,6 +7100,9 @@ msgstr "从使用 ``edge`` 的 ``node`` 遍历到路径序列中的下一个节 msgid "Used in functions the following:" msgstr "用于以下函数：" +msgid ":doc:`pgr_withPoints`" +msgstr ":doc:`pgr_withPoints`" + msgid "" "Returns set of ``(seq, path_seq [, start_pid] [, end_pid], node, edge, cost, " "agg_cost)``" @@ -7344,9 +7414,9 @@ msgid "Upgrading the database" msgstr "升级数据库" msgid "" -"To upgrade pgRouting in the database to version 4.0.0 use the following " +"To upgrade pgRouting in the database to version 3.7.0 use the following " "command:" -msgstr "要将数据库中的 pgRouting 升级到 4.0.0 版本，请使用以下命令：" +msgstr "要将数据库中的 pgRouting 升级到版本3.7.0，请使用以下命令：" msgid "" "More information can be found in https://www.postgresql.org/docs/current/sql-" @@ -7638,14 +7708,15 @@ msgstr "" "`Georepublic `__ 、`Paragon Corporation `__ 和广大用户社区的支持和维护。" +#, fuzzy msgid "" "pgRouting is part of `OSGeo Community Projects `__ from the `OSGeo Foundation `__ and included on `OSGeoLive `__." msgstr "" -"pgRouting 是 `OSGeo Community Projects `__的一部分，隶属于`OSGeo Foundation `__，并被包含在`OSGeoLive `__。" +"pgRouting 是 `OSGeo 基金会 `__ `OSGeo 社区项目 " +"`__ 的一部分，并包含在 " +"`OSGeoLive `__ 中。" msgid "Licensing" msgstr "许可" @@ -7702,7 +7773,7 @@ msgid "This Release Contributors" msgstr "此版本贡献者" msgid "Individuals in this release v3.7.x (in alphabetical order)" -msgstr "此版本 v3.7.x 中的个人贡献者（按字母顺序排列）" +msgstr "在此版本 v3.7.x 中的个人贡献者（按字母顺序排列）" msgid "(Alphabetical order)" msgstr "(按字母顺序排列）" @@ -7832,8 +7903,8 @@ msgstr "Boost C++ 源库位于 https://www.boost.org。" msgid ":doc:`migration`" msgstr ":doc:`migration`" -msgid "``pgr_KSP``" -msgstr "``pgr_KSP``" +msgid "pgr_KSP" +msgstr "pgr_KSP" msgid "``pgr_KSP`` — Yen's algorithm for K shortest paths using Dijkstra." msgstr "``pgr_KSP`` — Yen 使用 Dijkstra 计算 K 最短路径的算法。" @@ -7841,39 +7912,32 @@ msgstr "``pgr_KSP`` — Yen 使用 Dijkstra 计算 K 最短路径的算法。" msgid "Availability" msgstr "可用性" -#, fuzzy -msgid "Version 4.0.0" -msgstr "版本2.0.0" - -msgid "All signatures promoted to official." -msgstr "" - msgid "Version 3.6.0" msgstr "版本3.6.0" msgid "Result columns standarized to: |nksp-result|" msgstr "结果列标准化为 |nksp-result|" -msgid "pgr_ksp(One to One)" -msgstr "pgr_ksp(一对一)" +msgid "``pgr_ksp`` (One to One)" +msgstr "``pgr_ksp`` (一对一)" msgid "Added ``start_vid`` and ``end_vid`` result columns." msgstr "增加 ``start_vid`` 和 ``end_vid`` 结果列。" -msgid "New proposed signatures:" -msgstr "新拟议的签名：" +msgid "New overload functions:" +msgstr "新的重载函数：" -msgid "pgr_ksp(One to Many)" -msgstr "pgr_ksp(一对多)" +msgid "``pgr_ksp`` (One to Many)" +msgstr "``pgr_ksp`` (一对多)" -msgid "pgr_ksp(Many to One)" -msgstr "pgr_ksp(多对一)" +msgid "``pgr_ksp`` (Many to One)" +msgstr "``pgr_ksp`` (多对一)" -msgid "pgr_ksp(Many to Many)" -msgstr "pgr_ksp(多对多)" +msgid "``pgr_ksp`` (Many to Many)" +msgstr "``pgr_ksp`` (多对多)" -msgid "pgr_ksp(Combinations)" -msgstr "pgr_ksp(组合)" +msgid "``pgr_ksp`` (Combinations)" +msgstr "``pgr_ksp`` (组合)" msgid "Version 2.1.0" msgstr "版本2.1.0" @@ -7887,20 +7951,14 @@ msgstr "不再支持旧签名" msgid "Version 2.0.0" msgstr "版本2.0.0" -msgid "Official function." -msgstr "官方 函数" +msgid "**Official** function" +msgstr "**官方** 函数" msgid "" "The K shortest path routing algorithm based on Yen's algorithm. \"K\" is the " "number of shortest paths desired." msgstr "基于Yen算法的K最短路径路由算法。 “K”是所需的最短路径的数量。" -msgid "|Boost| Boost Graph Inside" -msgstr "|Boost| Boost 图内部" - -msgid "Boost Graph Inside" -msgstr "Boost 图内部" - msgid "Signatures" msgstr "签名" @@ -8268,14 +8326,6 @@ msgstr "``pgr_TSPeuclidean``" msgid "``pgr_TSPeuclidean`` - Aproximation using *metric* algorithm." msgstr "``pgr_TSPeuclidean`` -使用*metric*算法进行近似。" -#, fuzzy -msgid "" -"Using `Boost: metric TSP approx `__" -msgstr "" -"`Boost 的 metric appro 的 metric 近似 `__" - msgid "" "The Simulated Annealing Algorithm related parameters are ignored: " "`max_processing_time`, `tries_per_temperature`, " @@ -8293,9 +8343,8 @@ msgstr "版本3.0.0" msgid "Name change from pgr_eucledianTSP" msgstr "pgr_eucledianTSP 的名称更改" -#, fuzzy -msgid "New official function." -msgstr "新函数 official。" +msgid "New **Official** function" +msgstr "**官方** 新函数" msgid "" "Any duplicated identifier will be ignored. The coordinates that will be kept" @@ -8312,8 +8361,9 @@ msgid "" "The coordinates are quite different for the same identifier, for example ::" msgstr "对于相同的标识符，坐标有很大不同，例如::" +#, fuzzy msgid "pgr_TSPeuclidean(`Coordinates SQL`_, ``[start_id, end_id]``)" -msgstr "pgr_TSPeuclidean(`Coordinates SQL`_, ``[start_id, end_id]``)" +msgstr "pgr_TSPeuclidean(`Coordinates SQL`_ , ``[start_id, end_id]``)" msgid "With default values" msgstr "有默认值" @@ -8380,53 +8430,57 @@ msgstr "" "从视觉上看，第一幅图像是 `最优解 `__ ，第二幅图像是使用 ``pgr_TSPeuclidean`` 获得的解。" +msgid ":doc:`sampledata` network." +msgstr ":doc:`sampledata` 网络。" + msgid "``pgr_aStar``" msgstr "``pgr_aStar``" msgid "``pgr_aStar`` — Shortest path using the A* algorithm." msgstr "``pgr_aStar`` —使用 A* 算法的最短路径。" -msgid "Combinations signature promoted to official." -msgstr "" - msgid "Standarizing output columns to |short-generic-result|" msgstr "标准输出列|short-generic-result|" -#, fuzzy -msgid "pgr_aStar(One to One) added ``start_vid`` and ``end_vid`` columns." -msgstr "``pgr_aStar`` （`一对一`）增加了 ``start_vid`` 和 ``end_vid`` 列。" +msgid "" +"``pgr_aStar`` (`One to One`_) added ``start_vid`` and ``end_vid`` columns." +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`` (`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`` 列。" +msgid "``pgr_aStar`` (`Many to One`_) added ``start_vid`` column." +msgstr "``pgr_aStar`` (`多对一`_) 增加 ``start_vid`` 列." msgid "Version 3.2.0" msgstr "版本3.2.0" -#, fuzzy -msgid "New proposed signature:" -msgstr "新拟议的签名：" +msgid "New **proposed** signature:" +msgstr "新 **拟议** 的签名：" -msgid "Function promoted to official." -msgstr "" +msgid "``pgr_aStar`` (`Combinations`_)" +msgstr "``pgr_aStar`` (`组合`_)" msgid "Version 2.4.0" msgstr "版本2.4.0" -msgid "pgr_aStar(One to Many)" -msgstr "pgr_aStar(一对多）" +msgid "New **Proposed** signatures:" +msgstr "新 **拟议** 签名：" -msgid "pgr_aStar(Many to One)" -msgstr "pgr_aStar(多对一）" +msgid "``pgr_aStar`` (`One to Many`_)" +msgstr "``pgr_aStar`` (`一对多`_)" -msgid "pgr_aStar(Many to Many)" -msgstr "pgr_aStar(多对多）" +msgid "``pgr_aStar`` (`Many to One`_)" +msgstr "``pgr_aStar`` (`多对一`_)" -#, fuzzy -msgid "Signature change on pgr_aStar(One to One)" -msgstr "签名更改 pgr_aStar(一对一)" +msgid "``pgr_aStar`` (`Many to Many`_)" +msgstr "``pgr_aStar`` (`多对多`_)" + +msgid "Signature change on ``pgr_astar`` (`One to One`_)" +msgstr "签名更改 ``pgr_astar`` (`一对一`_)" + +msgid "**Official** ``pgr_aStar`` (`One to One`_)" +msgstr "**官方** ``pgr_aStar`` (`一对一`_)" msgid "" "The results are equivalent to the union of the results of the `pgr_aStar(` " @@ -8507,20 +8561,25 @@ msgstr "示例3" msgid "Manually assigned vertex combinations." msgstr "手动指定的顶点组合。" -msgid "``pgr_aStarCost``" -msgstr "``pgr_aStarCost``" +msgid "pgr_aStarCost" +msgstr "pgr_aStarCost" +#, fuzzy msgid "" "``pgr_aStarCost`` - Total cost of the shortest path using the A* algorithm." -msgstr "``pgr_aStarCost`` - 使用 A* 算法计算最短路径的总成本。" +msgstr "``pgr_aStarCost`` -使用 A* 算法的最短路径的总成本。" -msgid "New proposed function." -msgstr "新提议的函数。" +msgid "``pgr_aStarCost`` (`Combinations`_)" +msgstr "``pgr_aStarCost`` (`组合`_)" +msgid "New **proposed** function" +msgstr "新 **拟议** 函数" + +#, fuzzy msgid "" "The ``pgr_aStarCost`` function sumarizes of the cost of the shortest path " "using the A* algorithm." -msgstr "``pgr_aStarCost`` 函数总结了使用 A* 算法计算最短路径的成本。" +msgstr "``pgr_aStarCost`` 函数使用 A* 算法汇总最短路径的成本。" msgid "" "Let be the case the values returned are stored in a table, so the unique " @@ -8639,9 +8698,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 形状的多边形部分。" @@ -8716,8 +8772,8 @@ msgstr ":doc:`pgr_drivingDistance`" msgid "`ST_ConcaveHull `__" msgstr "`ST_ConcaveHull `__" -msgid "``pgr_analyzeGraph``" -msgstr "``pgr_analyzeGraph``" +msgid "pgr_analyzeGraph" +msgstr "pgr_analyzeGraph" msgid "``pgr_analyzeGraph`` — Analyzes the network topology." msgstr "``pgr_analyzeGraph`` —分析网络拓扑。" @@ -8992,6 +9048,9 @@ msgstr "" "选择几何图形靠近表 ``othertable`` 的 place='myhouse' 的行。 （注意 " "quote_literal 的使用）" +msgid "The examples use the :doc:`sampledata` network." +msgstr "这些示例使用 :doc:`sampledata` 网络。" + msgid ":doc:`pgr_analyzeOneWay`" msgstr ":doc:`pgr_analyzeOneWay`" @@ -9001,8 +9060,8 @@ msgstr ":doc:`pgr_createVerticesTable`" msgid ":doc:`pgr_nodeNetwork` to create nodes to a not noded edge table." msgstr ":doc:`pgr_nodeNetwork` 创建节点到非节点边表。" -msgid "``pgr_analyzeOneWay``" -msgstr "``pgr_analyzeOneWay``" +msgid "pgr_analyzeOneWay" +msgstr "pgr_analyzeOneWay" msgid "" "``pgr_analyzeOneWay`` — Analyzes oneway Sstreets and identifies flipped " @@ -9177,8 +9236,8 @@ msgstr "结果列更改：删除了 ``seq``" msgid "Version 2.5.0" msgstr "版本2.5.0" -msgid "New experimental function." -msgstr "新实验功能。" +msgid "New **experimental** function" +msgstr "新 **实验** 函数" msgid "" "Those vertices that belong to more than one biconnected component are called " @@ -9210,9 +9269,8 @@ msgstr "图表的连接点" msgid "Nodes in red are the articulation points." msgstr "红色节点是关节点。" -#, fuzzy msgid "" -"`Boost: Biconnected components & articulation points `__" msgstr "" "Boost: `双连通分量和关节点 `__" -msgstr "" -"`Boost: Belman Ford `__" - msgid "https://en.wikipedia.org/wiki/Bellman%E2%80%93Ford_algorithm" msgstr "https://en.wikipedia.org/wiki/Bellman%E2%80%93Ford_algorithm" -#, fuzzy -msgid "``pgr_betweennessCentrality`` - Experimental" -msgstr "``pgr_betweennessCentrality``" +msgid "``pgr_betweennessCentrality``" +msgstr "" -#, fuzzy msgid "" -"``pgr_betweennessCentrality`` - Calculates the relative betweenness " +"``pgr_betweennessCentrality`` - Calculates the relative betweeness " "centrality using Brandes Algorithm" -msgstr "``pgr_betweennessCentrality`` - 使用 Brandes 算法计算相对介数中心度" +msgstr "" +#, fuzzy msgid "Version 3.7.0" -msgstr "版本 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 "Brandes 算法利用稀疏图来评估所有顶点的中心度得分。" +msgstr "" msgid "" "Betweenness centrality measures the extent to which a vertex lies on the " @@ -9607,75 +9704,83 @@ 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 "" -"Betweenness centrality（介数中心性）衡量的是一个顶点在所有其他顶点对之间的最" -"短路径中的重要性。具有较高介数中心性得分的顶点，通常能够对网络产生显著的影" -"响，因为它们控制了通过它们的最短路径。" 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 "该实现适用于directed 和undirected。" +msgstr "该实现适用于 **有向** 图和 **无向** 图。" +#, fuzzy msgid "Running time: :math:`\\Theta(VE)`" -msgstr "运行时间: :math:`Theta(VE)`" +msgstr "运行时间： :math:`O(V + E)`" +#, fuzzy msgid "Running space: :math:`\\Theta(VE)`" -msgstr "运行空间: :math:`\\Theta(VE)`" +msgstr "运行时间： :math:`O(V + E)`" +#, fuzzy msgid "Throws when there are no edges in the graph" -msgstr "当图形中没有边时抛出" +msgstr "当图中没有边时，返回 EMPTY SET。" msgid "pgr_betweennessCentrality(`Edges SQL`_, [``directed``])" msgstr "pgr_betweennessCentrality(`Edges SQL`_, [``directed``])" +#, fuzzy msgid "Returns set of ``(vid, centrality)``" -msgstr "返回 ``(vid, centrality)`` 的集合" +msgstr "返回集合 ``(edge, cost)``" +#, fuzzy msgid "For a directed graph with edges :math:`\\{1, 2, 3, 4\\}`." -msgstr "对于带边的directed graph:math:`\\{1, 2, 3, 4\\}`." +msgstr "对于有边 :math:`\\{1, 2, 3, 4\\}` 的有向子图。" +#, fuzzy msgid "Explanation" -msgstr "说明" +msgstr "应用" msgid "The betweenness centrality are between parenthesis." -msgstr "介数中心性值位于括号内。" +msgstr "" msgid "The leaf vertices have betweenness centrality :math:`0`." -msgstr "叶子节点的介数中心性为 :math:`0`。" +msgstr "" +#, fuzzy msgid "" "Betweenness centrality of vertex :math:`6` is higher than of vertex :math:" "`10`." -msgstr "顶点 :math:`6` 的间隔中心度高于顶点 :math:`10` 的间隔中心度。" +msgstr "从顶点 :math:`11` 到顶点 :math:`12`" +#, fuzzy msgid "Removing vertex :math:`6` will create three graph components." -msgstr "移除顶点 :math:`6` 将创建三个图形组件。" +msgstr "顶点 :math:`w` 已从图中移除" msgid "Removing vertex :math:`10` will create two graph components." -msgstr "移除节点 :math:`10` 将会产生两个图形组件。" +msgstr "" msgid "``vid``" msgstr "``vid``" +#, fuzzy msgid "``centrality``" msgstr "``capacity``" msgid "" "Relative betweenness centrality score of the vertex (will be in range [0,1])" -msgstr "该节点的相对介数中心性得分（范围为 [0,1]）" +msgstr "" #, fuzzy msgid "" -"`Boost: betweenness centrality `_" -msgstr "" -"`Boost: betweenness centrality `_" +msgstr "" +"`Boost：Hawick 电路算法 `__" + +msgid "Queries use the :doc:`sampledata` network." +msgstr "查询使用 :doc:`sampledata` 网络。" msgid "``pgr_biconnectedComponents``" msgstr "``pgr_biconnectedComponents``" @@ -9736,21 +9841,41 @@ msgstr "具有组件中最小边标识符的值。" msgid "Identifier of the edge that belongs to the ``component``." msgstr "属于该 ``分量`` 的边的标识符。" +msgid "" +"Boost: `Biconnected components `__" +msgstr "" +"Boost: `双连通分量 `__" + msgid "``pgr_binaryBreadthFirstSearch`` - Experimental" msgstr "``pgr_binaryBreadthFirstSearch`` - 实验" +#, fuzzy msgid "" "``pgr_binaryBreadthFirstSearch`` — Returns the shortest path in a binary " "graph." -msgstr "``pgr_binaryBreadthFirstSearch`` — 返回二进制图中的最短路径。" +msgstr "``pgr_binaryBreadthFirstSearch`` — 返回二元图中的最短路径。" 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'." msgstr "任何边权属于集合 {0,X} 的图（其中“X”是任何非负整数）都被称为“二元图”。" -msgid "pgr_binaryBreadthFirstSearch(Combinations)" -msgstr "pgr_binaryBreadthFirstSearch(组合)" +msgid "pgr_binaryBreadthFirstSearch(`Combinations`_)" +msgstr "pgr_binaryBreadthFirstSearch(`组合`_)" + +msgid "pgr_binaryBreadthFirstSearch(`One to One`_)" +msgstr "pgr_binaryBreadthFirstSearch(`一对一`_)" + +msgid "pgr_binaryBreadthFirstSearch(`One to Many`_)" +msgstr "pgr_binaryBreadthFirstSearch(`一对多`_)" + +msgid "pgr_binaryBreadthFirstSearch(`Many to One`_)" +msgstr "pgr_binaryBreadthFirstSearch(`多对一`_)" + +msgid "pgr_binaryBreadthFirstSearch(`Many to Many`_)" +msgstr "pgr_binaryBreadthFirstSearch(`多对多`_)" msgid "" "It is well-known that the shortest paths between a single source and all " @@ -9833,14 +9958,6 @@ msgid "" msgstr "" "**注意:** 使用 :doc:`sampledata` 网络，因为所有权重都相同（即为 :math:`1`）" -#, fuzzy -msgid "" -"`Boost: Breadth First Search `__" -msgstr "" -"`Boost：广度优先搜索算法文档 `__" - msgid "https://cp-algorithms.com/graph/01_bfs.html" msgstr "https://cp-algorithms.com/graph/01_bfs.html" @@ -9849,8 +9966,7 @@ msgid "" msgstr "" "https://en.wikipedia.org/wiki/Dijkstra%27s_algorithm#Specialized_variants" -#, fuzzy -msgid "``pgr_bipartite`` - Experimental" +msgid "pgr_bipartite -Experimental" msgstr "pgr_bipartite -实验" msgid "" @@ -9858,6 +9974,9 @@ msgid "" "within the same set are adjacent." msgstr "`pgr_bipartite` - 不相邻的顶点集合，同一集合中没有两个顶点相邻。" +msgid "New **experimental** signature" +msgstr "新的 **实验** 签名" + msgid "" "A bipartite graph is a graph with two sets of vertices which are connected " "to each other, but not within themselves. A bipartite graph is possible if " @@ -9911,18 +10030,6 @@ msgstr "" msgid "Edges in blue represent odd length cycle subgraph." msgstr "蓝色边代表奇数长度循环子图。" -msgid "" -"`Boost: is_bipartite `__" -msgstr "" -"`Boost: is_bipartite `__" - -msgid "" -"`Wikipedia: bipartite graph `__" -msgstr "`维基百科：二分图 `__" - msgid "``pgr_boykovKolmogorov``" msgstr "``pgr_boykovKolmogorov``" @@ -9934,12 +10041,20 @@ msgstr "" "`pgr_boykovKolmogorov`` - 使用 Boykov Kolmogorov 算法计算图边的流量，使从源到" "目标的流量最大。" +msgid "New **proposed** signature" +msgstr "新的 **拟议** 签名" + +msgid "``pgr_boykovKolmogorov`` (`Combinations`_)" +msgstr "``pgr_boykovKolmogorov`` (`组合`_)" + msgid "Renamed from ``pgr_maxFlowBoykovKolmogorov``" msgstr "从 ``pgr_maxFlowBoykovKolmogorov`` 更名而来" -#, fuzzy -msgid "Function promoted to proposed." -msgstr "实验性的功能被提升为提议的。" +msgid "**Proposed** function" +msgstr "**拟议** 函数" + +msgid "New **Experimental** function" +msgstr "新的 **实验** 函数" msgid "Running time: Polynomial" msgstr "运行时间：多项式时间" @@ -9982,10 +10097,7 @@ msgstr "" "使用组合表，相当于计算从顶点 :math:`\\{5, 6\\}` 到顶点 :math:`{\\10, 15, " "14\\}` 的结果。" -#, fuzzy -msgid "" -"`Boost: Boykov Kolmogorov max flow `__" +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" msgid "``pgr_breadthFirstSearch`` - Experimental" @@ -9994,7 +10106,13 @@ msgstr "``pgr_breadthFirstSearch`` - 实验" msgid "" "``pgr_breadthFirstSearch`` — Returns the traversal order(s) using Breadth " "First Search algorithm." -msgstr "``pgr_breadthFirstSearch`` — 使用广度优先搜索算法返回遍历顺序。" +msgstr "``pgr_breadthFirstSearch`` —使用广度优先搜索算法返回遍历顺序。" + +msgid "``pgr_breadthFirstSearch`` (`Single Vertex`_)" +msgstr "``pgr_breadthFirstSearch`` (`单顶点搜索`_)" + +msgid "``pgr_breadthFirstSearch`` (`Multiple Vertices`_)" +msgstr "``pgr_breadthFirstSearch`` (`多顶点搜索`_)" msgid "" "Provides the Breadth First Search traversal order from a root vertex to a " @@ -10064,6 +10182,13 @@ msgstr "升序" msgid "descending" msgstr "降序" +msgid "" +"`Boost: Breadth First Search algorithm documentation `__" +msgstr "" +"`Boost：广度优先搜索算法文档 `__" + msgid "" "`Wikipedia: Breadth First Search algorithm `__" @@ -10106,13 +10231,8 @@ msgstr "作为桥的边的标识符。" msgid "https://en.wikipedia.org/wiki/Bridge_%28graph_theory%29" msgstr "https://en.wikipedia.org/wiki/Bridge_%28graph_theory%29" -#, fuzzy -msgid "" -"`Boost: Connected components `__" -msgstr "" -"Boost: ` 已连接组件 `__" +msgid "**Supported versions**" +msgstr "**支持版本**" msgid "``pgr_chinesePostman`` - Experimental" msgstr "``pgr_chinesePostman`` - 实验" @@ -10175,8 +10295,8 @@ msgstr "``pgr_chinesepostmancost``" msgid "Minimum costs of a circuit path." msgstr "一个回路路径的最小成本。" -msgid "``pgr_connectedComponents``" -msgstr "``pgr_connectedComponents``" +msgid "pgr_connectedComponents" +msgstr "pgr_connectedComponents" msgid "" "``pgr_connectedComponents`` — Connected components of an undirected graph " @@ -10214,6 +10334,13 @@ msgstr "属于该 ``组件`` 的顶点的标识符。" msgid "Connecting disconnected components" msgstr "连接不连通的组件" +msgid "" +"Boost: `Connected components `__" +msgstr "" +"Boost: ` 已连接组件 `__" + msgid "" "wikipedia: `Connected component `__" @@ -10395,8 +10522,8 @@ msgstr "仅死端收缩" msgid "Only linear contraction" msgstr "仅线性收缩" -msgid "``pgr_createTopology``" -msgstr "``pgr_createTopology``" +msgid "pgr_createTopology" +msgstr "pgr_createTopology" msgid "" "``pgr_createTopology`` — Builds a network topology based on the geometry " @@ -10615,8 +10742,11 @@ msgid "" "to the rest of the edges." msgstr "该示例以 5 条边的简洁拓扑结构为起点，然后递增到其余的边。" -msgid "``pgr_createVerticesTable``" -msgstr "``pgr_createVerticesTable``" +msgid "The example uses the :doc:`sampledata` network." +msgstr "本例使用 :doc:`sampledata` 网络。" + +msgid "pgr_createVerticesTable" +msgstr "pgr_createVerticesTable" msgid "" "``pgr_createVerticesTable`` — Reconstructs the vertices table based on the " @@ -10855,17 +10985,17 @@ msgstr "" "`Wikipedia: Cuthill-McKee 排序 `__" -#, fuzzy -msgid "``pgr_dagShortestPath`` - Experimental" +msgid "pgr_dagShortestPath - Experimental" msgstr "pgr_dagShortestPath - 实验" +#, fuzzy 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`` — 返回加权有向无环图（DAG）中的最短路径。特别是使用 " -"Boost.Graph 实现的 DAG 最短路径算法。" +"``pgr_dagShortestPath`` — 返回加权有向无环图（DAG）的最短路径（path）。特别" +"是，由Boost.Graph实现的DAG最短路径算法。" msgid "pgr_dagShortestPath(Combinations)" msgstr "pgr_dagShortestPath(组合)" @@ -10942,14 +11072,6 @@ msgstr "返回列" msgid "Making **start_vids** the same as **end_vids**" msgstr "使 **start_vids** 与 **end_vids** 相同" -#, fuzzy -msgid "" -"`Boost: DAG shortest paths `__" -msgstr "" -"`Boost: is_bipartite `__" - msgid "https://en.wikipedia.org/wiki/Topological_sorting" msgstr "https://en.wikipedia.org/wiki/Topological_sorting" @@ -10964,8 +11086,9 @@ msgstr "``pgr_degree`` —对于无向图中的每个顶点，返回与该顶点 msgid "Calculates the degree of the vertices of an **undirected** graph" msgstr "计算 **无向** 图顶点的度数" +#, fuzzy msgid "pgr_degree(`Edges SQL`_ , `Vertex SQL`_, [``dryrun``])" -msgstr "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|" @@ -11076,6 +11199,15 @@ msgstr "" msgid "Version 3.3.0" msgstr "版本 3.3.0" +msgid "Promoted to **proposed** function" +msgstr "升级至 **拟议** 函数" + +msgid "``pgr_depthFirstSearch`` (`Single Vertex`_)" +msgstr "``pgr_depthFirstSearch`` (`单个顶点`_)" + +msgid "``pgr_depthFirstSearch`` (`Multiple Vertices`_)" +msgstr "``pgr_depthFirstSearch`` (`多个顶点`_)" + msgid "" "Depth First Search algorithm is a traversal algorithm which starts from a " "root vertex, goes as deep as possible, and backtracks once a vertex is " @@ -11131,18 +11263,16 @@ msgstr "**options:** ``[directed, max_depth]``" msgid "Same as `Single vertex`_ but with edges in descending order of ``id``." msgstr "与 `单顶点`_ 相同，但边按 ``id`` 降序排列。" -#, fuzzy msgid "" -"`Boost: Depth First Search `__" +"`Boost: Depth First Search algorithm documentation `__" msgstr "" "`Boost：深度优先搜索算法文档 `__" -#, fuzzy msgid "" -"`Boost: Undirected DFS `__" +"`Boost: Undirected DFS algorithm documentation `__" msgstr "" "`Boost：非定向 DFS 算法文档 `__" @@ -11157,40 +11287,53 @@ msgstr "" msgid "``pgr_dijkstra``" msgstr "`pgr_dijkstra``" +#, fuzzy msgid "``pgr_dijkstra`` — Shortest path using Dijkstra algorithm." -msgstr "`pgr_dijkstra`` - 使用 Dijkstra 算法计算的最短路径。" +msgstr "`pgr_dijkstra`` - 使用 Dijkstra 算法的最短路径。" msgid "Version 3.5.0" msgstr "版本 3.5.0" -msgid "pgr_dijkstra(One to One) added ``start_vid`` and ``end_vid`` columns." -msgstr "pgr_dijkstra（一对一）增加了``start_vid`` 和``end_vid`` 列。" +msgid "" +"``pgr_dijkstra`` (`One to One`_) added ``start_vid`` and ``end_vid`` columns." +msgstr "``pgr_dijkstra`` (`一对一`_)增加``start_vid`` 和``end_vid`` 列。" -msgid "pgr_dijkstra(One to Many) added ``end_vid`` column." -msgstr "pgr_dijkstra（一对多）添加了 ``end_vid`` 列。" +msgid "``pgr_dijkstra`` (`One to Many`_) added ``end_vid`` column." +msgstr "``pgr_dijkstra`` (`一对多`_) 增加``end_vid`` 列。" -msgid "pgr_dijkstra(Many to One) added ``start_vid`` column." -msgstr "pgr_dijkstra（多对一）添加了 ``start_vid`` 列。" +msgid "``pgr_dijkstra`` (`Many to One`_) added ``start_vid`` column." +msgstr "``pgr_dijkstra`` (`多对一`_) 增加 ``start_vid`` 列。" msgid "Version 3.1.0" msgstr "版本 3.1.0" +msgid "``pgr_dijkstra`` (`Combinations`_)" +msgstr "``pgr_dijkstra`` (`组合`_)" + +msgid "**Official** functions" +msgstr "**官方** 函数" + msgid "Version 2.2.0" msgstr "版本 2.2.0" -msgid "pgr_dijkstra(One to Many)" -msgstr "pgr_dijkstra(一对多)" +msgid "New **proposed** functions:" +msgstr "新的 **拟议** 函数：" -msgid "pgr_dijkstra(Many to One)" -msgstr "pgr_dijkstra(多对一)" +msgid "``pgr_dijkstra`` (`One to Many`_)" +msgstr "``pgr_dijkstra`` (`一对多`_)" -msgid "pgr_dijkstra(Many to Many)" -msgstr "pgr_dijkstra（多对多）" +msgid "``pgr_dijkstra`` (`Many to One`_)" +msgstr "``pgr_dijkstra`` (`多对一`_)" -#, fuzzy -msgid "Signature change on pgr_dijkstra(One to One)" +msgid "``pgr_dijkstra`` (`Many to Many`_)" +msgstr "``pgr_dijkstra`` (`多对多`_)" + +msgid "Signature change on ``pgr_dijkstra`` (`One to One`_)" 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``])" @@ -11376,29 +11519,26 @@ msgstr "36) 使用 `多对多`_" msgid "37) Using `Combinations`_" msgstr "37) 使用 `组合`_" -#, fuzzy -msgid "" -"`Boost: Dijkstra shortest paths `__" -msgstr "" -"`Boost: is_bipartite `__" - msgid "https://en.wikipedia.org/wiki/Dijkstra%27s_algorithm" 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 using Dijkstra " "algorithm." -msgstr "`pgr_dijkstraCost`` - 使用 Dijkstra 算法计算最短路径的总成本。" +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 " "using Dijkstra Algorithm." -msgstr "``pgr_dijkstraCost`` 函数总结了使用 Dijkstra 算法计算最短路径的成本。" +msgstr "``pgr_dijkstraCost`` 函数总结了使用Dijkstra算法的最短路径的成本。" msgid "" "pgr_dijkstraCost(`Edges SQL`_, **start vid**, **end vid**, [``directed``])" @@ -11707,11 +11847,14 @@ msgstr "``true`` 时：仅返回 ``cap`` 结果" msgid "When ``false``: ``cap`` limit per ``Start vid`` will be returned" 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" + msgid "Wikipedia: https://en.wikipedia.org/wiki/Dijkstra%27s_algorithm" msgstr "维基百科：https://en.wikipedia.org/wiki/Dijkstra%27s_algorithm" msgid "``pgr_dijkstraNearCost`` - Proposed" -msgstr "``pgr_dijkstraNearCost`` - 提议" +msgstr "``pgr_dijkstraNearCost`` - 拟议" msgid "" "``pgr_dijkstraNearCost`` — Using dijkstra algorithm, finds the route that " @@ -11823,11 +11966,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 "" -"在一个directed graph中，找到按顺序访问顶点 :math:`\\ {5, 1, 8\\}` 的路径。" +msgstr "在有向图上查找按顺序访问顶点 :math:`\\{ 5, 1, 8\\}` 的路线。" msgid "Via optional parameters" msgstr "Via可选参数" @@ -11890,9 +12033,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`` 结果列。" @@ -11902,17 +12042,14 @@ msgstr "结果列名称更改： ``from_v``改为 ``start_vid``。" msgid "Added ``depth`` and ``pred`` result columns." msgstr "添加了 ``depth`` 和``pred`` 结果列。" -msgid "Signature change:" -msgstr "签名变更：" +msgid "Signature change pgr_drivingDistance(single vertex)" +msgstr "签名更改 pgr_drivingDistance（单顶点）" -msgid "pgr_drivingDistance(single vertex)" -msgstr "pgr_drivingDistance （单顶点）" +msgid "New **Official** pgr_drivingDistance(multiple vertices)" +msgstr "新 **官方** pgr_drivingDistance(多顶点)" -msgid "New official signature:" -msgstr "新签名：" - -msgid "pgr_drivingDistance(multiple vertices)" -msgstr "pgr_drivingDistance （多顶点）" +msgid "Official:: pgr_drivingDistance(single vertex)" +msgstr "官方:: pgr_drivingDistance(单顶点)" msgid "" "Using the Dijkstra algorithm, extracts all the nodes that have costs less " @@ -11972,8 +12109,7 @@ msgid "" "undirected graph" msgstr "在无向图上，从顶点 :math:`{11, 16\\}` 开始的距离为 :math:`3.0`" -#, fuzzy -msgid "``pgr_edgeColoring`` - Experimental" +msgid "pgr_edgeColoring - Experimental" msgstr "pgr_edgeColoring - 实验" msgid "" @@ -12053,18 +12189,6 @@ msgstr "Returns set of |result-edge-color|" msgid "Graph coloring of pgRouting :doc:`sampledata`" msgstr "pgRouting :doc:`sampledata` 的图形着色" -#, fuzzy -msgid "" -"`Boost: Edge Coloring `__" -msgstr "" -"`Boost：边缘着色算法文档 `__" - -msgid "" -"`Wikipedia: Graph coloring `__" -msgstr "`维基百科：图着色 `__" - msgid "``pgr_edgeDisjointPaths``" msgstr "``pgr_edgeDisjointPaths``" @@ -12073,6 +12197,9 @@ msgid "" "groups of vertices." msgstr "``pgr_edgeDisjointPaths`` - 计算两组顶点之间的边不相交路径。" +msgid "New **proposed** function:" +msgstr "新的 **拟议** 函数：" + msgid "pgr_edgeDisjointPaths(Combinations)" msgstr "pgr_edgeDisjointPaths(组合)" @@ -12167,6 +12294,9 @@ msgstr "" "``pgr_edmondsKarp`` —使用 Edmonds Karp 算法计算图边上的流量，以最大化从源到目" "标的流量。" +msgid "``pgr_edmondsKarp`` (`Combinations`_)" +msgstr "``pgr_edmondsKarp`` (`组合`_)" + msgid "Renamed from ``pgr_maxFlowEdmondsKarp``" msgstr "从 ``pgr_maxFlowEdmondsKarp`` 更名而来" @@ -12188,25 +12318,33 @@ msgstr "pgr_edmondsKarp(`Edges SQL`_, **start vids**, **end vids**)" msgid "pgr_edmondsKarp(`Edges SQL`_, `Combinations SQL`_)" msgstr "pgr_edmondsKarp(`Edges SQL`_, `Combinations SQL`_)" -#, fuzzy -msgid "" -"`Boost: Edmonds Karp max flow `__" +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" msgid "https://en.wikipedia.org/wiki/Edmonds%E2%80%93Karp_algorithm" msgstr "https://en.wikipedia.org/wiki/Edmonds%E2%80%93Karp_algorithm" -#, fuzzy -msgid "``pgr_edwardMoore`` - Experimental" -msgstr "``pgr_edwardMoore`` - 实验" +msgid "``pgr_edwardMoore - Experimental``" +msgstr "``pgr_edwardMoore - 实验``" msgid "" "``pgr_edwardMoore`` — Returns the shortest path using Edward-Moore algorithm." msgstr "`pgr_edwardMoore`` - 使用 Edward-Moore 算法返回最短路径。" -msgid "pgr_edwardMoore(Combinations)" -msgstr "pgr_edwardMoore(组合)" +msgid "``pgr_edwardMoore`` (`Combinations`_)" +msgstr "``pgr_edwardMoore`` (`组合`_)" + +msgid "``pgr_edwardMoore`` (`One to One`_)" +msgstr "``pgr_edwardMoore`` (`一对一`_)" + +msgid "``pgr_edwardMoore`` (`One to Many`_)" +msgstr "``pgr_edwardMoore`` (`一对多`_)" + +msgid "``pgr_edwardMoore`` (`Many to One`_)" +msgstr "``pgr_edwardMoore`` (`多对一`_)" + +msgid "``pgr_edwardMoore`` (`Many to Many`_)" +msgstr "``pgr_edwardMoore`` (`多对多`_)" msgid "" "Edward Moore’s Algorithm is an improvement of the Bellman-Ford Algorithm. It " @@ -12279,8 +12417,8 @@ 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" -msgid "``pgr_extractVertices`` -- Proposed" -msgstr "``pgr_extractVertices`` -- 拟议" +msgid "pgr_extractVertices -- Proposed" +msgstr "pgr_extractVertices -- 拟议" msgid "``pgr_extractVertices`` — Extracts the vertices information" msgstr "``pgr_extractVertices`` — 提取顶点信息" @@ -12386,12 +12524,21 @@ msgid "" "= true``." msgstr "要获取用于生成顶点信息的查询，请使用 ``dryrun := true``。" -msgid "``pgr_findCloseEdges`` - Proposed" -msgstr "``pgr_findCloseEdges``- 拟议" +msgid "``pgr_findCloseEdges``" +msgstr "``pgr_findCloseEdges``" msgid "``pgr_findCloseEdges`` - Finds the close edges to a point geometry." msgstr "``pgr_findCloseEdges`` -查找点几何图形的闭合边。" +msgid "New **proposed** signatures:" +msgstr "新的 **拟议** 签名：" + +msgid "``pgr_findCloseEdges`` (`One point`_)" +msgstr "``pgr_findCloseEdges`` (`一个点`_)" + +msgid "``pgr_findCloseEdges`` (`Many points`_)" +msgstr "``pgr_findCloseEdges`` (`多个点`_)" + msgid "" "``pgr_findCloseEdges`` - An utility function that finds the closest edge to " "a point geometry." @@ -12406,7 +12553,6 @@ msgid "" "adjustments needed by the application." msgstr "可以获取计算代码，以便根据应用需要进行进一步的具体调整。" -#, fuzzy msgid "``EMTPY SET`` is returned on dryrun executions" msgstr "空运行执行时返回 ``EMTPY SET``" @@ -12903,6 +13049,9 @@ msgstr "" "Boost `floyd-Warshall `_" +msgid "Queries uses the :doc:`sampledata` network." +msgstr "查询使用 :doc:`sampledata` 网络。" + msgid "``pgr_full_version``" msgstr "``pgr_full_version``" @@ -12910,6 +13059,9 @@ msgid "" "``pgr_full_version`` — Get the details of pgRouting version information." msgstr "``pgr_full_version`` — 获取pgRouting版本信息的详细信息。." +msgid "New **official** function" +msgstr "**官方** 新功能" + msgid "Get complete details of pgRouting version information" msgstr "获取 pgRouting 版本信息的完整详细信息" @@ -12976,8 +13128,7 @@ msgstr "``hash``" msgid "Git hash of pgRouting build" msgstr "pgRouting 构建的 Git 哈希" -#, fuzzy -msgid "``pgr_hawickCircuits`` - Experimental" +msgid "``pgr_hawickCircuits - Experimental``" msgstr "``pgr_hawickCircuits - 实验``" msgid "" @@ -12985,6 +13136,9 @@ msgid "" "algorithm." msgstr "``pgr_hawickCircuits`` — 使用 Hawick 回路算法返回回路列表。" +msgid "``pgr_hawickCircuits``" +msgstr "``pgr_hawickCircuits``" + msgid "" "Hawick Circuit algorithm, is published in 2008 by Ken Hawick and Health A. " "James. This algorithm solves the problem of detecting and enumerating " @@ -13125,10 +13279,7 @@ msgstr "" "新图不是平面图，因为它具有一个 :math:`K_5` 子图。蓝色的边代表 :math:`K_5` 子" "图。" -#, fuzzy -msgid "" -"`Boost: Boyer Myrvold `__" +msgid "https://www.boost.org/libs/graph/doc/boyer_myrvold.html" msgstr "https://www.boost.org/libs/graph/doc/boyer_myrvold.html" msgid "``pgr_johnson``" @@ -13138,7 +13289,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 " @@ -13188,9 +13339,6 @@ msgid "" "breadth First Search ordering." msgstr "``pgr_kruskalBFS`` — Kruskal 的最小生成树算法，具有广度优先搜索排序。" -msgid "Added ``pred`` result columns." -msgstr "添加了 ``pred`` 结果列。" - msgid "" "Visits and extracts the nodes information in Breath First Search ordering of " "the Minimum Spanning Tree created using Kruskal's algorithm." @@ -13225,8 +13373,8 @@ msgid "" "than or equal to a **distance** from a **root** vertex (or vertices) within " "the calculated minimum spanning tree." msgstr "" -"使用 Kruskal 算法，从计算出的最小生成树中，提取出那些与 **root** 顶点（或根顶" -"点组）之间的聚合成本，小于或等于 **distance** 的节点。" +"使用 Kruskal 算法，在计算的最小生成树中提取总成本小于或等于距 **根** 顶点（或" +"多个顶点） **距离** 的节点。" msgid "Returned tree nodes from a root vertex are on Depth First Search order." msgstr "从根顶点返回的树节点遵循深度优先搜索顺序。" @@ -13273,9 +13421,8 @@ msgstr "pgr_kruskalDFS(`Edges SQL`_, **root vid**, [``max_depth``])" msgid "pgr_kruskalDFS(`Edges SQL`_, **root vids**, [``max_depth``])" msgstr "pgr_kruskalDFS(`Edges SQL`_, **root vids**, [``max_depth``])" -#, fuzzy -msgid "``pgr_lengauerTarjanDominatorTree`` - Experimental" -msgstr "``pgr_lengauerTarjanDominatorTree`` - 实验" +msgid "pgr_lengauerTarjanDominatorTree -Experimental" +msgstr "pgr_lengauerTarjanDominatorTree -实验" msgid "" "``pgr_lengauerTarjanDominatorTree`` — Returns the immediate dominator of all " @@ -13287,8 +13434,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 "" -"该算法计算每个顶点的 *immidiate dominator* ，称为 **idom** ，一旦每个顶点的 " -"**idom** 被计算出来，通过将每个顶点的 **idom** 作为其父节点，可以构建支配树。" +"该算法计算每个顶点的 **直接支配者**（称为 **idom**），一旦计算出每个顶点的 " +"**idom**，然后通过将每个顶点的 **idom** 作为其父节点，可以构建支配树。" msgid "The algorithm works in directed graph only." msgstr "该算法仅适用于有向图。" @@ -13333,12 +13480,11 @@ msgstr "顶点的直接支配者。" msgid "Dominator tree of another component." msgstr "另一个组件的支配树。" -#, fuzzy msgid "" -"`Boost: Lengauer-Tarjan dominator `__" +"`Boost: Lengauer-Tarjan dominator tree algorithm `__" msgstr "" -"`Boost：Languer-Tarjan 支配树算法 `__" msgid "" @@ -13347,50 +13493,51 @@ msgid "" msgstr "" "`维基百科:支配树 `__" -msgid "``pgr_lineGraph`` - Proposed" -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 "Works for directed and undirected graphs." -msgstr "适用于有向和无向图。" - +#, fuzzy msgid "" "Given a graph :math:`G`, its line graph :math:`L(G)` is a graph such that:" -msgstr "给定一个图 :math:`G`，其线图 :math:`L(G)` 是一个图，满足以下条件：" +msgstr "给定一个图 G，它的线图 L(G) 是这样的图：" +#, fuzzy msgid "Each vertex of :math:`L(G)` represents an edge of :math:`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 "" -":math:`L(G)` 的两个顶点相邻，当且仅当它们对应的边在 :math:`G` 中共享一个共同" -"端点时" +":math:`L(G)` 的两个顶点相邻当且仅当它们对应的边共享 :math:`G` 中的公共端点" +#, fuzzy 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." -msgstr "当图形是有向的，结果也是有向的。" +msgstr "当图无向时，成本矩阵是对称的。" msgid "" "To get the complete Line Graph use unique identifiers on the double way " "edges (See `Additional Examples`_)." msgstr "" -"要获取完整的线图，请在双向边上使用唯一标识符 (See `Additional Examples`_)." msgid "When the graph is undirected the result is undirected." -msgstr "当图undirected(无向)时，成本矩阵是对称的。" +msgstr "当图无向时，成本矩阵是对称的。" msgid "The ``reverse_cost`` is always :math:`-1`." -msgstr "``reverse_cost`` 始终为 :math:`-1`。" +msgstr "" msgid "pgr_lineGraph(`Edges SQL`_, [``directed``])" msgstr "pgr_lineGraph(`Edges SQL`_, [``directed``])" @@ -13398,8 +13545,9 @@ msgstr "pgr_lineGraph(`Edges SQL`_, [``directed``])" msgid "Returns set of |result-lineg|" msgstr "Returns set of |result-lineg|" +#, fuzzy msgid "For an undirected graph with edges :math:'{2,4,5,8}'" -msgstr "对于一个undirected graph(无向图)，其边为 :math:'{2,4,5,8}'" +msgstr "对于有边 :math:`\\{1, 2, 3, 4\\}` 的有向子图" msgid "Gives a local identifier for the edge" msgstr "给出边的本地标识符" @@ -13432,146 +13580,152 @@ msgid "" "it’s not part of the graph." 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 " "\\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 "用共享边标识符定向表示" +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 "为了简化数据库中边表的设计，边的标识符采用3位数字表示：" +msgstr "" msgid "hundreds" -msgstr "百位" +msgstr "" +#, fuzzy msgid "the source vertex" -msgstr "源点" +msgstr "获取最近的顶点" msgid "tens" -msgstr "十位" +msgstr "" msgid "always 0, acts as a separator" -msgstr "始终为 0，用作分隔符" +msgstr "" +#, fuzzy msgid "units" -msgstr "个位" +msgstr "单位" +#, fuzzy msgid "the target vertex" -msgstr "目标顶点" +msgstr "获取最近的顶点" msgid "In this image," -msgstr "在这张图片中，" +msgstr "" msgid "" "Single or double head arrows represent one edge (row) on the edges table." -msgstr "单向或双向箭头表示边表中的一条边（行）。" +msgstr "" +#, fuzzy msgid "The numbers in the yellow shadow are the edge identifiers." -msgstr "黄色阴影中的数字是边缘标识符。" +msgstr "返回的行按边标识符升序排列。" msgid "" "Two pair of edges share the same identifier when the ``reverse_cost`` column " "is used." -msgstr "当使用 ``reverse_cost`` 列时，两个边对会共享相同的标识符。" +msgstr "" +#, fuzzy msgid "" "Edges :math:`{2 \\rightarrow 3, 3 \\rightarrow 2}` are represented with one " "edge row with :math:`id=203`." -msgstr "" -"边 :math:`{2 \\rightarrow 3, 3 \\rightarrow 2}` 用一条边行表示，标识符其 :" -"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:`{3 \\rightarrow 4, 4 \\rightarrow 3}` 用一条边的行表示，标识符为 :" -"math:`id=304` 。" +msgstr "从图中删除边 :math:`v \\rightarrow w` 和 :math:`w \\rightarrow z`。" +#, fuzzy msgid "The graph can be created as follows:" -msgstr "图表的创建过程如下：" +msgstr "图定义如下：" +#, fuzzy msgid "Line Graph of a directed graph represented with shared edges" -msgstr "用共享边表示的有向图的线图" +msgstr "就有向图而言，就像有四个边" +#, fuzzy msgid "The result is a directed graph." -msgstr "结果就是一个有向图。" +msgstr "有向图。" +#, fuzzy msgid "" "For :math:`seq=4` from :math:`203 \\leftrightarrow 304` represent two edges" -msgstr "对于 :math:`seq=4` ，从:math:`203 \\leftrightarrow 304` 表示两条边" +msgstr "边 :math:`2` (:math:`1 \\rightarrow 3`) 不是图的一部分" msgid "For all the other values of ``seq`` represent one edge." -msgstr "所有其他的 ``seq`` 值都代表一条边。" +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." -msgstr "当为正数时：边缘存在。" +msgstr "当正数时是顶点的标识符。" +#, fuzzy msgid "When negative: the edge does not exist." -msgstr "负数时：边缘不存在。" +msgstr "为负数时抛出错误。" msgid "Representation as directed with unique edge identifiers" -msgstr "作为有向图表示，并使用唯一的边标识符" +msgstr "" +#, fuzzy msgid "Single head arrows represent one edge (row) on the edges table." -msgstr "单头箭头代表边表中的一条边（行）。" +msgstr "红色箭头对应边表中 ``cost`` > 0的情况。" msgid "There are no double head arrows" -msgstr "没有双向头箭" +msgstr "" msgid "" "Two pair of edges share the same ending nodes and the ``reverse_cost`` " "column is not used." -msgstr "两对边共享相同的结束节点，不使用 ``reverse_cost`` 列。" +msgstr "" msgid "" "Edges :math:`{2 \\rightarrow 3, 3 \\rightarrow 2}` are represented with two " "edges :math:`id=203` and :math:`id=302` respectively." msgstr "" -"边 :math:`{2 \\rightarrow 3, 3 \\rightarrow 2}`分别用两条边表示，边标识符为 :" -"math:`id=203` 和:math:`id=302` 。" msgid "" "Edges :math:`{3 \\rightarrow 4, 4 \\rightarrow 3}` are represented with two " "edges :math:`id=304` and :math:`id=403` respectively." msgstr "" -"边 :math:`{3 \\rightarrow 4, 4 \\rightarrow 3}`分别用两条边表示，边标识符为 :" -"math:`id=304` 和 :math:`id=403` 。" +#, fuzzy msgid "Line Graph of a directed graph represented with unique edges" -msgstr "用唯一边表示的有向图的线图" +msgstr "就有向图而言，就像有四个边" +#, fuzzy msgid "" "For :math:`seq=7` from :math:`203 \\leftrightarrow 302` represent two edges." -msgstr "对于 :math:`seq=7` 从 :math:`203 \\leftrightarrow 302` 代表两条边。" +msgstr "边 :math:`2` (:math:`1 \\rightarrow 3`) 不是图的一部分。" +#, fuzzy msgid "" "For :math:`seq=8` from :math:`304 \\leftrightarrow 403` represent two edges." -msgstr "对于 :math:`seq=8` ，从 :math:`304 \\leftrightarrow 403` 表示两条边。" +msgstr "边 :math:`2` (:math:`1 \\rightarrow 3`) 不是图的一部分。" +#, fuzzy msgid "wikipedia: `Line Graph `__" -msgstr "维基百科: `Line Graph `__" +msgstr "`维基百科：二分图 `__" msgid "" "mathworld: `Line Graph `__" msgstr "" -"MathWorld在线数学资源: `Line Graph `__" msgid "``pgr_lineGraphFull`` - Experimental" msgstr "``pgr_lineGraphFull`` - 实验" @@ -13638,9 +13792,9 @@ msgstr "返回 |result-linegf| 的集合" msgid "Full line graph of subgraph of edges :math:`\\{4, 7, 8, 10\\}`" msgstr "边 :math:`\\{4, 7, 8, 10\\}` 子图的全线图" -#, fuzzy msgid "" -"The examples include the subgraph including edges 4, 7, 8, and 10 with " +"The examples of this section are based on the :doc:`sampledata` network. The " +"examples include the subgraph including edges 4, 7, 8, and 10 with " "``reverse_cost``." msgstr "" "本节的示例基于 :doc:`sampledata` 网络。 这些示例包括包含具有 " @@ -13795,7 +13949,7 @@ msgid "Removing self loops on leaf nodes" msgstr "删除叶节点上的自循环" msgid "The self loops of the leaf nodes are" -msgstr "叶节点的自循环" +msgstr "叶节点的自循环为" msgid "Which can be removed" msgstr "哪些可以删除" @@ -13874,36 +14028,30 @@ msgstr "pgr_makeConnected(`Edges SQL`_)" msgid "Returns set of |result-component-make|" msgstr "Returns set of |result-component-make|" -#, fuzzy -msgid "List of edges that are needed to connect the graph." +msgid "" +"Query done on :doc:`sampledata` network gives the list of edges that are " +"needed to connect the graph." msgstr "在 :doc:`sampledata` 网络上完成的查询给出了连接图所需的边列表。" -#, fuzzy -msgid "" -"`Boost: make connected `__" +msgid "https://www.boost.org/libs/graph/doc/make_connected.html" msgstr "https://www.boost.org/libs/graph/doc/make_connected.html" -msgid "``pgr_maxCardinalityMatch``" -msgstr "``pgr_maxCardinalityMatch``" +msgid "pgr_maxCardinalityMatch" +msgstr "pgr_maxCardinalityMatch" msgid "" "``pgr_maxCardinalityMatch`` — Calculates a maximum cardinality matching in a " "graph." msgstr "``pgr_maxCardinalityMatch`` — 计算图中的最大基数匹配。." -#, fuzzy -msgid "pgr_maxCardinalityMatch(text) returns only ``edge`` column." -msgstr "``pgr_maxCardinalityMatch(text)`` 仅仅返回``边`` 列." - msgid "Deprecated signature" msgstr "已弃用的签名" -msgid "pgr_maxCardinalityMatch(text,boolean)" -msgstr "pgr_maxCardinalityMatch(text,boolean)" +msgid "``pgr_maxCardinalityMatch(text,boolean)``" +msgstr "``pgr_maxCardinalityMatch(text,boolean)``" -msgid "directed => ``false`` when used." -msgstr "使用时 directed => ``false``。" +msgid "``directed => false`` when used." +msgstr "使用时 ``directed => false``。" msgid "Renamed from ``pgr_maximumCardinalityMatching``" msgstr "从 ``pgr_maximumCardinalityMatching`` 重命名" @@ -13953,10 +14101,7 @@ msgstr "正值表示存在边(``target``, ``source``)" msgid "Identifier of the edge in the original query." msgstr "原始查询中边的标识符。" -#, fuzzy -msgid "" -"`Boost: maximum_matching `__" +msgid "https://www.boost.org/libs/graph/doc/maximum_matching.html" msgstr "https://www.boost.org/libs/graph/doc/maximum_matching.html" msgid "https://en.wikipedia.org/wiki/Matching_%28graph_theory%29" @@ -13972,10 +14117,17 @@ msgid "" "``pgr_maxFlow`` — Calculates the maximum flow in a directed graph from the " "source(s) to the targets(s) using the Push Relabel algorithm." msgstr "" -"``pgr_maxFlow`` — 使用 Push Relabel 算法计算有向图中从源到目标的最大流量。" +"``pgr_maxFlow`` —使用 Push Relabel 算法计算有向图中从源到目标的最大流量。" + +msgid "``pgr_maxFlow`` (`Combinations`_)" +msgstr "``pgr_maxFlow`` (`组合`_)" + +msgid "New **Proposed** function" +msgstr "新 **拟议** 的函数" +#, fuzzy msgid "Calculates the maximum flow from the sources to the targets." -msgstr "计算从源头到目标的最大流量。" +msgstr "计算从 `source(s)` 到 `target(s)` 的最大流量。" msgid "" "When the maximum flow is **0** then there is no flow and **0** is returned." @@ -14008,10 +14160,7 @@ msgstr "RETURNS ``BIGINT``" msgid "Maximum flow possible from the source(s) to the target(s)" msgstr "从 source(s)到 target(s)的可能最大流量" -#, fuzzy -msgid "" -"`Boost: push relabel max flow `__" +msgid "https://www.boost.org/libs/graph/doc/push_relabel_max_flow.html" msgstr "https://www.boost.org/libs/graph/doc/push_relabel_max_flow.html" msgid "" @@ -14027,11 +14176,8 @@ msgid "" "of the maximum flow on a graph" msgstr "``pgr_maxFlowMinCost`` — 计算图上最大流的总成本最小化的边" -msgid "pgr_maxFlowMinCost(Combinations)" -msgstr "pgr_maxFlowMinCost(组合)" - -msgid "|boost| graph inside." -msgstr "|boost| 图内部。" +msgid "``pgr_maxFlowMinCost`` (`Combinations`_)" +msgstr "``pgr_maxFlowMinCost`` (`组合`_)" msgid "**TODO** check which statement is true:" msgstr "**TODO** 检查哪个陈述是正确的：" @@ -14076,6 +14222,13 @@ msgstr "pgr_maxFlowMinCost(`Edges SQL`_, `Combinations SQL`_)" msgid "Returns set of |result-flow-mincost|" msgstr "返回 |result-flow-mincost| 的集合" +msgid "" +"https://www.boost.org/libs/graph/doc/" +"successive_shortest_path_nonnegative_weights.html" +msgstr "" +"https://www.boost.org/libs/graph/doc/" +"successive_shortest_path_nonnegative_weights.html" + msgid "``pgr_maxFlowMinCost_Cost`` - Experimental" msgstr "``pgr_maxFlowMinCost_Cost`` - 实验" @@ -14084,8 +14237,8 @@ msgid "" "maximum flow on a graph" msgstr "``pgr_maxFlowMinCost_Cost`` — 计算图上最大流量的最小总成本" -msgid "pgr_maxFlowMinCost_Cost(Combinations)" -msgstr "pgr_maxFlowMinCost_Cost(组合)" +msgid "``pgr_maxFlowMinCost_Cost`` (`Combinations`_)" +msgstr "``pgr_maxFlowMinCost_Cost`` (`组合`_)" msgid "**The cost value of all input edges must be nonnegative.**" msgstr "**所有输入边的成本值必须是非负的。**" @@ -14117,8 +14270,8 @@ msgstr "RETURNS FLOAT" msgid "Minimum Cost Maximum Flow possible from the source(s) to the target(s)" msgstr "从source(s) 到target(s)的最小成本最大流量" -msgid "``pgr_nodeNetwork``" -msgstr "``pgr_nodeNetwork``" +msgid "pgr_nodeNetwork" +msgstr "pgr_nodeNetwork" msgid "``pgr_nodeNetwork`` - Nodes an network edge table." msgstr "``pgr_nodeNetwork`` - 网络边表的节点。" @@ -14188,8 +14341,9 @@ msgstr "``bigint`` 表的唯一标识符" msgid "old_id" msgstr "old_id" +#, fuzzy msgid "``bigint`` Identifier of the edge in original table" -msgstr "``bigint`` 是原始表中边的标识符" +msgstr "``bigint`` 原表中边的标识符" msgid "sub_id" msgstr "sub_id" @@ -14283,8 +14437,9 @@ msgstr "仅具有进行拓扑分析的基本字段" msgid "Edges with 1 dead end: 1,6,24" msgstr "有 1 个死端的边：1、6、24" +#, fuzzy msgid "Edges with 2 dead ends: 17,18" -msgstr "边缘有 2 个死角：17,18" +msgstr "有两个死端的边：17，18" msgid "" "Edge 17's right node is a dead end because there is no other edge sharing " @@ -14297,8 +14452,9 @@ msgstr "有 1 个死端的边：1-1 ,6-1,14-2, 18-1 17-1 18-2" msgid "Isolated segments" msgstr "孤立的片段" +#, fuzzy msgid "two isolated segments: 17 and 18 both they have 2 dead ends" -msgstr "两个孤立的段：17 和 18，它们都有两个死端" +msgstr "两个孤立的段：17 和 18 都有 2 个死端" msgid "No Isolated segments" msgstr "无孤立段" @@ -14631,12 +14787,12 @@ msgid "" "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 using Prims's algorithm." msgstr "" -"访问并提取使用 Prims 算法创建的最小生成树的 Breath First Search 排序中的节点" -"信息。" +"访问并提取使用 Prims 算法创建的最小生成树的深度优先搜索顺序中的节点信息。" msgid "pgr_primBFS(`Edges SQL`_, **root vid**, [``max_depth``])" msgstr "pgr_primBFS(`Edges SQL`_, **root vid**, [``max_depth``])" @@ -14647,13 +14803,14 @@ msgstr "pgr_primBFS(`Edges SQL`_, **root vids**, [``max_depth``])" 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." msgstr "" -"使用 Prim 算法，从计算出最小生成树中提取出那些与根节点（或根节点组）之间的聚" -"合成本小于或等于某个距离的节点。" +"使用 Prim 算法，在计算的最小生成树中提取总成本小于或等于距根顶点（或多个顶" +"点）距离的节点。" msgid "pgr_primDD(`Edges SQL`_, **root vid**, **distance**)" msgstr "pgr_primDD(`Edges SQL`_, **root vid**, **distance**)" @@ -14688,6 +14845,9 @@ msgstr "" "``pgr_pushRelabel`` — 使用 Push Relabel 算法计算图边上的流量，以最大化从源到" "目标的流量。" +msgid "``pgr_pushRelabel`` (`Combinations`_)" +msgstr "``pgr_pushRelabel`` (`组合`_)" + msgid "Renamed from ``pgr_maxFlowPushRelabel``" msgstr "由 ``pgr_maxFlowPushRelabel`` 重命名" @@ -14706,14 +14866,17 @@ 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_sequentialVertexColoring`` - Proposed" -msgstr "``pgr_sequentialVertexColoring`` - 拟议" +msgid "pgr_sequentialVertexColoring - Proposed" +msgstr "pgr_sequentialVertexColoring - 拟议" msgid "" "``pgr_sequentialVertexColoring`` — Returns the vertex coloring of an " "undirected graph, using greedy approach." msgstr "``pgr_sequentialVertexColoring`` — 使用贪婪方法返回无向图的顶点着色。" +msgid "Promoted to **proposed** signature" +msgstr "晋升为 **拟议** 签名" + msgid "" "Sequential vertex coloring algorithm is a graph coloring algorithm in which " "color identifiers are assigned to the vertices of a graph in a sequential " @@ -14760,16 +14923,8 @@ msgstr ":math:`k` 是使用的颜色数量。" msgid "pgr_sequentialVertexColoring(`Edges SQL`_)" msgstr "pgr_sequentialVertexColoring(`Edges SQL`_)" -#, fuzzy -msgid "" -"`Boost: Sequential Vertex Coloring `__" -msgstr "" -"`Boost：顺序顶点着色算法文档 `__" - -msgid "``pgr_stoerWagner`` - Experimental" -msgstr "``pgr_stoerWagner`` - 实验" +msgid "pgr_stoerWagner - Experimental" +msgstr "pgr_stoerWagner - 实验" msgid "``pgr_stoerWagner`` — The min-cut of graph using stoerWagner algorithm." msgstr "``pgr_stoerWagner`` — 使用 stoerWagner 算法对图进行最小分割。" @@ -14862,14 +15017,6 @@ msgstr "边的最小割" msgid "Using :doc:`pgr_connectedComponents`" msgstr "使用 :doc:`pgr_connectedComponents`" -#, fuzzy -msgid "" -"`Boost: Stoer Wagner min cut `__" -msgstr "" -"Boost: `强大组件 `__" - msgid "https://en.wikipedia.org/wiki/Stoer%E2%80%93Wagner_algorithm" msgstr "https://en.wikipedia.org/wiki/Stoer%E2%80%93Wagner_algorithm" @@ -14900,9 +15047,8 @@ msgstr "pgr_strongComponents(`Edges SQL`_)" msgid "The strong components of the graph" msgstr "图的重要组成部分" -#, fuzzy msgid "" -"`Boost: Strong components `__" msgstr "" "Boost: `强大组件 `__" -msgstr "" -"`Boost: is_bipartite `__" - msgid "``pgr_transitiveClosure`` - Experimental" msgstr "``pgr_transitiveClosure`` - 实验" @@ -15038,55 +15176,58 @@ msgstr "边目标的标识符" msgid "Identifiers of the vertices that are reachable from vertex v." msgstr "从顶点 v 可到达的顶点的标识符。" -#, fuzzy -msgid "" -"`Boost: transitive closure `__" -msgstr "" -"`Boost: is_bipartite `__" - msgid "https://en.wikipedia.org/wiki/Transitive_closure" msgstr "https://en.wikipedia.org/wiki/Transitive_closure" -msgid "``pgr_trsp``" -msgstr "``pgr_trsp``" +msgid "pgr_trsp - Proposed" +msgstr "pgr_trsp - 拟议" msgid "``pgr_trsp`` - routing vertices with restrictions." msgstr "``pgr_trsp`` -有限制的路由顶点。" -msgid "pgr_trsp(One to One)" -msgstr "pgr_trsp （一对一）" +msgid "New proposed signatures" +msgstr "新拟议的签名" -msgid "pgr_trsp(One to Many)" -msgstr "pgr_trsp （一对多）" +msgid "``pgr_trsp`` (`One to One`_)" +msgstr "``pgr_trsp`` (`一对一`_)" -msgid "pgr_trsp(Many to One)" -msgstr "pgr_trsp （多对一）" +msgid "``pgr_trsp`` (`One to Many`_)" +msgstr "``pgr_trsp`` (`一对多`_)" -msgid "pgr_trsp(Many to Many)" -msgstr "pgr_trsp （多对多）" +msgid "``pgr_trsp`` (`Many to One`_)" +msgstr "``pgr_trsp`` (`多对一`_)" -msgid "pgr_trsp(Combinations)" -msgstr "pgr_trsp （组合）" +msgid "``pgr_trsp`` (`Many to Many`_)" +msgstr "``pgr_trsp`` (`多对多`_)" + +msgid "``pgr_trsp`` (`Combinations`_)" +msgstr "``pgr_trsp`` (`组合`_)" msgid "Deprecated signatures" msgstr "弃用签名" -msgid "pgr_trsp(text,integer,float,integer,float,boolean,boolean,text)" -msgstr "pgr_trsp(text,integer,float,integer,float,boolean,boolean,text)" +msgid "``pgr_trsp(text,integer,integer,boolean,boolean,text)``" +msgstr "``pgr_trsp(text,integer,integer,boolean,boolean,text)``" + +msgid "``pgr_trsp(text,integer,float,integer,float,boolean,boolean,text)``" +msgstr "``pgr_trsp(text,integer,float,integer,float,boolean,boolean,text)``" -msgid "pgr_trspViaVertices(text,anyarray,boolean,boolean,text)" -msgstr "pgr_trspViaVertices(text,anyarray,boolean,boolean,text)" +msgid "``pgr_trspViaVertices(text,anyarray,boolean,boolean,text)``" +msgstr "``pgr_trspViaVertices(text,anyarray,boolean,boolean,text)``" + +msgid "" +"``pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)``" +msgstr "" +"``pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)``" msgid "New prototypes" msgstr "新原型" -msgid "pgr_trspViaVertices" -msgstr "pgr_trspViaVertices" +msgid "``pgr_trspViaVertices``" +msgstr "``pgr_trspViaVertices``" -msgid "pgr_trspViaEdges" -msgstr "pgr_trspViaEdges" +msgid "``pgr_trspViaEdges``" +msgstr "``pgr_trspViaEdges``" msgid "" "Turn restricted shortest path (TRSP) is an algorithm that receives turn " @@ -15170,13 +15311,19 @@ msgid "" "`Deprecated documentation `_" msgstr "` 已弃用文档 `_" -msgid "``pgr_trspVia``" -msgstr "``pgr_trspVia``" +msgid "``pgr_trspVia`` - Proposed" +msgstr "``pgr_trspVia`` - 拟议" msgid "" "``pgr_trspVia`` Route that goes through a list of vertices with restrictions." msgstr "``pgr_trspVia`` 穿过有限制的顶点列表的路线。" +msgid "New proposed function:" +msgstr "新提议的函数：" + +msgid "``pgr_trspVia`` (`One Via`_)" +msgstr "``pgr_trspVia`` (`One Via`_)" + 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 :" @@ -15269,14 +15416,17 @@ msgstr "因此，当设置为 ``false`` 时，结果会忽略 ``U_turn_on_edge`` msgid ":doc:`via-category`" msgstr ":doc:`via-category`" -msgid "``pgr_trspVia_withPoints``" -msgstr "``pgr_trspVia_withPoints``" +msgid "``pgr_trspVia_withPoints`` - Proposed" +msgstr "``pgr_trspVia_withPoints`` - 拟议" msgid "" "``pgr_trspVia_withPoints`` - Route that goes through a list of vertices and/" "or points with restrictions." msgstr "``pgr_trspVia_withPoints`` - 经过一系列具有限制的顶点和/或点的路线。" +msgid "``pgr_trspVia_withPoints`` (`One Via`_)" +msgstr "``pgr_trspVia_withPoints`` (`One Via`_)" + msgid "" "Given a graph, a set of restriction on the graph edges, a set of points on " "the graphs edges and a list of vertices, this function is equivalent to " @@ -15408,7 +15558,7 @@ msgstr "" "的路线。" msgid "Status of \"passes in front\" or \"visits\" of the nodes and points." -msgstr "节点和点的“经过”或“访问”状态。" +msgstr "节点、点的\"通过\"或\"访问\"状态。" msgid "The algorithm performs a :doc:`pgr_withPointsVia`" msgstr "该算法执行 :doc:`pgr_withPointsVia`" @@ -15460,17 +15610,35 @@ msgstr "" "`pgr_withPointsVia` 结果中，它删除了冲突路径，并使用 :doc:`pgr_trsp` 算法的结" "果构建解决方案。 在这种情况下，使用相同的边缘完成 U 形转弯。" -msgid "``pgr_trsp_withPoints``" -msgstr "``pgr_trsp_withPoints``" +msgid "pgr_trsp_withPoints - Proposed" +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`` (`一对一`_)" + +msgid "``pgr_trsp_withPoints`` (`One to Many`_)" +msgstr "``pgr_trsp_withPoints`` (`一对多`_)" + +msgid "``pgr_trsp_withPoints`` (`Many to One`_)" +msgstr "``pgr_trsp_withPoints`` (`多对一`_)" + +msgid "``pgr_trsp_withPoints`` (`Many to Many`_)" +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" -msgstr "" -"修改图形，使其包含由 points_sql 定义的点。使用 Dijkstra 算法找出最短路径" +msgstr "修改图以包括由points_sql 定义的点。 使用 Dijkstra 算法，找到最短路径" msgid "Characteristics:" msgstr "特征：" @@ -15591,15 +15759,17 @@ msgstr "" "无向图上从点 :math:`1` 和顶点 :math:`6` 到点 :math:`3`到顶点 :math:`1` 的详细" "信息。" -msgid "``pgr_turnRestrictedPath`` - Experimental" -msgstr "``pgr_turnRestrictedPath`` - 实验性" +msgid "pgr_turnRestrictedPath - Experimental" +msgstr "pgr_turnRestrictedPath - 实验性" -#, fuzzy msgid "" -"``pgr_turnRestrictedPath`` Using Yen's algorithm Vertex - Vertex routing " -"with restrictions" +"``pgr_turnRestrictedPath`` Using Yen's algorithm Vertex -Vertex routing with " +"restrictions" msgstr "``pgr_turnRestrictedPath`` 使用 Yen 算法顶点- 带限制的顶点路由" +msgid "New experimental function" +msgstr "新实验功能" + msgid "" "Using Yen's algorithm to obtain K shortest paths and analyze the paths to " "select the paths that do not use the restrictions" @@ -15673,8 +15843,8 @@ msgstr "pgr_version()" msgid "pgRouting Version for this documentation" msgstr "本文档的 pgRouting 版本" -msgid "``pgr_vrpOneDepot`` - Experimental" -msgstr "``pgr_vrpOneDepot`` - 实验" +msgid "pgr_vrpOneDepot - Experimental" +msgstr "pgr_vrpOneDepot -实验" msgid "**No documentation available**" msgstr "**无可用文档**" @@ -15682,8 +15852,8 @@ msgstr "**无可用文档**" msgid "**TBD**" msgstr "**TBD**" -msgid "``pgr_withPoints``" -msgstr "``pgr_withPoints``" +msgid "``pgr_withPoints`` - Proposed" +msgstr "``pgr_withPoints`` -拟议" msgid "" "``pgr_withPoints`` - Returns the shortest path in a graph with additional " @@ -15841,25 +16011,28 @@ msgstr "对于点 :math:`6` 和顶点 :math:`11`。" msgid "Passes in front or visits with left side driving." msgstr "从前方超车或以左侧驾驶方式行驶。" -msgid "``pgr_withPointsCost``" -msgstr "``pgr_withPointsCost``" +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 found, for the combination of points " "given." msgstr "" -"``pgr_withPointsCost`` - 计算最短路径，并只返回所给点组合的最短路径的总成本。" +"``pgr_withPointsCost`` -对于给定的点组合，计算最短路径并仅返回找到的最短路径" +"的总成本。" 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 found." msgstr "" -"修改图形以包含由 points_sql 定义的点。使用 Dijkstra 算法，只返回找到的最短路" -"径的总成本。" +"修改图以包括由points_sql 定义的点。 使用 Dijkstra 算法，仅返回找到的最短路径" +"的总成本。" msgid "" "Returns the sum of the costs of the shortest path for pair combination of " @@ -16009,8 +16182,8 @@ msgstr "左侧驾驶拓扑" msgid "Does not matter driving side driving topology" msgstr "与驱动端驱动拓扑无关" -msgid "``pgr_withPointsCostMatrix``" -msgstr "``pgr_withPointsCostMatrix``" +msgid "``pgr_withPointsCostMatrix`` - proposed" +msgstr "``pgr_withPointsCostMatrix`` - 拟议" msgid "" "``pgr_withPointsCostMatrix`` - Calculates a cost matrix using :doc:" @@ -16046,8 +16219,8 @@ msgid "" msgstr "" "求从顶点 :math:`1` 到图上点 `(2.9, 1.8)` 的两个最近位置的路线的矩阵成本。" -msgid "``pgr_withPointsDD``" -msgstr "``pgr_withPointsDD``" +msgid "``pgr_withPointsDD`` - Proposed" +msgstr "``pgr_withPointsDD`` - 拟议" msgid "" "``pgr_withPointsDD`` - Returns the driving **distance** from a starting " @@ -16061,11 +16234,8 @@ msgstr "" "签名更改： ``driving_side`` 参数从已命名的可选参数改为未命名的必选参数 " "**driving side**。" -msgid "pgr_withPointsDD(Single vertex)" -msgstr "pgr_withPointsDD （单顶点）" - -msgid "pgr_withPointsDD(Multiple vertices)" -msgstr "pgr_withPointsDD（多顶点）" +msgid "``pgr_withPointsDD`` (`Single vertex`)" +msgstr "``pgr_withPointsDD`` （`单顶点`）" msgid "Added ``depth``, ``pred`` and ``start_vid`` column." msgstr "添加了 ``depth``、``pred`` 和 ``start_vid`` 列。" @@ -16073,8 +16243,9 @@ msgstr "添加了 ``depth``、``pred`` 和 ``start_vid`` 列。" msgid "Added ``depth``, ``pred`` columns." msgstr "添加了 ``depth``，``pred`` 列。" +#, fuzzy msgid "When ``details`` is ``false``:" -msgstr "当 ``details`` 为 ``false`` 时：" +msgstr "当 ``details`` 为``false`` 时：" msgid "" "Only points that are visited are removed, that is, points reached within the " @@ -16084,16 +16255,18 @@ msgstr "" "被包含在内" msgid "" -"pgr_withpointsdd(text,text,bigint,double precision,boolean,character,boolean)" +"``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)" +"``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 " @@ -16101,8 +16274,8 @@ msgid "" "``**distance**`` from the starting point. The edges extracted will conform " "the corresponding spanning tree." msgstr "" -"修改图以包含点，并使用 Dijkstra 算法，提取成本小于或等于距起点 " -"``**distance**`` 值的所有节点和点。 提取的边将符合相应的生成树。" +"修改图以包含点，并使用 Dijkstra 算法，提取成本小于或等于距起点 ``**距离**`` " +"值的所有节点和点。 提取的边将符合相应的生成树。" msgid "" "pgr_withPointsDD(`Edges SQL`_, `Points SQL`_, **root vid**, **distance**, " @@ -16214,8 +16387,8 @@ msgstr "" msgid ":doc:`pgr_alphaShape`" msgstr ":doc:`pgr_alphaShape`" -msgid "``pgr_withPointsKSP``" -msgstr "``pgr_withPointsKSP``" +msgid "pgr_withPointsKSP - Proposed" +msgstr "pgr_withPointsKSP -拟议" msgid "" "``pgr_withPointsKSP`` — Yen's algorithm for K shortest paths using Dijkstra." @@ -16224,26 +16397,29 @@ msgstr "``pgr_withPointsKSP`` — Yen 使用 Dijkstra 计算 K 最短路径的 msgid "Standarizing output columns to |nksp-result|" msgstr "标准化输出列为 |nksp-result|" -msgid "pgr_withPointsKSP(One to One)" -msgstr "pgr_withPointsKSP(一对一)" +msgid "``pgr_withPointsKSP`` (One to One)" +msgstr "``pgr_withPointsKSP`` (一对一)" -msgid "pgr_withPointsKSP(One to Many)" -msgstr "pgr_withPointsKSP (一对多)" +msgid "New overload functions" +msgstr "新的重载函数" -msgid "pgr_withPointsKSP(Many to One)" -msgstr "pgr_withPointsKSP(多对一)" +msgid "``pgr_withPointsKSP`` (One to Many)" +msgstr "``pgr_withPointsKSP`` (一对多)" -msgid "pgr_withPointsKSP(Many to Many)" -msgstr "pgr_withPointsKSP(多对多)" +msgid "``pgr_withPointsKSP`` (Many to One)" +msgstr "``pgr_withPointsKSP`` (多对一)" -msgid "pgr_withPointsKSP(Combinations)" -msgstr "pgr_withPointsKSP（组合）" +msgid "``pgr_withPointsKSP`` (Many to Many)" +msgstr "``pgr_withPointsKSP`` (多对多)" + +msgid "``pgr_withPointsKSP`` (Combinations)" +msgstr "``pgr_withPointsKSP`` (组合)" msgid "" -"pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,char," +"``pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,char," "boolean)``" msgstr "" -"pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,char," +"``pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,char," "boolean)``" msgid "" @@ -16380,14 +16556,17 @@ msgstr "" "使用右侧驾驶拓扑，从点 :math:`1` 到点 :math:`2` 获取 :math:`2` 条路径，同时使" "用堆路径（heap paths）并包含详细信息。" -msgid "``pgr_withPointsVia``" -msgstr "``pgr_withPointsVia``" +msgid "``pgr_withPointsVia`` - Proposed" +msgstr "``pgr_withPointsVia`` - 拟议" msgid "" "``pgr_withPointsVia`` - Route that goes through a list of vertices and/or " "points." msgstr "``pgr_withPointsVia`` - 经过一系列顶点和/或点的路线。" +msgid "New **proposed** function ``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, " "this function is equivalent to finding the shortest path between :math:" @@ -16507,14 +16686,22 @@ msgid "" ":doc:`pgr_lineGraph` - Transformation algorithm for generating a Line Graph." msgstr ":doc:`pgr_lineGraph` - 用于生成折线图的转换算法。" +msgid ":doc:`pgr_withPointsVia`" +msgstr ":doc:`pgr_withPointsVia`" + +msgid ":doc:`pgr_trspVia`" +msgstr ":doc:`pgr_trspVia`" + +msgid ":doc:`pgr_trspVia_withPoints`" +msgstr ":doc:`pgr_trspVia_withPoints`" + msgid ":doc:`withPoints-family` - Functions based on Dijkstra algorithm." msgstr ":doc:`withPoints-family` -基于 Dijkstra 算法的函数。" msgid "From the :doc:`TRSP-family`:" msgstr "来自 :doc:`TRSP-family`:" -#, fuzzy -msgid "Utilities Category" +msgid "Utilities" msgstr "实用程序" msgid ":doc:`pgr_findCloseEdges`" @@ -16534,261 +16721,76 @@ msgstr "" "pgRouting/pgrouting/commits>`_。" msgid "Mayors" -msgstr "Mayors" - -msgid "pgRouting 4" -msgstr "pgRouting 4" - -msgid "Minors 4.x" -msgstr "Minors 4.x" - -msgid "pgRouting 4.0" -msgstr "pgRouting 4.0" +msgstr "主要版本" msgid "pgRouting 3" msgstr "pgRouting 3" msgid "Minors 3.x" -msgstr "Minors 3.x" +msgstr "3.x小版本" msgid "pgRouting 3.7" msgstr "pgRouting 3.7" -msgid "pgRouting 3.7.3 Release Notes" -msgstr "pgRouting 3.7.3 发布说明" - -#, fuzzy -msgid "" -"To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.7.3 `__" -msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 `Git closed milestone for 3.7.1 " -"`__" - -#, fuzzy -msgid "" -"`#2731 `__ Build Failure " -"on Ubuntu 22" -msgstr "" -"`#2607 `__ 在 C++ 上读取 " -"postgresql 数据" - -msgid "pgRouting 3.7.2 Release Notes" -msgstr "pgRouting 3.7.2 发布说明" - -#, fuzzy -msgid "" -"To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.7.2 `__" -msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 `Git closed milestone for 3.7.1 " -"`__" - -msgid "Build" -msgstr "Build" - -#, fuzzy -msgid "" -"`#2713 `__ cmake missing " -"some policies and min version" -msgstr "" -"`#2517 `__ Astar 代码简化。" - -msgid "Using OLD policies: CMP0148, CMP0144, CMP0167" -msgstr "" - -msgid "Minimum cmake version 3.12" -msgstr "" - -#, fuzzy -msgid "" -"`#2707 `__ Build failure " -"in pgRouting 3.7.1 on Alpine" -msgstr "" -"`#2607 `__ 在 C++ 上读取 " -"postgresql 数据" - -#, fuzzy -msgid "" -"`#2706 `__ winnie crashing " -"on pgr_betweennessCentrality" -msgstr "" -"`#2505 `__ 使用命名空间。" - -msgid "pgRouting 3.7.1 Release Notes" -msgstr "pgRouting 3.7.1 发布说明" - -msgid "" -"To see all issues & pull requests closed by this release see the `Git closed " -"milestone for 3.7.1 `__" -msgstr "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 `Git closed milestone for 3.7.1 " -"`__" - -msgid "" -"`#2680 `__ fails to " -"compile under mingw64 gcc 13.2" -msgstr "" -"`#2680 `__ 在 mingw64 gcc " -"13.2 下编译失败" - -msgid "" -"`#2689 `__ When point is a " -"vertex, the withPoints family do not return results." -msgstr "" -"`#2689 `__ 当 point 是顶点" -"时，withPoints 系列不返回结果。" - -#, fuzzy -msgid "C/C++ code enhancemet" -msgstr "C/C++ 代码增强" - -#, fuzzy -msgid "TRSP family" -msgstr "Prim族" - -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 "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 `Git closed milestone for 3.7.0 " -"`__" - -msgid "" -"`#2656 `__ Stop support of " -"PostgreSQL12 on pgrouting v3.7" -msgstr "" -"`#2656 `__ 在 pgrouting " -"v3.7 上停止支持 PostgreSQL12" - -msgid "Stopping support of PostgreSQL 12" -msgstr "停止支持 PostgreSQL 12" - -msgid "CI does not test for PostgreSQL 12" -msgstr "CI 不测试 PostgreSQL 12" - -msgid "New experimental functions" -msgstr "新的实验函数" - -msgid "Metrics" -msgstr "Metrics" - -msgid "pgr_betweennessCentrality" -msgstr "pgr_betweennessCentrality" - -msgid "Official functions changes" -msgstr "官方功能变更" - -msgid "" -"`#2605 `__ Standarize " -"spanning tree functions output" -msgstr "" -"`#2605 `__ 将生成树函数输出" -"标准化" - -msgid "Functions:" -msgstr "Functions:" - -msgid "Experimental promoted to proposed." -msgstr "实验性的功能被提升为提议的。" - -msgid "" -"`#2635 `__ pgr_LineGraph " -"ignores directed flag and use negative values for identifiers." -msgstr "" -"`#2635 `__ pgr_LineGraph 忽" -"略了有向标志，并使用负值作为标识符。" - -msgid "``pgr_lineGraph``" -msgstr "``pgr_lineGraph``" - -msgid "Code enhancement" -msgstr "代码改进" - -msgid "" -"`#2599 `__ Driving " -"distance cleanup" -msgstr "" -"`#2599 `__ 行车距离清理" - -msgid "" -"`#2607 `__ Read postgresql " -"data on C++" -msgstr "" -"`#2607 `__ 在 C++ 上读取 " -"postgresql 数据" - -msgid "" -"`#2614 `__ Clang tidy does " -"not work" -msgstr "" -"`#2614 `__ Clang tidy 不工" -"作" - msgid "pgRouting 3.6" msgstr "pgRouting 3.6" +#, fuzzy msgid "pgRouting 3.6.3 Release Notes" -msgstr "pgRouting 3.6.3 发布说明" +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 "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 `Git closed milestone for 3.6.3 " -"`__" +"要查看此版本关闭的所有问题和拉取请求，请参阅 `3.6.1Git 关闭里程碑 `_" + +msgid "Build" +msgstr "构建" msgid "Explicit minimum requirements:" -msgstr "最低要求：" +msgstr "" msgid "postgres 11.0.0" -msgstr "postgres 11.0.0" +msgstr "" +#, fuzzy msgid "postgis 3.0.0" -msgstr "postgis 3.0.0" +msgstr "版本3.0.0" msgid "g++ 13+ is supported" -msgstr "支持 g++ 13+" +msgstr "" msgid "Code fixes" -msgstr "代码修复" +msgstr "代码修正" msgid "Fix warnings from cpplint." -msgstr "修复来自 cpplint 的警告。" +msgstr "" msgid "Fix warnings from clang 18." -msgstr "修复来自 clang 18 的警告。" +msgstr "" +#, fuzzy msgid "CI tests" -msgstr "CI tests" +msgstr "pgtap 测试" msgid "Add a clang tidy test on changed files." -msgstr "为已更改的文件添加 clang tidy 测试。" +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 "" -"未对以下版本进行更新测试3.0.1, 3.0.2, 3.0.3, 3.0.4, 3.1.0, 3.1.1, 3.1.2" msgid "Documentation" msgstr "文档" msgid "Results of documentation queries adujsted to boost 1.83.0 version:" -msgstr "根据 boost 1.83.0 版本进行的文档查询结果：" +msgstr "" msgid "pgr_edgeDisjointPaths" msgstr "pgr_edgeDisjointPaths" @@ -16799,29 +16801,32 @@ msgstr "pgr_stoerWagner" msgid "pgtap tests" msgstr "pgtap 测试" +#, fuzzy msgid "bug fixes" -msgstr "bug fixes" +msgstr "Bug修复" +#, fuzzy msgid "pgRouting 3.6.2 Release Notes" -msgstr "pgRouting 3.6.2 发布说明" +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 "" -"要查看此版本关闭的所有问题和拉取请求，请参阅 `Git closed milestone for 3.6.2 " -"`__" +"要查看此版本关闭的所有问题和拉取请求，请参阅 `3.6.1Git 关闭里程碑 `_" msgid "Upgrade fix" -msgstr "升级修复" +msgstr "" msgid "The upgrade was failing for same minor" -msgstr "升级失败的主要原因是" +msgstr "" msgid "Fix warnings from cpplint" -msgstr "修复来自 cpplint 的警告" +msgstr "" msgid "Others" msgstr "其他" @@ -16870,6 +16875,16 @@ msgstr "" "`#2516 `__ 标准化输出" "pgr_aStar" +msgid "" +"``pgr_aStar`` (`One to One`) added ``start_vid`` and ``end_vid`` columns." +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`` 列。" + msgid "" "`#2523 `__ Standarize " "output pgr_bdAstar" @@ -16877,6 +16892,16 @@ msgstr "" "`#2523 `__ 标准化输出 " "pgr_bdAstar" +msgid "" +"``pgr_bdAstar`` (`One to One`) added ``start_vid`` and ``end_vid`` columns." +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`` 列。" + msgid "" "`#2547 `__ Standarize " "output and modifying signature pgr_KSP" @@ -16884,10 +16909,9 @@ msgstr "" "`#2547 `__ 标准化输出并修改" "签名 pgr_KSP" -#, fuzzy msgid "" "`#2548 `__ Standarize " -"output pgr_drivingDistance" +"output pgr_drivingdistance" msgstr "" "`#2548 `__ 标准化输出 " "pgr_drivingdistance" @@ -17016,7 +17040,7 @@ msgstr "问题修复" msgid "" "`#2565 `__ " -"pgr_lengauerTarjanDominatorTree triggers an assertion" +"pgr_pgr_lengauerTarjanDominatorTree triggers an assertion" msgstr "" "`#2565 `__ " "pgr_pgr_lengauerTarjanDominatorTree 触发了一个断言" @@ -17065,6 +17089,16 @@ msgstr "" msgid "Dijkstra" msgstr "Dijkstra" +msgid "" +"``pgr_dijkstra`` (`One to One`) added ``start_vid`` and ``end_vid`` columns." +msgstr "``pgr_dijkstra``（`一对一`）增加了``start_vid`` 和``end_vid`` 列。" + +msgid "``pgr_dijkstra`` (`One to Many`) added ``end_vid`` column." +msgstr "``pgr_dijkstra``（`一对多`）添加了 ``end_vid`` 列。" + +msgid "``pgr_dijkstra`` (`Many to One`) added ``start_vid`` column." +msgstr "``pgr_dijkstra`` （`多对一`）添加了 ``start_vid`` 列。" + msgid "pgRouting 3.4" msgstr "pgRouting 3.4" @@ -17140,15 +17174,14 @@ msgstr "" "`#1891 `__: pgr_ksp 没有" "给出所有正确的最短路径" -msgid "New proposed functions." -msgstr "新的拟议函数。" +msgid "New proposed functions" +msgstr "新的拟议函数" msgid "With points" msgstr "带点" -#, fuzzy -msgid "pgr_withPointsVia(One Via)" -msgstr "pgr_withPointsVia (One Via)" +msgid "``pgr_withPointsVia`` (One Via)" +msgstr "``pgr_withPointsVia`` (One Via)" msgid "Turn Restrictions" msgstr "转弯限制" @@ -17156,70 +17189,83 @@ msgstr "转弯限制" msgid "Via with turn restrictions" msgstr "有转弯限制的通道" -#, fuzzy -msgid "pgr_trspVia(One Via)" -msgstr "pgr_trspVia(One Via)" +msgid "``pgr_trspVia`` (One Via)" +msgstr "``pgr_trspVia`` (One Via)" + +msgid "``pgr_trspVia_withPoints`` (One Via)" +msgstr "pgr_trspVia_withPoints``（一次通过）" + +msgid "``pgr_trsp``" +msgstr "``pgr_trsp``" + +msgid "``pgr_trsp`` (One to One)" +msgstr "``pgr_trsp`` （一对一）" + +msgid "``pgr_trsp`` (One to Many)" +msgstr "``pgr_trsp`` （一对多）" + +msgid "``pgr_trsp`` (Many to One)" +msgstr "``pgr_trsp`` （多对一）" -msgid "pgr_trspVia_withPoints(One Via)" -msgstr "pgr_trspVia_withPoints（一次通过）" +msgid "``pgr_trsp`` (Many to Many)" +msgstr "``pgr_trsp`` （多对多）" + +msgid "``pgr_trsp`` (Combinations)" +msgstr "``pgr_trsp`` （组合）" + +msgid "``pgr_trsp_withPoints``" +msgstr "``pgr_trsp_withPoints``" -msgid "pgr_trsp_withPoints(One to One)" -msgstr "pgr_trsp_withPoints（一对一）" +msgid "``pgr_trsp_withPoints`` (One to One)" +msgstr "``pgr_trsp_withPoints`` （一对一）" -msgid "pgr_trsp_withPoints(One to Many)" -msgstr "pgr_trsp_withPoints（一对多）" +msgid "``pgr_trsp_withPoints`` (One to Many)" +msgstr "``pgr_trsp_withPoints`` （一对多）" -msgid "pgr_trsp_withPoints(Many to One)" -msgstr "pgr_trsp_withPoints（多对一）" +msgid "``pgr_trsp_withPoints`` (Many to One)" +msgstr "pgr_trsp_withPoints``（多对一）" -msgid "pgr_trsp_withPoints(Many to Many)" -msgstr "pgr_trsp_withPoints（多对多）" +msgid "``pgr_trsp_withPoints`` (Many to Many)" +msgstr "``pgr_trsp_withPoints`` （多对多）" -msgid "pgr_trsp_withPoints(Combinations)" -msgstr "pgr_trsp_withPoints（组合）" +msgid "``pgr_trsp_withPoints`` (Combinations)" +msgstr "``pgr_trsp_withPoints`` （组合）" msgid "Topology" msgstr "拓扑结构" -msgid "Utilities" -msgstr "实用程序" +msgid "``pgr_degree``" +msgstr "``pgr_degree``" -msgid "pgr_findCloseEdges(One point)" -msgstr "pgr_findCloseEdges（单点）" +msgid "``pgr_findCloseEdges`` (One point)" +msgstr "``pgr_findCloseEdges`` （单点）" -msgid "pgr_findCloseEdges(Many points)" -msgstr "pgr_findCloseEdges（多点）" +msgid "``pgr_findCloseEdges`` (Many points)" +msgstr "``pgr_findCloseEdges`` （多点）" msgid "Ordering" msgstr "排序" -msgid "pgr_cuthillMckeeOrdering" -msgstr "pgr_cuthillMckeeOrdering" - -msgid "Unclassified" -msgstr "未分类" - -msgid "pgr_hawickCircuits" -msgstr "pgr_hawickCircuits" +msgid "``pgr_cuthillMckeeOrdering``" +msgstr "``pgr_cuthillMckeeOrdering``" msgid "Flow functions" msgstr "流程函数" -msgid "pgr_maxCardinalityMatch(text)" -msgstr "pgr_maxCardinalityMatch(text)" +msgid "``pgr_maxCardinalityMatch(text)``" +msgstr "``pgr_maxCardinalityMatch(text)``" -#, fuzzy -msgid "Deprecating: pgr_maxCardinalityMatch(text,boolean)" +msgid "Deprecating ``pgr_maxCardinalityMatch(text,boolean)``" msgstr "弃用 ``pgr_maxCardinalityMatch(text,boolean)``" msgid "Deprecated Functions" msgstr "已废弃的函数" -msgid "pgr_trsp(text,integer,float8,integer,float8,boolean,boolean,text)" -msgstr "pgr_trsp(text,integer,float8,integer,float8,boolean,boolean,text)" +msgid "``pgr_trsp(text,integer,float8,integer,float8,boolean,boolean,text)``" +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)" +msgid "``pgr_trspViaEdges(text,integer[],float[],boolean,boolean,text)``" +msgstr "``pgr_trspViaEdges(text,integer[],float[],boolean,boolean,text)``" msgid "pgRouting 3.3" msgstr "pgRouting 3.3" @@ -17533,6 +17579,12 @@ msgstr "" msgid "Removing support for Boost v1.53, v1.54 & v1.55" msgstr "删除对 Boost v1.53、v1.54 和 v1.55 的支持" +msgid "pgr_bellmanFord(Combinations)" +msgstr "pgr_bellmanFord(组合)" + +msgid "pgr_binaryBreadthFirstSearch(Combinations)" +msgstr "pgr_binaryBreadthFirstSearch(组合)" + msgid "pgr_bipartite" msgstr "pgr_bipartite" @@ -17542,6 +17594,9 @@ msgstr "pgr_depthFirstSearch" msgid "Dijkstra Near" msgstr "Dijkstra Near" +msgid "pgr_edwardMoore(Combinations)" +msgstr "pgr_edwardMoore(组合)" + msgid "pgr_isPlanar" msgstr "pgr_isPlanar" @@ -17551,15 +17606,51 @@ msgstr "pgr_lengauerTarjanDominatorTree" msgid "pgr_makeConnected" msgstr "pgr_makeConnected" +msgid "pgr_maxFlowMinCost(Combinations)" +msgstr "pgr_maxFlowMinCost(组合)" + +msgid "pgr_maxFlowMinCost_Cost(Combinations)" +msgstr "pgr_maxFlowMinCost_Cost(组合)" + msgid "Astar" msgstr "Astar" +msgid "pgr_aStar(Combinations)" +msgstr "pgr_aStar(组合)" + +msgid "pgr_aStarCost(Combinations)" +msgstr "pgr_aStarCost(组合)" + msgid "Bidirectional Astar" msgstr "双向Astar" +msgid "pgr_bdAstar(Combinations)" +msgstr "pgr_bdAstar(组合)" + +msgid "pgr_bdAstarCost(Combinations)" +msgstr "pgr_bdAstarCost(组合)" + msgid "Bidirectional Dijkstra" msgstr "双向 Dijkstra" +msgid "pgr_bdDijkstra(Combinations)" +msgstr "pgr_bdDijkstra(组合)" + +msgid "pgr_bdDijkstraCost(Combinations)" +msgstr "pgr_bdDijkstraCost(组合)" + +msgid "pgr_boykovKolmogorov(Combinations)" +msgstr "pgr_boykovKolmogorov (组合)" + +msgid "pgr_edmondsKarp(Combinations)" +msgstr "pgr_edmondsKarp(组合)" + +msgid "pgr_maxFlow(Combinations)" +msgstr "pgr_maxFlow(组合)" + +msgid "pgr_pushRelabel(Combinations)" +msgstr "pgr_pushRelabel(组合)" + msgid "pgRouting 3.1" msgstr "pgRouting 3.1" @@ -17867,7 +17958,7 @@ msgid "" msgstr "" "`#1006 `__：无信息丢失" -msgid "New Functions" +msgid "New functions" msgstr "新函数" msgid "Kruskal family" @@ -17906,119 +17997,148 @@ msgstr "pgRouting 中的拟议已升级为正式版本" msgid "aStar Family" msgstr "aStar族" -#, fuzzy -msgid "pgr_aStarCost(One to One)" +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_aStarCost(one to one)" msgstr "pgr_aStarCost(一对一)" -#, fuzzy -msgid "pgr_aStarCost(One to Many)" +msgid "pgr_aStarCost(one to many)" msgstr "pgr_aStarCost(一对多)" -#, fuzzy -msgid "pgr_aStarCost(Many to One)" +msgid "pgr_aStarCost(many to one)" msgstr "pgr_aStarCost(多对一)" -#, fuzzy -msgid "pgr_aStarCost(Many to Many)" +msgid "pgr_aStarCost(many to many)" msgstr "pgr_aStarCost（多对多）" -#, fuzzy -msgid "pgr_aStarCostMatrix" -msgstr "pgr_astarCostMatrix" +msgid "pgr_aStarCostMatrix(one to one)" +msgstr "pgr_aStarCostMatrix(一对一)" + +msgid "pgr_aStarCostMatrix(one to many)" +msgstr "pgr_aStarCostMatrix (一对多)" + +msgid "pgr_aStarCostMatrix(many to one)" +msgstr "pgr_aStarCostMatrix (多对一)" + +msgid "pgr_aStarCostMatrix(many to many)" +msgstr "pgr_aStarCostMatrix（多对多）" msgid "bdAstar Family" msgstr "bdAstar 族" -#, fuzzy -msgid "pgr_bdAstarCost(One to One)" +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_bdAstarCost(one to one)" msgstr "pgr_bdAstarCost(一对一)" -#, fuzzy -msgid "pgr_bdAstarCost(One to Many)" +msgid "pgr_bdAstarCost(one to many)" msgstr "pgr_bdAstarCost(一对多)" -#, fuzzy -msgid "pgr_bdAstarCost(Many to One)" +msgid "pgr_bdAstarCost(many to one)" msgstr "pgr_bdAstarCost （多对一）" -#, fuzzy -msgid "pgr_bdAstarCost(Many to Many)" +msgid "pgr_bdAstarCost(many to many)" msgstr "pgr_bdAstarCost (多对多)" -msgid "pgr_bdAstarCostMatrix" -msgstr "pgr_bdAstarCostMatrix" +msgid "pgr_bdAstarCostMatrix(one to one)" +msgstr "pgr_bdAstarCostMatrix(一对一)" + +msgid "pgr_bdAstarCostMatrix(one to many)" +msgstr "pgr_bdAstarCostMatrix(一对多)" + +msgid "pgr_bdAstarCostMatrix(many to one)" +msgstr "pgr_bdAstarCostMatrix （多对一）" + +msgid "pgr_bdAstarCostMatrix(many to many)" +msgstr "pgr_bdAstarCostMatrix （多对多）" msgid "bdDijkstra Family" msgstr "bdDijkstra族" -#, fuzzy -msgid "pgr_bdDijkstraCost(One to One)" +msgid "pgr_bdDijkstra(one to many)" +msgstr "pgr_bdDijkstra（一对多）" + +msgid "pgr_bdDijkstra(many to one)" +msgstr "pgr_bdDijkstra（多对一）" + +msgid "pgr_bdDijkstra(many to many)" +msgstr "pgr_bdDijkstra（多对多）" + +msgid "pgr_bdDijkstraCost(one to one)" msgstr "pgr_bdDijkstraCost (一对一)" -#, fuzzy -msgid "pgr_bdDijkstraCost(One to Many)" +msgid "pgr_bdDijkstraCost(one to many)" msgstr "pgr_bdDijkstraCost(一对多)" -#, fuzzy -msgid "pgr_bdDijkstraCost(Many to One)" +msgid "pgr_bdDijkstraCost(many to one)" msgstr "pgr_bdDijkstraCost (多对一)" -#, fuzzy -msgid "pgr_bdDijkstraCost(Many to Many)" +msgid "pgr_bdDijkstraCost(many to many)" msgstr "pgr_bdDijkstraCost（多对多）" -msgid "pgr_bdDijkstraCostMatrix" -msgstr "pgr_bdDijkstraCostMatrix" +msgid "pgr_bdDijkstraCostMatrix(one to one)" +msgstr "pgr_bdDijkstraCostMatrix(一对一)" + +msgid "pgr_bdDijkstraCostMatrix(one to many)" +msgstr "pgr_bdDijkstraCostMatrix(一对多)" + +msgid "pgr_bdDijkstraCostMatrix(many to one)" +msgstr "pgr_bdDijkstraCostMatrix (多对一)" + +msgid "pgr_bdDijkstraCostMatrix(many to many)" +msgstr "pgr_bdDijkstraCostMatrix（多对多）" msgid "Flow Family" msgstr "Flow族" -#, fuzzy -msgid "pgr_pushRelabel(One to One)" +msgid "pgr_pushRelabel(one to one)" msgstr "pgr_pushRelabel(一对一)" -#, fuzzy -msgid "pgr_pushRelabel(One to Many)" +msgid "pgr_pushRelabel(one to many)" msgstr "pgr_pushRelabel(一对多)" -#, fuzzy -msgid "pgr_pushRelabel(Many to One)" +msgid "pgr_pushRelabel(many to one)" msgstr "pgr_pushRelabel(多对一)" -#, fuzzy -msgid "pgr_pushRelabel(Many to Many)" +msgid "pgr_pushRelabel(many to many)" msgstr "pgr_pushRelabel(多对多)" -#, fuzzy -msgid "pgr_edmondsKarp(One to One)" +msgid "pgr_edmondsKarp(one to one)" msgstr "pgr_edmondsKarp（一对一）" -#, fuzzy -msgid "pgr_edmondsKarp(One to Many)" +msgid "pgr_edmondsKarp(one to many)" msgstr "pgr_edmondsKarp（一对多）" -#, fuzzy -msgid "pgr_edmondsKarp(Many to One)" +msgid "pgr_edmondsKarp(many to one)" msgstr "pgr_edmondsKarp（多对一）" -#, fuzzy -msgid "pgr_edmondsKarp(Many to Many)" +msgid "pgr_edmondsKarp(many to many)" msgstr "pgr_edmondsKarp（多对多）" -#, fuzzy -msgid "pgr_boykovKolmogorov (One to One)" +msgid "pgr_boykovKolmogorov (one to one)" msgstr "pgr_boykovKolmogorov (一对一)" -#, fuzzy -msgid "pgr_boykovKolmogorov (One to Many)" +msgid "pgr_boykovKolmogorov (one to many)" msgstr "pgr_boykovKolmogorov (一对多)" -#, fuzzy -msgid "pgr_boykovKolmogorov (Many to One)" +msgid "pgr_boykovKolmogorov (many to one)" msgstr "pgr_boykovKolmogorov (多对一)" -#, fuzzy -msgid "pgr_boykovKolmogorov (Many to Many)" +msgid "pgr_boykovKolmogorov (many to many)" msgstr "pgr_boykovKolmogorov (多对多)" msgid "pgr_maxCardinalityMatching" @@ -18027,28 +18147,21 @@ msgstr "pgr_maxCardinalityMatching" msgid "pgr_maxFlow" msgstr "pgr_maxFlow" -#, fuzzy -msgid "pgr_edgeDisjointPaths(One to One)" +msgid "pgr_edgeDisjointPaths(one to one)" msgstr "pgr_edgeDisjointPaths (一对一)" -#, fuzzy -msgid "pgr_edgeDisjointPaths(One to Many)" +msgid "pgr_edgeDisjointPaths(one to many)" msgstr "pgr_edgeDisjointPaths （一对多）" -#, fuzzy -msgid "pgr_edgeDisjointPaths(Many to One)" +msgid "pgr_edgeDisjointPaths(many to one)" msgstr "pgr_edgeDisjointPaths (多对一)" -#, fuzzy -msgid "pgr_edgeDisjointPaths(Many to Many)" +msgid "pgr_edgeDisjointPaths(many to many)" msgstr "pgr_edgeDisjointPaths （多对多）" msgid "Components family" msgstr "分量族" -msgid "pgr_connectedComponents" -msgstr "pgr_connectedComponents" - msgid "pgr_strongComponents" msgstr "pgr_strongComponents" @@ -18164,7 +18277,7 @@ msgid "pgRouting 2" msgstr "pgRouting 2" msgid "Minors 2.x" -msgstr "Minors 2.x" +msgstr "2.x小版本" msgid "pgRouting 2.6" msgstr "pgRouting 2.6" @@ -18256,8 +18369,8 @@ msgstr "pgr_floydWarshall" msgid "pgr_johnson" msgstr "pgr_johnson" -msgid "pgr_aStar" -msgstr "pgr_aStar" +msgid "pgr_astar" +msgstr "pgr_astar" msgid "pgr_bdAstar" msgstr "pgr_bdAstar" @@ -18277,9 +18390,6 @@ msgstr "pgr_dijkstraCost" msgid "pgr_drivingDistance" msgstr "pgr_drivingDistance" -msgid "pgr_KSP" -msgstr "pgr_KSP" - msgid "pgr_dijkstraVia (proposed)" msgstr "pgr_dijkstraVia (拟议)" @@ -18469,7 +18579,7 @@ msgstr "" "utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.1%22%20>`_。" msgid "Fixed prerequisite minimum version of: cmake" -msgstr "修复 cmake 的最低版本要求" +msgstr "修正了 cmake 的最低版本要求" msgid "pgRouting 2.5.0 Release Notes" msgstr "pgRouting 2.5.0 发布说明" @@ -18501,17 +18611,24 @@ msgstr "在结果中添加了 path_id、cost 和 agg_cost 列" msgid "Parameter names changed" msgstr "更改参数名称" -#, fuzzy -msgid "The many version results are the union of the One to One version" +msgid "The many version results are the union of the one to one version" msgstr "多版本结果是一对一版本的并集" msgid "New Signatures" msgstr "新签名" -#, fuzzy -msgid "pgr_bdAstar(One to One)" +msgid "pgr_bdAstar(one to one)" msgstr "pgr_bdAstar（一对一）" +msgid "New Proposed functions" +msgstr "新的拟议函数" + +msgid "pgr_bdAstarCostMatrix" +msgstr "pgr_bdAstarCostMatrix" + +msgid "pgr_bdDijkstraCostMatrix" +msgstr "pgr_bdDijkstraCostMatrix" + msgid "pgr_lineGraph" msgstr "pgr_lineGraph" @@ -18580,7 +18697,7 @@ msgstr "" "utf8=%E2%9C%93&q=milestone%3A%22Release%202.4.1%22%20>`_。" msgid "Fixed compiling error on macOS" -msgstr "修复 macOS 上的编译错误" +msgstr "修正了 macOS 上的编译错误" msgid "Condition error on pgr_withPoints" msgstr "pgr_withPoints 上的条件错误" @@ -18600,8 +18717,32 @@ msgstr "" msgid "pgr_bdDijkstra" msgstr "pgr_bdDijkstra" -msgid "Deprecated signatures." -msgstr "弃用签名。" +msgid "New Proposed Signatures" +msgstr "新的拟议签名" + +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_astarCost(one to one)" +msgstr "pgr_astarCost(一对一)" + +msgid "pgr_astarCost(one to many)" +msgstr "pgr_astarCost(一对多)" + +msgid "pgr_astarCost(many to one)" +msgstr "pgr_astarCost(多对一)" + +msgid "pgr_astarCost(many to many)" +msgstr "pgr_astarCost（多对多）" + +msgid "pgr_astarCostMatrix" +msgstr "pgr_astarCostMatrix" msgid "pgr_bddijkstra - use pgr_bdDijkstra instead" msgstr "pgr_bddijkstra - 使用 pgr_bdDijkstra代替" @@ -18634,16 +18775,16 @@ msgstr "" "q=milestone%3A%22Release+2.3.2%22+is%3Aclosed>`_ 。" msgid "Fixed pgr_gsoc_vrppdtw crash when all orders fit on one truck." -msgstr "修复当所有订单都装在一辆卡车上时 pgr_gsoc_vrppdtw 崩溃的问题。" +msgstr "修正了当所有订单都装在一辆卡车上时 pgr_gsoc_vrppdtw 崩溃的问题。" msgid "Fixed pgr_trsp:" -msgstr "修复 pgr_trsp：" +msgstr "修正了 pgr_trsp：" msgid "Alternate code is not executed when the point is in reality a vertex" msgstr "当实际上的点是一个顶点时，替代代码不会被执行" msgid "Fixed ambiguity on seq" -msgstr "修复 seq 上的歧义" +msgstr "修正了 seq 上的歧义" msgid "pgRouting 2.3.1 Release Notes" msgstr "pgRouting 2.3.1 发布说明" @@ -18681,55 +18822,52 @@ msgstr "" msgid "pgr_TSP" msgstr "pgr_TSP" +msgid "pgr_aStar" +msgstr "pgr_aStar" + +msgid "New Functions" +msgstr "新函数" + msgid "pgr_eucledianTSP" msgstr "pgr_eucledianTSP" -#, fuzzy -msgid "pgr_maxFlowPushRelabel(One to One)" +msgid "pgr_withPointsCostMatrix" +msgstr "pgr_withPointsCostMatrix" + +msgid "pgr_maxFlowPushRelabel(one to one)" msgstr "pgr_maxFlowPushRelabel(一对一)" -#, fuzzy -msgid "pgr_maxFlowPushRelabel(One to Many)" +msgid "pgr_maxFlowPushRelabel(one to many)" msgstr "pgr_maxFlowPushRelabel(一对多)" -#, fuzzy -msgid "pgr_maxFlowPushRelabel(Many to One)" +msgid "pgr_maxFlowPushRelabel(many to one)" msgstr "pgr_maxFlowPushRelabel(多对一)" -#, fuzzy -msgid "pgr_maxFlowPushRelabel(Many to Many)" +msgid "pgr_maxFlowPushRelabel(many to many)" msgstr "pgr_maxFlowPushRelabel(多对多)" -#, fuzzy -msgid "pgr_maxFlowEdmondsKarp(One to One)" +msgid "pgr_maxFlowEdmondsKarp(one to one)" msgstr "pgr_maxFlowEdmondsKarp（一对一）" -#, fuzzy -msgid "pgr_maxFlowEdmondsKarp(One to Many)" +msgid "pgr_maxFlowEdmondsKarp(one to many)" msgstr "pgr_maxFlowEdmondsKarp（一对多）" -#, fuzzy -msgid "pgr_maxFlowEdmondsKarp(Many to One)" +msgid "pgr_maxFlowEdmondsKarp(many to one)" msgstr "pgr_maxFlowEdmondsKarp（多对一）" -#, fuzzy -msgid "pgr_maxFlowEdmondsKarp(Many to Many)" +msgid "pgr_maxFlowEdmondsKarp(many to many)" msgstr "pgr_maxFlowEdmondsKarp（多对多）" -#, fuzzy -msgid "pgr_maxFlowBoykovKolmogorov (One to One)" +msgid "pgr_maxFlowBoykovKolmogorov (one to one)" msgstr "pgr_maxFlowBoykovKolmogorov （一对一）" -#, fuzzy -msgid "pgr_maxFlowBoykovKolmogorov (One to Many)" +msgid "pgr_maxFlowBoykovKolmogorov (one to many)" msgstr "pgr_maxFlowBoykovKolmogorov （一对多）" -#, fuzzy -msgid "pgr_maxFlowBoykovKolmogorov (Many to One)" +msgid "pgr_maxFlowBoykovKolmogorov (many to one)" msgstr "pgr_maxFlowBoykovKolmogorov （多对一）" -#, fuzzy -msgid "pgr_maxFlowBoykovKolmogorov (Many to Many)" +msgid "pgr_maxFlowBoykovKolmogorov (many to many)" msgstr "pgr_maxFlowBoykovKolmogorov （多对多）" msgid "pgr_maximumCardinalityMatching" @@ -18741,8 +18879,7 @@ msgstr "pgr_contractGraph" msgid "pgr_tsp - use pgr_TSP or pgr_eucledianTSP instead" msgstr "pgr_tsp - 使用 pgr_TSP 或 pgr_eucledianTSP 代替" -#, fuzzy -msgid "pgr_aStar - use pgr_aStar instead" +msgid "pgr_astar - use pgr_aStar instead" msgstr "pgr_astar - 使用 pgr_aStar 代替" msgid "pgr_flip_edges" @@ -18809,7 +18946,7 @@ msgstr "" "q=milestone%3A%22Release+2.2.2%22+is%3Aclosed>`_ 。" msgid "Fixed regression error on pgr_drivingDistance" -msgstr "修复 pgr_drivingDistance 的回归错误" +msgstr "修正了 pgr_drivingDistance 的回归错误" msgid "pgRouting 2.2.1 Release Notes" msgstr "pgRouting 2.2.1 发布说明" @@ -18843,9 +18980,6 @@ msgstr "" msgid "Improvements" msgstr "改进" -msgid "pgr_nodeNetwork" -msgstr "pgr_nodeNetwork" - msgid "Adding a row_where and outall optional parameters" msgstr "添加 row_where 和 outall 可选参数" @@ -18858,55 +18992,43 @@ msgstr "pgr_dijkstra -- 与文档中的内容相匹配" msgid "pgr_Johnson" msgstr "pgr_Johnson" -#, fuzzy -msgid "pgr_dijkstraCost(One to One)" +msgid "pgr_dijkstraCost(one to one)" msgstr "pgr_dijkstraCost(一对一)" -#, fuzzy -msgid "pgr_dijkstraCost(One to Many)" -msgstr "pgr_dijkstraNearCost(一对多)" +msgid "pgr_dijkstraCost(one to many)" +msgstr "pgr_dijkstraCost(一对多)" -#, fuzzy -msgid "pgr_dijkstraCost(Many to One)" -msgstr "pgr_dijkstraNearCost(多对一)" +msgid "pgr_dijkstraCost(many to one)" +msgstr "pgr_dijkstraCost（多对一）" -#, fuzzy -msgid "pgr_dijkstraCost(Many to Many)" -msgstr "pgr_dijkstraNearCost (多对多)" +msgid "pgr_dijkstraCost(many to many)" +msgstr "pgr_dijkstraCost（多对多）" msgid "Proposed Functionality" msgstr "建议的功能" -#, fuzzy -msgid "pgr_withPoints(One to One)" -msgstr "pgr_withPointsKSP(一对一)" +msgid "pgr_withPoints(one to one)" +msgstr "pgr_withPoints(一对一)" -#, fuzzy -msgid "pgr_withPoints(One to Many)" -msgstr "pgr_withPointsKSP (一对多)" +msgid "pgr_withPoints(one to many)" +msgstr "pgr_withPoints（一对多）" -#, fuzzy -msgid "pgr_withPoints(Many to One)" -msgstr "pgr_withPointsKSP(多对一)" +msgid "pgr_withPoints(many to one)" +msgstr "pgr_withPoints(多对一)" -#, fuzzy -msgid "pgr_withPoints(Many to Many)" -msgstr "pgr_withPointsKSP(多对多)" +msgid "pgr_withPoints(many to many)" +msgstr "pgr_withPoints(多对多)" -#, fuzzy -msgid "pgr_withPointsCost(One to One)" +msgid "pgr_withPointsCost(one to one)" msgstr "pgr_withPointsCost(一对一)" -#, fuzzy -msgid "pgr_withPointsCost(One to Many)" +msgid "pgr_withPointsCost(one to many)" msgstr "pgr_withPointsCost(一对多)" -#, fuzzy -msgid "pgr_withPointsCost(Many to One)" +msgid "pgr_withPointsCost(many to one)" msgstr "pgr_withPointsCost(多对一)" -#, fuzzy -msgid "pgr_withPointsCost(Many to Many)" +msgid "pgr_withPointsCost(many to many)" msgstr "pgr_withPointsCost(多对多)" msgid "pgr_withPointsDD(single vertex)" @@ -18915,6 +19037,9 @@ msgstr "pgr_withPointsDD （单顶点）" msgid "pgr_withPointsDD(multiple vertices)" msgstr "pgr_withPointsDD（多顶点）" +msgid "pgr_withPointsKSP" +msgstr "pgr_withPointsKSP" + msgid "pgr_dijkstraVia" msgstr "pgr_dijkstraVia" @@ -18951,13 +19076,27 @@ msgstr "" "github.com/pgRouting/pgrouting/issues?" "q=is%3Aissue+milestone%3A%22Release+2.1.0%22+is%3Aclosed>`_ 。" +msgid "pgr_dijkstra(one to many)" +msgstr "pgr_dijkstra（一对多）" + +msgid "pgr_dijkstra(many to one)" +msgstr "pgr_dijkstra（多对一）" + +msgid "pgr_dijkstra(many to many)" +msgstr "pgr_dijkstra（多对多）" + +msgid "pgr_drivingDistance(multiple vertices)" +msgstr "pgr_drivingDistance （多顶点）" + msgid "Refactored" msgstr "重构" -#, fuzzy -msgid "pgr_dijkstra(One to One)" +msgid "pgr_dijkstra(one to one)" msgstr "pgr_dijkstra（一对一）" +msgid "pgr_drivingDistance(single vertex)" +msgstr "pgr_drivingDistance （单顶点）" + msgid "" "pgr_alphaShape function now can generate better (multi)polygon with holes " "and alpha parameter." @@ -19633,14 +19772,15 @@ msgid "" "User mailing list: https://lists.osgeo.org/mailman/listinfo/pgrouting-users" msgstr "用户邮件列表：https://lists.osgeo.org/mailman/listinfo/pgrouting-users" +#, fuzzy msgid "" "Developer mailing list: https://discourse.osgeo.org/c/pgrouting/pgrouting-" "dev/" -msgstr "" -"开发人员邮件列表： https://discourse.osgeo.org/c/pgrouting/pgrouting-dev/" +msgstr "开发者邮件列表：https://lists.osgeo.org/mailman/listinfo/pgrouting-dev" +#, fuzzy msgid "Subscribe: https://discourse.osgeo.org/g/pgrouting-dev" -msgstr "订阅：https://discourse.osgeo.org/g/pgrouting-dev" +msgstr "开发者邮件列表：https://lists.osgeo.org/mailman/listinfo/pgrouting-dev" msgid "" "For general questions and topics about how to use pgRouting, please write to " @@ -19717,10 +19857,9 @@ msgstr "" "与表关联的属性有助于指示图是有向的还是无向的，边是否是有向图上的单向，并且根" "据最终应用程序的需要，需要创建合适的拓扑。" -#, fuzzy msgid "" -"pgRouting supplies some functions to create a routing topology and to " -"analyze the topology." +"pgRouting suplies some functions to create a routing topology and to analyze " +"the topology." msgstr "pgRouting 提供一些函数来创建路由拓扑并分析拓扑。" msgid "Additional functions to create a graph:" @@ -19729,8 +19868,9 @@ msgstr "创建图表的附加函数：" msgid "Additional functions to analyze a graph:" msgstr "用于分析图表的附加函数：" +#, fuzzy msgid "Transformation - Family of functions" -msgstr "转换 - 函数族" +msgstr "收缩 - 函数族" msgid "" "This family of functions is used for transforming a given input graph :math:" @@ -20137,7 +20277,6 @@ msgstr "pgr_withPointsKSP 是 **带有点** 的 pgr_ksp" msgid "pgr_withPointsDD is pgr_drivingDistance **with points**" msgstr "pgr_withPointsDD 是 **带有点** 的 pgr_drivenDistance" -msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" -msgstr "pgr_withPointsvia 是 pgr_dijkstraVia **with points** 的版本" - #, fuzzy +msgid "pgr_withPointsvia is pgr_dijkstraVia **with points**" +msgstr "pgr_withPointsvia 是 **带有点** 的" diff --git a/pgtap/topology/degree/edge_cases.pg b/pgtap/metrics/degree/edge_cases.pg similarity index 55% rename from pgtap/topology/degree/edge_cases.pg rename to pgtap/metrics/degree/edge_cases.pg index a762c248286..76a75312a85 100644 --- a/pgtap/topology/degree/edge_cases.pg +++ b/pgtap/metrics/degree/edge_cases.pg @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. BEGIN; UPDATE edges SET cost = sign(cost), reverse_cost = sign(reverse_cost); -SELECT CASE WHEN min_version('3.4.0') THEN plan(12) ELSE plan(1) END; +SELECT CASE WHEN min_version('3.8.0') THEN plan(23) WHEN min_version('3.4.0') THEN plan(16) ELSE plan(1) END; CREATE OR REPLACE FUNCTION edge_cases() @@ -59,11 +59,13 @@ BEGIN SELECT * FROM pgr_degree('edges','SELECT id, out_edges FROM vertices'); RETURN QUERY SELECT lives_ok('query_1', 'Good execution'); - RETURN QUERY SELECT throws_ok('query_2', 'P0001', 'Missing column', 'Incomlete data -> throws'); - RETURN QUERY SELECT throws_ok('query_3', 'P0001', 'Missing column', 'Incomlete data -> throws'); - RETURN QUERY SELECT throws_ok('query_4', 'P0001', 'Missing column', 'Incomlete data -> throws'); + RETURN QUERY SELECT column_missing('query_2', 'id'); + RETURN QUERY SELECT column_missing('query_3', 'in_edges'); + RETURN QUERY SELECT column_missing('query_4', 'id'); RETURN QUERY SELECT lives_ok('query_5', 'Missing column out_edges but usable'); RETURN QUERY SELECT lives_ok('query_5', 'Missing column in_edges but usable'); + RETURN QUERY SELECT wrong_relation($$SELECT * FROM pgr_degree('SELECT id FROM foo', 'SELECT * FROM vertices')$$, 'foo'); + RETURN QUERY SELECT wrong_relation($$SELECT * FROM pgr_degree('SELECT id FROM edges', 'SELECT * FROM bar')$$, 'bar'); PREPARE subedges AS SELECT id FROM edges WHERE id < 17; @@ -90,12 +92,55 @@ BEGIN SELECT * FROM pgr_degree('subedges','SELECT id, out_edges FROM vertices'); RETURN QUERY SELECT lives_ok('query_7', 'Good execution'); - RETURN QUERY SELECT throws_ok('query_8', 'P0001', 'Missing column', 'Incomlete data -> throws'); - RETURN QUERY SELECT throws_ok('query_9', 'P0001', 'Missing column', 'Incomlete data -> throws'); - RETURN QUERY SELECT throws_ok('query_10', 'P0001', 'Missing column', 'Incomlete data -> throws'); + RETURN QUERY SELECT column_missing('query_8', 'id'); + RETURN QUERY SELECT column_missing('query_9', 'in_edges'); + RETURN QUERY SELECT column_missing('query_10', 'id'); RETURN QUERY SELECT lives_ok('query_11', 'Missing column out_edges but usable'); RETURN QUERY SELECT lives_ok('query_12', 'Missing column in_edges but usable'); + PREPARE empty_vertices AS + SELECT * FROM pgr_degree('SELECT id FROM edges', 'SELECT * FROM vertices WHERE id > 20'); + RETURN QUERY SELECT is_empty('empty_vertices', 'Empty vertices give empty result'); + + PREPARE empty_graph AS + SELECT * FROM pgr_degree('SELECT id FROM edges WHERE id > 20', 'SELECT * FROM vertices') ORDER BY node; + + IF min_version('3.8.0') THEN + RETURN QUERY + SELECT is_empty('empty_graph', 'is empty: Empty edges give 0 count on all vertices so none is in result'); + ELSE + RETURN QUERY + SELECT results_eq('empty_graph', 'SELECT generate_series (1,17)::BIGINT, 0::BIGINT', 'Empty edges give 0 count'); + END IF; + + IF NOT min_version('3.8.0') THEN RETURN; END IF; + + -- TESTS FOR edges_sql only + + PREPARE edges_1 AS + SELECT id, source, target FROM edges; + + PREPARE subedges_1 AS + SELECT id, source, target FROM edges WHERE id < 17; + + RETURN QUERY + SELECT set_eq($$SELECT * FROM pgr_degree('edges_1')$$, 'query_1', + 'degree(edges) = degree(edges,vertices)'); + + RETURN QUERY + SELECT set_eq($$SELECT * FROM pgr_degree('subedges_1')$$, 'query_7', + 'degree(subedges) = degree(subedges,vertices)'); + + RETURN QUERY SELECT lives_ok($$SELECT * FROM pgr_degree('SELECT id, source, target FROM edges')$$, 'good execution'); + RETURN QUERY SELECT throws_ok($$SELECT * FROM pgr_degree('SELECT source, target FROM edges')$$, + '42703','column "id" does not exist'); + RETURN QUERY SELECT throws_ok($$SELECT * FROM pgr_degree('SELECT id, target FROM edges')$$, + '42703','column "source" does not exist'); + RETURN QUERY SELECT throws_ok($$SELECT * FROM pgr_degree('SELECT id, source FROM edges')$$, + '42703','column "target" does not exist'); + RETURN QUERY SELECT wrong_relation($$SELECT * FROM pgr_degree('SELECT id FROM foo')$$, 'foo'); + + END; $BODY$ LANGUAGE plpgsql; diff --git a/pgtap/topology/degree/inner_query.pg b/pgtap/metrics/degree/inner_query.pg similarity index 100% rename from pgtap/topology/degree/inner_query.pg rename to pgtap/metrics/degree/inner_query.pg diff --git a/pgtap/topology/degree/no_crash_test.pg b/pgtap/metrics/degree/no_crash_test.pg similarity index 100% rename from pgtap/topology/degree/no_crash_test.pg rename to pgtap/metrics/degree/no_crash_test.pg diff --git a/pgtap/topology/degree/types_check.pg b/pgtap/metrics/degree/types_check.pg similarity index 56% rename from pgtap/topology/degree/types_check.pg rename to pgtap/metrics/degree/types_check.pg index cd4ad3287b5..7c242e33053 100644 --- a/pgtap/topology/degree/types_check.pg +++ b/pgtap/metrics/degree/types_check.pg @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ BEGIN; -SELECT CASE WHEN min_version('3.4.0') THEN plan(5) ELSE plan(1) END; +SELECT CASE WHEN min_version('3.8.0') THEN plan(7) WHEN min_version('3.4.0') THEN plan(5) ELSE plan(1) END; CREATE OR REPLACE FUNCTION types_check() RETURNS SETOF TEXT AS $BODY$ @@ -33,13 +33,37 @@ BEGIN RETURN QUERY SELECT has_function('pgr_degree', ARRAY['text', 'text', 'boolean']); RETURN QUERY SELECT function_returns('pgr_degree', ARRAY['text', 'text', 'boolean'], 'setof record'); - RETURN QUERY SELECT set_eq( - $$SELECT proargnames from pg_proc where proname = 'pgr_degree'$$, - $$SELECT '{"","","dryrun","node","degree"}'::TEXT[] $$); + RETURN QUERY + SELECT CASE + WHEN min_version('3.8.0') THEN + collect_tap( - RETURN QUERY SELECT set_eq( - $$SELECT proallargtypes from pg_proc where proname = 'pgr_degree'$$, - $$VALUES ('{25,25,16,20,20}'::OID[])$$); + has_function('pgr_degree', ARRAY['text', 'boolean']), + + function_returns('pgr_degree', ARRAY['text', 'boolean'], 'setof record'), + + set_eq($$SELECT proargnames from pg_proc where proname = 'pgr_degree'$$, + $$VALUES + ('{"","dryrun","node","degree"}'::TEXT[]), + ('{"","","dryrun","node","degree"}'::TEXT[]) + $$, 'proargnames'), + + set_eq($$SELECT proallargtypes from pg_proc where proname = 'pgr_degree'$$, + $$VALUES + ('{25,16,20,20}'::OID[]), + ('{25,25,16,20,20}'::OID[]) + $$, 'proallargtypes') + ) + ELSE + collect_tap( + + set_eq($$SELECT proargnames from pg_proc where proname = 'pgr_degree'$$, + $$VALUES ('{"","","dryrun","node","degree"}'::TEXT[]) $$, 'proargnames'), + + set_eq($$SELECT proallargtypes from pg_proc where proname = 'pgr_degree'$$, + $$VALUES ('{25,25,16,20,20}'::OID[])$$, 'proallargtypes') + ) + END; END $BODY$ diff --git a/pgtap/topology/extractVertices/edge_cases.pg b/pgtap/topology/extractVertices/edge_cases.pg index 430727e708d..4e3756f7f3c 100644 --- a/pgtap/topology/extractVertices/edge_cases.pg +++ b/pgtap/topology/extractVertices/edge_cases.pg @@ -25,103 +25,43 @@ SELECT plan(30); UPDATE edges SET cost = sign(cost) + 0.001 * id * id, reverse_cost = sign(reverse_cost) + 0.001 * id * id; -- -PREPARE query_1 AS -SELECT * FROM pgr_extractVertices( - 'SELECT source - FROM edges' -); - -PREPARE query_2 AS -SELECT * -FROM pgr_extractVertices( - 'SELECT target - FROM edges' -); - -SELECT throws_ok('query_1', 'P0001', 'Missing column', 'Incomlete data -> throws'); -SELECT throws_ok('query_2', 'P0001', 'Missing column', 'Incomlete data -> throws'); --- -PREPARE query_3 AS -SELECT * -FROM pgr_extractVertices( - 'SELECT ST_StartPoint(geom) AS startpoint - FROM edges' -); - -PREPARE query_4 AS -SELECT * -FROM pgr_extractVertices( - 'SELECT ST_EndPoint(geom) AS endpoint - FROM edges' -); - -SELECT throws_ok('query_3', 'P0001', 'Missing column', 'Incomlete data -> throws'); -SELECT throws_ok('query_4', 'P0001', 'Missing column', 'Incomlete data -> throws'); +PREPARE test_1(TEXT) AS +SELECT * FROM pgr_extractVertices('SELECT ' || $1 || ' FROM edges'); + +SELECT column_missing($$test_1('source')$$, 'target'); +SELECT column_missing($$test_1('target')$$, 'source'); -- -PREPARE query_5 AS -SELECT * FROM pgr_extractVertices( - 'SELECT source, geom - FROM edges' -); +SELECT column_missing($$"test_1"('ST_StartPoint(geom) AS startpoint')$$, 'endpoint'); +SELECT column_missing($$"test_1"('ST_EndPoint(geom) AS endpoint')$$, 'startpoint'); -PREPARE query_6 AS -SELECT * -FROM pgr_extractVertices( - 'SELECT target, geom - FROM edges' -); +-- -SELECT lives_ok('query_5', 'geom column makes data complete'); -SELECT lives_ok('query_6', 'geom column makes data complete'); +SELECT lives_ok($$"test_1"('source, geom')$$, 'geom column makes data complete'); +SELECT lives_ok($$"test_1"('target, geom')$$, 'geom column makes data complete'); -- -PREPARE query_7 AS -SELECT * -FROM pgr_extractVertices( - 'SELECT ST_StartPoint(geom) AS startpoint, geom - FROM edges' -); - -PREPARE query_8 AS -SELECT * -FROM pgr_extractVertices( - 'SELECT ST_EndPoint(geom) AS endpoint, geom - FROM edges' -); - -SELECT lives_ok('query_7', 'geom column makes data complete'); -SELECT lives_ok('query_8', 'geom column makes data complete'); --- +SELECT lives_ok($$"test_1"('ST_StartPoint(geom) AS startpoint, geom')$$, 'geom column makes data complete'); +SELECT lives_ok($$"test_1"('ST_EndPoint(geom) AS endpoint, geom')$$, 'geom column makes data complete'); -SELECT set_eq( - $$SELECT count(*) FROM pgr_extractVertices( 'SELECT geom FROM edges')$$, - $$VALUES (17)$$, - '17: Number of vertices extracted'); -SELECT set_eq( - $$SELECT count(*) FROM pgr_extractVertices( 'SELECT ST_StartPoint(geom) AS startpoint, ST_EndPoint(geom) AS endpoint FROM edges')$$, - $$VALUES (17)$$, - '17: Number of vertices extracted'); -SELECT set_eq( - $$SELECT count(*) FROM pgr_extractVertices( 'SELECT source, target FROM edges')$$, - $$VALUES (17)$$, - '17: Number of vertices extracted'); +-- -SELECT set_eq( - $$SELECT count(*) FROM pgr_extractVertices( 'SELECT id, geom FROM edges')$$, - $$VALUES (17)$$, - '17: Number of vertices extracted'); -SELECT set_eq( - $$SELECT count(*) FROM pgr_extractVertices( 'SELECT id, ST_StartPoint(geom) AS startpoint, ST_EndPoint(geom) AS endpoint FROM edges')$$, - $$VALUES (17)$$, - '17: Number of vertices extracted'); -SELECT set_eq( - $$SELECT count(*) FROM pgr_extractVertices( 'SELECT id, source, target FROM edges')$$, - $$VALUES (17)$$, - '17: Number of vertices extracted'); +SELECT is((SELECT count(*) FROM pgr_extractVertices('SELECT geom FROM edges')), + 17::BIGINT, '17 vertices with geom'); +SELECT is((SELECT count(*) FROM pgr_extractVertices('SELECT ST_StartPoint(geom) AS startpoint, ST_EndPoint(geom) AS endpoint FROM edges')), + 17::BIGINT, '17 vertices with points'); +SELECT is((SELECT count(*) FROM pgr_extractVertices('SELECT source, target FROM edges')), + 17::BIGINT, '17 vertices with source, target'); + +SELECT is((SELECT count(*) FROM pgr_extractVertices('SELECT id, geom FROM edges')), + 17::BIGINT, '17 vertices with id, geom'); +SELECT is((SELECT count(*) FROM pgr_extractVertices('SELECT id, ST_StartPoint(geom) AS startpoint, ST_EndPoint(geom) AS endpoint FROM edges')), + 17::BIGINT, '17 vertices with id, points'); +SELECT is((SELECT count(*) FROM pgr_extractVertices('SELECT id, source, target FROM edges')), + 17::BIGINT, '17 vertices with id, source, target'); -- SELECT set_eq( diff --git a/pgtap/trsp/trsp/edge_cases/compare_dijkstra.pg b/pgtap/trsp/trsp/edge_cases/compare_dijkstra.pg index 08f0656cbf4..86acfa78cb6 100644 --- a/pgtap/trsp/trsp/edge_cases/compare_dijkstra.pg +++ b/pgtap/trsp/trsp/edge_cases/compare_dijkstra.pg @@ -21,7 +21,9 @@ BEGIN; SET extra_float_digits = -3; UPDATE edges SET cost = sign(cost) + 0.001 * id * id, reverse_cost = sign(reverse_cost) + 0.001 * id * id; -SELECT CASE WHEN min_version('3.4.0') THEN plan(1882) ELSE plan(6) END; +SELECT CASE WHEN min_lib_version('4.0.0') AND min_version('3.6.0') THEN plan(1882) + WHEN NOT min_lib_version('4.0.0') AND min_version('3.4.0') THEN plan(1882) + ELSE plan(6) END; PREPARE with_reverse_cost AS SELECT id, source, target, cost, reverse_cost from edges ORDER BY id; PREPARE no_reverse_cost AS SELECT id, source, target, cost from edges ORDER BY id; diff --git a/pgtap/trsp/trsp/edge_cases/compare_dijkstraVia.pg b/pgtap/trsp/trsp/edge_cases/compare_dijkstraVia.pg index 600e4a2a14a..7f60a76c592 100644 --- a/pgtap/trsp/trsp/edge_cases/compare_dijkstraVia.pg +++ b/pgtap/trsp/trsp/edge_cases/compare_dijkstraVia.pg @@ -21,7 +21,9 @@ BEGIN; SET extra_float_digits=-3; UPDATE edges SET cost = sign(cost) + 0.001 * id * id, reverse_cost = sign(reverse_cost) + 0.001 * id * id; -SELECT CASE WHEN min_version('3.4.0') THEN plan(6) ELSE plan(1) END; +SELECT CASE WHEN min_lib_version('4.0.0') AND min_version('3.6.0') THEN plan(6) + WHEN NOT min_lib_version('4.0.0') AND min_version('3.4.0') THEN plan(6) + ELSE plan(1) END; PREPARE related_restriction AS SELECT 100.2 AS cost, ARRAY[4,8] AS path; PREPARE unrelated_restriction AS SELECT 100 AS cost, ARRAY[33, 32, 25] AS path; @@ -32,7 +34,12 @@ $BODY$ BEGIN IF NOT min_version('3.4.0') THEN - RETURN QUERY SELECT skip(1, 'pgr_signature added on 3.4.0'); + RETURN QUERY SELECT skip(1, 'New signatures added on 3.4.0'); + RETURN; + END IF; + + IF min_lib_version('4.0.0') and NOT min_version('3.6.0') THEN + RETURN QUERY SELECT skip(1, 'Internal function __v4trsp deprecated on 3.6.0 deleted on 4.0.0'); RETURN; END IF; diff --git a/pgtap/trsp/trsp/edge_cases/directed_compare_dijkstraVia.pg b/pgtap/trsp/trsp/edge_cases/directed_compare_dijkstraVia.pg index cc073cb165c..5aae5d32d72 100644 --- a/pgtap/trsp/trsp/edge_cases/directed_compare_dijkstraVia.pg +++ b/pgtap/trsp/trsp/edge_cases/directed_compare_dijkstraVia.pg @@ -22,7 +22,9 @@ BEGIN; SET extra_float_digits = -3; UPDATE edges SET cost = sign(cost) + 0.001 * id * id, reverse_cost = sign(reverse_cost) + 0.001 * id * id; -SELECT CASE WHEN min_version('3.4.0') THEN plan(3) ELSE plan(1) END; +SELECT CASE WHEN min_lib_version('4.0.0') AND min_version('3.6.0') THEN plan(3) + WHEN NOT min_lib_version('4.0.0') AND min_version('3.4.0') THEN plan(3) + ELSE plan(1) END; PREPARE related_restriction AS SELECT 100.2 AS cost, ARRAY[5,9] AS path; PREPARE unrelated_restriction AS SELECT 100 AS cost, ARRAY[33, 32, 25] AS path; @@ -32,7 +34,12 @@ $BODY$ BEGIN IF NOT min_version('3.4.0') THEN - RETURN QUERY SELECT skip(1, 'pgr_signature added on 3.4.0'); + RETURN QUERY SELECT skip(1, 'New signatures added on 3.4.0'); + RETURN; + END IF; + + IF min_lib_version('4.0.0') and NOT min_version('3.6.0') THEN + RETURN QUERY SELECT skip(1, 'Internal function __v4trsp deprecated on 3.6.0 deleted on 4.0.0'); RETURN; END IF; diff --git a/pgtap/trsp/trsp/edge_cases/edge_cases.pg b/pgtap/trsp/trsp/edge_cases/edge_cases.pg index cfafb865146..59acae109b5 100644 --- a/pgtap/trsp/trsp/edge_cases/edge_cases.pg +++ b/pgtap/trsp/trsp/edge_cases/edge_cases.pg @@ -1,4 +1,3 @@ - /*PGR-GNU***************************************************************** Copyright (c) 2018 pgRouting developers @@ -21,8 +20,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. BEGIN; UPDATE edges SET cost = sign(cost), reverse_cost = sign(reverse_cost); -SELECT CASE WHEN min_version('3.4.0') THEN plan(5) ELSE plan(1) END; -SET client_min_messages TO ERROR; +SELECT CASE WHEN min_lib_version('4.0.0') AND min_version('3.6.0') THEN plan(5) + WHEN NOT min_lib_version('4.0.0') AND min_version('3.4.0') THEN plan(5) + ELSE plan(1) END; CREATE OR REPLACE FUNCTION edge_cases() RETURNS SETOF TEXT AS @@ -34,7 +34,12 @@ DECLARE BEGIN IF NOT min_version('3.4.0') THEN - RETURN QUERY SELECT skip(1, 'New function on 3.4'); + RETURN QUERY SELECT skip(1, 'New signatures added on 3.4.0'); + RETURN; + END IF; + + IF min_lib_version('4.0.0') and NOT min_version('3.6.0') THEN + RETURN QUERY SELECT skip(1, 'Internal function _v4trsp deprecated on 3.6.0 deleted on 4.0.0'); RETURN; END IF; diff --git a/pgtap/trsp/trsp/edge_cases/emptyset_from_i_to_i.pg b/pgtap/trsp/trsp/edge_cases/emptyset_from_i_to_i.pg index 017bdb4dbce..6ae7d79bc42 100644 --- a/pgtap/trsp/trsp/edge_cases/emptyset_from_i_to_i.pg +++ b/pgtap/trsp/trsp/edge_cases/emptyset_from_i_to_i.pg @@ -20,7 +20,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. BEGIN; UPDATE edges SET cost = sign(cost), reverse_cost = sign(reverse_cost); -SELECT CASE WHEN min_version('3.4.0') THEN plan(72) ELSE plan(2) END; +SELECT CASE WHEN min_lib_version('4.0.0') AND min_version('3.6.0') THEN plan(72) + WHEN NOT min_lib_version('4.0.0') AND min_version('3.4.0') THEN plan(72) + ELSE plan(2) END; PREPARE restriction AS SELECT * FROM restrictions; PREPARE with_reverse AS SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id; @@ -39,10 +41,16 @@ directed TEXT; msg TEXT; parameters TEXT; BEGIN - IF NOT min_version('3.4.0') THEN - RETURN QUERY SELECT skip(1, 'pgr_signature added on 3.4.0'); - RETURN; - END IF; + + IF NOT min_version('3.4.0') THEN + RETURN QUERY SELECT skip(1, 'New signatures added on 3.4.0'); + RETURN; + END IF; + + IF min_lib_version('4.0.0') and NOT min_version('3.6.0') THEN + RETURN QUERY SELECT skip(1, 'Internal function __v4trsp deprecated on 3.6.0 deleted on 4.0.0'); + RETURN; + END IF; directed = 'Undirected'; IF flag THEN directed = 'Directed'; END IF; diff --git a/pgtap/trsp/trsp/edge_cases/issue_244.pg b/pgtap/trsp/trsp/edge_cases/issue_244.pg index 11fb2c07d7f..fdcb7106a53 100644 --- a/pgtap/trsp/trsp/edge_cases/issue_244.pg +++ b/pgtap/trsp/trsp/edge_cases/issue_244.pg @@ -28,7 +28,12 @@ $BODY$ BEGIN IF NOT min_version('3.4.0') THEN - RETURN QUERY SELECT skip(1, 'pgr_signature added on 3.4.0'); + RETURN QUERY SELECT skip(1, 'New signatures added on 3.4.0'); + RETURN; + END IF; + + IF min_lib_version('4.0.0') and NOT min_version('3.6.0') THEN + RETURN QUERY SELECT skip(1, 'Internal function __v4trsp deprecated on 3.6.0 deleted on 4.0.0'); RETURN; END IF; diff --git a/pgtap/trsp/trsp/inner_query.pg b/pgtap/trsp/trsp/inner_query.pg index 1add728ef76..afb9661b4fa 100644 --- a/pgtap/trsp/trsp/inner_query.pg +++ b/pgtap/trsp/trsp/inner_query.pg @@ -1,4 +1,3 @@ - /*PGR-GNU***************************************************************** Copyright (c) 2018 pgRouting developers @@ -20,8 +19,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. BEGIN; UPDATE edges SET cost = sign(cost) + 0.001 * id * id, reverse_cost = sign(reverse_cost) + 0.001 * id * id; -SELECT CASE WHEN min_version('3.4.0') THEN plan(216) ELSE plan(1) END; - +SELECT CASE WHEN min_lib_version('4.0.0') AND min_version('3.6.0') THEN plan(216) + WHEN NOT min_lib_version('4.0.0') AND min_version('3.4.0') THEN plan(216) + ELSE plan(1) END; CREATE OR REPLACE FUNCTION inner_query() RETURNS SETOF TEXT AS @@ -33,7 +33,12 @@ DECLARE BEGIN IF NOT min_version('3.4.0') THEN - RETURN QUERY SELECT skip(1, 'pgr_signature added on 3.4.0'); + RETURN QUERY SELECT skip(1, 'New signatures added on 3.4.0'); + RETURN; + END IF; + + IF min_lib_version('4.0.0') and NOT min_version('3.6.0') THEN + RETURN QUERY SELECT skip(1, 'Internal function _v4trsp deprecated on 3.6.0 deleted on 4.0.0'); RETURN; END IF; diff --git a/pgtap/trsp/trsp/no_crash_test.pg b/pgtap/trsp/trsp/no_crash_test.pg index acd250d0cbe..15f0dd28c15 100644 --- a/pgtap/trsp/trsp/no_crash_test.pg +++ b/pgtap/trsp/trsp/no_crash_test.pg @@ -20,7 +20,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. BEGIN; UPDATE edges SET cost = sign(cost), reverse_cost = sign(reverse_cost); -SELECT CASE WHEN min_version('3.4.0') THEN plan(147) ELSE plan(1) END; +SELECT CASE WHEN min_lib_version('4.0.0') AND min_version('3.6.0') THEN plan(147) + WHEN NOT min_lib_version('4.0.0') AND min_version('3.4.0') THEN plan(147) + ELSE plan(1) END; + SET client_min_messages TO ERROR; PREPARE all_edges AS @@ -92,8 +95,14 @@ params TEXT[]; params1 TEXT[]; subs TEXT[]; BEGIN + IF NOT min_version('3.4.0') THEN - RETURN QUERY SELECT skip(1, 'New signatures on 3.4.0'); + RETURN QUERY SELECT skip(1, 'New signatures added on 3.4.0'); + RETURN; + END IF; + + IF min_lib_version('4.0.0') and NOT min_version('3.6.0') THEN + RETURN QUERY SELECT skip(1, 'Internal function _v4trsp deprecated on 3.6.0 deleted on 4.0.0'); RETURN; END IF; diff --git a/pgtap/utilities/findCloseEdges/edge_cases.pg b/pgtap/utilities/findCloseEdges/edge_cases.pg index 90c58046a2b..705f33b473a 100644 --- a/pgtap/utilities/findCloseEdges/edge_cases.pg +++ b/pgtap/utilities/findCloseEdges/edge_cases.pg @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. BEGIN; UPDATE edges SET cost = sign(cost), reverse_cost = sign(reverse_cost); -SELECT CASE WHEN min_version('3.4.0') THEN plan(12) ELSE plan(1) END; +SELECT CASE WHEN min_version('3.8.0') THEN plan(17) WHEN min_version('3.8.0') THEN plan(33) WHEN min_version('3.4.0') THEN plan(34) ELSE plan(1) END; SET client_min_messages TO 'WARNING'; @@ -58,11 +58,16 @@ BEGIN RETURN QUERY SELECT lives_ok('query_1', 'With defaults'); RETURN QUERY SELECT lives_ok('query_2', 'two rows'); RETURN QUERY SELECT lives_ok('query_3', 'dryrun'); - RETURN QUERY SELECT is_empty('query_3', 'dryrun'); + RETURN QUERY SELECT is_empty('query_3', 'dryrun results empty'); - RETURN QUERY SELECT throws_ok('err1', 'P0001', 'Missing column', 'Incomlete data -> throws'); - RETURN QUERY SELECT throws_ok('err2', 'P0001', 'Missing column', 'Incomlete data -> throws'); + RETURN QUERY SELECT column_missing('err1', 'geom'); + RETURN QUERY SELECT column_missing('err2', 'id'); + RETURN QUERY SELECT wrong_relation($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM foo', (SELECT geom FROM pointsOfInterest WHERE pid = 5), 0.5)$$, 'foo'); + RETURN QUERY SELECT throws_ok($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM edges', (SELECT geom FROM bar WHERE pid = 5), 0.5)$$, + '42P01', 'relation "bar" does not exist'); -- Many points PREPARE query_4 AS @@ -80,12 +85,95 @@ BEGIN RETURN QUERY SELECT lives_ok('query_4', 'With defaults'); RETURN QUERY SELECT lives_ok('query_5', 'two rows'); RETURN QUERY SELECT lives_ok('query_6', 'dryrun'); - RETURN QUERY SELECT is_empty('query_6', 'dryrun'); + RETURN QUERY SELECT is_empty('query_6', 'dryrun results empty'); - RETURN QUERY SELECT throws_ok('err3', 'P0001', 'Missing column', 'Incomlete data -> throws'); - RETURN QUERY SELECT throws_ok('err4', 'P0001', 'Missing column', 'Incomlete data -> throws'); + RETURN QUERY SELECT column_missing('err3', 'geom'); + RETURN QUERY SELECT column_missing('err4', 'id'); + RETURN QUERY SELECT wrong_relation($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM foo', (SELECT array_agg(geom) FROM pointsOfInterest), 0.5)$$, 'foo'); + RETURN QUERY SELECT throws_ok($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM edges', (SELECT array_agg(geom) FROM bar), 0.5)$$, + '42P01', 'relation "bar" does not exist'); + + IF min_version('4.0.0') THEN + RETURN QUERY SELECT skip(1, 'Signatures with partial flag is removed on 4.0.0'); + RETURN; + END IF; + + -- Test with partial flag + RETURN QUERY SELECT is_empty($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM edges', (SELECT geom FROM pointsOfInterest WHERE pid = 5), 0.5, 1, true, true)$$, 'One geom: partial,dryrun = true,true'); + RETURN QUERY SELECT isnt_empty($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM edges', (SELECT geom FROM pointsOfInterest WHERE pid = 5), 0.5, 1, true, false)$$, 'One geom: partial,dryrun = true,false'); + RETURN QUERY SELECT is_empty($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM edges', (SELECT geom FROM pointsOfInterest WHERE pid = 5), 0.5, 1, false, true)$$, 'One geom: partial,dryrun = false,true'); + RETURN QUERY SELECT isnt_empty($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM edges', (SELECT geom FROM pointsOfInterest WHERE pid = 5), 0.5, 1, false, false)$$, 'One geom: partial,dryrun = false,false'); + + RETURN QUERY SELECT is_empty($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM edges', (SELECT array_agg(geom) FROM pointsOfInterest), 0.5, 1, true, true)$$, 'Many geom: partial,dryrun = true,true'); + RETURN QUERY SELECT isnt_empty($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM edges', (SELECT array_agg(geom) FROM pointsOfInterest), 0.5, 1, true, false)$$, 'Many geom: partial,dryrun = true,false'); + RETURN QUERY SELECT is_empty($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM edges', (SELECT array_agg(geom) FROM pointsOfInterest), 0.5, 1, false, true)$$, 'Many geom: partial,dryrun = false,true'); + RETURN QUERY SELECT isnt_empty($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM edges', (SELECT array_agg(geom) FROM pointsOfInterest), 0.5, 1, false, false)$$, 'Many geom: partial,dryrun = false,false'); + + RETURN QUERY SELECT + CASE WHEN min_version('3.8.0') THEN + collect_tap( + throws_ok($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM edges', (SELECT geom FROM pointsOfInterest WHERE pid = 5), 0.5, 1, partial => true) WHERE distance IS NOT NULL$$, + '42883','function pgr_findcloseedges(unknown, geometry, numeric, integer, partial => boolean) does not exist', 'throws: One geom, with cap value, naming partial => true'), + throws_ok($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM edges', (SELECT geom FROM pointsOfInterest WHERE pid = 5), 0.5, partial => true) WHERE distance IS NOT NULL$$, + '42883','function pgr_findcloseedges(unknown, geometry, numeric, partial => boolean) does not exist', 'throws: One geom, without cap value naming partial => true'), + isnt_empty($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM edges', (SELECT geom FROM pointsOfInterest WHERE pid = 5), 0.5, 1, true, false) WHERE distance IS NOT NULL$$, 'partial, One geom: isnt_empty distance'), + isnt_empty($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM edges', (SELECT geom FROM pointsOfInterest WHERE pid = 5), 0.5, 1, true, false) WHERE geom IS NOT NULL$$, 'partial, One geom: isnt_empty geom'), + isnt_empty($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM edges', (SELECT geom FROM pointsOfInterest WHERE pid = 5), 0.5, 1, true, false) WHERE edge IS NOT NULL$$, 'partial, One geom: isnt_empty edge'), + + throws_ok($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM edges', (SELECT array_agg(geom) FROM pointsOfInterest), 0.5, 1, partial => true) WHERE distance IS NOT NULL$$, + '42883','function pgr_findcloseedges(unknown, geometry[], numeric, integer, partial => boolean) does not exist', 'throws: Many geom, with cap value, naming partial => true'), + throws_ok($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM edges', (SELECT array_agg(geom) FROM pointsOfInterest), 0.5, partial => true) WHERE distance IS NOT NULL$$, + '42883','function pgr_findcloseedges(unknown, geometry[], numeric, partial => boolean) does not exist', 'throws: Many geom, without cap value naming partial => true'), + isnt_empty($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM edges', (SELECT array_agg(geom) FROM pointsOfInterest), 0.5, 1, true, false) WHERE distance IS NOT NULL$$, 'partial, Many geom: isnt_empty distance'), + isnt_empty($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM edges', (SELECT array_agg(geom) FROM pointsOfInterest), 0.5, 1, true, false) WHERE edge IS NOT NULL$$, 'partial, Many geom: isnt_empty edge') + ) + + ELSE + collect_tap( + lives_ok($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM edges', (SELECT geom FROM pointsOfInterest WHERE pid = 5), 0.5, 1, partial => true) WHERE distance IS NOT NULL$$, 'One geom, with cap value, naming partial => true'), + lives_ok($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM edges', (SELECT geom FROM pointsOfInterest WHERE pid = 5), 0.5, partial => true) WHERE distance IS NOT NULL$$, 'One geom, without cap value, naming partial => true'), + is_empty($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM edges', (SELECT geom FROM pointsOfInterest WHERE pid = 5), 0.5, 1, true, false) WHERE distance IS NOT NULL$$, 'partial, One geom: is_empty distance'), + is_empty($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM edges', (SELECT geom FROM pointsOfInterest WHERE pid = 5), 0.5, 1, true, false) WHERE geom IS NOT NULL$$, 'partial, One geom: is_empty geom'), + is_empty($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM edges', (SELECT geom FROM pointsOfInterest WHERE pid = 5), 0.5, 1, true, false) WHERE edge IS NOT NULL$$, 'partial, One geom: is_empty edge'), + + lives_ok($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM edges', (SELECT array_agg(geom) FROM pointsOfInterest), 0.5, 1, partial => true) WHERE distance IS NOT NULL$$, 'Many geom, with cap value, naming partial => true'), + lives_ok($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM edges', (SELECT array_agg(geom) FROM pointsOfInterest), 0.5, partial => true) WHERE distance IS NOT NULL$$, 'Many geom, without cap value, naming partial => true'), + isnt_empty($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM edges', (SELECT array_agg(geom) FROM pointsOfInterest), 0.5, 1, true, false) WHERE distance IS NOT NULL$$, 'partial, Many geom: isnt_empty distance'), + isnt_empty($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM edges', (SELECT array_agg(geom) FROM pointsOfInterest), 0.5, 1, true, false) WHERE geom IS NOT NULL$$, 'partial, Many geom: isnt_empty geom'), + is_empty($$SELECT * FROM pgr_findCloseEdges( + 'SELECT id, geom FROM edges', (SELECT array_agg(geom) FROM pointsOfInterest), 0.5, 1, true, false) WHERE edge IS NOT NULL$$, 'partial, Many geom: is_empty edge') + ) + END; END; $BODY$ diff --git a/pgtap/utilities/findCloseEdges/types_check.pg b/pgtap/utilities/findCloseEdges/types_check.pg index 58d8c0e17f8..b022f60b3b9 100644 --- a/pgtap/utilities/findCloseEdges/types_check.pg +++ b/pgtap/utilities/findCloseEdges/types_check.pg @@ -42,26 +42,45 @@ BEGIN SELECT function_returns('pgr_findcloseedges', ARRAY['text', 'geometry[]','double precision','integer','boolean','boolean'],'setof record'); + IF min_version('3.8.0') THEN - RETURN QUERY SELECT set_eq( - $$SELECT proargnames from pg_proc where proname = 'pgr_findcloseedges'$$, - $$SELECT '{"","","","cap","partial","dryrun","edge_id","fraction","side","distance","geom","edge"}'::TEXT[] $$); + RETURN QUERY SELECT bag_eq( + $$SELECT proargnames from pg_proc where proname = 'pgr_findcloseedges'$$, + $$VALUES + ('{"","","","cap","dryrun","edge_id","fraction","side","distance","geom","edge"}'::TEXT[]), + ('{"","","","cap","dryrun","edge_id","fraction","side","distance","geom","edge"}'::TEXT[]), + ('{"","","","cap","partial","dryrun","edge_id","fraction","side","distance","geom","edge"}'::TEXT[]), + ('{"","","","cap","partial","dryrun","edge_id","fraction","side","distance","geom","edge"}'::TEXT[]) + $$, + 'proargnames'); - /* pgtap does not like geometry type, this is a workaround */ - RETURN QUERY - SELECT set_eq( - $$WITH a AS (SELECT unnest(proallargtypes) FROM pg_proc WHERE proname = 'pgr_findcloseedges') - SELECT typname FROM a JOIN pg_type ON(oid = unnest)$$, - $$VALUES - ('bool'), - ('int4'), - ('text'), - ('float8'), - ('geometry'), - ('_geometry'), - ('int8'), - ('bpchar') - $$); + RETURN QUERY + SELECT function_types('pgr_findcloseedges', + $$ VALUES + ('{text,_geometry,float8,int4,bool,int8,float8,bpchar,float8,geometry,geometry}'::TEXT[]), + ('{text,geometry,float8,int4,bool,int8,float8,bpchar,float8,geometry,geometry}'::TEXT[]), + ('{text,geometry,float8,int4,bool,bool,int8,float8,bpchar,float8,geometry,geometry}'::TEXT[]), + ('{text,_geometry,float8,int4,bool,bool,int8,float8,bpchar,float8,geometry,geometry}'::TEXT[]) + $$); + + ELSE + + RETURN QUERY SELECT bag_eq( + $$SELECT proargnames from pg_proc where proname = 'pgr_findcloseedges'$$, + $$VALUES + ('{"","","","cap","partial","dryrun","edge_id","fraction","side","distance","geom","edge"}'::TEXT[]), + ('{"","","","cap","partial","dryrun","edge_id","fraction","side","distance","geom","edge"}'::TEXT[]) + $$, + 'proargnames'); + + RETURN QUERY + SELECT function_types('pgr_findcloseedges', + $$ VALUES + ('{text,geometry,float8,int4,bool,bool,int8,float8,bpchar,float8,geometry,geometry}'::TEXT[]), + ('{text,_geometry,float8,int4,bool,bool,int8,float8,bpchar,float8,geometry,geometry}'::TEXT[]) + $$); + + END IF; END $BODY$ diff --git a/requirements.txt b/requirements.txt index ef307a8bab1..85758d9a5a3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ Sphinx>4.0.0,<7.0.0 sphinx-bootstrap-theme>=0.8.0 +sphinx-collapse diff --git a/sql/common/_checkcolumn.sql b/sql/common/_checkcolumn.sql index eb0a59108c1..36edfe3b876 100644 --- a/sql/common/_checkcolumn.sql +++ b/sql/common/_checkcolumn.sql @@ -36,12 +36,23 @@ $BODY$ DECLARE has_column BOOLEAN := TRUE; rec RECORD; + sqlhint TEXT; BEGIN BEGIN EXECUTE format('SELECT %1$s FROM ( %2$s ) AS __a__ limit 1', $2, $1); + EXCEPTION WHEN OTHERS THEN + BEGIN + IF NOT is_optional THEN + RAISE EXCEPTION '%', SQLERRM USING HINT = $1, ERRCODE = SQLSTATE; + ELSE + has_column := FALSE; + END IF; + END; + END; + BEGIN EXECUTE format('SELECT pg_typeof(%1$s) FROM ( %2$s ) AS __a__ limit 1', $2, $1) INTO rec; @@ -89,7 +100,5 @@ END; $BODY$ LANGUAGE plpgsql VOLATILE STRICT; - --- COMMENTS COMMENT ON FUNCTION _pgr_checkColumn(TEXT, TEXT, TEXT, BOOLEAN, BOOLEAN) IS 'pgRouting internal function'; diff --git a/sql/common/_checkquery.sql b/sql/common/_checkquery.sql index ef6550e8d65..d649b775ee1 100644 --- a/sql/common/_checkquery.sql +++ b/sql/common/_checkquery.sql @@ -33,18 +33,19 @@ DECLARE BEGIN - BEGIN + IF $1 !~ '[[:space:]]' THEN + -- prepared statements no arguments EXECUTE format($$ SELECT regexp_replace(regexp_replace(statement, %1$L,'','i'),';$','') FROM pg_prepared_statements WHERE name = %2$L$$, '.*' || $1 || '\s*as', $1) INTO main_sql; - EXCEPTION WHEN OTHERS - THEN main_sql := $1; - END; - - IF main_sql IS NULL THEN + IF main_sql IS NULL THEN + RAISE EXCEPTION 'prepared statement "%" does not exist', $1; + END IF; + ELSE + -- normal query main_sql := $1; END IF; @@ -52,8 +53,7 @@ BEGIN EXECUTE format('SELECT * FROM ( %1$s ) AS __a__ limit 1', main_sql); EXCEPTION WHEN OTHERS THEN - RAISE EXCEPTION '%', SQLERRM - USING HINT = 'Please check query: '|| $1; + RAISE EXCEPTION '%', SQLERRM USING HINT = $1, ERRCODE = SQLSTATE; END; RETURN main_sql; @@ -62,7 +62,5 @@ END; $BODY$ LANGUAGE plpgsql VOLATILE STRICT; - --- COMMENTS COMMENT ON FUNCTION _pgr_checkquery(TEXT) IS 'pgrouting internal function'; diff --git a/sql/metrics/CMakeLists.txt b/sql/metrics/CMakeLists.txt index c047b395e5a..9b748324e2d 100644 --- a/sql/metrics/CMakeLists.txt +++ b/sql/metrics/CMakeLists.txt @@ -2,6 +2,7 @@ SET(LOCAL_FILES _betweennessCentrality.sql betweennessCentrality.sql + degree.sql ) foreach (f ${LOCAL_FILES}) diff --git a/sql/topology/degree.sql b/sql/metrics/degree.sql similarity index 54% rename from sql/topology/degree.sql rename to sql/metrics/degree.sql index 033a63ee20c..2270d804994 100644 --- a/sql/topology/degree.sql +++ b/sql/metrics/degree.sql @@ -43,16 +43,30 @@ DECLARE eids TEXT; query TEXT; + sqlhint TEXT; + BEGIN - edges_sql := _pgr_checkQuery($1); - PERFORM _pgr_checkColumn(edges_sql, 'id', 'ANY-INTEGER', dryrun => $3); + BEGIN + edges_sql := _pgr_checkQuery($1); + PERFORM _pgr_checkColumn(edges_sql, 'id', 'ANY-INTEGER', dryrun => $3); + + vertices_sql := _pgr_checkQuery($2); + PERFORM _pgr_checkColumn(vertices_sql, 'id', 'ANY-INTEGER', dryrun => $3); + + EXCEPTION WHEN OTHERS THEN + GET STACKED DIAGNOSTICS sqlhint = PG_EXCEPTION_HINT; + RAISE EXCEPTION '%', SQLERRM USING HINT = sqlhint, ERRCODE = SQLSTATE; + END; - vertices_sql := _pgr_checkQuery($2); - PERFORM _pgr_checkColumn(vertices_sql, 'id', 'ANY-INTEGER', dryrun => $3); has_in_edges := _pgr_checkColumn(vertices_sql, 'in_edges', 'ANY-INTEGER[]', true, dryrun => $3); has_out_edges := _pgr_checkColumn(vertices_sql, 'out_edges', 'ANY-INTEGER[]', true, dryrun => $3); + IF NOT has_in_edges AND NOT has_out_edges THEN + RAISE EXCEPTION 'column "in_edges" does not exist' USING HINT = vertices_sql, ERRCODE = 42703; + END IF; + + IF has_in_edges THEN eids = $$coalesce(in_edges::BIGINT[], '{}'::BIGINT[])$$; END IF; @@ -93,11 +107,11 @@ BEGIN totals AS ( SELECT v.id, count(*) - FROM g_vertices AS v - JOIN g_edges AS e ON (e.id = eid) GROUP BY v.id + FROM g_vertices v + JOIN g_edges e ON (v.eid = e.id) GROUP BY v.id ) - SELECT id::BIGINT, coalesce(count, 0)::BIGINT FROM all_vertices LEFT JOIN totals USING (id) + SELECT id::BIGINT, count::BIGINT FROM all_vertices JOIN totals USING (id) $q$, eids); IF dryrun THEN @@ -106,22 +120,93 @@ BEGIN RETURN QUERY EXECUTE query; END IF; - EXCEPTION WHEN OTHERS THEN - RAISE EXCEPTION '%', SQLERRM - USING HINT = 'Please check query: '|| $1; - END; $BODY$ LANGUAGE plpgsql VOLATILE STRICT; - --- COMMENTS COMMENT ON FUNCTION pgr_degree(TEXT, TEXT, BOOLEAN) IS 'pgr_degree -- PROPOSED - Parameters - Edges SQL with columns: id - Vertices SQL with columns: id, in_edges, out_edges - Documentation: - ${PROJECT_DOC_LINK}/pgr_degree.html '; + +--v3.8 +CREATE FUNCTION pgr_degree( + TEXT, -- Edges SQL + + dryrun BOOLEAN DEFAULT false, + + OUT node BIGINT, + OUT degree BIGINT +) +RETURNS SETOF RECORD AS +$BODY$ +DECLARE + edges_sql TEXT; + has_id BOOLEAN; + has_source BOOLEAN; + has_target BOOLEAN; + eids TEXT; + query TEXT; + + sqlhint TEXT; + +BEGIN + + -- Verify the data is complete + BEGIN + edges_sql := _pgr_checkQuery($1); + has_id := _pgr_checkColumn(edges_sql, 'id', 'ANY-INTEGER', dryrun => $2); + has_source := _pgr_checkColumn(edges_sql, 'source', 'ANY-INTEGER', dryrun => $2); + has_target := _pgr_checkColumn(edges_sql, 'target', 'ANY-INTEGER', dryrun => $2); + EXCEPTION WHEN OTHERS THEN + GET STACKED DIAGNOSTICS sqlhint = PG_EXCEPTION_HINT; + RAISE EXCEPTION '%', SQLERRM USING HINT = sqlhint, ERRCODE = SQLSTATE; + END; + + query := format($q$ + + WITH + + -- a sub set of edges of the graph goes here + g_edges AS ( + %1$s + ), + + -- sub set of vertices of the graph goes here + g_vertices AS ( + SELECT source, id FROM g_edges + UNION ALL + SELECT target, id FROM g_edges + ), + + totals AS ( + SELECT source AS node, count(*) AS degree + FROM g_vertices + GROUP BY node + ) + + SELECT node::BIGINT, degree::BIGINT + FROM totals + $q$, edges_sql); + + IF dryrun THEN + RAISE NOTICE '%', query || ';'; + ELSE + RETURN QUERY EXECUTE query; + END IF; + +END; +$BODY$ +LANGUAGE plpgsql VOLATILE STRICT; + +COMMENT ON FUNCTION pgr_degree(TEXT, BOOLEAN) +IS 'pgr_degree +- Parameters +- Edges SQL with columns: id +- Documentation: +- ${PROJECT_DOC_LINK}/pgr_degree.html +'; diff --git a/sql/scripts/build-extension-update-files.pl b/sql/scripts/build-extension-update-files.pl index 771b5c75607..74744480b69 100755 --- a/sql/scripts/build-extension-update-files.pl +++ b/sql/scripts/build-extension-update-files.pl @@ -64,6 +64,7 @@ my $version_3_5 = qr/(3.5.[\d+])/; my $version_3_6 = qr/(3.6.[\d+])/; my $version_3_7 = qr/(3.7.[\d+])/; +my $version_3_8 = qr/(3.8.[\d+])/; my $version_4_0 = qr/(4.0.[\d+])/; # add minor here @@ -222,19 +223,19 @@ sub generate_upgrade_script { } # updating to 3.4+ - if ($old_mayor == 2 or ($old_mayor == 3 and $old_minor < 4)) { + if ($old_minor < 3.4) { push @commands, drop_special_case_function("pgr_maxcardinalitymatch(text,boolean)"); } # updating to 3.5+ - if ($old_mayor == 2 or ($old_mayor == 3 && $old_minor < 5)) { + if ($old_minor < 3.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_mayor == 3 && $old_minor < 6)) { + if ($old_minor < 3.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)"); @@ -250,7 +251,7 @@ sub generate_upgrade_script { } # updating to 3.7+ - if ($old_mayor == 2 or ($old_mayor == 3 && $old_minor < 7)) { + if ($old_mayor >= 3.0 && $old_minor < 3.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)"); @@ -269,6 +270,12 @@ sub generate_upgrade_script { push @commands, drop_special_case_function("pgr_kruskaldd(text,anyarray,double precision)"); } + # updating to 3.7+ + if ($old_minor >= 3.4 && $old_minor < 3.8) { + push @commands, drop_special_case_function("pgr_findcloseedges(text,geometry,double precision,integer,boolean,boolean)"); + push @commands, drop_special_case_function("pgr_findcloseedges(text,geometry[],double precision,integer,boolean,boolean)"); + } + } #------------------------------------ @@ -278,14 +285,17 @@ sub generate_upgrade_script { if ($old_mayor == 2) { push @commands, update_from_version_2(); } + +=pod if ("$old_version" eq "3.0.0") { push @commands, update_from_version_3_0_0(); } +=cut # UGH! someone change the definition of the TYPE or reused an existing - # TYPE name which is VERY BAD because other poeple might be dependent + # TYPE name which is VERY BAD because other people might be dependent # on the old TYPE so we can DROP TYPE CASCADE; or we might drop - # a user's function. So juse DIE and maybe someone can resolve this + # a user's function. So just DIE and maybe someone can resolve this die "ERROR: pgrouting TYPE changed! Cannot continue!\n" if $err; @@ -446,6 +456,7 @@ sub others_3_0_0 { '"",seq,vid,target_array'); return @commands; } + =pod ***************************************************************** code beyond this point is v2.6 specific diff --git a/sql/sigs/pgrouting--3.8.sig b/sql/sigs/pgrouting--3.8.sig new file mode 100644 index 00000000000..59ae351e060 --- /dev/null +++ b/sql/sigs/pgrouting--3.8.sig @@ -0,0 +1,347 @@ +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_betweennesscentrality(text,boolean) +pgr_betweennesscentrality(text,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,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) +pgr_findcloseedges(text,geometry[],double precision,integer,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_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) +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_primv4(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/sql/sigs/pgrouting--4.0.sig b/sql/sigs/pgrouting--4.0.sig index 7159a7cc85e..79b8a10a07d 100644 --- a/sql/sigs/pgrouting--4.0.sig +++ b/sql/sigs/pgrouting--4.0.sig @@ -101,6 +101,7 @@ pgr_dagshortestpath(text,bigint,anyarray) pgr_dagshortestpath(text,bigint,bigint) pgr_dagshortestpath(text,text) _pgr_dagshortestpath(text,text,boolean,boolean) +pgr_degree(text,boolean) pgr_degree(text,text,boolean) _pgr_depthfirstsearch(text,anyarray,boolean,bigint) pgr_depthfirstsearch(text,anyarray,boolean,bigint) @@ -154,6 +155,8 @@ _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) +pgr_findcloseedges(text,geometry[],double precision,integer,boolean) pgr_findcloseedges(text,geometry,double precision,integer,boolean,boolean) pgr_findcloseedges(text,geometry[],double precision,integer,boolean,boolean) _pgr_floydwarshall(text,boolean) diff --git a/sql/topology/CMakeLists.txt b/sql/topology/CMakeLists.txt index 61719f1555d..fdd181295db 100644 --- a/sql/topology/CMakeLists.txt +++ b/sql/topology/CMakeLists.txt @@ -6,7 +6,6 @@ SET(LOCAL_FILES createverticestable.sql nodeNetwork.sql extractVertices.sql - degree.sql ) foreach (f ${LOCAL_FILES}) diff --git a/sql/topology/extractVertices.sql b/sql/topology/extractVertices.sql index 1dc5180e1ea..c3158b3a8b8 100644 --- a/sql/topology/extractVertices.sql +++ b/sql/topology/extractVertices.sql @@ -44,20 +44,49 @@ DECLARE quoted TEXT; query TEXT; has_geom BOOLEAN := TRUE; + has_st BOOLEAN := TRUE; has_source BOOLEAN := TRUE; + has_target BOOLEAN := TRUE; has_points BOOLEAN := TRUE; + has_start BOOLEAN := TRUE; + has_end BOOLEAN := TRUE; has_id BOOLEAN := TRUE; rec RECORD; + sqlhint TEXT; + BEGIN - edges_sql := _pgr_checkQuery($1); + BEGIN + edges_sql := _pgr_checkQuery($1); + EXCEPTION WHEN OTHERS THEN + GET STACKED DIAGNOSTICS sqlhint = PG_EXCEPTION_HINT; + RAISE EXCEPTION '%', SQLERRM USING HINT = sqlhint, ERRCODE = SQLSTATE; + END; + has_id := _pgr_checkColumn(edges_sql, 'id', 'ANY-INTEGER', true, dryrun => $2); - has_source := _pgr_checkColumn(edges_sql, 'source', 'ANY-INTEGER', true, dryrun => $2) - AND _pgr_checkColumn(edges_sql, 'target', 'ANY-INTEGER', true, dryrun => $2); + has_source := _pgr_checkColumn(edges_sql, 'source', 'ANY-INTEGER', true, dryrun => $2); + has_target := _pgr_checkColumn(edges_sql, 'target', 'ANY-INTEGER', true, dryrun => $2); has_geom := _pgr_checkColumn(edges_sql, 'geom', 'geometry', true, dryrun => $2); - has_points := _pgr_checkColumn(edges_sql, 'startpoint', 'geometry', true, dryrun => $2) - AND _pgr_checkColumn(edges_sql, 'endpoint', 'geometry', true, dryrun => $2); + has_start := _pgr_checkColumn(edges_sql, 'startpoint', 'geometry', true, dryrun => $2); + has_end := _pgr_checkColumn(edges_sql, 'endpoint', 'geometry', true, dryrun => $2); + has_points := has_start AND has_end; + has_st := has_source AND has_target; + + IF (NOT has_geom) THEN + IF (has_target AND NOT has_source) THEN + RAISE EXCEPTION 'column "source" does not exist' USING HINT = $1, ERRCODE = 42703; + ELSIF (NOT has_target AND has_source) THEN + RAISE EXCEPTION 'column "target" does not exist' USING HINT = $1, ERRCODE = 42703; + ELSIF (has_start AND NOT has_end) THEN + RAISE EXCEPTION 'column "endpoint" does not exist' USING HINT = $1, ERRCODE = 42703; + ELSIF (NOT has_start AND has_end) THEN + RAISE EXCEPTION 'column "startpoint" does not exist' USING HINT = $1, ERRCODE = 42703; + ELSIF (NOT has_st AND NOT has_points AND NOT has_geom) THEN + RAISE EXCEPTION 'column "geom" does not exist' USING HINT = $1, ERRCODE = 42703; + END IF; + END IF; + IF has_geom AND has_id THEN -- SELECT id, geom @@ -202,7 +231,7 @@ BEGIN SELECT row_number() over(ORDER BY ST_X(geom), ST_Y(geom)) AS id, NULL::BIGINT[], NULL::BIGINT[], x, y, geom FROM the_points$q$; - ELSIF has_source AND has_id THEN + ELSIF has_st AND has_id THEN -- SELECT id, source, target query := $q$ WITH @@ -232,7 +261,7 @@ BEGIN FROM the_points$q$; - ELSIF has_source AND NOT has_id THEN + ELSIF has_st AND NOT has_id THEN -- SELECT source, target query := $q$ WITH @@ -251,10 +280,6 @@ BEGIN SELECT DISTINCT vid::BIGINT AS id, NULL::BIGINT[], NULL::BIGINT[], NULL::FLOAT, NULL::FLOAT, NULL::geometry FROM the_points$q$; - ELSE - RAISE EXCEPTION 'Missing column' - USING HINT = 'Please check query: '|| $1; - END IF; IF dryrun THEN @@ -263,10 +288,6 @@ BEGIN RETURN QUERY EXECUTE query; END IF; - EXCEPTION WHEN OTHERS THEN - RAISE EXCEPTION '%', SQLERRM - USING HINT = 'Please check query: '|| $1; - END; $BODY$ LANGUAGE plpgsql VOLATILE STRICT; @@ -277,7 +298,6 @@ LANGUAGE plpgsql VOLATILE STRICT; COMMENT ON FUNCTION pgr_extractVertices(TEXT, BOOLEAN) IS 'pgr_extractVertices -- PROPOSED - Parameters - Edges SQL with columns: [id,] startpoint, endpoint OR diff --git a/sql/utilities/findCloseEdges.sql b/sql/utilities/findCloseEdges.sql index 5b207f9a526..abd4a489346 100644 --- a/sql/utilities/findCloseEdges.sql +++ b/sql/utilities/findCloseEdges.sql @@ -1,7 +1,7 @@ /*PGR-GNU***************************************************************** -Copyright (c) 2022 Celia Virginia Vergara Castillo -Mail: vicky at georepublic dot de +Copyright (c) 2025 Celia Virginia Vergara Castillo +Mail: vicky at erosion.dev ------ @@ -21,14 +21,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ ---v3.4 +--v3.8 CREATE FUNCTION pgr_findCloseEdges( TEXT, - geometry, + geometry[], FLOAT, cap INTEGER DEFAULT 1, - partial BOOLEAN DEFAULT true, - dryrun BOOLEAN DEFAULT false, + dryrun BOOLEAN default false, OUT edge_id BIGINT, OUT fraction FLOAT, @@ -39,131 +38,36 @@ CREATE FUNCTION pgr_findCloseEdges( returns SETOF RECORD AS $BODY$ DECLARE + geom_arr geometry[] := $2; + tolerance FLOAT := $3; + cap INTEGER := $4; + dryrun BOOLEAN := $5; edges_SQL TEXT; has_id BOOLEAN; has_geom BOOLEAN; ret_query TEXT; ret_query_end TEXT; -BEGIN - - IF ($3 < 0) THEN - RAISE EXCEPTION 'Invalid value for tolerance'; - END IF; - - IF (cap <= 0) THEN - RAISE EXCEPTION 'Invalid value for cap'; - END IF; - edges_sql := _pgr_checkQuery($1); - has_id := _pgr_checkColumn(edges_sql, 'id', 'ANY-INTEGER', false, dryrun => dryrun); - has_geom := _pgr_checkColumn(edges_sql, 'geom', 'geometry', false, dryrun => dryrun); - - - ret_query = format( - $q$ - WITH - edges_sql AS (%1$s), - point_sql AS (SELECT %2$L::geometry AS point) - - SELECT - id::BIGINT AS edge_id, - ST_LineLocatePoint(geom, point) AS fraction, - CASE WHEN ST_Intersects(ST_Buffer(geom, %3$s, 'side=right endcap=flat'), point) - THEN 'r' - ELSE 'l' END::CHAR AS side, - $q$, edges_sql, $2, $3); - - ret_query_end = format( - $q$ - FROM edges_sql, point_sql - WHERE ST_DWithin(geom, point, %1$s) - ORDER BY geom <-> point LIMIT %2$s - $q$, $3, cap); - - IF partial AND cap = 1 AND NOT dryrun THEN - /* one answer and partialimal columns */ - - ret_query = - ret_query - || $q$ - NULL::FLOAT, - NULL::geometry, - NULL::geometry - $q$ - || ret_query_end; + sqlhint TEXT; - ELSIF partial AND NOT dryrun THEN - /* more than one answer and partialimal columns - * needs distance info for further sorting by use - */ - - ret_query = - ret_query - || $q$ - geom <-> point AS distance, - NULL::geometry, - NULL::geometry - $q$ - || ret_query_end; - - ELSE - /* More than one answer and all columns, or dryrun*/ - - ret_query = - ret_query - || $q$ - geom <-> point AS distance, - ST_ClosestPoint(geom, point) AS new_point, - ST_MakeLine(point, ST_ClosestPoint(geom, point)) AS new_line - $q$ - || ret_query_end; +BEGIN + IF (tolerance < 0) THEN + RAISE EXCEPTION 'Invalid value for "tolerance"'; END IF; - IF dryrun THEN - RAISE NOTICE '%', ret_query; - RETURN; - END IF; - - RETURN query EXECUTE ret_query; - -END; -$BODY$ -LANGUAGE PLPGSQL VOLATILE STRICT -COST 5; - ---v3.4 -CREATE FUNCTION pgr_findCloseEdges( - TEXT, - geometry[], - FLOAT, - cap INTEGER DEFAULT 1, - partial BOOLEAN DEFAULT true, - dryrun BOOLEAN DEFAULT false, - - OUT edge_id BIGINT, - OUT fraction FLOAT, - OUT side CHAR, - OUT distance FLOAT, - OUT geom geometry, - OUT edge geometry) -returns SETOF RECORD AS -$BODY$ -DECLARE - edges_SQL TEXT; - has_id BOOLEAN; - has_geom BOOLEAN; - ret_query TEXT; - ret_query_end TEXT; -BEGIN - - IF ($3 < 0) THEN - RAISE EXCEPTION 'Invalid value for tolerance'; + IF (cap < 0) THEN + RAISE EXCEPTION 'Invalid value for "cap"'; END IF; - edges_sql := _pgr_checkQuery($1); - has_id := _pgr_checkColumn(edges_sql, 'id', 'ANY-INTEGER', false, dryrun => dryrun); - has_geom := _pgr_checkColumn(edges_sql, 'geom', 'geometry', false, dryrun => dryrun); + BEGIN + edges_sql := _pgr_checkQuery($1); + has_id := _pgr_checkColumn(edges_sql, 'id', 'ANY-INTEGER', false, dryrun => dryrun); + has_geom := _pgr_checkColumn(edges_sql, 'geom', 'geometry', false, dryrun => dryrun); + EXCEPTION WHEN OTHERS THEN + GET STACKED DIAGNOSTICS sqlhint = PG_EXCEPTION_HINT; + RAISE EXCEPTION '%', SQLERRM USING HINT = sqlhint, ERRCODE = SQLSTATE; + END; ret_query = format( $q$ @@ -179,7 +83,7 @@ results AS ( ELSE 'l' END::CHAR AS side, geom <-> point AS distance, point, - $q$, edges_sql, $2, $3); + $q$, edges_sql, geom_arr, tolerance); ret_query_end = format( $q$ @@ -192,22 +96,12 @@ prepare_cap AS ( SELECT edge_id, fraction, side, distance, point, new_line FROM prepare_cap WHERE rn <= %2$s - $q$, $3, cap); - - IF partial AND NOT dryrun THEN - - ret_query = ret_query - || $q$NULL::geometry AS new_line$q$ - || ret_query_end; - - ELSE + $q$, tolerance, cap); ret_query = ret_query || $q$ST_MakeLine(point, ST_ClosestPoint(geom, point)) AS new_line $q$ || ret_query_end; - END IF; - IF dryrun THEN RAISE NOTICE '%', ret_query; RETURN; @@ -220,31 +114,98 @@ $BODY$ LANGUAGE PLPGSQL VOLATILE STRICT COST 5; --- COMMENTS -COMMENT ON FUNCTION pgr_findCloseEdges(TEXT, GEOMETRY, FLOAT, INTEGER, BOOLEAN, BOOLEAN) -IS 'pgr_findCloseEdges(One Point) +COMMENT ON FUNCTION pgr_findCloseEdges(TEXT, GEOMETRY[], FLOAT, INTEGER, BOOLEAN) +IS 'pgr_findCloseEdges(Many Points) - Parameters: - Edges SQL with columns: id, geom - - POINT geometry + - Array of POINT geometries - Maximum separation between geometries - Optional Parameters - cap => 1: at most one answer - - partial => true: do minimal calculations - dryrun => false: do not output code - Documentation: - ${PROJECT_DOC_LINK}/pgr_findCloseEdges.html '; -COMMENT ON FUNCTION pgr_findCloseEdges(TEXT, GEOMETRY, FLOAT, INTEGER, BOOLEAN, BOOLEAN) -IS 'pgr_findCloseEdges(Many Points) +--v3.8 +CREATE FUNCTION pgr_findCloseEdges( + TEXT, + geometry, + FLOAT, + cap INTEGER DEFAULT 1, + dryrun BOOLEAN default false, + OUT edge_id BIGINT, + OUT fraction FLOAT, + OUT side CHAR, + OUT distance FLOAT, + OUT geom geometry, + OUT edge geometry) +returns SETOF RECORD AS +$BODY$ + SELECT edge_id, fraction, side, distance, geom, edge + FROM pgr_findCloseEdges($1, ARRAY[$2]::GEOMETRY[], $3, cap, dryrun); +$BODY$ +LANGUAGE SQL VOLATILE STRICT COST 5; + +COMMENT ON FUNCTION pgr_findCloseEdges(TEXT, GEOMETRY, FLOAT, INTEGER, BOOLEAN) +IS 'pgr_findCloseEdges(One Point) - Parameters: - Edges SQL with columns: id, geom - - Array of POINT geometries + - POINT geometry - Maximum separation between geometries - Optional Parameters - cap => 1: at most one answer - - partial => true: do minimal calculations - dryrun => false: do not output code - Documentation: - ${PROJECT_DOC_LINK}/pgr_findCloseEdges.html '; + +--v3.4 +CREATE FUNCTION pgr_findCloseEdges( + TEXT, + geometry, + FLOAT, + cap INTEGER, + partial BOOLEAN, + dryrun BOOLEAN, + + OUT edge_id BIGINT, + OUT fraction FLOAT, + OUT side CHAR, + OUT distance FLOAT, + OUT geom geometry, + OUT edge geometry) +returns SETOF RECORD AS +$BODY$ + SELECT edge_id, fraction, side, distance, geom, edge + FROM pgr_findCloseEdges($1, ARRAY[$2]::GEOMETRY[], $3, cap, dryrun); +$BODY$ +LANGUAGE SQL VOLATILE STRICT COST 5; + +COMMENT ON FUNCTION pgr_findCloseEdges(TEXT, GEOMETRY, FLOAT, INTEGER, BOOLEAN, BOOLEAN) +IS 'pgr_findCloseEdges deprecated signature on v3.8.0'; + +--v3.4 +CREATE FUNCTION pgr_findCloseEdges( + TEXT, + geometry[], + FLOAT, + cap INTEGER, + partial BOOLEAN, + dryrun BOOLEAN, + + OUT edge_id BIGINT, + OUT fraction FLOAT, + OUT side CHAR, + OUT distance FLOAT, + OUT geom geometry, + OUT edge geometry) +returns SETOF RECORD AS +$BODY$ + SELECT edge_id, fraction, side, distance, geom, edge + FROM pgr_findCloseEdges($1, $2, $3, cap, dryrun); +$BODY$ +LANGUAGE SQL VOLATILE STRICT COST 5; + +COMMENT ON FUNCTION pgr_findCloseEdges(TEXT, GEOMETRY[], FLOAT, INTEGER, BOOLEAN, BOOLEAN) +IS 'pgr_findCloseEdges deprecated signature on v3.8.0'; diff --git a/tools/developer/pumpup_version.sh b/tools/developer/pumpup_version.sh index 92bb3abd2ce..d6dacf89763 100755 --- a/tools/developer/pumpup_version.sh +++ b/tools/developer/pumpup_version.sh @@ -151,8 +151,8 @@ fi # ------ # Documentation related # ------ -perl -pi -e 's/# Copyright(.*) v(.*)$/# Copyright$1 v'"${NEW_VERSION}${NEW_KIND}"'/' locale/pot/*.pot -perl -pi -e 's/# Copyright(.*) v(.*)$/# Copyright$1 v'"${NEW_VERSION}${NEW_KIND}"'/' locale/*/*/*.po -perl -pi -e 's/('"${MAYOR}.${MINOR}"')/'"${NEW_MAYOR}.${NEW_MINOR}\', \'${MAYOR}.${MINOR}"'/g' doc/_static/page_history.js bash tools/transifex/update_locale.sh +perl -pi -e 's/# Copyright(.*) v(.*)$/# Copyright$1 v'"${NEW_MAYOR}.${NEW_MINOR}"'/' locale/pot/*.pot locale/*/*/*.po +perl -pi -e 's/Id-Version: pgRouting v'"${MAYOR}.${MINOR}"'/Id-Version: pgRouting v'"${NEW_MAYOR}.${NEW_MINOR}"'/' locale/*/*/*.po locale/pot/*.pot +perl -pi -e "s/versionsArr = \[/versionsArr = \['${NEW_MAYOR}.${NEW_MINOR}',/" doc/_static/page_history.js diff --git a/tools/testers/general_pgtap_tests.sql b/tools/testers/general_pgtap_tests.sql index 4a066f5b51c..fa9c9f82cb7 100644 --- a/tools/testers/general_pgtap_tests.sql +++ b/tools/testers/general_pgtap_tests.sql @@ -29,3 +29,39 @@ END; $BODY$ LANGUAGE plpgsql; + +CREATE OR REPLACE FUNCTION column_missing(TEXT, TEXT) +RETURNS TEXT AS +$BODY$ + SELECT CASE WHEN min_version('3.8.0') THEN + collect_tap(throws_ok($1, '42703','column "' || $2 || '" does not exist')) + ELSE + collect_tap(throws_ok($1, 'P0001', 'Missing column')) + END; +$BODY$ LANGUAGE SQL; + +CREATE OR REPLACE FUNCTION wrong_relation(TEXT, TEXT) +RETURNS TEXT AS +$BODY$ + SELECT CASE WHEN min_version('3.8.0') THEN + collect_tap(throws_ok($1, '42P01', 'relation "' || $2 || '" does not exist')) + ELSE + collect_tap(throws_ok($1, 'P0001', 'relation "' || $2 || '" does not exist')) + END; +$BODY$ LANGUAGE SQL; + +CREATE OR REPLACE FUNCTION function_types(TEXT, TEXT) +RETURNS TEXT AS +$BODY$ + SELECT set_eq(format($$ + WITH + a AS ( + SELECT oid, u.name, u.idx + FROM pg_proc p CROSS JOIN unnest(p.proallargtypes) + WITH ordinality as u(name, idx) + WHERE p.proname = '%1$s'), + b AS ( + SELECT a.*, t.typname FROM a JOIN pg_type As t on (t.oid = a.name)) + SELECT array_agg(typname ORDER BY idx) FROM b GROUP BY oid + $$, $1), $2, $1 || ': Function types'); +$BODY$ LANGUAGE SQL; diff --git a/tools/testers/sampledata.sql b/tools/testers/sampledata.sql index 231ae32e724..47004e3c7e5 100644 --- a/tools/testers/sampledata.sql +++ b/tools/testers/sampledata.sql @@ -87,14 +87,46 @@ FROM edges ORDER BY id; /* --POINTS CREATE start */ +DO LANGUAGE plpgsql $BODY$ +DECLARE v FLOAT; +BEGIN +SELECT (parts[1]||'.'||parts[2])::FLOAT FROM STRING_TO_ARRAY(pgr_version(), '.') AS parts INTO v; /* -- p1 */ CREATE TABLE pointsOfInterest( pid BIGSERIAL PRIMARY KEY, edge_id BIGINT, side CHAR, fraction FLOAT, + distance FLOAT, + edge geometry, + newPoint geometry, geom geometry); +IF v > 3.4 THEN /* -- p2 */ +INSERT INTO pointsOfInterest (geom) VALUES +(ST_Point(1.8, 0.4)), +(ST_Point(4.2, 2.4)), +(ST_Point(2.6, 3.2)), +(ST_Point(0.3, 1.8)), +(ST_Point(2.9, 1.8)), +(ST_Point(2.2, 1.7)); +/* -- p3 */ +UPDATE pointsofinterest SET + edge_id = poi.edge_id, + side = poi.side, + fraction = round(poi.fraction::numeric, 2), + distance = round(poi.distance::numeric, 2), + edge = poi.edge, + newPoint = ST_EndPoint(poi.edge) +FROM ( + SELECT * + FROM pgr_findCloseEdges( + $$SELECT id, geom FROM edges$$,(SELECT array_agg(geom) FROM pointsOfInterest), 0.5) ) AS poi +WHERE pointsOfInterest.geom = poi.geom; +/* -- p4 */ +UPDATE pointsOfInterest SET side = 'b' WHERE pid = 6; +/* -- p5 */ +ELSE INSERT INTO pointsOfInterest (edge_id, side, fraction, geom) VALUES (1, 'l' , 0.4, ST_POINT(1.8, 0.4)), (15, 'r' , 0.4, ST_POINT(4.2, 2.4)), @@ -102,7 +134,16 @@ INSERT INTO pointsOfInterest (edge_id, side, fraction, geom) VALUES (6, 'r' , 0.3, ST_POINT(0.3, 1.8)), (5, 'l' , 0.8, ST_POINT(2.9, 1.8)), (4, 'b' , 0.7, ST_POINT(2.2, 1.7)); -/* -- p3 */ +END IF; +END; +$BODY$; +/* -- p6 */ +SELECT + pid, ST_AsText(geom) geom, + edge_id, fraction AS frac, side, distance AS dist, + ST_AsText(edge) edge, ST_AsText(newPoint) newPoint +FROM pointsOfInterest; +/* -- p7 */ /* --POINTS CREATE end */ /* --COMBINATIONS CREATE start */ diff --git a/tools/testers/trsp_tests.sql b/tools/testers/trsp_tests.sql index 5471449f0ce..d747fb698e5 100644 --- a/tools/testers/trsp_tests.sql +++ b/tools/testers/trsp_tests.sql @@ -9,8 +9,14 @@ DECLARE params TEXT; msg TEXT; BEGIN + IF NOT min_version('3.4.0') THEN - RETURN QUERY SELECT skip(1, 'pgr_signature added on 3.4.0'); + RETURN QUERY SELECT skip(1, 'New signatures on 3.4'); + RETURN; + END IF; + + IF min_lib_version('4.0.0') and NOT min_version('3.6.0') THEN + RETURN QUERY SELECT skip(1, 'Internal function __v4trsp deprecated on 3.5.0'); RETURN; END IF;