StephanRichter/Web4Rail
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

implemented handling of stuck trains during route search

Browse Source
This commit is contained in:
Stephan Richter
2021-03-14 16:15:14 +01:00
parent c4e57d2b8a
commit d86b6dcbcc
6 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/de/srsoftware/web4rail/threads/RouteManager.java
View File

@@ -14,6 +14,7 @@ import de.srsoftware.web4rail.Plan.Direction;
import de.srsoftware.web4rail.Route;
import de.srsoftware.web4rail.moving.Train;
import de.srsoftware.web4rail.tiles.Block;
import de.srsoftware.web4rail.tiles.Tile;
public class RouteManager extends BaseClass implements Runnable {
@@ -66,6 +67,13 @@ public class RouteManager extends BaseClass implements Runnable {
LOG.debug("{}→ Candidate {} would create loop, skipping",inset,routeCandidate.shortName());
continue;
}
HashSet<Tile> stuckTrace = train.stuckTrace(); // if train has been stopped in between two blocks lastly: only allow routes that do not conflict with current train position
if (isSet(stuckTrace) && !routeCandidate.path().containsAll(stuckTrace)) {
LOG.debug("Stuck train occupies tiles ({}) outside of {} – not allowed.",stuckTrace,routeCandidate);
continue;
}
if (!routeCandidate.allowed(context)) {
if (routeCandidate.endBlock() != destination) { // allowance may be overridden by destination
LOG.debug("{} not allowed for {}",routeCandidate,context);