diff --git a/R/greedyMix.R b/R/greedyMix.R index 6624a4d..4aa71fc 100644 --- a/R/greedyMix.R +++ b/R/greedyMix.R @@ -978,14 +978,4 @@ greedyMix <- function( # else # popDiff = diff([0 pops npops+1]); # emptyPop = min(find(popDiff > 1)); -# end - -# %------------------------------------------------------ - -# function loggis = laskeLoggis(counts, sumcounts, adjprior) -# npops = size(counts,3); - -# logml2 = sum(sum(sum(gammaln(counts+repmat(adjprior,[1 1 npops]))))) ... -# - npops*sum(sum(gammaln(adjprior))) - ... -# sum(sum(gammaln(1+sumcounts))); -# loggis = logml2; \ No newline at end of file +# end \ No newline at end of file diff --git a/R/laskeLoggis.R b/R/laskeLoggis.R new file mode 100644 index 0000000..7bcd26f --- /dev/null +++ b/R/laskeLoggis.R @@ -0,0 +1,9 @@ +laskeLoggis <- function(counts, sumcounts, adjprior) { + npops <- size(counts, 3) + + sum1 <- sum(sum(sum(gammaln(counts + repmat(adjprior, c(1, 1, npops)))))) + sum3 <- sum(sum(lgamma(adjprior))) - sum(sum(lgamma(1 + sumcounts))) + logml2 <- sum1 - npops * sum3 + loggis <- logml2 + return(loggis) +} \ No newline at end of file