Changeset 4146 for branches

Timestamp:

2016-06-02T19:33:09-07:00 (8 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/pair-queue.lisp

@@ -102 +102 @@
 (defgeneric make-critical-pair-queue (object) 
   (:documentation "A factory of critical-pair-queue objects.")
-  (:method ((self strategy))
+  (:method ((self selection-strategy))
     "Creates a priority queue with selection strategy STRATEGY."
     (with-slots (pair-key-fn pair-order-fn)
@@ -113 +113 @@
                      :test pair-order-fn))))
 
-(defun make-critical-pairs (poly-list &optional (start 0)
+(defun make-critical-pairs (poly-list 
+                            &optional (start 0)
                             &aux 
                               (s (1- (length poly-list))))
@@ -122 +123 @@
   (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))))
+         (makelist (make-instance 'critical-pair :first (elt poly-list i) :second (elt poly-list j))
+                   (i start (1- s)) (j (1+ i) s))))
 
 (defgeneric enqueue-critical-pairs (self pair-lst)