Skip to content

Commit 7206e6e

Browse files
psychelzhpsychelzh
committed
Use new version filter logic
Now we list all valid versions and filter them in code.
1 parent e8d300a commit 7206e6e

4 files changed

Lines changed: 169 additions & 34 deletions

File tree

‎R/constants.R‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ game_id_keyboard <- readr::read_csv(
3535
"config/games_keyboard.csv",
3636
col_types = readr::cols(game_id = "I")
3737
)$game_id
38+
game_versions <- readr::read_csv(
39+
"config/game_versions.csv",
40+
col_types = readr::cols(game_id = "I")
41+
) |>
42+
dplyr::mutate(game_versions = strsplit(game_versions, ";"))
3843
game_data_names <- readr::read_csv(
3944
"config/game_data_names.csv",
4045
col_types = readr::cols(game_id = "I")
@@ -85,13 +90,13 @@ tasks_biased <- c("NsymNCmp", "TOJ", "RP", "DRMA", "CardSortPro")
8590

8691
# used in functional connectivity settings
8792
params_fmri_tasks <- tibble::tribble(
88-
~session, ~task, ~runs,
89-
"1", "rest", 2,
90-
"1", "am", 2,
91-
"1", "movie", 2,
92-
"2", "rest", 2,
93-
"2", "wm", 3,
94-
"2", "movie", 2
93+
~session , ~task , ~runs ,
94+
"1" , "rest" , 2 ,
95+
"1" , "am" , 2 ,
96+
"1" , "movie" , 2 ,
97+
"2" , "rest" , 2 ,
98+
"2" , "wm" , 3 ,
99+
"2" , "movie" , 2
95100
) |>
96101
tidyr::uncount(runs, .id = "run_id")
97102
# Note: sesion: 0 = all sessions, run_id: 0 = all runs

‎R/tar_factories.R‎

Lines changed: 42 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ tar_collect_camp <- function(contents) {
2626
bind_rows(
2727
select(tar_name_current, -project_id),
2828
zutils::cautiously(targets::tar_read, tibble())(
29-
tar_name_restore, store = .(path_restore)
29+
tar_name_restore,
30+
store = .(path_restore)
3031
) |>
3132
select(!contains("name"))
3233
) |>
@@ -83,6 +84,7 @@ tar_validate_rawdata <- function(contents) {
8384
}
8485
contents |>
8586
dplyr::distinct(game_id) |>
87+
dplyr::left_join(game_versions, by = "game_id") |>
8688
dplyr::left_join(game_data_names, by = "game_id") |>
8789
dplyr::left_join(config_data_correction, by = "game_id") |>
8890
dplyr::mutate(
@@ -98,6 +100,7 @@ tar_validate_rawdata <- function(contents) {
98100
tar_name_data_valid,
99101
.(prepare_command_correction(correction, game_id)) |>
100102
validate_data(
103+
list_versions = game_versions,
101104
require_keyboard = require_keyboard,
102105
list_names = list_names
103106
)
@@ -204,11 +207,14 @@ tar_partition_rawdata <- function(contents) {
204207
}
205208

206209
# item analysis related ----
207-
tar_test_retest <- function(contents, ...,
208-
cols_by = c("ver_major", "index_name"),
209-
add_compare = TRUE,
210-
name_suffix = NULL,
211-
extra_by = NULL) {
210+
tar_test_retest <- function(
211+
contents,
212+
...,
213+
cols_by = c("ver_major", "index_name"),
214+
add_compare = TRUE,
215+
name_suffix = NULL,
216+
extra_by = NULL
217+
) {
212218
rlang::check_dots_empty()
213219
suffix <- if (is.null(name_suffix)) "" else paste0("_", name_suffix)
214220
chr <- function(x, ...) paste(paste0(x, suffix), ..., sep = "_")
@@ -272,12 +278,16 @@ tar_test_retest <- function(contents, ...,
272278
}
273279

274280
# modeling related ----
275-
tar_fit_cfa <- function(config, data, theory,
276-
col_ov = manifest,
277-
col_lv = latent,
278-
col_fix = NULL,
279-
missing = "ml",
280-
tar_post_fit = c("gof", "comp_rel", "scores")) {
281+
tar_fit_cfa <- function(
282+
config,
283+
data,
284+
theory,
285+
col_ov = manifest,
286+
col_lv = latent,
287+
col_fix = NULL,
288+
missing = "ml",
289+
tar_post_fit = c("gof", "comp_rel", "scores")
290+
) {
281291
tar_post_fit <- match.arg(tar_post_fit, several.ok = TRUE)
282292
list(
283293
tar_target_raw(
@@ -336,7 +346,8 @@ tar_prepare_neural_data <- function(config) {
336346
path_obj_from_proj(
337347
.(
338348
as.call(c(
339-
quote(paste), "fc",
349+
quote(paste),
350+
"fc",
340351
rlang::syms(names(config_fc)),
341352
sep = "_"
342353
))
@@ -412,11 +423,16 @@ tar_prepare_neural_data <- function(config) {
412423
}
413424

414425
# g factor ----
415-
tar_calibrate_g <- function(expr, data, use_pairs, ...,
416-
name_suffix = NULL,
417-
data_crit = NULL,
418-
config_neural = NULL,
419-
hypers_cpm = NULL) {
426+
tar_calibrate_g <- function(
427+
expr,
428+
data,
429+
use_pairs,
430+
...,
431+
name_suffix = NULL,
432+
data_crit = NULL,
433+
config_neural = NULL,
434+
hypers_cpm = NULL
435+
) {
420436
suffix <- if (is.null(name_suffix)) "" else paste0("_", name_suffix)
421437
chr <- function(x) paste0(x, suffix)
422438
sym <- function(x) as.symbol(chr(x))
@@ -558,8 +574,14 @@ tar_calibrate_g <- function(expr, data, use_pairs, ...,
558574
)
559575
}
560576

561-
tar_combine_branches <- function(name, branches, targets, meta_names,
562-
meta_prefix = name, names_greedy = NULL) {
577+
tar_combine_branches <- function(
578+
name,
579+
branches,
580+
targets,
581+
meta_names,
582+
meta_prefix = name,
583+
names_greedy = NULL
584+
) {
563585
rlang::check_exclusive(targets, branches)
564586
if (missing(targets)) {
565587
targets <- zutils::select_list(branches, starts_with(name))

‎R/validate_data.R‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,24 @@
1313
#' another game caused by the technical issues.
1414
#'
1515
#' @param data_parsed Data with parsed raw data.
16+
#' @param list_versions List of possible versions.
1617
#' @param require_keyboard Logical indicating if keyboard response is required.
1718
#' @param list_names A [list()] of possible column names.
1819
#' @return Validated data of class [data.frame()].
1920
#' @export
20-
validate_data <- function(data_parsed, require_keyboard, list_names) {
21+
validate_data <- function(
22+
data_parsed,
23+
list_versions,
24+
require_keyboard,
25+
list_names
26+
) {
2127
data_parsed |>
22-
filter(check_ver(game_version)) |>
28+
filter(game_version %in% list_versions) |>
2329
filter(map_lgl(raw_parsed, check_device, require_keyboard)) |>
2430
filter(map_lgl(raw_parsed, check_names, list_names))
2531
}
2632

2733
# helper functions
28-
check_ver <- function(version) {
29-
ver_major <- str_extract(version, "\\d+")
30-
ver_major == max(ver_major)
31-
}
32-
3334
check_device <- function(raw_parsed, require_keyboard = TRUE) {
3435
if (!require_keyboard) {
3536
return(TRUE)

‎config/game_versions.csv‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
game_id,game_versions
2+
268008982667350,1.0.5
3+
268008982667388,1.0.0
4+
268008982642792,1.0.0
5+
268008982650985,2.0.0
6+
268008982663267,1.0.0
7+
268008982667368,2.0.0
8+
268008982642798,1.0.0
9+
268008982655090,1.0.0
10+
268008982667358,1.0.0
11+
279330041741381,1.0.0
12+
268008982663278,2.0.0
13+
225528186135045,2.0.0
14+
268008982667381,2.0.0
15+
268008982667380,3.0.0
16+
240406295777861,3.0.1;3.0.2
17+
268008982663260,1.0.0
18+
238267995484229,v1.0.0
19+
238279920537669,3.0.0
20+
324179964613381,2.0.0
21+
384311706735365,1.0.0;2.0.0
22+
265520726213317,1.2.0
23+
396559862781125,1.0.0
24+
268008982671457,
25+
279044271042629,
26+
268008982646865,
27+
268008982655064,
28+
268008982655072,
29+
280443619795013,
30+
386597615997829,1.0.0
31+
268008982671439,1.0.0
32+
268008982655069,1.0.0
33+
268008982650988,1.0.0
34+
268008982667391,1.0.0;2.0.0
35+
268008982663290,1.0.0
36+
268008982667347,1.0.0;1.1.0
37+
239263162577477,1.0.0
38+
239263721484357,2.0.0
39+
239264243732549,1.0.0
40+
224374703641029,1.0.0
41+
268008982646874,1.0.1
42+
268008982655059,2.0.0
43+
268008982659166,1.0.2
44+
281039429226565,2.0.0
45+
268008982663269,1.0.0
46+
224377200398533,1.0.0;1.0.2
47+
224379118576069,1.0.0;1.1.0
48+
238239294447813,1.0.0
49+
224378628399301,1.0.0
50+
268008982659192,1.0.0
51+
265086851706949,3.0.0
52+
225525822632453,1.0.1
53+
224377872388293,2.0.0
54+
380173315257221,1.0.0;1.0.1
55+
268008982655053,2.0.0
56+
224375977935045,2.0.0
57+
383626886017797,1.0.0
58+
383795602420485,1.0.0
59+
383791726646021,1.0.0
60+
383679060169477,1.0.0
61+
383674715747205,1.0.0
62+
391429131297669,1.0.0
63+
383634608857989,1.0.0
64+
383628661912453,1.0.0
65+
375917432341381,1.0.1
66+
268008982642811,2.1.0
67+
324179001000709,2.0.0
68+
355740333933445,1.0.0
69+
386196539900677,1.0.1
70+
355740871500677,1.0.1
71+
268008982642793,1.0.0
72+
225191359021253,1.0.2
73+
380176247862021,1.0.0
74+
268008982642772,1.0.0
75+
383668915696517,1.0.0
76+
380174783693701,1.0.0;1.0.1
77+
225191769534981,1.0.1
78+
375903641948933,1.0.0
79+
375917961736965,2.0.0
80+
375932568191877,1.0.0
81+
380174879445893,1.0.0;1.0.1
82+
375933823447813,1.0.0
83+
322148361573125,1.0.1;1.0.2
84+
324181013119877,1.0.0
85+
324182449562501,1.0.0
86+
361750352892805,1.0.0
87+
324177880433541,2.0.0
88+
411281158706373,1.0.0
89+
383637084689157,1.0.0
90+
225525419221509,1.0.1
91+
224376556507589,1.0.1
92+
375934626087813,2.0.0
93+
381560965628805,1.0.0
94+
386185817178885,1.0.0;1.0.1
95+
375916542735109,1.0.0
96+
380173961339781,1.0.1
97+
381576542159749,1.0.0;1.0.1
98+
268008982659144,3.0.0
99+
224383397556421,2.0.0
100+
356101783560965,2.0.0
101+
383670005867269,1.0.0
102+
383639942255493,1.0.0
103+
383637861135109,1.0.0
104+
388594665001861,2.0.0
105+
388200929063813,1.0.0
106+
388595402609413,1.0.0
107+
383366895919877,1.0.1;1.0.2

0 commit comments

Comments
 (0)