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

Minor changes to pass check

Browse source
This commit is contained in:
Waldir Leoncio 2020-11-09 06:57:08 +01:00
parent 9ae09f543f
commit a60f6e0617
5 changed files with 14 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
R/indMix.R
View file

@ -105,7 +105,7 @@ indMix <- function(c, npops, dispText) {
COUNTS <- counts
SUMCOUNTS <- sumcounts
POP_LOGML <- computePopulationLogml(1:npops, adjprior, priorTerm) # TODO: translate
LOGDIFF <- repmat(-Inf, ninds, npops)
LOGDIFF <- repmat(-Inf, c(ninds, npops))
rm(initialPartition, counts, sumcounts)
# PARHAAN MIXTURE-PARTITION ETSIMINEN
@ -468,7 +468,7 @@ indMix <- function(c, npops, dispText) {
)
updateGlobalVariables3(
muuttuva,diffInCounts, adjprior,
priorTerm, i2
priorTerm, i2
)
muutettu <- 1
totalMuutos <- totalMuutos + maxMuutos

2
R/min_max_MATLAB.R
View file

@ -4,7 +4,6 @@
#' @param indices return indices?
#' @return Either a list or a vector
#' @author Waldir Leoncio
#' @export
min_MATLAB <- function(X, indices = TRUE) {
mins <- apply(X, 2, min)
idx <- sapply(seq_len(ncol(X)), function(x) match(mins[x], X[, x]))
@ -21,7 +20,6 @@ min_MATLAB <- function(X, indices = TRUE) {
#' @param indices return indices?
#' @return Either a list or a vector
#' @author Waldir Leoncio
#' @export
max_MATLAB <- function(X, indices = TRUE) {
maxs <- apply(X, 2, max)
idx <- sapply(seq_len(ncol(X)), function(x) match(maxs[x], X[, x]))