-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/develop' into merschformann/reen…
…able-auto-benchmarks
- Loading branch information
Showing
109 changed files
with
10,128 additions
and
73 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,4 +3,4 @@ pydantic>=2.5.2 | |
| ruff>=0.1.7 | ||
| twine>=4.0.2 | ||
| hatch>=1.13.0 | ||
| nextmv>=0.13.1 | ||
| nextmv>=0.14.1 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
208 changes: 208 additions & 0 deletions
208
tests/golden/testdata/activation_penalty.json.python.golden
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,208 @@ | ||
| { | ||
| "options": { | ||
| "check_duration": 30, | ||
| "check_verbosity": "off", | ||
| "format_disable_progression": true, | ||
| "input": "input.json", | ||
| "model_constraints_disable_attributes": false, | ||
| "model_constraints_disable_capacities": [], | ||
| "model_constraints_disable_capacity": false, | ||
| "model_constraints_disable_distancelimit": false, | ||
| "model_constraints_disable_groups": false, | ||
| "model_constraints_disable_maximumduration": false, | ||
| "model_constraints_disable_maximumstops": false, | ||
| "model_constraints_disable_maximumwaitstop": false, | ||
| "model_constraints_disable_maximumwaitvehicle": false, | ||
| "model_constraints_disable_mixingitems": false, | ||
| "model_constraints_disable_precedence": false, | ||
| "model_constraints_disable_starttimewindows": false, | ||
| "model_constraints_disable_vehicleendtime": false, | ||
| "model_constraints_disable_vehiclestarttime": false, | ||
| "model_constraints_enable_cluster": false, | ||
| "model_objectives_capacities": "", | ||
| "model_objectives_cluster": 0, | ||
| "model_objectives_earlyarrivalpenalty": 1, | ||
| "model_objectives_latearrivalpenalty": 1, | ||
| "model_objectives_minstops": 1, | ||
| "model_objectives_travelduration": 0, | ||
| "model_objectives_unplannedpenalty": 1, | ||
| "model_objectives_vehicleactivationpenalty": 1, | ||
| "model_objectives_vehiclesduration": 1, | ||
| "model_properties_disable_durationgroups": false, | ||
| "model_properties_disable_durations": false, | ||
| "model_properties_disable_initialsolution": false, | ||
| "model_properties_disable_stopdurationmultipliers": false, | ||
| "model_validate_disable_resources": false, | ||
| "model_validate_disable_starttime": false, | ||
| "model_validate_enable_matrix": false, | ||
| "model_validate_enable_matrixasymmetrytolerance": 20, | ||
| "output": "output.json", | ||
| "solve_duration": 10, | ||
| "solve_iterations": 50, | ||
| "solve_parallelruns": 1, | ||
| "solve_rundeterministically": true, | ||
| "solve_startsolutions": 1 | ||
| }, | ||
| "solution": { | ||
| "objective": { | ||
| "name": "1 * vehicle_activation_penalty + 1 * vehicles_duration + 1 * unplanned_penalty", | ||
| "objectives": [ | ||
| { | ||
| "factor": 1, | ||
| "name": "vehicle_activation_penalty", | ||
| "value": 0 | ||
| }, | ||
| { | ||
| "base": 909.0466359667602, | ||
| "factor": 1, | ||
| "name": "vehicles_duration", | ||
| "value": 909.0466359667602 | ||
| }, | ||
| { | ||
| "factor": 1, | ||
| "name": "unplanned_penalty", | ||
| "value": 0 | ||
| } | ||
| ], | ||
| "value": 909.0466359667602 | ||
| }, | ||
| "unplanned": [], | ||
| "vehicles": [ | ||
| { | ||
| "id": "v1", | ||
| "route": [], | ||
| "route_duration": 0, | ||
| "route_travel_duration": 0 | ||
| }, | ||
| { | ||
| "id": "v2", | ||
| "route": [ | ||
| { | ||
| "cumulative_travel_duration": 0, | ||
| "stop": { | ||
| "id": "v2-start", | ||
| "location": { | ||
| "lat": 35.017209, | ||
| "lon": 135.672009 | ||
| } | ||
| }, | ||
| "travel_duration": 0 | ||
| }, | ||
| { | ||
| "cumulative_travel_duration": 0, | ||
| "stop": { | ||
| "id": "Arashiyama Bamboo Forest", | ||
| "location": { | ||
| "lat": 35.017209, | ||
| "lon": 135.672009 | ||
| } | ||
| }, | ||
| "travel_duration": 0 | ||
| }, | ||
| { | ||
| "cumulative_travel_distance": 5752, | ||
| "cumulative_travel_duration": 287, | ||
| "stop": { | ||
| "id": "Kinkaku-ji", | ||
| "location": { | ||
| "lat": 35.039705, | ||
| "lon": 135.728898 | ||
| } | ||
| }, | ||
| "travel_distance": 5752, | ||
| "travel_duration": 287 | ||
| }, | ||
| { | ||
| "cumulative_travel_distance": 9081, | ||
| "cumulative_travel_duration": 454, | ||
| "stop": { | ||
| "id": "Nijō Castle", | ||
| "location": { | ||
| "lat": 35.014239, | ||
| "lon": 135.748134 | ||
| } | ||
| }, | ||
| "travel_distance": 3329, | ||
| "travel_duration": 166 | ||
| }, | ||
| { | ||
| "cumulative_travel_distance": 10857, | ||
| "cumulative_travel_duration": 542, | ||
| "stop": { | ||
| "id": "Kyoto Imperial Palace", | ||
| "location": { | ||
| "lat": 35.025431, | ||
| "lon": 135.762057 | ||
| } | ||
| }, | ||
| "travel_distance": 1776, | ||
| "travel_duration": 88 | ||
| }, | ||
| { | ||
| "cumulative_travel_distance": 13696, | ||
| "cumulative_travel_duration": 684, | ||
| "stop": { | ||
| "id": "Gionmachi", | ||
| "location": { | ||
| "lat": 35.002457, | ||
| "lon": 135.775682 | ||
| } | ||
| }, | ||
| "travel_distance": 2839, | ||
| "travel_duration": 141 | ||
| }, | ||
| { | ||
| "cumulative_travel_distance": 14897, | ||
| "cumulative_travel_duration": 745, | ||
| "stop": { | ||
| "id": "Kiyomizu-dera", | ||
| "location": { | ||
| "lat": 34.994857, | ||
| "lon": 135.78506 | ||
| } | ||
| }, | ||
| "travel_distance": 1201, | ||
| "travel_duration": 60 | ||
| }, | ||
| { | ||
| "cumulative_travel_distance": 18177, | ||
| "cumulative_travel_duration": 909, | ||
| "stop": { | ||
| "id": "Fushimi Inari Taisha", | ||
| "location": { | ||
| "lat": 34.967146, | ||
| "lon": 135.772695 | ||
| } | ||
| }, | ||
| "travel_distance": 3280, | ||
| "travel_duration": 164 | ||
| } | ||
| ], | ||
| "route_duration": 909, | ||
| "route_travel_distance": 18177, | ||
| "route_travel_duration": 909 | ||
| } | ||
| ] | ||
| }, | ||
| "statistics": { | ||
| "result": { | ||
| "custom": { | ||
| "activated_vehicles": 1, | ||
| "max_duration": 0.123, | ||
| "max_stops_in_vehicle": 7, | ||
| "max_travel_duration": 0.123, | ||
| "min_duration": 0.123, | ||
| "min_stops_in_vehicle": 7, | ||
| "min_travel_duration": 0.123, | ||
| "unplanned_stops": 0 | ||
| }, | ||
| "duration": 0.123, | ||
| "value": 0.123 | ||
| }, | ||
| "run": { | ||
| "duration": 0.123, | ||
| "iterations": 50 | ||
| }, | ||
| "schema": "v1" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.