Skip to content
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

Jump to bottom

Change the default mode of CachingOptimizer #1254

Merged
merged 3 commits into from
Apr 30, 2021
Merged

Change the default mode of CachingOptimizer #1254

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a965a5
Change the default mode of CachingOptimizer
odow Mar 1, 2021
7a1837a
Merge branch 'master' into od/chg_default
odow Apr 23, 2021
b9d917e
Update overview.md
odow Apr 30, 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
11 changes: 4 additions & 7 deletions src/Utilities/cachingoptimizer.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ end
"""
CachingOptimizer(model_cache::MOI.ModelLike, optimizer::AbstractOptimizer)

Creates an `CachingOptimizer` in `AUTOMATIC` mode, with the optimizer `optimizer`.
The `model_cache` manager returned behaves like an `AbstractOptimizer` as long as no
`CachingOptimizer`-specific functions (e.g. `reset_optimizer`) are called on it.
Creates an `CachingOptimizer` in `AUTOMATIC` mode, with the optimizer
`optimizer`.

The type of the optimizer returned is `CachingOptimizer{typeof(optimizer),
typeof(model_cache)}` so it does not support the function
`reset_optimizer(::CachingOptimizer, new_optimizer)` if the type of
Expand All @@ -87,7 +87,7 @@ function CachingOptimizer(
return CachingOptimizer{typeof(optimizer),typeof(model_cache)}(
optimizer,
model_cache,
ATTACHED_OPTIMIZER,
EMPTY_OPTIMIZER,
AUTOMATIC,
IndexMap(),
IndexMap(),
Expand Down Expand Up @@ -218,9 +218,6 @@ function MOI.empty!(m::CachingOptimizer)
if m.state == ATTACHED_OPTIMIZER
MOI.empty!(m.optimizer)
end
if m.state == EMPTY_OPTIMIZER && m.mode == AUTOMATIC
m.state = ATTACHED_OPTIMIZER
end
m.model_to_optimizer_map = IndexMap()
return m.optimizer_to_model_map = IndexMap()
end
Expand Down
12 changes: 8 additions & 4 deletions test/Utilities/cachingoptimizer.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,11 @@ struct DummyConstraintAttribute <: MOI.AbstractConstraintAttribute end

@testset "Mapping of variables" begin
mock = MOIU.MockOptimizer(MOIU.UniversalFallback(MOIU.Model{Float64}()))
model = MOIU.CachingOptimizer(MOIU.UniversalFallback(MOIU.Model{Float64}()), mock)
model = MOIU.CachingOptimizer(
MOIU.UniversalFallback(MOIU.Model{Float64}()),
mock,
)
MOIU.attach_optimizer(model)
x = MOI.add_variable(model)
y = first(MOI.get(mock, MOI.ListOfVariableIndices()))
odow marked this conversation as resolved.
Show resolved Hide resolved
@test x != y # Otherwise, these tests will trivially pass
Expand Down Expand Up @@ -363,7 +367,7 @@ end
s.add_con_allowed = true
@test MOIU.state(m) == MOIU.EMPTY_OPTIMIZER
MOI.empty!(m)
@test MOIU.state(m) == MOIU.ATTACHED_OPTIMIZER
@test MOIU.state(m) == MOIU.EMPTY_OPTIMIZER
end

@testset "Add variable not allowed" begin
Expand Down Expand Up @@ -416,12 +420,12 @@ end
m = MOIU.CachingOptimizer(model, s)
@test m isa MOIU.CachingOptimizer{typeof(s), typeof(model)}
@test MOI.is_empty(m)
@test MOIU.state(m) == MOIU.ATTACHED_OPTIMIZER
@test MOIU.state(m) == MOIU.EMPTY_OPTIMIZER
@test MOIU.mode(m) == MOIU.AUTOMATIC
@test MOI.get(m, MOI.SolverName()) == "Mock"
@test sprint(show, m) == MOI.Utilities.replace_acronym("""
$(MOIU.CachingOptimizer{MOIU.MockOptimizer{MOIU.Model{Float64}},MOIU.Model{Float64}})
in state ATTACHED_OPTIMIZER
in state EMPTY_OPTIMIZER
in mode AUTOMATIC
with model cache MOIU.Model{Float64}
with optimizer MOIU.MockOptimizer{MOIU.Model{Float64}}""")
Expand Down