From cdca21b3f3fe57a06850e88da228c5369c5e8d28 Mon Sep 17 00:00:00 2001 From: onyx-and-iris Date: Wed, 25 Dec 2024 14:46:40 +0000 Subject: [PATCH] add day-24 part1 --- day-24/.gitignore | 1 + day-24/cmd/cli/main.go | 41 +++++++++++ day-24/go.mod | 7 ++ day-24/go.sum | 15 ++++ day-24/internal/one/expression.go | 16 +++++ day-24/internal/one/solve.go | 64 +++++++++++++++++ day-24/internal/one/solve_internal_test.go | 15 ++++ day-24/internal/one/util.go | 84 ++++++++++++++++++++++ day-24/internal/one/zwire.go | 8 +++ day-24/makefile | 30 ++++++++ day-24/solve.go | 20 ++++++ day-24/solve_internal_test.go | 15 ++++ 12 files changed, 316 insertions(+) create mode 100644 day-24/.gitignore create mode 100644 day-24/cmd/cli/main.go create mode 100644 day-24/go.mod create mode 100644 day-24/go.sum create mode 100644 day-24/internal/one/expression.go create mode 100644 day-24/internal/one/solve.go create mode 100644 day-24/internal/one/solve_internal_test.go create mode 100644 day-24/internal/one/util.go create mode 100644 day-24/internal/one/zwire.go create mode 100644 day-24/makefile create mode 100644 day-24/solve.go create mode 100644 day-24/solve_internal_test.go diff --git a/day-24/.gitignore b/day-24/.gitignore new file mode 100644 index 0000000..780f6b0 --- /dev/null +++ b/day-24/.gitignore @@ -0,0 +1 @@ +internal/two \ No newline at end of file diff --git a/day-24/cmd/cli/main.go b/day-24/cmd/cli/main.go new file mode 100644 index 0000000..10b5511 --- /dev/null +++ b/day-24/cmd/cli/main.go @@ -0,0 +1,41 @@ +/******************************************************************************** + Advent of Code 2024 - day-24 +********************************************************************************/ + +package main + +import ( + "embed" + "flag" + "fmt" + "slices" + + log "github.com/sirupsen/logrus" + + problems "github.com/onyx-and-iris/aoc2024/day-24" +) + +//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-24/go.mod b/day-24/go.mod new file mode 100644 index 0000000..0269561 --- /dev/null +++ b/day-24/go.mod @@ -0,0 +1,7 @@ +module github.com/onyx-and-iris/aoc2024/day-24 + +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-24/go.sum b/day-24/go.sum new file mode 100644 index 0000000..21f9bfb --- /dev/null +++ b/day-24/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-24/internal/one/expression.go b/day-24/internal/one/expression.go new file mode 100644 index 0000000..d80b85b --- /dev/null +++ b/day-24/internal/one/expression.go @@ -0,0 +1,16 @@ +package one + +const ( + AND = '&' + OR = '|' + XOR = '^' +) + +type expression struct { + left, right, target string + op rune +} + +func newExpression(left, right, target string, op rune) expression { + return expression{left, right, target, op} +} diff --git a/day-24/internal/one/solve.go b/day-24/internal/one/solve.go new file mode 100644 index 0000000..b0b7847 --- /dev/null +++ b/day-24/internal/one/solve.go @@ -0,0 +1,64 @@ +package one + +import ( + "bytes" + "cmp" + "slices" + "strconv" + "strings" + + log "github.com/sirupsen/logrus" +) + +func Solve(buf []byte) (int, error) { + r := bytes.NewReader(buf) + initial, wires, expressions, err := parseLines(r) + if err != nil { + return 0, err + } + + for k, v := range initial { + wires[k] = v + } + + wires = calculateWire(expressions, wires) + + zWires := []zWire{} + for k, v := range wires { + if strings.HasPrefix(k, "z") { + zWires = append(zWires, zWire{k, v}) + } + } + slices.SortFunc(zWires, func(a, b zWire) int { + return cmp.Compare(b.name, a.name) + }) + + var binStr strings.Builder + for _, zWire := range zWires { + binStr.WriteString(strconv.FormatInt(int64(zWire.value), 2)) + } + log.Debug(binStr.String()) + + return mustConvBinToDec(binStr.String()), nil +} + +func calculateWire(expressions []expression, wires map[string]int) map[string]int { + if !anyNegative(wires) { + return wires + } + + for _, expression := range expressions { + if wires[expression.left] != noValue && wires[expression.right] != noValue { + switch expression.op { + case AND: + wires[expression.target] = wires[expression.left] & wires[expression.right] + case OR: + wires[expression.target] = wires[expression.left] | wires[expression.right] + case XOR: + wires[expression.target] = wires[expression.left] ^ wires[expression.right] + } + } + } + + return calculateWire(expressions, wires) +} diff --git a/day-24/internal/one/solve_internal_test.go b/day-24/internal/one/solve_internal_test.go new file mode 100644 index 0000000..e5fd7ea --- /dev/null +++ b/day-24/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-24/internal/one/util.go b/day-24/internal/one/util.go new file mode 100644 index 0000000..c96d3e7 --- /dev/null +++ b/day-24/internal/one/util.go @@ -0,0 +1,84 @@ +package one + +import ( + "bufio" + "io" + "strconv" + "strings" +) + +const ( + left = iota * 2 + right + target +) + +func parseLines(r io.Reader) (map[string]int, map[string]int, []expression, error) { + initial := make(map[string]int) + wires := make(map[string]int) + expressions := []expression{} + + var inGates bool + scanner := bufio.NewScanner(r) + for scanner.Scan() { + line := scanner.Text() + + if line == "" { + inGates = true + continue + } + + if inGates { + parts := strings.Split(line, " ") + + wires[parts[left]] = noValue + wires[parts[right]] = noValue + wires[parts[target]] = noValue + + var op rune + switch parts[1] { + case "AND": + op = AND + case "OR": + op = OR + case "XOR": + op = XOR + } + expressions = append(expressions, newExpression(parts[left], parts[right], parts[target], op)) + } else { + parts := strings.Split(line, ": ") + initial[parts[0]] = mustConv(parts[1]) + } + } + + if err := scanner.Err(); err != nil { + return nil, nil, nil, err + } + + return initial, wires, expressions, nil +} + +func mustConv(s string) int { + n, err := strconv.Atoi(s) + if err != nil { + panic(err) + } + return n +} + +func anyNegative(wires map[string]int) bool { + for _, v := range wires { + if v == -1 { + return true + } + } + return false +} + +func mustConvBinToDec(s string) int { + n, err := strconv.ParseInt(s, 2, 64) + if err != nil { + panic(err) + } + return int(n) +} diff --git a/day-24/internal/one/zwire.go b/day-24/internal/one/zwire.go new file mode 100644 index 0000000..1868519 --- /dev/null +++ b/day-24/internal/one/zwire.go @@ -0,0 +1,8 @@ +package one + +const noValue = -1 + +type zWire struct { + name string + value int +} diff --git a/day-24/makefile b/day-24/makefile new file mode 100644 index 0000000..1563b5d --- /dev/null +++ b/day-24/makefile @@ -0,0 +1,30 @@ +program = day-24 + +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-24/solve.go b/day-24/solve.go new file mode 100644 index 0000000..e8b3c3d --- /dev/null +++ b/day-24/solve.go @@ -0,0 +1,20 @@ +package daytwentyfour + +import ( + "github.com/onyx-and-iris/aoc2024/day-24/internal/one" + "github.com/onyx-and-iris/aoc2024/day-24/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-24/solve_internal_test.go b/day-24/solve_internal_test.go new file mode 100644 index 0000000..9e7d435 --- /dev/null +++ b/day-24/solve_internal_test.go @@ -0,0 +1,15 @@ +package daytwentyfour + +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) +}