Merge remote-tracking branch 'origin/main' into main

Author: leynier

src/Algorithms.hs

@@ -29,8 +29,7 @@ genRCell rn cn val = do
 
 genRCellFromSet :: Set Cell -> IO [Cell]
 genRCellFromSet set = if Set.null set
-      then do
-            return []
+      then return []
       else do
             let size = Set.size set
             r <- randomRIO (0, size - 1)
@@ -50,11 +49,10 @@ generateRandom rn cn ratio = do
       let obs_matrix = foldl editMatrixCell matrix (take cant_obs randomCells)
       first_cell <- genRCell rn cn 1
       let newMatrix = editMatrixCell obs_matrix first_cell
-      if validateTemplate newMatrix then do
+      if validateTemplate newMatrix then
             return newMatrix
-      else do
-            result <- generateRandom rn cn ratio
-            return result
+      else
+            generateRandom rn cn ratio
 
 
 data Difficulty = Easy | Normal | Hard deriving (Ord, Eq, Show, Read)
@@ -69,20 +67,18 @@ emptyRatio Hard = 70/100
 generateRandomGame :: Int -> Int -> Float -> IO Matrix
 generateRandomGame rn cn ratio = do
       maybeTemplate <- timeout 1000000 $ generateRandom rn cn ratio
-      if isNothing maybeTemplate then do
-            game <- generateRandomGame rn cn ratio
-            return game
+      if isNothing maybeTemplate then
+            generateRandomGame rn cn ratio
       else do
-            let template = maybe (blankMatrix rn cn) (\x -> x) maybeTemplate
+            let template = maybe (blankMatrix rn cn) id maybeTemplate
             seed <- randomIO :: IO Int
             let gen = mkStdGen seed
             let seeds = randoms gen :: [Int]
             let solutions = solveAll template seeds
-            if null solutions then do
-                  game <- generateRandomGame rn cn ratio
-                  return game
-            else do
-                  return $ head solutions
+            if null solutions then
+                  generateRandomGame rn cn ratio
+            else
+              return $ head solutions
 
 
 removeCells :: Matrix -> [Cell] -> Int -> Int -> [Int] -> Matrix
@@ -109,7 +105,7 @@ generateGame rn cn ratio dif to = do
       if isNothing maybeMatrix then do
             return (False, blankMatrix 1 1)
       else do
-            let solution = maybe (blankMatrix rn cn) (\x -> x) maybeMatrix
+            let solution = maybe (blankMatrix rn cn) id maybeMatrix
             let setForRemove = Set.filter (\x -> let v = value x in v > 1 && v < rn * cn) (matrix solution) :: Set Cell
             randomCells <- genRCellFromSet setForRemove
             let total = Set.size setForRemove