.gitignore

@@ -26,7 +26,5 @@ go.work.sum
 .env
 
 # input files
-**/testdata/*.txt
+partial.txt
-
+input.txt
-# scaffold
-mkfiles.sh

day-03/benchmark

@@ -1,15 +0,0 @@
-goos: linux
-goarch: amd64
-pkg: github.com/onyx-and-iris/aoc2024/day-03
-cpu: Intel(R) Core(TM) i7-8700K CPU @ 3.70GHz
-BenchmarkMain-12    	1000000000	         0.001213 ns/op
-BenchmarkMain-12    	1000000000	         0.001343 ns/op
-BenchmarkMain-12    	1000000000	         0.001210 ns/op
-BenchmarkMain-12    	1000000000	         0.001314 ns/op
-BenchmarkMain-12    	1000000000	         0.001288 ns/op
-BenchmarkMain-12    	1000000000	         0.001646 ns/op
-BenchmarkMain-12    	1000000000	         0.001211 ns/op
-BenchmarkMain-12    	1000000000	         0.001174 ns/op
-BenchmarkMain-12    	1000000000	         0.001220 ns/op
-BenchmarkMain-12    	1000000000	         0.001169 ns/op
-ok  	github.com/onyx-and-iris/aoc2024/day-03	0.104s

day-03/cmd/cli/main.go

@@ -1,41 +0,0 @@
-/********************************************************************************
-    Advent of Code 2024 - day-03
-********************************************************************************/
-
-package main
-
-import (
-	"embed"
-	"flag"
-	"fmt"
-	"slices"
-
-	log "github.com/sirupsen/logrus"
-
-	problems "github.com/onyx-and-iris/aoc2024/day-03"
-)
-
-//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 (shorthand)")
-	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)
-}

day-03/go.mod

@@ -1,7 +0,0 @@
-module github.com/onyx-and-iris/aoc2024/day-03
-
-go 1.23.3
-
-require github.com/sirupsen/logrus v1.9.3
-
-require golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect

day-03/go.sum

@@ -1,15 +0,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/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=

day-03/internal/one/benchmark

@@ -1,6 +0,0 @@
-goos: linux
-goarch: amd64
-pkg: github.com/onyx-and-iris/aoc2024/day-03/internal/one
-cpu: Intel(R) Core(TM) i7-8700K CPU @ 3.70GHz
-BenchmarkMain-12    	1000000000	         0.0006976 ns/op
-ok  	github.com/onyx-and-iris/aoc2024/day-03/internal/one	0.010s

day-03/internal/one/solve.go

@@ -1,41 +0,0 @@
-package one
-
-import (
-	"bufio"
-	"bytes"
-	"io"
-	"regexp"
-
-	"github.com/onyx-and-iris/aoc2024/day-03/internal/util"
-)
-
-var reMul = regexp.MustCompile(`mul\((?P<first>[0-9]{1,3}),(?P<second>[0-9]{1,3})\)`)
-
-func Solve(data []byte) (int, error) {
-	r := bytes.NewReader(data)
-	sum, err := parseLines(r)
-	if err != nil {
-		return 0, err
-	}
-
-	return sum, nil
-}
-
-func parseLines(r io.Reader) (int, error) {
-	var sum int
-
-	scanner := bufio.NewScanner(r)
-	for scanner.Scan() {
-		m := reMul.FindAllString(scanner.Text(), -1)
-		for _, v := range m {
-			groups := util.GetGroups(reMul, v)
-			sum += util.MustConv(groups["first"]) * util.MustConv(groups["second"])
-		}
-	}
-
-	if err := scanner.Err(); err != nil {
-		return 0, err
-	}
-
-	return sum, nil
-}

day-03/internal/one/solve_internal_test.go

@@ -1,15 +0,0 @@
-package one
-
-import (
-	_ "embed"
-	"os"
-	"testing"
-)
-
-//go:embed testdata/input.txt
-var data []byte
-
-func BenchmarkMain(b *testing.B) {
-	os.Stdout, _ = os.Open(os.DevNull)
-	Solve(data)
-}

day-03/internal/two/benchmark

@@ -1,6 +0,0 @@
-goos: linux
-goarch: amd64
-pkg: github.com/onyx-and-iris/aoc2024/day-03/internal/two
-cpu: Intel(R) Core(TM) i7-8700K CPU @ 3.70GHz
-BenchmarkMain-12    	1000000000	         0.0006480 ns/op
-ok  	github.com/onyx-and-iris/aoc2024/day-03/internal/two	0.010s

day-03/internal/two/solve.go

@@ -1,58 +0,0 @@
-package two
-
-import (
-	"bufio"
-	"bytes"
-	"io"
-	"regexp"
-
-	"github.com/onyx-and-iris/aoc2024/day-03/internal/util"
-
-	log "github.com/sirupsen/logrus"
-)
-
-var reMulOrDoOrDont = regexp.MustCompile(`mul\((?P<first>[0-9]{1,3}),(?P<second>[0-9]{1,3})\)|do\(\)|don't\(\)`)
-
-func Solve(data []byte) (int, error) {
-	r := bytes.NewReader(data)
-	sum, err := parseLines(r)
-	if err != nil {
-		return 0, err
-	}
-
-	return sum, nil
-}
-
-func parseLines(r io.Reader) (int, error) {
-	var sum int
-	var do bool = true
-
-	scanner := bufio.NewScanner(r)
-	for scanner.Scan() {
-		m := reMulOrDoOrDont.FindAllString(scanner.Text(), -1)
-		for _, v := range m {
-			switch v {
-			case "do()":
-				do = true
-				log.Debug("hit a do")
-			case "don't()":
-				do = false
-				log.Debug("hit a don't")
-			}
-
-			if do {
-				groups := util.GetGroups(reMulOrDoOrDont, v)
-				if groups["first"] != "" && groups["second"] != "" {
-					log.Debugf("%s * %s\n", groups["first"], groups["second"])
-					sum += util.MustConv(groups["first"]) * util.MustConv(groups["second"])
-				}
-			}
-		}
-	}
-
-	if err := scanner.Err(); err != nil {
-		return 0, err
-	}
-
-	return sum, nil
-}

day-03/internal/two/solve_internal_test.go

@@ -1,15 +0,0 @@
-package two
-
-import (
-	_ "embed"
-	"os"
-	"testing"
-)
-
-//go:embed testdata/input.txt
-var data []byte
-
-func BenchmarkMain(b *testing.B) {
-	os.Stdout, _ = os.Open(os.DevNull)
-	Solve(data)
-}

day-03/internal/util/util.go

@@ -1,25 +0,0 @@
-package util
-
-import (
-	"regexp"
-	"strconv"
-)
-
-func GetGroups(r *regexp.Regexp, s string) map[string]string {
-	groups := make(map[string]string)
-	names := r.SubexpNames()
-	for i, res := range r.FindStringSubmatch(s) {
-		if i != 0 {
-			groups[names[i]] = res
-		}
-	}
-	return groups
-}
-
-func MustConv(s string) int {
-	n, err := strconv.Atoi(s)
-	if err != nil {
-		panic(err)
-	}
-	return n
-}

day-03/makefile

@@ -1,30 +0,0 @@
-program = day-03
-
-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)

day-03/solve.go

@@ -1,20 +0,0 @@
-package daythree
-
-import (
-	"github.com/onyx-and-iris/aoc2024/day-03/internal/one"
-	"github.com/onyx-and-iris/aoc2024/day-03/internal/two"
-)
-
-func Solve(data []byte) (int, int, error) {
-	answerOne, err := one.Solve(data)
-	if err != nil {
-		return 0, 0, err
-	}
-
-	answerTwo, err := two.Solve(data)
-	if err != nil {
-		return 0, 0, err
-	}
-
-	return answerOne, answerTwo, nil
-}

day-03/solve_internal_test.go

@@ -1,15 +0,0 @@
-package daythree
-
-import (
-	_ "embed"
-	"os"
-	"testing"
-)
-
-//go:embed testdata/input.txt
-var data []byte
-
-func BenchmarkMain(b *testing.B) {
-	os.Stdout, _ = os.Open(os.DevNull)
-	Solve(data)
-}

scaffold.sh

@@ -56,18 +56,6 @@ func main() {
 }
 EOT
 
-touch "$name"/solve.go
-cat <<EOT >> "$name"/makefile
-package name
-
-func Solve(data []byte) (int, int, error) {
-	return 0, 0, nil
-}
-EOT
-
 cd "$name" || exit
 
-go mod init github.com/onyx-and-iris/aoc2024/"$name"
+go mod init github.com/onyx-and-iris/aoc2024/"$name"
-
-MKFILES=../mkfiles.sh
-[[ -f $MKFILES ]] && ln -s $MKFILES .