diff --git a/R/InformedBinomialTestBayesianWrapper.R b/R/InformedBinomialTestBayesianWrapper.R index c896c9c..4a97ccb 100644 --- a/R/InformedBinomialTestBayesianWrapper.R +++ b/R/InformedBinomialTestBayesianWrapper.R @@ -19,15 +19,17 @@ InformedBinomialTestBayesian <- function( data = NULL, - version = "0.18.2", + version = "0.19", bayesFactorType = "BF10", bfComparison = "encompassing", - bfVsHypothesis = "", + bfVsHypothesis = "Model 1", bridgeSamples = 1000, descriptivesDisplay = "counts", descriptivesPlot = FALSE, descriptivesTable = FALSE, factor = "", + includeEncompassingModel = TRUE, + includeNullModel = TRUE, mcmcBurnin = 500, mcmcSamples = 5000, models = list(list(modelName = "Model 1", syntax = "")), @@ -36,8 +38,12 @@ InformedBinomialTestBayesian <- function( posteriorPlot = FALSE, posteriorPlotCiCoverage = 0.95, priorCounts = list(list(levels = list(), name = "data 1", values = list()), list(levels = list(), name = "data 2", values = list())), + priorModelProbability = list(list(levels = list("Model 1", "Encompassing", "Null"), name = "data 1", values = list(1, 1, 1))), sampleSize = "", seed = 1, + sequentialAnalysisNumberOfSteps = 10, + sequentialAnalysisPlot = FALSE, + sequentialAnalysisPlotType = "bayesFactor", setSeed = FALSE, successes = "") { @@ -50,9 +56,9 @@ InformedBinomialTestBayesian <- function( options[["data"]] <- NULL options[["version"]] <- NULL - optionsWithFormula <- c("bfVsHypothesis", "factor", "models", "priorCounts", "sampleSize", "successes") + optionsWithFormula <- c("bfVsHypothesis", "factor", "models", "priorCounts", "priorModelProbability", "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)) -} \ No newline at end of file +} diff --git a/R/InformedMultinomialTestBayesianWrapper.R b/R/InformedMultinomialTestBayesianWrapper.R index 6caba83..207550e 100644 --- a/R/InformedMultinomialTestBayesianWrapper.R +++ b/R/InformedMultinomialTestBayesianWrapper.R @@ -19,25 +19,31 @@ InformedMultinomialTestBayesian <- function( data = NULL, - version = "0.18.2", + version = "0.19", bayesFactorType = "BF10", - bfComparison = "encompassing", - bfVsHypothesis = "", - bridgeSamples = 1000, + bfComparison = "null", + bfVsHypothesis = "Model 1", + bridgeSamples = 10000, count = "", descriptivesDisplay = "counts", descriptivesPlot = FALSE, descriptivesTable = FALSE, factor = "", + includeEncompassingModel = TRUE, + includeNullModel = TRUE, mcmcBurnin = 500, - mcmcSamples = 5000, + mcmcSamples = 10000, 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())), + priorModelProbability = list(list(levels = list("Null", "Encompassing", "Model 1"), name = "data 1", values = list("1", "1", "1"))), seed = 1, + sequentialAnalysisNumberOfSteps = 10, + sequentialAnalysisPlot = FALSE, + sequentialAnalysisPlotType = "bayesFactor", setSeed = FALSE) { defaultArgCalls <- formals(jaspFrequencies::InformedMultinomialTestBayesian) @@ -49,9 +55,9 @@ InformedMultinomialTestBayesian <- function( options[["data"]] <- NULL options[["version"]] <- NULL - optionsWithFormula <- c("bfVsHypothesis", "count", "factor", "models", "priorCounts") + optionsWithFormula <- c("bfVsHypothesis", "count", "factor", "models", "priorCounts", "priorModelProbability") 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)) -} \ No newline at end of file +} diff --git a/R/abtestbayesianWrapper.R b/R/abtestbayesianWrapper.R index abf40e5..7aa7cd7 100644 --- a/R/abtestbayesianWrapper.R +++ b/R/abtestbayesianWrapper.R @@ -19,7 +19,7 @@ ABTestBayesian <- function( data = NULL, - version = "0.18.2", + version = "0.19", bayesFactorOrder = "bestModelTop", bayesFactorType = "BF10", bfRobustnessPlot = FALSE, @@ -66,4 +66,4 @@ ABTestBayesian <- function( if ((name %in% optionsWithFormula) && inherits(options[[name]], "formula")) options[[name]] = jaspBase::jaspFormula(options[[name]], data) } return(jaspBase::runWrappedAnalysis("jaspFrequencies::ABTestBayesian", data, options, version)) -} \ No newline at end of file +} diff --git a/R/binomialtestWrapper.R b/R/binomialtestWrapper.R index d1e6ffa..b8ba75d 100644 --- a/R/binomialtestWrapper.R +++ b/R/binomialtestWrapper.R @@ -19,7 +19,7 @@ BinomialTest <- function( data = NULL, - version = "0.18.2", + version = "0.19", 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)) -} \ No newline at end of file +} diff --git a/R/binomialtestbayesianWrapper.R b/R/binomialtestbayesianWrapper.R index e491642..bbbc8db 100644 --- a/R/binomialtestbayesianWrapper.R +++ b/R/binomialtestbayesianWrapper.R @@ -19,7 +19,7 @@ BinomialTestBayesian <- function( data = NULL, - version = "0.18.2", + version = "0.19", formula = NULL, alternative = "twoSided", bayesFactorType = "BF10", @@ -56,4 +56,4 @@ BinomialTestBayesian <- function( if ((name %in% optionsWithFormula) && inherits(options[[name]], "formula")) options[[name]] = jaspBase::jaspFormula(options[[name]], data) } return(jaspBase::runWrappedAnalysis("jaspFrequencies::BinomialTestBayesian", data, options, version)) -} \ No newline at end of file +} diff --git a/R/contingencytablesWrapper.R b/R/contingencytablesWrapper.R index 1b82bce..8d2c43a 100644 --- a/R/contingencytablesWrapper.R +++ b/R/contingencytablesWrapper.R @@ -19,7 +19,7 @@ ContingencyTables <- function( data = NULL, - version = "0.18.2", + version = "0.19", formula = NULL, byIntervalEta = FALSE, chiSquared = TRUE, @@ -81,4 +81,4 @@ ContingencyTables <- function( if ((name %in% optionsWithFormula) && inherits(options[[name]], "formula")) options[[name]] = jaspBase::jaspFormula(options[[name]], data) } return(jaspBase::runWrappedAnalysis("jaspFrequencies::ContingencyTables", data, options, version)) -} \ No newline at end of file +} diff --git a/R/contingencytablesbayesianWrapper.R b/R/contingencytablesbayesianWrapper.R index 4aa991d..47fc923 100644 --- a/R/contingencytablesbayesianWrapper.R +++ b/R/contingencytablesbayesianWrapper.R @@ -19,7 +19,7 @@ ContingencyTablesBayesian <- function( data = NULL, - version = "0.18.2", + version = "0.19", formula = NULL, alternative = "twoSided", bayesFactorType = "BF10", @@ -71,4 +71,4 @@ ContingencyTablesBayesian <- function( if ((name %in% optionsWithFormula) && inherits(options[[name]], "formula")) options[[name]] = jaspBase::jaspFormula(options[[name]], data) } return(jaspBase::runWrappedAnalysis("jaspFrequencies::ContingencyTablesBayesian", data, options, version)) -} \ No newline at end of file +} diff --git a/R/multinomialtestWrapper.R b/R/multinomialtestWrapper.R index 4888d67..42f5add 100644 --- a/R/multinomialtestWrapper.R +++ b/R/multinomialtestWrapper.R @@ -19,7 +19,7 @@ MultinomialTest <- function( data = NULL, - version = "0.18.2", + version = "0.19", count = "", descriptivesPlot = FALSE, descriptivesPlotCiLevel = 0.95, @@ -49,4 +49,4 @@ MultinomialTest <- function( if ((name %in% optionsWithFormula) && inherits(options[[name]], "formula")) options[[name]] = jaspBase::jaspFormula(options[[name]], data) } return(jaspBase::runWrappedAnalysis("jaspFrequencies::MultinomialTest", data, options, version)) -} \ No newline at end of file +} diff --git a/R/multinomialtestbayesianWrapper.R b/R/multinomialtestbayesianWrapper.R index efdeefc..e8eaa6d 100644 --- a/R/multinomialtestbayesianWrapper.R +++ b/R/multinomialtestbayesianWrapper.R @@ -19,7 +19,7 @@ MultinomialTestBayesian <- function( data = NULL, - version = "0.18.2", + version = "0.19", bayesFactorType = "BF10", count = "", descriptivesPlot = FALSE, @@ -50,4 +50,4 @@ MultinomialTestBayesian <- function( if ((name %in% optionsWithFormula) && inherits(options[[name]], "formula")) options[[name]] = jaspBase::jaspFormula(options[[name]], data) } return(jaspBase::runWrappedAnalysis("jaspFrequencies::MultinomialTestBayesian", data, options, version)) -} \ No newline at end of file +} diff --git a/R/regressionloglinearWrapper.R b/R/regressionloglinearWrapper.R index 3535ec1..0521117 100644 --- a/R/regressionloglinearWrapper.R +++ b/R/regressionloglinearWrapper.R @@ -19,7 +19,7 @@ RegressionLogLinear <- function( data = NULL, - version = "0.18.2", + version = "0.19", formula = NULL, count = "", factors = list(), @@ -52,4 +52,4 @@ RegressionLogLinear <- function( if ((name %in% optionsWithFormula) && inherits(options[[name]], "formula")) options[[name]] = jaspBase::jaspFormula(options[[name]], data) } return(jaspBase::runWrappedAnalysis("jaspFrequencies::RegressionLogLinear", data, options, version)) -} \ No newline at end of file +} diff --git a/R/regressionloglinearbayesianWrapper.R b/R/regressionloglinearbayesianWrapper.R index 5fc25e7..68c9ad3 100644 --- a/R/regressionloglinearbayesianWrapper.R +++ b/R/regressionloglinearbayesianWrapper.R @@ -19,7 +19,7 @@ RegressionLogLinearBayesian <- function( data = NULL, - version = "0.18.2", + version = "0.19", formula = NULL, bayesFactorType = "BF10", count = "", @@ -64,4 +64,4 @@ RegressionLogLinearBayesian <- function( if ((name %in% optionsWithFormula) && inherits(options[[name]], "formula")) options[[name]] = jaspBase::jaspFormula(options[[name]], data) } return(jaspBase::runWrappedAnalysis("jaspFrequencies::RegressionLogLinearBayesian", data, options, version)) -} \ No newline at end of file +}