Changeset 4142 for branches

Timestamp:

2016-06-01T22:44:22-07:00 (8 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/pair-queue.lisp (modified) (2 diffs)

branches/f4grobner/pair-queue.lisp

@@ -108 +108 @@
   (with-slots (pair-key-fn pair-order-fn)
       strategy
-    (reinitialize-instance self
+    (call-next-method self
                            :element-type 'critical-pair
                            :element-key #'(lambda (pair) (funcall pair-key-fn 
@@ -115 +115 @@
                            :test pair-order-fn)))
 
-(defgeneric enqueue-critical-pairs (self &optional poly-list start)
-  (:method ((self critical-pair-queue) &optional (poly-list nil) (start 0))
-    "The argument POLY-LIST should the initial list of
+(defun make-critical-pairs (poly-list &optional (start 0)
+                            &aux 
+                              (s (1- (length poly-list))))
+  "The argument POLY-LIST should the initial list of
 polynomials.  and START is the first position beyond the elements
 which form a partial Grobner basis, i.e. satisfy the Buchberger
 criterion."
-    (let* ((s (1- (length poly-list)))
-           (b (nconc (makelist (make-instance 'critical-pair :first (elt poly-list i) :second (elt poly-list j))
-                               (i 0 (1- start)) (j start s))
-                     (makelist (make-instance 'critical-pair :first (elt poly-list i) :second (elt poly-list j))
-                               (i start (1- s)) (j (1+ i) s)))))
+  (nconc (makelist (make-instance 'critical-pair :first (elt poly-list i) :second (elt poly-list j))
+                             (i 0 (1- start)) (j start s))
+                   (makelist (make-instance 'critical-pair :first (elt poly-list i) :second (elt poly-list j))
+                             (i start (1- s)) (j (1+ i) s))))
+#|
+
       (dolist (pair b self)
         (enqueue self pair)))))
+|#
 
-