addToExpression(::AffExpr, ::Variable, ::Number)

jump-dev · Aug 16, 2015 · 1c38224 · 1c38224
1 parent 96c1270
commit 1c38224
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/v0.4/parseExpr_staged.jl b/src/v0.4/parseExpr_staged.jl
@@ -85,6 +85,18 @@ function addToExpression{C,V}(aff::GenericAffExpr{C,V},c::Number,x::GenericAffEx
     aff
 end
 
+# help w/ ambiguity
+addToExpression{C,V<:Number}(aff::GenericAffExpr{C,V}, c::Number, x::Number) =
+    __addToExpression__(aff, c, x)
+
+function addToExpression{C,V}(aff::GenericAffExpr{C,V}, c::V, x::Number)
+    if x != 0
+        push!(aff.vars,   c)
+        push!(aff.coeffs, x)
+    end
+    aff
+end
+
 addToExpression{C,V}(aff::GenericAffExpr{C,V},c::V,x::V) =
     GenericQuadExpr{C,V}([c],[x],[one(C)],aff)