Skip to content

Commit bbdaeca

Browse files
committed
Merge branch 'hotfix/v0.6.3'
2 parents 46fc49d + 7089035 commit bbdaeca

36 files changed

+12135
-12116
lines changed

DESCRIPTION

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,48 @@
11
Package: hBayesDM
22
Title: Hierarchical Bayesian Modeling of Decision-Making Tasks
3-
Version: 0.6.2
4-
Date: 2018-10-09
3+
Version: 0.6.3
4+
Date: 2018-10-30
5+
Author:
6+
Woo-Young Ahn [aut, cre],
7+
Nate Haines [aut],
8+
Lei Zhang [aut],
9+
Harhim Park [ctb],
10+
Jaeyeong Yang [ctb],
11+
Dayeong Min [ctb],
12+
Jethro Lee [ctb]
513
Authors@R: c(
6-
person("Woo-Young", "Ahn", email = "wooyoung.ahn@gmail.com", role = c("aut", "cre")),
7-
person("Nate", "Haines", email = "haines.175@osu.edu", role = c("aut")),
8-
person("Lei", "Zhang", email = "bnuzhanglei2008@gmail.com", role = c("aut")) )
14+
person("Woo-Young", "Ahn", email = "wooyoung.ahn@gmail.com", role = c("aut", "cre")),
15+
person("Nate", "Haines", email = "haines.175@osu.edu", role = c("aut")),
16+
person("Lei", "Zhang", email = "bnuzhanglei2008@gmail.com", role = c("aut")),
17+
person("Harhim", "Park", email = "hrpark12@gmail.com", role = c("ctb")),
18+
person("Jaeyeong", "Yang", email = "jaeyeong.yang1125@gmail.com", role = c("ctb")),
19+
person("Dayeong", "Min", email = "mindy2801@snu.ac.kr", role = c("ctb")),
20+
person("Jethro", "Lee", email = "dlemfh96@snu.ac.kr", role = c("ctb")))
921
Maintainer: Woo-Young Ahn <wooyoung.ahn@gmail.com>
10-
Description: Fit an array of decision-making tasks with computational models in
22+
Description:
23+
Fit an array of decision-making tasks with computational models in
1124
a hierarchical Bayesian framework. Can perform hierarchical Bayesian analysis of
1225
various computational models with a single line of coding.
1326
Depends:
1427
R (>= 3.4.0),
15-
Rcpp (>= 0.12.14),
28+
Rcpp (>= 0.12.0),
1629
methods
1730
Imports:
18-
rstan (>= 2.17.0),
19-
rstantools (>= 1.4.0),
31+
rstan (>= 2.18.1),
2032
loo (>= 2.0),
2133
grid,
2234
parallel,
2335
ggplot2
24-
LinkingTo: StanHeaders (>= 2.17.0), rstan (>= 2.17.0), BH (>= 1.65.0.1), Rcpp
25-
(>= 0.12.14), RcppEigen (>= 0.3.3.3.1)
36+
LinkingTo:
37+
StanHeaders (>= 2.18.0),
38+
rstan (>= 2.18.1),
39+
BH (>= 1.66.0),
40+
Rcpp (>= 0.12.0),
41+
RcppEigen (>= 0.3.3.3.0)
2642
URL: http://rpubs.com/CCSL/hBayesDM
43+
BugReports: https://github.com/CCS-Lab/hBayesDM/issues
2744
License: GPL-3
2845
LazyData: true
2946
NeedsCompilation: yes
30-
Author: Woo-Young Ahn [aut, cre],
31-
Nate Haines [aut],
32-
Lei Zhang [aut]
33-
RoxygenNote: 6.0.1
47+
Encoding: UTF-8
48+
RoxygenNote: 6.1.0

cleanup

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ mkdir -p src/include
66
sed -i.bak '/current_statement_begin__ = [0-9]/d' src/include/models.hpp
77
cat src/*.cc > src/Modules.cpp
88
rm src/*.cc
9-
"${R_HOME}/bin/R" --vanilla --slave -e 'roxygen2::roxygenize(clean = TRUE)'
109
exit $?

cleanup.win

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ mkdir -p src/include
66

77
cat src/*.cc > src/Modules.cpp
88
rm src/*.cc
9-
"${R_HOME}/bin/R" --vanilla --slave -e 'roxygen2::roxygenize(clean = TRUE)'
109
exit $?

inst/NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Oct 30, 2018 (0.6.3)
2+
* Update the dependencies on rstan (>= 2.18.1)
3+
* No changes on model files, as same as the version 0.6.2
4+
15
Oct 19, 2018 (0.6.2)
26
* Fix an error on choiceRT_ddm (#44)
37

man/bandit2arm_delta.Rd

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

man/bandit4arm_4par.Rd

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

man/bandit4arm_lapse.Rd

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

man/bart_par4.Rd

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

man/choiceRT_ddm.Rd

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

man/choiceRT_ddm_single.Rd

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

0 commit comments

Comments
 (0)