close Warning: Can't synchronize with repository "(default)" (The repository directory has changed, you should resynchronize the repository with: trac-admin $ENV repository resync '(default)'). Look in the Trac log for more information.

Changeset 902


Ignore:
Timestamp:
2015-06-09T13:44:19-07:00 (9 years ago)
Author:
Marek Rychlik
Message:

* empty log message *

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/f4grobner/ideal.lisp

    r822 r902  
    6666                     plist))))
    6767
    68 (defun elimination-ideal (ring flist k
    69                           &optional (top-reduction-only $poly_top_reduction_only) (start 0)
    70                           &aux (*monomial-order*
    71                                 (or *elimination-order*
    72                                     (elimination-order k))))
    73   (ring-intersection (reduced-grobner ring flist start top-reduction-only) k))
     68(defun elimination-ideal (ring-and-order flist k &optional (top-reduction-only $poly_top_reduction_only) (start 0))
     69  (ring-intersection (reduced-grobner ring-and-order flist start top-reduction-only) k))
    7470
    7571(defun colon-ideal (ring f g &optional (top-reduction-only $poly_top_reduction_only))
    … …  
    10197
    10298
    103 (defun ideal-intersection (ring f g &optional (top-reduction-only $poly_top_reduction_only)
    104                            &aux (*monomial-order* (or *elimination-order*
    105                                                       #'elimination-order-1)))
     99(defun ideal-intersection (ring-and-order f g &optional (top-reduction-only $poly_top_reduction_only))
    106100  (mapcar #'poly-contract
    107101          (ring-intersection
    108102           (reduced-grobner
    109             ring
     103            ring-and-order
    110104            (append (mapcar #'(lambda (p) (poly-extend p (make-monom 1 :initial-exponent 1))) f)
    111105                    (mapcar #'(lambda (p)
    112                                 (poly-append (poly-extend (poly-uminus ring p)
     106                                (poly-append (poly-extend (poly-uminus ring-and-order p)
    113107                                                          (make-monom 1 :initial-exponent 1))
    114108                                             (poly-extend p)))
    … …  
    157151
    158152;; Calculate F : p^inf
    159 (defun ideal-saturation-1 (ring f p start &optional (top-reduction-only $poly_top_reduction_only)
    160                            &aux (*monomial-order* (or *elimination-order*
    161                                                       #'elimination-order-1)))
     153(defun ideal-saturation-1 (ring-and-order f p start &optional (top-reduction-only $poly_top_reduction_only))
    162154  "Returns the reduced Grobner basis of the saturation of the ideal
    163155generated by a polynomial list F in the ideal generated by a single
    … …  
    171163   (ring-intersection
    172164    (reduced-grobner
    173      ring
    174      (saturation-extension-1 ring f p)
     165     ring-and-order
     166     (saturation-extension-1 ring-and-order f p)
    175167     start top-reduction-only)
    176168    1)))
Note: See TracChangeset for help on using the changeset viewer.