summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormanuel <manuel@mausz.at>2012-04-20 11:31:52 +0200
committermanuel <manuel@mausz.at>2012-04-20 11:31:52 +0200
commit09106af9d56a910cd20a4dbaaa36429b94c7917c (patch)
tree06f96e703747ea1d4f499662b5767d4f644fe625
parent610f2a8993109c059f89f708e73d5aa65fd5a572 (diff)
downloadffp-09106af9d56a910cd20a4dbaaa36429b94c7917c.tar.gz
ffp-09106af9d56a910cd20a4dbaaa36429b94c7917c.tar.bz2
ffp-09106af9d56a910cd20a4dbaaa36429b94c7917c.zip
fix gzs from AufgabeFFP2
-rw-r--r--AufgabeFFP2.hs2
-rw-r--r--TestAufgabeFFP2.hs7
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
98 98
99-- goedel-number generator 99-- goedel-number generator
100gzs :: [Integer] 100gzs :: [Integer]
101gzs = map gz [0..] 101gzs = 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 [
29cases4 = TestLabel "gz/gzs" $ TestList [ 29cases4 = TestLabel "gz/gzs" $ TestList [
30 TestCase $ assertEqual "gz 42" 144 (gz 42), 30 TestCase $ assertEqual "gz 42" 144 (gz 42),
31 TestCase $ assertEqual "gz 402" 400 (gz 402), 31 TestCase $ assertEqual "gz 402" 400 (gz 402),
32 TestCase $ assertEqual "gzs!!42" 144 (gzs!!42), 32 TestCase $ assertEqual "gzs!!42" 432 (gzs!!42),
33 TestCase $ assertEqual "gzs!!402" 400 (gzs!!402) 33 TestCase $ assertEqual "gzs!!402" 2000 (gzs!!402),
34 TestCase $ assertEqual "take 7 gzs" [2,4,8,16,32,64,128] (take 7 gzs),
35 TestCase $ assertEqual "take 20 gzs" [gz i|i<-[1..20]] (take 20 gzs),
36 TestCase $ assertEqual "(sum.take 100) gzs" 30174552 ((sum.take 100) gzs)
34 ] 37 ]
35 38
36tests :: [Test] 39tests :: [Test]