From 975cb8653cd64b5f26c71339e7ec3151d077ba5e Mon Sep 17 00:00:00 2001 From: Mike Vink Date: Sun, 26 Feb 2023 22:59:17 +0100 Subject: fixup --- 2022/02/input.txt | 0 2022/02/jankenpon/jankenpon_suite_test.go | 13 + 2022/02/jankenpon/jankenpon_test.go | 9 +- 2022/02/main.go | 2 +- cmd/aocli/gen.go | 4 +- day2.txt | 2498 ----------------------------- 6 files changed, 24 insertions(+), 2502 deletions(-) create mode 100644 2022/02/input.txt create mode 100644 2022/02/jankenpon/jankenpon_suite_test.go diff --git a/2022/02/input.txt b/2022/02/input.txt new file mode 100644 index 0000000..e69de29 diff --git a/2022/02/jankenpon/jankenpon_suite_test.go b/2022/02/jankenpon/jankenpon_suite_test.go new file mode 100644 index 0000000..03ffea6 --- /dev/null +++ b/2022/02/jankenpon/jankenpon_suite_test.go @@ -0,0 +1,13 @@ +package jankenpon_test + +import ( + "testing" + + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" +) + +func TestJankenpon(t *testing.T) { + RegisterFailHandler(Fail) + RunSpecs(t, "Jankenpon Suite") +} diff --git a/2022/02/jankenpon/jankenpon_test.go b/2022/02/jankenpon/jankenpon_test.go index a961560..edf437d 100644 --- a/2022/02/jankenpon/jankenpon_test.go +++ b/2022/02/jankenpon/jankenpon_test.go @@ -1,8 +1,15 @@ -package jankenpon_test +package jankenpon import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "mvinkio.online/aoc/aoc" +) + +var ( + data = aoc.ReadLines(readJankenpon) + answer1 = 15 + answer2 = 12 ) var _ = Describe("jankenpon", func() { diff --git a/2022/02/main.go b/2022/02/main.go index a694019..35d3bfa 100644 --- a/2022/02/main.go +++ b/2022/02/main.go @@ -14,6 +14,6 @@ func main() { context.TODO(), aoc.NewScanCloser("2022/02/input.txt"), aoc.ReadLines(jankenpon.Reader), - jankenpon.Solvers, + jankenpon.Solvers, ) } diff --git a/cmd/aocli/gen.go b/cmd/aocli/gen.go index eadfff8..ad5fa72 100644 --- a/cmd/aocli/gen.go +++ b/cmd/aocli/gen.go @@ -54,12 +54,12 @@ func partTwo(ctx context.Context, data any) (any, error) { return nil, nil } -func read{{ .Name | Title }}(line []string) (any, error) { +func read{{ .Name | Title }}(lines []string) (any, error) { return nil, nil } ` -var testTmpl string = `package {{ .Name }}_test +var testTmpl string = `package {{ .Name }} import ( . "github.com/onsi/ginkgo/v2" diff --git a/day2.txt b/day2.txt index 75812ca..db60e36 100644 --- a/day2.txt +++ b/day2.txt @@ -1,2501 +1,3 @@ -C X -C X -C X -A Z -C X -C Z -C X -B Y -C X -C X -C X -B Y -C X -B Z -C Z -C X -C X -C Z -C Z -B Y -C Z -C X -B Z -C X -C X -C X -B Y -C Z -B Z -C X -B Y -C Z -A Y -C X -B Y -A Y -C X -C Y -C X -C Z -C X -C X -A Y -C X -C X -B Y -B Y -C X -C X -B Y -C Z -B Y -B Y -C X -C X -C Y -B X -C X -C X -B X -C Y -B X -B Y -C X -C Z -B Y -B Y -B Y -B X -C Z -C X -B Y -C X -A Y -C Z -A Y -C Z -C X -C Z -B Y -B X -C X -B Z -C X -C Y -C X -C X -C Z -C Z -C Z -B Z -C Y -B Y -B Y -B Y -C X -B Y -C Z -C X -C X -C X -B Y -C Z -C X -C X -C X -C X -C X -B Z -C X -A Y -B X -C X -C X -C X -A Y -B Z -C X -C Z -C X -A Y -C X -B Y -C Z -C X -C Z -B Z -B Y -B Y -C Z -B Y -B Y -B X -B Y -B Y -C X -C Z -C X -C X -C X -C X -C X -C X -C X -C X -C Z -C Y -B Y -B Y -C Z -A X -C X -C Z -B Z -B Y -C Z -C X -C X -B Z -B Z -C X -C X -C X -B X -A Y -B X -C X -C Z -C X -C Z -B Y -C X -B Y -A Y -A Y -A Y -B Y -C X -C Y -B Y -A Y -C Z -A X -C X -C Z -C X -C X -C X -C Z -C X -B X -A X -C Z -C X -C X -C Y -C X -C Z -B Y -C X -C X -C X -C Z -C X -B X -C X -B Y -B X -C Y -C X -C X -C Y -C X -C X -C X -C X -B Y -C X -B X -B Y -C Y -C X -C X -B X -C X -C X -B Y -A Y -C Z -C X -B Y -C X -C X -C Z -C X -C X -A Z -C X -C Y -A Z -C Z -C Z -B Y -C X -B Y -C X -C X -C X -B Y -B Z -C X -C X -C X -B X -B Y -C X -A Y -B X -B X -B Y -B Z -C X -B X -C Z -C X -B Y -C X -A X -C Y -A Z -C X -A Z -B Z -C X -B X -B Y -A Y -B X -C X -B Y -B X -C Z -B Y -B X -A X -C Z -B Y -C X -C X -C X -A Y -B Y -C X -B Y -C Z -C X -C Z -B Z -B X -A Y -C X -B Y -C X -C X -C X -B Y -B Y -B Z -B Y -C Z -C X -C Z -C X -C Z -C X -C X -A Y -C Z -B Y -A Y -B Z -C X -C X -C X -C X -B Y -C X -C X -C X -C X -A Y -C X -C X -C X -C Z -C X -B Y -C X -C X -C Z -C X -C X -C X -B Y -B Z -B Y -C X -C X -C X -B Y -C X -B Y -C X -C X -C Z -C Y -C Z -C Z -C X -C X -C Z -A Y -C Z -C X -B Z -C X -C Z -C X -C X -B Y -B Z -B Z -A Y -B Z -C Z -C X -C Y -B Y -A Y -C X -A Y -A Z -B Z -A Y -C X -C Z -A Y -B Y -B Y -C X -C Z -B Y -C X -C X -B Y -C X -C Z -B Y -B X -C Z -C X -C Y -C X -C X -C X -C Y -C X -B Z -C Y -B Y -B Y -C X -A Y -C X -A Z -A Y -B X -C X -B Y -C X -B Y -B Y -C Z -C Z -A Y -C X -A Y -C Z -C X -C Z -C X -B Y -B X -C X -B X -C X -C X -B Y -C X -C X -C X -C Z -C Z -B Y -C Y -C X -C X -B Y -C X -C Z -C X -C Z -C X -C Y -C X -C Y -C Z -C X -B Y -C X -B X -B Y -C Z -B Y -B Z -B Z -C X -A X -C X -C Z -C Y -C X -B X -C Y -A Y -C Y -C X -B Y -B Y -C X -C Z -B X -A Y -C X -C X -C X -B Y -B Y -B Z -C Z -C Z -B X -C X -B Z -C X -B Y -B Y -C Z -C X -C Z -C X -C X -C X -C Z -C Z -C Z -C X -B Y -C X -C X -B Y -C X -C X -C X -A Y -C Z -B Z -B Z -C Z -C X -C Y -C X -A Y -C X -C X -C Z -C X -B Y -B Y -C X -C Z -C Y -B X -B Y -A Y -B Y -C X -C X -C Z -B Y -C X -C Y -C Y -A Z -B Y -C X -B X -A Y -B Y -B Y -C Z -A X -C X -A Y -C Z -C Z -B X -A Y -C Y -B Y -C X -A Y -B Y -C X -C X -A Y -B Y -C Z -C X -C Z -A X -A Z -C X -C Z -C X -C Y -C X -B Y -C Z -C X -B Y -C Z -C X -B Z -B X -C X -C X -B X -C X -C Z -C X -C X -C X -C Y -B X -C X -C X -B Y -B Y -C X -B Y -C X -C Z -C X -B Y -B Y -B Y -C Z -C X -A Z -A Y -C X -C Z -C Z -A Z -B Y -A Z -C Z -B Z -B Y -C X -B Y -C X -B Y -A Y -C X -C X -C X -C X -B Y -A Z -B X -C X -C X -C X -C Z -B Y -C X -B Y -B Y -B Y -C X -C Y -B Z -C X -B Y -B X -C X -C X -B Y -C X -B X -C X -C X -A Z -C X -A Z -C X -C X -C Z -C X -B Y -C Z -B Y -C X -B Y -C Z -B X -C X -A Y -C Y -C X -C X -B Y -B Y -C X -C Z -C Z -C Z -C X -C X -B Z -B Z -A Z -B Y -B Y -B Y -A X -C X -B X -B X -C X -C X -C X -C X -B X -B X -B Y -B Y -B Y -B X -C X -C Z -B Y -B Y -A Y -A Y -C X -C X -C X -B X -C Z -C X -C X -B Y -C X -C X -C X -C X -B X -B X -A Y -B Z -C Z -B Z -A X -C X -B X -C X -B Z -C Z -B X -B Y -C Z -C Y -C X -C X -C Z -C X -C X -C X -C Z -C X -B Y -C X -C X -C X -A Z -C Z -C X -C X -C X -C Y -A Y -C Z -B X -B X -C X -C X -C Z -A Y -C Z -C X -B Y -B Y -B Z -B Y -C X -B X -C X -C X -B Y -C Y -C Z -C X -C Z -B Y -C Y -B Y -B X -C Y -B X -C X -C X -B Z -C Y -B Y -B Y -B Z -C Y -B X -B Y -C Z -A Y -B Y -B Y -A Z -C X -C Z -B Z -C X -C X -B Y -C X -C X -B X -C X -C Z -C Z -B Y -B X -B Z -B Z -B X -C X -C X -C X -C X -B Y -A Y -B X -C X -C X -C X -B Y -C Z -B X -C Y -C Z -B Z -C X -C X -B Y -C Z -B Y -C X -C X -B Y -B X -C X -C X -C X -C X -B Y -A Y -C Y -C X -C X -B Y -B X -B Y -C X -C X -C Z -C X -C Z -A Y -C X -C Z -B Y -C Z -B X -A X -C X -C Z -C Y -B Y -C X -C Z -C Z -B X -C X -C X -C Z -C X -A Y -B Y -C X -C X -C X -C X -C X -C X -B X -B X -C Z -B Y -C X -C X -A Z -C X -C Z -B Y -C Z -C Y -C X -C Y -C X -C X -C Z -B Y -B Y -B Z -B Y -C Z -C X -C Z -B Y -C Z -C X -C X -C X -C Y -C X -C X -B X -C X -B Y -B X -B X -B Y -B Y -B Z -C Z -A Y -B X -B Y -C Z -C Y -C X -C X -C Z -A Y -C X -C Z -C X -B X -B Z -C Z -B Y -C X -C X -C Z -B X -B Y -C Z -B Z -B Z -C X -C X -C X -B Y -C X -C Z -C X -C X -B Y -C X -B Y -B Y -C X -C X -C X -B Y -B Z -C X -C X -B X -B Y -C X -C Y -B Y -A Y -C X -C X -C X -C Y -C X -C Z -A Y -B X -C Z -C X -C X -C X -B Y -B Y -C Z -C Z -C Y -C Z -C X -B Y -B Y -C X -B Y -C X -B Y -C X -C X -C X -C X -C Z -B Y -B Z -C X -C X -B Y -C X -B Y -C X -B Y -C Y -B Y -C X -B Y -C X -B Y -C X -B Z -C X -B X -B X -B Y -B X -B Z -C X -B Y -C X -B Z -B Y -C X -C Y -C Z -A Z -C X -C X -B Y -A X -C X -B Z -C Z -B X -C X -C X -B Y -B Z -A Z -A Z -C X -C X -C X -C X -A Y -B Y -B Y -C X -B Z -C Z -C X -C X -B Z -C Z -B Y -C Z -C Y -C Z -B Y -C Z -B Z -B Y -C X -C Z -C X -C X -C Y -C X -B X -A X -B X -C X -C Z -C Z -C Z -B Y -B X -C X -B Y -C X -C X -C X -A Y -C Z -A Y -C X -C X -C X -B Z -C X -C Z -C X -B Y -B Y -B X -C X -C Z -C Z -A Z -B Y -C Y -B Y -C Z -C X -A Z -C X -B X -B Z -C X -B Y -C Y -C X -B X -C Z -C Z -C Z -C X -C X -C X -A Y -C Z -B X -B X -B Y -B X -A Y -C X -B Y -C X -C X -C X -B X -A X -B Y -C X -C Z -B X -A X -C X -B Y -C X -C Z -A X -C X -B Z -C X -C Z -C Z -B Z -C Z -C X -B Y -C X -B Y -C Y -B Y -C Y -B Y -C X -B X -C Y -C X -C X -B Y -C Y -A Z -C X -C X -C X -C X -B Y -B Y -C X -C Z -C X -C X -C X -B Y -B Y -B Y -C X -B Y -B X -C Y -B Y -C X -C X -B Y -C X -C Y -C X -B Y -C X -B Y -C Z -C X -C X -C Z -C Z -B Z -C Z -C X -C X -C Z -C Z -B X -C Y -C Y -C X -C X -B Z -C Z -B Y -B Y -C Z -C X -C X -B Y -C X -C X -C Z -C X -C Z -A Z -B Y -C Z -C X -A X -A Z -B Y -B Y -B Y -B Y -C Z -B X -C X -B Y -B Y -C X -B Y -B Y -C Z -C X -B Y -C Y -C X -C Z -C X -A Y -C X -C X -C Z -A X -B Y -B Y -B Z -B Y -C Z -C X -C X -B Y -C X -C Z -C Z -C X -B X -C Z -C Z -B Y -B Y -C X -B Y -B X -C X -A Y -B Y -B Y -C X -C Z -B X -C X -C Z -A Z -B Y -C X -C Z -C X -C X -C X -B Y -B X -B Y -B X -C X -C X -C Z -C X -C X -C X -C X -B Y -C X -B Y -C Z -B X -C Z -C X -B Z -C X -A Y -C X -C X -C X -C X -C X -C X -B Y -C X -C X -B Y -C Z -C Z -B X -C X -A X -C X -C X -B X -C Z -B Y -B X -C X -C X -B Y -C Z -C Y -B Y -C Y -B X -C X -B Y -C X -C Z -C Z -B Y -B Y -A Z -B X -C X -C X -C Z -C X -C X -B X -C Z -A Y -C Z -C X -C Z -C X -C Z -C Z -A Z -A Y -A Y -C Z -C X -A X -C X -B Y -B Y -C X -C Z -B X -B Z -C X -C Z -B Y -C Z -B Y -C Z -B Z -B Y -C X -C X -B Y -C X -C X -C Z -B X -C Z -C Z -B Y -A Z -C X -B Y -C X -C Z -C X -C X -B Y -C Z -A Z -C X -C X -B X -C X -C X -B Z -B Y -B Y -B X -C Y -C X -B Y -B Y -C X -C X -C X -A Z -C Z -A Y -C X -B Y -B Y -C X -C Z -C X -C X -B X -B Y -C Z -B Z -C Y -C X -C X -B Z -B X -C Z -C X -C X -C X -C X -C X -C X -C X -C X -B Y -C Y -C X -B Y -B Y -B Y -C X -C X -B X -C Y -B Y -C X -B Z -C X -C X -B Z -C Z -B X -B Z -C Z -B Z -C X -B Y -C X -C Y -A Y -B X -B Y -B Z -C X -B Z -A Y -C Z -C Z -C Y -B Y -B Y -B Z -C X -C X -A Y -C Z -C X -C X -C X -C Z -C X -C X -C X -C X -A Y -C X -C Z -C Z -C X -B Z -C X -C X -A Y -B Z -C Y -A X -C X -C X -C Z -C X -C X -C X -A Y -A Y -C Z -B Z -B X -C X -C X -C X -A Z -B Y -C Z -C Z -C X -C X -C Z -C X -B Y -B X -C Z -C X -B Y -B Z -C X -C X -B Y -C Z -C Z -C X -B Y -C X -C X -B Y -A Z -B X -C X -C X -C X -B Y -C X -C Z -B Y -B X -C Z -B Y -B X -C X -C X -A Y -C Z -C X -C X -C Z -B Z -B Y -B Y -B Z -C X -A Y -B X -C X -C X -B Y -C X -C Z -B Y -C X -C X -C X -C Y -B Y -B X -B Y -C X -C X -C Z -C Z -A Y -C X -C Y -B Y -B Y -B X -C X -C X -B X -C X -C X -C X -B X -C X -C Z -C X -A X -B Y -C Z -B Y -C Z -C X -C Z -C X -B Y -C X -B X -A X -A Z -C X -C Z -C X -C X -B Y -B X -B X -B Y -B Z -C Z -C X -C Z -B X -C X -B Y -B X -B Y -B Y -C Y -C X -B X -B Y -C X -C Z -C X -B Y -C X -C X -B Y -C X -C X -C Z -C X -B Z -A X -C X -C X -B X -C Y -C X -B Y -C X -C X -A Y -A X -C X -B Z -C X -A X -C X -C Y -C X -C X -C X -C Y -C X -C X -B Z -C X -C X -B X -B X -C X -C X -B Z -C X -A Y -B X -B Y -C X -C X -B X -B Y -C Z -B X -B Y -C X -C X -C X -C Z -C X -C X -C X -A Y -A Z -C Z -A Y -B Y -B Y -C Y -C X -C Y -C X -B Y -C X -C Z -A Y -B X -C Z -B Z -C Z -A Z -A X -B Y -B Y -C X -C Y -B Y -B Y -B Y -C Y -C X -B Y -B Y -C X -C X -B Y -C X -B Y -B Y -C Y -C Y -A Y -B Y -B Y -C X -B X -B X -C X -B Y -A X -C Z -C Z -C X -A X -B Y -C Y -B Y -C Z -C Z -B Y -B X -B Y -B X -B X -C Y -C Y -B Z -B Y -C X -C X -C Y -C X -C X -C X -C Z -B Y -B Y -C X -C X -C Z -B Y -A Y -B Y -B Y -B X -C X -C Z -C X -C Z -C X -B Z -C Z -C X -B Y -A Y -C X -A Y -B Y -C Y -A X -C X -B Z -C X -B Y -A Z -C X -C Z -C Z -C X -A Y -C Z -C X -C X -B Y -C Z -B Z -B Y -B Y -C Z -A Y -C X -B X -C Z -C X -B Y -A Y -B Y -B Y -C X -C Y -B Z -B Y -B X -C Z -C X -C X -B Y -A Y -B Y -C X -C X -B Y -B Y -C X -C Z -C X -B Y -C X -B Y -B Y -C X -C Z -A Z -B X -C Z -B X -C X -C Z -B Y -B Z -C X -B Y -C Z -C X -C X -C X -B Z -C X -C Z -C X -C X -B Y -B Y -C X -A X -A X -C X -C X -B X -C X -C Z -B Y -C Z -C Z -C X -A Y -A Z -C X -C X -B Y -B Y -B Y -C Z -B Y -C X -C X -C X -B X -B Y -B X -B Y -A Y -C X -B X -C X -C Y -C Z -C Y -C Z -C X -A Y -C X -B Y -C Z -C Z -C X -B Y -B Y -B Y -C X -A X -C X -B X -C Y -C X -B Y -C Z -C X -C Z -C Z -C Z -A Y -B Y -B Y -C X -A Y -C Y -B Y -C X -B Z -B Y -C X -B Y -C Z -B Y -C Z -C X -B Z -C Z -C Z -B X -C X -C Y -B X -B Y -C X -A X -B Y -C Z -B Y -C X -C X -B X -C X -B Y -C X -B Y -C Z -C Z -C X -C X -A Y -B Y -C Y -B Y -B Y -B Y -C X -C Y -A X -A Y -C X -C X -B X -B Y -C X -C Z -C X -B Y -C X -C Y -B Z -B X -C X -A Y -C X -C Y -C Z -B X -C X -C Z -C Y -C X -C Z -C X -C Z -B Y -B Z -C X -A Y -C X -C X -B X -B Y -C X -C X -B Y -C X -B Z -C X -C X -C X -B Z -A Y -B X -B Y -B Y -B Y -B Y -C X -C Z -B Z -C Z -C X -B Y -C X -B Y -A Y -C Y -B X -B Z -C X -C X -C X -A Y -B X -B Z -C X -C Z -B Y -C Z -C X -B Y -B Z -C Y -C Y -C X -C X -B Z -B Y -A Y -C Z -B Y -B Y -A Z -C X -B Y -A Y -C X -C Z -B Y -C X -A Z -C X -B Z -B Y -C Z -B Y -C X -B X -B Y -C X -B Y -C X -C Y -B Y -B X -C X -C Y -C X -B Y -C Y -C X -C X -B Y -B Y -B X -C X -B X -A Y -C X -B Y -C Y -C Z -C X -B Z -B X -C X -C X -C Z -C Z -B Y -C X -C X -B Y -C X -C X -A Y -C Z -C X -A X -B Y -C X -C X -C X -C Z -B Y -C X -B Y -B Z -C X -C X -B Y -A Z -C X -C X -C X -A Y -B Y -C X -C Y -C Z -A X -C X -C X -B X -B Y -C X -B Y -B X -B X -C X -C Z -B Y -B Y -C Z -B Y -A Y -C X -B Y -C X -C Z -C X -C Z -A Y -C X -B Z -C Z -B Z -C Z -C X -B Y -A Z -C X -C Z -B Y -B Y -C X -C Z -A X -B X -B Y -C X -C X -B Z -C X -C X -C Z -A Y -C X -A X -C X -C X -B X -C Z -B Y -B Y -C Z -B Y -B Y -C X -C X -B Z -B Y -B Y -C X -A X -C X -B Y -C X -B Y -C Z -A Z -C X -C Z -C Y -B Y -C X -C Z -C Z -B Y -B Z -B X -C Z -C Z -B Z -B Z -B Y -C X -B Y -B Y -B X -B Y -C X -C Z -C Z -B Y -B Y -B Z -C X -C Z -C Z -C Z -C X -C X -B Y -C X -B Y -B Y -C Y -C X -B Y -C X -C X -C X -C Z -A Z -C X -A X -A Y -B Y -C X -B Y -B Y -C Y -C X -C X -C X -B Y -C X -A Y -B Y -C Z -C Z -C X -A Y -C X -B Y -C X -C Z -C Z -C Y -B Y -C X -B Y -B Y -C Y -C X -B X -C Z -C X -C X -C X -B Y -B Z -C Z -C X -C Z -B Y -A Z -C X -C Z -B Z -A Z -B Y -B Y -C X -C Z -C X -C X -C X -C X -C Z -C X -B Y -C Y -B Y -C X -C Z -B Z -B X -C Y -C X -B Y -C X -B X -C X -C X -C Z -C X -B Y -C X -C Z -C Z -B X -C X -B Y -C X -B Y -B X -C X -A Y -C X -C X -C Z -B Y -C X -B Z -C X -C X -C X -C X -B Z -C X -B Y -C X -B X -C Z -C X -B Y -C X -C X -C X -A Y -B Z -C Z -A Z -C X -B X -C Z -C Y -B Z -C X -B Y -B Z -C X -C Z -B X -C X -C Z -C X -B Y -B X -B Y -B Y -C Y -C Y -C Y -C X -B Y -B Y -C X -C X -C Y -B Y -C X -C X -C Z -C X -B X -C X -C Y -C X -C X -C X -C Z -C Z -C Y -C Z -C Z -B X -C X -C X -B Y -C X -C X -C Z -B Y -C X -C X -C X -A Y -A X -C Z -C Z -C X -C X -B X -B Y -C X -C Y -B Y -B Y -C X -C Z -C X -C Z -B X -C X -C X -B Y -B Y -B Y -C X -C X -C X -C Z -C X -C X -B Z -C X -C Y -C X A Y -C X -C X -B X -C X -C X -B Z -C X -C X -C Z -C Z -C X -C Y -C X -C X -C X -C X -B Y -C X -C Y -C Z -C X -C X -C X -C X -B Y B X -C X -C X -C Y -C X -B Y -C X -C X -C Z C Z -C X - -- cgit v1.2.3