Changeset 960 for branches/f4grobner/ring-and-order.lisp

Timestamp:

2015-06-09T19:48:51-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/ring-and-order.lisp (modified) (1 diff)

branches/f4grobner/ring-and-order.lisp

@@ -34 +34 @@
              (:constructor make-ring-and-order 
                            (&key 
-                            ring
-                            order
-                            (primary-elimination-order   nil primary-elimination-order-supplied-p)
-                            (secondary_elimination_order nil secondary_elimination_order-supplied-p)
+                            (ring *ring-of-integers*)
+                            (order #'lex>)
+                            (primary-elimination-order   order)
+                            (secondary_elimination_order order)
                             (elimination-order-factory
-                             (cond 
-                               ((and primary-elimination-order-supplied-p
-                                     secondary_elimination_order-supplied-p)
-                                (make-elimination-order-factory primary-elimination-order
-                                                                secondary_elimination_order))
-                               (t 
-                                (error "Primary and secondary elimination order must be supplied.")))))))
+                             (make-elimination-order-factory primary-elimination-order)))))
   (ring  *ring-of-integers* :type ring)
   (order #'lex> :type function)