From 862e37b2e39932ef7ef38d54d5da3abb2722c503 Mon Sep 17 00:00:00 2001 From: ik1g19 <ik1g19@soton.ac.uk> Date: Tue, 29 Dec 2020 18:52:53 +0000 Subject: [PATCH] fixed addToGrid --- cw/src/Challenges.hs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cw/src/Challenges.hs b/cw/src/Challenges.hs index 9c50038..1948480 100644 --- a/cw/src/Challenges.hs +++ b/cw/src/Challenges.hs @@ -166,9 +166,11 @@ insertString rg s gen | elemAt rg (x,y) /= Rand && ((x,y),newGen) = generatePos gen (length rg) vDirs = validDirs rg s (x,y) - addToGrid :: Orientation -> String -> (Int,Int) -> RandGrid - addToGrid dir (c:cs) (x',y') = addToGrid dir cs charAdded (nextPos dir (x',y')) + addToGrid :: Orientation -> String -> RandGrid -> (Int,Int) -> RandGrid + addToGrid dir (c:[]) rg (x',y') = insertAt2D (Letter c) (x',y') rg + addToGrid dir (c:cs) rg (x',y') = addToGrid dir cs charAdded (nextPos dir (x',y')) where + charAdded :: RandGrid charAdded = insertAt2D (Letter c) (x',y') rg --addToGrid dir = map (\(c,(m,n)) -> insertAt2D (Letter c) (m,n) rg) (zip s (take (length s) $ iterate (nextPos dir) (x,y))) -- GitLab