Solved log distn issue; added mixture and cosine distns

Rucknium · Feb 17, 2022 · a7edfa7 · a7edfa7
1 parent fe2bcfe
commit a7edfa7
Show file tree

Hide file tree

Showing 18 changed files with 276 additions and 81 deletions.
diff --git a/R/OSPEAD-dry-run.R b/R/OSPEAD-dry-run.R
diff --git a/images/dry-run/L_FGT-flavor-1.png b/images/dry-run/L_FGT-flavor-1.png
diff --git a/images/dry-run/L_FGT-flavor-2.png b/images/dry-run/L_FGT-flavor-2.png
diff --git a/images/dry-run/L_MLE-flavor-0.png b/images/dry-run/L_MLE-flavor-0.png
diff --git a/images/dry-run/L_Welfare-flavor-1.png b/images/dry-run/L_Welfare-flavor-1.png
diff --git a/images/dry-run/L_Welfare-flavor-5.png b/images/dry-run/L_Welfare-flavor-5.png
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
@@ -1,16 +1,16 @@
 "f_D","L","flavor","param_1","param_2","param_3"
-"f","L_FGT",1,8.05719252491297,109.952536784803,19.3046757980035
-"f","L_FGT",2,12.5978958350072,51.0377153004329,30.2680011848127
-"f","L_Welfare",1,11.9840267193704,59.1303303747434,29.7422478098935
-"f","L_Welfare",5,12.8427809452998,33.244205814352,25.8240555862385
-"f","L_MLE",0,3.59628472609937,300481.358332403,22.5185453170164
-"gamma","L_FGT",1,6.48456816194793,1.89456483637355,NA
-"gamma","L_FGT",2,5.1506257459866,1.63896788952644,NA
-"gamma","L_Welfare",1,5.79170334040451,1.76046364010705,NA
-"gamma","L_Welfare",5,4.89150486745901,1.28402541668774,NA
-"gamma","L_MLE",0,6.74707527626395,0.929026890047148,NA
-"lnorm","L_FGT",1,1.32544578267069,0.296241359768276,NA
-"lnorm","L_FGT",2,1.23800307568435,0.323337939579835,NA
-"lnorm","L_Welfare",1,1.27141411713503,0.311455783458507,NA
-"lnorm","L_Welfare",5,0.5250732421875,0.511099288016679,NA
-"lnorm","L_MLE",0,1.90675350659741,0.40122196894288,NA
+"f","L_FGT",1,0.0258229189753421,0.470932164556762,7.25500051285172
+"f","L_FGT",2,0.0337806961572826,0.293835987623309,10.2910724459314
+"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
+"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
+"lgamma","L_Welfare",1,5.79177355280041,0.760390615270262,NA
+"lgamma","L_MLE",0,6.61888428299912,0.912322649506276,NA
+"rpln","L_FGT",1,0.235068088539693,4.12093461189479,1.37517796203296
+"rpln","L_FGT",2,0.133401736798986,3.79262710757299,1.20957181325172
+"rpln","L_Welfare",0.5,0.209131778347958,4.02530330697964,1.32059594519246
+"rpln","L_Welfare",1,0.180222199377147,3.92155628969283,1.25216698956246
+"rpln","L_MLE",0,0.443831728736976,4.99453315162395,1.8325076916268
diff --git a/tables/dry-run/performance.csv b/tables/dry-run/performance.csv
@@ -1,6 +1,6 @@
-"L","flavor","f_D.gamma","f_D.lnorm","f_D.f"
-"L_FGT",1,0.113778893365453,0.117158303471642,0.110733297205176
-"L_FGT",2,0.0574428929874666,0.0480854439291773,0.0461219760802895
-"L_Welfare",1,0.195514126489678,0.174381904329582,0.16660468015691
-"L_Welfare",5,38.3356738421929,9.80396820721904,2.43406074316384
-"L_MLE",0,18968945.0299809,19097272.1691623,18974332.125762
+"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