From 55cbadb471ff52238384982cffc7bd613fc09972 Mon Sep 17 00:00:00 2001 From: Waldir Leoncio Date: Mon, 15 Feb 2021 10:15:25 +0100 Subject: [PATCH] Replaced rowSums with colSums to match MATLAB sum --- R/laskeMuutokset12345.R | 2 +- R/updateGlobalVariables.R | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/R/laskeMuutokset12345.R b/R/laskeMuutokset12345.R index ef790d7..e67ed2c 100644 --- a/R/laskeMuutokset12345.R +++ b/R/laskeMuutokset12345.R @@ -60,7 +60,7 @@ laskeMuutokset <- function(ind, globalRows, data, adjprior, priorTerm) { diffInCounts <- computeDiffInCounts( rows, size(COUNTS, 1), size(COUNTS, 2), data ) - diffInSumCounts <- rowSums(diffInCounts) + diffInSumCounts <- colSums(diffInCounts) COUNTS[, , i1] <- COUNTS[, , i1] - diffInCounts SUMCOUNTS[i1, ] <- SUMCOUNTS[i1, ] - diffInSumCounts diff --git a/R/updateGlobalVariables.R b/R/updateGlobalVariables.R index e6d004d..94e5261 100644 --- a/R/updateGlobalVariables.R +++ b/R/updateGlobalVariables.R @@ -6,8 +6,8 @@ updateGlobalVariables <- function(ind, i2, diffInCounts, adjprior, priorTerm) { COUNTS[, , i1] <- COUNTS[, , i1] - diffInCounts COUNTS[, , i2] <- COUNTS[, , i2] + diffInCounts - SUMCOUNTS[i1, ] <- SUMCOUNTS[i1, ] - rowSums(diffInCounts) - SUMCOUNTS[i2, ] <- SUMCOUNTS[i2, ] + rowSums(diffInCounts) + SUMCOUNTS[i1, ] <- SUMCOUNTS[i1, ] - colSums(diffInCounts) + SUMCOUNTS[i2, ] <- SUMCOUNTS[i2, ] + colSums(diffInCounts) POP_LOGML[c(i1, i2)] <- computePopulationLogml( c(i1, i2), adjprior, priorTerm @@ -27,8 +27,8 @@ updateGlobalVariables2 <- function(i1, i2, diffInCounts, adjprior, priorTerm) { COUNTS[, , i1] <- COUNTS[, , i1] - diffInCounts COUNTS[, , i2] <- COUNTS[, , i2] + diffInCounts - SUMCOUNTS[i1, ] <- SUMCOUNTS[i1, ] - rowSums(diffInCounts) - SUMCOUNTS[i2, ] <- SUMCOUNTS[i2, ] + rowSums(diffInCounts) + SUMCOUNTS[i1, ] <- SUMCOUNTS[i1, ] - colSums(diffInCounts) + SUMCOUNTS[i2, ] <- SUMCOUNTS[i2, ] + colSums(diffInCounts) POP_LOGML[i1] <- 0 POP_LOGML[i2] <- computePopulationLogml(i2, adjprior, priorTerm) @@ -50,8 +50,8 @@ updateGlobalVariables3 <- function( COUNTS[, , i1] <- COUNTS[, , i1] - diffInCounts COUNTS[, , i2] <- COUNTS[, , i2] + diffInCounts - SUMCOUNTS[i1, ] <- SUMCOUNTS[i1, ] - rowSums(diffInCounts) - SUMCOUNTS[i2, ] <- SUMCOUNTS[i2, ] + rowSums(diffInCounts) + SUMCOUNTS[i1, ] <- SUMCOUNTS[i1, ] - colSums(diffInCounts) + SUMCOUNTS[i2, ] <- SUMCOUNTS[i2, ] + colSums(diffInCounts) POP_LOGML[c(i1, i2)] <- computePopulationLogml( c(i1, i2), adjprior, priorTerm