diff --git a/src/delta.lisp b/src/delta.lisp index f15857d..122d73d 100644 --- a/src/delta.lisp +++ b/src/delta.lisp @@ -259,11 +259,15 @@ (logandc2 gmsm (mask indx)))) rslt) (when (minusp (decf ldegr)) - (setf rslt (delete 1 rslt :key #'caaddr)) + (setf rslt (delete 1 rslt + :key #'(lambda (x) + (degr1 (cdr x))))) (setf (gnrt1 (gnrt (first rslt))) (setf (gnrt2 (gnrt (car (last rslt)))) 1)) - (return (delete 1 rslt :key #'cadddr))))))))) + (return (delete 1 rslt + :key #'(lambda (x) + (gnrt1 (cdr x)))))))))))) (DEFUN DELTAB2-BNDR (dmns gmsm) diff --git a/test/delta-test.lisp b/test/delta-test.lisp index 5d3da19..b5e72ba 100644 --- a/test/delta-test.lisp +++ b/test/delta-test.lisp @@ -113,17 +113,10 @@ (t1 500))) -#| -() -(dotimes (i 7) - (print (deltab2-dgnl i (mask (1+ i))))) - (test deltab2-dgnl (dotimes (i 7) (print (cat:deltab2-dgnl i (cat:mask (1+ i)))))) -|# - (test deltab2-bndr (cat:deltab2-bndr 1 5)