Changeset 4131 for branches

Timestamp:

2016-06-01T17:33:20-07:00 (8 years ago)

Author:

Marek Rychlik

Message:

* empty log message *

File:

• branches/f4grobner/buchberger.lisp (modified) (2 diffs)

branches/f4grobner/buchberger.lisp

@@ -25 +25 @@
         :criterion :pair-queue :priority-queue
         )
-  (:export "BUCHBERGER" "PARALLEL-BUCHBERGER"))
+  (:export "BUCHBERGER" "PARALLEL-BUCHBERGER")
+  (:documentation "Buchberger Algorithm Implementation."))
 
 (in-package :buchberger)
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; Buchberger Algorithm Implementation
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defun buchberger (ring-and-order f 
+(defun buchberger (f 
                    &optional 
                      (start 0)
@@ -47 +43 @@
 reduction will be preformed. This function assumes that all polynomials
 in F are non-zero."
-  (declare (type ring-and-order ring-and-order) (type fixnum start))
+  (declare (type fixnum start))
   (when (endp f) (return-from buchberger f)) ;cut startup costs
   (debug-cgb "~&GROBNER BASIS - BUCHBERGER ALGORITHM")
   (when (plusp start) (debug-cgb "~&INCREMENTAL:~d done" start))
-  #+grobner-check  (when (plusp start)
-                     (grobner-test ring-and-order (subseq f 0 start) (subseq f 0 start)))
+  #+grobner-check (when (plusp start) 
+                    (grobner-test (subseq f 0 start) (subseq f 0 start)))
   ;;Initialize critical pairs
-  (let ((b (pair-queue-initialize (make-pair-queue)
-                                  f start))
+  (let ((b (make-critical-pair-queue f start))
         (b-done (make-hash-table :test #'equal)))
     (declare (type priority-queue b) (type hash-table b-done))