mmarco/kenzo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

The implementation of DELTAB2-DGNL appears to be based on the old internal

Browse Source 
representation of TPNR as (:tnpr (degr1.gnrt1).(degr2.gnrt2)). (See page 77
in the Kenzo handbook.) The current internal representation of TPNR is a
structure with slots DEGR1, GNRT1, DEGR2, GNRT2. The implementation has been
modified accordingly.
This commit is contained in:
Gerd Heber 2015-08-01 19:39:16 -05:00
parent c3f663e202
commit c52da283b7
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/delta.lisp
View File

@ -259,11 +259,15 @@
(logandc2 gmsm (mask indx)))) (logandc2 gmsm (mask indx))))
rslt) rslt)
(when (minusp (decf ldegr)) (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 (gnrt1 (gnrt (first rslt)))
(setf (gnrt2 (gnrt (car (last rslt)))) (setf (gnrt2 (gnrt (car (last rslt))))
1)) 1))
(return (delete 1 rslt :key #'cadddr))))))))) (return (delete 1 rslt
:key #'(lambda (x)
(gnrt1 (cdr x))))))))))))
(DEFUN DELTAB2-BNDR (dmns gmsm) (DEFUN DELTAB2-BNDR (dmns gmsm)

7
test/delta-test.lisp
View File

@ -113,17 +113,10 @@
(t1 500))) (t1 500)))
#|
()
(dotimes (i 7)
(print (deltab2-dgnl i (mask (1+ i)))))
(test deltab2-dgnl (test deltab2-dgnl
(dotimes (i 7) (dotimes (i 7)
(print (cat:deltab2-dgnl i (cat:mask (1+ i)))))) (print (cat:deltab2-dgnl i (cat:mask (1+ i))))))
|#
(test deltab2-bndr (test deltab2-bndr
(cat:deltab2-bndr 1 5) (cat:deltab2-bndr 1 5)