Skip to content

Commit 013837d

Browse files
authored
Merge pull request #22 from psychelzh/20-release-cpmr-010
2 parents 0910d47 + 9853375 commit 013837d

File tree

6 files changed

+11
-23
lines changed

6 files changed

+11
-23
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: cpmr
22
Title: Connectome Predictive Modelling in R
3-
Version: 0.0.9.9000
3+
Version: 0.1.0
44
Authors@R:
55
person("Liang", "Zhang", , "[email protected]", role = c("aut", "cre"),
66
comment = c(ORCID = "0000-0001-9041-1150"))

NEWS.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# cpmr (development version)
1+
# cpmr 0.1.0
22

33
## New features
44

5-
* Added `summary()` method to summarize the results of the CPM analysis.
6-
* Added `tidy()` method to tidy the results of the CPM analysis.
5+
* Added `summary()` method to summarize the results of the CPM analysis (#8).
6+
* Added `tidy()` method to tidy the results of the CPM analysis (#10).
77
* Support `na_action` argument in `cpm()` function to handle missing values in the input data (#2).
88

99
## Enhancements

R/cpm.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,10 @@ cpm <- function(conmat, behav, ...,
133133
exclude = Reduce(
134134
function(x, y) intersect(x, y),
135135
list(
136-
which(complete.cases(conmat)),
137-
which(complete.cases(behav)),
136+
which(stats::complete.cases(conmat)),
137+
which(stats::complete.cases(behav)),
138138
if (!is.null(confounds)) {
139-
which(complete.cases(confounds))
139+
which(stats::complete.cases(confounds))
140140
} else {
141141
seq_along(behav)
142142
}
@@ -225,7 +225,7 @@ print.cpm <- function(x, ...) {
225225
cat(" Call: ")
226226
print(x$call)
227227
cat(sprintf(" Number of observations: %d\n", length(x$real)))
228-
cat(sprintf(" Complete cases: %d\n", sum(complete.cases(x$pred))))
228+
cat(sprintf(" Complete cases: %d\n", sum(stats::complete.cases(x$pred))))
229229
if (!is.null(x$edges)) {
230230
cat(sprintf(" Number of edges: %d\n", dim(x$edges)[1]))
231231
} else {

R/tidy.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ generics::tidy
77
#' @param x A `cpm` object.
88
#' @param ... Additional arguments passed to `summary()`.
99
#' @param component A character vector indicating the component to tidy.
10-
#' @return A [tibble][tibble-package] with columns storing parameters of the
10+
#' @return A [tibble][tibble::tibble-package] with columns storing parameters of the
1111
#' [cpm()] object and further columns depending on the `component` argument:
1212
#'
1313
#' For `component = "performance"`:

cran-comments.md

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
11
## R CMD check results
22

3-
0 errors | 0 warnings | 1 note
4-
5-
* This is a new release.
6-
7-
The NOTE is as follows:
8-
9-
```
10-
❯ checking for non-standard things in the check directory ... NOTE
11-
Found the following files/directories:
12-
''NULL''
13-
```
14-
15-
As noted in [this issue](https://github.com/r-hub/rhub/issues/560), this is a known issue with the `rhub` package and can be safely ignored.
3+
Use `devtools::check_win_devel()` shows no errors, warnings and notes.

man/tidy.cpm.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)