Add GEV distn; Laplace periodic; fix scoping issues with future_lapply

Rucknium · Jul 8, 2022 · 986e145 · 986e145
1 parent 2641675
commit 986e145
Show file tree

Hide file tree

Showing 13 changed files with 161 additions and 73 deletions.
diff --git a/R/OSPEAD-dry-run.R b/R/OSPEAD-dry-run.R
diff --git a/images/dry-run/estimate-div-target/estimate-div-target-L_FGT-flavor-1.png b/images/dry-run/estimate-div-target/estimate-div-target-L_FGT-flavor-1.png
diff --git a/images/dry-run/estimate-div-target/estimate-div-target-L_FGT-flavor-2.png b/images/dry-run/estimate-div-target/estimate-div-target-L_FGT-flavor-2.png
diff --git a/images/dry-run/estimate-div-target/estimate-div-target-L_MLE-flavor-0.png b/images/dry-run/estimate-div-target/estimate-div-target-L_MLE-flavor-0.png
diff --git a/images/dry-run/estimate-div-target/estimate-div-target-L_Welfare-flavor-0.5.png b/images/dry-run/estimate-div-target/estimate-div-target-L_Welfare-flavor-0.5.png
diff --git a/images/dry-run/estimate-div-target/estimate-div-target-L_Welfare-flavor-1.png b/images/dry-run/estimate-div-target/estimate-div-target-L_Welfare-flavor-1.png
diff --git a/images/dry-run/estimate/estimate-L_FGT-flavor-1.png b/images/dry-run/estimate/estimate-L_FGT-flavor-1.png
diff --git a/images/dry-run/estimate/estimate-L_FGT-flavor-2.png b/images/dry-run/estimate/estimate-L_FGT-flavor-2.png
diff --git a/images/dry-run/estimate/estimate-L_MLE-flavor-0.png b/images/dry-run/estimate/estimate-L_MLE-flavor-0.png
diff --git a/images/dry-run/estimate/estimate-L_Welfare-flavor-0.5.png b/images/dry-run/estimate/estimate-L_Welfare-flavor-0.5.png
diff --git a/images/dry-run/estimate/estimate-L_Welfare-flavor-1.png b/images/dry-run/estimate/estimate-L_Welfare-flavor-1.png
diff --git a/tables/dry-run/minimizer-params.csv b/tables/dry-run/minimizer-params.csv
@@ -4,6 +4,11 @@
 "f","L_Welfare",0.5,0.0288808950718405,0.429100499006261,8.10225358969462
 "f","L_Welfare",1,0.0332847988836337,0.382992554942066,9.27177787736757
 "f","L_MLE",0,0.0472845788598647,0.685180711492068,11.5136529476187
+"gev","L_FGT",1,106.006385385711,421.489306825294,2.62669436486397
+"gev","L_FGT",2,-72.746608660382,3.14169314901481e-29,5.74009754947618
+"gev","L_Welfare",0.5,-95.9283989601833,1.92383488244785e-18,3.88203648659631
+"gev","L_Welfare",1,-86.5670745156584,6.27795206645483e-15,4.34318615666134
+"gev","L_MLE",0,99.7319021299796,245.733064921722,2.48473850654117
 "lgamma","L_FGT",1,6.48362873288899,0.894496076201774,NA
 "lgamma","L_FGT",2,5.1494561399815,0.638826991451516,NA
 "lgamma","L_Welfare",0.5,6.24923547932455,0.852103771780026,NA

diff --git a/tables/dry-run/performance.csv b/tables/dry-run/performance.csv
@@ -1,6 +1,6 @@
-"L","flavor","f_D.lgamma","f_D.f","f_D.rpln","f_D.lgamma.f.mix","f_D.lgamma.cosine"
-"L_FGT",1,0.113778867141488,0.109544660269791,0.107349662930036,0.108051543901359,0.113485468008807
-"L_FGT",2,0.0574428913968771,0.0462095226642241,0.0449336724947927,0.0402023848953585,0.0574429135413852
-"L_Welfare",0.5,-1.85420238355917,-1.86812150524091,-1.8703089974283,-1.87213860338171,-1.85429561225997
-"L_Welfare",1,0.19551412892729,0.163490136204828,0.160410771941704,0.162180157596204,0.195514142280518
-"L_MLE",0,76467589.345657,76729722.0110642,76589284.1835327,NA,NA
+"L","flavor","f_D.lgamma","f_D.f","f_D.rpln","f_D.gev","f_D.lgamma.f.mix","f_D.gev.f.mix","f_D.lgamma.periodic.laplace"
+"L_FGT",1,0.113778867141488,0.109544660269791,0.107349662930036,0.116850017535279,0.108051543901359,0.109426238021017,0.11232447690439
+"L_FGT",2,0.0574428913968771,0.0462095226642241,0.0449336724947927,0.0502770837969232,0.0402023848953585,0.0447834021255949,0.0572302135048248
+"L_Welfare",0.5,-1.85420238355917,-1.86812150524091,-1.8703089974283,-1.86084393897906,-1.87213860338171,-1.86972038729008,-1.85514817501787
+"L_Welfare",1,0.195514128927289,0.163490136204828,0.160410771941704,0.17659179996602,0.162180157596204,0.156694078339655,0.194876859144769
+"L_MLE",0,76467589.345657,76729722.0110642,76589284.1835327,77556086.8533189,NA,NA,NA