close Warning: Can't synchronize with repository "(default)" (The repository directory has changed, you should resynchronize the repository with: trac-admin $ENV repository resync '(default)'). Look in the Trac log for more information.

Changeset 1696 for branches


Ignore:
Timestamp:
2015-06-14T21:40:59-07:00 (9 years ago)
Author:
Marek Rychlik
Message:

* empty log message *

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/f4grobner/mx-grobner.lisp

    r1695 r1696  
    219219         (coerce-coeff (ro-ring ring-and-order) expr vars)))))))
    220220
    221 (defun maxima->polyl (expr vars
    222                       &optional
    223                         (ring (find-ring-by-name $poly_coefficient_ring))
    224                         (order (find-order-by-name $poly_monomial_order))
    225                         (primary-elimination-order (find-order-by-name $poly_primary_elimination_order))
    226                         (secondary-elimination-order (find-order-by-name $poly_secondary_elimination_order)))
     221(defun maxima->poly-list (expr vars
     222                          &optional
     223                            (ring (find-ring-by-name $poly_coefficient_ring))
     224                            (order (find-order-by-name $poly_monomial_order))
     225                            (primary-elimination-order (find-order-by-name $poly_primary_elimination_order))
     226                            (secondary-elimination-order (find-order-by-name $poly_secondary_elimination_order)))
    227227  "Convert a Maxima representation of a list of polynomials to the internal form."
    228228  (case (caar expr)
     
    236236                       expr vars))))
    237237
    238 (defun maxima->polyll (poly-list-list vars)
     238(defun maxima->poly-list-list (poly-list-list vars
     239                          &optional
     240                            (ring (find-ring-by-name $poly_coefficient_ring))
     241                            (order (find-order-by-name $poly_monomial_order))
     242                            (primary-elimination-order (find-order-by-name $poly_primary_elimination_order))
     243                            (secondary-elimination-order (find-order-by-name $poly_secondary_elimination_order)))
    239244  "Parse a Maxima representation of a list of lists of polynomials."
    240   (mapcar #'(lambda (g) (parse-poly-list g vars)) (coerce-maxima-list poly-list-list)))
     245  (mapcar #'(lambda (g) (parse-poly-list g vars ring-order primary-elimination-order secondary-elimination-order))
     246          (coerce-maxima-list poly-list-list)))
    241247
    242248
Note: See TracChangeset for help on using the changeset viewer.