Changeset 1672

Timestamp:

2015-06-14T20:55:07-07:00 (10 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/mx-grobner.lisp (modified) (4 diffs)

branches/f4grobner/mx-grobner.lisp

@@ -172 +172 @@
                                         :order (find-order)
                                         :primary-elimination-order primary-elimination-order
-                                        :secondary-elimination-order secondary-elimination-order))
-                       (ring (ro-order ring-and-order)))
+                                        :secondary-elimination-order secondary-elimination-order)))
   "Convert a maxima polynomial expression EXPR in variables VARS to internal form."
   (labels ((parse (arg) (maxima->poly arg vars ring order primary-elimination-order secondary-elimination-order))
@@ -181 +180 @@
      ((member expr vars :test #'equal-test-p)
       (let ((pos (position expr vars :test #'equal-test-p)))
-        (make-poly-variable ring (length vars) pos)))
+        (make-poly-variable (ro-ring ring-and-order) (length vars) pos)))
      ((free-of-vars expr vars)
       ;;This means that variable-free CRE and Poisson forms will be converted
       ;;to coefficients intact
-      (coerce-coeff ring expr vars))
+      (coerce-coeff (ro-ring ring-and-order) expr vars))
      (t
       (case (caar expr)
         (mplus (reduce #'(lambda (x y) (poly-add ring-and-order x y)) (parse-list (cdr expr))))
-        (mminus (poly-uminus ring (parse (cadr expr))))
+        (mminus (poly-uminus (ro-ring ring-and-order) (parse (cadr expr))))
         (mtimes
          (if (endp (cddr expr))         ;unary
@@ -199 +198 @@
            ;;Special handling of (expt var pow)
            (let ((pos (position (cadr expr) vars :test #'equal-test-p)))
-             (make-poly-variable ring (length vars) pos (caddr expr))))
+             (make-poly-variable (ro-ring ring-and-order) (length vars) pos (caddr expr))))
           ((not (and (integerp (caddr expr)) (plusp (caddr expr))))
            ;; Negative power means division in coefficient ring
@@ -205 +204 @@
            (mtell "~%Warning: Expression ~%~M~%contains power which is not a positive integer. Parsing as coefficient.~%"
                   expr)
-           (coerce-coeff ring expr vars))
-          (t (poly-expt ring (parse (cadr expr)) (caddr expr)))))
+           (coerce-coeff (ro-ring ring-and-order) expr vars))
+          (t (poly-expt (ro-ring ring-and-order) (parse (cadr expr)) (caddr expr)))))
         (mrat (parse ($ratdisrep expr)))
         (mpois (parse ($outofpois expr)))