Refresh accuracy.R

[morpheus.git] / reports / accuracy.R

diff --git a/reports/accuracy.R b/reports/accuracy.R
index 2381524..ee08078 100644 (file)
--- a/reports/accuracy.R
+++ b/reports/accuracy.R
@@ -2,23 +2,19 @@ optimBeta <- function(N, n, K, p, beta, b, link, ncores)
 {
        library(morpheus)
        res <- multiRun(
-               list(n=n, p=p, beta=beta, b=b, optargs=list(K=K, link=link)),
+               list(n=n, p=p, beta=beta, b=b, K=K, link=link),
                list(
                        # morpheus
                        function(fargs) {
                                library(morpheus)
-                               K <- fargs$optargs$K
-                               M <- computeMoments(fargs$X, fargs$Y)
-                               fargs$optargs$M <- M
-                               mu <- computeMu(fargs$X, fargs$Y, fargs$optargs)
+                               K <- fargs$K
+                               mu <- computeMu(fargs$X, fargs$Y, list(K=K))
+        op <- optimParams(fargs$X, fargs$Y, K, fargs$link)
+        x_init <- list(p=rep(1/K,K-1), beta=mu, b=rep(0,K))
                                res2 <- NULL
                                tryCatch({
-                                       op <- optimParams(K,link,fargs$optargs)
-                                       x_init <- list(p=rep(1/K,K-1), beta=mu, b=rep(0,K))
-                                       res2 <- do.call(rbind, op$run(x_init))
-                               }, error = function(e) {
-                                       res2 <- NA
-                               })
+          res2 <- do.call(rbind, op$run(x_init))
+                               }, error = function(e) {})
                                res2
                        }
 #                      ,
@@ -26,7 +22,7 @@ optimBeta <- function(N, n, K, p, beta, b, link, ncores)
 #                      function(fargs) {
 #                              library(flexmix)
 #                              source("../patch_Bettina/FLXMRglm.R")
-#                              K <- fargs$optargs$K
+#                              K <- fargs$K
 #                              dat <- as.data.frame( cbind(fargs$Y,fargs$X) )
 #                              res2 <- NULL
 #                              tryCatch({
@@ -46,11 +42,9 @@ optimBeta <- function(N, n, K, p, beta, b, link, ncores)
                ),
                prepareArgs = function(fargs, index) {
                        library(morpheus)
-                       io = generateSampleIO(fargs$n, fargs$p, fargs$beta, fargs$b, fargs$optargs$link)
+                       io = generateSampleIO(fargs$n, fargs$p, fargs$beta, fargs$b, fargs$link)
                        fargs$X = io$X
                        fargs$Y = io$Y
-                       fargs$optargs$K = ncol(fargs$beta)
-                       fargs$optargs$M = computeMoments(io$X,io$Y)
                        fargs
                }, N=N, ncores=ncores, verbose=TRUE)
        p <- c(p, 1-sum(p))
@@ -114,7 +108,7 @@ if (d == 2) {
 }
 
 mr <- optimBeta(N, n, K, p, beta, b, link, ncores)
-mr_params <- list("N"=N, "n"=n, "K"=K, "d"=d, "link"=link,
+mr_params <- list("N"=N, "nc"=ncores, "n"=n, "K"=K, "d"=d, "link"=link,
        "p"=c(p,1-sum(p)), "beta"=beta, "b"=b)
 
-save("mr", "mr_params", file=paste("multirun_",n,"_",d,"_",link,".RData",sep=""))
+save("mr", "mr_params", file=paste("res_",n,"_",d,"_",link,".RData",sep=""))