Fix test release issues jaspFactor (#248)

* add seed stuff * add varCovData to check Errors * also adjust the tests * renv lock file
jasp-stats · Dec 6, 2024 · 418b2c7 · 418b2c7
1 parent 49db5b1
commit 418b2c7
Show file tree

Hide file tree

Showing 8 changed files with 969 additions and 439 deletions.
diff --git a/R/exploratoryfactoranalysis.R b/R/exploratoryfactoranalysis.R
@@ -101,7 +101,7 @@ exploratoryFactorAnalysisInternal <- function(jaspResults, dataset, options, ...
   )
 
   if (options[["dataType"]] == "raw") {
-    error <- .hasErrors(dataset = dataset, type = c("infinity", "variance"), custom = customChecksEFA,
+    error <- .hasErrors(dataset = dataset, type = c("infinity", "variance", "varCovData"), custom = customChecksEFA,
                         exitAnalysisIfErrors = TRUE)
   }
 
@@ -192,15 +192,17 @@ exploratoryFactorAnalysisInternal <- function(jaspResults, dataset, options, ...
 
   if (options[["analysisBasedOn"]] == "polyTetrachoricCorrelationMatrix") {
     polyTetraCor <- psych::mixedCor(dataset)
-    set.seed(options[["parallelAnalysisSeed"]])
+    .setSeedJASP(options)
+
     parallelResult <- try(psych::fa.parallel(polyTetraCor$rho,
                                  plot = FALSE,
                                  fa = ifelse(options[["parallelAnalysisMethod"]] == "principalComponentBased",
                                              "pc", "fa"),
                                  n.obs = nrow(dataset)))
   }
   else {
-    set.seed(options[["parallelAnalysisSeed"]])
+    .setSeedJASP(options)
+
     parallelResult <- try(psych::fa.parallel(dataset, plot = FALSE,
                                              fa = ifelse(options[["parallelAnalysisMethod"]] == "principalComponentBased",
                                                          "pc", "fa")))
@@ -600,14 +602,16 @@ exploratoryFactorAnalysisInternal <- function(jaspResults, dataset, options, ...
 
   if (options[["analysisBasedOn"]] == "polyTetrachoricCorrelationMatrix") {
     polyTetraCor <- psych::mixedCor(dataset)
-    set.seed(options[["parallelAnalysisSeed"]])
+    .setSeedJASP(options)
+
     parallelResult <- try(psych::fa.parallel(polyTetraCor$rho,
                                              plot = FALSE,
                                              fa = ifelse(options[["parallelAnalysisTableMethod"]] == "principalComponentBased",
                                                          "pc", "fa"),
                                              n.obs = nrow(dataset)))
   } else {
-    set.seed(options[["parallelAnalysisSeed"]])
+    .setSeedJASP(options)
+
     parallelResult <- try(psych::fa.parallel(dataset, plot = FALSE,
                                              fa = ifelse(options[["parallelAnalysisTableMethod"]] == "principalComponentBased",
                                                          "pc", "fa")))
@@ -628,7 +632,7 @@ exploratoryFactorAnalysisInternal <- function(jaspResults, dataset, options, ...
   }
 
   parallelTable <- createJaspTable(gettext("Parallel Analysis"))
-  parallelTable$dependOn(c("parallelAnalysisTable", "parallelAnalysisTableMethod", "parallelAnalysisSeed"))
+  parallelTable$dependOn(c("parallelAnalysisTable", "parallelAnalysisTableMethod"))
   parallelTable$addColumnInfo(name = "col", title = "", type = "string")
 
   parallelTable$addColumnInfo(name = "val1", title = eigTitle, type = "number", format = "dp:3")
@@ -679,14 +683,16 @@ exploratoryFactorAnalysisInternal <- function(jaspResults, dataset, options, ...
 
     if (options[["analysisBasedOn"]] == "polyTetrachoricCorrelationMatrix") {
       polyTetraCor <- psych::mixedCor(dataset)
-      set.seed(options[["parallelAnalysisSeed"]])
+      .setSeedJASP(options)
+
       parallelResult <- try(psych::fa.parallel(polyTetraCor$rho,
                                    plot = FALSE,
                                    fa = ifelse(options[["parallelAnalysisTableMethod"]] == "principalComponentBased",
                                                "pc", "fa"),
                                    n.obs = nrow(dataset)))
     } else {
-      set.seed(options[["parallelAnalysisSeed"]])
+      .setSeedJASP(options)
+
       parallelResult <- try(psych::fa.parallel(dataset, plot = FALSE,
                                                fa = ifelse(options[["parallelAnalysisTableMethod"]] == "principalComponentBased",
                                                            "pc", "fa")))

diff --git a/R/principalcomponentanalysis.R b/R/principalcomponentanalysis.R
@@ -157,7 +157,7 @@ principalComponentAnalysisInternal <- function(jaspResults, dataset, options, ..
   )
 
   if (options[["dataType"]] == "raw") {
-    error <- .hasErrors(dataset = dataset, type = c("infinity", "variance"), custom = customChecksPCAEFA,
+    error <- .hasErrors(dataset = dataset, type = c("infinity", "variance", "varCovData"), custom = customChecksPCAEFA,
                         exitAnalysisIfErrors = TRUE)
   }
 

diff --git a/inst/qml/ExploratoryFactorAnalysis.qml b/inst/qml/ExploratoryFactorAnalysis.qml
@@ -81,15 +81,9 @@ Form
 						label: qsTr("Based on FA")
 					}
 				}
-				IntegerField
-				{
-					name: 			"parallelAnalysisSeed"
-					label: 			"Seed"
-					defaultValue: 	1234
-					fieldWidth: 	60
-					min: 			1
-					max: 			1e6
-				}
+
+				SetSeed{}
+
 			}
 
 			RadioButton

diff --git a/inst/qml/PrincipalComponentAnalysis.qml b/inst/qml/PrincipalComponentAnalysis.qml
@@ -78,15 +78,8 @@ Form
 					label: qsTr("Based on factors")
 				}
 			}
-			IntegerField
-			{
-				name: 			"parallelAnalysisSeed"
-				label: 			"Seed"
-				defaultValue: 	1234
-				fieldWidth: 	60
-				min: 			1
-				max: 			1e6
-			}
+			SetSeed{}
+
 		}
 		RadioButton
 		{