Changeset 1498 for branches

Timestamp:

2015-06-12T12:52:51-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/5am-tests.lisp (modified) (2 diffs)

branches/f4grobner/5am-tests.lisp

@@ -359 +359 @@
     (is-true (grobner-equal ring-and-order fl gl))))
 
-;; Calculate [F, U1*P1-1,U2*P2-1,...,UK*PK-1], where PLIST=[P1,P2,...,PK].
+;; Calculates [F, U*P-1]
 (test saturation-extension-1
   "Saturation extension with 1 polynomial"
@@ -366 +366 @@
          (P (string->poly "x^2" '(x y)))
          (ring *ring-of-integers*)
-         (F-sat (append (cdr (string->poly F-str '(u1 x y)))
-                        (cdr (string->poly "[u1*x^2-1]" '(u1 x y))))))
+         (F-sat (append (cdr (string->poly F-str '(u x y)))
+                        (cdr (string->poly "[u*x^2-1]" '(u x y))))))
     (is (every #'poly-equal-no-sugar-p 
                (saturation-extension-1 ring F p)
                F-sat))))
 
+;; Calculates [F, U1*P1-1,U2*P2-1,...,UK*PK-1], where PLIST=[P1,P2,...,PK].
 (test saturation-extension
   "Saturation extension"
   (let* ((F-str "[x^3,x^2*y]")
          (F (cdr (string->poly F-str '(x y))))
-         (P (cdr (string->poly "[x^2]" '(x y))))
+         (P (cdr (string->poly "[x^2,x*y]" '(x y))))
          (ring *ring-of-integers*)
          (F-sat (append (cdr (string->poly F-str '(u1 x y)))
-                        (cdr (string->poly "[u1*x^2-1]" '(u1 x y))))))
+                        (cdr (string->poly "[u1*x^2-1,u2*(x*y)-1]" '(u1 x y))))))
     (is (every #'poly-equal-no-sugar-p 
                (print (polysaturation-extension ring F P))
                F-sat))))
 
-#+nil
 (test ideal-saturation-1
   "Calculate F : p^inf"