update syntax for interaction

TARGENE · Jan 12, 2024 · 21da08c · 21da08c
1 parent e186879
commit 21da08c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/tmle_inputs/allele_independent_estimands.jl b/src/tmle_inputs/allele_independent_estimands.jl
@@ -37,7 +37,7 @@ function generate_treatments_combinations(treatments_lists, orders)
     return sort(treatment_combinations)
 end
 
-function generate_interactions!(batch_saver, dataset, variants_config, outcomes, confounders; 
+function generate_iates!(batch_saver, dataset, variants_config, outcomes, confounders; 
     extra_treatments=[],
     outcome_extra_covariates=[],
     positivity_constraint=0.,
@@ -101,9 +101,9 @@ function allele_independent_estimands(parsed_args)
 
     # Estimands
     for estimand_type in config["estimands"]
-        if estimand_type == "interactions"
+        if estimand_type == "IATE"
             orders = config["orders"]
-            generate_interactions!(batch_saver, dataset, variants_config, outcomes, confounders; 
+            generate_iates!(batch_saver, dataset, variants_config, outcomes, confounders; 
                 extra_treatments=extra_treatments,
                 outcome_extra_covariates=outcome_extra_covariates,
                 positivity_constraint=positivity_constraint,

diff --git a/test/data/interaction_config.yaml b/test/data/interaction_config.yaml
@@ -1,6 +1,6 @@
 orders: [2, 3]
 estimands: 
-  - interactions
+  - IATE
 variants:
   TF1:
     bQTLs:

diff --git a/test/tmle_inputs/allele_independent_estimands.jl b/test/tmle_inputs/allele_independent_estimands.jl
@@ -15,7 +15,15 @@ include(joinpath(TESTDIR, "tmle_inputs", "test_utils.jl"))
         [:RSID_1, :RSID_2],
         [:RSID_3, :RSID_4],
         [:RSID_5],
-        ] 
+        ]
+    order_1 = TargeneCore.generate_treatments_combinations(treatments_list, [1])
+    @test order_1 == [
+        (:RSID_1,),
+        (:RSID_2,),
+        (:RSID_3,),
+        (:RSID_4,),
+        (:RSID_5,)
+    ]
     order_2 = TargeneCore.generate_treatments_combinations(treatments_list, [2])
     @test order_2 == [
         (:RSID_1, :RSID_3),