From ec4f20243c0807654eeeb8df343611d22c8ef404 Mon Sep 17 00:00:00 2001 From: Stefan Karpinski Date: Thu, 30 Jun 2011 01:03:15 -0400 Subject: [PATCH] Crap: missed a couple of unstaged changes. Fix to 58079819, see issue #92. --- j/linalg.j | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/j/linalg.j b/j/linalg.j index 064084c6d3b8e..30948e0b1b907 100644 --- a/j/linalg.j +++ b/j/linalg.j @@ -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)