update develop to match master

Model/model_params_with_variant.csv

@@ -0,0 +1,12 @@
+scenalpha,scen,scenario,mag1,mag2,mag2a,mag3,mag3a,mag4,mag5,mag6,mag6a,mag6b,mag7,mag8,mag9,mag10,mag11,mag12,mag13,mag14,mag15,mag16,mag17,mag18,mag19,mag20,mag21,mag22,mag23,mag24,mag25,mag26,traj,ef1_1,ef1_2,t1,t2,t2a,t3,t3a,t4,t5,t6,t6a,t6b,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16,t17,t18,t19,t20,t21,t22,t23,t24,t25,t26,ttraj,tproject,pS1,pS2,pS3,pS4,lambda,beta,hosp1,hosp2,hosp3,hosp4,hosp2b,hosp2c,hosp3b,hosp3c,hosp4b,hosp4c,dh1,dh2,dh3,dh4,dnh1,dnh2,dnh3,dnh4,hlos1,hlos2,hlos3,hlos4,hlos1a,hlos2a,hlos3a,hlos4a,dimmuneA,dimmuneI,n1,n2,n3,n4
+current,april,1,0,0.6719,0.8134,0.8215,0.8411,0.8896,0.8868,0.9117,0.7579,0.611,0.8169,0.8311,0.8226,0.7912,0.7601,0.7055,0.6861,0.6102,0.6648,0.7072,0.8446,0.8452,0.8214,0.786,0.8763,0.7487,0.8223,0.7163,0.7574,0.6236,0.6236,0.6236,0.6236,41,52,59,66,80,94,108,122,136,150,164,178,192,206,220,234,248,262,276,290,304,318,332,346,360,374,388,402,416,430,439,456,0.110023,0.35705,0.561205,0.774879,1.395,0.4793,0.0227054,0.03656527,0.050782,0.0789884,0.03747127,0.02341227,0.049972,0.03312364,0.0724784,0.10043694,0.005504587,0.014716188,0.057513214,0.160570555,0.000013,0.0000822,0.000622705,0.027971448,5.8303,6.366447985,10.54149451,10.53665902,5.5747,5.231230631,8.486187615,8.136581647,190,365,1513005,1685869,1902963,738958
+reduce 5%,april,2,0,0.6719,0.8134,0.8215,0.8411,0.8896,0.8868,0.9117,0.7579,0.611,0.8169,0.8311,0.8226,0.7912,0.7601,0.7055,0.6861,0.6102,0.6648,0.7072,0.8446,0.8452,0.8214,0.786,0.8763,0.7487,0.8223,0.7163,0.7574,0.6236,0.6236,0.6236,0.5736,41,52,59,66,80,94,108,122,136,150,164,178,192,206,220,234,248,262,276,290,304,318,332,346,360,374,388,402,416,430,439,456,0.110023,0.35705,0.561205,0.774879,1.395,0.4793,0.0227054,0.03656527,0.050782,0.0789884,0.03747127,0.02341227,0.049972,0.03312364,0.0724784,0.10043694,0.005504587,0.014716188,0.057513214,0.160570555,0.000013,0.0000822,0.000622705,0.027971448,5.8303,6.366447985,10.54149451,10.53665902,5.5747,5.231230631,8.486187615,8.136581647,190,365,1513005,1685869,1902963,738958
+reduce 7%,april,3,0,0.6719,0.8134,0.8215,0.8411,0.8896,0.8868,0.9117,0.7579,0.611,0.8169,0.8311,0.8226,0.7912,0.7601,0.7055,0.6861,0.6102,0.6648,0.7072,0.8446,0.8452,0.8214,0.786,0.8763,0.7487,0.8223,0.7163,0.7574,0.6236,0.6236,0.6236,0.5536,41,52,59,66,80,94,108,122,136,150,164,178,192,206,220,234,248,262,276,290,304,318,332,346,360,374,388,402,416,430,439,456,0.110023,0.35705,0.561205,0.774879,1.395,0.4793,0.0227054,0.03656527,0.050782,0.0789884,0.03747127,0.02341227,0.049972,0.03312364,0.0724784,0.10043694,0.005504587,0.014716188,0.057513214,0.160570555,0.000013,0.0000822,0.000622705,0.027971448,5.8303,6.366447985,10.54149451,10.53665902,5.5747,5.231230631,8.486187615,8.136581647,190,365,1513005,1685869,1902963,738958
+reduce 12%,april,4,0,0.6719,0.8134,0.8215,0.8411,0.8896,0.8868,0.9117,0.7579,0.611,0.8169,0.8311,0.8226,0.7912,0.7601,0.7055,0.6861,0.6102,0.6648,0.7072,0.8446,0.8452,0.8214,0.786,0.8763,0.7487,0.8223,0.7163,0.7574,0.6236,0.6236,0.6236,0.5036,41,52,59,66,80,94,108,122,136,150,164,178,192,206,220,234,248,262,276,290,304,318,332,346,360,374,388,402,416,430,439,456,0.110023,0.35705,0.561205,0.774879,1.395,0.4793,0.0227054,0.03656527,0.050782,0.0789884,0.03747127,0.02341227,0.049972,0.03312364,0.0724784,0.10043694,0.005504587,0.014716188,0.057513214,0.160570555,0.000013,0.0000822,0.000622705,0.027971448,5.8303,6.366447985,10.54149451,10.53665902,5.5747,5.231230631,8.486187615,8.136581647,190,365,1513005,1685869,1902963,738958
+reduce 17%,april,5,0,0.6719,0.8134,0.8215,0.8411,0.8896,0.8868,0.9117,0.7579,0.611,0.8169,0.8311,0.8226,0.7912,0.7601,0.7055,0.6861,0.6102,0.6648,0.7072,0.8446,0.8452,0.8214,0.786,0.8763,0.7487,0.8223,0.7163,0.7574,0.6236,0.6236,0.6236,0.4536,41,52,59,66,80,94,108,122,136,150,164,178,192,206,220,234,248,262,276,290,304,318,332,346,360,374,388,402,416,430,439,456,0.110023,0.35705,0.561205,0.774879,1.395,0.4793,0.0227054,0.03656527,0.050782,0.0789884,0.03747127,0.02341227,0.049972,0.03312364,0.0724784,0.10043694,0.005504587,0.014716188,0.057513214,0.160570555,0.000013,0.0000822,0.000622705,0.027971448,5.8303,6.366447985,10.54149451,10.53665902,5.5747,5.231230631,8.486187615,8.136581647,190,365,1513005,1685869,1902963,738958
+current,may,6,0,0.6719,0.8134,0.8215,0.8411,0.8896,0.8868,0.9117,0.7579,0.611,0.8169,0.8311,0.8226,0.7912,0.7601,0.7055,0.6861,0.6102,0.6648,0.7072,0.8446,0.8452,0.8214,0.786,0.8763,0.7487,0.8223,0.7163,0.7574,0.6236,0.6236,0.6236,0.6236,41,52,59,66,80,94,108,122,136,150,164,178,192,206,220,234,248,262,276,290,304,318,332,346,360,374,388,402,416,430,439,478,0.110023,0.35705,0.561205,0.774879,1.395,0.4793,0.0227054,0.03656527,0.050782,0.0789884,0.03747127,0.02341227,0.049972,0.03312364,0.0724784,0.10043694,0.005504587,0.014716188,0.057513214,0.160570555,0.000013,0.0000822,0.000622705,0.027971448,5.8303,6.366447985,10.54149451,10.53665902,5.5747,5.231230631,8.486187615,8.136581647,190,365,1513005,1685869,1902963,738958
+reduce 5%,may,7,0,0.6719,0.8134,0.8215,0.8411,0.8896,0.8868,0.9117,0.7579,0.611,0.8169,0.8311,0.8226,0.7912,0.7601,0.7055,0.6861,0.6102,0.6648,0.7072,0.8446,0.8452,0.8214,0.786,0.8763,0.7487,0.8223,0.7163,0.7574,0.6236,0.6236,0.6236,0.5736,41,52,59,66,80,94,108,122,136,150,164,178,192,206,220,234,248,262,276,290,304,318,332,346,360,374,388,402,416,430,439,478,0.110023,0.35705,0.561205,0.774879,1.395,0.4793,0.0227054,0.03656527,0.050782,0.0789884,0.03747127,0.02341227,0.049972,0.03312364,0.0724784,0.10043694,0.005504587,0.014716188,0.057513214,0.160570555,0.000013,0.0000822,0.000622705,0.027971448,5.8303,6.366447985,10.54149451,10.53665902,5.5747,5.231230631,8.486187615,8.136581647,190,365,1513005,1685869,1902963,738958
+reduce 7%,may,8,0,0.6719,0.8134,0.8215,0.8411,0.8896,0.8868,0.9117,0.7579,0.611,0.8169,0.8311,0.8226,0.7912,0.7601,0.7055,0.6861,0.6102,0.6648,0.7072,0.8446,0.8452,0.8214,0.786,0.8763,0.7487,0.8223,0.7163,0.7574,0.6236,0.6236,0.6236,0.5536,41,52,59,66,80,94,108,122,136,150,164,178,192,206,220,234,248,262,276,290,304,318,332,346,360,374,388,402,416,430,439,478,0.110023,0.35705,0.561205,0.774879,1.395,0.4793,0.0227054,0.03656527,0.050782,0.0789884,0.03747127,0.02341227,0.049972,0.03312364,0.0724784,0.10043694,0.005504587,0.014716188,0.057513214,0.160570555,0.000013,0.0000822,0.000622705,0.027971448,5.8303,6.366447985,10.54149451,10.53665902,5.5747,5.231230631,8.486187615,8.136581647,190,365,1513005,1685869,1902963,738958
+reduce 12%,may,9,0,0.6719,0.8134,0.8215,0.8411,0.8896,0.8868,0.9117,0.7579,0.611,0.8169,0.8311,0.8226,0.7912,0.7601,0.7055,0.6861,0.6102,0.6648,0.7072,0.8446,0.8452,0.8214,0.786,0.8763,0.7487,0.8223,0.7163,0.7574,0.6236,0.6236,0.6236,0.5036,41,52,59,66,80,94,108,122,136,150,164,178,192,206,220,234,248,262,276,290,304,318,332,346,360,374,388,402,416,430,439,478,0.110023,0.35705,0.561205,0.774879,1.395,0.4793,0.0227054,0.03656527,0.050782,0.0789884,0.03747127,0.02341227,0.049972,0.03312364,0.0724784,0.10043694,0.005504587,0.014716188,0.057513214,0.160570555,0.000013,0.0000822,0.000622705,0.027971448,5.8303,6.366447985,10.54149451,10.53665902,5.5747,5.231230631,8.486187615,8.136581647,190,365,1513005,1685869,1902963,738958
+reduce 17%,may,10,0,0.6719,0.8134,0.8215,0.8411,0.8896,0.8868,0.9117,0.7579,0.611,0.8169,0.8311,0.8226,0.7912,0.7601,0.7055,0.6861,0.6102,0.6648,0.7072,0.8446,0.8452,0.8214,0.786,0.8763,0.7487,0.8223,0.7163,0.7574,0.6236,0.6236,0.6236,0.4536,41,52,59,66,80,94,108,122,136,150,164,178,192,206,220,234,248,262,276,290,304,318,332,346,360,374,388,402,416,430,439,478,0.110023,0.35705,0.561205,0.774879,1.395,0.4793,0.0227054,0.03656527,0.050782,0.0789884,0.03747127,0.02341227,0.049972,0.03312364,0.0724784,0.10043694,0.005504587,0.014716188,0.057513214,0.160570555,0.000013,0.0000822,0.000622705,0.027971448,5.8303,6.366447985,10.54149451,10.53665902,5.5747,5.231230631,8.486187615,8.136581647,190,365,1513005,1685869,1902963,738958
+week 04/19,trajectories,11,0,0.6719,0.8134,0.8215,0.8411,0.8896,0.8868,0.9117,0.7579,0.611,0.8169,0.8311,0.8226,0.7912,0.7601,0.7055,0.6861,0.6102,0.6648,0.7072,0.8446,0.8452,0.8216,0.7809,0.8716,0.7437,0.8186,0.7163,0.7574,0.6236,0.6236,0.6236,0.6236,41,52,59,66,80,94,108,122,136,150,164,178,192,206,220,234,248,262,276,290,304,318,332,346,360,374,388,402,416,430,439,439,0.110023,0.35705,0.561205,0.774879,1.395,0.4793,0.0227054,0.03656527,0.050782,0.0789884,0.03747127,0.02341227,0.049972,0.03312364,0.0724784,0.10043694,0.005504587,0.014716188,0.057513214,0.160570555,0.000013,0.0000822,0.000622705,0.027971448,5.8303,6.366447985,10.54149451,10.53665902,5.5747,5.231230631,8.486187615,8.136581647,190,365,1513005,1685869,1902963,738958