2023 day07 optimised

Author: liamgallear

2023/day07/main.go

@@ -38,23 +38,23 @@ func main() {
 func parseInput(input string) {
 	lines := strings.Split(strings.TrimSpace(input), "\n")
 	hands = make([]Hand, len(lines))
-	
+
 	for i, line := range lines {
 		spaceIdx := strings.Index(line, " ")
-		
+
 		// Parse hand
 		var h Hand
 		for j := 0; j < 5; j++ {
 			h.cards[j] = cardValue(line[j])
 		}
-		
+
 		// Parse bid
 		bid := 0
 		for j := spaceIdx + 1; j < len(line); j++ {
 			bid = bid*10 + int(line[j]-'0')
 		}
 		h.bid = bid
-		
+
 		hands[i] = h
 	}
 }
@@ -104,30 +104,30 @@ func handStrength(counts [5]int) int {
 func getHandStrength(h Hand, jokerRule bool) int {
 	counts := [5]int{}
 	cardCounts := make(map[int]int)
-	
+
 	for _, card := range h.cards {
 		cardCounts[card]++
 	}
-	
+
 	// Handle jokers (value 11 in part 1, converted to 1 in part 2)
 	jokers := 0
 	if jokerRule {
 		jokers = cardCounts[1]
 		delete(cardCounts, 1)
 	}
-	
+
 	// Fill counts array
 	i := 0
 	for _, count := range cardCounts {
 		counts[i] = count
 		i++
 	}
-	
+
 	// Add jokers to the highest count
 	if jokers > 0 {
 		slices.Sort(counts[:])
 		counts[4] += jokers
 	}
-	
+
 	return handStrength(counts)
 }

2023/day07/main_test.go

@@ -5,7 +5,7 @@ import "testing"
 func BenchmarkPartOne(b *testing.B) {
 	parseInput(input)
 	b.ResetTimer()
-	
+
 	for n := 0; n < b.N; n++ {
 		doPartOne()
 	}
@@ -14,7 +14,7 @@ func BenchmarkPartOne(b *testing.B) {
 func BenchmarkPartTwo(b *testing.B) {
 	parseInput(input)
 	b.ResetTimer()
-	
+
 	for n := 0; n < b.N; n++ {
 		doPartTwo()
 	}

2023/day07/part1.go

@@ -6,16 +6,16 @@ func doPartOne() int {
 	// Create a copy for sorting
 	sortedHands := make([]Hand, len(hands))
 	copy(sortedHands, hands)
-	
+
 	slices.SortFunc(sortedHands, func(a, b Hand) int {
 		// Compare hand strengths
 		sa := getHandStrength(a, false)
 		sb := getHandStrength(b, false)
-		
+
 		if sa != sb {
 			return sa - sb
 		}
-		
+
 		// Same strength, compare cards in order
 		for i := 0; i < 5; i++ {
 			if a.cards[i] != b.cards[i] {
@@ -24,7 +24,7 @@ func doPartOne() int {
 		}
 		return 0
 	})
-	
+
 	result := 0
 	for i, h := range sortedHands {
 		result += (i + 1) * h.bid

2023/day07/part2.go

@@ -18,16 +18,16 @@ func doPartTwo() int {
 		}
 		sortedHands[i] = newHand
 	}
-	
+
 	slices.SortFunc(sortedHands, func(a, b Hand) int {
 		// Compare hand strengths with joker rule
 		sa := getHandStrength(a, true)
 		sb := getHandStrength(b, true)
-		
+
 		if sa != sb {
 			return sa - sb
 		}
-		
+
 		// Same strength, compare cards in order
 		for i := 0; i < 5; i++ {
 			if a.cards[i] != b.cards[i] {
@@ -36,7 +36,7 @@ func doPartTwo() int {
 		}
 		return 0
 	})
-	
+
 	result := 0
 	for i, h := range sortedHands {
 		result += (i + 1) * h.bid