Changeset 4201 for branches

Timestamp:

2016-06-04T09:52:57-07:00 (8 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/5am-buchberger.lisp (modified) (4 diffs)

branches/f4grobner/5am-buchberger.lisp

@@ -54 +54 @@
 
 (defpackage #:5am-buchberger
-  (:use :cl :it.bese.fiveam :monom :polynomial :infix :symbolic-polynomial :division :priority-queue :buchberger))
+  (:use :cl :it.bese.fiveam :monom :polynomial :infix :symbolic-polynomial :division :priority-queue :buchberger :grobner-debug))
 
 (in-package :5am-buchberger)
@@ -63 +63 @@
 (in-suite buchberger-suite)
 
+#+nil
+(setf $poly_grobner_debug t
+      $poly_top_reduction_only nil)
+
+(def-fixture buchberger-context ()
+  (let ((fl (cdr (string->poly "[x+y,x-2*y]" '(x y))))
+        (gb (cdr (string->poly "[x+y,x-2*y,y]" '(x y)))))
+    (&body)))
+
 
 (test buchberger
   "Buchberger algorithm"
-  (let* ((fl (cdr (string->poly "[x+y,x-2*y]" '(x y))))
-         (gb (cdr (string->poly "[x+y,x-2*y,y]" '(x y)))))
+  (with-fixture buchberger-context ()
     (is-true (grobner-test gb fl))
     (is (every #'universal-equalp (buchberger fl) gb))
@@ -75 +83 @@
 
 ;; poly_grobner([x-3*u-3*u*v^2+u^3,y-3*v-3*u^2*v+v^3,z-3*u^2+3*v^2],[u,v,x,y,z]);
-(test buchberger-advanced 
-  "Buchberger algorithm - advanced case"
+(def-fixture buchberger-advanced-context ()
   (let ((fl (cdr (string->poly "[x-3*u-3*u*v^2+u^3,y-3*v-3*u^2*v+v^3,z-3*u^2+3*v^2]" '(u v x y z))))
         (gb (cdr (string->poly "[x-3*u*v^2+u^3-3*u,y+v^3-3*u^2*v-3*v,z+3*v^2-3*u^2,
@@ -108 +115 @@
              +118098*y^4*z^2-118098*x^4*z^2+59049*y^4*z-118098*x^2*y^2*z
              +59049*x^4*z+19683*y^6-59049*x^2*y^4+59049*x^4*y^2-19683*x^6]" '(u v x y z)))))
+    (&body)))
+    
+(test buchberger-advanced
+  "Buchberger algorithm - advanced case"
+  (with-fixture buchberger-advanced-context ()
     (is-true (grobner-test gb fl))
     ;;(is (every #'universal-equalp (buchberger fl) gb))
     ;;(is (every #'universal-equalp (parallel-buchberger fl) gb))
     ))
-    
+