Changeset 989

Timestamp:

2015-06-09T20:51:31-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/polynomial.lisp (modified) (3 diffs)

branches/f4grobner/polynomial.lisp

@@ -240 +240 @@
                            0))
 
-(defun poly-eval (ring expr vars &optional (list-marker '[))
-  (labels ((p-eval (arg) (poly-eval ring arg vars))
+(defun poly-eval (ring-and-order expr vars &optional (list-marker '[)
+                                             &aux (ring (ro-ring ring-and-order)))
+  (labels ((p-eval (arg) (poly-eval ring-and-order arg vars))
            (p-eval-list (args) (mapcar #'p-eval args))
-           (p-add (x y) (poly-add ring x y)))
+           (p-add (x y) (poly-add ring-and-order x y)))
     (cond
       ((eql expr 0) (make-poly-zero))
@@ -259 +260 @@
               (1 (make-poly-zero))
               (2 (poly-uminus ring (p-eval (cadr expr))))
-              (3 (poly-sub ring (p-eval (cadr expr)) (p-eval (caddr expr))))
-              (otherwise (poly-sub ring (p-eval (cadr expr))
+              (3 (poly-sub ring-and-order (p-eval (cadr expr)) (p-eval (caddr expr))))
+              (otherwise (poly-sub ring-and-order (p-eval (cadr expr))
                                    (reduce #'p-add (p-eval-list (cddr expr)))))))
          (*
           (if (endp (cddr expr))                ;unary
               (p-eval (cdr expr))
-              (reduce #'(lambda (p q) (poly-mul ring p q)) (p-eval-list (cdr expr)))))
+              (reduce #'(lambda (p q) (poly-mul ring-and-order p q)) (p-eval-list (cdr expr)))))
          (expt
           (cond
@@ -276 +277 @@
              ;; Non-integer power means non-polynomial coefficient
              (coerce-coeff ring expr vars))
-            (t (poly-expt ring (p-eval (cadr expr)) (caddr expr)))))
+            (t (poly-expt ring-and-order (p-eval (cadr expr)) (caddr expr)))))
          (otherwise
           (coerce-coeff ring expr vars)))))))