Changeset 3944 for branches

Timestamp:

2016-05-30T00:25:21-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

@@ -54 +54 @@
 
 (defclass selection-strategy ()
-  ((pair-key-fn :initform #'(lambda (p q) (universal-lcm (leading-monomial p) (leading-monomial q))))
-   (pair-order-fn :initform #'lex>))
+  ((pair-key-fn :initform #'(lambda (p q) (universal-lcm (leading-monomial p) (leading-monomial q))) :initarg :pair-key-fn :accessor pair-key-fn)
+   (pair-order-fn :initform #'lex> :initarg :pair-order-fn :accessor pair-order-fn))
   (:documentation "Represents the normal critical pair selection
 strategy.  The two ingredients of a strategy is a function
@@ -98 +98 @@
                 :test pair-order-fn))))
 
+(defmethod print-object ((self critical-pair-queue) stream)
+  (print-unreadable-object (self stream :type t :identity t)
+    (with-accessors ((pair-key-fn pair-key-fn)
+                     (pair-order-fn pair-order-fn)
+                     (pq pq))
+        self
+      (format stream "PAIR-KEY-FN=~A PAIR-ORDER-FN=~A PQ=~A" 
+              pair-key-fn pair-order-fn pq))))
+
+
 (defun pair-queue-initialize (pq f start
                               &aux