close Warning: Can't synchronize with repository "(default)" (The repository directory has changed, you should resynchronize the repository with: trac-admin $ENV repository resync '(default)'). Look in the Trac log for more information.

Changeset 1710 for branches/f4grobner


Ignore:
Timestamp:
2015-06-14T21:54:35-07:00 (9 years ago)
Author:
Marek Rychlik
Message:

* empty log message *

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/f4grobner/mx-grobner.lisp

    r1709 r1710  
    189189     ((member expr vars :test #'equal-test-p)
    190190      (let ((pos (position expr vars :test #'equal-test-p)))
    191         (make-poly-variable (ro-ring ring-and-order) (length vars) pos)))
     191        (make-poly-variable ring (length vars) pos)))
    192192     ((free-of-vars expr vars)
    193193      ;;This means that variable-free CRE and Poisson forms will be converted
    194194      ;;to coefficients intact
    195       (coerce-coeff (ro-ring ring-and-order) expr vars))
     195      (coerce-coeff ring expr vars))
    196196     (t
    197197      (case (caar expr)
    198198        (mplus (reduce #'(lambda (x y) (poly-add ring-and-order x y)) (parse-list (cdr expr))))
    199         (mminus (poly-uminus (ro-ring ring-and-order) (parse (cadr expr))))
     199        (mminus (poly-uminus ring (parse (cadr expr))))
    200200        (mtimes
    201201         (if (endp (cddr expr))         ;unary
     
    207207           ;;Special handling of (expt var pow)
    208208           (let ((pos (position (cadr expr) vars :test #'equal-test-p)))
    209              (make-poly-variable (ro-ring ring-and-order) (length vars) pos (caddr expr))))
     209             (make-poly-variable ring (length vars) pos (caddr expr))))
    210210          ((not (and (integerp (caddr expr)) (plusp (caddr expr))))
    211211           ;; Negative power means division in coefficient ring
     
    213213           (mtell "~%Warning: Expression ~%~M~%contains power which is not a positive integer. Parsing as coefficient.~%"
    214214                  expr)
    215            (coerce-coeff (ro-ring ring-and-order) expr vars))
    216           (t (poly-expt (ro-ring ring-and-order) (parse (cadr expr)) (caddr expr)))))
     215           (coerce-coeff ring expr vars))
     216          (t (poly-expt ring (parse (cadr expr)) (caddr expr)))))
    217217        (mrat (parse ($ratdisrep expr)))
    218218        (mpois (parse ($outofpois expr)))
    219219        (otherwise
    220          (coerce-coeff (ro-ring ring-and-order) expr vars)))))))
     220         (coerce-coeff ring expr vars)))))))
    221221
    222222(defun maxima->poly-list (expr vars
Note: See TracChangeset for help on using the changeset viewer.