From 9d7a9d5791ebcd63b290cebc7648f1a5811cbc5f Mon Sep 17 00:00:00 2001 From: onyx-and-iris Date: Wed, 18 Dec 2024 18:48:11 +0000 Subject: [PATCH] add day-18 + benchmarks --- day-18/benchmark | 15 +++ day-18/cmd/cli/main.go | 49 +++++++++ day-18/go.mod | 7 ++ day-18/go.sum | 16 +++ day-18/internal/config/config.go | 7 ++ day-18/internal/one/benchmark | 6 ++ day-18/internal/one/graph.go | 50 +++++++++ day-18/internal/one/neighbours.go | 10 ++ day-18/internal/one/point.go | 6 ++ day-18/internal/one/solve.go | 76 +++++++++++++ day-18/internal/one/solve_internal_test.go | 21 ++++ day-18/internal/one/util.go | 41 +++++++ day-18/internal/queue/queue.go | 40 +++++++ day-18/internal/two/benchmark | 6 ++ day-18/internal/two/graph.go | 118 +++++++++++++++++++++ day-18/internal/two/neighbours.go | 10 ++ day-18/internal/two/point.go | 6 ++ day-18/internal/two/solve.go | 39 +++++++ day-18/internal/two/solve_internal_test.go | 21 ++++ day-18/internal/two/util.go | 42 ++++++++ day-18/makefile | 30 ++++++ day-18/solve.go | 21 ++++ day-18/solve_internal_test.go | 21 ++++ 23 files changed, 658 insertions(+) create mode 100644 day-18/benchmark create mode 100644 day-18/cmd/cli/main.go create mode 100644 day-18/go.mod create mode 100644 day-18/go.sum create mode 100644 day-18/internal/config/config.go create mode 100644 day-18/internal/one/benchmark create mode 100644 day-18/internal/one/graph.go create mode 100644 day-18/internal/one/neighbours.go create mode 100644 day-18/internal/one/point.go create mode 100644 day-18/internal/one/solve.go create mode 100644 day-18/internal/one/solve_internal_test.go create mode 100644 day-18/internal/one/util.go create mode 100644 day-18/internal/queue/queue.go create mode 100644 day-18/internal/two/benchmark create mode 100644 day-18/internal/two/graph.go create mode 100644 day-18/internal/two/neighbours.go create mode 100644 day-18/internal/two/point.go create mode 100644 day-18/internal/two/solve.go create mode 100644 day-18/internal/two/solve_internal_test.go create mode 100644 day-18/internal/two/util.go create mode 100644 day-18/makefile create mode 100644 day-18/solve.go create mode 100644 day-18/solve_internal_test.go diff --git a/day-18/benchmark b/day-18/benchmark new file mode 100644 index 0000000..96304c5 --- /dev/null +++ b/day-18/benchmark @@ -0,0 +1,15 @@ +goos: linux +goarch: amd64 +pkg: github.com/onyx-and-iris/aoc2024/day-18 +cpu: Intel(R) Core(TM) i7-8700K CPU @ 3.70GHz +BenchmarkSolve-12 1 3840363786 ns/op +BenchmarkSolve-12 1 3847307489 ns/op +BenchmarkSolve-12 1 3793560090 ns/op +BenchmarkSolve-12 1 3804761992 ns/op +BenchmarkSolve-12 1 3811796394 ns/op +BenchmarkSolve-12 1 3782742297 ns/op +BenchmarkSolve-12 1 3799861901 ns/op +BenchmarkSolve-12 1 3784385312 ns/op +BenchmarkSolve-12 1 3780708522 ns/op +BenchmarkSolve-12 1 3811926561 ns/op +ok github.com/onyx-and-iris/aoc2024/day-18 38.067s diff --git a/day-18/cmd/cli/main.go b/day-18/cmd/cli/main.go new file mode 100644 index 0000000..47b6e59 --- /dev/null +++ b/day-18/cmd/cli/main.go @@ -0,0 +1,49 @@ +/******************************************************************************** + Advent of Code 2024 - day-18 +********************************************************************************/ + +package main + +import ( + "embed" + "flag" + "fmt" + "slices" + + log "github.com/sirupsen/logrus" + + problems "github.com/onyx-and-iris/aoc2024/day-18" + "github.com/onyx-and-iris/aoc2024/day-18/internal/config" +) + +//go:embed testdata +var files embed.FS + +func main() { + filename := flag.String("f", "input.txt", "input file") + width := flag.Int("w", 71, "graph width") + height := flag.Int("h", 71, "graph height") + numCorruptions := flag.Int("n", 1024, "number of graph corruptions") + loglevel := flag.Int("l", int(log.InfoLevel), "log level") + flag.Parse() + + if slices.Contains(log.AllLevels, log.Level(*loglevel)) { + log.SetLevel(log.Level(*loglevel)) + } + + data, err := files.ReadFile(fmt.Sprintf("testdata/%s", *filename)) + if err != nil { + log.Fatal(err) + } + + one, two, err := problems.Solve(data, config.Config{ + Width: *width, + Height: *height, + NumCorruptions: *numCorruptions, + }) + if err != nil { + log.Fatal(err) + } + + fmt.Printf("solution one: %d\nsolution two: %s\n", one, two) +} diff --git a/day-18/go.mod b/day-18/go.mod new file mode 100644 index 0000000..210963f --- /dev/null +++ b/day-18/go.mod @@ -0,0 +1,7 @@ +module github.com/onyx-and-iris/aoc2024/day-18 + +go 1.23.3 + +require github.com/sirupsen/logrus v1.9.3 + +require golang.org/x/sys v0.12.0 // indirect diff --git a/day-18/go.sum b/day-18/go.sum new file mode 100644 index 0000000..8d5c188 --- /dev/null +++ b/day-18/go.sum @@ -0,0 +1,16 @@ +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/day-18/internal/config/config.go b/day-18/internal/config/config.go new file mode 100644 index 0000000..25c82cf --- /dev/null +++ b/day-18/internal/config/config.go @@ -0,0 +1,7 @@ +package config + +type Config struct { + Width int + Height int + NumCorruptions int +} diff --git a/day-18/internal/one/benchmark b/day-18/internal/one/benchmark new file mode 100644 index 0000000..3316dc1 --- /dev/null +++ b/day-18/internal/one/benchmark @@ -0,0 +1,6 @@ +goos: linux +goarch: amd64 +pkg: github.com/onyx-and-iris/aoc2024/day-18/internal/one +cpu: Intel(R) Core(TM) i7-8700K CPU @ 3.70GHz +BenchmarkSolve-12 1000000000 0.004050 ns/op +ok github.com/onyx-and-iris/aoc2024/day-18/internal/one 0.029s diff --git a/day-18/internal/one/graph.go b/day-18/internal/one/graph.go new file mode 100644 index 0000000..1862864 --- /dev/null +++ b/day-18/internal/one/graph.go @@ -0,0 +1,50 @@ +package one + +import ( + "slices" + "strings" +) + +type graph struct { + start Point + end Point + data []string +} + +func newGraph(width, height, numCorruptions int, corruptedCoords [][]int) *graph { + var data []string + var sb strings.Builder + for range height { + for range width { + sb.WriteRune('.') + } + data = append(data, sb.String()) + sb.Reset() + } + + for _, coords := range corruptedCoords[:numCorruptions] { + data[coords[1]] = replaceAtIndex(data[coords[1]], '#', coords[0]) + } + + return &graph{Point{0, 0}, Point{len(data[0]) - 1, len(data) - 1}, data} +} + +func (g *graph) String() string { + return strings.Join(g.data, "\n") +} + +func (g *graph) isOutOfBounds(p Point) bool { + return p.X < 0 || p.Y < 0 || p.Y >= len(g.data) || p.X >= len(g.data[p.Y]) +} + +func (g *graph) valueAt(p Point) rune { + return rune(g.data[p.Y][p.X]) +} + +func (g *graph) debug(path []Point) string { + temp := slices.Clone(g.data) + for _, p := range path { + temp[p.Y] = replaceAtIndex(temp[p.Y], 'O', p.X) + } + return strings.Join(temp, "\n") +} diff --git a/day-18/internal/one/neighbours.go b/day-18/internal/one/neighbours.go new file mode 100644 index 0000000..d941e8e --- /dev/null +++ b/day-18/internal/one/neighbours.go @@ -0,0 +1,10 @@ +package one + +func neighbours(p Point) [4]Point { + return [4]Point{ + {p.X, p.Y - 1}, // N + {p.X + 1, p.Y}, // E + {p.X, p.Y + 1}, // S + {p.X - 1, p.Y}, // W + } +} diff --git a/day-18/internal/one/point.go b/day-18/internal/one/point.go new file mode 100644 index 0000000..e54fb23 --- /dev/null +++ b/day-18/internal/one/point.go @@ -0,0 +1,6 @@ +package one + +type Point struct { + X int + Y int +} diff --git a/day-18/internal/one/solve.go b/day-18/internal/one/solve.go new file mode 100644 index 0000000..069f0a9 --- /dev/null +++ b/day-18/internal/one/solve.go @@ -0,0 +1,76 @@ +package one + +import ( + "bytes" + "math" + + "github.com/onyx-and-iris/aoc2024/day-18/internal/config" + "github.com/onyx-and-iris/aoc2024/day-18/internal/queue" + log "github.com/sirupsen/logrus" +) + +var ShortestPath []Point + +func Solve(buf []byte, config config.Config) (int, error) { + r := bytes.NewReader(buf) + graph, err := parseLines(r, config) + if err != nil { + return 0, err + } + + log.Debugf("start: %v end: %v", graph.start, graph.end) + + log.Debugf("\n%s\n", graph.String()) + queue := queue.New[Point]() + queue.Enqueue(graph.start) + visited := make(map[Point]struct{}) + costs := make(map[Point]int) + prev := make(map[Point]Point) + + for !queue.IsEmpty() { + current := queue.Dequeue() + + if current == graph.end { + break + } + + _, ok := visited[current] + if ok { + continue + } + visited[current] = struct{}{} + + for _, n := range neighbours(current) { + if graph.isOutOfBounds(n) { + continue + } + + if graph.valueAt(n) == '#' { + continue + } + + _, ok := costs[n] + if !ok { + costs[n] = math.MaxInt + } + + new_cost := costs[current] + 1 + if new_cost < costs[n] { + costs[n] = new_cost + prev[n] = current + queue.Enqueue(n) + } + } + } + + ShortestPath = []Point{graph.end} + node := prev[graph.end] + for node != graph.start { + ShortestPath = append(ShortestPath, prev[node]) + node = prev[node] + } + + log.Debugf("\n%s\n", graph.debug(ShortestPath)) + + return len(ShortestPath), nil +} diff --git a/day-18/internal/one/solve_internal_test.go b/day-18/internal/one/solve_internal_test.go new file mode 100644 index 0000000..0105e68 --- /dev/null +++ b/day-18/internal/one/solve_internal_test.go @@ -0,0 +1,21 @@ +package one + +import ( + _ "embed" + "os" + "testing" + + "github.com/onyx-and-iris/aoc2024/day-18/internal/config" +) + +//go:embed testdata/input.txt +var data []byte + +func BenchmarkSolve(b *testing.B) { + os.Stdout, _ = os.Open(os.DevNull) + Solve(data, config.Config{ + Width: 71, + Height: 71, + NumCorruptions: 1024, + }) +} diff --git a/day-18/internal/one/util.go b/day-18/internal/one/util.go new file mode 100644 index 0000000..cdf7fc1 --- /dev/null +++ b/day-18/internal/one/util.go @@ -0,0 +1,41 @@ +package one + +import ( + "bufio" + "io" + "strconv" + "strings" + + "github.com/onyx-and-iris/aoc2024/day-18/internal/config" +) + +func parseLines(r io.Reader, config config.Config) (*graph, error) { + corruptedCoords := [][]int{} + scanner := bufio.NewScanner(r) + for scanner.Scan() { + corruptedCoords = append(corruptedCoords, func() []int { + x := strings.Split(scanner.Text(), ",") + return []int{mustConv(x[0]), mustConv(x[1])} + }()) + } + + if err := scanner.Err(); err != nil { + return nil, err + } + + return newGraph(config.Width, config.Height, config.NumCorruptions, corruptedCoords), nil +} + +func mustConv(s string) int { + n, err := strconv.Atoi(s) + if err != nil { + panic(err) + } + return n +} + +func replaceAtIndex(s string, r rune, i int) string { + out := []rune(s) + out[i] = r + return string(out) +} diff --git a/day-18/internal/queue/queue.go b/day-18/internal/queue/queue.go new file mode 100644 index 0000000..8c8024a --- /dev/null +++ b/day-18/internal/queue/queue.go @@ -0,0 +1,40 @@ +package queue + +import "sync" + +type ConcurrentQueue[T comparable] struct { + items []T + lock sync.Mutex + cond *sync.Cond +} + +func New[T comparable]() *ConcurrentQueue[T] { + q := &ConcurrentQueue[T]{} + q.cond = sync.NewCond(&q.lock) + return q +} + +func (q *ConcurrentQueue[T]) Enqueue(item T) { + q.lock.Lock() + defer q.lock.Unlock() + + q.items = append(q.items, item) + q.cond.Signal() +} + +// Gets the item from queue +func (q *ConcurrentQueue[T]) Dequeue() T { + q.lock.Lock() + defer q.lock.Unlock() + + for len(q.items) == 0 { + q.cond.Wait() + } + item := q.items[0] + q.items = q.items[1:] + return item +} + +func (q *ConcurrentQueue[T]) IsEmpty() bool { + return len(q.items) == 0 +} diff --git a/day-18/internal/two/benchmark b/day-18/internal/two/benchmark new file mode 100644 index 0000000..3021b46 --- /dev/null +++ b/day-18/internal/two/benchmark @@ -0,0 +1,6 @@ +goos: linux +goarch: amd64 +pkg: github.com/onyx-and-iris/aoc2024/day-18/internal/two +cpu: Intel(R) Core(TM) i7-8700K CPU @ 3.70GHz +BenchmarkSolve-12 1 3756699083 ns/op +ok github.com/onyx-and-iris/aoc2024/day-18/internal/two 3.760s diff --git a/day-18/internal/two/graph.go b/day-18/internal/two/graph.go new file mode 100644 index 0000000..83fe183 --- /dev/null +++ b/day-18/internal/two/graph.go @@ -0,0 +1,118 @@ +package two + +import ( + "errors" + "math" + "slices" + "strings" + + "github.com/onyx-and-iris/aoc2024/day-18/internal/queue" +) + +type graph struct { + start point + end point + data []string +} + +func newGraph(width, height, numCorruptions int, corruptedCoords [][]int) *graph { + var data []string + var sb strings.Builder + for range height { + for range width { + sb.WriteRune('.') + } + data = append(data, sb.String()) + sb.Reset() + } + + for _, coords := range corruptedCoords[:numCorruptions] { + data[coords[1]] = replaceAtIndex(data[coords[1]], '#', coords[0]) + } + + return &graph{point{0, 0}, point{len(data[0]) - 1, len(data) - 1}, data} +} + +func (g *graph) String() string { + return strings.Join(g.data, "\n") +} + +func (g *graph) isOutOfBounds(p point) bool { + return p.x < 0 || p.y < 0 || p.y >= len(g.data) || p.x >= len(g.data[p.y]) +} + +func (g *graph) valueAt(p point) rune { + return rune(g.data[p.y][p.x]) +} + +func (g *graph) addCorruption(coords []int) { + g.data[coords[1]] = replaceAtIndex(g.data[coords[1]], '#', coords[0]) +} + +func (g *graph) dijkstra(start, end point) ([]point, error) { + queue := queue.New[point]() + queue.Enqueue(start) + visited := make(map[point]struct{}) + costs := make(map[point]int) + prev := make(map[point]point) + + for !queue.IsEmpty() { + current := queue.Dequeue() + + // we found a shortest path + if current == end { + return g.generatePath(start, end, prev), nil + } + + _, ok := visited[current] + if ok { + continue + } + visited[current] = struct{}{} + + for _, n := range neighbours(current) { + if g.isOutOfBounds(n) { + continue + } + + if g.valueAt(n) == '#' { + continue + } + + _, ok := costs[n] + if !ok { + costs[n] = math.MaxInt + } + + new_cost := costs[current] + 1 + if new_cost < costs[n] { + costs[n] = new_cost + prev[n] = current + queue.Enqueue(n) + } + } + } + + return nil, errors.New("unable to find a shortest path") +} + +func (g *graph) generatePath(start, end point, prev map[point]point) []point { + path := []point{end} + node := prev[end] + for node != start { + path = append(path, prev[node]) + node = prev[node] + } + return path +} + +func (g *graph) debug(path []point) string { + temp := slices.Clone(g.data) + for _, p := range path { + if g.valueAt(p) == '#' { + continue + } + temp[p.y] = replaceAtIndex(temp[p.y], 'O', p.x) + } + return strings.Join(temp, "\n") +} diff --git a/day-18/internal/two/neighbours.go b/day-18/internal/two/neighbours.go new file mode 100644 index 0000000..0dde7cf --- /dev/null +++ b/day-18/internal/two/neighbours.go @@ -0,0 +1,10 @@ +package two + +func neighbours(p point) [4]point { + return [4]point{ + {p.x, p.y - 1}, // N + {p.x + 1, p.y}, // E + {p.x, p.y + 1}, // S + {p.x - 1, p.y}, // W + } +} diff --git a/day-18/internal/two/point.go b/day-18/internal/two/point.go new file mode 100644 index 0000000..eef5cd7 --- /dev/null +++ b/day-18/internal/two/point.go @@ -0,0 +1,6 @@ +package two + +type point struct { + x int + y int +} diff --git a/day-18/internal/two/solve.go b/day-18/internal/two/solve.go new file mode 100644 index 0000000..158ed9d --- /dev/null +++ b/day-18/internal/two/solve.go @@ -0,0 +1,39 @@ +package two + +import ( + "bytes" + "fmt" + + "github.com/onyx-and-iris/aoc2024/day-18/internal/config" + log "github.com/sirupsen/logrus" +) + +func Solve(buf []byte, config config.Config) (string, error) { + r := bytes.NewReader(buf) + graph, corruptedCoords, err := parseLines(r, config) + if err != nil { + return "", err + } + + log.Debugf("start: %v end: %v", graph.start, graph.end) + + indx := runUntilNoPath(graph, corruptedCoords, config) + return fmt.Sprintf("%d,%d", corruptedCoords[indx][0], corruptedCoords[indx][1]), nil +} + +func runUntilNoPath(graph *graph, corruptedCoords [][]int, config config.Config) int { + for i, coords := range corruptedCoords[config.NumCorruptions+1:] { + nextCorruption := point{coords[0], coords[1]} + + log.Debugf("adding corruption %v", nextCorruption) + + graph.addCorruption(coords) + path, err := graph.dijkstra(graph.start, graph.end) + if err != nil { + log.Debug(err) + return config.NumCorruptions + i + 1 + } + log.Debugf("\n%s\n", graph.debug(path)) + } + return 0 +} diff --git a/day-18/internal/two/solve_internal_test.go b/day-18/internal/two/solve_internal_test.go new file mode 100644 index 0000000..dbc66e6 --- /dev/null +++ b/day-18/internal/two/solve_internal_test.go @@ -0,0 +1,21 @@ +package two + +import ( + _ "embed" + "os" + "testing" + + "github.com/onyx-and-iris/aoc2024/day-18/internal/config" +) + +//go:embed testdata/input.txt +var data []byte + +func BenchmarkSolve(b *testing.B) { + os.Stdout, _ = os.Open(os.DevNull) + Solve(data, config.Config{ + Width: 71, + Height: 71, + NumCorruptions: 1024, + }) +} diff --git a/day-18/internal/two/util.go b/day-18/internal/two/util.go new file mode 100644 index 0000000..14b6dba --- /dev/null +++ b/day-18/internal/two/util.go @@ -0,0 +1,42 @@ +package two + +import ( + "bufio" + "io" + "strconv" + "strings" + + "github.com/onyx-and-iris/aoc2024/day-18/internal/config" +) + +func parseLines(r io.Reader, config config.Config) (*graph, [][]int, error) { + corruptedCoords := [][]int{} + scanner := bufio.NewScanner(r) + for scanner.Scan() { + corruptedCoords = append(corruptedCoords, func() []int { + x := strings.Split(scanner.Text(), ",") + return []int{mustConv(x[0]), mustConv(x[1])} + }()) + } + + if err := scanner.Err(); err != nil { + return nil, nil, err + } + + graph := newGraph(config.Width, config.Height, config.NumCorruptions, corruptedCoords) + return graph, corruptedCoords, nil +} + +func mustConv(s string) int { + n, err := strconv.Atoi(s) + if err != nil { + panic(err) + } + return n +} + +func replaceAtIndex(s string, r rune, i int) string { + out := []rune(s) + out[i] = r + return string(out) +} diff --git a/day-18/makefile b/day-18/makefile new file mode 100644 index 0000000..3d0b2a1 --- /dev/null +++ b/day-18/makefile @@ -0,0 +1,30 @@ +program = day-18 + +GO = go +SRC_DIR := src +BIN_DIR := bin + +EXE := $(BIN_DIR)/$(program) + +.DEFAULT_GOAL := build + +.PHONY: fmt vet build bench clean +fmt: + $(GO) fmt ./... + +vet: fmt + $(GO) vet ./... + +build: vet | $(BIN_DIR) + $(GO) build -o $(EXE) ./$(SRC_DIR) + +bench: + $(GO) test ./internal/one/ -bench=. > internal/one/benchmark + $(GO) test ./internal/two/ -bench=. > internal/two/benchmark + $(GO) test . -count=10 -bench=. > benchmark + +$(BIN_DIR): + @mkdir -p $@ + +clean: + @rm -rv $(BIN_DIR) diff --git a/day-18/solve.go b/day-18/solve.go new file mode 100644 index 0000000..4a9654d --- /dev/null +++ b/day-18/solve.go @@ -0,0 +1,21 @@ +package eighteen + +import ( + "github.com/onyx-and-iris/aoc2024/day-18/internal/config" + "github.com/onyx-and-iris/aoc2024/day-18/internal/one" + "github.com/onyx-and-iris/aoc2024/day-18/internal/two" +) + +func Solve(buf []byte, config config.Config) (int, string, error) { + answerOne, err := one.Solve(buf, config) + if err != nil { + return 0, "", err + } + + answerTwo, err := two.Solve(buf, config) + if err != nil { + return 0, "", err + } + + return answerOne, answerTwo, nil +} diff --git a/day-18/solve_internal_test.go b/day-18/solve_internal_test.go new file mode 100644 index 0000000..8c7881b --- /dev/null +++ b/day-18/solve_internal_test.go @@ -0,0 +1,21 @@ +package eighteen + +import ( + _ "embed" + "os" + "testing" + + "github.com/onyx-and-iris/aoc2024/day-18/internal/config" +) + +//go:embed testdata/input.txt +var data []byte + +func BenchmarkSolve(b *testing.B) { + os.Stdout, _ = os.Open(os.DevNull) + Solve(data, config.Config{ + Width: 71, + Height: 71, + NumCorruptions: 1024, + }) +}