advent-of-code/2024
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

day(07): refactor a bit

Browse source 
Also DRY

Signed-off-by: Matej Focko <me@mfocko.xyz>
This commit is contained in:
Matej Focko 2024-12-07 18:19:20 +01:00
parent fd05f1a7f2
commit 638cf91099
Signed by: mfocko
SSH key fingerprint: SHA256:icm0fIOSJUpy5+1x23sfr+hLtF9UhY8VpMC7H4WFJP8
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Day07.kt
View file

@ -24,9 +24,6 @@ private data class Equation(
} }
fun isSatisfiable(ops: List<(Long, Long) -> Long>): Boolean = canSatisfy(ops, 0L, 0, Long::plus) fun isSatisfiable(ops: List<(Long, Long) -> Long>): Boolean = canSatisfy(ops, 0L, 0, Long::plus)
val satisfiable: Boolean
get() = canSatisfy(listOf(Long::plus, Long::times), 0L, 0, Long::plus)
} }
private fun String.toEquation(): Equation = private fun String.toEquation(): Equation =
@ -40,6 +37,9 @@ class Day07(
private val equations: List<Equation> = readInput(7, inputType).map { it.toEquation() }.toList() private val equations: List<Equation> = readInput(7, inputType).map { it.toEquation() }.toList()
companion object { companion object {
private val PART1_OPS: List<(Long, Long) -> Long> = listOf(Long::plus, Long::times)
private val PART2_OPS: List<(Long, Long) -> Long> = listOf(Long::plus, Long::times, ::concat)
fun concat( fun concat(
x: Long, x: Long,
y: Long, y: Long,
@ -65,9 +65,11 @@ class Day07(
// no-op // no-op
} }
override fun part1(): Long = equations.filter { it.satisfiable }.sumOf { it.target } private fun getSum(ops: List<(Long, Long) -> Long>): Long = equations.filter { it.isSatisfiable(ops) }.sumOf { it.target }
override fun part2(): Long = equations.filter { it.isSatisfiable(listOf(Long::plus, Long::times, ::concat)) }.sumOf { it.target } override fun part1(): Long = getSum(PART1_OPS)
override fun part2(): Long = getSum(PART2_OPS)
} }
fun main() { fun main() {