lhq/FT546-WCS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(javaTest): align simulation time semantics

Browse Source
This commit is contained in:
zgw
2026-07-31 15:28:40 +08:00
parent c31153dc86
commit 8112e30691
5 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
javaTest/src/main/java/com/ft546/wcs/shadow/history/simulation/HistoricalDispatchSimulator.java
View File

@@ -100,7 +100,8 @@ public final class HistoricalDispatchSimulator {
events, traversedEdges);
verifyLedger(ledger, invariants);
boolean awaitingFutureArrival = active.isEmpty() && clearanceMoves.isEmpty()
boolean awaitingFutureArrival = queue.size() > 0
&& active.isEmpty() && clearanceMoves.isEmpty()
&& queue.readyAt(now).isEmpty();
if (watchdog.observe(terminal.size(),
businessProgress || clearanceProgress.moved || awaitingFutureArrival,
@@ -461,7 +462,7 @@ public final class HistoricalDispatchSimulator {
ResourceKey edge = ResourceKey.edge(from, to);
List<ResourceKey> resources = Arrays.asList(
ResourceKey.node(from), edge, ResourceKey.node(to));
Instant decisionTime = Instant.EPOCH.plusMillis(now + tick);
Instant decisionTime = Instant.EPOCH.plusMillis(now);
TrafficVehicleSnapshot frozen = new TrafficVehicleSnapshot(vehicleId,
Long.toString(vehicle.getBootId()), tick + 1, tick + 1,
decisionTime, from, to,

9
javaTest/src/main/java/com/ft546/wcs/shadow/history/simulation/SimulationClock.java
View File

@@ -27,15 +27,10 @@ public final class SimulationClock {
Collections.sort(ordered);
LinkedHashMap<LocalDateTime, Long> converted =
new LinkedHashMap<LocalDateTime, Long>();
long simulationMillis = 0L;
LocalDateTime previous = null;
LocalDateTime first = ordered.get(0);
for (LocalDateTime arrival : ordered) {
if (previous != null) {
long sourceGap = Duration.between(previous, arrival).toMillis();
simulationMillis += sourceGap / acceleration;
}
long simulationMillis = Duration.between(first, arrival).toMillis() / acceleration;
converted.put(arrival, simulationMillis);
previous = arrival;
}
this.arrivals = Collections.unmodifiableMap(converted);
}

13
javaTest/src/test/java/com/ft546/wcs/shadow/history/simulation/SimulationClockTest.java
View File

@@ -31,4 +31,17 @@ class SimulationClockTest {
assertThrows(IllegalArgumentException.class,
() -> new SimulationClock(Arrays.asList(base), 25));
}
@Test
void scalesFromTheFirstArrivalWithoutAccumulatingRoundingLoss() {
LocalDateTime base = LocalDateTime.of(2026, 3, 1, 10, 0);
LocalDateTime firstGap = base.plusNanos(99_000_000L);
LocalDateTime secondGap = base.plusNanos(198_000_000L);
SimulationClock clock = new SimulationClock(
Arrays.asList(base, firstGap, secondGap), 100);
assertEquals(0L, clock.toSimulationMillis(firstGap));
assertEquals(1L, clock.toSimulationMillis(secondGap));
}
}