diff --git a/day-15/.gitignore b/day-15/.gitignore deleted file mode 100644 index 780f6b0..0000000 --- a/day-15/.gitignore +++ /dev/null @@ -1 +0,0 @@ -internal/two \ No newline at end of file diff --git a/day-15/benchmark b/day-15/benchmark new file mode 100644 index 0000000..f09bfba --- /dev/null +++ b/day-15/benchmark @@ -0,0 +1,15 @@ +goos: linux +goarch: amd64 +pkg: github.com/onyx-and-iris/aoc2024/day-15 +cpu: Intel(R) Core(TM) i7-8700K CPU @ 3.70GHz +BenchmarkSolve-12 1000000000 0.1255 ns/op +BenchmarkSolve-12 1000000000 0.1184 ns/op +BenchmarkSolve-12 1000000000 0.1247 ns/op +BenchmarkSolve-12 1000000000 0.1178 ns/op +BenchmarkSolve-12 1000000000 0.1214 ns/op +BenchmarkSolve-12 1000000000 0.1201 ns/op +BenchmarkSolve-12 1000000000 0.1196 ns/op +BenchmarkSolve-12 1000000000 0.1199 ns/op +BenchmarkSolve-12 1000000000 0.1192 ns/op +BenchmarkSolve-12 1000000000 0.1230 ns/op +ok github.com/onyx-and-iris/aoc2024/day-15 13.298s diff --git a/day-15/go.mod b/day-15/go.mod index 437d570..84a4e46 100644 --- a/day-15/go.mod +++ b/day-15/go.mod @@ -5,6 +5,11 @@ go 1.23.3 require github.com/sirupsen/logrus v1.9.3 require ( - github.com/stretchr/testify v1.7.1 // indirect + github.com/bahlo/generic-list-go v0.2.0 // indirect + github.com/buger/jsonparser v1.1.1 // indirect + github.com/mailru/easyjson v0.9.0 // indirect + github.com/stretchr/testify v1.8.1 // indirect + github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/day-15/go.sum b/day-15/go.sum index 5f3d96a..32ad0d6 100644 --- a/day-15/go.sum +++ b/day-15/go.sum @@ -1,16 +1,31 @@ +github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk= +github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg= +github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= +github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= 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/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= +github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4= +github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU= 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/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc= +github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw= 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= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/day-15/internal/one/benchmark b/day-15/internal/one/benchmark new file mode 100644 index 0000000..56160cf --- /dev/null +++ b/day-15/internal/one/benchmark @@ -0,0 +1,6 @@ +goos: linux +goarch: amd64 +pkg: github.com/onyx-and-iris/aoc2024/day-15/internal/one +cpu: Intel(R) Core(TM) i7-8700K CPU @ 3.70GHz +BenchmarkSolve-12 1000000000 0.03920 ns/op +ok github.com/onyx-and-iris/aoc2024/day-15/internal/one 0.322s diff --git a/day-15/internal/two/benchmark b/day-15/internal/two/benchmark new file mode 100644 index 0000000..fa697a6 --- /dev/null +++ b/day-15/internal/two/benchmark @@ -0,0 +1,6 @@ +goos: linux +goarch: amd64 +pkg: github.com/onyx-and-iris/aoc2024/day-15/internal/two +cpu: Intel(R) Core(TM) i7-8700K CPU @ 3.70GHz +BenchmarkSolve-12 1000000000 0.07903 ns/op +ok github.com/onyx-and-iris/aoc2024/day-15/internal/two 0.728s diff --git a/day-15/internal/two/directions.go b/day-15/internal/two/directions.go new file mode 100644 index 0000000..41b4e93 --- /dev/null +++ b/day-15/internal/two/directions.go @@ -0,0 +1,20 @@ +package two + +import "slices" + +type direction int + +const ( + N direction = iota + NE + E + SE + S + SW + W + NW +) + +func directions(dir rune) direction { + return direction(slices.Index([]rune{'^', '.', '>', '.', 'v', '.', '<', '.'}, dir)) +} diff --git a/day-15/internal/two/explore.go b/day-15/internal/two/explore.go new file mode 100644 index 0000000..6e9f84a --- /dev/null +++ b/day-15/internal/two/explore.go @@ -0,0 +1,102 @@ +package two + +import ( + log "github.com/sirupsen/logrus" + + orderedmap "github.com/wk8/go-ordered-map/v2" +) + +func exploreDFS(graph *graph, next point, direction direction, stack *stack) (*stack, bool) { + ns := neighbours(next) + + log.Debug(string(graph.valueAt(ns[direction]))) + + switch graph.valueAt(ns[direction]) { + case '#': + return nil, false + case '.': + return stack, true + case '[', ']': + stack.Push(ns[direction]) + } + + return exploreDFS(graph, ns[direction], direction, stack) +} + +func exploreBFS(graph *graph, direction direction) (*orderedmap.OrderedMap[point, struct{}], bool) { + queue := newQueue() + queue.Enqueue(graph.robot) + visited := make(map[point]struct{}) + om := orderedmap.New[point, struct{}]() + + for !queue.IsEmpty() { + current := queue.Dequeue().(point) + + _, ok := visited[current] + if ok { + continue + } + visited[current] = struct{}{} + + ns := neighbours(current) + switch graph.valueAt(ns[direction]) { + case '.': + if graph.valueAt(current) == '@' { + return om, true + } + case '#': + return om, false + case '[': + log.Debugf("adding %s to the queue", string(graph.valueAt(ns[direction]))) + queue.Enqueue(ns[direction]) + _, ok := om.Get(ns[direction]) + if !ok { + om.Set(ns[direction], struct{}{}) + } + + switch direction { + case N: + log.Debugf("adding %s to the queue", string(graph.valueAt(ns[NE]))) + queue.Enqueue(ns[NE]) + _, ok := om.Get(ns[NE]) + if !ok { + om.Set(ns[NE], struct{}{}) + } + case S: + log.Debugf("adding %s to the queue", string(graph.valueAt(ns[SE]))) + queue.Enqueue(ns[SE]) + _, ok := om.Get(ns[SE]) + if !ok { + om.Set(ns[SE], struct{}{}) + } + } + + case ']': + log.Debugf("adding %s to the queue", string(graph.valueAt(ns[direction]))) + queue.Enqueue(ns[direction]) + _, ok := om.Get(ns[direction]) + if !ok { + om.Set(ns[direction], struct{}{}) + } + + switch direction { + case N: + log.Debugf("adding %s to the queue", string(graph.valueAt(ns[NW]))) + queue.Enqueue(ns[NW]) + _, ok := om.Get(ns[NW]) + if !ok { + om.Set(ns[NW], struct{}{}) + } + case S: + log.Debugf("adding %s to the queue", string(graph.valueAt(ns[SW]))) + queue.Enqueue(ns[SW]) + _, ok := om.Get(ns[SW]) + if !ok { + om.Set(ns[SW], struct{}{}) + } + } + } + } + + return om, true +} diff --git a/day-15/internal/two/graph.go b/day-15/internal/two/graph.go new file mode 100644 index 0000000..a78e2cc --- /dev/null +++ b/day-15/internal/two/graph.go @@ -0,0 +1,44 @@ +package two + +import ( + "strings" + + log "github.com/sirupsen/logrus" +) + +type graph struct { + robot point + data []string +} + +func newGraph() *graph { + return &graph{} +} + +func (g *graph) String() string { + return strings.Join(g.data, "\n") +} + +func (g *graph) valueAt(p point) rune { + return rune(g.data[p.y][p.x]) +} + +func (g *graph) updateRobot(dir direction) { + new := neighbours(g.robot)[dir] + log.Debugf("new robot point: %v", new) + + g.updateEach(g.robot, '.') + g.updateEach(new, '@') + g.robot = new +} + +func (g *graph) updateBox(p point, dir direction) { + new := neighbours(p)[dir] + + g.updateEach(new, g.valueAt(p)) + g.updateEach(p, '.') +} + +func (g *graph) updateEach(p point, r rune) { + g.data[p.y] = replaceAtIndex(g.data[p.y], r, p.x) +} diff --git a/day-15/internal/two/neighbours.go b/day-15/internal/two/neighbours.go new file mode 100644 index 0000000..3769190 --- /dev/null +++ b/day-15/internal/two/neighbours.go @@ -0,0 +1,14 @@ +package two + +func neighbours(p point) []point { + return []point{ + {p.x, p.y - 1}, // N + {p.x + 1, p.y - 1}, // NE + {p.x + 1, p.y}, // E + {p.x + 1, p.y + 1}, // SE + {p.x, p.y + 1}, // S + {p.x - 1, p.y + 1}, // SW + {p.x - 1, p.y}, // W + {p.x - 1, p.y - 1}, // NW + } +} diff --git a/day-15/internal/two/point.go b/day-15/internal/two/point.go new file mode 100644 index 0000000..d17aa5c --- /dev/null +++ b/day-15/internal/two/point.go @@ -0,0 +1,16 @@ +package two + +import "fmt" + +type point struct { + x int + y int +} + +func newPoint(x, y int) point { + return point{x, y} +} + +func (p *point) String() string { + return fmt.Sprintf("x: %d y: %d", p.x, p.y) +} diff --git a/day-15/internal/two/queue.go b/day-15/internal/two/queue.go new file mode 100644 index 0000000..d6ea67f --- /dev/null +++ b/day-15/internal/two/queue.go @@ -0,0 +1,47 @@ +package two + +import ( + "errors" + "fmt" +) + +type queue struct { + elements []point +} + +func newQueue() *queue { + return &queue{} +} + +func (q *queue) Enqueue(elem point) { + q.elements = append(q.elements, elem) +} + +func (q *queue) Dequeue() interface{} { + if q.IsEmpty() { + fmt.Println("UnderFlow") + return point{} + } + element := q.elements[0] + if q.Len() == 1 { + q.elements = nil + return element + } + q.elements = q.elements[1:] + return element +} + +func (q *queue) Len() int { + return len(q.elements) +} + +func (q *queue) IsEmpty() bool { + return len(q.elements) == 0 +} + +func (q *queue) Peek() (point, error) { + if q.IsEmpty() { + return point{}, errors.New("empty queue") + } + return q.elements[0], nil +} diff --git a/day-15/internal/two/solve.go b/day-15/internal/two/solve.go new file mode 100644 index 0000000..57ba61d --- /dev/null +++ b/day-15/internal/two/solve.go @@ -0,0 +1,66 @@ +package two + +import ( + "bytes" + + log "github.com/sirupsen/logrus" +) + +func Solve(buf []byte) (int, error) { + r := bytes.NewReader(buf) + graph, dirs, err := parseLines(r) + if err != nil { + return 0, err + } + + log.Debugf("\n%s\n", graph.String()) + + for _, dir := range dirs { + log.Debugf("about to explore '%s' direction from robot location (%s)", string(dir), graph.robot.String()) + + switch directions(dir) { + case N, S: + exploreNorthSouth(graph, directions(dir)) + case W, E: + exploreWestEast(graph, directions(dir)) + } + + log.Debugf("\n%s\n", graph.String()) + } + + var sum int + for y, line := range graph.data { + for x, r := range line { + if r == '[' { + sum += (100 * y) + x + } + } + } + + return sum, nil +} + +func exploreWestEast(graph *graph, direction direction) { + stack, ok := exploreDFS(graph, graph.robot, direction, newStack()) + if !ok { + log.Debug("path ends with '#', continuing...") + return + } + + for !stack.IsEmpty() { + point := stack.Pop().(point) + graph.updateBox(point, direction) + } + graph.updateRobot(direction) +} + +func exploreNorthSouth(graph *graph, direction direction) { + om, ok := exploreBFS(graph, direction) + + if ok { + for pair := om.Newest(); pair != nil; pair = pair.Prev() { + graph.updateBox(pair.Key, direction) + } + graph.updateRobot(direction) + } +} diff --git a/day-15/internal/two/solve_internal_test.go b/day-15/internal/two/solve_internal_test.go new file mode 100644 index 0000000..ecb05d5 --- /dev/null +++ b/day-15/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-15/internal/two/stack.go b/day-15/internal/two/stack.go new file mode 100644 index 0000000..9138627 --- /dev/null +++ b/day-15/internal/two/stack.go @@ -0,0 +1,33 @@ +package two + +type stack struct { + items []interface{} +} + +func newStack() *stack { + return &stack{} +} + +func (s *stack) Push(element interface{}) interface{} { + s.items = append(s.items, element) + return element +} + +func (s *stack) Pop() interface{} { + l := len(s.items) + element := s.items[l-1] + s.items = s.items[:l-1] + return element +} + +func (s *stack) Peek() interface{} { + return s.items[len(s.items)-1] +} + +func (s *stack) Len() int { + return len(s.items) +} + +func (s *stack) IsEmpty() bool { + return s.Len() == 0 +} diff --git a/day-15/internal/two/util.go b/day-15/internal/two/util.go new file mode 100644 index 0000000..1cc3afb --- /dev/null +++ b/day-15/internal/two/util.go @@ -0,0 +1,70 @@ +package two + +import ( + "bufio" + "io" + "strings" + + log "github.com/sirupsen/logrus" +) + +func parseLines(r io.Reader) (*graph, string, error) { + graph := newGraph() + var directions []string + + var sb strings.Builder + var inDirections bool + var linecount int + scanner := bufio.NewScanner(r) + for scanner.Scan() { + line := scanner.Text() + if len(line) == 0 { + inDirections = true + continue + } + + if inDirections { + directions = append(directions, line) + } else { + for _, r := range line { + switch r { + case '#': + sb.WriteRune('#') + sb.WriteRune('#') + case 'O': + sb.WriteRune('[') + sb.WriteRune(']') + case '@': + sb.WriteRune('@') + sb.WriteRune('.') + default: + sb.WriteRune('.') + sb.WriteRune('.') + } + } + + indx := strings.Index(sb.String(), "@") + if indx != -1 { + log.Debugf("adding start point at (%d, %d)", indx, linecount) + graph.robot = newPoint(indx, linecount) + } + + graph.data = append(graph.data, sb.String()) + sb.Reset() + } + + linecount++ + } + + if err := scanner.Err(); err != nil { + return nil, "", err + } + + return graph, strings.Join(directions, ""), nil +} + +func replaceAtIndex(s string, r rune, i int) string { + out := []rune(s) + out[i] = r + return string(out) +}