Skip to content

Commit

Permalink
Add IMM vignette, example data, and updated distribution functions
Browse files Browse the repository at this point in the history
This commit adds the vignette for the IMM. Contains two example data sets, and has also included density and random generation functions for the mixture2p, the mixture3p, and the IMM.
  • Loading branch information
GidonFrischkorn committed Feb 8, 2024
1 parent 5ad4d5a commit 22d77ce
Show file tree
Hide file tree
Showing 17 changed files with 1,044 additions and 7 deletions.
3 changes: 3 additions & 0 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,6 @@ Imports:
URL: https://github.com/venpopov/bmm, https://venpopov.github.io/bmm/
BugReports: https://github.com/venpopov/bmm/issues
VignetteBuilder: knitr
Depends:
R (>= 2.10)
LazyData: true
12 changes: 12 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ export(c_sqrtexp2bessel)
export(calc_error_relative_to_nontargets)
export(check_data)
export(configure_model)
export(dIMM)
export(dmixture2p)
export(dmixture3p)
export(dsdm)
export(fit_model)
export(gen_3p_data)
Expand All @@ -32,10 +35,19 @@ export(get_model_prior)
export(k2sd)
export(mixture2p)
export(mixture3p)
export(pIMM)
export(pmixture2p)
export(pmixture3p)
export(postprocess_brm)
export(print_pretty_models_md)
export(psdm)
export(qIMM)
export(qmixture2p)
export(qmixture3p)
export(qsdm)
export(rIMM)
export(rmixture2p)
export(rmixture3p)
export(rsdm)
export(sdmSimple)
export(softmax)
Expand Down
45 changes: 45 additions & 0 deletions R/data.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
#' Data from Experiment 2 reported by Zhang & Luck (2008)
#'
#' Raw data of 8 subjects for the response error in a continuous reproduction task
#' with set size 1, 2, 3, and 6 reported by Zhang & Luck (2008).
#'
#' @format ## `ZhangLuck_2008`
#' A data frame with 4,000 rows and 9 columns:
#' \describe{
#' \item{subID}{Integer uniquely identifying different subjects}
#' \item{trial}{Trial identifyier}
#' \item{setsize}{The setsize of the data in this row}
#' \item{RespErr}{The response error, that is the difference between the reponse
#' given and the target color.}
#' \item{Pos_Lure1, Pos_Lure2, Pos_Lure3, Pos_Lure4, Pos_Lure5}{Position of the lure items relative to the target color.}
#'
#' }
#'
#' @source <https://www.nature.com/articles/nature06860>
"ZhangLuck_2008"


#' Data from Experiment 1 reported by Oberauer & Lin (2017)
#'
#' Raw data of 19 subjects that completed a continuous reproduction task
#' with set size 1 to 8 reported by Oberauer & Lin (2017).
#'
#' @format ## `OberauerLin_2017`
#' A data frame with 4,000 rows and 9 columns:
#' \describe{
#' \item{ID}{Integer uniquely identifying different subjects}
#' \item{Session}{Session number}
#' \item{Trial}{Trial number within each session}
#' \item{SetSize}{The setsize of the data in this row}
#' \item{Response}{The response in degrees given on the color wheel}
#' \item{deviation}{The response error or deviation of the `Response` from the target color (i.e., `Item1_Col`) in degrees.}
#' \item{dev_rad}{The response error converted from degrees to radians.}
#' \item{Item1_Col,Item2_Col,Item3_Col,Item4_Col,Item5_Col,Item6_Col,Item7_Col,Item8_Col}{The absolute colors of all items in degrees of the color wheel. Although there are always eight values given even for set sizes smaller than 8, only the colors from item 1 to the respective set size were shown.}
#' \item{Item1_Pos,Item2_Pos,Item3_Pos,Item4_Pos,Item5_Pos,Item6_Pos,Item7_Pos,Item8_Pos}{The position of all items in clockwise order around the circle. There were 12 possible positions, thus each position was 30 degrees apart from each other. Although positions are always given for all items, only item 1 to the respective set size was shown.}
#' \item{Item1_Col_rad,Item2_Col_rad,Item3_Col_rad,Item4_Col_rad,Item5_Col_rad,Item6_Col,Item7_Col_rad,Item8_Col_rad}{The relative position of colors to the target item (i.e. `Item1_Col`) of all items in radians. Although there are always eight values given even for set sizes smaller than 8, only the colors from item 1 to the respective set size were shown.}
#' \item{Item1_Pos_rad,Item2_Pos_rad,Item3_Pos_rad,Item4_Pos_rad,Item5_Pos_rad,Item6_Pos,Item7_Pos_rad,Item8_Pos_rad}{The relative position of all items to the position of the target item (i.e. `Item1_Pos`) in radians. Although there are always eight values given even for set sizes smaller than 8, only the colors from item 1 to the respective set size were shown.}
#'
#' }
#'
#' @source <https://osf.io/m4shu>
"OberauerLin_2017"
Loading

0 comments on commit 22d77ce

Please sign in to comment.