refactoring

Author: Siljesc

Diff for: Day1/part1.go

@@ -0,0 +1,70 @@
+package main
+
+import (
+	"fmt"
+	"strconv"
+
+	"../util"
+)
+
+func scanLines(path string, freq int, freqDict map[int]bool) (int, error) {
+
+	scanner, _ := util.ReadFile(path)
+
+	var firstRepeated int
+	var foundValue = false
+
+	for scanner.Scan() {
+		lineFreq, err := strconv.Atoi(scanner.Text())
+
+		if err != nil {
+			return 0, err
+		}
+
+		freq += lineFreq
+
+		_, freqItem := freqDict[freq]
+
+		if freqItem {
+			firstRepeated = freq
+			foundValue = true
+			break
+		}
+
+		freqDict[freq] = true
+	}
+
+	if !foundValue {
+		return scanLines(path, freq, freqDict)
+	}
+
+	return firstRepeated, nil
+}
+
+func part1() int {
+
+	scanner, _ := util.ReadFile("input.txt")
+	freq := 0
+
+	for scanner.Scan() {
+		lineFreq, _ := strconv.Atoi(scanner.Text())
+
+		freq += lineFreq
+	}
+
+	return freq
+}
+
+func part2() int {
+	freq := 0
+	freqDict := map[int]bool{0: true}
+
+	firstRepeated, _ := scanLines("input.text", freq, freqDict)
+
+	return firstRepeated
+}
+
+func main() {
+	fmt.Println("[Sol 1] Frequency: ", part1())
+	fmt.Println("[Sol 2] First Repeated Frequency: ", part2())
+}

Diff for: Day1/part2.go

@@ -1,20 +1,67 @@
 package main
 
 import (
-	"bufio"
 	"fmt"
-	"os"
 	"strings"
+
+	"../util"
 )
 
-func main() {
-	file, err := os.Open("input.txt")
-	if err != nil {
-		fmt.Println("File reading error", err)
-		return
+func part1() int {
+	scanner, _ := util.ReadFile("input.txt")
+
+	twoWords := 0
+	threeWords := 0
+
+	for scanner.Scan() {
+		word := scanner.Text()
+		letterList := strings.Split(word, "")
+		letterDict := map[string]int{}
+
+		counted2 := false
+		counted3 := false
+
+		for _, letter := range letterList {
+
+			_, ok := letterDict[letter]
+
+			if !ok {
+				letterDict[letter] = 0
+			}
+
+			letterDict[letter]++
+		}
+
+		for _, frequency := range letterDict {
+			if frequency == 2 && !counted2 {
+				twoWords++
+				counted2 = true
+			} else if frequency == 3 && !counted3 {
+				threeWords++
+				counted3 = true
+			}
+		}
 	}
 
-	scanner := bufio.NewScanner(file)
+	return twoWords * threeWords
+
+}
+
+func checkIds(id1 []string, id2 []string) string {
+	var commonLetters strings.Builder
+
+	for index, letter := range id1 {
+		if letter == id2[index] {
+			commonLetters.WriteString(letter)
+		}
+	}
+
+	return commonLetters.String()
+}
+
+func part2() string {
+	scanner, _ := util.ReadFile("input.txt")
+
 	var lines [][]string
 	var checkLines [][]string
 	var commonID string
@@ -43,22 +90,11 @@ func main() {
 		}
 	}
 
-	if err := scanner.Err(); err != nil {
-		fmt.Println("File scanning error", err)
-	}
-
-	fmt.Println("Box Id: ", commonID)
+	return commonID
 
 }
 
-func checkIds(id1 []string, id2 []string) string {
-	var commonLetters strings.Builder
-
-	for index, letter := range id1 {
-		if letter == id2[index] {
-			commonLetters.WriteString(letter)
-		}
-	}
-
-	return commonLetters.String()
+func main() {
+	fmt.Println("[Sol 1] Checksum: ", part1())
+	fmt.Println("[Sol 2] Common ID: ", part2())
 }

Diff for: Day1/solution.go

@@ -1,25 +1,20 @@
 package main
 
 import (
-	"bufio"
 	"fmt"
-	"os"
 	"regexp"
 	"strconv"
+
+	"../util"
 )
 
 type Coords struct {
 	X, Y int
 }
 
 func main() {
-	file, err := os.Open("input.txt")
-	if err != nil {
-		fmt.Println("File reading error", err)
-		return
-	}
 
-	scanner := bufio.NewScanner(file)
+	scanner, _ := util.ReadFile("input.txt")
 	fabric := make([][]int, 1000*1000)
 
 	overlappedCells := map[string][]Coords{}

Diff for: Day2/part1.go

@@ -0,0 +1,32 @@
+package util
+
+import (
+	"bufio"
+	"fmt"
+	"os"
+)
+
+var cachedFiles map[string]*os.File
+
+func ReadFile(path string) (*bufio.Scanner, error) {
+
+	_, ok := cachedFiles[path]
+
+	var file *os.File
+	var err error
+
+	if ok {
+		file = cachedFiles[path]
+	} else {
+		file, err = os.Open(path)
+	}
+
+	if err != nil {
+		fmt.Println("File reading error", err)
+		return nil, err
+	}
+
+	file.Seek(0, 0)
+
+	return bufio.NewScanner(file), nil
+}