Changeset 903 for branches/f4grobner

Timestamp:

2015-06-09T13:45:28-07:00 (10 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/ideal.lisp (modified) (3 diffs)

branches/f4grobner/ideal.lisp

@@ -181 +181 @@
         (ideal-polysaturation-1 ring g (rest plist) (length g) top-reduction-only)))))
 
-(defun ideal-saturation (ring f g start &optional (top-reduction-only $poly_top_reduction_only)
+(defun ideal-saturation (ring-and-order f g start &optional (top-reduction-only $poly_top_reduction_only)
                          &aux
-                         (k (length g))
-                         (*monomial-order* (or *elimination-order*
-                                               (elimination-order k))))
+                         (k (length g)))
   "Returns the reduced Grobner basis of the saturation of the ideal
 generated by a polynomial list F in the ideal generated a polynomial
@@ -197 +195 @@
    #'(lambda (q) (poly-contract q k))
    (ring-intersection
-    (reduced-grobner ring
-                     (polysaturation-extension ring f g)
+    (reduced-grobner ring-and-order
+                     (polysaturation-extension ring-and-order f g)
                      start
                      top-reduction-only)
     k)))
 
-(defun ideal-polysaturation (ring f ideal-list start &optional (top-reduction-only $poly_top_reduction_only))
+(defun ideal-polysaturation (ring-and-order f ideal-list start &optional (top-reduction-only $poly_top_reduction_only))
     "Returns the reduced Grobner basis of the ideal obtained by a
 successive applications of IDEAL-SATURATION to F and lists of
@@ -209 +207 @@
   (cond
    ((endp ideal-list) f)
-   (t (let ((h (ideal-saturation ring f (car ideal-list) start top-reduction-only)))
-        (ideal-polysaturation ring h (rest ideal-list) (length h) top-reduction-only)))))
+   (t (let ((h (ideal-saturation ring-and-order f (car ideal-list) start top-reduction-only)))
+        (ideal-polysaturation ring-and-order h (rest ideal-list) (length h) top-reduction-only)))))