Changeset 1696 for branches

Timestamp:

2015-06-14T21:40:59-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

@@ -219 +219 @@
          (coerce-coeff (ro-ring ring-and-order) expr vars)))))))
 
-(defun maxima->polyl (expr vars 
-                      &optional
-                        (ring (find-ring-by-name $poly_coefficient_ring))
-                        (order (find-order-by-name $poly_monomial_order))
-                        (primary-elimination-order (find-order-by-name $poly_primary_elimination_order))
-                        (secondary-elimination-order (find-order-by-name $poly_secondary_elimination_order)))
+(defun maxima->poly-list (expr vars 
+                          &optional
+                            (ring (find-ring-by-name $poly_coefficient_ring))
+                            (order (find-order-by-name $poly_monomial_order))
+                            (primary-elimination-order (find-order-by-name $poly_primary_elimination_order))
+                            (secondary-elimination-order (find-order-by-name $poly_secondary_elimination_order)))
   "Convert a Maxima representation of a list of polynomials to the internal form."
   (case (caar expr)
@@ -236 +236 @@
                        expr vars))))
 
-(defun maxima->polyll (poly-list-list vars)
+(defun maxima->poly-list-list (poly-list-list vars
+                          &optional
+                            (ring (find-ring-by-name $poly_coefficient_ring))
+                            (order (find-order-by-name $poly_monomial_order))
+                            (primary-elimination-order (find-order-by-name $poly_primary_elimination_order))
+                            (secondary-elimination-order (find-order-by-name $poly_secondary_elimination_order)))
   "Parse a Maxima representation of a list of lists of polynomials."
-  (mapcar #'(lambda (g) (parse-poly-list g vars)) (coerce-maxima-list poly-list-list)))
+  (mapcar #'(lambda (g) (parse-poly-list g vars ring-order primary-elimination-order secondary-elimination-order))
+          (coerce-maxima-list poly-list-list)))