Skip to content

Commit

Permalink
A few fixes to warnings/errors reported by R CMD check.
Browse files Browse the repository at this point in the history
  • Loading branch information
pcarbo committed Aug 17, 2023
1 parent 468579b commit b286043
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 4 deletions.
4 changes: 4 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
^docs$
^_pkgdown\.yml$
^\.github$
^\.circleci$
^\.travis\.yml$
^appveyor\.yml$
7 changes: 5 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Encoding: UTF-8
Type: Package
Package: mr.mash.alpha
Version: 0.2-28
Version: 0.2-29
Date: 2023-08-17
Title: Multiple Regression with Multivariate Adaptive Shrinkage
Description: Provides an implementation of methods for multivariate
Expand All @@ -26,11 +26,14 @@ Imports:
parallel
Suggests:
testthat,
varbvs
varbvs,
knitr,
rmarkdown,
LinkingTo:
Rcpp,
RcppArmadillo (>= 0.10.4.0.0),
RcppParallel
VignetteBuilder: knitr
Remotes:
stephenslab/ebnm,
stephenslab/mashr,
Expand Down
2 changes: 2 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ importFrom(mvtnorm,rmvnorm)
importFrom(parallel,makeCluster)
importFrom(parallel,parLapply)
importFrom(parallel,stopCluster)
importFrom(stats,coef)
importFrom(stats,cov)
importFrom(stats,cov2cor)
importFrom(stats,lm)
importFrom(stats,predict)
useDynLib(mr.mash.alpha)
2 changes: 2 additions & 0 deletions R/compute_covs.R
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,8 @@ compute_cov_canonical <- function(ntraits, singletons, hetgrid, grid, zeromat=TR
return(U)
}
###Compute univariate summary statistics
#
#' @importFrom stats coef
get_univariate_sumstats <- function(X, Y, standardize=FALSE, standardize.response=FALSE){
r <- ncol(Y)
p <- ncol(X)
Expand Down
8 changes: 7 additions & 1 deletion R/mr_mash_predict.R
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
#'
#' @return Matrix of predicted values.
#'
#' @importFrom stats predict
#'
#' @method predict mr.mash
#' @export
#' @export predict.mr.mash
#'
Expand All @@ -27,8 +30,11 @@ predict.mr.mash <- function(object, newx, ...){
#'
#' @return (p+1) x r matrix of coefficients.
#'
#' @export
#' @importFrom stats coef
#'
#' @method coef mr.mash
#' @export coef.mr.mash
#' @export
#'
coef.mr.mash <- function(object, ...){
coeffs <- rbind(object$intercept, object$mu1)
Expand Down
2 changes: 1 addition & 1 deletion man/mr.mash.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b286043

Please sign in to comment.