Simplify code

Author: blegat

src/constraint.jl

@@ -14,40 +14,24 @@ function MOIU.allocate_constraint(m::SOItoMOIBridge, f::SAF, s::SupportedSets)
     _allocate_constraint(m::SOItoMOIBridge, f, s)
 end
 
-output_index(::MOI.ScalarAffineTerm)  = 1
-output_index(t::MOI.VectorAffineTerm) = t.output_index
-scalar_term(t::MOI.ScalarAffineTerm) = t
-scalar_term(t::MOI.VectorAffineTerm) = t.scalar_term
-
-_getconstant(m::SOItoMOIBridge, s::MOI.AbstractScalarSet) = MOIU.getconstant(s)
-_getconstant(m::SOItoMOIBridge{T}, s::MOI.AbstractSet) where T = zero(T)
-
-function loadcoefficients!(m::SOItoMOIBridge, cs::UnitRange, f::SAF, s)
+function loadcoefficients!(m::SOItoMOIBridge, cs::UnitRange,
+                           f::MOI.ScalarAffineFunction, s)
     f = MOIU.canonical(f) # sum terms with same variables and same outputindex
-    if !isempty(cs)
-        rhs = _getconstant(m, s) .- MOI._constant(f)
-        for t in f.terms
-            st = scalar_term(t)
-            if !iszero(st.coefficient)
-                c = cs[output_index(t)]
-                for (blk, i, j, coef, shift) in varmap(m, st.variable_index)
-                    if !iszero(blk)
-                        @assert !iszero(coef)
-                        setconstraintcoefficient!(m.sdoptimizer, st.coefficient*coef, c, blk, i, j)
-                    end
-                    if isa(rhs, Vector)
-                        rhs[output_index(t)] -= st.coefficient * shift
-                    else
-                        rhs -= st.coefficient * shift
-                    end
+    @assert length(cs) == 1
+    c = first(cs)
+    rhs = MOIU.getconstant(s) - MOI._constant(f)
+    for t in f.terms
+        if !iszero(t.coefficient)
+            for (blk, i, j, coef, shift) in varmap(m, t.variable_index)
+                if !iszero(blk)
+                    @assert !iszero(coef)
+                    setconstraintcoefficient!(m.sdoptimizer, t.coefficient*coef, c, blk, i, j)
                 end
+                rhs -= t.coefficient * shift
             end
         end
-        for j in 1:MOI.output_dimension(f)
-            c = cs[j]
-            setconstraintconstant!(m.sdoptimizer, rhs[j], c)
-        end
     end
+    setconstraintconstant!(m.sdoptimizer, rhs, c)
 end
 
 function MOIU.load_constraint(m::SOItoMOIBridge, ci::CI, f::SAF, s::SupportedSets)

src/variable.jl

@@ -84,6 +84,9 @@ function MOIU.allocate_constraint(m::SOItoMOIBridge{T}, f::VF, s::SupportedSets)
     end
 end
 
+_getconstant(m::SOItoMOIBridge, s::MOI.AbstractScalarSet) = MOIU.getconstant(s)
+_getconstant(m::SOItoMOIBridge{T}, s::MOI.AbstractSet) where T = zero(T)
+
 _var(f::SVF, j) = f.variable
 _var(f::VVF, j) = f.variables[j]
 function MOIU.load_constraint(m::SOItoMOIBridge, ci::CI, f::VF, s::SupportedSets)