Skip to content

Commit 472b353

Browse files
authored
Merge pull request #53 from JuliaOpt/ml/solvetime
implement getsolvetime
2 parents 04ca4bb + 742241a commit 472b353

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

src/ECOSSolverInterface.jl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ type ECOSMathProgModel <: AbstractConicModel
3434
b::Vector{Float64} # RHS for equality
3535
# Post-solve
3636
solve_stat::Symbol
37+
solve_time::Float64
3738
obj_val::Float64
3839
primal_sol::Vector{Float64}
3940
dual_sol_eq::Vector{Float64}
@@ -58,7 +59,7 @@ ECOSMathProgModel(;kwargs...) = ECOSMathProgModel(0,0,0,0,0,0,
5859
spzeros(0,0),
5960
Float64[], :Min,
6061
Float64[], Float64[],
61-
:NotSolved, 0.0,
62+
:NotSolved, 0.0, 0.0,
6263
Float64[],
6364
Float64[], Float64[],
6465
Int[], Symbol[],
@@ -87,7 +88,9 @@ function optimize!(m::ECOSMathProgModel)
8788
m.c[:], # Seems to modify this
8889
m.h, m.b; m.options...)
8990

91+
t = time()
9092
flag = solve(ecos_prob_ptr)
93+
m.solve_time = time() - t
9194
if flag == ECOS_OPTIMAL
9295
m.solve_stat = :Optimal
9396
elseif flag == ECOS_PINF
@@ -437,3 +440,5 @@ function getvardual(m::ECOSMathProgModel)
437440
end
438441
return duals
439442
end
443+
444+
getsolvetime(m::ECOSMathProgModel) = m.solve_time

0 commit comments

Comments
 (0)