Changeset 1724 for branches

Timestamp:

2015-06-15T08:03:11-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/mx-grobner.lisp (modified) (3 diffs)

branches/f4grobner/mx-grobner.lisp

@@ -163 +163 @@
                                       (ring (find-ring-by-name $poly_coefficient_ring))
                                       (order (find-order-by-name $poly_monomial_order))
+                                      (elimination-order (find-order-by-name $poly_elimination_order))
                                       (primary-elimination-order (find-order-by-name $poly_primary_elimination_order))
                                       (secondary-elimination-order (find-order-by-name $poly_secondary_elimination_order))
@@ -383 +384 @@
      (coerce-to-maxima
       ,value-type
-      (with-coefficient-ring ($poly_coefficient_ring)
-        (with-monomial-order ($poly_monomial_order)
-          (with-elimination-orders ($poly_primary_elimination_order
-                                    $poly_secondary_elimination_order
-                                    $poly_elimination_order)
-            (let ,(let ((args nil))
+      (let ((*ring-and-order* ,(find-ring-and-order-by-name
+                                :ring ,$poly_coefficient_ring
+                                :order ,$poly_monomial_order
+                                :elimination-order ,$poly_primary_elimination_order
+                                :primary-elimination-order ,$poly_secondary_elimination_order
+                                :secondary-elimination-order ,$poly_elimination_order)))
+        (let ,(let ((args nil))
                        (dolist (p polynomials args)
                          (setf args (cons `(,p (parse-poly ,p ,vars)) args)))
@@ -410 +412 @@
                             :value-type :polynomial)
                            p))
+
+#|
 
 (defmfun $poly_expt (p n vars)