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

new feature: Train wait times for autopilot now randomly chosen from

Browse Source 
within range defined in block's settings
This commit is contained in:
Stephan Richter
2020-11-11 10:09:28 +01:00
parent 104da20eec
commit 9b6b1edce2
5 changed files with 58 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/de/srsoftware/web4rail/tiles/Block.java
View File

@@ -13,6 +13,7 @@ import org.json.JSONObject;
import de.srsoftware.tools.Tag;
import de.srsoftware.web4rail.Connector;
import de.srsoftware.web4rail.Plan.Direction;
import de.srsoftware.web4rail.Range;
import de.srsoftware.web4rail.Window;
import de.srsoftware.web4rail.moving.Train;
import de.srsoftware.web4rail.tags.Button;
@@ -33,8 +34,6 @@ public abstract class Block extends StretchableTile{
private static final String NO_TAG = "[default]";
private static final String NEW_TAG = "new_tag";
private static final String TAG = "tag";
private static final String MAX = "max";
private static final String MIN = "min";
private static final String WAIT_TIMES = "wait_times";
public String name = "Block";
@@ -50,28 +49,6 @@ public abstract class Block extends StretchableTile{
waitTimes.add(defaultWT);
}
/**
* class for min-max range
*/
public class Range{
public int min=0,max=10000;
public JSONObject json() {
return new JSONObject(Map.of(MIN,min,MAX,max));
}
public Range load(JSONObject json) {
min = json.getInt(MIN);
max = json.getInt(MAX);
return this;
}
@Override
public String toString() {
return min+"…"+max;
}
}
/**
* aggregates all (directional) wait times for one tag
*/
@@ -313,4 +290,13 @@ public abstract class Block extends StretchableTile{
}
return null;
}
public Range getWaitTime(Train train) {
for (WaitTime wt : waitTimes) {
if (train.tags().contains(wt.tag)) {
return wt.get(train.direction());
}
}
return getWaitTime(NO_TAG).get(train.direction());
}
}