up

Author: blegat

src/constraints/GreaterThanConstraint.jl

@@ -11,7 +11,7 @@ function vexity(vex, ::MOI.Nonnegatives)
     return vex
 end
 
-function Base.:>=(lhs::AbstractExpr, rhs::AbstractExpr)
+function _promote_size(lhs::AbstractExpr, rhs::AbstractExpr)
     if sign(lhs) == ComplexSign() || sign(rhs) == ComplexSign()
         error(
             "Cannot create inequality constraint between expressions of sign $(sign(lhs)) and $(sign(rhs))",
@@ -32,6 +32,11 @@ function Base.:>=(lhs::AbstractExpr, rhs::AbstractExpr)
             "Cannot create inequality constraint between expressions of size $(lhs.size) and $(rhs.size)",
         )
     end
+    return lhs, rhs
+end
+
+function Base.:>=(lhs::AbstractExpr, rhs::AbstractExpr)
+    lhs, rhs = _promote_size(lhs, rhs)
     return GenericConstraint{MOI.Nonnegatives}(lhs - rhs)
 end
 

src/constraints/LessThanConstraint.jl

@@ -12,26 +12,7 @@ function vexity(vex, ::MOI.Nonpositives)
 end
 
 function Base.:<=(lhs::AbstractExpr, rhs::AbstractExpr)
-    if sign(lhs) == ComplexSign() || sign(rhs) == ComplexSign()
-        error(
-            "Cannot create inequality constraint between expressions of sign $(sign(lhs)) and $(sign(rhs))",
-        )
-    end
-    if lhs.size == rhs.size || lhs.size == (1, 1)
-        sz = rhs.size
-        if lhs.size == (1, 1) && rhs.size != (1, 1)
-            lhs = lhs * ones(rhs.size)
-        end
-    elseif rhs.size == (1, 1)
-        sz = lhs.size
-        if rhs.size == (1, 1) && lhs.size != (1, 1)
-            rhs = rhs * ones(lhs.size)
-        end
-    else
-        error(
-            "Cannot create inequality constraint between expressions of size $(lhs.size) and $(rhs.size)",
-        )
-    end
+    lhs, rhs = _promote_size(lhs, rhs)
     return GenericConstraint{MOI.Nonpositives}(lhs - rhs)
 end
 

src/constraints/SecondOrderConeConstraint.jl

@@ -1,7 +1,8 @@
-const SecondOrderConeConstraint = Constraint{MOI.SecondOrderCone}
+mutable struct SecondOrderConeConstraint <: Constraint
+    children::Tuple
+    dual::Union{Value,Nothing}
 
-function set_with_size(::Type{MOI.SecondOrderCone}, sz::Tuple{Int})
-    return MOI.SecondOrderCone(sz[1])
+    SecondOrderConeConstraint(args::AbstractExpr...) = new(args, nothing)
 end
 
 head(io::IO, ::SecondOrderConeConstraint) = print(io, "soc")