Skip to content

Commit

Permalink
Crap: missed a couple of unstaged changes.
Browse files Browse the repository at this point in the history
Fix to 5807981, see issue #92.
  • Loading branch information
StefanKarpinski committed Jun 30, 2011
1 parent 5807981 commit ec4f202
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions j/linalg.j
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
dot(x::Vector, y::Vector) = sum(x.*conj(y))

# blas.j defines these for floats; this handles other cases
(*)(A::Matrix, B::Vector) = [ A[i,:].*B | i=1:size(A,1) ]
(*)(A::Matrix, B::Matrix) = [ A[i,:].*B[:,j] | i=1:size(A,1), j=1:size(B,2) ]
(*)(A::Matrix, B::Vector) = [ sum(A[i,:].*B) | i=1:size(A,1) ]
(*)(A::Matrix, B::Matrix) = [ sum(A[i,:].*B[:,j]) | i=1:size(A,1), j=1:size(B,2) ]

triu(M) = triu(M,0)
tril(M) = tril(M,0)
Expand Down

0 comments on commit ec4f202

Please sign in to comment.