Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,10 @@ the solution process.
* `MOA.SolutionLimit()`
* `MOI.TimeLimitSec()`

Query the number of scalar subproblems that were solved using
There are also the following result attributes that can be queried after the
solve:

* `MOA.SolveTimeInner()`
* `MOA.SubproblemCount()`

For example:
Expand Down
21 changes: 17 additions & 4 deletions src/MultiObjectiveAlgorithms.jl
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ mutable struct Optimizer <: MOI.AbstractOptimizer
Float64[],
_default(ComputeIdealPoint()),
0,
0.0,
NaN,
optimizer_factory,
)
end
Expand All @@ -239,6 +239,7 @@ function MOI.empty!(model::Optimizer)
model.start_time = NaN
empty!(model.ideal_point)
model.subproblem_count = 0
model.solve_time_inner = NaN
return
end

Expand Down Expand Up @@ -343,9 +344,21 @@ end

### SolveTimeSec

function MOI.get(model::Optimizer, ::MOI.SolveTimeSec)
return model.solve_time
end
MOI.get(model::Optimizer, ::MOI.SolveTimeSec) = model.solve_time

### SolveTimeSecInner

"""
SolveTimeSecInner <: AbstractModelAttribute -> Float64

A result attribute for querying the total solve time of subproblem solves by an
algorithm.
"""
struct SolveTimeSecInner <: MOI.AbstractModelAttribute end

MOI.is_set_by_optimize(::SolveTimeSecInner) = true

MOI.get(model::Optimizer, ::SolveTimeSecInner) = model.solve_time_inner

### ObjectiveFunction

Expand Down
8 changes: 8 additions & 0 deletions test/test_model.jl
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,16 @@ function test_solve_time()
MOI.set(model, MOI.ObjectiveFunction{typeof(f)}(), f)
MOI.set(model, MOI.ObjectiveSense(), MOI.MAX_SENSE)
@test isnan(MOI.get(model, MOI.SolveTimeSec()))
@test MOI.is_set_by_optimize(MOA.SolveTimeSecInner())
@test isnan(MOI.get(model, MOA.SolveTimeSecInner()))
MOI.optimize!(model)
@test MOI.get(model, MOI.SolveTimeSec()) >= 0
@test MOI.get(model, MOA.SolveTimeSecInner()) >= 0
@test MOI.get(model, MOI.SolveTimeSec()) == model.solve_time
@test MOI.get(model, MOA.SolveTimeSecInner()) == model.solve_time_inner
MOI.empty!(model)
@test isnan(MOI.get(model, MOI.SolveTimeSec()))
@test isnan(MOI.get(model, MOA.SolveTimeSecInner()))
return
end

Expand Down
Loading