Skip to content

Commit

Permalink
update hsMemory to report new epidodes when time passed = hsMemory in…
Browse files Browse the repository at this point in the history 
…stead hsMemory + 1t (#388)

* update hsMemory to report new epidodes when time passed = hsMemory instead hsMemory + 1t

* update tests
  • Loading branch information
@acavelan
acavelan authored Jun 23, 2024
1 parent 8d115b7 commit 95aefaa
Show file tree
Hide file tree
Showing 31 changed files with 3,214 additions and 3,214 deletions.
2 changes: 1 addition & 1 deletion model/Clinical/Episode.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ void Episode::flush() {

void Episode::update (const Host::Human& human, Episode::State newState)
{
if( time + ClinicalModel::hsMemory() < sim::ts0() ){
if( time + ClinicalModel::hsMemory() <= sim::ts0() ){
report ();

time = sim::ts0();
Expand Down
8 changes: 4 additions & 4 deletions test/expected/output10.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
1 2 0 17
1 3 0 15
1 4 0 13
1 1 14 41
1 2 14 43
1 3 14 42
1 4 14 37
1 1 14 42
1 2 14 44
1 3 14 43
1 4 14 39
1 1 68 3.0274
1 2 68 6.28767
1 3 68 9.39726
Expand Down
8 changes: 4 additions & 4 deletions test/expected/output11.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
1 2 12 1100
1 1 13 137
1 2 13 419
1 1 14 714
1 2 14 1814
1 1 15 184
1 2 15 391
1 1 14 820
1 2 14 2033
1 1 15 195
1 2 15 422
1 1 18 8
1 2 18 0
1 1 19 0
Expand Down
38 changes: 19 additions & 19 deletions test/expected/output12.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
1 12 5 0
1 1 14 1
1 2 14 0
1 3 14 4
1 4 14 5
1 3 14 5
1 4 14 4
1 5 14 3
1 6 14 8
1 6 14 7
1 7 14 3
1 8 14 4
1 8 14 3
1 9 14 2
1 10 14 2
1 11 14 7
Expand Down Expand Up @@ -100,7 +100,7 @@
2 3 14 2
2 4 14 4
2 5 14 1
2 6 14 4
2 6 14 5
2 7 14 7
2 8 14 3
2 9 14 2
Expand Down Expand Up @@ -160,9 +160,9 @@
3 2 14 0
3 3 14 3
3 4 14 4
3 5 14 6
3 6 14 14
3 7 14 10
3 5 14 7
3 6 14 17
3 7 14 11
3 8 14 6
3 9 14 3
3 10 14 1
Expand Down Expand Up @@ -222,9 +222,9 @@
4 3 14 0
4 4 14 0
4 5 14 3
4 6 14 3
4 7 14 2
4 8 14 4
4 6 14 2
4 7 14 1
4 8 14 5
4 9 14 2
4 10 14 2
4 11 14 5
Expand Down Expand Up @@ -288,7 +288,7 @@
5 8 14 3
5 9 14 2
5 10 14 2
5 11 14 2
5 11 14 3
5 12 14 0
5 0 36 0.000755422
5 1 55 17
Expand Down Expand Up @@ -345,7 +345,7 @@
6 4 14 0
6 5 14 0
6 6 14 2
6 7 14 2
6 7 14 3
6 8 14 1
6 9 14 1
6 10 14 2
Expand Down Expand Up @@ -405,7 +405,7 @@
7 3 14 0
7 4 14 1
7 5 14 3
7 6 14 10
7 6 14 12
7 7 14 2
7 8 14 3
7 9 14 3
Expand Down Expand Up @@ -464,14 +464,14 @@
8 1 14 0
8 2 14 9
8 3 14 11
8 4 14 17
8 5 14 17
8 6 14 25
8 7 14 21
8 4 14 20
8 5 14 19
8 6 14 28
8 7 14 23
8 8 14 18
8 9 14 15
8 10 14 7
8 11 14 7
8 11 14 8
8 12 14 1
8 0 36 0.428331
8 1 55 15
Expand Down
62 changes: 31 additions & 31 deletions test/expected/output4.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@
1 16 14 0
1 17 14 0
1 18 14 1
1 19 14 0
1 19 14 1
1 20 14 0
1 21 14 0
1 22 14 0
Expand Down Expand Up @@ -728,9 +728,9 @@
2 21 13 0
2 22 13 0
2 1 14 0
2 2 14 1
2 3 14 1
2 4 14 1
2 2 14 3
2 3 14 0
2 4 14 2
2 5 14 1
2 6 14 1
2 7 14 0
Expand Down Expand Up @@ -1191,23 +1191,23 @@
3 20 13 0
3 21 13 0
3 22 13 0
3 1 14 59
3 2 14 59
3 3 14 41
3 4 14 29
3 5 14 22
3 1 14 61
3 2 14 62
3 3 14 42
3 4 14 31
3 5 14 23
3 6 14 15
3 7 14 12
3 8 14 9
3 9 14 4
3 10 14 10
3 11 14 6
3 12 14 9
3 12 14 10
3 13 14 3
3 14 14 4
3 15 14 5
3 15 14 6
3 16 14 14
3 17 14 24
3 17 14 25
3 18 14 5
3 19 14 13
3 20 14 9
Expand Down Expand Up @@ -2119,30 +2119,30 @@
5 20 13 0
5 21 13 0
5 22 13 0
5 1 14 275
5 2 14 269
5 3 14 245
5 4 14 168
5 5 14 138
5 6 14 106
5 7 14 71
5 1 14 287
5 2 14 289
5 3 14 258
5 4 14 179
5 5 14 146
5 6 14 108
5 7 14 74
5 8 14 39
5 9 14 28
5 10 14 26
5 10 14 27
5 11 14 21
5 12 14 18
5 13 14 19
5 14 14 21
5 15 14 17
5 16 14 106
5 17 14 90
5 18 14 84
5 19 14 61
5 20 14 27
5 21 14 40
5 13 14 20
5 14 14 22
5 15 14 19
5 16 14 108
5 17 14 93
5 18 14 86
5 19 14 62
5 20 14 29
5 21 14 41
5 22 14 12
5 1 15 6
5 2 15 4
5 1 15 5
5 2 15 5
5 3 15 1
5 4 15 0
5 5 15 0
Expand Down
Loading

0 comments on commit 95aefaa

Please sign in to comment.