From d4c416329b362b67e45211c7f62b1484192ba275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Cavelan?= Date: Wed, 11 Jan 2023 15:04:44 +0100 Subject: [PATCH] update test HetVecDailyEIR with correct name and expected output --- test/CMakeLists.txt | 2 +- test/expected/outputHetVecDailyEIR.txt | 852 ++++++++++++------------- 2 files changed, 427 insertions(+), 427 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f2aa34eb..728169c0 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -53,7 +53,7 @@ set (OM_BOXTEST_NAMES BSV TBV DecisionTree5DayDielmo - VecDailyEIR + HetVecDailyEIR ) # tests with broken checkpointing: set (OM_BOXTEST_NC_NAMES) diff --git a/test/expected/outputHetVecDailyEIR.txt b/test/expected/outputHetVecDailyEIR.txt index 845895fb..4da6eabb 100644 --- a/test/expected/outputHetVecDailyEIR.txt +++ b/test/expected/outputHetVecDailyEIR.txt @@ -1,432 +1,432 @@ -1 1 0 13 -1 2 0 7 -1 3 0 14 -1 4 0 22 -1 5 0 21 -1 6 0 44 -1 7 0 46 -1 8 0 37 -1 9 0 67 -1 10 0 56 -1 11 0 56 -1 12 0 17 -1 1 3 6 -1 2 3 5 -1 3 3 12 -1 4 3 17 -1 5 3 17 -1 6 3 34 -1 7 3 22 -1 8 3 13 -1 9 3 26 -1 10 3 19 -1 11 3 14 -1 12 3 6 -1 1 5 29.7156 -1 2 5 35.9914 -1 3 5 78.3561 -1 4 5 96.0916 -1 5 5 102.687 -1 6 5 169.323 -1 7 5 94.4374 -1 8 5 48.2514 -1 9 5 105.603 -1 10 5 67.522 -1 11 5 59.1401 -1 12 5 26.6874 -1 1 6 16 -1 2 6 36 -1 3 6 79 -1 4 6 110 -1 5 6 136 -1 6 6 274 -1 7 6 182 -1 8 6 100 -1 9 6 151 -1 10 6 131 -1 11 6 95 -1 12 6 35 -1 1 8 7 -1 2 8 18 -1 3 8 32 -1 4 8 41 -1 5 8 67 -1 6 8 118 -1 7 8 49 -1 8 8 18 -1 9 8 52 -1 10 8 26 -1 11 8 28 -1 12 8 10 -1 1 30 2507.76 -1 2 30 1944.34 -1 3 30 3264.26 -1 4 30 7122.6 -1 5 30 9148.51 -1 6 30 19749.3 -1 7 30 25638 -1 8 30 30981.9 -1 9 30 64617.9 -1 10 30 47684.7 -1 11 30 48241.5 -1 12 30 14995.9 -2 1 0 12 -2 2 0 9 -2 3 0 15 -2 4 0 20 -2 5 0 22 -2 6 0 43 -2 7 0 47 -2 8 0 37 -2 9 0 64 -2 10 0 58 -2 11 0 56 -2 12 0 17 -2 1 3 5 -2 2 3 9 -2 3 3 15 -2 4 3 19 -2 5 3 20 -2 6 3 37 +1 1 0 14 +1 2 0 8 +1 3 0 16 +1 4 0 31 +1 5 0 24 +1 6 0 50 +1 7 0 64 +1 8 0 54 +1 9 0 82 +1 10 0 63 +1 11 0 72 +1 12 0 22 +1 1 3 3 +1 2 3 4 +1 3 3 7 +1 4 3 14 +1 5 3 7 +1 6 3 22 +1 7 3 30 +1 8 3 24 +1 9 3 33 +1 10 3 26 +1 11 3 22 +1 12 3 4 +1 1 5 10.272 +1 2 5 22.8462 +1 3 5 30.4043 +1 4 5 65.7913 +1 5 5 37.2959 +1 6 5 108.111 +1 7 5 128.163 +1 8 5 104.316 +1 9 5 136.59 +1 10 5 102.447 +1 11 5 84.0253 +1 12 5 17.32 +1 1 6 11 +1 2 6 12 +1 3 6 37 +1 4 6 85 +1 5 6 45 +1 6 6 158 +1 7 6 199 +1 8 6 151 +1 9 6 263 +1 10 6 151 +1 11 6 170 +1 12 6 26 +1 1 8 3 +1 2 8 7 +1 3 8 15 +1 4 8 26 +1 5 8 13 +1 6 8 53 +1 7 8 55 +1 8 8 45 +1 9 8 61 +1 10 8 39 +1 11 8 39 +1 12 8 4 +1 1 30 3689.58 +1 2 30 1152.15 +1 3 30 1259.31 +1 4 30 2146.04 +1 5 30 8398.67 +1 6 30 15130 +1 7 30 26622.6 +1 8 30 27345.2 +1 9 30 72992.8 +1 10 30 35283.6 +1 11 30 105597 +1 12 30 5833.07 +2 1 0 20 +2 2 0 6 +2 3 0 14 +2 4 0 29 +2 5 0 23 +2 6 0 49 +2 7 0 66 +2 8 0 52 +2 9 0 84 +2 10 0 64 +2 11 0 69 +2 12 0 24 +2 1 3 10 +2 2 3 4 +2 3 3 8 +2 4 3 18 +2 5 3 13 +2 6 3 34 2 7 3 36 -2 8 3 20 -2 9 3 37 -2 10 3 26 -2 11 3 19 -2 12 3 7 -2 1 5 29.4091 -2 2 5 63.385 -2 3 5 104.679 -2 4 5 131.082 -2 5 5 134.962 -2 6 5 220.67 -2 7 5 169.142 -2 8 5 84.2746 -2 9 5 153.36 -2 10 5 103.43 -2 11 5 97.0199 -2 12 5 35.178 -2 1 6 50 -2 2 6 76 -2 3 6 137 -2 4 6 207 -2 5 6 230 -2 6 6 477 -2 7 6 339 -2 8 6 195 -2 9 6 272 -2 10 6 228 -2 11 6 183 -2 12 6 54 -2 1 8 10 -2 2 8 48 -2 3 8 86 -2 4 8 111 -2 5 8 145 -2 6 8 227 -2 7 8 114 -2 8 8 45 -2 9 8 82 -2 10 8 50 -2 11 8 54 -2 12 8 14 -2 1 30 697.23 -2 2 30 490.567 -2 3 30 1041.46 -2 4 30 1839.99 -2 5 30 2337.43 -2 6 30 5770.23 -2 7 30 7928.42 -2 8 30 8189.53 -2 9 30 16433.4 -2 10 30 14340.9 -2 11 30 14046.5 -2 12 30 4264.12 -3 1 0 12 +2 8 3 33 +2 9 3 46 +2 10 3 41 +2 11 3 31 +2 12 3 8 +2 1 5 55.3592 +2 2 5 24.8004 +2 3 5 42.0589 +2 4 5 104.258 +2 5 5 67.6273 +2 6 5 207.358 +2 7 5 194.622 +2 8 5 151.746 +2 9 5 211.164 +2 10 5 162.869 +2 11 5 127.535 +2 12 5 33.0046 +2 1 6 36 +2 2 6 22 +2 3 6 69 +2 4 6 122 +2 5 6 81 +2 6 6 254 +2 7 6 362 +2 8 6 265 +2 9 6 422 +2 10 6 256 +2 11 6 312 +2 12 6 48 +2 1 8 23 +2 2 8 15 +2 3 8 30 +2 4 8 49 +2 5 8 25 +2 6 8 114 +2 7 8 130 +2 8 8 95 +2 9 8 119 +2 10 8 72 +2 11 8 80 +2 12 8 12 +2 1 30 387.478 +2 2 30 253.104 +2 3 30 533.938 +2 4 30 819.532 +2 5 30 456.773 +2 6 30 4786.68 +2 7 30 9151.93 +2 8 30 7394.89 +2 9 30 20513.5 +2 10 30 10380.6 +2 11 30 27788.3 +2 12 30 2264.51 +3 1 0 18 3 2 0 9 3 3 0 14 -3 4 0 21 -3 5 0 24 -3 6 0 40 -3 7 0 49 -3 8 0 38 -3 9 0 63 -3 10 0 55 -3 11 0 57 -3 12 0 18 -3 1 3 4 -3 2 3 8 -3 3 3 14 -3 4 3 18 -3 5 3 23 -3 6 3 36 -3 7 3 37 -3 8 3 19 -3 9 3 38 -3 10 3 26 -3 11 3 25 -3 12 3 7 -3 1 5 30.7591 -3 2 5 53.6856 -3 3 5 87.4122 -3 4 5 130.833 -3 5 5 147.84 -3 6 5 213.272 -3 7 5 179.445 -3 8 5 85.1239 -3 9 5 154.255 -3 10 5 110.988 -3 11 5 113.857 -3 12 5 35.6758 -3 1 6 35 -3 2 6 81 -3 3 6 132 -3 4 6 230 -3 5 6 261 -3 6 6 463 -3 7 6 373 -3 8 6 193 -3 9 6 281 -3 10 6 220 -3 11 6 207 -3 12 6 64 -3 1 8 15 -3 2 8 48 -3 3 8 81 -3 4 8 151 -3 5 8 177 -3 6 8 286 -3 7 8 152 -3 8 8 54 -3 9 8 93 -3 10 8 68 -3 11 8 65 -3 12 8 16 -3 1 30 225.78 -3 2 30 193.42 -3 3 30 334.326 -3 4 30 613.766 -3 5 30 779.305 -3 6 30 1839.82 -3 7 30 2687.43 -3 8 30 2685.12 -3 9 30 5247.2 -3 10 30 4641.61 -3 11 30 4669.2 -3 12 30 1408.61 -4 1 0 12 -4 2 0 7 -4 3 0 11 -4 4 0 24 -4 5 0 24 -4 6 0 41 -4 7 0 47 -4 8 0 40 -4 9 0 64 -4 10 0 54 -4 11 0 58 -4 12 0 18 -4 1 3 3 -4 2 3 6 -4 3 3 11 -4 4 3 19 -4 5 3 21 -4 6 3 36 -4 7 3 32 -4 8 3 21 -4 9 3 35 -4 10 3 22 -4 11 3 22 -4 12 3 6 -4 1 5 14.6473 -4 2 5 37.4316 -4 3 5 78.9381 -4 4 5 126.53 -4 5 5 131.505 -4 6 5 204.8 -4 7 5 148.808 -4 8 5 86.3795 -4 9 5 137.606 -4 10 5 92.1829 -4 11 5 96.4805 -4 12 5 28.8421 -4 1 6 27 -4 2 6 51 -4 3 6 97 -4 4 6 238 -4 5 6 229 -4 6 6 415 -4 7 6 303 -4 8 6 172 -4 9 6 237 -4 10 6 179 -4 11 6 186 -4 12 6 61 -4 1 8 10 -4 2 8 24 -4 3 8 64 -4 4 8 127 -4 5 8 159 -4 6 8 247 -4 7 8 115 -4 8 8 43 -4 9 8 68 -4 10 8 54 -4 11 8 57 -4 12 8 14 -4 1 30 33.2462 -4 2 30 28.0874 -4 3 30 43.913 -4 4 30 101.297 -4 5 30 126.377 -4 6 30 268.143 -4 7 30 417.749 -4 8 30 436.39 -4 9 30 809.447 -4 10 30 695.447 -4 11 30 728.728 -4 12 30 228.885 -5 1 0 16 -5 2 0 5 -5 3 0 9 -5 4 0 22 -5 5 0 27 +3 4 0 26 +3 5 0 26 +3 6 0 49 +3 7 0 66 +3 8 0 53 +3 9 0 84 +3 10 0 63 +3 11 0 67 +3 12 0 25 +3 1 3 10 +3 2 3 6 +3 3 3 6 +3 4 3 17 +3 5 3 18 +3 6 3 35 +3 7 3 42 +3 8 3 34 +3 9 3 49 +3 10 3 41 +3 11 3 34 +3 12 3 8 +3 1 5 66.2664 +3 2 5 37.2422 +3 3 5 29.257 +3 4 5 109.595 +3 5 5 102.381 +3 6 5 183.534 +3 7 5 224.578 +3 8 5 171.099 +3 9 5 221.876 +3 10 5 173.287 +3 11 5 142.917 +3 12 5 34.58 +3 1 6 53 +3 2 6 36 +3 3 6 47 +3 4 6 128 +3 5 6 117 +3 6 6 257 +3 7 6 380 +3 8 6 290 +3 9 6 426 +3 10 6 261 +3 11 6 319 +3 12 6 50 +3 1 8 29 +3 2 8 29 +3 3 8 20 +3 4 8 72 +3 5 8 50 +3 6 8 126 +3 7 8 171 +3 8 8 127 +3 9 8 155 +3 10 8 104 +3 11 8 102 +3 12 8 13 +3 1 30 203.588 +3 2 30 88.1379 +3 3 30 143.235 +3 4 30 289.169 +3 5 30 161.192 +3 6 30 1574.75 +3 7 30 3038.05 +3 8 30 2423.68 +3 9 30 6758.18 +3 10 30 3406.17 +3 11 30 8928.28 +3 12 30 770.424 +4 1 0 17 +4 2 0 12 +4 3 0 13 +4 4 0 27 +4 5 0 27 +4 6 0 45 +4 7 0 62 +4 8 0 56 +4 9 0 86 +4 10 0 62 +4 11 0 67 +4 12 0 26 +4 1 3 4 +4 2 3 9 +4 3 3 4 +4 4 3 15 +4 5 3 16 +4 6 3 29 +4 7 3 39 +4 8 3 34 +4 9 3 44 +4 10 3 36 +4 11 3 28 +4 12 3 9 +4 1 5 25.2913 +4 2 5 49.4074 +4 3 5 27.4819 +4 4 5 87.6603 +4 5 5 75.7134 +4 6 5 149.762 +4 7 5 188.336 +4 8 5 161.069 +4 9 5 205.171 +4 10 5 149.166 +4 11 5 121.11 +4 12 5 32.8783 +4 1 6 24 +4 2 6 46 +4 3 6 40 +4 4 6 105 +4 5 6 105 +4 6 6 213 +4 7 6 332 +4 8 6 272 +4 9 6 389 +4 10 6 237 +4 11 6 275 +4 12 6 48 +4 1 8 6 +4 2 8 31 +4 3 8 11 +4 4 8 56 +4 5 8 40 +4 6 8 95 +4 7 8 122 +4 8 8 102 +4 9 8 144 +4 10 8 90 +4 11 8 84 +4 12 8 9 +4 1 30 59.8573 +4 2 30 15.4577 +4 3 30 22.4627 +4 4 30 42.5455 +4 5 30 31.3259 +4 6 30 245.668 +4 7 30 460.938 +4 8 30 301.099 +4 9 30 1131.88 +4 10 30 522.818 +4 11 30 1372.9 +4 12 30 121.705 +5 1 0 21 +5 2 0 11 +5 3 0 13 +5 4 0 29 +5 5 0 29 5 6 0 39 -5 7 0 47 -5 8 0 41 -5 9 0 64 -5 10 0 55 -5 11 0 57 -5 12 0 18 -5 1 3 4 -5 2 3 3 -5 3 3 7 -5 4 3 17 -5 5 3 23 -5 6 3 32 -5 7 3 28 -5 8 3 18 -5 9 3 28 -5 10 3 21 -5 11 3 17 -5 12 3 7 -5 1 5 26.8489 -5 2 5 19.9868 -5 3 5 38.6708 -5 4 5 102.031 -5 5 5 128.466 -5 6 5 165.657 -5 7 5 128.362 -5 8 5 74.3795 -5 9 5 108.115 -5 10 5 77.164 -5 11 5 72.9459 -5 12 5 32.8307 -5 1 6 21 -5 2 6 27 -5 3 6 58 -5 4 6 186 -5 5 6 221 -5 6 6 336 +5 7 0 61 +5 8 0 56 +5 9 0 83 +5 10 0 65 +5 11 0 67 +5 12 0 26 +5 1 3 3 +5 2 3 8 +5 3 3 6 +5 4 3 14 +5 5 3 9 +5 6 3 24 +5 7 3 32 +5 8 3 29 +5 9 3 37 +5 10 3 32 +5 11 3 27 +5 12 3 8 +5 1 5 12.1491 +5 2 5 41.6308 +5 3 5 39.0838 +5 4 5 75.2606 +5 5 5 49.3059 +5 6 5 108.046 +5 7 5 141.2 +5 8 5 129.581 +5 9 5 164.015 +5 10 5 121.242 +5 11 5 106.15 +5 12 5 30.0227 +5 1 6 19 +5 2 6 21 +5 3 6 37 +5 4 6 99 +5 5 6 85 +5 6 6 156 5 7 6 250 -5 8 6 147 -5 9 6 188 -5 10 6 139 -5 11 6 150 -5 12 6 50 -5 1 8 16 -5 2 8 9 -5 3 8 32 -5 4 8 89 -5 5 8 131 -5 6 8 167 -5 7 8 86 -5 8 8 33 -5 9 8 43 -5 10 8 38 -5 11 8 45 -5 12 8 11 -5 1 30 10.93 -5 2 30 5.05314 -5 3 30 10.5201 -5 4 30 28.9702 -5 5 30 39.3576 -5 6 30 78.0566 -5 7 30 116.36 -5 8 30 128.928 -5 9 30 229.908 -5 10 30 200.33 -5 11 30 211.257 -5 12 30 65.5626 -6 1 0 13 -6 2 0 8 +5 8 6 199 +5 9 6 289 +5 10 6 194 +5 11 6 224 +5 12 6 42 +5 1 8 3 +5 2 8 12 +5 3 8 22 +5 4 8 42 +5 5 8 28 +5 6 8 67 +5 7 8 76 +5 8 8 73 +5 9 8 107 +5 10 8 63 +5 11 8 61 +5 12 8 10 +5 1 30 15.9257 +5 2 30 5.13585 +5 3 30 5.36149 +5 4 30 14.4481 +5 5 30 9.17536 +5 6 30 67.0635 +5 7 30 126.125 +5 8 30 82.4156 +5 9 30 324.288 +5 10 30 161.149 +5 11 30 393.249 +5 12 30 34.8997 +6 1 0 19 +6 2 0 14 6 3 0 10 -6 4 0 21 -6 5 0 25 -6 6 0 40 -6 7 0 47 -6 8 0 41 -6 9 0 63 -6 10 0 57 -6 11 0 57 -6 12 0 18 -6 1 3 3 -6 2 3 4 -6 3 3 8 -6 4 3 16 -6 5 3 23 -6 6 3 31 -6 7 3 27 -6 8 3 19 -6 9 3 27 -6 10 3 17 -6 11 3 13 -6 12 3 6 -6 1 5 19.2855 -6 2 5 24.7728 -6 3 5 37.9765 -6 4 5 89.0535 -6 5 5 109.355 -6 6 5 147.678 -6 7 5 108.83 -6 8 5 69.4789 -6 9 5 96.8503 -6 10 5 65.7876 -6 11 5 59.3803 -6 12 5 25.8442 -6 1 6 9 -6 2 6 28 -6 3 6 55 -6 4 6 153 -6 5 6 173 -6 6 6 272 -6 7 6 216 -6 8 6 136 -6 9 6 163 -6 10 6 120 -6 11 6 126 -6 12 6 37 -6 1 8 5 -6 2 8 10 -6 3 8 25 -6 4 8 61 -6 5 8 82 -6 6 8 115 -6 7 8 57 -6 8 8 26 -6 9 8 41 -6 10 8 25 -6 11 8 36 -6 12 8 8 -6 1 30 7.19837 -6 2 30 3.04165 -6 3 30 6.01386 -6 4 30 16.7539 -6 5 30 23.5844 -6 6 30 46.1616 -6 7 30 70.9369 -6 8 30 78.6787 -6 9 30 138.878 -6 10 30 123.643 -6 11 30 125.275 -6 12 30 39.5606 +6 4 0 31 +6 5 0 27 +6 6 0 43 +6 7 0 58 +6 8 0 57 +6 9 0 81 +6 10 0 67 +6 11 0 68 +6 12 0 25 +6 1 3 2 +6 2 3 9 +6 3 3 4 +6 4 3 12 +6 5 3 7 +6 6 3 20 +6 7 3 24 +6 8 3 24 +6 9 3 30 +6 10 3 26 +6 11 3 25 +6 12 3 5 +6 1 5 9.0999 +6 2 5 42.5593 +6 3 5 22.5395 +6 4 5 56.4029 +6 5 5 35.3022 +6 6 5 87.0541 +6 7 5 100.303 +6 8 5 105.191 +6 9 5 128.688 +6 10 5 93.0822 +6 11 5 90.4395 +6 12 5 19.1664 +6 1 6 8 +6 2 6 29 +6 3 6 20 +6 4 6 86 +6 5 6 63 +6 6 6 124 +6 7 6 202 +6 8 6 175 +6 9 6 225 +6 10 6 175 +6 11 6 183 +6 12 6 33 +6 1 8 3 +6 2 8 11 +6 3 8 13 +6 4 8 30 +6 5 8 15 +6 6 8 49 +6 7 8 48 +6 8 8 52 +6 9 8 82 +6 10 8 50 +6 11 8 41 +6 12 8 3 +6 1 30 11.0461 +6 2 30 2.80021 +6 3 30 3.16676 +6 4 30 9.27658 +6 5 30 6.68196 +6 6 30 37.9262 +6 7 30 73.0434 +6 8 30 52.6258 +6 9 30 187.603 +6 10 30 104.331 +6 11 30 238.427 +6 12 30 20.6474