summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AufgabeFFP6.hs3
-rw-r--r--TestAufgabeFFP6.hs10
2 files changed, 12 insertions, 1 deletions
diff --git a/AufgabeFFP6.hs b/AufgabeFFP6.hs
index ff16ba8..49d4e41 100644
--- a/AufgabeFFP6.hs
+++ b/AufgabeFFP6.hs
@@ -3,6 +3,9 @@ where
3 3
4import Data.Array 4import Data.Array
5 5
6(./.) :: Int -> Int -> Int
7(./.) = div
8
6myfoldl :: [(a -> b -> a)] -> a -> [b] -> a 9myfoldl :: [(a -> b -> a)] -> a -> [b] -> a
7myfoldl _ z [] = z 10myfoldl _ z [] = z
8myfoldl (f:fs) z (x:xs) = myfoldl fs (f z x) xs 11myfoldl (f:fs) z (x:xs) = myfoldl fs (f z x) xs
diff --git a/TestAufgabeFFP6.hs b/TestAufgabeFFP6.hs
index 86bd75d..77cae92 100644
--- a/TestAufgabeFFP6.hs
+++ b/TestAufgabeFFP6.hs
@@ -11,7 +11,15 @@ cases1 = TestLabel "eval" $ TestList [
11 TestCase $ assertEqual "eval2" (5) 11 TestCase $ assertEqual "eval2" (5)
12 (eval (array (1,3) [(1,1), (2,2), (3,3)]) (array (1,2) [(1,(*)), (2,(+))])), 12 (eval (array (1,3) [(1,1), (2,2), (3,3)]) (array (1,2) [(1,(*)), (2,(+))])),
13 TestCase $ assertEqual "eval3" (-3) 13 TestCase $ assertEqual "eval3" (-3)
14 (eval (array (1,3) [(1,1), (2,2), (3,3)]) (array (1,2) [(1,(-)), (2,(*))])) 14 (eval (array (1,3) [(1,1), (2,2), (3,3)]) (array (1,2) [(1,(-)), (2,(*))])),
15 TestCase $ assertEqual "eval4" (-1)
16 (eval (array (1,6) [(1,3), (2,5), (3,2), (4,-2), (5,7), (6,0)]) (array (1,5) [(1,(+)), (2,(./.)), (3,(*)), (4,(+)), (5,(-))])),
17 TestCase $ assertEqual "eval5" (1)
18 (eval (array (1,6) [(1,3), (2,5), (3,2), (4,-2), (5,7), (6,0)]) (array (1,5) [(1,(*)), (2,(-)), (3,(+)), (4,(./.)), (5,(+))])),
19 TestCase $ assertEqual "eval6" (-5)
20 (eval (array (1,6) [(1,4), (2,2), (3,3), (4,-4), (5,5), (6,2)]) (array (1,5) [(1,(+)), (2,(./.)), (3,(*)), (4,(+)), (5,(-))])),
21 TestCase $ assertEqual "eval7" (2)
22 (eval (array (1,6) [(1,4), (2,2), (3,3), (4,-4), (5,5), (6,2)]) (array (1,5) [(1,(*)), (2,(-)), (3,(+)), (4,(./.)), (5,(+))]))
15 ] 23 ]
16 24
17tests :: [Test] 25tests :: [Test]