Changeset 1736 for branches/f4grobner/mx-grobner.lisp

Timestamp:

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

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/mx-grobner.lisp

@@ -388 +388 @@
      (poly->maxima
       ,value-type
-      (let ((,ring-and-order `(find-ring-and-order-by-name
-                               :ring ,$poly_coefficient_ring
-                               :order ,$poly_monomial_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)))
+                               :primary-elimination-order $poly_secondary_elimination_order
+                               :secondary-elimination-order $poly_elimination_order)))
         (let ,(let ((args nil))
                    (dolist (p polynomials args)
@@ -401 +401 @@
                    (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)
-          vars)))
+          . ,body))
+      ,(if new-vars-supplied-p
+           `(append ,vars ,new-vars)
+           vars))))