Changeset 3598

Timestamp:

2015-09-05T18:32:35-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/5am-monom.lisp

@@ -148 +148 @@
   "Term basics"
   (with-fixture term-context () 
-    (is (= (r-dimension m) 3))
-    (is (= (r-elt m 2) 3))
+    (is (= (monom-dimension m) 3))
+    (is (= (monom-elt m 2) 3))
     (is (= (r-total-degree m) 6))
     (is (= (r-sugar m) 6))
-    (is (equalp  (r->list z) '(0 0 0)) "Trivial term is a vector of 0's")
-    (is (r-equalp (r* m n) m*n))
-    (is (r-equalp (r/ n m) n/m))
-    (is (r-equalp (right-tensor-product-by m n) m-tensor-n))
+    (is (equalp  (monom->list z) '(0 0 0)) "Trivial term is a vector of 0's")
+    (is (universal-equalp (multiply m n) m*n))
+    (is (universal-equalp (divide 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 'term  :dimension 3 :exponents '(1 2 3 4 5 6) :coeff 77))
-    (is-true (r-divides-p m n))
-    (is-false (r-divides-p n m))
-    (is (r-equalp (r-gcd m n) m))
-    (is (r-equalp (r-lcm m n) n))
-    (is-true (r-depends-p m 0))
+    (is-true (divides-p m n))
+    (is-false (divides-p n m))
+    (is (r-equalp (universal-gcd m n) m))
+    (is (r-equalp (universal-lcm m n) n))
+    (is-true (depends-p m 0))
     (signals
         (error "Index out of bounds")
-      (r-depends-p m 3))
+      (depends-p m 3))
     )
   (with-fixture term-context ()
-    (is (r-equalp (multiply-by m n) m*n)))
+    (is (universal-equalp (multiply-by m n) m*n)))
   (with-fixture term-context ()
-    (is (r-equalp (divide-by n m) n/m)))
+    (is (universal-equalp (divide-by n m) n/m)))
   (with-fixture term-context ()
-    (is (r-equalp (unary-minus m) m-uminus))))
+    (is (universal-equalp (unary-minus m) m-uminus))))
 
 
@@ -186 +186 @@
   "Monom/term conversion"
   (with-fixture monom/term-conversion-context ()
-    (is (r-equalp (change-class term 'monom) monom)))
+    (is (universal-equalp (change-class term 'monom) monom)))
   (with-fixture monom/term-conversion-context ()
-    (is (r-equalp (change-class monom 'term) promoted-monom))))
+    (is (universal-equalp (change-class monom 'term) promoted-monom))))
 
 (test monom/term-copy
   "Monom/term copy"
   (with-fixture monom/term-conversion-context ()
-    (is (r-equalp (copy-instance monom) monom))
-    (is (r-equalp (copy-instance term) term)))
+    (is (universal-equalp (copy-instance monom) monom))
+    (is (universal-equalp (copy-instance term) term)))
   )
 
@@ -202 +202 @@
         (term2 (make-instance 'term :exponents '(4 5) :coeff 3))
         (term1-left-tensor-by-term2 (make-instance 'term :exponents '(4 5 1 2 3) :coeff 12)))
-    (is (r-equalp (left-tensor-product-by term1 term2) term1-left-tensor-by-term2))))
+    (is (universal-equalp (left-tensor-product-by term1 term2) term1-left-tensor-by-term2))))
 
 (test term-contract
@@ -208 +208 @@
   (let ((term (make-instance 'term :exponents '(1 2 3) :coeff 4))
         (term-contracted (make-instance 'term :exponents '(2 3) :coeff 4)))
-    (is (r-equalp (left-contract term 1) term-contracted))))
+    (is (universal-equalp (left-contract term 1) term-contracted))))