2017.1-12 cleanup

Author: metalim

01_sums.go

@@ -8,7 +8,12 @@ import (
 )
 
 func main() {
-	for p := range source.Test(1, `91212129`, `9`).Test(2, `12131415`, `4`).Advent(2017, 1) {
+	var ins source.Inputs
+
+	ins = ins.Test(1, `91212129`, `9`)
+	ins = ins.Test(2, `12131415`, `4`)
+
+	for p := range ins.Advent(2017, 1) {
 		fmt.Println(Brown("\n" + p.Name))
 		in := p.Val
 

02_sums.go

@@ -17,7 +17,12 @@ var test2 = `5 9 2 8
 3 8 6 5`
 
 func main() {
-	for p := range source.Test(1, test1, `18`).Test(2, test2, `9`).Advent(2017, 2) {
+	var ins source.Inputs
+
+	ins = ins.Test(1, test1, `18`)
+	ins = ins.Test(2, test2, `9`)
+
+	for p := range ins.Advent(2017, 2) {
 		fmt.Println(Brown("\n" + p.Name))
 		ssn := p.Lines().Ints()
 

03_spiral_map.go

@@ -33,7 +33,13 @@ func walkSpiral(f field.Field, fn func(int, field.Pos) bool) field.Pos {
 }
 
 func main() {
-	for in := range source.Test(1, `23`, `2`).Test(1, `1024`, `31`).Test(2, `60`, `122`).Advent(2017, 3) {
+	var ins source.Inputs
+
+	ins = ins.Test(1, `23`, `2`)
+	ins = ins.Test(1, `1024`, `31`)
+	ins = ins.Test(2, `60`, `122`)
+
+	for in := range ins.Advent(2017, 3) {
 		fmt.Println(Brown("\n" + in.Name))
 		n := in.Ints()[0]
 		fmt.Println(Black(n).Bold())

04_count_passphrases.go

@@ -8,12 +8,14 @@ import (
 	. "github.com/logrusorgru/aurora"
 )
 
-var test1 = `aa bb cc dd aa`
-var test2 = `aa bb cc dd aaa`
-var test3 = `abcde xyz ecdab`
-
 func main() {
-	for p := range source.Test(1, test1, `0`).Test(1, test2, `1`).Test(2, test3, `0`).Advent(2017, 4) {
+	var ins source.Inputs
+
+	ins = ins.Test(1, `aa bb cc dd aa`, `0`)
+	ins = ins.Test(1, `aa bb cc dd aaa`, `1`)
+	ins = ins.Test(2, `abcde xyz ecdab`, `0`)
+
+	for p := range ins.Advent(2017, 4) {
 		fmt.Println(Brown("\n" + p.Name))
 		ssw := p.Lines().Words()
 		fmt.Println(len(ssw), "lines", Black(ssw[0]).Bold())

05_jump_instructions.go

@@ -14,7 +14,12 @@ var test1 = `0
 -3`
 
 func main() {
-	for p := range source.Test(1, test1, `5`).Test(2, test1, `10`).Advent(2017, 5) {
+	var ins source.Inputs
+
+	ins = ins.Test(1, test1, `5`)
+	ins = ins.Test(2, test1, `10`)
+
+	for p := range ins.Advent(2017, 5) {
 		fmt.Println(Brown("\n" + p.Name))
 
 		if p.Part(1) {

06_spread_banks.go

@@ -11,8 +11,12 @@ import (
 var test1 = `0 2 7 0`
 
 func main() {
-	// source.Dry()
-	for p := range source.Test(1, test1, `5`).Test(2, test1, `4`).Advent(2017, 6) {
+	var ins source.Inputs
+
+	ins = ins.Test(1, test1, `5`)
+	ins = ins.Test(2, test1, `4`)
+
+	for p := range ins.Advent(2017, 6) {
 		fmt.Println(Brown("\n" + p.Name))
 		sn := p.Ints()
 		fmt.Println(Black(sn).Bold())

07_tree_balance.go

@@ -48,7 +48,12 @@ func calc(n *node) int {
 }
 
 func main() {
-	for p := range source.Test(1, test1, `tknk`).Test(2, test1, `60`).Advent(2017, 7) {
+	var ins source.Inputs
+
+	ins = ins.Test(1, test1, `tknk`)
+	ins = ins.Test(2, test1, `60`)
+
+	for p := range ins.Advent(2017, 7) {
 		fmt.Println(Brown("\n" + p.Name))
 		ssw := p.Lines().WordsTrim("()->, ")
 		fmt.Println(len(ssw), Black(ssw[0]).Bold())

08_exec.go

@@ -13,9 +13,10 @@ a inc 1 if b < 5
 c dec -10 if a >= 1
 c inc -20 if c == 10`
 
-// 1   2     4  5  6
-
-var test2 = ``
+/*
+0  1   2  -  4  5  6
+c inc -20 if c == 10`
+*/
 
 type regs map[string]int
 type comp func(rs regs, r string, v int) bool
@@ -36,7 +37,12 @@ var ops = map[string]op{
 }
 
 func main() {
-	for p := range source.Test(1, test1, `1`).Test(2, test1, `10`).Advent(2017, 8) {
+	var ins source.Inputs
+
+	ins = ins.Test(1, test1, `1`)
+	ins = ins.Test(2, test1, `10`)
+
+	for p := range ins.Advent(2017, 8) {
 		fmt.Println(Brown("\n" + p.Name))
 		ssw := p.Lines().Words()
 		fmt.Println(len(ssw), Black(ssw[0]).Bold())

09_groups_and_garbage.go

@@ -7,12 +7,13 @@ import (
 	. "github.com/logrusorgru/aurora"
 )
 
-var test1 = `{{{<{}>},{},{{}}}}`
+func main() {
+	var ins source.Inputs
 
-var test2 = `<{o"i!a,<{i<a>`
+	ins = ins.Test(1, `{{{<{}>},{},{{}}}}`, `16`)
+	ins = ins.Test(2, `<{o"i!a,<{i<a>`, `10`)
 
-func main() {
-	for p := range source.Test(1, test1, `16`).Test(2, test2, `10`).Advent(2017, 9) {
+	for p := range ins.Advent(2017, 9) {
 		fmt.Println(Brown("\n" + p.Name))
 		s := p.Val
 		fmt.Println(len(s), Black(s[:14]).Bold())

10_knot_hash.go

@@ -9,12 +9,13 @@ import (
 	. "github.com/logrusorgru/aurora"
 )
 
-var test1 = `3, 4, 1, 5`
-
 func main() {
-	ins := source.Test(1, test1, `12`)
+	var ins source.Inputs
+
+	ins = ins.Test(1, `3, 4, 1, 5`, `12`)
 	ins = ins.Test(2, "", `a2582a3a0e66e6e86e3812dcb672a272`)
 	ins = ins.Test(2, "AoC 2017", "33efeb34ea91902bb2f59c9920caa6cd")
+
 	for p := range ins.Advent(2017, 10) {
 		fmt.Println(Brown("\n" + p.Name))
 		fmt.Println(Black(p.Val).Bold())

11_hex_grid_distance.go

@@ -8,15 +8,14 @@ import (
 	. "github.com/logrusorgru/aurora"
 )
 
-var test1 = `ne,ne,sw,sw`
-var test2 = `se,sw,se,sw,sw`
-
 var abs = numbers.Abs
 
 func main() {
-	// source.Dry()
-	ins := source.Test(1, test1, `0`)
-	ins = ins.Test(1, test2, `3`)
+	var ins source.Inputs
+
+	ins = ins.Test(1, `ne,ne,sw,sw`, `0`)
+	ins = ins.Test(1, `se,sw,se,sw,sw`, `3`)
+
 	for par := range ins.Advent(2017, 11) {
 		fmt.Println(Brown("\n" + par.Name))
 		sw := par.Lines().Split(",").Values

12_unions.go

@@ -16,12 +16,12 @@ var test1 = `0 <-> 2
 5 <-> 6
 6 <-> 4, 5`
 
-var test2 = ``
-
 func main() {
-	// source.Dry()
-	ins := source.Test(1, test1, `6`)
+	var ins source.Inputs
+
+	ins = ins.Test(1, test1, `6`)
 	ins = ins.Test(2, test1, `2`)
+
 	for p := range ins.Advent(2017, 12) {
 		fmt.Println(Brown("\n" + p.Name))
 		ssn := p.Lines().Ints()

99_template.go

@@ -14,6 +14,7 @@ func main() {
 	source.Dry()
 
 	var ins source.Inputs
+
 	ins = ins.Test(1, test1, `11`)
 	ins = ins.Test(2, test2, `22`)
 

lib/source/advent.go

@@ -44,7 +44,7 @@ func (ins Inputs) Test(part int, in string, ex ...string) Inputs {
 	if part&1 == 0 { // test for part 2 only.
 		ex = append([]string{""}, ex...)
 	}
-	return append(ins, Input{Name: "test" + strconv.Itoa(len(ins)), Val: in, parts: part, ex: ex})
+	return append(ins, Input{Name: "test" + strconv.Itoa(1+len(ins)), Val: in, parts: part, ex: ex})
 }
 
 // Advent sources.