Skip to content

Commit

Permalink
docs + github ci update for tmp branch
Browse files Browse the repository at this point in the history
  • Loading branch information
1beb committed Oct 20, 2020
1 parent 410b38e commit a5d1752
Show file tree
Hide file tree
Showing 8 changed files with 64 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Add kableExtra
run: Rscript -e 'devtools::install_github("haozhu233/kableExtra")'
- name: CRAN crunch
run: Rscript -e 'install.packages("crunch")'
run: Rscript -e 'devtools::install_github("crunch-io/rcrunch", ref = "gfe-multi-weight-tabbook")'
- name: Build
run: R CMD build --no-build-vignettes --no-manual .
- name: Check
Expand Down
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Depends:
R (>= 3.5.0),
crunch
Imports:
kableExtra,
kableExtra (>= 1.1.0.9000),
rlang,
openxlsx,
digest,
Expand All @@ -31,9 +31,9 @@ Suggests:
httptest (>= 2.0.0),
jsonlite,
knitr,
httpcache,
rmarkdown,
testthat (>= 2.1.0),
kableExtra (>= 1.1.0.9000)
testthat (>= 2.1.0)
RoxygenNote: 7.1.1
VignetteBuilder: knitr
Encoding: UTF-8
1 change: 1 addition & 0 deletions R/crosstabs.R
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#' @param include_numeric Logical. Should we include numeric questions? Defaults to FALSE. Implemented for Toplines only.
#' @param include_datetime Logical. Should we include date time questions? Defaults to FALSE. Implemented for Toplines only.
#' @param include_verbatims Logical. Should we include a sample text varaibles? Defaults to FALSE. Implemented for Toplines only.
#' @param include_original_weighted Logical. When providing list of weights to apply, should we include the default weighted vars? Defaults to TRUE.
#' @param num_verbatims An integer identifying the number of examples to extract from a text variable. Defaults to 10. Implemented for Toplines only.
#' @return A Toplines (when no banner is provided) or Crosstabs (when a banner is provided)
#' summary of the input dataset.
Expand Down
2 changes: 2 additions & 0 deletions R/recontactQuestion.R
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ recontact_toplines <- function(dataset, questions, suffixes, labels,
#'
#' @param q1 The results object for the first question
#' @param q2 The results onject second question
#' @param labels Two character strings used to describe the pre and post waves
#' @param weights A single alias, list, or NULL
as.ToplineCategoricalArray <- function(q1, q2, labels = c("Pre", "Post"), weights) {

q1$subnames <- labels
Expand Down
22 changes: 22 additions & 0 deletions man/as.ToplineCategoricalArray.Rd

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

8 changes: 6 additions & 2 deletions man/crosstabs.Rd

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

28 changes: 28 additions & 0 deletions man/recontact_toplines.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/tabBooks.Rd

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

0 comments on commit a5d1752

Please sign in to comment.