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 1732 for branches


Ignore:
Timestamp:
2015-06-15T08:20:49-07:00 (9 years ago)
Author:
Marek Rychlik
Message:

* empty log message *

File:
1 edited

Legend:

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

    r1731 r1732  
    383383         ,@(when new-vars-supplied-p
    384384                 (list `(,new-vars (coerce-maxima-list ,maxima-new-vars)))))
    385      (coerce-to-maxima
     385     (poly->maxima
    386386      ,value-type
    387387      (let ((*ring-and-order* (find-ring-and-order-by-name
    388                                 :ring ,$poly_coefficient_ring
    389                                 :order ,$poly_monomial_order
    390                                 ;; :elimination-order ,$poly_primary_elimination_order
    391                                 :primary-elimination-order ,$poly_secondary_elimination_order
    392                                 :secondary-elimination-order ,$poly_elimination_order)))
     388                               :ring ,$poly_coefficient_ring
     389                               :order ,$poly_monomial_order
     390                               ;; :elimination-order ,$poly_primary_elimination_order
     391                               :primary-elimination-order ,$poly_secondary_elimination_order
     392                               :secondary-elimination-order ,$poly_elimination_order)))
    393393        (let ,(let ((args nil))
    394394                       (dolist (p polynomials args)
     
    398398                       (dolist (p poly-list-lists args)
    399399                         (setf args (cons `(,p (parse-poly-list-list ,p ,vars)) args))))
    400               . ,body))))
    401       ,(if new-vars-supplied-p
    402            `(append ,vars ,new-vars)
    403            vars))))
     400              . ,body)))
     401     ,(if new-vars-supplied-p
     402          `(append ,vars ,new-vars)
     403          vars)))
    404404
    405405
Note: See TracChangeset for help on using the changeset viewer.