Skip to content

Commit

Permalink
Merge branch 'release/1.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
psychelzh committed Nov 23, 2021
2 parents 19182cc + 36f5085 commit cc2fa71
Show file tree
Hide file tree
Showing 12 changed files with 54 additions and 278 deletions.
10 changes: 5 additions & 5 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
Type: Package
Package: dataproc.iquizoo
Package: preproc.iquizoo
Title: Utility Functions for Data Processing of Iquizoo Games
Version: 1.2.0
Version: 1.2.1
Authors@R:
person("Liang", "Zhang", , "psychelzh@outlook.com", role = c("aut", "cre"),
comment = c(ORCID = "0000-0001-9041-1150"))
Description: Several couples of games are developed by IQUIZOO.COM. Here
are the functions used to do data processing for all of those games.
License: MIT + file LICENSE
URL: https://psychelzh.github.io/dataproc.iquizoo,
https://github.com/psychelzh/dataproc.iquizoo
BugReports: https://github.com/psychelzh/dataproc.iquizoo/issues
URL: https://psychelzh.github.io/preproc.iquizoo,
https://github.com/psychelzh/preproc.iquizoo
BugReports: https://github.com/psychelzh/preproc.iquizoo/issues
Depends:
R (>= 4.1.0)
Imports:
Expand Down
49 changes: 28 additions & 21 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,29 +1,36 @@
# dataproc.iquizoo 1.2.0
# preproc.iquizoo 1.2.1

## Breaking Changes

* Now the package is named as "preproc.iquizoo".
* `game_info` data is moved to {data.iquizoo} package.

# preproc.iquizoo 1.2.0

## Breaking Changes

* For integrating "{dm}" package, we moved `wrangle_data()` back to {tarflow.iquizoo}, and then renamed `preproc_data()` to `preproc()`.

# dataproc.iquizoo 1.1.1
# preproc.iquizoo 1.1.1

## Miscellaneous

* Added more games into the `game_info` data.

# dataproc.iquizoo 1.1.0
# preproc.iquizoo 1.1.0

## New Features

* Added a new function `wrange_data()` (originally in {tarflow.iquizoo}). Now it removes duplicates from data.
* Added two more indices in `refframe()` of distance error aggregating both conditions.

# dataproc.iquizoo 1.0.5
# preproc.iquizoo 1.0.5

## New Features

* Support an edge case for `span()` when number of correct responses can be recovered from columns `"stim"` and `"resp"`. Use it with care, for it does take order into consideration!

# dataproc.iquizoo 1.0.4
# preproc.iquizoo 1.0.4

## New Features

Expand All @@ -33,7 +40,7 @@

* Now cancellation games use `cpt()` preprocessing function.

# dataproc.iquizoo 1.0.3
# preproc.iquizoo 1.0.3

## New Features

Expand All @@ -43,21 +50,21 @@

* Now pipe and rlang helpers are not re-exported from this package.

# dataproc.iquizoo 1.0.2
# preproc.iquizoo 1.0.2

## New Features

* Add a subtle new feature that now more keywords are supported in `nback()`. Specifically, you can now use `"filler"` and `"target"` keywords.
* Add another subtle new feature so that you can ignore the case of character vectors. For example, `"filler"` and `"Filler"` are both okay for now, but only `"Filler"` is errorproof for previous versions.

# dataproc.iquizoo 1.0.1
# preproc.iquizoo 1.0.1

## Bug Fixes

* Added more games in the data `game_info`, mostly are questionnaires (#27, thanks to @Blockhead-yj).
* Fixed case issues of data name. Now lowercase is used thoroughly for data names (note it is not snake_case, for readability is not for consideration).

# dataproc.iquizoo 1.0.0
# preproc.iquizoo 1.0.0

## New Features

Expand All @@ -67,53 +74,53 @@

* Use log-linear correction for extreme proportions in calculation of d' based on signal detection theory (#16).

# dataproc.iquizoo 0.2.8
# preproc.iquizoo 0.2.8

* Add more games to `game_info` data.

# dataproc.iquizoo 0.2.7
# preproc.iquizoo 0.2.7

* Completely removed `conflict()`, which is defunct for many versions.
* Used the 3rd version test framework of testthat package, especially takes advantage of the snapshot test (or goden test) to simplify all our tests.
* Unified the abnormal output by setting all of the `NA`s as `NA_real`.
* Unified the response metrics checking. Now many games need to have a minimal valid response rate of 80% and a minimal accuracy rate, too. Use `?tarflow.iquizoo:::check_resp_metric` to see details. Note this function is not exported for now.

# dataproc.iquizoo 0.2.6
# preproc.iquizoo 0.2.6

* Add external data `game_info`, which stores games information of preprocessing functions. Run `?game_info` in R to read more details.

# dataproc.iquizoo 0.2.5
# preproc.iquizoo 0.2.5

* Fixed a bug occured in function `london()` when user did not respond and the data still scored the user as correct.
* Added a response rate check for `london()`. Now the score is normal only when the response rate is no less than 80%.

# dataproc.iquizoo 0.2.4
# preproc.iquizoo 0.2.4

* Just as `complexswitch()`, now `switchcost()` will also return abnormal result (all `NA`s) if at least one block has no responses.

# dataproc.iquizoo 0.2.3
# preproc.iquizoo 0.2.3

* Fix a bug occured in function `multisense()` when users did not respond to sound trials.

# dataproc.iquizoo 0.2.2
# preproc.iquizoo 0.2.2

* Fix a bug occured in function `wxpred()` after filling `NA` values to `name_block` (mostly is just `Block`) column.
* Fix a bug occured in function `driving()` when minus signs, which are confused with hyphens, are logged into data.

# dataproc.iquizoo 0.2.1
# preproc.iquizoo 0.2.1

* Now `complexswitch()` will return abnormal result (all `NA`s) if at least one block has no responses.

# dataproc.iquizoo 0.2.0
# preproc.iquizoo 0.2.0

* Rename package from "dataprocr2" to "dataproc.iquizoo". This is recommended because all the work is related to www.iquizoo.com.
* Rename package from "preprocr2" to "preproc.iquizoo". This is recommended because all the work is related to www.iquizoo.com.

# dataproc.iquizoo 0.1.4
# preproc.iquizoo 0.1.4

* Added a utility function `calc_sdt()` to calculate signal detection theory related indices.
* Fixed an issue related to perfect accuracy in `drm()`.

# dataproc.iquizoo 0.1.3
# preproc.iquizoo 0.1.3

* Added a `NEWS.md` file to track changes to the package.
* Added `pc_all` index, meaning overal percent of correct, to `wxpred` function.
13 changes: 0 additions & 13 deletions R/data.R

This file was deleted.

14 changes: 7 additions & 7 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,27 @@ knitr::opts_chunk$set(
)
```

# dataproc.iquizoo
# preproc.iquizoo

<!-- badges: start -->
[![R-CMD-check](https://github.com/psychelzh/dataproc.iquizoo/workflows/R-CMD-check/badge.svg)](https://github.com/psychelzh/dataproc.iquizoo/actions)
[![Codecov test coverage](https://codecov.io/gh/psychelzh/dataproc.iquizoo/branch/main/graph/badge.svg)](https://codecov.io/gh/psychelzh/dataproc.iquizoo?branch=main)
[![lint](https://github.com/psychelzh/dataproc.iquizoo/workflows/lint/badge.svg)](https://github.com/psychelzh/dataproc.iquizoo/actions)
[![R-CMD-check](https://github.com/psychelzh/preproc.iquizoo/workflows/R-CMD-check/badge.svg)](https://github.com/psychelzh/preproc.iquizoo/actions)
[![Codecov test coverage](https://codecov.io/gh/psychelzh/preproc.iquizoo/branch/main/graph/badge.svg)](https://codecov.io/gh/psychelzh/preproc.iquizoo?branch=main)
[![lint](https://github.com/psychelzh/preproc.iquizoo/workflows/lint/badge.svg)](https://github.com/psychelzh/preproc.iquizoo/actions)
<!-- badges: end -->

The goal of dataproc.iquizoo is to provide pre-processing functions for IQUIZOO original data.
The goal of preproc.iquizoo is to provide pre-processing functions for IQUIZOO original data.

## Background

IQUIZOO is now a developing company shipped with a bunch of games assessing psychological constructs. The original data from these games have various formats, and this package tries to provide data preprocessing APIs for them. The basic logic here is to use one dataset named `game_info`, which is exported to provide information of each game and its preprocessing function name, so that one can easily match the correct function to preprocess data for these games based on this dataset.
IQUIZOO is now a developing company shipped with a bunch of games assessing psychological constructs. The original data from these games have various formats, and this package tries to provide data preprocessing APIs for them. The basic logic here is to use one dataset named `game_info` (from [data.iquizoo package](https://github.com/psychelzh/data.iquizoo)), which provides information of each game and its pre-processing function name, so that one can easily match the correct function to preprocess data for these games based on this dataset.

## Installation

You can install the development version from [GitHub](https://github.com/) with:

``` r
# install.packages("devtools")
devtools::install_github("psychelzh/dataproc.iquizoo")
devtools::install_github("psychelzh/preproc.iquizoo")
```

## Usage
Expand Down
21 changes: 11 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@

<!-- README.md is generated from README.Rmd. Please edit that file -->

# dataproc.iquizoo
# preproc.iquizoo

<!-- badges: start -->

[![R-CMD-check](https://github.com/psychelzh/dataproc.iquizoo/workflows/R-CMD-check/badge.svg)](https://github.com/psychelzh/dataproc.iquizoo/actions)
[![R-CMD-check](https://github.com/psychelzh/preproc.iquizoo/workflows/R-CMD-check/badge.svg)](https://github.com/psychelzh/preproc.iquizoo/actions)
[![Codecov test
coverage](https://codecov.io/gh/psychelzh/dataproc.iquizoo/branch/main/graph/badge.svg)](https://codecov.io/gh/psychelzh/dataproc.iquizoo?branch=main)
[![lint](https://github.com/psychelzh/dataproc.iquizoo/workflows/lint/badge.svg)](https://github.com/psychelzh/dataproc.iquizoo/actions)
coverage](https://codecov.io/gh/psychelzh/preproc.iquizoo/branch/main/graph/badge.svg)](https://codecov.io/gh/psychelzh/preproc.iquizoo?branch=main)
[![lint](https://github.com/psychelzh/preproc.iquizoo/workflows/lint/badge.svg)](https://github.com/psychelzh/preproc.iquizoo/actions)
<!-- badges: end -->

The goal of dataproc.iquizoo is to provide pre-processing functions for
The goal of preproc.iquizoo is to provide pre-processing functions for
IQUIZOO original data.

## Background
Expand All @@ -20,10 +20,11 @@ IQUIZOO is now a developing company shipped with a bunch of games
assessing psychological constructs. The original data from these games
have various formats, and this package tries to provide data
preprocessing APIs for them. The basic logic here is to use one dataset
named `game_info`, which is exported to provide information of each game
and its preprocessing function name, so that one can easily match the
correct function to preprocess data for these games based on this
dataset.
named `game_info` (from [data.iquizoo
package](https://github.com/psychelzh/data.iquizoo)), which provides
information of each game and its pre-processing function name, so that
one can easily match the correct function to preprocess data for these
games based on this dataset.

## Installation

Expand All @@ -32,7 +33,7 @@ You can install the development version from

``` r
# install.packages("devtools")
devtools::install_github("psychelzh/dataproc.iquizoo")
devtools::install_github("psychelzh/preproc.iquizoo")
```

## Usage
Expand Down
2 changes: 1 addition & 1 deletion _pkgdown.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
url: https://psychelzh.github.io/dataproc.iquizoo
url: https://psychelzh.github.io/preproc.iquizoo
reference:
- title: Main Entry Point
desc: >
Expand Down
7 changes: 0 additions & 7 deletions data-raw/game_info.R

This file was deleted.

Loading

0 comments on commit cc2fa71

Please sign in to comment.