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 1769 for branches


Ignore:
Timestamp:
2015-06-15T10:04:45-07:00 (10 years ago)
Author:
Marek Rychlik
Message:

* empty log message *

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/f4grobner/mx-grobner.lisp

    r1768 r1769  
    456456    (poly-exact-divide ring-and-order f g)))
    457457
    458 #|
    459458(defmfun $poly_normal_form (f fl vars)
    460   (with-parsed-polynomials ((vars) :polynomials (f)
     459  (with-ring-and-order ((vars) :polynomials (f)
    461460                                   :poly-lists (fl)
    462461                                   :value-type :polynomial)
    463     (normal-form +maxima-ring+ f (remzero fl) nil)))
     462    (normal-form ring-and-order f (remzero fl) nil)))
    464463
    465464(defmfun $poly_buchberger_criterion (g vars)
    466   (with-parsed-polynomials ((vars) :poly-lists (g) :value-type :logical)
    467     (buchberger-criterion +maxima-ring+ g)))
     465  (with-ring-and-order ((vars) :poly-lists (g) :value-type :logical)
     466    (buchberger-criterion ring-and-order g)))
    468467
    469468(defmfun $poly_buchberger (fl vars)
    470   (with-parsed-polynomials ((vars) :poly-lists (fl) :value-type :poly-list)
    471     (buchberger +maxima-ring+  (remzero fl) 0 nil)))
     469  (with-ring-and-order ((vars) :poly-lists (fl) :value-type :poly-list)
     470    (buchberger ring-and-order  (remzero fl) 0 nil)))
    472471
    473472(defmfun $poly_reduction (plist vars)
    474   (with-parsed-polynomials ((vars) :poly-lists (plist)
    475                                    :value-type :poly-list)
    476     (reduction +maxima-ring+ plist)))
     473  (with-ring-and-order ((vars) :poly-lists (plist)
     474                                   :value-type :poly-list)
     475    (reduction ring-and-order plist)))
    477476
    478477(defmfun $poly_minimization (plist vars)
    479   (with-parsed-polynomials ((vars) :poly-lists (plist)
     478  (with-ring-and-order ((vars) :poly-lists (plist)
    480479                                   :value-type :poly-list)
    481480    (minimization plist)))
    482481
    483482(defmfun $poly_normalize_list (plist vars)
    484   (with-parsed-polynomials ((vars) :poly-lists (plist)
    485                                    :value-type :poly-list)
    486     (poly-normalize-list +maxima-ring+ plist)))
     483  (with-ring-and-order ((vars) :poly-lists (plist)
     484                                   :value-type :poly-list)
     485    (poly-normalize-list ring-and-order plist)))
    487486
    488487(defmfun $poly_grobner (f vars)
    489   (with-parsed-polynomials ((vars) :poly-lists (f)
    490                                    :value-type :poly-list)
    491     (grobner +maxima-ring+ (remzero f))))
     488  (with-ring-and-order ((vars) :poly-lists (f)
     489                                   :value-type :poly-list)
     490    (grobner ring-and-order (remzero f))))
    492491
    493492(defmfun $poly_reduced_grobner (f vars)
    494   (with-parsed-polynomials ((vars) :poly-lists (f)
    495                                    :value-type :poly-list)
    496     (reduced-grobner +maxima-ring+ (remzero f))))
     493  (with-ring-and-order ((vars) :poly-lists (f)
     494                                   :value-type :poly-list)
     495    (reduced-grobner ring-and-order (remzero f))))
    497496
    498497(defmfun $poly_depends_p (p var mvars
     
    504503
    505504(defmfun $poly_elimination_ideal (flist k vars)
    506   (with-parsed-polynomials ((vars) :poly-lists (flist)
    507                                    :value-type :poly-list)
    508     (elimination-ideal +maxima-ring+ flist k nil 0)))
     505  (with-ring-and-order ((vars) :poly-lists (flist)
     506                                   :value-type :poly-list)
     507    (elimination-ideal ring-and-order flist k nil 0)))
    509508
    510509(defmfun $poly_colon_ideal (f g vars)
    511   (with-parsed-polynomials ((vars) :poly-lists (f g) :value-type :poly-list)
    512     (colon-ideal +maxima-ring+ f g nil)))
     510  (with-ring-and-order ((vars) :poly-lists (f g) :value-type :poly-list)
     511    (colon-ideal ring-and-order f g nil)))
    513512
    514513(defmfun $poly_ideal_intersection (f g vars)
    515   (with-parsed-polynomials ((vars) :poly-lists (f g) :value-type :poly-list) 
    516     (ideal-intersection +maxima-ring+ f g nil)))
     514  (with-ring-and-order ((vars) :poly-lists (f g) :value-type :poly-list) 
     515    (ideal-intersection ring-and-order f g nil)))
    517516
    518517(defmfun $poly_lcm (f g vars)
    519   (with-parsed-polynomials ((vars) :polynomials (f g) :value-type :polynomial)
    520     (poly-lcm +maxima-ring+ f g)))
     518  (with-ring-and-order ((vars) :polynomials (f g) :value-type :polynomial)
     519    (poly-lcm ring-and-order f g)))
    521520
    522521(defmfun $poly_gcd (f g vars)
     
    524523
    525524(defmfun $poly_grobner_equal (g1 g2 vars)
    526   (with-parsed-polynomials ((vars) :poly-lists (g1 g2))
    527     (grobner-equal +maxima-ring+ g1 g2)))
     525  (with-ring-and-order ((vars) :poly-lists (g1 g2))
     526    (grobner-equal ring-and-order g1 g2)))
    528527
    529528(defmfun $poly_grobner_subsetp (g1 g2 vars)
    530   (with-parsed-polynomials ((vars) :poly-lists (g1 g2))
    531     (grobner-subsetp +maxima-ring+ g1 g2)))
     529  (with-ring-and-order ((vars) :poly-lists (g1 g2))
     530    (grobner-subsetp ring-and-order g1 g2)))
    532531
    533532(defmfun $poly_grobner_member (p g vars)
    534   (with-parsed-polynomials ((vars) :polynomials (p) :poly-lists (g))
    535     (grobner-member +maxima-ring+ p g)))
     533  (with-ring-and-order ((vars) :polynomials (p) :poly-lists (g))
     534    (grobner-member ring-and-order p g)))
    536535
    537536(defmfun $poly_ideal_saturation1 (f p vars)
    538   (with-parsed-polynomials ((vars) :poly-lists (f) :polynomials (p)
    539                                    :value-type :poly-list)
    540     (ideal-saturation-1 +maxima-ring+ f p 0)))
     537  (with-ring-and-order ((vars) :poly-lists (f) :polynomials (p)
     538                                   :value-type :poly-list)
     539    (ideal-saturation-1 ring-and-order f p 0)))
    541540
    542541(defmfun $poly_saturation_extension (f plist vars new-vars)
    543   (with-parsed-polynomials ((vars new-vars)
     542  (with-ring-and-order ((vars new-vars)
    544543                            :poly-lists (f plist)
    545544                            :value-type :poly-list)
    546     (saturation-extension +maxima-ring+ f plist)))
     545    (saturation-extension ring-and-order f plist)))
    547546
    548547(defmfun $poly_polysaturation_extension (f plist vars new-vars)
    549   (with-parsed-polynomials ((vars new-vars)
     548  (with-ring-and-order ((vars new-vars)
    550549                            :poly-lists (f plist)
    551550                            :value-type :poly-list)
    552     (polysaturation-extension +maxima-ring+ f plist)))
     551    (polysaturation-extension ring-and-order f plist)))
    553552
    554553(defmfun $poly_ideal_polysaturation1 (f plist vars)
    555   (with-parsed-polynomials ((vars) :poly-lists (f plist)
    556                                    :value-type :poly-list)
    557     (ideal-polysaturation-1 +maxima-ring+ f plist 0 nil)))
     554  (with-ring-and-order ((vars) :poly-lists (f plist)
     555                                   :value-type :poly-list)
     556    (ideal-polysaturation-1 ring-and-order f plist 0 nil)))
    558557
    559558(defmfun $poly_ideal_saturation (f g vars)
    560   (with-parsed-polynomials ((vars) :poly-lists (f g)
     559  (with-ring-and-order ((vars) :poly-lists (f g)
    561560                                   :value-type  :poly-list)
    562     (ideal-saturation +maxima-ring+ f g 0 nil)))
     561    (ideal-saturation ring-and-order f g 0 nil)))
    563562
    564563(defmfun $poly_ideal_polysaturation (f ideal-list vars)
    565   (with-parsed-polynomials ((vars) :poly-lists (f)
     564  (with-ring-and-order ((vars) :poly-lists (f)
    566565                                   :poly-list-lists (ideal-list)
    567566                                   :value-type :poly-list)
    568     (ideal-polysaturation +maxima-ring+ f ideal-list 0 nil)))
     567    (ideal-polysaturation ring-and-order f ideal-list 0 nil)))
    569568
    570569(defmfun $poly_lt (f vars)
    571   (with-parsed-polynomials ((vars) :polynomials (f) :value-type :polynomial)
     570  (with-ring-and-order ((vars) :polynomials (f) :value-type :polynomial)
    572571    (make-poly-from-termlist (list (poly-lt f)))))
    573572
    574573(defmfun $poly_lm (f vars)
    575   (with-parsed-polynomials ((vars) :polynomials (f) :value-type :polynomial)
    576     (make-poly-from-termlist (list (make-term (poly-lm f) (funcall (ring-unit +maxima-ring+)))))))
    577 
    578 |#
     574  (with-ring-and-order ((vars) :polynomials (f) :value-type :polynomial)
     575    (make-poly-from-termlist (list (make-term (poly-lm f) (funcall (ring-unit ring-and-order)))))))
     576
Note: See TracChangeset for help on using the changeset viewer.