emacs: lisp/calc/calc-poly.el comparison

comparison lisp/calc/calc-poly.el @ 90054:f2ebccfa87d4

Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-74 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-709 Update from CVS: src/indent.c (Fvertical_motion): Fix last change. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-710 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-715 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-716 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-74 Update from CVS

author	Miles Bader <miles@gnu.org>
date	Wed, 08 Dec 2004 05:02:30 +0000
parents	b637c617432f 88f98983accf
children	62afea0771d8

comparison

equal deleted inserted replaced

-:fff5f1a61d92
+:f2ebccfa87d4
 ;;; Commentary:
 ;;; Code:
 ;; This file is autoloaded from calc-ext.el.
 (require 'calc-ext)
 (require 'calc-macs)
-(defun calc-Need-calc-poly () nil)
 (defun calcFunc-pcont (expr &optional var)
 (cond ((Math-primp expr)
 	 (cond ((Math-zerop expr) 1)
 	       ((Math-messy-integerp expr) (math-trunc expr))
 			    (and (= (nth 1 a) (nth 1 b))
 				 (math-beforep (car a) (car b))))))))
 ;;; Given an expression find all variables that are polynomial bases.
 ;;; Return list in the form '( (var1 degree1) (var2 degree2) ... ).
-;;; Note dynamic scope of mpb-total-base.
+;; The variable math-poly-base-total-base is local to
+;; math-total-polynomial-base, but is used by math-polynomial-p1,
+;; which is called by math-total-polynomial-base.
+(defvar math-poly-base-total-base)
 (defun math-total-polynomial-base (expr)
-(let ((mpb-total-base nil))
+(let ((math-poly-base-total-base nil))
 (math-polynomial-base expr 'math-polynomial-p1)
-(math-sort-poly-base-list mpb-total-base)))
+(math-sort-poly-base-list math-poly-base-total-base)))
+;; The variable math-poly-base-top-expr is local to math-polynomial-base
+;; in calc-alg.el, but is used by math-polynomial-p1 which is called
+;; by math-polynomial-base.
+(defvar math-poly-base-top-expr)
 (defun math-polynomial-p1 (subexpr)
-(or (assoc subexpr mpb-total-base)
+(or (assoc subexpr math-poly-base-total-base)
 (memq (car subexpr) '(+ - * / neg))
 (and (eq (car subexpr) '^) (natnump (nth 2 subexpr)))
 (let* ((math-poly-base-variable subexpr)
-	     (exponent (math-polynomial-p mpb-top-expr subexpr)))
+	     (exponent (math-polynomial-p math-poly-base-top-expr subexpr)))
 	(if exponent
-	    (setq mpb-total-base (cons (list subexpr exponent)
+	    (setq math-poly-base-total-base (cons (list subexpr exponent)
-				       mpb-total-base)))))
+				       math-poly-base-total-base)))))
 nil)
+;; The variable math-factored-vars is local to calcFunc-factors and
+;; calcFunc-factor, but is used by math-factor-expr and
+;; math-factor-expr-part, which are called (directly and indirectly) by
-(defun calcFunc-factors (expr &optional var)
+;; calcFunc-factor and calcFunc-factors.
+(defvar math-factored-vars)
+;; The variable math-fact-expr is local to calcFunc-factors,
+;; calcFunc-factor and math-factor-expr, but is used by math-factor-expr-try
+;; and math-factor-expr-part, which are called (directly and indirectly) by
+;; calcFunc-factor, calcFunc-factors and math-factor-expr.
+(defvar math-fact-expr)
+;; The variable math-to-list is local to calcFunc-factors and
+;; calcFunc-factor, but is used by math-accum-factors, which is
+;; called (indirectly) by calcFunc-factors and calcFunc-factor.
+(defvar math-to-list)
+(defun calcFunc-factors (math-fact-expr &optional var)
 (let ((math-factored-vars (if var t nil))
 	(math-to-list t)
 	(calc-prefer-frac t))
 (or var
-	(setq var (math-polynomial-base expr)))
+	(setq var (math-polynomial-base math-fact-expr)))
 (let ((res (math-factor-finish
 		(or (catch 'factor (math-factor-expr-try var))
-		    expr))))
+		    math-fact-expr))))
 (math-simplify (if (math-vectorp res)
 			 res
 		       (list 'vec (list 'vec res 1)))))))
-(defun calcFunc-factor (expr &optional var)
+(defun calcFunc-factor (math-fact-expr &optional var)
 (let ((math-factored-vars nil)
 	(math-to-list nil)
 	(calc-prefer-frac t))
 (math-simplify (math-factor-finish
 		    (if var
 			(let ((math-factored-vars t))
-			  (or (catch 'factor (math-factor-expr-try var)) expr))
+			  (or (catch 'factor (math-factor-expr-try var)) math-fact-expr))
-		      (math-factor-expr expr))))))
+		      (math-factor-expr math-fact-expr))))))
 (defun math-factor-finish (x)
 (if (Math-primp x)
 x
 (if (eq (car x) 'calcFunc-Fac-Prot)
 (defun math-factor-protect (x)
 (if (memq (car-safe x) '(+ -))
 (list 'calcFunc-Fac-Prot x)
 x))
-(defun math-factor-expr (expr)
+(defun math-factor-expr (math-fact-expr)
-(cond ((eq math-factored-vars t) expr)
+(cond ((eq math-factored-vars t) math-fact-expr)
-	((or (memq (car-safe expr) '(* / ^ neg))
+	((or (memq (car-safe math-fact-expr) '(* / ^ neg))
-	     (assq (car-safe expr) calc-tweak-eqn-table))
+	     (assq (car-safe math-fact-expr) calc-tweak-eqn-table))
-	 (cons (car expr) (mapcar 'math-factor-expr (cdr expr))))
+	 (cons (car math-fact-expr) (mapcar 'math-factor-expr (cdr math-fact-expr))))
-	((memq (car-safe expr) '(+ -))
+	((memq (car-safe math-fact-expr) '(+ -))
 	 (let* ((math-factored-vars math-factored-vars)
-		(y (catch 'factor (math-factor-expr-part expr))))
+		(y (catch 'factor (math-factor-expr-part math-fact-expr))))
 	   (if y
 	       (math-factor-expr y)
-	     expr)))
+	     math-fact-expr)))
-	(t expr)))
+	(t math-fact-expr)))
 (defun math-factor-expr-part (x)    ; uses "expr"
 (if (memq (car-safe x) '(+ - * / ^ neg))
 (while (setq x (cdr x))
 	(math-factor-expr-part (car x)))
 (and (not (Math-objvecp x))
 	 (not (assoc x math-factored-vars))
-	 (> (math-factor-contains expr x) 1)
+	 (> (math-factor-contains math-fact-expr x) 1)
 	 (setq math-factored-vars (cons (list x) math-factored-vars))
 	 (math-factor-expr-try x))))
-(defun math-factor-expr-try (x)
+;; The variable math-fet-x is local to math-factor-expr-try, but is
-(if (eq (car-safe expr) '*)
+;; used by math-factor-poly-coefs, which is called by math-factor-expr-try.
-(let ((res1 (catch 'factor (let ((expr (nth 1 expr)))
+(defvar math-fet-x)
-				   (math-factor-expr-try x))))
-	    (res2 (catch 'factor (let ((expr (nth 2 expr)))
+(defun math-factor-expr-try (math-fet-x)
-				   (math-factor-expr-try x)))))
+(if (eq (car-safe math-fact-expr) '*)
+(let ((res1 (catch 'factor (let ((math-fact-expr (nth 1 math-fact-expr)))
+				   (math-factor-expr-try math-fet-x))))
+	    (res2 (catch 'factor (let ((math-fact-expr (nth 2 math-fact-expr)))
+				   (math-factor-expr-try math-fet-x)))))
 	(and (or res1 res2)
-	     (throw 'factor (math-accum-factors (or res1 (nth 1 expr)) 1
+	     (throw 'factor (math-accum-factors (or res1 (nth 1 math-fact-expr)) 1
-						(or res2 (nth 2 expr))))))
+						(or res2 (nth 2 math-fact-expr))))))
-(let* ((p (math-is-polynomial expr x 30 'gen))
+(let* ((p (math-is-polynomial math-fact-expr math-fet-x 30 'gen))
-	   (math-poly-modulus (math-poly-modulus expr))
+	   (math-poly-modulus (math-poly-modulus math-fact-expr))
 	   res)
 (and (cdr p)
 	   (setq res (math-factor-poly-coefs p))
 	   (throw 'factor res)))))
 						      (cdr (cdr facs)))))
 		(cons 'vec (cons (list 'vec fac pow) (cdr facs))))))))
 (math-mul (math-pow fac pow) facs)))
 (defun math-factor-poly-coefs (p &optional square-free)    ; uses "x"
-(let (t1 t2)
+(let (t1 t2 temp)
 (cond ((not (cdr p))
 	   (or (car p) 0))
-	  ;; Strip off multiples of x.
+	  ;; Strip off multiples of math-fet-x.
 	  ((Math-zerop (car p))
 	   (let ((z 0))
 	     (while (and p (Math-zerop (car p)))
 	       (setq z (1+ z) p (cdr p)))
 	     (if (cdr p)
 		 (setq p (math-factor-poly-coefs p square-free))
 	       (setq p (math-sort-terms (math-factor-expr (car p)))))
-	     (math-accum-factors x z (math-factor-protect p))))
+	     (math-accum-factors math-fet-x z (math-factor-protect p))))
 	  ;; Factor out content.
 	  ((and (not square-free)
 		(not (eq 1 (setq t1 (math-mul (math-poly-gcd-list p)
 					      (if (math-guess-if-neg
 						   (nth (1- (length p)) p))
 						  -1 1))))))
 	   (math-accum-factors t1 1 (math-factor-poly-coefs
 				     (math-poly-div-list p t1) 'cont)))
-	  ;; Check if linear in x.
+	  ;; Check if linear in math-fet-x.
 	  ((not (cdr (cdr p)))
 	   (math-add (math-factor-protect
 		      (math-sort-terms
 		       (math-factor-expr (car p))))
-		     (math-mul x (math-factor-protect
+		     (math-mul math-fet-x (math-factor-protect
 				  (math-sort-terms
 				   (math-factor-expr (nth 1 p)))))))
 	  ;; If symbolic coefficients, use FactorRules.
 	  ((let ((pp p))
 				     (Math-integerp (nth 1 (car pp)))
 				     (Math-integerp (nth 2 (car pp))))))
 	       (setq pp (cdr pp)))
 	     pp)
 	   (let ((res (math-rewrite
-		       (list 'calcFunc-thecoefs x (cons 'vec p))
+		       (list 'calcFunc-thecoefs math-fet-x (cons 'vec p))
 		       '(var FactorRules var-FactorRules))))
 	     (or (and (eq (car-safe res) 'calcFunc-thefactors)
 		      (= (length res) 3)
 		      (math-vectorp (nth 2 res))
 		      (let ((facs 1)
 			    (vec (nth 2 res)))
 			(while (setq vec (cdr vec))
 			  (setq facs (math-accum-factors (car vec) 1 facs)))
 			facs))
-		 (math-build-polynomial-expr p x))))
+		 (math-build-polynomial-expr p math-fet-x))))
 	  ;; Check if rational coefficients (i.e., not modulo a prime).
 	  ((eq math-poly-modulus 1)
 	   ;; Check if there are any squared terms, or a content not = 1.
 					 (let ((den (math-lcm-denoms
 						     coef0 coef1)))
 					   (setq scale (math-div scale den))
 					   (math-add
 					    (math-add
-					     (math-mul den (math-pow x 2))
+					     (math-mul den (math-pow math-fet-x 2))
-					     (math-mul (math-mul coef1 den) x))
+					     (math-mul (math-mul coef1 den)
+math-fet-x))
 					    (math-mul coef0 den)))
 				       (let ((den (math-lcm-denoms coef0)))
 					 (setq scale (math-div scale den))
-					 (math-add (math-mul den x)
+					 (math-add (math-mul den math-fet-x)
 						   (math-mul coef0 den))))
 				     1 expr)
 			       roots (cdr roots))))
 		     (setq expr (math-accum-factors
 				 expr 1
 				 (math-mul csign
 					   (math-build-polynomial-expr
 					    (math-mul-list (nth 1 t1) scale)
-					    x)))))
+					    math-fet-x)))))
-		 (math-build-polynomial-expr p x))   ; can't factor it.
+		 (math-build-polynomial-expr p math-fet-x))   ; can't factor it.
 	     ;; Separate out the squared terms (Knuth exercise 4.6.2-34).
 	     ;; This step also divides out the content of the polynomial.
 	     (let* ((cabs (math-poly-gcd-list p))
 		    (csign (if (math-negp (nth (1- (length p)) p)) -1 1))
 	   (list '^ x n))))
 (defun calcFunc-expandpow (x n)
 (math-normalize (math-expand-power x n)))
+(provide 'calc-poly)
 ;;; arch-tag: d2566c51-2ccc-45f1-8c50-f3462c2953ff
 ;;; calc-poly.el ends here

Mercurial > emacs

comparison lisp/calc/calc-poly.el @ 90054:f2ebccfa87d4