Changeset 3107

Timestamp:

2015-06-22T07:48:57-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/polynomial.lisp (modified) (2 diffs)

branches/f4grobner/polynomial.lisp

@@ -337 +337 @@
   plist)
 
-#|
-
-(defun standard-sum (F plist 
-                                 &aux 
-                                   (k (length plist))
-                                   (d (+ k (monom-dimension (poly-lt (car plist)))))
-                                   ;; Add k variables to f
-                                   (f (poly-list-add-variables f k))
-                                   ;; Set PLIST to [U1*P1,U2*P2,...,UK*PK]
-                                   (plist (apply #'nconc (poly-standard-extension plist))))
+
+(defun standard-sum (plist
+                     &aux 
+                       (plist (standard-extension plist))
+                       (nvars (poly-dimension (car plist))))
   "Calculate the polynomial U1*P1+U2*P2+...+UK*PK-1, where PLIST=[P1,P2,...,PK].
 Firstly, new K variables, U1, U2, ..., UK, are inserted into each
@@ -354 +349 @@
 which is equivalent to using a lexicographic order on the first K
 variables."
-  (setf (cdr (last (poly-termlist plist)))
-        ;; Add -1 as the last term
-        (list (make-term :monom (make-monom :dimension d)
-                         :coeff (funcall (ring-uminus ring) (funcall (ring-unit ring))))))
-  (append f (list plist)))
-
+  (flet ((subtract-1 (p) 
+           (append-item p (make-instance 'term :coeff -1 :dimension nvars))))
+    (make-instance
+     'poly
+     :termlist (mapcon #'poly-termlist plist))
+    (setf plist (mapc #'subtract-1 plist)))
+)
+
+
+#|