Changeset 1797 for branches/f4grobner/mx-grobner.lisp

Timestamp:

2015-06-15T11:46:14-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/mx-grobner.lisp

@@ -268 +268 @@
     (otherwise
      object)))
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; Unary and binary operation definition facility
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defmacro define-unop (maxima-name fun-name
-                       &optional (documentation nil documentation-supplied-p))
-  "Define a MAXIMA-level unary operator MAXIMA-NAME corresponding to unary function FUN-NAME."
-  `(defun ,maxima-name (p vars
-                             &aux
-                             (vars (coerce-maxima-list vars))
-                             (p (parse-poly p vars)))
-     ,@(when documentation-supplied-p (list documentation))
-     (poly->maxima :polynomial (,fun-name +maxima-ring+ p) vars)))
-
-(defmacro define-binop (maxima-name fun-name
-                        &optional (documentation nil documentation-supplied-p))
-  "Define a MAXIMA-level binary operator MAXIMA-NAME corresponding to binary function FUN-NAME."
-  `(defmfun ,maxima-name (p q vars
-                             &aux
-                             (vars (coerce-maxima-list vars))
-                             (p (parse-poly p vars))
-                             (q (parse-poly q vars)))
-     ,@(when documentation-supplied-p (list documentation))
-     (poly->maxima :polynomial (,fun-name +maxima-ring+ p q) vars)))
 
 
@@ -425 +397 @@
 
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Unary and binary operation definition facility
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defmacro define-unop (maxima-name fun-name
+                       &optional (documentation nil documentation-supplied-p))
+  "Define a MAXIMA-level unary operator MAXIMA-NAME corresponding to unary function FUN-NAME."
+  `(defun ,maxima-name (p vars)
+     ,@(when documentation-supplied-p (list documentation))
+     (with-ring-and-order ((vars) :polynomials (p) :value-type :polynomial)
+       (,fun-name ring p) vars)))
+
+(defmacro define-binop (maxima-name fun-name
+                        &optional (documentation nil documentation-supplied-p))
+  "Define a MAXIMA-level binary operator MAXIMA-NAME corresponding to binary function FUN-NAME."
+  `(defun ,maxima-name (p vars)
+     ,@(when documentation-supplied-p (list documentation))
+     (with-ring-and-order ((vars) :polynomials (p q) :value-type :polynomial)
+       (,fun-name ring p q) vars)))
+
+
+
 ;;Functions