diff options
| author | manuel <manuel@mausz.at> | 2012-03-23 19:10:34 +0100 |
|---|---|---|
| committer | manuel <manuel@mausz.at> | 2012-03-23 19:10:34 +0100 |
| commit | 431e5c6cbc7d6fa745d841d7943ae4b1f63901e4 (patch) | |
| tree | 8a3a623c1d56b5698084540a7e954da7366cd62f | |
| parent | c9e70808546f2a6b58e1729d64e7ae8bbc17a98e (diff) | |
| download | ffp-431e5c6cbc7d6fa745d841d7943ae4b1f63901e4.tar.gz ffp-431e5c6cbc7d6fa745d841d7943ae4b1f63901e4.tar.bz2 ffp-431e5c6cbc7d6fa745d841d7943ae4b1f63901e4.zip | |
implement fibspd
==> aufgabe1 done
| -rw-r--r-- | AufgabeFFP1.hs | 5 | ||||
| -rw-r--r-- | TestAufgabeFFP1.hs | 11 |
2 files changed, 15 insertions, 1 deletions
diff --git a/AufgabeFFP1.hs b/AufgabeFFP1.hs index b393fc2..705dce1 100644 --- a/AufgabeFFP1.hs +++ b/AufgabeFFP1.hs | |||
| @@ -43,3 +43,8 @@ fibdiag (n) | |||
| 43 | 43 | ||
| 44 | fibdiags :: [[Integer]] | 44 | fibdiags :: [[Integer]] |
| 45 | fibdiags = map (fibdiag) [1,2..] | 45 | fibdiags = map (fibdiag) [1,2..] |
| 46 | |||
| 47 | ------------------------------------------------------------------------------- | ||
| 48 | |||
| 49 | fibspd :: [Integer] | ||
| 50 | fibspd = map (\x -> sum x) fibdiags | ||
diff --git a/TestAufgabeFFP1.hs b/TestAufgabeFFP1.hs index 1fa5c35..4a38f3c 100644 --- a/TestAufgabeFFP1.hs +++ b/TestAufgabeFFP1.hs | |||
| @@ -67,8 +67,17 @@ fibdiagsTests = TestList [fibdiags1] | |||
| 67 | 67 | ||
| 68 | ------------------------------------------------------------------------------- | 68 | ------------------------------------------------------------------------------- |
| 69 | 69 | ||
| 70 | fibspd1 :: Test | ||
| 71 | fibspd1 = TestCase (assertEqual "fibspd" | ||
| 72 | [1,1,2,3,5,8,13,21,34,55,89,144,233,377,610,987,1597,2584,4181,6765,10946,17711,28657] | ||
| 73 | (take 23 fibspd)) | ||
| 74 | |||
| 75 | fibspdTests = TestList [fibspd1] | ||
| 76 | |||
| 77 | ------------------------------------------------------------------------------- | ||
| 78 | |||
| 70 | tests :: [Test] | 79 | tests :: [Test] |
| 71 | tests = [pof2s1, pdTests, fibdiagTests, fibdiagsTests] | 80 | tests = [pof2s1, pdTests, fibdiagTests, fibdiagsTests, fibspdTests] |
| 72 | 81 | ||
| 73 | main = do | 82 | main = do |
| 74 | forM tests $ \test -> | 83 | forM tests $ \test -> |
