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

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();
}