ZHAW-IT21b_WIN
/
team02-AngryNerds-projekt1-racetrack
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' 

# Conflicts:
#	src/main/java/ch/zhaw/pm2/racetrack/InvalidFileFormatException.java
This commit is contained in:
Leonardo Brandenberger 2022-03-25 22:04:18 +01:00
parent 77922b71b8 d08ebc0187
commit 6560de8708
3 changed files with 47 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/ch/zhaw/pm2/racetrack/PositionVector.java
View File

@ -33,6 +33,7 @@ public final class PositionVector {
/**
* Adds two PositionVectors (e.g. car position and velocity vector or two velocity vectors).
*
* @param vectorA A position or velocity vector
* @param vectorB A position or velocity vector
* @return A new PositionVector holding the result of the addition. If both
@ -45,6 +46,7 @@ public final class PositionVector {
/**
* Subtracts two PositionVectors (e.g. car position and velocity vector or two velocity vectors).
*
* @param vectorA A position or velocity vector
* @param vectorB A position or velocity vector
* @return A new PositionVector holding the result of the addition. If both
@ -58,6 +60,7 @@ public final class PositionVector {
/**
* Calculates the scalar product (Skalarprodukt) of two 2D vectors. The scalar product
* multiplies the lengths of the parallel components of the vectors.
*
* @param vectorA A position or velocity vector
* @param vectorB A position or velocity vector
* @return The scalar product (vectorA * vectorB). Since vectorA and
@ -75,6 +78,7 @@ public final class PositionVector {
/**
* Copy constructor
*
* @param other
*/
public PositionVector(final PositionVector other) {
@ -109,6 +113,6 @@ public final class PositionVector {
@Override
public String toString() {
return "(X:" + this.x + ", Y:" + this.y + ")";
return "(X:" + this.x + ", Y:" + this.y + ")";
}
}

1
src/main/java/ch/zhaw/pm2/racetrack/strategy/DoNotMoveStrategy.java
View File

@ -11,6 +11,7 @@ public class DoNotMoveStrategy implements MoveStrategy {
/**
* This method will be used to return the next Direction for the car.
*
* @return a NONE Direction
*/
@Override

75
src/main/java/ch/zhaw/pm2/racetrack/strategy/PathFinderMoveStrategy.java
View File

@ -9,7 +9,7 @@ import java.util.List;
/**
* Strategy which calculates the path automatically
*/
public class PathFinderMoveStrategy implements MoveStrategy{
public class PathFinderMoveStrategy implements MoveStrategy {
private final Track track;
private final int carIndex;
private List<PositionVector.Direction> moveList;
@ -23,6 +23,7 @@ public class PathFinderMoveStrategy implements MoveStrategy{
/**
* Constructor which initialises the needed variables and creates the MoveList
*
* @param track track instance of the game
* @param carIndex index of the car which owns this moveStrategy
*/
@ -36,17 +37,17 @@ public class PathFinderMoveStrategy implements MoveStrategy{
/**
* Method to create a working moveList
*/
private void createMoveList(){
private void createMoveList() {
// if Movelist is recreated next move will be the first move in moveList
pointer = 0;
calculatedStates = new ArrayList<>();
PossibleMove finishedMove = null;
List<PossibleMove> possibleMoves= new ArrayList<>();
List<PossibleMove> possibleMoves = new ArrayList<>();
// create a PossibleMove object for each direction which doesn't end with a crash.
for(PositionVector.Direction direction : allDirections){
for (PositionVector.Direction direction : allDirections) {
PossibleMove newMove = new PossibleMove(null, direction);
if(! newMove.crashed()){
if (!newMove.crashed()) {
possibleMoves.add(newMove);
}
@ -54,22 +55,22 @@ public class PathFinderMoveStrategy implements MoveStrategy{
// while no PossibleMove crosses the finishline
// every PossibleMove will be accelerated in each direction to find a Move which finishes.
while(finishedMove == null){
while (finishedMove == null) {
List<PossibleMove> newMoves = new ArrayList<>();
for(PossibleMove previousMove : possibleMoves){
for(PositionVector.Direction direction : allDirections){
for (PossibleMove previousMove : possibleMoves) {
for (PositionVector.Direction direction : allDirections) {
PossibleMove newMove = new PossibleMove(previousMove, direction);
State newState = new State(newMove.endPosition, newMove.endVelocity);
//only use the new created Possible Move if it doesn't crash, end State isn't in List of calculatedStates
// and if there is no move found yet which is finished.
if(! (newMove.crashed() || alreadyCalculated(newState) || finishedMove != null)){
if(newMove.finished()){
finishedMove = newMove;
} else {
calculatedStates.add(newState);
newMoves.add(newMove);
}
//only use the new created Possible Move if it doesn't crash, end State isn't in List of calculatedStates
// and if there is no move found yet which is finished.
if (!(newMove.crashed() || alreadyCalculated(newState) || finishedMove != null)) {
if (newMove.finished()) {
finishedMove = newMove;
} else {
calculatedStates.add(newState);
newMoves.add(newMove);
}
}
}
}
possibleMoves = newMoves;
@ -82,12 +83,13 @@ public class PathFinderMoveStrategy implements MoveStrategy{
/**
* Method to check if a State is already in List calculatedStates
*
* @param state the State which should be checked
* @return true if it is in List, false if it isn't in List
*/
private boolean alreadyCalculated(State state){
for(State calculatedState: calculatedStates){
if(state.equals(calculatedState)){
private boolean alreadyCalculated(State state) {
for (State calculatedState : calculatedStates) {
if (state.equals(calculatedState)) {
return true;
}
}
@ -97,26 +99,28 @@ public class PathFinderMoveStrategy implements MoveStrategy{
/**
* Combination of position and velocity
*/
public static class State{
public static class State {
final PositionVector position;
final PositionVector velocity;
/**
* Constructor of State
*
* @param position the PositionVector object with coordinates of the Position
* @param velocity the PositionVector object with coordinates of the Velocity
*/
public State(PositionVector position, PositionVector velocity){
public State(PositionVector position, PositionVector velocity) {
this.position = position;
this.velocity = velocity;
}
/**
* Checks if a state has the same Position and the same Velocity
*
* @param compareState the State object to compare
* @return true if it is equal, false if it is not equal
*/
public boolean equals(State compareState){
public boolean equals(State compareState) {
return compareState.position.equals(position) && compareState.velocity.equals(velocity);
}
}
@ -136,21 +140,21 @@ public class PathFinderMoveStrategy implements MoveStrategy{
/**
* Constructor of PossibleMove
* @param previousMove The move which must be executed bevor this move can be executed
*
* @param previousMove The move which must be executed bevor this move can be executed
* @param nextDirection The direction of the move
*/
public PossibleMove(PossibleMove previousMove, PositionVector.Direction nextDirection){
public PossibleMove(PossibleMove previousMove, PositionVector.Direction nextDirection) {
// Velocity of the car bevor the move is executed
PositionVector startVelocity;
directions = new ArrayList<>();
// check if there was a previousMove.
if(previousMove != null){
if (previousMove != null) {
directions.addAll(previousMove.directions); //copy the LIst of Directions from the previousMove
startPosition = previousMove.endPosition; //use the endPosition from previousMove as startPosition
startVelocity = previousMove.endVelocity; //use the endVelocity from previousMove as startVelocity
}
else { //if there was no previousMove
} else { //if there was no previousMove
startPosition = track.getCarPos(carIndex); //use the current Position of the car from track as startPosition
startVelocity = track.getCar(carIndex).getVelocity(); //use the current Velocity of the car from track as startVelocity
}
@ -161,20 +165,22 @@ public class PathFinderMoveStrategy implements MoveStrategy{
/**
* check if the finishline is crossed (in correct direction) if this move is executed
*
* @return true if finishline will be crossed
*/
public boolean finished(){
public boolean finished() {
return track.calculateNewWinPoints(startPosition, endPosition) == 1;
}
/**
* checks if the car will crash or finishline will be crossed in wrong direction if this move is executed
*
* @return true if car will crash
*/
public boolean crashed() {
List<PositionVector> points = track.calculatePointsOnPath(startPosition, endPosition);
for(PositionVector point : points) {
if (track.willCrashAtPosition(carIndex, point)){
for (PositionVector point : points) {
if (track.willCrashAtPosition(carIndex, point)) {
return true;
}
}
@ -187,6 +193,7 @@ public class PathFinderMoveStrategy implements MoveStrategy{
/**
* Checks if the next Move in moveList will crash. If no crash next move in moveList will be executed.
* If crash the moveList will be recreated.
*
* @return the direction of acceleration which should be executed.
*/
@Override
@ -197,11 +204,11 @@ public class PathFinderMoveStrategy implements MoveStrategy{
PositionVector newVelocity = new PositionVector(currentVelocity.getX() + direction.vector.getX(), currentVelocity.getY() + direction.vector.getY());
PositionVector currentPosition = track.getCarPos(carIndex);
PositionVector newPosition = new PositionVector(currentPosition.getX() + newVelocity.getX(), currentPosition.getY() + newVelocity.getY());
for(PositionVector point : track.calculatePointsOnPath(currentPosition, newPosition)){
if(track.willCrashAtPosition(carIndex, point)){
for (PositionVector point : track.calculatePointsOnPath(currentPosition, newPosition)) {
if (track.willCrashAtPosition(carIndex, point)) {
createMoveList();
pointer = 0;
direction = moveList.get(pointer);
direction = moveList.get(pointer);
break;
}
}