Changeset 1674 for branches

Timestamp:

2015-06-14T20:59:52-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/mx-grobner.lisp

@@ -125 +125 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defun find-ring (ring)
+(defun find-ring-by-name (ring)
   "This function returns the ring structure bases on input symbol."
   (cond
@@ -140 +140 @@
     nil)))
 
-(defun find-order (order)
+(defun find-order-by-name (order)
   "This function returns the order function bases on its name."
   (cond
@@ -162 +162 @@
 (defun maxima->poly (expr vars 
                      &optional
-                       (ring-name $poly_coefficient_ring)
-                       (order-name $poly_monomial_order)
-                       (primary-elimination-order-name $poly_primary_elimination_order)
-                       (secondary-elimination-order-name $poly_secondary_elimination_order)
+                       (ring (find-ring-by-name $poly_coefficient_ring))
+                       (order (find-order-by-name $poly_monomial_order))
+                       (primary-elimination-order-name (find-order-by-name $poly_primary_elimination_order))
+                       (secondary-elimination-order-name (find-order-by-name $poly_secondary_elimination_order))
                      &aux 
                        (vars (coerce-maxima-list vars))
                        (ring-and-order (make-ring-and-order 
-                                        :ring  (find-ring ring-name)
-                                        :order (find-order order-name)
-                                        :primary-elimination-order (find-order primary-elimination-order-name)
-                                        :secondary-elimination-order (find-order secondary-elimination-order-name)))
+                                        :ring  ring
+                                        :order order
+                                        :primary-elimination-order primary-elimination-order-name
+                                        :secondary-elimination-order secondary-elimination-order-name))
                        (ring (ro-ring ring-and-order)))
   "Convert a maxima polynomial expression EXPR in variables VARS to internal form."