Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion interfaces/daqp-julia/Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "DAQPBase"
uuid = "833476c3-a8c0-4073-9b64-6473509843fe"
authors = ["Daniel Arnström <daniel.arnstrom@gmail.com>"]
version = "0.3.2"
version = "0.3.3"

[deps]
DAQP_jll = "5c51c916-43bf-57fe-9d62-13064ebbf40d"
Expand Down
24 changes: 13 additions & 11 deletions interfaces/daqp-julia/src/api.jl
Original file line number Diff line number Diff line change
Expand Up @@ -195,17 +195,19 @@ function solve(daqp::DAQPBase.Model)
if(!daqp.has_model) return zeros(0), NaN, -10, [] end
result= Ref(DAQPResult(daqp.x,daqp.λ));

exitflag=ccall((:daqp_solve, DAQPBase.libdaqp), Cint,
(Ref{DAQPBase.DAQPResult},Ref{DAQPBase.Workspace}),
result,daqp.work)

info = (x = daqp.x, λ=daqp.λ, fval=result[].fval,
exitflag=result[].exitflag,
status = DAQPBase.flag2status[result[].exitflag],
solve_time = result[].solve_time,
setup_time = result[].setup_time,
iterations= result[].iter, nodes = result[].nodes)
return copy(daqp.x),result[].fval,result[].exitflag,info
GC.@preserve result begin
ccall((:daqp_solve, DAQPBase.libdaqp), Nothing,
(Ref{DAQPBase.DAQPResult},Ref{DAQPBase.Workspace}),
result,daqp.work)

info = (x = daqp.x, λ=daqp.λ, fval=result[].fval,
exitflag=result[].exitflag,
status = DAQPBase.flag2status[result[].exitflag],
solve_time = result[].solve_time,
setup_time = result[].setup_time,
iterations= result[].iter, nodes = result[].nodes)
return copy(daqp.x),result[].fval,result[].exitflag,info
end
end


Expand Down
2 changes: 1 addition & 1 deletion interfaces/daqp-julia/src/avi.jl
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ function _solve_kkt(H,f,A,bu,bl,ASu,ASl,kkt_buffer)
n = length(f)
nkkt = n+length(AS)
resize!(kkt_buffer,nkkt^2)
K = reshape(kkt_buffer,nkkt,nkkt)
K = reshape(view(kkt_buffer,1:nkkt^2),(nkkt,nkkt))
@views K[1:n,1:n] = H
@views K[n+1:end,1:n] = A[AS,:]
@views K[1:n,n+1:end] = A[AS,:]'
Expand Down
Loading