diff --git a/day-07/.gitignore b/day-07/.gitignore new file mode 100644 index 0000000..f1a0e53 --- /dev/null +++ b/day-07/.gitignore @@ -0,0 +1 @@ +internal/stack \ No newline at end of file diff --git a/day-07/benchmark b/day-07/benchmark new file mode 100644 index 0000000..4e67d7a --- /dev/null +++ b/day-07/benchmark @@ -0,0 +1,15 @@ +goos: linux +goarch: amd64 +pkg: github.com/onyx-and-iris/aoc2024/day-07 +cpu: Intel(R) Core(TM) i7-8700K CPU @ 3.70GHz +BenchmarkSolve-12 1000000000 0.2486 ns/op +BenchmarkSolve-12 1000000000 0.2670 ns/op +BenchmarkSolve-12 1000000000 0.2498 ns/op +BenchmarkSolve-12 1000000000 0.2449 ns/op +BenchmarkSolve-12 1000000000 0.2520 ns/op +BenchmarkSolve-12 1000000000 0.2512 ns/op +BenchmarkSolve-12 1000000000 0.2500 ns/op +BenchmarkSolve-12 1000000000 0.2494 ns/op +BenchmarkSolve-12 1000000000 0.2473 ns/op +BenchmarkSolve-12 1000000000 0.2453 ns/op +ok github.com/onyx-and-iris/aoc2024/day-07 37.477s diff --git a/day-07/cmd/cli/main.go b/day-07/cmd/cli/main.go new file mode 100644 index 0000000..9e7143c --- /dev/null +++ b/day-07/cmd/cli/main.go @@ -0,0 +1,41 @@ +/******************************************************************************** + Advent of Code 2024 - day-07 +********************************************************************************/ + +package main + +import ( + "embed" + "flag" + "fmt" + "slices" + + log "github.com/sirupsen/logrus" + + problems "github.com/onyx-and-iris/aoc2024/day-07" +) + +//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-07/go.mod b/day-07/go.mod new file mode 100644 index 0000000..a3d1bbb --- /dev/null +++ b/day-07/go.mod @@ -0,0 +1,7 @@ +module github.com/onyx-and-iris/aoc2024/day-07 + +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-07/go.sum b/day-07/go.sum new file mode 100644 index 0000000..21f9bfb --- /dev/null +++ b/day-07/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-07/internal/one/benchmark b/day-07/internal/one/benchmark new file mode 100644 index 0000000..cade16e --- /dev/null +++ b/day-07/internal/one/benchmark @@ -0,0 +1,6 @@ +goos: linux +goarch: amd64 +pkg: github.com/onyx-and-iris/aoc2024/day-07/internal/one +cpu: Intel(R) Core(TM) i7-8700K CPU @ 3.70GHz +BenchmarkSolve-12 1000000000 0.001456 ns/op +ok github.com/onyx-and-iris/aoc2024/day-07/internal/one 0.017s diff --git a/day-07/internal/one/equation.go b/day-07/internal/one/equation.go new file mode 100644 index 0000000..c0e0cd3 --- /dev/null +++ b/day-07/internal/one/equation.go @@ -0,0 +1,10 @@ +package one + +type equation struct { + target int + operands []int +} + +func newEquation(res int, operands []int) equation { + return equation{res, operands} +} diff --git a/day-07/internal/one/op.go b/day-07/internal/one/op.go new file mode 100644 index 0000000..e8568bb --- /dev/null +++ b/day-07/internal/one/op.go @@ -0,0 +1,6 @@ +package one + +const ( + sumOp = "+" + prodOp = "*" +) diff --git a/day-07/internal/one/solve.go b/day-07/internal/one/solve.go new file mode 100644 index 0000000..8b7af4c --- /dev/null +++ b/day-07/internal/one/solve.go @@ -0,0 +1,62 @@ +package one + +import ( + "bytes" + + log "github.com/sirupsen/logrus" +) + +func Solve(buf []byte) (int, error) { + r := bytes.NewReader(buf) + equations, err := parseLines(r) + if err != nil { + return 0, err + } + + conc := len(equations) + sumChan := make(chan int) + + for _, equation := range equations { + go func() { + var total int + if res, ok := next(equation.target, equation.operands, total, sumOp); ok { + sumChan <- res + return + } + sumChan <- 0 + }() + } + + var sum int + for range conc { + res := <-sumChan + sum += res + } + + return sum, nil +} + +func next(target int, operands []int, total int, operator string) (int, bool) { + if len(operands) == 0 { + if total == target { + log.Debug(total) + return total, true + } + return 0, false + } + + switch operator { + case sumOp: + total += operands[0] + case prodOp: + total *= operands[0] + } + + if res, ok := next(target, operands[1:], total, sumOp); ok { + return res, ok + } + if res, ok := next(target, operands[1:], total, prodOp); ok { + return res, ok + } + return 0, false +} diff --git a/day-07/internal/one/solve_internal_test.go b/day-07/internal/one/solve_internal_test.go new file mode 100644 index 0000000..e5fd7ea --- /dev/null +++ b/day-07/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-07/internal/one/util.go b/day-07/internal/one/util.go new file mode 100644 index 0000000..552321f --- /dev/null +++ b/day-07/internal/one/util.go @@ -0,0 +1,37 @@ +package one + +import ( + "bufio" + "io" + "strconv" + "strings" +) + +func mustConv(s string) int { + n, err := strconv.Atoi(s) + if err != nil { + panic(err) + } + return n +} + +func parseLines(r io.Reader) ([]equation, error) { + equations := []equation{} + + scanner := bufio.NewScanner(r) + for scanner.Scan() { + parts := strings.Split(scanner.Text(), ":") + res := mustConv(parts[0]) + var operands []int + for _, s := range strings.Fields(parts[1]) { + operands = append(operands, mustConv(string(s))) + } + equations = append(equations, newEquation(res, operands)) + } + + if err := scanner.Err(); err != nil { + return nil, err + } + + return equations, nil +} diff --git a/day-07/internal/two/benchmark b/day-07/internal/two/benchmark new file mode 100644 index 0000000..0172ba8 --- /dev/null +++ b/day-07/internal/two/benchmark @@ -0,0 +1,6 @@ +goos: linux +goarch: amd64 +pkg: github.com/onyx-and-iris/aoc2024/day-07/internal/two +cpu: Intel(R) Core(TM) i7-8700K CPU @ 3.70GHz +BenchmarkSolve-12 1000000000 0.2539 ns/op +ok github.com/onyx-and-iris/aoc2024/day-07/internal/two 3.822s diff --git a/day-07/internal/two/equation.go b/day-07/internal/two/equation.go new file mode 100644 index 0000000..15ea5b3 --- /dev/null +++ b/day-07/internal/two/equation.go @@ -0,0 +1,10 @@ +package two + +type equation struct { + target int + operands []int +} + +func newEquation(res int, operands []int) equation { + return equation{res, operands} +} diff --git a/day-07/internal/two/op.go b/day-07/internal/two/op.go new file mode 100644 index 0000000..d392b3b --- /dev/null +++ b/day-07/internal/two/op.go @@ -0,0 +1,7 @@ +package two + +const ( + sumOp = "+" + prodOp = "*" + joinOp = "||" +) diff --git a/day-07/internal/two/solve.go b/day-07/internal/two/solve.go new file mode 100644 index 0000000..642cde5 --- /dev/null +++ b/day-07/internal/two/solve.go @@ -0,0 +1,70 @@ +package two + +import ( + "bytes" + "fmt" + + log "github.com/sirupsen/logrus" +) + +func Solve(buf []byte) (int, error) { + r := bytes.NewReader(buf) + equations, err := parseLines(r) + if err != nil { + return 0, err + } + + conc := len(equations) + sumChan := make(chan int) + + for _, equation := range equations { + go func() { + var total int + if res, ok := next(equation.target, equation.operands, total, joinOp); ok { + sumChan <- res + return + } + sumChan <- 0 + }() + } + + var sum int + for range conc { + res := <-sumChan + sum += res + } + + return sum, nil +} + +func next(target int, operands []int, total int, operator string) (int, bool) { + if len(operands) == 0 { + if total == target { + log.Debug(total) + return total, true + } + return 0, false + } + + switch operator { + case sumOp: + total += operands[0] + case prodOp: + total *= operands[0] + case joinOp: + opStr := fmt.Sprintf("%d%d", total, operands[0]) + total = mustConv(opStr) + } + + if res, ok := next(target, operands[1:], total, sumOp); ok { + return res, ok + } + if res, ok := next(target, operands[1:], total, prodOp); ok { + return res, ok + } + if res, ok := next(target, operands[1:], total, joinOp); ok { + return res, ok + } + + return 0, false +} diff --git a/day-07/internal/two/solve_internal_test.go b/day-07/internal/two/solve_internal_test.go new file mode 100644 index 0000000..ecb05d5 --- /dev/null +++ b/day-07/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-07/internal/two/util.go b/day-07/internal/two/util.go new file mode 100644 index 0000000..f44fe7f --- /dev/null +++ b/day-07/internal/two/util.go @@ -0,0 +1,37 @@ +package two + +import ( + "bufio" + "io" + "strconv" + "strings" +) + +func mustConv(s string) int { + n, err := strconv.Atoi(s) + if err != nil { + panic(err) + } + return n +} + +func parseLines(r io.Reader) ([]equation, error) { + equations := []equation{} + + scanner := bufio.NewScanner(r) + for scanner.Scan() { + parts := strings.Split(scanner.Text(), ":") + res := mustConv(parts[0]) + var operands []int + for _, s := range strings.Fields(parts[1]) { + operands = append(operands, mustConv(string(s))) + } + equations = append(equations, newEquation(res, operands)) + } + + if err := scanner.Err(); err != nil { + return nil, err + } + + return equations, nil +} diff --git a/day-07/makefile b/day-07/makefile new file mode 100644 index 0000000..7741806 --- /dev/null +++ b/day-07/makefile @@ -0,0 +1,30 @@ +program = day-07 + +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-07/solve.go b/day-07/solve.go new file mode 100644 index 0000000..0f5d7b8 --- /dev/null +++ b/day-07/solve.go @@ -0,0 +1,20 @@ +package dayseven + +import ( + "github.com/onyx-and-iris/aoc2024/day-07/internal/one" + "github.com/onyx-and-iris/aoc2024/day-07/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-07/solve_internal_test.go b/day-07/solve_internal_test.go new file mode 100644 index 0000000..5e3ccfa --- /dev/null +++ b/day-07/solve_internal_test.go @@ -0,0 +1,15 @@ +package dayseven + +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) +}