Changeset 3863 for trunk/lisp/calc/calc-poly.el

Timestamp:

2005年09月10日 10時16分00秒 (3 years ago)

Author:

miyoshi

Message:

--

Files:

• trunk/lisp/calc/calc-poly.el (modified) (1 diff)

trunk/lisp/calc/calc-poly.el

@@ -1070 +1070 @@
-                          (list '/ (nth 2 (nth 1 expr)) (nth 2 expr))
-                          nil (eq (car (nth 1 expr)) '-)))
+        ((and (eq calc-matrix-mode 'matrix)
+              (eq (car-safe expr) '^)
+              (natnump (nth 2 expr))
+              (> (nth 2 expr) 1)
+              (memq (car-safe (nth 1 expr)) '(+ -)))
+         (if (= (nth 2 expr) 2)
+             (math-add-or-sub (list '* (nth 1 (nth 1 expr)) (nth 1 expr))
+                              (list '* (nth 2 (nth 1 expr)) (nth 1 expr))
+                              nil (eq (car (nth 1 expr)) '-))
+           (math-add-or-sub (list '* (nth 1 (nth 1 expr)) (list '^ (nth 1 expr) 
+                                                                (1- (nth 2 expr))))
+                            (list '* (nth 2 (nth 1 expr)) (list '^ (nth 1 expr) 
+                                                                (1- (nth 2 expr))))
+                            nil (eq (car (nth 1 expr)) '-))))
-        ((and (eq (car-safe expr) '^)
-              (memq (car-safe (nth 1 expr)) '(+ -))
-              (integerp (nth 2 expr))
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        (t expr)))
-