The *CMBN-CONTROL* variable was ignored in DO-CONTROL. Fixed.
Added missing tests.
This commit is contained in:
parent
c95825279c
commit
d3dce67ea4
@ -4,16 +4,6 @@
|
||||
(in-suite :kenzo)
|
||||
|
||||
|
||||
#|
|
||||
(do-control #'s-cmpr (cmbn 0 1 'a 1 'b -1 'c))
|
||||
(do-control #'s-cmpr (cmbn 0 1 'b 1 'b -1 'c))
|
||||
(do-control #'s-cmpr (cmbn 0 1 'a 1 'b -1 'b))
|
||||
(setf *cmbn-control* nil)
|
||||
(control #'s-cmpr (cmbn 0 1 'a 1 'b -1 'b))
|
||||
(setf *cmbn-control* t)
|
||||
(control #'s-cmpr (cmbn 0 1 'a 1 'b -1 'b))
|
||||
|#
|
||||
|
||||
(test do-control
|
||||
(let ((comb (cat:do-control #'cat:s-cmpr (cat:cmbn 0 1 'a 1 'b -1 'c))))
|
||||
(is (equal (cat:cmbn-degr comb) 0))
|
||||
@ -25,8 +15,12 @@
|
||||
(signals simple-error (cat:do-control #'cat:s-cmpr
|
||||
(cat:cmbn 0 1 'a 1 'b -1 'b)))
|
||||
|
||||
(setf cat:*cmbn-control* nil))
|
||||
|
||||
(setf cat:*cmbn-control* nil)
|
||||
(is (not (null (cat:do-control #'cat:s-cmpr
|
||||
(cat:cmbn 0 1 'a 1 'b -1 'b)))))
|
||||
(setf cat:*cmbn-control* t)
|
||||
(signals simple-error (cat:do-control #'cat:s-cmpr
|
||||
(cat:cmbn 0 1 'a 1 'b -1 'b))))
|
||||
|
||||
(test gnrt-?
|
||||
(progn
|
||||
@ -43,9 +37,7 @@
|
||||
:intr #'(lambda (degr n)
|
||||
(cat:cmbn degr 1 n))
|
||||
:strt :gnrt :orgn '(test))))
|
||||
;; setting this to a small value (-1) triggers some kind
|
||||
;; of caching which appears to be broken (???)
|
||||
(setf cat:+too-much-time+ 50)
|
||||
(setf cat:+too-much-time+ -1)
|
||||
(dotimes (i 20)
|
||||
(let* ((n (- (random 50) 50))
|
||||
(comb (cat:gnrt-? ff 0 n)))
|
||||
@ -89,7 +81,4 @@
|
||||
(setq comb (cat:cmbn-? mrph comb))
|
||||
(setq comb (cat:cmbn-? mrph comb))
|
||||
(setq comb (cat:cmbn-? mrph comb))
|
||||
(setq comb (cat:cmbn-? mrph comb))
|
||||
;; (time (cat:cmbn-? mrph *))
|
||||
;; (inspect mrph)
|
||||
))))
|
||||
(setq comb (cat:cmbn-? mrph comb))))))
|
||||
|
||||
Loading…
Reference in New Issue
Block a user