Merge pull request #10 from tkoolen/tk/fix-bounds-modification

Don't modify input argument in bounds modification functions.
osqp · Apr 30, 2018 · 97e7ce7 · 97e7ce7
2 parents ac2359b + 24781f3
commit 97e7ce7
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 27 deletions.
diff --git a/src/interface.jl b/src/interface.jl
@@ -13,23 +13,17 @@ end
 
 mutable struct Model
     workspace::Ptr{OSQP.Workspace}
+    lcache::Vector{Float64} # to facilitate converting l to use OSQP_INFTY
+    ucache::Vector{Float64} # to facilitate converting u to use OSQP_INFTY
 
     """
         Module()
 
     Initialize OSQP module
     """
     function Model()
-            # TODO: Change me to more elegant way
-            # a = Array{Ptr{OSQP.Workspace}}(1)[1]
-        a = C_NULL
-
-            # Create new model
-        model = new(a)
-
-            # Add finalizer
+        model = new(C_NULL, Float64[], Float64[])
         @compat finalizer(OSQP.clean!, model)
-
         return model
 
     end
@@ -123,6 +117,10 @@ function setup!(model::OSQP.Model;
     u = min.(u, OSQP_INFTY)
     l = max.(l, -OSQP_INFTY)
 
+    # Resize caches
+    resize!(model.lcache, m)
+    resize!(model.ucache, m)
+
     # Create managed matrices to avoid segfaults (See SCS.jl)
     managedP = OSQP.ManagedCcsc(P)
     managedA = OSQP.ManagedCcsc(A)
@@ -150,10 +148,8 @@ function setup!(model::OSQP.Model;
 
     # Perform setup
     @compat_gc_preserve managedP Pdata managedA Adata q l u begin
-        model.workspace = ccall((:osqp_setup, OSQP.osqp),
-                    Ptr{OSQP.Workspace}, (Ptr{OSQP.Data},
-                                          Ptr{OSQP.Settings}),
-                    Ref(data), Ref(stgs))
+        model.workspace = ccall((:osqp_setup, OSQP.osqp), Ptr{OSQP.Workspace},
+            (Ptr{OSQP.Data}, Ptr{OSQP.Settings}), Ref(data), Ref(stgs))
     end
 
     if model.workspace == C_NULL
@@ -231,8 +227,8 @@ function update_l!(model::OSQP.Model, l::Vector{Float64})
     if length(l) != m
         error("l must have length m = $(m)")
     end
-    l .= max.(l, -OSQP_INFTY) # Convert values to OSQP_INFTY
-    exitflag = ccall((:osqp_update_lower_bound, OSQP.osqp), Cc_int, (Ptr{OSQP.Workspace}, Ptr{Cdouble}), model.workspace, l)
+    model.lcache .= max.(l, -OSQP_INFTY)
+    exitflag = ccall((:osqp_update_lower_bound, OSQP.osqp), Cc_int, (Ptr{OSQP.Workspace}, Ptr{Cdouble}), model.workspace, model.lcache)
     if exitflag != 0 error("Error updating l") end
 end
 
@@ -241,8 +237,8 @@ function update_u!(model::OSQP.Model, u::Vector{Float64})
     if length(u) != m
         error("u must have length m = $(m)")
     end
-    u .= min.(u, OSQP_INFTY) # Convert values to OSQP_INFTY
-    exitflag = ccall((:osqp_update_upper_bound, OSQP.osqp), Cc_int, (Ptr{OSQP.Workspace}, Ptr{Cdouble}), model.workspace, u)
+    model.ucache .= min.(u, OSQP_INFTY)
+    exitflag = ccall((:osqp_update_upper_bound, OSQP.osqp), Cc_int, (Ptr{OSQP.Workspace}, Ptr{Cdouble}), model.workspace, model.ucache)
     if exitflag != 0 error("Error updating u") end
 end
 
@@ -254,7 +250,10 @@ function update_bounds!(model::OSQP.Model, l::Vector{Float64}, u::Vector{Float64
     if length(u) != m
         error("u must have length m = $(m)")
     end
-    exitflag = ccall((:osqp_update_bounds, OSQP.osqp), Cc_int, (Ptr{OSQP.Workspace}, Ptr{Cdouble}, Ptr{Cdouble}), model.workspace, l, u)
+    model.lcache .= max.(l, -OSQP_INFTY)
+    model.ucache .= min.(u, OSQP_INFTY)
+    exitflag = ccall((:osqp_update_bounds, OSQP.osqp), Cc_int, (Ptr{OSQP.Workspace}, Ptr{Cdouble}, Ptr{Cdouble}),
+        model.workspace, model.lcache, model.ucache)
     if exitflag != 0 error("Error updating bounds l and u") end
 end
 

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -4,15 +4,15 @@ using Compat.Test, Compat.SparseArrays, Compat.LinearAlgebra, Compat.Random
 
 
 tests = [
-    # "basic.jl",
-    # "dual_infeasibility.jl",
-    # "feasibility.jl",
-    # "polishing.jl",
-    # "primal_infeasibility.jl",
-    # "unconstrained.jl",
-    # "warm_start.jl",
-    # "update_matrices.jl",
-    # "mpbinterface.jl",
+    "basic.jl",
+    "dual_infeasibility.jl",
+    "feasibility.jl",
+    "polishing.jl",
+    "primal_infeasibility.jl",
+    "unconstrained.jl",
+    "warm_start.jl",
+    "update_matrices.jl",
+    "mpbinterface.jl",
     "MathOptInterfaceOSQP.jl"
     ]