Changeset 3461

Timestamp:

2015-09-05T09:48:11-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/5am-monom.lisp

@@ -38 +38 @@
 (ql:quickload :fiveam)
 
-(require :ring "ring")
 (require :monom "monom")
-(require :term "term")
-(require :order "order")
+(require :term "copy")
 
 (defpackage #:5am-monom
@@ -98 +96 @@
     (is (r-equalp (divide-by n m) n/m))))
   
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;        TERM class tests
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(def-fixture term-context ()
-  (symbol-macrolet 
-      ((z (make-instance 'term  :dimension 3 :coeff 5))
-       (m (make-instance 'term  :dimension 3 :exponents '(1 2 3) :coeff 6))
-       (n (make-instance 'term  :dimension 3 :exponents '(4 5 6) :coeff 12))
-       (m*n (make-instance 'term  :dimension 3 :exponents '(5 7 9) :coeff 72))
-       (n/m (make-instance 'term  :dimension 3 :exponents '(3 3 3) :coeff 2))
-       (m-tensor-n (make-instance 'term  :exponents '(1 2 3 4 5 6) :coeff 72))
-       (m-uminus (make-instance 'term  :dimension 3 :exponents '(1 2 3) :coeff -6)))
-    (&body)))
-
-(test term-basics
-  "Term basics"
-  (with-fixture term-context () 
-    (is (= (r-dimension m) 3))
-    (is (= (r-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))
-    (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))
-    (signals
-        (error "Index out of bounds")
-      (r-depends-p m 3))
-    )
-  (with-fixture term-context ()
-    (is (r-equalp (multiply-by m n) m*n)))
-  (with-fixture term-context ()
-    (is (r-equalp (divide-by n m) n/m)))
-  (with-fixture term-context ()
-    (is (r-equalp (unary-minus m) m-uminus))))
-
-
-(def-fixture monom/term-conversion-context ()
-  (symbol-macrolet 
-      ((term (make-instance 'term :exponents '(1 2 3) :coeff 4))
-       (monom (make-instance 'monom :exponents '(1 2 3)))
-       (promoted-monom  (make-instance 'term :exponents '(1 2 3) :coeff 1)))
-    (&body)))
-
-(test monom/term-conversion
-  "Monom/term conversion"
-  (with-fixture monom/term-conversion-context ()
-    (is (r-equalp (change-class term 'monom) monom)))
-  (with-fixture monom/term-conversion-context ()
-    (is (r-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)))
-  )
-
-(test term-tensor-product
-  "Term tensor product"
-  (let ((term1 (make-instance 'term :exponents '(1 2 3) :coeff 4))
-        (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))))
-
-(test term-contract
-  "Term contract"
-  (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))))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;        Order generics (LEX>, GRLEX>,...) tests
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-
-(def-fixture order-context ()
-  (symbol-macrolet 
-      ((p (make-instance 'monom :exponents '(1 3 2)))
-       (q (make-instance 'monom :exponents '(1 2 3))))
-    (&body)))
-
-(test order
-  "order"
-  (with-fixture order-context ()
-    (is-true (lex>  p q)) 
-    (is-true (grlex>  p q)) 
-    (is-true (revlex>  p q)) 
-    (is-true (grevlex>  p q)) 
-    (is-false (invlex>  p q))))
-
-(def-fixture elim-order-context ()
-  (let* ((p (make-instance 'monom :exponents '(1 2 3)))
-         (q (make-instance 'monom :exponents '(4 5 6)))
-         (elim-order-factory (make-elimination-order-factory))
-         (elim-order-1 (funcall elim-order-factory 1))
-         (elim-order-2 (funcall elim-order-factory 2)))
-    (&body)))
-
-
-(test elim-order
-  "Elimination order"
-  (with-fixture elim-order-context ()
-    (is-false (funcall elim-order-1 p q))
-    (is-false (funcall elim-order-2 p q))))
-
 (run! 'monom-suite)
 (format t "All tests done!~%")