v1

Author: Teiva Harsanyi

Diff for: 2018/day17-go/main.go

@@ -18,6 +18,7 @@ func fs1(input io.Reader) int {
 	}
 
 	const minRow = 0
+	minY := math.MaxInt
 	minCol := math.MaxInt
 	maxCol := math.MinInt
 	maxRow := 0
@@ -31,8 +32,10 @@ func fs1(input io.Reader) int {
 		}
 
 		if scan.rangeRow == nil {
+			minY = lib.Min(minY, scan.row)
 			maxRow = lib.Max(maxRow, scan.row)
 		} else {
+			minY = lib.Min(minY, scan.rangeRow.from)
 			maxRow = lib.Max(maxRow, scan.rangeRow.to)
 		}
 	}
@@ -41,10 +44,7 @@ func fs1(input io.Reader) int {
 
 	grid.dfs(Position{0, 500})
 
-	fmt.Println(grid)
-	//fmt.Println(grid.Visited())
-	//fmt.Println(grid.visited[Position{11, 500}])
-	return grid.sumWater() - 1 // spring
+	return grid.sumWater(minY)
 }
 
 type Grid struct {
@@ -68,10 +68,10 @@ func (p Position) delta(row, col int) Position {
 	return p
 }
 
-func (g *Grid) sumWater() int {
+func (g *Grid) sumWater(row int) int {
 	sum := 0
-	for _, row := range g.board {
-		for _, v := range row {
+	for ; row < len(g.board); row++ {
+		for _, v := range g.board[row] {
 			if v == water {
 				sum++
 			}
@@ -195,21 +195,6 @@ func (g *Grid) String() string {
 	return s
 }
 
-//func (g *Grid) Visited() string {
-//	s := ""
-//	for r, row := range g.board {
-//		for c := range row {
-//			if g.visited[Position{r + g.minRow, c + g.minCol}] {
-//				s += "X"
-//			} else {
-//				s += "."
-//			}
-//		}
-//		s += "\n"
-//	}
-//	return s
-//}
-
 type UnitType int
 
 const (

Diff for: 2018/day17-go/main_test.go

@@ -11,13 +11,13 @@ import (
 func TestFs1Unit(t *testing.T) {
 	f, err := os.Open("unit.txt")
 	require.NoError(t, err)
-	assert.Equal(t, 36, fs1(f))
+	assert.Equal(t, 28, fs1(f))
 }
 
 func TestFs1Unit2(t *testing.T) {
 	f, err := os.Open("unit2.txt")
 	require.NoError(t, err)
-	assert.Equal(t, 76, fs1(f))
+	assert.Equal(t, 55, fs1(f))
 }
 
 func TestFs1Test(t *testing.T) {
@@ -29,13 +29,13 @@ func TestFs1Test(t *testing.T) {
 func TestFs1Input(t *testing.T) {
 	f, err := os.Open("input.txt")
 	require.NoError(t, err)
-	assert.Equal(t, 31476, fs1(f))
+	assert.Equal(t, 31471, fs1(f))
 }
 
 func TestFs2Test(t *testing.T) {
 	f, err := os.Open("test.txt")
 	require.NoError(t, err)
-	assert.Equal(t, 42, fs2(f))
+	assert.Equal(t, 29, fs2(f))
 }
 
 func TestFs2Input(t *testing.T) {