Fix bridge addition with complex coef (#90)

* Fix bridge addition with complex coef

* Fix format

Author: blegat

Project.toml

@@ -15,6 +15,7 @@ MutableArithmetics = "d8a4904e-b15c-11e9-3269-09a3773c0cb0"
 SemialgebraicSets = "8e049039-38e8-557d-ae3a-bc521ccf6204"
 
 [compat]
+DynamicPolynomials = "0.5"
 JuMP = "1"
 MathOptInterface = "1"
 MultivariateBases = "0.2"

src/constraint.jl

@@ -78,21 +78,24 @@ by the bridges.
 bridges(S::Type{<:MOI.AbstractSet}) = bridges(MOI.VectorOfVariables, S)
 
 function bridges(
-    ::Type{<:MOI.AbstractVectorFunction},
+    F::Type{<:MOI.AbstractVectorFunction},
     ::Type{<:ZeroPolynomialSet{FullSpace}},
 )
-    return [Bridges.Constraint.ZeroPolynomialBridge]
+    return [(Bridges.Constraint.ZeroPolynomialBridge, _coef_type(F))]
 end
 
 function bridges(
-    ::Type{<:MOI.AbstractVectorFunction},
+    F::Type{<:MOI.AbstractVectorFunction},
     ::Type{<:ZeroPolynomialSet{<:AbstractAlgebraicSet}},
 )
-    return [Bridges.Constraint.ZeroPolynomialInAlgebraicSetBridge]
+    return [(
+        Bridges.Constraint.ZeroPolynomialInAlgebraicSetBridge,
+        _coef_type(F),
+    )]
 end
 
-function bridges(::Type{<:MOI.AbstractVectorFunction}, ::Type{<:PlusMinusSet})
-    return [Bridges.Constraint.PlusMinusBridge]
+function bridges(F::Type{<:MOI.AbstractVectorFunction}, ::Type{<:PlusMinusSet})
+    return [(Bridges.Constraint.PlusMinusBridge, _coef_type(F))]
 end
 
 """
@@ -128,8 +131,9 @@ end
 function bridgeable(c::JuMP.AbstractConstraint, S::Type{<:MOI.AbstractSet})
     bridge_types = bridges(S)
     for bridge_type in bridge_types
-        c = BridgeableConstraint(c, bridge_type)
-        concrete_bridge_type = _concrete(bridge_type{Float64}, S)
+        BT, T = bridge_type
+        c = BridgeableConstraint(c, BT; coefficient_type = T)
+        concrete_bridge_type = _concrete(BT{T}, S)
         for (ST,) in
             MOI.Bridges.added_constrained_variable_types(concrete_bridge_type)
             c = bridgeable(c, ST)
@@ -151,12 +155,10 @@ function bridgeable(
 )
     bridge_types = bridges(F, S)
     for bridge_type in bridge_types
-        c = BridgeableConstraint(c, bridge_type)
-        concrete_bridge_type = MOI.Bridges.Constraint.concrete_bridge_type(
-            bridge_type{_coef_type(F)},
-            F,
-            S,
-        )
+        BT, T = bridge_type
+        c = BridgeableConstraint(c, BT, coefficient_type = T)
+        concrete_bridge_type =
+            MOI.Bridges.Constraint.concrete_bridge_type(BT{T}, F, S)
         for (ST,) in
             MOI.Bridges.added_constrained_variable_types(concrete_bridge_type)
             c = bridgeable(c, ST)

test/constraint.jl

@@ -172,6 +172,7 @@ function test_NonNeg(var)
     S = DummyPolyModule.NonNeg
     jump_set = DummyPolyModule.DummyNonNeg()
     _test_constraint(m, @constraint(m, x >= y), S, jump_set, x - y, [], [])
+    @test DummyPolyModule.DummyNonNegBridge{Float64} in m.bridge_types
     _test_constraint(
         m,
         @constraint(m, im * x >= y),
@@ -182,6 +183,7 @@ function test_NonNeg(var)
         [],
         T = ComplexF64,
     )
+    @test DummyPolyModule.DummyNonNegBridge{ComplexF64} in m.bridge_types
     _test_constraint(
         m,
         @constraint(m, p >= q + 1, domain = @set y >= 1 && dom),

test/testpolymodule.jl

@@ -30,10 +30,10 @@ JuMP.reshape_set(::NonNeg, ::PolyJuMP.PolynomialShape) = DummyNonNeg()
 
 struct DummyNonNegBridge{T,F} <: MOI.Bridges.Constraint.AbstractBridge end
 function PolyJuMP.bridges(
-    ::Type{<:MOI.AbstractVectorFunction},
+    F::Type{<:MOI.AbstractVectorFunction},
     ::Type{<:NonNeg},
 )
-    return [DummyNonNegBridge]
+    return [(DummyNonNegBridge, PolyJuMP._coef_type(F))]
 end
 function MOI.Bridges.added_constrained_variable_types(
     ::Type{<:DummyNonNegBridge},