Skip to content

Commit

Permalink
Merge branch 'release/3.11.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
psychelzh committed Jul 11, 2024
2 parents e70974a + fc6d9c2 commit 6769b0e
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 20 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: tarflow.iquizoo
Title: Setup "targets" Workflows for "iquizoo" Data Processing
Version: 3.11.4
Version: 3.11.5
Authors@R: c(
person("Liang", "Zhang", , "[email protected]", role = c("aut", "cre"),
comment = c(ORCID = "0000-0001-9041-1150")),
Expand Down Expand Up @@ -49,4 +49,4 @@ Config/testthat/parallel: true
Config/testthat/start-first: targets
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
7 changes: 7 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# tarflow.iquizoo 3.11.5

## Enhancements

* Enhance documentation of `tar_prep_iquizoo()`.
* Support new dark theme of pkgdown.

# tarflow.iquizoo 3.11.4

## Breaking Changes
Expand Down
20 changes: 11 additions & 9 deletions R/targets.R
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,18 @@
#' @param ... For future usage. Should be empty.
#' @param what What to fetch. There are basically two types of data, i.e., raw
#' data and scores. The former is the logged raw data for each trial of the
#' tasks/games, while the latter is the scores calculated by iQuizoo server.
#' If set as "all", both raw data and scores will be fetched. Further actions
#' on the fetched raw data can be specified by `action_raw_data`.
#' tasks/games, and further actions on the fetched raw data can be specified
#' by `action_raw_data`. The latter is the scores calculated by iQuizoo
#' server.
#' @param action_raw_data The action to be taken on the fetched raw data. There
#' are two consecutive actions, i.e., wrangling and pre-processing. The former
#' will parse the raw data into a tidy format, while the latter will calculate
#' indices based on the parsed data. If set as "all", both wrangling and
#' pre-processing will be done. If set as "parse", only wrangling will be
#' done. If set as "none", neither will be done. If `what` is "scores", this
#' argument will be ignored.
#' are two consecutive actions, i.e., raw data parsing and pre-processing. The
#' former will parse the `json` formatted raw data into [data.frame()]s and
#' wrap them into one list column, see [parse_data()] for more details. The
#' latter will calculate indices based on the parsed data, see
#' [preproc.iquizoo::preproc_data()] for more details. If set as `"none"`,
#' neither will be done. If set as `"parse"`, only raw data parsing will be
#' done. If set as `"all"`, both parsing and pre-processing will be done. If
#' `what` is set as `"scores"`, this argument will be ignored.
#' @param combine Specify which targets to be combined. Note you should only
#' specify names from `c("scores", "raw_data", "raw_data_parsed", "indices")`.
#' If `NULL`, none will be combined.
Expand Down
1 change: 1 addition & 0 deletions _pkgdown.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
url: https://psychelzh.github.io/tarflow.iquizoo
template:
bootstrap: 5
light-switch: true
reference:
- title: "Targets Factory Related Functions"
desc: "A collection of functions to help you build targets."
Expand Down
20 changes: 11 additions & 9 deletions man/tar_prep_iquizoo.Rd

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

0 comments on commit 6769b0e

Please sign in to comment.