Changeset 3593 for branches

Timestamp:

2015-09-05T18:23:34-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/5am-monom.lisp (modified) (1 diff)

branches/f4grobner/5am-monom.lisp

@@ -67 +67 @@
     (is (= (monom-dimension m) 3))
     (is (= (monom-elt m 2) 3))
-    (is (= (monom-total-degree m) 6))
-    (is (= (monom-sugar m) 6))
+    (is (= (total-degree m) 6))
+    (is (= (sugar m) 6))
     (is (equalp  (monom->list (make-instance 'monom  :dimension 3)) '(0 0 0)) "Trivial monomial is a vector of 0's")
-    (is (monom-equalp (monom-multiply-2 m n) m*n))
-    (is (monom-equalp (monom-divide-by n m) n/m))
-    (is (monom-equalp (monom-right-tensor-product-by m n) m-tensor-n))
+    (is (universal-equalp (multiply-2 m n) m*n))
+    (is (universal-equalp (divide-by n m) n/m))
+    (is (universal-equalp (right-tensor-product-by m n) m-tensor-n))
     (signals
         (error "EXPONENTS must have length DIMENSION") 
       (make-instance 'monom  :dimension 3 :exponents '(1 2 3 4 5 6)))
-    (is-true (monom-divides-p m n))
-    (is-false (monom-divides-p n m))
-    (is (monom-equalp (monom-gcd m n) m))
-    (is (monom-equalp (monom-lcm m n) n))
-    (is-true (monom-depends-p m 0))
+    (is-true (divides-p m n))
+    (is-false (divides-p n m))
+    (is (universal-equalp (universal-gcd m n) m))
+    (is (universal-equalp (universal-lcm m n) n))
+    (is-true (depends-p m 0))
     (signals
         (error "Index out of bounds")
-      (monom-depends-p m 3))
+      (depends-p m 3))
     )
   (with-fixture monom-context ()
-    (is (monom-equalp (monom-multiply-by m n) m*n)))
+    (is (universal-equalp (multiply-by m n) m*n)))
   (with-fixture monom-context ()
-    (is (monom-equalp (monom-divide-by n m) n/m)))
+    (is (universal-equalp (divide-by n m) n/m)))
   (with-fixture monom-context () 
     (is (equal (monom->list m) '(1 2 3)))))