From c5c67b83fe0ad5d4fc8bb5a868b3e03f6a9301ed Mon Sep 17 00:00:00 2001 From: Gerd Heber Date: Thu, 26 Nov 2015 21:10:33 -0600 Subject: [PATCH] Formatting updates. --- kenzo-test.asd | 96 +++++++++++----------- test/bar-test.lisp | 200 ++++++++++++++++++++++----------------------- 2 files changed, 147 insertions(+), 149 deletions(-) diff --git a/kenzo-test.asd b/kenzo-test.asd index 1060796..92acd50 100644 --- a/kenzo-test.asd +++ b/kenzo-test.asd @@ -1,50 +1,50 @@ (defsystem :kenzo-test - :description "A simple regression test suite for Kenzo" - :serial t - :version "0.1.0" - :author "Francis Sergeraert " - :license "GPLv3" - :depends-on (:kenzo :fiveam) - :pathname #P"test/" - :components ((:file "package") - (:file "common") - ;; === test files === - (:file "bar-test") - (:file "bicones-test") - (:file "cartesian-products-test") - (:file "ccn") - (:file "chain-complexes-test") - (:file "chcm-elementary-op-test") - (:file "circle") - (:file "cl-space-efhm-test") - (:file "classifying-spaces-test") - (:file "cobar-test") - (:file "combinations-test") - (:file "cones-test") - (:file "cs-twisted-products-test") - (:file "delta-test") - (:file "diabolo") - (:file "disk-pasting-test") - (:file "eilenberg-zilber-test") - (:file "effective-homology-test") - (:file "fibrations-test") - (:file "homology-groups-test") - (:file "k-pi-n-test") - (:file "kan-test") - (:file "loop-spaces-test") - (:file "lp-space-efhm-test") - (:file "ls-twisted-products-test") - (:file "macros-test") - (:file "searching-homology-test") - (:file "serre-test") - (:file "simplicial-groups-test") - (:file "simplicial-mrphs-test") - (:file "simplicial-sets-test") - (:file "smith-test") - (:file "special-smsts-test") - (:file "suspensions-test") - (:file "tensor-products-test") - (:file "various-test") - (:file "whitehead-test") - )) + :description "A simple regression test suite for Kenzo" + :serial t + :version "0.1.0" + :author "Francis Sergeraert " + :license "GPLv3" + :depends-on (:kenzo :fiveam) + :pathname #P"test/" + :components ((:file "package") + (:file "common") + ;; === test files === + (:file "bar-test") + (:file "bicones-test") + (:file "cartesian-products-test") + (:file "ccn") + (:file "chain-complexes-test") + (:file "chcm-elementary-op-test") + (:file "circle") + (:file "cl-space-efhm-test") + (:file "classifying-spaces-test") + (:file "cobar-test") + (:file "combinations-test") + (:file "cones-test") + (:file "cs-twisted-products-test") + (:file "delta-test") + (:file "diabolo") + (:file "disk-pasting-test") + (:file "eilenberg-zilber-test") + (:file "effective-homology-test") + (:file "fibrations-test") + (:file "homology-groups-test") + (:file "k-pi-n-test") + (:file "kan-test") + (:file "loop-spaces-test") + (:file "lp-space-efhm-test") + (:file "ls-twisted-products-test") + (:file "macros-test") + (:file "searching-homology-test") + (:file "serre-test") + (:file "simplicial-groups-test") + (:file "simplicial-mrphs-test") + (:file "simplicial-sets-test") + (:file "smith-test") + (:file "special-smsts-test") + (:file "suspensions-test") + (:file "tensor-products-test") + (:file "various-test") + (:file "whitehead-test") + )) diff --git a/test/bar-test.lisp b/test/bar-test.lisp index 256c5f5..4bdc453 100644 --- a/test/bar-test.lisp +++ b/test/bar-test.lisp @@ -1,4 +1,3 @@ - (in-package :kenzo-test) (in-suite :kenzo) @@ -11,58 +10,58 @@ (test bar-cmpr (let ((r (cat:bar-cmpr #'cat:s-cmpr))) - (is (equal :equal (funcall r (cat:abar) (cat:abar)))) - (is (equal :greater (funcall r (cat:abar 3 'a) (cat:abar)))) - (is (equal :less (funcall r (cat:abar 3 'a) (cat:abar 2 'a 1 'b)))) - (is (equal :less (funcall r (cat:abar 3 'a) (cat:abar 3 'b)))) - (is (equal :equal (funcall r (cat:abar 3 'a) (cat:abar 3 'a)))))) + (is (equal :equal (funcall r (cat:abar) (cat:abar)))) + (is (equal :greater (funcall r (cat:abar 3 'a) (cat:abar)))) + (is (equal :less (funcall r (cat:abar 3 'a) (cat:abar 2 'a 1 'b)))) + (is (equal :less (funcall r (cat:abar 3 'a) (cat:abar 3 'b)))) + (is (equal :equal (funcall r (cat:abar 3 'a) (cat:abar 3 'a)))))) (test bar-basis-length (let ((basis #'(lambda (degr) (list degr)))) - (cat:bar-basis-length basis 2 1) - (cat:bar-basis-length basis 2 2) - (cat:bar-basis-length basis 3 1) - (cat:bar-basis-length basis 3 2) - (cat:bar-basis-length basis 4 1) - (cat:bar-basis-length basis 4 2) - (cat:bar-basis-length basis 4 3) - (cat:bar-basis-length basis 4 4) - (cat:bar-basis-length basis 8 1) - (cat:bar-basis-length basis 8 2) - (cat:bar-basis-length basis 8 3) - (cat:bar-basis-length basis 8 4) - (cat:bar-basis-length basis 8 5) - (cat:bar-basis-length basis 8 6) - (cat:bar-basis-length basis 8 11))) + (cat:bar-basis-length basis 2 1) + (cat:bar-basis-length basis 2 2) + (cat:bar-basis-length basis 3 1) + (cat:bar-basis-length basis 3 2) + (cat:bar-basis-length basis 4 1) + (cat:bar-basis-length basis 4 2) + (cat:bar-basis-length basis 4 3) + (cat:bar-basis-length basis 4 4) + (cat:bar-basis-length basis 8 1) + (cat:bar-basis-length basis 8 2) + (cat:bar-basis-length basis 8 3) + (cat:bar-basis-length basis 8 4) + (cat:bar-basis-length basis 8 5) + (cat:bar-basis-length basis 8 6) + (cat:bar-basis-length basis 8 11))) (test bar-basis (let* ((basis #'(lambda (degr) (list degr))) - (r (cat:bar-basis basis))) - (funcall r 0) - (funcall r 1) - (funcall r 2) - (dotimes (i 7) - (print (funcall r i))) - (cat:bar-basis :locally-effective))) + (r (cat:bar-basis basis))) + (funcall r 0) + (funcall r 1) + (funcall r 2) + (dotimes (i 7) + (print (funcall r i))) + (cat:bar-basis :locally-effective))) (test bar-intr-vrtc-dffr (let* ((d (cat:soft-delta-infinity)) - (r (cat:bar-intr-vrtc-dffr (cat:dffr d)))) - (funcall r 0 (cat:abar)) - (funcall r 3 (cat:abar 3 (cat:d 7))) - (funcall r 5 (cat:abar 3 (cat:d 7) 2 (cat:d 3))) - (funcall r 5 (cat:abar 2 (cat:d 3) 3 (cat:d 7))))) + (r (cat:bar-intr-vrtc-dffr (cat:dffr d)))) + (funcall r 0 (cat:abar)) + (funcall r 3 (cat:abar 3 (cat:d 7))) + (funcall r 5 (cat:abar 3 (cat:d 7) 2 (cat:d 3))) + (funcall r 5 (cat:abar 2 (cat:d 3) 3 (cat:d 7))))) (defun random-abar1 (length) (let ((rslt nil)) (dotimes (i length) (let* ((gmsm (random (cat:mask 6))) - (dmns (1- (logcount gmsm)))) - (when (plusp dmns) - (push (cat:brgn (1+ dmns) (cat:d gmsm)) rslt)))) + (dmns (1- (logcount gmsm)))) + (when (plusp dmns) + (push (cat:brgn (1+ dmns) gmsm) rslt)))) (cat:make-abar :list rslt))) @@ -84,54 +83,53 @@ (test bar-intr-hrzn-dffr (let* ((k (cat:k-z-1)) - (r (cat:bar-intr-hrzn-dffr (cat:aprd k)))) - (funcall r 0 (cat:abar )) - (funcall r 3 (cat:abar 3 '(2 3))) - (funcall r 6 (cat:abar 3 '(2 3) 3 '(-2 -3))) - (funcall r 9 (cat:abar 3 '(2 3) 3 '(-2 -3) 3 '(2 3))) - (funcall r 11 (cat:abar 3 '(2 3) 3 '(-2 -3) 2 '(-2) 3 '(-2 -3))))) + (r (cat:bar-intr-hrzn-dffr (cat:aprd k)))) + (funcall r 0 (cat:abar )) + (funcall r 3 (cat:abar 3 '(2 3))) + (funcall r 6 (cat:abar 3 '(2 3) 3 '(-2 -3))) + (funcall r 9 (cat:abar 3 '(2 3) 3 '(-2 -3) 3 '(2 3))) + (funcall r 11 (cat:abar 3 '(2 3) 3 '(-2 -3) 2 '(-2) 3 '(-2 -3))))) -#| (test bar-hrzn-dffr (progn - (cat:cat-init) - (let ((h (cat:bar-hrzn-dffr (cat:k-z-1))) - (abar)) - (dotimes (i 10) - (print (random-abar 10 5))) - (setf abar (random-abar 10 5)) - (cat:? h (apply #'+ (mapcar #'car (cat:abar-list abar))) abar) - (cat:? h (cat:? h (apply #'+ (mapcar #'car - (cat:abar-list abar))) abar)) - (dotimes (i 10) - (setf abar (random-abar 10 3)) - (print abar) - (print (cat:? h (apply #'+ (mapcar #'car (cat:abar-list abar))) - abar)) - (print (cat:? h (cat:? h (apply #'+ (mapcar #'car - (cat:abar-list abar))) - abar))))))) -|# + (cat:cat-init) + (let ((h (cat:bar-hrzn-dffr (cat:k-z-1))) + (abar)) + (dotimes (i 10) + (print (random-abar 10 5))) + (setf abar (random-abar 10 5)) + (cat:? h (apply #'+ (mapcar #'car (cat:abar-list abar))) abar) + (cat:? h (cat:? h (apply #'+ (mapcar #'car + (cat:abar-list abar))) abar)) + (dotimes (i 10) + (setf abar (random-abar 10 3)) + (print abar) + (print (cat:? h (apply #'+ (mapcar #'car (cat:abar-list abar))) + abar)) + (print (cat:? h (cat:? h (apply #'+ (mapcar #'car + (cat:abar-list abar))) + abar))))))) + (test bar (progn - (cat:cat-init) - (let ((b (cat:bar (cat:k-z-1))) - (abar (random-abar 10 3))) - (cat:? b (apply #'+ (mapcar #'car (cat:abar-list abar))) abar) - (cat:? b (cat:? b (apply #'+ (mapcar #'car (cat:abar-list abar))) - abar)) - (dotimes (i 10) - (let ((abar (random-abar 10 3))) - (print abar) - (print (cat:? b (apply #'+ (mapcar #'car (cat:abar-list abar))) - abar)) - (print (cat:? b - (cat:? b - (apply #'+ (mapcar #'car - (cat:abar-list abar))) - abar)))))))) + (cat:cat-init) + (let ((b (cat:bar (cat:k-z-1))) + (abar (random-abar 10 3))) + (cat:? b (apply #'+ (mapcar #'car (cat:abar-list abar))) abar) + (cat:? b (cat:? b (apply #'+ (mapcar #'car (cat:abar-list abar))) + abar)) + (dotimes (i 10) + (let ((abar (random-abar 10 3))) + (print abar) + (print (cat:? b (apply #'+ (mapcar #'car (cat:abar-list abar))) + abar)) + (print (cat:? b + (cat:? b + (apply #'+ (mapcar #'car + (cat:abar-list abar))) + abar)))))))) (test ncmbn-bar @@ -139,42 +137,42 @@ (cat:ncmbn-bar (list (cat:cmbn 3 2 'a 3 'b))) (cat:ncmbn-bar (list (cat:cmbn 1 2 'a 3 'b) (cat:cmbn 2 4 'c 5 'd))) (cat:ncmbn-bar (list (cat:cmbn 1 2 'a 3 'b) (cat:cmbn 1 4 'c 5 'd) - (cat:cmbn 1 6 'e 7 'f)))) + (cat:cmbn 1 6 'e 7 'f)))) (test mrph-vrtc-bar-intr (let* ((cc (cat:build-chcm :cmpr #'cat:f-cmpr - :basis :locally-effective - :intr-dffr #'cat:zero-mrph - :strt :cmbn)) - (m (cat:build-mrph :sorc cc :trgt cc :degr 0 :intr - #'(lambda (degr gnrt) - (cat:cmbn degr 2 gnrt 3 (1+ gnrt))) - :strt :gnrt :orgn '(test))) - (r (cat:mrph-vrtc-bar-intr m))) - (funcall r 4 (cat:abar 2 3 2 4)))) + :basis :locally-effective + :intr-dffr #'cat:zero-mrph + :strt :cmbn)) + (m (cat:build-mrph :sorc cc :trgt cc :degr 0 :intr + #'(lambda (degr gnrt) + (cat:cmbn degr 2 gnrt 3 (1+ gnrt))) + :strt :gnrt :orgn '(test))) + (r (cat:mrph-vrtc-bar-intr m))) + (funcall r 4 (cat:abar 2 3 2 4)))) (test vrtc-bar (progn - (cat:cat-init) - (let* ((f (cat:aw (cat:soft-delta-infinity) - (cat:soft-delta-infinity))) - (cf (cat:vrtc-bar f))) - (cat:? cf 6 (cat:abar 3 (cat:crpr 0 (cat:d 7) 0 (cat:d 7)) 3 - (cat:crpr 0 (cat:d 56) 0 (cat:d 56))))))) + (cat:cat-init) + (let* ((f (cat:aw (cat:soft-delta-infinity) + (cat:soft-delta-infinity))) + (cf (cat:vrtc-bar f))) + (cat:? cf 6 (cat:abar 3 (cat:crpr 0 (cat:d 7) 0 (cat:d 7)) 3 + (cat:crpr 0 (cat:d 56) 0 (cat:d 56))))))) (test hmtp-vrtc-bar-intr (progn - (cat:cat-init) - (let* ((ez (cat:ez (cat:delta-infinity) (cat:delta-infinity))) - (h (cat:h ez)) - (gf (cat:cmps (cat:g ez) (cat:f ez))) - (r (cat:hmtp-vrtc-bar-intr h gf))) - (funcall r 3 (cat:abar 3 (cat:crpr 0 7 0 7))) - (funcall r 9 (cat:abar 3 (cat:crpr 0 7 0 7) 3 (cat:crpr 0 14 0 14) - 3 (cat:crpr 0 14 0 14)))))) + (cat:cat-init) + (let* ((ez (cat:ez (cat:delta-infinity) (cat:delta-infinity))) + (h (cat:h ez)) + (gf (cat:cmps (cat:g ez) (cat:f ez))) + (r (cat:hmtp-vrtc-bar-intr h gf))) + (funcall r 3 (cat:abar 3 (cat:crpr 0 7 0 7))) + (funcall r 9 (cat:abar 3 (cat:crpr 0 7 0 7) 3 (cat:crpr 0 14 0 14) + 3 (cat:crpr 0 14 0 14)))))) (test vrtc-bar1