Skip to content

[Utilities] fix emptying of CachingOptimizer #1615

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
odow merged 1 commit into from
Sep 16, 2021
Merged

[Utilities] fix emptying of CachingOptimizer #1615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion src/Utilities/cachingoptimizer.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,10 @@ end

function MOI.empty!(m::CachingOptimizer)
MOI.empty!(m.model_cache)
if m.state == ATTACHED_OPTIMIZER
if m.state != NO_OPTIMIZER
# We call `empty!` even if the state is already `EMPTY_OPTIMIZER`
# because we may have used to two-argument `optimize!` for a single-shot
# solver.
MOI.empty!(m.optimizer)
m.state = EMPTY_OPTIMIZER
end
Expand Down
22 changes: 18 additions & 4 deletions test/Utilities/cachingoptimizer.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,20 +763,34 @@ function test_status_codes()
return
end

struct CopyToAndOptimizer <: MOI.AbstractOptimizer end
MOI.is_empty(::CopyToAndOptimizer) = true
function MOI.optimize!(::CopyToAndOptimizer, src::MOI.ModelLike)
mutable struct CopyToAndOptimizer <: MOI.AbstractOptimizer
is_dirty::Bool
end

function MOI.empty!(x::CopyToAndOptimizer)
x.is_dirty = false
return
end

MOI.is_empty(x::CopyToAndOptimizer) = !x.is_dirty

function MOI.optimize!(x::CopyToAndOptimizer, ::MOI.ModelLike)
x.is_dirty = true
return MOI.Utilities.IndexMap(), false
end

function test_copy_to_and_optimize!()
optimizer = CopyToAndOptimizer()
optimizer = CopyToAndOptimizer(false)
model = MOI.Utilities.CachingOptimizer(
MOI.Utilities.Model{Float64}(),
optimizer,
)
MOI.optimize!(model)
@test MOI.Utilities.state(model) == MOI.Utilities.EMPTY_OPTIMIZER
@test !MOI.is_empty(optimizer)
MOI.empty!(model)
@test MOI.is_empty(optimizer)
@test MOI.Utilities.state(model) == MOI.Utilities.EMPTY_OPTIMIZER
return
end

Expand Down