Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 13 additions & 4 deletions src/MathOptLazy.jl
Original file line number Diff line number Diff line change
Expand Up @@ -459,16 +459,25 @@ function MOI.get(
model::Optimizer,
::MOI.ListOfConstraintIndices{F,LazyScalarSet{S}},
) where {F<:MOI.AbstractScalarFunction,S<:MOI.AbstractScalarSet}
n = MOI.get(model, MOI.NumberOfConstraints{F,LazyScalarSet{S}}())
return [MOI.ConstraintIndex{F,LazyScalarSet{S}}(i) for i in 1:n]
ret = MOI.ConstraintIndex{F,LazyScalarSet{S}}[]
if (data = _maybe_data(model, F, S)) !== nothing
for (i, status) in enumerate(data.status)
if status != _kLAZY_CONSTRAINT_DELETED
push!(ret, MOI.ConstraintIndex{F,LazyScalarSet{S}}(i))
end
end
end
return ret
end

function MOI.get(
model::Optimizer,
::MOI.NumberOfConstraints{F,LazyScalarSet{S}},
) where {F<:MOI.AbstractScalarFunction,S<:MOI.AbstractScalarSet}
ret = _maybe_data(model, F, S)
return ret === nothing ? 0 : length(ret.data)
if (data = _maybe_data(model, F, S)) !== nothing
return count(!=(_kLAZY_CONSTRAINT_DELETED), data.status)
end
return 0
end

function MOI.add_constraint(
Expand Down
12 changes: 12 additions & 0 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -408,9 +408,14 @@ function test_delete_lazy_inactive()
MOI.add_constraint(model, x, MOI.EqualTo(0.0))
set = MathOptLazy.LazyScalarSet(MOI.EqualTo(1.0))
c = MOI.add_constraint(model, 1.0 * x, set)
F, S = MOI.ScalarAffineFunction{Float64}, typeof(set)
@test MOI.is_valid(model, c)
@test only(MOI.get(model, MOI.ListOfConstraintIndices{F,S}())) == c
@test MOI.get(model, MOI.NumberOfConstraints{F,S}()) == 1
MOI.delete(model, c)
@test !MOI.is_valid(model, c)
@test isempty(MOI.get(model, MOI.ListOfConstraintIndices{F,S}()))
@test MOI.get(model, MOI.NumberOfConstraints{F,S}()) == 0
MOI.optimize!(model)
@test MOI.get(model, MOI.TerminationStatus()) == MOI.OPTIMAL
return
Expand All @@ -425,7 +430,14 @@ function test_delete_lazy_active()
c = MOI.add_constraint(model, 1.0 * x, set)
MOI.optimize!(model)
@test MOI.get(model, MOI.TerminationStatus()) == MOI.INFEASIBLE
F, S = MOI.ScalarAffineFunction{Float64}, typeof(set)
@test MOI.is_valid(model, c)
@test only(MOI.get(model, MOI.ListOfConstraintIndices{F,S}())) == c
@test MOI.get(model, MOI.NumberOfConstraints{F,S}()) == 1
MOI.delete(model, c)
@test !MOI.is_valid(model, c)
@test isempty(MOI.get(model, MOI.ListOfConstraintIndices{F,S}()))
@test MOI.get(model, MOI.NumberOfConstraints{F,S}()) == 0
MOI.optimize!(model)
@test MOI.get(model, MOI.TerminationStatus()) == MOI.OPTIMAL
return
Expand Down
Loading