diff options
| author | mo khan <mo@mokhan.ca> | 2019-08-05 13:34:28 -0600 |
|---|---|---|
| committer | mo khan <mo@mokhan.ca> | 2019-08-05 13:34:28 -0600 |
| commit | 1f5a1647eb36793e06b9136c877941e626d4221b (patch) | |
| tree | 391cb311fec5e6d27c9f5a46ee0e0321ee4b98de /src | |
| parent | d8e4543b237a0aa2ca96e9d3653893ea6e46f75e (diff) | |
rename robots from X and Y to 1 and 2
Diffstat (limited to 'src')
| -rw-r--r-- | src/Q9/MovingRobot.java | 8 | ||||
| -rw-r--r-- | src/Q9/MovingRobotTest.java | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/Q9/MovingRobot.java b/src/Q9/MovingRobot.java index c982250..334041d 100644 --- a/src/Q9/MovingRobot.java +++ b/src/Q9/MovingRobot.java @@ -45,12 +45,12 @@ public class MovingRobot extends Robot { return r1.getX() == r2.getX() && r1.getY() == r2.getY(); } - public static String printGrid(Robot x, Robot y) { + public static String printGrid(Robot r1, Robot r2) { String grid = ""; for (int row = 0; row < 10; row++) { for (int column = 0; column < 10; column++) { - if (x.getX() == row && x.getY() == column) grid += "|X"; - else if (y.getX() == row && y.getY() == column) grid += "|Y"; + if (r1.getX() == row && r1.getY() == column) grid += "|1"; + else if (r2.getX() == row && r2.getY() == column) grid += "|2"; else grid += "| "; } grid += String.format("|%s", System.lineSeparator()); @@ -151,6 +151,8 @@ public class MovingRobot extends Robot { r2.move(); clear(); + System.out.println( + String.format("R1 (%d, %d), R2: (%d, %d)", r1.getX(), r1.getY(), r2.getX(), r2.getY())); System.out.println(MovingRobot.printGrid(r1, r2)); sleep(1000); } diff --git a/src/Q9/MovingRobotTest.java b/src/Q9/MovingRobotTest.java index 8731130..0ac68cb 100644 --- a/src/Q9/MovingRobotTest.java +++ b/src/Q9/MovingRobotTest.java @@ -185,7 +185,7 @@ public class MovingRobotTest extends TestCase { Robot r2 = new MovingRobot(9, 9); String expected = - "|X| | | | | | | | | |\n" + "|1| | | | | | | | | |\n" + "| | | | | | | | | | |\n" + "| | | | | | | | | | |\n" + "| | | | | | | | | | |\n" @@ -194,7 +194,7 @@ public class MovingRobotTest extends TestCase { + "| | | | | | | | | | |\n" + "| | | | | | | | | | |\n" + "| | | | | | | | | | |\n" - + "| | | | | | | | | |Y|\n"; + + "| | | | | | | | | |2|\n"; String result = MovingRobot.printGrid(r1, r2); System.out.println(expected); |
