From 839b887d7e942c729c0c019d3b6e38d1be950ba8 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 19 Sep 2023 21:29:54 -0600 Subject: [PATCH] [docqueries] changes because manual assignment of poi --- docqueries/topology/degree.result | 214 ++++++++++----------- docqueries/trsp/trsp_withPoints.result | 66 +++---- docqueries/utilities/findCloseEdges.result | 2 +- 3 files changed, 141 insertions(+), 141 deletions(-) diff --git a/docqueries/topology/degree.result b/docqueries/topology/degree.result index 66b10a77d3c..340dbf44646 100644 --- a/docqueries/topology/degree.result +++ b/docqueries/topology/degree.result @@ -1,107 +1,107 @@ -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 +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/trsp/trsp_withPoints.result b/docqueries/trsp/trsp_withPoints.result index 2f075e28983..364d45241d0 100644 --- a/docqueries/trsp/trsp_withPoints.result +++ b/docqueries/trsp/trsp_withPoints.result @@ -17,10 +17,10 @@ SELECT * FROM pgr_trsp_withPoints( 2 | 2 | -1 | 10 | 5 | 1 | 1 | 0.4 3 | 3 | -1 | 10 | 6 | 4 | 0.7 | 1.4 4 | 4 | -1 | 10 | -6 | 4 | 0.3 | 2.1 - 5 | 5 | -1 | 10 | 7 | 8 | 1 | 2.4 - 6 | 6 | -1 | 10 | 11 | 9 | 1 | 3.4 - 7 | 7 | -1 | 10 | 16 | 15 | 0.4 | 4.4 - 8 | 8 | -1 | 10 | -2 | 15 | 0.6 | 4.8 + 5 | 5 | -1 | 10 | 7 | 10 | 1 | 2.4 + 6 | 6 | -1 | 10 | 8 | 12 | 0.6 | 3.4 + 7 | 7 | -1 | 10 | -3 | 12 | 0.4 | 4 + 8 | 8 | -1 | 10 | 12 | 13 | 1 | 4.4 9 | 9 | -1 | 10 | 17 | 15 | 1 | 5.4 10 | 10 | -1 | 10 | 16 | 16 | 1 | 6.4 11 | 11 | -1 | 10 | 15 | 3 | 1 | 7.4 @@ -79,29 +79,30 @@ SELECT * FROM pgr_trsp_withPoints( 5 | 5 | -1 | -3 | -3 | -1 | 0 | 4 6 | 1 | -1 | 1 | -1 | 1 | 1.4 | 0 7 | 2 | -1 | 1 | 6 | 4 | 1 | 1.4 - 8 | 3 | -1 | 1 | 7 | 8 | 1 | 2.4 - 9 | 4 | -1 | 1 | 11 | 9 | 1 | 3.4 - 10 | 5 | -1 | 1 | 16 | 15 | 2 | 4.4 - 11 | 6 | -1 | 1 | 16 | 9 | 1 | 6.4 - 12 | 7 | -1 | 1 | 11 | 8 | 1 | 7.4 - 13 | 8 | -1 | 1 | 7 | 7 | 1 | 8.4 - 14 | 9 | -1 | 1 | 3 | 6 | 1 | 9.4 - 15 | 10 | -1 | 1 | 1 | -1 | 0 | 10.4 - 16 | 1 | 6 | -3 | 6 | 4 | 1 | 0 - 17 | 2 | 6 | -3 | 7 | 10 | 1 | 1 - 18 | 3 | 6 | -3 | 8 | 12 | 0.6 | 2 - 19 | 4 | 6 | -3 | -3 | -1 | 0 | 2.6 - 20 | 1 | 6 | 1 | 6 | 4 | 1 | 0 - 21 | 2 | 6 | 1 | 7 | 10 | 1 | 1 - 22 | 3 | 6 | 1 | 8 | 12 | 1 | 2 - 23 | 4 | 6 | 1 | 12 | 13 | 1 | 3 - 24 | 5 | 6 | 1 | 17 | 15 | 1 | 4 - 25 | 6 | 6 | 1 | 16 | 9 | 1 | 5 - 26 | 7 | 6 | 1 | 11 | 8 | 1 | 6 - 27 | 8 | 6 | 1 | 7 | 7 | 1 | 7 - 28 | 9 | 6 | 1 | 3 | 6 | 1 | 8 - 29 | 10 | 6 | 1 | 1 | -1 | 0 | 9 -(29 rows) + 8 | 3 | -1 | 1 | 7 | 10 | 1 | 2.4 + 9 | 4 | -1 | 1 | 8 | 12 | 1 | 3.4 + 10 | 5 | -1 | 1 | 12 | 13 | 1 | 4.4 + 11 | 6 | -1 | 1 | 17 | 15 | 1 | 5.4 + 12 | 7 | -1 | 1 | 16 | 9 | 1 | 6.4 + 13 | 8 | -1 | 1 | 11 | 8 | 1 | 7.4 + 14 | 9 | -1 | 1 | 7 | 7 | 1 | 8.4 + 15 | 10 | -1 | 1 | 3 | 6 | 1 | 9.4 + 16 | 11 | -1 | 1 | 1 | -1 | 0 | 10.4 + 17 | 1 | 6 | -3 | 6 | 4 | 1 | 0 + 18 | 2 | 6 | -3 | 7 | 10 | 1 | 1 + 19 | 3 | 6 | -3 | 8 | 12 | 0.6 | 2 + 20 | 4 | 6 | -3 | -3 | -1 | 0 | 2.6 + 21 | 1 | 6 | 1 | 6 | 4 | 1 | 0 + 22 | 2 | 6 | 1 | 7 | 10 | 1 | 1 + 23 | 3 | 6 | 1 | 8 | 12 | 1 | 2 + 24 | 4 | 6 | 1 | 12 | 13 | 1 | 3 + 25 | 5 | 6 | 1 | 17 | 15 | 1 | 4 + 26 | 6 | 6 | 1 | 16 | 9 | 1 | 5 + 27 | 7 | 6 | 1 | 11 | 8 | 1 | 6 + 28 | 8 | 6 | 1 | 7 | 7 | 1 | 7 + 29 | 9 | 6 | 1 | 3 | 6 | 1 | 8 + 30 | 10 | 6 | 1 | 1 | -1 | 0 | 9 +(30 rows) /* --e5 */ SELECT * FROM pgr_trsp_withPoints( @@ -117,10 +118,10 @@ SELECT * FROM pgr_trsp_withPoints( 2 | 2 | -1 | 10 | 5 | 1 | 1 | 0.4 3 | 3 | -1 | 10 | 6 | 4 | 0.7 | 1.4 4 | 4 | -1 | 10 | -6 | 4 | 0.3 | 2.1 - 5 | 5 | -1 | 10 | 7 | 8 | 1 | 2.4 - 6 | 6 | -1 | 10 | 11 | 9 | 1 | 3.4 - 7 | 7 | -1 | 10 | 16 | 15 | 0.4 | 4.4 - 8 | 8 | -1 | 10 | -2 | 15 | 0.6 | 4.8 + 5 | 5 | -1 | 10 | 7 | 10 | 1 | 2.4 + 6 | 6 | -1 | 10 | 8 | 12 | 0.6 | 3.4 + 7 | 7 | -1 | 10 | -3 | 12 | 0.4 | 4 + 8 | 8 | -1 | 10 | 12 | 13 | 1 | 4.4 9 | 9 | -1 | 10 | 17 | 15 | 1 | 5.4 10 | 10 | -1 | 10 | 16 | 16 | 1 | 6.4 11 | 11 | -1 | 10 | 15 | 3 | 1 | 7.4 @@ -154,7 +155,6 @@ ELSE ' passes in front of' (-1 => -6) at 4th step: | visits | Point | 6 (-1 => -3) at 4th step: | passes in front of | Point | 6 (-1 => 10) at 4th step: | passes in front of | Point | 6 - (-1 => 10) at 6th step: | passes in front of | Vertex | 11 (-1 => 11) at 4th step: | passes in front of | Point | 6 (-1 => 11) at 6th step: | visits | Vertex | 11 (5 => -6) at 3th step: | visits | Point | 6 @@ -162,7 +162,7 @@ ELSE ' passes in front of' (5 => 10) at 3th step: | passes in front of | Point | 6 (5 => 11) at 3th step: | passes in front of | Point | 6 (5 => 11) at 5th step: | visits | Vertex | 11 -(11 rows) +(10 rows) /* --q2 */ SELECT * FROM pgr_trsp_withPoints( diff --git a/docqueries/utilities/findCloseEdges.result b/docqueries/utilities/findCloseEdges.result index 810c9f5f281..185071edbd1 100644 --- a/docqueries/utilities/findCloseEdges.result +++ b/docqueries/utilities/findCloseEdges.result @@ -200,7 +200,7 @@ FROM pgr_findCloseEdges( NOTICE: WITH edges_sql AS (SELECT id, geom FROM edges), -point_sql AS (SELECT unnest('{0101000000CDCCCCCCCCCCFC3F9A9999999999D93F:0101000000333333333333D33FCDCCCCCCCCCCFC3F:0101000000CDCCCCCCCCCC04409A99999999990940:0101000000CDCCCCCCCCCC10403333333333330340:01010000003333333333330740CDCCCCCCCCCCFC3F:01010000009A99999999990140333333333333FB3F}'::geometry[]) AS point), +point_sql AS (SELECT unnest('{0101000000CDCCCCCCCCCCFC3F9A9999999999D93F:0101000000CDCCCCCCCCCC10403333333333330340:0101000000CDCCCCCCCCCC04409A99999999990940:0101000000333333333333D33FCDCCCCCCCCCCFC3F:01010000003333333333330740CDCCCCCCCCCCFC3F:01010000009A99999999990140333333333333FB3F}'::geometry[]) AS point), results AS ( SELECT id::BIGINT AS edge_id,