Merge branch 'VanAndelInstitute:main' into main

ttriche · Mar 21, 2023 · 2b256e1 · 2b256e1
2 parents f3b4ad2 + f2a2570
commit 2b256e1
Show file tree

Hide file tree

Showing 2 changed files with 325 additions and 2 deletions.
diff --git a/R/est_pow.R b/R/est_pow.R
@@ -59,8 +59,8 @@ est_pow = function(n,alpha,nsim,dist,params,tests){
 
   if("mclust" %in% tests){
     pwr.df = rbind(pwr.df,data.frame(N = n, Test = "Mclust",
-                                     power = sum(sapply(n.dfs, function(s) I(mclust::mclustBootstrapLRT(as.data.frame(s),modelName="V",verbose=F,maxG=1)$p.value<alpha)))/nsim,
-                                     FP = sum(sapply(a.dfs, function(s) I(mclust::mclustBootstrapLRT(as.data.frame(s),modelName="V",verbose=F,maxG=1)$p.value<alpha)))/nsim ))
+                                     power = sum(sapply(n.dfs, function(s) I(mclust::mclustBootstrapLRT(as.data.frame(s),modelName="E",verbose=F,maxG=1)$p.value<alpha)))/nsim,
+                                     FP = sum(sapply(a.dfs, function(s) I(mclust::mclustBootstrapLRT(as.data.frame(s),modelName="E",verbose=F,maxG=1)$p.value<alpha)))/nsim ))
   }
 
   ## sigclust is giving me issues so I've dropped it for now. 

diff --git a/SimulationStudy20230220.html b/SimulationStudy20230220.html