resolve 2023

dbut2 · Dec 3, 2024 · 799d61a · 799d61a
1 parent b003628
commit 799d61a
Show file tree

Hide file tree

Showing 40 changed files with 86 additions and 96 deletions.
diff --git a/.github/workflows/quality.yaml b/.github/workflows/quality.yaml
@@ -21,4 +21,5 @@ jobs:
 
       - name: Build all Go files
         run: |
+          find ./2023 -name "*.go" -exec go build {} \;
           find ./2024 -name "*.go" -exec go build {} \;
diff --git a/2023/01/01.go b/2023/01/01.go
@@ -17,8 +17,8 @@ var tests embed.FS
 
 func main() {
 	h := harness.New(solve, input, tests)
-	h.Expect(1, 142)
-	h.Solve()
+	h.Tester.Expect(1, 142)
+	h.Run()
 }
 
 func solve(input string) int {

diff --git a/2023/01/02.go b/2023/01/02.go
@@ -17,8 +17,8 @@ var tests embed.FS
 
 func main() {
 	h := harness.New(solve, input, tests)
-	h.Expect(2, 281)
-	h.Solve()
+	h.Tester.Expect(2, 281)
+	h.Run()
 }
 
 func solve(input string) int {

diff --git a/2023/07/01.go b/2023/07/01.go
@@ -19,8 +19,8 @@ var tests embed.FS
 
 func main() {
 	h := harness.New(solve, input, tests)
-	h.Expect(1, 6440)
-	h.Solve()
+	h.Tester.Expect(1, 6440)
+	h.Run()
 }
 
 func solve(input string) int {

diff --git a/2023/07/02.go b/2023/07/02.go
@@ -19,8 +19,8 @@ var tests embed.FS
 
 func main() {
 	h := harness.New(solve, input, tests)
-	h.Expect(2, 5905)
-	h.Solve()
+	h.Tester.Expect(2, 5905)
+	h.Run()
 }
 
 func solve(input string) int {

diff --git a/2023/08/01.go b/2023/08/01.go
@@ -16,8 +16,8 @@ var tests embed.FS
 
 func main() {
 	h := harness.New(solve, input, tests)
-	h.Expect(1, 2)
-	h.Solve()
+	h.Tester.Expect(1, 2)
+	h.Run()
 }
 
 func solve(input string) int {

diff --git a/2023/08/02.go b/2023/08/02.go
@@ -19,8 +19,8 @@ var tests embed.FS
 
 func main() {
 	h := harness.New(solve, input, tests)
-	h.Expect(2, 6)
-	h.Solve()
+	h.Tester.Expect(2, 6)
+	h.Run()
 }
 
 type node struct {

diff --git a/2023/09/01.go b/2023/09/01.go
@@ -16,8 +16,8 @@ var tests embed.FS
 
 func main() {
 	h := harness.New(solve, input, tests)
-	h.Expect(1, 114)
-	h.Solve()
+	h.Tester.Expect(1, 114)
+	h.Run()
 }
 
 func solve(input string) int {

diff --git a/2023/09/02.go b/2023/09/02.go
@@ -17,8 +17,8 @@ var tests embed.FS
 
 func main() {
 	h := harness.New(solve, input, tests)
-	h.Expect(1, 2)
-	h.Solve()
+	h.Tester.Expect(1, 2)
+	h.Run()
 }
 
 func solve(input string) int {

diff --git a/2023/10/01.go b/2023/10/01.go
@@ -18,8 +18,8 @@ var tests embed.FS
 
 func main() {
 	h := harness.New(solve, input, tests)
-	h.Expect(1, 8)
-	h.Solve()
+	h.Tester.Expect(1, 8)
+	h.Run()
 }
 
 const (
@@ -82,11 +82,10 @@ func solve(input string) int {
 
 	seen := sets.SetOf(start)
 	loop := []space.Cell{start}
-	queue := lists.Queue[space.Cell]{start.Move(connectionDirections[*grid.Get(start)][0])}
-
-	for len(queue) > 0 {
-		cell := queue.Pop()
+	queue := lists.Queue[space.Cell]{}
+	queue.Push(start.Move(connectionDirections[*grid.Get(start)][0]))
 
+	for cell := range queue.Seq {
 		if seen.Contains(cell) {
 			continue
 		}

diff --git a/2023/10/02.go b/2023/10/02.go
@@ -19,8 +19,8 @@ var tests embed.FS
 
 func main() {
 	h := harness.New(solve, input, tests)
-	h.Expect(2, 10)
-	h.Solve()
+	h.Tester.Expect(2, 10)
+	h.Run()
 }
 
 const (
@@ -83,11 +83,10 @@ func solve(input string) int {
 
 	seen := sets.SetOf(start)
 	loop := []space.Cell{start}
-	queue := lists.Queue[space.Cell]{start.Move(connectionDirections[*grid.Get(start)][0])}
-
-	for len(queue) > 0 {
-		cell := queue.Pop()
+	queue := lists.Queue[space.Cell]{}
+	queue.Push(start.Move(connectionDirections[*grid.Get(start)][0]))
 
+	for cell := range queue.Seq {
 		if seen.Contains(cell) {
 			continue
 		}

diff --git a/2023/11/01.go b/2023/11/01.go
@@ -17,8 +17,8 @@ var tests embed.FS
 
 func main() {
 	h := harness.New(solve, input, tests)
-	h.Expect(1, 374)
-	h.Solve()
+	h.Tester.Expect(1, 374)
+	h.Run()
 }
 
 func solve(input string) int {

diff --git a/2023/11/02.go b/2023/11/02.go
@@ -18,7 +18,7 @@ var tests embed.FS
 func main() {
 	h := harness.New(solve, input, tests)
 	//h.Expect(1, 0)
-	h.Solve()
+	h.Run()
 }
 
 func solve(input string) int {

diff --git a/2023/12/01.go b/2023/12/01.go
@@ -17,8 +17,8 @@ var tests embed.FS
 
 func main() {
 	h := harness.New(solve, input, tests)
-	h.Expect(1, 21)
-	h.Solve()
+	h.Tester.Expect(1, 21)
+	h.Run()
 }
 
 func solve(input string) int {

diff --git a/2023/12/02.go b/2023/12/02.go
@@ -20,8 +20,8 @@ var tests embed.FS
 
 func main() {
 	h := harness.New(solve, input, tests)
-	h.Expect(1, 525152)
-	h.Solve()
+	h.Tester.Expect(1, 525152)
+	h.Run()
 }
 
 func solve(input string) int {

diff --git a/2023/13/01.go b/2023/13/01.go
@@ -16,8 +16,8 @@ var tests embed.FS
 
 func main() {
 	h := harness.New(solve, input, tests)
-	h.Expect(1, 405)
-	h.Solve()
+	h.Tester.Expect(1, 405)
+	h.Run()
 }
 
 func solve(input string) int {

diff --git a/2023/13/02.go b/2023/13/02.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"embed"
+
 	"github.com/dbut2/advent-of-code/pkg/grid"
 	"github.com/dbut2/advent-of-code/pkg/harness"
 	"github.com/dbut2/advent-of-code/pkg/utils"
@@ -15,8 +16,8 @@ var tests embed.FS
 
 func main() {
 	h := harness.New(solve, input, tests)
-	h.Expect(2, 400)
-	h.Solve()
+	h.Tester.Expect(2, 400)
+	h.Run()
 }
 
 func solve(input string) int {

diff --git a/2023/14/01.go b/2023/14/01.go
@@ -16,8 +16,8 @@ var tests embed.FS
 
 func main() {
 	h := harness.New(solve, input, tests)
-	h.Expect(1, 136)
-	h.Solve()
+	h.Tester.Expect(1, 136)
+	h.Run()
 }
 
 func solve(input string) int {

diff --git a/2023/14/02.go b/2023/14/02.go
@@ -16,8 +16,8 @@ var tests embed.FS
 
 func main() {
 	h := harness.New(solve, input, tests)
-	h.Expect(1, 64)
-	h.Solve()
+	h.Tester.Expect(1, 64)
+	h.Run()
 }
 
 type rock uint8

diff --git a/2023/15/01.go b/2023/15/01.go
@@ -15,8 +15,8 @@ var tests embed.FS
 
 func main() {
 	h := harness.New(solve, input, tests)
-	h.Expect(1, 1320)
-	h.Solve()
+	h.Tester.Expect(1, 1320)
+	h.Run()
 }
 
 func solve(input string) int {

diff --git a/2023/15/02.go b/2023/15/02.go
@@ -17,8 +17,8 @@ var tests embed.FS
 
 func main() {
 	h := harness.New(solve, input, tests)
-	h.Expect(1, 145)
-	h.Solve()
+	h.Tester.Expect(1, 145)
+	h.Run()
 }
 
 func solve(input string) int {

diff --git a/2023/16/01.go b/2023/16/01.go
@@ -18,8 +18,8 @@ var tests embed.FS
 
 func main() {
 	h := harness.New(solve, input, tests)
-	h.Expect(1, 46)
-	h.Solve()
+	h.Tester.Expect(1, 46)
+	h.Run()
 }
 
 func solve(input string) int {

diff --git a/2023/16/02.go b/2023/16/02.go
@@ -18,8 +18,8 @@ var tests embed.FS
 
 func main() {
 	h := harness.New(solve, input, tests)
-	h.Expect(1, 51)
-	h.Solve()
+	h.Tester.Expect(1, 51)
+	h.Run()
 }
 
 func solve(input string) int {

diff --git a/2023/17/01.go b/2023/17/01.go
@@ -18,8 +18,8 @@ var tests embed.FS
 
 func main() {
 	h := harness.New(solve, input, tests)
-	h.Expect(1, 102)
-	h.Solve()
+	h.Tester.Expect(1, 102)
+	h.Run()
 }
 
 func solve(input string) int {

diff --git a/2023/17/02.go b/2023/17/02.go
@@ -18,9 +18,9 @@ var tests embed.FS
 
 func main() {
 	h := harness.New(solve, input, tests)
-	h.Expect(1, 94)
-	h.Expect(2, 71)
-	h.Solve()
+	h.Tester.Expect(1, 94)
+	h.Tester.Expect(2, 71)
+	h.Run()
 }
 
 func solve(input string) int {

diff --git a/2023/18/01.go b/2023/18/01.go
@@ -19,8 +19,8 @@ var tests embed.FS
 
 func main() {
 	h := harness.New(solve, input, tests)
-	h.Expect(1, 62)
-	h.Solve()
+	h.Tester.Expect(1, 62)
+	h.Run()
 }
 
 func solve(input string) int {

diff --git a/2023/18/02.go b/2023/18/02.go
@@ -18,8 +18,8 @@ var tests embed.FS
 
 func main() {
 	h := harness.New(solve, input, tests)
-	h.Expect(1, 952408144115)
-	h.Solve()
+	h.Tester.Expect(1, 952408144115)
+	h.Run()
 }
 
 func hexToDec(hex string) int {

diff --git a/2023/19/01.go b/2023/19/01.go
@@ -17,8 +17,8 @@ var tests embed.FS
 
 func main() {
 	h := harness.New(solve, input, tests)
-	h.Expect(1, 19114)
-	h.Solve()
+	h.Tester.Expect(1, 19114)
+	h.Run()
 }
 
 type Workflow struct {

diff --git a/2023/19/02.go b/2023/19/02.go
@@ -19,8 +19,8 @@ var tests embed.FS
 
 func main() {
 	h := harness.New(solve, input, tests)
-	h.Expect(1, 167409079868000)
-	h.Solve()
+	h.Tester.Expect(1, 167409079868000)
+	h.Run()
 }
 
 type Workflow struct {
@@ -100,9 +100,7 @@ func solve(input string) int {
 		rule: "in",
 	})
 
-	for len(queue) > 0 {
-		item := queue.Pop()
-
+	for item := range queue.Seq {
 		w := workflows[item.rule]
 
 		for _, rule := range w.Rules {

diff --git a/2023/20/01.go b/2023/20/01.go
@@ -17,8 +17,8 @@ var tests embed.FS
 
 func main() {
 	h := harness.New(solve, input, tests)
-	h.Expect(1, 32000000)
-	h.Solve()
+	h.Tester.Expect(1, 32000000)
+	h.Run()
 }
 
 type Pulse struct {
@@ -167,9 +167,7 @@ func solve(input string) int {
 			high: false,
 		})
 
-		for len(pulses) > 0 {
-			p := pulses.Pop()
-
+		for p := range pulses.Seq {
 			if p.high {
 				high++
 			} else {