Skip to content

Commit

Permalink
stable sort to taskId, updated tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@s-fuerst
s-fuerst committed May 26, 2021
1 parent 653e58f commit 6c1a417
Show file tree
Hide file tree
Showing 16 changed files with 66,626 additions and 68,452 deletions.
6 changes: 4 additions & 2 deletions src/main/java/org/matsim/episim/InfectionEventHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -511,8 +511,10 @@ private void balanceContainersByLoad(List<Tuple<EpisimContainer<?>, Double>> est
Collections.sort(estimatedLoad, new Comparator<Tuple<EpisimContainer<?>, Double>>() {
@Override
public int compare(Tuple<EpisimContainer<?>, Double> t1, Tuple<EpisimContainer<?>, Double> t2) {
if (Math.abs(t1.getSecond() - t2.getSecond()) < 1.0e-9)
return 0;
if (Math.abs(t1.getSecond() - t2.getSecond()) < 1.0e-9) {
return t1.getFirst().getContainerId().toString().compareTo(
t2.getFirst().getContainerId().toString());
}
else if (t1.getSecond() < t2.getSecond())
return 1;
return -1;
Expand Down
196 changes: 98 additions & 98 deletions test/input/org/matsim/run/RunEpisimIntegrationTest/testBaseCase[it100]/infections.txt
View file

Large diffs are not rendered by default.

48,120 changes: 24,295 additions & 23,825 deletions test/input/org/matsim/run/RunEpisimIntegrationTest/testBaseCase[it10]/infectionEvents.txt
View file

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions test/input/org/matsim/run/RunEpisimIntegrationTest/testBaseCase[it10]/infections.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ time day date nSusceptible nInfectedButNotContagious nContagious nShowingSymptom
86400.0 1 1970-01-01 4697600 100 0 0 0 0 100 100 0 0 0 0 0 0 0 0 0 0 unknown
172800.0 2 1970-01-02 4697500 100 100 0 0 0 200 200 100 0 0 0 0 0 0 0 0 0 unknown
259200.0 3 1970-01-03 4697200 100 400 0 0 0 500 500 400 0 0 0 0 0 0 0 0 0 unknown
345600.0 4 1970-01-04 4695200 100 2400 0 0 0 2500 2500 2400 0 0 0 0 0 0 0 0 0 unknown
432000.0 5 1970-01-05 4685500 100 12000 100 0 0 12200 12200 12100 100 0 0 0 100 0 0 0 0 unknown
518400.0 6 1970-01-06 4642500 100 54900 200 0 0 55200 55200 55100 200 0 0 0 200 0 0 0 0 unknown
604800.0 7 1970-01-07 4456600 100 239500 1500 0 0 241100 241100 241000 1500 0 0 0 1500 0 0 0 0 unknown
691200.0 8 1970-01-08 3859200 100 827400 9500 100 0 837100 838500 838400 9600 100 0 1400 9600 0 0 0 0 unknown
777600.0 9 1970-01-09 2929200 100 1727900 35000 200 0 1763200 1768500 1768400 35200 200 0 5300 35200 0 0 0 0 unknown
864000.0 10 1970-01-10 2224900 100 2348600 109100 400 0 2458200 2472800 2472700 110100 400 0 14600 110100 0 0 0 0 unknown
345600.0 4 1970-01-04 4695100 100 2500 0 0 0 2600 2600 2500 0 0 0 0 0 0 0 0 0 unknown
432000.0 5 1970-01-05 4685900 100 11600 100 0 0 11800 11800 11700 100 0 0 0 100 0 0 0 0 unknown
518400.0 6 1970-01-06 4642500 100 54800 300 0 0 55200 55200 55100 300 0 0 0 300 0 0 0 0 unknown
604800.0 7 1970-01-07 4446600 100 249500 1500 0 0 251100 251100 251000 1500 0 0 0 1500 0 0 0 0 unknown
691200.0 8 1970-01-08 3831600 100 854800 9700 0 0 864600 866100 866000 9800 0 0 1500 9800 0 0 0 0 unknown
777600.0 9 1970-01-09 2889400 100 1763500 38500 100 0 1802200 1808300 1808200 39000 100 0 6100 38900 0 0 0 0 unknown
864000.0 10 1970-01-10 2189900 100 2368200 121900 200 0 2490400 2507800 2507700 122800 200 0 17400 122400 0 0 0 0 unknown
128 changes: 73 additions & 55 deletions ...input/org/matsim/run/RunEpisimIntegrationTest/testPlausibleShutdown[it100]/infections.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,58 +3,76 @@ time day date nSusceptible nInfectedButNotContagious nContagious nShowingSymptom
172800.0 2 2020-02-02 4697500 100 100 0 0 0 200 200 100 0 0 0 0 0 0 0 0 0 unknown
259200.0 3 2020-02-03 4697400 100 200 0 0 0 300 300 200 0 0 0 0 0 0 0 0 0 unknown
345600.0 4 2020-02-04 4697300 100 300 0 0 0 400 400 300 0 0 0 0 0 0 0 0 0 unknown
432000.0 5 2020-02-05 4697000 100 500 100 0 0 700 700 600 100 0 0 0 100 0 0 0 0 unknown
518400.0 6 2020-02-06 4696000 100 1500 100 0 0 1700 1700 1600 100 0 0 0 100 0 0 0 0 unknown
604800.0 7 2020-02-07 4695300 100 2100 200 0 0 2400 2400 2300 200 0 0 0 200 0 0 0 0 unknown
691200.0 8 2020-02-08 4695100 100 2300 200 0 0 2600 2600 2500 200 0 0 0 200 0 0 0 0 unknown
777600.0 9 2020-02-09 4695000 100 2300 200 0 0 2600 2700 2600 300 0 0 100 300 0 0 0 0 unknown
864000.0 10 2020-02-10 4694900 100 1900 300 0 0 2300 2800 2700 500 0 0 500 400 0 0 0 0 unknown
950400.0 11 2020-02-11 4694600 0 1900 400 0 0 2300 3100 3100 600 0 0 800 400 0 0 0 0 unknown
1036800.0 12 2020-02-12 4694100 0 1900 500 100 0 2500 3600 3600 800 100 0 1100 600 0 0 0 0 unknown
1123200.0 13 2020-02-13 4694000 0 1800 700 100 0 2600 3700 3700 1000 100 0 1100 800 0 0 0 0 unknown
1209600.0 14 2020-02-14 4694000 0 1500 700 100 0 2300 3700 3700 1200 100 0 1400 1000 0 0 0 0 unknown
1296000.0 15 2020-02-15 4693900 0 1500 700 0 0 2200 3800 3800 1300 100 0 1600 900 0 0 0 0 unknown
1382400.0 16 2020-02-16 4693900 0 1300 700 0 0 2000 3800 3800 1300 100 0 1800 700 0 0 0 0 unknown
1468800.0 17 2020-02-17 4693900 0 900 800 0 0 1700 3800 3800 1500 100 0 2100 900 0 0 0 0 unknown
1555200.0 18 2020-02-18 4693900 0 800 800 0 0 1600 3800 3800 1600 100 0 2200 900 0 0 0 0 unknown
1641600.0 19 2020-02-19 4693900 0 800 800 0 0 1600 3800 3800 1600 100 0 2200 800 0 0 0 0 unknown
1728000.0 20 2020-02-20 4693800 0 800 700 0 0 1500 3900 3900 1700 100 0 2400 900 0 0 0 0 unknown
1814400.0 21 2020-02-21 4693600 0 1000 700 0 0 1700 4100 4100 1700 100 0 2400 700 0 0 0 0 unknown
1900800.0 22 2020-02-22 4693600 0 800 700 0 0 1500 4100 4100 1700 100 0 2600 700 0 0 0 0 unknown
1987200.0 23 2020-02-23 4693600 0 600 800 0 0 1400 4100 4100 1800 100 0 2700 800 0 0 0 0 unknown
2073600.0 24 2020-02-24 4693600 0 600 800 0 0 1400 4100 4100 1800 100 0 2700 800 0 0 0 0 unknown
2160000.0 25 2020-02-25 4693600 0 500 500 100 0 1100 4100 4100 1900 200 0 3000 900 0 0 0 0 unknown
2246400.0 26 2020-02-26 4693600 0 400 600 100 0 1100 4100 4100 2000 200 0 3000 700 0 0 0 0 unknown
2332800.0 27 2020-02-27 4693600 0 400 600 100 0 1100 4100 4100 2000 200 0 3000 700 0 0 0 0 unknown
2419200.0 28 2020-02-28 4693600 0 400 500 100 0 1000 4100 4100 2000 200 0 3100 700 0 0 0 0 unknown
2505600.0 29 2020-02-29 4693600 0 300 600 100 0 1000 4100 4100 2100 200 0 3100 700 0 0 0 0 unknown
2592000.0 30 2020-03-01 4693600 0 300 300 100 0 700 4100 4100 2100 200 0 3400 700 0 0 0 0 unknown
2678400.0 31 2020-03-02 4693600 0 300 200 100 0 600 4100 4100 2100 200 0 3500 400 0 0 0 0 unknown
2764800.0 32 2020-03-03 4693600 0 300 100 100 0 500 4100 4100 2100 200 0 3600 300 0 0 0 0 unknown
2851200.0 33 2020-03-04 4693600 0 300 100 100 0 500 4100 4100 2100 200 0 3600 200 0 0 0 0 unknown
2937600.0 34 2020-03-05 4693600 0 300 100 100 0 500 4100 4100 2100 200 0 3600 200 0 0 0 0 unknown
3024000.0 35 2020-03-06 4693600 0 200 200 100 0 500 4100 4100 2200 200 0 3600 300 0 0 0 0 unknown
3110400.0 36 2020-03-07 4693600 0 200 200 100 0 500 4100 4100 2200 200 0 3600 300 0 0 0 0 unknown
3196800.0 37 2020-03-08 4693600 0 200 200 100 0 500 4100 4100 2200 200 0 3600 300 0 0 0 0 unknown
3283200.0 38 2020-03-09 4693600 0 200 200 100 0 500 4100 4100 2200 200 0 3600 300 0 0 0 0 unknown
3369600.0 39 2020-03-10 4693600 0 200 200 100 0 500 4100 4100 2200 200 0 3600 300 0 0 0 0 unknown
3456000.0 40 2020-03-11 4693600 0 200 200 0 0 400 4100 4100 2200 200 0 3700 300 0 0 0 0 unknown
3542400.0 41 2020-03-12 4693600 0 200 200 0 0 400 4100 4100 2200 200 0 3700 200 0 0 0 0 unknown
3628800.0 42 2020-03-13 4693600 0 200 200 0 0 400 4100 4100 2200 200 0 3700 200 0 0 0 0 unknown
3715200.0 43 2020-03-14 4693600 0 200 200 0 0 400 4100 4100 2200 200 0 3700 200 0 0 0 0 unknown
3801600.0 44 2020-03-15 4693600 0 200 200 0 0 400 4100 4100 2200 200 0 3700 200 0 0 0 0 unknown
3888000.0 45 2020-03-16 4693600 0 200 0 0 0 200 4100 4100 2200 200 0 3900 200 0 0 0 0 unknown
3974400.0 46 2020-03-17 4693600 0 200 0 0 0 200 4100 4100 2200 200 0 3900 0 0 0 0 0 unknown
4060800.0 47 2020-03-18 4693600 0 200 0 0 0 200 4100 4100 2200 200 0 3900 0 0 0 0 0 unknown
4147200.0 48 2020-03-19 4693600 0 200 0 0 0 200 4100 4100 2200 200 0 3900 0 0 0 0 0 unknown
4233600.0 49 2020-03-20 4693600 0 200 0 0 0 200 4100 4100 2200 200 0 3900 0 0 0 0 0 unknown
4320000.0 50 2020-03-21 4693600 0 100 100 0 0 200 4100 4100 2300 200 0 3900 100 0 0 0 0 unknown
4406400.0 51 2020-03-22 4693600 0 100 100 0 0 200 4100 4100 2300 200 0 3900 100 0 0 0 0 unknown
4492800.0 52 2020-03-23 4693600 0 0 100 0 0 100 4100 4100 2300 200 0 4000 100 0 0 0 0 unknown
4579200.0 53 2020-03-24 4693600 0 0 100 0 0 100 4100 4100 2300 200 0 4000 100 0 0 0 0 unknown
4665600.0 54 2020-03-25 4693600 0 0 100 0 0 100 4100 4100 2300 200 0 4000 100 0 0 0 0 unknown
4752000.0 55 2020-03-26 4693600 0 0 100 0 0 100 4100 4100 2300 200 0 4000 100 0 0 0 0 unknown
4838400.0 56 2020-03-27 4693600 0 0 100 0 0 100 4100 4100 2300 200 0 4000 100 0 0 0 0 unknown
4924800.0 57 2020-03-28 4693600 0 0 100 0 0 100 4100 4100 2300 200 0 4000 100 0 0 0 0 unknown
5011200.0 58 2020-03-29 4693600 0 0 0 0 0 0 4100 4100 2300 200 0 4100 100 0 0 0 0 unknown
5097600.0 59 2020-03-30 4693600 0 0 0 0 0 0 4100 4100 2300 200 0 4100 0 0 0 0 0 unknown
432000.0 5 2020-02-05 4696900 100 600 100 0 0 800 800 700 100 0 0 0 100 0 0 0 0 unknown
518400.0 6 2020-02-06 4695900 100 1600 100 0 0 1800 1800 1700 100 0 0 0 100 0 0 0 0 unknown
604800.0 7 2020-02-07 4694500 100 2900 200 0 0 3200 3200 3100 200 0 0 0 200 0 0 0 0 unknown
691200.0 8 2020-02-08 4693300 100 4100 100 100 0 4400 4400 4300 200 100 0 0 200 0 0 0 0 unknown
777600.0 9 2020-02-09 4691700 100 5600 100 100 0 5900 6000 5900 300 100 0 100 300 0 0 0 0 unknown
864000.0 10 2020-02-10 4690600 100 5700 700 100 0 6600 7100 7000 900 100 0 500 800 0 0 0 0 unknown
950400.0 11 2020-02-11 4690400 0 5300 1100 100 0 6500 7300 7300 1300 100 0 800 1200 0 0 0 0 unknown
1036800.0 12 2020-02-12 4690200 0 4500 1800 100 0 6400 7500 7500 2000 100 0 1100 1900 0 0 0 0 unknown
1123200.0 13 2020-02-13 4690100 0 4200 2000 200 0 6400 7600 7600 2300 200 0 1200 2200 0 0 0 0 unknown
1209600.0 14 2020-02-14 4690100 0 3600 2300 100 100 6100 7600 7600 2700 200 100 1500 2600 0 0 0 0 unknown
1296000.0 15 2020-02-15 4690100 0 3100 2800 100 100 6100 7600 7600 3200 200 100 1500 3000 0 0 0 0 unknown
1382400.0 16 2020-02-16 4690100 0 2500 2700 200 100 5500 7600 7600 3600 300 100 2100 3400 0 0 0 0 unknown
1468800.0 17 2020-02-17 4690100 0 2200 2700 200 100 5200 7600 7600 3800 300 100 2400 3200 0 0 0 0 unknown
1555200.0 18 2020-02-18 4690100 0 1800 3100 200 100 5200 7600 7600 4200 300 100 2400 3400 0 0 0 0 unknown
1641600.0 19 2020-02-19 4690100 0 1500 3000 200 100 4800 7600 7600 4400 400 100 2800 3600 0 0 0 0 unknown
1728000.0 20 2020-02-20 4690100 0 1400 2600 100 200 4300 7600 7600 4500 400 200 3300 3400 0 0 0 0 unknown
1814400.0 21 2020-02-21 4690100 0 1300 2300 100 200 3900 7600 7600 4600 400 200 3700 3000 0 0 0 0 unknown
1900800.0 22 2020-02-22 4690100 0 1100 2300 0 200 3600 7600 7600 4800 400 200 4000 2800 0 0 0 0 unknown
1987200.0 23 2020-02-23 4690100 0 800 2100 100 200 3200 7600 7600 5000 500 200 4400 2700 0 0 0 0 unknown
2073600.0 24 2020-02-24 4690100 0 700 1900 100 200 2900 7600 7600 5100 500 200 4700 2500 0 0 0 0 unknown
2160000.0 25 2020-02-25 4690100 0 700 1800 100 200 2800 7600 7600 5100 500 200 4800 2200 0 0 0 0 unknown
2246400.0 26 2020-02-26 4690100 0 700 1300 200 100 2300 7600 7600 5100 500 200 5300 2100 0 0 0 0 unknown
2332800.0 27 2020-02-27 4690100 0 700 1300 200 100 2300 7600 7600 5100 500 200 5300 1600 0 0 0 0 unknown
2419200.0 28 2020-02-28 4690100 0 600 1100 200 100 2000 7600 7600 5100 500 200 5600 1600 0 0 0 0 unknown
2505600.0 29 2020-02-29 4690100 0 400 1200 100 100 1800 7600 7600 5300 500 200 5800 1600 0 0 0 0 unknown
2592000.0 30 2020-03-01 4690100 0 400 1000 200 100 1700 7600 7600 5300 600 200 5900 1400 0 0 0 0 unknown
2678400.0 31 2020-03-02 4690100 0 400 900 100 100 1500 7600 7600 5300 600 200 6100 1300 0 0 0 0 unknown
2764800.0 32 2020-03-03 4690100 0 400 900 100 100 1500 7600 7600 5300 600 200 6100 1100 0 0 0 0 unknown
2851200.0 33 2020-03-04 4690100 0 200 900 100 100 1300 7600 7600 5500 600 200 6300 1300 0 0 0 0 unknown
2937600.0 34 2020-03-05 4690100 0 200 900 100 100 1300 7600 7600 5500 600 200 6300 1100 0 0 0 0 unknown
3024000.0 35 2020-03-06 4690100 0 200 900 100 100 1300 7600 7600 5500 600 200 6300 1100 0 0 0 0 unknown
3110400.0 36 2020-03-07 4690100 0 200 700 200 100 1200 7600 7600 5500 700 200 6400 1100 0 0 0 0 unknown
3196800.0 37 2020-03-08 4690100 0 200 700 200 100 1200 7600 7600 5500 700 200 6400 1000 0 0 0 0 unknown
3283200.0 38 2020-03-09 4690100 0 200 600 200 100 1100 7600 7600 5500 700 200 6500 1000 0 0 0 0 unknown
3369600.0 39 2020-03-10 4690100 0 100 700 200 100 1100 7600 7600 5600 700 200 6500 1000 0 0 0 0 unknown
3456000.0 40 2020-03-11 4690100 0 100 700 200 100 1100 7600 7600 5600 700 200 6500 1000 0 0 0 0 unknown
3542400.0 41 2020-03-12 4690100 0 100 600 200 100 1000 7600 7600 5600 700 200 6600 1000 0 0 0 0 unknown
3628800.0 42 2020-03-13 4690100 0 100 600 200 100 1000 7600 7600 5600 700 200 6600 900 0 0 0 0 unknown
3715200.0 43 2020-03-14 4690100 0 100 600 200 100 1000 7600 7600 5600 700 200 6600 900 0 0 0 0 unknown
3801600.0 44 2020-03-15 4690100 0 100 500 200 100 900 7600 7600 5600 700 200 6700 900 0 0 0 0 unknown
3888000.0 45 2020-03-16 4690100 0 100 500 200 100 900 7600 7600 5600 700 200 6700 800 0 0 0 0 unknown
3974400.0 46 2020-03-17 4690100 0 100 400 0 100 600 7600 7600 5600 700 200 7000 800 0 0 0 0 unknown
4060800.0 47 2020-03-18 4690100 0 100 300 0 100 500 7600 7600 5600 700 200 7100 500 0 0 0 0 unknown
4147200.0 48 2020-03-19 4690100 0 100 300 0 100 500 7600 7600 5600 700 200 7100 400 0 0 0 0 unknown
4233600.0 49 2020-03-20 4690100 0 100 200 100 0 400 7600 7600 5600 700 200 7200 400 0 0 0 0 unknown
4320000.0 50 2020-03-21 4690100 0 100 200 100 0 400 7600 7600 5600 700 200 7200 300 0 0 0 0 unknown
4406400.0 51 2020-03-22 4690100 0 100 200 100 0 400 7600 7600 5600 700 200 7200 300 0 0 0 0 unknown
4492800.0 52 2020-03-23 4690100 0 0 200 0 0 200 7600 7600 5600 700 200 7400 300 0 0 0 0 unknown
4579200.0 53 2020-03-24 4690100 0 0 200 0 0 200 7600 7600 5600 700 200 7400 200 0 0 0 0 unknown
4665600.0 54 2020-03-25 4690100 0 0 200 0 0 200 7600 7600 5600 700 200 7400 200 0 0 0 0 unknown
4752000.0 55 2020-03-26 4690100 0 0 200 0 0 200 7600 7600 5600 700 200 7400 200 0 0 0 0 unknown
4838400.0 56 2020-03-27 4690100 0 0 200 0 0 200 7600 7600 5600 700 200 7400 200 0 0 0 0 unknown
4924800.0 57 2020-03-28 4690100 0 0 200 0 0 200 7600 7600 5600 700 200 7400 200 0 0 0 0 unknown
5011200.0 58 2020-03-29 4690100 0 0 200 0 0 200 7600 7600 5600 700 200 7400 200 0 0 0 0 unknown
5097600.0 59 2020-03-30 4690100 0 0 200 0 0 200 7600 7600 5600 700 200 7400 200 0 0 0 0 unknown
5184000.0 60 2020-03-31 4690100 0 0 200 0 0 200 7600 7600 5600 700 200 7400 200 0 0 0 0 unknown
5270400.0 61 2020-04-01 4690100 0 0 200 0 0 200 7600 7600 5600 700 200 7400 200 0 0 0 0 unknown
5356800.0 62 2020-04-02 4690100 0 0 200 0 0 200 7600 7600 5600 700 200 7400 200 0 0 0 0 unknown
5443200.0 63 2020-04-03 4690100 0 0 200 0 0 200 7600 7600 5600 700 200 7400 200 0 0 0 0 unknown
5529600.0 64 2020-04-04 4690100 0 0 200 0 0 200 7600 7600 5600 700 200 7400 200 0 0 0 0 unknown
5616000.0 65 2020-04-05 4690100 0 0 200 0 0 200 7600 7600 5600 700 200 7400 200 0 0 0 0 unknown
5702400.0 66 2020-04-06 4690100 0 0 200 0 0 200 7600 7600 5600 700 200 7400 200 0 0 0 0 unknown
5788800.0 67 2020-04-07 4690100 0 0 200 0 0 200 7600 7600 5600 700 200 7400 200 0 0 0 0 unknown
5875200.0 68 2020-04-08 4690100 0 0 200 0 0 200 7600 7600 5600 700 200 7400 200 0 0 0 0 unknown
5961600.0 69 2020-04-09 4690100 0 0 100 0 0 100 7600 7600 5600 700 200 7500 200 0 0 0 0 unknown
6048000.0 70 2020-04-10 4690100 0 0 100 0 0 100 7600 7600 5600 700 200 7500 100 0 0 0 0 unknown
6134400.0 71 2020-04-11 4690100 0 0 100 0 0 100 7600 7600 5600 700 200 7500 100 0 0 0 0 unknown
6220800.0 72 2020-04-12 4690100 0 0 100 0 0 100 7600 7600 5600 700 200 7500 100 0 0 0 0 unknown
6307200.0 73 2020-04-13 4690100 0 0 100 0 0 100 7600 7600 5600 700 200 7500 100 0 0 0 0 unknown
6393600.0 74 2020-04-14 4690100 0 0 100 0 0 100 7600 7600 5600 700 200 7500 100 0 0 0 0 unknown
6480000.0 75 2020-04-15 4690100 0 0 100 0 0 100 7600 7600 5600 700 200 7500 100 0 0 0 0 unknown
6566400.0 76 2020-04-16 4690100 0 0 0 0 0 0 7600 7600 5600 700 200 7600 100 0 0 0 0 unknown
6652800.0 77 2020-04-17 4690100 0 0 0 0 0 0 7600 7600 5600 700 200 7600 0 0 0 0 0 unknown
Loading

0 comments on commit 6c1a417

Please sign in to comment.