Unify behavioral results

R/behav.R

@@ -1,8 +1,12 @@
-calc_mem_perf <- function(data, subjs) {
-  data |>
+clean_events <- function(file, subjs) {
+  read_tsv(file, show_col_types = FALSE) |>
     mutate(subj_id = match(subj, subjs)) |>
-    filter(!is.na(subj_id)) |>
-    mutate(acc = resp != 0 & xor(old_new == 1, resp >= 3)) |>
+    filter(resp != 0, !is.na(subj_id)) |>
+    mutate(acc = resp != 0 & xor(old_new == 1, resp >= 3))
+}
+
+calc_mem_perf <- function(data) {
+  data |>
     preproc.iquizoo:::calc_sdt(
       type_signal = 1,
       by = "subj_id",
@@ -20,6 +24,5 @@ calc_simil_mem <- function(mem_perf) {
 
 calc_memorability <- function(data) {
   data |>
-    mutate(acc = xor(old_new == 1, resp >= 3)) |>
     summarise(pc = mean(acc == 1), .by = trial_id)
 }

_targets.R

@@ -74,27 +74,22 @@ list(
     "data/subj_206.txt",
     read = scan(!!.x)
   ),
-  tar_target(file_events_retrieval, "data/behav/retrieval.tsv", format = "file"),
-  tar_target(
-    mem_perf,
-    read_tsv(file_events_retrieval, show_col_types = FALSE) |>
-      calc_mem_perf(subjs)
+  tarchetypes::tar_file_read(
+    events_retrieval,
+    "data/behav/retrieval.tsv",
+    read = clean_events(!!.x, subjs)
   ),
+  tar_target(mem_perf, calc_mem_perf(events_retrieval)),
   tarchetypes::tar_file_read(
     smc,
     "data/behav/simil.rds", # use pre-calculated
     read = readRDS(!!.x)$mat[[4]]
   ),
   tar_target(simil_mem, calc_simil_mem(mem_perf)),
-  tar_target(
-    memorability,
-    read_tsv(file_events_retrieval, show_col_types = FALSE) |>
-      calc_memorability()
-  ),
+  tar_target(memorability, calc_memorability(events_retrieval)),
   tar_target(
     memorability_content,
-    read_tsv(file_events_retrieval, show_col_types = FALSE) |>
-      filter(resp > 0) |>
+    events_retrieval |>
       left_join(memorability, by = "trial_id") |>
       summarise(
         r = psych::polyserial(pick(pc), pick(resp))[, 1],