Changeset 4225

Timestamp:

2016-06-04T15:41:22-07:00 (8 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/monom.lisp (modified) (4 diffs)

branches/f4grobner/monom.lisp

@@ -21 +21 @@
 
 (defpackage "MONOM"
-  (:use :cl :utils :copy)
+  (:use :cl :utils :copy :ring :integer-ring)
   (:export "MONOM"
            "TERM"
@@ -145 +145 @@
 
 (defgeneric universal-equalp (object1 object2)
-  (:documentation "Returns T iff OBJECT1 and OBJECT2 are equal.")
-  (:method ((object1 cons) (object2 cons)) (every #'universal-equalp object1 object2))
-  (:method ((object1 number) (object2 number)) (= object1 object2))
   (:method ((m1 monom) (m2 monom))
     "Returns T iff monomials M1 and M2 have identical EXPONENTS."
@@ -329 +326 @@
 (defgeneric universal-gcd (object1 object2)
   (:documentation "Returns GCD of objects OBJECT1 and OBJECT2")
-  (:method ((object1 number) (object2 number)) (gcd object1 object2))
   (:method ((m1 monom) (m2 monom))
     "Returns greatest common divisor of monomials M1 and M2."
@@ -540 +536 @@
 
 (defclass term (monom)
-  ((coeff :initarg :coeff :accessor term-coeff))
-  (:default-initargs :coeff nil)
+  ((coeff :initarg :coeff :initform (error "Must specify coefficient.") :accessor term-coeff :type ring))
   (:documentation "Implements a term, i.e. a product of a scalar
 and powers of some variables, such as 5*X^2*Y^3."))