add day-08 + benchmarks

day-08/benchmark

@@ -0,0 +1,15 @@
+goos: linux
+goarch: amd64
+pkg: github.com/onyx-and-iris/aoc2024/day-08
+cpu: Intel(R) Core(TM) i7-8700K CPU @ 3.70GHz
+BenchmarkSolve-12    	1000000000	         0.001771 ns/op
+BenchmarkSolve-12    	1000000000	         0.001648 ns/op
+BenchmarkSolve-12    	1000000000	         0.002101 ns/op
+BenchmarkSolve-12    	1000000000	         0.001605 ns/op
+BenchmarkSolve-12    	1000000000	         0.001808 ns/op
+BenchmarkSolve-12    	1000000000	         0.001663 ns/op
+BenchmarkSolve-12    	1000000000	         0.001589 ns/op
+BenchmarkSolve-12    	1000000000	         0.001926 ns/op
+BenchmarkSolve-12    	1000000000	         0.001643 ns/op
+BenchmarkSolve-12    	1000000000	         0.001669 ns/op
+ok  	github.com/onyx-and-iris/aoc2024/day-08	0.144s

day-08/cmd/cli/main.go

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

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

day-08/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-08/internal/one/antenna.go

@@ -0,0 +1,20 @@
+package one
+
+type coords struct {
+	x int
+	y int
+}
+
+func newCoords(x, y int) coords {
+	return coords{x, y}
+}
+
+type antenna struct {
+	coords
+	identifier rune
+}
+
+func newAntenna(x, y int, identifier rune) antenna {
+	coords := newCoords(x, y)
+	return antenna{coords: coords, identifier: identifier}
+}

day-08/internal/one/benchmark

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

day-08/internal/one/graph.go

@@ -0,0 +1,32 @@
+package one
+
+import (
+	"strings"
+
+	"github.com/onyx-and-iris/aoc2024/day-08/internal/util"
+)
+
+type graph struct {
+	data      []string
+	antennae  []antenna
+	antinodes map[coords]struct{}
+}
+
+func (g *graph) String() string {
+	return strings.Join(g.data, "\n")
+}
+
+func (g *graph) isOutOfBounds(c coords) bool {
+	return c.x < 0 || c.y < 0 || c.y >= len(g.data) || c.x >= len(g.data[0])
+}
+
+func (g *graph) debug() string {
+	for _, antenna := range g.antennae {
+		g.data[antenna.y] = util.ReplaceAtIndex(g.data[antenna.y], antenna.identifier, antenna.x)
+	}
+	for antinode := range g.antinodes {
+		g.data[antinode.y] = util.ReplaceAtIndex(g.data[antinode.y], '#', antinode.x)
+	}
+
+	return g.String()
+}

day-08/internal/one/solve.go

@@ -0,0 +1,53 @@
+package one
+
+import (
+	"bytes"
+	"math"
+
+	log "github.com/sirupsen/logrus"
+)
+
+func Solve(buf []byte) (int, error) {
+	r := bytes.NewReader(buf)
+	graph, err := parseLines(r)
+	if err != nil {
+		return 0, err
+	}
+
+	graph.antinodes = make(map[coords]struct{})
+
+	for i, a := range graph.antennae {
+		for j, b := range graph.antennae {
+			if i == j || a.identifier != b.identifier {
+				continue
+			}
+
+			coords := calcAntiNodePos(a.coords, b.coords)
+			if !graph.isOutOfBounds(coords) {
+				_, ok := graph.antinodes[coords]
+				if !ok {
+					graph.antinodes[coords] = struct{}{}
+				}
+			}
+		}
+	}
+
+	log.Debugf("\n%s\n", graph.debug())
+
+	return len(graph.antinodes), nil
+}
+
+func calcAntiNodePos(a, b coords) coords {
+	xdiff := int(math.Abs(float64(a.x - b.x)))
+	ydiff := int(math.Abs(float64(a.y - b.y)))
+
+	if a.x < b.x && a.y < b.y {
+		return newCoords(b.x+xdiff, b.y+ydiff)
+	} else if a.x < b.x && a.y > b.y {
+		return newCoords(b.x+xdiff, b.y-ydiff)
+	} else if a.x > b.x && a.y < b.y {
+		return newCoords(b.x-xdiff, b.y+ydiff)
+	} else {
+		return newCoords(b.x-xdiff, b.y-ydiff)
+	}
+}

day-08/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-08/internal/one/util.go

@@ -0,0 +1,34 @@
+package one
+
+import (
+	"bufio"
+	"io"
+	"regexp"
+)
+
+var reMatchAntennae = regexp.MustCompile(`[a-zA-Z0-9]`)
+
+func parseLines(r io.Reader) (*graph, error) {
+	var graph graph
+
+	var linecount int
+	scanner := bufio.NewScanner(r)
+	for scanner.Scan() {
+		line := scanner.Text()
+		graph.data = append(graph.data, line)
+
+		for _, m := range reMatchAntennae.FindAllStringIndex(line, -1) {
+			graph.antennae = append(
+				graph.antennae,
+				newAntenna(m[0], linecount, rune(line[m[0]])),
+			)
+		}
+		linecount++
+	}
+
+	if err := scanner.Err(); err != nil {
+		return nil, err
+	}
+
+	return &graph, nil
+}

day-08/internal/two/antenna.go

@@ -0,0 +1,20 @@
+package two
+
+type coords struct {
+	x int
+	y int
+}
+
+func newCoords(x, y int) coords {
+	return coords{x, y}
+}
+
+type antenna struct {
+	coords
+	identifier rune
+}
+
+func newAntenna(x, y int, identifier rune) antenna {
+	coords := newCoords(x, y)
+	return antenna{coords: coords, identifier: identifier}
+}

day-08/internal/two/benchmark

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

day-08/internal/two/cache.go

@@ -0,0 +1,33 @@
+package two
+
+import "sync"
+
+type antiNodeCache struct {
+	mu   sync.RWMutex
+	data map[coords]struct{}
+}
+
+func newAntiNodeCache() antiNodeCache {
+	return antiNodeCache{
+		data: make(map[coords]struct{}),
+	}
+}
+
+func (c *antiNodeCache) len() int {
+	return len(c.data)
+}
+
+func (c *antiNodeCache) contains(coords coords) bool {
+	c.mu.RLock()
+	defer c.mu.RUnlock()
+
+	_, ok := c.data[coords]
+	return ok
+}
+
+func (c *antiNodeCache) insert(coords coords) {
+	c.mu.Lock()
+	defer c.mu.Unlock()
+
+	c.data[coords] = struct{}{}
+}

day-08/internal/two/graph.go

@@ -0,0 +1,36 @@
+package two
+
+import (
+	"strings"
+
+	"github.com/onyx-and-iris/aoc2024/day-08/internal/util"
+)
+
+type graph struct {
+	data      []string
+	antennae  []antenna
+	antinodes antiNodeCache
+}
+
+func newGraph() *graph {
+	return &graph{[]string{}, []antenna{}, newAntiNodeCache()}
+}
+
+func (g *graph) String() string {
+	return strings.Join(g.data, "\n")
+}
+
+func (g *graph) isOutOfBounds(c coords) bool {
+	return c.x < 0 || c.y < 0 || c.y >= len(g.data) || c.x >= len(g.data[0])
+}
+
+func (g *graph) debug() string {
+	for _, antenna := range g.antennae {
+		g.data[antenna.y] = util.ReplaceAtIndex(g.data[antenna.y], antenna.identifier, antenna.x)
+	}
+	for antinode := range g.antinodes.data {
+		g.data[antinode.y] = util.ReplaceAtIndex(g.data[antinode.y], '#', antinode.x)
+	}
+
+	return g.String()
+}

day-08/internal/two/solve.go

@@ -0,0 +1,66 @@
+package two
+
+import (
+	"bytes"
+	"math"
+	"sync"
+
+	log "github.com/sirupsen/logrus"
+)
+
+func Solve(buf []byte) (int, error) {
+	r := bytes.NewReader(buf)
+	graph, err := parseLines(r)
+	if err != nil {
+		return 0, err
+	}
+
+	var wg sync.WaitGroup
+	wg.Add(len(graph.antennae))
+
+	for i, a := range graph.antennae {
+		go func() {
+			defer wg.Done()
+
+			for j, b := range graph.antennae {
+				if i == j || a.identifier != b.identifier {
+					continue
+				}
+
+				all := []coords{a.coords, b.coords}
+				for _, coords := range calcAntiNodePos(a.coords, b.coords, graph, all) {
+					if !graph.isOutOfBounds(coords) && !graph.antinodes.contains(coords) {
+						graph.antinodes.insert(coords)
+					}
+				}
+			}
+		}()
+	}
+
+	wg.Wait()
+
+	log.Debugf("\n%s\n", graph.debug())
+
+	return graph.antinodes.len(), nil
+}
+
+func calcAntiNodePos(a, b coords, graph *graph, all []coords) []coords {
+	xdiff := int(math.Abs(float64(a.x - b.x)))
+	ydiff := int(math.Abs(float64(a.y - b.y)))
+
+	var next coords
+	if a.x < b.x && a.y < b.y {
+		next = newCoords(b.x+xdiff, b.y+ydiff)
+	} else if a.x < b.x && a.y > b.y {
+		next = newCoords(b.x+xdiff, b.y-ydiff)
+	} else if a.x > b.x && a.y < b.y {
+		next = newCoords(b.x-xdiff, b.y+ydiff)
+	} else {
+		next = newCoords(b.x-xdiff, b.y-ydiff)
+	}
+
+	if graph.isOutOfBounds(next) {
+		return all
+	}
+	return calcAntiNodePos(b, next, graph, append(all, next))
+}

day-08/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-08/internal/two/util.go

@@ -0,0 +1,34 @@
+package two
+
+import (
+	"bufio"
+	"io"
+	"regexp"
+)
+
+var reMatchAntennae = regexp.MustCompile(`[a-zA-Z0-9]`)
+
+func parseLines(r io.Reader) (*graph, error) {
+	graph := newGraph()
+
+	var linecount int
+	scanner := bufio.NewScanner(r)
+	for scanner.Scan() {
+		line := scanner.Text()
+		graph.data = append(graph.data, line)
+
+		for _, m := range reMatchAntennae.FindAllStringIndex(line, -1) {
+			graph.antennae = append(
+				graph.antennae,
+				newAntenna(m[0], linecount, rune(line[m[0]])),
+			)
+		}
+		linecount++
+	}
+
+	if err := scanner.Err(); err != nil {
+		return nil, err
+	}
+
+	return graph, nil
+}

day-08/internal/util/util.go

@@ -0,0 +1,7 @@
+package util
+
+func ReplaceAtIndex(s string, r rune, i int) string {
+	out := []rune(s)
+	out[i] = r
+	return string(out)
+}

day-08/makefile

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

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

day-08/solve_internal_test.go

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