Skip to content

Commit

Permalink
Updating expectation for new app output style
Browse files Browse the repository at this point in the history
  • Loading branch information
@merschformann
merschformann committed Dec 16, 2024
1 parent 5f7bc41 commit 383d6c7
Show file tree
Hide file tree
Showing 47 changed files with 8,286 additions and 9,837 deletions.
371 changes: 169 additions & 202 deletions tests/golden/testdata/activation_penalty.json.golden
View file
Original file line number Diff line number Diff line change
@@ -1,219 +1,189 @@
{
"options": {
"check": {
"duration": 30000000000,
"verbosity": "off"
},
"format": {
"disable": {
"progression": true
}
},
"model": {
"constraints": {
"disable": {
"attributes": false,
"capacities": null,
"capacity": false,
"distance_limit": false,
"groups": false,
"maximum_duration": false,
"maximum_stops": false,
"maximum_wait_stop": false,
"maximum_wait_vehicle": false,
"mixing_items": false,
"precedence": false,
"start_time_windows": false,
"vehicle_end_time": false,
"vehicle_start_time": false
},
"enable": {
"cluster": false
}
},
"objectives": {
"capacities": "",
"cluster": 0,
"early_arrival_penalty": 1,
"late_arrival_penalty": 1,
"min_stops": 1,
"stop_balance": 0,
"travel_duration": 0,
"unplanned_penalty": 1,
"vehicle_activation_penalty": 1,
"vehicles_duration": 1
},
"properties": {
"disable": {
"duration_groups": false,
"durations": false,
"initial_solution": false,
"stop_duration_multipliers": false
"check_duration": 30,
"check_verbosity": "off",
"format_disable_progression": true,
"input": "../../../tests/golden/testdata/activation_penalty.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": "/tmp/output700701039",
"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
},
"maximum_time_horizon": 2592000
},
"validate": {
"disable": {
"resources": false,
"start_time": false
{
"base": 909.0466359667602,
"factor": 1,
"name": "vehicles_duration",
"value": 909.0466359667602
},
"enable": {
"matrix": false,
"matrix_asymmetry_tolerance": 20
{
"factor": 1,
"name": "unplanned_penalty",
"value": 0
}
}
],
"value": 909.0466359667602
},
"solve": {
"duration": 10000000000,
"iterations": 50,
"parallel_runs": 1,
"run_deterministically": true,
"start_solutions": 1
}
},
"solutions": [
{
"objective": {
"name": "1 * vehicle_activation_penalty + 1 * vehicles_duration + 1 * unplanned_penalty",
"objectives": [
"unplanned": [],
"vehicles": [
{
"id": "v1",
"route": [],
"route_duration": 0,
"route_travel_duration": 0
},
{
"id": "v2",
"route": [
{
"factor": 1,
"name": "vehicle_activation_penalty",
"value": 0
"cumulative_travel_duration": 0,
"stop": {
"id": "v2-start",
"location": {
"lat": 35.017209,
"lon": 135.672009
}
},
"travel_duration": 0
},
{
"base": 909.0466359667602,
"factor": 1,
"name": "vehicles_duration",
"value": 909.0466359667602
"cumulative_travel_duration": 0,
"stop": {
"id": "Arashiyama Bamboo Forest",
"location": {
"lat": 35.017209,
"lon": 135.672009
}
},
"travel_duration": 0
},
{
"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_distance": 5752,
"cumulative_travel_duration": 287,
"stop": {
"id": "Kinkaku-ji",
"location": {
"lat": 35.039705,
"lon": 135.728898
}
},
{
"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
"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
}
},
{
"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
"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
}
},
{
"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
"travel_distance": 1776,
"travel_duration": 88
},
{
"cumulative_travel_distance": 13696,
"cumulative_travel_duration": 684,
"stop": {
"id": "Gionmachi",
"location": {
"lat": 35.002457,
"lon": 135.775682
}
},
{
"cumulative_travel_distance": 13696,
"cumulative_travel_duration": 684,
"stop": {
"id": "Gionmachi",
"location": {
"lat": 35.002457,
"lon": 135.775682
}
},
"travel_distance": 2839,
"travel_duration": 141
"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
}
},
{
"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
"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
}
},
{
"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
}
]
}
],
"travel_distance": 3280,
"travel_duration": 164
}
],
"route_duration": 909,
"route_travel_distance": 18177,
"route_travel_duration": 909
}
]
},
"statistics": {
"result": {
"custom": {
Expand All @@ -234,8 +204,5 @@
"iterations": 50
},
"schema": "v1"
},
"version": {
"sdk": "VERSION"
}
}
Loading

0 comments on commit 383d6c7

Please sign in to comment.