Changeset 4312 for branches/f4grobner/5am-division.lisp

Timestamp:

2016-06-04T22:56:30-07:00 (8 years ago)

Author:

Marek Rychlik

Message:

Added ring classes

File:

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

branches/f4grobner/5am-division.lisp

@@ -44 +44 @@
   (require :utils "utils")
   (require :copy "copy")
+  (require :ring "ring")
+  (require :integer-ring "integer-ring")
   (require :monom "monom")
   (require :polynomial "polynomial")
@@ -51 +53 @@
 
 (defpackage #:5am-division
-  (:use :cl :it.bese.fiveam :monom :polynomial :infix :symbolic-polynomial :division))
+  (:use :cl :it.bese.fiveam :monom :polynomial :infix :symbolic-polynomial :division :integer-ring))
 
 (in-package :5am-division)
@@ -73 +75 @@
          (y-sq (string->poly "y^2" '(x y)))
          (fl (cdr (string->poly "[x+y,x-2*y]" '(x y))))
-         (quotients (cdr (string->poly "[x-y,0]" '(x y)))))
+         (quotients (cdr (string->poly "[x-y,0]" '(x y))))
+         (one (make-instance 'integer-ring :value 1)))
     (&body)))
 
@@ -79 +82 @@
   "Normal form"
   (with-fixture division-context ()
-    (is (universal-equalp (multiple-value-list (normal-form f fl)) (list y-sq 1 2)))
-    (is (universal-equalp (multiple-value-list (poly-pseudo-divide f fl))
-                          (list quotients y-sq 1 2)))
-    (is-false (buchberger-criterion fl))))
+    (is (universal-equalp (multiple-value-list (normal-form f fl)) (list y-sq one 2)))
+    (is (universal-equalp (multiple-value-list (poly-pseudo-divide f fl)) (list quotients y-sq one 2)))
+    (is-false (buchberger-criterion fl))
+    )
+  )
 
 (test normal-form-easy