Changeset 1644 for branches

Timestamp:

2015-06-14T20:22:14-07:00 (10 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/mx-grobner.lisp

@@ -125 +125 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(defun find-ring (ring)
+  "This function returns the ring structure bases on input symbol."
+  (cond
+   ((null ring) nil)
+   ((symbolp ring)
+    (case ring
+      ((maxima-ring  :maxima-ring $expression_ring) *maxima-ring*) 
+      ((ring-of-integers :ring-of-integers $ring_of_integers) *ring-of-integers*) 
+      (otherwise
+       (mtell "~%Warning: Ring ~M not found. Using default.~%" ring))))
+   (t
+    (mtell "~%Ring specification ~M is not recognized. Using default.~%" ring)
+    nil)))
+
 (defun find-order (order)
   "This function returns the order function bases on its name."
@@ -142 +156 @@
     nil)))
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; Ring utilities
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defun find-ring (ring)
-  "This function returns the ring structure bases on input symbol."
-  (cond
-   ((null ring) nil)
-   ((symbolp ring)
-    (case ring
-      ((maxima-ring  :maxima-ring $expression_ring) *maxima-ring*) 
-      ((ring-of-integers :ring-of-integers $ring_of_integers) *ring-of-integers*) 
-      (otherwise
-       (mtell "~%Warning: Ring ~M not found. Using default.~%" ring))))
-   (t
-    (mtell "~%Ring specification ~M is not recognized. Using default.~%" ring)
-    nil)))
-
-
-(defun maxima->poly (expr vars &aux (vars (coerce-maxima-list vars)))
+
+(defun maxima->poly (expr vars 
+                     &optional
+                       (ring $poly_coefficient_ring)
+                       (order $poly_monomial_order)
+                     &aux 
+                       (vars (coerce-maxima-list vars))
+                       (ring-and-order (make-ring-and-order (find-ring) (find-order))))
   "Convert a maxima polynomial expression EXPR in variables VARS to internal form."
   (labels ((parse (arg) (maxima->poly arg vars))