X-Git-Url: https://git.auder.net/?p=morpheus.git;a=blobdiff_plain;f=reports%2Fmultistart.R;h=73df53898a9fb99a6d082c36e737f052b978670b;hp=7cc0a5e4cc5c02e42a3c28ec68b1eb87ca374ec4;hb=147b2ef3c1def913673ab2333ac629bafaff1360;hpb=86f257f88727805ee73f69e2b9ad57bea2f40b82

diff --git a/reports/multistart.R b/reports/multistart.R
index 7cc0a5e..73df538 100644
--- a/reports/multistart.R
+++ b/reports/multistart.R
@@ -9,8 +9,9 @@ testMultistart <- function(N, n, p, beta, b, link, nstart, ncores)
         # 1 start
         library(morpheus)
         K <- ncol(fargs$beta)
+        mu <- computeMu(fargs$X, fargs$Y, list(K=K, M=fargs$M))
         op <- optimParams(fargs$X, fargs$Y, K, fargs$link, fargs$M)
-        x_init <- list(p=rep(1/K,K-1), beta=fargs$mu, b=rep(0,K))
+        x_init <- list(p=rep(1/K,K-1), beta=mu, b=rep(0,K))
 				res2 <- NULL
 				tryCatch({
           res2 <- do.call(rbind, op$run(x_init))
@@ -45,22 +46,26 @@ testMultistart <- function(N, n, p, beta, b, link, nstart, ncores)
             }
           }
         }
-        # Bet that at least one run succeded:
-        do.call(rbind,best_par)
+        do.call(rbind,best_par) #return NULL on empty list
       }
     ),
     prepareArgs = function(fargs, index) {
       library(morpheus)
       io = generateSampleIO(fargs$n, fargs$p, fargs$beta, fargs$b, fargs$link)
       fargs$M <- computeMoments(io$X, io$Y)
-      mu <- computeMu(io$X, io$Y, list(M=fargs$M))
-      fargs$mu <- mu
       fargs$X <- io$X
       fargs$Y <- io$Y
 			fargs
     }, N=N, ncores=ncores, verbose=TRUE)
-  for (i in 1:2)
+  p <- c(p, 1-sum(p))
+  for (i in 1:length(res)) {
+    for (j in N:1) {
+      if (is.null(res[[i]][[j]]) || is.na(res[[i]][[j]]))
+        res[[i]][[j]] <- NULL
+    }
+    print(paste("Count valid runs for ",i," = ",length(res[[i]]),sep=""))
     res[[i]] <- alignMatrices(res[[i]], ref=rbind(p,beta,b), ls_mode="exact")
+  }
   res
 }