Skip to content

[Utilities] fix deleting variables and constraints in MockOptimizer #3080

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 9, 2026
+51 −11
Merged

[Utilities] fix deleting variables and constraints in MockOptimizer #3080

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
24 changes: 13 additions & 11 deletions src/Utilities/mockoptimizer.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -865,15 +865,15 @@ end
function MOI.delete(mock::MockOptimizer, index::MOI.VariableIndex)
if !mock.delete_allowed
throw(MOI.DeleteNotAllowed(index))
end
if !MOI.is_valid(mock, index)
elseif !MOI.is_valid(mock, index)
# The index thrown by `mock.inner_model` would be xored
throw(MOI.InvalidIndex(index))
end
MOI.delete(mock.inner_model, xor_index(index))
delete!(mock.variable_primal, index)
delete!(mock.callback_variable_primal, index)
delete!(mock.variable_basis_status, index)
xored = xor_index(index)
MOI.delete(mock.inner_model, xored)
delete!(mock.variable_primal, xored)
delete!(mock.callback_variable_primal, xored)
delete!(mock.variable_basis_status, xored)
return
end

Expand All @@ -885,8 +885,9 @@ function MOI.delete(mock::MockOptimizer, indices::Vector{MOI.VariableIndex})
# The index thrown by `mock.inner_model` would be xored
MOI.throw_if_not_valid(mock, index)
end
MOI.delete(mock.inner_model, xor_index.(indices))
for index in indices
xored = xor_index.(indices)
MOI.delete(mock.inner_model, xored)
for index in xored
delete!(mock.variable_primal, index)
delete!(mock.callback_variable_primal, index)
delete!(mock.variable_basis_status, index)
Expand All @@ -902,9 +903,10 @@ function MOI.delete(mock::MockOptimizer, index::MOI.ConstraintIndex)
# The index thrown by `mock.inner_model` would be xored
throw(MOI.InvalidIndex(index))
end
MOI.delete(mock.inner_model, xor_index(index))
delete!(mock.constraint_dual, index)
delete!(mock.constraint_basis_status, index)
xored = xor_index(index)
MOI.delete(mock.inner_model, xored)
delete!(mock.constraint_dual, xored)
delete!(mock.constraint_basis_status, xored)
return
end

Expand Down
38 changes: 38 additions & 0 deletions test/Utilities/test_mockoptimizer.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,44 @@ function test_empty_constructor()
return
end

function test_delete_mock_variable()
model = MOI.Utilities.MockOptimizer(MOI.Utilities.Model{Float64}())
x = MOI.add_variables(model, 3)
MOI.set.(model, MOI.VariablePrimal(), x, [1.0, 2.0, 3.0])
MOI.delete(model, x[2])
@test length(model.variable_primal) == 2
@test haskey(model.variable_primal, MOI.Utilities.xor_index(x[1]))
@test !haskey(model.variable_primal, MOI.Utilities.xor_index(x[2]))
@test haskey(model.variable_primal, MOI.Utilities.xor_index(x[3]))
return
end

function test_delete_mock_variable_vector()
model = MOI.Utilities.MockOptimizer(MOI.Utilities.Model{Float64}())
x = MOI.add_variables(model, 3)
MOI.set.(model, MOI.VariablePrimal(), x, [1.0, 2.0, 3.0])
MOI.delete(model, x[1:2])
@test length(model.variable_primal) == 1
@test !haskey(model.variable_primal, MOI.Utilities.xor_index(x[1]))
@test !haskey(model.variable_primal, MOI.Utilities.xor_index(x[2]))
@test haskey(model.variable_primal, MOI.Utilities.xor_index(x[3]))
return
end

function test_delete_mock_constraint()
model = MOI.Utilities.MockOptimizer(MOI.Utilities.Model{Float64}())
x = MOI.add_variables(model, 3)
c = MOI.add_constraint.(model, x, MOI.EqualTo(1.0))
@test isempty(model.constraint_dual)
MOI.set.(model, MOI.ConstraintDual(), c, [1.0, 2.0, 3.0])
MOI.delete(model, c[2])
@test length(model.constraint_dual) == 2
@test haskey(model.constraint_dual, MOI.Utilities.xor_index(c[1]))
@test !haskey(model.constraint_dual, MOI.Utilities.xor_index(c[2]))
@test haskey(model.constraint_dual, MOI.Utilities.xor_index(c[3]))
return
end

end # module

TestMockOptimizer.runtests()
Loading