diff --git a/tests/tools/drt/drtOR-Tools/direct_route_factor_1/output.tools b/tests/tools/drt/drtOR-Tools/direct_route_factor_1/output.tools index 0079aedf6e3..53257f58b86 100644 --- a/tests/tools/drt/drtOR-Tools/direct_route_factor_1/output.tools +++ b/tests/tools/drt/drtOR-Tools/direct_route_factor_1/output.tools @@ -1,4 +1,3 @@ - Retrying in 1 seconds Simulation parameters: end: 600.0 interval: 30 @@ -23,9 +22,9 @@ Start solving the problem. Register distance callback. Add distance constraints... Add pickup and delivery constraints... -pickup/dropoff indexes (nodes): 0/2 (1/3) +pickup/dropoff nodes: 1/3 allow to reject new reservation 0 -pickup/dropoff indexes (nodes): 1/3 (2/4) +pickup/dropoff nodes: 2/4 allow to reject new reservation 1 Add direct route factor constraints... reservation 0 with direct route cost 680 * drf 1.0 = max cost 680 @@ -33,11 +32,11 @@ reservation 1 with direct route cost 385 * drf 1.0 = max cost 385 Add dropoff constraints... Add capacity constraints... Add time windows constraints... -window for index(node) 0(1): [1, 600] -window for index(node) 1(2): [1, 600] -window for index(node) 2(3): [1, 600] -window for index(node) 3(4): [1, 600] -window for index(node) 4(5): [1, 600] +window for node 1: [1, 600] +window for node 2: [1, 600] +window for node 3: [1, 600] +window for node 4: [1, 600] +window for node 5: [1, 600] ## Done Set solution heuristic... Start solving the problem. diff --git a/tests/tools/drt/drtOR-Tools/direct_route_factor_3/output.tools b/tests/tools/drt/drtOR-Tools/direct_route_factor_3/output.tools index 93027885ab6..91e3acc4f7c 100644 --- a/tests/tools/drt/drtOR-Tools/direct_route_factor_3/output.tools +++ b/tests/tools/drt/drtOR-Tools/direct_route_factor_3/output.tools @@ -1,4 +1,3 @@ - Retrying in 1 seconds Simulation parameters: end: 600.0 interval: 30 @@ -23,9 +22,9 @@ Start solving the problem. Register distance callback. Add distance constraints... Add pickup and delivery constraints... -pickup/dropoff indexes (nodes): 0/2 (1/3) +pickup/dropoff nodes: 1/3 allow to reject new reservation 0 -pickup/dropoff indexes (nodes): 1/3 (2/4) +pickup/dropoff nodes: 2/4 allow to reject new reservation 1 Add direct route factor constraints... reservation 0 with direct route cost 680 * drf 3.0 = max cost 2040 @@ -33,11 +32,11 @@ reservation 1 with direct route cost 385 * drf 3.0 = max cost 1155 Add dropoff constraints... Add capacity constraints... Add time windows constraints... -window for index(node) 0(1): [1, 600] -window for index(node) 1(2): [1, 600] -window for index(node) 2(3): [1, 600] -window for index(node) 3(4): [1, 600] -window for index(node) 4(5): [1, 600] +window for node 1: [1, 600] +window for node 2: [1, 600] +window for node 3: [1, 600] +window for node 4: [1, 600] +window for node 5: [1, 600] ## Done Set solution heuristic... Start solving the problem. diff --git a/tests/tools/drt/drtOR-Tools/oneTaxi_addNewReq/output.tools b/tests/tools/drt/drtOR-Tools/oneTaxi_addNewReq/output.tools index a089b4497db..dab3605bb82 100644 --- a/tests/tools/drt/drtOR-Tools/oneTaxi_addNewReq/output.tools +++ b/tests/tools/drt/drtOR-Tools/oneTaxi_addNewReq/output.tools @@ -1,3 +1,10 @@ +Simulation parameters: + end: 600.0 + interval: 30 + time_limit: 10 + cost_type: CostType.DISTANCE + drf: -1.0 + fix_allocation: False timestep: 0.0 Reservations waiting: ['0', '1'] Taxis empty: ('v0',) @@ -9,24 +16,35 @@ Reservation 0 starts at edge B0C0 Reservation 1 starts at edge C0D0 Reservation 0 ends at edge C1D1 Reservation 1 ends at edge D0D1 +Reservation 0 has direct route costs 680 +Reservation 1 has direct route costs 385 Start solving the problem. Register distance callback. Add distance constraints... Add pickup and delivery constraints... +pickup/dropoff nodes: 1/3 +allow to reject new reservation 0 +pickup/dropoff nodes: 2/4 +allow to reject new reservation 1 Add dropoff constraints... Add capacity constraints... Add time windows constraints... +window for node 1: [1, 600] +window for node 2: [1, 600] +window for node 3: [1, 600] +window for node 4: [1, 600] +window for node 5: [1, 600] ## Done Set solution heuristic... Start solving the problem. -Objective: 225735 +Objective: 2235 Route for vehicle 0: 5 (L: 0, C: 0, T: (1,310)) -> 1 (L: 1, C: 588, T: (43,352)) -> 2 (L: 2, C: 1174, T: (85,394)) -> 4 (L: 1, C: 1559, T: (176,485)) -> 3 (L: 0, C: 2235, T: (291,600)) - -> 0 (L: 0, C: 2235, T: (291,1972)) + -> 0 (L: 0, C: 2235, T: (291,600)) Costs of the route: 2235 Total cost of the routes: 2235 @@ -62,24 +80,33 @@ do reservations: ['0'] Reservation 2 starts at edge C2C1 Reservation 2 ends at edge D1D2 Drop-off of reservation 0 at edge C1D1 +Reservation 2 has direct route costs 485 Start solving the problem. Register distance callback. Add distance constraints... Add pickup and delivery constraints... +pickup/dropoff nodes: 1/2 +allow to reject new reservation 2 Add dropoff constraints... -reservation 0 in veh v0 (0) +reservation 0 in veh v0(0), droppoff node: 3 Add capacity constraints... Add time windows constraints... +window for node 1: [180, 600] +window for node 2: [180, 600] +window for node 3: [180, 600] +window for node 4: [180, 600] ## Done Set solution heuristic... Start solving the problem. -Objective: 125240 +Initial solution: +veh 0: [3] +Objective: 1240 Route for vehicle 0: 4 (L: 1, C: 0, T: (180,380)) -> 1 (L: 2, C: 470, T: (219,419)) -> 3 (L: 1, C: 855, T: (310,510)) -> 2 (L: 0, C: 1240, T: (400,600)) - -> 0 (L: 0, C: 1240, T: (400,897)) + -> 0 (L: 0, C: 1240, T: (400,600)) Costs of the route: 1240 Total cost of the routes: 1240 diff --git a/tests/tools/drt/drtOR-Tools/time_window1/output.tools b/tests/tools/drt/drtOR-Tools/time_window1/output.tools index c312956ca5c..f030672e56e 100644 --- a/tests/tools/drt/drtOR-Tools/time_window1/output.tools +++ b/tests/tools/drt/drtOR-Tools/time_window1/output.tools @@ -1,4 +1,3 @@ - Retrying in 1 seconds Simulation parameters: end: 600.0 interval: 30 @@ -23,9 +22,9 @@ Start solving the problem. Register distance callback. Add distance constraints... Add pickup and delivery constraints... -pickup/dropoff indexes (nodes): 0/2 (1/3) +pickup/dropoff nodes: 1/3 allow to reject new reservation 0 -pickup/dropoff indexes (nodes): 1/3 (2/4) +pickup/dropoff nodes: 2/4 allow to reject new reservation 1 Add direct route factor constraints... reservation 0 with direct route cost 680 * drf 1.5 = max cost 1020 @@ -33,11 +32,11 @@ reservation 1 with direct route cost 385 * drf 1.5 = max cost 578 Add dropoff constraints... Add capacity constraints... Add time windows constraints... -window for index(node) 0(1): [200, 600] -window for index(node) 1(2): [1, 600] -window for index(node) 2(3): [1, 600] -window for index(node) 3(4): [1, 190] -window for index(node) 4(5): [1, 600] +window for node 1: [200, 600] +window for node 2: [1, 600] +window for node 3: [1, 600] +window for node 4: [1, 190] +window for node 5: [1, 600] ## Done Set solution heuristic... Start solving the problem. diff --git a/tests/tools/drt/drtOR-Tools/time_window2/output.tools b/tests/tools/drt/drtOR-Tools/time_window2/output.tools index 3ce5d46e1e5..141ae880fab 100644 --- a/tests/tools/drt/drtOR-Tools/time_window2/output.tools +++ b/tests/tools/drt/drtOR-Tools/time_window2/output.tools @@ -1,4 +1,3 @@ - Retrying in 1 seconds Simulation parameters: end: 600.0 interval: 30 @@ -23,9 +22,9 @@ Start solving the problem. Register distance callback. Add distance constraints... Add pickup and delivery constraints... -pickup/dropoff indexes (nodes): 0/2 (1/3) +pickup/dropoff nodes: 1/3 allow to reject new reservation 0 -pickup/dropoff indexes (nodes): 1/3 (2/4) +pickup/dropoff nodes: 2/4 allow to reject new reservation 1 Add direct route factor constraints... reservation 0 with direct route cost 680 * drf 1.5 = max cost 1020 @@ -33,11 +32,11 @@ reservation 1 with direct route cost 385 * drf 1.5 = max cost 578 Add dropoff constraints... Add capacity constraints... Add time windows constraints... -window for index(node) 0(1): [1, 600] -window for index(node) 1(2): [200, 600] -window for index(node) 2(3): [1, 190] -window for index(node) 3(4): [1, 600] -window for index(node) 4(5): [1, 600] +window for node 1: [1, 600] +window for node 2: [200, 600] +window for node 3: [1, 190] +window for node 4: [1, 600] +window for node 5: [1, 600] ## Done Set solution heuristic... Start solving the problem. diff --git a/tests/tools/drt/drtOR-Tools/twoTaxis/output.tools b/tests/tools/drt/drtOR-Tools/twoTaxis/output.tools index 2764461ffbb..712661b8502 100644 --- a/tests/tools/drt/drtOR-Tools/twoTaxis/output.tools +++ b/tests/tools/drt/drtOR-Tools/twoTaxis/output.tools @@ -1,3 +1,10 @@ +Simulation parameters: + end: 900.0 + interval: 30 + time_limit: 10 + cost_type: CostType.DISTANCE + drf: -1.0 + fix_allocation: False timestep: 0.0 Reservations waiting: ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'] Taxis empty: ('v0', 'v1') @@ -25,53 +32,105 @@ Reservation 6 ends at edge C2D2 Reservation 7 ends at edge C0C1 Reservation 8 ends at edge B2B1 Reservation 9 ends at edge E0D0 +Reservation 0 has direct route costs 870 +Reservation 1 has direct route costs 771 +Reservation 2 has direct route costs 785 +Reservation 3 has direct route costs 770 +Reservation 4 has direct route costs 1576 +Reservation 5 has direct route costs 777 +Reservation 6 has direct route costs 1166 +Reservation 7 has direct route costs 565 +Reservation 8 has direct route costs 276 +Reservation 9 has direct route costs 1575 Start solving the problem. Register distance callback. Add distance constraints... Add pickup and delivery constraints... +pickup/dropoff nodes: 1/11 +allow to reject new reservation 0 +pickup/dropoff nodes: 2/12 +allow to reject new reservation 1 +pickup/dropoff nodes: 3/13 +allow to reject new reservation 2 +pickup/dropoff nodes: 4/14 +allow to reject new reservation 3 +pickup/dropoff nodes: 5/15 +allow to reject new reservation 4 +pickup/dropoff nodes: 6/16 +allow to reject new reservation 5 +pickup/dropoff nodes: 7/17 +allow to reject new reservation 6 +pickup/dropoff nodes: 8/18 +allow to reject new reservation 7 +pickup/dropoff nodes: 9/19 +allow to reject new reservation 8 +pickup/dropoff nodes: 10/20 +allow to reject new reservation 9 Add dropoff constraints... Add capacity constraints... Add time windows constraints... +window for node 1: [1, 900] +window for node 2: [1, 900] +window for node 3: [1, 900] +window for node 4: [1, 900] +window for node 5: [1, 900] +window for node 6: [1, 900] +window for node 7: [1, 900] +window for node 8: [1, 900] +window for node 9: [1, 900] +window for node 10: [1, 900] +window for node 11: [1, 900] +window for node 12: [1, 900] +window for node 13: [1, 900] +window for node 14: [1, 900] +window for node 15: [1, 900] +window for node 16: [1, 900] +window for node 17: [1, 900] +window for node 18: [1, 900] +window for node 19: [1, 900] +window for node 20: [1, 900] +window for node 21: [1, 900] +window for node 22: [1, 900] ## Done Set solution heuristic... Start solving the problem. -Objective: 534198 +Objective: 9617 Route for vehicle 0: - 21 (L: 0, C: 0, T: (1,178)) - -> 9 (L: 1, C: 387, T: (33,210)) - -> 4 (L: 2, C: 772, T: (64,241)) - -> 5 (L: 3, C: 1159, T: (94,271)) - -> 19 (L: 2, C: 1835, T: (150,327)) - -> 14 (L: 1, C: 1921, T: (216,393)) - -> 3 (L: 2, C: 2486, T: (264,441)) - -> 6 (L: 3, C: 3071, T: (312,489)) - -> 8 (L: 4, C: 3157, T: (318,495)) - -> 18 (L: 3, C: 3722, T: (426,603)) - -> 13 (L: 2, C: 4502, T: (547,724)) - -> 15 (L: 1, C: 4678, T: (622,799)) - -> 16 (L: 0, C: 5160, T: (723,900)) - -> 0 (L: 0, C: 5160, T: (723,42936)) -Costs of the route: 5160 + 21 (L: 0, C: 0, T: (1,315)) + -> 9 (L: 1, C: 387, T: (33,347)) + -> 4 (L: 2, C: 772, T: (64,378)) + -> 5 (L: 3, C: 1159, T: (94,408)) + -> 19 (L: 2, C: 1835, T: (150,464)) + -> 14 (L: 1, C: 1921, T: (216,530)) + -> 3 (L: 2, C: 2486, T: (264,578)) + -> 6 (L: 3, C: 3071, T: (312,626)) + -> 13 (L: 2, C: 3551, T: (410,724)) + -> 15 (L: 1, C: 3727, T: (485,799)) + -> 16 (L: 0, C: 4209, T: (586,900)) + -> 0 (L: 0, C: 4209, T: (586,900)) +Costs of the route: 4209 Route for vehicle 1: - 22 (L: 0, C: 0, T: (1,257)) - -> 2 (L: 1, C: 382, T: (29,285)) - -> 1 (L: 2, C: 867, T: (70,326)) - -> 10 (L: 3, C: 1337, T: (107,363)) - -> 11 (L: 2, C: 2022, T: (221,477)) - -> 12 (L: 1, C: 2802, T: (343,599)) - -> 7 (L: 2, C: 3388, T: (385,641)) - -> 20 (L: 1, C: 4163, T: (504,760)) - -> 17 (L: 0, C: 5238, T: (644,900)) - -> 0 (L: 0, C: 5238, T: (644,42936)) -Costs of the route: 5238 + 22 (L: 0, C: 0, T: (1,1)) + -> 2 (L: 1, C: 382, T: (29,29)) + -> 1 (L: 2, C: 867, T: (70,70)) + -> 10 (L: 3, C: 1337, T: (107,107)) + -> 11 (L: 2, C: 2022, T: (221,221)) + -> 8 (L: 3, C: 2707, T: (274,274)) + -> 7 (L: 4, C: 3187, T: (311,311)) + -> 20 (L: 3, C: 3962, T: (430,430)) + -> 18 (L: 2, C: 4642, T: (540,540)) + -> 17 (L: 1, C: 5122, T: (637,637)) + -> 12 (L: 0, C: 5408, T: (718,718)) + -> 0 (L: 0, C: 5408, T: (718,718)) +Costs of the route: 5408 -Total cost of the routes: 10398 +Total cost of the routes: 9617 Start interpreting the solution for SUMO. -Dispatching v0 with ['8', '3', '4', '8', '3', '2', '5', '7', '7', '2', '4', '5'] -Costs for v0: 5160 -Dispatching v1 with ['1', '0', '9', '0', '1', '6', '9', '6'] -Costs for v1: 10398 +Dispatching v0 with ['8', '3', '4', '8', '3', '2', '5', '2', '4', '5'] +Costs for v0: 4209 +Dispatching v1 with ['1', '0', '9', '0', '7', '6', '9', '7', '6', '1'] +Costs for v1: 9617 timestep: 30.0 Reservations being picked up: ['0', '1', '2', '3', '4', '5', '6', '7', '9'] Reservations en route: ['8'] @@ -121,62 +180,51 @@ Taxis picking up: ('v0', 'v1') Taxis occupied: ('v0', 'v1') Taxis occupied and picking up: ('v0', 'v1') timestep: 270.0 -Reservations being picked up: ['5', '6', '7'] -Reservations en route: ['1', '2', '4', '9'] +Reservations being picked up: ['5', '6'] +Reservations en route: ['1', '2', '4', '7', '9'] Taxis picking up: ('v0', 'v1') Taxis occupied: ('v0', 'v1') Taxis occupied and picking up: ('v0', 'v1') timestep: 300.0 -Reservations being picked up: ['6'] -Reservations en route: ['1', '2', '4', '5', '7', '9'] -Taxis picking up: ('v1',) +Reservations en route: ['1', '2', '4', '5', '6', '7', '9'] Taxis occupied: ('v0', 'v1') -Taxis occupied and picking up: ('v1',) timestep: 330.0 -Reservations being picked up: ['6'] -Reservations en route: ['1', '2', '4', '5', '7', '9'] -Taxis picking up: ('v1',) +Reservations en route: ['1', '2', '4', '5', '6', '7', '9'] Taxis occupied: ('v0', 'v1') -Taxis occupied and picking up: ('v1',) timestep: 360.0 -Reservations en route: ['2', '4', '5', '6', '7', '9'] +Reservations en route: ['1', '2', '4', '5', '6', '7', '9'] Taxis occupied: ('v0', 'v1') timestep: 390.0 -Reservations en route: ['2', '4', '5', '6', '7', '9'] +Reservations en route: ['1', '2', '4', '5', '6', '7', '9'] Taxis occupied: ('v0', 'v1') timestep: 420.0 -Reservations en route: ['2', '4', '5', '6', '9'] +Reservations en route: ['1', '4', '5', '6', '7'] Taxis occupied: ('v0', 'v1') timestep: 450.0 -Reservations en route: ['2', '4', '5', '6', '9'] +Reservations en route: ['1', '4', '5', '6', '7'] Taxis occupied: ('v0', 'v1') timestep: 480.0 -Reservations en route: ['2', '4', '5', '6'] +Reservations en route: ['1', '5', '6', '7'] Taxis occupied: ('v0', 'v1') timestep: 510.0 -Reservations en route: ['2', '4', '5', '6'] +Reservations en route: ['1', '5', '6', '7'] Taxis occupied: ('v0', 'v1') timestep: 540.0 -Reservations en route: ['4', '5', '6'] +Reservations en route: ['1', '5', '6'] Taxis occupied: ('v0', 'v1') timestep: 570.0 -Reservations en route: ['4', '5', '6'] +Reservations en route: ['1', '5', '6'] Taxis occupied: ('v0', 'v1') timestep: 600.0 -Reservations en route: ['4', '5', '6'] -Taxis occupied: ('v0', 'v1') +Reservations en route: ['1', '6'] +Taxis empty: ('v0',) +Taxis occupied: ('v1',) timestep: 630.0 -Reservations en route: ['5'] -Taxis empty: ('v1',) -Taxis occupied: ('v0',) +Taxis empty: ('v0', 'v1') timestep: 660.0 -Reservations en route: ['5'] -Taxis empty: ('v1',) -Taxis occupied: ('v0',) +Taxis empty: ('v0', 'v1') timestep: 690.0 -Reservations en route: ['5'] -Taxis empty: ('v1',) -Taxis occupied: ('v0',) +Taxis empty: ('v0', 'v1') timestep: 720.0 Taxis empty: ('v0', 'v1') timestep: 750.0 diff --git a/tests/tools/drt/drtOR-Tools/twoTaxis/tripinfos.tools b/tests/tools/drt/drtOR-Tools/twoTaxis/tripinfos.tools index 22f8cb5d4ca..6d7bfef8bc5 100644 --- a/tests/tools/drt/drtOR-Tools/twoTaxis/tripinfos.tools +++ b/tests/tools/drt/drtOR-Tools/twoTaxis/tripinfos.tools @@ -1,6 +1,6 @@ - - + - + - + diff --git a/tests/tools/drt/drtOrtools/output.tools b/tests/tools/drt/drtOrtools/output.tools index 4ec6abd20c6..21c581ee8f4 100644 --- a/tests/tools/drt/drtOrtools/output.tools +++ b/tests/tools/drt/drtOrtools/output.tools @@ -1,3 +1,10 @@ +Simulation parameters: + end: 900.0 + interval: 30 + time_limit: 10 + cost_type: CostType.DISTANCE + drf: 1.5 + fix_allocation: False timestep: 0.0 Reservations waiting: ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'] Taxis empty: ('v0', 'v1') @@ -25,182 +32,255 @@ Reservation 6 ends at edge C2D2 Reservation 7 ends at edge C0C1 Reservation 8 ends at edge B2B1 Reservation 9 ends at edge E0D0 +Reservation 0 has direct route costs 870 +Reservation 1 has direct route costs 771 +Reservation 2 has direct route costs 785 +Reservation 3 has direct route costs 770 +Reservation 4 has direct route costs 1576 +Reservation 5 has direct route costs 777 +Reservation 6 has direct route costs 1166 +Reservation 7 has direct route costs 565 +Reservation 8 has direct route costs 276 +Reservation 9 has direct route costs 1575 Start solving the problem. Register distance callback. Add distance constraints... Add pickup and delivery constraints... +pickup/dropoff nodes: 1/11 +allow to reject new reservation 0 +pickup/dropoff nodes: 2/12 +allow to reject new reservation 1 +pickup/dropoff nodes: 3/13 +allow to reject new reservation 2 +pickup/dropoff nodes: 4/14 +allow to reject new reservation 3 +pickup/dropoff nodes: 5/15 +allow to reject new reservation 4 +pickup/dropoff nodes: 6/16 +allow to reject new reservation 5 +pickup/dropoff nodes: 7/17 +allow to reject new reservation 6 +pickup/dropoff nodes: 8/18 +allow to reject new reservation 7 +pickup/dropoff nodes: 9/19 +allow to reject new reservation 8 +pickup/dropoff nodes: 10/20 +allow to reject new reservation 9 Add direct route factor constraints... +reservation 0 with direct route cost 870 * drf 1.5 = max cost 1305 +reservation 1 with direct route cost 771 * drf 1.5 = max cost 1156 +reservation 2 with direct route cost 785 * drf 1.5 = max cost 1178 +reservation 3 with direct route cost 770 * drf 1.5 = max cost 1155 +reservation 4 with direct route cost 1576 * drf 1.5 = max cost 2364 +reservation 5 with direct route cost 777 * drf 1.5 = max cost 1166 +reservation 6 with direct route cost 1166 * drf 1.5 = max cost 1749 +reservation 7 with direct route cost 565 * drf 1.5 = max cost 848 +reservation 8 with direct route cost 276 * drf 1.5 = max cost 414 +reservation 9 with direct route cost 1575 * drf 1.5 = max cost 2362 Add dropoff constraints... Add capacity constraints... Add time windows constraints... +window for node 1: [1, 900] +window for node 2: [1, 900] +window for node 3: [1, 900] +window for node 4: [1, 900] +window for node 5: [1, 900] +window for node 6: [1, 900] +window for node 7: [1, 900] +window for node 8: [1, 900] +window for node 9: [1, 900] +window for node 10: [1, 900] +window for node 11: [1, 900] +window for node 12: [1, 900] +window for node 13: [1, 900] +window for node 14: [1, 900] +window for node 15: [1, 900] +window for node 16: [1, 900] +window for node 17: [1, 900] +window for node 18: [1, 900] +window for node 19: [1, 900] +window for node 20: [1, 900] +window for node 21: [1, 900] +window for node 22: [1, 900] ## Done Set solution heuristic... Start solving the problem. -Objective: 643224 +Objective: 12035 Route for vehicle 0: - 21 (L: 0, C: 0, T: (1,185)) - -> 5 (L: 1, C: 766, T: (65,249)) - -> 7 (L: 2, C: 2247, T: (178,362)) - -> 15 (L: 1, C: 2627, T: (266,450)) - -> 17 (L: 0, C: 3696, T: (410,594)) - -> 3 (L: 1, C: 4372, T: (466,650)) - -> 6 (L: 2, C: 4957, T: (514,698)) - -> 13 (L: 1, C: 5437, T: (612,796)) - -> 16 (L: 0, C: 6015, T: (716,900)) - -> 0 (L: 0, C: 6015, T: (716,42936)) -Costs of the route: 6015 + 21 (L: 0, C: 0, T: (1,1)) + -> 4 (L: 1, C: 687, T: (58,58)) + -> 5 (L: 2, C: 1074, T: (88,88)) + -> 9 (L: 3, C: 1560, T: (127,127)) + -> 14 (L: 2, C: 1836, T: (149,149)) + -> 19 (L: 1, C: 1922, T: (215,215)) + -> 7 (L: 2, C: 2993, T: (298,298)) + -> 15 (L: 1, C: 3373, T: (386,386)) + -> 17 (L: 0, C: 4442, T: (530,530)) + -> 1 (L: 1, C: 5211, T: (589,589)) + -> 11 (L: 0, C: 6081, T: (719,719)) + -> 0 (L: 0, C: 6081, T: (719,719)) +Costs of the route: 6081 Route for vehicle 1: - 22 (L: 0, C: 0, T: (1,47)) - -> 4 (L: 1, C: 677, T: (51,97)) - -> 9 (L: 2, C: 1438, T: (113,159)) - -> 14 (L: 1, C: 1714, T: (135,181)) - -> 19 (L: 0, C: 1800, T: (201,247)) - -> 2 (L: 1, C: 1886, T: (267,313)) - -> 12 (L: 0, C: 2657, T: (389,435)) - -> 8 (L: 1, C: 3227, T: (433,479)) - -> 18 (L: 0, C: 3792, T: (541,587)) - -> 1 (L: 1, C: 3978, T: (554,600)) - -> 10 (L: 2, C: 4448, T: (591,637)) - -> 11 (L: 1, C: 5133, T: (705,751)) - -> 20 (L: 0, C: 6309, T: (854,900)) - -> 0 (L: 0, C: 6309, T: (854,42936)) -Costs of the route: 6309 + 22 (L: 0, C: 0, T: (1,128)) + -> 2 (L: 1, C: 382, T: (29,156)) + -> 12 (L: 0, C: 1153, T: (151,278)) + -> 8 (L: 1, C: 1723, T: (195,322)) + -> 18 (L: 0, C: 2288, T: (303,430)) + -> 10 (L: 1, C: 2673, T: (334,461)) + -> 3 (L: 2, C: 3442, T: (395,522)) + -> 13 (L: 1, C: 4227, T: (519,646)) + -> 20 (L: 0, C: 4797, T: (625,752)) + -> 6 (L: 1, C: 5177, T: (653,780)) + -> 16 (L: 0, C: 5954, T: (773,900)) + -> 0 (L: 0, C: 5954, T: (773,900)) +Costs of the route: 5954 -Total cost of the routes: 12324 +Total cost of the routes: 12035 Start interpreting the solution for SUMO. -Dispatching v0 with ['4', '6', '4', '6', '2', '5', '2', '5'] -Costs for v0: 6015 -Dispatching v1 with ['3', '8', '3', '8', '1', '1', '7', '7', '0', '9', '0', '9'] -Costs for v1: 12324 +Dispatching v0 with ['3', '4', '8', '3', '8', '6', '4', '6', '0', '0'] +Costs for v0: 6081 +Dispatching v1 with ['1', '1', '7', '7', '9', '2', '2', '9', '5', '5'] +Costs for v1: 12035 timestep: 30.0 Reservations being picked up: ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'] Taxis picking up: ('v0', 'v1') timestep: 60.0 -Reservations being picked up: ['0', '1', '2', '4', '5', '6', '7', '8', '9'] -Reservations en route: ['3'] +Reservations being picked up: ['0', '2', '4', '5', '6', '7', '8', '9'] +Reservations en route: ['1', '3'] Taxis picking up: ('v0', 'v1') -Taxis occupied: ('v1',) -Taxis occupied and picking up: ('v1',) +Taxis occupied: ('v0', 'v1') +Taxis occupied and picking up: ('v0', 'v1') timestep: 90.0 -Reservations being picked up: ['0', '1', '2', '5', '6', '7', '8', '9'] -Reservations en route: ['3', '4'] +Reservations being picked up: ['0', '2', '5', '6', '7', '8', '9'] +Reservations en route: ['1', '3', '4'] Taxis picking up: ('v0', 'v1') Taxis occupied: ('v0', 'v1') Taxis occupied and picking up: ('v0', 'v1') timestep: 120.0 -Reservations being picked up: ['0', '1', '2', '5', '6', '7', '9'] -Reservations en route: ['3', '4', '8'] +Reservations being picked up: ['0', '2', '5', '6', '7', '9'] +Reservations en route: ['1', '3', '4', '8'] Taxis picking up: ('v0', 'v1') Taxis occupied: ('v0', 'v1') Taxis occupied and picking up: ('v0', 'v1') timestep: 150.0 -Reservations being picked up: ['0', '1', '2', '5', '6', '7', '9'] -Reservations en route: ['3', '4', '8'] +Reservations being picked up: ['0', '2', '5', '6', '7', '9'] +Reservations en route: ['1', '3', '4', '8'] Taxis picking up: ('v0', 'v1') Taxis occupied: ('v0', 'v1') Taxis occupied and picking up: ('v0', 'v1') timestep: 180.0 -Reservations being picked up: ['0', '1', '2', '5', '7', '9'] -Reservations en route: ['3', '4', '6', '8'] -Taxis picking up: ('v0', 'v1') -Taxis occupied: ('v0', 'v1') -Taxis occupied and picking up: ('v0', 'v1') -timestep: 210.0 -Reservations being picked up: ['0', '1', '2', '5', '7', '9'] -Reservations en route: ['4', '6'] +Reservations being picked up: ['0', '2', '5', '6', '7', '9'] +Reservations en route: ['3', '4', '8'] Taxis picking up: ('v0', 'v1') Taxis occupied: ('v0',) Taxis occupied and picking up: ('v0',) +timestep: 210.0 +Reservations being picked up: ['0', '2', '5', '6', '9'] +Reservations en route: ['4', '7'] +Taxis picking up: ('v0', 'v1') +Taxis occupied: ('v0', 'v1') +Taxis occupied and picking up: ('v0', 'v1') timestep: 240.0 -Reservations being picked up: ['0', '2', '5', '7', '9'] -Reservations en route: ['1', '4', '6'] +Reservations being picked up: ['0', '2', '5', '6', '9'] +Reservations en route: ['4', '7'] Taxis picking up: ('v0', 'v1') Taxis occupied: ('v0', 'v1') Taxis occupied and picking up: ('v0', 'v1') timestep: 270.0 -Reservations being picked up: ['0', '2', '5', '7', '9'] -Reservations en route: ['1', '6'] +Reservations being picked up: ['0', '2', '5', '9'] +Reservations en route: ['4', '6', '7'] Taxis picking up: ('v0', 'v1') Taxis occupied: ('v0', 'v1') Taxis occupied and picking up: ('v0', 'v1') timestep: 300.0 -Reservations being picked up: ['0', '2', '5', '7', '9'] -Reservations en route: ['1', '6'] +Reservations being picked up: ['0', '2', '5', '9'] +Reservations en route: ['4', '6', '7'] Taxis picking up: ('v0', 'v1') Taxis occupied: ('v0', 'v1') Taxis occupied and picking up: ('v0', 'v1') timestep: 330.0 -Reservations being picked up: ['0', '2', '5', '7', '9'] -Reservations en route: ['1', '6'] +Reservations being picked up: ['0', '2', '5'] +Reservations en route: ['4', '6', '9'] Taxis picking up: ('v0', 'v1') Taxis occupied: ('v0', 'v1') Taxis occupied and picking up: ('v0', 'v1') timestep: 360.0 -Reservations being picked up: ['0', '2', '5', '7', '9'] -Reservations en route: ['6'] +Reservations being picked up: ['0', '2', '5'] +Reservations en route: ['4', '6', '9'] Taxis picking up: ('v0', 'v1') -Taxis occupied: ('v0',) -Taxis occupied and picking up: ('v0',) +Taxis occupied: ('v0', 'v1') +Taxis occupied and picking up: ('v0', 'v1') timestep: 390.0 -Reservations being picked up: ['0', '2', '5', '9'] -Reservations en route: ['6', '7'] +Reservations being picked up: ['0', '5'] +Reservations en route: ['2', '6', '9'] Taxis picking up: ('v0', 'v1') Taxis occupied: ('v0', 'v1') Taxis occupied and picking up: ('v0', 'v1') timestep: 420.0 -Reservations being picked up: ['0', '2', '5', '9'] -Reservations en route: ['7'] +Reservations being picked up: ['0', '5'] +Reservations en route: ['2', '6', '9'] Taxis picking up: ('v0', 'v1') -Taxis occupied: ('v1',) -Taxis occupied and picking up: ('v1',) +Taxis occupied: ('v0', 'v1') +Taxis occupied and picking up: ('v0', 'v1') timestep: 450.0 -Reservations being picked up: ['0', '5', '9'] -Reservations en route: ['2', '7'] +Reservations being picked up: ['0', '5'] +Reservations en route: ['2', '6', '9'] Taxis picking up: ('v0', 'v1') Taxis occupied: ('v0', 'v1') Taxis occupied and picking up: ('v0', 'v1') timestep: 480.0 -Reservations being picked up: ['0', '5', '9'] -Reservations en route: ['2', '7'] +Reservations being picked up: ['0', '5'] +Reservations en route: ['2', '6', '9'] Taxis picking up: ('v0', 'v1') Taxis occupied: ('v0', 'v1') Taxis occupied and picking up: ('v0', 'v1') timestep: 510.0 -Reservations being picked up: ['0', '9'] -Reservations en route: ['2', '5'] -Taxis picking up: ('v1',) -Taxis occupied: ('v0',) -timestep: 540.0 -Reservations en route: ['0', '2', '5', '9'] +Reservations being picked up: ['0', '5'] +Reservations en route: ['2', '6', '9'] +Taxis picking up: ('v0', 'v1') Taxis occupied: ('v0', 'v1') +Taxis occupied and picking up: ('v0', 'v1') +timestep: 540.0 +Reservations being picked up: ['0', '5'] +Reservations en route: ['9'] +Taxis picking up: ('v0', 'v1') +Taxis occupied: ('v1',) +Taxis occupied and picking up: ('v1',) timestep: 570.0 -Reservations en route: ['0', '2', '5', '9'] +Reservations being picked up: ['5'] +Reservations en route: ['0', '9'] +Taxis picking up: ('v1',) Taxis occupied: ('v0', 'v1') +Taxis occupied and picking up: ('v1',) timestep: 600.0 -Reservations en route: ['0', '2', '5', '9'] +Reservations being picked up: ['5'] +Reservations en route: ['0', '9'] +Taxis picking up: ('v1',) Taxis occupied: ('v0', 'v1') +Taxis occupied and picking up: ('v1',) timestep: 630.0 -Reservations en route: ['0', '5', '9'] +Reservations being picked up: ['5'] +Reservations en route: ['0', '9'] +Taxis picking up: ('v1',) Taxis occupied: ('v0', 'v1') +Taxis occupied and picking up: ('v1',) timestep: 660.0 -Reservations en route: ['0', '5', '9'] +Reservations en route: ['0', '5'] Taxis occupied: ('v0', 'v1') timestep: 690.0 -Reservations en route: ['5', '9'] +Reservations en route: ['0', '5'] Taxis occupied: ('v0', 'v1') timestep: 720.0 -Reservations en route: ['9'] +Reservations en route: ['5'] Taxis empty: ('v0',) Taxis occupied: ('v1',) timestep: 750.0 -Reservations en route: ['9'] +Reservations en route: ['5'] Taxis empty: ('v0',) Taxis occupied: ('v1',) timestep: 780.0 -Reservations en route: ['9'] -Taxis empty: ('v0',) -Taxis occupied: ('v1',) +Taxis empty: ('v0', 'v1') timestep: 810.0 Taxis empty: ('v0', 'v1') timestep: 840.0 diff --git a/tests/tools/drt/drtOrtools/tripinfos.tools b/tests/tools/drt/drtOrtools/tripinfos.tools index 48f09d86082..191aa091ab2 100644 --- a/tests/tools/drt/drtOrtools/tripinfos.tools +++ b/tests/tools/drt/drtOrtools/tripinfos.tools @@ -1,6 +1,6 @@ - + + + - + - + - - + + - - + + - - - - + - + + + + - + - - - - + - - + + - - + + diff --git a/tests/tools/drt/drtOrtools/xmlstats.tools b/tests/tools/drt/drtOrtools/xmlstats.tools index 32e95a3e9b9..46c477e1233 100644 --- a/tests/tools/drt/drtOrtools/xmlstats.tools +++ b/tests/tools/drt/drtOrtools/xmlstats.tools @@ -1,6 +1,6 @@ -