Changeset 2433 for branches/f4grobner

Timestamp:

2015-06-19T08:12:04-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/order.lisp

@@ -43 +43 @@
 ;; pure lexicographic
 (defgeneric lex> (p q &optional start end)
-  (:method ((p monom) (q monom) &optional (start 0) (end (monom-dimension  p)))
+  (:method ((p monom) (q monom) &optional (start 0) (end (r-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."
@@ -57 +57 @@
 ;; total degree order , ties broken by lexicographic
 (defgeneric grlex> (p q &optional start end)
-  (:method ((p monom) (q monom) &optional (start 0) (end (monom-dimension  p)))
+  (:method ((p monom) (q monom) &optional (start 0) (end (r-dimension  p)))
     "Return T if P>Q with respect to graded lexicographic order, otherwise NIL.
 The second returned value is T if P=Q, otherwise it is NIL."
@@ -72 +72 @@
 
 ;; reverse lexicographic
-(defmethod revlex> ((p monom) (q monom) &optional (start 0) (end (monom-dimension  p)))
+(defgeneric revlex> ((p monom) (q monom) &optional (start 0) (end (r-dimension  p)))
   "Return T if P>Q with respect to reverse lexicographic order, NIL
 otherwise.  The second returned value is T if P=Q, otherwise it is
@@ -90 +90 @@
 
 ;; total degree, ties broken by reverse lexicographic
-(defmethod grevlex> ((p monom) (q monom) &optional (start 0) (end (monom-dimension  p)))
+(defmethod grevlex> ((p monom) (q monom) &optional (start 0) (end (r-dimension  p)))
   "Return T if P>Q with respect to graded reverse lexicographic order,
 NIL otherwise. The second returned value is T if P=Q, otherwise it is NIL."
@@ -103 +103 @@
       (revlex> p q start end)))))
 
-(defmethod invlex> ((p monom) (q monom) &optional (start 0) (end (monom-dimension  p)))
+(defmethod invlex> ((p monom) (q monom) &optional (start 0) (end (r-dimension  p)))
   "Return T if P>Q with respect to inverse lexicographic order, NIL otherwise
 The second returned value is T if P=Q, otherwise it is NIL."
@@ -119 +119 @@
 (defun reverse-monomial-order (order)
   "Create the inverse monomial order to the given monomial order ORDER."
-  #'(lambda (p q &optional (start 0) (end (monom-dimension q))) 
+  #'(lambda (p q &optional (start 0) (end (r-dimension q))) 
       (declare (type monom p q) (type fixnum start end))
       (funcall order q p start end)))
@@ -135 +135 @@
 i.e. for eliminating the first variable. Thus, the order compares the degrees of the
 first variable in P and Q first, with ties broken by SECONDARY-ELIMINATION-ORDER."
-  #'(lambda (p q &optional (start 0) (end (monom-dimension p)))
+  #'(lambda (p q &optional (start 0) (end (r-dimension p)))
       (declare (type monom p q) (type fixnum start end))
       (cond
@@ -170 +170 @@
          (make-elimination-order-factory-1 secondary-elimination-order))
         (t
-         #'(lambda (p q &optional (start 0) (end (monom-dimension  p)))
+         #'(lambda (p q &optional (start 0) (end (r-dimension  p)))
              (declare (type monom p q) (type fixnum start end))
              (multiple-value-bind (primary equal)