[Emacs-diffs] Changes to emacs/lisp/calc/calc-vec.el,v

[Jay Belanger]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jay Belanger <jpb>      08/04/07 21:55:05

Index: calc-vec.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/calc/calc-vec.el,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- calc-vec.el 8 Jan 2008 20:46:36 -0000       1.21
+++ calc-vec.el 7 Apr 2008 21:55:05 -0000       1.22
@@ -479,6 +479,11 @@
   (calc-wrapper
    (calc-binary-op "cros" 'calcFunc-cross arg)))
 
+(defun calc-kron (arg)
+  (interactive "P")
+  (calc-wrapper
+   (calc-binary-op "kron" 'calcFunc-kron arg)))
+
 (defun calc-remove-duplicates (arg)
   (interactive "P")
   (calc-wrapper
@@ -1466,6 +1471,41 @@
     (math-reject-arg a "*Three-vector expected")))
 
 
+;;; Compute a Kronecker product
+(defun calcFunc-kron (x y &optional nocheck)
+  "The Kronecker product of objects X and Y.
+The objects X and Y may be scalars, vectors or matrices.
+The type of the result depends on the types of the operands;
+the product of two scalars is a scalar,
+of one scalar and a vector is a vector,
+of two vectors is a vector.
+of one vector and a matrix is a matrix,
+of two matrices is a matrix."
+  (unless nocheck
+    (cond ((or (math-matrixp x)
+               (math-matrixp y))
+           (unless (math-matrixp x)
+             (setq x (if (math-vectorp x)
+                         (list 'vec x)
+                       (list 'vec (list 'vec x)))))
+           (unless (math-matrixp y)
+             (setq y (if (math-vectorp y)
+                         (list 'vec y)
+                       (list 'vec (list 'vec y))))))
+          ((or (math-vectorp x)
+               (math-vectorp y))
+           (unless (math-vectorp x)
+             (setq x (list 'vec x)))
+           (unless (math-vectorp y)
+             (setq y (list 'vec y))))))
+  (if (math-vectorp x)
+      (let (ret)
+        (dolist (v (cdr x))
+          (dolist (w (cdr y))
+            (setq ret (cons (calcFunc-kron v w t) ret))))
+        (cons 'vec (nreverse ret)))
+    (math-mul x y)))
+
 
 ;; The variable math-rb-close is local to math-read-brackets, but
 ;; is used by math-read-vector, which is called (directly and