Changeset 2425

Timestamp:

2015-06-19T07:57:13-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/order.lisp (modified) (6 diffs)

branches/f4grobner/order.lisp

@@ -28 +28 @@
 
 (defpackage "ORDER"
-  (:use :cl :monom)
+  (:use :cl :ring :monom)
   (:export "LEX>"
            "GRLEX>"
@@ -42 +42 @@
 
 ;; pure lexicographic
-(defun lex> (p q &optional (start 0) (end (monom-dimension  p)))
+(defmethod lex> ((p monom) (q monom) &optional (start 0) (end (monom-dimension  p)))
   "Return T if P>Q with respect to lexicographic order, otherwise NIL.
 The second returned value is T if P=Q, otherwise it is NIL."
@@ -49 +49 @@
       ((>= i end) (values nil t))
     (cond
-     ((> (monom-elt p i) (monom-elt q i))
+     ((> (r-elt p i) (r-elt q i))
       (return-from lex> (values t nil)))
-     ((< (monom-elt p i) (monom-elt q i))
+     ((< (r-elt p i) (r-elt q i))
       (return-from lex> (values nil nil))))))
 
@@ -81 +81 @@
     (declare (type fixnum i))
     (cond
-     ((< (monom-elt p i) (monom-elt q i))
+     ((< (r-elt p i) (r-elt q i))
       (return-from revlex> (values t nil)))
-     ((> (monom-elt p i) (monom-elt q i))
+     ((> (r-elt p i) (r-elt q i))
       (return-from revlex> (values nil nil))))))
 
@@ -109 +109 @@
     (declare (type fixnum i))
     (cond
-      ((> (monom-elt p i) (monom-elt q i))
+      ((> (r-elt p i) (r-elt q i))
        (return-from invlex> (values t nil)))
-      ((< (monom-elt p i) (monom-elt q i))
+      ((< (r-elt p i) (r-elt q i))
        (return-from invlex> (values nil nil))))))
 
@@ -136 +136 @@
       (declare (type monom p q) (type fixnum start end))
       (cond
-        ((> (monom-elt p start) (monom-elt q start))
+        ((> (r-elt p start) (r-elt q start))
          (values t nil))
-        ((< (monom-elt p start) (monom-elt q start))
+        ((< (r-elt p start) (r-elt q start))
          (values nil nil))
         (t