up

Author: xieyuheng

examples/factorial-half.test.lisp

@@ -1,5 +1,5 @@
 (import add mul "nat-church.lisp")
-(import zero one two three four "nat-church.lisp")
+(import zero one two three four five "nat-church.lisp")
 
 (import factorial "factorial-half.lisp")
 
@@ -8,3 +8,4 @@
 (assert-equal (factorial two) two)
 (assert-equal (factorial three) (mul three two))
 (assert-equal (factorial four) (mul four (mul three two)))
+(assert-equal (factorial five) (mul five (mul four (mul three two))))

examples/factorial-wrap.test.lisp

@@ -1,5 +1,5 @@
 (import zero? add mul sub1 "nat-church.lisp")
-(import zero one two three four "nat-church.lisp")
+(import zero one two three four five "nat-church.lisp")
 (import if true false "bool.lisp")
 (import Y turing "fixpoint.lisp")
 
@@ -10,12 +10,14 @@
 (assert-equal ((Y factorial-wrap) two) two)
 (assert-equal ((Y factorial-wrap) three) (mul three two))
 (assert-equal ((Y factorial-wrap) four) (mul four (mul three two)))
+(assert-equal ((Y factorial-wrap) five) (mul five (mul four (mul three two))))
 
 (assert-equal ((turing factorial-wrap) zero) one)
 (assert-equal ((turing factorial-wrap) one) one)
 (assert-equal ((turing factorial-wrap) two) two)
 (assert-equal ((turing factorial-wrap) three) (mul three two))
 (assert-equal ((turing factorial-wrap) four) (mul four (mul three two)))
+(assert-equal ((turing factorial-wrap) five) (mul five (mul four (mul three two))))
 
 (import factorial "factorial-wrap.lisp")
 

examples/factorial.test.lisp

@@ -1,5 +1,5 @@
 (import add mul "nat-church.lisp")
-(import zero one two three four "nat-church.lisp")
+(import zero one two three four five "nat-church.lisp")
 
 (import factorial "factorial.lisp")
 
@@ -8,6 +8,7 @@
 (assert-equal (factorial two) two)
 (assert-equal (factorial three) (mul three two))
 (assert-equal (factorial four) (mul four (mul three two)))
+(assert-equal (factorial five) (mul five (mul four (mul three two))))
 
 ;; test equivalence between recursive functions
 

examples/nat-parigot.lisp

@@ -53,7 +53,5 @@
 (assert-equal (factorial one) one)
 (assert-equal (factorial two) two)
 (assert-equal (factorial three) (mul three two))
-
-;; The following number is huge! Sorry~
-
-;; (assert-equal (factorial four) (mul four (mul three two)))
+(assert-equal (factorial four) (mul four (mul three two)))
+(assert-equal (factorial five) (mul five (mul four (mul three two))))