Skip to content

Commit

Permalink
Splitting golden files for diverging output formats
Browse files Browse the repository at this point in the history
  • Loading branch information
merschformann committed Dec 16, 2024
1 parent 2c1119e commit cfe33fb
Show file tree
Hide file tree
Showing 106 changed files with 11,613 additions and 9 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/nextmv-io/nextroute
go 1.21

require (
github.com/nextmv-io/sdk v1.8.1
github.com/nextmv-io/sdk v1.8.2-0.20241216100747-7da66dbefd1c
gonum.org/v1/gonum v0.14.0
)

Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/nextmv-io/sdk v1.8.1 h1:CYhhDtd4ZeFYfHXSinVQpvH4mIPJHOqtQGUaSwBfpp8=
github.com/nextmv-io/sdk v1.8.1/go.mod h1:Y48XLPcIOOxRgO86ICNpqGrH2N5+dd1TDNvef/FD2Kc=
github.com/nextmv-io/sdk v1.8.2-0.20241216100747-7da66dbefd1c h1:Tm248WPtjW1Fo9BO2FNIwVuroKasmORfgQq0DtLFbbE=
github.com/nextmv-io/sdk v1.8.2-0.20241216100747-7da66dbefd1c/go.mod h1:Y48XLPcIOOxRgO86ICNpqGrH2N5+dd1TDNvef/FD2Kc=
github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
Expand Down
1 change: 1 addition & 0 deletions src/tests/solve_golden/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ func TestPythonSolveGolden(t *testing.T) {
Thresholds: golden.Tresholds{
Float: 0.01,
},
GoldenExtension: ".python.golden",
ExecutionConfig: &golden.ExecutionConfig{
Command: "python3",
Args: []string{pythonFileDestination},
Expand Down
2 changes: 1 addition & 1 deletion tests/check/input.json.golden
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"initial_solution": false,
"stop_duration_multipliers": false
},
"maximum_time_horizon": 2592000
"maximum_time_horizon": 15552000
},
"validate": {
"disable": {
Expand Down
2 changes: 1 addition & 1 deletion tests/custom_constraint/input.json.golden
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"initial_solution": false,
"stop_duration_multipliers": false
},
"maximum_time_horizon": 2592000
"maximum_time_horizon": 15552000
},
"validate": {
"disable": {
Expand Down
2 changes: 1 addition & 1 deletion tests/custom_matrices/input.json.golden
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"initial_solution": false,
"stop_duration_multipliers": false
},
"maximum_time_horizon": 2592000
"maximum_time_horizon": 15552000
},
"validate": {
"disable": {
Expand Down
2 changes: 1 addition & 1 deletion tests/custom_objective/input.json.golden
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"initial_solution": false,
"stop_duration_multipliers": false
},
"maximum_time_horizon": 2592000
"maximum_time_horizon": 15552000
},
"validate": {
"disable": {
Expand Down
2 changes: 1 addition & 1 deletion tests/custom_operators/input.json.golden
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"initial_solution": false,
"stop_duration_multipliers": false
},
"maximum_time_horizon": 2592000
"maximum_time_horizon": 15552000
},
"validate": {
"disable": {
Expand Down
1 change: 1 addition & 0 deletions tests/golden/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ func TestGolden(t *testing.T) {
// for deterministic tests
"-solve.startsolutions", "1",
},
GoldenExtension: ".go.golden",
TransientFields: []golden.TransientField{
{Key: "$.version.sdk", Replacement: golden.StableVersion},
{Key: "$.statistics.result.duration", Replacement: golden.StableFloat},
Expand Down
241 changes: 241 additions & 0 deletions tests/golden/testdata/activation_penalty.json.go.golden
Original file line number Diff line number Diff line change
@@ -0,0 +1,241 @@
{
"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
},
"maximum_time_horizon": 15552000
},
"validate": {
"disable": {
"resources": false,
"start_time": false
},
"enable": {
"matrix": false,
"matrix_asymmetry_tolerance": 20
}
}
},
"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": [
{
"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"
},
"version": {
"sdk": "VERSION"
}
}
Loading

0 comments on commit cfe33fb

Please sign in to comment.