Fix added_constraint_types of Constraint.SlackBridge

blegat · blegat · commit ecac62faab45 · 2019-07-15T18:03:57.000-06:00
diff --git a/src/Bridges/Constraint/slack.jl b/src/Bridges/Constraint/slack.jl
@@ -39,7 +39,7 @@ function MOIB.added_constrained_variable_types(::Type{<:ScalarSlackBridge{T, F,
     return [(S,)]
 end
 function MOIB.added_constraint_types(::Type{ScalarSlackBridge{T, F, S}}) where {T, F, S}
-    return [(F, MOI.EqualTo{T}), (MOI.SingleVariable, S)]
+    return [(F, MOI.EqualTo{T})]
 end
 function concrete_bridge_type(::Type{<:ScalarSlackBridge{T}},
                               F::Type{<:MOI.AbstractScalarFunction},
@@ -142,7 +142,7 @@ function MOIB.added_constrained_variable_types(::Type{<:VectorSlackBridge{T, F,
     return [(S,)]
 end
 function MOIB.added_constraint_types(::Type{VectorSlackBridge{T, F, S}}) where {T, F<:MOI.AbstractVectorFunction, S}
-    return [(F, MOI.Zeros), (MOI.VectorOfVariables, S)]
+    return [(F, MOI.Zeros)]
 end
 function concrete_bridge_type(::Type{<:VectorSlackBridge{T}},
                               F::Type{<:MOI.AbstractVectorFunction},
diff --git a/src/Bridges/Variable/vectorize.jl b/src/Bridges/Variable/vectorize.jl
@@ -65,7 +65,7 @@ function MOI.set(model::MOI.ModelLike, attr::MOI.ConstraintSet,
     # This would require modifing any constraint which uses the bridged
     # variable.
     throw(MOI.SetAttributeNotAllowed(attr,
-        "The variable $(bridge.variable) is bridged by the `VectorizeBridge`."))
+        "The variable `$(bridge.variable)` is bridged by the `VectorizeBridge`."))
 end
 
 function MOI.get(model::MOI.ModelLike, attr::MOI.ConstraintPrimal,
diff --git a/src/Bridges/lazy_bridge_optimizer.jl b/src/Bridges/lazy_bridge_optimizer.jl
@@ -210,6 +210,44 @@ function add_bridge(b::LazyBridgeOptimizer, BT::Type{<:Constraint.AbstractBridge
     update_dist!(b, keys(b.variable_best), keys(b.constraint_best))
 end
 
+function _remove_bridge(bridge_types::Vector, BT::Type)
+    i = findfirst(isequal(BT), bridge_types)
+    if i === nothing
+        error("Cannot remove bridge `BT` as it was never added or was already",
+              " removed.")
+    else
+        deleteat!(bridge_types, i)
+    end
+    return
+end
+function _reset_dist(b::LazyBridgeOptimizer)
+    empty!(b.variable_dist)
+    empty!(b.variable_best)
+    empty!(b.constraint_dist)
+    empty!(b.constraint_best)
+end
+
+"""
+    remove_bridge(b::LazyBridgeOptimizer, BT::Type{<:Variable.AbstractBridge})
+
+Disable the use of the variable bridges of type `BT` by `b`.
+"""
+function remove_bridge(b::LazyBridgeOptimizer, BT::Type{<:Variable.AbstractBridge})
+    _remove_bridge(b.variable_bridge_types, BT)
+    _reset_dist(b)
+end
+
+"""
+    remove_bridge(b::LazyBridgeOptimizer, BT::Type{<:Constraint.AbstractBridge})
+
+Disable the use of the constraint bridges of type `BT` by `b`.
+"""
+function remove_bridge(b::LazyBridgeOptimizer, BT::Type{<:Constraint.AbstractBridge})
+    _remove_bridge(b.constraint_bridge_types, BT)
+    _reset_dist(b)
+end
+
+
 # It only bridges when the constraint is not supporting, hence the name "Lazy"
 function is_bridged(b::LazyBridgeOptimizer, S::Type{<:MOI.AbstractSet})
     return !MOI.supports_constraint(b.model, variable_function_type(S), S)
diff --git a/test/Bridges/Variable/vectorize.jl b/test/Bridges/Variable/vectorize.jl
@@ -44,7 +44,7 @@ end
     ci = MOI.ConstraintIndex{MOI.SingleVariable, MOI.LessThan{Float64}}(y.value)
     attr = MOI.ConstraintSet()
     err = MOI.SetAttributeNotAllowed(attr,
-        "The variable MathOptInterface.VariableIndex(12345676) is bridged by the `VectorizeBridge`.")
+        "The variable `MathOptInterface.VariableIndex(12345676)` is bridged by the `VectorizeBridge`.")
     @test_throws err MOI.set(bridged_mock, attr, ci, MOI.LessThan(4.0))
 end
 
diff --git a/test/Bridges/lazy_bridge_optimizer.jl b/test/Bridges/lazy_bridge_optimizer.jl
@@ -29,73 +29,120 @@ MOI.supports_constraint(::SDPAModel{T}, ::Type{MOI.SingleVariable}, ::Type{MOI.G
 MOI.supports_constraint(::SDPAModel{T}, ::Type{MOI.SingleVariable}, ::Type{MOI.LessThan{T}}) where {T} = false
 MOI.supports_constraint(::SDPAModel{T}, ::Type{MOI.SingleVariable}, ::Type{MOI.EqualTo{T}}) where {T} = false
 MOI.supports_constraint(::SDPAModel, ::Type{MOI.VectorOfVariables}, ::Type{MOI.Reals}) = false
+MOI.supports(::SDPAModel{T}, ::MOI.ObjectiveFunction{MOI.ScalarQuadraticFunction{T}}) where {T} = false
+MOI.supports(::SDPAModel, ::MOI.ObjectiveFunction{MOI.SingleVariable}) = false
 
 @testset "Name test" begin
     model = SDPAModel{Float64}()
     bridged = MOIB.full_bridge_optimizer(model, Float64)
     MOIT.nametest(bridged)
 end
-
 @testset "SDPA format with $T" for T in [Float64, Int]
     model = SDPAModel{T}()
     bridged = MOIB.LazyBridgeOptimizer(model)
-    @testset "Nonpositives" begin
-        @test !MOI.supports_constraint(model, MOI.VectorOfVariables, MOI.Nonpositives)
-        @test !MOI.supports_constraint(bridged, MOI.VectorOfVariables, MOI.Nonpositives)
-        MOIB.add_bridge(bridged, MOIB.Variable.NonposToNonnegBridge{T})
-        @test MOI.supports_constraint(bridged, MOI.VectorOfVariables, MOI.Nonpositives)
-        @test MOIB.bridge_type(bridged, MOI.Nonpositives) == MOIB.Variable.NonposToNonnegBridge{T}
-    end
-    @testset "Zeros" begin
-        @test !MOI.supports_constraint(model, MOI.VectorOfVariables, MOI.Zeros)
-        @test !MOI.supports_constraint(bridged, MOI.VectorOfVariables, MOI.Zeros)
-        MOIB.add_bridge(bridged, MOIB.Variable.ZerosBridge{T})
-        @test MOI.supports_constraint(bridged, MOI.VectorOfVariables, MOI.Zeros)
-        @test MOIB.bridge_type(bridged, MOI.Zeros) == MOIB.Variable.ZerosBridge{T}
-    end
-    @testset "Free" begin
-        @test !MOI.supports_constraint(model, MOI.VectorOfVariables, MOI.Reals)
-        @test !MOI.supports_constraint(bridged, MOI.VectorOfVariables, MOI.Reals)
-        MOIB.add_bridge(bridged, MOIB.Variable.FreeBridge{T})
-        @test MOI.supports_constraint(bridged, MOI.VectorOfVariables, MOI.Reals)
-        @test MOIB.bridge_type(bridged, MOI.Reals) == MOIB.Variable.FreeBridge{T}
-    end
-    @testset "Vectorize" begin
-        @test !MOI.supports_constraint(model, MOI.SingleVariable, MOI.GreaterThan{T})
-        @test !MOI.supports_constraint(bridged, MOI.SingleVariable, MOI.GreaterThan{T})
-        @test !MOI.supports_constraint(model, MOI.SingleVariable, MOI.LessThan{T})
-        @test !MOI.supports_constraint(bridged, MOI.SingleVariable, MOI.LessThan{T})
-        @test !MOI.supports_constraint(model, MOI.SingleVariable, MOI.EqualTo{T})
-        @test !MOI.supports_constraint(bridged, MOI.SingleVariable, MOI.EqualTo{T})
-        MOIB.add_bridge(bridged, MOIB.Variable.VectorizeBridge{T})
-        @test MOI.supports_constraint(bridged, MOI.SingleVariable, MOI.GreaterThan{T})
-        @test MOIB.bridge_type(bridged, MOI.GreaterThan{T}) == MOIB.Variable.VectorizeBridge{T, MOI.Nonnegatives}
-        @test MOI.supports_constraint(bridged, MOI.SingleVariable, MOI.LessThan{T})
-        @test MOIB.bridge_type(bridged, MOI.LessThan{T}) == MOIB.Variable.VectorizeBridge{T, MOI.Nonpositives}
-        @test MOI.supports_constraint(bridged, MOI.SingleVariable, MOI.EqualTo{T})
-        @test MOIB.bridge_type(bridged, MOI.EqualTo{T}) == MOIB.Variable.VectorizeBridge{T, MOI.Zeros}
-    end
-    @testset "RSOCtoPSD" begin
-        @test !MOI.supports_constraint(model, MOI.VectorOfVariables, MOI.RotatedSecondOrderCone)
-        @test !MOI.supports_constraint(bridged, MOI.VectorOfVariables, MOI.RotatedSecondOrderCone)
-        MOIB.add_bridge(bridged, MOIB.Variable.RSOCtoPSDBridge{T})
-        @test !MOI.supports_constraint(bridged, MOI.VectorOfVariables, MOI.RotatedSecondOrderCone)
-        MOIB.add_bridge(bridged, MOIB.Constraint.ScalarFunctionizeBridge{T})
-        @test MOI.supports_constraint(bridged, MOI.VectorOfVariables, MOI.RotatedSecondOrderCone)
-        @test MOIB.bridge_type(bridged, MOI.RotatedSecondOrderCone) == MOIB.Variable.RSOCtoPSDBridge{T}
+    @testset "Variable" begin
+        @testset "Nonpositives" begin
+            @test !MOI.supports_constraint(model, MOI.VectorOfVariables, MOI.Nonpositives)
+            @test !MOI.supports_constraint(bridged, MOI.VectorOfVariables, MOI.Nonpositives)
+            MOIB.add_bridge(bridged, MOIB.Variable.NonposToNonnegBridge{T})
+            @test MOI.supports_constraint(bridged, MOI.VectorOfVariables, MOI.Nonpositives)
+            @test MOIB.bridge_type(bridged, MOI.Nonpositives) == MOIB.Variable.NonposToNonnegBridge{T}
+        end
+        @testset "Zeros" begin
+            @test !MOI.supports_constraint(model, MOI.VectorOfVariables, MOI.Zeros)
+            @test !MOI.supports_constraint(bridged, MOI.VectorOfVariables, MOI.Zeros)
+            MOIB.add_bridge(bridged, MOIB.Variable.ZerosBridge{T})
+            @test MOI.supports_constraint(bridged, MOI.VectorOfVariables, MOI.Zeros)
+            @test MOIB.bridge_type(bridged, MOI.Zeros) == MOIB.Variable.ZerosBridge{T}
+        end
+        @testset "Free" begin
+            @test !MOI.supports_constraint(model, MOI.VectorOfVariables, MOI.Reals)
+            @test !MOI.supports_constraint(bridged, MOI.VectorOfVariables, MOI.Reals)
+            MOIB.add_bridge(bridged, MOIB.Variable.FreeBridge{T})
+            @test MOI.supports_constraint(bridged, MOI.VectorOfVariables, MOI.Reals)
+            @test MOIB.bridge_type(bridged, MOI.Reals) == MOIB.Variable.FreeBridge{T}
+        end
+        @testset "Vectorize" begin
+            @test !MOI.supports_constraint(model, MOI.SingleVariable, MOI.GreaterThan{T})
+            @test !MOI.supports_constraint(bridged, MOI.SingleVariable, MOI.GreaterThan{T})
+            @test !MOI.supports_constraint(model, MOI.SingleVariable, MOI.LessThan{T})
+            @test !MOI.supports_constraint(bridged, MOI.SingleVariable, MOI.LessThan{T})
+            @test !MOI.supports_constraint(model, MOI.SingleVariable, MOI.EqualTo{T})
+            @test !MOI.supports_constraint(bridged, MOI.SingleVariable, MOI.EqualTo{T})
+            MOIB.add_bridge(bridged, MOIB.Variable.VectorizeBridge{T})
+            @test MOI.supports_constraint(bridged, MOI.SingleVariable, MOI.GreaterThan{T})
+            @test MOIB.bridge_type(bridged, MOI.GreaterThan{T}) == MOIB.Variable.VectorizeBridge{T, MOI.Nonnegatives}
+            @test MOI.supports_constraint(bridged, MOI.SingleVariable, MOI.LessThan{T})
+            @test MOIB.bridge_type(bridged, MOI.LessThan{T}) == MOIB.Variable.VectorizeBridge{T, MOI.Nonpositives}
+            @test MOI.supports_constraint(bridged, MOI.SingleVariable, MOI.EqualTo{T})
+            @test MOIB.bridge_type(bridged, MOI.EqualTo{T}) == MOIB.Variable.VectorizeBridge{T, MOI.Zeros}
+        end
+        @testset "RSOCtoPSD" begin
+            @test !MOI.supports_constraint(model, MOI.VectorOfVariables, MOI.RotatedSecondOrderCone)
+            @test !MOI.supports_constraint(bridged, MOI.VectorOfVariables, MOI.RotatedSecondOrderCone)
+            MOIB.add_bridge(bridged, MOIB.Variable.RSOCtoPSDBridge{T})
+            @test !MOI.supports_constraint(bridged, MOI.VectorOfVariables, MOI.RotatedSecondOrderCone)
+            MOIB.add_bridge(bridged, MOIB.Constraint.ScalarFunctionizeBridge{T})
+            @test MOI.supports_constraint(bridged, MOI.VectorOfVariables, MOI.RotatedSecondOrderCone)
+            @test MOIB.bridge_type(bridged, MOI.RotatedSecondOrderCone) == MOIB.Variable.RSOCtoPSDBridge{T}
+        end
+        @testset "Combining two briges" begin
+            xy = MOI.add_variables(bridged, 2)
+            test_delete_bridged_variables(bridged, xy, MOI.Reals, 2, (
+                (MOI.VectorOfVariables, MOI.Nonnegatives, 0),
+                (MOI.VectorOfVariables, MOI.Nonpositives, 0)),
+                used_bridges = 2)
+        end
     end
-    @testset "Combining two briges" begin
-        xy = MOI.add_variables(bridged, 2)
-        test_delete_bridged_variables(bridged, xy, MOI.Reals, 2, (
-            (MOI.VectorOfVariables, MOI.Nonnegatives, 0),
-            (MOI.VectorOfVariables, MOI.Nonpositives, 0)),
-            used_bridges = 2)
+    @testset "Constraint" begin
+        @testset "Slack" begin
+            @test !MOI.supports_constraint(bridged, MOI.VectorAffineFunction{T}, MOI.RotatedSecondOrderCone)
+            MOIB.add_bridge(bridged, MOIB.Constraint.VectorSlackBridge{T})
+            @test !MOI.supports_constraint(bridged, MOI.VectorAffineFunction{T}, MOI.RotatedSecondOrderCone)
+            MOIB.add_bridge(bridged, MOIB.Constraint.ScalarizeBridge{T})
+            @test MOI.supports_constraint(bridged, MOI.VectorAffineFunction{T}, MOI.RotatedSecondOrderCone)
+            @test MOIB.bridge_type(bridged, MOI.VectorAffineFunction{T}, MOI.RotatedSecondOrderCone) ==
+                MOIB.Constraint.VectorSlackBridge{T, MOI.VectorAffineFunction{T}, MOI.RotatedSecondOrderCone}
+            @test MOI.supports_constraint(bridged, MOI.VectorAffineFunction{T}, MOI.Zeros)
+            @test MOIB.bridge_type(bridged, MOI.VectorAffineFunction{T}, MOI.Zeros) ==
+                MOIB.Constraint.ScalarizeBridge{T, MOI.ScalarAffineFunction{T}, MOI.EqualTo{T}}
+        end
+        @testset "Vectorize" begin
+            @test !MOI.supports_constraint(bridged, MOI.ScalarAffineFunction{T}, MOI.GreaterThan{T})
+            MOIB.add_bridge(bridged, MOIB.Constraint.VectorizeBridge{T})
+            @test MOI.supports_constraint(bridged, MOI.ScalarAffineFunction{T}, MOI.GreaterThan{T})
+            @test MOIB.bridge_type(bridged, MOI.ScalarAffineFunction{T},
+                                   MOI.GreaterThan{T}) ==
+                MOIB.Constraint.VectorizeBridge{
+                    T, MOI.VectorAffineFunction{T}, MOI.Nonnegatives,
+                    MOI.ScalarAffineFunction{T}
+                }
+
+        end
+        @testset "Quadratic" begin
+            @test !MOI.supports_constraint(bridged, MOI.ScalarQuadraticFunction{T}, MOI.GreaterThan{T})
+            @test !MOI.supports_constraint(bridged, MOI.ScalarQuadraticFunction{T}, MOI.LessThan{T})
+            MOIB.add_bridge(bridged, MOIB.Constraint.QuadtoSOCBridge{T})
+            @test MOI.supports_constraint(bridged, MOI.ScalarQuadraticFunction{T}, MOI.GreaterThan{T})
+            @test MOIB.bridge_type(bridged, MOI.ScalarQuadraticFunction{T},
+                                   MOI.GreaterThan{T}) == MOIB.Constraint.QuadtoSOCBridge{T}
+            @test MOI.supports_constraint(bridged, MOI.ScalarQuadraticFunction{T}, MOI.LessThan{T})
+            @test MOIB.bridge_type(bridged, MOI.ScalarQuadraticFunction{T},
+                                   MOI.LessThan{T}) == MOIB.Constraint.QuadtoSOCBridge{T}
+        end
     end
 end
 
 @testset "Continuous Linear" begin
     model = SDPAModel{Float64}()
     bridged = MOIB.full_bridge_optimizer(model, Float64)
+    # For `ScalarAffineFunction`-in-`GreaterThan`,
+    # `Constraint.ScalarSlackBridge` -> `Variable.VectorizeBridge`
+    # is equivalent to
+    # `Constraint.VectorizeBridge` -> `Constraint.VectorSlackBridge`
+    # however, `Variable.VectorizeBridge` do not support modification of the
+    # set hence it makes some tests of `contlineartest` fail so we disable it.
+    MOIB.remove_bridge(bridged, MOIB.Constraint.ScalarSlackBridge{Float64})
     exclude = ["partial_start"] # `VariablePrimalStart` not supported.
     MOIT.contlineartest(bridged, MOIT.TestConfig(solve=false), exclude)
 end
