adjusted CIM

R/CIM.R

@@ -146,7 +146,6 @@ CIM <- function(data,
 
   dataframeName <- deparse(substitute(data));
 
-
   abbrScaleNames <- abbreviate(names(scales));
   abbrScales <-
     lapply(seq_along(scales), function(i) {
@@ -498,15 +497,30 @@ CIM <- function(data,
                 sort(c(rowVar, colVar));
               titleString <- paste0(titleString[1], ' & ', titleString[2], "\n",
                                     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]],
                                              colors=colors,
                                              sortAlphabetically=TRUE) +
-              #faDfDiamondCIplot(faDf, xlab=NULL) +
+                  #faDfDiamondCIplot(faDf, xlab=NULL) +
                   ggplot2::ggtitle(titleString);
-            #           textGrob(paste0("Upper diag:\n", rowVar,
-            #                           " and ", colVar));
+                #           textGrob(paste0("Upper diag:\n", rowVar,
+                #                           " and ", colVar));
+
+              } else {
+
+                grobsList[[rowIndex]][[colIndex]] <-
+                  res$intermediate$diamondplots[[rowVar]][[colVar]] <-
+                  factorLoadingHeatmap(
+                    res$intermediate$efas[[rowVar]][[colVar]],
+                    sortAlphabetically=TRUE
+                  );
+
+              }
+
             } else {
               grobsList[[rowIndex]][[colIndex]] <-
                 grid::textGrob('Not possible');