Skip to content

Commit 2781155

Browse files
committed
Merge branch 'hotfix/v1.0.2'
2 parents fdd88c9 + 03a6a67 commit 2781155

File tree

85 files changed

+2215
-1035
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+2215
-1035
lines changed

R/DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: hBayesDM
22
Title: Hierarchical Bayesian Modeling of Decision-Making Tasks
3-
Version: 1.0.1
4-
Date: 2019-09-01
3+
Version: 1.0.2
4+
Date: 2019-11-13
55
Author:
66
Woo-Young Ahn [aut, cre],
77
Nate Haines [aut],

R/NEWS.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# hBayesDM 1.0.2
2+
3+
- Fix an error on using data.frame objects as data (#112).
4+
15
# hBayesDM 1.0.1
26

37
- Minor fix on the plotting function.

R/R/HDIofMCMC.R

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#' Compute Highest-Density Interval
22
#'
33
#' @description
4-
#' Computes the highest density interval from a sample of representative values, estimated as shortest credible interval.
5-
#' Downloaded from John Kruschke's website \url{http://www.indiana.edu/~kruschke/DoingBayesianDataAnalysis/}
4+
#' Computes the highest density interval from a sample of representative values,
5+
#' estimated as shortest credible interval.
6+
#' Based on John Kruschke's codes.
67
#'
78
#' @param sampleVec A vector of representative values from a probability distribution (e.g., MCMC samples).
89
#' @param credMass A scalar between 0 and 1, indicating the mass within the credible interval that is to be estimated.

R/R/hBayesDM_model.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,8 @@ hBayesDM_model <- function(task_name,
306306
############### Print for user ###############
307307
cat("\n")
308308
cat("Model name =", model, "\n")
309-
cat("Data file =", data, "\n")
309+
if (is.character(data))
310+
cat("Data file =", data, "\n")
310311
cat("\n")
311312
cat("Details:\n")
312313
if (vb) {

R/R/plotHDI.R

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#' Plots highest density interval (HDI) from (MCMC) samples and prints HDI in the R console. HDI is indicated by a red line.
1+
#' Plots highest density interval (HDI) from (MCMC) samples and prints HDI in the R console.
2+
#' HDI is indicated by a red line.
3+
#' Based on John Kruschke's codes.
24
#'
3-
#' Based on John Kruschke's codes \url{http://www.indiana.edu/~kruschke/DoingBayesianDataAnalysis/}
45
#' @param sample MCMC samples
56
#' @param credMass A scalar between 0 and 1, indicating the mass within the credible interval that is to be estimated.
67
#' @param Title Character value containing the main title for the plot

R/docs/404.html

Lines changed: 152 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)