summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Wisniowski <matthias.wisniowski@gmail.com>2012-05-11 10:33:20 +0200
committerMatthias Wisniowski <matthias.wisniowski@gmail.com>2012-05-11 10:33:20 +0200
commit52ac93c46e9f52798a2c4e472c29cc8f131e2bdd (patch)
treeeef5edfdf50deb4b6896a73202faf38d673da98d
parent858b0cbc8800d695ddd3797d5eccd9a4205ecc5d (diff)
downloadffp-52ac93c46e9f52798a2c4e472c29cc8f131e2bdd.tar.gz
ffp-52ac93c46e9f52798a2c4e472c29cc8f131e2bdd.tar.bz2
ffp-52ac93c46e9f52798a2c4e472c29cc8f131e2bdd.zip
Methoden-namen lt lva seite angepasst. Angabe für 6
-rw-r--r--AufgabeFFP5.hs8
-rw-r--r--AufgabeFFP6.pdfbin0 -> 37916 bytes
2 files changed, 4 insertions, 4 deletions
diff --git a/AufgabeFFP5.hs b/AufgabeFFP5.hs
index 78ed0fe..430fb22 100644
--- a/AufgabeFFP5.hs
+++ b/AufgabeFFP5.hs
@@ -97,18 +97,18 @@ divideAndConquer indiv solve divide combine initPb = dAC initPb
97-- 4. 97-- 4.
98------------------------------------------------------------------------------- 98-------------------------------------------------------------------------------
99 99
100miIndiv :: [a] -> Bool 100mi_indiv :: [a] -> Bool
101miIndiv a = length a <= 1 101miIndiv a = length a <= 1
102 102
103miSolve :: (Ix a, Show a) => (b -> Bool) -> [(a,b)] -> [(a,b)] 103mi_solve :: (Ix a, Show a) => (b -> Bool) -> [(a,b)] -> [(a,b)]
104miSolve wf [(a,b)] 104miSolve wf [(a,b)]
105 | wf b = [(a,b)] 105 | wf b = [(a,b)]
106 | otherwise = [] 106 | otherwise = []
107 107
108miDivide :: [a] -> [[a]] 108mi_divide :: [a] -> [[a]]
109miDivide (x:xs) = [[x], xs] 109miDivide (x:xs) = [[x], xs]
110 110
111miCombine :: [a] -> [[a]] -> [a] 111mi_combine :: [a] -> [[a]] -> [a]
112miCombine _ [] = error "No matching index" 112miCombine _ [] = error "No matching index"
113miCombine a (x:xs) 113miCombine a (x:xs)
114 | null x = miCombine a xs 114 | null x = miCombine a xs
diff --git a/AufgabeFFP6.pdf b/AufgabeFFP6.pdf
new file mode 100644
index 0000000..0fe111b
--- /dev/null
+++ b/AufgabeFFP6.pdf
Binary files differ