Skip to content

Fix inference in CachingOptimizer #1321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 7, 2021
Merged

Fix inference in CachingOptimizer #1321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
409e798
Fix inference in CachingOptimizer
odow May 7, 2021
0b45f30
add tests
odow May 7, 2021
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
37 changes: 25 additions & 12 deletions src/Utilities/cachingoptimizer.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,18 +759,10 @@ end
function MOI.get(model::CachingOptimizer, attr::MOI.AbstractModelAttribute)
if MOI.is_set_by_optimize(attr)
if state(model) == NO_OPTIMIZER
if attr == MOI.TerminationStatus()
return MOI.OPTIMIZE_NOT_CALLED
elseif attr == MOI.PrimalStatus()
return MOI.NO_SOLUTION
elseif attr == MOI.DualStatus()
return MOI.NO_SOLUTION
else
error(
"Cannot query $(attr) from caching optimizer because no" *
" optimizer is attached.",
)
end
error(
"Cannot query $(attr) from caching optimizer because no " *
"optimizer is attached.",
)
end
return map_indices(
model.optimizer_to_model_map,
Expand All @@ -780,6 +772,27 @@ function MOI.get(model::CachingOptimizer, attr::MOI.AbstractModelAttribute)
return MOI.get(model.model_cache, attr)
end
end

function MOI.get(
model::CachingOptimizer,
attr::MOI.TerminationStatus,
)::MOI.TerminationStatusCode
if state(model) == NO_OPTIMIZER
return MOI.OPTIMIZE_NOT_CALLED
end
return MOI.get(model.optimizer, attr)
end

function MOI.get(
model::CachingOptimizer,
attr::Union{MOI.PrimalStatus,MOI.DualStatus},
)::MOI.ResultStatusCode
if state(model) == NO_OPTIMIZER
return MOI.NO_SOLUTION
end
return MOI.get(model.optimizer, attr)
end

function MOI.get(
model::CachingOptimizer,
attr::Union{MOI.AbstractVariableAttribute,MOI.AbstractConstraintAttribute},
Expand Down
13 changes: 13 additions & 0 deletions test/Utilities/cachingoptimizer.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,3 +681,16 @@ end
@test_throws KeyError MOI.get(model, MOI.RawParameter("foo"))
@test_throws KeyError MOI.get(model, MOI.NumberOfThreads())
end

@testset "Status codes" begin
optimizer = MOI.Utilities.MockOptimizer(MOI.Utilities.Model{Float64}())
model = MOI.Utilities.CachingOptimizer(
MOI.Utilities.Model{Float64}(),
optimizer,
)
MOI.Utilities.attach_optimizer(model)
MOI.set(optimizer, MOI.TerminationStatus(), MOI.OPTIMAL)
MOI.set(optimizer, MOI.PrimalStatus(), MOI.FEASIBLE_POINT)
@test MOI.get(model, MOI.TerminationStatus()) == MOI.OPTIMAL
@test MOI.get(model, MOI.PrimalStatus()) == MOI.FEASIBLE_POINT
end