Changeset 3651

Timestamp:

2015-09-05T21:16:21-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/polynomial.lisp

@@ -393 +393 @@
       :termlist (apply #'nconc (mapcar #'poly-termlist plist))))))
 
+(defgeneric spoly (object1 object2)
+  (:documentation "Yields the S-polynomial of OBJECT1 and OBJECT2.")
+  (:method ((f poly) (g poly))
+    (let* ((lcm (universal-lcm (leading-monomial f) (leading-monomial g)))
+           (mf (divide lcm (leading-monomial f)))
+           (mg (divide lcm (leading-monomial g))))
+      (multiple-value-bind (c cf cg)
+          (funcall (ring-ezgcd ring) (poly-lc f) (poly-lc g))
+        (declare (ignore c))
+        (subtract
+         (multiply cg (multiply mf f))
+         (multiply cf (multiply mg g)))))))
+
+
 #|
 
@@ -403 +417 @@
 
 
-(defun spoly (ring-and-order f g
-              &aux
-                (ring (ro-ring ring-and-order)))
-  "It yields the S-polynomial of polynomials F and G."
-  (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))))
-    (declare (type monom mf mg))
-    (multiple-value-bind (c cf cg)
-        (funcall (ring-ezgcd ring) (poly-lc f) (poly-lc g))
-      (declare (ignore c))
-      (poly-sub 
-       ring-and-order
-       (scalar-times-poly ring cg (monom-times-poly mf f))
-       (scalar-times-poly ring cf (monom-times-poly mg g))))))