From 352b1be3f2e91870191d548318e842fdab3dc5e3 Mon Sep 17 00:00:00 2001
From: Stefan Dresselhaus <sdressel@techfak.uni-bielefeld.de>
Date: Mon, 25 Apr 2016 17:10:10 +0200
Subject: [PATCH] fixed error

---
 Übungen/Blatt2.hs  |   4 +-
 Übungen/Blatt2.lhs |  88 +++++++++++++++++++++-----------------------
 Übungen/Blatt2.md  |   4 +-
 Übungen/Blatt2.pdf | Bin 124402 -> 124401 bytes
 4 files changed, 45 insertions(+), 51 deletions(-)

diff --git a/Übungen/Blatt2.hs b/Übungen/Blatt2.hs
index e6d1456..e9bfb68 100644
--- a/Übungen/Blatt2.hs
+++ b/Übungen/Blatt2.hs
@@ -57,8 +57,8 @@ mystery3 f a l = post a l'
    where
      l' = map f l
      post a (x:xs)
-         | a == x    = x ++ post a xs
-         | otherwise =      post a xs
+         | a == x    = x : post a xs
+         | otherwise =     post a xs
      post _ [] = []
 
 mystery4 :: (Int -> Bool)
diff --git a/Übungen/Blatt2.lhs b/Übungen/Blatt2.lhs
index 828518a..981882d 100644
--- a/Übungen/Blatt2.lhs
+++ b/Übungen/Blatt2.lhs
@@ -6,10 +6,8 @@ Throat-Clearing
 
 a.k.a. Imports, damit der Code funktioniert.
 
-``` {.haskell}
-import Data.Functor
-import Data.Monoid
-```
+> import Data.Functor
+> import Data.Monoid
 
 Functor
 -------
@@ -23,20 +21,18 @@ Erinnerung:
 Nehmen sie an, sie hätten folgende Datentypen gegeben, für die alle eine
 `Functor`-Instanz existiert und eindeutig ist:
 
-``` {.haskell}
-data Identity a = Identity { unIdentity :: a }
-
-data Vielleicht a = Etwas a
-                  | Nichts
-
-data EntwederOder b a = Entweder a
-                      | Oder b
-
-data GameVector b a = V3 a a a
-                    | VStrange [a]
-                    | Neighbours [GameVector b a]
-                    | EntwederOder b (GameVector b a)
-```
+> data Identity a = Identity { unIdentity :: a }
+> 
+> data Vielleicht a = Etwas a
+>                   | Nichts
+>
+> data EntwederOder b a = Entweder a
+>                       | Oder b
+> 
+> data GameVector b a = V3 a a a
+>                     | VStrange [a]
+>                     | Neighbours [GameVector b a]
+>                     | EntwederOder b (GameVector b a)
 
 Schreiben sie hierzu die jeweiligen `Functor`-Instanzen.
 
@@ -52,35 +48,33 @@ Kann die Funktion nachher mehr als vorher?
 
 *Bonus*: Hat sich an der Laufzeit etwas verändert?
 
-``` {.haskell}
-mystery1 :: [[a]] -> [[a]]
-mystery1 = map (++[])
-
-mystery2 :: (Eq a) => a -> a -> a -> Bool
-mystery2 x y z
-  | x == y || y == z = True
-  | x == y && y == z = True
-  | x /= z           = False
-  | y /= z           = False
-  | x == y || y /= z = True
-  | otherwise        = False
-
-mystery3 :: Eq a => (a -> a) -> a -> [a] -> [a]
-mystery3 f a l = post a l'
-   where
-     l' = map f l
-     post a (x:xs)
-         | a == x    = x ++ post a xs
-         | otherwise =      post a xs
-     post _ [] = []
-
-mystery4 :: (Int -> Bool)
-         -> Vielleicht (EntwederOder String Int)
-         -> Vielleicht (EntwederOder String Bool)
-mystery4 f (Etwas (Entweder a)) = Etwas . Entweder . f $ a
-mystery4 _ (Etwas (Oder b))     = Etwas (Oder b)
-mystery4 _  Nichts              = Nichts
-```
+> mystery1 :: [[a]] -> [[a]]
+> mystery1 = map (++[])
+> 
+> mystery2 :: (Eq a) => a -> a -> a -> Bool
+> mystery2 x y z
+>   | x == y || y == z = True
+>   | x == y && y == z = True
+>   | x /= z           = False
+>   | y /= z           = False
+>   | x == y || y /= z = True
+>   | otherwise        = False
+> 
+> mystery3 :: Eq a => (a -> a) -> a -> [a] -> [a]
+> mystery3 f a l = post a l'
+>    where
+>      l' = map f l
+>      post a (x:xs)
+>          | a == x    = x : post a xs
+>          | otherwise =     post a xs
+>      post _ [] = []
+> 
+> mystery4 :: (Int -> Bool)
+>          -> Vielleicht (EntwederOder String Int)
+>          -> Vielleicht (EntwederOder String Bool)
+> mystery4 f (Etwas (Entweder a)) = Etwas . Entweder . f $ a
+> mystery4 _ (Etwas (Oder b))     = Etwas (Oder b)
+> mystery4 _  Nichts              = Nichts
 
 Bonus
 -----
diff --git a/Übungen/Blatt2.md b/Übungen/Blatt2.md
index 3d70061..2fe9849 100644
--- a/Übungen/Blatt2.md
+++ b/Übungen/Blatt2.md
@@ -62,8 +62,8 @@ mystery3 f a l = post a l'
    where
      l' = map f l
      post a (x:xs)
-         | a == x    = x ++ post a xs
-         | otherwise =      post a xs
+         | a == x    = x : post a xs
+         | otherwise =     post a xs
      post _ [] = []
 
 mystery4 :: (Int -> Bool)
diff --git a/Übungen/Blatt2.pdf b/Übungen/Blatt2.pdf
index 38f29620b1de38d590741aeb5e40c9034feadef8..0f0d2490fff74416204246cb09a2a61febdaffb5 100644
GIT binary patch
delta 2091
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
V$q<N_$>jkc2{<_lB_%~qMhYXr;Zgtq

delta 2090
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
U5RjM1<pCfGIWP((B}Gq03byd(vH$=8