max/ourMELONS
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

laskeMuutokset() reads npop from parent functions (#24)

Browse source
This commit is contained in:
Waldir Leoncio 2024-04-10 14:25:22 +02:00
parent 5deadcf3ee
commit 58a5e5a2fd
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
R/indMix.R
View file

@ -149,7 +149,7 @@ indMix <- function(c, npops, counts = NULL, sumcounts = NULL, max_iter = 100L, d
i1 <- baps.globals$PARTITION[ind]
muutokset_diffInCounts <- greedyMix_muutokset$new()
muutokset_diffInCounts <- muutokset_diffInCounts$laskeMuutokset(
ind, rows, data, adjprior, priorTerm
ind, rows, data, adjprior, priorTerm, npops
)
muutokset <- muutokset_diffInCounts$muutokset
diffInCounts <- muutokset_diffInCounts$diffInCounts

3
R/laskeMuutokset12345.R
View file

@ -341,8 +341,7 @@ greedyMix_muutokset <- R6Class(
#' @param data data
#' @param adjprior adjprior
#' @param priorTerm priorTerm
laskeMuutokset = function(ind, globalRows, data, adjprior, priorTerm) {
npops <- size(COUNTS, 3)
laskeMuutokset = function(ind, globalRows, data, adjprior, priorTerm, npops) {
muutokset <- baps.globals$LOGDIFF[ind, ]
i1 <- baps.globals$PARTITION[ind]