Support MOI.SolveTimeSec (#56)

Author: remi-garcia

src/MultiObjectiveAlgorithms.jl

@@ -109,6 +109,7 @@ mutable struct Optimizer <: MOI.AbstractOptimizer
     solutions::Vector{SolutionPoint}
     termination_status::MOI.TerminationStatusCode
     time_limit_sec::Union{Nothing,Float64}
+    solve_time::Float64
 
     function Optimizer(optimizer_factory)
         return new(
@@ -118,6 +119,7 @@ mutable struct Optimizer <: MOI.AbstractOptimizer
             SolutionPoint[],
             MOI.OPTIMIZE_NOT_CALLED,
             nothing,
+            NaN,
         )
     end
 end
@@ -127,14 +129,16 @@ function MOI.empty!(model::Optimizer)
     model.f = nothing
     model.solutions = SolutionPoint[]
     model.termination_status = MOI.OPTIMIZE_NOT_CALLED
+    model.solve_time = NaN
     return
 end
 
 function MOI.is_empty(model::Optimizer)
     return MOI.is_empty(model.inner) &&
            model.f === nothing &&
            isempty(model.solutions) &&
-           model.termination_status == MOI.OPTIMIZE_NOT_CALLED
+           model.termination_status == MOI.OPTIMIZE_NOT_CALLED &&
+           isnan(model.solve_time)
 end
 
 MOI.supports_incremental_interface(::Optimizer) = true
@@ -176,6 +180,12 @@ function _time_limit_exceeded(model::Optimizer, start_time::Float64)
     return false
 end
 
+### SolveTimeSec
+
+function MOI.get(model::Optimizer, ::MOI.SolveTimeSec)
+    return model.solve_time
+end
+
 ### ObjectiveFunction
 
 function MOI.supports(
@@ -493,6 +503,7 @@ function MOI.delete(model::Optimizer, ci::MOI.ConstraintIndex)
 end
 
 function MOI.optimize!(model::Optimizer)
+    start_time = time()
     empty!(model.solutions)
     model.termination_status = MOI.OPTIMIZE_NOT_CALLED
     if model.f === nothing
@@ -508,6 +519,7 @@ function MOI.optimize!(model::Optimizer)
     if MOI.supports(model.inner, MOI.TimeLimitSec())
         MOI.set(model.inner, MOI.TimeLimitSec(), nothing)
     end
+    model.solve_time = time() - start_time
     return
 end
 

test/test_model.jl

@@ -88,6 +88,20 @@ function test_time_limit()
     return
 end
 
+function test_solve_time()
+    model = MOA.Optimizer(HiGHS.Optimizer)
+    MOI.set(model, MOI.Silent(), true)
+    x = MOI.add_variables(model, 2)
+    MOI.add_constraint.(model, x, MOI.GreaterThan(0.0))
+    f = MOI.Utilities.operate(vcat, Float64, 1.0 .* x...)
+    MOI.set(model, MOI.ObjectiveFunction{typeof(f)}(), f)
+    MOI.set(model, MOI.ObjectiveSense(), MOI.MAX_SENSE)
+    @test isnan(MOI.get(model, MOI.SolveTimeSec()))
+    MOI.optimize!(model)
+    @test MOI.get(model, MOI.SolveTimeSec()) >= 0
+    return
+end
+
 end
 
 TestModel.run_tests()