From e282f2676241735ce1ac19a75bbfaf57c7f4b41e Mon Sep 17 00:00:00 2001 From: Marius Merschformann Date: Tue, 24 Dec 2024 14:14:53 +0100 Subject: [PATCH 1/3] Upgrade nextroute to latest version --- go-nextroute/go.mod | 4 ++-- go-nextroute/go.sum | 8 ++++---- python-nextroute/requirements.txt | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go-nextroute/go.mod b/go-nextroute/go.mod index 99db4df..6b0db96 100644 --- a/go-nextroute/go.mod +++ b/go-nextroute/go.mod @@ -3,8 +3,8 @@ module example.com/your_project/go-nextroute go 1.22 require ( - github.com/nextmv-io/nextroute v1.10.1 - github.com/nextmv-io/sdk v1.8.1 + github.com/nextmv-io/nextroute v1.11.0 + github.com/nextmv-io/sdk v1.8.3-0.20241219091227-002f36a342d6 ) require ( diff --git a/go-nextroute/go.sum b/go-nextroute/go.sum index cb7849f..546b4d7 100644 --- a/go-nextroute/go.sum +++ b/go-nextroute/go.sum @@ -302,10 +302,10 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/nextmv-io/nextroute v1.10.1 h1:x8c//5XHplPxw4bOlPNVmfoSdcgwvMqb44yAIoz/DXU= -github.com/nextmv-io/nextroute v1.10.1/go.mod h1:Y5VkkPwW2TyHopnrcBpgYvyUbPH19KZgFiX+iNQ1Y7U= -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/nextroute v1.11.0 h1:8+wRIq1vrSck8H77eiigbP6FGR5p93GB5kD6Qwi8EHo= +github.com/nextmv-io/nextroute v1.11.0/go.mod h1:ZPVGnU48OehlxfPb4Aw5XW2wPGrIBSnukz1Pkgf3kUs= +github.com/nextmv-io/sdk v1.8.3-0.20241219091227-002f36a342d6 h1:icnvtf2R9Zg9Qs+SyVbQ6HEZ5fPj6A+7ywxOT2lrWus= +github.com/nextmv-io/sdk v1.8.3-0.20241219091227-002f36a342d6/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= diff --git a/python-nextroute/requirements.txt b/python-nextroute/requirements.txt index a18812a..b1695f0 100644 --- a/python-nextroute/requirements.txt +++ b/python-nextroute/requirements.txt @@ -1,2 +1,2 @@ -nextroute==1.10.1 +nextroute==1.11.0 nextmv==0.14.2 From f6a431fd7d077139ccadd6d01436a4e453ded349 Mon Sep 17 00:00:00 2001 From: Marius Merschformann Date: Tue, 24 Dec 2024 14:23:07 +0100 Subject: [PATCH 2/3] Update expectations --- .nextmv/golden/go-nextroute/inputs/input.json.golden | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.nextmv/golden/go-nextroute/inputs/input.json.golden b/.nextmv/golden/go-nextroute/inputs/input.json.golden index 6b3a22b..4e7226f 100644 --- a/.nextmv/golden/go-nextroute/inputs/input.json.golden +++ b/.nextmv/golden/go-nextroute/inputs/input.json.golden @@ -49,7 +49,8 @@ "durations": false, "initial_solution": false, "stop_duration_multipliers": false - } + }, + "maximum_time_horizon": 15552000 }, "validate": { "disable": { @@ -66,6 +67,12 @@ "duration": 3000000000, "iterations": 50, "parallel_runs": 1, + "plateau": { + "absolute_threshold": -1, + "duration": 0, + "iterations": 0, + "relative_threshold": 0 + }, "run_deterministically": true, "start_solutions": 1 } From 2b601eb64327a7636b17ca6f674d629afc4a68bb Mon Sep 17 00:00:00 2001 From: Marius Merschformann Date: Tue, 24 Dec 2024 18:05:46 +0100 Subject: [PATCH 3/3] Updating expectation --- .nextmv/golden/python-nextroute/inputs/input.json.golden | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.nextmv/golden/python-nextroute/inputs/input.json.golden b/.nextmv/golden/python-nextroute/inputs/input.json.golden index b0924fe..aff961c 100644 --- a/.nextmv/golden/python-nextroute/inputs/input.json.golden +++ b/.nextmv/golden/python-nextroute/inputs/input.json.golden @@ -24,6 +24,7 @@ "model_objectives_earlyarrivalpenalty": 1, "model_objectives_latearrivalpenalty": 1, "model_objectives_minstops": 1, + "model_objectives_stopbalance": 0, "model_objectives_travelduration": 0, "model_objectives_unplannedpenalty": 1, "model_objectives_vehicleactivationpenalty": 1, @@ -32,6 +33,7 @@ "model_properties_disable_durations": false, "model_properties_disable_initialsolution": false, "model_properties_disable_stopdurationmultipliers": false, + "model_properties_maximumtimehorizon": 15552000, "model_validate_disable_resources": false, "model_validate_disable_starttime": false, "model_validate_enable_matrix": false, @@ -40,6 +42,10 @@ "solve_duration": 3, "solve_iterations": 50, "solve_parallelruns": 1, + "solve_plateau_absolutethreshold": -1, + "solve_plateau_duration": 0, + "solve_plateau_iterations": 0, + "solve_plateau_relativethreshold": 0, "solve_rundeterministically": true, "solve_startsolutions": 1 },