Changeset 3367

Timestamp:

2015-08-27T05:58:46-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/symbolic-polynomial.lisp

@@ -22 +22 @@
 (defpackage "SYMBOLIC-POLYNOMIAL"
   (:use :cl :utils :ring :monom :order :term :polynomial :infix)
-  (:export "SYMBOLIC-POLY")
+  (:export "SYMBOLIC-POLY" "READ-INFIX-FORM")
   (:documentation "Implements symbolic polynomials. A symbolic
 polynomial is and object which uses symbolic variables for reading and
@@ -56 +56 @@
   (assert (= (length (symbolic-poly-vars new)) (poly-dimension new))))
 
-(defgeneric poly-eval (expr vars ring order) 
+(defgeneric poly-eval (expr vars order) 
   (:documentation "Evaluate Lisp form EXPR to a polynomial or a list of polynomials in
 variables VARS. Return the resulting polynomial or list of
@@ -64 +64 @@
 of polynomials in internal form. A similar operation in another computer
 algebra system could be called 'expand' or so.")
-  (:method ((expr symbolic-poly) vars ring order) expr)
-  (:method (expr vars ring order) 
+  (:method ((expr symbolic-poly) vars order) expr)
+  (:method (expr vars order) 
     (cond 
       ((eq expr 0) 
@@ -71 +71 @@
       ((member expr vars :test #'equalp)
        (let ((pos (position expr vars :test #'equalp)))
-         (make-poly-variable ring (length vars) pos)))
+         (make-monom-variable (length vars) pos)))
       ((atom expr)
-       (coerce-coeff ring expr vars))
+       expr)
       ((eq (car expr) list-marker)
        (cons list-marker (p-eval-list (cdr expr))))
       (t
        (case (car expr)
-         (+ (reduce #'p-add (p-eval-list (cdr expr))))
+         (+ (reduce #'add-to (p-eval-list (cdr expr))))
          (- (case (length expr)
               (1 (make-poly-zero))