From 097873d88c8efc3f81ef7a3700fb308b56827f99 Mon Sep 17 00:00:00 2001
From: Gerd Heber <gheber@hdfgroup.org>
Date: Fri, 10 Jul 2015 19:51:08 -0500
Subject: [PATCH] The previous commit (type declaration) fixes a bunch of
 tests.

---
 kenzo-test.asd      |  7 ++++++-
 run-kenzo-test.lisp |  3 +++
 test/bar-test.lisp  | 18 +++++++-----------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/kenzo-test.asd b/kenzo-test.asd
index 1ff5fdd..d50eefe 100644
--- a/kenzo-test.asd
+++ b/kenzo-test.asd
@@ -9,6 +9,7 @@
   :pathname #P"test/"
   :components ((:file "package")
 	       (:file "common")
+	       #|
 	       (:file "combinations-test")
 	       (:file "various-test")
 	       (:file "chain-complexes-test")
@@ -21,7 +22,11 @@
 	       (:file "homology-groups-test")
 	       (:file "searching-homology-test")
 	       (:file "delta-test")
+	       |#
 	       (:file "bar-test")
+	       #|
 	       (:file "cartesian-products-test")
 	       (:file "cones-test")
-	       (:file "cl-space-efhm-test")))
+	       (:file "cl-space-efhm-test")
+	       |#
+	       ))
diff --git a/run-kenzo-test.lisp b/run-kenzo-test.lisp
index 9a872ef..7e7af87 100644
--- a/run-kenzo-test.lisp
+++ b/run-kenzo-test.lisp
@@ -1,6 +1,9 @@
 (require 'asdf)
 
+(declaim (optimize (speed 0) (space 0) (debug 3)))
+
 (asdf:operate 'asdf:load-op 'kenzo-test)
+
 (fiveam:run!)
 
 #+ccl(quit)
diff --git a/test/bar-test.lisp b/test/bar-test.lisp
index ed14550..3a5cd94 100644
--- a/test/bar-test.lisp
+++ b/test/bar-test.lisp
@@ -82,7 +82,6 @@
 				     abar))))))))
 
 
-#|
 (test bar-intr-hrzn-dffr
       (let* ((k (cat:k-z-1))
 	     (r (cat:bar-intr-hrzn-dffr (cat:aprd k))))
@@ -99,13 +98,13 @@
 	(let ((h (cat:bar-hrzn-dffr (cat:k-z-1)))
 	      (abar))
 	  (dotimes (i 10)
-	    (print (random-abar1 10 5)))
-	  (setf abar (random-abar1 10 5))
+	    (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-abar1 10 3))
+	    (setf abar (random-abar 10 3))
 	    (print abar)
 	    (print (cat:? h (apply #'+ (mapcar #'car (cat:abar-list abar)))
 			  abar))
@@ -118,12 +117,12 @@
       (progn
 	(cat:cat-init)
 	(let ((b (cat:bar (cat:k-z-1)))
-	      (abar (random-abar1 10 3)))
+	      (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-abar1 10 3)))
+	    (let ((abar (random-abar 10 3)))
 	      (print abar)
 	      (print (cat:? b (apply #'+ (mapcar #'car (cat:abar-list abar)))
 			    abar))
@@ -133,7 +132,6 @@
 						      (cat:abar-list abar)))
 				   abar))))))))
 
-|#
 
 (test ncmbn-bar
       (cat:ncmbn-bar nil)
@@ -200,7 +198,6 @@
   (check-rdct))
 
 #|
-
 (test vrtc-bar
       (progn
 	(cat:cat-init)
@@ -253,12 +250,11 @@
 	  (aleat-tc)
 	  (aleat-bc)
 	  (loop (c))))) ;; degrees >= 15 is possible => error.
+|#
 
-(test bar
+(test homology
       (progn
 	(cat:cat-init)
 	(let* ((h (cat:efhm (cat:k-z-1)))
 	       (b (cat:bar h)))
-	  ;;(inspect b)
 	  (cat:homology (cat:rbcc b) 0 11))))
-|#