Changeset 2004

Timestamp:

2015-06-16T17:14:41-07:00 (10 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/pol.lisp

@@ -100 +100 @@
 
 (defclass poly ()
-  ((termlist :initarg :termlist :accessor termlist))
-  (:default-initargs :termlist nil))
-
-(defun make-poly-from-termlist (termlist)
-  (make-instance 'poly :termlist termlist :sugar sugar))
-
-(defun make-poly-zero (&aux (termlist nil) (sugar -1))
-  (make-instance 'poly :termlist termlist))
-
-(defun make-poly-variable (ring nvars pos &optional (power 1)
-                           &aux
-                             (termlist (list
-                                        (make-term-variable ring nvars pos power))))
-  (make-instance 'poly :termlist termlist))
-
-(defun poly-unit (ring dimension
-                  &aux
-                    (termlist (termlist-unit ring dimension)))
-  (make-instance 'poly :termlist termlist))
-
+  ((expr :initarg :expr :accessor expr))
+  ((vars :initarg :vars :accessor vars))
+  (:default-initargs :expr 0 :vars nil))
 
 (defmethod print-object ((self poly) stream)
-  (princ (slot-value self 'termlist)))
-
-(defmethod poly-termlist ((self poly))
-  (slot-value self 'termlist))
-
-(defmethod (setf poly-termlist) (new-value (poly poly))
-  (setf (slot-value poly 'termlist) new-value))
+  (princ (slot-value self 'expr)))
 
 (defmethod poly-add ((p poly) (q poly)))
@@ -151 +128 @@
     ((null expr) 
      (error "Empty expression"))
-    ((eql expr 0) (make-poly-zero))
+    ((eql expr 0) 
+     (make-poly-zero))
     ((member expr vars :test #'equalp)
      (let ((pos (position expr vars :test #'equalp)))