uweights up

kosukeimai · Apr 19, 2020 · de52555 · de52555
1 parent b852455
commit de52555
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/R/emlinkMARmov.R b/R/emlinkMARmov.R
@@ -312,11 +312,11 @@ emlinkMARmov <- function(patterns, nobs.a, nobs.b,
         }
     }
 
+    weights <- log(p.gamma.j.m) - log(p.gamma.j.u)
+
     p.gamma.j.m <- p.gamma.j.m/sum(p.gamma.j.m)
     p.gamma.j.u <- p.gamma.j.u/sum(p.gamma.j.u)
 
-    weights <- log(p.gamma.j.m) - log(p.gamma.j.u)
-
     data.w <- cbind(patterns, weights, p.gamma.j.m, p.gamma.j.u)
     nc <- ncol(data.w)
     colnames(data.w)[nc-2] <- "weights"
@@ -478,11 +478,12 @@ emlinkRS <- function(patterns.out, em.out, nobs.a, nobs.b){
                                                    log(p.u))
     zeta.j <- exp(log.prod - log.sum)
 
+    weights <- log(p.gamma.j.m) - log(p.gamma.j.u)
+
     ## Renormalize
     p.gamma.j.m <- p.gamma.j.m/sum(p.gamma.j.m)
     p.gamma.j.u <- p.gamma.j.u/sum(p.gamma.j.u)
 
-    weights <- log(p.gamma.j.m) - log(p.gamma.j.u)
     data.w <- cbind(patterns.out, weights, p.gamma.j.m, p.gamma.j.u)
     nc <- ncol(data.w)
     colnames(data.w)[nc - 3] <- "counts"