Changeset 1005 for branches

Timestamp:

2015-06-10T06:24:33-07:00 (10 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/parse.lisp (modified) (1 diff)

branches/f4grobner/parse.lisp

@@ -75 +75 @@
 is a number then convert it to a polynomial in N variables."
   (if (numberp number-or-poly)
-      (make-poly-from-termlist (list (make-term (make-monomial :dimension n) number-or-poly)))
+      (make-poly-from-termlist (list (make-term (make-monom :dimension n) number-or-poly)))
       number-or-poly))
 
-(defun $poly+ (p q n order ring)
+(defun $poly+ (ring-and-order p q n)
   "Add two polynomials P and Q, where each polynomial is either a
 numeric constant or a polynomial in internal representation. If the
 result is a number then convert it to a polynomial in N variables."
-  (poly+ (convert-number p n) (convert-number q n) order ring))
-
-(defun $poly- (p q n order ring)
+  (poly-add ring-and-order (convert-number p n) (convert-number q n)))
+
+(defun $poly- (ring-and-order p q n)
   "Subtract two polynomials P and Q, where each polynomial is either a
 numeric constant or a polynomial in internal representation. If the
 result is a number then convert it to a polynomial in N variables."
-  (poly- (convert-number p n) (convert-number q n) order ring))
-
-(defun $minus-poly (p n ring)
+  (poly-sub ring-and-order (convert-number p n) (convert-number q n)))
+
+(defun $minus-poly (ring p n)
   "Negation of P is a polynomial is either a numeric constant or a
 polynomial in internal representation. If the result is a number then
 convert it to a polynomial in N variables."
-  (minus-poly (convert-number p n) ring))
+  (poly-uminus ring (convert-number p n)))
 
 (defun $poly* (p q n order ring)