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 1665 for branches/f4grobner


Ignore:
Timestamp:
2015-06-14T20:48:05-07:00 (10 years ago)
Author:
Marek Rychlik
Message:

* empty log message *

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/f4grobner/5am-tests.lisp

    r1612 r1665  
    125125         (t2 (make-term m2 9))
    126126         (t3 (make-term m3 (* 7 9))))
    127     (is (equalp (term-mul *ring-of-integers* t1 t2) t3))))
     127    (is (equalp (term-mul +ring-of-integers+ t1 t2) t3))))
    128128
    129129(test termlist
    … …  
    157157  "Conversion to infix form"
    158158  (is (equal
    159        (coerce-to-infix :term (make-term-variable *ring-of-integers* 5 3) '(x y z w u v))
     159       (coerce-to-infix :term (make-term-variable +ring-of-integers+ 5 3) '(x y z w u v))
    160160       '(* 1 (EXPT X 0) (EXPT Y 0) (EXPT Z 0) (EXPT W 1) (EXPT U 0)))))
    161161
    … …  
    237237         (y-sq (string->poly "y^2" '(x y)))
    238238         (fl (cdr (string->poly "[x+y,x-2*y]" '(x y))))
    239          (ring *ring-of-integers*)
     239         (ring +ring-of-integers+)
    240240         (order #'lex>)
    241241         (ring-and-order (make-ring-and-order :ring ring :order order))
    … …  
    248248         (g (string->poly "x+2*y" '(x y)))
    249249         (h (string->poly "x-2*y" '(x y)))
    250          (ring *ring-of-integers*)
     250         (ring +ring-of-integers+)
    251251         (order #'lex>)
    252252         (ring-and-order (make-ring-and-order :ring ring :order order)))
    … …  
    257257  "Buchberger algorithm"
    258258  (let* ((fl (cdr (string->poly "[x+y,x-2*y]" '(x y))))
    259          (ring *ring-of-integers*)
     259         (ring +ring-of-integers+)
    260260         (order #'lex>)
    261261         (ring-and-order (make-ring-and-order :ring ring :order order))
    … …  
    268268  "Gebauer-Moeller algorithm"
    269269  (let* ((fl (cdr (string->poly "[x+y,x-2*y]" '(x y))))
    270          (ring *ring-of-integers*)
     270         (ring +ring-of-integers+)
    271271         (order #'lex>)
    272272         (ring-and-order (make-ring-and-order :ring ring :order order))
    … …  
    278278  "Reduction algorithm"
    279279  (let* ((fl (cdr (string->poly "[x^2,x+y,x-2*y]" '(x y))))
    280          (ring *ring-of-integers*)
     280         (ring +ring-of-integers+)
    281281         (order #'lex>)
    282282         (ring-and-order (make-ring-and-order :ring ring :order order))
    … …  
    296296  (let* (($poly_grobner_algorithm :buchberger)
    297297         (fl (cdr (string->poly "[x+y,x-2*y]" '(x y))))
    298          (ring *ring-of-integers*)
     298         (ring +ring-of-integers+)
    299299         (order #'lex>)
    300300         (ring-and-order (make-ring-and-order :ring ring :order order))
    … …  
    310310  (let* (($poly_grobner_algorithm :buchberger)
    311311         (fl (cdr (string->poly "[x+y,x-2*y]" '(x y))))
    312          (ring *ring-of-integers*)
     312         (ring +ring-of-integers+)
    313313         (order #'lex>)
    314314         (ring-and-order (make-ring-and-order :ring ring :order order))
    … …  
    322322         (I (cdr (string->poly "[x^2*y,x*y^2]" '(x y))))
    323323         (J (cdr (string->poly "[x,y]" '(x y))))
    324          (ring *ring-of-integers*)
     324         (ring +ring-of-integers+)
    325325         (order #'lex>)
    326326         (ring-and-order (make-ring-and-order :ring ring :order order))
    … …  
    333333         (f (string->poly "x^2-y^2" '(x y)))
    334334         (g (string->poly "(x+y)^2" '(x y)))
    335          (ring *ring-of-integers*)
     335         (ring +ring-of-integers+)
    336336         (order #'lex>)
    337337         (ring-and-order (make-ring-and-order :ring ring :order order))
    … …  
    344344         (f (string->poly "y" '(x y)))
    345345         (fl (cdr (string->poly "[x-y,x+y,y]" '(x y))))
    346          (ring *ring-of-integers*)
     346         (ring +ring-of-integers+)
    347347         (order #'lex>)
    348348         (ring-and-order (make-ring-and-order :ring ring :order order)))
    … …  
    355355         (fl (cdr (string->poly "[x,x-y,y]" '(x y))))
    356356         (gl (cdr (string->poly "[x-y,x+2*y,y]" '(x y))))
    357          (ring *ring-of-integers*)
     357         (ring +ring-of-integers+)
    358358         (order #'lex>)
    359359         (ring-and-order (make-ring-and-order :ring ring :order order)))
    … …  
    368368         (F (cdr (string->poly F-str '(x y))))
    369369         (P (string->poly "x^2" '(x y)))
    370          (ring *ring-of-integers*)
     370         (ring +ring-of-integers+)
    371371         (F-sat (append (cdr (string->poly F-str '(u x y)))
    372372                        (cdr (string->poly "[u*x^2-1]" '(u x y))))))
    … …  
    379379         (F (cdr (string->poly F-str '(x y))))
    380380         (P (cdr (string->poly "[x^2,x*y]" '(x y))))
    381          (ring *ring-of-integers*)
     381         (ring +ring-of-integers+)
    382382         (F-sat (append (cdr (string->poly F-str '(u1 u2 x y)))
    383383                        (cdr (string->poly "[u1*(x^2) + u2*(x*y)-1]" '(u1 u2 x y))))))
    … …  
    390390         (F (cdr (string->poly "[x^3*(y+z^2),x^2*(y-z^2)]" '(x y z))))
    391391         (p (string->poly "x" '(x y z)))
    392          (ring *ring-of-integers*)
     392         (ring +ring-of-integers+)
    393393         (order #'lex>)
    394394         (ring-and-order (make-ring-and-order :ring ring :order order))
    … …  
    402402         (F (cdr (string->poly "[x^3*z*y,x*z*y^2]" '(x y z))))
    403403         (P (cdr (string->poly "[x,z]" '(x y z))))
    404          (ring *ring-of-integers*)
     404         (ring +ring-of-integers+)
    405405         (order #'lex>)
    406406         (ring-and-order (make-ring-and-order :ring ring :order order))
    … …  
    414414         (F (cdr (string->poly "[x^3*(y+z^2),x^2*(y-z^2)]" '(x y z))))
    415415         (P (cdr (string->poly "[x]" '(x y z))))
    416          (ring *ring-of-integers*)
     416         (ring +ring-of-integers+)
    417417         (order #'lex>)
    418418         (ring-and-order (make-ring-and-order :ring ring :order order))
    … …  
    427427         (P1 (cdr (string->poly "[x]" '(x y z))))
    428428         (P2 (cdr (string->poly "[z]" '(x y z))))
    429          (ring *ring-of-integers*)
     429         (ring +ring-of-integers+)
    430430         (order #'lex>)
    431431         (ring-and-order (make-ring-and-order :ring ring :order order))
Note: See TracChangeset for help on using the changeset viewer.