Skip to content

Commit d31cc9a

Browse files
committed
[docqueries] changes because manual assignment of poi
1 parent 6d4f183 commit d31cc9a

File tree

3 files changed

+141
-141
lines changed

3 files changed

+141
-141
lines changed

docqueries/topology/degree.result

Lines changed: 107 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,107 @@
1-
BEGIN;
2-
BEGIN
3-
SET client_min_messages TO NOTICE;
4-
SET
5-
/* -- q1 */
6-
DROP TABLE IF EXISTS tmp_edges_vertices_pgr;
7-
NOTICE: table "tmp_edges_vertices_pgr" does not exist, skipping
8-
DROP TABLE
9-
CREATE TEMP TABLE tmp_edges_vertices_pgr AS
10-
SELECT id, in_edges, out_edges
11-
FROM pgr_extractVertices('SELECT id, geom FROM edges');
12-
SELECT 17
13-
SELECT * FROM pgr_degree(
14-
$$SELECT id FROM edges$$,
15-
$$SELECT id, in_edges, out_edges
16-
FROM tmp_edges_vertices_pgr$$);
17-
node | degree
18-
------+--------
19-
1 | 1
20-
2 | 1
21-
3 | 2
22-
4 | 1
23-
5 | 1
24-
6 | 3
25-
7 | 4
26-
8 | 3
27-
9 | 1
28-
10 | 3
29-
11 | 4
30-
12 | 3
31-
13 | 1
32-
14 | 1
33-
15 | 2
34-
16 | 3
35-
17 | 2
36-
(17 rows)
37-
38-
/* -- q2 */
39-
SELECT * FROM pgr_degree(
40-
$$SELECT id FROM edges WHERE id < 17$$,
41-
$$SELECT id, in_edges, out_edges
42-
FROM pgr_extractVertices('SELECT id, geom FROM edges')$$);
43-
node | degree
44-
------+--------
45-
1 | 1
46-
2 | 0
47-
3 | 2
48-
4 | 0
49-
5 | 1
50-
6 | 3
51-
7 | 4
52-
8 | 3
53-
9 | 1
54-
10 | 3
55-
11 | 4
56-
12 | 3
57-
13 | 0
58-
14 | 0
59-
15 | 2
60-
16 | 3
61-
17 | 2
62-
(17 rows)
63-
64-
/* -- q3 */
65-
SELECT * FROM pgr_degree(
66-
$$SELECT id FROM edges WHERE id < 17$$,
67-
$$SELECT id, in_edges, out_edges
68-
FROM pgr_extractVertices('SELECT id, geom FROM edges')$$,
69-
dryrun => true);
70-
NOTICE:
71-
WITH
72-
73-
-- a sub set of edges of the graph goes here
74-
g_edges AS (
75-
SELECT id FROM edges WHERE id < 17
76-
),
77-
78-
-- sub set of vertices of the graph goes here
79-
all_vertices AS (
80-
SELECT id, in_edges, out_edges
81-
FROM pgr_extractVertices('SELECT id, geom FROM edges')
82-
),
83-
84-
g_vertices AS (
85-
SELECT id,
86-
unnest(
87-
coalesce(in_edges::BIGINT[], '{}'::BIGINT[])
88-
||
89-
coalesce(out_edges::BIGINT[], '{}'::BIGINT[])) AS eid
90-
FROM all_vertices
91-
),
92-
93-
totals AS (
94-
SELECT v.id, count(*)
95-
FROM g_vertices AS v
96-
JOIN g_edges AS e ON (e.id = eid) GROUP BY v.id
97-
)
98-
99-
SELECT id::BIGINT, coalesce(count, 0)::BIGINT FROM all_vertices LEFT JOIN totals USING (id)
100-
;
101-
node | degree
102-
------+--------
103-
(0 rows)
104-
105-
/* -- q4 */
106-
ROLLBACK;
107-
ROLLBACK
1+
BEGIN;
2+
BEGIN
3+
SET client_min_messages TO NOTICE;
4+
SET
5+
/* -- q1 */
6+
DROP TABLE IF EXISTS tmp_edges_vertices_pgr;
7+
NOTICE: table "tmp_edges_vertices_pgr" does not exist, skipping
8+
DROP TABLE
9+
CREATE TEMP TABLE tmp_edges_vertices_pgr AS
10+
SELECT id, in_edges, out_edges
11+
FROM pgr_extractVertices('SELECT id, geom FROM edges');
12+
SELECT 17
13+
SELECT * FROM pgr_degree(
14+
$$SELECT id FROM edges$$,
15+
$$SELECT id, in_edges, out_edges
16+
FROM tmp_edges_vertices_pgr$$);
17+
node | degree
18+
------+--------
19+
1 | 1
20+
2 | 1
21+
3 | 2
22+
4 | 1
23+
5 | 1
24+
6 | 3
25+
7 | 4
26+
8 | 3
27+
9 | 1
28+
10 | 3
29+
11 | 4
30+
12 | 3
31+
13 | 1
32+
14 | 1
33+
15 | 2
34+
16 | 3
35+
17 | 2
36+
(17 rows)
37+
38+
/* -- q2 */
39+
SELECT * FROM pgr_degree(
40+
$$SELECT id FROM edges WHERE id < 17$$,
41+
$$SELECT id, in_edges, out_edges
42+
FROM pgr_extractVertices('SELECT id, geom FROM edges')$$);
43+
node | degree
44+
------+--------
45+
1 | 1
46+
2 | 0
47+
3 | 2
48+
4 | 0
49+
5 | 1
50+
6 | 3
51+
7 | 4
52+
8 | 3
53+
9 | 1
54+
10 | 3
55+
11 | 4
56+
12 | 3
57+
13 | 0
58+
14 | 0
59+
15 | 2
60+
16 | 3
61+
17 | 2
62+
(17 rows)
63+
64+
/* -- q3 */
65+
SELECT * FROM pgr_degree(
66+
$$SELECT id FROM edges WHERE id < 17$$,
67+
$$SELECT id, in_edges, out_edges
68+
FROM pgr_extractVertices('SELECT id, geom FROM edges')$$,
69+
dryrun => true);
70+
NOTICE:
71+
WITH
72+
73+
-- a sub set of edges of the graph goes here
74+
g_edges AS (
75+
SELECT id FROM edges WHERE id < 17
76+
),
77+
78+
-- sub set of vertices of the graph goes here
79+
all_vertices AS (
80+
SELECT id, in_edges, out_edges
81+
FROM pgr_extractVertices('SELECT id, geom FROM edges')
82+
),
83+
84+
g_vertices AS (
85+
SELECT id,
86+
unnest(
87+
coalesce(in_edges::BIGINT[], '{}'::BIGINT[])
88+
||
89+
coalesce(out_edges::BIGINT[], '{}'::BIGINT[])) AS eid
90+
FROM all_vertices
91+
),
92+
93+
totals AS (
94+
SELECT v.id, count(*)
95+
FROM g_vertices AS v
96+
JOIN g_edges AS e ON (e.id = eid) GROUP BY v.id
97+
)
98+
99+
SELECT id::BIGINT, coalesce(count, 0)::BIGINT FROM all_vertices LEFT JOIN totals USING (id)
100+
;
101+
node | degree
102+
------+--------
103+
(0 rows)
104+
105+
/* -- q4 */
106+
ROLLBACK;
107+
ROLLBACK

docqueries/trsp/trsp_withPoints.result

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ SELECT * FROM pgr_trsp_withPoints(
1717
2 | 2 | -1 | 10 | 5 | 1 | 1 | 0.4
1818
3 | 3 | -1 | 10 | 6 | 4 | 0.7 | 1.4
1919
4 | 4 | -1 | 10 | -6 | 4 | 0.3 | 2.1
20-
5 | 5 | -1 | 10 | 7 | 8 | 1 | 2.4
21-
6 | 6 | -1 | 10 | 11 | 9 | 1 | 3.4
22-
7 | 7 | -1 | 10 | 16 | 15 | 0.4 | 4.4
23-
8 | 8 | -1 | 10 | -2 | 15 | 0.6 | 4.8
20+
5 | 5 | -1 | 10 | 7 | 10 | 1 | 2.4
21+
6 | 6 | -1 | 10 | 8 | 12 | 0.6 | 3.4
22+
7 | 7 | -1 | 10 | -3 | 12 | 0.4 | 4
23+
8 | 8 | -1 | 10 | 12 | 13 | 1 | 4.4
2424
9 | 9 | -1 | 10 | 17 | 15 | 1 | 5.4
2525
10 | 10 | -1 | 10 | 16 | 16 | 1 | 6.4
2626
11 | 11 | -1 | 10 | 15 | 3 | 1 | 7.4
@@ -79,29 +79,30 @@ SELECT * FROM pgr_trsp_withPoints(
7979
5 | 5 | -1 | -3 | -3 | -1 | 0 | 4
8080
6 | 1 | -1 | 1 | -1 | 1 | 1.4 | 0
8181
7 | 2 | -1 | 1 | 6 | 4 | 1 | 1.4
82-
8 | 3 | -1 | 1 | 7 | 8 | 1 | 2.4
83-
9 | 4 | -1 | 1 | 11 | 9 | 1 | 3.4
84-
10 | 5 | -1 | 1 | 16 | 15 | 2 | 4.4
85-
11 | 6 | -1 | 1 | 16 | 9 | 1 | 6.4
86-
12 | 7 | -1 | 1 | 11 | 8 | 1 | 7.4
87-
13 | 8 | -1 | 1 | 7 | 7 | 1 | 8.4
88-
14 | 9 | -1 | 1 | 3 | 6 | 1 | 9.4
89-
15 | 10 | -1 | 1 | 1 | -1 | 0 | 10.4
90-
16 | 1 | 6 | -3 | 6 | 4 | 1 | 0
91-
17 | 2 | 6 | -3 | 7 | 10 | 1 | 1
92-
18 | 3 | 6 | -3 | 8 | 12 | 0.6 | 2
93-
19 | 4 | 6 | -3 | -3 | -1 | 0 | 2.6
94-
20 | 1 | 6 | 1 | 6 | 4 | 1 | 0
95-
21 | 2 | 6 | 1 | 7 | 10 | 1 | 1
96-
22 | 3 | 6 | 1 | 8 | 12 | 1 | 2
97-
23 | 4 | 6 | 1 | 12 | 13 | 1 | 3
98-
24 | 5 | 6 | 1 | 17 | 15 | 1 | 4
99-
25 | 6 | 6 | 1 | 16 | 9 | 1 | 5
100-
26 | 7 | 6 | 1 | 11 | 8 | 1 | 6
101-
27 | 8 | 6 | 1 | 7 | 7 | 1 | 7
102-
28 | 9 | 6 | 1 | 3 | 6 | 1 | 8
103-
29 | 10 | 6 | 1 | 1 | -1 | 0 | 9
104-
(29 rows)
82+
8 | 3 | -1 | 1 | 7 | 10 | 1 | 2.4
83+
9 | 4 | -1 | 1 | 8 | 12 | 1 | 3.4
84+
10 | 5 | -1 | 1 | 12 | 13 | 1 | 4.4
85+
11 | 6 | -1 | 1 | 17 | 15 | 1 | 5.4
86+
12 | 7 | -1 | 1 | 16 | 9 | 1 | 6.4
87+
13 | 8 | -1 | 1 | 11 | 8 | 1 | 7.4
88+
14 | 9 | -1 | 1 | 7 | 7 | 1 | 8.4
89+
15 | 10 | -1 | 1 | 3 | 6 | 1 | 9.4
90+
16 | 11 | -1 | 1 | 1 | -1 | 0 | 10.4
91+
17 | 1 | 6 | -3 | 6 | 4 | 1 | 0
92+
18 | 2 | 6 | -3 | 7 | 10 | 1 | 1
93+
19 | 3 | 6 | -3 | 8 | 12 | 0.6 | 2
94+
20 | 4 | 6 | -3 | -3 | -1 | 0 | 2.6
95+
21 | 1 | 6 | 1 | 6 | 4 | 1 | 0
96+
22 | 2 | 6 | 1 | 7 | 10 | 1 | 1
97+
23 | 3 | 6 | 1 | 8 | 12 | 1 | 2
98+
24 | 4 | 6 | 1 | 12 | 13 | 1 | 3
99+
25 | 5 | 6 | 1 | 17 | 15 | 1 | 4
100+
26 | 6 | 6 | 1 | 16 | 9 | 1 | 5
101+
27 | 7 | 6 | 1 | 11 | 8 | 1 | 6
102+
28 | 8 | 6 | 1 | 7 | 7 | 1 | 7
103+
29 | 9 | 6 | 1 | 3 | 6 | 1 | 8
104+
30 | 10 | 6 | 1 | 1 | -1 | 0 | 9
105+
(30 rows)
105106

106107
/* --e5 */
107108
SELECT * FROM pgr_trsp_withPoints(
@@ -117,10 +118,10 @@ SELECT * FROM pgr_trsp_withPoints(
117118
2 | 2 | -1 | 10 | 5 | 1 | 1 | 0.4
118119
3 | 3 | -1 | 10 | 6 | 4 | 0.7 | 1.4
119120
4 | 4 | -1 | 10 | -6 | 4 | 0.3 | 2.1
120-
5 | 5 | -1 | 10 | 7 | 8 | 1 | 2.4
121-
6 | 6 | -1 | 10 | 11 | 9 | 1 | 3.4
122-
7 | 7 | -1 | 10 | 16 | 15 | 0.4 | 4.4
123-
8 | 8 | -1 | 10 | -2 | 15 | 0.6 | 4.8
121+
5 | 5 | -1 | 10 | 7 | 10 | 1 | 2.4
122+
6 | 6 | -1 | 10 | 8 | 12 | 0.6 | 3.4
123+
7 | 7 | -1 | 10 | -3 | 12 | 0.4 | 4
124+
8 | 8 | -1 | 10 | 12 | 13 | 1 | 4.4
124125
9 | 9 | -1 | 10 | 17 | 15 | 1 | 5.4
125126
10 | 10 | -1 | 10 | 16 | 16 | 1 | 6.4
126127
11 | 11 | -1 | 10 | 15 | 3 | 1 | 7.4
@@ -154,15 +155,14 @@ ELSE ' passes in front of'
154155
(-1 => -6) at 4th step: | visits | Point | 6
155156
(-1 => -3) at 4th step: | passes in front of | Point | 6
156157
(-1 => 10) at 4th step: | passes in front of | Point | 6
157-
(-1 => 10) at 6th step: | passes in front of | Vertex | 11
158158
(-1 => 11) at 4th step: | passes in front of | Point | 6
159159
(-1 => 11) at 6th step: | visits | Vertex | 11
160160
(5 => -6) at 3th step: | visits | Point | 6
161161
(5 => -3) at 3th step: | passes in front of | Point | 6
162162
(5 => 10) at 3th step: | passes in front of | Point | 6
163163
(5 => 11) at 3th step: | passes in front of | Point | 6
164164
(5 => 11) at 5th step: | visits | Vertex | 11
165-
(11 rows)
165+
(10 rows)
166166

167167
/* --q2 */
168168
SELECT * FROM pgr_trsp_withPoints(

docqueries/utilities/findCloseEdges.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ FROM pgr_findCloseEdges(
200200
NOTICE:
201201
WITH
202202
edges_sql AS (SELECT id, geom FROM edges),
203-
point_sql AS (SELECT unnest('{0101000000CDCCCCCCCCCCFC3F9A9999999999D93F:0101000000333333333333D33FCDCCCCCCCCCCFC3F:0101000000CDCCCCCCCCCC04409A99999999990940:0101000000CDCCCCCCCCCC10403333333333330340:01010000003333333333330740CDCCCCCCCCCCFC3F:01010000009A99999999990140333333333333FB3F}'::geometry[]) AS point),
203+
point_sql AS (SELECT unnest('{0101000000CDCCCCCCCCCCFC3F9A9999999999D93F:0101000000CDCCCCCCCCCC10403333333333330340:0101000000CDCCCCCCCCCC04409A99999999990940:0101000000333333333333D33FCDCCCCCCCCCCFC3F:01010000003333333333330740CDCCCCCCCCCCFC3F:01010000009A99999999990140333333333333FB3F}'::geometry[]) AS point),
204204
results AS (
205205
SELECT
206206
id::BIGINT AS edge_id,

0 commit comments

Comments
 (0)