From 381ea44a9a9d9e28218446c585be18f368d4ce03 Mon Sep 17 00:00:00 2001 From: romanschenk37 <84532681+romanschenk37@users.noreply.github.com> Date: Sat, 5 Mar 2022 16:39:08 +0100 Subject: [PATCH 01/28] Created CarTest.java added Tests setPosition, nextPosition --- .../java/ch/zhaw/pm2/racetrack/CarTest.java | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 src/test/java/ch/zhaw/pm2/racetrack/CarTest.java diff --git a/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java b/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java new file mode 100644 index 0000000..eb013c6 --- /dev/null +++ b/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java @@ -0,0 +1,60 @@ + +package ch.zhaw.pm2.racetrack; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class CarTest { + Car car; + + @BeforeEach + void setUp() { + car = new Car('a', new PositionVector(10, 10)); + } + + @AfterEach + void tearDown() { + } + + @Test + void setPosition() { + car.setPosition(new PositionVector(20, 20)); + checkPosition(20, 20); + } + + @Test + void nextPosition() { + checkPosition(10, 10); + } + + @Test + void accelerate() { + } + + @Test + void move() { + } + + @Test + void crash() { + } + + @Test + void isCrashed() { + } + + @Test + void setMoveStrategy() { + } + + @Test + void getMoveStrategy() { + } + + void checkPosition(int x, int y) { + assertTrue(car.nextPosition().equals(new PositionVector(x, y))); + } +} From 972f011a080c488eaabc6345a71570ed72e14c4a Mon Sep 17 00:00:00 2001 From: romanschenk37 <84532681+romanschenk37@users.noreply.github.com> Date: Sun, 6 Mar 2022 17:06:42 +0100 Subject: [PATCH 02/28] changes in Tests car.CarTest setPosition, movement, crash, moveStrategy --- .../java/ch/zhaw/pm2/racetrack/CarTest.java | 124 ++++++++++++++---- 1 file changed, 100 insertions(+), 24 deletions(-) diff --git a/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java b/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java index eb013c6..a6d91ba 100644 --- a/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java +++ b/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java @@ -1,60 +1,136 @@ package ch.zhaw.pm2.racetrack; -import org.junit.jupiter.api.AfterEach; +import ch.zhaw.pm2.racetrack.strategy.*; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import static org.junit.jupiter.api.Assertions.*; class CarTest { Car car; + int DEFAULT_X = 10; + int DEFAULT_Y = 10; @BeforeEach void setUp() { - car = new Car('a', new PositionVector(10, 10)); + car = new Car('a', new PositionVector(DEFAULT_X, DEFAULT_Y)); } - @AfterEach - void tearDown() { - } @Test void setPosition() { - car.setPosition(new PositionVector(20, 20)); - checkPosition(20, 20); + CheckNextPosition(DEFAULT_X, DEFAULT_Y); + + List validPositions = new ArrayList<>(); + validPositions.add(new PositionVector(20, 20)); + validPositions.add(new PositionVector(0, 0)); + validPositions.add(new PositionVector(20, 0)); + validPositions.add(new PositionVector(0, 20)); + + for(PositionVector positionVector : validPositions) { + car.setPosition(positionVector); + assertEquals(positionVector, car.nextPosition()); + } + + List invalidPositions = new ArrayList<>(); + invalidPositions.add(new PositionVector(0, -20)); + invalidPositions.add(new PositionVector(-20, 0)); + invalidPositions.add(new PositionVector(-20, -20)); + + for(PositionVector positionVector : invalidPositions) { + boolean exception = false; + try { + car.setPosition(positionVector); + } catch (IllegalArgumentException e) { + exception = true; + } + assertTrue(exception); + + CheckNextPosition(0, 0); + } } - @Test - void nextPosition() { - checkPosition(10, 10); - } + @Test - void accelerate() { + void movement() { + car.move(); + CheckNextPosition(DEFAULT_X, DEFAULT_Y); + + List directions = Arrays.asList(PositionVector.Direction.values()); + + for (PositionVector.Direction direction1 : directions){ + + setUp(); + int nextPosX = DEFAULT_X; + int nextPosY = DEFAULT_Y; + + car.accelerate(direction1); + nextPosX += direction1.vector.getX(); + nextPosY += direction1.vector.getY(); + CheckNextPosition(nextPosX, nextPosY); + + car.move(); + nextPosX += direction1.vector.getX(); + nextPosY += direction1.vector.getY(); + CheckNextPosition(nextPosX, nextPosY); + + for (PositionVector.Direction direction2 : directions) { + car.accelerate(direction2); + nextPosX += direction2.vector.getX(); + nextPosY += direction2.vector.getY(); + CheckNextPosition(nextPosX, nextPosY); + + car.move(); + nextPosX += direction1.vector.getX(); + nextPosY += direction1.vector.getY(); + nextPosX += direction2.vector.getX(); + nextPosY += direction2.vector.getY(); + CheckNextPosition(nextPosX, nextPosY); + + } + + } } - @Test - void move() { - } @Test void crash() { + assertFalse(car.isCrashed()); + car.crash(); + assertTrue(car.isCrashed()); + } @Test - void isCrashed() { + void MoveStrategy() { + MoveStrategy moveStrategy; + + moveStrategy = new DoNotMoveStrategy(); + car.setMoveStrategy(moveStrategy); + assertEquals(moveStrategy, car.getMoveStrategy()); + + moveStrategy = new MoveListStrategy(); + car.setMoveStrategy(moveStrategy); + assertEquals(moveStrategy, car.getMoveStrategy()); + + moveStrategy = new PathFollowerMoveStrategy(); + car.setMoveStrategy(moveStrategy); + assertEquals(moveStrategy, car.getMoveStrategy()); + + moveStrategy = new UserMoveStrategy(); + car.setMoveStrategy(moveStrategy); + assertEquals(moveStrategy, car.getMoveStrategy()); } - @Test - void setMoveStrategy() { - } - @Test - void getMoveStrategy() { - } - void checkPosition(int x, int y) { - assertTrue(car.nextPosition().equals(new PositionVector(x, y))); + void CheckNextPosition(int x, int y) { + assertEquals(new PositionVector(x, y), car.nextPosition()); } } From 8086111772e34c4079d87805ee1a8eff94111306 Mon Sep 17 00:00:00 2001 From: romanschenk37 <84532681+romanschenk37@users.noreply.github.com> Date: Sun, 6 Mar 2022 18:13:27 +0100 Subject: [PATCH 03/28] Fix in CarTest.java @Test setPosition --- src/test/java/ch/zhaw/pm2/racetrack/CarTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java b/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java index a6d91ba..5f0c462 100644 --- a/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java +++ b/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java @@ -51,7 +51,7 @@ class CarTest { } assertTrue(exception); - CheckNextPosition(0, 0); + CheckNextPosition(DEFAULT_X, DEFAULT_Y); } } From 40cd4f7b72e59e83fbcf60f9d7ad2759d6015fab Mon Sep 17 00:00:00 2001 From: romanschenk37 <84532681+romanschenk37@users.noreply.github.com> Date: Sun, 6 Mar 2022 18:57:01 +0100 Subject: [PATCH 04/28] Added Javadoc and comments in CarTest.java --- .../java/ch/zhaw/pm2/racetrack/CarTest.java | 91 ++++++++++++------- 1 file changed, 60 insertions(+), 31 deletions(-) diff --git a/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java b/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java index 5f0c462..3468cbf 100644 --- a/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java +++ b/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java @@ -11,38 +11,62 @@ import java.util.List; import static org.junit.jupiter.api.Assertions.*; +/** + * Tests for Class Car + */ class CarTest { + Car car; + + // Default coordinates for tests int DEFAULT_X = 10; int DEFAULT_Y = 10; + /** + * Create a new Car Object and set Position to a defined Default Position + */ @BeforeEach void setUp() { car = new Car('a', new PositionVector(DEFAULT_X, DEFAULT_Y)); } + /** + * Method to check nextPosition with coordinates as int + * + * @param x the expected value for x coordinate + * @param y the expected value for y coordinate + */ + void CheckNextPosition(int x, int y) { + assertEquals(new PositionVector(x, y), car.nextPosition()); + } + /** + * - checks if the position of the car can be set and saved correctly with valid positions. + * - checks if an exception is throwed and position keeps unchanged if invalid coordinates are entered. + */ @Test void setPosition() { CheckNextPosition(DEFAULT_X, DEFAULT_Y); + // List of valid Positions List validPositions = new ArrayList<>(); validPositions.add(new PositionVector(20, 20)); validPositions.add(new PositionVector(0, 0)); validPositions.add(new PositionVector(20, 0)); validPositions.add(new PositionVector(0, 20)); - for(PositionVector positionVector : validPositions) { + for (PositionVector positionVector : validPositions) { car.setPosition(positionVector); assertEquals(positionVector, car.nextPosition()); } + // List of invalid positions. List invalidPositions = new ArrayList<>(); invalidPositions.add(new PositionVector(0, -20)); invalidPositions.add(new PositionVector(-20, 0)); invalidPositions.add(new PositionVector(-20, -20)); - for(PositionVector positionVector : invalidPositions) { + for (PositionVector positionVector : invalidPositions) { boolean exception = false; try { car.setPosition(positionVector); @@ -51,62 +75,73 @@ class CarTest { } assertTrue(exception); + // position should keep unchanged CheckNextPosition(DEFAULT_X, DEFAULT_Y); } } - + /** + * Checks if the methods accelerate and move are working correctly with acceleration in all directions. + * Checks also if velocity is calculated correctly if method accelerate is called a second time. + */ @Test void movement() { + // add all possible directions in a List + List directions = Arrays.asList(PositionVector.Direction.values()); + + //position shouldn't be changed because velocity should be 0. car.move(); CheckNextPosition(DEFAULT_X, DEFAULT_Y); - List directions = Arrays.asList(PositionVector.Direction.values()); - - for (PositionVector.Direction direction1 : directions){ + for (PositionVector.Direction direction1 : directions) { + //create a new instance of Car with default coordinates and velocity 0. setUp(); - int nextPosX = DEFAULT_X; - int nextPosY = DEFAULT_Y; + + //variables to save the actual expected result of method nextPosition + int ExpectedNextPosX = DEFAULT_X; + int ExpectedNextPosY = DEFAULT_Y; car.accelerate(direction1); - nextPosX += direction1.vector.getX(); - nextPosY += direction1.vector.getY(); - CheckNextPosition(nextPosX, nextPosY); + ExpectedNextPosX += direction1.vector.getX(); + ExpectedNextPosY += direction1.vector.getY(); + CheckNextPosition(ExpectedNextPosX, ExpectedNextPosY); car.move(); - nextPosX += direction1.vector.getX(); - nextPosY += direction1.vector.getY(); - CheckNextPosition(nextPosX, nextPosY); + ExpectedNextPosX += direction1.vector.getX(); + ExpectedNextPosY += direction1.vector.getY(); + CheckNextPosition(ExpectedNextPosX, ExpectedNextPosY); for (PositionVector.Direction direction2 : directions) { car.accelerate(direction2); - nextPosX += direction2.vector.getX(); - nextPosY += direction2.vector.getY(); - CheckNextPosition(nextPosX, nextPosY); + ExpectedNextPosX += direction2.vector.getX(); + ExpectedNextPosY += direction2.vector.getY(); + CheckNextPosition(ExpectedNextPosX, ExpectedNextPosY); car.move(); - nextPosX += direction1.vector.getX(); - nextPosY += direction1.vector.getY(); - nextPosX += direction2.vector.getX(); - nextPosY += direction2.vector.getY(); - CheckNextPosition(nextPosX, nextPosY); - + ExpectedNextPosX += (direction1.vector.getX() + direction2.vector.getX()); + ExpectedNextPosY += (direction1.vector.getY() + direction2.vector.getY()); + CheckNextPosition(ExpectedNextPosX, ExpectedNextPosY); } - } } + /** + * test for methods crash and isCrashed. checks if state crashed is set and returned correctly. + */ @Test void crash() { assertFalse(car.isCrashed()); car.crash(); assertTrue(car.isCrashed()); - } + /** + * test for methods setMoveStrategy. Checks if the MoveStrategy Object is saved and returned correctly + * with all Types of MoveStrategy. + */ @Test void MoveStrategy() { MoveStrategy moveStrategy; @@ -127,10 +162,4 @@ class CarTest { car.setMoveStrategy(moveStrategy); assertEquals(moveStrategy, car.getMoveStrategy()); } - - - - void CheckNextPosition(int x, int y) { - assertEquals(new PositionVector(x, y), car.nextPosition()); - } } From dea430e418c1bf1aacec97bc766cfc0f996c5637 Mon Sep 17 00:00:00 2001 From: romanschenk37 <84532681+romanschenk37@users.noreply.github.com> Date: Mon, 7 Mar 2022 17:43:32 +0100 Subject: [PATCH 05/28] Added Test for Method getID in CarTest.java --- src/test/java/ch/zhaw/pm2/racetrack/CarTest.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java b/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java index 3468cbf..e8db6aa 100644 --- a/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java +++ b/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java @@ -21,13 +21,19 @@ class CarTest { // Default coordinates for tests int DEFAULT_X = 10; int DEFAULT_Y = 10; + char DEFAULT_ID = 'f'; /** * Create a new Car Object and set Position to a defined Default Position */ @BeforeEach void setUp() { - car = new Car('a', new PositionVector(DEFAULT_X, DEFAULT_Y)); + car = new Car(DEFAULT_ID, new PositionVector(DEFAULT_X, DEFAULT_Y)); + } + + @Test + void getID() { + assertEquals(DEFAULT_ID, car.getID()); } /** From 31a24120eb29b2a4c9d1ffdb355f1fd1a72a17d5 Mon Sep 17 00:00:00 2001 From: romanschenk37 <84532681+romanschenk37@users.noreply.github.com> Date: Mon, 7 Mar 2022 20:44:05 +0100 Subject: [PATCH 06/28] added checks for method getVelocity in Test Movement in CarTest.java --- .../java/ch/zhaw/pm2/racetrack/CarTest.java | 54 ++++++++++++------- 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java b/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java index e8db6aa..472b356 100644 --- a/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java +++ b/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java @@ -42,7 +42,7 @@ class CarTest { * @param x the expected value for x coordinate * @param y the expected value for y coordinate */ - void CheckNextPosition(int x, int y) { + void checkNextPosition(int x, int y) { assertEquals(new PositionVector(x, y), car.nextPosition()); } @@ -52,7 +52,7 @@ class CarTest { */ @Test void setPosition() { - CheckNextPosition(DEFAULT_X, DEFAULT_Y); + checkNextPosition(DEFAULT_X, DEFAULT_Y); // List of valid Positions List validPositions = new ArrayList<>(); @@ -82,13 +82,17 @@ class CarTest { assertTrue(exception); // position should keep unchanged - CheckNextPosition(DEFAULT_X, DEFAULT_Y); + checkNextPosition(DEFAULT_X, DEFAULT_Y); } } + void checkVelocity(int x, int y) { + assertEquals(new PositionVector(x, y), car.getVelocity()); + } + /** - * Checks if the methods accelerate and move are working correctly with acceleration in all directions. + * Checks if the methods accelerate, move and getVelocity are working correctly with acceleration in all directions. * Checks also if velocity is calculated correctly if method accelerate is called a second time. */ @Test @@ -98,7 +102,7 @@ class CarTest { //position shouldn't be changed because velocity should be 0. car.move(); - CheckNextPosition(DEFAULT_X, DEFAULT_Y); + checkNextPosition(DEFAULT_X, DEFAULT_Y); for (PositionVector.Direction direction1 : directions) { @@ -106,29 +110,41 @@ class CarTest { setUp(); //variables to save the actual expected result of method nextPosition - int ExpectedNextPosX = DEFAULT_X; - int ExpectedNextPosY = DEFAULT_Y; + int expectedNextPosX = DEFAULT_X; + int expectedNextPosY = DEFAULT_Y; + + //variables to save the acutal expected result of method getVelocity + int expectedVelocityX = 0; + int expectedVelocityY = 0; car.accelerate(direction1); - ExpectedNextPosX += direction1.vector.getX(); - ExpectedNextPosY += direction1.vector.getY(); - CheckNextPosition(ExpectedNextPosX, ExpectedNextPosY); + expectedVelocityX += direction1.vector.getX(); + expectedVelocityY += direction1.vector.getY(); + expectedNextPosX += direction1.vector.getX(); + expectedNextPosY += direction1.vector.getY(); + checkVelocity(expectedVelocityX, expectedVelocityY); + checkNextPosition(expectedNextPosX, expectedNextPosY); car.move(); - ExpectedNextPosX += direction1.vector.getX(); - ExpectedNextPosY += direction1.vector.getY(); - CheckNextPosition(ExpectedNextPosX, ExpectedNextPosY); + expectedNextPosX += direction1.vector.getX(); + expectedNextPosY += direction1.vector.getY(); + checkVelocity(expectedVelocityX, expectedVelocityY); + checkNextPosition(expectedNextPosX, expectedNextPosY); for (PositionVector.Direction direction2 : directions) { car.accelerate(direction2); - ExpectedNextPosX += direction2.vector.getX(); - ExpectedNextPosY += direction2.vector.getY(); - CheckNextPosition(ExpectedNextPosX, ExpectedNextPosY); + expectedVelocityX += direction2.vector.getX(); + expectedVelocityY += direction2.vector.getY(); + expectedNextPosX += direction2.vector.getX(); + expectedNextPosY += direction2.vector.getY(); + checkVelocity(expectedVelocityX, expectedVelocityY); + checkNextPosition(expectedNextPosX, expectedNextPosY); car.move(); - ExpectedNextPosX += (direction1.vector.getX() + direction2.vector.getX()); - ExpectedNextPosY += (direction1.vector.getY() + direction2.vector.getY()); - CheckNextPosition(ExpectedNextPosX, ExpectedNextPosY); + checkVelocity(expectedVelocityX, expectedVelocityY); + expectedNextPosX += (direction1.vector.getX() + direction2.vector.getX()); + expectedNextPosY += (direction1.vector.getY() + direction2.vector.getY()); + checkNextPosition(expectedNextPosX, expectedNextPosY); } } } From 19b227c59fccb2b65816a3eebfbeda0c82d0b0d4 Mon Sep 17 00:00:00 2001 From: Leonardo Brandenberger Date: Thu, 10 Mar 2022 14:18:33 +0100 Subject: [PATCH 07/28] merged cartest branch into car branch --- src/test/java/ch/zhaw/pm2/racetrack/CarTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java b/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java index 472b356..87154a6 100644 --- a/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java +++ b/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java @@ -74,6 +74,7 @@ class CarTest { for (PositionVector positionVector : invalidPositions) { boolean exception = false; + setUp(); try { car.setPosition(positionVector); } catch (IllegalArgumentException e) { From a67a96d19de2cb4bf71227229d115ca32bc8a437 Mon Sep 17 00:00:00 2001 From: romanschenk37 <84532681+romanschenk37@users.noreply.github.com> Date: Thu, 10 Mar 2022 14:46:51 +0100 Subject: [PATCH 08/28] fix in CarTest.java --- .../java/ch/zhaw/pm2/racetrack/CarTest.java | 55 ++++++++++--------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java b/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java index 87154a6..89b1965 100644 --- a/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java +++ b/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java @@ -105,34 +105,37 @@ class CarTest { car.move(); checkNextPosition(DEFAULT_X, DEFAULT_Y); + + for (PositionVector.Direction direction1 : directions) { - - //create a new instance of Car with default coordinates and velocity 0. - setUp(); - - //variables to save the actual expected result of method nextPosition - int expectedNextPosX = DEFAULT_X; - int expectedNextPosY = DEFAULT_Y; - - //variables to save the acutal expected result of method getVelocity - int expectedVelocityX = 0; - int expectedVelocityY = 0; - - car.accelerate(direction1); - expectedVelocityX += direction1.vector.getX(); - expectedVelocityY += direction1.vector.getY(); - expectedNextPosX += direction1.vector.getX(); - expectedNextPosY += direction1.vector.getY(); - checkVelocity(expectedVelocityX, expectedVelocityY); - checkNextPosition(expectedNextPosX, expectedNextPosY); - - car.move(); - expectedNextPosX += direction1.vector.getX(); - expectedNextPosY += direction1.vector.getY(); - checkVelocity(expectedVelocityX, expectedVelocityY); - checkNextPosition(expectedNextPosX, expectedNextPosY); - for (PositionVector.Direction direction2 : directions) { + + //create a new instance of Car with default coordinates and velocity 0. + setUp(); + + //variables to save the actual expected result of method nextPosition + int expectedNextPosX = DEFAULT_X; + int expectedNextPosY = DEFAULT_Y; + + //variables to save the acutal expected result of method getVelocity + int expectedVelocityX = 0; + int expectedVelocityY = 0; + + car.accelerate(direction1); + expectedVelocityX += direction1.vector.getX(); + expectedVelocityY += direction1.vector.getY(); + expectedNextPosX += direction1.vector.getX(); + expectedNextPosY += direction1.vector.getY(); + checkVelocity(expectedVelocityX, expectedVelocityY); + checkNextPosition(expectedNextPosX, expectedNextPosY); + + car.move(); + expectedNextPosX += direction1.vector.getX(); + expectedNextPosY += direction1.vector.getY(); + checkVelocity(expectedVelocityX, expectedVelocityY); + checkNextPosition(expectedNextPosX, expectedNextPosY); + + car.accelerate(direction2); expectedVelocityX += direction2.vector.getX(); expectedVelocityY += direction2.vector.getY(); From 0fafa3e0e70027501ba1e7acf2c4d3de96a26d3f Mon Sep 17 00:00:00 2001 From: Leonardo Brandenberger Date: Thu, 10 Mar 2022 15:17:04 +0100 Subject: [PATCH 09/28] finished both exceptions. --- .../ch/zhaw/pm2/racetrack/InvalidFileFormatException.java | 5 ++++- .../ch/zhaw/pm2/racetrack/InvalidTrackFormatException.java | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/ch/zhaw/pm2/racetrack/InvalidFileFormatException.java b/src/main/java/ch/zhaw/pm2/racetrack/InvalidFileFormatException.java index e7d0c07..c60ea91 100644 --- a/src/main/java/ch/zhaw/pm2/racetrack/InvalidFileFormatException.java +++ b/src/main/java/ch/zhaw/pm2/racetrack/InvalidFileFormatException.java @@ -1,5 +1,8 @@ package ch.zhaw.pm2.racetrack; public class InvalidFileFormatException extends Exception { - // TODO: implementation + + public InvalidFileFormatException(String errorMessage) { + super(errorMessage); + } } diff --git a/src/main/java/ch/zhaw/pm2/racetrack/InvalidTrackFormatException.java b/src/main/java/ch/zhaw/pm2/racetrack/InvalidTrackFormatException.java index 25de664..97b0310 100644 --- a/src/main/java/ch/zhaw/pm2/racetrack/InvalidTrackFormatException.java +++ b/src/main/java/ch/zhaw/pm2/racetrack/InvalidTrackFormatException.java @@ -1,5 +1,7 @@ package ch.zhaw.pm2.racetrack; public class InvalidTrackFormatException extends Exception { - // TODO: implementation + public InvalidTrackFormatException(String errorMessage) { + super(errorMessage); + } } From 6080b48b828748ba31112fb313d3286b470a8bff Mon Sep 17 00:00:00 2001 From: Leonardo Brandenberger Date: Thu, 10 Mar 2022 15:18:16 +0100 Subject: [PATCH 10/28] finished both exceptions. --- .../java/ch/zhaw/pm2/racetrack/InvalidFileFormatException.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/ch/zhaw/pm2/racetrack/InvalidFileFormatException.java b/src/main/java/ch/zhaw/pm2/racetrack/InvalidFileFormatException.java index c60ea91..91c59fa 100644 --- a/src/main/java/ch/zhaw/pm2/racetrack/InvalidFileFormatException.java +++ b/src/main/java/ch/zhaw/pm2/racetrack/InvalidFileFormatException.java @@ -1,7 +1,6 @@ package ch.zhaw.pm2.racetrack; public class InvalidFileFormatException extends Exception { - public InvalidFileFormatException(String errorMessage) { super(errorMessage); } From dca575999e4efe3335bff6aa91cb6b657f99b62a Mon Sep 17 00:00:00 2001 From: Leonardo Brandenberger Date: Thu, 10 Mar 2022 15:20:53 +0100 Subject: [PATCH 11/28] Added javadocs to exceptions. --- .../java/ch/zhaw/pm2/racetrack/InvalidFileFormatException.java | 3 +++ .../ch/zhaw/pm2/racetrack/InvalidTrackFormatException.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/main/java/ch/zhaw/pm2/racetrack/InvalidFileFormatException.java b/src/main/java/ch/zhaw/pm2/racetrack/InvalidFileFormatException.java index 91c59fa..6655e69 100644 --- a/src/main/java/ch/zhaw/pm2/racetrack/InvalidFileFormatException.java +++ b/src/main/java/ch/zhaw/pm2/racetrack/InvalidFileFormatException.java @@ -1,5 +1,8 @@ package ch.zhaw.pm2.racetrack; +/** + * Class for Exception when invalid Fileformat is used. + */ public class InvalidFileFormatException extends Exception { public InvalidFileFormatException(String errorMessage) { super(errorMessage); diff --git a/src/main/java/ch/zhaw/pm2/racetrack/InvalidTrackFormatException.java b/src/main/java/ch/zhaw/pm2/racetrack/InvalidTrackFormatException.java index 97b0310..3cdd04c 100644 --- a/src/main/java/ch/zhaw/pm2/racetrack/InvalidTrackFormatException.java +++ b/src/main/java/ch/zhaw/pm2/racetrack/InvalidTrackFormatException.java @@ -1,5 +1,8 @@ package ch.zhaw.pm2.racetrack; +/** + * Class for Exception when invalid track format is used. + */ public class InvalidTrackFormatException extends Exception { public InvalidTrackFormatException(String errorMessage) { super(errorMessage); From 882656196324cbaa3ca95ec641c7efb171a9cd3e Mon Sep 17 00:00:00 2001 From: Andrin Fassbind Date: Sat, 19 Mar 2022 13:20:19 +0100 Subject: [PATCH 12/28] GameTest startet ++ Game and Main clean up --- src/main/java/ch/zhaw/pm2/racetrack/Game.java | 81 +++++++++----- src/main/java/ch/zhaw/pm2/racetrack/Main.java | 2 +- .../java/ch/zhaw/pm2/racetrack/GameTest.java | 104 ++++++++++++++++++ 3 files changed, 158 insertions(+), 29 deletions(-) create mode 100644 src/test/java/ch/zhaw/pm2/racetrack/GameTest.java diff --git a/src/main/java/ch/zhaw/pm2/racetrack/Game.java b/src/main/java/ch/zhaw/pm2/racetrack/Game.java index 810ad78..413fef3 100644 --- a/src/main/java/ch/zhaw/pm2/racetrack/Game.java +++ b/src/main/java/ch/zhaw/pm2/racetrack/Game.java @@ -18,7 +18,7 @@ import static ch.zhaw.pm2.racetrack.PositionVector.Direction; public class Game implements GameSpecification { public static final int NO_WINNER = -1; private Track track; - int currentCarIndex; + private int currentCarIndex; UserInterface userInterface; @@ -27,7 +27,7 @@ public class Game implements GameSpecification { } - public boolean initPhase() throws InvalidTrackFormatException, FileNotFoundException { + public boolean initPhase() throws InvalidTrackFormatException { File folder = new File("tracks"); File[] listOfFiles = folder.listFiles(); if (listOfFiles.length > 0) { @@ -36,39 +36,37 @@ public class Game implements GameSpecification { tracks.add(file.getName()); } File selectedTrack = listOfFiles[userInterface.selectOption("Select Track file", tracks)]; - try { - track = new Track(selectedTrack); - } catch (FileNotFoundException | PositionVectorNotValid e) { - e.printStackTrace(); - } + selectTrack(selectedTrack); List moveStrategies = new ArrayList<>(); moveStrategies.add("Do not move Strategy"); moveStrategies.add("User Move Strategy"); moveStrategies.add("Move List Strategy"); moveStrategies.add("Path Follow Move Strategy"); for (int i = 0; i < track.getCarCount(); i++) { - while(track.getCar(i).getMoveStrategy() == null) { + Car car = track.getCar(i); + while (car.getMoveStrategy() == null) { int moveStrategie = userInterface.selectOption( "Select Strategy for Car " + i + " (" + track.getCarId(i) + ")", moveStrategies); switch (moveStrategie + 1) { case 1: - track.getCar(i).setMoveStrategy(new DoNotMoveStrategy()); + selectMoveStrategy(car, new DoNotMoveStrategy()); break; case 2: - track.getCar(i).setMoveStrategy(new UserMoveStrategy(userInterface, i, track.getCarId(i))); + selectMoveStrategy(car, new UserMoveStrategy(userInterface, i, track.getCarId(i))); break; case 3: String path = ".\\moves\\" + selectedTrack.getName().split("\\.")[0] + "-car-" + track.getCar(i).getID() + ".txt"; try { MoveStrategy moveStrategy = new MoveListStrategy(path); - track.getCar(i).setMoveStrategy(moveStrategy); + selectMoveStrategy(car, moveStrategy); } catch (FileNotFoundException e) { userInterface.printInformation("There is no MoveList implemented. Choose another Strategy!"); } //TODO: Backslash kompatibel für Linux break; case 4: - track.getCar(i).setMoveStrategy(new PathFollowerMoveStrategy()); //TODO: add Arguments + //TODO: add Arguments + selectMoveStrategy(car, new PathFollowerMoveStrategy()); break; } } @@ -80,6 +78,31 @@ public class Game implements GameSpecification { } } + /** + * The functionality was taken out of init to automate testing + * + * @param selectedTrack + */ + Track selectTrack(File selectedTrack) { + try { + track = new Track(selectedTrack); + return track; + } catch (FileNotFoundException | PositionVectorNotValid | InvalidTrackFormatException e) { + e.printStackTrace(); + } + return null; + } + + /** + * The functionality was taken out of init to automate testing + * + * @param car to set the MoveStrategy + * @param strategy The movestrategy to set + */ + void selectMoveStrategy(Car car, MoveStrategy strategy) { + car.setMoveStrategy(strategy); + } + /** * Return the index of the current active car. * Car indexes are zero-based, so the first car is 0, and the last car is getCarCount() - 1. @@ -115,6 +138,7 @@ public class Game implements GameSpecification { /** * Get the velocity of the specified car. + * * @param carIndex The zero-based carIndex number * @return A PositionVector containing the car's current velocity */ @@ -192,20 +216,21 @@ public class Game implements GameSpecification { } public String gamePhase() throws PositionVectorNotValid { - while (CarsMoving() && getWinner() == NO_WINNER) { + while (carsMoving() && getWinner() == NO_WINNER) { userInterface.printTrack(track); - Direction direction = null; - direction= track.getCar(currentCarIndex).getMoveStrategy().nextMove(); - if(direction == null) { + Direction direction; + direction = track.getCar(currentCarIndex).getMoveStrategy().nextMove(); + if (direction == null) { track.getCar(currentCarIndex).setMoveStrategy(new DoNotMoveStrategy()); - direction= track.getCar(currentCarIndex).getMoveStrategy().nextMove(); + direction = track.getCar(currentCarIndex).getMoveStrategy().nextMove(); //TODO: Entfernen? + }else { + doCarTurn(direction); } - doCarTurn(direction); switchToNextActiveCar(); } userInterface.printTrack(track); int indexWinner = getWinner(); - if(indexWinner == NO_WINNER){ + if (indexWinner == NO_WINNER) { return null; } return String.valueOf(track.getCar(indexWinner).getID()); @@ -302,8 +327,7 @@ public class Game implements GameSpecification { private void calculateWinner(PositionVector start, PositionVector finish, int carIndex) { List path = calculatePath(start, finish); for (PositionVector point : path) { - if (track.getSpaceType(point) != null) - { + if (track.getSpaceType(point) != null) { switch (track.getSpaceType(point)) { case FINISH_UP: if (start.getY() < finish.getY()) { @@ -333,15 +357,16 @@ public class Game implements GameSpecification { track.getCar(carIndex).increaseWinPoints(); } break; - } - } + + } } } /** * Does indicate if a car would have a crash with a WALL space or another car at the given position. + * * @param carIndex The zero-based carIndex number * @param position A PositionVector of the possible crash position * @return A boolean indicator if the car would crash with a WALL or another car. @@ -353,17 +378,17 @@ public class Game implements GameSpecification { public boolean onlyOneCarLeft() { int carsLeft = 0; - for(int carIndex = 0; carIndex < track.getCarCount(); carIndex ++) { - if(! track.getCar(carIndex).isCrashed()) { + for (int carIndex = 0; carIndex < track.getCarCount(); carIndex++) { + if (!track.getCar(carIndex).isCrashed()) { carsLeft++; } } return !(carsLeft > 1); } - public boolean CarsMoving() { - for(int carIndex = 0; carIndex < track.getCarCount(); carIndex ++) { - if(! (track.getCar(carIndex).isCrashed() || track.getCar(carIndex).getMoveStrategy().getClass() == DoNotMoveStrategy.class)) { + public boolean carsMoving() { + for (int carIndex = 0; carIndex < track.getCarCount(); carIndex++) { + if (!(track.getCar(carIndex).isCrashed() || track.getCar(carIndex).getMoveStrategy().getClass() == DoNotMoveStrategy.class)) { return true; } } diff --git a/src/main/java/ch/zhaw/pm2/racetrack/Main.java b/src/main/java/ch/zhaw/pm2/racetrack/Main.java index 4013616..aec65bd 100644 --- a/src/main/java/ch/zhaw/pm2/racetrack/Main.java +++ b/src/main/java/ch/zhaw/pm2/racetrack/Main.java @@ -6,7 +6,7 @@ import java.util.List; public class Main { - public static void main(String[] args) throws InvalidTrackFormatException, FileNotFoundException, PositionVectorNotValid { + public static void main(String[] args) throws InvalidTrackFormatException, PositionVectorNotValid { UserInterface userInterface = new UserInterface("Hello and Welcome to Racetrack by Team02-\"AngryNerds\""); while (true) { Game game = new Game(userInterface); diff --git a/src/test/java/ch/zhaw/pm2/racetrack/GameTest.java b/src/test/java/ch/zhaw/pm2/racetrack/GameTest.java new file mode 100644 index 0000000..03cb0f3 --- /dev/null +++ b/src/test/java/ch/zhaw/pm2/racetrack/GameTest.java @@ -0,0 +1,104 @@ +package ch.zhaw.pm2.racetrack; + +import ch.zhaw.pm2.racetrack.strategy.UserMoveStrategy; +import org.junit.jupiter.api.*; + +import java.io.File; + +import static ch.zhaw.pm2.racetrack.Game.NO_WINNER; + +class GameTest { + private UserInterface userInterface; + private Game game; + private Track track; + + @Nested + @DisplayName("Test correct Setup") + class Setup { + @BeforeEach + void setup() { + userInterface = new UserInterface("Test"); + game = new Game(userInterface); + track = game.selectTrack(new File(".\\tracks\\challenge.txt")); + game.selectMoveStrategy(track.getCar(0),new UserMoveStrategy(new UserInterface("Testing"),0, track.getCarId(0))); + game.selectMoveStrategy(track.getCar(1),new UserMoveStrategy(new UserInterface("Testing"),1, track.getCarId(1))); + + } + + + @Test + void getCurrentCarIndex() { + Assertions.assertEquals(0,game.getCurrentCarIndex()); + game.switchToNextActiveCar(); + Assertions.assertEquals(1,game.getCurrentCarIndex()); + } + + @Test + void getCarId() { + Assertions.assertEquals('a',game.getCarId(0)); + Assertions.assertEquals('b',game.getCarId(1)); + } + + @Test + void getCarPosition() { + Assertions.assertEquals(new PositionVector(24,22),game.getCarPosition(0)); + Assertions.assertEquals(new PositionVector(24,24),game.getCarPosition(1)); + } + + @Test + void getCarVelocity() { + Assertions.assertEquals(new PositionVector(0,0),game.getCarVelocity(0)); + Assertions.assertEquals(new PositionVector(0,0),game.getCarVelocity(1)); + } + + @Test + void getWinner() { + Assertions.assertEquals(NO_WINNER,game.getWinner()); + } + + @Test + void onlyOneCarLeft() { + Assertions.assertFalse(game.onlyOneCarLeft()); + } + + @Test + void carsMoving() { + Assertions.assertTrue(game.carsMoving()); + } + } + + @Nested + @DisplayName("Basic manipulation") + class manipulation { + @BeforeEach + void setup() { + userInterface = new UserInterface("Test"); + game = new Game(userInterface); + track = game.selectTrack(new File(".\\tracks\\challenge.txt")); + game.selectMoveStrategy(track.getCar(0),new UserMoveStrategy(new UserInterface("Testing"),0, track.getCarId(0))); + game.selectMoveStrategy(track.getCar(1),new UserMoveStrategy(new UserInterface("Testing"),1, track.getCarId(1))); + + } + + @Test + void carTurnCorrect() { + try { + game.doCarTurn(PositionVector.Direction.RIGHT); + Assertions.assertEquals(new PositionVector(1,0),game.getCarVelocity(0)); + } catch (PositionVectorNotValid positionVectorNotValid) { + positionVectorNotValid.printStackTrace(); + } + } + + @Test + void carCrash() { + try { + game.doCarTurn(PositionVector.Direction.UP); + Assertions.assertTrue(game.onlyOneCarLeft()); + } catch (PositionVectorNotValid positionVectorNotValid) { + positionVectorNotValid.printStackTrace(); + } + } + + } +} From b467a795961b3b5262682c1be7532ed561136e26 Mon Sep 17 00:00:00 2001 From: Andrin Fassbind Date: Sun, 20 Mar 2022 13:44:54 +0100 Subject: [PATCH 13/28] Changed mainClass in build.gradle to Main --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 669126f..9b73dff 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ version = '2022.1' application { // Define the main class for the application. - mainClass = 'ch.zhaw.pm2.racetrack.ConsoleApp' + mainClass = 'ch.zhaw.pm2.racetrack.Main' } run { From eddf9d3daa0efcd6688795b962eeca0022b8358d Mon Sep 17 00:00:00 2001 From: romanschenk37 <84532681+romanschenk37@users.noreply.github.com> Date: Tue, 22 Mar 2022 18:20:23 +0100 Subject: [PATCH 14/28] implemented PathFollowerMoveStrategy.java --- follower/challenge_points.txt | 19 ++++ src/main/java/ch/zhaw/pm2/racetrack/Game.java | 24 +++-- .../racetrack/strategy/MoveListStrategy.java | 8 +- .../strategy/PathFollowerMoveStrategy.java | 93 ++++++++++++++++++- 4 files changed, 129 insertions(+), 15 deletions(-) create mode 100644 follower/challenge_points.txt diff --git a/follower/challenge_points.txt b/follower/challenge_points.txt new file mode 100644 index 0000000..d794046 --- /dev/null +++ b/follower/challenge_points.txt @@ -0,0 +1,19 @@ +(X:40, Y:22) +(X:43, Y:22) +(X:46, Y:21) +(X:48, Y:19) +(X:48, Y:17) +(X:46, Y:15) +(X:41, Y:13) +(X:41, Y:10) +(X:46, Y:9) +(X:49, Y:4) +(X:40, Y:2) +(X:30, Y:2) +(X:21, Y:3) +(X:16, Y:7) +(X:13, Y:10) +(X:14, Y:14) +(X:11, Y:19) +(X:13, Y:22) +(X:24, Y:22) diff --git a/src/main/java/ch/zhaw/pm2/racetrack/Game.java b/src/main/java/ch/zhaw/pm2/racetrack/Game.java index 413fef3..406cf40 100644 --- a/src/main/java/ch/zhaw/pm2/racetrack/Game.java +++ b/src/main/java/ch/zhaw/pm2/racetrack/Game.java @@ -44,32 +44,38 @@ public class Game implements GameSpecification { moveStrategies.add("Path Follow Move Strategy"); for (int i = 0; i < track.getCarCount(); i++) { Car car = track.getCar(i); - while (car.getMoveStrategy() == null) { + MoveStrategy moveStrategy = null; + while (moveStrategy == null) { + String filePath; int moveStrategie = userInterface.selectOption( "Select Strategy for Car " + i + " (" + track.getCarId(i) + ")", moveStrategies); switch (moveStrategie + 1) { case 1: - selectMoveStrategy(car, new DoNotMoveStrategy()); + moveStrategy = new DoNotMoveStrategy(); break; case 2: - selectMoveStrategy(car, new UserMoveStrategy(userInterface, i, track.getCarId(i))); + moveStrategy = new UserMoveStrategy(userInterface, i, track.getCarId(i)); break; case 3: - String path = ".\\moves\\" + selectedTrack.getName().split("\\.")[0] + "-car-" + track.getCar(i).getID() + ".txt"; + filePath = ".\\moves\\" + selectedTrack.getName().split("\\.")[0] + "-car-" + track.getCar(i).getID() + ".txt"; try { - MoveStrategy moveStrategy = new MoveListStrategy(path); - selectMoveStrategy(car, moveStrategy); + moveStrategy = new MoveListStrategy(filePath); } catch (FileNotFoundException e) { - userInterface.printInformation("There is no MoveList implemented. Choose another Strategy!"); + userInterface.printInformation("There is no Move-List implemented. Choose another Strategy!"); } //TODO: Backslash kompatibel für Linux break; case 4: - //TODO: add Arguments - selectMoveStrategy(car, new PathFollowerMoveStrategy()); + filePath = ".\\follower\\" + selectedTrack.getName().split("\\.")[0] + "_points.txt"; + try { + moveStrategy = new PathFollowerMoveStrategy(filePath, track.getCarPos(i)); + } catch (FileNotFoundException e) { + userInterface.printInformation("There is no Point-List implemented. Choose another Strategy!"); + } break; } } + selectMoveStrategy(car, moveStrategy); } return true; } else { diff --git a/src/main/java/ch/zhaw/pm2/racetrack/strategy/MoveListStrategy.java b/src/main/java/ch/zhaw/pm2/racetrack/strategy/MoveListStrategy.java index 7d1e68e..774b323 100644 --- a/src/main/java/ch/zhaw/pm2/racetrack/strategy/MoveListStrategy.java +++ b/src/main/java/ch/zhaw/pm2/racetrack/strategy/MoveListStrategy.java @@ -20,14 +20,14 @@ public class MoveListStrategy implements MoveStrategy { readFile(new File(path)); } - private void readFile(File trackFile) throws FileNotFoundException { + protected void readFile(File trackFile) throws FileNotFoundException { Scanner scanner = new Scanner(new FileInputStream(trackFile), "UTF-8"); Direction[] directions = Direction.values(); while (scanner.hasNextLine()) { String line = scanner.nextLine(); - for (Direction dir : directions) { - if (dir.toString().equals(line)) { - moveList.add(dir); + for (Direction direction : directions) { + if (direction.toString().equals(line)) { + moveList.add(direction); break; } } diff --git a/src/main/java/ch/zhaw/pm2/racetrack/strategy/PathFollowerMoveStrategy.java b/src/main/java/ch/zhaw/pm2/racetrack/strategy/PathFollowerMoveStrategy.java index 23ad51f..f85a0e9 100644 --- a/src/main/java/ch/zhaw/pm2/racetrack/strategy/PathFollowerMoveStrategy.java +++ b/src/main/java/ch/zhaw/pm2/racetrack/strategy/PathFollowerMoveStrategy.java @@ -1,15 +1,104 @@ package ch.zhaw.pm2.racetrack.strategy; +import ch.zhaw.pm2.racetrack.PositionVector; import ch.zhaw.pm2.racetrack.PositionVector.Direction; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.util.ArrayList; +import java.util.Scanner; + /** * The PathFollowerMoveStrategy class determines the next move based on a file containing points on a path. */ public class PathFollowerMoveStrategy implements MoveStrategy { + private PositionVector currentPosition; + private PositionVector currentVelocity; + private ArrayList pointList; + private int pointer; + + + public PathFollowerMoveStrategy(String path, PositionVector startPosition) throws FileNotFoundException { + pointList = new ArrayList<>(); + pointer = 0; + readFile(new File(path)); + currentPosition = startPosition; + currentVelocity = new PositionVector(0, 0); + } + + public void readFile(File trackFile) throws FileNotFoundException { + Scanner scanner = new Scanner(new FileInputStream(trackFile), "UTF-8"); + while (scanner.hasNextLine()) { + String line = scanner.nextLine(); + String[] coordinates = line.split("(\\(X:|, Y:|\\))"); + pointList.add(new PositionVector(Integer.parseInt(coordinates[1]), Integer.parseInt(coordinates[2]))); + } + } @Override public Direction nextMove() { - // TODO: implementation - throw new UnsupportedOperationException(); + if (pointer >= pointList.size()) { + return null; + } + int accelerationX = 0; + int accelerationY = 0; + if (pointList.get(pointer).equals(currentPosition)) { + pointer ++; + } + + + if(currentVelocity.getX() > 0){ + accelerationX = -1; + } else if(currentVelocity.getX() < 0) { + accelerationX = 1; + } + if(currentVelocity.getY() > 0){ + accelerationY = -1; + } else if(currentVelocity.getY() < 0) { + accelerationY = 1; + } + + + PositionVector movementVector = new PositionVector(pointList.get(pointer).getX() - currentPosition.getX(), pointList.get(pointer).getY() - currentPosition.getY()); + if(movementVector.getX() > 0 && movementVector.getX()/2.0 > currentVelocity.getX()) { + accelerationX = 1; + } + else if(movementVector.getX() > 0 && movementVector.getX()/2.0 <= currentVelocity.getX()) { + accelerationX = -1; + } + else if(movementVector.getX() < 0 && movementVector.getX()/2.0 < currentVelocity.getX()) { + accelerationX = -1; + } + else if(movementVector.getX() < 0 && movementVector.getX()/2.0 >= currentVelocity.getX()) { + accelerationX = 1; + } + + if(movementVector.getY() > 0 && movementVector.getY()/2.0 > currentVelocity.getY()) { + accelerationY = 1; + } + else if(movementVector.getY() > 0 && movementVector.getY()/2.0 <= currentVelocity.getY()) { + accelerationY = -1; + } + else if(movementVector.getY() < 0 && movementVector.getY()/2.0 < currentVelocity.getY()) { + accelerationY = -1; + } + else if(movementVector.getY() < 0 && movementVector.getY()/2.0 >= currentVelocity.getY()) { + accelerationY = 1; + } + + + currentVelocity = new PositionVector(currentVelocity.getX() + accelerationX, currentVelocity.getY() + accelerationY); + currentPosition = new PositionVector(currentPosition.getX() + currentVelocity.getX(), currentPosition.getY() + currentVelocity.getY()); + + PositionVector acceleration = new PositionVector(accelerationX, accelerationY); + Direction[] directions = Direction.values(); + for (Direction direction : directions) { + if (direction.vector.equals(acceleration)) { + return direction; + } + } + return null; + } } From c59e4a30d87bc869a95787a2835c0b6fa7c64149 Mon Sep 17 00:00:00 2001 From: romanschenk37 Date: Tue, 22 Mar 2022 18:31:15 +0100 Subject: [PATCH 15/28] Update MoveListStrategy.java --- .../java/ch/zhaw/pm2/racetrack/strategy/MoveListStrategy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ch/zhaw/pm2/racetrack/strategy/MoveListStrategy.java b/src/main/java/ch/zhaw/pm2/racetrack/strategy/MoveListStrategy.java index 774b323..3de3f23 100644 --- a/src/main/java/ch/zhaw/pm2/racetrack/strategy/MoveListStrategy.java +++ b/src/main/java/ch/zhaw/pm2/racetrack/strategy/MoveListStrategy.java @@ -20,7 +20,7 @@ public class MoveListStrategy implements MoveStrategy { readFile(new File(path)); } - protected void readFile(File trackFile) throws FileNotFoundException { + private void readFile(File trackFile) throws FileNotFoundException { Scanner scanner = new Scanner(new FileInputStream(trackFile), "UTF-8"); Direction[] directions = Direction.values(); while (scanner.hasNextLine()) { From 8877f1476f826cf5f4b11b6aefeeeb9b354b4524 Mon Sep 17 00:00:00 2001 From: Andrin Fassbind Date: Tue, 22 Mar 2022 18:47:14 +0100 Subject: [PATCH 16/28] GameTest --- .../java/ch/zhaw/pm2/racetrack/GameTest.java | 129 ++++++++++++++++-- 1 file changed, 114 insertions(+), 15 deletions(-) diff --git a/src/test/java/ch/zhaw/pm2/racetrack/GameTest.java b/src/test/java/ch/zhaw/pm2/racetrack/GameTest.java index 03cb0f3..ebfb473 100644 --- a/src/test/java/ch/zhaw/pm2/racetrack/GameTest.java +++ b/src/test/java/ch/zhaw/pm2/racetrack/GameTest.java @@ -1,11 +1,14 @@ package ch.zhaw.pm2.racetrack; import ch.zhaw.pm2.racetrack.strategy.UserMoveStrategy; +import org.junit.Before; import org.junit.jupiter.api.*; import java.io.File; +import java.util.List; import static ch.zhaw.pm2.racetrack.Game.NO_WINNER; +import static ch.zhaw.pm2.racetrack.PositionVector.Direction.*; class GameTest { private UserInterface userInterface; @@ -20,40 +23,40 @@ class GameTest { userInterface = new UserInterface("Test"); game = new Game(userInterface); track = game.selectTrack(new File(".\\tracks\\challenge.txt")); - game.selectMoveStrategy(track.getCar(0),new UserMoveStrategy(new UserInterface("Testing"),0, track.getCarId(0))); - game.selectMoveStrategy(track.getCar(1),new UserMoveStrategy(new UserInterface("Testing"),1, track.getCarId(1))); + game.selectMoveStrategy(track.getCar(0), new UserMoveStrategy(new UserInterface("Testing"), 0, track.getCarId(0))); + game.selectMoveStrategy(track.getCar(1), new UserMoveStrategy(new UserInterface("Testing"), 1, track.getCarId(1))); } @Test void getCurrentCarIndex() { - Assertions.assertEquals(0,game.getCurrentCarIndex()); + Assertions.assertEquals(0, game.getCurrentCarIndex()); game.switchToNextActiveCar(); - Assertions.assertEquals(1,game.getCurrentCarIndex()); + Assertions.assertEquals(1, game.getCurrentCarIndex()); } @Test void getCarId() { - Assertions.assertEquals('a',game.getCarId(0)); - Assertions.assertEquals('b',game.getCarId(1)); + Assertions.assertEquals('a', game.getCarId(0)); + Assertions.assertEquals('b', game.getCarId(1)); } @Test void getCarPosition() { - Assertions.assertEquals(new PositionVector(24,22),game.getCarPosition(0)); - Assertions.assertEquals(new PositionVector(24,24),game.getCarPosition(1)); + Assertions.assertEquals(new PositionVector(24, 22), game.getCarPosition(0)); + Assertions.assertEquals(new PositionVector(24, 24), game.getCarPosition(1)); } @Test void getCarVelocity() { - Assertions.assertEquals(new PositionVector(0,0),game.getCarVelocity(0)); - Assertions.assertEquals(new PositionVector(0,0),game.getCarVelocity(1)); + Assertions.assertEquals(new PositionVector(0, 0), game.getCarVelocity(0)); + Assertions.assertEquals(new PositionVector(0, 0), game.getCarVelocity(1)); } @Test void getWinner() { - Assertions.assertEquals(NO_WINNER,game.getWinner()); + Assertions.assertEquals(NO_WINNER, game.getWinner()); } @Test @@ -75,16 +78,16 @@ class GameTest { userInterface = new UserInterface("Test"); game = new Game(userInterface); track = game.selectTrack(new File(".\\tracks\\challenge.txt")); - game.selectMoveStrategy(track.getCar(0),new UserMoveStrategy(new UserInterface("Testing"),0, track.getCarId(0))); - game.selectMoveStrategy(track.getCar(1),new UserMoveStrategy(new UserInterface("Testing"),1, track.getCarId(1))); + game.selectMoveStrategy(track.getCar(0), new UserMoveStrategy(new UserInterface("Testing"), 0, track.getCarId(0))); + game.selectMoveStrategy(track.getCar(1), new UserMoveStrategy(new UserInterface("Testing"), 1, track.getCarId(1))); } @Test void carTurnCorrect() { try { - game.doCarTurn(PositionVector.Direction.RIGHT); - Assertions.assertEquals(new PositionVector(1,0),game.getCarVelocity(0)); + game.doCarTurn(RIGHT); + Assertions.assertEquals(new PositionVector(1, 0), game.getCarVelocity(0)); } catch (PositionVectorNotValid positionVectorNotValid) { positionVectorNotValid.printStackTrace(); } @@ -99,6 +102,102 @@ class GameTest { positionVectorNotValid.printStackTrace(); } } + } + + @Nested + @DisplayName("Playtrough") + class Play { + private Game game; + + @Test + void winner() { + game = new Game(new interFace("Test")); + try { + game.initPhase(); + Assertions.assertEquals('a',game.gamePhase()); + } catch (InvalidTrackFormatException | PositionVectorNotValid e) { + e.printStackTrace(); + } + } + + + + } + + private class interFace extends UserInterface { + + private static PositionVector.Direction[] directions = {RIGHT, + RIGHT, + RIGHT, + NONE, + NONE, + NONE, + NONE, + UP, + LEFT, + LEFT, + LEFT, + LEFT, + UP_LEFT, + NONE, + RIGHT, + RIGHT, + RIGHT, + NONE, + LEFT, + DOWN_LEFT, + DOWN_LEFT, + LEFT, + LEFT, + NONE, + RIGHT, + NONE, + DOWN, + DOWN, + RIGHT, + NONE, + RIGHT, + DOWN, + NONE, + UP_RIGHT, + RIGHT, + UP_RIGHT, + UP_RIGHT, + RIGHT, + RIGHT}; + + private static int pointer = -1; + + public interFace(String welcometxt) { + super(welcometxt); + } + + @Override + public int selectOption(String text, List options) { + if (text.equals("Select Track file")) { + return 1; + } else if (text.contains("Select Strategy for Car")) { + return 2; + } + return 0; + } + + public void printInformation(String text) { + } + + public void printTrack(Track track) { + } + + public void quit(String text) { + } + + public PositionVector.Direction selectDirection(int playingCarIndex, char playingCarID) { + pointer += 1; + if(pointer < directions.length) { + return directions[pointer]; + } + return NONE; + } } } From dc34d984f8212477bd53da9c532c41baea3f07ba Mon Sep 17 00:00:00 2001 From: Andrin Fassbind Date: Tue, 22 Mar 2022 19:04:26 +0100 Subject: [PATCH 17/28] -CarTest added winpoint test -added Klassendiagramm -create Constructor InvalidTrackFormatException --- Klassendiagramm.drawio | 1 + .../InvalidTrackFormatException.java | 3 ++ .../java/ch/zhaw/pm2/racetrack/CarTest.java | 37 ++++++++++++++++++- 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 Klassendiagramm.drawio diff --git a/Klassendiagramm.drawio b/Klassendiagramm.drawio new file mode 100644 index 0000000..afde28c --- /dev/null +++ b/Klassendiagramm.drawio @@ -0,0 +1 @@ +7Vtbd6I6GP01PraLi7c+qr3MzOn0OGNPe16jRMgxEE+Itc6vny8QQExVaGVorWt1rZKPkED2zpedDTbsgf98w9Hc+84cTBuW4Tw37MuGZZnwB/9kZBVHOu1mHHA5cVSlLDAiv7AKGiq6IA4OcxUFY1SQeT44YUGAJyIXQ5yzZb7alNF8r3PkYi0wmiCqRx+JI7w42rU6WfwLJq6X9Gy2L+IzPkoqqycJPeSw5VrIvmrYA86YiI/85wGmcvCScXn8unqkt7P2zbcf4f/on/5f93cPZ3Fj12UuSR+B40C8uulfs+n1l4fmf//Oh9c/lsZNb/ztTF1iPCG6UOM1xDxkgXpisUqGMVwSn6IASv0pC8RInYFB6CNK3ACOJ3B3mEPgCXNBAIGeOiHYHKITj1DnFq3YQj5DKNBklpT6HuPkFzSLKJwyIQCnuVBkstq5GiN5JYQNiHIcQp1hMjBmGrpFoVB1JoxSNA/JOLphWcVH3CVBnwnB/KQhtggc7KhSinRUEJzNUu7I6wvCoWCTo4Gf18io4LnBzMeCr6CKOttVaKiZ1lLFZUZbs61i3jpl7a6aLmqquGnLaWc/YWqhwIUhSHuz7Hx3ZrNgf4BHrjtEAfYACdyXgxiukxAO1h40C0XULEFTU6PpHfKxRlIYZ7FGSIqnYisdwzmakMC9jepcNrPIT/WkMsTg2imNqOARx8FBRBWBBIrZJPkxZyQQ0VC0+vAHAzYwzluNFtzQAMpmVoY/WZ2LAQuAVYhE9MFA1SWWdH2BWDsn7X5irfKIlUV2nUg5SMviZ+lpxmOBJOPdwh9D0jg2JHfkE0/4VB1WhXfLqhlvW8P7ykdEXtZzHMjQ4QnwgwLe6dYMeFMDXEOYkkg9qNEwX1xZ98DvA5CyuQTve0mHyzNT44Stc8J+AX+KxpgOWUgEYbJ9Htfd4EVdWds0msVQ3bH8vwnUlp61F3zioVAmbhBdMxje6OgI53NloJp15+a2hupILBz5mAU1v3HS/JVpfrtbreg37Vf2V4Po72wn6rHKxoJZp12YZe9lA9DVsOzB3UvrxjK+w0pydEgeVA+Wxrv2DcDFSQ8eHNSiIr8qOWjqZuFXSPzGFaARrbSWcc9kOeBMtnZkM3pdAjWrwrhbd6I2davtBssVd4R9EiAuAb9HM6w7xB8d36ogrV/xJzewKxvjwOnJty1QGlMmxXYfQkqNm0ZcvCY0Wbn2yOX88ocdFydTB9MxW15lgX4UgBMJU0qL7ZDBrhTvhwy2Fy4usJmTd7sT2JeA5JgiQZ7yL512aPOhJG6myy0jr8stw843ET+kumr9LU/ZhuJR0Bo6mFOvW39DzqY4DJku108bzOo3mLb5yh1fx9hL4hc2mHazQHed97HBNHXXcoQoUhn3E65t6eT9OBtLUzcpNfQ++06jPKxF94+VbTV0k/JTKZYEsXctWTYXls4rJcvmCmV1Nu6lasmiG43b3lKeBEv1gqW1oSAKf5Zi7lhjtguWVivf3bv+DEa3UUeCY6y/uvksgqVTmF3vRrDo1uiAiOOTnAc1wMvjXLsDnnw1mpurkB1OQB8W6No/fbF0xxSEvVzELWPAnBPgBwa88Gcx1SGu+6kDGBNxhMZB3VjbrxRjh8Na9zM1kD+9v1Ae11ZBGVaVwWDp1t8DQOQc4wJdHYrt2jOx7v79vRDzhXQXevJV5a2cBydECyN6UXu+Lef8sXk01uW8vdQWNOt3+tTY7jX6Eiz3On0KZ0mlnIuibuiNpp+98b2ieWHlmyhq+m26PFpDW0w/raGzzRdOG+2w6TTElfiGlu4bGufnCfAZXSMvbi0R7Ek7Y+XIxWt4H01mbsTfAaOMw/mAZf6jMrut4jkhmV/q55bqthrpjxyL+3Rnb2RUQsw/BpdunhXHKtFPHxWsw8z+5JPcPw6d7plReAq5wKOt3ueaHN9EVVfBRQz8VKPvxrqUif5GYmgE2MaV4uvExWGYknyevmHiv4UrUMx+bB1Xz36ybl/9Bg== \ No newline at end of file diff --git a/src/main/java/ch/zhaw/pm2/racetrack/InvalidTrackFormatException.java b/src/main/java/ch/zhaw/pm2/racetrack/InvalidTrackFormatException.java index 3cdd04c..fa24c25 100644 --- a/src/main/java/ch/zhaw/pm2/racetrack/InvalidTrackFormatException.java +++ b/src/main/java/ch/zhaw/pm2/racetrack/InvalidTrackFormatException.java @@ -7,4 +7,7 @@ public class InvalidTrackFormatException extends Exception { public InvalidTrackFormatException(String errorMessage) { super(errorMessage); } + public InvalidTrackFormatException() { + super(); + } } diff --git a/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java b/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java index 89b1965..6325c9b 100644 --- a/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java +++ b/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java @@ -2,9 +2,11 @@ package ch.zhaw.pm2.racetrack; import ch.zhaw.pm2.racetrack.strategy.*; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import java.io.FileNotFoundException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -176,7 +178,11 @@ class CarTest { car.setMoveStrategy(moveStrategy); assertEquals(moveStrategy, car.getMoveStrategy()); - moveStrategy = new MoveListStrategy(); + try { + moveStrategy = new MoveListStrategy(".\\moves\\challenge-car-a.txt"); + } catch (FileNotFoundException e) { + Assertions.fail(); + } car.setMoveStrategy(moveStrategy); assertEquals(moveStrategy, car.getMoveStrategy()); @@ -184,8 +190,35 @@ class CarTest { car.setMoveStrategy(moveStrategy); assertEquals(moveStrategy, car.getMoveStrategy()); - moveStrategy = new UserMoveStrategy(); + moveStrategy = new UserMoveStrategy(new UserInterface("Hello"),0,'a'); car.setMoveStrategy(moveStrategy); assertEquals(moveStrategy, car.getMoveStrategy()); } + + /** + * Test for get WinPoints + */ + @Test + void getWinPoints() { + assertEquals(0,car.getWinPoints()); + } + + /** + * Test for increase WinPoints + */ + @Test + void increaseWinPoints() { + car.increaseWinPoints(); + assertEquals(1,car.getWinPoints()); + } + + /** + * Test for deduct WinPoints + */ + @Test + void deductWinPoints() { + car.deductWinPoints(); + assertEquals(-1,car.getWinPoints()); + } + } From 45918124dfc3d8e0b2f234d0e5d6066df86a2291 Mon Sep 17 00:00:00 2001 From: romanschenk37 <84532681+romanschenk37@users.noreply.github.com> Date: Wed, 23 Mar 2022 08:48:46 +0100 Subject: [PATCH 18/28] refactoring and javadoc in PathFollowerMoveStrategy.javaa --- .../strategy/PathFollowerMoveStrategy.java | 96 ++++++++++++------- 1 file changed, 59 insertions(+), 37 deletions(-) diff --git a/src/main/java/ch/zhaw/pm2/racetrack/strategy/PathFollowerMoveStrategy.java b/src/main/java/ch/zhaw/pm2/racetrack/strategy/PathFollowerMoveStrategy.java index f85a0e9..74f55c0 100644 --- a/src/main/java/ch/zhaw/pm2/racetrack/strategy/PathFollowerMoveStrategy.java +++ b/src/main/java/ch/zhaw/pm2/racetrack/strategy/PathFollowerMoveStrategy.java @@ -13,12 +13,30 @@ import java.util.Scanner; * The PathFollowerMoveStrategy class determines the next move based on a file containing points on a path. */ public class PathFollowerMoveStrategy implements MoveStrategy { + + /** + * The current Position of the car. + */ private PositionVector currentPosition; + /** + * The current Velocity of the car. + */ private PositionVector currentVelocity; + /** + * List of all points on the path. + */ private ArrayList pointList; + /** + * The index of the next point on the path. + */ private int pointer; - + /** + * Constructer to create a new PathFollowerMoveStrategy for a car. + * @param path The location where the file is saved + * @param startPosition The start position of the car + * @throws FileNotFoundException If the file with the given path does not exist. + */ public PathFollowerMoveStrategy(String path, PositionVector startPosition) throws FileNotFoundException { pointList = new ArrayList<>(); pointer = 0; @@ -27,6 +45,11 @@ public class PathFollowerMoveStrategy implements MoveStrategy { currentVelocity = new PositionVector(0, 0); } + /** + * Method to read the given File and add the points to the pointList + * @param trackFile the File Object which should be read + * @throws FileNotFoundException If the file with the given path does not exist. + */ public void readFile(File trackFile) throws FileNotFoundException { Scanner scanner = new Scanner(new FileInputStream(trackFile), "UTF-8"); while (scanner.hasNextLine()) { @@ -36,61 +59,60 @@ public class PathFollowerMoveStrategy implements MoveStrategy { } } + /** + * Method to select the direction for the next move. + * @return The direction for the next move. null if there are no points left in the list. + */ @Override public Direction nextMove() { + // if no more points in the list --> return null if (pointer >= pointList.size()) { return null; } - int accelerationX = 0; - int accelerationY = 0; + + // increase pointer variable if the next point is reached. if (pointList.get(pointer).equals(currentPosition)) { pointer ++; } - - if(currentVelocity.getX() > 0){ - accelerationX = -1; - } else if(currentVelocity.getX() < 0) { - accelerationX = 1; - } - if(currentVelocity.getY() > 0){ - accelerationY = -1; - } else if(currentVelocity.getY() < 0) { - accelerationY = 1; - } - - + // calculate Vector from current Position to next Point PositionVector movementVector = new PositionVector(pointList.get(pointer).getX() - currentPosition.getX(), pointList.get(pointer).getY() - currentPosition.getY()); - if(movementVector.getX() > 0 && movementVector.getX()/2.0 > currentVelocity.getX()) { - accelerationX = 1; + + // select acceleration for X + int accelerationX; + if((movementVector.getX() == 0 && currentVelocity.getX() > 0) || //reduce velocity to 0 if the destination coordinate is reached + (movementVector.getX() > 0 && movementVector.getX()/2.0 <= currentVelocity.getX()) || //increase velocity + (movementVector.getX() < 0 && movementVector.getX()/2.0 < currentVelocity.getX())){ //reduce velocity + accelerationX = -1; + } else if((movementVector.getX() == 0 && currentVelocity.getX() < 0) || //reduce velocity to 0 if the destination coordinate is reached + (movementVector.getX() > 0 && movementVector.getX()/2.0 > currentVelocity.getX()) || //increase velocity + (movementVector.getX() < 0 && movementVector.getX()/2.0 >= currentVelocity.getX())) { //reduce velocity + accelerationX = 1; } - else if(movementVector.getX() > 0 && movementVector.getX()/2.0 <= currentVelocity.getX()) { - accelerationX = -1; - } - else if(movementVector.getX() < 0 && movementVector.getX()/2.0 < currentVelocity.getX()) { - accelerationX = -1; - } - else if(movementVector.getX() < 0 && movementVector.getX()/2.0 >= currentVelocity.getX()) { - accelerationX = 1; + else { //no acceleration + accelerationX = 0; } - if(movementVector.getY() > 0 && movementVector.getY()/2.0 > currentVelocity.getY()) { - accelerationY = 1; + // select acceleration for Y + int accelerationY; + if((movementVector.getY() == 0 && currentVelocity.getY() > 0) || //reduce velocity to 0 if the destination coordinate is reached + (movementVector.getY() > 0 && movementVector.getY()/2.0 <= currentVelocity.getY()) || //increase velocity + (movementVector.getY() < 0 && movementVector.getY()/2.0 < currentVelocity.getY())){ //reduce velocity + accelerationY = -1; + } else if((movementVector.getY() == 0 && currentVelocity.getY() < 0) || //reduce velocity to 0 if the destination coordinate is reached + (movementVector.getY() > 0 && movementVector.getY()/2.0 > currentVelocity.getY()) || //increase velocity + (movementVector.getY() < 0 && movementVector.getY()/2.0 >= currentVelocity.getY())) { //reduce velocity + accelerationY = 1; } - else if(movementVector.getY() > 0 && movementVector.getY()/2.0 <= currentVelocity.getY()) { - accelerationY = -1; - } - else if(movementVector.getY() < 0 && movementVector.getY()/2.0 < currentVelocity.getY()) { - accelerationY = -1; - } - else if(movementVector.getY() < 0 && movementVector.getY()/2.0 >= currentVelocity.getY()) { - accelerationY = 1; + else { //no acceleration + accelerationY = 0; } - + //update current Velocity and current Position with the selected acceleration currentVelocity = new PositionVector(currentVelocity.getX() + accelerationX, currentVelocity.getY() + accelerationY); currentPosition = new PositionVector(currentPosition.getX() + currentVelocity.getX(), currentPosition.getY() + currentVelocity.getY()); + //Find Direction for acceleration PositionVector acceleration = new PositionVector(accelerationX, accelerationY); Direction[] directions = Direction.values(); for (Direction direction : directions) { From b1a4f3b3dbe5c8244e36653055d40155d1dfae4f Mon Sep 17 00:00:00 2001 From: Andrin Fassbind Date: Wed, 23 Mar 2022 08:53:40 +0100 Subject: [PATCH 19/28] -CarTest added winpoint test -added Klassendiagramm -create Constructor InvalidTrackFormatException --- src/main/java/ch/zhaw/pm2/racetrack/Game.java | 2 +- .../java/ch/zhaw/pm2/racetrack/GameTest.java | 164 +++++++++++------- 2 files changed, 98 insertions(+), 68 deletions(-) diff --git a/src/main/java/ch/zhaw/pm2/racetrack/Game.java b/src/main/java/ch/zhaw/pm2/racetrack/Game.java index 413fef3..44bf317 100644 --- a/src/main/java/ch/zhaw/pm2/racetrack/Game.java +++ b/src/main/java/ch/zhaw/pm2/racetrack/Game.java @@ -222,7 +222,7 @@ public class Game implements GameSpecification { direction = track.getCar(currentCarIndex).getMoveStrategy().nextMove(); if (direction == null) { track.getCar(currentCarIndex).setMoveStrategy(new DoNotMoveStrategy()); - direction = track.getCar(currentCarIndex).getMoveStrategy().nextMove(); //TODO: Entfernen? + track.getCar(currentCarIndex).getMoveStrategy().nextMove(); }else { doCarTurn(direction); } diff --git a/src/test/java/ch/zhaw/pm2/racetrack/GameTest.java b/src/test/java/ch/zhaw/pm2/racetrack/GameTest.java index ebfb473..0c1dea3 100644 --- a/src/test/java/ch/zhaw/pm2/racetrack/GameTest.java +++ b/src/test/java/ch/zhaw/pm2/racetrack/GameTest.java @@ -1,39 +1,51 @@ package ch.zhaw.pm2.racetrack; import ch.zhaw.pm2.racetrack.strategy.UserMoveStrategy; -import org.junit.Before; -import org.junit.jupiter.api.*; - +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Assertions; import java.io.File; import java.util.List; - import static ch.zhaw.pm2.racetrack.Game.NO_WINNER; import static ch.zhaw.pm2.racetrack.PositionVector.Direction.*; + +/** + * Test for Class Game + */ class GameTest { private UserInterface userInterface; private Game game; private Track track; + private String TRACK_FILE_PATH = ".\\tracks\\challenge.txt"; + private int CAR_INDEX_ONE = 0; + private int CAR_INDEX_TWO = 1; + + /** + * This nested Class tests if the game gets initiatet correctly + */ @Nested @DisplayName("Test correct Setup") class Setup { + @BeforeEach void setup() { userInterface = new UserInterface("Test"); game = new Game(userInterface); - track = game.selectTrack(new File(".\\tracks\\challenge.txt")); - game.selectMoveStrategy(track.getCar(0), new UserMoveStrategy(new UserInterface("Testing"), 0, track.getCarId(0))); - game.selectMoveStrategy(track.getCar(1), new UserMoveStrategy(new UserInterface("Testing"), 1, track.getCarId(1))); + track = game.selectTrack(new File(TRACK_FILE_PATH)); + game.selectMoveStrategy(track.getCar(CAR_INDEX_ONE), new UserMoveStrategy(new UserInterface("Testing"), CAR_INDEX_ONE, track.getCarId(CAR_INDEX_ONE))); + game.selectMoveStrategy(track.getCar(CAR_INDEX_TWO), new UserMoveStrategy(new UserInterface("Testing"), CAR_INDEX_TWO, track.getCarId(CAR_INDEX_TWO))); } - @Test void getCurrentCarIndex() { - Assertions.assertEquals(0, game.getCurrentCarIndex()); + Assertions.assertEquals(CAR_INDEX_ONE, game.getCurrentCarIndex()); game.switchToNextActiveCar(); - Assertions.assertEquals(1, game.getCurrentCarIndex()); + Assertions.assertEquals(CAR_INDEX_TWO, game.getCurrentCarIndex()); } @Test @@ -70,16 +82,20 @@ class GameTest { } } + /** + * This nested Class makes basic manipulation after Game init. + */ @Nested @DisplayName("Basic manipulation") - class manipulation { + class Manipulation { + @BeforeEach void setup() { userInterface = new UserInterface("Test"); game = new Game(userInterface); - track = game.selectTrack(new File(".\\tracks\\challenge.txt")); - game.selectMoveStrategy(track.getCar(0), new UserMoveStrategy(new UserInterface("Testing"), 0, track.getCarId(0))); - game.selectMoveStrategy(track.getCar(1), new UserMoveStrategy(new UserInterface("Testing"), 1, track.getCarId(1))); + track = game.selectTrack(new File(TRACK_FILE_PATH)); + game.selectMoveStrategy(track.getCar(CAR_INDEX_ONE), new UserMoveStrategy(new UserInterface("Testing"), CAR_INDEX_ONE, track.getCarId(CAR_INDEX_ONE))); + game.selectMoveStrategy(track.getCar(CAR_INDEX_TWO), new UserMoveStrategy(new UserInterface("Testing"), CAR_INDEX_TWO, track.getCarId(CAR_INDEX_TWO))); } @@ -104,6 +120,9 @@ class GameTest { } } + /** + * This nested Class tests a Playtrough. And implements a UserInterface interagtion to pretend a real player + */ @Nested @DisplayName("Playtrough") class Play { @@ -111,75 +130,86 @@ class GameTest { @Test void winner() { - game = new Game(new interFace("Test")); + game = new Game(new interFace("Test",new Integer[]{0,2,1},new PositionVector.Direction[]{RIGHT, + RIGHT, + RIGHT, + NONE, + NONE, + NONE, + NONE, + UP, + LEFT, + LEFT, + LEFT, + LEFT, + UP_LEFT, + NONE, + RIGHT, + RIGHT, + RIGHT, + NONE, + LEFT, + DOWN_LEFT, + DOWN_LEFT, + LEFT, + LEFT, + NONE, + RIGHT, + NONE, + DOWN, + DOWN, + RIGHT, + NONE, + RIGHT, + DOWN, + NONE, + UP_RIGHT, + RIGHT, + UP_RIGHT, + UP_RIGHT, + RIGHT, + RIGHT})); try { game.initPhase(); - Assertions.assertEquals('a',game.gamePhase()); + Assertions.assertEquals("a",game.gamePhase()); } catch (InvalidTrackFormatException | PositionVectorNotValid e) { e.printStackTrace(); } } - + @Test + void crashA() { + game = new Game(new interFace("Test",new Integer[]{0,2,2},new PositionVector.Direction[]{UP})); + try { + game.initPhase(); + Assertions.assertEquals("b",game.gamePhase()); + } catch (InvalidTrackFormatException | PositionVectorNotValid e) { + e.printStackTrace(); + } + } } private class interFace extends UserInterface { - private static PositionVector.Direction[] directions = {RIGHT, - RIGHT, - RIGHT, - NONE, - NONE, - NONE, - NONE, - UP, - LEFT, - LEFT, - LEFT, - LEFT, - UP_LEFT, - NONE, - RIGHT, - RIGHT, - RIGHT, - NONE, - LEFT, - DOWN_LEFT, - DOWN_LEFT, - LEFT, - LEFT, - NONE, - RIGHT, - NONE, - DOWN, - DOWN, - RIGHT, - NONE, - RIGHT, - DOWN, - NONE, - UP_RIGHT, - RIGHT, - UP_RIGHT, - UP_RIGHT, - RIGHT, - RIGHT}; + private final PositionVector.Direction[] directions; + private final Integer[] instructions; + private int pointerDir,pointerInstruction; - private static int pointer = -1; - public interFace(String welcometxt) { + public interFace(String welcometxt, Integer[] instructions, PositionVector.Direction[] directions) { super(welcometxt); + pointerDir = -1; + pointerInstruction = -1; + this.instructions = instructions; + this.directions = directions; } @Override public int selectOption(String text, List options) { - if (text.equals("Select Track file")) { - return 1; - } else if (text.contains("Select Strategy for Car")) { - return 2; - } - return 0; + pointerInstruction++; + return instructions[pointerInstruction]; + } public void printInformation(String text) { @@ -192,9 +222,9 @@ class GameTest { } public PositionVector.Direction selectDirection(int playingCarIndex, char playingCarID) { - pointer += 1; - if(pointer < directions.length) { - return directions[pointer]; + pointerDir += 1; + if(pointerDir < directions.length) { + return directions[pointerDir]; } return NONE; } From 6ac4f644561fd61f7e18ee2d03b36bb59c1e519b Mon Sep 17 00:00:00 2001 From: romanschenk37 <84532681+romanschenk37@users.noreply.github.com> Date: Wed, 23 Mar 2022 08:55:32 +0100 Subject: [PATCH 20/28] Javadoc in PathFollowerMoveStrategy.java --- .../zhaw/pm2/racetrack/strategy/PathFollowerMoveStrategy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ch/zhaw/pm2/racetrack/strategy/PathFollowerMoveStrategy.java b/src/main/java/ch/zhaw/pm2/racetrack/strategy/PathFollowerMoveStrategy.java index 74f55c0..807ddc8 100644 --- a/src/main/java/ch/zhaw/pm2/racetrack/strategy/PathFollowerMoveStrategy.java +++ b/src/main/java/ch/zhaw/pm2/racetrack/strategy/PathFollowerMoveStrategy.java @@ -32,7 +32,7 @@ public class PathFollowerMoveStrategy implements MoveStrategy { private int pointer; /** - * Constructer to create a new PathFollowerMoveStrategy for a car. + * Constructor to create a new PathFollowerMoveStrategy for a car. * @param path The location where the file is saved * @param startPosition The start position of the car * @throws FileNotFoundException If the file with the given path does not exist. From 826f67d125320c326cfa7d11c65a682dcad0836e Mon Sep 17 00:00:00 2001 From: Andrin Fassbind Date: Wed, 23 Mar 2022 09:10:51 +0100 Subject: [PATCH 21/28] gamePhase() prevent null direction --- src/main/java/ch/zhaw/pm2/racetrack/Game.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/ch/zhaw/pm2/racetrack/Game.java b/src/main/java/ch/zhaw/pm2/racetrack/Game.java index 44bf317..fcfd270 100644 --- a/src/main/java/ch/zhaw/pm2/racetrack/Game.java +++ b/src/main/java/ch/zhaw/pm2/racetrack/Game.java @@ -222,10 +222,9 @@ public class Game implements GameSpecification { direction = track.getCar(currentCarIndex).getMoveStrategy().nextMove(); if (direction == null) { track.getCar(currentCarIndex).setMoveStrategy(new DoNotMoveStrategy()); - track.getCar(currentCarIndex).getMoveStrategy().nextMove(); - }else { - doCarTurn(direction); + direction = track.getCar(currentCarIndex).getMoveStrategy().nextMove(); } + doCarTurn(direction); switchToNextActiveCar(); } userInterface.printTrack(track); From ded9023ff1d3c008d2874f48d7de426790c6aeb6 Mon Sep 17 00:00:00 2001 From: romanschenk37 <84532681+romanschenk37@users.noreply.github.com> Date: Wed, 23 Mar 2022 11:24:58 +0100 Subject: [PATCH 22/28] adapted CarTest.java for PathFolowerMoveStrategy.java --- src/test/java/ch/zhaw/pm2/racetrack/CarTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java b/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java index 6325c9b..ebac56c 100644 --- a/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java +++ b/src/test/java/ch/zhaw/pm2/racetrack/CarTest.java @@ -186,7 +186,11 @@ class CarTest { car.setMoveStrategy(moveStrategy); assertEquals(moveStrategy, car.getMoveStrategy()); - moveStrategy = new PathFollowerMoveStrategy(); + try { + moveStrategy = new PathFollowerMoveStrategy(".\\follower\\challenge_points.txt", new PositionVector(0, 0)); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } car.setMoveStrategy(moveStrategy); assertEquals(moveStrategy, car.getMoveStrategy()); From a14327a2a7c40a2879a70b7f4951037fb97480ba Mon Sep 17 00:00:00 2001 From: Leonardo Brandenberger Date: Wed, 23 Mar 2022 21:07:44 +0100 Subject: [PATCH 23/28] started readme --- README.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/README.md b/README.md index 9156ddf..7219a8b 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,25 @@ # team02-AngryNerds-projekt1-racetrack PM2 Team 02 Projekt 1 Racetrack +Racetrack is a pen and paper game that dates back to the early 1960s in this version of the game, the game is digitalized and the math behind it is done automatically rather than calculated by hand and the winner gets informed automatically as well. + +The aim of the game is to finish the race faster than your opponent or win by being the only survivor in case the other cars crash. + +In order to not crash you have to keep in mind the acceleration and other players car to get to the finish line safely. + +#Initialization: +###The game can be initialized by the terminal command: + ./gradlew run +###You will then be prompted to select a track file from the selection by entering the corresponding number. +###For each car that is taking part in the race a strategy has to be chosen there are the following options: ++ ####Do not move Strategy +> This Strategy sets the car stationary and it won't make any moves during the game staying at the startpoint indefinitely. ++ User Move Strategy +> The player is prompted for each move to make a choice the different choices you are able to take are as followed: +> > 1=down-left
2=down
3=down-right
4=left
5=no acceleration
6=right
7=up-left
8=up
9=up-right
it is also possible to leave the game when it is your turn by entering 10 ++ Move List Strategy +> For this strategy a predefined list of moves have to be given, the list may contain all allowed moves like mentioned in User Move Strategy ++ Path Follow Move Strategy +> A list of point has to be given to the follow move strategy, the strategy will then calculate the route to cross each point in the given order. ++ Path Finder Strategy +> The pathfinder Strategy Calculates a route itself and follows it direction fully automatically. + From 1c63c0cb211e2cc11c4873ba1a2de4ac9e37d6f0 Mon Sep 17 00:00:00 2001 From: Leonardo Brandenberger Date: Wed, 23 Mar 2022 21:08:57 +0100 Subject: [PATCH 24/28] started readme --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7219a8b..6bfff28 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,10 @@ In order to not crash you have to keep in mind the acceleration and other player ###The game can be initialized by the terminal command: ./gradlew run ###You will then be prompted to select a track file from the selection by entering the corresponding number. + ###For each car that is taking part in the race a strategy has to be chosen there are the following options: -+ ####Do not move Strategy + ++ Do not move Strategy > This Strategy sets the car stationary and it won't make any moves during the game staying at the startpoint indefinitely. + User Move Strategy > The player is prompted for each move to make a choice the different choices you are able to take are as followed: From 7c87f4b2fd45bd796516f3decb091ee53f7a3a96 Mon Sep 17 00:00:00 2001 From: Leonardo Brandenberger Date: Wed, 23 Mar 2022 21:11:36 +0100 Subject: [PATCH 25/28] started readme --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6bfff28..4605561 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,12 @@ The aim of the game is to finish the race faster than your opponent or win by be In order to not crash you have to keep in mind the acceleration and other players car to get to the finish line safely. -#Initialization: -###The game can be initialized by the terminal command: +# Initialization: +### The game can be initialized by the terminal command: ./gradlew run -###You will then be prompted to select a track file from the selection by entering the corresponding number. +### You will then be prompted to select a track file from the selection by entering the corresponding number. -###For each car that is taking part in the race a strategy has to be chosen there are the following options: +### For each car that is taking part in the race a strategy has to be chosen there are the following options: + Do not move Strategy > This Strategy sets the car stationary and it won't make any moves during the game staying at the startpoint indefinitely. From 082d1414f5deb330ddf65ee887409b27ed9a66c9 Mon Sep 17 00:00:00 2001 From: Leonardo Brandenberger Date: Wed, 23 Mar 2022 21:19:37 +0100 Subject: [PATCH 26/28] started readme --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4605561..fd95499 100644 --- a/README.md +++ b/README.md @@ -7,11 +7,11 @@ The aim of the game is to finish the race faster than your opponent or win by be In order to not crash you have to keep in mind the acceleration and other players car to get to the finish line safely. # Initialization: -### The game can be initialized by the terminal command: +#### The game can be initialized by the terminal command: ./gradlew run -### You will then be prompted to select a track file from the selection by entering the corresponding number. +You will then be prompted to select a track file from the selection by entering the corresponding number. -### For each car that is taking part in the race a strategy has to be chosen there are the following options: +#### For each car that is taking part in the race a strategy has to be chosen there are the following options: + Do not move Strategy > This Strategy sets the car stationary and it won't make any moves during the game staying at the startpoint indefinitely. @@ -25,3 +25,5 @@ In order to not crash you have to keep in mind the acceleration and other player + Path Finder Strategy > The pathfinder Strategy Calculates a route itself and follows it direction fully automatically. +##Determining a winner +The winner gets determined automatically.
The car that first passes the finish line (doing a complete round) is given the win, if all car except one crash the surviving car will be crowned as the winner.
The game will inform you of this, and you will have the option to quit the game or play another match. From dc704cce4c0a0d53a132ea8a80b028a23ea1ea9d Mon Sep 17 00:00:00 2001 From: Leonardo Brandenberger Date: Wed, 23 Mar 2022 21:32:15 +0100 Subject: [PATCH 27/28] continued readme --- README.md | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fd95499..e3e5c8a 100644 --- a/README.md +++ b/README.md @@ -14,9 +14,9 @@ You will then be prompted to select a track file from the selection by entering #### For each car that is taking part in the race a strategy has to be chosen there are the following options: + Do not move Strategy -> This Strategy sets the car stationary and it won't make any moves during the game staying at the startpoint indefinitely. +> This Strategy sets the car stationary, and it won't make any moves during the game staying at the startpoint indefinitely. + User Move Strategy -> The player is prompted for each move to make a choice the different choices you are able to take are as followed: +> The player is prompted for each move to make a choice the different choices you are able to take are as following: > > 1=down-left
2=down
3=down-right
4=left
5=no acceleration
6=right
7=up-left
8=up
9=up-right
it is also possible to leave the game when it is your turn by entering 10 + Move List Strategy > For this strategy a predefined list of moves have to be given, the list may contain all allowed moves like mentioned in User Move Strategy @@ -25,5 +25,15 @@ You will then be prompted to select a track file from the selection by entering + Path Finder Strategy > The pathfinder Strategy Calculates a route itself and follows it direction fully automatically. -##Determining a winner +The shown Track can be interpreted as following:
+'#' is a Wall
+'>,<,^,v' are finish line components
+And every other character represents a car. + +### Determining a winner The winner gets determined automatically.
The car that first passes the finish line (doing a complete round) is given the win, if all car except one crash the surviving car will be crowned as the winner.
The game will inform you of this, and you will have the option to quit the game or play another match. + +## Branching Model +We choose a simple branching model where all starting features got a branch and where merged into the main branch, some branches who needed unfinished code to be completed where taken from the game branch but merged into the main at the end as well.
Since there was just one end product we abstained from using a development branch and merges where done straight into main. + +## Class Diagramm From fa4842e440a2f5d79a0e1d1ad619b01fd6083f15 Mon Sep 17 00:00:00 2001 From: romanschenk37 <84532681+romanschenk37@users.noreply.github.com> Date: Thu, 24 Mar 2022 13:32:12 +0100 Subject: [PATCH 28/28] refactoring of Method calculatePath from Game.java to Track.java --- src/main/java/ch/zhaw/pm2/racetrack/Game.java | 59 +------------------ .../java/ch/zhaw/pm2/racetrack/Track.java | 59 +++++++++++++++++++ 2 files changed, 62 insertions(+), 56 deletions(-) diff --git a/src/main/java/ch/zhaw/pm2/racetrack/Game.java b/src/main/java/ch/zhaw/pm2/racetrack/Game.java index d10ec86..265cd15 100644 --- a/src/main/java/ch/zhaw/pm2/racetrack/Game.java +++ b/src/main/java/ch/zhaw/pm2/racetrack/Game.java @@ -271,64 +271,11 @@ public class Game implements GameSpecification { */ @Override public List calculatePath(PositionVector startPosition, PositionVector endPosition) { - ArrayList pathList = new ArrayList<>(); - // Use Bresenham's algorithm to determine positions. - int x = startPosition.getX(); - int y = startPosition.getY(); - - // Relative Distance (x & y axis) between end- and starting position - int diffX = endPosition.getX() - startPosition.getX(); - int diffY = endPosition.getY() - startPosition.getY(); - - // Absolute distance (x & y axis) between end- and starting position - int distX = Math.abs(diffX); - int distY = Math.abs(diffY); - - // Direction of vector on x & y axis (-1: to left/down, 0: none, +1 : to right/up) - int dirX = Integer.signum(diffX); - int dirY = Integer.signum(diffY); - - // Determine which axis is the fast direction and set parallel/diagonal step values - int parallelStepX, parallelStepY; - int diagonalStepX, diagonalStepY; - int distanceSlowAxis, distanceFastAxis; - if (distX > distY) { - // x axis is the 'fast' direction - parallelStepX = dirX; - parallelStepY = 0; // parallel step only moves in x direction - diagonalStepX = dirX; - diagonalStepY = dirY; // diagonal step moves in both directions - distanceSlowAxis = distY; - distanceFastAxis = distX; - } else { - // y axis is the 'fast' direction - parallelStepX = 0; - parallelStepY = dirY; // parallel step only moves in y direction - diagonalStepX = dirX; - diagonalStepY = dirY; // diagonal step moves in both directions - distanceSlowAxis = distX; - distanceFastAxis = distY; - } - - int error = distanceFastAxis / 2; - for (int step = 0; step < distanceFastAxis; step++) { - error -= distanceSlowAxis; - if (error < 0) { - error += distanceFastAxis; // correct error value to be positive again - // step into slow direction; diagonal step - x += diagonalStepX; - y += diagonalStepY; - } else { - // step into fast direction; parallel step - x += parallelStepX; - y += parallelStepY; - } - - pathList.add(new PositionVector(x, y)); - } - return pathList; + return track.calculatePointsOnPath(startPosition, endPosition); } + + private void calculateWinner(PositionVector start, PositionVector finish, int carIndex) { List path = calculatePath(start, finish); for (PositionVector point : path) { diff --git a/src/main/java/ch/zhaw/pm2/racetrack/Track.java b/src/main/java/ch/zhaw/pm2/racetrack/Track.java index c83839e..e0a6ff4 100644 --- a/src/main/java/ch/zhaw/pm2/racetrack/Track.java +++ b/src/main/java/ch/zhaw/pm2/racetrack/Track.java @@ -355,6 +355,65 @@ public class Track implements TrackSpecification { return currentSpace.getValue(); } + public ArrayList calculatePointsOnPath(PositionVector startPosition, PositionVector endPosition) { + ArrayList pathList = new ArrayList<>(); + // Use Bresenham's algorithm to determine positions. + int x = startPosition.getX(); + int y = startPosition.getY(); + + // Relative Distance (x & y axis) between end- and starting position + int diffX = endPosition.getX() - startPosition.getX(); + int diffY = endPosition.getY() - startPosition.getY(); + + // Absolute distance (x & y axis) between end- and starting position + int distX = Math.abs(diffX); + int distY = Math.abs(diffY); + + // Direction of vector on x & y axis (-1: to left/down, 0: none, +1 : to right/up) + int dirX = Integer.signum(diffX); + int dirY = Integer.signum(diffY); + + // Determine which axis is the fast direction and set parallel/diagonal step values + int parallelStepX, parallelStepY; + int diagonalStepX, diagonalStepY; + int distanceSlowAxis, distanceFastAxis; + if (distX > distY) { + // x axis is the 'fast' direction + parallelStepX = dirX; + parallelStepY = 0; // parallel step only moves in x direction + diagonalStepX = dirX; + diagonalStepY = dirY; // diagonal step moves in both directions + distanceSlowAxis = distY; + distanceFastAxis = distX; + } else { + // y axis is the 'fast' direction + parallelStepX = 0; + parallelStepY = dirY; // parallel step only moves in y direction + diagonalStepX = dirX; + diagonalStepY = dirY; // diagonal step moves in both directions + distanceSlowAxis = distX; + distanceFastAxis = distY; + } + + int error = distanceFastAxis / 2; + for (int step = 0; step < distanceFastAxis; step++) { + error -= distanceSlowAxis; + if (error < 0) { + error += distanceFastAxis; // correct error value to be positive again + // step into slow direction; diagonal step + x += diagonalStepX; + y += diagonalStepY; + } else { + // step into fast direction; parallel step + x += parallelStepX; + y += parallelStepY; + } + + pathList.add(new PositionVector(x, y)); + } + return pathList; + } + /** * Return a String representation of the track, including the car locations. *