solve part2 and refactor

day01.go

@@ -5,64 +5,94 @@ import (
 	"fmt"
 	"io"
 	"strconv"
+	"strings"
 	"unicode"
 )
 
-type day01 struct {
+func linevalue(digits []rune) int {
+	str := fmt.Sprintf("%c%c", digits[0], digits[len(digits)-1])
+	value, _ := strconv.Atoi(str)
+	return value
 }
 
-type buffer struct {
-	first bool
-	d1    rune
-
-	last bool
-	d2   rune
+func finddigits(line string) []rune {
+	d := make([]rune, 0, 7)
+	for len(line) > 0 {
+		if unicode.IsDigit(rune(line[0])) {
+			d = append(d, rune(line[0]))
 		}
-
-func (b *buffer) value() (value uint64) {
-	var d2 rune
-
-	if b.last {
-		d2 = b.d2
-	} else {
-		d2 = b.d1
+		line = line[1:]
+	}
+	return d
 }
 
-	str := fmt.Sprintf("%c%c", b.d1, d2)
-	value, _ = strconv.ParseUint(str, 10, 64)
-
-	b.first, b.last = false, false
-	return
+func findtextdigits(line string) []rune {
+	d := make([]rune, 0, 7)
+	for len(line) > 0 {
+		if unicode.IsDigit(rune(line[0])) {
+			d = append(d, rune(line[0]))
 		}
 
-func (b *buffer) record(digit rune) {
-	if !b.first {
-		b.d1 = digit
-		b.first = true
+		if strings.HasPrefix(line, "one") {
+			d = append(d, '1')
+			line = line[3:]
+		} else if strings.HasPrefix(line, "two") {
+			d = append(d, '2')
+			line = line[3:]
+		} else if strings.HasPrefix(line, "three") {
+			d = append(d, '3')
+			line = line[5:]
+		} else if strings.HasPrefix(line, "four") {
+			d = append(d, '4')
+			line = line[4:]
+		} else if strings.HasPrefix(line, "five") {
+			d = append(d, '5')
+			line = line[4:]
+		} else if strings.HasPrefix(line, "six") {
+			d = append(d, '6')
+			line = line[3:]
+		} else if strings.HasPrefix(line, "seven") {
+			d = append(d, '7')
+			line = line[5:]
+		} else if strings.HasPrefix(line, "eight") {
+			d = append(d, '8')
+			line = line[5:]
+		} else if strings.HasPrefix(line, "nine") {
+			d = append(d, '9')
+			line = line[4:]
 		} else {
-		b.d2 = digit
-		b.last = true
+			line = line[1:]
+		}
 	}
+	return d
 }
 
-func (d day01) solve(r io.Reader) string {
+type day01 struct {
+}
+
+func (d day01) solve1(r io.Reader) string {
 	var (
-		buffer buffer
-		total  uint64
-		buf    = bufio.NewReader(r)
+		total   int
+		scanner = bufio.NewScanner(r)
 	)
 
-	for {
-		b, _, err := buf.ReadRune()
-		if err != nil {
-			return fmt.Sprintf("%d", total+buffer.value())
+	for scanner.Scan() {
+		digits := finddigits(scanner.Text())
+		total += linevalue(digits)
 	}
-
-		if unicode.IsDigit(b) {
-			buffer.record(b)
-		} else if b == '\n' {
-			total += buffer.value()
+	return fmt.Sprintf("%d", total)
 }
 
+func (d day01) solve2(r io.Reader) (ans string) {
+	var (
+		total   int
+		scanner = bufio.NewScanner(r)
+	)
+
+	for scanner.Scan() {
+		digits := findtextdigits(scanner.Text())
+		total += linevalue(digits)
 	}
+
+	return fmt.Sprintf("%d", total)
 }

main.go

@@ -6,12 +6,12 @@ import (
 	"io"
 	"log"
 	"os"
-	"path/filepath"
 	"strconv"
 )
 
 type puzzle interface {
-	solve(r io.Reader) string
+	solve1(r io.Reader) string
+	solve2(r io.Reader) string
 }
 
 var (
@@ -24,34 +24,25 @@ var (
 	}
 )
 
-func init() {
-	flag.Parse()
-
-}
-
-func inputs(day int64) []io.Reader {
-	inputs := make([]io.Reader, 0, 2)
-	path := fmt.Sprintf("input/%d-[1-2]", day)
-
-	matches, err := filepath.Glob(path)
-	if err != nil {
-		log.Fatalf("matching puzzle input files: %s", err.Error())
-	}
-
-	fmt.Println(matches)
+func inputs(day int) [2]io.Reader {
+	inputs := [2]io.Reader{}
+	path1 := fmt.Sprintf("input/%d-1", day)
+	path2 := fmt.Sprintf("input/%d-2", day)
 
-	for _, match := range matches {
-		f, err := os.Open(match)
+	f1, err := os.Open(path1)
 	if err == nil {
-			inputs = append(inputs, f)
+		inputs[0] = f1
 	}
+	f2, err := os.Open(path2)
+	if err == nil {
+		inputs[1] = f2
 	}
-
 	return inputs
 }
 
 func main() {
-	puzzleIndex, err := strconv.ParseInt(*day, 10, 32)
+	flag.Parse()
+	puzzleIndex, err := strconv.Atoi(*day)
 	if err != nil {
 		log.Fatalf("invalid puzzle day: %s", *day)
 	}
@@ -59,10 +50,6 @@ func main() {
 
 	puzzle := puzzles[puzzleIndex-1]
 
-	fmt.Fprintf(os.Stdout, "Day %d:\n", puzzleIndex)
-	for i := range inputs {
-		ans := puzzle.solve(inputs[i])
-		fmt.Fprintf(os.Stdout, "Solution %d:\n%s", i+1, ans)
-	}
-	fmt.Fprintln(os.Stdout)
+	fmt.Fprintf(os.Stdout, "Solution 1:\n%s\n", puzzle.solve1(inputs[0]))
+	fmt.Fprintf(os.Stdout, "Solution 2:\n%s\n", puzzle.solve2(inputs[1]))
 }

main_test.go

@@ -0,0 +1,37 @@
+package main
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestDay01(t *testing.T) {
+	ans1 := "142"
+	input1 := `1abc2
+    pqr3stu8vwx
+    a1b2c3d4e5f
+    treb7uchet`
+
+	ans2 := "281"
+	input2 := `two1nine
+    eightwothree
+    abcone2threexyz
+    xtwone3four
+    4nineeightseven2
+    zoneight234
+    7pqrstsixteen`
+
+	puzzle := day01{}
+
+	res1 := puzzle.solve1(strings.NewReader(input1))
+	t.Logf("day 1 solution 1: %s", res1)
+	if res1 != ans1 {
+		t.Errorf("day 1 solution 1 = %s; wanted %s", res1, ans1)
+	}
+
+	res2 := puzzle.solve2(strings.NewReader(input2))
+	t.Logf("day 1 solution 2: %s", res2)
+	if res2 != ans2 {
+		t.Errorf("day 1 solution 2 = %s; wanted %s", res2, ans2)
+	}
+}