Rearranged utils and pulled the Grid into a util

shaunburdick · shaunburdick · commit 5e9b51cf2bfe · 2024-12-10T21:04:37.000-05:00
diff --git a/day-0/main.go b/day-0/main.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	file "github.com/shaunburdick/advent-of-code-2024/lib"
+	file "github.com/shaunburdick/advent-of-code-2024/lib/file"
 )
 
 var input string
diff --git a/day-0/main_test.go b/day-0/main_test.go
@@ -3,7 +3,7 @@ package main
 import (
 	"testing"
 
-	file "github.com/shaunburdick/advent-of-code-2024/lib"
+	file "github.com/shaunburdick/advent-of-code-2024/lib/file"
 )
 
 type TestDeclaration struct {
diff --git a/day-1/main.go b/day-1/main.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	file "github.com/shaunburdick/advent-of-code-2024/lib"
+	file "github.com/shaunburdick/advent-of-code-2024/lib/file"
 )
 
 var input string
diff --git a/day-1/main_test.go b/day-1/main_test.go
@@ -3,7 +3,7 @@ package main
 import (
 	"testing"
 
-	file "github.com/shaunburdick/advent-of-code-2024/lib"
+	file "github.com/shaunburdick/advent-of-code-2024/lib/file"
 )
 
 type TestDeclaration struct {
diff --git a/day-2/main.go b/day-2/main.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	file "github.com/shaunburdick/advent-of-code-2024/lib"
+	file "github.com/shaunburdick/advent-of-code-2024/lib/file"
 )
 
 var input string
diff --git a/day-2/main_test.go b/day-2/main_test.go
@@ -3,7 +3,7 @@ package main
 import (
 	"testing"
 
-	file "github.com/shaunburdick/advent-of-code-2024/lib"
+	file "github.com/shaunburdick/advent-of-code-2024/lib/file"
 )
 
 type TestDeclaration struct {
diff --git a/day-3/main.go b/day-3/main.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	file "github.com/shaunburdick/advent-of-code-2024/lib"
+	file "github.com/shaunburdick/advent-of-code-2024/lib/file"
 )
 
 var input string
diff --git a/day-3/main_test.go b/day-3/main_test.go
@@ -3,7 +3,7 @@ package main
 import (
 	"testing"
 
-	file "github.com/shaunburdick/advent-of-code-2024/lib"
+	file "github.com/shaunburdick/advent-of-code-2024/lib/file"
 )
 
 type TestDeclaration struct {
diff --git a/day-4/main.go b/day-4/main.go
@@ -7,7 +7,7 @@ import (
 	"log"
 	"strings"
 
-	file "github.com/shaunburdick/advent-of-code-2024/lib"
+	file "github.com/shaunburdick/advent-of-code-2024/lib/file"
 )
 
 var input string
diff --git a/day-4/main_test.go b/day-4/main_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	file "github.com/shaunburdick/advent-of-code-2024/lib"
+	file "github.com/shaunburdick/advent-of-code-2024/lib/file"
 )
 
 type TestDeclaration struct {
diff --git a/day-5/main.go b/day-5/main.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"
 
-	file "github.com/shaunburdick/advent-of-code-2024/lib"
+	file "github.com/shaunburdick/advent-of-code-2024/lib/file"
 )
 
 var input string
diff --git a/day-5/main_test.go b/day-5/main_test.go
@@ -3,7 +3,7 @@ package main
 import (
 	"testing"
 
-	file "github.com/shaunburdick/advent-of-code-2024/lib"
+	file "github.com/shaunburdick/advent-of-code-2024/lib/file"
 )
 
 type TestDeclaration struct {
diff --git a/day-6/main.go b/day-6/main.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	file "github.com/shaunburdick/advent-of-code-2024/lib"
+	file "github.com/shaunburdick/advent-of-code-2024/lib/file"
 )
 
 var input string
diff --git a/day-6/main_test.go b/day-6/main_test.go
@@ -3,7 +3,7 @@ package main
 import (
 	"testing"
 
-	file "github.com/shaunburdick/advent-of-code-2024/lib"
+	file "github.com/shaunburdick/advent-of-code-2024/lib/file"
 )
 
 type TestDeclaration struct {
diff --git a/day-7/main.go b/day-7/main.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	file "github.com/shaunburdick/advent-of-code-2024/lib"
+	file "github.com/shaunburdick/advent-of-code-2024/lib/file"
 )
 
 var input string
diff --git a/day-7/main_test.go b/day-7/main_test.go
@@ -3,7 +3,7 @@ package main
 import (
 	"testing"
 
-	file "github.com/shaunburdick/advent-of-code-2024/lib"
+	file "github.com/shaunburdick/advent-of-code-2024/lib/file"
 )
 
 type TestDeclaration struct {
diff --git a/lib/file/file.go b/lib/file/file.go
diff --git a/lib/grid/grid.go b/lib/grid/grid.go
@@ -0,0 +1,96 @@
+package grid
+
+import (
+	"strconv"
+)
+
+type Grid struct {
+	Data []string
+}
+
+// Returns the rune at the given coordinates
+func (g Grid) CharAt(c Coords) rune {
+	return rune(g.Data[c.y][c.x])
+}
+
+// Updates the grid, setting the char at the coords
+func (g Grid) SetCharAt(c Coords, char string) {
+	g.Data[c.y] = g.Data[c.y][:c.x] + char + g.Data[c.y][c.x+1:]
+}
+
+// Checks if a set of Coords is on the grid
+func (g Grid) InBounds(c Coords) bool {
+	return c.x >= 0 && c.y >= 0 && c.y < len(g.Data) && c.x < len(g.Data[c.y])
+}
+
+// Returns a list of Coords where the char is found
+func (g Grid) FindChar(char rune) []Coords {
+	coords := []Coords{}
+
+	for y, row := range g.Data {
+		for x, letter := range row {
+			if letter == char {
+				coords = append(coords, Coords{x, y})
+			}
+		}
+	}
+
+	return coords
+}
+
+type Coords struct {
+	x int
+	y int
+}
+
+type Direction int
+
+const (
+	NorthWest Direction = iota
+	North
+	NorthEast
+	West
+	East
+	SouthWest
+	South
+	SouthEast
+)
+
+var AllDirections []Direction = []Direction{
+	NorthWest,
+	North,
+	NorthEast,
+	West,
+	East,
+	SouthWest,
+	South,
+	SouthEast,
+}
+
+// Gets the next Coords in the given direction
+func (c Coords) Next(d Direction) Coords {
+	switch d {
+	case NorthWest:
+		return Coords{x: c.x - 1, y: c.y - 1}
+	case North:
+		return Coords{x: c.x, y: c.y - 1}
+	case NorthEast:
+		return Coords{x: c.x + 1, y: c.y - 1}
+	case West:
+		return Coords{x: c.x - 1, y: c.y}
+	case East:
+		return Coords{x: c.x + 1, y: c.y}
+	case SouthWest:
+		return Coords{x: c.x - 1, y: c.y + 1}
+	case South:
+		return Coords{x: c.x, y: c.y + 1}
+	case SouthEast:
+		return Coords{x: c.x + 1, y: c.y + 1}
+	default:
+		panic("Unknown Direction!")
+	}
+}
+
+func (c Coords) String() string {
+	return strconv.Itoa(c.x) + "-" + strconv.Itoa(c.y)
+}
diff --git a/scripts/template/tmpls/main.go.tmpl b/scripts/template/tmpls/main.go.tmpl
@@ -7,7 +7,7 @@ import (
     "log"
 	"strings"
 
-    file "github.com/shaunburdick/advent-of-code-2024/lib"
+    file "github.com/shaunburdick/advent-of-code-2024/lib/file"
 )
 
 var input string
diff --git a/scripts/template/tmpls/main_test.go.tmpl b/scripts/template/tmpls/main_test.go.tmpl
@@ -3,7 +3,7 @@ package main
 import (
 	"testing"
 
-    file "github.com/shaunburdick/advent-of-code-2024/lib"
+    file "github.com/shaunburdick/advent-of-code-2024/lib/file"
 )
 
 type TestDeclaration struct {

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"strconv"`
`8`	`8`	`"strings"`
`9`	`9`
`10`		`- file "github.com/shaunburdick/advent-of-code-2024/lib"`
	`10`	`+ file "github.com/shaunburdick/advent-of-code-2024/lib/file"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`var input string`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package main`
`3`	`3`	`import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`		`- file "github.com/shaunburdick/advent-of-code-2024/lib"`
	`6`	`+ file "github.com/shaunburdick/advent-of-code-2024/lib/file"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`type TestDeclaration struct {`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"strconv"`
`9`	`9`	`"strings"`
`10`	`10`
`11`		`- file "github.com/shaunburdick/advent-of-code-2024/lib"`
	`11`	`+ file "github.com/shaunburdick/advent-of-code-2024/lib/file"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`var input string`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"log"`
`8`	`8`	`"strings"`
`9`	`9`
`10`		`- file "github.com/shaunburdick/advent-of-code-2024/lib"`
	`10`	`+ file "github.com/shaunburdick/advent-of-code-2024/lib/file"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`var input string`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"reflect"`
`5`	`5`	`"testing"`
`6`	`6`
`7`		`- file "github.com/shaunburdick/advent-of-code-2024/lib"`
	`7`	`+ file "github.com/shaunburdick/advent-of-code-2024/lib/file"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`type TestDeclaration struct {`