paul/dojo-mars-rover
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

R: Move move() into Heading.move(Position)

Browse source
This commit is contained in:
Paul Hameteman 2025-10-14 22:52:06 +02:00
commit 84e78f18d3
3 changed files with 31 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/main/kotlin/org/example/Heading.kt
View file

@ -1,10 +1,10 @@
package org.example
enum class Heading(val symbol: Char) {
NORTH('N'),
EAST('E'),
SOUTH('S'),
WEST('W'),
enum class Heading(val symbol: Char, val deltaX: Int, val deltaY: Int) {
NORTH('N', 0, 1),
EAST('E', 1, 0),
SOUTH('S', 0, -1),
WEST('W', -1, 0),
;
fun turnLeft(): Heading =
@ -23,6 +23,11 @@ enum class Heading(val symbol: Char) {
NORTH -> EAST
}
fun move(
x: Int,
y: Int,
): Pair<Int, Int> = Pair(x + deltaX, y + deltaY)
override fun toString(): String = symbol.toString()
companion object {

9
src/main/kotlin/org/example/Rover.kt
View file

@ -21,12 +21,9 @@ class Rover {
}
private fun move() {
when (state.heading) {
Heading.EAST -> state.positionX++
Heading.SOUTH -> state.positionY--
Heading.WEST -> state.positionX--
Heading.NORTH -> state.positionY++
}
val (updatedX, updatedY) = state.heading.move(state.positionX, state.positionY)
state.positionX = updatedX
state.positionY = updatedY
}
private fun turnRight() {