Changeset 2913

Timestamp:

2015-06-21T12:39:51-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/polynomial.lisp

@@ -155 +155 @@
                                    uminus-method-name
                                    &optional
-                                    (doc-string nil doc-string-supplied-p))
+                                     (doc-string nil doc-string-supplied-p))
   "This macro avoids code duplication for two similar operations: ADD-TO and SUBTRACT-FROM."
   `(defmethod ,add/subtract-method-name ((self poly) (other poly))
@@ -184 +184 @@
 no consing, entirely reusing the sells of SELF and OTHER.")
 
-)
+  )
 
 (defmethod unary-minus ((self poly))
@@ -220 +220 @@
     ((endp (cdr p))
      (multiply-term-by-termlist-dropping-zeros (car p) q)
-    ((endp (cdr q))
-     (multiply-term-by-termlist-dropping-zeros (car q) p t)
-     (t
-      (nconc (multiply-terms (car p) (car q))
-             (tail (add-termlists 
-                    (multiply-term-by-termlist-dropping-zeros (car p) (cdr q))
-                    (multiply-termlists (cdr p) q)
-                    order-fn))))))))
+     ((endp (cdr q))
+      (multiply-term-by-termlist-dropping-zeros (car q) p t)
+      (t
+       (nconc (multiply-terms (car p) (car q))
+              (tail (add-termlists 
+                     (multiply-term-by-termlist-dropping-zeros (car p) (cdr q))
+                     (multiply-termlists (cdr p) q)
+                     order-fn))))))))
 
 
@@ -389 +389 @@
   (declare (type ring-and-order ring-and-order) (type poly f g))
   (let* ((lcm (monom-lcm (poly-lm f) (poly-lm g)))
-          (mf (monom-div lcm (poly-lm f)))
-          (mg (monom-div lcm (poly-lm g))))
+         (mf (monom-div lcm (poly-lm f)))
+         (mg (monom-div lcm (poly-lm g))))
     (declare (type monom mf mg))
     (multiple-value-bind (c cf cg)
@@ -407 +407 @@
   (if (poly-zerop p)
       (values p 1)
-    (let ((c (poly-content ring p)))
-      (values (make-poly-from-termlist 
-               (mapcar
-                #'(lambda (x)
-                    (make-term :monom (term-monom x)
-                               :coeff (funcall (ring-div ring) (term-coeff x) c)))
-                (poly-termlist p))
-               (poly-sugar p))
-              c))))
+      (let ((c (poly-content ring p)))
+        (values (make-poly-from-termlist 
+                 (mapcar
+                  #'(lambda (x)
+                      (make-term :monom (term-monom x)
+                                 :coeff (funcall (ring-div ring) (term-coeff x) c)))
+                  (poly-termlist p))
+                 (poly-sugar p))
+                c))))
 
 (defun poly-content (ring p)
@@ -447 +447 @@
   (read-from-string
    (concatenate 'string
-     "#I(" 
-     (with-output-to-string (s)
-       (loop
-         (multiple-value-bind (line eof)
-             (read-line stream t)
-           (format s "~A" line)
-           (when eof (return)))))
-     ")")))
-        
+                "#I(" 
+                (with-output-to-string (s)
+                  (loop
+                     (multiple-value-bind (line eof)
+                         (read-line stream t)
+                       (format s "~A" line)
+                       (when eof (return)))))
+                ")")))
+
 (defun read-poly (vars &key
                          (stream t) 
@@ -487 +487 @@
 
 (defun string->alist (str vars
-                     &optional
-                       (ring +ring-of-integers+) 
-                       (order #'lex>))
+                      &optional
+                        (ring +ring-of-integers+) 
+                        (order #'lex>))
   "Convert a string STR representing a polynomial or polynomial list to
 an association list (... (MONOM . COEFF) ...)."