Fixes

jump-dev · Jul 3, 2024 · 2b5a47b · 2b5a47b
1 parent 7e226b9
commit 2b5a47b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 138 deletions.
diff --git a/src/Bridges/Constraint/Constraint.jl b/src/Bridges/Constraint/Constraint.jl
@@ -19,7 +19,6 @@ const Certificate = SOS.Certificate
 include("empty.jl")
 include("psd2x2.jl")
 include("diagonally_dominant.jl")
-include("scaled_diagonally_dominant.jl")
 
 # SOS polynomial bridges
 include("utilities.jl")

diff --git a/src/Bridges/Constraint/scaled_diagonally_dominant.jl b/src/Bridges/Constraint/scaled_diagonally_dominant.jl
diff --git a/src/constraints.jl b/src/constraints.jl
@@ -303,31 +303,19 @@ function PolyJuMP.bridges(
 end
 
 function PolyJuMP.bridges(
-    ::Type{<:MOI.AbstractVectorFunction},
+    F::Type{<:MOI.AbstractVectorFunction},
     ::Type{<:ScaledDiagonallyDominantConeTriangle},
-)
-    return [(Bridges.Constraint.ScaledDiagonallyDominantBridge, Float64)]
-end
-
-function _bridge_coefficient_type(::Type{<:WeightedSOSCone{M}}) where {M}
-    return _complex(Float64, M)
-end
-
-function _bridge_coefficient_type(::Type{SOSPolynomialSet{D,B,C}}) where {D,B,C}
-    return _complex(Float64, matrix_cone_type(C))
-end
-
-function PolyJuMP.bridges(S::Type{<:WeightedSOSCone})
+) # Needed so that `Variable.ScaledDiagonallyDominantBridge` is added as well
     return Tuple{Type,Type}[(
-        Bridges.Variable.KernelBridge,
-        _bridge_coefficient_type(S),
+        MOI.Bridges.Constraint.VectorSlackBridge,
+        PolyJuMP.coefficient_type_or_float(F),
     )]
 end
 
 function PolyJuMP.bridges(
     F::Type{<:MOI.AbstractVectorFunction},
     ::Type{<:WeightedSOSCone},
-) # Needed so that `KernelBridge` is added as well
+) # Needed so that `Variable.KernelBridge` is added as well
     return Tuple{Type,Type}[(
         MOI.Bridges.Constraint.VectorSlackBridge,
         PolyJuMP.coefficient_type_or_float(F),

diff --git a/src/variables.jl b/src/variables.jl
@@ -1,5 +1,20 @@
 export DSOSPoly, SDSOSPoly, SOSPoly
 
+function _bridge_coefficient_type(::Type{<:WeightedSOSCone{M}}) where {M}
+    return _complex(Float64, M)
+end
+
+function _bridge_coefficient_type(::Type{SOSPolynomialSet{D,B,C}}) where {D,B,C}
+    return _complex(Float64, matrix_cone_type(C))
+end
+
+function PolyJuMP.bridges(S::Type{<:WeightedSOSCone})
+    return Tuple{Type,Type}[(
+        Bridges.Variable.KernelBridge,
+        _bridge_coefficient_type(S),
+    )]
+end
+
 function PolyJuMP.bridges(::Type{<:PositiveSemidefinite2x2ConeTriangle})
     return [(Bridges.Variable.PositiveSemidefinite2x2Bridge, Float64)]
 end