Changeset 2442 for branches/f4grobner

Timestamp:

2015-06-19T09:52:11-07:00 (10 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/polynomial.lisp

@@ -84 +84 @@
 (proclaim '(optimize (speed 3) (space 0) (safety 0) (debug 0)))
 
-(defstruct (poly
+#|
              ;;
              ;; BOA constructor, by default constructs zero polynomial
@@ -99 +99 @@
                                            (termlist (termlist-unit ring dimension))
                                            (sugar 0))))
-  (termlist nil :type list)
-  (sugar -1 :type fixnum))
+
+|#
+
+(defclass poly ()
+  ((termlist :initarg :terms :accessor poly-termlist))
+  (:default-initargs :termlist nil))
 
 ;; Leading term
-(defmacro poly-lt (p) `(car (poly-termlist ,p)))
+(defgeneric leading-term (object)
+  (:method ((self poly)) 
+    (car (poly-termlist self))))
 
 ;; Second term
-(defmacro poly-second-lt (p) `(cadar (poly-termlist ,p)))
-
-;; Leading monomial
-(defun poly-lm (p) 
-  (declare (type poly p))
-  (term-monom (poly-lt p)))
-
-;; Second monomial
-(defun poly-second-lm (p)
-  (declare (type poly p))
-  (term-monom (poly-second-lt p)))
+(defgeneric second-leading-term (object) 
+  (:method ((self poly))
+    (cadar (poly-termlist self))))
 
 ;; Leading coefficient
-(defun poly-lc (p)
-  (declare (type poly p))
-  (term-coeff (poly-lt p)))
+(defgeneric leading-coefficient (object)
+  (:method ((self poly))
+    (r-coeff (leading-term self))))
 
 ;; Second coefficient
-(defun poly-second-lc (p)
-  (declare (type poly p))
-  (term-coeff (poly-second-lt p)))
+(defgeneric second-leading-coefficient (object)
+  (:method ((self poly)) 
+    (term-coeff (second-leading-term self))))
 
 ;; Testing for a zero polynomial