From e69ce73532aacaeda9958ac523ab7e49e9470ce1 Mon Sep 17 00:00:00 2001 From: manuel Date: Mon, 14 May 2012 13:49:11 +0200 Subject: implement tits-operator (./.) --- AufgabeFFP6.hs | 3 +++ TestAufgabeFFP6.hs | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/AufgabeFFP6.hs b/AufgabeFFP6.hs index ff16ba8..49d4e41 100644 --- a/AufgabeFFP6.hs +++ b/AufgabeFFP6.hs @@ -3,6 +3,9 @@ where import Data.Array +(./.) :: Int -> Int -> Int +(./.) = div + myfoldl :: [(a -> b -> a)] -> a -> [b] -> a myfoldl _ z [] = z myfoldl (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 [ TestCase $ assertEqual "eval2" (5) (eval (array (1,3) [(1,1), (2,2), (3,3)]) (array (1,2) [(1,(*)), (2,(+))])), TestCase $ assertEqual "eval3" (-3) - (eval (array (1,3) [(1,1), (2,2), (3,3)]) (array (1,2) [(1,(-)), (2,(*))])) + (eval (array (1,3) [(1,1), (2,2), (3,3)]) (array (1,2) [(1,(-)), (2,(*))])), + TestCase $ assertEqual "eval4" (-1) + (eval (array (1,6) [(1,3), (2,5), (3,2), (4,-2), (5,7), (6,0)]) (array (1,5) [(1,(+)), (2,(./.)), (3,(*)), (4,(+)), (5,(-))])), + TestCase $ assertEqual "eval5" (1) + (eval (array (1,6) [(1,3), (2,5), (3,2), (4,-2), (5,7), (6,0)]) (array (1,5) [(1,(*)), (2,(-)), (3,(+)), (4,(./.)), (5,(+))])), + TestCase $ assertEqual "eval6" (-5) + (eval (array (1,6) [(1,4), (2,2), (3,3), (4,-4), (5,5), (6,2)]) (array (1,5) [(1,(+)), (2,(./.)), (3,(*)), (4,(+)), (5,(-))])), + TestCase $ assertEqual "eval7" (2) + (eval (array (1,6) [(1,4), (2,2), (3,3), (4,-4), (5,5), (6,2)]) (array (1,5) [(1,(*)), (2,(-)), (3,(+)), (4,(./.)), (5,(+))])) ] tests :: [Test] -- cgit v1.2.3