Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor matmul code with mul! #1995

Merged
merged 6 commits into from
Jun 23, 2019
Merged

Refactor matmul code with mul! #1995

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d25cced
Refactor matmul code with mul!
blegat Jun 20, 2019
34d8b60
adds -> sets
blegat Jun 23, 2019
c450259
Fix variable names
blegat Jun 23, 2019
68081be
TrAdj -> TransposeOrAdjoint
blegat Jun 23, 2019
bd4dda3
a -> are
blegat Jun 23, 2019
6af7e98
Add tests for #1990
blegat Jun 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/aff_expr.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Loading