fixing dependencies (1/2)

jasp-stats · Nov 13, 2024 · 18854a3 · 18854a3
1 parent 82a9b08
commit 18854a3
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 36 deletions.
diff --git a/R/commonequivalencefunctions.R b/R/commonequivalencefunctions.R
@@ -29,15 +29,11 @@ gettextf <- function(fmt, ..., domain = NULL)  {
 
 .equivalencePriorandPosterior <- function(jaspResults, dataset, options, equivalenceBayesianTTestResults, ready, paired = FALSE) {
 
-  if (is.null(jaspResults[["equivalencePriorPosteriorContainer"]])) {
-    equivalencePriorPosteriorContainer <- createJaspContainer(title = gettext("Equivalence Prior and Posterior"))
-    equivalencePriorPosteriorContainer$dependOn(c("priorandposterior", "priorandposteriorAdditionalInfo", "missingValues",
-                                                  ,
-                                                  .equivalencePriorDependencies))
-    jaspResults[["equivalencePriorPosteriorContainer"]] <- equivalencePriorPosteriorContainer
-  } else {
-    equivalencePriorPosteriorContainer <- jaspResults[["equivalencePriorPosteriorContainer"]]
-  }
+  equivalencePriorPosteriorContainer <- createJaspContainer(title = gettext("Equivalence Prior and Posterior"))
+  equivalencePriorPosteriorContainer$dependOn(c("priorandposterior", "priorandposteriorAdditionalInfo", "missingValues", .equivalencePriorDependencies))
+  equivalencePriorPosteriorContainer$position <- 4
+
+  jaspResults[["equivalencePriorPosteriorContainer"]] <- equivalencePriorPosteriorContainer
 
   if (!ready)
     return()
@@ -695,14 +691,10 @@ gettextf <- function(fmt, ..., domain = NULL)  {
 }
 
 .equivalencePlotSequentialAnalysis <- function(jaspResults, dataset, options, equivalenceBayesianTTestResults, ready, paired = FALSE) {
-  equivalenceSequentialContainer <- createJaspContainer(title = gettext("Equivalence Sequential Analysis"))
 
-  equivalenceSequentialContainer$dependOn(c("missingValues", "priorWidth",
-                                            "effectSizeStandardized", "equivalenceRegion","lower", "upper",
-                                            "region", "lowerbound", "upperbound", "lower_max", "upper_min", "prior",
-                                            "informative", "informativeCauchyLocation", "informativeCauchyScale",
-                                            "informativeNormalMean", "informativeNormalStd", "informativeTLocation",
-                                            "informativeTScale", "informativeTDf", "plotSequentialAnalysisRobustness"))
+  equivalenceSequentialContainer <- createJaspContainer(title = gettext("Equivalence Sequential Analysis"))
+  equivalenceSequentialContainer$dependOn(c("missingValues", "effectSizeStandardized", .equivalenceRegionDependencies, .equivalencePriorDependencies, "plotSequentialAnalysis"))
+  equivalenceSequentialContainer$position <- 5
 
   jaspResults[["equivalenceSequentialContainer"]] <- equivalenceSequentialContainer
 

diff --git a/R/equivalencebayesianindependentsamplesttest.R b/R/equivalencebayesianindependentsamplesttest.R
@@ -40,11 +40,11 @@ EquivalenceBayesianIndependentSamplesTTest <- function(jaspResults, dataset, opt
   if (options$descriptives && is.null(jaspResults[["equivalenceBayesianDescriptivesTable"]]))
     .equivalenceBayesianIndTTestTableDescriptives(jaspResults, dataset, options, equivalenceBayesianIndTTestResults, ready)
 
-  if (options$priorandposterior)
+  if (options$priorandposterior && is.null(jaspResults[["equivalencePriorPosteriorContainer"]]))
     .equivalencePriorandPosterior(jaspResults, dataset, options, equivalenceBayesianIndTTestResults, ready)
 
-  if (options$plotSequentialAnalysis)
-      .equivalencePlotSequentialAnalysis(jaspResults, dataset, options, equivalenceBayesianIndTTestResults, ready)
+  if (options$plotSequentialAnalysis && is.null(jaspResults[["equivalenceSequentialContainer"]]))
+    .equivalencePlotSequentialAnalysis(jaspResults, dataset, options, equivalenceBayesianIndTTestResults, ready)
 
   if (options$massPriorPosterior && is.null(jaspResults[["equivalenceMassTable"]]))
     .massPriorPosteriorIndpTTestTable(jaspResults, dataset, options, equivalenceBayesianIndTTestResults, ready)
@@ -135,6 +135,7 @@ EquivalenceBayesianIndependentSamplesTTest <- function(jaspResults, dataset, opt
   # Create table
   equivalenceBayesianIndTTestTable <- createJaspTable(title = gettext("Equivalence Bayesian Independent Samples T-Test"))
   equivalenceBayesianIndTTestTable$dependOn(c("variables", "groupingVariable", "missingValues", .equivalenceRegionDependencies, .equivalencePriorDependencies))
+  equivalenceBayesianIndTTestTable$position <- 1
 
   # Add Columns to table
   equivalenceBayesianIndTTestTable$addColumnInfo(name = "variable",   title = " ",                          type = "string", combine = TRUE)
@@ -207,6 +208,7 @@ EquivalenceBayesianIndependentSamplesTTest <- function(jaspResults, dataset, opt
   # Create table
   equivalenceBayesianDescriptivesTable <- createJaspTable(title = gettext("Descriptives"))
   equivalenceBayesianDescriptivesTable$dependOn(c("variables", "groupingVariable", "descriptives", "missingValues"))
+  equivalenceBayesianDescriptivesTable$position <- 2
 
   # Add Columns to table
   equivalenceBayesianDescriptivesTable$addColumnInfo(name = "variable",   title = "",                   type = "string", combine = TRUE)
@@ -281,8 +283,10 @@ EquivalenceBayesianIndependentSamplesTTest <- function(jaspResults, dataset, opt
 }
 
 .massPriorPosteriorIndpTTestTable <- function(jaspResults, dataset, options, equivalenceBayesianIndTTestResults, ready) {
+
   equivalenceMassTable <- createJaspTable(title = gettext("Prior and Posterior Mass Table"))
-  equivalenceMassTable$dependOn(c("variables", "groupingVariable", "missingValues", .equivalenceRegionDependencies, .equivalencePriorDependencies))
+  equivalenceMassTable$dependOn(c("variables", "groupingVariable", "missingValues", "massPriorPosterior", .equivalenceRegionDependencies, .equivalencePriorDependencies))
+  equivalenceMassTable$position <- 3
 
   equivalenceMassTable$addColumnInfo(name = "variable",         title = " ",                        type = "string", combine = TRUE)
   equivalenceMassTable$addColumnInfo(name = "section",          title = gettext("Section"),         type = "string")

diff --git a/R/equivalencebayesianonesamplettest.R b/R/equivalencebayesianonesamplettest.R
@@ -41,10 +41,10 @@ EquivalenceBayesianOneSampleTTest <- function(jaspResults, dataset, options) {
   if(options$descriptives && is.null(jaspResults[["equivalenceBayesianDescriptivesTable"]]))
     .equivalenceBayesianOneTTestTableDescriptives(jaspResults, dataset, options, equivalenceBayesianOneTTestResults, ready)
 
-  if (options$priorandposterior)
+  if (options$priorandposterior && is.null(jaspResults[["equivalencePriorPosteriorContainer"]]))
     .equivalencePriorandPosterior(jaspResults, dataset, options, equivalenceBayesianOneTTestResults, ready)
 
-  if (options$plotSequentialAnalysis)
+  if (options$plotSequentialAnalysis && is.null(jaspResults[["equivalenceSequentialContainer"]]))
     .equivalencePlotSequentialAnalysis(jaspResults, dataset, options, equivalenceBayesianOneTTestResults, ready)
 
   if (options$massPriorPosterior && is.null(jaspResults[["equivalenceMassTable"]]))
@@ -121,6 +121,7 @@ EquivalenceBayesianOneSampleTTest <- function(jaspResults, dataset, options) {
   # Create table
   equivalenceBayesianOneTTestTable <- createJaspTable(title = gettext("Equivalence Bayesian One Sample T-Test"))
   equivalenceBayesianOneTTestTable$dependOn(c("variables", "groupingVariable", "missingValues", "mu", .equivalenceRegionDependencies, .equivalencePriorDependencies))
+  equivalenceBayesianOneTTestTable$position <- 1
   equivalenceBayesianOneTTestTable$showSpecifiedColumnsOnly <- TRUE
 
   # Add Columns to table
@@ -193,6 +194,7 @@ EquivalenceBayesianOneSampleTTest <- function(jaspResults, dataset, options) {
   # Create table
   equivalenceBayesianDescriptivesTable <- createJaspTable(title = gettext("Descriptives"))
   equivalenceBayesianDescriptivesTable$dependOn(c("variables", "descriptives", "missingValues"))
+  equivalenceBayesianDescriptivesTable$position <- 2
   equivalenceBayesianDescriptivesTable$showSpecifiedColumnsOnly <- TRUE
 
   # Add Columns to table
@@ -235,7 +237,8 @@ EquivalenceBayesianOneSampleTTest <- function(jaspResults, dataset, options) {
 .massPriorPosteriorOneTTestTable <- function(jaspResults, dataset, options, equivalenceBayesianOneTTestResults, ready) {
 
   equivalenceMassTable <- createJaspTable(title = gettext("Prior and Posterior Mass Table"))
-  equivalenceMassTable$dependOn(c("variables", "mu", "groupingVariable", "missingValues", .equivalenceRegionDependencies, .equivalencePriorDependencies))
+  equivalenceMassTable$dependOn(c("variables", "mu", "groupingVariable", "missingValues", "massPriorPosterior", .equivalenceRegionDependencies, .equivalencePriorDependencies))
+  equivalenceMassTable$position <- 3
 
   equivalenceMassTable$addColumnInfo(name = "variable",      title = " ",                     type = "string", combine = TRUE)
   equivalenceMassTable$addColumnInfo(name = "section",       title = gettext("Section"),      type = "string")

diff --git a/R/equivalencebayesianpairedsamplesttest.R b/R/equivalencebayesianpairedsamplesttest.R
@@ -44,13 +44,13 @@ EquivalenceBayesianPairedSamplesTTest <- function(jaspResults, dataset, options)
   # Output tables and plots
   .equivalenceBayesianPairedTTestTableMain(jaspResults, dataset, options, equivalenceBayesianPairedTTestResults, ready)
 
-  if(options$descriptives)
+  if(options$descriptives && is.null(jaspResults[["equivalenceBayesianDescriptivesTable"]]))
     .equivalenceBayesianPairedTTestTableDescriptives(jaspResults, dataset, options, equivalenceBayesianPairedTTestResults, ready)
 
-  if (options$priorandposterior)
+  if (options$priorandposterior && is.null(jaspResults[["equivalencePriorPosteriorContainer"]]))
     .equivalencePriorandPosterior(jaspResults, dataset, options, equivalenceBayesianPairedTTestResults, ready, paired = TRUE)
 
-  if (options$plotSequentialAnalysis)
+  if (options$plotSequentialAnalysis && is.null(jaspResults[["equivalenceSequentialContainer"]]))
      .equivalencePlotSequentialAnalysis(jaspResults, dataset, options, equivalenceBayesianPairedTTestResults, ready, paired = TRUE)
 
   if (options$massPriorPosterior && is.null(jaspResults[["equivalenceMassPairedTTestTable"]]))
@@ -132,6 +132,7 @@ EquivalenceBayesianPairedSamplesTTest <- function(jaspResults, dataset, options)
   # Create table
   equivalenceBayesianPairedTTestTable <- createJaspTable(title = gettext("Equivalence Bayesian Paired Samples T-Test"))
   equivalenceBayesianPairedTTestTable$dependOn(c("pairs", "missingValues", .equivalenceRegionDependencies, .equivalencePriorDependencies))
+  equivalenceBayesianPairedTTestTable$position <- 1
   equivalenceBayesianPairedTTestTable$showSpecifiedColumnsOnly <- TRUE
 
   # Add Columns to table
@@ -211,11 +212,10 @@ EquivalenceBayesianPairedSamplesTTest <- function(jaspResults, dataset, options)
 
 .equivalenceBayesianPairedTTestTableDescriptives <- function(jaspResults, dataset, options, equivalenceBayesianPairedTTestResults, ready) {
 
-  if(!is.null(jaspResults[["equivalenceBayesianDescriptivesTable"]])) return()
-
   # Create table
   equivalenceBayesianDescriptivesTable <- createJaspTable(title = gettext("Descriptives"))
   equivalenceBayesianDescriptivesTable$dependOn(c("pairs", "descriptives", "missingValues"))
+  equivalenceBayesianDescriptivesTable$position <- 2
   equivalenceBayesianDescriptivesTable$showSpecifiedColumnsOnly <- TRUE
 
   # Add Columns to table
@@ -262,7 +262,8 @@ EquivalenceBayesianPairedSamplesTTest <- function(jaspResults, dataset, options)
 
   # Create table
   equivalenceMassPairedTTestTable <- createJaspTable(title = gettext("Equivalence Mass Table"))
-  equivalenceMassPairedTTestTable$dependOn(c("pairs", "missingValues", .equivalenceRegionDependencies, .equivalencePriorDependencies))
+  equivalenceMassPairedTTestTable$dependOn(c("pairs", "missingValues", "massPriorPosterior",  .equivalenceRegionDependencies, .equivalencePriorDependencies))
+  equivalenceMassPairedTTestTable$position <- 3
   equivalenceMassPairedTTestTable$showSpecifiedColumnsOnly <- TRUE
 
   # Add Columns to table

diff --git a/R/equivalenceindependentsamplesttest.R b/R/equivalenceindependentsamplesttest.R
@@ -45,7 +45,7 @@ EquivalenceIndependentSamplesTTest <- function(jaspResults, dataset, options) {
   if (options$descriptives && is.null(jaspResults[["equivalenceDescriptivesTable"]]))
     .equivalenceIndTTestTableDescriptives(jaspResults, dataset, options, equivalenceIndTTestResults, ready)
 
-  if (options$equivalenceboundsplot)
+  if (options$equivalenceboundsplot && is.null(jaspResults[["equivalenceBoundsContainer"]]))
     .equivalencePlotInd(jaspResults, dataset, options, equivalenceIndTTestResults, ready)
 
   return()
@@ -147,6 +147,7 @@ EquivalenceIndependentSamplesTTest <- function(jaspResults, dataset, options) {
   # Create table
   equivalenceIndTTestTable <- createJaspTable(title = gettext("Equivalence Independent Samples T-Test"))
   equivalenceIndTTestTable$dependOn(c("variables", "groupingVariable", "tests", "alpha", "missingValues", "boundstype", .equivalenceRegionDependencies))
+  equivalenceIndTTestTable$positions <- 1
 
   # Add Columns to table
   equivalenceIndTTestTable$addColumnInfo(name = "variable",   title = " ",                   type = "string", combine = TRUE)
@@ -213,6 +214,7 @@ EquivalenceIndependentSamplesTTest <- function(jaspResults, dataset, options) {
   # Create table
   equivalenceBoundsTable <- createJaspTable(title = gettext("Equivalence Bounds"))
   equivalenceBoundsTable$dependOn(c("variables", "groupingVariable", "tests", "alpha", "missingValues", "boundstype", .equivalenceRegionDependencies))
+  equivalenceBoundsTable$positions <- 2
 
   # Add Columns to table
   equivalenceBoundsTable$addColumnInfo(name = "variable",   title = " ",                            type = "string", combine = TRUE)
@@ -273,6 +275,7 @@ EquivalenceIndependentSamplesTTest <- function(jaspResults, dataset, options) {
   # Create table
   equivalenceDescriptivesTable <- createJaspTable(title = gettext("Descriptives"))
   equivalenceDescriptivesTable$dependOn(c("variables", "groupingVariable", "descriptives", "missingValues"))
+  equivalenceDescriptivesTable$positions <- 3
 
   # Add Columns to table
   equivalenceDescriptivesTable$addColumnInfo(name = "variable",   title = " ",                  type = "string", combine = TRUE)
@@ -325,7 +328,8 @@ EquivalenceIndependentSamplesTTest <- function(jaspResults, dataset, options) {
 .equivalencePlotInd <- function(jaspResults, dataset, options, equivalenceIndTTestResults, ready) {
 
   equivalenceBoundsContainer <- createJaspContainer(title = gettext("Equivalence Bounds Plots"))
-  equivalenceBoundsContainer$dependOn(c("variables", "groupingVariable", "tests", "alpha", "missingValues", "boundstype", .equivalenceRegionDependencies))
+  equivalenceBoundsContainer$dependOn(c("variables", "groupingVariable", "tests", "alpha", "missingValues", "boundstype", "equivalenceboundsplot", .equivalenceRegionDependencies))
+  equivalenceBoundsContainer$positions <- 4
   jaspResults[["equivalenceBoundsContainer"]] <- equivalenceBoundsContainer
 
   if (!ready) {

diff --git a/R/equivalenceonesamplettest.R b/R/equivalenceonesamplettest.R
@@ -46,7 +46,7 @@ EquivalenceOneSampleTTest <- function(jaspResults, dataset, options) {
   if(options$descriptives && is.null(jaspResults[["equivalenceOneDescriptivesTable"]]))
     .equivalenceOneTTestTableDescriptives(jaspResults, dataset, options, equivalenceOneTTestResults, ready)
 
-  if(options$equivalenceboundsplot)
+  if(options$equivalenceboundsplot && is.null(jaspResults[["equivalenceOneBoundsContainer"]]))
     .equivalenceOnePlot(jaspResults, dataset, options, equivalenceOneTTestResults, ready)
 
   return()
@@ -137,6 +137,7 @@ EquivalenceOneSampleTTest <- function(jaspResults, dataset, options) {
   # Create table
   equivalenceOneTTestTable <- createJaspTable(title = gettext("Equivalence One Sample T-Test"))
   equivalenceOneTTestTable$dependOn(c("variables", "mu", "alpha", "missingValues", "boundstype", .equivalenceRegionDependencies))
+  equivalenceOneTTestTable$position <- 1
 
   # Add Columns to table
   equivalenceOneTTestTable$addColumnInfo(name = "variable",   title = " ",                   type = "string", combine = TRUE)
@@ -201,6 +202,7 @@ EquivalenceOneSampleTTest <- function(jaspResults, dataset, options) {
   # Create table
   equivalenceOneBoundsTable <- createJaspTable(title = gettext("Equivalence Bounds"))
   equivalenceOneBoundsTable$dependOn(c("variables", "mu", "alpha", "missingValues", "boundstype", .equivalenceRegionDependencies))
+  equivalenceOneBoundsTable$position <- 2
 
   # Add Columns to table
   equivalenceOneBoundsTable$addColumnInfo(name = "variable",   title = " ",                     type = "string", combine = TRUE)
@@ -261,6 +263,7 @@ EquivalenceOneSampleTTest <- function(jaspResults, dataset, options) {
 
   # Create table
   equivalenceOneDescriptivesTable <- createJaspTable(title = gettext("Descriptives"))
+  equivalenceOneDescriptivesTable$position <- 3
   equivalenceOneDescriptivesTable$dependOn(c("variables", "mu", "descriptives", "missingValues"))
 
   # Add Columns to table
@@ -308,7 +311,8 @@ EquivalenceOneSampleTTest <- function(jaspResults, dataset, options) {
 .equivalenceOnePlot <- function(jaspResults, dataset, options, equivalenceOneTTestResults, ready) {
 
   equivalenceOneBoundsContainer <- createJaspContainer(title = gettext("Equivalence Bounds Plots"))
-  equivalenceOneBoundsContainer$dependOn(c("variables", "mu", "alpha", "missingValues", "boundstype", .equivalenceRegionDependencies))
+  equivalenceOneBoundsContainer$dependOn(c("variables", "mu", "alpha", "missingValues", "boundstype", "equivalenceboundsplot", .equivalenceRegionDependencies))
+  equivalenceOneBoundsContainer$position <- 4
   jaspResults[["equivalenceOneBoundsContainer"]] <- equivalenceOneBoundsContainer
 
   if (!ready)

diff --git a/R/equivalencepairedsamplesttest.R b/R/equivalencepairedsamplesttest.R
@@ -51,7 +51,7 @@ EquivalencePairedSamplesTTest <- function(jaspResults, dataset, options) {
   if (options$descriptives && is.null(jaspResults[["equivalencePairedDescriptivesTable"]]))
     .equivalencePairedTTestTableDescriptives(jaspResults, dataset, options, equivalencePairedTTestResults, ready)
 
-  if (options$equivalenceboundsplot)
+  if (options$equivalenceboundsplot && is.null(jaspResults[["equivalencePairedBoundsContainer"]]))
     .equivalenceBoundsPlotPaired(jaspResults, dataset, options, equivalencePairedTTestResults, ready)
 
   return()
@@ -149,6 +149,7 @@ EquivalencePairedSamplesTTest <- function(jaspResults, dataset, options) {
   # Create table
   equivalencePairedTTestTable <- createJaspTable(title = gettext("Equivalence Paired Samples T-Test"))
   equivalencePairedTTestTable$dependOn(c("pairs", "alpha", "missingValues", "boundstype", .equivalenceRegionDependencies))
+  equivalencePairedTTestTable$position <- 1
 
   # Add Columns to table
   equivalencePairedTTestTable$addColumnInfo(name = "variable1",   title = " ",                   type = "string")
@@ -223,6 +224,7 @@ EquivalencePairedSamplesTTest <- function(jaspResults, dataset, options) {
   # Create table
   equivalencePairedBoundsTable <- createJaspTable(title = gettext("Equivalence Bounds"))
   equivalencePairedBoundsTable$dependOn(c("pairs", "alpha", "missingValues", "boundstype", .equivalenceRegionDependencies))
+  equivalencePairedBoundsTable$position <- 2
 
   # Add Columns to table
   equivalencePairedBoundsTable$addColumnInfo(name = "variable1",   title = " ",                   type = "string", combine = TRUE)
@@ -291,6 +293,7 @@ EquivalencePairedSamplesTTest <- function(jaspResults, dataset, options) {
   # Create table
   equivalencePairedDescriptivesTable <- createJaspTable(title = gettext("Descriptives"))
   equivalencePairedDescriptivesTable$dependOn(c("pairs", "descriptives", "missingValues"))
+  equivalencePairedDescriptivesTable$position <- 3
 
   # Add Columns to table
   equivalencePairedDescriptivesTable$addColumnInfo(name = "level",      title = " ",                  type = "string")
@@ -336,9 +339,9 @@ EquivalencePairedSamplesTTest <- function(jaspResults, dataset, options) {
 
 .equivalenceBoundsPlotPaired <- function(jaspResults, dataset, options, equivalencePairedTTestResults, ready) {
 
-
   equivalencePairedBoundsContainer <- createJaspContainer(title = gettext("Equivalence Bounds Plots"))
-  equivalencePairedBoundsContainer$dependOn(c("pairs", "alpha", "missingValues",  "boundstype", .equivalenceRegionDependencies))
+  equivalencePairedBoundsContainer$dependOn(c("pairs", "alpha", "missingValues",  "boundstype", "equivalenceboundsplot", .equivalenceRegionDependencies))
+  equivalencePairedBoundsContainer$position <- 4
   jaspResults[["equivalencePairedBoundsContainer"]] <- equivalencePairedBoundsContainer
 
   if (!ready)