Mercurial > hg > octave-lyh

changeset 12110:8166d596247e release-3-2-x

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix dot
author Jaroslav Hajek <highegg@gmail.com>
date Thu, 26 Nov 2009 14:08:48 +0100
parents 10dcb8b64e4a
children 050b8c0e1531
files scripts/ChangeLog scripts/linear-algebra/dot.m
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-26  David Grundberg <individ@acc.umu.se>
+
+	* linear-algebra/dot.m: Conjugate first argument.
+
 2009-11-14  Jaroslav Hajek  <highegg@gmail.com>
 
 	* linear-algebra/expm.m: Fix typo.
--- a/scripts/linear-algebra/dot.m
+++ b/scripts/linear-algebra/dot.m
@@ -43,12 +43,12 @@
     if (! size_equal (x, y))
       error ("dot: sizes of arguments must match");
     endif
-    z = sum(x .* y);
+    z = sum(x .* conj (y));
   else
     if (! size_equal (x, y))
       error ("dot: sizes of arguments must match");
     endif
-    z = sum(x .* y, dim);
+    z = sum(x .* conj (y), dim);
   endif
 
 endfunction