Skip to content

Commit bc05ecc

Browse files
octonionoctonion
committed
Varsity Cup update.
1 parent 92508b2 commit bc05ecc

File tree

7 files changed

+81
-77
lines changed

7 files changed

+81
-77
lines changed

‎varsity/csv/varsity-2022.csv‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
1+
2022,FNB UWC,,,FNB CUT Ixias,28.03.2022,UWC Stadium
2+
2022,FNB UCT Ikeys,,,FNB Maties,28.03.2022,UCT Rugby Fields
3+
2022,FNB UP-Tuks,,,FNB Wits,28.03.2022,Tuks Stadium
4+
2022,FNB NWU Eagles,,,FNB Madibaz,28.03.2022,Fanie du Toit Sports Ground
5+
2022,FNB UJ,,,FNB UFS Shimlas,28.03.2022,UJ Stadium
6+
2022,FNB Wits,51,12,FNB UWC,21.03.2022,Wits Rugby Stadium
7+
2022,FNB Maties,20,12,FNB NWU Eagles,21.03.2022,Danie Craven Stadium
8+
2022,FNB UP-Tuks,61,12,FNB CUT Ixias,21.03.2022,Tuks Stadium
9+
2022,FNB UFS Shimlas,58,7,FNB UCT Ikeys,21.03.2022,Shimla Park
10+
2022,FNB Madibaz,9,24,FNB UJ,21.03.2022,Madibaz Stadium
111
2022,FNB UWC,19,51,FNB UP-Tuks,14.03.2022,UWC Stadium
212
2022,FNB UJ,27,24,FNB Wits,14.03.2022,UJ Stadium
313
2022,FNB CUT Ixias,19,52,FNB Maties,14.03.2022,CUT Rugby Stadium
414
2022,FNB UFS Shimlas,22,32,FNB NWU Eagles,14.03.2022,Shimla Park
515
2022,FNB UCT Ikeys,33,26,FNB Madibaz,14.03.2022,UCT Rugby Fields
6-
2022,FNB Wits,,,FNB UWC,21.03.2022,Wits Rugby Stadium
7-
2022,FNB Maties,,,FNB NWU Eagles,21.03.2022,Danie Craven Stadium
8-
2022,FNB UP-Tuks,,,FNB CUT Ixias,21.03.2022,Tuks Stadium
9-
2022,FNB UFS Shimlas,,,FNB UCT Ikeys,21.03.2022,Shimla Park
10-
2022,FNB Madibaz,,,FNB UJ,21.03.2022,Madibaz Stadium
1116
2022,FNB Madibaz,36,26,FNB CUT Ixias,07.03.2022,Madibaz Stadium
1217
2022,FNB NWU Eagles,17,8,FNB UP-Tuks,07.03.2022,Fanie du Toit Sports Ground
1318
2022,FNB Maties,40,38,FNB UJ,07.03.2022,Danie Craven Stadium

‎varsity/diagnostics/lmer.txt‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,35 @@
1-
[1] 134 7
2-
[1] 184 7
1+
[1] 60 7
2+
[1] 120 7
33
[1] TRUE
4-
[1] 184 5
5-
start par. = 1 1 1 fn = 2566.955
4+
[1] 120 5
5+
start par. = 1 1 1 fn = 1892.778
66
At return
7-
eval: 120 fn: 2440.1485 par: 0.282379 0.208566 0.171977
8-
(NM) 20: f = 2440.15 at 0.282379 0.208566 0.171977 3.3198 0.0920439
9-
(NM) 40: f = 2440.15 at 0.282379 0.208566 0.171977 3.3198 0.0920439
10-
(NM) 60: f = 2440.15 at 0.282089 0.208717 0.171359 3.31389 0.0918424
11-
(NM) 80: f = 2440.14 at 0.282327 0.208859 0.171851 3.3141 0.0920454
12-
(NM) 100: f = 2440.14 at 0.282417 0.208584 0.171986 3.31426 0.0920748
13-
(NM) 120: f = 2440.14 at 0.282385 0.208588 0.171987 3.31415 0.0921155
14-
(NM) 140: f = 2440.14 at 0.282388 0.208528 0.171972 3.31408 0.092147
15-
(NM) 160: f = 2440.14 at 0.282385 0.208544 0.171971 3.31412 0.0921315
16-
(NM) 180: f = 2440.14 at 0.282382 0.20854 0.171966 3.31411 0.0921382
7+
eval: 97 fn: 1829.1794 par: 0.280343 0.304794 0.222857
8+
(NM) 20: f = 1829.18 at 0.280343 0.304794 0.222857 3.17099 0.238056
9+
(NM) 40: f = 1829.18 at 0.280343 0.304794 0.222857 3.17099 0.238056
10+
(NM) 60: f = 1829.18 at 0.280396 0.304848 0.222818 3.16901 0.238223
11+
(NM) 80: f = 1829.18 at 0.280458 0.304594 0.223048 3.16769 0.238372
12+
(NM) 100: f = 1829.18 at 0.280399 0.30481 0.222905 3.16803 0.238354
13+
(NM) 120: f = 1829.18 at 0.280366 0.30473 0.222841 3.16779 0.238378
14+
(NM) 140: f = 1829.18 at 0.280341 0.304816 0.222846 3.16784 0.238377
15+
(NM) 160: f = 1829.18 at 0.280344 0.304798 0.22285 3.16784 0.238373
1716
Generalized linear mixed model fit by maximum likelihood (Laplace
1817
Approximation) [glmerMod]
1918
Family: poisson ( log )
2019
Formula: gs ~ field + (1 | offense) + (1 | defense) + (1 | game_id)
2120
Data: g
2221
Weights: w
2322
AIC BIC logLik deviance df.resid
24-
2450.145 2466.219 -1220.072 2440.145 179
23+
1839.1788 1853.1162 -914.5894 1829.1788 115
2524
Random effects:
2625
Groups Name Std.Dev.
27-
game_id (Intercept) 0.2824
28-
defense (Intercept) 0.2085
29-
offense (Intercept) 0.1720
30-
Number of obs: 184, groups: game_id, 67; defense, 10; offense, 10
26+
game_id (Intercept) 0.2803
27+
defense (Intercept) 0.3048
28+
offense (Intercept) 0.2229
29+
Number of obs: 120, groups: game_id, 30; defense, 10; offense, 10
3130
Fixed Effects:
3231
(Intercept) fieldoffense_home
33-
3.31411 0.09214
32+
3.1678 0.2384
3433
Generalized linear mixed model fit by maximum likelihood (Laplace
3534
Approximation) [glmerMod]
3635
Family: poisson ( log )
@@ -39,27 +38,27 @@ Formula: gs ~ field + (1 | offense) + (1 | defense) + (1 | game_id)
3938
Weights: w
4039

4140
AIC BIC logLik deviance df.resid
42-
2450.1 2466.2 -1220.1 2440.1 179
41+
1839.2 1853.1 -914.6 1829.2 115
4342

4443
Scaled residuals:
4544
Min 1Q Median 3Q Max
46-
-4.6477 -1.3306 -0.0234 1.2356 4.2688
45+
-4.1704 -1.6734 0.0298 1.5562 4.1806
4746

4847
Random effects:
4948
Groups Name Variance Std.Dev.
50-
game_id (Intercept) 0.07974 0.2824
51-
defense (Intercept) 0.04349 0.2085
52-
offense (Intercept) 0.02957 0.1720
53-
Number of obs: 184, groups: game_id, 67; defense, 10; offense, 10
49+
game_id (Intercept) 0.07859 0.2803
50+
defense (Intercept) 0.09290 0.3048
51+
offense (Intercept) 0.04966 0.2229
52+
Number of obs: 120, groups: game_id, 30; defense, 10; offense, 10
5453

5554
Fixed effects:
5655
Estimate Std. Error z value Pr(>|z|)
57-
(Intercept) 3.31411 0.09395 35.27 < 2e-16 ***
58-
fieldoffense_home 0.09214 0.02286 4.03 5.58e-05 ***
56+
(Intercept) 3.16784 0.13135 24.118 <2e-16 ***
57+
fieldoffense_home 0.23837 0.02571 9.273 <2e-16 ***
5958
---
6059
Signif. codes: 0 ‘***’ 0.001 ‘**’ 0.01 ‘*’ 0.05 ‘.’ 0.1 ‘ ’ 1
6160

6261
Correlation of Fixed Effects:
6362
(Intr)
64-
fildffns_hm -0.127
63+
fildffns_hm -0.109
6564
[1] TRUE

‎varsity/sos/current_ranking.csv‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
rk,team,str,ofs,dfs,sos
2-
1,FNB UP-Tuks,0.40,0.12,-0.28,0.00
3-
2,FNB Maties,0.40,0.15,-0.24,0.04
4-
3,FNB UCT Ikeys,0.27,0.21,-0.06,-0.02
5-
4,FNB NWU Eagles,0.08,-0.05,-0.13,0.09
6-
5,FNB UFS Shimlas,0.08,0.15,0.07,-0.02
7-
6,FNB UJ,0.04,0.04,0.01,0.07
8-
7,FNB Wits,0.00,-0.08,-0.09,0.00
9-
8,FNB CUT Ixias,-0.32,-0.13,0.19,0.05
10-
9,FNB UWC,-0.36,-0.12,0.24,0.04
11-
10,FNB Madibaz,-0.58,-0.27,0.31,0.01
2+
1,FNB Maties,0.49,0.20,-0.29,0.04
3+
2,FNB UFS Shimlas,0.44,0.35,-0.09,-0.05
4+
3,FNB UP-Tuks,0.30,-0.05,-0.35,-0.02
5+
4,FNB UJ,0.26,0.14,-0.12,0.00
6+
5,FNB Wits,0.15,-0.01,-0.17,-0.05
7+
6,FNB NWU Eagles,0.08,-0.14,-0.22,0.10
8+
7,FNB UCT Ikeys,-0.12,0.04,0.16,0.03
9+
8,FNB CUT Ixias,-0.42,-0.05,0.37,0.10
10+
9,FNB Madibaz,-0.59,-0.37,0.22,-0.02
11+
10,FNB UWC,-0.60,-0.09,0.51,0.08

‎varsity/sos/current_ranking.txt‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,30 @@ CREATE TABLE
33
INSERT 0 10
44
rk | team | str | ofs | dfs | sos
55
----+-----------------+-------+-------+-------+-------
6-
1 | FNB UP-Tuks | 0.40 | 0.12 | -0.28 | 0.00
7-
2 | FNB Maties | 0.40 | 0.15 | -0.24 | 0.04
8-
3 | FNB UCT Ikeys | 0.27 | 0.21 | -0.06 | -0.02
9-
4 | FNB NWU Eagles | 0.08 | -0.05 | -0.13 | 0.09
10-
5 | FNB UFS Shimlas | 0.08 | 0.15 | 0.07 | -0.02
11-
6 | FNB UJ | 0.04 | 0.04 | 0.01 | 0.07
12-
7 | FNB Wits | 0.00 | -0.08 | -0.09 | 0.00
13-
8 | FNB CUT Ixias | -0.32 | -0.13 | 0.19 | 0.05
14-
9 | FNB UWC | -0.36 | -0.12 | 0.24 | 0.04
15-
10 | FNB Madibaz | -0.58 | -0.27 | 0.31 | 0.01
6+
1 | FNB Maties | 0.49 | 0.20 | -0.29 | 0.04
7+
2 | FNB UFS Shimlas | 0.44 | 0.35 | -0.09 | -0.05
8+
3 | FNB UP-Tuks | 0.30 | -0.05 | -0.35 | -0.02
9+
4 | FNB UJ | 0.26 | 0.14 | -0.12 | 0.00
10+
5 | FNB Wits | 0.15 | -0.01 | -0.17 | -0.05
11+
6 | FNB NWU Eagles | 0.08 | -0.14 | -0.22 | 0.10
12+
7 | FNB UCT Ikeys | -0.12 | 0.04 | 0.16 | 0.03
13+
8 | FNB CUT Ixias | -0.42 | -0.05 | 0.37 | 0.10
14+
9 | FNB Madibaz | -0.59 | -0.37 | 0.22 | -0.02
15+
10 | FNB UWC | -0.60 | -0.09 | 0.51 | 0.08
1616
(10 rows)
1717

1818
rk | team | str | ofs | dfs | sos
1919
----+-----------------+-------+-------+-------+-------
20-
1 | FNB UP-Tuks | 0.40 | 0.12 | -0.28 | 0.00
21-
2 | FNB Maties | 0.40 | 0.15 | -0.24 | 0.04
22-
3 | FNB UCT Ikeys | 0.27 | 0.21 | -0.06 | -0.02
23-
4 | FNB NWU Eagles | 0.08 | -0.05 | -0.13 | 0.09
24-
5 | FNB UFS Shimlas | 0.08 | 0.15 | 0.07 | -0.02
25-
6 | FNB UJ | 0.04 | 0.04 | 0.01 | 0.07
26-
7 | FNB Wits | 0.00 | -0.08 | -0.09 | 0.00
27-
8 | FNB CUT Ixias | -0.32 | -0.13 | 0.19 | 0.05
28-
9 | FNB UWC | -0.36 | -0.12 | 0.24 | 0.04
29-
10 | FNB Madibaz | -0.58 | -0.27 | 0.31 | 0.01
20+
1 | FNB Maties | 0.49 | 0.20 | -0.29 | 0.04
21+
2 | FNB UFS Shimlas | 0.44 | 0.35 | -0.09 | -0.05
22+
3 | FNB UP-Tuks | 0.30 | -0.05 | -0.35 | -0.02
23+
4 | FNB UJ | 0.26 | 0.14 | -0.12 | 0.00
24+
5 | FNB Wits | 0.15 | -0.01 | -0.17 | -0.05
25+
6 | FNB NWU Eagles | 0.08 | -0.14 | -0.22 | 0.10
26+
7 | FNB UCT Ikeys | -0.12 | 0.04 | 0.16 | 0.03
27+
8 | FNB CUT Ixias | -0.42 | -0.05 | 0.37 | 0.10
28+
9 | FNB Madibaz | -0.59 | -0.37 | 0.22 | -0.02
29+
10 | FNB UWC | -0.60 | -0.09 | 0.51 | 0.08
3030
(10 rows)
3131

3232
COPY 10

‎varsity/sos/lmer.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ r.team_score::float as gs,
2020
from varsity.results r
2121
2222
where
23-
r.year between 2021 and 2022
23+
r.year between 2022 and 2022
2424
2525
;")
2626

‎varsity/sos/predictions.csv‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
date,home,away,e_home,e_away,e_d
2-
2022-03-21,FNB Madibaz,FNB UJ,23.06,39.09,-16.04
3-
2022-03-21,FNB Maties,FNB NWU Eagles,30.89,20.53,10.36
4-
2022-03-21,FNB UFS Shimlas,FNB UCT Ikeys,33.00,36.52,-3.53
5-
2022-03-21,FNB UP-Tuks,FNB CUT Ixias,41.32,18.39,22.93
6-
2022-03-21,FNB Wits,FNB UWC,35.22,22.28,12.94
2+
2022-03-28,FNB NWU Eagles,FNB Madibaz,32.47,13.10,19.37
3+
2022-03-28,FNB UCT Ikeys,FNB Maties,23.34,33.84,-10.50
4+
2022-03-28,FNB UJ,FNB UFS Shimlas,31.76,29.95,1.81
5+
2022-03-28,FNB UP-Tuks,FNB Wits,24.31,16.56,7.75
6+
2022-03-28,FNB UWC,FNB CUT Ixias,39.86,37.70,2.16

‎varsity/sos/predictions.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
BEGIN
2-
date | home | away | e_home | e_away | e_d
3-
------------+-----------------+----------------+--------+--------+--------
4-
2022-03-21 | FNB Madibaz | FNB UJ | 23.06 | 39.09 | -16.04
5-
2022-03-21 | FNB Maties | FNB NWU Eagles | 30.89 | 20.53 | 10.36
6-
2022-03-21 | FNB UFS Shimlas | FNB UCT Ikeys | 33.00 | 36.52 | -3.53
7-
2022-03-21 | FNB UP-Tuks | FNB CUT Ixias | 41.32 | 18.39 | 22.93
8-
2022-03-21 | FNB Wits | FNB UWC | 35.22 | 22.28 | 12.94
2+
date | home | away | e_home | e_away | e_d
3+
------------+----------------+-----------------+--------+--------+--------
4+
2022-03-28 | FNB NWU Eagles | FNB Madibaz | 32.47 | 13.10 | 19.37
5+
2022-03-28 | FNB UCT Ikeys | FNB Maties | 23.34 | 33.84 | -10.50
6+
2022-03-28 | FNB UJ | FNB UFS Shimlas | 31.76 | 29.95 | 1.81
7+
2022-03-28 | FNB UP-Tuks | FNB Wits | 24.31 | 16.56 | 7.75
8+
2022-03-28 | FNB UWC | FNB CUT Ixias | 39.86 | 37.70 | 2.16
99
(5 rows)
1010

1111
COPY 5

0 commit comments

Comments
 (0)