Changeset 4346

Timestamp:

2016-06-06T13:26:28-07:00 (8 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/symbolic-polynomial.lisp (modified) (4 diffs)

branches/f4grobner/symbolic-polynomial.lisp

@@ -21 +21 @@
 
 (defpackage "SYMBOLIC-POLYNOMIAL"
-  (:use :cl :utils :monom :polynomial :infix :infix-printer)
+  (:use :cl :utils :monom :polynomial :infix :infix-printer :ring)
   (:export "SYMBOLIC-POLY" "READ-INFIX-FORM" "STRING->POLY" "POLY->STRING" "->INFIX")
   (:documentation "Implements symbolic polynomials. A symbolic
@@ -105 +105 @@
 (defun read-poly (vars &key
                          (stream t) 
-                         (order #'lex>))
+                         (order #'lex>)
+                         (coefficient-class 'rational-field))
   "Reads an expression in prefix form from a stream STREAM.
 The expression read from the strem should represent a polynomial or a
@@ -111 +112 @@
 polynomial or list of polynomials is returned, with terms in each
 polynomial ordered according to monomial order ORDER."
-  (poly-eval (read-infix-form :stream stream) vars order))
+  (poly-eval (read-infix-form :stream stream) vars order coefficient-class))
 
 (defun string->poly (str vars 
                      &optional
-                       (order #'lex>))
+                       (order #'lex>)
+                       (coefficient-class 'rational-field))
   "Converts a string STR to a polynomial in variables VARS."
   (with-input-from-string (s str)
-    (let ((p-or-plist (read-poly vars :stream s :order order)))
+    (let ((p-or-plist (read-poly vars :stream s :order order :coefficient-class coefficient-class)))
       (etypecase p-or-plist
         (poly (change-class p-or-plist 'symbolic-poly :vars vars))
@@ -138 +140 @@
 (defun string->alist (str vars
                       &optional
-                        (order #'lex>))
+                        (order #'lex>)
+                        (coefficient-class 'rational-field))
   "Convert a string STR representing a polynomial or polynomial list to
 an association list (... (MONOM . COEFF) ...)."
-  (poly->alist (string->poly str vars order)))
+  (poly->alist (string->poly str vars order coefficient-class)))
 
 (defun poly-equal-no-sugar-p (p q)