From e42a20eb6caf2bf26bc42764427096cce6308709 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Fri, 7 Oct 2022 21:52:11 -0400 Subject: [PATCH] TEST: Fix bad test model --- fitlins/conftest.py | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/fitlins/conftest.py b/fitlins/conftest.py index f2ef9586..64769714 100644 --- a/fitlins/conftest.py +++ b/fitlins/conftest.py @@ -42,7 +42,7 @@ def sample_model_dict(): }, "Model": {"X": ["trial_type.ice_cream", "trial_type.cake", "food_sweats"]}, "DummyContrasts": { - "Conditions": ["trial_type.ice_cream", "trial_type.cake"], + "Contrasts": ["trial_type.ice_cream", "trial_type.cake"], "Test": "t", }, "Contrasts": [ @@ -69,13 +69,16 @@ def sample_model_dict(): }, { "Level": "dataset", - "Name": "all_food_good_food", + "Name": "dataset", "GroupBy": ["contrast"], - "Model": {"X": [1]}, - "DummyContrasts": { - "Conditions": ["icecream_gt_cake", "eating_vs_baseline"], - "Test": "t", - }, + "Model": {"X": [1], "Type": "glm"}, + "DummyContrasts": {"Test": "t"}, + }, + { + "Level": "dataset", + "Name": "all_food_good_food", + "GroupBy": [], + "Model": {"X": ["trial_type.ice_cream", "trial_type.cake"], "Type": "glm"}, "Contrasts": [ { "Name": "all_food_good_food", @@ -90,9 +93,14 @@ def sample_model_dict(): {"Source": "run", "Destination": "subject"}, { "Source": "subject", - "Destination": "all_food_good_food", + "Destination": "dataset", "Filter": {"contrast": ["icecream_gt_cake", "eating_vs_baseline"]}, }, + { + "Source": "subject", + "Destination": "all_food_good_food", + "Filter": {"contrast": ["trial_type.ice_cream", "trial_type.cake"]}, + }, ], }