jack
/
Minesweeper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring

This commit is contained in:
Jack Harley 2021-01-31 20:54:08 +00:00
parent 1ff9279f66
commit b7859f8ea7
3 changed files with 67 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Autosolver.hs
View File

@ -10,8 +10,8 @@ playAutoMove b | fst (nextMove b) == Uncover = uncover b $ snd (nextMove b)
| otherwise = b | otherwise = b
nextMove :: Board -> (MoveType, Square) nextMove :: Board -> (MoveType, Square)
nextMove b | not . null $ uncoverStrat1 b = (Uncover, head $ uncoverStrat1 b) nextMove b | not . null $ uncoverStrat b = (Uncover, head $ uncoverStrat b)
| not . null $ flagStrat1 b = (Flag, head $ flagStrat1 b) | not . null $ flagStrat b = (Flag, head $ flagStrat b)
| not . null $ uncoverStratFallback b = (Uncover, head $ uncoverStratFallback b) | not . null $ uncoverStratFallback b = (Uncover, head $ uncoverStratFallback b)
| otherwise = (None, (0,0)) | otherwise = (None, (0,0))
@ -21,21 +21,19 @@ nextMove b | not . null $ uncoverStrat1 b = (Uncover, head $ uncoverStrat1 b)
-- WHERE the number of adjacent mines == number of adjacent flags -- WHERE the number of adjacent mines == number of adjacent flags
-- WHERE number of adjacent covered squares > number of adjacent flags -- WHERE number of adjacent covered squares > number of adjacent flags
-- FIND adjacent squares -- FIND adjacent squares
-- WHICH are valid
-- WHICH are covered -- WHICH are covered
-- WHICH are not flagged -- WHICH are not flagged
uncoverStrat1 :: Board -> [Square] uncoverStrat :: Board -> [Square]
uncoverStrat1 b = uncoverStrat b =
filter (not. isFlagged b) $ filter (not. isFlagged b) $
filter (isCovered b) $ filter (isCovered b) $
filter (validSquare b) $ concatMap (adjacentSquares b) $
concatMap adjacentSquares $
filter (\s -> adjacentCovereds b s > adjacentFlags b s) $ filter (\s -> adjacentCovereds b s > adjacentFlags b s) $
filter (\s -> adjacentFlags b s == adjacentMines b s) $ filter (\s -> adjacentFlags b s == adjacentMines b s) $
filter (\s -> adjacentMines b s > 0) $ filter (\s -> adjacentMines b s > 0) $
uncoveredSquares b uncoveredSquares b
-- filter: (first covered square) -- filter:
-- covered squares -- covered squares
-- WHICH are not flagged -- WHICH are not flagged
uncoverStratFallback :: Board -> [Square] uncoverStratFallback :: Board -> [Square]
@ -48,20 +46,13 @@ uncoverStratFallback b =
-- WITH at least one adjacent mine -- WITH at least one adjacent mine
-- WHERE the number of adjacent mines == number of adjacent covered squares -- WHERE the number of adjacent mines == number of adjacent covered squares
-- FIND adjacent squares -- FIND adjacent squares
-- WHICH are valid
-- WHICH are covered -- WHICH are covered
-- WHICH are not already flagged -- WHICH are not already flagged
flagStrat1 :: Board -> [Square] flagStrat :: Board -> [Square]
flagStrat1 b = flagStrat b =
filter (not. isFlagged b) $ filter (not. isFlagged b) $
filter (isCovered b) $ filter (isCovered b) $
filter (validSquare b) $ concatMap (adjacentSquares b) $
concatMap adjacentSquares $
filter (\s -> adjacentMines b s == adjacentCovereds b s) $ filter (\s -> adjacentMines b s == adjacentCovereds b s) $
filter (\s -> adjacentMines b s > 0) $ filter (\s -> adjacentMines b s > 0) $
uncoveredSquares b uncoveredSquares b
-- if number of adjacent mines == number of adjacent flags, it's safe to uncover all adjacent non-flagged squares
adjacentMinesAccountedFor :: Board -> Square -> Bool
adjacentMinesAccountedFor b (r,c) = adjacentMines b (r,c) == adjacentFlags b (r,c)

2
src/Main.hs
View File

@ -69,12 +69,10 @@ setup w = void $ do
#+ [string $ squareAscii b (r,c)] #+ [string $ squareAscii b (r,c)]
on UI.click cell $ \_ -> do on UI.click cell $ \_ -> do
--liftIO $ putStrLn $ "Click (" ++ show r ++ "," ++ show c ++ ")"
liftIO $ modifyIORef' iob $ \oldB -> uncover oldB (r,c) liftIO $ modifyIORef' iob $ \oldB -> uncover oldB (r,c)
refresh iob refresh iob
on UI.contextmenu cell $ \_ -> do on UI.contextmenu cell $ \_ -> do
--liftIO $ putStrLn $ "Right Click (" ++ show r ++ "," ++ show c ++ ")"
liftIO $ modifyIORef' iob $ \oldB -> flag oldB (r,c) liftIO $ modifyIORef' iob $ \oldB -> flag oldB (r,c)
refresh iob refresh iob

87
src/Minesweeper.hs
View File

@ -60,24 +60,22 @@ weightedRandomBool rng p = (generatedFloat <= p, newRng)
-- returns True if the given square has a mine, otherwise False -- returns True if the given square has a mine, otherwise False
hasMine :: Board -> Square -> Bool hasMine :: Board -> Square -> Bool
hasMine b (r,c) | validSquare b (r,c) = (mines b !! r) !! c hasMine b (r,c) | validSquare b (r,c) = (mines b !! r) !! c
| otherwise = False | otherwise = error "square out of board bounds"
-- returns True if the given square is uncovered, otherwise False -- returns True if the given square is uncovered, otherwise False
isUncovered :: Board -> Square -> Bool isUncovered :: Board -> Square -> Bool
isUncovered b (r,c) | validSquare b (r,c) = (uncovered b !! r) !! c isUncovered b (r,c) | validSquare b (r,c) = (uncovered b !! r) !! c
| otherwise = True -- We return True when the requested square does not exist as a useful | otherwise = error "square out of board bounds"
-- hack so that adjacent mine numbers are not shown on the edge of the
-- board grid
-- returns True if the given square is covered, otherwise False -- returns True if the given square is covered, otherwise False
isCovered :: Board -> Square -> Bool isCovered :: Board -> Square -> Bool
isCovered b (r,c) | validSquare b (r,c) = not $ (uncovered b !! r) !! c isCovered b (r,c) | validSquare b (r,c) = not $ (uncovered b !! r) !! c
| otherwise = False | otherwise = error "square out of board bounds"
-- returns True if the given square is flagged, otherwise False -- returns True if the given square is flagged, otherwise False
isFlagged :: Board -> Square -> Bool isFlagged :: Board -> Square -> Bool
isFlagged b (r,c) | validSquare b (r,c) = (flagged b !! r) !! c isFlagged b (r,c) | validSquare b (r,c) = (flagged b !! r) !! c
| otherwise = False | otherwise = error "square out of board bounds"
-- returns True if the given square is within the bounds of the board -- returns True if the given square is within the bounds of the board
validSquare :: Board -> Square -> Bool validSquare :: Board -> Square -> Bool
@ -89,23 +87,24 @@ onEdge b (r,c) = r == 0 || c == 0 || r+1 == size b || c+1 == size b
-- returns the number of mines adjacent to the given square -- returns the number of mines adjacent to the given square
adjacentMines :: Board -> Square -> Int adjacentMines :: Board -> Square -> Int
adjacentMines b (r,c) = sum $ map (boolToInt . hasMine b) $ adjacentSquares (r,c) adjacentMines b s = sum $ map (boolToInt . hasMine b) $ adjacentSquares b s
-- returns the number of flagged squares adjacent to the given square -- returns the number of flagged squares adjacent to the given square
adjacentFlags :: Board -> Square -> Int adjacentFlags :: Board -> Square -> Int
adjacentFlags b (r,c) = sum $ map (boolToInt . isFlagged b) $ adjacentSquares (r,c) adjacentFlags b s = sum $ map (boolToInt . isFlagged b) $ adjacentSquares b s
-- returns the number of covered squares adjacent to the given square -- returns the number of covered squares adjacent to the given square
adjacentCovereds :: Board -> Square -> Int adjacentCovereds :: Board -> Square -> Int
adjacentCovereds b (r,c) = sum $ map (boolToInt . isCovered b) $ adjacentSquares (r,c) adjacentCovereds b s = sum $ map (boolToInt . isCovered b) $ adjacentSquares b s
-- returns true if the given square is adjacent to a covered square -- returns true if the given square is adjacent to a covered square
adjacentToCovered :: Board -> Square -> Bool adjacentToCovered :: Board -> Square -> Bool
adjacentToCovered b (r,c) = adjacentCovereds b (r,c) > 0 adjacentToCovered b s = adjacentCovereds b s > 0
-- returns a list of all the squares directly adjacent to the given square (using arithmetic) -- returns a list of all the squares directly adjacent to the given square (using arithmetic)
adjacentSquares :: Square -> [Square] adjacentSquares :: Board -> Square -> [Square]
adjacentSquares (r,c) = [(r-1,c-1), (r-1,c), (r-1,c+1), (r,c-1), (r,c+1), (r+1,c-1), (r+1,c), (r+1,c+1)] adjacentSquares b s = filter (validSquare b) $ adjacentSquares' s
adjacentSquares' (r,c) = [(r-1,c-1), (r-1,c), (r-1,c+1), (r,c-1), (r,c+1), (r+1,c-1), (r+1,c), (r+1,c+1)]
-- returns 1 for boolean True and 0 for Boolean false -- returns 1 for boolean True and 0 for Boolean false
boolToInt :: Bool -> Int boolToInt :: Bool -> Int
@ -118,11 +117,11 @@ gameWon b = all (hasMine b) (coveredSquares b) && not (any (hasMine b) (uncovere
-- returns a list of all squares on a board currently still covered -- returns a list of all squares on a board currently still covered
coveredSquares :: Board -> [Square] coveredSquares :: Board -> [Square]
coveredSquares (Board _ _ u _) = matchingSquares 0 False u coveredSquares b = matchingSquares 0 False (uncovered b)
-- returns a list of all squares on a board currently uncovered -- returns a list of all squares on a board currently uncovered
uncoveredSquares :: Board -> [Square] uncoveredSquares :: Board -> [Square]
uncoveredSquares (Board _ _ u _) = matchingSquares 0 True u uncoveredSquares b = matchingSquares 0 True (uncovered b)
-- returns a list of all squares in a grid starting at the given row with the given boolean status -- returns a list of all squares in a grid starting at the given row with the given boolean status
matchingSquares :: Int -> Bool -> Grid -> [Square] matchingSquares :: Int -> Bool -> Grid -> [Square]
@ -149,26 +148,30 @@ allSquares' (Board s m u f) r c | r < s && c < s = (r,c) : allSquares' (Board s
-- returns a string that should be shown in the given square for a UI render of the board -- returns a string that should be shown in the given square for a UI render of the board
-- typically either blank or if bordering on covered squares: the number of adjacent mines -- typically either blank or if bordering on covered squares: the number of adjacent mines
squareAscii :: Board -> Square -> String squareAscii :: Board -> Square -> String
squareAscii b (r,c) | gameWon b = "" squareAscii b s | gameWon b = ""
| isUncovered b (r,c) && adjacentToCovered b (r,c) = show $ adjacentMines b (r,c) | onEdge b s = ""
| otherwise = "" | isCovered b s = ""
| not (adjacentToCovered b s) = ""
| otherwise = show $ adjacentMines b s
-- returns a string indicating the bg colour class for a given square for a UI render of the board -- returns a string indicating the bg colour class for a given square for a UI render of the board
-- intended to be a used as a CSS class -- intended to be a used as a CSS class
squareBgColour :: Board -> Square -> String squareBgColour :: Board -> Square -> String
squareBgColour b (r,c) | gameWon b && hasMine b (r,c) = "bg-blue" squareBgColour b s | gameWon b && hasMine b s = "bg-blue"
| gameWon b = "bg-green" | gameWon b = "bg-green"
| isUncovered b (r,c) && hasMine b (r,c) = "bg-red" | isUncovered b s && hasMine b s = "bg-red"
| isUncovered b (r,c) = "bg-light" | isUncovered b s = "bg-light"
| isFlagged b (r,c) = "bg-yellow" | isFlagged b s = "bg-yellow"
| otherwise = "bg-dark" | otherwise = "bg-dark"
-- returns a string indicating the text colour class for a given square for a UI render of the board -- returns a string indicating the text colour class for a given square for a UI render of the board
-- intended to be a used as a CSS class -- intended to be a used as a CSS class
squareTextColour :: Board -> Square -> String squareTextColour :: Board -> Square -> String
squareTextColour b (r,c) | hasMine b (r,c) || isFlagged b (r,c) = "" squareTextColour b s | hasMine b s = ""
| isUncovered b (r,c) && adjacentToCovered b (r,c) = | isFlagged b s = ""
case adjacentMines b (r,c) of | isUncovered b s && adjacentToCovered b s =
case adjacentMines b s of
0 -> "text-white"
1 -> "text-blue" 1 -> "text-blue"
2 -> "text-green" 2 -> "text-green"
3 -> "text-red" 3 -> "text-red"
@ -177,39 +180,39 @@ squareTextColour b (r,c) | hasMine b (r,c) || isFlagged b (r,c) = ""
6 -> "text-turquoise" 6 -> "text-turquoise"
7 -> "text-black" 7 -> "text-black"
8 -> "text-gray" 8 -> "text-gray"
_ -> "text-black" | otherwise = ""
| otherwise = "text-black"
-- --
-- Functions for changing the status of square(s) -- Functions for interacting with the board/making changes
-- --
-- uncovers a square and recursively uncovers adjacent squares iff the square has zero adjacent mines -- uncovers a square, if the uncovered square has a mine: uncovers the entire board (lost)
-- if the uncovered square has a mine, uncovers the entire board (lost) -- otherwise, trigger the recursive uncover in case of 0 adjacent mines
uncover :: Board -> Square -> Board uncover :: Board -> Square -> Board
uncover b (r,c) | not $ validSquare b (r,c) = b uncover b s | not $ validSquare b s = b
| isUncovered b (r,c) = b | isUncovered b s = b
| hasMine b (r,c) = Board (size b) (mines b) (createGrid True (size b)) (flagged b) | hasMine b s = Board (size b) (mines b) (createGrid True (size b)) (flagged b)
| otherwise = uncoverAdjacentsIfSafe | otherwise = uncoverRecurse
(Board (size b) (mines b) (modSquare (uncovered b) (r,c) True) (flagged b)) (Board (size b) (mines b) (modSquare (uncovered b) s True) (flagged b)) s
(r,c)
uncoverAdjacentsIfSafe :: Board -> Square -> Board -- uncovers adjacent squares iff the square has zero adjacent mines
uncoverAdjacentsIfSafe b (r,c) | adjacentMines b (r,c) == 0 = uncoverAll b $ adjacentSquares (r,c) uncoverRecurse :: Board -> Square -> Board
uncoverRecurse b s | adjacentMines b s == 0 = uncoverAll b $ adjacentSquares b s
| otherwise = b | otherwise = b
-- uncovers all squares given in a list -- uncovers all squares given in a list
uncoverAll :: Board -> [Square] -> Board uncoverAll :: Board -> [Square] -> Board
uncoverAll b [] = b uncoverAll b [] = b
uncoverAll b ((r,c):xs) = uncoverAll newB xs where newB = uncover b (r,c) uncoverAll b (s:ss) = uncoverAll newB ss where newB = uncover b s
-- toggles a square's flagged status -- toggles a square's flagged status
flag :: Board -> Square -> Board flag :: Board -> Square -> Board
flag b (r,c) | not $ validSquare b (r,c) = b flag b s | not $ validSquare b s = b
| isUncovered b (r,c) = b | isUncovered b s = b
| isFlagged b (r,c) = Board (size b) (mines b) (uncovered b) (modSquare (flagged b) (r,c) False) | isFlagged b s = Board (size b) (mines b) (uncovered b) (modSquare (flagged b) s False)
| otherwise = Board (size b) (mines b) (uncovered b) (modSquare (flagged b) (r,c) True) | otherwise = Board (size b) (mines b) (uncovered b) (modSquare (flagged b) s True)
-- modifies the boolean status value of a given square in a given grid
modSquare :: Grid -> Square -> Bool -> Grid modSquare :: Grid -> Square -> Bool -> Grid
modSquare grid (r,c) newStatus = let (rowsA, row : rowsB) = splitAt r grid modSquare grid (r,c) newStatus = let (rowsA, row : rowsB) = splitAt r grid
(cellsA, _ : cellsB) = splitAt c row (cellsA, _ : cellsB) = splitAt c row