[Git][debian-gis-team/pgrouting][upstream] New upstream version 2.6.2
Bas Couwenberg
gitlab at salsa.debian.org
Tue Dec 4 09:47:12 GMT 2018
Bas Couwenberg pushed to branch upstream at Debian GIS Project / pgrouting
Commits:
872a857f by Bas Couwenberg at 2018-12-04T08:49:50Z
New upstream version 2.6.2
- - - - -
18 changed files:
- CMakeLists.txt
- NEWS
- README.md
- VERSION
- cmake/FindSphinx.cmake
- doc/queries/doc-pgr_version.queries
- doc/src/release_notes.rst
- include/dijkstra/pgr_dijkstra.hpp
- include/yen/pgr_ksp.hpp
- + pgtap/driving_distance/issue1152.sql
- sql/sigs/CMakeLists.txt
- + sql/sigs/pgrouting--2.5.5.sig
- + sql/sigs/pgrouting--2.6.2.sig
- test/common/doc-pgr_version.result
- test/costMatrix/doc-pgr_fooDmatrix-windows.result
- test/costMatrix/doc-pgr_fooDmatrix-windows.test.sql
- tools/testers/algorithm-tester.pl
- + tools/testers/tmp_net.sql
Changes:
=====================================
CMakeLists.txt
=====================================
@@ -182,7 +182,7 @@ endif()
set(PGROUTING_VERSION_MAJOR "2")
set(PGROUTING_VERSION_MINOR "6")
-set(PGROUTING_VERSION_PATCH "1")
+set(PGROUTING_VERSION_PATCH "2")
set(PGROUTING_VERSION_DEV "")
set(PGROUTING_SHORT_VERSION "${PGROUTING_VERSION_MAJOR}.${PGROUTING_VERSION_MINOR}")
=====================================
NEWS
=====================================
@@ -1,4 +1,16 @@
+pgRouting 2.6.2 Release Notes
+-------------------------------------------------------------------------------
+
+To see the issues closed by this release see the [Git closed milestone for 2.6.2 ](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.6.2%22%20) on Github.
+
+*Bug fixes*
+
+* [#1152 ](https://github.com/pgRouting/pgrouting/issues/1152)_ Fixes driving distance when vertex is not part of the graph
+* [#1098 ](https://github.com/pgRouting/pgrouting/issues/1098)_ Fixes windows test
+* [#1165 ](https://github.com/pgRouting/pgrouting/issues/1165)_ Fixes build for python3 and perl5
+
+
pgRouting 2.6.1 Release Notes
-------------------------------------------------------------------------------
@@ -71,6 +83,18 @@ To see the issues closed by this release see the [Git closed milestone for 2.6.0
* Cleaned the internal code of withPoints
+pgRouting 2.5.5 Release Notes
+-------------------------------------------------------------------------------
+
+To see the issues closed by this release see the [Git closed milestone for 2.5.5 ](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.5%22%20) on Github.
+
+*Bug fixes*
+
+* Fixes driving distance when vertex is not part of the graph
+* Fixes windows test
+* Fixes build for python3 and perl5
+
+
pgRouting 2.5.4 Release Notes
-------------------------------------------------------------------------------
=====================================
README.md
=====================================
@@ -6,9 +6,9 @@
### Branches
-* The *master* branch has the release 2.5.2
-* The *release/2.5* branch has the next micro-release 2.5.3 (if needed)
-* The *develop* branch has the development of the next minor-release 2.6.0-dev
+* The *master* branch has the release 2.6.1
+* The *release/2.5* branch has the next micro-release 2.5.4 (if needed)
+* The *develop* branch has the development of the next release 3.0.0-dev
For the complete list of releases go to:
https://github.com/pgRouting/pgrouting/releases
=====================================
VERSION
=====================================
@@ -1 +1 @@
-6798-1360698 release/2.6
+6808-b14f4d56b master
=====================================
cmake/FindSphinx.cmake
=====================================
@@ -7,6 +7,10 @@
# SPHINX_VERSION - the version of Sphinx which was found, e.g. "1.0.7"
#=============================================================================
+#
+# Copyright (C) 2018 Vicky Vergara
+# Modification for python3
+#
# Copyright (C) 2011 Marie Rognes and Johannes Ring
# All rights reserved.
#
@@ -52,10 +56,13 @@ find_program(SPHINX_EXECUTABLE sphinx-build
if (SPHINX_EXECUTABLE)
# Try to check Sphinx version by importing Sphinx
execute_process(
- COMMAND ${PYTHON_EXECUTABLE} -c "import sphinx; print sphinx.__version__"
+ COMMAND ${SPHINX_EXECUTABLE} --version
OUTPUT_VARIABLE SPHINX_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE)
+ message(STATUS "SPHINX_VERSION ${SPHINX_VERSION}")
+ string(REGEX MATCH "[0-9]+\.[0-9]+.\[0-9]+" SPHINX_VERSION "${SPHINX_VERSION}")
+ message(STATUS "SPHINX_VERSION ${SPHINX_VERSION}")
if (Sphinx_FIND_VERSION)
# Check if version found is >= required version
if (NOT "${SPHINX_VERSION}" VERSION_LESS "${Sphinx_FIND_VERSION}")
@@ -76,4 +83,3 @@ mark_as_advanced(
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Sphinx DEFAULT_MSG
SPHINX_EXECUTABLE SPHINX_VERSION_OK)
-
=====================================
doc/queries/doc-pgr_version.queries
=====================================
@@ -6,7 +6,7 @@ SET
SELECT version FROM pgr_version();
version
---------
- 2.6.1
+ 2.6.2
(1 row)
-- q2
=====================================
doc/src/release_notes.rst
=====================================
@@ -18,8 +18,10 @@ To see the full list of changes check the list of `Git commits <https://github.c
.. changelog start
+* :ref:`changelog_2_6_2`
* :ref:`changelog_2_6_1`
* :ref:`changelog_2_6_0`
+* :ref:`changelog_2_5_5`
* :ref:`changelog_2_5_4`
* :ref:`changelog_2_5_3`
* :ref:`changelog_2_5_2`
@@ -43,6 +45,19 @@ To see the full list of changes check the list of `Git commits <https://github.c
.. changelog end
+.. _changelog_2_6_2:
+
+pgRouting 2.6.2 Release Notes
+-------------------------------------------------------------------------------
+
+To see the issues closed by this release see the `Git closed milestone for 2.6.2 <https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.6.2%22%20>`_ on Github.
+
+.. rubric:: Bug fixes
+
+* `#1152 <https://github.com/pgRouting/pgrouting/issues/1152>`__ Fixes driving distance when vertex is not part of the graph
+* `#1098 <https://github.com/pgRouting/pgrouting/issues/1098>`__ Fixes windows test
+* `#1165 <https://github.com/pgRouting/pgrouting/issues/1165>`__ Fixes build for python3 and perl5
+
.. _changelog_2_6_1:
pgRouting 2.6.1 Release Notes
@@ -117,6 +132,19 @@ To see the issues closed by this release see the `Git closed milestone for 2.6.0
* Cleaned the internal code of withPoints
+.. _changelog_2_5_5:
+
+pgRouting 2.5.5 Release Notes
+-------------------------------------------------------------------------------
+
+To see the issues closed by this release see the `Git closed milestone for 2.5.5 <https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.5%22%20>`_ on Github.
+
+.. rubric:: Bug fixes
+
+* Fixes driving distance when vertex is not part of the graph
+* Fixes windows test
+* Fixes build for python3 and perl5
+
.. _changelog_2_5_4:
pgRouting 2.5.4 Release Notes
=====================================
include/dijkstra/pgr_dijkstra.hpp
=====================================
@@ -588,7 +588,7 @@ class Pgr_dijkstra {
/*
* The vertex does not exist on the graph
*/
- if (pred[i - 1].empty()) {pgassert(false); continue;}
+ if (pred[i - 1].empty()) break;
/*
=====================================
include/yen/pgr_ksp.hpp
=====================================
@@ -60,7 +60,7 @@ class Pgr_ksp {
if (p1.tot_cost() < p2.tot_cost())
return true;
- pgassert(p1.tot_cost() == p2.tot_cost());
+ //pgassert(p1.tot_cost() == p2.tot_cost());
// paths costs are equal now check by length
if (p1.size() > p2.size())
=====================================
pgtap/driving_distance/issue1152.sql
=====================================
@@ -0,0 +1,111 @@
+\i setup.sql
+\i tmp_net.sql
+
+SELECT plan(71);
+
+
+CREATE or REPLACE FUNCTION issue1154()
+RETURNS SETOF TEXT AS
+$BODY$
+DECLARE
+ dd_query TEXT;
+ dijkstra_sql TEXT;
+ astar_sql TEXT;
+ vids TEXT;
+ data INTEGER[];
+ cant INTEGER;
+BEGIN
+ data := ARRAY[
+ 28143,37447,43401,50409,91800,
+ 98234,108908,1888,1897,85914,
+ 1898,112714,11851,31406,
+ 37961,43534,50994,57875,71749,
+ 77860,4424,4641,35309,53002,
+ 57762,75549,79856,80019,88626,
+ 89435,116859,37736,51812,97808]::INTEGER[];
+
+ RETURN QUERY
+ SELECT is_empty($$
+ SELECT * FROM tmp_net WHERE target = 85930
+ UNION
+ SELECT * FROM tmp_net WHERE target = 85930
+ $$);
+
+ cant := array_length(data, 1);
+
+ FOR i IN 1.. cant LOOP
+
+ dd_query := format($$
+ SELECT
+ route.node AS node_id,
+ route.agg_cost
+ FROM pgr_drivingdistance(
+ 'SELECT * FROM tmp_net',
+ ARRAY[%1$s, %2$s]::INTEGER[],
+ 2680, equicost:=TRUE, directed:=TRUE) route;
+ $$, 85930, data[i]);
+
+
+ RETURN QUERY SELECT lives_ok(dd_query, 'i=' || data[i]);
+
+ dd_query := format($$
+ SELECT
+ route.node AS node_id,
+ route.agg_cost
+ FROM pgr_drivingdistance(
+ 'SELECT * FROM tmp_net',
+ ARRAY[%1$s, %2$s]::INTEGER[],
+ 2680, equicost:=TRUE, directed:=TRUE) route;
+ $$, data[i], 85930);
+
+
+ RETURN QUERY SELECT lives_ok(dd_query, 'i=' || data[i]);
+
+ END LOOP;
+
+RETURN;
+END
+$BODY$
+language plpgsql;
+
+SELECT * FROM issue1154();
+
+SELECT lives_ok($$
+ SELECT *
+ FROM pgr_drivingdistance(
+ 'SELECT * FROM tmp_net',
+ ARRAY[
+ 28143,37447,43401,50409,91800,
+ 98234,108908,1888,1897,85914,
+ 1898,85930,112714,11851,31406,
+ 37961,43534,50994,57875,71749,
+ 77860,4424,4641,35309,53002,
+ 57762,75549,79856,80019,88626,
+ 89435,116859,37736,51812,97808]::INTEGER[],
+ 2680,
+ equicost:=TRUE,
+ directed:=TRUE
+ )
+ $$);
+
+SELECT bag_has($$
+ SELECT *
+ FROM pgr_drivingdistance(
+ 'SELECT * FROM tmp_net',
+ ARRAY[
+ 28143,37447,43401,50409,91800,
+ 98234,108908,1888,1897,85914,
+ 1898,85930,112714,11851,31406,
+ 37961,43534,50994,57875,71749,
+ 77860,4424,4641,35309,53002,
+ 57762,75549,79856,80019,88626,
+ 89435,116859,37736,51812,97808]::INTEGER[],
+ 2680,
+ equicost:=TRUE,
+ directed:=TRUE
+ )$$,
+ $$ VALUES (12, 85930, 85930, -1, 0, 0) $$
+);
+
+SELECT finish();
+ROLLBACK;
=====================================
sql/sigs/CMakeLists.txt
=====================================
@@ -1,6 +1,8 @@
SET(OLD_SIGNATURES
+ 2.6.1
2.6.0
+ 2.5.5
2.5.4
2.5.3
2.5.2
=====================================
sql/sigs/pgrouting--2.5.5.sig
=====================================
@@ -0,0 +1,185 @@
+#VERSION pgrouting 2.5.5
+#TYPES
+pgr_costresult
+pgr_costresult3
+pgr_geomresult
+#FUNCTIONS
+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_apspjohnson(text)
+pgr_apspwarshall(text,boolean,boolean)
+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_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,integer,integer,boolean,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_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)
+pgr_bdastar(text,bigint,bigint,boolean,integer,numeric,numeric)
+pgr_bdastar(text,integer,integer,boolean,boolean)
+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_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)
+pgr_bddijkstra(text,bigint,bigint,boolean)
+pgr_bddijkstra(text,integer,integer,boolean,boolean)
+pgr_biconnectedcomponents(text)
+pgr_boykovkolmogorov(text,anyarray,anyarray)
+pgr_boykovkolmogorov(text,anyarray,bigint)
+pgr_boykovkolmogorov(text,bigint,anyarray)
+pgr_boykovkolmogorov(text,bigint,bigint)
+pgr_bridges(text)
+_pgr_checkverttab(text,text[],integer,text)
+pgr_connectedcomponents(text)
+pgr_contractgraph(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_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_dijkstra(text,anyarray,anyarray,boolean)
+_pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean)
+pgr_dijkstra(text,anyarray,bigint,boolean)
+pgr_dijkstra(text,bigint,anyarray,boolean)
+pgr_dijkstra(text,bigint,bigint)
+pgr_dijkstra(text,bigint,bigint,boolean)
+pgr_dijkstra(text,integer,integer,boolean,boolean)
+pgr_dijkstravia(text,anyarray,boolean,boolean,boolean)
+pgr_drivingdistance(text,anyarray,double precision,boolean,boolean)
+pgr_drivingdistance(text,bigint,double precision,boolean)
+pgr_drivingdistance(text,bigint,double precision,boolean,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_edmondskarp(text,anyarray,anyarray)
+pgr_edmondskarp(text,anyarray,bigint)
+pgr_edmondskarp(text,bigint,anyarray)
+pgr_edmondskarp(text,bigint,bigint)
+_pgr_endpoint(geometry)
+pgr_endpoint(geometry)
+pgr_euclediantsp(text,bigint,bigint,double precision,integer,integer,integer,double precision,double precision,double precision,boolean)
+pgr_flipedges(geometry[])
+pgr_floydwarshall(text,boolean)
+pgr_getcolumnname(text,text)
+_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)
+_pgr_gettablename(text,integer,text)
+_pgr_gsoc_vrppdtw(text,integer,double precision,double precision,integer)
+pgr_gsoc_vrppdtw(text,integer,integer)
+pgr_iscolumnindexed(text,text)
+_pgr_iscolumnindexed(text,text,integer,text)
+_pgr_iscolumnindexed(text,text,text,integer,text)
+_pgr_iscolumnintable(text,text)
+pgr_iscolumnintable(text,text)
+pgr_johnson(text,boolean)
+pgr_kdijkstracost(text,integer,integer[],boolean,boolean)
+pgr_kdijkstrapath(text,integer,integer[],boolean,boolean)
+_pgr_ksp(text,bigint,bigint,integer,boolean,boolean)
+pgr_ksp(text,bigint,bigint,integer,boolean,boolean)
+pgr_ksp(text,integer,integer,integer,boolean)
+pgr_labelgraph(text,text,text,text,text,text)
+pgr_linegraph(text,boolean)
+_pgr_makedistancematrix(text)
+pgr_maxcardinalitymatch(text,boolean)
+pgr_maxflowboykovkolmogorov(text,anyarray,anyarray)
+pgr_maxflowboykovkolmogorov(text,anyarray,bigint)
+pgr_maxflowboykovkolmogorov(text,bigint,anyarray)
+pgr_maxflowboykovkolmogorov(text,bigint,bigint)
+pgr_maxflowedmondskarp(text,anyarray,anyarray)
+pgr_maxflowedmondskarp(text,anyarray,bigint)
+pgr_maxflowedmondskarp(text,bigint,anyarray)
+pgr_maxflowedmondskarp(text,bigint,bigint)
+pgr_maxflowpushrelabel(text,anyarray,anyarray)
+pgr_maxflowpushrelabel(text,anyarray,bigint)
+pgr_maxflowpushrelabel(text,bigint,anyarray)
+pgr_maxflowpushrelabel(text,bigint,bigint)
+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_maximumcardinalitymatching(text,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_parameter_check(text,text,boolean)
+_pgr_pickdelivereuclidean(text,text,double precision,integer,integer)
+_pgr_pickdeliver(text,text,text,double precision,integer,integer)
+pgr_pointsaspolygon(character varying,double precision)
+pgr_pointstodmatrix(geometry[],integer)
+pgr_pointstovids(geometry[],text,double precision)
+pgr_pointtoedgenode(text,geometry,double precision)
+_pgr_pointtoid(geometry,double precision,text,integer)
+pgr_pushrelabel(text,anyarray,anyarray)
+pgr_pushrelabel(text,anyarray,bigint)
+pgr_pushrelabel(text,bigint,anyarray)
+pgr_pushrelabel(text,bigint,bigint)
+_pgr_quote_ident(text)
+pgr_quote_ident(text)
+_pgr_startpoint(geometry)
+pgr_startpoint(geometry)
+pgr_strongcomponents(text)
+pgr_texttopoints(text,integer)
+_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,integer,integer,boolean,boolean,text)
+pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)
+pgr_trspviavertices(text,anyarray,boolean,boolean,text)
+_pgr_trspviavertices(text,integer[],boolean,boolean,text)
+pgr_tsp(double precision[],integer,integer)
+pgr_tsp(text,bigint,bigint,double precision,integer,integer,integer,double precision,double precision,double precision,boolean)
+pgr_tsp(text,integer,integer)
+_pgr_unnest_matrix(double precision[])
+pgr_version()
+_pgr_versionless(text,text)
+pgr_versionless(text,text)
+pgr_vidstodmatrix(integer[],geometry[],text,double precision)
+pgr_vidstodmatrix(text,integer[],boolean,boolean,boolean)
+_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_withpointsdd(text,text,anyarray,double precision,boolean,character,boolean,boolean)
+pgr_withpointsdd(text,text,bigint,double precision,boolean,character,boolean)
+pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,character,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_withpointsvia(text,bigint[],double precision[],boolean)
=====================================
sql/sigs/pgrouting--2.6.2.sig
=====================================
@@ -0,0 +1,191 @@
+#VERSION pgrouting 2.6.2
+#TYPES
+pgr_costresult
+pgr_costresult3
+pgr_geomresult
+#FUNCTIONS
+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_apspjohnson(text)
+pgr_apspwarshall(text,boolean,boolean)
+_pgr_array_reverse(anyarray)
+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_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,integer,integer,boolean,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_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)
+pgr_bdastar(text,bigint,bigint,boolean,integer,numeric,numeric)
+pgr_bdastar(text,integer,integer,boolean,boolean)
+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_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)
+pgr_bddijkstra(text,bigint,bigint,boolean)
+pgr_bddijkstra(text,integer,integer,boolean,boolean)
+pgr_biconnectedcomponents(text)
+pgr_boykovkolmogorov(text,anyarray,anyarray)
+pgr_boykovkolmogorov(text,anyarray,bigint)
+pgr_boykovkolmogorov(text,bigint,anyarray)
+pgr_boykovkolmogorov(text,bigint,bigint)
+pgr_bridges(text)
+_pgr_checkverttab(text,text[],integer,text)
+pgr_connectedcomponents(text)
+pgr_contractgraph(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_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_dijkstra(text,anyarray,anyarray,boolean)
+_pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean)
+pgr_dijkstra(text,anyarray,bigint,boolean)
+pgr_dijkstra(text,bigint,anyarray,boolean)
+pgr_dijkstra(text,bigint,bigint)
+pgr_dijkstra(text,bigint,bigint,boolean)
+pgr_dijkstra(text,integer,integer,boolean,boolean)
+pgr_dijkstravia(text,anyarray,boolean,boolean,boolean)
+pgr_drivingdistance(text,anyarray,double precision,boolean,boolean)
+pgr_drivingdistance(text,bigint,double precision,boolean)
+pgr_drivingdistance(text,bigint,double precision,boolean,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_edmondskarp(text,anyarray,anyarray)
+pgr_edmondskarp(text,anyarray,bigint)
+pgr_edmondskarp(text,bigint,anyarray)
+pgr_edmondskarp(text,bigint,bigint)
+_pgr_endpoint(geometry)
+pgr_endpoint(geometry)
+pgr_euclediantsp(text,bigint,bigint,double precision,integer,integer,integer,double precision,double precision,double precision,boolean)
+pgr_flipedges(geometry[])
+pgr_floydwarshall(text,boolean)
+pgr_getcolumnname(text,text)
+_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)
+_pgr_gettablename(text,integer,text)
+_pgr_gsoc_vrppdtw(text,integer,double precision,double precision,integer)
+pgr_gsoc_vrppdtw(text,integer,integer)
+pgr_iscolumnindexed(text,text)
+_pgr_iscolumnindexed(text,text,integer,text)
+_pgr_iscolumnindexed(text,text,text,integer,text)
+_pgr_iscolumnintable(text,text)
+pgr_iscolumnintable(text,text)
+pgr_johnson(text,boolean)
+pgr_kdijkstracost(text,integer,integer[],boolean,boolean)
+pgr_kdijkstrapath(text,integer,integer[],boolean,boolean)
+_pgr_ksp(text,bigint,bigint,integer,boolean,boolean)
+pgr_ksp(text,bigint,bigint,integer,boolean,boolean)
+pgr_ksp(text,integer,integer,integer,boolean)
+pgr_labelgraph(text,text,text,text,text,text)
+pgr_linegraphfull(text)
+pgr_linegraph(text,boolean)
+_pgr_makedistancematrix(text)
+pgr_maxcardinalitymatch(text,boolean)
+pgr_maxflowboykovkolmogorov(text,anyarray,anyarray)
+pgr_maxflowboykovkolmogorov(text,anyarray,bigint)
+pgr_maxflowboykovkolmogorov(text,bigint,anyarray)
+pgr_maxflowboykovkolmogorov(text,bigint,bigint)
+pgr_maxflowedmondskarp(text,anyarray,anyarray)
+pgr_maxflowedmondskarp(text,anyarray,bigint)
+pgr_maxflowedmondskarp(text,bigint,anyarray)
+pgr_maxflowedmondskarp(text,bigint,bigint)
+pgr_maxflowpushrelabel(text,anyarray,anyarray)
+pgr_maxflowpushrelabel(text,anyarray,bigint)
+pgr_maxflowpushrelabel(text,bigint,anyarray)
+pgr_maxflowpushrelabel(text,bigint,bigint)
+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_maximumcardinalitymatching(text,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_parameter_check(text,text,boolean)
+_pgr_pickdelivereuclidean(text,text,double precision,integer,integer)
+_pgr_pickdeliver(text,text,text,double precision,integer,integer)
+pgr_pointsaspolygon(character varying,double precision)
+pgr_pointstodmatrix(geometry[],integer)
+pgr_pointstovids(geometry[],text,double precision)
+pgr_pointtoedgenode(text,geometry,double precision)
+_pgr_pointtoid(geometry,double precision,text,integer)
+pgr_pushrelabel(text,anyarray,anyarray)
+pgr_pushrelabel(text,anyarray,bigint)
+pgr_pushrelabel(text,bigint,anyarray)
+pgr_pushrelabel(text,bigint,bigint)
+_pgr_quote_ident(text)
+pgr_quote_ident(text)
+_pgr_startpoint(geometry)
+pgr_startpoint(geometry)
+pgr_strongcomponents(text)
+pgr_texttopoints(text,integer)
+_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,bigint,boolean)
+_pgr_trsp(text,text,bigint,anyarray,boolean)
+_pgr_trsp(text,text,bigint,bigint,boolean)
+pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)
+pgr_trspviavertices(text,anyarray,boolean,boolean,text)
+_pgr_trspviavertices(text,integer[],boolean,boolean,text)
+pgr_tsp(double precision[],integer,integer)
+pgr_tsp(text,bigint,bigint,double precision,integer,integer,integer,double precision,double precision,double precision,boolean)
+pgr_tsp(text,integer,integer)
+_pgr_unnest_matrix(double precision[])
+pgr_version()
+_pgr_versionless(text,text)
+pgr_versionless(text,text)
+pgr_vidstodmatrix(integer[],geometry[],text,double precision)
+pgr_vidstodmatrix(text,integer[],boolean,boolean,boolean)
+_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_withpointsdd(text,text,anyarray,double precision,boolean,character,boolean,boolean)
+pgr_withpointsdd(text,text,bigint,double precision,boolean,character,boolean)
+pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,character,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_withpointsvia(text,bigint[],double precision[],boolean)
+_trsp(text,text,anyarray,anyarray,boolean)
=====================================
test/common/doc-pgr_version.result
=====================================
@@ -6,7 +6,7 @@ SET
SELECT version FROM pgr_version();
version
---------
- 2.6.1
+ 2.6.2
(1 row)
-- q2
=====================================
test/costMatrix/doc-pgr_fooDmatrix-windows.result
=====================================
@@ -264,61 +264,19 @@ SELECT * FROM pgr_bdAstarCostMatrix(
start_vid | end_vid | agg_cost
-----------+---------+----------
1 | 2 | 1
- 1 | 3 | 6
- 1 | 4 | 5
+ 1 | 3 | 12
+ 1 | 4 | 12
2 | 1 | 1
- 2 | 3 | 5
- 2 | 4 | 4
+ 2 | 3 | 10
+ 2 | 4 | 9
3 | 1 | 2
3 | 2 | 1
- 3 | 4 | 3
- 4 | 1 | 3
+ 3 | 4 | 5
+ 4 | 1 | 5
4 | 2 | 2
4 | 3 | 1
(12 rows)
--- bdAstar q2
-SELECT * FROM pgr_bdAstarCostMatrix(
- 'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
- (SELECT array_agg(id) FROM edge_table_vertices_pgr WHERE id < 5),
- false
-);
- start_vid | end_vid | agg_cost
------------+---------+----------
- 1 | 2 | 1
- 1 | 3 | 2
- 1 | 4 | 3
- 2 | 1 | 1
- 2 | 3 | 1
- 2 | 4 | 2
- 3 | 1 | 2
- 3 | 2 | 1
- 3 | 4 | 1
- 4 | 1 | 3
- 4 | 2 | 2
- 4 | 3 | 1
-(12 rows)
-
--- bdAstar q3
-SELECT * FROM pgr_TSP(
- $$
- SELECT * FROM pgr_bdAstarCostMatrix(
- 'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
- (SELECT array_agg(id) FROM edge_table_vertices_pgr WHERE id < 5),
- false
- )
- $$,
- randomize := false
-);
- seq | node | cost | agg_cost
------+------+------+----------
- 1 | 1 | 1 | 0
- 2 | 2 | 1 | 1
- 3 | 3 | 1 | 2
- 4 | 4 | 3 | 3
- 5 | 1 | 0 | 6
-(5 rows)
-
-- bdAstar q4
ROLLBACK;
ROLLBACK
=====================================
test/costMatrix/doc-pgr_fooDmatrix-windows.test.sql
=====================================
@@ -115,21 +115,4 @@ SELECT * FROM pgr_bdAstarCostMatrix(
'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
(SELECT array_agg(id) FROM edge_table_vertices_pgr WHERE id < 5)
);
-\echo -- bdAstar q2
-SELECT * FROM pgr_bdAstarCostMatrix(
- 'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
- (SELECT array_agg(id) FROM edge_table_vertices_pgr WHERE id < 5),
- false
-);
-\echo -- bdAstar q3
-SELECT * FROM pgr_TSP(
- $$
- SELECT * FROM pgr_bdAstarCostMatrix(
- 'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
- (SELECT array_agg(id) FROM edge_table_vertices_pgr WHERE id < 5),
- false
- )
- $$,
- randomize := false
-);
\echo -- bdAstar q4
=====================================
tools/testers/algorithm-tester.pl
=====================================
@@ -35,7 +35,7 @@ eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
if 0; #$running_under_some_shell
use strict;
-use warnings;
+use lib './';
use File::Find ();
use File::Basename;
use Data::Dumper;
@@ -198,6 +198,7 @@ $postgis_ver = '' if ! $postgis_ver;
# cfgs = SET of configuration file names
# c one file in cfgs
+# print join("\n", at cfgs),"\n";
for my $c (@cfgs) {
my $found = 0;
@@ -575,6 +576,7 @@ sub want_tests {
# ||
/^test\.conf\z/s &&
push @cfgs, $name;
+ #print join("\n", at cfgs),"\n";
}
=====================================
tools/testers/tmp_net.sql
=====================================
The diff for this file was not included because it is too large.
View it on GitLab: https://salsa.debian.org/debian-gis-team/pgrouting/commit/872a857ff468abbdfd43816ebab217a2dd37975d
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/pgrouting/commit/872a857ff468abbdfd43816ebab217a2dd37975d
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20181204/91fd1356/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list