Changeset 4401 for branches

Timestamp:

2016-06-07T19:03:45-07:00 (8 years ago)

Author:

Marek Rychlik

Message:

 

Location:

branches/f4grobner

Files:

• 5am-division.lisp (modified) (1 diff)
• infix-printer.lisp (modified) (3 diffs)
• test5.lisp (modified) (1 diff)

branches/f4grobner/5am-division.lisp

@@ -168 +168 @@
       (is (universal-equalp fl fl-copy)))))
 
-#+nil
 (test buchberger-criterion-full
   (with-fixture buchberger-criterion-context 

branches/f4grobner/infix-printer.lisp

@@ -36 +36 @@
    (t
     (dolist (arg lst)
+      ;;(format t "Processing arg: ~S~%" arg)
       (setf true-sep sep)
       (incf count)
@@ -43 +44 @@
                  (consp arg)
                  (eq alt-op (car arg)))
-        (setf arg (cadr arg)
-              true-sep alt-sep))
+        (setf arg (cadr arg) true-sep alt-sep))
       (if beg
           (setf beg nil)
@@ -100 +100 @@
       ((+ - * /)
        (infix-print-separated-list
-        (cdr expr)
-        (car expr)
+        (cdr expr)                      
+        (car expr)                      
         stream
-        (car expr)
-        (1+ print-level)
+        (car expr)                      
+        (1+ print-level)                
         (cond ((eq (car expr) '+) '-)
               ((eq (car expr) '-) '-)

branches/f4grobner/test5.lisp

@@ -26 +26 @@
           (setf sp-rem (normal-form sp fl))
           (format t "NORMAL-FORM(~A,~A) --> ~A~%" 
-                  (poly->string sp-rem) 
+                  (poly->string sp) 
                   (poly->string (cons :[ fl)) 
                   (poly->string sp-rem))