diff options
| author | Niclas Dobbertin <niclas.dobbertin@mailbox.org> | 2023-10-01 17:05:56 +0200 |
|---|---|---|
| committer | Niclas Dobbertin <niclas.dobbertin@mailbox.org> | 2023-10-01 17:05:56 +0200 |
| commit | 1840bf6f0f086b156552ef47bfb870a07be39821 (patch) | |
| tree | 9f3223e8bd6f25f82d7c6ae32ab801f1e5d9f608 | |
| parent | c030c0916b8238fc9a5166ec065d7e94bbb5758f (diff) | |
| parent | 2d445574131a42bd7a4f1bfc2e9f5106a344add3 (diff) | |
Merge branch 'master' into 1920x1080
| -rw-r--r-- | master_thesis/frensch_task.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/master_thesis/frensch_task.py b/master_thesis/frensch_task.py index 3b3e511..c6b9eae 100644 --- a/master_thesis/frensch_task.py +++ b/master_thesis/frensch_task.py @@ -116,7 +116,9 @@ def run_trial(water_sample, procedure_keys: list, condition): water_sample.print_all() if condition == "random": + overall = procedure_keys.pop() random.shuffle(procedure_keys) + procedure_keys.append(overall) solid = DisplayVariable("Mineralien", [water_sample.solid]) algae = DisplayVariable("Algen", [water_sample.algae]) @@ -185,7 +187,7 @@ def run_trial(water_sample, procedure_keys: list, condition): # event.waitKeys(keyList=["space"]) - return answers, procedure_keys + return tuple(answers), tuple(procedure_keys) pause = visual.TextBox2( @@ -223,7 +225,7 @@ results = {} for i in range(TRAIN_TRIALS): print(train_procedures) answer, procedure_keys = run_trial( - all_samples[i], train_procedures, ORDER_CONDITIONS[0] + all_samples[i], train_procedures, ORDER_CONDITIONS[1] ) answer_dict = {} answer_dict["procedure_order"] = procedure_keys @@ -256,6 +258,7 @@ for i in range(TEST_TRIALS): answer, procedure_keys = run_trial( all_samples[TRAIN_TRIALS + i], train_procedures, ORDER_CONDITIONS[0] ) + print(procedure_keys) answer_dict = {} answer_dict["procedure_order"] = procedure_keys answer_dict["water_sample"] = all_samples[TRAIN_TRIALS + i].water_sample_dict() |