Update wrappers (#177)

jasp-stats · Nov 22, 2023 · 6f595f8 · 6f595f8
1 parent 60af191
commit 6f595f8
Show file tree

Hide file tree

Showing 12 changed files with 127 additions and 10 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -19,6 +19,8 @@ export(ContingencyTablesInternal)
 export(ContingencyTablesBayesianInternal)
 export(RegressionLogLinearInternal)
 export(RegressionLogLinearBayesianInternal)
+export(InformedMultinomialTestBayesian)
+export(InformedBinomialTestBayesian)
 export(.bayesBinomialTest)
 export(.dfPointsPP)
 export(.dfLinesPP)

diff --git a/R/InformedBinomialTestBayesianWrapper.R b/R/InformedBinomialTestBayesianWrapper.R
@@ -0,0 +1,58 @@
+#
+# Copyright (C) 2013-2022 University of Amsterdam
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# This is a generated file. Don't change it
+
+InformedBinomialTestBayesian <- function(
+          data = NULL,
+          version = "0.18.2",
+          bayesFactorType = "BF10",
+          bfComparison = "encompassing",
+          bfVsHypothesis = "",
+          bridgeSamples = 1000,
+          descriptivesDisplay = "counts",
+          descriptivesPlot = FALSE,
+          descriptivesTable = FALSE,
+          factor = "",
+          mcmcBurnin = 500,
+          mcmcSamples = 5000,
+          models = list(list(modelName = "Model 1", syntax = "")),
+          plotHeight = 320,
+          plotWidth = 480,
+          posteriorPlot = FALSE,
+          posteriorPlotCiCoverage = 0.95,
+          priorCounts = list(list(levels = list(), name = "data 1", values = list()), list(levels = list(), name = "data 2", values = list())),
+          sampleSize = "",
+          seed = 1,
+          setSeed = FALSE,
+          successes = "") {
+
+   defaultArgCalls <- formals(jaspFrequencies::InformedBinomialTestBayesian)
+   defaultArgs <- lapply(defaultArgCalls, eval)
+   options <- as.list(match.call())[-1L]
+   options <- lapply(options, eval)
+   defaults <- setdiff(names(defaultArgs), names(options))
+   options[defaults] <- defaultArgs[defaults]
+   options[["data"]] <- NULL
+   options[["version"]] <- NULL
+
+   optionsWithFormula <- c("bfVsHypothesis", "factor", "models", "priorCounts", "sampleSize", "successes")
+   for (name in optionsWithFormula) {
+      if ((name %in% optionsWithFormula) && inherits(options[[name]], "formula")) options[[name]] = jaspBase::jaspFormula(options[[name]], data)   }
+
+   return(jaspBase::runWrappedAnalysis("jaspFrequencies::InformedBinomialTestBayesian", data, options, version))
+}
diff --git a/R/InformedMultinomialTestBayesianWrapper.R b/R/InformedMultinomialTestBayesianWrapper.R
@@ -0,0 +1,57 @@
+#
+# Copyright (C) 2013-2022 University of Amsterdam
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# This is a generated file. Don't change it
+
+InformedMultinomialTestBayesian <- function(
+          data = NULL,
+          version = "0.18.2",
+          bayesFactorType = "BF10",
+          bfComparison = "encompassing",
+          bfVsHypothesis = "",
+          bridgeSamples = 1000,
+          count = "",
+          descriptivesDisplay = "counts",
+          descriptivesPlot = FALSE,
+          descriptivesTable = FALSE,
+          factor = "",
+          mcmcBurnin = 500,
+          mcmcSamples = 5000,
+          models = list(list(modelName = "Model 1", syntax = "")),
+          plotHeight = 320,
+          plotWidth = 480,
+          posteriorPlot = FALSE,
+          posteriorPlotCiCoverage = 0.95,
+          priorCounts = list(list(levels = list(), name = "data 1", values = list())),
+          seed = 1,
+          setSeed = FALSE) {
+
+   defaultArgCalls <- formals(jaspFrequencies::InformedMultinomialTestBayesian)
+   defaultArgs <- lapply(defaultArgCalls, eval)
+   options <- as.list(match.call())[-1L]
+   options <- lapply(options, eval)
+   defaults <- setdiff(names(defaultArgs), names(options))
+   options[defaults] <- defaultArgs[defaults]
+   options[["data"]] <- NULL
+   options[["version"]] <- NULL
+
+   optionsWithFormula <- c("bfVsHypothesis", "count", "factor", "models", "priorCounts")
+   for (name in optionsWithFormula) {
+      if ((name %in% optionsWithFormula) && inherits(options[[name]], "formula")) options[[name]] = jaspBase::jaspFormula(options[[name]], data)   }
+
+   return(jaspBase::runWrappedAnalysis("jaspFrequencies::InformedMultinomialTestBayesian", data, options, version))
+}
diff --git a/R/abtestbayesianWrapper.R b/R/abtestbayesianWrapper.R
@@ -19,7 +19,7 @@
 
 ABTestBayesian <- function(
           data = NULL,
-          version = "0.17.1",
+          version = "0.18.2",
           bayesFactorOrder = "bestModelTop",
           bayesFactorType = "BF10",
           bfRobustnessPlot = FALSE,

diff --git a/R/binomialtestWrapper.R b/R/binomialtestWrapper.R
@@ -19,7 +19,7 @@
 
 BinomialTest <- function(
           data = NULL,
-          version = "0.17.1",
+          version = "0.18.2",
           formula = NULL,
           alternative = "twoSided",
           ci = FALSE,
@@ -53,4 +53,4 @@ BinomialTest <- function(
       if ((name %in% optionsWithFormula) && inherits(options[[name]], "formula")) options[[name]] = jaspBase::jaspFormula(options[[name]], data)   }
 
    return(jaspBase::runWrappedAnalysis("jaspFrequencies::BinomialTest", data, options, version))
-}
+}
diff --git a/R/binomialtestbayesianWrapper.R b/R/binomialtestbayesianWrapper.R
@@ -19,7 +19,7 @@
 
 BinomialTestBayesian <- function(
           data = NULL,
-          version = "0.17.1",
+          version = "0.18.2",
           formula = NULL,
           alternative = "twoSided",
           bayesFactorType = "BF10",

diff --git a/R/contingencytablesWrapper.R b/R/contingencytablesWrapper.R
@@ -19,7 +19,7 @@
 
 ContingencyTables <- function(
           data = NULL,
-          version = "0.17.1",
+          version = "0.18.2",
           formula = NULL,
           byIntervalEta = FALSE,
           chiSquared = TRUE,

diff --git a/R/contingencytablesbayesianWrapper.R b/R/contingencytablesbayesianWrapper.R
@@ -19,7 +19,7 @@
 
 ContingencyTablesBayesian <- function(
           data = NULL,
-          version = "0.17.1",
+          version = "0.18.2",
           formula = NULL,
           alternative = "twoSided",
           bayesFactorType = "BF10",

diff --git a/R/multinomialtestWrapper.R b/R/multinomialtestWrapper.R
@@ -19,7 +19,7 @@
 
 MultinomialTest <- function(
           data = NULL,
-          version = "0.17.1",
+          version = "0.18.2",
           count = "",
           descriptivesPlot = FALSE,
           descriptivesPlotCiLevel = 0.95,

diff --git a/R/multinomialtestbayesianWrapper.R b/R/multinomialtestbayesianWrapper.R
@@ -19,7 +19,7 @@
 
 MultinomialTestBayesian <- function(
           data = NULL,
-          version = "0.17.1",
+          version = "0.18.2",
           bayesFactorType = "BF10",
           count = "",
           descriptivesPlot = FALSE,

diff --git a/R/regressionloglinearWrapper.R b/R/regressionloglinearWrapper.R
@@ -19,7 +19,7 @@
 
 RegressionLogLinear <- function(
           data = NULL,
-          version = "0.17.1",
+          version = "0.18.2",
           formula = NULL,
           count = "",
           factors = list(),

diff --git a/R/regressionloglinearbayesianWrapper.R b/R/regressionloglinearbayesianWrapper.R
@@ -19,7 +19,7 @@
 
 RegressionLogLinearBayesian <- function(
           data = NULL,
-          version = "0.17.1",
+          version = "0.18.2",
           formula = NULL,
           bayesFactorType = "BF10",
           count = "",