From 431e5c6cbc7d6fa745d841d7943ae4b1f63901e4 Mon Sep 17 00:00:00 2001 From: manuel Date: Fri, 23 Mar 2012 19:10:34 +0100 Subject: implement fibspd ==> aufgabe1 done --- AufgabeFFP1.hs | 5 +++++ TestAufgabeFFP1.hs | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/AufgabeFFP1.hs b/AufgabeFFP1.hs index b393fc2..705dce1 100644 --- a/AufgabeFFP1.hs +++ b/AufgabeFFP1.hs @@ -43,3 +43,8 @@ fibdiag (n) fibdiags :: [[Integer]] fibdiags = map (fibdiag) [1,2..] + +------------------------------------------------------------------------------- + +fibspd :: [Integer] +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] ------------------------------------------------------------------------------- +fibspd1 :: Test +fibspd1 = TestCase (assertEqual "fibspd" + [1,1,2,3,5,8,13,21,34,55,89,144,233,377,610,987,1597,2584,4181,6765,10946,17711,28657] + (take 23 fibspd)) + +fibspdTests = TestList [fibspd1] + +------------------------------------------------------------------------------- + tests :: [Test] -tests = [pof2s1, pdTests, fibdiagTests, fibdiagsTests] +tests = [pof2s1, pdTests, fibdiagTests, fibdiagsTests, fibspdTests] main = do forM tests $ \test -> -- cgit v1.2.3