Skip to content

VROOM Category Functions - Add more informations in the result columns #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
krashish8 merged 20 commits into from
Dec 23, 2021
Merged

VROOM Category Functions - Add more informations in the result columns #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
9221b1b
[vroom][src] Add summary and unassigned rows, modify travel_time column
krashish8 Dec 22, 2021
76b56c2
[vroom][include] Add summary and unassigned rows, modify travel_time …
krashish8 Dec 22, 2021
2399a22
[vroom][sql] Added note in result columns for unallocated and summary…
krashish8 Dec 22, 2021
a1245ef
[vroom][docqueries] Update docqueries - unallocated, summary row
krashish8 Dec 22, 2021
247826b
[vroom][pgtap] Update tests - unallocated, summary row
krashish8 Dec 22, 2021
99ace7c
[vroom][sql] Add data jsonb field
krashish8 Dec 22, 2021
9675635
[vroom][src] Add data jsonb field code
krashish8 Dec 22, 2021
8d9491c
[vroom][include] Add data jsonb field
krashish8 Dec 22, 2021
89e492a
[vroom][sql] Add departure output field
krashish8 Dec 22, 2021
eea4fc9
[vroom][include] Add departure field in result columns
krashish8 Dec 22, 2021
7dc8fc7
[vroom][src] Add departure field in result columns
krashish8 Dec 22, 2021
f637da0
[vroom][docqueries] Update docqueries with added fields
krashish8 Dec 22, 2021
d782048
[vroom][pgtap] Modify pgtap tests with added fields
krashish8 Dec 22, 2021
21ef7c4
[vroom][sql] Add location_id and setup_time in output
krashish8 Dec 23, 2021
77774e4
[vroom][src] Add location_id and setup_time in result columns
krashish8 Dec 23, 2021
81ea524
[vroom][include] Add location_id and setup_time in result columns
krashish8 Dec 23, 2021
ef9666b
[vroom][include] Update pgTAP tests
krashish8 Dec 23, 2021
5451807
[vroom][docqueries] Update docqueries with extra columns
krashish8 Dec 23, 2021
9d852af
[tools] Update notes2news script
krashish8 Dec 23, 2021
5bbcf93
[doc] Update NEWS and release notes
krashish8 Dec 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
v0.3.0 Release Notes
*******************************************************************************

To see all issues & pull requests closed by this release see the [Git closed milestone for 0.3.0 ](https://github.com/pgRouting/vrprouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%200.3.0%22) on Github.
To see all issues & pull requests closed by this release see the [Git closed milestone for 0.3.0](https://github.com/pgRouting/vrprouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%200.3.0%22) on Github.

*Modification of experimental functions*
**Modification of experimental functions**

- VROOM

Expand All @@ -15,7 +15,7 @@ To see all issues & pull requests closed by this release see the [Git closed mil
- vrp_vroomJobsPlain
- vrp_vroomShipmentsPlain

*Added support for VROOM 1.11.0 (#24)*
**Added support for VROOM 1.11.0 ([#24](https://github.com/pgRouting/vrprouting/issues/24))**

- Added setup time in jobs and shipments to refine service time modeling.
- Added support for custom cost matrices, along with the duration matrix.
Expand All @@ -26,14 +26,22 @@ To see all issues & pull requests closed by this release see the [Git closed mil
- Added custom scaling logic for speed_factor.
- Modified parameter names to make the naming consistent.

*Fixes*
**Fixes**

- Honor client cancel requests for vroom-category functions.
- Added more information in the inner query and result columns of VROOM category functions
([#26](https://github.com/pgRouting/vrprouting/issues/26), [#27](https://github.com/pgRouting/vrprouting/issues/27)):

- Summary row in the output, for each vehicle and for the complete problem.
- Uassigned rows in the output with vehicle_id = -1.
- Modified travel_time result column to return travel time between current and last step.
- Added data jsonb field in jobs, shipments, vehicles, breaks as well as in the result columns.
- Added departure field and location_id field in the result columns.

v0.2.0 Release Notes
*******************************************************************************

*New experimental functions*
**New experimental functions**

- VROOM

Expand All @@ -47,11 +55,11 @@ v0.2.0 Release Notes
v0.1.0 Release Notes
*******************************************************************************

*Extraction tasks*
**Extraction tasks**

- Porting pgRouting's VRP functionality

*New official functions*
**New official functions**

* vrp_version
* vrp_full_version
10 changes: 9 additions & 1 deletion doc/general/release_notes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ To see all issues & pull requests closed by this release see the `Git closed mil
- vrp_vroomJobsPlain
- vrp_vroomShipmentsPlain

.. rubric:: Added support for VROOM 1.11.0 (#24)
.. rubric:: Added support for VROOM 1.11.0 (`#24 <https://github.com/pgRouting/vrprouting/issues/24>`_)

- Added setup time in jobs and shipments to refine service time modeling.
- Added support for custom cost matrices, along with the duration matrix.
Expand All @@ -52,6 +52,14 @@ To see all issues & pull requests closed by this release see the `Git closed mil
.. rubric:: Fixes

- Honor client cancel requests for vroom-category functions.
- Added more information in the inner query and result columns of VROOM category functions
(`#26 <https://github.com/pgRouting/vrprouting/issues/26>`_, `#27 <https://github.com/pgRouting/vrprouting/issues/27>`_):

- Summary row in the output, for each vehicle and for the complete problem.
- Uassigned rows in the output with vehicle_id = -1.
- Modified travel_time result column to return travel time between current and last step.
- Added data jsonb field in jobs, shipments, vehicles, breaks as well as in the result columns.
- Added departure field and location_id field in the result columns.

v0.2.0 Release Notes
*******************************************************************************
Expand Down
85 changes: 46 additions & 39 deletions docqueries/vroom/doc-vrp_vroom.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,36 +41,41 @@ FROM vrp_vroom(
'SELECT * FROM vroom.breaks_time_windows',
'SELECT * FROM vroom.matrix'
);
seq | vehicle_seq | vehicle_id | step_seq | step_type | task_id | arrival | travel_time | service_time | waiting_time | load
-----+-------------+------------+----------+-----------+---------+---------------------+-------------+--------------+--------------+------
1 | 1 | 1 | 1 | 1 | -1 | 2021-09-02 09:05:00 | 00:00:00 | 00:00:00 | 00:00:00 | {30}
2 | 1 | 1 | 2 | 5 | 1 | 2021-09-02 09:05:00 | 00:00:00 | 00:00:00 | 00:00:00 | {30}
3 | 1 | 1 | 3 | 2 | 2 | 2021-09-02 09:05:50 | 00:00:50 | 00:04:10 | 00:15:00 | {30}
4 | 1 | 1 | 4 | 3 | 5 | 2021-09-02 09:25:00 | 00:00:50 | 00:37:30 | 03:17:30 | {40}
5 | 1 | 1 | 5 | 3 | 3 | 2021-09-02 13:20:50 | 00:01:40 | 00:37:30 | 00:00:00 | {60}
6 | 1 | 1 | 6 | 4 | 5 | 2021-09-02 13:59:10 | 00:02:30 | 00:37:30 | 00:03:45 | {50}
7 | 1 | 1 | 7 | 4 | 3 | 2021-09-02 14:40:25 | 00:02:30 | 00:37:30 | 00:03:20 | {30}
8 | 1 | 1 | 8 | 6 | -1 | 2021-09-02 15:22:05 | 00:03:20 | 00:00:00 | 00:00:00 | {30}
9 | 2 | 2 | 1 | 1 | -1 | 2021-09-02 09:04:35 | 00:00:00 | 00:00:00 | 00:00:00 | {70}
10 | 2 | 2 | 2 | 5 | 2 | 2021-09-02 09:04:35 | 00:00:00 | 00:00:10 | 00:00:00 | {70}
11 | 2 | 2 | 3 | 2 | 5 | 2021-09-02 09:06:00 | 00:01:15 | 00:04:10 | 00:11:05 | {70}
12 | 2 | 2 | 4 | 2 | 3 | 2021-09-02 09:22:05 | 00:02:05 | 00:04:10 | 00:23:20 | {70}
13 | 2 | 2 | 5 | 2 | 4 | 2021-09-02 09:49:35 | 00:02:05 | 00:04:10 | 00:09:10 | {70}
14 | 2 | 2 | 6 | 6 | -1 | 2021-09-02 10:02:55 | 00:02:05 | 00:00:00 | 00:00:00 | {70}
15 | 3 | 3 | 1 | 1 | -1 | 2021-09-02 09:00:00 | 00:00:00 | 00:00:00 | 00:00:00 | {20}
16 | 3 | 3 | 2 | 5 | 3 | 2021-09-02 09:00:00 | 00:00:00 | 00:00:00 | 00:00:00 | {20}
17 | 3 | 3 | 3 | 2 | 1 | 2021-09-02 09:00:00 | 00:00:00 | 00:04:10 | 01:00:25 | {20}
18 | 3 | 3 | 4 | 3 | 4 | 2021-09-02 10:04:35 | 00:00:00 | 00:37:30 | 00:41:40 | {40}
19 | 3 | 3 | 5 | 4 | 4 | 2021-09-02 11:25:00 | 00:01:15 | 00:37:30 | 00:03:45 | {20}
20 | 3 | 3 | 6 | 6 | -1 | 2021-09-02 12:07:30 | 00:02:30 | 00:00:00 | 00:00:00 | {20}
21 | 4 | 4 | 1 | 1 | -1 | 2021-09-02 09:04:10 | 00:00:00 | 00:00:00 | 00:00:00 | {0}
22 | 4 | 4 | 2 | 5 | 4 | 2021-09-02 09:04:10 | 00:00:00 | 00:00:00 | 00:00:00 | {0}
23 | 4 | 4 | 3 | 3 | 2 | 2021-09-02 09:04:35 | 00:00:25 | 00:37:30 | 00:01:40 | {10}
24 | 4 | 4 | 4 | 3 | 1 | 2021-09-02 09:44:10 | 00:00:50 | 00:37:30 | 00:00:00 | {20}
25 | 4 | 4 | 5 | 4 | 2 | 2021-09-02 10:23:10 | 00:02:20 | 00:37:30 | 00:00:00 | {10}
26 | 4 | 4 | 6 | 4 | 1 | 2021-09-02 11:02:31 | 00:04:11 | 00:37:30 | 04:52:54 | {0}
27 | 4 | 4 | 7 | 6 | -1 | 2021-09-02 16:33:20 | 00:04:36 | 00:00:00 | 00:00:00 | {0}
(27 rows)
seq | vehicle_seq | vehicle_id | vehicle_data | step_seq | step_type | task_id | location_id | task_data | arrival | travel_time | setup_time | service_time | waiting_time | departure | load
-----+-------------+------------+--------------+----------+-----------+---------+-------------+-----------+---------------------+-------------+------------+--------------+--------------+---------------------+------
1 | 1 | 1 | {} | 1 | 1 | -1 | 1 | {} | 2021-09-02 09:05:00 | 00:00:00 | 00:00:00 | 00:00:00 | 00:00:00 | 2021-09-02 09:05:00 | {30}
2 | 1 | 1 | {} | 2 | 5 | 1 | 1 | {} | 2021-09-02 09:05:00 | 00:00:00 | 00:00:00 | 00:00:00 | 00:00:00 | 2021-09-02 09:05:00 | {30}
3 | 1 | 1 | {} | 3 | 2 | 2 | 2 | {} | 2021-09-02 09:05:50 | 00:00:50 | 00:00:00 | 00:04:10 | 00:15:00 | 2021-09-02 09:25:00 | {30}
4 | 1 | 1 | {} | 4 | 3 | 5 | 2 | {} | 2021-09-02 09:25:00 | 00:00:00 | 00:00:00 | 00:37:30 | 03:17:30 | 2021-09-02 13:20:00 | {40}
5 | 1 | 1 | {} | 5 | 3 | 3 | 1 | {} | 2021-09-02 13:20:50 | 00:00:50 | 00:00:00 | 00:37:30 | 00:00:00 | 2021-09-02 13:58:20 | {60}
6 | 1 | 1 | {} | 6 | 4 | 5 | 2 | {} | 2021-09-02 13:59:10 | 00:00:50 | 00:00:00 | 00:37:30 | 00:03:45 | 2021-09-02 14:40:25 | {50}
7 | 1 | 1 | {} | 7 | 4 | 3 | 2 | {} | 2021-09-02 14:40:25 | 00:00:00 | 00:00:00 | 00:37:30 | 00:03:20 | 2021-09-02 15:21:15 | {30}
8 | 1 | 1 | {} | 8 | 6 | -1 | 1 | {} | 2021-09-02 15:22:05 | 00:00:50 | 00:00:00 | 00:00:00 | 00:00:00 | 2021-09-02 15:22:05 | {30}
9 | 1 | 1 | {} | 0 | 0 | 0 | 0 | {} | 1970-01-01 00:00:00 | 00:03:20 | 00:00:00 | 02:34:10 | 03:39:35 | 1970-01-01 00:00:00 | {}
10 | 2 | 2 | {} | 1 | 1 | -1 | 1 | {} | 2021-09-02 09:04:35 | 00:00:00 | 00:00:00 | 00:00:00 | 00:00:00 | 2021-09-02 09:04:35 | {70}
11 | 2 | 2 | {} | 2 | 5 | 2 | 1 | {} | 2021-09-02 09:04:35 | 00:00:00 | 00:00:00 | 00:00:10 | 00:00:00 | 2021-09-02 09:04:45 | {70}
12 | 2 | 2 | {} | 3 | 2 | 5 | 4 | {} | 2021-09-02 09:06:00 | 00:01:15 | 00:00:00 | 00:04:10 | 00:11:05 | 2021-09-02 09:21:15 | {70}
13 | 2 | 2 | {} | 4 | 2 | 3 | 3 | {} | 2021-09-02 09:22:05 | 00:00:50 | 00:00:00 | 00:04:10 | 00:23:20 | 2021-09-02 09:49:35 | {70}
14 | 2 | 2 | {} | 5 | 2 | 4 | 3 | {} | 2021-09-02 09:49:35 | 00:00:00 | 00:00:00 | 00:04:10 | 00:09:10 | 2021-09-02 10:02:55 | {70}
15 | 2 | 2 | {} | 6 | 6 | -1 | 3 | {} | 2021-09-02 10:02:55 | 00:00:00 | 00:00:00 | 00:00:00 | 00:00:00 | 2021-09-02 10:02:55 | {70}
16 | 2 | 2 | {} | 0 | 0 | 0 | 0 | {} | 1970-01-01 00:00:00 | 00:02:05 | 00:00:00 | 00:12:40 | 00:43:35 | 1970-01-01 00:00:00 | {}
17 | 3 | 3 | {} | 1 | 1 | -1 | 1 | {} | 2021-09-02 09:00:00 | 00:00:00 | 00:00:00 | 00:00:00 | 00:00:00 | 2021-09-02 09:00:00 | {20}
18 | 3 | 3 | {} | 2 | 5 | 3 | 1 | {} | 2021-09-02 09:00:00 | 00:00:00 | 00:00:00 | 00:00:00 | 00:00:00 | 2021-09-02 09:00:00 | {20}
19 | 3 | 3 | {} | 3 | 2 | 1 | 1 | {} | 2021-09-02 09:00:00 | 00:00:00 | 00:00:00 | 00:04:10 | 01:00:25 | 2021-09-02 10:04:35 | {20}
20 | 3 | 3 | {} | 4 | 3 | 4 | 1 | {} | 2021-09-02 10:04:35 | 00:00:00 | 00:00:00 | 00:37:30 | 00:41:40 | 2021-09-02 11:23:45 | {40}
21 | 3 | 3 | {} | 5 | 4 | 4 | 4 | {} | 2021-09-02 11:25:00 | 00:01:15 | 00:00:00 | 00:37:30 | 00:03:45 | 2021-09-02 12:06:15 | {20}
22 | 3 | 3 | {} | 6 | 6 | -1 | 1 | {} | 2021-09-02 12:07:30 | 00:01:15 | 00:00:00 | 00:00:00 | 00:00:00 | 2021-09-02 12:07:30 | {20}
23 | 3 | 3 | {} | 0 | 0 | 0 | 0 | {} | 1970-01-01 00:00:00 | 00:02:30 | 00:00:00 | 01:19:10 | 01:45:50 | 1970-01-01 00:00:00 | {}
24 | 4 | 4 | {} | 1 | 1 | -1 | 3 | {} | 2021-09-02 09:04:10 | 00:00:00 | 00:00:00 | 00:00:00 | 00:00:00 | 2021-09-02 09:04:10 | {0}
25 | 4 | 4 | {} | 2 | 5 | 4 | 1 | {} | 2021-09-02 09:04:10 | 00:00:00 | 00:00:00 | 00:00:00 | 00:00:00 | 2021-09-02 09:04:10 | {0}
26 | 4 | 4 | {} | 3 | 3 | 2 | 5 | {} | 2021-09-02 09:04:35 | 00:00:25 | 00:00:00 | 00:37:30 | 00:01:40 | 2021-09-02 09:43:45 | {10}
27 | 4 | 4 | {} | 4 | 3 | 1 | 3 | {} | 2021-09-02 09:44:10 | 00:00:25 | 00:00:00 | 00:37:30 | 00:00:00 | 2021-09-02 10:21:40 | {20}
28 | 4 | 4 | {} | 5 | 4 | 2 | 6 | {} | 2021-09-02 10:23:10 | 00:01:30 | 00:00:00 | 00:37:30 | 00:00:00 | 2021-09-02 11:00:40 | {10}
29 | 4 | 4 | {} | 6 | 4 | 1 | 5 | {} | 2021-09-02 11:02:31 | 00:01:51 | 00:00:00 | 00:37:30 | 04:52:54 | 2021-09-02 16:32:55 | {0}
30 | 4 | 4 | {} | 7 | 6 | -1 | 3 | {} | 2021-09-02 16:33:20 | 00:00:25 | 00:00:00 | 00:00:00 | 00:00:00 | 2021-09-02 16:33:20 | {0}
31 | 4 | 4 | {} | 0 | 0 | 0 | 0 | {} | 1970-01-01 00:00:00 | 00:04:36 | 00:00:00 | 02:30:00 | 04:54:34 | 1970-01-01 00:00:00 | {}
32 | 0 | 0 | {} | 0 | 0 | 0 | 0 | {} | 1970-01-01 00:00:00 | 00:12:31 | 00:00:00 | 06:36:00 | 11:03:34 | 1970-01-01 00:00:00 | {}
(32 rows)

/* -- q2 */
SELECT *
Expand Down Expand Up @@ -103,15 +108,17 @@ FROM vrp_vroom(
) AS C(start_id, end_id, duration)
$matrix$
);
seq | vehicle_seq | vehicle_id | step_seq | step_type | task_id | arrival | travel_time | service_time | waiting_time | load
-----+-------------+------------+----------+-----------+---------+---------------------+-------------+--------------+--------------+------
1 | 1 | 1 | 1 | 1 | -1 | 1970-01-01 00:00:00 | 00:00:00 | 00:00:00 | 00:00:00 | {}
2 | 1 | 1 | 2 | 3 | 100 | 1970-01-01 00:00:00 | 00:00:00 | 00:00:00 | 00:00:00 | {}
3 | 1 | 1 | 3 | 2 | 1414 | 1970-01-01 00:35:04 | 00:35:04 | 00:00:00 | 00:00:00 | {}
4 | 1 | 1 | 4 | 2 | 1515 | 1970-01-01 01:12:39 | 01:12:39 | 00:00:00 | 00:00:00 | {}
5 | 1 | 1 | 5 | 4 | 100 | 1970-01-01 01:31:01 | 01:31:01 | 00:00:00 | 00:00:00 | {}
6 | 1 | 1 | 6 | 6 | -1 | 1970-01-01 01:31:01 | 01:31:01 | 00:00:00 | 00:00:00 | {}
(6 rows)
seq | vehicle_seq | vehicle_id | vehicle_data | step_seq | step_type | task_id | location_id | task_data | arrival | travel_time | setup_time | service_time | waiting_time | departure | load
-----+-------------+------------+--------------+----------+-----------+---------+-------------+-----------+---------------------+-------------+------------+--------------+--------------+---------------------+------
1 | 1 | 1 | {} | 1 | 1 | -1 | 1 | {} | 1970-01-01 00:00:00 | 00:00:00 | 00:00:00 | 00:00:00 | 00:00:00 | 1970-01-01 00:00:00 | {}
2 | 1 | 1 | {} | 2 | 3 | 100 | 1 | {} | 1970-01-01 00:00:00 | 00:00:00 | 00:00:00 | 00:00:00 | 00:00:00 | 1970-01-01 00:00:00 | {}
3 | 1 | 1 | {} | 3 | 2 | 1414 | 2 | {} | 1970-01-01 00:35:04 | 00:35:04 | 00:00:00 | 00:00:00 | 00:00:00 | 1970-01-01 00:35:04 | {}
4 | 1 | 1 | {} | 4 | 2 | 1515 | 3 | {} | 1970-01-01 01:12:39 | 00:37:35 | 00:00:00 | 00:00:00 | 00:00:00 | 1970-01-01 01:12:39 | {}
5 | 1 | 1 | {} | 5 | 4 | 100 | 4 | {} | 1970-01-01 01:31:01 | 00:18:22 | 00:00:00 | 00:00:00 | 00:00:00 | 1970-01-01 01:31:01 | {}
6 | 1 | 1 | {} | 6 | 6 | -1 | 4 | {} | 1970-01-01 01:31:01 | 00:00:00 | 00:00:00 | 00:00:00 | 00:00:00 | 1970-01-01 01:31:01 | {}
7 | 1 | 1 | {} | 0 | 0 | 0 | 0 | {} | 1970-01-01 00:00:00 | 01:31:01 | 00:00:00 | 00:00:00 | 00:00:00 | 1970-01-01 00:00:00 | {}
8 | 0 | 0 | {} | 0 | 0 | 0 | 0 | {} | 1970-01-01 00:00:00 | 01:31:01 | 00:00:00 | 00:00:00 | 00:00:00 | 1970-01-01 00:00:00 | {}
(8 rows)

/* -- q3 */
ROLLBACK;
Expand Down
Loading