Skip to content

Commit d1e2fdf

Browse files
committed
added base for tomorrow
1 parent 621cccb commit d1e2fdf

File tree

8 files changed

+28
-16
lines changed

8 files changed

+28
-16
lines changed

2024/src/main/kotlin/org/suggs/aoc2024/Day04CeresSearch.kt

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
package org.suggs.aoc2024
22

3-
import org.slf4j.LoggerFactory
43
import org.suggs.adventofcode.Coordinate
54
import org.suggs.adventofcode.Grid
65

76
object Day04CeresSearch {
87

9-
private val log = LoggerFactory.getLogger(this::class.java)
10-
118
fun countXmasWordsInGrid(grid: Grid) = grid.findAll('X').sumOf { grid.countXmasWords(it) }
129

1310
private fun Grid.countXmasWords(coord: Coordinate) = getAllWordsFrom(coord).count { it == "XMAS" }
@@ -22,16 +19,7 @@ object Day04CeresSearch {
2219
}
2320

2421
private fun Grid.getAllWordsFrom(coord: Coordinate) =
25-
listOf(
26-
wordUp(coord),
27-
wordDown(coord),
28-
wordLeft(coord),
29-
wordRight(coord),
30-
wordUpLeft(coord),
31-
wordUpRight(coord),
32-
wordDownLeft(coord),
33-
wordDownRight(coord)
34-
)
22+
listOf(wordUp(coord), wordDown(coord), wordLeft(coord), wordRight(coord), wordUpLeft(coord), wordUpRight(coord), wordDownLeft(coord), wordDownRight(coord))
3523

3624
private fun Grid.wordUp(from: Coordinate) = listOf(valueOf(from), valueOf(from.up(1)), valueOf(from.up(2)), valueOf(from.up(3))).joinToString("")
3725
private fun Grid.wordDown(from: Coordinate) = listOf(valueOf(from), valueOf(from.down(1)), valueOf(from.down(2)), valueOf(from.down(3))).joinToString("")
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package org.suggs.aoc2024
2+
3+
import org.slf4j.LoggerFactory
4+
5+
object Day05 {
6+
7+
private val log = LoggerFactory.getLogger(this::class.java)
8+
9+
10+
11+
}

2024/src/test/kotlin/org/suggs/aoc2024/Day01HistorianHysteriaTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import org.suggs.adventofcode.Util.getFileLinesFrom
88
import org.suggs.aoc2024.Day01HistorianHysteria.addListDistancesFor
99
import org.suggs.aoc2024.Day01HistorianHysteria.addSimilarityScoresFor
1010

11-
@DisplayName("Historian Hysteria")
11+
@DisplayName("Day 01 Historian Hysteria")
1212
class Day01HistorianHysteriaTest {
1313

1414
@Test

2024/src/test/kotlin/org/suggs/aoc2024/Day02RedNosedReportsTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import org.suggs.adventofcode.Util.getFileLinesFrom
88
import org.suggs.aoc2024.Day02RedNosedReports.countNumberOfDampenedSafeReportsFrom
99
import org.suggs.aoc2024.Day02RedNosedReports.countNumberOfSafeReportsFrom
1010

11-
@DisplayName("Red-Nosed Reports")
11+
@DisplayName("Day 02 Red-Nosed Reports")
1212
class Day02RedNosedReportsTest {
1313

1414
@Test

2024/src/test/kotlin/org/suggs/aoc2024/Day03MullItOverTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import org.suggs.adventofcode.Util.readFileAsString
88
import org.suggs.aoc2024.Day03MullItOver.filterOutAndAddMultiplicationCallsFrom
99
import org.suggs.aoc2024.Day03MullItOver.filterOutAndMultiplyEnabledCallsFrom
1010

11-
@DisplayName("Mull it Over")
11+
@DisplayName("Day 03 Mull it Over")
1212
class Day03MullItOverTest {
1313

1414
@Test

2024/src/test/kotlin/org/suggs/aoc2024/Day04CeresSearchTest.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@ package org.suggs.aoc2024
22

33
import io.kotest.matchers.shouldBe
44
import org.junit.jupiter.api.Disabled
5+
import org.junit.jupiter.api.DisplayName
56
import org.junit.jupiter.api.Test
67
import org.suggs.adventofcode.Grid
78
import org.suggs.adventofcode.Util.createGridFromFileContent
89
import org.suggs.aoc2024.Day04CeresSearch.countXmasWordsInGrid
910
import org.suggs.aoc2024.Day04CeresSearch.findCrossingMasInGrid
1011

12+
@DisplayName("Day 04 Ceres Search")
1113
class Day04CeresSearchTest {
1214

1315
@Test
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package org.suggs.aoc2024
2+
3+
import org.junit.jupiter.api.DisplayName
4+
import org.suggs.adventofcode.Util.getFileLinesFrom
5+
6+
@DisplayName("Day 05")
7+
class Day05Test {
8+
9+
private val largeData = getFileLinesFrom("day05-input.txt")
10+
private val smallData = """""".split("\n")
11+
}

2024/src/test/resources/day05-input.txt

Whitespace-only changes.

0 commit comments

Comments
 (0)