Stevan/advent-of-code-2025
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: edge and rectangle in separate packages

Browse Source
This commit is contained in:
Stevan Freeborn
2025-12-19 19:01:44 -06:00
parent c5abf62fff
commit 5b7f652dee
5 changed files with 373 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/09/main.go
+17 -68
View File
@@ -1,10 +1,11 @@
package main
import (
"math"
"strconv"
"strings"
"github.com/StevanFreeborn/advent-of-code-2025/cmd/09/edge"
"github.com/StevanFreeborn/advent-of-code-2025/cmd/09/rectangle"
"github.com/StevanFreeborn/advent-of-code-2025/internal/file"
"github.com/StevanFreeborn/advent-of-code-2025/internal/position"
)
@@ -27,14 +28,10 @@ func SolvePartOne(filePath string) int {
for j := i + 1; j < numberOfPositions; j++ {
start := positions[i]
end := positions[j]
rect := rectangle.From(start, end)
width := int(math.Abs(float64(end.Column()-start.Column())) + 1)
height := int(math.Abs(float64(end.Row()-start.Row())) + 1)
a := width * height
if a > largestArea {
largestArea = a
if rect.Area() > largestArea {
largestArea = rect.Area()
}
}
}
@@ -42,8 +39,6 @@ func SolvePartOne(filePath string) int {
return largestArea
}
// TODO: Refactor below so more understandable
func SolvePartTwo(filePath string) int {
positions := []position.Position{}
@@ -62,41 +57,21 @@ func SolvePartTwo(filePath string) int {
for j := i + 1; j < numberOfPositions; j++ {
start := positions[i]
end := positions[j]
rect := rectangle.From(start, end)
rectMinRow := int(math.Min(float64(start.Row()), float64(end.Row())))
rectMaxRow := int(math.Max(float64(start.Row()), float64(end.Row())))
rectMinCol := int(math.Min(float64(start.Column()), float64(end.Column())))
rectMaxCol := int(math.Max(float64(start.Column()), float64(end.Column())))
width := int(math.Abs(float64(rectMaxCol-rectMinCol)) + 1)
height := int(math.Abs(float64(rectMaxRow-rectMinRow)) + 1)
a := width * height
if a <= largestArea {
if rect.Area() <= largestArea {
continue
}
centerRow := int((rectMaxRow + rectMinRow) / 2)
centerCol := int((rectMaxCol + rectMinCol) / 2)
center := position.From(centerRow, centerCol)
centerIsInside := false
for i := range numberOfPositions {
edgeStart := positions[i]
edgeEndIndex := (i + 1) % numberOfPositions
edgeEnd := positions[edgeEndIndex]
edge := edge.From(edgeStart, edgeEnd)
isCenterVerticallyBetweenEdge := (edgeStart.Row() <= center.Row()) && (center.Row() <= edgeEnd.Row())
edgeTotalHeight := int(math.Abs(float64(edgeEnd.Row() - edgeStart.Row())))
edgeTotalWidth := int(math.Abs(float64(edgeEnd.Column() - edgeStart.Column())))
centerPercentageOfEdgeHeight := int(float64(center.Row()-edgeStart.Row()) / float64(edgeTotalHeight))
edgeColumnAtCenterRow := edgeStart.Column() + centerPercentageOfEdgeHeight*edgeTotalWidth
isCenterHorizontallyToTheLeft := center.Row() <= edgeColumnAtCenterRow
if isCenterVerticallyBetweenEdge && isCenterHorizontallyToTheLeft {
if edge.VerticallyContains(rect.Center()) && edge.IntersectsHorizontalLineAt(rect.Center()) {
centerIsInside = !centerIsInside
}
}
@@ -108,40 +83,14 @@ func SolvePartTwo(filePath string) int {
isIntersectedByEdge := false
for i := range numberOfPositions {
currPos := positions[i]
nextPosIndex := (i + 1) % numberOfPositions
nextPos := positions[nextPosIndex]
edgeStart := positions[i]
edgeEndIndex := (i + 1) % numberOfPositions
edgeEnd := positions[edgeEndIndex]
edge := edge.From(edgeStart, edgeEnd)
if currPos.Column() == nextPos.Column() {
col := currPos.Column()
if col > rectMinCol && col < rectMaxCol {
edgeMinRow := math.Min(float64(currPos.Row()), float64(nextPos.Row()))
edgeMaxRow := math.Max(float64(currPos.Row()), float64(nextPos.Row()))
overlapStart := int(math.Max(edgeMinRow, float64(rectMinRow)))
overlapEnd := int(math.Min(edgeMaxRow, float64(rectMaxRow)))
if overlapEnd > overlapStart {
isIntersectedByEdge = true
break
}
}
} else {
row := currPos.Row()
if row > rectMinRow && row < rectMaxRow {
edgeMinCol := math.Min(float64(currPos.Column()), float64(nextPos.Column()))
edgeMaxCol := math.Max(float64(currPos.Column()), float64(nextPos.Column()))
overlapStart := int(math.Max(edgeMinCol, float64(rectMinCol)))
overlapEnd := int(math.Min(edgeMaxCol, float64(rectMaxCol)))
if overlapEnd > overlapStart {
isIntersectedByEdge = true
break
}
}
if edge.Intersects(rect) {
isIntersectedByEdge = true
break
}
}
@@ -149,7 +98,7 @@ func SolvePartTwo(filePath string) int {
continue
}
largestArea = a
largestArea = rect.Area()
}
}