comparing f19cc6a5f187c957b1ca87ee2675e27a2cc0d912 and main on kot.pink/aoc

+44

5.py

···

       1
       1
       +
       import sys

     

       2
       2
       +
       import heapq

     

       3
       3
       +
       from typing import List, Tuple, Optional

     

       4
       4
       +
       

     

       5
       5
       +
       listed_in_range = 0

     

       6
       6
       +
       file = '5.input' if len(sys.argv) <= 1 else sys.argv[1]

     

       7
       7
       +
       

     

       8
       8
       +
       ranges = []

     

       9
       9
       +
       numbers = None

     

       10
       10
       +
       for line in open(file).readlines():

     

       11
       11
       +
           line = line.strip()

     

       12
       12
       +
           if line == '':

     

       13
       13
       +
               numbers = []

     

       14
       14
       +
           elif numbers is not None:

     

       15
       15
       +
               numbers.append(int(line))

     

       16
       16
       +
           else:

     

       17
       17
       +
               heapq.heappush(ranges, tuple(map(int, line.split('-'))))

     

       18
       18
       +
       

     

       19
       19
       +
       for num in numbers:

     

       20
       20
       +
           for start, end in ranges:

     

       21
       21
       +
               if start <= num and num <= end:

     

       22
       22
       +
                   listed_in_range += 1

     

       23
       23
       +
                   break

     

       24
       24
       +
       

     

       25
       25
       +
       print(f'p1: {listed_in_range}')

     

       26
       26
       +
       

     

       27
       27
       +
       dedup_ranges = []

     

       28
       28
       +
       last_start, last_end = None, None

     

       29
       29
       +
       while ranges:

     

       30
       30
       +
           start, end = heapq.heappop(ranges)

     

       31
       31
       +
           if last_start is None:

     

       32
       32
       +
               last_start, last_end = start, end

     

       33
       33
       +
           elif start <= last_end: # merge interval

     

       34
       34
       +
               # print("merge", last_start, last_end, "with", start, end)

     

       35
       35
       +
               last_start, last_end = last_start, max(last_end, end)

     

       36
       36
       +
           else: # commit interval

     

       37
       37
       +
               # print("commit", last_start, last_end)

     

       38
       38
       +
               dedup_ranges.append((last_start, last_end))

     

       39
       39
       +
               last_start, last_end = start, end

     

       40
       40
       +
       

     

       41
       41
       +
       dedup_ranges.append((last_start, last_end))

     

       42
       42
       +
       # print(dedup_ranges)

     

       43
       43
       +
       

     

       44
       44
       +
       print(f'p2: {sum(end - start + 1 for start, end in dedup_ranges)}')

+11

5.test

+48

6.py

···

       1
       1
       +
       import sys

     

       2
       2
       +
       from operator import mul, add

     

       3
       3
       +
       from functools import reduce

     

       4
       4
       +
       

     

       5
       5
       +
       total_wordwise = 0

     

       6
       6
       +
       total_digitwise = 0

     

       7
       7
       +
       file = '6.input' if len(sys.argv) <= 1 else sys.argv[1]

     

       8
       8
       +
       

     

       9
       9
       +
       columns = []

     

       10
       10
       +
       ops = []

     

       11
       11
       +
       op_line = None

     

       12
       12
       +
       

     

       13
       13
       +
       for line in open(file).readlines():

     

       14
       14
       +
           line = line.strip('\n')

     

       15
       15
       +
           for word in line.split(' '):

     

       16
       16
       +
               if not word: continue

     

       17
       17
       +
               if word in '+*':

     

       18
       18
       +
                   ops.append(word)

     

       19
       19
       +
                   op_line = line

     

       20
       20
       +
               else:

     

       21
       21
       +
                   columns.append(word)

     

       22
       22
       +
       

     

       23
       23
       +
       for op_i, op in enumerate(ops):

     

       24
       24
       +
           column = [int(c) for i, c in enumerate(columns) if i % len(ops) == op_i]

     

       25
       25
       +
           if op == '+':

     

       26
       26
       +
               total_wordwise += sum(column)

     

       27
       27
       +
           elif op == '*':

     

       28
       28
       +
               total_wordwise += reduce(mul, column, 1)

     

       29
       29
       +
       

     

       30
       30
       +
       print(f'p1: {total_wordwise}')

     

       31
       31
       +
       

     

       32
       32
       +
       lines = []

     

       33
       33
       +
       op_pos = [i for i, ch in enumerate(op_line) if ch in '+*']

     

       34
       34
       +
       for line in open(file).readlines():

     

       35
       35
       +
           if line.strip() == op_line.strip(): break

     

       36
       36
       +
           words = [line[i:j][:-1] for i, j in zip([0] + op_pos[1:], op_pos[1:] + [None])]

     

       37
       37
       +
           lines.append(words)

     

       38
       38
       +
       

     

       39
       39
       +
       for op_i, op in enumerate(ops):

     

       40
       40
       +
           cols = [line[i] for i in range(len(lines[0])) if i % len(ops) == op_i for line in lines]

     

       41
       41
       +
           digits = [col[i] for i in range(len(cols[0])) for col in cols]

     

       42
       42
       +
           numbers = [int(''.join(digits[i:i+len(cols)])) for i in range(0, len(digits), len(cols))]

     

       43
       43
       +
           if op == '+':

     

       44
       44
       +
               total_digitwise += sum(numbers)

     

       45
       45
       +
           elif op == '*':

     

       46
       46
       +
               total_digitwise += reduce(mul, numbers, 1)

     

       47
       47
       +
       

     

       48
       48
       +
       print(f'p2: {total_digitwise}')

6.test

···

       1
       1
       +
       123 328  51 64 

     

       2
       2
       +
        45 64  387 23 

     

       3
       3
       +
         6 98  215 314

     

       4
       4
       +
       *   +   *   +

Compare changes