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 1673 for branches/f4grobner


Ignore:
Timestamp:
2015-06-14T20:57:36-07:00 (9 years ago)
Author:
Marek Rychlik
Message:

* empty log message *

File:
1 edited

Legend:

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

    r1672 r1673  
    162162(defun maxima->poly (expr vars
    163163                     &optional
    164                        (ring $poly_coefficient_ring)
    165                        (order $poly_monomial_order)
    166                        (primary-elimination-order $poly_primary_elimination_order)
    167                        (secondary-elimination-order $poly_secondary_elimination_order)
     164                       (ring-name $poly_coefficient_ring)
     165                       (order-name $poly_monomial_order)
     166                       (primary-elimination-order-name $poly_primary_elimination_order)
     167                       (secondary-elimination-order-name $poly_secondary_elimination_order)
    168168                     &aux
    169169                       (vars (coerce-maxima-list vars))
    170170                       (ring-and-order (make-ring-and-order
    171                                         :ring (find-ring)
    172                                         :order (find-order)
    173                                         :primary-elimination-order primary-elimination-order
    174                                         :secondary-elimination-order secondary-elimination-order)))
     171                                        :ring  (find-ring ring-name)
     172                                        :order (find-order order-name)
     173                                        :primary-elimination-order (find-order primary-elimination-order-name)
     174                                        :secondary-elimination-order (find-order secondary-elimination-order-name)))
     175                       (ring (ro-ring ring-and-order)))
    175176  "Convert a maxima polynomial expression EXPR in variables VARS to internal form."
    176177  (labels ((parse (arg) (maxima->poly arg vars ring order primary-elimination-order secondary-elimination-order))
     
    209210        (mpois (parse ($outofpois expr)))
    210211        (otherwise
    211          (coerce-coeff ring expr vars)))))))
     212         (coerce-coeff (ro-ring ring-and-order) expr vars)))))))
    212213
    213214#|
Note: See TracChangeset for help on using the changeset viewer.