Skip to content

Implement supports_add_constrained_variable for MockOptimizer #1164

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 1 commit into from
Sep 19, 2020
Merged

Implement supports_add_constrained_variable for MockOptimizer #1164

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: 5 additions & 0 deletions src/Utilities/mockoptimizer.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,11 @@ end
# TODO: transform

MOI.supports_constraint(mock::MockOptimizer, F::Type{<:MOI.AbstractFunction}, S::Type{<:MOI.AbstractSet}) = MOI.supports_constraint(mock.inner_model, F, S)
MOI.supports_add_constrained_variable(mock::MockOptimizer, S::Type{<:MOI.AbstractScalarSet}) = MOI.supports_add_constrained_variable(mock.inner_model, S)
MOI.supports_add_constrained_variables(mock::MockOptimizer, S::Type{<:MOI.AbstractVectorSet}) = MOI.supports_add_constrained_variables(mock.inner_model, S)
# Add this method to avoid ambiguity
MOI.supports_add_constrained_variables(mock::MockOptimizer, ::Type{MOI.Reals}) = MOI.supports_add_constrained_variables(mock.inner_model, MOI.Reals)

function MOI.copy_to(mock::MockOptimizer, src::MOI.ModelLike; kws...)
automatic_copy_to(mock, src; kws...)
end
Expand Down
16 changes: 16 additions & 0 deletions test/Utilities/mockoptimizer.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,22 @@ end
MOIT.nametest(MOIU.MockOptimizer(MOIU.Model{Float64}()))
end

struct NoFreeModel <: MOI.ModelLike end
MOI.supports_add_constrained_variables(::NoFreeModel, ::Type{MOI.Reals}) = false

@testset "supports_add_constrained_variable" begin
optimizer = MOIU.MockOptimizer(MOIU.Model{Float64}())
@test MOI.supports_add_constrained_variable(optimizer, MOI.GreaterThan{Float64})
@test !MOI.supports_add_constrained_variable(optimizer, MOIT.UnknownScalarSet{Float64})
@test MOI.supports_add_constrained_variables(optimizer, MOI.Nonnegatives)
@test !MOI.supports_add_constrained_variables(optimizer, MOIT.UnknownVectorSet)

nofree_optimizer = MOIU.MockOptimizer(NoFreeModel())
@test !MOI.supports_add_constrained_variable(nofree_optimizer, MOI.GreaterThan{Float64})
@test !MOI.supports_add_constrained_variables(nofree_optimizer, MOI.Nonnegatives)
@test !MOI.supports_add_constrained_variables(nofree_optimizer, MOI.Reals)
end

@testset "Optimizer attributes" begin
optimizer = MOIU.MockOptimizer(MOIU.Model{Float64}())
@test MOI.supports(optimizer, MOIU.MockModelAttribute())
Expand Down