X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=reports%2Faccuracy.R;h=5eadd3bdf5ef0a5f17e96f9006b2634f401713e0;hb=074c721aa587d45c4f7ef10f8a28fdc09273d31a;hp=57a63db8eaecd921e547acc5566301aaf3bba73d;hpb=324febd30a6fbf63d805dc76f1ac7aed8fead915;p=morpheus.git

diff --git a/reports/accuracy.R b/reports/accuracy.R
index 57a63db..5eadd3b 100644
--- a/reports/accuracy.R
+++ b/reports/accuracy.R
@@ -11,14 +11,12 @@ optimBeta <- function(N, n, K, p, beta, b, link, ncores)
 				M <- computeMoments(fargs$X, fargs$Y)
 				fargs$optargs$M <- M
 				mu <- computeMu(fargs$X, fargs$Y, fargs$optargs)
+        op <- optimParams(K,fargs$optargs$link,fargs$optargs)
+        x_init <- list(p=rep(1/K,K-1), beta=mu, b=rep(0,K))
 				res2 <- NULL
 				tryCatch({
-					op <- optimParams(K,fargs$optargs$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
 			}
 #			,
@@ -50,7 +48,6 @@ optimBeta <- function(N, n, K, p, beta, b, link, ncores)
 			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 +111,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=""))