Add delete and supports tests

Author: blegat

src/Bridges/Variable/zeros.jl

@@ -39,6 +39,9 @@ function MOI.get(bridge::ZerosBridge, ::MOI.ListOfVariableIndices)
     return MOI.VariableIndex[]
 end
 
+# References
+function MOI.delete(::MOI.ModelLike, ::ZerosBridge) end
+
 # Attributes, Bridge acting as a constraint
 
 function MOI.get(::MOI.ModelLike, ::MOI.ConstraintPrimal,

src/Bridges/bridge.jl

@@ -38,6 +38,17 @@ function MOI.get(::AbstractBridge,
     return MOI.ConstraintIndex{F, S}[]
 end
 
+"""
+    MOI.supports(model::MOI.ModelLike, attr::MOI.AbstractConstraintAttribute,
+                 BT::Type{<:AbstractBridge})
+
+Return a `Bool` indicating whether `BT` supports setting `attr` to `model`.
+"""
+function MOI.supports(::MOI.ModelLike, ::MOI.AbstractConstraintAttribute,
+                      ::Type{<:AbstractBridge})
+    return false
+end
+
 """
     function MOI.get(model::MOI.ModelLike, attr::MOI.AbstractConstraintAttribute,
                      bridge::AbstractBridge)

src/Bridges/bridge_optimizer.jl

@@ -131,10 +131,6 @@ function MOIU.supports_default_copy_to(b::AbstractBridgeOptimizer,
 end
 
 # References
-function _constraint_index(b::AbstractBridgeOptimizer, i::Integer)
-    F, S = b.constraint_types[i]
-    return MOI.ConstraintIndex{F, S}(i)
-end
 function MOI.is_valid(b::AbstractBridgeOptimizer, vi::MOI.VariableIndex)
     if is_bridged(b, vi)
         return haskey(Variable.bridges(b), vi)
@@ -201,14 +197,15 @@ end
 function MOI.delete(b::AbstractBridgeOptimizer, ci::MOI.ConstraintIndex)
     if is_bridged(b, ci)
         MOI.throw_if_not_valid(b, ci)
-        MOI.delete(b, bridge(b, ci))
+        br = bridge(b, ci)
         if is_variable_bridged(b, ci)
             error("Cannot delete constraint index of bridged constrained",
                   " variables, delete the scalar variable or the vector of",
                   " variables instead.")
         else
             delete!(Constraint.bridges(b), ci)
         end
+        MOI.delete(b, br)
         if Constraint.has_bridges(Constraint.bridges(b))
             b.name_to_con = nothing
         end

test/Bridges/Variable/flip_sign.jl

@@ -24,6 +24,7 @@ config = MOIT.TestConfig()
     y = vis[4]
     @test y.value == -1
 
+    @test MOI.supports(bridged_mock, MOI.VariablePrimalStart(), MOI.VariableIndex)
     MOI.set(bridged_mock, MOI.VariablePrimalStart(), y, 1.0)
     x, y_flipped, z, s = MOI.get(mock, MOI.ListOfVariableIndices())
     @test MOI.get(mock, MOI.VariablePrimalStart(), y_flipped) == -1

test/Bridges/Variable/free.jl

@@ -84,11 +84,8 @@ end
     @test MOI.get(bridged_mock, MOI.ConstraintPrimal(), cy) == [-100.0]
     @test MOI.get(bridged_mock, MOI.ConstraintDual(), cy) == [0.0]
 
-    MOI.set(bridged_mock, MOI.VariablePrimalStart(), x, 1.0)
-    MOI.set(bridged_mock, MOI.VariablePrimalStart(), y, -1.0)
+    @test MOI.supports(bridged_mock, MOI.VariablePrimalStart(), MOI.VariableIndex)
+    MOI.set(bridged_mock, MOI.VariablePrimalStart(), [x, y], [1.0, -1.0])
     xa, xb, ya, yb = MOI.get(mock, MOI.ListOfVariableIndices())
-    @test MOI.get(mock, MOI.VariablePrimalStart(), xa) == 1
-    @test MOI.get(mock, MOI.VariablePrimalStart(), xb) == 0
-    @test MOI.get(mock, MOI.VariablePrimalStart(), ya) == 0
-    @test MOI.get(mock, MOI.VariablePrimalStart(), yb) == -1
+    @test MOI.get(mock, MOI.VariablePrimalStart(), [xa, xb, ya, yb]) == [1.0, 0.0, 0.0, -1.0]
 end

test/Bridges/Variable/zeros.jl

@@ -31,6 +31,12 @@ MOI.set(bridged_mock, MOI.ObjectiveFunction{typeof(obj)}(), obj)
 @test MOIB.Variable.unbridged_map(MOIB.bridge(bridged_mock, y), y, MOIB.Variable.IndexInVector(1)) === nothing
 @test MOIB.Variable.unbridged_map(MOIB.bridge(bridged_mock, z), z, MOIB.Variable.IndexInVector(2)) === nothing
 
+err = ErrorException(
+    "Cannot delete constraint index of bridged constrained variables, delete" *
+    " the scalar variable or the vector of variables instead."
+)
+@test_throws err MOI.delete(bridged_mock, cyz)
+
 err = ErrorException(
     "Cannot add two `VectorOfVariables`-in-`MathOptInterface.Zeros` on the" *
     " same first variable MathOptInterface.VariableIndex(-1)."
@@ -88,6 +94,7 @@ err = ArgumentError(
 end
 
 @testset "Query" begin
+    @test MOI.get(bridged_mock, MOI.ConstraintFunction(), cyz).variables == yz
     @test MOI.get(mock, MOI.NumberOfVariables()) == 1
     @test MOI.get(mock, MOI.ListOfVariableIndices()) == [x]
     @test MOI.get(bridged_mock, MOI.NumberOfVariables()) == 3
@@ -103,3 +110,18 @@ end
     MOI.set(bridged_mock, MOI.ObjectiveFunction{typeof(fx)}(), fx)
     @test MOI.get(bridged_mock, MOI.ObjectiveFunction{typeof(fx)}()) == fx
 end
+
+@testset "Delete" begin
+    message = string("Cannot delete variable as it is constrained with other",
+                     " other variables in a `MOI.VectorOfVariables`.")
+    err = MOI.DeleteNotAllowed(y, message)
+    @test_throws err MOI.delete(bridged_mock, y)
+    err = MOI.DeleteNotAllowed(z, message)
+    @test_throws err MOI.delete(bridged_mock, z)
+    test_delete_bridged_variables(bridged_mock, yz, MOI.Zeros, 3, (
+        (MOI.SingleVariable, MOI.GreaterThan{Float64}, 1),
+    ))
+    @test MOI.is_valid(bridged_mock, x)
+    @test !MOI.is_valid(bridged_mock, y)
+    @test !MOI.is_valid(bridged_mock, z)
+end

test/Bridges/bridge_optimizer.jl

@@ -28,13 +28,14 @@ mock = MOIU.MockOptimizer(NoIntervalModel{Float64}())
 bridged_mock = MOIB.Constraint.LessToGreater{Float64}(MOIB.Constraint.SplitInterval{Float64}(mock))
 
 @testset "Unsupported constraint attribute" begin
-    attr = UnknownConstraintAttribute()
+    attr = MOIT.UnknownConstraintAttribute()
     err = ArgumentError(
         "Bridge of type `MathOptInterface.Bridges.Constraint.SplitIntervalBridge{Float64,MathOptInterface.SingleVariable}` " *
         "does not support accessing the attribute `$attr`.")
     x = MOI.add_variable(bridged_mock)
     ci = MOI.add_constraint(bridged_mock, MOI.SingleVariable(x),
                             MOI.Interval(0.0, 1.0))
+    @test !MOI.supports(bridged_mock, attr, typeof(ci))
     @test_throws err MOI.get(bridged_mock, attr, ci)
 end