Fix deletion methods (#175)

* Fix deletion methods

* fix vector affine case

* add better deletion test

* fix tests

* fix

* improve edge case

Author: joaquimg

Project.toml

@@ -1,7 +1,7 @@
 name = "ParametricOptInterface"
 uuid = "0ce4ce61-57bf-432b-a095-efac525d185e"
 authors = ["Tomás Gutierrez <[email protected]>"]
-version = "0.11.0"
+version = "0.11.1"
 
 [deps]
 MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"

src/MOI_wrapper.jl

@@ -843,8 +843,8 @@ function MOI.delete(
     if haskey(model.quadratic_outer_to_inner, c)
         ci_inner = model.quadratic_outer_to_inner[c]
         delete!(model.quadratic_outer_to_inner, c)
-        delete!(model.quadratic_constraint_cache, c)
-        delete!(model.quadratic_constraint_cache_set, c)
+        delete!(model.quadratic_constraint_cache, ci_inner)
+        delete!(model.quadratic_constraint_cache_set, ci_inner)
         MOI.delete(model.optimizer, ci_inner)
     else
         MOI.delete(model.optimizer, c)
@@ -860,8 +860,8 @@ function MOI.delete(
     if haskey(model.affine_outer_to_inner, c)
         ci_inner = model.affine_outer_to_inner[c]
         delete!(model.affine_outer_to_inner, c)
-        delete!(model.affine_constraint_cache, c)
-        delete!(model.affine_constraint_cache_set, c)
+        delete!(model.affine_constraint_cache, ci_inner)
+        delete!(model.affine_constraint_cache_set, ci_inner)
         MOI.delete(model.optimizer, ci_inner)
     else
         MOI.delete(model.optimizer, c)
@@ -883,9 +883,14 @@ function MOI.delete(
     model::Optimizer,
     c::MOI.ConstraintIndex{F,S},
 ) where {F<:MOI.VectorAffineFunction,S<:MOI.AbstractSet}
-    MOI.delete(model.optimizer, c)
+    ci_inner = model.constraint_outer_to_inner[c]
+    if haskey(model.vector_affine_constraint_cache, ci_inner)
+        delete!(model.vector_affine_constraint_cache, ci_inner)
+        MOI.delete(model.optimizer, ci_inner)
+    else
+        MOI.delete(model.optimizer, c)
+    end
     delete!(model.constraint_outer_to_inner, c)
-    delete!(model.vector_affine_constraint_cache, c)
     return
 end
 

test/jump_tests.jl

@@ -753,6 +753,105 @@ function test_jump_dual_delete_constraint()
     return
 end
 
+function test_jump_dual_delete_constraint_2()
+    model = Model(() -> POI.Optimizer(GLPK.Optimizer()))
+    @variable(model, α in MOI.Parameter(1.0))
+    @variable(model, β in MOI.Parameter(0.0))
+    @variable(model, x)
+    list = []
+    cref = @constraint(model, x >= 1 * 1)
+    push!(list, cref)
+    cref = @constraint(model, x >= 9 * α)
+    push!(list, cref)
+    cref = @constraint(model, x >= 8 * α + β^2)
+    push!(list, cref)
+    cref = @constraint(model, x >= 7 * 1)
+    push!(list, cref)
+    cref = @constraint(model, x >= 6 * α)
+    push!(list, cref)
+    cref = @constraint(model, x >= 5 * α + β^2)
+    push!(list, cref)
+    cref = @constraint(model, x >= 4 * 1)
+    push!(list, cref)
+    cref = @constraint(model, x >= 3 * α)
+    push!(list, cref)
+    cref = @constraint(model, x >= 2 * α + β^2)
+    push!(list, cref)
+    @objective(model, Min, x)
+    cref1 = popfirst!(list)
+    for i in 9:-1:2
+        JuMP.optimize!(model)
+        @test JuMP.value(x) == 1.0 * i
+        @test JuMP.dual(cref1) == 0.0
+        for con in list[2:end]
+            @test JuMP.dual(con) == 0.0
+        end
+        @test JuMP.dual(list[1]) == 1.0
+        if i in [7, 4]
+            @test MOI.get(model, POI.ParameterDual(), α) == 0.0
+        else
+            @test MOI.get(model, POI.ParameterDual(), α) == 1.0 * i
+        end
+        con = popfirst!(list)
+        JuMP.delete(model, con)
+    end
+    return
+end
+
+function test_jump_dual_delete_constraint_3()
+    cached = MOI.Utilities.CachingOptimizer(
+        MOI.Utilities.UniversalFallback(MOI.Utilities.Model{Float64}()),
+        SCS.Optimizer(),
+    )
+    optimizer = POI.Optimizer(cached)
+    model = direct_model(optimizer)
+    set_silent(model)
+    list = []
+    @variable(model, α in MOI.Parameter(1.0))
+    @variable(model, β in MOI.Parameter(0.0))
+    @variable(model, x)
+    cref = @constraint(model, [x - 1 * 1] in MOI.Nonnegatives(1))
+    push!(list, cref)
+    cref = @constraint(model, [x - 9 * α] in MOI.Nonnegatives(1))
+    push!(list, cref)
+    # cref = @constraint(model, [x - 8 * α + β^2] in MOI.Nonnegatives(1))
+    cref = @constraint(model, [x - 8 * α + β] in MOI.Nonnegatives(1))
+    push!(list, cref)
+    cref = @constraint(model, [x - 7 * 1] in MOI.Nonnegatives(1))
+    push!(list, cref)
+    cref = @constraint(model, [x - 6 * α] in MOI.Nonnegatives(1))
+    push!(list, cref)
+    # cref = @constraint(model, [x - 5 * α + β^2] in MOI.Nonnegatives(1))
+    cref = @constraint(model, [x - 5 * α + β] in MOI.Nonnegatives(1))
+    push!(list, cref)
+    cref = @constraint(model, [x - 4 * 1] in MOI.Nonnegatives(1))
+    push!(list, cref)
+    cref = @constraint(model, [x - 3 * α] in MOI.Nonnegatives(1))
+    push!(list, cref)
+    # cref = @constraint(model, [x - 2 * α + β^2] in MOI.Nonnegatives(1))
+    cref = @constraint(model, [x - 2 * α + β] in MOI.Nonnegatives(1))
+    push!(list, cref)
+    @objective(model, Min, 1.0 * x)
+    cref1 = popfirst!(list)
+    for i in 9:-1:2
+        JuMP.optimize!(model)
+        @test JuMP.value(x) ≈ 1.0 * i atol = 1e-5
+        @test JuMP.dual(cref1)[] ≈ 0.0 atol = 1e-5
+        for con in list[2:end]
+            @test JuMP.dual(con)[] ≈ 0.0 atol = 1e-5
+        end
+        @test JuMP.dual(list[1])[] ≈ 1.0 atol = 1e-5
+        if i in [7, 4]
+            @test MOI.get(model, POI.ParameterDual(), α) ≈ 0.0 atol = 1e-5
+        else
+            @test MOI.get(model, POI.ParameterDual(), α) ≈ 1.0 * i atol = 1e-5
+        end
+        con = popfirst!(list)
+        JuMP.delete(model, con)
+    end
+    return
+end
+
 function test_jump_nlp()
     model = Model(() -> ParametricOptInterface.Optimizer(Ipopt.Optimizer()))
     @variable(model, x)