From 383c3cd35c418b6935f91185add4cf8568ae66bb Mon Sep 17 00:00:00 2001 From: Sebastian Quintero Date: Wed, 28 Aug 2024 10:10:47 -0500 Subject: [PATCH 1/2] Upgrade go-mip --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 884d392..e265f3e 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/nextmv-io/go-highs go 1.21 -require github.com/nextmv-io/go-mip v1.5.1 +require github.com/nextmv-io/go-mip v1.6.0 require ( github.com/sergi/go-diff v1.3.1 // indirect @@ -15,7 +15,7 @@ require ( github.com/gorilla/schema v1.4.1 // indirect github.com/iancoleman/strcase v0.3.0 // indirect github.com/itzg/go-flagsfiller v1.14.0 // indirect - github.com/nextmv-io/sdk v1.6.3 + github.com/nextmv-io/sdk v1.8.0 github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect diff --git a/go.sum b/go.sum index b3e7a9b..cafb9d5 100644 --- a/go.sum +++ b/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/go-mip v1.5.1 h1:fXWdvt/7OnSlxH/nZFS94QQx1ZknEwOOLM7nbyFlr9w= -github.com/nextmv-io/go-mip v1.5.1/go.mod h1:4iBVtYsW7XOkCXAKeRLHdiZ3WoTehqemlYyhHcFEHlg= -github.com/nextmv-io/sdk v1.6.3 h1:Jtqxmn8FTvhRM1kIyaukB6k/2ekXBI8+h8acEZpPMLs= -github.com/nextmv-io/sdk v1.6.3/go.mod h1:Y48XLPcIOOxRgO86ICNpqGrH2N5+dd1TDNvef/FD2Kc= +github.com/nextmv-io/go-mip v1.6.0 h1:UULt5UcLvLLISWMcXBq+1Q+rO9eV9gUH15wT0dfCzZM= +github.com/nextmv-io/go-mip v1.6.0/go.mod h1:8kETFsctIoqHLo+YpBoo9QdXYvhxUxJzJzyCQaf6YLc= +github.com/nextmv-io/sdk v1.8.0 h1:EqYibIyeaFRc9zgyPUUwbD2nx9z37l18YfJfVe1wHCU= +github.com/nextmv-io/sdk v1.8.0/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= From 814874d8db8c2b990c53e2331b34cc44ff390dcb Mon Sep 17 00:00:00 2001 From: Sebastian Quintero Date: Wed, 28 Aug 2024 10:14:51 -0500 Subject: [PATCH 2/2] Fix tests --- tests/incentive-allocation/main_test.go | 8 ++++---- tests/knapsack/main_test.go | 8 ++++---- tests/meal-allocation/main_test.go | 10 +++++----- tests/shift-scheduling/main_test.go | 10 +++++----- tests/solve_control_parameters/main_test.go | 8 ++++---- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/tests/incentive-allocation/main_test.go b/tests/incentive-allocation/main_test.go index 70342d4..711bf7d 100644 --- a/tests/incentive-allocation/main_test.go +++ b/tests/incentive-allocation/main_test.go @@ -28,10 +28,10 @@ func TestGolden(t *testing.T) { "-solve.duration", "10s", }, TransientFields: []golden.TransientField{ - {Key: ".version.sdk", Replacement: golden.StableVersion}, - {Key: ".version.go-mip", Replacement: golden.StableVersion}, - {Key: ".statistics.result.duration", Replacement: golden.StableFloat}, - {Key: ".statistics.run.duration", Replacement: golden.StableFloat}, + {Key: "$.version.sdk", Replacement: golden.StableVersion}, + {Key: "$.version.go-mip", Replacement: golden.StableVersion}, + {Key: "$.statistics.result.duration", Replacement: golden.StableFloat}, + {Key: "$.statistics.run.duration", Replacement: golden.StableFloat}, }, Thresholds: golden.Tresholds{ Float: 0.01, diff --git a/tests/knapsack/main_test.go b/tests/knapsack/main_test.go index 70342d4..711bf7d 100644 --- a/tests/knapsack/main_test.go +++ b/tests/knapsack/main_test.go @@ -28,10 +28,10 @@ func TestGolden(t *testing.T) { "-solve.duration", "10s", }, TransientFields: []golden.TransientField{ - {Key: ".version.sdk", Replacement: golden.StableVersion}, - {Key: ".version.go-mip", Replacement: golden.StableVersion}, - {Key: ".statistics.result.duration", Replacement: golden.StableFloat}, - {Key: ".statistics.run.duration", Replacement: golden.StableFloat}, + {Key: "$.version.sdk", Replacement: golden.StableVersion}, + {Key: "$.version.go-mip", Replacement: golden.StableVersion}, + {Key: "$.statistics.result.duration", Replacement: golden.StableFloat}, + {Key: "$.statistics.run.duration", Replacement: golden.StableFloat}, }, Thresholds: golden.Tresholds{ Float: 0.01, diff --git a/tests/meal-allocation/main_test.go b/tests/meal-allocation/main_test.go index f9038ef..d56913d 100644 --- a/tests/meal-allocation/main_test.go +++ b/tests/meal-allocation/main_test.go @@ -27,13 +27,13 @@ func TestGolden(t *testing.T) { "-solve.duration", "10s", }, TransientFields: []golden.TransientField{ - {Key: ".version.sdk", Replacement: golden.StableVersion}, - {Key: ".version.go-mip", Replacement: golden.StableVersion}, - {Key: ".statistics.result.duration", Replacement: golden.StableFloat}, - {Key: ".statistics.run.duration", Replacement: golden.StableFloat}, + {Key: "$.version.sdk", Replacement: golden.StableVersion}, + {Key: "$.version.go-mip", Replacement: golden.StableVersion}, + {Key: "$.statistics.result.duration", Replacement: golden.StableFloat}, + {Key: "$.statistics.run.duration", Replacement: golden.StableFloat}, }, DedicatedComparison: []string{ - ".statistics.result.value", + "$.statistics.result.value", }, }, ) diff --git a/tests/shift-scheduling/main_test.go b/tests/shift-scheduling/main_test.go index f9038ef..d56913d 100644 --- a/tests/shift-scheduling/main_test.go +++ b/tests/shift-scheduling/main_test.go @@ -27,13 +27,13 @@ func TestGolden(t *testing.T) { "-solve.duration", "10s", }, TransientFields: []golden.TransientField{ - {Key: ".version.sdk", Replacement: golden.StableVersion}, - {Key: ".version.go-mip", Replacement: golden.StableVersion}, - {Key: ".statistics.result.duration", Replacement: golden.StableFloat}, - {Key: ".statistics.run.duration", Replacement: golden.StableFloat}, + {Key: "$.version.sdk", Replacement: golden.StableVersion}, + {Key: "$.version.go-mip", Replacement: golden.StableVersion}, + {Key: "$.statistics.result.duration", Replacement: golden.StableFloat}, + {Key: "$.statistics.run.duration", Replacement: golden.StableFloat}, }, DedicatedComparison: []string{ - ".statistics.result.value", + "$.statistics.result.value", }, }, ) diff --git a/tests/solve_control_parameters/main_test.go b/tests/solve_control_parameters/main_test.go index 41b3d71..1251d2c 100644 --- a/tests/solve_control_parameters/main_test.go +++ b/tests/solve_control_parameters/main_test.go @@ -33,10 +33,10 @@ func TestGolden(t *testing.T) { "-solve.control.string", "presolve=off", }, TransientFields: []golden.TransientField{ - {Key: ".version.sdk", Replacement: golden.StableVersion}, - {Key: ".version.go-mip", Replacement: golden.StableVersion}, - {Key: ".statistics.result.duration", Replacement: golden.StableFloat}, - {Key: ".statistics.run.duration", Replacement: golden.StableFloat}, + {Key: "$.version.sdk", Replacement: golden.StableVersion}, + {Key: "$.version.go-mip", Replacement: golden.StableVersion}, + {Key: "$.statistics.result.duration", Replacement: golden.StableFloat}, + {Key: "$.statistics.run.duration", Replacement: golden.StableFloat}, }, Thresholds: golden.Tresholds{ Float: 0.01,