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

improved brake time learning, added time table to routes

Browse Source
This commit is contained in:
Stephan Richter
2020-11-28 16:46:34 +01:00
parent ba2be67f8f
commit df529aaba4
6 changed files with 60 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/de/srsoftware/web4rail/Route.java
View File

@@ -39,6 +39,7 @@ import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Form;
import de.srsoftware.web4rail.tags.Input;
import de.srsoftware.web4rail.tags.Label;
import de.srsoftware.web4rail.tags.Table;
import de.srsoftware.web4rail.tiles.Block;
import de.srsoftware.web4rail.tiles.Contact;
import de.srsoftware.web4rail.tiles.Shadow;
@@ -76,17 +77,23 @@ public class Route extends BaseClass implements Comparable<Route>{
private class BrakeProcessor extends Thread {
private int startSpeed;
private long timestamp;
private int timeStep;
private Integer timeStep;
private Route route;
private Train train;
private boolean aborted = false;
private String brakeId;
private static final int ENDSPEED = 5;
public BrakeProcessor(Route route, Train train, Integer timestep) {
startSpeed = train.speed;
this.timeStep = isNull(timestep) ? 100 : timestep;
this.route = route;
public BrakeProcessor(Route route, Train train) {
this.train = train;
this.route = route;
startSpeed = train.speed;
brakeId = train.brakeId();
timeStep = brakeTimes.get(brakeId);
// if no brake time is available for this train, use the fastest brake time already known for this route:
if (isNull(timeStep)) timeStep = route.brakeTimes.values().stream().min(Integer::compare).orElse(100);
start();
}
@@ -109,7 +116,7 @@ public class Route extends BaseClass implements Comparable<Route>{
newTimeStep = diff < 0 ? timeStep - absDiff : timeStep + absDiff;
if (newTimeStep != timeStep) {
route.brakeTimes.put(train.brakeId(),newTimeStep);
route.brakeTimes.put(brakeId,newTimeStep);
LOG.debug("Corrected brake timestep for {} @ {} from {} to {} ms.",train,route,timeStep,newTimeStep);
}
}
@@ -233,6 +240,19 @@ public class Route extends BaseClass implements Comparable<Route>{
}
}
private void addBraketimesTo(Window win) {
new Tag("h4").content(t("Brake time table")).addTo(win);
Table table = new Table();
table.addHead(t("Train"),t("Brake time¹, forward"),t("Brake time¹, reverse"));
for (Train t : Train.list()) {
Integer fTime = brakeTimes.get(t.brakeId());
Integer rTime = brakeTimes.get(t.brakeId(true));
table.addRow(t,isSet(fTime)? fTime+NBSP+"ms" : "–",isSet(rTime)? fTime+NBSP+"ms" : "–");
}
table.clazz("brake-times").addTo(win);
new Tag("p").content(t("1) Duration between 5 {} steps during brake process.",speedUnit)).addTo(win);
}
private void addConditionsTo(Window win) {
new Tag("h4").content(t("Conditions")).addTo(win);
if (!conditions.isEmpty()) {
@@ -365,8 +385,7 @@ public class Route extends BaseClass implements Comparable<Route>{
public void brakeStart() {
if (isNull(train)) return;
Integer brakeTime = brakeTimes.get(train.brakeId());
brakeProcessor = new BrakeProcessor(this,train,brakeTime);
brakeProcessor = new BrakeProcessor(this,train);
}
public void brakeStop() {
@@ -695,7 +714,7 @@ public class Route extends BaseClass implements Comparable<Route>{
addTurnoutsTo(win);
addConditionsTo(win);
addContactsTo(win);
addBraketimesTo(win);
return win;
}

2
src/main/java/de/srsoftware/web4rail/moving/Locomotive.java
View File

@@ -28,7 +28,7 @@ public class Locomotive extends Car implements Constants,Device{
private static final String REVERSE = "reverse";
public static final String LOCOMOTIVE = "locomotive";
private boolean reverse = false;
boolean reverse = false;
private Protocol proto = Protocol.DCC128;
private int address = 3;
private int speed = 0;

22
src/main/java/de/srsoftware/web4rail/moving/Train.java
View File

@@ -80,9 +80,7 @@ public class Train extends BaseClass implements Comparable<Train> {
private Block currentBlock,destination = null;
LinkedList<Tile> trace = new LinkedList<Tile>();
private String brakeId = null;
private class Autopilot extends Thread{
boolean stop = false;
int waitTime = 100;
@@ -197,7 +195,6 @@ public class Train extends BaseClass implements Comparable<Train> {
if (car instanceof Locomotive) {
locos.add((Locomotive) car);
} else cars.add(car);
brakeId = null;
car.train(this);
}
@@ -210,13 +207,15 @@ public class Train extends BaseClass implements Comparable<Train> {
}
public String brakeId() {
if (isNull(brakeId)) {
TreeSet<Integer> carIds = new TreeSet<Integer>();
locos.stream().map(loco -> loco.id()).forEach(carIds::add);
cars.stream().map(car -> car.id()).forEach(carIds::add);
brakeId = md5sum(carIds+":"+direction);
LOG.debug("generated new brake id for {}: {}",brakeId,this);
}
return brakeId(false);
}
public String brakeId(boolean reversed) {
TreeSet<String> carIds = new TreeSet<String>();
locos.stream().map(loco -> loco.id()+":"+(reversed != loco.reverse?"r":"f")).forEach(carIds::add);
cars.stream().map(car -> ""+car.id()).forEach(carIds::add);
String brakeId = md5sum(carIds);
LOG.debug("generated new brake id for {}: {}",this,brakeId);
return brakeId;
}
@@ -309,7 +308,6 @@ public class Train extends BaseClass implements Comparable<Train> {
locos.remove(loco);
loco.train(null);
}
brakeId = null;
return properties();
}