day 7 tidier

This commit is contained in:
Joshua Seigler 2024-12-07 00:47:23 -05:00
parent 74e3e285b5
commit 433321cd50
2 changed files with 12 additions and 29 deletions

View file

@ -96,13 +96,13 @@
"solved": true, "solved": true,
"result": "12553187650171", "result": "12553187650171",
"attempts": [], "attempts": [],
"time": 21.47319 "time": 23.011534
}, },
"part2": { "part2": {
"solved": true, "solved": true,
"result": "96779702119491", "result": "96779702119491",
"attempts": [], "attempts": [],
"time": 782.404856 "time": 599.068573
} }
}, },
{ {

View file

@ -3,18 +3,13 @@ import run from "aocrunner"
const parseInput = (rawInput: string) => const parseInput = (rawInput: string) =>
rawInput.split("\n").map((line) => line.split(/[: ]+/).map(Number)) rawInput.split("\n").map((line) => line.split(/[: ]+/).map(Number))
const part1 = (rawInput: string) => { const solve = (rawInput: string, isP2?: boolean) => {
const input = parseInput(rawInput) const input = rawInput.split('\n').map(l => l.split(/[^\d]+/).map(Number))
return input.reduce((total, [target, ...values]) => { return input.reduce((total, [target, ...values]) => {
const operators = [(a,b) => a * b, (a,b) => a + b] const operators = [(a,b) => a * b, (a,b) => a + b, ...(isP2 ? [(a,b) => Number(`${a}${b}`)] : [])]
const evaluate = (numbers: number[]) => { const evaluate = (numbers: number[]) => {
if (numbers[0] > target) { if (numbers[0] > target) return false
return false if (numbers.length === 1) return numbers[0] === target
}
if (numbers.length === 1) {
return numbers[0] === target
}
for (const op of operators) { for (const op of operators) {
if (evaluate([op(numbers[0], numbers[1]), ...numbers.slice(2)])) { return true } if (evaluate([op(numbers[0], numbers[1]), ...numbers.slice(2)])) { return true }
} }
@ -23,24 +18,12 @@ const part1 = (rawInput: string) => {
}, 0) }, 0)
} }
const part2 = (rawInput: string) => { const part1 = (rawInput: string) => {
const input = parseInput(rawInput) return solve(rawInput, false)
}
return input.reduce((total, [target, ...values]) => { const part2 = (rawInput: string) => {
const operators = [(a,b) => a * b, (a,b) => a + b, (a,b) => Number(`${a}${b}`)] return solve(rawInput, true)
const evaluate = (numbers: number[]) => {
if (numbers[0] > target) {
return false
}
if (numbers.length === 1) {
return numbers[0] === target
}
for (const op of operators) {
if (evaluate([op(numbers[0], numbers[1]), ...numbers.slice(2)])) { return true }
}
}
return total + (evaluate(values) ? target : 0)
}, 0)
} }
run({ run({