update for nicer Mosek syntax

jump-dev · Nov 26, 2014 · 2103813 · 2103813
1 parent 373e262
commit 2103813
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/test/probmod.jl b/test/probmod.jl
@@ -276,4 +276,4 @@ if mos
     methods_test("Mosek", Mosek.MosekSolver(), supp)
 end
 
-end
+end
diff --git a/test/solvers.jl b/test/solvers.jl
@@ -31,15 +31,15 @@ if kni; import KNITRO; end
 lp_solvers = Any[]
 grb && push!(lp_solvers, Gurobi.GurobiSolver(OutputFlag=0))
 cpx && push!(lp_solvers, CPLEX.CplexSolver(CPX_PARAM_SCRIND=0))
-mos && push!(lp_solvers, Mosek.MosekSolver(output=false))
+mos && push!(lp_solvers, Mosek.MosekSolver(LOG=0))
 cbc && push!(lp_solvers, Clp.ClpSolver())
 glp && push!(lp_solvers, GLPKMathProgInterface.GLPKSolverLP())
 ipt && push!(lp_solvers, Ipopt.IpoptSolver(print_level=0))
 # MILP solvers
 ip_solvers = Any[]
 grb && push!(ip_solvers, Gurobi.GurobiSolver(OutputFlag=0))
 cpx && push!(ip_solvers, CPLEX.CplexSolver(CPX_PARAM_SCRIND=0))
-mos && push!(ip_solvers, Mosek.MosekSolver(output=false))
+mos && push!(ip_solvers, Mosek.MosekSolver(LOG=0))
 cbc && push!(ip_solvers, Cbc.CbcSolver(logLevel=0))
 glp && push!(ip_solvers, GLPKMathProgInterface.GLPKSolverMIP())
 # Support semi-continuous, semi-integer solvers
@@ -72,10 +72,10 @@ end
 quad_solvers = Any[]
 grb && push!(quad_solvers, Gurobi.GurobiSolver(OutputFlag=0))
 cpx && push!(quad_solvers, CPLEX.CplexSolver(CPX_PARAM_SCRIND=0))
-mos && push!(quad_solvers, Mosek.MosekSolver(output=false))
+mos && push!(quad_solvers, Mosek.MosekSolver(LOG=0))
 # Nonlinear solvers
 nl_solvers = Any[]
 ipt && push!(nl_solvers, Ipopt.IpoptSolver(print_level=0))
 nlo && push!(nl_solvers, NLopt.NLoptSolver(algorithm=:LD_SLSQP))
 kni && push!(nl_solvers, KNITRO.KnitroSolver())
-mos && push!(nl_solvers, Mosek.MosekSolver(output=false))
+mos && push!(nl_solvers, Mosek.MosekSolver(LOG=0))