add day-05 + benchmarks

day-05/benchmark

@@ -0,0 +1,15 @@
+goos: linux
+goarch: amd64
+pkg: github.com/onyx-and-iris/aoc2024/day-05
+cpu: Intel(R) Core(TM) i7-8700K CPU @ 3.70GHz
+BenchmarkSolve-12    	1000000000	         0.02016 ns/op
+BenchmarkSolve-12    	1000000000	         0.02019 ns/op
+BenchmarkSolve-12    	1000000000	         0.02182 ns/op
+BenchmarkSolve-12    	1000000000	         0.01990 ns/op
+BenchmarkSolve-12    	1000000000	         0.02056 ns/op
+BenchmarkSolve-12    	1000000000	         0.02031 ns/op
+BenchmarkSolve-12    	1000000000	         0.02083 ns/op
+BenchmarkSolve-12    	1000000000	         0.02167 ns/op
+BenchmarkSolve-12    	1000000000	         0.02048 ns/op
+BenchmarkSolve-12    	1000000000	         0.02080 ns/op
+ok  	github.com/onyx-and-iris/aoc2024/day-05	1.471s

day-05/cmd/cli/main.go

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

day-05/go.mod

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

day-05/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=

day-05/internal/one/benchmark

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

day-05/internal/one/solve.go

@@ -0,0 +1,43 @@
+package one
+
+import (
+	"bytes"
+	"slices"
+
+	"github.com/onyx-and-iris/aoc2024/day-05/internal/util"
+)
+
+func Solve(buf []byte) (int, error) {
+	r := bytes.NewReader(buf)
+	data, err := util.ParseLines(r)
+	if err != nil {
+		return 0, err
+	}
+
+	var sum int
+
+	for i, products := range data[1] {
+		inOrder := true
+		for _, product := range products {
+			for _, rules := range data[0] {
+				if !slices.Contains(rules, product) {
+					continue
+				}
+
+				indx1, indx2 := slices.Index(products, rules[0]), slices.Index(products, rules[1])
+				if indx1 != -1 && indx2 != -1 && indx2 < indx1 {
+					inOrder = false
+					break
+				}
+			}
+			if !inOrder {
+				break
+			}
+		}
+		if inOrder {
+			sum += data[1][i][len(data[1][i])/2]
+		}
+	}
+
+	return sum, nil
+}

day-05/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)
+}

day-05/internal/two/benchmark

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

day-05/internal/two/solve.go

@@ -0,0 +1,65 @@
+package two
+
+import (
+	"bytes"
+	"slices"
+
+	log "github.com/sirupsen/logrus"
+
+	"github.com/onyx-and-iris/aoc2024/day-05/internal/util"
+)
+
+func Solve(buf []byte) (int, error) {
+	r := bytes.NewReader(buf)
+	data, err := util.ParseLines(r)
+	if err != nil {
+		return 0, err
+	}
+
+	var sum int
+
+	for i, products := range data[1] {
+		inOrder := true
+		for _, product := range products {
+			for _, rulesets := range data[0] {
+				if !slices.Contains(rulesets, product) {
+					continue
+				}
+
+				indx1, indx2 := slices.Index(products, rulesets[0]), slices.Index(products, rulesets[1])
+				if indx1 != -1 && indx2 != -1 && indx2 < indx1 {
+					inOrder = false
+					break
+				}
+			}
+			if !inOrder {
+				break
+			}
+		}
+		if !inOrder {
+			sum += midOfFixedOrder(data[1][i], data[0])
+		}
+	}
+
+	return sum, nil
+}
+
+func midOfFixedOrder(products []int, rulesets [][]int) int {
+	log.Debugf("unordered products: %v", products)
+
+	for {
+		var sorts int
+		for _, ruleset := range rulesets {
+			indx1, indx2 := slices.Index(products, ruleset[0]), slices.Index(products, ruleset[1])
+			if indx1 != -1 && indx2 != -1 && indx2 < indx1 {
+				products[indx1], products[indx2] = products[indx2], products[indx1]
+				sorts++
+			}
+		}
+		if sorts == 0 {
+			break
+		}
+	}
+
+	return products[len(products)/2]
+}

day-05/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)
+}

day-05/internal/util/util.go

@@ -0,0 +1,49 @@
+package util
+
+import (
+	"bufio"
+	"io"
+	"log"
+	"strconv"
+	"strings"
+)
+
+func MustConv(s string) int {
+	n, err := strconv.Atoi(s)
+	if err != nil {
+		panic(err)
+	}
+	return n
+}
+
+func ParseLines(r io.Reader) ([][][]int, error) {
+	data := make([][][]int, 2)
+
+	filter := func(r rune) bool {
+		return r == '|' || r == ','
+	}
+
+	buf, err := io.ReadAll(r)
+	if err != nil {
+		log.Fatal(err)
+	}
+	parts := strings.Split(string(buf), "\n\n")
+
+	for i, part := range parts {
+		scanner := bufio.NewScanner(strings.NewReader(part))
+		for scanner.Scan() {
+			filtered := strings.FieldsFunc(scanner.Text(), filter)
+			var nums []int
+			for _, n := range filtered {
+				nums = append(nums, MustConv(n))
+			}
+			data[i] = append(data[i], nums)
+		}
+
+		if err := scanner.Err(); err != nil {
+			return nil, err
+		}
+	}
+
+	return data, nil
+}

day-05/makefile

@@ -0,0 +1,30 @@
+program = day-05
+
+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-05/solve.go

@@ -0,0 +1,20 @@
+package dayfive
+
+import (
+	"github.com/onyx-and-iris/aoc2024/day-05/internal/one"
+	"github.com/onyx-and-iris/aoc2024/day-05/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-05/solve_internal_test.go

@@ -0,0 +1,15 @@
+package dayfive
+
+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)
+}