fix bug with adding scores and listwise deletion

jasp-stats · Jan 21, 2025 · c26c673 · c26c673
1 parent d299c6a
commit c26c673
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/R/exploratoryfactoranalysis.R b/R/exploratoryfactoranalysis.R
@@ -920,7 +920,7 @@ exploratoryFactorAnalysisInternal <- function(jaspResults, dataset, options, ...
   colNamesR <- paste0(options[["addedScoresPrefix"]], "_", seq_len(length(options$variables)))
 
   container    <- createJaspContainer()
-  container$dependOn(optionsFromObject = modelContainer, options = c("addScores", "addedScoresPrefix"))
+  container$dependOn(optionsFromObject = modelContainer, options = c("addScores", "addedScoresPrefix", "naAction"))
 
   scores <- modelContainer[["model"]][["object"]][["scores"]]
 
@@ -933,7 +933,17 @@ exploratoryFactorAnalysisInternal <- function(jaspResults, dataset, options, ...
     }
 
     container[[colNameR]] <- jaspBase::createJaspColumn(colNameR)
-    container[[colNameR]]$setScale(scores[, ii])
+    if (options[["naAction"]] == "pairwise") {
+      container[[colNameR]]$setScale(scores[, ii])
+    } else { # for listwise we need to identify the complete cases
+      # so we need to temporarily load the raw data with the NAs
+      dataTmp <- .readDataSetToEnd(columns.as.numeric = unlist(options$variables))
+      scoresTmp <- rep(NA, nrow(dataTmp))
+      scoresTmp[complete.cases(dataTmp)] <- scores[, ii]
+      container[[colNameR]]$setScale(scoresTmp)
+
+    }
+
   }
 
   jaspResults[["addedScoresContainer"]] <- container

diff --git a/R/principalcomponentanalysis.R b/R/principalcomponentanalysis.R
@@ -25,6 +25,7 @@ principalComponentAnalysisInternal <- function(jaspResults, dataset, options, ..
 
   dataset <- .pcaAndEfaDataCovariance(dataset, options, ready)
 
+
   if (ready)
     .pcaCheckErrors(dataset, options)
 
@@ -59,7 +60,6 @@ principalComponentAnalysisInternal <- function(jaspResults, dataset, options, ..
     if (options[["naAction"]] == "listwise") {
       return(.readDataSetToEnd(columns.as.numeric = unlist(options$variables), exclude.na.listwise = unlist(options$variables)))
     } else {
-
       return(.readDataSetToEnd(columns.as.numeric = unlist(options$variables)))
     }
   } else { # if variance covariance matrix as input

diff --git a/inst/Description.qml b/inst/Description.qml
@@ -13,6 +13,7 @@ Description
 	website		: "jasp-stats.org"
 	license		: "GPL (>= 2)"
 	hasWrappers	: true
+	preloadData	: false
 
 	Analysis
 	{
@@ -31,7 +32,7 @@ Description
 	Analysis
 	{
 		title:	qsTr("Confirmatory Factor Analysis")
-		func:	"confirmatoryFactorAnalysis"
+		func:		"confirmatoryFactorAnalysis"
 		qml:    "ConfirmatoryFactorAnalysis.qml"
 	}
 }
diff --git a/jaspFactor.Rproj b/jaspFactor.Rproj
@@ -1,4 +1,5 @@
 Version: 1.0
+ProjectId: 5cc9ddfa-69dc-44cb-b072-af7608690805
 
 RestoreWorkspace: Default
 SaveWorkspace: Default