Update to v1.5.1 (#152)

jump-dev · Mar 10, 2023 · 1754060 · 1754060 · odow · Mar 10, 2023
1 parent 9121d40
commit 1754060
Show file tree

Hide file tree

Showing 5 changed files with 309 additions and 12 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "HiGHS"
 uuid = "87dc4568-4c63-4d18-b0c0-bb2238e4078b"
-version = "1.4.3"
+version = "1.5.0"
 
 [deps]
 HiGHS_jll = "8fd58aa0-07eb-5a78-9b36-339c94fd15ea"
@@ -9,7 +9,7 @@ SnoopPrecompile = "66db9d55-30c0-4569-8b51-7e840670fc0c"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
 [compat]
-HiGHS_jll = "=1.2.0, =1.2.1, =1.2.2, =1.3.0, =1.4.0, =1.4.1, =1.4.2"
+HiGHS_jll = "=1.5.1"
 MathOptInterface = "1"
 SnoopPrecompile = "1"
 julia = "1.6"

diff --git a/gen/Project.toml b/gen/Project.toml
@@ -4,4 +4,4 @@ HiGHS_jll = "8fd58aa0-07eb-5a78-9b36-339c94fd15ea"
 
 [compat]
 Clang = "0.14"
-HiGHS_jll = "1.2.1"
+HiGHS_jll = "1.5.1"
diff --git a/src/HiGHS.jl b/src/HiGHS.jl
@@ -6,7 +6,7 @@
 module HiGHS
 
 import HiGHS_jll
-import MathOptInterface
+import MathOptInterface as MOI
 import SparseArrays
 
 function __init__()

diff --git a/src/MOI_wrapper.jl b/src/MOI_wrapper.jl
@@ -3,7 +3,6 @@
 # Use of this source code is governed by an MIT-style license that can be found
 # in the LICENSE.md file or at https://opensource.org/licenses/MIT.
 
-const MOI = MathOptInterface
 const CleverDicts = MOI.Utilities.CleverDicts
 
 @enum(
@@ -316,7 +315,8 @@ Base.unsafe_convert(::Type{Ptr{Cvoid}}, model::Optimizer) = model.inner
 MOI.get(::Optimizer, ::MOI.SolverName) = "HiGHS"
 
 function MOI.get(::Optimizer, ::MOI.SolverVersion)
-    return "v$(HIGHS_VERSION_MAJOR).$(HIGHS_VERSION_MINOR).$(HIGHS_VERSION_PATCH)"
+    X, Y, Z = Highs_versionMajor(), Highs_versionMinor(), Highs_versionPatch()
+    return "v$X.$Y.$Z"
 end
 
 function _check_ret(ret::HighsInt)
@@ -552,7 +552,7 @@ function _get_double_option(model::Optimizer, option::String)
 end
 
 function _get_string_option(model::Optimizer, option::String)
-    buffer = Vector{Cchar}(undef, 1024)
+    buffer = Vector{Cchar}(undef, kHighsMaximumStringLength)
     bufferP = pointer(buffer)
     GC.@preserve buffer begin
         ret = Highs_getStringOptionValue(model, option, bufferP)
@@ -1790,9 +1790,11 @@ function MOI.get(model::Optimizer, ::MOI.TerminationStatus)
         return MOI.TIME_LIMIT
     elseif model.solution.model_status == kHighsModelStatusIterationLimit
         return MOI.ITERATION_LIMIT
-    else
-        @assert model.solution.model_status == kHighsModelStatusUnknown
+    elseif model.solution.model_status == kHighsModelStatusUnknown
         return MOI.OTHER_ERROR
+    else
+        @assert model.solution.model_status == kHighsModelStatusSolutionLimit
+        return MOI.SOLUTION_LIMIT
     end
 end