last tweaks to make it pretty

Author: JohnnyDoorn

R/anovarepeatedmeasures.R

@@ -64,9 +64,9 @@ AnovaRepeatedMeasuresInternal <- function(jaspResults, dataset = NULL, options)
 
   .BANOVAdescriptives(rmAnovaContainer, longData, options, list(noVariables=FALSE), "RM-ANOVA", ready)
 
-  .anovaExportResiduals(anovaContainer, dataset, options, ready)
+  .anovaExportResiduals(rmAnovaContainer, dataset, options, ready)
 
-  .anovaExportPredictions(anovaContainer, dataset, options, ready)
+  .anovaExportPredictions(rmAnovaContainer, dataset, options, ready)
 
   return()
 }

R/commonAnovaFreq.R

@@ -273,8 +273,10 @@
 
 .anovaExportResiduals <- function(container, dataset, options, ready) {
 
-  if (options[["residualsSavedToData"]] && ready && is.null(container[["residualsSavedToDataColumn"]]) &&
-    options[["residualsSavedToDataColumn"]] != "") {
+  if (ready &&
+      isTRUE(options[["residualsSavedToData"]]) &&
+      isTRUE(options[["residualsSavedToDataColumn"]] != "") &&
+      is.null(container[["residualsSavedToDataColumn"]])) {
 
     model <- container[["model"]]$object
 
@@ -291,8 +293,11 @@
 
 .anovaExportPredictions <- function(container, dataset, options, ready) {
 
-  if (options[["predictionsSavedToData"]] && ready && is.null(container[["predictionsSavedToDataColumn"]]) &&
-      options[["predictionsSavedToDataColumn"]] != "") {
+  if (ready &&
+      isTRUE(options[["predictionsSavedToData"]]) &&
+      isTRUE(options[["predictionsSavedToDataColumn"]] != "") &&
+      is.null(container[["predictionsSavedToDataColumn"]])) {
+
 
     model <- container[["model"]]$object