Skip to content

Commit

Permalink
Pull request #20: R CMD check fixes
Browse files Browse the repository at this point in the history
Merge in STAT/prestogp from build-workflow to master

* commit '8dac09511058405d630121ca13c589781c932bf4':
  R CMD check fixes
  Add new files to Collate section in DESCRIPTION file
  • Loading branch information
shail-choksi committed Dec 28, 2023
2 parents 710520c + 8dac095 commit 2e94403
Show file tree
Hide file tree
Showing 11 changed files with 176 additions and 28 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
^\.Rproj\.user$
^doc$
^Meta$
^\.github/
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ manuscript/

# Output files from R CMD build
/*.tar.gz
*.dll

# Output files from R CMD check
/*.Rcheck/
Expand Down
14 changes: 8 additions & 6 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -36,22 +36,23 @@ Imports:
knitr,
dplyr,
glmnet,
rmarkdown,
markdown,
gtools,
geoR,
doParallel,
RANN,
rlang (>= 0.4.11),
foreach,
stats,
methods
methods,
foreach,
rlang,
mvtnorm,
spam,
psych
License: GPL-3
Encoding: UTF-8
VignetteBuilder: knitr
RoxygenNote: 7.2.3
Collate:
'Log_Likelihood.R'
'PrestoGP-package.R'
'PrestoGP_CreateU_Multivariate.R'
'PrestoGP_Model.R'
'PrestoGP_Vecchia_Spatiotemporal.R'
Expand All @@ -63,6 +64,7 @@ Collate:
'RcppExports.R'
'Visualization.R'
'package.R'
'utils-tidy-eval.R'
Suggests:
roxygen2,
testthat (>= 3.0.0)
Expand Down
18 changes: 18 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Generated by roxygen2: do not edit by hand

export(":=")
export(.data)
export(FullSpatialModel)
export(Kr_pred)
export(MultivariateVecchiaModel)
Expand All @@ -8,7 +10,11 @@ export(ST_Krig_Param_Avg)
export(SpatialModel)
export(SpatiotemporalFullModel)
export(SpatiotemporalModel)
export(as_label)
export(as_name)
export(createUMultivariate)
export(enquo)
export(enquos)
export(negloglik.full)
export(negloglik_full_ST)
export(negloglik_vecchia)
Expand All @@ -27,6 +33,18 @@ import(readxl)
import(scoringRules)
importFrom(aod,wald.test)
importFrom(dplyr,"%>%")
importFrom(foreach,"%dopar%")
importFrom(foreach,foreach)
importFrom(methods,callNextMethod)
importFrom(methods,new)
importFrom(methods,validObject)
importFrom(rlang,":=")
importFrom(rlang,.data)
importFrom(rlang,as_label)
importFrom(rlang,as_name)
importFrom(rlang,enquo)
importFrom(rlang,enquos)
importFrom(stats,coef)
importFrom(stats,optim)
importFrom(stats,predict)
importFrom(stats,var)
Expand Down
2 changes: 1 addition & 1 deletion R/PrestoGP_Model.R
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ setMethod(
}

model <- transform_data(model, model@Y_train, model@X_train)
model <- estimate_betas(model, parallel, foldid)
model <- estimate_betas(model, parallel)
min.error <- compute_error(model)
### Check min-error against the previous error and tolerance
if (min.error < prev.error * tol) {
Expand Down
23 changes: 23 additions & 0 deletions man/PrestoGP-package.Rd

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

3 changes: 2 additions & 1 deletion man/compute_error-PrestoGPModel-method.Rd

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

2 changes: 1 addition & 1 deletion man/estimate_betas-PrestoGPModel-method.Rd

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

39 changes: 21 additions & 18 deletions man/prestogp_fit-PrestoGPModel-method.Rd

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

3 changes: 2 additions & 1 deletion man/show_theta-PrestoGPModel-method.Rd

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

98 changes: 98 additions & 0 deletions man/tidyeval.Rd

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

0 comments on commit 2e94403

Please sign in to comment.