arnekeller/kit-programmieren-ws1920-final1
1
0
Fork 0
mirror of https://gitlab.com/arnekeller/kit-programmieren-ws1920-final1.git synced 2024-11-08 18:00:38 +00:00
Code Issues Projects Releases Wiki Activity

Only place trains if all switches are set

Browse Source
This commit is contained in:
Arne Keller 2020-02-19 08:37:36 +01:00
parent 6e62cdb6e0
commit ba6a939a92
4 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fuzz1_input.txt
View File

@ -4,6 +4,7 @@ add track (0,15) -> (1,15)
add track (1,1) -> (1,14) add track (1,1) -> (1,14)
add switch (1,14) -> (0,14),(1,0) add switch (1,14) -> (0,14),(1,0)
set switch 5 positio (1,0) set switch 5 positio (1,0)
set switch 2 position (1,0)
create engine diesel T3 Emma 1 false true create engine diesel T3 Emma 1 false true
add train 1 T3-Emma add train 1 T3-Emma
create coach passenger 1906 true true create coach passenger 1906 true true
@ -13,6 +14,8 @@ add train 1 W1
add train 1 W2 add train 1 W2
add train 1 W3 add train 1 W3
put train 1 at (0,0) in direction 0,-1 put train 1 at (0,0) in direction 0,-1
delete track 2
add switch (1,14) -> (0,14),(1,0)
step -20 step -20
step 20 step 20
set switch 5 position (0,14) set switch 5 position (0,14)

3
fuzz1_output.txt
View File

@ -4,6 +4,7 @@ Error, track is not connected to other tracks
Error, track is not connected to other tracks Error, track is not connected to other tracks
2 2
Error, invalid set switch argument syntax Error, invalid set switch argument syntax
OK
T3-Emma T3-Emma
diesel engine T3-Emma added to train 1 diesel engine T3-Emma added to train 1
1 1
@ -13,6 +14,8 @@ passenger coach W1 added to train 1
passenger coach W2 added to train 1 passenger coach W2 added to train 1
Error, could not add rolling stock to train Error, could not add rolling stock to train
Error, could not place train Error, could not place train
OK
2
Error, rail tracks/switches not set up Error, rail tracks/switches not set up
Error, rail tracks/switches not set up Error, rail tracks/switches not set up
Error, could not set switch Error, could not set switch

2
fuzz3_output.txt
View File

@ -9,4 +9,4 @@ diesel engine T3-Emma added to train 1
freight coach W1 added to train 1 freight coach W1 added to train 1
special coach W2 added to train 1 special coach W2 added to train 1
passenger coach W3 added to train 1 passenger coach W3 added to train 1
Error, could not place train Error, switches not set up

2
src/edu/kit/informatik/model/ModelRailwaySimulation.java
View File

@ -384,6 +384,8 @@ public class ModelRailwaySimulation {
throw new InvalidInputException("train is already placed"); throw new InvalidInputException("train is already placed");
} else if (direction.getX() != 0 && direction.getY() != 0) { } else if (direction.getX() != 0 && direction.getY() != 0) {
throw new InvalidInputException("invalid train direction"); throw new InvalidInputException("invalid train direction");
} else if (!railNetwork.isReadyForTrains()) {
throw new InvalidInputException("switches not set up");
} }
// attempt to place train // attempt to place train
boolean placed = train.placeOn(railNetwork, position, direction); boolean placed = train.placeOn(railNetwork, position, direction);