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

R: Readabilty (magic strings rename)

Browse source
This commit is contained in:
Paul Hameteman 2025-10-14 21:33:04 +02:00
commit 9a56cc4f79
1 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,7 @@ class Rover {
if (command.size >= ROVER_MINIMUM_NEEDED_COMMANDS) { if (command.size >= ROVER_MINIMUM_NEEDED_COMMANDS) {
state.positionX = command[ROVER_STARTING_POSITION_X].toInt() state.positionX = command[ROVER_STARTING_POSITION_X].toInt()
state.positionY = command[ROVER_STARTING_POSITION_Y].toInt() state.positionY = command[ROVER_STARTING_POSITION_Y].toInt()
state.direction = command[ROVER_FACING_DIRECTION][ROVER_COMMANDLIST_DIRECTION] state.heading = command[ROVER_FACING_DIRECTION][ROVER_COMMANDLIST_DIRECTION]
} }
} }
@ -14,27 +14,27 @@ class Rover {
for (instruction in instructions) { for (instruction in instructions) {
when (instruction) { when (instruction) {
COMMAND_TURN_LEFT -> { COMMAND_TURN_LEFT -> {
when (state.direction) { when (state.heading) {
DIRECTION_EAST -> state.direction = DIRECTION_NORTH HEADING_EAST -> state.heading = HEADING_NORTH
DIRECTION_NORTH -> state.direction = DIRECTION_WEST HEADING_NORTH -> state.heading = HEADING_WEST
DIRECTION_WEST -> state.direction = DIRECTION_SOUTH HEADING_WEST -> state.heading = HEADING_SOUTH
DIRECTION_SOUTH -> state.direction = DIRECTION_EAST HEADING_SOUTH -> state.heading = HEADING_EAST
} }
} }
COMMAND_TURN_RIGHT -> { COMMAND_TURN_RIGHT -> {
when (state.direction) { when (state.heading) {
DIRECTION_EAST -> state.direction = DIRECTION_SOUTH HEADING_EAST -> state.heading = HEADING_SOUTH
DIRECTION_SOUTH -> state.direction = DIRECTION_WEST HEADING_SOUTH -> state.heading = HEADING_WEST
DIRECTION_WEST -> state.direction = DIRECTION_NORTH HEADING_WEST -> state.heading = HEADING_NORTH
DIRECTION_NORTH -> state.direction = DIRECTION_EAST HEADING_NORTH -> state.heading = HEADING_EAST
} }
} }
COMMAND_MOVE -> { COMMAND_MOVE -> {
when (state.direction) { when (state.heading) {
DIRECTION_EAST -> state.positionX++ HEADING_EAST -> state.positionX++
DIRECTION_SOUTH -> state.positionY-- HEADING_SOUTH -> state.positionY--
DIRECTION_WEST -> state.positionX-- HEADING_WEST -> state.positionX--
DIRECTION_NORTH -> state.positionY++ HEADING_NORTH -> state.positionY++
} }
} }
} }
@ -42,7 +42,7 @@ class Rover {
} }
val position: String val position: String
get() = "${state.positionX} ${state.positionY} ${state.direction}" get() = "${state.positionX} ${state.positionY} ${state.heading}"
fun pos(): String = position fun pos(): String = position
@ -52,7 +52,7 @@ class Rover {
class RoverState { class RoverState {
var positionX: Int = 0 var positionX: Int = 0
var positionY: Int = 0 var positionY: Int = 0
var direction: Char = DIRECTION_NORTH var heading: Char = HEADING_NORTH
} }
private const val ROVER_MINIMUM_NEEDED_COMMANDS = 3 private const val ROVER_MINIMUM_NEEDED_COMMANDS = 3
@ -65,7 +65,7 @@ private const val COMMAND_TURN_LEFT = 'L'
private const val COMMAND_TURN_RIGHT = 'R' private const val COMMAND_TURN_RIGHT = 'R'
private const val COMMAND_MOVE = 'M' private const val COMMAND_MOVE = 'M'
private const val DIRECTION_EAST = 'E' private const val HEADING_EAST = 'E'
private const val DIRECTION_NORTH = 'N' private const val HEADING_NORTH = 'N'
private const val DIRECTION_WEST = 'W' private const val HEADING_WEST = 'W'
private const val DIRECTION_SOUTH = 'S' private const val HEADING_SOUTH = 'S'