diff options
author | Andrew Cady <d@jerkface.net> | 2019-06-14 10:16:00 -0400 |
---|---|---|
committer | Andrew Cady <d@jerkface.net> | 2019-06-14 10:16:00 -0400 |
commit | e76f6672781bd1a4d50a0fc9451f474bc81176cb (patch) | |
tree | b81777ad6e75e28306ae7eeb84e44f33f64eeb30 /src | |
parent | e46c610d2f7c0c3a4421c30d78752a03b6a61f97 (diff) |
minor style changes
Diffstat (limited to 'src')
-rw-r--r-- | src/MyQueens.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/MyQueens.hs b/src/MyQueens.hs index bc7da02..a3c5e0b 100644 --- a/src/MyQueens.hs +++ b/src/MyQueens.hs | |||
@@ -21,7 +21,7 @@ allOptionsBoard = take 8 $ repeat allOptionsColumn | |||
21 | 21 | ||
22 | select :: Board -> [Board] | 22 | select :: Board -> [Board] |
23 | select (x@(RankChoice _):xs) = map (x:) (select xs) | 23 | select (x@(RankChoice _):xs) = map (x:) (select xs) |
24 | select ((RankOptions rs):xs) = dropHopeless $ map (\r -> (RankChoice r):(restrict xs r)) rs | 24 | select ((RankOptions rs):xs) = dropHopeless $ map (restrict xs) rs |
25 | select [] = error "select on invalid board" | 25 | select [] = error "select on invalid board" |
26 | 26 | ||
27 | dropHopeless :: [Board] -> [Board] | 27 | dropHopeless :: [Board] -> [Board] |
@@ -36,7 +36,7 @@ filterRankOptions f (RankOptions rs) = RankOptions (filter f rs) | |||
36 | filterRankOptions _ x = x | 36 | filterRankOptions _ x = x |
37 | 37 | ||
38 | restrict :: PartialBoard -> Rank -> PartialBoard | 38 | restrict :: PartialBoard -> Rank -> PartialBoard |
39 | restrict rs r = | 39 | restrict rs r = ((RankChoice r) :) $ |
40 | (dropDiagonal pred minBound r) . | 40 | (dropDiagonal pred minBound r) . |
41 | (dropDiagonal succ maxBound r) . | 41 | (dropDiagonal succ maxBound r) . |
42 | (map (filterRankOptions (/= r))) $ | 42 | (map (filterRankOptions (/= r))) $ |
@@ -51,7 +51,7 @@ select' :: [Board] -> [Board] | |||
51 | select' = concatMap select | 51 | select' = concatMap select |
52 | 52 | ||
53 | queens :: [Board] | 53 | queens :: [Board] |
54 | queens = select' . select' . select' . select' . select' . select' . select' . select' $ [allOptionsBoard] | 54 | queens = foldl1 (.) (take 8 $ repeat select') $ [allOptionsBoard] |
55 | 55 | ||
56 | main :: IO () | 56 | main :: IO () |
57 | main = do | 57 | main = do |