comparing 76cf71d6aae85e5cc6692d802ae1ea7ad2ef8879 and main on drubery.com/aoc2025

+48 -7

src/Day10.hs

···

       64
       64
        
                else

     

       65
       65
        
                  (0 : go (n+1) (b:bs))

     

       66
       66
        
       

     

       67
       67
       -
       gaussJordan :: Map (Int,Int) (Ratio Int) -> Map Int (Ratio Int) -> (Map (Int,Int) (Ratio Int), Map Int (Ratio Int), Int)

     

       68
       68
       -
       gaussJordan m g = error "GJ"

     

       67
       67
       +
       type Matrix = (Int, Int, Map (Int,Int) (Ratio Int))

     

       68
       68
       +
       

     

       69
       69
       +
       cols :: Matrix -> Int

     

       70
       70
       +
       cols (_, c, _) = c - 1

     

       71
       71
       +
       

     

       72
       72
       +
       rows :: Matrix -> Int

     

       73
       73
       +
       rows (r, _, _) = r

     

       74
       74
       +
       

     

       75
       75
       +
       mat :: Matrix -> Map (Int,Int) (Ratio Int)

     

       76
       76
       +
       mat (_, _, m) = m

     

       77
       77
       +
       

     

       78
       78
       +
       minimum' :: Ord a => [a] -> Maybe a

     

       79
       79
       +
       minimum' [] = Nothing

     

       80
       80
       +
       minimum' as = Just $ minimum as

     

       81
       81
       +
       

     

       82
       82
       +
       pivotCell :: Matrix -> Int -> Int -> Maybe (Int, Int)

     

       83
       83
       +
       pivotCell m minRow minCol =

     

       84
       84
       +
         minimum' [(i,j) | i <- [minCol..cols m - 1],

     

       85
       85
       +
                           j <- [minRow..rows m - 1],

     

       86
       86
       +
                           (mat m) Map.! (i,j) /= 0]

     

       87
       87
       +
       

     

       88
       88
       +
       eraseColumn :: Int -> Int -> Matrix -> Matrix

     

       89
       89
       +
       eraseColumn i j m = error "TODO"

     

       90
       90
       +
       

     

       91
       91
       +
       swapCols :: Int -> Int -> Matrix -> Matrix

     

       92
       92
       +
       swapCols i i' m = error "TODO"

     

       93
       93
       +
         -- let (r,c,d) = m

     

       94
       94
       +
         --     d' = Map.fromList

     

       95
       95
       +
         --            ([((i,j), d Map.! (i',j)) | j <- [0..rows - 1]] ++

     

       96
       96
       +
         --             [((i',j), d Map.! (i,j)) | j <- [0..rows - 1]])

     

       97
       97
       +
         --  in (r,c,Map.union d' d)

     

       98
       98
       +
       

     

       99
       99
       +
       gaussJordan :: Map (Int,Int) (Ratio Int) -> Map (Int,Int) (Ratio Int)

     

       100
       100
       +
       gaussJordan mat = error "TODO" -- go mat 0 0

     

       101
       101
       +
        -- where go m minRow minCol =

     

       102
       102
       +
        --         case pivotCell m minRow minCol of

     

       103
       103
       +
        --           Nothing -> m

     

       104
       104
       +
        --           Just (i,j) ->

     

       105
       105
       +
        --             let m' = eraseColumn minCol minRow $

     

       106
       106
       +
        --                      normalizeRow minCol minRow $

     

       107
       107
       +
        --                      swapRows j minRow $

     

       108
       108
       +
        --                      swapCols i minCol m

     

       109
       109
       +
        --              in go m' (minRow + 1) (minCol + 1)

     

       69
       110
        
       

     

       70
       111
        
       solveMachine2 :: [Button] -> [Int] -> Maybe Int

     

       71
       71
       -
       solveMachine2 buttons goal =

     

       72
       72
       -
         let mat = Map.fromList [((i,j),1 % 1) | (i,b) <- zip [0..] buttons, j <- b]

     

       73
       73
       -
             g = Map.fromList $ zip [0..] (map (% 1) goal)

     

       74
       74
       -
             (mat', g', rank) = gaussJordan mat g

     

       75
       75
       -
          in Just 0

     

       112
       112
       +
       solveMachine2 buttons goal = error "TODO"

     

       113
       113
       +
         -- let mat = Map.fromList [((i,j),1 % 1) | (i,b) <- zip [0..] buttons, j <- b]

     

       114
       114
       +
         --     g = Map.fromList $ zip [0..] (map (% 1) goal)

     

       115
       115
       +
         --     (mat', g', rank) = gaussJordan mat g

     

       116
       116
       +
         --  in Just 0

     

       76
       117
        
       

     

       77
       118
        
       part2 :: String -> String

     

       78
       119
        
       part2 input =

+78

src/Day10_part2.py

···

       1
       1
       +
       import sys

     

       2
       2
       +
       import itertools

     

       3
       3
       +
       

     

       4
       4
       +
       def parseIntList(s):

     

       5
       5
       +
           return list(map(int, s[1:-1].split(",")))

     

       6
       6
       +
       

     

       7
       7
       +
       def parseMachine(line):

     

       8
       8
       +
           words = line.split(" ")

     

       9
       9
       +
           buttons = list(map(parseIntList, words[1:-1]))

     

       10
       10
       +
           goal = parseIntList(words[-1])

     

       11
       11
       +
           return (buttons, goal)

     

       12
       12
       +
       

     

       13
       13
       +
       def solveMachine(machine):

     

       14
       14
       +
           (buttons, goal) = machine

     

       15
       15
       +
           rows = len(goal)

     

       16
       16
       +
           cols = len(buttons) + 1

     

       17
       17
       +
           matrix = [[0 for _ in range(rows)] for _ in range(cols)]

     

       18
       18
       +
           for i,button in enumerate(buttons):

     

       19
       19
       +
               for b in button:

     

       20
       20
       +
                   matrix[i][b] = 1

     

       21
       21
       +
           for i in range(rows):

     

       22
       22
       +
               matrix[cols-1][i] = -goal[i]

     

       23
       23
       +
           maxPresses = max(goal)

     

       24
       24
       +
           # Row reduce matrix

     

       25
       25
       +
           curRow,curCol = 0,0

     

       26
       26
       +
           freeVars = []

     

       27
       27
       +
           while curRow < rows and curCol < cols:

     

       28
       28
       +
               pivotRow = None

     

       29
       29
       +
               for i in range(curRow, rows):

     

       30
       30
       +
                   if matrix[curCol][i] != 0:

     

       31
       31
       +
                       pivotRow = i

     

       32
       32
       +
                       break

     

       33
       33
       +
               if pivotRow is None:

     

       34
       34
       +
                   freeVars.append(curCol)

     

       35
       35
       +
                   curCol += 1

     

       36
       36
       +
                   continue

     

       37
       37
       +
               for i in range(cols):

     

       38
       38
       +
                   matrix[i][curRow], matrix[i][pivotRow] = matrix[i][pivotRow], matrix[i][curRow]

     

       39
       39
       +
               for j in range(rows):

     

       40
       40
       +
                   if j == curRow:

     

       41
       41
       +
                       continue

     

       42
       42
       +
                   a,b = matrix[curCol][curRow],-matrix[curCol][j]

     

       43
       43
       +
                   for i in range(cols):

     

       44
       44
       +
                       matrix[i][j] = a*matrix[i][j] + b*matrix[i][curRow]

     

       45
       45
       +
               curRow += 1

     

       46
       46
       +
               curCol += 1

     

       47
       47
       +
           while curCol < cols:

     

       48
       48
       +
               freeVars.append(curCol)

     

       49
       49
       +
               curCol += 1

     

       50
       50
       +
           # The last col is going to be fixed at 1

     

       51
       51
       +
           freeVars.pop()

     

       52
       52
       +
           minMoves = maxPresses * len(buttons)

     

       53
       53
       +
           for freeAssignment in itertools.product(range(maxPresses+1), repeat=len(freeVars)):

     

       54
       54
       +
               varAssignment = [None for i in range(cols)]

     

       55
       55
       +
               varAssignment[-1] = 1

     

       56
       56
       +
               valid = True

     

       57
       57
       +
               for i,v in enumerate(freeVars):

     

       58
       58
       +
                   varAssignment[v] = freeAssignment[i]

     

       59
       59
       +
               for j in range(rows-1,-1,-1):

     

       60
       60
       +
                   nonZeroCols = [i for i in range(cols) if matrix[i][j] != 0]

     

       61
       61
       +
                   if len(nonZeroCols) == 0:

     

       62
       62
       +
                       continue

     

       63
       63
       +
                   rhs = -sum([varAssignment[c]*matrix[c][j] for c in nonZeroCols[1:]])

     

       64
       64
       +
                   lhs = matrix[nonZeroCols[0]][j]

     

       65
       65
       +
                   if rhs % lhs != 0:

     

       66
       66
       +
                       valid = False

     

       67
       67
       +
                       break

     

       68
       68
       +
                   if rhs // lhs < 0:

     

       69
       69
       +
                       valid = False

     

       70
       70
       +
                       break

     

       71
       71
       +
                   varAssignment[nonZeroCols[0]] = rhs // lhs

     

       72
       72
       +
               if not valid:

     

       73
       73
       +
                   continue

     

       74
       74
       +
               minMoves = min(minMoves, sum(varAssignment) - 1)

     

       75
       75
       +
           return minMoves

     

       76
       76
       +
       

     

       77
       77
       +
       machines = [parseMachine(line) for line in open(sys.argv[1]).read().strip().split("\n")]

     

       78
       78
       +
       print(sum(map(solveMachine, machines)))

+14 -2

src/Day12.hs

···

       1
       1
        
       module Day12 where

     

       2
       2
        
       

     

       3
       3
       +
       parse :: String -> [(Int,Int,[Int])]

     

       4
       4
       +
       parse = map parseLine . drop 30 . lines

     

       5
       5
       +
         where parseLine line =

     

       6
       6
       +
                 let w = words line

     

       7
       7
       +
                     (size,counts) = (head w, map read $ tail w)

     

       8
       8
       +
                     cols = read $ take 2 size

     

       9
       9
       +
                     rows = read $ take 2 $ drop 3 size

     

       10
       10
       +
                  in (cols, rows, counts)

     

       11
       11
       +
       

     

       3
       12
        
       part1 :: String -> String

     

       4
       4
       -
       part1 _ = "Day 12 part 1"

     

       13
       13
       +
       part1 input =

     

       14
       14
       +
         let regions = parse input

     

       15
       15
       +
             slack (cols, rows, counts) = cols * rows - 7 * (counts !! 0) - 7 * (counts !! 1) - 7 * (counts !! 2) - 5 * (counts !! 3) - 7 * (counts !! 4) - 6 * (counts !! 5)

     

       16
       16
       +
          in show $ length $ filter (> 0) $ map slack regions

     

       5
       17
        
       

     

       6
       18
        
       part2 :: String -> String

     

       7
       7
       -
       part2 _ = "Day 12 part 2"

     

       19
       19
       +
       part2 _ = "You win!"

Compare changes