Changeset 3442 for branches

Timestamp:

2015-09-05T09:07:05-07:00 (9 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 :ring)
+  (:use :cl)
   (:export "MONOM"
            "EXPONENT"
            "MONOM-DIMENSION"
            "MONOM-EXPONENTS"
-           "MAKE-MONOM-VARIABLE")
+           "MONOM-EQUALP"
+           "MONOM-ELT"
+           "MONOM-TOTAL-DEGREE"
+           "MONOM-SUGRAR"
+           "MONOM-MULTIPLY-BY"
+           "MONOM-DIVIDE-BY"
+           "MONOM-COPY-INSTANCE"
+           "MONOM-MULTIPLY-2"
+           "MONOM-MULTIPLY"
+           "MONOM-DIVIDES-P"
+           "MONOM-DIVIDES-LCM-P"
+           "MONOM-LCM-DIVIDES-LCM-P"
+           "MONOM-LCM-EQUAL-LCM-P"
+           "MONOM-DIVISIBLE-BY-P"
+           "MONOM-REL-PRIME-P"
+           "MONOM-LCM"
+           "MONOM-GCD"
+           "MONOM-DEPENDS-P"
+           "MONOM-LEFT-TENSOR-PRODUCT-BY"
+           "MONOM-RIGHT-TENSOR-PRODUCT-BY"
+           "MONOM-LEFT-CONTRACT"
+           "MAKE-MONOM-VARIABLE"
+           "MONOM->LIST")
+
   (:documentation
    "This package implements basic operations on monomials. 
@@ -137 +160 @@
   (monom-total-degree m start end))
 
-(defmethod multiply-by ((self monom) (other monom))
+(defmethod monom-multiply-by ((self monom) (other monom))
   (with-slots ((exponents1 exponents))
       self
@@ -159 +182 @@
   self)
 
-(defmethod copy-instance :around ((object monom)  &rest initargs &key &allow-other-keys)
+(defmethod monom-copy-instance ((object monom)  &rest initargs &key &allow-other-keys)
   "An :AROUNT method for COPY-INSTANCE. The primary method is a shallow copy,
   while for monomials we typically need a fresh copy of the
@@ -168 +191 @@
     copy))
 
-(defmethod monom* ((m1 monom) (m2 monom))
+(defmethod monom-multiply-2 ((m1 monom) (m2 monom))
   "Non-destructively multiply monomial M1 by M2."
   (multiply-by (copy-instance m1) (copy-instance m2)))
 
-(defmethod monom* ((numerator monom) &rest denominators)
+(defmethod monom-multiply ((numerator monom) &rest denominators)
   "Non-destructively divide monomial NUMERATOR by product of DENOMINATORS."
-  (divide-by (copy-instance numerator) (reduce #'
-                                        monom* denominators)))
+  (divide-by (copy-instance numerator) (reduce #'monom-multiply-2 denominators)))
 
 (defmethod monom-divides-p ((m1 monom) (m2 monom))