update for ECOS 2.0.5

jump-dev · Aug 3, 2016 · 42ced24 · 42ced24
1 parent d0ebbd3
commit 42ced24
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/deps/build.jl b/deps/build.jl
@@ -10,7 +10,7 @@ if is_apple()
     provides( Homebrew.HB, "ecos", ecos, os = :Darwin )
 end
 
-version = "2.0.4"
+version = "2.0.5"
 win_version = "2.0.2"
 provides(Sources, URI("https://github.com/ifa-ethz/ecos/archive/v$version.tar.gz"),
     [ecos], os = :Unix, unpacked_dir="ecos-$version")

diff --git a/src/ECOS.jl b/src/ECOS.jl
@@ -31,9 +31,9 @@ end
 
 function __init__()
     vnum = VersionNumber(ver())
-    if !(vnum.major == 2 && vnum.minor == 0)
+    if !(vnum.major == 2 && vnum.minor == 0 && vnum.patch >= 5)
         depsdir = realpath(joinpath(dirname(@__FILE__),"..","deps"))
-        error("Current ECOS version installed is $(ver()), but we require version 2.0.*. On Linux and Windows, delete the contents of the `$depsdir` directory except for the files `build.jl` and `.gitignore`, then rerun Pkg.build(\"ECOS\"). On OS X, run `using Homebrew; Homebrew.update()` in Julia.")
+        error("Current ECOS version installed is $(ver()), but we require version 2.0.5 or greater. On Linux and Windows, delete the contents of the `$depsdir` directory except for the files `build.jl` and `.gitignore`, then rerun Pkg.build(\"ECOS\"). On OS X, run `using Homebrew; Homebrew.update()` in Julia.")
     end
 end
 

diff --git a/src/types.jl b/src/types.jl
@@ -184,6 +184,10 @@ immutable Cpwork
     b::Ptr{Cdouble}
     h::Ptr{Cdouble}
 
+    # indices that map entries of A and G to the KKT matrix
+    AtoK::Ptr{Clong}
+    GtoK::Ptr{Clong}
+
     # equilibration vector
     xequil::Ptr{Cdouble}
     Aequil::Ptr{Cdouble}