Skip to content

Commit

Permalink
Merge 1038500 into 30dac88
Browse files Browse the repository at this point in the history
  • Loading branch information
abelsiqueira committed Jan 23, 2017
2 parents 30dac88 + 1038500 commit a5790bb
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/bmark/run_solver.jl
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ function solve_problems(solver :: Function, problems :: Any; prune :: Bool=true,
(f, g, h) = solve_problem(solver, problem, verbose=verbose; kwargs...)
k = k + 1
stats[k, :] = [f, g, h]
finalize(problem)
catch e
isa(e, SkipException) || rethrow(e)
end
Expand Down
7 changes: 7 additions & 0 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,10 @@ println(length(probs))
assert(size(stats[Symbol(solvers[1])], 1) == length(probs) - 1)
stats = bmark_solvers(solvers, models, skipif=m -> m.meta.ncon > 0, prune=false)
assert(size(stats[Symbol(solvers[1])], 1) == length(probs))

# test bmark_solvers with CUTEst
@static if is_unix()
models = (isa(p, String) ? CUTEstModel(p) : CUTEstModel(p...) for p in ["ROSENBR", ("DIXMAANJ", "-param", "M=30")])
stats = bmark_solvers(solvers, models)
println(stats)
end

0 comments on commit a5790bb

Please sign in to comment.