Implementierung des neuen Routen-Algorithmus weitgehend abgeschlossen.
Was noch fehlt ist der Brems-Prozessor; außerdem muss der neue Code getestet werden.
This commit is contained in:
@@ -29,7 +29,6 @@ public class PreserveRoute extends Action {
|
||||
LOG.debug("Not preserving route, as train needs to stop for {} ms at {}!",waitTime,endBlock);
|
||||
return false; // train is expected to wait in next block.
|
||||
}
|
||||
|
||||
return train.reserveRouteAfter(route);
|
||||
return isSet(route.getNextPreparedRoute()) || train.reserveRouteAfter(route);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,11 +29,7 @@ public class SetTurnout extends Action {
|
||||
if (isNull(turnout)) return false;
|
||||
if (!turnout.state(state).succeeded()) return false;
|
||||
if (turnout.address() == 0) return true;
|
||||
try {
|
||||
Thread.sleep(1000);
|
||||
} catch (InterruptedException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
sleep(1000);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user