2025 day04

Author: liamgallear

2025/day04/.bench

@@ -1 +1 @@
-{"Lines":[{"Name":"Part 1","N":480,"NsPerOp":2287557,"AllocedBytesPerOp":0,"AllocsPerOp":0,"MBPerS":0,"Measured":1,"Ord":0},{"Name":"Part 2","N":33,"NsPerOp":35479323,"AllocedBytesPerOp":0,"AllocsPerOp":0,"MBPerS":0,"Measured":1,"Ord":0}],"Measured":1}
+{"Lines":[{"Name":"Part 1","N":667,"NsPerOp":1606148,"AllocedBytesPerOp":0,"AllocsPerOp":0,"MBPerS":0,"Measured":1,"Ord":0},{"Name":"Part 2","N":32,"NsPerOp":36528327,"AllocedBytesPerOp":0,"AllocsPerOp":0,"MBPerS":0,"Measured":1,"Ord":0}],"Measured":1}

2025/day04/main.go

@@ -1,9 +1,11 @@
 package main
 
 import (
+	"aocli/utils/maps"
 	_ "embed"
 	"image"
 	"os"
+	"strings"
 )
 
 //go:embed input.txt
@@ -18,16 +20,22 @@ var delta = []image.Point{
 	{-1, 1}, {0, 1}, {1, 1},
 }
 
+var mapper map[image.Point]rune
+var rect image.Rectangle
+
 func main() {
 	// Check argv if we use test input or not
 	if len(os.Args) > 1 && os.Args[1] == "test" {
 		input = inputTest
 	}
 
+	// Parse input once
+	mapper, rect = maps.MakeImagePointMapRect(strings.Split(strings.TrimSpace(input), "\n"))
+
 	answer := doPartOne(input)
 	println(answer)
 
-	answer = doPartTwo(input)
+	answer = doPartTwo(mapper)
 	println(answer)
 }
 

2025/day04/main_test.go

@@ -1,15 +1,28 @@
 package main
 
-import "testing"
+import (
+	"aocli/utils/maps"
+	"strings"
+	"testing"
+)
 
 func BenchmarkPartOne(b *testing.B) {
+	// Parse input once before benchmark
+	mapper, rect = maps.MakeImagePointMapRect(strings.Split(strings.TrimSpace(input), "\n"))
+
+	b.ResetTimer()
 	for n := 0; n < b.N; n++ {
 		doPartOne(input)
 	}
 }
 
 func BenchmarkPartTwo(b *testing.B) {
+	// Parse input once before benchmark
+	mapper, rect = maps.MakeImagePointMapRect(strings.Split(strings.TrimSpace(input), "\n"))
+
+	b.ResetTimer()
 	for n := 0; n < b.N; n++ {
-		doPartTwo(input)
+		mapperCopy := maps.CopyMap(mapper)
+		doPartTwo(mapperCopy)
 	}
 }

2025/day04/part1.go

@@ -1,11 +1,5 @@
 package main
 
-import (
-	"aocli/utils/maps"
-	"strings"
-)
-
 func doPartOne(input string) int {
-	mapper, rect := maps.MakeImagePointMapRect(strings.Split(strings.TrimSpace(input), "\n"))
 	return countRemovable(mapper, rect)
 }

2025/day04/part2.go

@@ -1,13 +1,10 @@
 package main
 
 import (
-	"aocli/utils/maps"
 	"image"
-	"strings"
 )
 
-func doPartTwo(input string) int {
-	mapper, rect := maps.MakeImagePointMapRect(strings.Split(strings.TrimSpace(input), "\n"))
+func doPartTwo(mapper map[image.Point]rune) int {
 	ans := 0
 
 	for {