Update with Zach new version

Yu-Group · Jan 25, 2024 · 3962589 · 3962589
1 parent 786902b
commit 3962589
Show file tree

Hide file tree

Showing 4 changed files with 173 additions and 458 deletions.
diff --git a/feature_importance/fi_config/mdi_local/two_subgroups_linear_sims/dgp.py b/feature_importance/fi_config/mdi_local/two_subgroups_linear_sims/dgp.py
@@ -26,10 +26,8 @@
 # vary two parameters in a grid
 ### "sample_row_n"
 VARY_PARAM_NAME = ["heritability", "n"]
-VARY_PARAM_VALS = {"heritability": {"0.1": 0.1, "0.4": 0.4, "0.8": 0.8},
+VARY_PARAM_VALS = {"heritability": {"0.1": 0.1, "0.2": 0.2, "0.4": 0.4, "0.8": 0.8},
                    "n": {"100": 100, "250": 250, "500": 500, "1000": 1000}}
-# VARY_PARAM_VALS = {"heritability": {"0.1": 0.1, "0.2": 0.2, "0.4": 0.4, "0.8": 0.8},
-#                    "n": {"100": 100, "250": 250, "500": 500, "1000": 1000}}
 
 # # vary over n_estimators in RF model in models.py
 # VARY_PARAM_NAME = "n_estimators"

diff --git a/feature_importance/fi_config/mdi_local/two_subgroups_linear_sims/models.py b/feature_importance/fi_config/mdi_local/two_subgroups_linear_sims/models.py
@@ -10,18 +10,18 @@
 ]
 
 FI_ESTIMATORS = [
-    [FIModelConfig('MDI_all_stumps', MDI_local_all_stumps, ascending = False, model_type='tree')],
-    [FIModelConfig('MDI_sub_stumps', MDI_local_sub_stumps, ascending = False, model_type='tree')],
-    [FIModelConfig('MDI_all_stumps_without_raw', MDI_local_all_stumps, ascending = False, model_type='tree', other_params={"include_raw": False})],
-    [FIModelConfig('MDI_sub_stumps_without_raw', MDI_local_sub_stumps, ascending = False, model_type='tree', other_params={"include_raw": False})],
-    [FIModelConfig('LFI_sum_absolute_all_stumps', LFI_sum_absolute_all_stumps, model_type='tree')],
-    [FIModelConfig('LFI_absolute_sum_all_stumps', LFI_absolute_sum_all_stumps, model_type='tree')],
-    [FIModelConfig('LFI_sum_absolute_sub_stumps', LFI_sum_absolute_sub_stumps, model_type='tree')],
-    [FIModelConfig('LFI_absolute_sum_sub_stumps', LFI_absolute_sum_sub_stumps, model_type='tree')],
-    [FIModelConfig('LFI_sum_absolute_all_stumps_without_raw', LFI_sum_absolute_all_stumps, model_type='tree', other_params={"include_raw": False})],
-    [FIModelConfig('LFI_absolute_sum_all_stumps_without_raw', LFI_absolute_sum_all_stumps, model_type='tree', other_params={"include_raw": False})],
-    [FIModelConfig('LFI_sum_absolute_sub_stumps_without_raw', LFI_sum_absolute_sub_stumps, model_type='tree', other_params={"include_raw": False})],
-    [FIModelConfig('LFI_absolute_sum_sub_stumps_without_raw', LFI_absolute_sum_sub_stumps, model_type='tree', other_params={"include_raw": False})],
+    # [FIModelConfig('MDI_all_stumps', MDI_local_all_stumps, ascending = False, model_type='tree')],
+    # [FIModelConfig('MDI_sub_stumps', MDI_local_sub_stumps, ascending = False, model_type='tree')],
+    # [FIModelConfig('MDI_all_stumps_without_raw', MDI_local_all_stumps, ascending = False, model_type='tree', other_params={"include_raw": False})],
+    # [FIModelConfig('MDI_sub_stumps_without_raw', MDI_local_sub_stumps, ascending = False, model_type='tree', other_params={"include_raw": False})],
+    [FIModelConfig('LFI_sum_absolute', LFI_sum_absolute, model_type='tree')],
+    [FIModelConfig('LFI_absolute_sum', LFI_absolute_sum, model_type='tree')],
+    # [FIModelConfig('LFI_sum_absolute_sub_stumps', LFI_sum_absolute_sub_stumps, model_type='tree')],
+    # [FIModelConfig('LFI_absolute_sum_sub_stumps', LFI_absolute_sum_sub_stumps, model_type='tree')],
+    [FIModelConfig('LFI_sum_absolute_without_raw', LFI_sum_absolute, model_type='tree', other_params={"include_raw": False})],
+    [FIModelConfig('LFI_absolute_sum_without_raw', LFI_absolute_sum, model_type='tree', other_params={"include_raw": False})],
+    # [FIModelConfig('LFI_sum_absolute_sub_stumps_without_raw', LFI_sum_absolute_sub_stumps, model_type='tree', other_params={"include_raw": False})],
+    # [FIModelConfig('LFI_absolute_sum_sub_stumps_without_raw', LFI_absolute_sum_sub_stumps, model_type='tree', other_params={"include_raw": False})],
     [FIModelConfig('TreeSHAP', tree_shap_local, model_type='tree')],
     [FIModelConfig('LIME', lime_local, model_type='tree')],
 ]