Refactor matmul code with mul!

jump-dev · Jun 20, 2019 · d25cced · d25cced
1 parent 62ef2a1
commit d25cced
Show file tree

Hide file tree

Showing 3 changed files with 199 additions and 150 deletions.
diff --git a/src/aff_expr.jl b/src/aff_expr.jl
@@ -293,6 +293,13 @@ end
 
 Base.convert(::Type{GenericAffExpr{T,V}}, v::V)    where {T,V} = GenericAffExpr(zero(T), v => one(T))
 Base.convert(::Type{GenericAffExpr{T,V}}, v::Real) where {T,V} = GenericAffExpr{T,V}(convert(T, v))
+# Used in `JuMP._mul!`.
+function Base.convert(::Type{T}, aff::GenericAffExpr{T}) where T
+    if !isempty(aff.terms)
+        throw(InexactError(:convert, T, aff))
+    end
+    return convert(T, aff.constant)
+end
 
 # Alias for (Float64, VariableRef), the specific GenericAffExpr used by JuMP
 const AffExpr = GenericAffExpr{Float64,VariableRef}