Changeset 1009 for branches/f4grobner

Timestamp:

2015-06-10T06:31:34-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/parse.lisp

@@ -251 +251 @@
    (t (sort-poly-1 poly-or-poly-list order))))
 
-(defun poly-eval-1 (expr vars order ring
+(defun poly-eval-1 (ring-and-order expr vars
                     &aux
-                    (n (length vars))
-                    (basis (monom-basis (length vars))))
+                      (ring (ro-ring ring-and-order))
+                      (n (length vars))
+                      (basis (monom-basis (length vars))))
   "Evaluate an expression EXPR as polynomial by substituting operators
 + - * expt with corresponding polynomial operators and variables VARS
@@ -265 +266 @@
      (cond
        ((zerop expr) NIL)
-       (t (list (cons (make-list n :initial-element 0) expr)))))
+       (t (make-poly-from-termlist (list (make-monom :dimension n) expr)))))
     ((symbolp expr)
      (nth (position expr vars) basis)) 
@@ -272 +273 @@
        (expt
         (if (= (length expr) 3)
-            ($poly-expt (poly-eval-1 (cadr expr) vars order ring)
+            ($poly-expt (poly-eval-1 ring-and-order (cadr expr) vars)
                         (caddr expr)
-                        n order ring)
+                        n)
             (error "Too many arguments to EXPT")))
        (/
         (if (and (= (length expr) 3)
                  (numberp (caddr expr)))
-            ($poly/ (cadr expr) (caddr expr) ring)
+            ($poly/ ring (cadr expr) (caddr expr))
             (error "The second argument to / must be a number")))
        (otherwise