Changeset 3729

Timestamp:

2015-09-07T19:41:37-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/symbolic-polynomial.lisp (modified) (5 diffs)

branches/f4grobner/symbolic-polynomial.lisp

@@ -87 +87 @@
         (t
          (case (car expr)
-           (+ (reduce #'r+ (p-eval-list (cdr expr))))
-           (- (apply #'r- (p-eval-list (cdr expr))))
+           (+ (reduce #'add (p-eval-list (cdr expr))))
+           (- (apply #'subtract (p-eval-list (cdr expr))))
            (*
             (if (endp (cddr expr))      ;unary
                 (p-eval (cdr expr))
-                (reduce #'r* (p-eval-list (cdr expr)))))
+                (reduce #'multiply (p-eval-list (cdr expr)))))
            (/ 
             ;; A polynomial can be divided by a scalar
@@ -98 +98 @@
               ((endp (cddr expr))
                ;; A special case (/ ?), the inverse
-               (r/ (cadr expr)))
+               (divide (cadr expr)))
               (t
                (let ((num (p-eval (cadr expr)))
-                     (denom-inverse (apply #'r/ (mapcar #'p-eval-scalar (cddr expr)))))
-                 (r* denom-inverse num)))))
+                     (denom-inverse (apply #'divide (mapcar #'p-eval-scalar (cddr expr)))))
+                 (multiply denom-inverse num)))))
            (expt
             (cond
@@ -113 +113 @@
                ;; Non-integer power means non-polynomial coefficient
                expr)
-              (t (r-expt (p-eval (cadr expr)) (caddr expr)))))
+              (t (universal-expt (p-eval (cadr expr)) (caddr expr)))))
            (otherwise
             expr)))))))
@@ -184 +184 @@
   (cond
     ((poly-p p)
-     (mapcar #'term->cons (poly-termlist p)))
+     (mapcar #'->list (poly-termlist p)))
     ((and (consp p) (eq (car p) :[))
      (cons :[ (mapcar #'poly->alist (cdr p))))))
@@ -193 +193 @@
   "Convert a string STR representing a polynomial or polynomial list to
 an association list (... (MONOM . COEFF) ...)."
-  (poly->alist (string->poly str vars ring order)))
+  (poly->alist (string->poly str vars order)))
 
 (defun poly-equal-no-sugar-p (p q)