Skip to content

Commit b1128e7

Browse files
committed
Merge branch 'hotfix/remove-warnings'
2 parents fd2a2c6 + a7ce9b8 commit b1128e7

Some content is hidden

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

67 files changed

+793
-715
lines changed

DESCRIPTION

Lines changed: 6 additions & 5 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: 0.7.0
4-
Date: 2018-12-14
3+
Version: 0.7.1
4+
Date: 2019-01-21
55
Author:
66
Woo-Young Ahn [aut, cre],
77
Nate Haines [aut],
@@ -21,11 +21,12 @@ Description:
2121
Fit an array of decision-making tasks with computational models in
2222
a hierarchical Bayesian framework. Can perform hierarchical Bayesian analysis of
2323
various computational models with a single line of coding.
24+
Ahn et al. (2018) <doi:10.1162/CPSY_a_00002>
2425
Depends:
25-
R (>= 3.4.0)
26-
Imports:
27-
methods,
26+
R (>= 3.4.0),
2827
Rcpp (>= 0.12.0),
28+
methods
29+
Imports:
2930
rstan (>= 2.18.1),
3031
loo (>= 2.0),
3132
grid,

NEWS.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# hBayesDM 0.7.1
2+
3+
* Make it usable without manually loading `rstan`.
4+
* Remove an annoying warning about using `..insensitive_data_columns`.
5+
16
# hBayesDM 0.7.0
27

38
* Now, in default, you should build a Stan file into a binary for the first time to use it. To build all the models on installation, you should set an environmental variable `BUILD_ALL` to `true` before installation.

R/hBayesDM_model.R

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ hBayesDM_model <- function(task_name,
170170
colnames_raw_data <- colnames(raw_data)
171171

172172
# Check if necessary data columns all exist (while ignoring case and underscores)
173-
..insensitive_data_columns <- NULL # To avoid NOTEs by R CMD check
174173
insensitive_data_columns <- tolower(gsub("_", "", data_columns, fixed = TRUE))
175174
colnames(raw_data) <- tolower(gsub("_", "", colnames(raw_data), fixed = TRUE))
176175
if (!all(insensitive_data_columns %in% colnames(raw_data))) {
@@ -179,7 +178,7 @@ hBayesDM_model <- function(task_name,
179178
}
180179

181180
# Remove only the rows containing NAs in necessary columns
182-
complete_rows <- complete.cases(raw_data[, ..insensitive_data_columns])
181+
complete_rows <- complete.cases(raw_data[, insensitive_data_columns, with = FALSE])
183182
sum_incomplete_rows <- sum(!complete_rows)
184183
if (sum_incomplete_rows > 0) {
185184
raw_data <- raw_data[complete_rows, ]

README.md

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,6 @@ install.packages("hBayesDM") # Install from CRAN
5555
devtools::install_github("CCS-Lab/hBayesDM") # Install from GitHub
5656
```
5757

58-
### Caveats
59-
60-
Before you load `hBayesDM`, you should load `rstan` to make sampling properly work.
61-
62-
```r
63-
library(rstan)
64-
library(hBayesDM)
65-
```
66-
6758
### Quick Links
6859

6960
- **Tutorial**: http://rpubs.com/CCSL/hBayesDM

docs/LICENSE-text.html

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

docs/authors.html

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

docs/index.html

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

0 commit comments

Comments
 (0)