Changeset 4088 for branches

Timestamp:

2016-06-01T09:23:43-07:00 (9 years ago)

Author:

Marek Rychlik

Message:

 

Location:

branches/f4grobner

Files:

• 5am-division.lisp (added)
• mx-grobner-0.lisp~ (deleted)
• ngrobner.asd (modified) (1 diff)
• symbolic-polynomial.lisp (modified) (1 diff)
• test1.lisp (modified) (1 diff)

branches/f4grobner/ngrobner.asd

@@ -22 +22 @@
                  (:file "priority-queue")
                  (:file "pair-queue")
-                 ;;(:file "grobner-debug")
-                 ;;(:file "division")
+                 (:file "grobner-debug")
+                 (:file "division")
                  ;;(:file "criterion")
                  ;;(:file "buchberger")

branches/f4grobner/symbolic-polynomial.lisp

@@ -163 +163 @@
 (defgeneric poly->string (self &optional vars)
   (:documentation "Render polynomial SELF as a string, using symbolic variables VARS.")
-  (:method ((self list) &optional (vars nil))
+  (:method ((self list) &optional (vars nil vars-p))
     (assert (eql (car self) :[))
-    (cons :[ (mapcar #'(lambda (p) (poly->string p vars)) (cdr self))))
+    (cond (vars-p
+           (cons :[ (mapcar #'(lambda (p) (poly->string p vars)) (cdr self))))
+          (t 
+           (cons :[ (mapcar #'(lambda (p) (poly->string p)) (cdr self))))))
   (:method ((self poly) &optional (vars nil))
     ;; Ensure that the number of variables matches the dimension

branches/f4grobner/test1.lisp

@@ -21 +21 @@
   (multiple-value-bind (a r c division-count)
       (step (poly-pseudo-divide f fl))
-    (format t "Quotients:        ~S~%" a)
-    (format t "Remainder:        ~S~%" (->sexp r))
+    (format t "Quotients:        ~S~%" (poly->string (cons :[ a) '(x y)))
+    (format t "Remainder:        ~S~%" (->sexp r '(x y)))
     (format t "Coefficient:     ~S~%" c)
     (format t "Division count:  ~S~%" division-count)))