Skip to content

Commit 5f836b9

Browse files
vidhyamanisankarvidhyamanisankar
authoredJun 28, 2022
Merge pull request #86 from ONSdigital/spp_6805_H_value_to_boolean
Spp 6805 h value to boolean
·
spp_1245.14.3.0
2 parents f5737cc + 6e3f4cf commit 5f836b9

20 files changed

+491
-553
lines changed
 

‎statistical_methods_library/estimation.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ def estimate(
220220
.agg(
221221
sum(col("sample_marker")),
222222
sum(col("death_marker")),
223-
first(col("h_value")),
223+
first(col("h_value").cast("integer")).alias("first(h_value)"),
224224
count(col("sample_marker")),
225225
)
226226
.withColumn(

‎tests/fixture_data/estimation/dev_scenarios/combined_estimation_input.csv

+36-36
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
reference,period,strata,sample_inclusion_marker,death_marker,H,auxiliary,calibration_group
2-
1,202009,10,1,0,1,10,10
3-
2,202009,10,1,0,1,10,10
4-
3,202009,10,1,1,1,10,10
5-
4,202009,10,0,0,1,10,10
6-
5,202009,10,0,0,1,10,10
7-
6,202009,10,0,1,1,10,10
8-
7,202009,11,1,0,1,15,11
9-
8,202009,11,1,0,1,15,11
10-
9,202009,11,1,1,1,15,11
11-
10,202009,11,0,0,1,15,11
12-
11,202009,11,0,0,1,15,11
13-
12,202009,11,0,1,1,15,11
14-
13,202009,12,1,0,0,20,12
15-
14,202009,12,1,0,0,20,12
16-
15,202009,12,1,1,0,20,12
17-
16,202009,12,0,0,0,20,12
18-
17,202009,12,0,0,0,20,12
19-
18,202009,12,0,1,0,20,12
20-
1,202010,10,1,0,1,10,10
21-
2,202010,10,1,0,1,10,10
22-
3,202010,10,1,1,1,10,10
23-
4,202010,10,0,0,1,10,10
24-
5,202010,10,0,0,1,10,10
25-
6,202010,10,0,1,1,10,10
26-
7,202010,11,1,0,1,15,11
27-
8,202010,11,1,0,1,15,11
28-
9,202010,11,1,1,1,15,11
29-
10,202010,11,0,0,1,15,11
30-
11,202010,11,0,0,1,15,11
31-
12,202010,11,0,1,1,15,11
32-
13,202010,12,1,0,0,20,12
33-
14,202010,12,1,0,0,20,12
34-
15,202010,12,1,1,0,20,12
35-
16,202010,12,0,0,0,20,12
36-
17,202010,12,0,0,0,20,12
37-
18,202010,12,0,1,0,20,12
2+
1,202009,10,1,0,True,10,10
3+
2,202009,10,1,0,True,10,10
4+
3,202009,10,1,1,True,10,10
5+
4,202009,10,0,0,True,10,10
6+
5,202009,10,0,0,True,10,10
7+
6,202009,10,0,1,True,10,10
8+
7,202009,11,1,0,True,15,11
9+
8,202009,11,1,0,True,15,11
10+
9,202009,11,1,1,True,15,11
11+
10,202009,11,0,0,True,15,11
12+
11,202009,11,0,0,True,15,11
13+
12,202009,11,0,1,True,15,11
14+
13,202009,12,1,0,False,20,12
15+
14,202009,12,1,0,False,20,12
16+
15,202009,12,1,1,False,20,12
17+
16,202009,12,0,0,False,20,12
18+
17,202009,12,0,0,False,20,12
19+
18,202009,12,0,1,False,20,12
20+
1,202010,10,1,0,True,10,10
21+
2,202010,10,1,0,True,10,10
22+
3,202010,10,1,1,True,10,10
23+
4,202010,10,0,0,True,10,10
24+
5,202010,10,0,0,True,10,10
25+
6,202010,10,0,1,True,10,10
26+
7,202010,11,1,0,True,15,11
27+
8,202010,11,1,0,True,15,11
28+
9,202010,11,1,1,True,15,11
29+
10,202010,11,0,0,True,15,11
30+
11,202010,11,0,0,True,15,11
31+
12,202010,11,0,1,True,15,11
32+
13,202010,12,1,0,False,20,12
33+
14,202010,12,1,0,False,20,12
34+
15,202010,12,1,1,False,20,12
35+
16,202010,12,0,0,False,20,12
36+
17,202010,12,0,0,False,20,12
37+
18,202010,12,0,1,False,20,12

‎tests/fixture_data/estimation/dev_scenarios/expansion_estimation_input.csv

+36-36
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
reference,period,strata,sample_inclusion_marker,death_marker,H
2-
1,202009,10,1,0,1
3-
2,202009,10,1,0,1
4-
3,202009,10,1,1,1
5-
4,202009,10,0,0,1
6-
5,202009,10,0,0,1
7-
6,202009,10,0,1,1
8-
7,202009,11,1,0,1
9-
8,202009,11,1,0,1
10-
9,202009,11,1,1,1
11-
10,202009,11,0,0,1
12-
11,202009,11,0,0,1
13-
12,202009,11,0,1,1
14-
13,202009,12,1,0,0
15-
14,202009,12,1,0,0
16-
15,202009,12,1,1,0
17-
16,202009,12,0,0,0
18-
17,202009,12,0,0,0
19-
18,202009,12,0,1,0
20-
1,202010,10,1,0,1
21-
2,202010,10,1,0,1
22-
3,202010,10,1,1,1
23-
4,202010,10,0,0,1
24-
5,202010,10,0,0,1
25-
6,202010,10,0,1,1
26-
7,202010,11,1,0,1
27-
8,202010,11,1,0,1
28-
9,202010,11,1,1,1
29-
10,202010,11,0,0,1
30-
11,202010,11,0,0,1
31-
12,202010,11,0,1,1
32-
13,202010,12,1,0,0
33-
14,202010,12,1,0,0
34-
15,202010,12,1,1,0
35-
16,202010,12,0,0,0
36-
17,202010,12,0,0,0
37-
18,202010,12,0,1,0
2+
1,202009,10,1,0,True
3+
2,202009,10,1,0,True
4+
3,202009,10,1,1,True
5+
4,202009,10,0,0,True
6+
5,202009,10,0,0,True
7+
6,202009,10,0,1,True
8+
7,202009,11,1,0,True
9+
8,202009,11,1,0,True
10+
9,202009,11,1,1,True
11+
10,202009,11,0,0,True
12+
11,202009,11,0,0,True
13+
12,202009,11,0,1,True
14+
13,202009,12,1,0,False
15+
14,202009,12,1,0,False
16+
15,202009,12,1,1,False
17+
16,202009,12,0,0,False
18+
17,202009,12,0,0,False
19+
18,202009,12,0,1,False
20+
1,202010,10,1,0,True
21+
2,202010,10,1,0,True
22+
3,202010,10,1,1,True
23+
4,202010,10,0,0,True
24+
5,202010,10,0,0,True
25+
6,202010,10,0,1,True
26+
7,202010,11,1,0,True
27+
8,202010,11,1,0,True
28+
9,202010,11,1,1,True
29+
10,202010,11,0,0,True
30+
11,202010,11,0,0,True
31+
12,202010,11,0,1,True
32+
13,202010,12,1,0,False
33+
14,202010,12,1,0,False
34+
15,202010,12,1,1,False
35+
16,202010,12,0,0,False
36+
17,202010,12,0,0,False
37+
18,202010,12,0,1,False

‎tests/fixture_data/estimation/dev_scenarios/expansion_estimation_unadjusted_input.csv

+36-36
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
reference,period,strata,sample_inclusion_marker,death_marker,H
2-
1,202009,10,1,0,1
3-
2,202009,10,1,0,1
4-
3,202009,10,1,1,1
5-
4,202009,10,0,0,1
6-
5,202009,10,0,0,1
7-
6,202009,10,0,1,1
8-
7,202009,11,1,0,1
9-
8,202009,11,1,0,1
10-
9,202009,11,1,1,1
11-
10,202009,11,0,0,1
12-
11,202009,11,0,0,1
13-
12,202009,11,0,1,1
14-
13,202009,12,1,0,0
15-
14,202009,12,1,0,0
16-
15,202009,12,1,1,0
17-
16,202009,12,0,0,0
18-
17,202009,12,0,0,0
19-
18,202009,12,0,1,0
20-
1,202010,10,1,0,1
21-
2,202010,10,1,0,1
22-
3,202010,10,1,1,1
23-
4,202010,10,0,0,1
24-
5,202010,10,0,0,1
25-
6,202010,10,0,1,1
26-
7,202010,11,1,0,1
27-
8,202010,11,1,0,1
28-
9,202010,11,1,1,1
29-
10,202010,11,0,0,1
30-
11,202010,11,0,0,1
31-
12,202010,11,0,1,1
32-
13,202010,12,1,0,0
33-
14,202010,12,1,0,0
34-
15,202010,12,1,1,0
35-
16,202010,12,0,0,0
36-
17,202010,12,0,0,0
37-
18,202010,12,0,1,0
2+
1,202009,10,1,0,True
3+
2,202009,10,1,0,True
4+
3,202009,10,1,1,True
5+
4,202009,10,0,0,True
6+
5,202009,10,0,0,True
7+
6,202009,10,0,1,True
8+
7,202009,11,1,0,True
9+
8,202009,11,1,0,True
10+
9,202009,11,1,1,True
11+
10,202009,11,0,0,True
12+
11,202009,11,0,0,True
13+
12,202009,11,0,1,True
14+
13,202009,12,1,0,False
15+
14,202009,12,1,0,False
16+
15,202009,12,1,1,False
17+
16,202009,12,0,0,False
18+
17,202009,12,0,0,False
19+
18,202009,12,0,1,False
20+
1,202010,10,1,0,True
21+
2,202010,10,1,0,True
22+
3,202010,10,1,1,True
23+
4,202010,10,0,0,True
24+
5,202010,10,0,0,True
25+
6,202010,10,0,1,True
26+
7,202010,11,1,0,True
27+
8,202010,11,1,0,True
28+
9,202010,11,1,1,True
29+
10,202010,11,0,0,True
30+
11,202010,11,0,0,True
31+
12,202010,11,0,1,True
32+
13,202010,12,1,0,False
33+
14,202010,12,1,0,False
34+
15,202010,12,1,1,False
35+
16,202010,12,0,0,False
36+
17,202010,12,0,0,False
37+
18,202010,12,0,1,False

‎tests/fixture_data/estimation/dev_scenarios/separate_estimation_input.csv

+36-36
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
reference,period,strata,sample_inclusion_marker,death_marker,H,auxiliary
2-
1,202009,10,1,0,1,10
3-
2,202009,10,1,0,1,10
4-
3,202009,10,1,1,1,10
5-
4,202009,10,0,0,1,10
6-
5,202009,10,0,0,1,10
7-
6,202009,10,0,1,1,10
8-
7,202009,11,1,0,1,15
9-
8,202009,11,1,0,1,15
10-
9,202009,11,1,1,1,15
11-
10,202009,11,0,0,1,15
12-
11,202009,11,0,0,1,15
13-
12,202009,11,0,1,1,15
14-
13,202009,12,1,0,0,20
15-
14,202009,12,1,0,0,20
16-
15,202009,12,1,1,0,20
17-
16,202009,12,0,0,0,20
18-
17,202009,12,0,0,0,20
19-
18,202009,12,0,1,0,20
20-
1,202010,10,1,0,1,10
21-
2,202010,10,1,0,1,10
22-
3,202010,10,1,1,1,10
23-
4,202010,10,0,0,1,10
24-
5,202010,10,0,0,1,10
25-
6,202010,10,0,1,1,10
26-
7,202010,11,1,0,1,15
27-
8,202010,11,1,0,1,15
28-
9,202010,11,1,1,1,15
29-
10,202010,11,0,0,1,15
30-
11,202010,11,0,0,1,15
31-
12,202010,11,0,1,1,15
32-
13,202010,12,1,0,0,20
33-
14,202010,12,1,0,0,20
34-
15,202010,12,1,1,0,20
35-
16,202010,12,0,0,0,20
36-
17,202010,12,0,0,0,20
37-
18,202010,12,0,1,0,20
2+
1,202009,10,1,0,True,10
3+
2,202009,10,1,0,True,10
4+
3,202009,10,1,1,True,10
5+
4,202009,10,0,0,True,10
6+
5,202009,10,0,0,True,10
7+
6,202009,10,0,1,True,10
8+
7,202009,11,1,0,True,15
9+
8,202009,11,1,0,True,15
10+
9,202009,11,1,1,True,15
11+
10,202009,11,0,0,True,15
12+
11,202009,11,0,0,True,15
13+
12,202009,11,0,1,True,15
14+
13,202009,12,1,0,False,20
15+
14,202009,12,1,0,False,20
16+
15,202009,12,1,1,False,20
17+
16,202009,12,0,0,False,20
18+
17,202009,12,0,0,False,20
19+
18,202009,12,0,1,False,20
20+
1,202010,10,1,0,True,10
21+
2,202010,10,1,0,True,10
22+
3,202010,10,1,1,True,10
23+
4,202010,10,0,0,True,10
24+
5,202010,10,0,0,True,10
25+
6,202010,10,0,1,True,10
26+
7,202010,11,1,0,True,15
27+
8,202010,11,1,0,True,15
28+
9,202010,11,1,1,True,15
29+
10,202010,11,0,0,True,15
30+
11,202010,11,0,0,True,15
31+
12,202010,11,0,1,True,15
32+
13,202010,12,1,0,False,20
33+
14,202010,12,1,0,False,20
34+
15,202010,12,1,1,False,20
35+
16,202010,12,0,0,False,20
36+
17,202010,12,0,0,False,20
37+
18,202010,12,0,1,False,20

‎tests/fixture_data/estimation/methodology_scenarios/01_expansion_input.csv

+54-54
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
11
reference,period,strata,sample_inclusion_marker,H,death_marker
2-
49999999101,202012,0001,1,0,0
3-
49999999102,202012,0001,1,0,0
4-
49999999103,202012,0001,1,0,0
5-
49999999104,202012,0001,1,0,0
6-
49999999105,202012,0001,1,0,0
7-
49999999106,202012,0001,1,0,0
8-
49999999107,202012,0001,1,0,0
9-
49999999108,202012,0001,1,0,0
10-
49999999109,202012,0001,0,0,0
11-
49999999110,202012,0001,0,0,0
12-
49999999111,202012,0001,0,0,0
13-
49999999112,202012,0001,0,0,0
14-
49999999113,202012,0002,1,1,0
15-
49999999114,202012,0002,1,1,0
16-
49999999115,202012,0002,1,1,1
17-
49999999116,202012,0002,1,1,1
18-
49999999117,202012,0002,1,1,0
19-
49999999118,202012,0002,1,1,0
20-
49999999119,202012,0002,1,1,0
21-
49999999120,202012,0002,1,1,0
22-
49999999121,202012,0002,1,1,0
23-
49999999122,202012,0002,1,1,1
24-
49999999123,202012,0002,1,1,0
25-
49999999124,202012,0002,0,1,0
26-
49999999125,202012,0002,0,1,0
27-
49999999126,202012,0002,0,1,0
28-
49999999127,202012,0002,0,1,0
29-
49999999128,202012,0002,0,1,0
30-
49999999129,202012,0002,0,1,0
31-
49999999130,202012,0002,0,1,0
32-
49999999131,202012,0003,1,1,0
33-
49999999132,202012,0003,1,1,0
34-
49999999133,202012,0003,1,1,0
35-
49999999134,202012,0003,1,1,0
36-
49999999135,202012,0003,0,1,0
37-
49999999136,202012,0003,0,1,0
38-
49999999137,202012,0003,0,1,0
39-
49999999138,202012,0003,0,1,0
40-
49999999139,202012,0004,1,0,0
41-
49999999140,202012,0004,1,0,0
42-
49999999141,202012,0004,0,0,0
43-
49999999142,202012,0004,0,0,0
44-
49999999143,202012,0004,0,0,0
45-
49999999144,202012,0004,0,0,0
46-
49999999145,202012,0004,0,0,0
47-
49999999146,202012,0004,0,0,0
48-
49999999106,202101,0001,1,0,0
49-
49999999110,202101,0001,1,0,0
50-
49999999150,202101,0001,0,0,0
51-
49999999160,202101,0001,0,0,0
52-
49999999116,202101,0002,1,0,0
53-
49999999119,202101,0002,1,0,0
54-
49999999129,202101,0002,1,0,0
55-
49999999130,202101,0002,0,0,0
2+
49999999101,202012,0001,1,False,0
3+
49999999102,202012,0001,1,False,0
4+
49999999103,202012,0001,1,False,0
5+
49999999104,202012,0001,1,False,0
6+
49999999105,202012,0001,1,False,0
7+
49999999106,202012,0001,1,False,0
8+
49999999107,202012,0001,1,False,0
9+
49999999108,202012,0001,1,False,0
10+
49999999109,202012,0001,0,False,0
11+
49999999110,202012,0001,0,False,0
12+
49999999111,202012,0001,0,False,0
13+
49999999112,202012,0001,0,False,0
14+
49999999113,202012,0002,1,True,0
15+
49999999114,202012,0002,1,True,0
16+
49999999115,202012,0002,1,True,1
17+
49999999116,202012,0002,1,True,1
18+
49999999117,202012,0002,1,True,0
19+
49999999118,202012,0002,1,True,0
20+
49999999119,202012,0002,1,True,0
21+
49999999120,202012,0002,1,True,0
22+
49999999121,202012,0002,1,True,0
23+
49999999122,202012,0002,1,True,1
24+
49999999123,202012,0002,1,True,0
25+
49999999124,202012,0002,0,True,0
26+
49999999125,202012,0002,0,True,0
27+
49999999126,202012,0002,0,True,0
28+
49999999127,202012,0002,0,True,0
29+
49999999128,202012,0002,0,True,0
30+
49999999129,202012,0002,0,True,0
31+
49999999130,202012,0002,0,True,0
32+
49999999131,202012,0003,1,True,0
33+
49999999132,202012,0003,1,True,0
34+
49999999133,202012,0003,1,True,0
35+
49999999134,202012,0003,1,True,0
36+
49999999135,202012,0003,0,True,0
37+
49999999136,202012,0003,0,True,0
38+
49999999137,202012,0003,0,True,0
39+
49999999138,202012,0003,0,True,0
40+
49999999139,202012,0004,1,False,0
41+
49999999140,202012,0004,1,False,0
42+
49999999141,202012,0004,0,False,0
43+
49999999142,202012,0004,0,False,0
44+
49999999143,202012,0004,0,False,0
45+
49999999144,202012,0004,0,False,0
46+
49999999145,202012,0004,0,False,0
47+
49999999146,202012,0004,0,False,0
48+
49999999106,202101,0001,1,False,0
49+
49999999110,202101,0001,1,False,0
50+
49999999150,202101,0001,0,False,0
51+
49999999160,202101,0001,0,False,0
52+
49999999116,202101,0002,1,False,0
53+
49999999119,202101,0002,1,False,0
54+
49999999129,202101,0002,1,False,0
55+
49999999130,202101,0002,0,False,0

‎tests/fixture_data/estimation/methodology_scenarios/02_expansion_h-value_input.csv

-55
This file was deleted.

‎tests/fixture_data/estimation/methodology_scenarios/02_expansion_h-value_output.csv

-7
This file was deleted.

‎tests/fixture_data/estimation/methodology_scenarios/02_separate_ratio_input.csv

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
reference,period,strata,sample_inclusion_marker,H,death_marker,auxiliary,calibration_group
2+
49999999101,202012,0001,1,False,0,5,0001
3+
49999999102,202012,0001,1,False,0,15,0001
4+
49999999103,202012,0001,1,False,0,2,0001
5+
49999999104,202012,0001,1,False,0,11,0001
6+
49999999105,202012,0001,1,False,0,34,0001
7+
49999999106,202012,0001,1,False,0,15,0001
8+
49999999107,202012,0001,1,False,0,6,0001
9+
49999999108,202012,0001,1,False,0,12,0001
10+
49999999109,202012,0001,0,False,0,22,0001
11+
49999999110,202012,0001,0,False,0,2,0001
12+
49999999111,202012,0001,0,False,0,8,0001
13+
49999999112,202012,0001,0,False,0,17,0001
14+
49999999113,202012,0002,1,True,1,11,0002
15+
49999999114,202012,0002,1,True,0,5,0002
16+
49999999115,202012,0002,1,True,0,4,0002
17+
49999999116,202012,0002,1,True,0,5,0002
18+
49999999117,202012,0002,1,True,0,12,0002
19+
49999999118,202012,0002,1,True,1,10,0002
20+
49999999119,202012,0002,1,True,0,11,0002
21+
49999999120,202012,0002,1,True,0,2,0002
22+
49999999121,202012,0002,1,True,0,14,0002
23+
49999999122,202012,0002,1,True,0,6,0002
24+
49999999123,202012,0002,0,True,0,6,0002
25+
49999999124,202012,0002,0,True,0,8,0002
26+
49999999125,202012,0002,0,True,0,1,0002
27+
49999999126,202012,0002,0,True,0,3,0002
28+
49999999127,202012,0002,0,True,0,11,0002
29+
49999999128,202012,0002,0,True,0,10,0002
30+
49999999129,202012,0002,0,True,0,9,0002
31+
49999999130,202012,0002,0,True,0,11,0002
32+
49999999131,202012,0003,1,True,0,3,0003
33+
49999999132,202012,0003,1,True,0,8,0003
34+
49999999133,202012,0003,1,True,0,3,0003
35+
49999999134,202012,0003,1,True,1,9,0003
36+
49999999135,202012,0003,0,True,0,7,0003
37+
49999999136,202012,0003,0,True,0,3,0003
38+
49999999137,202012,0003,0,True,0,17,0003
39+
49999999138,202012,0003,0,True,0,19,0003
40+
49999999139,202012,0004,1,False,0,5,0004
41+
49999999140,202012,0004,1,False,0,3,0004
42+
49999999141,202012,0004,0,False,0,22,0004
43+
49999999142,202012,0004,0,False,0,15,0004
44+
49999999143,202012,0004,0,False,0,8,0004
45+
49999999144,202012,0004,0,False,0,6,0004
46+
49999999145,202012,0004,0,False,0,2,0004
47+
49999999146,202012,0004,0,False,0,10,0004
48+
49999999106,202101,0001,1,False,0,2,0001
49+
49999999110,202101,0001,1,False,0,7,0001
50+
49999999150,202101,0001,0,False,0,2,0001
51+
49999999160,202101,0001,0,False,0,13,0001
52+
49999999116,202101,0002,1,False,0,3,0002
53+
49999999119,202101,0002,1,False,0,5,0002
54+
49999999129,202101,0002,1,False,0,8,0002
55+
49999999130,202101,0002,0,False,0,3,0002

‎tests/fixture_data/estimation/methodology_scenarios/03_combined_ratio_input.csv

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
reference,period,strata,sample_inclusion_marker,H,death_marker,auxiliary,calibration_group
2+
1,202012,0001,1,True,1,10,A
3+
2,202012,0001,1,True,0,5,A
4+
3,202012,0001,1,True,0,6,A
5+
4,202012,0001,1,True,0,11,A
6+
5,202012,0001,1,True,1,42,A
7+
6,202012,0001,1,True,0,21,A
8+
7,202012,0001,1,True,0,5,A
9+
8,202012,0001,0,True,0,15,A
10+
9,202012,0001,0,True,0,17,A
11+
10,202012,0001,0,True,0,5,A
12+
11,202012,0001,0,True,0,3,A
13+
12,202012,0001,0,True,0,11,A
14+
13,202012,0002,1,True,0,1,A
15+
14,202012,0002,1,True,0,5,A
16+
15,202012,0002,1,True,1,12,A
17+
16,202012,0002,1,True,1,11,A
18+
17,202012,0002,1,True,0,15,A
19+
18,202012,0002,1,True,0,10,A
20+
19,202012,0002,1,True,0,8,A
21+
20,202012,0002,1,True,1,2,A
22+
21,202012,0002,1,True,1,11,A
23+
22,202012,0002,0,True,0,5,A
24+
23,202012,0002,0,True,0,1,A
25+
24,202012,0002,0,True,0,10,A
26+
25,202012,0002,0,True,0,2,A
27+
26,202012,0002,0,True,0,5,A
28+
27,202012,0002,0,True,0,5,A
29+
28,202012,0002,0,True,0,16,A
30+
29,202012,0002,0,True,0,12,A
31+
30,202012,0002,0,True,0,8,A
32+
31,202012,0003,1,False,0,2,B
33+
32,202012,0003,1,False,0,11,B
34+
33,202012,0003,1,False,0,8,B
35+
34,202012,0003,0,False,0,12,B
36+
35,202012,0003,0,False,0,5,B
37+
36,202012,0003,0,False,0,12,B
38+
37,202012,0003,0,False,0,18,B
39+
38,202012,0003,0,False,0,11,B
40+
39,202012,0004,1,False,0,12,B
41+
40,202012,0004,1,False,0,5,B
42+
41,202012,0004,1,False,0,12,B
43+
42,202012,0004,1,False,0,11,B
44+
43,202012,0004,0,False,0,8,B
45+
44,202012,0004,0,False,0,5,B
46+
45,202012,0004,0,False,0,1,B
47+
46,202012,0004,0,False,0,6,B
48+
1,202101,0001,1,False,0,2,A
49+
2,202101,0001,0,False,0,4,A
50+
3,202101,0001,0,False,0,5,A
51+
10,202101,0001,0,False,0,9,A
52+
42,202101,0002,1,False,0,11,A
53+
43,202101,0002,1,False,0,6,A
54+
55,202101,0002,1,False,0,8,A
55+
56,202101,0002,0,False,0,11,A
56+

‎tests/fixture_data/estimation/methodology_scenarios/03_separate_ratio_input.csv

-55
This file was deleted.

‎tests/fixture_data/estimation/methodology_scenarios/04_combined_ratio_input.csv

-56
This file was deleted.

‎tests/fixture_data/estimation/unit/basic_functionality.csv

+36-36
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
reference,period,strata,sample_inclusion_marker,death_marker,H,auxiliary,calibration_group
2-
1,202009,10,1,0,1,10,10
3-
2,202009,10,1,0,1,10,10
4-
3,202009,10,1,1,1,10,10
5-
4,202009,10,0,0,1,10,10
6-
5,202009,10,0,0,1,10,10
7-
6,202009,10,0,1,1,10,10
8-
7,202009,11,1,0,1,15,11
9-
8,202009,11,1,0,1,15,11
10-
9,202009,11,1,1,1,15,11
11-
10,202009,11,0,0,1,15,11
12-
11,202009,11,0,0,1,15,11
13-
12,202009,11,0,1,1,15,11
14-
13,202009,12,1,0,0,20,12
15-
14,202009,12,1,0,0,20,12
16-
15,202009,12,1,1,0,20,12
17-
16,202009,12,0,0,0,20,12
18-
17,202009,12,0,0,0,20,12
19-
18,202009,12,0,1,0,20,12
20-
1,202010,10,1,0,1,10,10
21-
2,202010,10,1,0,1,10,10
22-
3,202010,10,1,1,1,10,10
23-
4,202010,10,0,0,1,10,10
24-
5,202010,10,0,0,1,10,10
25-
6,202010,10,0,1,1,10,10
26-
7,202010,11,1,0,1,15,11
27-
8,202010,11,1,0,1,15,11
28-
9,202010,11,1,1,1,15,11
29-
10,202010,11,0,0,1,15,11
30-
11,202010,11,0,0,1,15,11
31-
12,202010,11,0,1,1,15,11
32-
13,202010,12,1,0,0,20,12
33-
14,202010,12,1,0,0,20,12
34-
15,202010,12,1,1,0,20,12
35-
16,202010,12,0,0,0,20,12
36-
17,202010,12,0,0,0,20,12
37-
18,202010,12,0,1,0,20,12
2+
1,202009,10,1,0,True,10,10
3+
2,202009,10,1,0,True,10,10
4+
3,202009,10,1,1,True,10,10
5+
4,202009,10,0,0,True,10,10
6+
5,202009,10,0,0,True,10,10
7+
6,202009,10,0,1,True,10,10
8+
7,202009,11,1,0,True,15,11
9+
8,202009,11,1,0,True,15,11
10+
9,202009,11,1,1,True,15,11
11+
10,202009,11,0,0,True,15,11
12+
11,202009,11,0,0,True,15,11
13+
12,202009,11,0,1,True,15,11
14+
13,202009,12,1,0,False,20,12
15+
14,202009,12,1,0,False,20,12
16+
15,202009,12,1,1,False,20,12
17+
16,202009,12,0,0,False,20,12
18+
17,202009,12,0,0,False,20,12
19+
18,202009,12,0,1,False,20,12
20+
1,202010,10,1,0,True,10,10
21+
2,202010,10,1,0,True,10,10
22+
3,202010,10,1,1,True,10,10
23+
4,202010,10,0,0,True,10,10
24+
5,202010,10,0,0,True,10,10
25+
6,202010,10,0,1,True,10,10
26+
7,202010,11,1,0,True,15,11
27+
8,202010,11,1,0,True,15,11
28+
9,202010,11,1,1,True,15,11
29+
10,202010,11,0,0,True,15,11
30+
11,202010,11,0,0,True,15,11
31+
12,202010,11,0,1,True,15,11
32+
13,202010,12,1,0,False,20,12
33+
14,202010,12,1,0,False,20,12
34+
15,202010,12,1,1,False,20,12
35+
16,202010,12,0,0,False,20,12
36+
17,202010,12,0,0,False,20,12
37+
18,202010,12,0,1,False,20,12

‎tests/fixture_data/estimation/unit/duplicate_references.csv

+36-36
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
reference,period,strata,sample_inclusion_marker,death_marker,H,auxiliary,calibration_group
2-
1,202009,10,1,0,1,10,10
3-
2,202009,10,1,0,1,10,10
4-
3,202009,10,1,1,1,10,10
5-
4,202009,10,0,0,1,10,10
6-
5,202009,10,0,0,1,10,10
7-
6,202009,10,0,1,1,10,10
8-
7,202009,11,1,0,1,15,11
9-
8,202009,11,1,0,1,15,11
10-
9,202009,11,1,1,1,15,11
11-
10,202009,11,0,0,1,15,11
12-
11,202009,11,0,0,1,15,11
13-
12,202009,11,0,1,1,15,11
14-
13,202009,12,1,0,0,20,12
15-
14,202009,12,1,0,0,20,12
16-
15,202009,12,1,1,0,20,12
17-
16,202009,12,0,0,0,20,12
18-
17,202009,12,0,0,0,20,12
19-
17,202009,12,0,1,0,20,12
20-
1,202010,10,1,0,1,10,10
21-
2,202010,10,1,0,1,10,10
22-
3,202010,10,1,1,1,10,10
23-
4,202010,10,0,0,1,10,10
24-
5,202010,10,0,0,1,10,10
25-
6,202010,10,0,1,1,10,10
26-
7,202010,11,1,0,1,15,11
27-
8,202010,11,1,0,1,15,11
28-
9,202010,11,1,1,1,15,11
29-
10,202010,11,0,0,1,15,11
30-
11,202010,11,0,0,1,15,11
31-
12,202010,11,0,1,1,15,11
32-
13,202010,12,1,0,0,20,12
33-
14,202010,12,1,0,0,20,12
34-
15,202010,12,1,1,0,20,12
35-
16,202010,12,0,0,0,20,12
36-
17,202010,12,0,0,0,20,12
37-
18,202010,12,0,1,0,20,12
2+
1,202009,10,1,0,True,10,10
3+
2,202009,10,1,0,True,10,10
4+
3,202009,10,1,1,True,10,10
5+
4,202009,10,0,0,True,10,10
6+
5,202009,10,0,0,True,10,10
7+
6,202009,10,0,1,True,10,10
8+
7,202009,11,1,0,True,15,11
9+
8,202009,11,1,0,True,15,11
10+
9,202009,11,1,1,True,15,11
11+
10,202009,11,0,0,True,15,11
12+
11,202009,11,0,0,True,15,11
13+
12,202009,11,0,1,True,15,11
14+
13,202009,12,1,0,False,20,12
15+
14,202009,12,1,0,False,20,12
16+
15,202009,12,1,1,False,20,12
17+
16,202009,12,0,0,False,20,12
18+
17,202009,12,0,0,False,20,12
19+
17,202009,12,0,1,False,20,12
20+
1,202010,10,1,0,True,10,10
21+
2,202010,10,1,0,True,10,10
22+
3,202010,10,1,1,True,10,10
23+
4,202010,10,0,0,True,10,10
24+
5,202010,10,0,0,True,10,10
25+
6,202010,10,0,1,True,10,10
26+
7,202010,11,1,0,True,15,11
27+
8,202010,11,1,0,True,15,11
28+
9,202010,11,1,1,True,15,11
29+
10,202010,11,0,0,True,15,11
30+
11,202010,11,0,0,True,15,11
31+
12,202010,11,0,1,True,15,11
32+
13,202010,12,1,0,False,20,12
33+
14,202010,12,1,0,False,20,12
34+
15,202010,12,1,1,False,20,12
35+
16,202010,12,0,0,False,20,12
36+
17,202010,12,0,0,False,20,12
37+
18,202010,12,0,1,False,20,12

‎tests/fixture_data/estimation/unit/mixed_h-values_in_strata.csv

+36-36
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
reference,period,strata,sample_inclusion_marker,death_marker,H,auxiliary,calibration_group
2-
1,202009,10,1,0,0,10,10
3-
2,202009,10,1,0,1,10,10
4-
3,202009,10,1,1,1,10,10
5-
4,202009,10,0,0,1,10,10
6-
5,202009,10,0,0,1,10,10
7-
6,202009,10,0,1,1,10,10
8-
7,202009,11,1,0,1,15,11
9-
8,202009,11,1,0,1,15,11
10-
9,202009,11,1,1,1,15,11
11-
10,202009,11,0,0,1,15,11
12-
11,202009,11,0,0,1,15,11
13-
12,202009,11,0,1,1,15,11
14-
13,202009,12,1,0,0,20,12
15-
14,202009,12,1,0,0,20,12
16-
15,202009,12,1,1,0,20,12
17-
16,202009,12,0,0,0,20,12
18-
17,202009,12,0,0,0,20,12
19-
18,202009,12,0,1,0,20,12
20-
1,202010,10,1,0,1,10,10
21-
2,202010,10,1,0,1,10,10
22-
3,202010,10,1,1,1,10,10
23-
4,202010,10,0,0,1,10,10
24-
5,202010,10,0,0,1,10,10
25-
6,202010,10,0,1,1,10,10
26-
7,202010,11,1,0,1,15,11
27-
8,202010,11,1,0,1,15,11
28-
9,202010,11,1,1,1,15,11
29-
10,202010,11,0,0,1,15,11
30-
11,202010,11,0,0,1,15,11
31-
12,202010,11,0,1,1,15,11
32-
13,202010,12,1,0,0,20,12
33-
14,202010,12,1,0,0,20,12
34-
15,202010,12,1,1,0,20,12
35-
16,202010,12,0,0,0,20,12
36-
17,202010,12,0,0,0,20,12
37-
18,202010,12,0,1,0,20,12
2+
1,202009,10,1,0,False,10,10
3+
2,202009,10,1,0,True,10,10
4+
3,202009,10,1,1,True,10,10
5+
4,202009,10,0,0,True,10,10
6+
5,202009,10,0,0,True,10,10
7+
6,202009,10,0,1,True,10,10
8+
7,202009,11,1,0,True,15,11
9+
8,202009,11,1,0,True,15,11
10+
9,202009,11,1,1,True,15,11
11+
10,202009,11,0,0,True,15,11
12+
11,202009,11,0,0,True,15,11
13+
12,202009,11,0,1,True,15,11
14+
13,202009,12,1,0,False,20,12
15+
14,202009,12,1,0,False,20,12
16+
15,202009,12,1,1,False,20,12
17+
16,202009,12,0,0,False,20,12
18+
17,202009,12,0,0,False,20,12
19+
18,202009,12,0,1,False,20,12
20+
1,202010,10,1,0,True,10,10
21+
2,202010,10,1,0,True,10,10
22+
3,202010,10,1,1,True,10,10
23+
4,202010,10,0,0,True,10,10
24+
5,202010,10,0,0,True,10,10
25+
6,202010,10,0,1,True,10,10
26+
7,202010,11,1,0,True,15,11
27+
8,202010,11,1,0,True,15,11
28+
9,202010,11,1,1,True,15,11
29+
10,202010,11,0,0,True,15,11
30+
11,202010,11,0,0,True,15,11
31+
12,202010,11,0,1,True,15,11
32+
13,202010,12,1,0,False,20,12
33+
14,202010,12,1,0,False,20,12
34+
15,202010,12,1,1,False,20,12
35+
16,202010,12,0,0,False,20,12
36+
17,202010,12,0,0,False,20,12
37+
18,202010,12,0,1,False,20,12

‎tests/fixture_data/estimation/unit/non_boolean_markers.csv

+36-36
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
reference,period,strata,sample_inclusion_marker,death_marker,H,auxiliary,calibration_group
2-
1,202009,10,2,0,1,10,10
3-
2,202009,10,1,0,1,10,10
4-
3,202009,10,1,1,1,10,10
5-
4,202009,10,0,0,1,10,10
6-
5,202009,10,0,0,1,10,10
7-
6,202009,10,0,1,1,10,10
8-
7,202009,11,1,0,1,15,11
9-
8,202009,11,1,0,1,15,11
10-
9,202009,11,1,1,1,15,11
11-
10,202009,11,0,0,1,15,11
12-
11,202009,11,0,0,1,15,11
13-
12,202009,11,0,1,1,15,11
14-
13,202009,12,1,0,0,20,12
15-
14,202009,12,1,0,0,20,12
16-
15,202009,12,1,1,0,20,12
17-
16,202009,12,0,0,0,20,12
18-
17,202009,12,0,0,0,20,12
19-
18,202009,12,0,1,0,20,12
20-
1,202010,10,1,0,1,10,10
21-
2,202010,10,1,0,1,10,10
22-
3,202010,10,1,1,1,10,10
23-
4,202010,10,0,0,1,10,10
24-
5,202010,10,0,0,1,10,10
25-
6,202010,10,0,1,1,10,10
26-
7,202010,11,1,0,1,15,11
27-
8,202010,11,1,0,1,15,11
28-
9,202010,11,1,1,1,15,11
29-
10,202010,11,0,0,1,15,11
30-
11,202010,11,0,0,1,15,11
31-
12,202010,11,0,1,1,15,11
32-
13,202010,12,1,0,0,20,12
33-
14,202010,12,1,0,0,20,12
34-
15,202010,12,1,1,0,20,12
35-
16,202010,12,0,0,0,20,12
36-
17,202010,12,0,0,0,20,12
37-
18,202010,12,0,1,0,20,12
2+
1,202009,10,2,0,True,10,10
3+
2,202009,10,1,0,True,10,10
4+
3,202009,10,1,1,True,10,10
5+
4,202009,10,0,0,True,10,10
6+
5,202009,10,0,0,True,10,10
7+
6,202009,10,0,1,True,10,10
8+
7,202009,11,1,0,True,15,11
9+
8,202009,11,1,0,True,15,11
10+
9,202009,11,1,1,True,15,11
11+
10,202009,11,0,0,True,15,11
12+
11,202009,11,0,0,True,15,11
13+
12,202009,11,0,1,True,15,11
14+
13,202009,12,1,0,False,20,12
15+
14,202009,12,1,0,False,20,12
16+
15,202009,12,1,1,False,20,12
17+
16,202009,12,0,0,False,20,12
18+
17,202009,12,0,0,False,20,12
19+
18,202009,12,0,1,False,20,12
20+
1,202010,10,1,0,True,10,10
21+
2,202010,10,1,0,True,10,10
22+
3,202010,10,1,1,True,10,10
23+
4,202010,10,0,0,True,10,10
24+
5,202010,10,0,0,True,10,10
25+
6,202010,10,0,1,True,10,10
26+
7,202010,11,1,0,True,15,11
27+
8,202010,11,1,0,True,15,11
28+
9,202010,11,1,1,True,15,11
29+
10,202010,11,0,0,True,15,11
30+
11,202010,11,0,0,True,15,11
31+
12,202010,11,0,1,True,15,11
32+
13,202010,12,1,0,False,20,12
33+
14,202010,12,1,0,False,20,12
34+
15,202010,12,1,1,False,20,12
35+
16,202010,12,0,0,False,20,12
36+
17,202010,12,0,0,False,20,12
37+
18,202010,12,0,1,False,20,12

‎tests/fixture_data/estimation/unit/null_value_present.csv

+36-36
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
reference,period,strata,sample_inclusion_marker,death_marker,H,auxiliary,calibration_group
2-
1,202009,,1,0,1,10,10
3-
2,202009,10,1,0,1,10,10
4-
3,202009,10,1,1,1,10,10
5-
4,202009,10,0,0,1,10,10
6-
5,202009,10,0,0,1,10,10
7-
6,202009,10,0,1,1,10,10
8-
7,202009,11,1,0,1,15,11
9-
8,202009,11,1,0,1,15,11
10-
9,202009,11,1,1,1,15,11
11-
10,202009,11,0,0,1,15,11
12-
11,202009,11,0,0,1,15,11
13-
12,202009,11,0,1,1,15,11
14-
13,202009,12,1,0,0,20,12
15-
14,202009,12,1,0,0,20,12
16-
15,202009,12,1,1,0,20,12
17-
16,202009,12,0,0,0,20,12
18-
17,202009,12,0,0,0,20,12
19-
18,202009,12,0,1,0,20,12
20-
1,202010,10,1,0,1,10,10
21-
2,202010,10,1,0,1,10,10
22-
3,202010,10,1,1,1,10,10
23-
4,202010,10,0,0,1,10,10
24-
5,202010,10,0,0,1,10,10
25-
6,202010,10,0,1,1,10,10
26-
7,202010,11,1,0,1,15,11
27-
8,202010,11,1,0,1,15,11
28-
9,202010,11,1,1,1,15,11
29-
10,202010,11,0,0,1,15,11
30-
11,202010,11,0,0,1,15,11
31-
12,202010,11,0,1,1,15,11
32-
13,202010,12,1,0,0,20,12
33-
14,202010,12,1,0,0,20,12
34-
15,202010,12,1,1,0,20,12
35-
16,202010,12,0,0,0,20,12
36-
17,202010,12,0,0,0,20,12
37-
18,202010,12,0,1,0,20,12
2+
1,202009,,1,0,True,10,10
3+
2,202009,10,1,0,True,10,10
4+
3,202009,10,1,1,True,10,10
5+
4,202009,10,0,0,True,10,10
6+
5,202009,10,0,0,True,10,10
7+
6,202009,10,0,1,True,10,10
8+
7,202009,11,1,0,True,15,11
9+
8,202009,11,1,0,True,15,11
10+
9,202009,11,1,1,True,15,11
11+
10,202009,11,0,0,True,15,11
12+
11,202009,11,0,0,True,15,11
13+
12,202009,11,0,1,True,15,11
14+
13,202009,12,1,0,False,20,12
15+
14,202009,12,1,0,False,20,12
16+
15,202009,12,1,1,False,20,12
17+
16,202009,12,0,0,False,20,12
18+
17,202009,12,0,0,False,20,12
19+
18,202009,12,0,1,False,20,12
20+
1,202010,10,1,0,True,10,10
21+
2,202010,10,1,0,True,10,10
22+
3,202010,10,1,1,True,10,10
23+
4,202010,10,0,0,True,10,10
24+
5,202010,10,0,0,True,10,10
25+
6,202010,10,0,1,True,10,10
26+
7,202010,11,1,0,True,15,11
27+
8,202010,11,1,0,True,15,11
28+
9,202010,11,1,1,True,15,11
29+
10,202010,11,0,0,True,15,11
30+
11,202010,11,0,0,True,15,11
31+
12,202010,11,0,1,True,15,11
32+
13,202010,12,1,0,False,20,12
33+
14,202010,12,1,0,False,20,12
34+
15,202010,12,1,1,False,20,12
35+
16,202010,12,0,0,False,20,12
36+
17,202010,12,0,0,False,20,12
37+
18,202010,12,0,1,False,20,12

‎tests/test_estimation.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
strata_col: "string",
4141
sample_col: "int",
4242
death_col: "int",
43-
h_col: "double",
43+
h_col: "boolean",
4444
auxiliary_col: "double",
4545
calibration_group_col: "string",
4646
design_weight_col: "double",

0 commit comments

Comments
 (0)
Please sign in to comment.