Skip to content

Commit 231bdac

Browse files
cvvergaracvvergara
committed
(docqueries) Adjusting to changes
1 parent 2ae82c0 commit 231bdac

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

‎docqueries/pgr_pickDeliver/pgr_pickDeliver.pg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ SELECT * FROM vrp_pgr_pickDeliver(
2222
$$ SELECT * FROM orders_1 ORDER BY id $$,
2323
$$ SELECT * FROM vehicles_1 ORDER BY id$$,
2424
$$ SELECT start_vid, end_vid, agg_cost::INTEGER FROM pgr_dijkstraCostMatrix(
25-
'SELECT * FROM edge_table ',
25+
'SELECT * FROM edges',
2626
(SELECT array_agg(id) FROM (SELECT p_id AS id FROM orders_1
2727
UNION
2828
SELECT d_id FROM orders_1

‎docqueries/pgr_pickDeliver/pgr_pickDeliver.result‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,25 @@ SELECT * FROM vrp_pgr_pickDeliver(
2222
);
2323
seq | vehicle_seq | vehicle_id | stop_seq | stop_type | stop_id | order_id | cargo | travel_time | arrival_time | wait_time | service_time | departure_time
2424
-----+-------------+------------+----------+-----------+---------+----------+-------+-------------+--------------+-----------+--------------+----------------
25-
1 | 1 | 1 | 1 | 1 | 6 | -1 | 0 | 0 | 0 | 1 | 0 | 1
26-
2 | 1 | 1 | 2 | 2 | 5 | 3 | 30 | 1 | 2 | 0 | 3 | 5
27-
3 | 1 | 1 | 3 | 3 | 11 | 3 | 0 | 1 | 6 | 0 | 3 | 9
28-
4 | 1 | 1 | 4 | 2 | 9 | 2 | 20 | 1 | 10 | 0 | 2 | 12
29-
5 | 1 | 1 | 5 | 3 | 4 | 2 | 0 | 1 | 13 | 0 | 3 | 16
30-
6 | 1 | 1 | 6 | 6 | 6 | -1 | 0 | 1 | 17 | 0 | 0 | 17
25+
1 | 1 | 1 | 1 | 1 | 6 | -1 | 0 | 0 | 0 | 0 | 0 | 0
26+
2 | 1 | 1 | 2 | 2 | 10 | 1 | 10 | 2 | 2 | 0 | 3 | 5
27+
3 | 1 | 1 | 3 | 2 | 16 | 2 | 30 | 1 | 6 | 0 | 2 | 8
28+
4 | 1 | 1 | 4 | 3 | 15 | 2 | 10 | 1 | 9 | 0 | 3 | 12
29+
5 | 1 | 1 | 5 | 3 | 3 | 1 | 0 | 3 | 15 | 0 | 3 | 18
30+
6 | 1 | 1 | 6 | 6 | 6 | -1 | 0 | 2 | 20 | 0 | 0 | 20
3131
7 | 2 | 2 | 1 | 1 | 6 | -1 | 0 | 0 | 0 | 1 | 0 | 1
32-
8 | 2 | 2 | 2 | 2 | 3 | 1 | 10 | 1 | 2 | 0 | 3 | 5
33-
9 | 2 | 2 | 3 | 3 | 8 | 1 | 0 | 2 | 7 | 0 | 3 | 10
34-
10 | 2 | 2 | 4 | 6 | 6 | -1 | 0 | 2 | 12 | 0 | 0 | 12
35-
11 | -2 | 0 | 0 | -1 | -1 | -1 | -1 | 10 | -1 | 2 | 17 | 29
32+
8 | 2 | 2 | 2 | 2 | 7 | 3 | 30 | 1 | 2 | 0 | 3 | 5
33+
9 | 2 | 2 | 3 | 3 | 6 | 3 | 0 | 1 | 6 | 0 | 3 | 9
34+
10 | 2 | 2 | 4 | 6 | 6 | -1 | 0 | 0 | 9 | 0 | 0 | 9
35+
11 | -2 | 0 | 0 | -1 | -1 | -1 | -1 | 11 | -1 | 1 | 17 | 29
3636
(11 rows)
3737

3838
/* --q2 */
3939
SELECT * FROM vrp_pgr_pickDeliver(
4040
$$ SELECT * FROM orders_1 ORDER BY id $$,
4141
$$ SELECT * FROM vehicles_1 ORDER BY id$$,
4242
$$ SELECT start_vid, end_vid, agg_cost::INTEGER FROM pgr_dijkstraCostMatrix(
43-
'SELECT * FROM edge_table ',
43+
'SELECT * FROM edges',
4444
(SELECT array_agg(id) FROM (SELECT p_id AS id FROM orders_1
4545
UNION
4646
SELECT d_id FROM orders_1
@@ -51,15 +51,15 @@ SELECT * FROM vrp_pgr_pickDeliver(
5151
seq | vehicle_seq | vehicle_id | stop_seq | stop_type | stop_id | order_id | cargo | travel_time | arrival_time | wait_time | service_time | departure_time
5252
-----+-------------+------------+----------+-----------+---------+----------+-------+-------------+--------------+-----------+--------------+----------------
5353
1 | 1 | 1 | 1 | 1 | 6 | -1 | 0 | 0 | 0 | 1 | 0 | 1
54-
2 | 1 | 1 | 2 | 2 | 5 | 3 | 30 | 1 | 2 | 0 | 3 | 5
55-
3 | 1 | 1 | 3 | 3 | 11 | 3 | 0 | 2 | 7 | 0 | 3 | 10
56-
4 | 1 | 1 | 4 | 2 | 9 | 2 | 20 | 2 | 12 | 0 | 2 | 14
57-
5 | 1 | 1 | 5 | 3 | 4 | 2 | 0 | 1 | 15 | 0 | 3 | 18
58-
6 | 1 | 1 | 6 | 6 | 6 | -1 | 0 | 2 | 20 | 0 | 0 | 20
54+
2 | 1 | 1 | 2 | 2 | 7 | 3 | 30 | 1 | 2 | 0 | 3 | 5
55+
3 | 1 | 1 | 3 | 2 | 16 | 2 | 50 | 2 | 7 | 0 | 2 | 9
56+
4 | 1 | 1 | 4 | 3 | 15 | 2 | 30 | 1 | 10 | 0 | 3 | 13
57+
5 | 1 | 1 | 5 | 3 | 6 | 3 | 0 | 2 | 15 | 0 | 3 | 18
58+
6 | 1 | 1 | 6 | 6 | 6 | -1 | 0 | 0 | 18 | 0 | 0 | 18
5959
7 | 2 | 2 | 1 | 1 | 6 | -1 | 0 | 0 | 0 | 0 | 0 | 0
60-
8 | 2 | 2 | 2 | 2 | 3 | 1 | 10 | 3 | 3 | 0 | 3 | 6
61-
9 | 2 | 2 | 3 | 3 | 8 | 1 | 0 | 3 | 9 | 0 | 3 | 12
62-
10 | 2 | 2 | 4 | 6 | 6 | -1 | 0 | 2 | 14 | 0 | 0 | 14
60+
8 | 2 | 2 | 2 | 2 | 10 | 1 | 10 | 5 | 5 | 0 | 3 | 8
61+
9 | 2 | 2 | 3 | 3 | 3 | 1 | 0 | 3 | 11 | 0 | 3 | 14
62+
10 | 2 | 2 | 4 | 6 | 6 | -1 | 0 | 2 | 16 | 0 | 0 | 16
6363
11 | -2 | 0 | 0 | -1 | -1 | -1 | -1 | 16 | -1 | 1 | 17 | 34
6464
(11 rows)
6565

‎docqueries/version/full_version.result‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SET
66
SELECT version, library FROM vrp_full_version();
77
version | library
88
---------+------------------
9-
0.4.2 | vrprouting-0.4.2
9+
0.5.0 | vrprouting-0.5.0
1010
(1 row)
1111

1212
/* -- q2 */

‎docqueries/version/version.result‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SET
66
SELECT vrp_version();
77
vrp_version
88
-------------
9-
0.4.2
9+
0.5.0
1010
(1 row)
1111

1212
/* -- q2 */

0 commit comments

Comments
 (0)