Changeset 3533

Timestamp:

2015-09-05T15:58:06-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/monom.lisp

@@ -477 +477 @@
                    (values primary nil))))))))
 
-
 (defclass term (monom)
   ((coeff :initarg :coeff :accessor term-coeff))
@@ -492 +491 @@
               exponents coeff))))
 
-
-(defmethod r-equalp ((term1 term) (term2 term))
-  (when (r-equalp (scalar-coeff term1) (scalar-coeff term2))
+(defmethod monom-equalp ((term1 term) (term2 term))
+  (when (equalp (term-coeff term1) (term-coeff term2))
     (call-next-method)))
 
-(defmethod update-instance-for-different-class :after ((old monom) (new  scalar) &key)
-  (setf (scalar-coeff new) 1))
-
-(defmethod multiply-by :before ((self term) (other term))
+(defmethod update-instance-for-different-class :after ((old monom) (new term) &key)
+  (setf (term-coeff new) 1))
+
+(defmethod monom-multiply-by ((self term) (other term))
   "Destructively multiply terms SELF and OTHER and store the result into SELF.
 It returns SELF."
   (setf (scalar-coeff self) (multiply-by (scalar-coeff self) (scalar-coeff other))))
 
-(defmethod left-tensor-product-by ((self term) (other term))
-  (setf (scalar-coeff self) (multiply-by (scalar-coeff self) (scalar-coeff other)))
+(defmethod monom-left-tensor-product-by ((self term) (other term))
+  (setf (term-coeff self) (multiply-by (term-coeff self) (term-coeff other)))
   (call-next-method))
 
-(defmethod right-tensor-product-by ((self term) (other term))
-  (setf (scalar-coeff self) (multiply-by (scalar-coeff self) (scalar-coeff other)))
+(defmethod monom-right-tensor-product-by ((self term) (other term))
+  (setf (term-coeff self) (multiply-by (term-coeff self) (term-coeff other)))
   (call-next-method))
 
-(defmethod left-tensor-product-by ((self term) (other monom))
-  (call-next-method))
-
-(defmethod right-tensor-product-by ((self term) (other monom))
-  (call-next-method))
-
-(defmethod divide-by ((self term) (other term))
+(defmethod monom-divide-by ((self term) (other term))
   "Destructively divide term SELF by OTHER and store the result into SELF.
 It returns SELF."
-  (setf (scalar-coeff self) (divide-by (scalar-coeff self) (scalar-coeff other)))
+  (setf (term-coeff self) (divide-by (term-coeff self) (term-coeff other)))
   (call-next-method))
 
-(defmethod unary-minus ((self term))
-  (setf (scalar-coeff self) (unary-minus (scalar-coeff self)))
+(defmethod monom-unary-minus ((self term))
+  (setf (term-coeff self) (monom-unary-minus (term-coeff self)))
   self)
 
-(defmethod r* ((term1 term) (term2 term))
+(defmethod monom-multiply ((term1 term) (term2 term))
   "Non-destructively multiply TERM1 by TERM2."
-  (multiply-by (copy-instance term1) (copy-instance term2)))
-
-(defmethod r* ((term1 number) (term2 monom))
+  (monom-multiply-by (copy-instance term1) (copy-instance term2)))
+
+(defmethod monom-multiply ((term1 number) (term2 monom))
   "Non-destructively multiply TERM1 by TERM2."
-  (r* term1 (change-class (copy-instance term2) 'term)))
-
-(defmethod r* ((term1 number) (term2 term))
-  "Non-destructively multiply TERM1 by TERM2."
-  (setf (scalar-coeff term2) 
-        (r* term1 (scalar-coeff term2)))
-  term2)
-
-(defmethod r-zerop ((self term))
-  (r-zerop (scalar-coeff self)))
+  (monom-multiply term1 (change-class (copy-instance term2) 'term)))
+
+(defmethod monom-zerop ((self term))
+  (zerop (term-coeff self)))