Changeset 1734 for branches

Timestamp:

2015-06-15T08:23:57-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

@@ -377 +377 @@
                                 (poly-list-lists nil)
                                 (value-type nil))
-                               &body body
-                               &aux (vars (gensym))
-                                 (new-vars (gensym)))
+                               &body
+                                 body
+                               &aux 
+                                 (vars (gensym))
+                                 (new-vars (gensym))
+                                 (ring-and-order (gensym)))
   `(let ((,vars (coerce-maxima-list ,maxima-vars))
          ,@(when new-vars-supplied-p
@@ -385 +388 @@
      (poly->maxima
       ,value-type
-      (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 ((,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)))
-                       (dolist (p poly-lists args)
-                         (setf args (cons `(,p (parse-poly-list ,p ,vars)) args)))
-                       (dolist (p poly-list-lists args)
-                         (setf args (cons `(,p (parse-poly-list-list ,p ,vars)) args))))
-              . ,body)))
+                   (dolist (p polynomials args)
+                     (setf args (cons `(,p (maxima->poly ,p ,vars ,ring-and-order)) args)))
+                   (dolist (p poly-lists args)
+                     (setf args (cons `(,p (maxima->poly-list ,p ,vars ,ring-and-order)) args)))
+                   (dolist (p poly-list-lists args)
+                     (setf args (cons `(,p (maxima->poly-list-list ,p ,vars ,ring-and-order)) args))))
+          . ,body)))
      ,(if new-vars-supplied-p
           `(append ,vars ,new-vars)