Changeset 3978 for branches/f4grobner

Timestamp:

2016-05-30T17:40:39-07:00 (8 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

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

branches/f4grobner/5am-pair-queue.lisp

@@ -49 +49 @@
 
 (defpackage #:5am-pair-queue
-  (:use :cl :it.bese.fiveam :monom :polynomial :symbolic-polynomial :pair-queue))
+  (:use :cl :it.bese.fiveam :monom :polynomial :symbolic-polynomial :priority-queue :pair-queue))
 
 (in-package :5am-pair-queue)
@@ -61 +61 @@
   (let* ((p (string->poly "11*x*y*z+13*x^2*y^3*z^4" '(x y z)))
          (q (string->poly "5*x+7*y*z^2" '(x y z)))
-         (queue (make-instance 'critical-pair-queue :poly-list (list p q))))
+         (queue (make-critical-pair-queue :poly-list (list p q))))
     (&body)))
 
@@ -67 +67 @@
   "Queue building"
   (with-fixture poly-context ()
-    (is (= (queue-size queue) 2))))
+    (is (= (priority-queue-size queue) 2))))
 
 (test queue-access
   "Queue access"
   (with-fixture poly-context ()
-    (let ((pair (dequeue queue)))
+    (let ((pair (priority-queue-remove queue)))
       (is (universal-equalp (critical-pair-first pair) p))
       (is (universal-equalp (critical-pair-second pair) q)))))