Commit 9b4edb49 authored by Gjalt-Jorn Peters's avatar Gjalt-Jorn Peters
Browse files

adjusted CIM

parent 11cd4af4
Pipeline #225307130 failed with stage
in 5 minutes and 27 seconds
...@@ -146,7 +146,6 @@ CIM <- function(data, ...@@ -146,7 +146,6 @@ CIM <- function(data,
dataframeName <- deparse(substitute(data)); dataframeName <- deparse(substitute(data));
abbrScaleNames <- abbreviate(names(scales)); abbrScaleNames <- abbreviate(names(scales));
abbrScales <- abbrScales <-
lapply(seq_along(scales), function(i) { lapply(seq_along(scales), function(i) {
...@@ -498,15 +497,30 @@ CIM <- function(data, ...@@ -498,15 +497,30 @@ CIM <- function(data,
sort(c(rowVar, colVar)); sort(c(rowVar, colVar));
titleString <- paste0(titleString[1], ' & ', titleString[2], "\n", titleString <- paste0(titleString[1], ' & ', titleString[2], "\n",
fitText); fitText);
grobsList[[rowIndex]][[colIndex]] <-
res$intermediate$diamondplots[[rowVar]][[colVar]] <- if (n.iter > 1) {
grobsList[[rowIndex]][[colIndex]] <-
res$intermediate$diamondplots[[rowVar]][[colVar]] <-
factorLoadingDiamondCIplot(res$intermediate$efas[[rowVar]][[colVar]], factorLoadingDiamondCIplot(res$intermediate$efas[[rowVar]][[colVar]],
colors=colors, colors=colors,
sortAlphabetically=TRUE) + sortAlphabetically=TRUE) +
#faDfDiamondCIplot(faDf, xlab=NULL) + #faDfDiamondCIplot(faDf, xlab=NULL) +
ggplot2::ggtitle(titleString); ggplot2::ggtitle(titleString);
# textGrob(paste0("Upper diag:\n", rowVar, # textGrob(paste0("Upper diag:\n", rowVar,
# " and ", colVar)); # " and ", colVar));
} else {
grobsList[[rowIndex]][[colIndex]] <-
res$intermediate$diamondplots[[rowVar]][[colVar]] <-
factorLoadingHeatmap(
res$intermediate$efas[[rowVar]][[colVar]],
sortAlphabetically=TRUE
);
}
} else { } else {
grobsList[[rowIndex]][[colIndex]] <- grobsList[[rowIndex]][[colIndex]] <-
grid::textGrob('Not possible'); grid::textGrob('Not possible');
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment