Changeset 4093

Timestamp:

2016-06-01T10:24:47-07:00 (8 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/monom.lisp (modified) (4 diffs)

branches/f4grobner/monom.lisp

@@ -34 +34 @@
            "DIVIDE-BY"
            "DIVIDE"
-           "MULTIPLY-2"
            "MULTIPLY"
            "DIVIDES-P"
@@ -197 +196 @@
     self))
 
+(defun multiply (factor &rest more-factors)
+  "Successively multiplies factor FACTOR by the remaining arguments
+MORE-FACTORS."
+  (reduce #'multiply-by more-factors :initial-value factor))
+
 (defgeneric divide-by (self other)
   (:documentation "Divide SELF by OTHER, return SELF.")
@@ -220 +224 @@
       copy))
 
-(defun multiply-2 (object1 object2)
-  "Multiply OBJECT1 by OBJECT2"
-  (multiply-by (copy-instance object1) (copy-instance object2)))
-
-(defun multiply (&rest factors)
-  "Non-destructively multiply list FACTORS."
-  (cond ((endp factors) 1)
-        ((endp (rest factors)) (first factors))
-        (t (reduce #'multiply-2 factors))))
+;; (defun multiply-2 (object1 object2)
+;;   "Multiply OBJECT1 by OBJECT2"
+;;   (multiply-by (copy-instance object1) (copy-instance object2)))
+
+;; (defun multiply (&rest factors)
+;;   "Non-destructively multiply list FACTORS."
+;;   (cond ((endp factors) 1)
+;;      ((endp (rest factors)) (first factors))
+;;      (t (reduce #'multiply-2 factors))))
 
 (defgeneric unary-inverse (self)
@@ -590 +594 @@
   (setf (term-coeff self) (multiply-by (term-coeff self) (term-coeff other))))
 
+
 (defmethod left-tensor-product-by :before ((self term) (other term))
   (setf (term-coeff self) (multiply-by (term-coeff self) (term-coeff other))))