Update wrappers (#197)

jasp-stats · Nov 22, 2023 · a4a3959 · a4a3959
1 parent b62d40d
commit a4a3959
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/R/confirmatoryfactoranalysisWrapper.R b/R/confirmatoryfactoranalysisWrapper.R
@@ -19,7 +19,8 @@
 
 confirmatoryFactorAnalysis <- function(
           data = NULL,
-          version = "0.17.1",
+          version = "0.18.2",
+          ave = FALSE,
           bartlettTest = FALSE,
           bootstrapSamples = 1000,
           ciLevel = 0.95,
@@ -31,7 +32,9 @@ confirmatoryFactorAnalysis <- function(
           factorsUncorrelated = FALSE,
           fitMeasures = FALSE,
           group = "",
+          htmt = FALSE,
           impliedCovarianceMatrix = FALSE,
+          interceptsFixedToZero = "latent",
           invarianceTesting = "configural",
           kaiserMeyerOlkinTest = FALSE,
           latentInterceptsFixedToZero = TRUE,
@@ -54,6 +57,7 @@ confirmatoryFactorAnalysis <- function(
           plotHeight = 320,
           plotWidth = 480,
           rSquared = FALSE,
+          reliability = FALSE,
           residualCovarianceMatrix = FALSE,
           residualSingleIndicatorOmitted = TRUE,
           residualVariances = TRUE,

diff --git a/R/exploratoryfactoranalysisWrapper.R b/R/exploratoryfactoranalysisWrapper.R
@@ -19,7 +19,7 @@
 
 exploratoryFactorAnalysis <- function(
           data = NULL,
-          version = "0.17.1",
+          version = "0.18.2",
           analysisBasedOn = "correlationMatrix",
           bartlettTest = FALSE,
           eigenValuesAbove = 1,

diff --git a/R/principalcomponentanalysisWrapper.R b/R/principalcomponentanalysisWrapper.R
@@ -19,16 +19,19 @@
 
 principalComponentAnalysis <- function(
           data = NULL,
-          version = "0.17.1",
+          version = "0.18.2",
           addComponentScores = FALSE,
           analysisBasedOn = "correlationMatrix",
+          bartlettTest = FALSE,
           componentCorrelations = FALSE,
           componentCountMethod = "parallelAnalysis",
           componentLoadingsOrder = "sortByComponentSize",
           componentsPrefix = "",
           eigenValuesAbove = 1,
+          kaiserMeyerOlkinTest = FALSE,
           loadingsDisplayLimit = 0.4,
           manualNumberOfComponents = 1,
+          mardiaTest = FALSE,
           naAction = "pairwise",
           obliqueSelector = "promax",
           orthogonalSelector = "none",
@@ -59,4 +62,4 @@ principalComponentAnalysis <- function(
       if ((name %in% optionsWithFormula) && inherits(options[[name]], "formula")) options[[name]] = jaspBase::jaspFormula(options[[name]], data)   }
 
    return(jaspBase::runWrappedAnalysis("jaspFactor::principalComponentAnalysis", data, options, version))
-}
+}