Skip to content

Commit 2d552a6

Browse files
committed
Update to default reference prior
1 parent c98bd06 commit 2d552a6

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

R/auditBayesianEstimation.R

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ auditBayesianEstimation <- function(jaspResults, dataset, options, ...) {
148148
result <- jaspResults[["state"]]$object
149149

150150
pTry <- try({
151-
if (options[["priorKappa"]] == 0 || options[["priorNu"]] == 0 || options[["priorSigma2"]] == 0) {
151+
if (options[["priorKappa"]] == 0 || options[["priorNu"]] <= 0 || options[["priorSigma2"]] == 0) {
152152
xseq <- seq(extraDistr::qlst(0.0001, df = result$posterior$nu, mu = result$posterior$mu, sigma = result$posterior$sigma),
153153
extraDistr::qlst(0.9999, df = result$posterior$nu, mu = result$posterior$mu, sigma = result$posterior$sigma),
154154
length.out = 1000
@@ -215,7 +215,7 @@ auditBayesianEstimation <- function(jaspResults, dataset, options, ...) {
215215
}
216216
}
217217

218-
.jfaDirectBayes <- function(y, n, N, mu0 = 0, kappa0 = 0, nu0 = 0, sigma20 = 0, conf.level = 0.95) {
218+
.jfaDirectBayes <- function(y, n, N, mu0 = 0, kappa0 = 0, nu0 = -1, sigma20 = 0, conf.level = 0.95) {
219219
alpha <- (1 - conf.level) / 2
220220
mu_n <- (kappa0 * mu0 + n * mean(y)) / (kappa0 + n)
221221
kappa_n <- kappa0 + n
@@ -234,7 +234,7 @@ auditBayesianEstimation <- function(jaspResults, dataset, options, ...) {
234234
return(list(est = muY, lb = lb, ub = ub, unc = ub - muY, prior = list(nu = nu0, sigma = sigmaYprior, mu = muYprior), posterior = list(nu = nu_n, sigma = sigmaY, mu = muY)))
235235
}
236236

237-
.jfaDifferenceBayes <- function(y, x, n, X, N, mu0 = 0, kappa0 = 0, nu0 = 0, sigma20 = 0, conf.level = 0.95) {
237+
.jfaDifferenceBayes <- function(y, x, n, X, N, mu0 = 0, kappa0 = 0, nu0 = -1, sigma20 = 0, conf.level = 0.95) {
238238
alpha <- (1 - conf.level) / 2
239239
e <- x - y
240240
mu_n <- (kappa0 * mu0 + n * mean(e)) / (kappa0 + n)
@@ -254,7 +254,7 @@ auditBayesianEstimation <- function(jaspResults, dataset, options, ...) {
254254
return(list(est = muY, lb = lb, ub = ub, unc = ub - muY, prior = list(nu = nu0, sigma = sigmaYprior, mu = muYprior), posterior = list(nu = nu_n, sigma = sigmaY, mu = muY)))
255255
}
256256

257-
.jfaRatioBayes <- function(y, x, n, X, N, mu0 = 0, kappa0 = 0, nu0 = 0, sigma20 = 0, conf.level = 0.95) {
257+
.jfaRatioBayes <- function(y, x, n, X, N, mu0 = 0, kappa0 = 0, nu0 = -1, sigma20 = 0, conf.level = 0.95) {
258258
alpha <- (1 - conf.level) / 2
259259
q <- y / x
260260
mu_n <- (kappa0 * mu0 + n * mean(q)) / (kappa0 + n)
@@ -274,7 +274,7 @@ auditBayesianEstimation <- function(jaspResults, dataset, options, ...) {
274274
return(list(est = muY, lb = lb, ub = ub, unc = ub - muY, prior = list(nu = nu0, sigma = sigmaYprior, mu = muYprior), posterior = list(nu = nu_n, sigma = sigmaY, mu = muY)))
275275
}
276276

277-
.jfaRegressionBayes <- function(y, x, n, X, N, mu0 = c(0, 0), Lambda0 = diag(2) * 0, nu0 = 0, sigma20 = 0, conf.level = 0.95) {
277+
.jfaRegressionBayes <- function(y, x, n, X, N, mu0 = c(0, 0), Lambda0 = diag(2) * 0, nu0 = -1, sigma20 = 0, conf.level = 0.95) {
278278
alpha <- (1 - conf.level) / 2
279279
D <- cbind(1, x)
280280
DtD <- t(D) %*% D

inst/qml/auditBayesianEstimation.qml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,9 @@ Form
7676
{
7777
name: "priorNu"
7878
text: qsTr("Prior variance weight \u03BD")
79-
defaultValue: 0
80-
min: 0
79+
defaultValue: -1
80+
min: -1
81+
negativeValues: true
8182
decimals: 2
8283
info: qsTr("The prior parameter for the implicit sample size of the variance.")
8384
}

tests/testthat/test-auditbayesianestimation.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ test_that("Direct Estimator table results match", {
1919
table <- results[["results"]][["summaryTable"]][["data"]]
2020
jaspTools::expect_equal_tables(
2121
table,
22-
list(815398.066666667, 699530.415390775, 115867.651275891, 931265.717942558)
22+
list(815398.066666667, 699135.90261438, 116262.164052287, 931660.230718954)
2323
)
2424
})
2525

@@ -75,7 +75,7 @@ test_that("Ratio Estimator table results match", {
7575
table <- results[["results"]][["summaryTable"]][["data"]]
7676
jaspTools::expect_equal_tables(
7777
table,
78-
list(760959.912828661, 748177.445523007, 12782.4673056537, 773742.380134315)
78+
list(760959.912828661, 748133.92305051, 12825.9897781507, 773785.902606811)
7979
)
8080
})
8181

@@ -98,6 +98,6 @@ test_that("Regression Estimator table results match", {
9898
table <- results[["results"]][["summaryTable"]][["data"]]
9999
jaspTools::expect_equal_tables(
100100
table,
101-
list(757392.591641175, 744560.540015853, 12832.051625322, 770224.643266497)
101+
list(757392.591641175, 744516.848715841, 12875.7429253338, 770268.334566509)
102102
)
103103
})

0 commit comments

Comments
 (0)