Skip to content

Commit

Permalink
Merge pull request #36 from oxfordcontrol/update_time
Browse files Browse the repository at this point in the history
Updates for Release 0.5.0
  • Loading branch information
bstellato authored Dec 11, 2018
2 parents 1748fc0 + b1ffcd7 commit e4fc5b6
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
Version 0.4.0 (): OSQP v0.4.1
Version 0.5.0 (10 December 2018): OSQP v0.5.0
----------------------------------------------
* Upgraded OSQP to 0.5.0 version
* Added `update_time` info structure

Version 0.4.0 (29 October 2018): OSQP v0.4.1
----------------------------------------------
* Upgraded OSQP to 0.4.1 version

Expand Down
2 changes: 1 addition & 1 deletion deps/build.jl
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ using Compat.Libdl
osqp = library_dependency("osqp", aliases=["libosqp"])

# Current version
version = "0.4.1"
version = "0.5.0"

# Get current operating system
osqp_platform =
Expand Down
3 changes: 3 additions & 0 deletions src/types.jl
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ struct CInfo
dua_res::Cdouble
setup_time::Cdouble
solve_time::Cdouble
update_time::Cdouble
polish_time::Cdouble
run_time::Cdouble
rho_updates::Cc_int
Expand Down Expand Up @@ -209,6 +210,7 @@ mutable struct Info
dua_res::Float64
setup_time::Float64
solve_time::Float64
update_time::Float64
polish_time::Float64
run_time::Float64
rho_updates::Int64
Expand All @@ -227,6 +229,7 @@ function Compat.copyto!(info::Info, cinfo::CInfo)
info.dua_res = cinfo.dua_res
info.setup_time = cinfo.setup_time
info.solve_time = cinfo.solve_time
info.update_time = cinfo.update_time
info.polish_time = cinfo.polish_time
info.run_time = cinfo.run_time
info.rho_updates = cinfo.rho_updates
Expand Down

0 comments on commit e4fc5b6

Please sign in to comment.