2024.15, split apply()

lucianoq · lucianoq · commit eaffb8a0b738 · 2024-12-15T11:29:58.000Z
diff --git a/2024/15/main1.go b/2024/15/main1.go
@@ -5,12 +5,12 @@ import "fmt"
 func main() {
 	m, moves, robot := parseInput()
 	for _, move := range moves {
-		robot = apply(m, move, robot)
+		robot = apply1(m, move, robot)
 	}
 	fmt.Println(gps(m, 'O'))
 }
 
-func apply(m map[P]byte, move byte, robot P) P {
+func apply1(m map[P]byte, move byte, robot P) P {
 	delta := getDelta(move)
 
 	nextEmpty, err := findNextEmpty(m, robot, delta)
diff --git a/2024/15/main2.go b/2024/15/main2.go
@@ -6,7 +6,7 @@ func main() {
 	m, moves, robot := parseInput()
 	m, robot = grow(m, robot)
 	for _, move := range moves {
-		robot = apply(m, move, robot)
+		robot = apply2(m, move, robot)
 	}
 	fmt.Println(gps(m, '['))
 }
@@ -36,7 +36,7 @@ func grow(m map[P]byte, robot P) (map[P]byte, P) {
 	return newM, P{robot.x, 2 * robot.y}
 }
 
-func apply(m map[P]byte, move byte, robot P) P {
+func apply2(m map[P]byte, move byte, robot P) P {
 	delta := getDelta(move)
 
 	nextEmpty, err := findNextEmpty(m, robot, delta)

Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,12 @@ import "fmt"`
`5`	`5`	`func main() {`
`6`	`6`	`m, moves, robot := parseInput()`
`7`	`7`	`for _, move := range moves {`
`8`		`- robot = apply(m, move, robot)`
	`8`	`+ robot = apply1(m, move, robot)`
`9`	`9`	`}`
`10`	`10`	`fmt.Println(gps(m, 'O'))`
`11`	`11`	`}`
`12`	`12`
`13`		`-func apply(m map[P]byte, move byte, robot P) P {`
	`13`	`+func apply1(m map[P]byte, move byte, robot P) P {`
`14`	`14`	`delta := getDelta(move)`
`15`	`15`
`16`	`16`	`nextEmpty, err := findNextEmpty(m, robot, delta)`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ func main() {`
`6`	`6`	`m, moves, robot := parseInput()`
`7`	`7`	`m, robot = grow(m, robot)`
`8`	`8`	`for _, move := range moves {`
`9`		`- robot = apply(m, move, robot)`
	`9`	`+ robot = apply2(m, move, robot)`
`10`	`10`	`}`
`11`	`11`	`fmt.Println(gps(m, '['))`
`12`	`12`	`}`
`@@ -36,7 +36,7 @@ func grow(m map[P]byte, robot P) (map[P]byte, P) {`
`36`	`36`	`return newM, P{robot.x, 2 * robot.y}`
`37`	`37`	`}`
`38`	`38`
`39`		`-func apply(m map[P]byte, move byte, robot P) P {`
	`39`	`+func apply2(m map[P]byte, move byte, robot P) P {`
`40`	`40`	`delta := getDelta(move)`
`41`	`41`
`42`	`42`	`nextEmpty, err := findNextEmpty(m, robot, delta)`