Skip to content

Tests for vector specialized version of MOI.delete #989

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 5 commits into from
Jan 10, 2020
Merged

Tests for vector specialized version of MOI.delete #989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9cb4c7d
Adds delete_variables_in_a_batch in the modification tests. MOI.delet…
henriquebecker91 Jan 3, 2020
9d9403f
Used the flag passed to delete_variables_in_a_batch.
henriquebecker91 Jan 3, 2020
358d1b7
Removed some redundancy in the tests.
henriquebecker91 Jan 4, 2020
9be3a13
Merge branch 'master' into hb/batch_delete_test
henriquebecker91 Jan 5, 2020
7f6d4cc
Added call to tests as asked by @odow.
henriquebecker91 Jan 5, 2020
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: 37 additions & 0 deletions src/Test/UnitTests/modifications.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,4 +353,41 @@ function delete_variable_with_single_variable_obj(model::MOI.ModelLike,
end
modificationtests["delete_variable_with_single_variable_obj"] = delete_variable_with_single_variable_obj

"""
delete_variables_in_a_batch(model::MOI.ModelLike, config::TestConfig)

Test deleting many variables in a batch (i.e. using the delete method which
takes a vector of variable references). If `config.solve=true` confirm that it
solves correctly.
"""
function delete_variables_in_a_batch(model::MOI.ModelLike,
config::TestConfig)
MOI.empty!(model)
@test MOI.is_empty(model)
MOIU.loadfromstring!(model,"""
variables: x, y, z
minobjective: 1.0 * x + 2.0 * y + 3.0 * z
c1: x >= 1.0
c2: y >= 1.0
c3: z >= 1.0
""")
x, y, z = MOI.get(model, MOI.ListOfVariableIndices())
@test MOI.is_valid(model, x)
@test MOI.is_valid(model, y)
@test MOI.is_valid(model, z)
if config.solve
MOI.optimize!(model)
@test MOI.get(model, MOI.ObjectiveValue()) == 6.0
end
MOI.delete(model, [x, z])
@test !MOI.is_valid(model, x)
@test MOI.is_valid(model, y)
@test !MOI.is_valid(model, z)
if config.solve
MOI.optimize!(model)
@test MOI.get(model, MOI.ObjectiveValue()) == 2.0
end
end
modificationtests["delete_variables_in_a_batch"] = delete_variables_in_a_batch

@moitestset modification
13 changes: 13 additions & 0 deletions test/Test/unit.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,19 @@ end
# `UniversalFallback` needed for `MOI.Silent`
mock = MOIU.MockOptimizer(MOIU.UniversalFallback(MOIU.Model{Float64}()))
config = MOIT.TestConfig()
@testset "delete_variables_in_a_batch" begin
MOIU.set_mock_optimize!(mock,
(mock::MOIU.MockOptimizer) -> MOIU.mock_optimize!(mock,
MOI.OPTIMAL, (MOI.FEASIBLE_POINT, [1.0, 1.0, 1.0]),
MOI.FEASIBLE_POINT
),
(mock::MOIU.MockOptimizer) -> MOIU.mock_optimize!(mock,
MOI.OPTIMAL, (MOI.FEASIBLE_POINT, [1.0]),
MOI.FEASIBLE_POINT
)
)
MOIT.delete_variables_in_a_batch(mock, config)
end
@testset "solve_set_singlevariable_lessthan" begin
MOIU.set_mock_optimize!(mock,
(mock::MOIU.MockOptimizer) -> MOIU.mock_optimize!(mock,
Expand Down