-
-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Major enhancements in the docs (#233)
* Update roxygen2 version. * Consistently use `#'` (not `##'`) for roxygen2 comments. * Speed up the examples in the documentation (and minor other improvements in the docs). * Major enhancements in the documentation. * Move documentation for `extract_model_data` to section "Details". * Enhance documentation (continued). * Fix issue #190 (note in documentation concerning interactions in L1 search). * Improve formatting in the `CITATION` file (make it more consistent). * Enhance documentation (continued). * Add `print()` to examples (otherwise, only output from the last line will be printed). * Add documentation for `as.matrix.projection()`. * Show usage of the `posterior` package (in the `as.matrix.projection()` example). * Argument `regul` is only relevant for submodels which are GLMs. Unify the documentation for `regul` (two occurrences). * Show usage of **bayesplot** in the example for `as.matrix.projection()`. * Enhance documentation (continued; `d_test`). * Use `@inheritParams varsel` instead of `@template args-vsel`. * Use a consistent (and enhanced) documentation for arguments `seed` and `.seed`. * Enhance documentation (continued; fix bugs). * Use roxygen2 syntax also in a non-roxygen2 comment (to avoid inconsistencies in case that comment is turned into a roxygen2 comment). * Use roxygen2 syntax also in an invisible documentation (to avoid inconsistencies in case that documentation is turned on). * In `DESCRIPTION`, put the `Package:` field at the beginning because some search routines require this. * Enhance the `Description:` field in `DESCRIPTION`. * Re-order the `DESCRIPTION` fields (affects the ordering in the PDF manual). * Use Markdown syntax consistently. * Resolve minor inconsistencies in the documentation. * Resolve minor inconsistencies regarding the abbreviation "CV". * Enhance documentation (continued; indentation and other formatting). * Enhance documentation (continued; `man-roxygen/args-newdata.R`). * Enhance documentation (continued; mainly `refmodel-init-get`; this probably also solves issue #156). * Enhance documentation (continued; `predict.refmodel()`). * Enhance documentation (continued; mainly `project()`; this probably also solves a part of issue #154 (namely the documentation) for now). * Document the now consistent behavior of `suggest_size()` (see issue #164). * Minor wording improvements. * Enhance documentation (continued; `projection-linpred-predict`). * Rename documentation tag `projection-linpred-predict` to `pred-projection`. * Enhance documentation (continued; `pred-projection`). * Enhance documentation (continued; mainly `varsel()`). * Enhance documentation (continued; mainly `cv_varsel()`). * Use a consistent language for "response" and "predictors". * Minor improvements in `data.R`. * Minor improvement for `acc`/`pctcorr`. * Minor wording improvement. * Make journal volume numbers bold (as in other R docs). * Add references for PSIS-LOO CV. * Fix a typo in a reference. * Examples: Add a note concerning `chains = 2, iter = 500`. * Add an example for a custom reference model via `init_refmodel()` (which partly solves issue #125) and perform minor improvements in related example code. * `DESCRIPTION`: Add the `Date:` field (important for the `CITATION` file). * Fix a typo in the docs (`as.matrix.projection()` example). * Minor wording improvement in the docs (`as.matrix.projection()` example). * Docs: Remove "[stat<...>]" for arXiv links, according to the CRAN convention. * Docs: Add a comment concerning the relevance of `ndraws<_pred>` and `nclusters<_pred>` in case of `cv_search = FALSE`. * Docs: Use the terms "search step" and "evaluation step" (as a repeating pattern, this should be easier to recognize for readers). * Docs: Avoid the `@details [...] Notes: <list>` construction (looks strange in the final documentation). Unfortunately, `@note` can't be used since otherwise, `cv_varsel()`'s documentation couldn't inherit that section from `varsel()`'s documentation. * There are no Gaussian-only `stats` (at least it isn't implemented this way). Therefore, adapt the documentation. * Docs: Add more details concerning argument `method`. * Minor wording improvements in the general package documentation (help topic `projpred-package`). * References in the docs: Replace "doi:[<...>](<...>)" by "DOI: [<...>](<...>)". In the docs, this does not seem to be necessary, but in the vignette, the former way caused the DOI hyperlinks to be rendered incorrectly. * Docs: Handle section "References" consistently. * Replace "arxiv" by "arXiv". * Docs: Replace "search step" and "evaluation step" by "search part" and "evaluation part", respectively. The reason is a possible confusion of the term "search step" with the steps of a stepwise variable selection, see e.g. `?step`. The second reason is that the term "step" might suggest an EM-like alternation of steps (which is not the case here, since the search is completed first and only after that, the evaluation takes place). * Minor wording improvements in the general package documentation (available at ``?`projpred-package` ``). * Fix a reflow bug in the general package documentation (available at ``?`projpred-package` ``). * `DESCRIPTION`: Minor cleaning. * `DESCRIPTION`: Reflow to margin width 80. * Activate the examples in Travis CI checks.
- Loading branch information
Showing
46 changed files
with
2,347 additions
and
1,830 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,13 @@ | ||
Encoding: UTF-8 | ||
Package: projpred | ||
Encoding: UTF-8 | ||
Title: Projection Predictive Feature Selection | ||
Version: 2.0.5.9000 | ||
Authors@R: c(person("Juho", "Piironen", role = c("aut"), email = "[email protected]"), | ||
Date: 2021-09-21 | ||
Authors@R: c(person("Juho", "Piironen", role = c("aut"), | ||
email = "[email protected]"), | ||
person("Markus", "Paasiniemi", role = "aut"), | ||
person("Alejandro", "Catalina", role = c("cre", "aut"), email="[email protected]"), | ||
person("Alejandro", "Catalina", role = c("cre", "aut"), | ||
email = "[email protected]"), | ||
person("Aki", "Vehtari", role = "aut"), | ||
person("Jonah", "Gabry", role = "ctb"), | ||
person("Marco", "Colombo", role = "ctb"), | ||
|
@@ -15,12 +18,15 @@ Maintainer: | |
Alejandro Catalina <[email protected]> | ||
Description: | ||
Performs projection predictive feature selection for generalized linear | ||
models and generalized linear and additive multilevel models | ||
(see, Piironen, Paasiniemi and Vehtari, 2020, <https://projecteuclid.org/euclid.ejs/1589335310>, | ||
Catalina, Bürkner and Vehtari, 2020, <arXiv:2010.06994>). | ||
The package is compatible with the 'rstanarm' and 'brms' packages, but other | ||
reference models can also be used. See the package vignette for more | ||
information and examples. | ||
models and generalized linear and additive multilevel models (see Piironen, | ||
Paasiniemi and Vehtari, 2020, <doi:10.1214/20-EJS1711>; Catalina, Bürkner | ||
and Vehtari, 2020, <arXiv:2010.06994>). The package is compatible with the | ||
'rstanarm' and 'brms' packages, but other reference models can also be used. | ||
See the documentation as well as the package vignettes for more information | ||
and examples. | ||
License: GPL-3 | ||
URL: https://mc-stan.org/projpred/, https://discourse.mc-stan.org | ||
BugReports: https://github.com/stan-dev/projpred/issues/ | ||
Depends: | ||
R (>= 3.5.0) | ||
Imports: | ||
|
@@ -36,11 +42,6 @@ Imports: | |
mgcv, | ||
gamm4, | ||
rlang | ||
LinkingTo: Rcpp, RcppArmadillo | ||
License: GPL-3 | ||
LazyData: TRUE | ||
Roxygen: list(markdown = TRUE) | ||
RoxygenNote: 7.1.1 | ||
Suggests: | ||
rstanarm, | ||
brms, | ||
|
@@ -49,7 +50,10 @@ Suggests: | |
rmarkdown, | ||
glmnet, | ||
bayesplot (>= 1.5.0), | ||
optimx | ||
optimx, | ||
posterior | ||
LinkingTo: Rcpp, RcppArmadillo | ||
LazyData: TRUE | ||
Roxygen: list(markdown = TRUE) | ||
RoxygenNote: 7.1.2 | ||
VignetteBuilder: knitr | ||
URL: https://mc-stan.org/projpred/, https://discourse.mc-stan.org | ||
BugReports: https://github.com/stan-dev/projpred/issues/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,41 +1,42 @@ | ||
#' Binomial toy example. | ||
#' Binomial toy example | ||
#' | ||
#' @format A simulated classification dataset containing 100 observations. | ||
#' \describe{ | ||
#' \item{y}{target, 0 or 1.} | ||
#' \item{x}{features, 30 in total.} | ||
#' \item{y}{response, 0 or 1.} | ||
#' \item{x}{predictors, 30 in total.} | ||
#' } | ||
#' @source \url{http://web.stanford.edu/~hastie/glmnet/glmnetData/BNExample.RData} | ||
#' @source <https://web.stanford.edu/~hastie/glmnet/glmnetData/BNExample.RData> | ||
"df_binom" | ||
|
||
#' Gaussian toy example. | ||
#' Gaussian toy example | ||
#' | ||
#' @format A simulated regression dataset containing 100 observations. | ||
#' \describe{ | ||
#' \item{y}{target, real-valued.} | ||
#' \item{x}{features, 20 in total. Mean and sd approximately 0 and 1.} | ||
#' \item{y}{response, real-valued.} | ||
#' \item{x}{predictors, 20 in total. Mean and SD are approximately 0 and 1, | ||
#' respectively.} | ||
#' } | ||
#' @source \url{http://web.stanford.edu/~hastie/glmnet/glmnetData/QSExample.RData} | ||
#' @source <https://web.stanford.edu/~hastie/glmnet/glmnetData/QSExample.RData> | ||
"df_gaussian" | ||
|
||
#' Mesquite data set. | ||
#' | ||
#' The mesquite bushes yields data set from Gelman | ||
#' and Hill (2007) (\url{http://www.stat.columbia.edu/~gelman/arm/}). | ||
#' Mesquite data set | ||
#' | ||
#' @format The outcome variable is the total weight (in grams) of photosynthetic | ||
#' material as derived from actual harvesting of the bush. The predictor | ||
#' variables are: | ||
#' The mesquite bushes yields data set from Gelman and Hill (2007) | ||
#' (<http://www.stat.columbia.edu/~gelman/arm/>). | ||
#' | ||
#' @format The response variable is the total weight (in grams) of | ||
#' photosynthetic material as derived from actual harvesting of the bush. The | ||
#' predictor variables are: | ||
#' \describe{ | ||
#' \item{diam1}{diameter of the canopy (the leafy area of the bush) | ||
#' in meters, measured along the longer axis of the bush.} | ||
#' \item{diam2}{canopy diameter measured along the shorter axis} | ||
#' \item{canopy height}{height of the canopy.} | ||
#' \item{total height}{total height of the bush.} | ||
#' \item{density}{plant unit density (# of primary stems per plant unit).} | ||
#' \item{group}{group of measurements (0 for the first group, 1 for the second group)} | ||
#' \item{diam1}{diameter of the canopy (the leafy area of the bush) in meters, | ||
#' measured along the longer axis of the bush.} | ||
#' \item{diam2}{canopy diameter measured along the shorter axis.} | ||
#' \item{canopy height}{height of the canopy.} | ||
#' \item{total height}{total height of the bush.} | ||
#' \item{density}{plant unit density (# of primary stems per plant unit).} | ||
#' \item{group}{group of measurements (0 for the first group, 1 for the second | ||
#' group).} | ||
#' } | ||
#' | ||
#' @source \url{http://www.stat.columbia.edu/~gelman/arm/examples/} | ||
#' @source <http://www.stat.columbia.edu/~gelman/arm/examples/mesquite/mesquite.dat> | ||
"mesquite" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.