Skip to content

Commit

Permalink
Merge pull request #19 from JuliaOpt/newtol
Browse files Browse the repository at this point in the history
Update max_iters + fix deprec warning
  • Loading branch information
karanveerm committed Mar 1, 2015
2 parents cc4ae41 + 29714f9 commit e883e02
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions REQUIRE
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ julia 0.3
MathProgBase
BinDeps
@osx Homebrew
Compat
4 changes: 2 additions & 2 deletions src/high_level_wrapper.jl
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ end
# c is of length n x 1
# refer to create_scs_cone for K
function create_scs_data(;m::Int=nothing, n::Int=nothing, A::Ptr{SCSMatrix}=nothing,
b::Ptr{Cdouble}=nothing, c::Ptr{Cdouble}=nothing, max_iters=2500::Int,
eps=convert(Cdouble, 1e-5)::Cdouble, alpha=convert(Cdouble, 1.8)::Cdouble,
b::Ptr{Cdouble}=nothing, c::Ptr{Cdouble}=nothing, max_iters=20000::Int,
eps=convert(Cdouble, 1e-4)::Cdouble, alpha=convert(Cdouble, 1.8)::Cdouble,
rho_x=convert(Cdouble, 1e-3)::Cdouble, scale=convert(Cdouble, 5.0)::Cdouble,
cg_rate=convert(Cdouble, 1.5)::Cdouble, verbose=1::Int,
normalize=1::Int, warm_start=0::Int, options...)
Expand Down
5 changes: 3 additions & 2 deletions src/types.jl
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using Compat
export SCSMatrix, SCSData, SCSSolution, SCSInfo, SCSCone, SCSWork, SCSVecOrMatOrSparse


Expand Down Expand Up @@ -100,13 +101,13 @@ immutable SCSWork
p::Ptr{Void}
end

const status_map = {
@compat const status_map = Dict{Int, Symbol}(
1 => :Optimal,
-2 => :Infeasible,
-1 => :Unbounded,
-3 => :Indeterminate,
-4 => :Error
}
)

type Solution
x::Array{Float64, 1}
Expand Down

0 comments on commit e883e02

Please sign in to comment.