Skip to content

Commit

Permalink
Fix compilation warnings after upgrading kotlin version
Browse files Browse the repository at this point in the history
  • Loading branch information
markjfisher committed Dec 4, 2022
1 parent 4f97e4d commit 9fa8f3a
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 22 deletions.
4 changes: 2 additions & 2 deletions advents/src/main/kotlin/net/fish/geometry/Direction.kt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ enum class Direction {

companion object {
fun from(s: String) : Direction = from(s.first())
fun from(char: Char) : Direction = when(char.toUpperCase()) {
fun from(char: Char) : Direction = when(char.uppercaseChar()) {
'N' -> NORTH
'S' -> SOUTH
'E' -> EAST
Expand All @@ -48,7 +48,7 @@ enum class Direction {
}

fun from(c: Char, heading: Direction): Direction {
val dir = c.toUpperCase()
val dir = c.uppercaseChar()
return if (dir == 'F') return heading else from(dir)
}
}
Expand Down
4 changes: 2 additions & 2 deletions advents/src/main/kotlin/net/fish/y2020/Day07.kt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ object Day07 : Day {
// EDIT: this rule would work, but using 2 is easier to process.
// val fullExtractor = Regex("""([\p{Alpha} ]+) bags contain|(\d+) ([\p{Alpha} ]+) bag""")
val bagExtractor = Regex("""^([\p{Alpha} ]+) bags contain""")
val rulesExtractor = Regex("""([\d]+) ([\p{Alpha} ]+) bag""")
val rulesExtractor = Regex("""(\d+) ([\p{Alpha} ]+) bag""")

val bag = bagExtractor.find(bagRule)?.destructured!!.let { (n) -> Bag(name = n) }
val contains = rulesExtractor.findAll(bagRule).map { it.destructured.let { (num, bagName) -> Contain(num = num.toInt(), bag = Bag(bagName)) } }.toList()
Expand All @@ -41,7 +41,7 @@ object Day07 : Day {
private fun containedInBag(bag: Bag, rules: List<Rule>): Int {
val rule = findRuleForBag(bag, rules)
if (rule.contains.isEmpty()) return 0
return rule.contains.sumBy {
return rule.contains.sumOf {
it.num * (1 + containedInBag(it.bag, rules))
}
}
Expand Down
2 changes: 1 addition & 1 deletion advents/src/main/kotlin/net/fish/y2021/BitsProcessor.kt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ data class BitsProcessor(
var currentBit = 0

private fun convertToBinary(): List<Int> {
return BigInteger(hexPacket, 16).toString(2).toList().map { it.toInt() - 48 }.toMutableList().also { l ->
return BigInteger(hexPacket, 16).toString(2).toList().map { it.code - 48 }.toMutableList().also { l ->
val zerosToPad = nextBoundary(l.size, 8) - l.size
(0 until zerosToPad).forEach { _ -> l.add(0, 0) }
}
Expand Down
4 changes: 2 additions & 2 deletions advents/src/main/kotlin/net/fish/y2021/Day07.kt
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ object Day07 : Day {
}
}

private fun fuelCost(pos: Int, positions: List<Int>): Int = positions.sumBy { abs(it - pos) }
private fun fuelCost(pos: Int, positions: List<Int>): Int = positions.sumOf { abs(it - pos) }

private fun fuelCost2(pos: Int, positions: List<Int>): Int = positions.sumBy {
private fun fuelCost2(pos: Int, positions: List<Int>): Int = positions.sumOf {
val diff = abs(it - pos)
diff * (diff + 1) / 2
}
Expand Down
4 changes: 2 additions & 2 deletions advents/src/main/kotlin/net/fish/y2021/Day19.kt
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ object Day19 : Day {
}

override fun part1() = doPart1(scanners)
override fun part2() = doPart2(scanners)
override fun part2() = doPart2()

fun doPart1(scanners: List<Scanner>): Pair<Int, Int> {
val solution = solve(scanners)
Expand All @@ -69,7 +69,7 @@ object Day19 : Day {
return Pair(count, maxDist)
}

fun doPart2(scanners: List<Scanner>): Int {
fun doPart2(): Int {
// doing it in part1 as there solution is complete there
return 0
}
Expand Down
2 changes: 1 addition & 1 deletion advents/src/main/kotlin/net/fish/y2021/Day20.kt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ object Day20 : Day {
fun evolve(iterations: Int): TrenchMap {
var isInfinite = shouldConsiderInfinite
val bit0 = if(algorithm[0] == '#') "1" else "0"
val data = (0 until iterations).foldIndexed(this.imageMap) { i, map, _ ->
val data = (0 until iterations).foldIndexed(this.imageMap) { _, map, _ ->
val newImageMap = mutableSetOf<Point>()
val bounds = map.bounds()
for (y in bounds.first.y - 1..bounds.second.y + 1) {
Expand Down
10 changes: 5 additions & 5 deletions advents/src/main/kotlin/net/fish/y2021/Day23.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ import net.fish.Day
import net.fish.resourceLines

object Day23 : Day {
private val data = resourceLines(2021, 23)
// private val data = resourceLines(2021, 23)

override fun part1() = doPart1(data)
override fun part2() = doPart2(data)
override fun part1() = doPart1()
override fun part2() = doPart2()

// Solved with paper and pen today
fun doPart1(data: List<String>): Int = 14148
fun doPart2(data: List<String>): Int = 43814
fun doPart1(): Int = 14148
fun doPart2(): Int = 43814

@JvmStatic
fun main(args: Array<String>) {
Expand Down
4 changes: 2 additions & 2 deletions advents/src/main/kotlin/net/fish/y2021/Day24.kt
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ object Day24 : Day {
private val data = resourceLines(2021, 24)

override fun part1() = doPart1(data)
override fun part2() = doPart2(data)
override fun part2() = doPart2()

fun doPart1(data: List<String>): Pair<Long, Long> = solve(data)
fun doPart2(data: List<String>) = 0L
fun doPart2() = 0L

// Pencil and paper originally - until did the solution version.
// fun doPart1(data: List<String>): Long = 53999995829399L
Expand Down
4 changes: 2 additions & 2 deletions advents/src/main/kotlin/net/fish/y2021/Day25.kt
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ object Day25 : Day {
private val simulator by lazy { SeaCucumberSimulator(resourceLines(2021, 25)) }

override fun part1() = doPart1(simulator)
override fun part2() = doPart2(simulator)
override fun part2() = doPart2()

fun doPart1(simulator: SeaCucumberSimulator): Int = simulator.findBlockStep()
fun doPart2(simulator: SeaCucumberSimulator): Int = 0
fun doPart2(): Int = 0

@JvmStatic
fun main(args: Array<String>) {
Expand Down
4 changes: 2 additions & 2 deletions advents/src/main/kotlin/net/fish/y2021/DayTemplate.kt
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ object DayTemplate : Day {
override fun part1() = doPart1(data)
override fun part2() = doPart2(data)

fun doPart1(data: List<String>): Int = 0
fun doPart2(data: List<String>): Int = 0
fun doPart1(data: List<String>): Int = data.size
fun doPart2(data: List<String>): Int = data.size

@JvmStatic
fun main(args: Array<String>) {
Expand Down
1 change: 0 additions & 1 deletion advents/src/main/kotlin/net/fish/y2022/Day04.kt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ object Day04 : Day {
println(part1())
println(part2())
}

}

fun IntRange.fullyContains(t: IntRange): Boolean = this.first <= t.first && this.last >= t.last
Expand Down

0 comments on commit 9fa8f3a

Please sign in to comment.