Merge branch 'hotfix/v0.6.1'

Author: JaeyeongYang

.travis.yml

@@ -1,4 +1,7 @@
 language: r
+r:
+  - oldrel
+  - release
 
 # Be strict when checking our package
 warnings_are_errors: false
@@ -15,12 +18,15 @@ os:
   - osx
 
 # Use cache for packages
-cache: packages
+cache:
+  apt: true
+  packages: true
 
 # System dependencies for HTTP calling
 addons:
   apt:
     packages:
+      - libgit2-dev
       - libcurl4-openssl-dev
       - libxml2-dev
 

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: hBayesDM
 Title: Hierarchical Bayesian Modeling of Decision-Making Tasks
-Version: 0.6.0
-Date: 2018-09-11
+Version: 0.6.1
+Date: 2018-10-09
 Authors@R: c(
 	person("Woo-Young", "Ahn", email = "wooyoung.ahn@gmail.com", role = c("aut", "cre")),
 	person("Nate", "Haines", email = "haines.175@osu.edu", role = c("aut")),

R/peer_ocu.R

@@ -258,9 +258,9 @@ peer_ocu <- function(data           = "choose",
         mu_p     = c(qnorm(inits_fixed[1]/2), log(inits_fixed[2]), inits_fixed[3]),
         sigma    = c(1.0, 1.0, 1.0),
         rho_p    = rep(qnorm(inits_fixed[1]/2), numSubjs),
-        tau_p    = rep(log(inits_fixed[2]), numSubjs,
-        ocu_p    = rep(inits_fixed[3]), numSubjs)
-)
+        tau_p    = rep(log(inits_fixed[2]), numSubjs),
+        ocu_p    = rep(inits_fixed[3], numSubjs)
+      )
     }
   } else {
     genInitList <- "random"

inst/NEWS

@@ -1,8 +1,12 @@
+Oct 9, 2018 (0.6.1)
+* Solve an issue with built binary files.
+* Fix an error on peer_ocu with misplaced parentheses.
+
 Sep 11, 2018 (0.6.0)
 * Add new tasks (Balloon Analogue Risk Task, Choice under Risk and Ambiguity Task, Probabilistic Selection Task, Risky Decision Task (a.k.a. Happiness task), Wisconsin Card Sorting Task)
-* Add a new model for the Iowa Gambling Task (igt_orl) 
+* Add a new model for the Iowa Gambling Task (igt_orl)
 * Change priors (Half-Cauchy(0, 5) --> Half-Cauchy(0, 1) or Half-Normal(0, 0.2)
-* printFit function now provides LOOIC weights and/or WAIC weights 
+* printFit function now provides LOOIC weights and/or WAIC weights
 
 March 26, 2018 (0.5.1)
 * Add models for the Two Step task
@@ -14,14 +18,14 @@ Dec 25, 2017 (0.5.0)
 * Support variational Bayesian methods (vb=TRUE)
 * Allow posterior predictive checks, except for drift-diffusion models (inc_postpred=TRUE)
 * Add the peer influence task (Chung et al., 2015, USE WITH CAUTION for now and PLEASE GIVE US FEEDBACK!)
-* Add 'prl_fictitious_rp' model 
-* Made changes to be compatible with the newest Stan version (e.g., // instead of # for commenting). 
+* Add 'prl_fictitious_rp' model
+* Made changes to be compatible with the newest Stan version (e.g., // instead of # for commenting).
 * In 'prl_*' models, 'rewlos' is replaced by 'outcome' so that column names and labels would be consistent across tasks as much as possible.
 * Email feature is disabled as R mail package does not allow users to send anonymous emails anymore.
 * When outputs are saved as a file (*.RData), the file name now contains the name of the data file.
 
 May 20, 2017 (0.4.0)
-* Add a choice reaction time task and evidence accumulation models 
+* Add a choice reaction time task and evidence accumulation models
   - Drift diffusion model (both hierarchical and single-subject)
   - Linear Ballistic Accumulator (LBA) model (both hierarchical and single-subject)
 * Add PRL models that can fit multiple blocks
@@ -34,26 +38,26 @@ Jan 22, 2017 (0.3.1)
 * Rewrite the "printFit" function.
 
 Jan 20, 2017 (0.3.0)
-* Made several changes following the guidelines for R packages providing interfaces to Stan. 
-* Stan models are precompiled and models will run immediately when called. 
-* The default number of chains is set to 4. 
+* Made several changes following the guidelines for R packages providing interfaces to Stan.
+* Stan models are precompiled and models will run immediately when called.
+* The default number of chains is set to 4.
 * The default value of `adapt_delta` is set to 0.95 to reduce the potential for divergences.
-* The “printFit” function uses LOOIC by default. Users can select WAIC or both (LOOIC & WAIC) if needed. 
+* The “printFit” function uses LOOIC by default. Users can select WAIC or both (LOOIC & WAIC) if needed.
 
 Dec 28, 2016 (0.2.3.3)
 1. Change
   * Add help files
-  * Add a function for checking Rhat values (rhat). 
+  * Add a function for checking Rhat values (rhat).
   * Change a link to its tutorial website
 
 Dec 21, 2016 (0.2.3.2)
 1. Change
   * Use wide normal distributions for unbounded parameters (gng_* models).
-  * Automatic removal of rows (trials) containing NAs. 
+  * Automatic removal of rows (trials) containing NAs.
 
 Sep 29, 2016 (0.2.3.1)
 1. Change
-  * Add a function for plotting individual parameters (plotInd) 
+  * Add a function for plotting individual parameters (plotInd)
 
 Sat July 16 2016 (0.2.3)
 1. Change
@@ -65,11 +69,11 @@ Sat July 16 2016 (0.2.3)
   * ‘plotHDI’ function -> add ‘fontSize’ argument & change the color of histogram
 
 Sat Apr 02 2016 (0.2.1)
-1. Bug fixes 
+1. Bug fixes
   * All models: Fix errors when indPars=“mode”
   * ra_prospect model: Add description for column names of a data (*.txt) file
 2. Change
-  * Change standard deviations of ‘b’ and ‘pi’ priors in gng_* models	  
+  * Change standard deviations of ‘b’ and ‘pi’ priors in gng_* models
 
 Fri Mar 25 2016 (0.2.0)
-Initially released. 
+Initially released.