Fix deletion before final_touch

src/Bridges/Constraint/bridges/BinPackingToMILPBridge.jl

@@ -129,6 +129,7 @@ function MOI.get(
 end
 
 function MOI.delete(model::MOI.ModelLike, bridge::BinPackingToMILPBridge)
+    # Delete is okay before `final_touch`
     MOI.delete.(model, bridge.less_than)
     empty!(bridge.less_than)
     MOI.delete.(model, bridge.equal_to)

src/Bridges/Constraint/bridges/CountBelongsToMILPBridge.jl

@@ -133,6 +133,7 @@ function MOI.get(
 end
 
 function MOI.delete(model::MOI.ModelLike, bridge::CountBelongsToMILPBridge)
+    # Delete is okay before `final_touch`
     for ci in bridge.equal_to
         MOI.delete(model, ci)
     end

src/Bridges/Constraint/bridges/CountDistinctToMILPBridge.jl

@@ -172,6 +172,7 @@ function MOI.get(
 end
 
 function MOI.delete(model::MOI.ModelLike, bridge::CountDistinctToMILPBridge)
+    # Delete is okay before `final_touch`
     for ci in bridge.equal_to
         MOI.delete(model, ci)
     end

src/Bridges/Constraint/bridges/CountGreaterThanToMILPBridge.jl

@@ -108,6 +108,7 @@ function MOI.get(
 end
 
 function MOI.delete(model::MOI.ModelLike, bridge::CountGreaterThanToMILPBridge)
+    # Delete is okay before `final_touch`
     MOI.delete.(model, bridge.greater_than)
     empty!(bridge.greater_than)
     MOI.delete.(model, bridge.equal_to)

src/Bridges/Constraint/bridges/IntegerToZeroOneBridge.jl

@@ -103,6 +103,9 @@ function MOI.get(::MOI.ModelLike, ::MOI.ConstraintSet, ::IntegerToZeroOneBridge)
 end
 
 function MOI.delete(model::MOI.ModelLike, bridge::IntegerToZeroOneBridge)
+    if bridge.last_bounds === nothing
+        return  # We're deleting the bridge before final_touch
+    end
     MOI.delete(model, bridge.ci)
     MOI.delete(model, bridge.y)
     return

src/Bridges/Constraint/bridges/ReifiedCountDistinctToMILPBridge.jl

@@ -169,6 +169,7 @@ function MOI.delete(
     model::MOI.ModelLike,
     bridge::ReifiedCountDistinctToMILPBridge,
 )
+    # Delete is okay before `final_touch`
     for ci in bridge.equal_to
         MOI.delete(model, ci)
     end

src/Bridges/Constraint/bridges/SemiToBinaryBridge.jl

@@ -186,6 +186,7 @@ function MOI.get(
 end
 
 function MOI.delete(model::MOI.ModelLike, bridge::SemiToBinaryBridge)
+    # Delete is okay, even though we call `final_touch`
     if bridge.integer_index !== nothing
         MOI.delete(model, bridge.integer_index)
     end

test/Bridges/Constraint/test_BinPackingToMILPBridge.jl

@@ -142,6 +142,19 @@ function test_runtests_error_affine()
     return
 end
 
+function test_delete_before_final_touch()
+    inner = MOI.Utilities.Model{Int}()
+    model = MOI.Bridges.Constraint.BinPackingToMILP{Int}(inner)
+    x = MOI.add_variables(model, 2)
+    f = MOI.Utilities.operate(vcat, Int, 2, 1 * x[1], x[2])
+    c = MOI.add_constraint(model, f, MOI.BinPacking(3, [1, 2, 3]))
+    MOI.delete(model, c)
+    @test MOI.is_valid(model, x[1])
+    @test !MOI.is_valid(model, c)
+    MOI.Bridges.final_touch(model)
+    return
+end
+
 end  # module
 
 TestConstraintBinPacking.runtests()

test/Bridges/Constraint/test_CountBelongsToMILPBridge.jl

@@ -127,6 +127,19 @@ function test_runtests_error_affine()
     return
 end
 
+function test_delete_before_final_touch()
+    inner = MOI.Utilities.Model{Int}()
+    model = MOI.Bridges.Constraint.CountBelongsToMILP{Int}(inner)
+    x = MOI.add_variables(model, 2)
+    f = MOI.Utilities.operate(vcat, Int, 2, 1 * x[1], x[2])
+    c = MOI.add_constraint(model, f, MOI.CountBelongs(3, Set([2, 4])))
+    MOI.delete(model, c)
+    @test MOI.is_valid(model, x[1])
+    @test !MOI.is_valid(model, c)
+    MOI.Bridges.final_touch(model)
+    return
+end
+
 end  # module
 
 TestConstraintCountBelongs.runtests()

test/Bridges/Constraint/test_CountDistinctToMILPBridge.jl

@@ -185,6 +185,19 @@ function test_resolve_with_modified_not_equal_to()
     return
 end
 
+function test_delete_before_final_touch()
+    inner = MOI.Utilities.Model{Int}()
+    model = MOI.Bridges.Constraint.CountDistinctToMILP{Int}(inner)
+    x = MOI.add_variables(model, 2)
+    f = MOI.Utilities.operate(vcat, Int, 2, 1 * x[1], x[2])
+    c = MOI.add_constraint(model, f, MOI.CountDistinct(3))
+    MOI.delete(model, c)
+    @test MOI.is_valid(model, x[1])
+    @test !MOI.is_valid(model, c)
+    MOI.Bridges.final_touch(model)
+    return
+end
+
 end  # module
 
 TestConstraintCountDistinct.runtests()

test/Bridges/Constraint/test_CountGreaterThanToMILPBridge.jl

@@ -144,6 +144,19 @@ function test_runtests_error_affine()
     return
 end
 
+function test_delete_before_final_touch()
+    inner = MOI.Utilities.Model{Int}()
+    model = MOI.Bridges.Constraint.CountGreaterThanToMILP{Int}(inner)
+    x = MOI.add_variables(model, 2)
+    f = MOI.Utilities.operate(vcat, Int, 2, x[1], 1 * x[1], x[2])
+    c = MOI.add_constraint(model, f, MOI.CountGreaterThan(3))
+    MOI.delete(model, c)
+    @test MOI.is_valid(model, x[1])
+    @test !MOI.is_valid(model, c)
+    MOI.Bridges.final_touch(model)
+    return
+end
+
 end  # module
 
 TestConstraintCountGreaterThan.runtests()

test/Bridges/Constraint/test_IndicatorToMILPBridge.jl

@@ -298,6 +298,7 @@ function test_delete_before_final_touch()
     )
     MOI.delete(model, c)
     @test !MOI.is_valid(model, c)
+    MOI.Bridges.final_touch(model)
     return
 end
 

test/Bridges/Constraint/test_IntegerToZeroOneBridge.jl

@@ -94,6 +94,18 @@ function test_final_touch_twice()
     return
 end
 
+function test_delete_before_final_touch()
+    inner = MOI.Utilities.Model{Int}()
+    model = MOI.Bridges.Constraint.IntegerToZeroOne{Int}(inner)
+    x, cx = MOI.add_constrained_variable(model, MOI.Integer())
+    MOI.add_constraint(model, x, MOI.Interval(1, 3))
+    MOI.delete(model, x)
+    @test !MOI.is_valid(model, x)
+    @test !MOI.is_valid(model, cx)
+    MOI.Bridges.final_touch(model)
+    return
+end
+
 end  # module
 
 TestConstraintIntegerToZeroOne.runtests()

test/Bridges/Constraint/test_ReifiedCountDistinctToMILPBridge.jl

@@ -164,6 +164,19 @@ function test_runtests_error_affine()
     return
 end
 
+function test_delete_before_final_touch()
+    inner = MOI.Utilities.Model{Int}()
+    model = MOI.Bridges.Constraint.ReifiedCountDistinctToMILP{Int}(inner)
+    x = MOI.add_variables(model, 3)
+    f = MOI.Utilities.operate(vcat, Int, x[1], 1, x[2], x[3])
+    c = MOI.add_constraint(model, f, MOI.Reified(MOI.CountDistinct(3)))
+    MOI.delete(model, c)
+    @test MOI.is_valid(model, x[1])
+    @test !MOI.is_valid(model, c)
+    MOI.Bridges.final_touch(model)
+    return
+end
+
 end  # module
 
 TestConstraintReifiedCountDistinct.runtests()

test/Bridges/Constraint/test_SOS1ToMILPBridge.jl

@@ -128,6 +128,7 @@ function test_delete_before_final_touch()
     )
     MOI.delete(model, c)
     @test !MOI.is_valid(model, c)
+    MOI.Bridges.final_touch(model)
     return
 end
 

test/Bridges/Constraint/test_SOS2ToMILPBridge.jl

@@ -138,6 +138,7 @@ function test_delete_before_final_touch()
     )
     MOI.delete(model, c)
     @test !MOI.is_valid(model, c)
+    MOI.Bridges.final_touch(model)
     return
 end
 

test/Bridges/Constraint/test_SemiToBinaryBridge.jl

@@ -334,6 +334,18 @@ function test_open_interval()
     return
 end
 
+function test_delete_before_final_touch()
+    inner = MOI.Utilities.Model{Float64}()
+    model = MOI.Bridges.Constraint.SemiToBinary{Float64}(inner)
+    x = MOI.add_variable(model)
+    c = MOI.add_constraint(model, 1.0 * x, MOI.Semicontinuous(1.0, 2.0))
+    MOI.delete(model, c)
+    @test MOI.is_valid(model, x)
+    @test !MOI.is_valid(model, c)
+    MOI.Bridges.final_touch(model)
+    return
+end
+
 end  # module
 
 TestConstraintSemiToBinary.runtests()