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

Just discovered the D macro. It returns a dotted pair. That why CDR is in order.

Browse Source 
Backed out the earlier changes.
This commit is contained in:
Gerd Heber 2015-07-08 17:14:33 -05:00
parent b7a7e9a4ea
commit 31d84edc1e
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.lisp
View File

@ -150,6 +150,7 @@
CMBN-NON-ZERO-P CMBN-NON-ZERO-P
CMBN-ZERO-P CMBN-ZERO-P
CMPR CMPR
D
DFFR DFFR
GNRT GNRT
I-SBTR I-SBTR

2
src/classes.lisp
View File

@ -399,7 +399,7 @@
(the boolean (the boolean
(and (consp object) (and (consp object)
(eq :delt (car object)) (eq :delt (car object))
(typep (cadr object) 'dgop)))) (typep (cdr object) 'dgop))))
(DEFTYPE SOFT-DLOP () '(satisfies soft-dlop-p)) (DEFTYPE SOFT-DLOP () '(satisfies soft-dlop-p))

4
src/delta.lisp
View File

@ -12,7 +12,7 @@
(DEFUN SOFT-DELTA-CMPR (gmsm1 gmsm2) (DEFUN SOFT-DELTA-CMPR (gmsm1 gmsm2)
(f-cmpr (cadr gmsm1) (cadr gmsm2))) (f-cmpr (cdr gmsm1) (cdr gmsm2)))
(DEFUN DELTA-FACE (indx dmns gmsm) (DEFUN DELTA-FACE (indx dmns gmsm)
@ -34,7 +34,7 @@
(declare (declare
(fixnum indx dmns) (fixnum indx dmns)
(type soft-dlop gmsm)) (type soft-dlop gmsm))
(absm 0 (d (gmsm (delta-face indx dmns (cadr gmsm)))))) (absm 0 (d (gmsm (delta-face indx dmns (cdr gmsm))))))
(DEFUN DELTA-BNDR (dmns gmsm) (DEFUN DELTA-BNDR (dmns gmsm)

8
test/delta-test.lisp
View File

@ -4,7 +4,7 @@
(in-suite :kenzo) (in-suite :kenzo)
(test soft-delta-cmpr (test soft-delta-cmpr
(is (equal :less (cat:soft-delta-cmpr '(d 12) '(d 23))))) (is (equal :less (cat:soft-delta-cmpr (cat:d 12) (cat:d 23)))))
(defun faces (i lst) (defun faces (i lst)
(cat:dlop-int-ext (cat:dlop-int-ext
@ -22,11 +22,11 @@
(is (equal '(0 2 4) (faces 3 '(0 2 4 6)))) (is (equal '(0 2 4) (faces 3 '(0 2 4 6))))
(dotimes (i 4) (dotimes (i 4)
(print (cat:soft-delta-face i 3 `(:delt ,(cat:mask 4))))) (print (cat:soft-delta-face i 3 (cat:d (cat:mask 4)))))
(dotimes (i 4) (dotimes (i 4)
(print (cat:soft-delta-face i 3 `(:delt (print (cat:soft-delta-face i 3 (cat:d
,(cat:dlop-ext-int '(0 2 4 6))))))) (cat:dlop-ext-int '(0 2 4 6)))))))
#| #|
(test homology (test homology