Changeset 3945 for trunk/lisp/calc/calc-arith.el

Timestamp:

2005年11月02日 00時34分59秒 (3 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/calc/calc-arith.el (modified) (8 diffs)

trunk/lisp/calc/calc-arith.el

@@ -240 +240 @@
-    (number)
-    (scalar)
+    (sqmatrix matrix vector)
-    (matrix vector)
-    (vector)
@@ -306 +307 @@
-       (not (math-known-scalarp a t))))
-
+(defun math-known-square-matrixp (a)
+  (and (math-known-matrixp a)
+       (math-check-known-square-matrixp a)))
+
-;;; Try to prove that A is a scalar (i.e., a non-vector).
-(defun math-check-known-scalarp (a)
@@ -324 +329 @@
-                         (or (assq (nth 2 a) math-decls-cache)
-                             math-decls-all)
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-;;; Try to prove that A is *not* a scalar.
@@ -343 +357 @@
-                         (or (assq (nth 2 a) math-decls-cache)
-                             math-decls-all)
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-;;; Try to prove that A is a real (i.e., not complex).
@@ -1336 +1387 @@
-           (Math-looks-negp (nth 2 b))
-           (not (and (eq (car-safe a) '^) (Math-looks-negp (nth 2 a))))
+           (not (math-known-matrixp (nth 1 b)))
-           (math-div a (math-normalize
-                        (list '^ (nth 1 b) (math-neg (nth 2 b))))))
@@ -1377 +1429 @@
-               (and (math-known-matrixp a)
-                    (math-mul a (nth 1 b)))))
+      (and (math-identity-matrix-p a t)
+           (or (and (eq (car-safe b) 'calcFunc-idn)
+                    (= (length b) 2)
+                    (list 'calcFunc-idn (math-mul 
+                                         (nth 1 (nth 1 a))
+                                         (nth 1 b))
+                          (1- (length a))))
+               (and (math-known-scalarp b)
+                    (list 'calcFunc-idn (math-mul 
+                                         (nth 1 (nth 1 a)) b)
+                          (1- (length a))))
+               (and (math-known-matrixp b)
+                    (math-mul (nth 1 (nth 1 a)) b))))
+      (and (math-identity-matrix-p b t)
+           (or (and (eq (car-safe a) 'calcFunc-idn)
+                    (= (length a) 2)
+                    (list 'calcFunc-idn (math-mul (nth 1 a) 
+                                                  (nth 1 (nth 1 b)))
+                          (1- (length b))))
+               (and (math-known-scalarp a)
+                    (list 'calcFunc-idn (math-mul a (nth 1 (nth 1 b))) 
+                          (1- (length b))))
+               (and (math-known-matrixp a)
+                    (math-mul a (nth 1 (nth 1 b))))))
-      (and (math-looks-negp b)
-           (math-mul (math-neg a) (math-neg b)))
@@ -1656 +1732 @@
-
-(defun math-div-symb-fancy (a b)
-
+
+
+
-           (not (equal a math-simplify-only))
-           (list '/ a b))
@@ -1870 +1948 @@
-                       (not (equal a math-simplify-only)))
-                  (list '^ a b))
+                 ((and (eq (car-safe a) '*)
+                       (or 
+                        (and
+                         (math-known-matrixp (nth 1 a))
+                         (math-known-matrixp (nth 2 a)))
+                        (and
+                         calc-matrix-mode
+                         (not (eq calc-matrix-mode 'scalar))
+                         (and (not (math-known-scalarp (nth 1 a)))
+                              (not (math-known-scalarp (nth 2 a)))))))
+                  (if (and (= b -1)
+                           (math-known-square-matrixp (nth 1 a))
+                           (math-known-square-matrixp (nth 2 a)))
+                      (list '* (list '^ (nth 2 a) -1) (list '^ (nth 1 a) -1))
+                    (list '^ a b)))
-                 ((and (eq (car-safe a) '*)
-                       (or (math-known-num-integerp b)