apollo/advent-of-code
1
0
Fork 0
Code Pull requests Activity Actions

refactor(Day 3): updated Day 3 solution code

Browse source 
- added a custom function to check if a rune is a symbol.
- changed name of type 'answer' to 'solution'.
- ci(forgejo actions): updated setup-go from v3 to v4.
This commit is contained in:
Dan Anglin 2023-12-04 13:10:03 +00:00
parent 5af35d0ccc
commit 0f1ee8c599
Signed by: dananglin
GPG key ID: 0C1D44CFBEE68638
3 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.forgejo/workflows/workflow.yaml
View file

@ -13,7 +13,7 @@ jobs:
- name: Checkout Repository
uses: https://code.forgejo.org/actions/checkout@v3
- name: Setup Go
uses: https://code.forgejo.org/actions/setup-go@v3
uses: https://code.forgejo.org/actions/setup-go@v4
with:
go-version: '1.21'
- name: Test

30
2023/day-3/main.go
View file

@ -14,7 +14,7 @@ const (
potentialGear = '*'
)
type answer struct {
type solution struct {
sumOfValidEnginePartNumbers int
sumOfGearRatios int
}
@ -34,7 +34,7 @@ func main() {
fmt.Printf("[Part 2] The sum of all Gear Ratios: %d\n", answer.sumOfGearRatios)
}
func fixTheGondola(schematic []string) (answer, error) {
func fixTheGondola(schematic []string) (solution, error) {
var (
partNumSum = 0
partNum = ""
@ -52,49 +52,49 @@ func fixTheGondola(schematic []string) (answer, error) {
if !validPartNum {
switch {
// check above left
case ((y - 1) >= 0) && ((x - 1) >= 0) && !unicode.IsDigit(rune(schematic[y-1][x-1])) && (schematic[y-1][x-1] != dot):
case ((y - 1) >= 0) && ((x - 1) >= 0) && isSymbol(rune(schematic[y-1][x-1])):
validPartNum = true
if schematic[y-1][x-1] == potentialGear {
potentialGearPos = fmt.Sprintf("%d-%d", y-1, x-1)
}
// check straight above
case ((y - 1) >= 0) && !unicode.IsDigit(rune(schematic[y-1][x])) && (schematic[y-1][x] != dot):
case ((y - 1) >= 0) && isSymbol(rune(schematic[y-1][x])):
validPartNum = true
if schematic[y-1][x] == potentialGear {
potentialGearPos = fmt.Sprintf("%d-%d", y-1, x)
}
// check above right
case ((y - 1) >= 0) && ((x + 1) <= maxX) && !unicode.IsDigit(rune(schematic[y-1][x+1])) && (schematic[y-1][x+1] != dot):
case ((y - 1) >= 0) && ((x + 1) <= maxX) && isSymbol(rune(schematic[y-1][x+1])):
validPartNum = true
if schematic[y-1][x+1] == potentialGear {
potentialGearPos = fmt.Sprintf("%d-%d", y-1, x+1)
}
// check left
case ((x - 1) >= 0) && !unicode.IsDigit(rune(schematic[y][x-1])) && (schematic[y][x-1] != dot):
case ((x - 1) >= 0) && isSymbol(rune(schematic[y][x-1])):
validPartNum = true
if schematic[y][x-1] == potentialGear {
potentialGearPos = fmt.Sprintf("%d-%d", y, x-1)
}
// check right
case ((x + 1) <= maxX) && !unicode.IsDigit(rune(schematic[y][x+1])) && (schematic[y][x+1] != dot):
case ((x + 1) <= maxX) && isSymbol(rune(schematic[y][x+1])):
validPartNum = true
if schematic[y][x+1] == potentialGear {
potentialGearPos = fmt.Sprintf("%d-%d", y, x+1)
}
// check below left
case ((y + 1) <= maxY) && ((x - 1) >= 0) && !unicode.IsDigit(rune(schematic[y+1][x-1])) && (schematic[y+1][x-1] != dot):
case ((y + 1) <= maxY) && ((x - 1) >= 0) && isSymbol(rune(schematic[y+1][x-1])):
validPartNum = true
if schematic[y+1][x-1] == potentialGear {
potentialGearPos = fmt.Sprintf("%d-%d", y+1, x-1)
}
// check straight below
case ((y + 1) <= maxY) && !unicode.IsDigit(rune(schematic[y+1][x])) && (schematic[y+1][x] != dot):
case ((y + 1) <= maxY) && isSymbol(rune(schematic[y+1][x])):
validPartNum = true
if schematic[y+1][x] == potentialGear {
potentialGearPos = fmt.Sprintf("%d-%d", y+1, x)
}
// check below right
case ((y + 1) <= maxY) && ((x + 1) <= maxX) && !unicode.IsDigit(rune(schematic[y+1][x+1])) && (schematic[y+1][x+1] != dot):
case ((y + 1) <= maxY) && ((x + 1) <= maxX) && isSymbol(rune(schematic[y+1][x+1])):
validPartNum = true
if schematic[y+1][x+1] == potentialGear {
potentialGearPos = fmt.Sprintf("%d-%d", y+1, x+1)
@ -105,7 +105,7 @@ func fixTheGondola(schematic []string) (answer, error) {
if validPartNum {
value, err := strconv.Atoi(partNum)
if err != nil {
return answer{}, fmt.Errorf("unable to convert %q to int; %w", partNum, err)
return solution{}, fmt.Errorf("unable to convert %q to int; %w", partNum, err)
}
partNumSum = partNumSum + value
@ -130,12 +130,12 @@ func fixTheGondola(schematic []string) (answer, error) {
}
}
ans := answer{
answer := solution{
sumOfValidEnginePartNumbers: partNumSum,
sumOfGearRatios: sumGearRatios,
}
return ans, nil
return answer, nil
}
func engineSchematic(filename string) ([]string, error) {
@ -153,3 +153,7 @@ func engineSchematic(filename string) ([]string, error) {
return lines, nil
}
func isSymbol(r rune) bool {
return !unicode.IsDigit(r) && (r != dot)
}

2
2023/day-3/main_test.go
View file

@ -36,7 +36,7 @@ func testFixTheGondola(schematic []string) func(t *testing.T) {
t.Fatalf("Received an error after running sumOfValidEnginePartNumbers(); %v\n", err)
}
want := answer{
want := solution{
sumOfValidEnginePartNumbers: 4361,
sumOfGearRatios: 467835,
}