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

working on new autopilot

Browse Source
This commit is contained in:
Stephan Richter
2021-03-12 12:46:18 +01:00
parent c6aa5e45da
commit a60e766dac
4 changed files with 51 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/de/srsoftware/web4rail/threads/BrakeProcessor.java
View File

@@ -33,27 +33,25 @@ public class BrakeProcessor extends BaseClass implements Runnable {
public void end() {
state = State.ENDED;
measuredDistance += train.speed * (BaseClass.timestamp() - lastTime);
LOG.debug("old brake time: {}, measured distance: {}",brakeTime,measuredDistance);
Route route = train.route();
if (isNull(route)) return;
LOG.debug("old brake time: {}, measured distance: {}", brakeTime, measuredDistance);
int step = brakeTime;
for (int i=0; i<10; i++) {
long calculatedDistance = calculate(brakeTime,startSpeed);
step/=2;
if (step<1) step = 1;
LOG.debug("new brake time: {}, calculated distance: {}",brakeTime,calculatedDistance);
if (measuredDistance < calculatedDistance) {
brakeTime -= step;
}
if (measuredDistance > calculatedDistance) {
brakeTime += step;
}
for (int i = 0; i < 15; i++) {
long calculatedDistance = calculate(brakeTime, startSpeed);
step /= 2;
if (step < 1) step = 1;
if (measuredDistance > calculatedDistance) brakeTime += step;
if (measuredDistance < calculatedDistance) brakeTime -= step;
LOG.debug("new brake time: {}, calculated distance: {}", brakeTime, calculatedDistance);
}
LOG.debug("new brake time: {}, calculated distance: {}",brakeTime,"");
route.brakeTime(train.brakeId(), brakeTime);
}
private static long calculate(int brakeTime, int speed) {
long dist = 0;
while (speed > defaultEndSpeed) {
dist += speed*brakeTime;
dist += speed * brakeTime;
speed -= 10;
}
return dist;