Changeset 1996 for branches

Timestamp:

2015-06-16T01:33:28-07:00 (10 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/pol.lisp

@@ -336 +336 @@
          (make-poly-variable ring (length vars) pos)))
       ((atom expr)
-       (coerce-coeff ring expr vars))
+       (scalar->poly ring expr vars))
       ((eq (car expr) list-marker)
        (cons list-marker (p-eval-list (cdr expr))))
@@ -357 +357 @@
             ((endp (cddr expr))
              ;; A special case (/ ?), the inverse
-             (coerce-coeff ring (apply (ring-div ring) (cdr expr)) vars))
+             (scalar->poly ring (apply (ring-div ring) (cdr expr)) vars))
             (t
              (let ((num (p-eval (cadr expr)))
@@ -373 +373 @@
              ;; Negative power means division in coefficient ring
              ;; Non-integer power means non-polynomial coefficient
-             (coerce-coeff ring expr vars))
+             (scalar->poly ring expr vars))
             (t (poly-expt ring-and-order (p-eval (cadr expr)) (caddr expr)))))
          (otherwise
-          (coerce-coeff ring expr vars)))))))
+          (scalar->poly ring expr vars)))))))
 
 (defun poly-eval-scalar (expr