Changeset 3920 for branches

Timestamp:

2016-05-29T21:46:35-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/pair-queue.lisp

@@ -22 +22 @@
 (defpackage "PAIR-QUEUE"
   (:use :cl :priority-queue :monom :polynomial :utils)
-  (:export "PAIR"
-           "MAKE-PAIR"
-           "PAIR-FIRST"
-           "PAIR-SECOND"
-           "PAIR-DIVISION-DATA"
-           "*PAIR-KEY-FUNCTION*"
-           "*PAIR-ORDER*"
+  (:export "CRITICAL-PAIR"
+           "CRITICAL-PAIR-FIRST"
+           "CRITICAL-PAIR-SECOND"
            "MAKE-PAIR-QUEUE"
            "PAIR-QUEUE-INITIALIZE"
@@ -45 +41 @@
 
 (defclass critical-pair ()
-  ((first :initform nil :initarg :first)
-   (second :initform nil :initarg :second))
+  ((first :initform nil  :initarg :first :accessor critical-pair-first)
+   (second :initform nil :initarg :second :accessor critical-pair-second))
   (:documentation "Represents a critical pair."))
 
+(defmethod print-object ((self poly) stream)
+  (print-unreadable-object (self stream :type t :identity t)
+    (with-accessors ((first critical-pair-first)
+                     (second critical-pair-second))
+        self
+      (format stream "FIRST=~A SECOND=~A" 
+              first second))))
+
   
-(defvar *pair-key-function* nil
-  "Function that, given two polynomials as argument, computed the key
-in the pair queue.")
-
-(defvar *pair-order* nil
-  "Function that orders the keys of pairs.")
-
 (defun make-pair-queue ()
   "Constructs a priority queue for critical pairs."