Skip to content

Commit 574459b

Browse files
boutinbboutinb
committed
Update wrappers
1 parent 7baa771 commit 574459b

40 files changed

+2056
-240
lines changed

‎R/LDamorosoWrapper.R‎

Lines changed: 56 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (C) 2013-2022 University of Amsterdam
2+
# Copyright (C) 2013-2025 University of Amsterdam
33
#
44
# This program is free software: you can redistribute it and/or modify
55
# it under the terms of the GNU General Public License as published by
@@ -15,15 +15,59 @@
1515
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1616
#
1717

18-
# This is a generated file. Don't change it
18+
# This is a generated file. Don't change it!
1919

20+
#' Amoroso
21+
#'
22+
#' @param andersonDarling, Displays the Anderson-Darling test
23+
#' Defaults to \code{FALSE}.
24+
#' @param cramerVonMisses, Displays the Cramér-von Mises test
25+
#' Defaults to \code{FALSE}.
26+
#' @param ecdf, Displays an empirical cumulative distribution plot of the selected variable.
27+
#' Defaults to \code{FALSE}.
28+
#' @param estCDF, Displays an empirical cumulative distribution plot overlayed with the cumulative distribution function of the fitted distribution
29+
#' Defaults to \code{FALSE}.
30+
#' @param estPDF, Displays a histogram of the selected variable overlayed with the probability density function of the fitted distribution
31+
#' Defaults to \code{FALSE}.
32+
#' @param highlightDensity, Highlights the probability density on the probability density plot and cumulative distribution plot at specified values of x
33+
#' Defaults to \code{FALSE}.
34+
#' @param highlightProbability, Highlights the probability in between the specified values of x in the density plot (area under the curve), and highlights the cumulative probability at the specified values in the cumulative distribution plot
35+
#' Defaults to \code{FALSE}.
36+
#' @param highlightType, Select the bounds of the interval to display: Density is highlighted at the lower and upper bounds, the probability is displayed for the specified interval.
37+
#' \itemize{
38+
#' \item \code{"minmax"}
39+
#' \item \code{"upper"}
40+
#' \item \code{"lower"}
41+
#' }
42+
#' @param histogram, Display a histogram of the selected variable with the number of specified bins.
43+
#' Defaults to \code{FALSE}.
44+
#' @param kolmogorovSmirnov, Displays the Kolmogorov-Smirnov test
45+
#' Defaults to \code{FALSE}.
46+
#' @param lillienfors, Displays the Lillienfors test
47+
#' Defaults to \code{FALSE}.
48+
#' @param methodMLE, Estimates the parameters by the values in the domain at which the likelihood function is maximized. The likelihood function fixes the data argument (based on the selected variable) in the theoretical density function and views it as a function of the parameters. The optimization procedure is initialized with the values for the parameters entered under "Show Distribution".
49+
#' Defaults to \code{FALSE}.
50+
#' @param min_x, Defines the limits of the x-axis of the probability density plot and cumulative distribution plot, and the limits of the y-axis of the quantile plot.
51+
#' @param moments, Displays a table with the raw and central sample moments of the selected variable. Defaults to first 2 moments.
52+
#' Defaults to \code{FALSE}.
53+
#' @param newVariableName, Specify the name of the variable. Once filled, creates a column with samples drawn from the specified distribution in the current data set.
54+
#' @param ppplot, Displays the probability-probability plot. The *x*-axis shows the theoretical value of the cumulative density function of the data points under the fitted distribution, the *y*-axis shows the empirical percentiles of the selected variable.
55+
#' Defaults to \code{FALSE}.
56+
#' @param qqplot, Displays the quantile-quantile plot. The *x*-axis shows the theoretical quantiles of the data points under the fitted distribution, the *y*-axis shows the empirical quantiles of the selected variable.
57+
#' Defaults to \code{FALSE}.
58+
#' @param sampleSize, Specify the number of samples.
59+
#' @param shapiroWilk, Displays the Shapiro-Wilk test of normality
60+
#' Defaults to \code{FALSE}.
61+
#' @param summary, Displays a descriptive table of the selected variable.
62+
#' Defaults to \code{TRUE}.
2063
LDamoroso <- function(
2164
data = NULL,
22-
version = "0.19",
65+
version = "0.95",
2366
a = 0,
2467
alpha = 1,
2568
andersonDarling = FALSE,
2669
beta = 1,
70+
biasCorrected = FALSE,
2771
ciInterval = FALSE,
2872
ciIntervalInterval = 0.95,
2973
cramerVonMisses = FALSE,
@@ -38,6 +82,7 @@ LDamoroso <- function(
3882
histogram = FALSE,
3983
histogramBins = 30,
4084
kolmogorovSmirnov = FALSE,
85+
lillienfors = FALSE,
4186
lower_max = 0,
4287
max = 1,
4388
max_x = 3,
@@ -61,13 +106,13 @@ LDamoroso <- function(
61106
qqPlotCi = FALSE,
62107
qqPlotCiLevel = 0.95,
63108
qqplot = FALSE,
64-
sampleSize = 7,
109+
sampleSize = 0,
65110
shapiroWilk = FALSE,
66111
simulateNow = FALSE,
67112
summary = TRUE,
68113
theta = 1,
69114
upper_min = 0,
70-
variable = "") {
115+
variable = list(types = list(), value = "")) {
71116

72117
defaultArgCalls <- formals(jaspDistributions::LDamoroso)
73118
defaultArgs <- lapply(defaultArgCalls, eval)
@@ -78,9 +123,14 @@ LDamoroso <- function(
78123
options[["data"]] <- NULL
79124
options[["version"]] <- NULL
80125

126+
127+
if (!jaspBase::jaspResultsCalledFromJasp() && !is.null(data)) {
128+
jaspBase::storeDataSet(data)
129+
}
130+
81131
optionsWithFormula <- c("variable")
82132
for (name in optionsWithFormula) {
83133
if ((name %in% optionsWithFormula) && inherits(options[[name]], "formula")) options[[name]] = jaspBase::jaspFormula(options[[name]], data) }
84134

85-
return(jaspBase::runWrappedAnalysis("jaspDistributions::LDamoroso", data, options, version))
135+
return(jaspBase::runWrappedAnalysis("jaspDistributions", "LDamoroso", "LDamoroso.qml", options, version, TRUE))
86136
}

‎R/LDbernoulliWrapper.R‎

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (C) 2013-2022 University of Amsterdam
2+
# Copyright (C) 2013-2025 University of Amsterdam
33
#
44
# This program is free software: you can redistribute it and/or modify
55
# it under the terms of the GNU General Public License as published by
@@ -15,11 +15,34 @@
1515
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1616
#
1717

18-
# This is a generated file. Don't change it
18+
# This is a generated file. Don't change it!
1919

20+
#' Bernoulli
21+
#'
22+
#' @param ecdf, Displays an empirical cumulative distribution plot of the selected variable.
23+
#' Defaults to \code{FALSE}.
24+
#' @param estCDF, Displays an empirical cumulative distribution plot overlayed with the cumulative distribution function of the fitted distribution
25+
#' Defaults to \code{FALSE}.
26+
#' @param estPMF, Displays a histogram of the selected variable overlayed with the probability density function of the fitted distribution
27+
#' Defaults to \code{FALSE}.
28+
#' @param histogram, Display a bar plot of the selected variable.
29+
#' Defaults to \code{FALSE}.
30+
#' @param methodMLE, Estimates the parameters by the values in the domain at which the likelihood function is maximized. The likelihood function fixes the data argument (based on the selected variable) in the theoretical density function and views it as a function of the parameters. The optimization procedure is initialized with the values for the parameters entered under "Show Distribution".
31+
#' Defaults to \code{FALSE}.
32+
#' @param moments, Displays a table with the raw and central sample moments of the selected variable. Defaults to first 2 moments.
33+
#' Defaults to \code{FALSE}.
34+
#' @param newVariableName, Specify the name of the variable. Once filled, creates a column with samples drawn from the specified distribution in the current data set.
35+
#' @param ppplot, Displays the probability-probability plot. The *x*-axis shows the theoretical value of the cumulative density function of the data points under the fitted distribution, the *y*-axis shows the empirical percentiles of the selected variable.
36+
#' Defaults to \code{FALSE}.
37+
#' @param qqplot, Displays the quantile-quantile plot. The *x*-axis shows the theoretical quantiles of the data points under the fitted distribution, the *y*-axis shows the empirical quantiles of the selected variable.
38+
#' Defaults to \code{FALSE}.
39+
#' @param sampleSize, Specify the number of samples.
40+
#' @param summary, Displays a descriptive table of the selected variable.
41+
#' Defaults to \code{TRUE}.
2042
LDbernoulli <- function(
2143
data = NULL,
22-
version = "0.19",
44+
version = "0.95",
45+
biasCorrected = FALSE,
2346
ciInterval = FALSE,
2447
ciIntervalInterval = 0.95,
2548
ecdf = FALSE,
@@ -51,10 +74,10 @@ LDbernoulli <- function(
5174
qqPlotCi = FALSE,
5275
qqPlotCiLevel = 0.95,
5376
qqplot = FALSE,
54-
sampleSize = 7,
77+
sampleSize = 0,
5578
simulateNow = FALSE,
5679
summary = TRUE,
57-
variable = "") {
80+
variable = list(types = list(), value = "")) {
5881

5982
defaultArgCalls <- formals(jaspDistributions::LDbernoulli)
6083
defaultArgs <- lapply(defaultArgCalls, eval)
@@ -65,9 +88,14 @@ LDbernoulli <- function(
6588
options[["data"]] <- NULL
6689
options[["version"]] <- NULL
6790

91+
92+
if (!jaspBase::jaspResultsCalledFromJasp() && !is.null(data)) {
93+
jaspBase::storeDataSet(data)
94+
}
95+
6896
optionsWithFormula <- c("variable")
6997
for (name in optionsWithFormula) {
7098
if ((name %in% optionsWithFormula) && inherits(options[[name]], "formula")) options[[name]] = jaspBase::jaspFormula(options[[name]], data) }
7199

72-
return(jaspBase::runWrappedAnalysis("jaspDistributions::LDbernoulli", data, options, version))
100+
return(jaspBase::runWrappedAnalysis("jaspDistributions", "LDbernoulli", "LDbernoulli.qml", options, version, TRUE))
73101
}

‎R/LDbetaBinomialWrapper.R‎

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (C) 2013-2022 University of Amsterdam
2+
# Copyright (C) 2013-2025 University of Amsterdam
33
#
44
# This program is free software: you can redistribute it and/or modify
55
# it under the terms of the GNU General Public License as published by
@@ -15,13 +15,38 @@
1515
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1616
#
1717

18-
# This is a generated file. Don't change it
18+
# This is a generated file. Don't change it!
1919

20+
#' Beta-binomial
21+
#'
22+
#' @param chiSquare, Displays the chi-square goodness of fit test
23+
#' Defaults to \code{FALSE}.
24+
#' @param ecdf, Displays an empirical cumulative distribution plot of the selected variable.
25+
#' Defaults to \code{FALSE}.
26+
#' @param estCDF, Displays an empirical cumulative distribution plot overlayed with the cumulative distribution function of the fitted distribution
27+
#' Defaults to \code{FALSE}.
28+
#' @param estPMF, Displays a histogram of the selected variable overlayed with the probability density function of the fitted distribution
29+
#' Defaults to \code{FALSE}.
30+
#' @param histogram, Display a bar plot of the selected variable.
31+
#' Defaults to \code{FALSE}.
32+
#' @param methodMLE, Estimates the parameters by the values in the domain at which the likelihood function is maximized. The likelihood function fixes the data argument (based on the selected variable) in the theoretical density function and views it as a function of the parameters. The optimization procedure is initialized with the values for the parameters entered under "Show Distribution".
33+
#' Defaults to \code{FALSE}.
34+
#' @param moments, Displays a table with the raw and central sample moments of the selected variable. Defaults to first 2 moments.
35+
#' Defaults to \code{FALSE}.
36+
#' @param newVariableName, Specify the name of the variable. Once filled, creates a column with samples drawn from the specified distribution in the current data set.
37+
#' @param ppplot, Displays the probability-probability plot. The *x*-axis shows the theoretical value of the cumulative density function of the data points under the fitted distribution, the *y*-axis shows the empirical percentiles of the selected variable.
38+
#' Defaults to \code{FALSE}.
39+
#' @param qqplot, Displays the quantile-quantile plot. The *x*-axis shows the theoretical quantiles of the data points under the fitted distribution, the *y*-axis shows the empirical quantiles of the selected variable.
40+
#' Defaults to \code{FALSE}.
41+
#' @param sampleSize, Specify the number of samples.
42+
#' @param summary, Displays a descriptive table of the selected variable.
43+
#' Defaults to \code{TRUE}.
2044
LDbetaBinomial <- function(
2145
data = NULL,
22-
version = "0.19",
46+
version = "0.95",
2347
alpha = 1,
2448
beta = 1,
49+
biasCorrected = FALSE,
2550
chiSquare = FALSE,
2651
ciInterval = FALSE,
2752
ciIntervalInterval = 0.95,
@@ -55,11 +80,11 @@ LDbetaBinomial <- function(
5580
qqPlotCi = FALSE,
5681
qqPlotCiLevel = 0.95,
5782
qqplot = FALSE,
58-
sampleSize = 7,
83+
sampleSize = 0,
5984
simulateNow = FALSE,
6085
size = 10,
6186
summary = TRUE,
62-
variable = "") {
87+
variable = list(types = list(), value = "")) {
6388

6489
defaultArgCalls <- formals(jaspDistributions::LDbetaBinomial)
6590
defaultArgs <- lapply(defaultArgCalls, eval)
@@ -70,9 +95,14 @@ LDbetaBinomial <- function(
7095
options[["data"]] <- NULL
7196
options[["version"]] <- NULL
7297

98+
99+
if (!jaspBase::jaspResultsCalledFromJasp() && !is.null(data)) {
100+
jaspBase::storeDataSet(data)
101+
}
102+
73103
optionsWithFormula <- c("variable")
74104
for (name in optionsWithFormula) {
75105
if ((name %in% optionsWithFormula) && inherits(options[[name]], "formula")) options[[name]] = jaspBase::jaspFormula(options[[name]], data) }
76106

77-
return(jaspBase::runWrappedAnalysis("jaspDistributions::LDbetaBinomial", data, options, version))
107+
return(jaspBase::runWrappedAnalysis("jaspDistributions", "LDbetaBinomial", "LDbetaBinomial.qml", options, version, TRUE))
78108
}

‎R/LDbetaPrimeWrapper.R‎

Lines changed: 56 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (C) 2013-2022 University of Amsterdam
2+
# Copyright (C) 2013-2025 University of Amsterdam
33
#
44
# This program is free software: you can redistribute it and/or modify
55
# it under the terms of the GNU General Public License as published by
@@ -15,14 +15,58 @@
1515
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1616
#
1717

18-
# This is a generated file. Don't change it
18+
# This is a generated file. Don't change it!
1919

20+
#' Beta prime
21+
#'
22+
#' @param andersonDarling, Displays the Anderson-Darling test
23+
#' Defaults to \code{FALSE}.
24+
#' @param cramerVonMisses, Displays the Cramér-von Mises test
25+
#' Defaults to \code{FALSE}.
26+
#' @param ecdf, Displays an empirical cumulative distribution plot of the selected variable.
27+
#' Defaults to \code{FALSE}.
28+
#' @param estCDF, Displays an empirical cumulative distribution plot overlayed with the cumulative distribution function of the fitted distribution
29+
#' Defaults to \code{FALSE}.
30+
#' @param estPDF, Displays a histogram of the selected variable overlayed with the probability density function of the fitted distribution
31+
#' Defaults to \code{FALSE}.
32+
#' @param highlightDensity, Highlights the probability density on the probability density plot and cumulative distribution plot at specified values of x
33+
#' Defaults to \code{FALSE}.
34+
#' @param highlightProbability, Highlights the probability in between the specified values of x in the density plot (area under the curve), and highlights the cumulative probability at the specified values in the cumulative distribution plot
35+
#' Defaults to \code{FALSE}.
36+
#' @param highlightType, Select the bounds of the interval to display: Density is highlighted at the lower and upper bounds, the probability is displayed for the specified interval.
37+
#' \itemize{
38+
#' \item \code{"lower"}
39+
#' \item \code{"minmax"}
40+
#' \item \code{"upper"}
41+
#' }
42+
#' @param histogram, Display a histogram of the selected variable with the number of specified bins.
43+
#' Defaults to \code{FALSE}.
44+
#' @param kolmogorovSmirnov, Displays the Kolmogorov-Smirnov test
45+
#' Defaults to \code{FALSE}.
46+
#' @param lillienfors, Displays the Lillienfors test
47+
#' Defaults to \code{FALSE}.
48+
#' @param methodMLE, Estimates the parameters by the values in the domain at which the likelihood function is maximized. The likelihood function fixes the data argument (based on the selected variable) in the theoretical density function and views it as a function of the parameters. The optimization procedure is initialized with the values for the parameters entered under "Show Distribution".
49+
#' Defaults to \code{FALSE}.
50+
#' @param min_x, Defines the limits of the x-axis of the probability density plot and cumulative distribution plot, and the limits of the y-axis of the quantile plot.
51+
#' @param moments, Displays a table with the raw and central sample moments of the selected variable. Defaults to first 2 moments.
52+
#' Defaults to \code{FALSE}.
53+
#' @param newVariableName, Specify the name of the variable. Once filled, creates a column with samples drawn from the specified distribution in the current data set.
54+
#' @param ppplot, Displays the probability-probability plot. The *x*-axis shows the theoretical value of the cumulative density function of the data points under the fitted distribution, the *y*-axis shows the empirical percentiles of the selected variable.
55+
#' Defaults to \code{FALSE}.
56+
#' @param qqplot, Displays the quantile-quantile plot. The *x*-axis shows the theoretical quantiles of the data points under the fitted distribution, the *y*-axis shows the empirical quantiles of the selected variable.
57+
#' Defaults to \code{FALSE}.
58+
#' @param sampleSize, Specify the number of samples.
59+
#' @param shapiroWilk, Displays the Shapiro-Wilk test of normality
60+
#' Defaults to \code{FALSE}.
61+
#' @param summary, Displays a descriptive table of the selected variable.
62+
#' Defaults to \code{TRUE}.
2063
LDbetaPrime <- function(
2164
data = NULL,
22-
version = "0.19",
65+
version = "0.95",
2366
alpha = 1,
2467
andersonDarling = FALSE,
2568
beta = 1,
69+
biasCorrected = FALSE,
2670
ciInterval = FALSE,
2771
ciIntervalInterval = 0.95,
2872
cramerVonMisses = FALSE,
@@ -37,6 +81,7 @@ LDbetaPrime <- function(
3781
histogram = FALSE,
3882
histogramBins = 30,
3983
kolmogorovSmirnov = FALSE,
84+
lillienfors = FALSE,
4085
lower_max = 0,
4186
max = 1,
4287
max_x = 3,
@@ -60,12 +105,12 @@ LDbetaPrime <- function(
60105
qqPlotCi = FALSE,
61106
qqPlotCiLevel = 0.95,
62107
qqplot = FALSE,
63-
sampleSize = 7,
108+
sampleSize = 0,
64109
shapiroWilk = FALSE,
65110
simulateNow = FALSE,
66111
summary = TRUE,
67112
upper_min = 0,
68-
variable = "") {
113+
variable = list(types = list(), value = "")) {
69114

70115
defaultArgCalls <- formals(jaspDistributions::LDbetaPrime)
71116
defaultArgs <- lapply(defaultArgCalls, eval)
@@ -76,9 +121,14 @@ LDbetaPrime <- function(
76121
options[["data"]] <- NULL
77122
options[["version"]] <- NULL
78123

124+
125+
if (!jaspBase::jaspResultsCalledFromJasp() && !is.null(data)) {
126+
jaspBase::storeDataSet(data)
127+
}
128+
79129
optionsWithFormula <- c("variable")
80130
for (name in optionsWithFormula) {
81131
if ((name %in% optionsWithFormula) && inherits(options[[name]], "formula")) options[[name]] = jaspBase::jaspFormula(options[[name]], data) }
82132

83-
return(jaspBase::runWrappedAnalysis("jaspDistributions::LDbetaPrime", data, options, version))
133+
return(jaspBase::runWrappedAnalysis("jaspDistributions", "LDbetaPrime", "LDbetaPrime.qml", options, version, TRUE))
84134
}

0 commit comments

Comments
 (0)