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

Fixed output

Browse source
This commit is contained in:
Waldir Leoncio 2024-09-27 10:47:24 +02:00
parent dd6ee912bd
commit 5449bef162
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
R/kldiv2str.R
View file

@ -20,5 +20,5 @@ kldiv2str <- function(div, max_chars = 6L) {
mjono[3] <- "." mjono[3] <- "."
mjono[2] <- palautaYks(abs(div), suurinYks) mjono[2] <- palautaYks(abs(div), suurinYks)
} }
return(mjono) paste(mjono, collapse = "")
} }

20
R/writeMixtureInfo.R
View file

@ -65,9 +65,9 @@ writeMixtureInfo <- function(
} }
cluster_count <- length(unique(globals$PARTITION)) cluster_count <- length(unique(globals$PARTITION))
if (verbose) cat("Best Partition: ") if (verbose) cat("\nBest Partition:\n")
if (fid != -1) { if (fid != -1) {
append(fid, c("Best Partition: ", "\n")) append(fid, c("\nBest Partition:", "\n"))
} }
for (m in 1:cluster_count) { for (m in 1:cluster_count) {
indsInM <- matlab2r::find(globals$PARTITION == m) indsInM <- matlab2r::find(globals$PARTITION == m)
@ -116,7 +116,7 @@ writeMixtureInfo <- function(
cat("\n") cat("\n")
cat( cat(
"Changes in log(marginal likelihood)", "Changes in log(marginal likelihood)",
" if indvidual i is moved to group j:\n" "if indvidual i is moved to group j:\n"
) )
} }
if (fid != -1) { if (fid != -1) {
@ -163,12 +163,12 @@ writeMixtureInfo <- function(
muutokset <- changesInLogml[, ind] muutokset <- changesInLogml[, ind]
if (names) { if (names) {
nimi <- as.character(popnames[ind]) nimi <- as.character(popnames[ind])
rivi <- c(blanks(maxSize - length(nimi)), nimi, ":\n") rivi <- c(blanks(maxSize - length(nimi)), nimi, ":")
} else { } else {
rivi <- c("\n", blanks(4 - floor(log10(ind))), ownNum2Str(ind), ":\n") rivi <- c("\n", blanks(4 - floor(log10(ind))), ownNum2Str(ind), ":")
} }
for (j in 1:npops) { for (j in 1:npops) {
rivi <- c(rivi, logml2String(omaRound(muutokset[j]), "")) rivi <- c(rivi, " ", logml2String(omaRound(muutokset[j])))
} }
if (verbose) cat(rivi, sep = "") if (verbose) cat(rivi, sep = "")
if (fid != -1) { if (fid != -1) {
@ -176,11 +176,11 @@ writeMixtureInfo <- function(
append(fid, "\n") append(fid, "\n")
} }
} }
if (verbose) cat("\n\nKL-divergence matrix in PHYLIP format: ") if (verbose) cat("\n\nKL-divergence matrix in PHYLIP format:\n")
dist_mat <- zeros(npops, npops) dist_mat <- zeros(npops, npops)
if (fid != -1) { if (fid != -1) {
append(fid, " KL-divergence matrix in PHYLIP format: ") append(fid, " KL-divergence matrix in PHYLIP format:\n")
} }
globals$COUNTS <- globals$COUNTS[seq_len(nrow(adjprior)), seq_len(ncol(adjprior)), , drop = FALSE] globals$COUNTS <- globals$COUNTS[seq_len(nrow(adjprior)), seq_len(ncol(adjprior)), , drop = FALSE]
@ -223,9 +223,9 @@ writeMixtureInfo <- function(
dist_mat <- dist_mat + t(dist_mat) # make it symmetric dist_mat <- dist_mat + t(dist_mat) # make it symmetric
for (pop1 in 1:npops) { for (pop1 in 1:npops) {
rivi <- c("\nCluster_", as.character(pop1), "\n") rivi <- c("\nCluster_", as.character(pop1), " ")
for (pop2 in 1:npops) { for (pop2 in 1:npops) {
rivi <- c(rivi, kldiv2str(dist_mat[pop1, pop2], 4L)) rivi <- c(rivi, kldiv2str(dist_mat[pop1, pop2]))
} }
if (verbose) cat(rivi, sep = "") if (verbose) cat(rivi, sep = "")
if (fid != -1) { if (fid != -1) {