Skip to content
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.

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

Move get postgres data from c to cpp #63

Merged
Merged
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
3ec1aac
(pgdata_fetchers) Functions that are called by the getters
cvvergara Aug 25, 2024
2af6417
(pgdata_getters) Functions that are called by the drivers
cvvergara Aug 25, 2024
110fd51
(get_data) template for general data retrival
cvvergara Aug 25, 2024
f337a7e
(undefPostgresDefine) Need to undef some postgres defines
cvvergara Aug 25, 2024
aeb8461
(check_get_data) checks and gets data from postgres
cvvergara Aug 25, 2024
14ae65d
Structures for data retreival: struct -> class in namespace vrprouting
cvvergara Aug 25, 2024
95ceeb4
(compatibleVehicles) moving code from C file to C++ file
cvvergara Aug 25, 2024
5aa7f4f
(pgr_pickDeliver) moving code from C file to C++ file
cvvergara Aug 25, 2024
307f368
(pgr_pickDeliverEuclidean) moving code from C file to C++ file
cvvergara Aug 25, 2024
6d01e1d
(pickDeliver) moving code from C file to C++ file
cvvergara Aug 25, 2024
083b75b
(optimize) moving code from C file to C++ file
cvvergara Aug 25, 2024
b88fd49
(vroom) moving code from C file to C++ file
cvvergara Aug 25, 2024
12c8d9b
(CPP) adjusting code to changes from struct to class
cvvergara Aug 30, 2024
7349377
(vroom) cleaning up code
cvvergara Aug 30, 2024
7bdb945
(build) adjusting the build to the files
cvvergara Aug 30, 2024
e29347f
(pgtap) some messages & tests change
cvvergara Aug 30, 2024
bc25275
(docqueries) some messages & results change
cvvergara Aug 30, 2024
c0634a3
Removing unused files
cvvergara Aug 25, 2024
65d1be2
updating release notes
cvvergara Sep 13, 2024
1096d2c
Update locale: commit for hash 65d1be20
github-actions[bot] Sep 13, 2024
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
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on Github.
* Moved sphinx doc from .c files .rst files
* Removing prefix `pgr_` & addding `namespace vrprouting`
* Separating implementation from header vroom.hpp

* Queries are read on the cpp code.

**Documentation queries**

Expand Down
2 changes: 1 addition & 1 deletion doc/general/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ on Github.
* Moved sphinx doc from .c files .rst files
* Removing prefix `pgr_` & addding `namespace vrprouting`
* Separating implementation from header vroom.hpp

* Queries are read on the cpp code.

.. rubric:: Documentation queries

Expand Down
8 changes: 8 additions & 0 deletions docqueries/viewRoute/viewRoute/sample-with-service.result
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,14 @@ FROM vrp_viewRoute(
$$SELECT start_vid, end_vid, travel_time FROM timeMatrix$$,
$$SELECT * FROM tdm('2019-12-09'::TIMESTAMP, '2019-12-13'::TIMESTAMP)$$,
699::BIGINT, factor => 1.0::float);
NOTICE: Insufficient data found on 'orders' inner query
HINT:
WITH
__shipments AS (SELECT * FROM shipments),
__vehicles AS (SELECT * FROM vehicles)
SELECT * FROM __shipments
WHERE id IN (SELECT distinct(unnest(stops)) FROM __vehicles v WHERE id = 699)

seq | vehicle_seq | vehicle_id | stop_seq | stop_type | stop_id | shipment_id | load | travel | arrival | waiting_time | schedule | service | departure | cvtot | twvtot | location
-----+-------------+------------+----------+-----------+---------+-------------+------+--------+---------+--------------+----------+---------+-----------+-------+--------+----------
(0 rows)
Expand Down
8 changes: 8 additions & 0 deletions docqueries/viewRoute/viewRoute/sample_output.result
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,14 @@ FROM vrp_viewRoute(
$$SELECT start_vid, end_vid, travel_time FROM timeMatrix$$,
$$SELECT * FROM tdm('2019-12-09'::TIMESTAMP, '2019-12-13'::TIMESTAMP)$$,
699::BIGINT, factor => 1.0::float);
NOTICE: Insufficient data found on 'orders' inner query
HINT:
WITH
__shipments AS (SELECT * FROM shipments),
__vehicles AS (SELECT * FROM vehicles)
SELECT * FROM __shipments
WHERE id IN (SELECT distinct(unnest(stops)) FROM __vehicles v WHERE id = 699)

seq | vehicle_seq | vehicle_id | stop_seq | stop_type | stop_id | shipment_id | load | travel | arrival | waiting_time | schedule | service | departure | cvtot | twvtot | location
-----+-------------+------------+----------+-----------+---------+-------------+------+--------+---------+--------------+----------+---------+-----------+-------+--------+----------
(0 rows)
Expand Down
8 changes: 8 additions & 0 deletions docqueries/viewRoute/viewRouteRaw/sample-with-service.result
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,14 @@ FROM vrp_viewRouteRaw(
$$SELECT start_vid, end_vid, agg_cost FROM timeMatrix$$,
$$SELECT * FROM tdm_raw('2019-12-09'::TIMESTAMP, '2019-12-13'::TIMESTAMP)$$,
699::BIGINT, factor => 1.0::float);
NOTICE: Insufficient data found on 'orders' inner query
HINT:
WITH
__shipments AS (SELECT * FROM shipments),
__vehicles AS (SELECT * FROM vehicles)
SELECT * FROM __shipments
WHERE id IN (SELECT distinct(unnest(stops)) FROM __vehicles v WHERE id = 699)

seq | vehicle_seq | vehicle_id | stop_seq | stop_type | stop_id | order_id | cargo | travel_fd | arrival_ft | wait_fd | schedule_ft | service_fd | departure_ft | cvtot | twvtot | location
-----+-------------+------------+----------+-----------+---------+----------+-------+-----------+------------+---------+-------------+------------+--------------+-------+--------+----------
(0 rows)
Expand Down
8 changes: 8 additions & 0 deletions docqueries/viewRoute/viewRouteRaw/sample_output.result
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,14 @@ FROM vrp_viewRouteRaw(
$$SELECT start_vid, end_vid, agg_cost FROM timeMatrix$$,
$$SELECT * FROM tdm_raw('2019-12-09'::TIMESTAMP, '2019-12-13'::TIMESTAMP)$$,
699::BIGINT, factor => 1.0::float);
NOTICE: Insufficient data found on 'orders' inner query
HINT:
WITH
__shipments AS (SELECT * FROM shipments),
__vehicles AS (SELECT * FROM vehicles)
SELECT * FROM __shipments
WHERE id IN (SELECT distinct(unnest(stops)) FROM __vehicles v WHERE id = 699)

seq | vehicle_seq | vehicle_id | stop_seq | stop_type | stop_id | order_id | cargo | travel_fd | arrival_ft | wait_fd | schedule_ft | service_fd | departure_ft | cvtot | twvtot | location
-----+-------------+------------+----------+-----------+---------+----------+-------+-----------+------------+---------+-------------+------------+--------------+-------+--------+----------
(0 rows)
Expand Down
43 changes: 0 additions & 43 deletions include/c_common/arrays_input.h

This file was deleted.

45 changes: 0 additions & 45 deletions include/c_common/matrixRows_input.h

This file was deleted.

53 changes: 0 additions & 53 deletions include/c_common/orders_input.h

This file was deleted.

49 changes: 0 additions & 49 deletions include/c_common/time_multipliers_input.h

This file was deleted.

58 changes: 0 additions & 58 deletions include/c_common/vehicles_input.h

This file was deleted.

46 changes: 0 additions & 46 deletions include/c_common/vroom/breaks_input.h

This file was deleted.

Loading