Merge branch 'hotfix/v0.6.3'

CCS-Lab · Oct 30, 2018 · bbdaeca · bbdaeca
2 parents 46fc49d + 7089035
commit bbdaeca
Show file tree

Hide file tree

Showing 36 changed files with 12,135 additions and 12,116 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,33 +1,48 @@
 Package: hBayesDM
 Title: Hierarchical Bayesian Modeling of Decision-Making Tasks
-Version: 0.6.2
-Date: 2018-10-09
+Version: 0.6.3
+Date: 2018-10-30
+Author:
+    Woo-Young Ahn [aut, cre],
+    Nate Haines [aut],
+    Lei Zhang [aut],
+    Harhim Park [ctb],
+    Jaeyeong Yang [ctb],
+    Dayeong Min [ctb],
+    Jethro Lee [ctb]
 Authors@R: c(
-	person("Woo-Young", "Ahn", email = "[email protected]", role = c("aut", "cre")),
-	person("Nate", "Haines", email = "[email protected]", role = c("aut")),
-	person("Lei", "Zhang", email = "[email protected]", role = c("aut")) )
+    person("Woo-Young", "Ahn", email = "[email protected]", role = c("aut", "cre")),
+    person("Nate", "Haines", email = "[email protected]", role = c("aut")),
+    person("Lei", "Zhang", email = "[email protected]", role = c("aut")),
+    person("Harhim", "Park", email = "[email protected]", role = c("ctb")),
+    person("Jaeyeong", "Yang", email = "[email protected]", role = c("ctb")),
+    person("Dayeong", "Min", email = "[email protected]", role = c("ctb")),
+    person("Jethro", "Lee", email = "[email protected]", role = c("ctb")))
 Maintainer: Woo-Young Ahn <[email protected]>
-Description: Fit an array of decision-making tasks with computational models in
+Description:
+    Fit an array of decision-making tasks with computational models in
     a hierarchical Bayesian framework. Can perform hierarchical Bayesian analysis of
     various computational models with a single line of coding.
 Depends:
     R (>= 3.4.0),
-    Rcpp (>= 0.12.14),
+    Rcpp (>= 0.12.0),
     methods
 Imports:
-    rstan (>= 2.17.0),
-    rstantools (>= 1.4.0),
+    rstan (>= 2.18.1),
     loo (>= 2.0),
     grid,
     parallel,
     ggplot2
-LinkingTo: StanHeaders (>= 2.17.0), rstan (>= 2.17.0), BH (>= 1.65.0.1), Rcpp
-    (>= 0.12.14), RcppEigen (>= 0.3.3.3.1)
+LinkingTo:
+    StanHeaders (>= 2.18.0),
+    rstan (>= 2.18.1),
+    BH (>= 1.66.0),
+    Rcpp (>= 0.12.0),
+    RcppEigen (>= 0.3.3.3.0)
 URL: http://rpubs.com/CCSL/hBayesDM
+BugReports: https://github.com/CCS-Lab/hBayesDM/issues
 License: GPL-3
 LazyData: true
 NeedsCompilation: yes
-Author: Woo-Young Ahn [aut, cre],
-    Nate Haines [aut],
-    Lei Zhang [aut]
-RoxygenNote: 6.0.1
+Encoding: UTF-8
+RoxygenNote: 6.1.0
diff --git a/cleanup b/cleanup
@@ -6,5 +6,4 @@ mkdir -p src/include
 sed -i.bak '/current_statement_begin__ = [0-9]/d' src/include/models.hpp
 cat src/*.cc > src/Modules.cpp
 rm src/*.cc
-"${R_HOME}/bin/R" --vanilla --slave -e 'roxygen2::roxygenize(clean = TRUE)'
 exit $?
diff --git a/cleanup.win b/cleanup.win
@@ -6,5 +6,4 @@ mkdir -p src/include
 
 cat src/*.cc > src/Modules.cpp
 rm src/*.cc
-"${R_HOME}/bin/R" --vanilla --slave -e 'roxygen2::roxygenize(clean = TRUE)'
 exit $?
diff --git a/inst/NEWS b/inst/NEWS
@@ -1,3 +1,7 @@
+Oct 30, 2018 (0.6.3)
+* Update the dependencies on rstan (>= 2.18.1)
+* No changes on model files, as same as the version 0.6.2
+
 Oct 19, 2018 (0.6.2)
 * Fix an error on choiceRT_ddm (#44)
 

diff --git a/man/bandit2arm_delta.Rd b/man/bandit2arm_delta.Rd
diff --git a/man/bandit4arm_4par.Rd b/man/bandit4arm_4par.Rd
diff --git a/man/bandit4arm_lapse.Rd b/man/bandit4arm_lapse.Rd
diff --git a/man/bart_par4.Rd b/man/bart_par4.Rd
diff --git a/man/choiceRT_ddm.Rd b/man/choiceRT_ddm.Rd
diff --git a/man/choiceRT_ddm_single.Rd b/man/choiceRT_ddm_single.Rd
diff --git a/man/choiceRT_lba.Rd b/man/choiceRT_lba.Rd
diff --git a/man/choiceRT_lba_single.Rd b/man/choiceRT_lba_single.Rd
diff --git a/man/cra_linear.Rd b/man/cra_linear.Rd
diff --git a/man/dd_cs_single.Rd b/man/dd_cs_single.Rd
diff --git a/man/dd_hyperbolic.Rd b/man/dd_hyperbolic.Rd
diff --git a/man/dd_hyperbolic_single.Rd b/man/dd_hyperbolic_single.Rd
diff --git a/man/igt_orl.Rd b/man/igt_orl.Rd
diff --git a/man/igt_pvl_decay.Rd b/man/igt_pvl_decay.Rd
diff --git a/man/igt_pvl_delta.Rd b/man/igt_pvl_delta.Rd
diff --git a/man/igt_vpp.Rd b/man/igt_vpp.Rd
diff --git a/man/plotDist.Rd b/man/plotDist.Rd
diff --git a/man/plotHDI.Rd b/man/plotHDI.Rd
diff --git a/man/prl_fictitious.Rd b/man/prl_fictitious.Rd
diff --git a/man/prl_fictitious_multipleB.Rd b/man/prl_fictitious_multipleB.Rd
diff --git a/man/prl_fictitious_rp.Rd b/man/prl_fictitious_rp.Rd