Remove calls to src/api.jl

jump-dev · Mar 13, 2024 · 4cb7306 · 4cb7306
1 parent 52875fd
commit 4cb7306
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/src/MOI/MOI_callbacks.jl b/src/MOI/MOI_callbacks.jl
@@ -305,7 +305,7 @@ function MOI.submit(
     if ilength == MOI.get(model, MOI.NumberOfVariables())
         mipsolcol = C_NULL
     end
-    addmipsol(model_cb, ilength, mipsolval, mipsolcol, C_NULL)
+    @checked Lib.XPRSaddmipsol(model_cb, ilength, mipsolval, mipsolcol, C_NULL)
     return MOI.HEURISTIC_SOLUTION_UNKNOWN
 end
 MOI.supports(::Optimizer, ::MOI.HeuristicSolution{CallbackData}) = true

diff --git a/src/Xpress.jl b/src/Xpress.jl
@@ -49,7 +49,7 @@ const XPRS_ATTRIBUTES = Dict{String,Any}(
 function initialize()
     Libdl.dlopen(libxprs)
     userlic()
-    init()
+    Lib.XPRSinit(C_NULL)
     # Calling free is not necessary since destroyprob is called
     # in the finalizer.
     return

diff --git a/src/helper.jl b/src/helper.jl
@@ -76,7 +76,7 @@ mutable struct XpressProblem <: CWrapper
     )
         model = new(ptr, logfile)
         if finalize_env
-            finalizer(destroyprob, model)
+            finalizer(Lib.XPRSdestroyprob, model)
         end
         return model
     end

diff --git a/src/license.jl b/src/license.jl
@@ -81,7 +81,7 @@ function userlic(;
     slicmsg = path_lic #xpauth_path == "dh" ? Array{Cchar}(undef, 1024*8) :
 
     # FIRST call do xprslicense to get BASE LIC
-    license(lic, slicmsg)
+    Lib.XPRSlicense(lic, slicmsg)
 
     # convert BASE LIC to GIVEN LIC
     lic = liccheck(lic)
@@ -90,7 +90,7 @@ function userlic(;
     buffer = Array{Cchar}(undef, 1024 * 8)
     buffer_p = pointer(buffer)
     ierr = GC.@preserve buffer begin
-        license(lic, Cstring(buffer_p))
+        Lib.XPRSlicense(lic, Cstring(buffer_p))
     end
 
     # check LIC TYPE

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -20,8 +20,14 @@ end
     file_extension = ifelse(vXpress_major <= 38, ".mps", "")
     msg = "Xpress internal error:\n\n85 Error: File not found: $(file_extension).\n"
     if Xpress.get_version() >= v"41.0.0"
-        @test_throws Xpress.XpressError(85, msg) Xpress.readprob(prob, "", "")
+        @test_throws(
+            Xpress.XpressError(85, msg)
+            Xpress.Lib.XPRSreadprob(prob, "", ""),
+        )
     else
-        @test_throws Xpress.XpressError(32, msg) Xpress.readprob(prob, "", "")
+        @test_throws(
+            Xpress.XpressError(32, msg),
+            Xpress.Lib.XPRSreadprob(prob, "", ""),
+        )
     end
 end