Fix setwarmstart (#71)

And a deprecation fix.
jump-dev · Sep 22, 2018 · a9db9ba · a9db9ba
1 parent 1d6eacb
commit a9db9ba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/CbcCInterface.jl b/src/CbcCInterface.jl
@@ -296,8 +296,8 @@ function addSOS(prob::CbcModel, numRows::Integer, rowStarts::Vector{Cint},
 
     @cbc_ccall(addSOS,Cvoid,(Ptr{Cvoid}, Cint, Ptr{Cint}, Ptr{Cint},
                             Ptr{Float64}, Cint),prob.p,numRows,
-                            rowStarts-convert(Cint,1),
-                            colIndices-convert(Cint,1),
+                            rowStarts .- convert(Cint,1),
+                            colIndices .- convert(Cint,1),
                             weights, typ)
 
 end

diff --git a/src/CbcSolverInterface.jl b/src/CbcSolverInterface.jl
@@ -212,7 +212,7 @@ function MPB.setwarmstart!(m::CbcMathProgModel, v)
         end
         lb = getRowLower(m.inner)
         ub = getRowUpper(m.inner)
-        A = getconstrmatrix(m)
+        A = MPB.getconstrmatrix(m)
         rowval = A*v
         for i in 1:MPB.numconstr(m)
             if !(lb[i] - 1e-6 <= rowval[i] <= ub[i] + 1e-6)