Changeset 1673 for branches/f4grobner

Timestamp:

2015-06-14T20:57:36-07:00 (10 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/mx-grobner.lisp

@@ -162 +162 @@
 (defun maxima->poly (expr vars 
                      &optional
-                       (ring $poly_coefficient_ring)
-                       (order $poly_monomial_order)
-                       (primary-elimination-order $poly_primary_elimination_order)
-                       (secondary-elimination-order $poly_secondary_elimination_order)
+                       (ring-name $poly_coefficient_ring)
+                       (order-name $poly_monomial_order)
+                       (primary-elimination-order-name $poly_primary_elimination_order)
+                       (secondary-elimination-order-name $poly_secondary_elimination_order)
                      &aux 
                        (vars (coerce-maxima-list vars))
                        (ring-and-order (make-ring-and-order 
-                                        :ring (find-ring)
-                                        :order (find-order)
-                                        :primary-elimination-order primary-elimination-order
-                                        :secondary-elimination-order secondary-elimination-order)))
+                                        :ring  (find-ring ring-name)
+                                        :order (find-order order-name)
+                                        :primary-elimination-order (find-order primary-elimination-order-name)
+                                        :secondary-elimination-order (find-order secondary-elimination-order-name)))
+                       (ring (ro-ring ring-and-order)))
   "Convert a maxima polynomial expression EXPR in variables VARS to internal form."
   (labels ((parse (arg) (maxima->poly arg vars ring order primary-elimination-order secondary-elimination-order))
@@ -209 +210 @@
         (mpois (parse ($outofpois expr)))
         (otherwise
-         (coerce-coeff ring expr vars)))))))
+         (coerce-coeff (ro-ring ring-and-order) expr vars)))))))
 
 #|