From 09106af9d56a910cd20a4dbaaa36429b94c7917c Mon Sep 17 00:00:00 2001 From: manuel Date: Fri, 20 Apr 2012 11:31:52 +0200 Subject: fix gzs from AufgabeFFP2 --- AufgabeFFP2.hs | 2 +- TestAufgabeFFP2.hs | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/AufgabeFFP2.hs b/AufgabeFFP2.hs index aef3bfb..1dbf2ca 100644 --- a/AufgabeFFP2.hs +++ b/AufgabeFFP2.hs @@ -98,4 +98,4 @@ gz n -- goedel-number generator gzs :: [Integer] -gzs = map gz [0..] +gzs = map gz [1..] diff --git a/TestAufgabeFFP2.hs b/TestAufgabeFFP2.hs index ef6d48a..1131e04 100644 --- a/TestAufgabeFFP2.hs +++ b/TestAufgabeFFP2.hs @@ -29,8 +29,11 @@ cases3 = TestLabel "fMT/f" $ TestList [ cases4 = TestLabel "gz/gzs" $ TestList [ TestCase $ assertEqual "gz 42" 144 (gz 42), TestCase $ assertEqual "gz 402" 400 (gz 402), - TestCase $ assertEqual "gzs!!42" 144 (gzs!!42), - TestCase $ assertEqual "gzs!!402" 400 (gzs!!402) + TestCase $ assertEqual "gzs!!42" 432 (gzs!!42), + TestCase $ assertEqual "gzs!!402" 2000 (gzs!!402), + TestCase $ assertEqual "take 7 gzs" [2,4,8,16,32,64,128] (take 7 gzs), + TestCase $ assertEqual "take 20 gzs" [gz i|i<-[1..20]] (take 20 gzs), + TestCase $ assertEqual "(sum.take 100) gzs" 30174552 ((sum.take 100) gzs) ] tests :: [Test] -- cgit v1.2.3