diff --git a/day-10/benchmark b/day-10/benchmark new file mode 100644 index 0000000..62cb9c8 --- /dev/null +++ b/day-10/benchmark @@ -0,0 +1,15 @@ +goos: linux +goarch: amd64 +pkg: github.com/onyx-and-iris/aoc2024/day-10 +cpu: Intel(R) Core(TM) i7-8700K CPU @ 3.70GHz +BenchmarkSolve-12 1000000000 0.002208 ns/op +BenchmarkSolve-12 1000000000 0.002135 ns/op +BenchmarkSolve-12 1000000000 0.002113 ns/op +BenchmarkSolve-12 1000000000 0.002273 ns/op +BenchmarkSolve-12 1000000000 0.002123 ns/op +BenchmarkSolve-12 1000000000 0.002133 ns/op +BenchmarkSolve-12 1000000000 0.002054 ns/op +BenchmarkSolve-12 1000000000 0.002107 ns/op +BenchmarkSolve-12 1000000000 0.002664 ns/op +BenchmarkSolve-12 1000000000 0.002081 ns/op +ok github.com/onyx-and-iris/aoc2024/day-10 0.167s diff --git a/day-10/cmd/cli/main.go b/day-10/cmd/cli/main.go new file mode 100644 index 0000000..3ab2279 --- /dev/null +++ b/day-10/cmd/cli/main.go @@ -0,0 +1,41 @@ +/******************************************************************************** + Advent of Code 2024 - day-10 +********************************************************************************/ + +package main + +import ( + "embed" + "flag" + "fmt" + "slices" + + log "github.com/sirupsen/logrus" + + problems "github.com/onyx-and-iris/aoc2024/day-10" +) + +//go:embed testdata +var files embed.FS + +func main() { + filename := flag.String("f", "input.txt", "input file") + 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) + if err != nil { + log.Fatal(err) + } + + fmt.Printf("solution one: %d\nsolution two: %d\n", one, two) +} diff --git a/day-10/go.mod b/day-10/go.mod new file mode 100644 index 0000000..af79f75 --- /dev/null +++ b/day-10/go.mod @@ -0,0 +1,7 @@ +module github.com/onyx-and-iris/aoc2024/day-10 + +go 1.23.3 + +require github.com/sirupsen/logrus v1.9.3 + +require golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect diff --git a/day-10/go.sum b/day-10/go.sum new file mode 100644 index 0000000..21f9bfb --- /dev/null +++ b/day-10/go.sum @@ -0,0 +1,15 @@ +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 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/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-10/internal/one/benchmark b/day-10/internal/one/benchmark new file mode 100644 index 0000000..df30523 --- /dev/null +++ b/day-10/internal/one/benchmark @@ -0,0 +1,6 @@ +goos: linux +goarch: amd64 +pkg: github.com/onyx-and-iris/aoc2024/day-10/internal/one +cpu: Intel(R) Core(TM) i7-8700K CPU @ 3.70GHz +BenchmarkSolve-12 1000000000 0.001398 ns/op +ok github.com/onyx-and-iris/aoc2024/day-10/internal/one 0.014s diff --git a/day-10/internal/one/direction.go b/day-10/internal/one/direction.go new file mode 100644 index 0000000..7e9f65f --- /dev/null +++ b/day-10/internal/one/direction.go @@ -0,0 +1,9 @@ +package one + +const ( + N = iota + E + S + W + None +) diff --git a/day-10/internal/one/graph.go b/day-10/internal/one/graph.go new file mode 100644 index 0000000..9c96314 --- /dev/null +++ b/day-10/internal/one/graph.go @@ -0,0 +1,40 @@ +package one + +import ( + "slices" + "strings" +) + +type point struct { + x int + y int +} + +type graph struct { + data []string + startPositions []point +} + +func newGrid() *graph { + return &graph{data: make([]string, 0), startPositions: make([]point, 0)} +} + +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 _, pos := range path { + temp[pos.y] = replaceAtIndex(temp[pos.y], '+', pos.x) + } + return strings.Join(temp, "\n") +} diff --git a/day-10/internal/one/neighbours.go b/day-10/internal/one/neighbours.go new file mode 100644 index 0000000..1fd0a90 --- /dev/null +++ b/day-10/internal/one/neighbours.go @@ -0,0 +1,10 @@ +package one + +func neighbours(p point) [4]point { + return [4]point{ + {p.x, p.y - 1}, + {p.x + 1, p.y}, + {p.x, p.y + 1}, + {p.x - 1, p.y}, + } +} diff --git a/day-10/internal/one/solve.go b/day-10/internal/one/solve.go new file mode 100644 index 0000000..2ff23cc --- /dev/null +++ b/day-10/internal/one/solve.go @@ -0,0 +1,68 @@ +package one + +import ( + "bytes" + + log "github.com/sirupsen/logrus" + + "github.com/onyx-and-iris/aoc2024/day-10/internal/queue" +) + +const target = '9' + +func Solve(buf []byte) (int, error) { + r := bytes.NewReader(buf) + graph, err := parseLines(r) + if err != nil { + return 0, err + } + + var totalScore int + queue := queue.New[point]() + for _, pos := range graph.startPositions { + if graph.isOutOfBounds(pos) { + continue + } + queue.Enqueue(pos) + + var score int + visited := make(map[point]struct{}) + endpoints := make(map[point]struct{}) + for !queue.IsEmpty() { + current := queue.Dequeue() + + _, ok := endpoints[current] + if ok { + continue + } + endpoints[current] = struct{}{} + + if graph.valueAt(current) == target { + score++ + continue + } + + _, ok = visited[current] + if ok { + continue + } + visited[current] = struct{}{} + + for _, n := range neighbours(current) { + if graph.isOutOfBounds(n) { + continue + } + + if graph.valueAt(n)-graph.valueAt(current) == 1 { + log.Tracef("pushing %v with value %s back onto the queue\n", n, string(graph.valueAt(n))) + queue.Enqueue(n) + } + } + } + + log.Debugf("score for trailhead %v - %d\n", pos, score) + totalScore += score + } + + return totalScore, nil +} diff --git a/day-10/internal/one/solve_internal_test.go b/day-10/internal/one/solve_internal_test.go new file mode 100644 index 0000000..e5fd7ea --- /dev/null +++ b/day-10/internal/one/solve_internal_test.go @@ -0,0 +1,15 @@ +package one + +import ( + _ "embed" + "os" + "testing" +) + +//go:embed testdata/input.txt +var data []byte + +func BenchmarkSolve(b *testing.B) { + os.Stdout, _ = os.Open(os.DevNull) + Solve(data) +} diff --git a/day-10/internal/one/util.go b/day-10/internal/one/util.go new file mode 100644 index 0000000..e40e9c2 --- /dev/null +++ b/day-10/internal/one/util.go @@ -0,0 +1,45 @@ +package one + +import ( + "bufio" + "io" + "regexp" + + log "github.com/sirupsen/logrus" +) + +var reStartPos = regexp.MustCompile(`0`) + +func parseLines(r io.Reader) (*graph, error) { + graph := newGrid() + + var linecount int + scanner := bufio.NewScanner(r) + for scanner.Scan() { + line := scanner.Text() + + graph.data = append(graph.data, line) + for _, m := range reStartPos.FindAllStringIndex(line, -1) { + graph.startPositions = append( + graph.startPositions, + point{x: m[0], y: linecount}, + ) + } + + linecount++ + } + + log.Debug(graph.startPositions) + + if err := scanner.Err(); err != nil { + return nil, err + } + + return graph, nil +} + +func replaceAtIndex(s string, r rune, i int) string { + out := []rune(s) + out[i] = r + return string(out) +} diff --git a/day-10/internal/queue/queue.go b/day-10/internal/queue/queue.go new file mode 100644 index 0000000..b38c5f3 --- /dev/null +++ b/day-10/internal/queue/queue.go @@ -0,0 +1,39 @@ +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() +} + +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-10/internal/two/benchmark b/day-10/internal/two/benchmark new file mode 100644 index 0000000..a764284 --- /dev/null +++ b/day-10/internal/two/benchmark @@ -0,0 +1,6 @@ +goos: linux +goarch: amd64 +pkg: github.com/onyx-and-iris/aoc2024/day-10/internal/two +cpu: Intel(R) Core(TM) i7-8700K CPU @ 3.70GHz +BenchmarkSolve-12 1000000000 0.0009003 ns/op +ok github.com/onyx-and-iris/aoc2024/day-10/internal/two 0.012s diff --git a/day-10/internal/two/direction.go b/day-10/internal/two/direction.go new file mode 100644 index 0000000..9a1bdb8 --- /dev/null +++ b/day-10/internal/two/direction.go @@ -0,0 +1,9 @@ +package two + +const ( + N = iota + E + S + W + None +) diff --git a/day-10/internal/two/graph.go b/day-10/internal/two/graph.go new file mode 100644 index 0000000..2ce384b --- /dev/null +++ b/day-10/internal/two/graph.go @@ -0,0 +1,41 @@ +package two + +import ( + "slices" + "strings" +) + +type point struct { + x int + y int + direction int +} + +type graph struct { + data []string + startPositions []point +} + +func newGrid() *graph { + return &graph{data: make([]string, 0), startPositions: make([]point, 0)} +} + +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 _, pos := range path { + temp[pos.y] = replaceAtIndex(temp[pos.y], '+', pos.x) + } + return strings.Join(temp, "\n") +} diff --git a/day-10/internal/two/neighbours.go b/day-10/internal/two/neighbours.go new file mode 100644 index 0000000..70c6e01 --- /dev/null +++ b/day-10/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-10/internal/two/solve.go b/day-10/internal/two/solve.go new file mode 100644 index 0000000..28e6416 --- /dev/null +++ b/day-10/internal/two/solve.go @@ -0,0 +1,58 @@ +package two + +import ( + "bytes" + + log "github.com/sirupsen/logrus" + + "github.com/onyx-and-iris/aoc2024/day-10/internal/queue" +) + +const target = '9' + +func Solve(buf []byte) (int, error) { + r := bytes.NewReader(buf) + graph, err := parseLines(r) + if err != nil { + return 0, err + } + + var totalScore int + queue := queue.New[point]() + for _, pos := range graph.startPositions { + if graph.isOutOfBounds(pos) { + continue + } + queue.Enqueue(pos) + + var score int + for !queue.IsEmpty() { + current := queue.Dequeue() + + if graph.valueAt(current) == target { + score++ + continue + } + + for dir, n := range neighbours(current) { + if graph.isOutOfBounds(n) { + continue + } + + if n.direction == None { + n.direction = dir + } + + if graph.valueAt(n)-graph.valueAt(current) == 1 { + log.Tracef("pushing %v with value %s back onto the queue\n", n, string(graph.valueAt(n))) + queue.Enqueue(n) + } + } + } + + log.Debugf("score for trailhead %v - %d\n", pos, score) + totalScore += score + } + + return totalScore, nil +} diff --git a/day-10/internal/two/solve_internal_test.go b/day-10/internal/two/solve_internal_test.go new file mode 100644 index 0000000..ecb05d5 --- /dev/null +++ b/day-10/internal/two/solve_internal_test.go @@ -0,0 +1,15 @@ +package two + +import ( + _ "embed" + "os" + "testing" +) + +//go:embed testdata/input.txt +var data []byte + +func BenchmarkSolve(b *testing.B) { + os.Stdout, _ = os.Open(os.DevNull) + Solve(data) +} diff --git a/day-10/internal/two/util.go b/day-10/internal/two/util.go new file mode 100644 index 0000000..ecf5ab6 --- /dev/null +++ b/day-10/internal/two/util.go @@ -0,0 +1,45 @@ +package two + +import ( + "bufio" + "io" + "regexp" + + log "github.com/sirupsen/logrus" +) + +var reStartPos = regexp.MustCompile(`0`) + +func parseLines(r io.Reader) (*graph, error) { + graph := newGrid() + + var linecount int + scanner := bufio.NewScanner(r) + for scanner.Scan() { + line := scanner.Text() + + graph.data = append(graph.data, line) + for _, m := range reStartPos.FindAllStringIndex(line, -1) { + graph.startPositions = append( + graph.startPositions, + point{x: m[0], y: linecount, direction: None}, + ) + } + + linecount++ + } + + log.Debug(graph.startPositions) + + if err := scanner.Err(); err != nil { + return nil, err + } + + return graph, nil +} + +func replaceAtIndex(s string, r rune, i int) string { + out := []rune(s) + out[i] = r + return string(out) +} diff --git a/day-10/makefile b/day-10/makefile new file mode 100644 index 0000000..d38e5fc --- /dev/null +++ b/day-10/makefile @@ -0,0 +1,30 @@ +program = day-10 + +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-10/solve.go b/day-10/solve.go new file mode 100644 index 0000000..91d96e9 --- /dev/null +++ b/day-10/solve.go @@ -0,0 +1,20 @@ +package dayten + +import ( + "github.com/onyx-and-iris/aoc2024/day-10/internal/one" + "github.com/onyx-and-iris/aoc2024/day-10/internal/two" +) + +func Solve(buf []byte) (int, int, error) { + answerOne, err := one.Solve(buf) + if err != nil { + return 0, 0, err + } + + answerTwo, err := two.Solve(buf) + if err != nil { + return 0, 0, err + } + + return answerOne, answerTwo, nil +} diff --git a/day-10/solve_internal_test.go b/day-10/solve_internal_test.go new file mode 100644 index 0000000..c8c8d94 --- /dev/null +++ b/day-10/solve_internal_test.go @@ -0,0 +1,15 @@ +package dayten + +import ( + _ "embed" + "os" + "testing" +) + +//go:embed testdata/input.txt +var data []byte + +func BenchmarkSolve(b *testing.B) { + os.Stdout, _ = os.Open(os.DevNull) + Solve(data) +}