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

bugfix

Browse Source
This commit is contained in:
Stephan Richter
2020-12-27 20:20:10 +01:00
parent e042f7d1c1
commit 817bcc9989
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>de.srsoftware</groupId> <groupId>de.srsoftware</groupId>
<artifactId>web4rail</artifactId> <artifactId>web4rail</artifactId>
<version>1.2.60</version> <version>1.2.61</version>
<name>Web4Rail</name> <name>Web4Rail</name>
<packaging>jar</packaging> <packaging>jar</packaging>
<description>Java Model Railway Control</description> <description>Java Model Railway Control</description>

2
resources/logback.xml
View File

@@ -5,7 +5,7 @@
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{5} - %msg%n</pattern> <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{5} - %msg%n</pattern>
</encoder> </encoder>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter"> <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>INFO</level> <level>DEBUG</level>
</filter> </filter>
</appender> </appender>

2
src/main/java/de/srsoftware/web4rail/Range.java
View File

@@ -25,7 +25,7 @@ public class Range extends BaseClass{
} }
public int random() { public int random() {
if (max - min == 0) return max - min; if (max == min) return min;
return min + random.nextInt(max - min); return min + random.nextInt(max - min);
} }

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

@@ -52,6 +52,12 @@ public abstract class Block extends StretchableTile{
defaultWT.setMin(directionB(), 0); defaultWT.setMin(directionB(), 0);
defaultWT.setMax(directionB(), 10000); defaultWT.setMax(directionB(), 10000);
waitTimes.add(defaultWT); waitTimes.add(defaultWT);
WaitTime learningWt = new WaitTime(t("learn"));
learningWt.setMin(directionA(), 1000);
learningWt.setMax(directionA(), 1000);
learningWt.setMin(directionB(), 1000);
learningWt.setMax(directionB(), 1000);
waitTimes.add(learningWt);
} }
/** /**
@@ -115,8 +121,7 @@ public abstract class Block extends StretchableTile{
} }
public void validate() { public void validate() {
for (Entry<Direction, Range> entry: dirs.entrySet()) entry.getValue().validate(); for (Entry<Direction, Range> entry: dirs.entrySet()) entry.getValue().validate();
} }
} }