recommitting

Yu-Group · May 15, 2024 · 292edb1 · 292edb1
1 parent 51f608a
commit 292edb1
Show file tree

Hide file tree

Showing 12 changed files with 1,992 additions and 1,706 deletions.
diff --git a/feature_importance/01_ablation_classification_script.sh b/feature_importance/01_ablation_classification_script.sh
diff --git a/feature_importance/01_ablation_regression_script.sh b/feature_importance/01_ablation_regression_script.sh
diff --git a/feature_importance/01_ablation_script.sh b/feature_importance/01_ablation_script.sh
diff --git a/feature_importance/diabetes_regression_test.png b/feature_importance/diabetes_regression_test.png
diff --git a/feature_importance/diabetes_regression_test_subset_1.png b/feature_importance/diabetes_regression_test_subset_1.png
diff --git a/feature_importance/diabetes_regression_test_subset_2.png b/feature_importance/diabetes_regression_test_subset_2.png
diff --git a/feature_importance/diabetes_regression_train.png b/feature_importance/diabetes_regression_train.png
diff --git a/feature_importance/feature_ranking.sh b/feature_importance/feature_ranking.sh
@@ -3,7 +3,7 @@
 #SBATCH --mail-type=ALL
 
 source activate mdi
-command="ranking_importance_local_sims.py --nreps 1 --config mdi_local.real_x_sim_y.diabetes-regression.lss-model --split_seed 6 --ignore_cache --create_rmd --result_name diabetes-reg-lss"
+command="ranking_importance_local_sims.py --nreps 1 --config mdi_local.real_x_sim_y.diabetes-regression.linear-model --split_seed ${1} --ignore_cache --create_rmd --result_name diabetes-reg-linear"
 
 # Execute the command
 python $command
diff --git a/feature_importance/fi_config/mdi_local/real_x_sim_y/diabetes-regression/linear-model/dgp.py b/feature_importance/fi_config/mdi_local/real_x_sim_y/diabetes-regression/linear-model/dgp.py
@@ -18,12 +18,12 @@
     "s": 5
 }
 
-VARY_PARAM_NAME = ["heritability", "sample_row_n"]
-VARY_PARAM_VALS = {"heritability": {"0.1": 0.1, "0.2": 0.2,
-                                    "0.4": 0.4, "0.8": 0.8},
-                   "sample_row_n": {"100": 100, "200": 200,
-                                    "300": 300, "400": 400}}
-
-# VARY_PARAM_NAME = ["heritability"]
+# VARY_PARAM_NAME = ["heritability", "sample_row_n"]
 # VARY_PARAM_VALS = {"heritability": {"0.1": 0.1, "0.2": 0.2,
-#                                     "0.4": 0.4, "0.8": 0.8}}
+#                                     "0.4": 0.4, "0.8": 0.8},
+#                    "sample_row_n": {"100": 100, "200": 200,
+#                                     "300": 300, "400": 400}}
+
+VARY_PARAM_NAME = ["heritability"]
+VARY_PARAM_VALS = {"heritability": {"0.1": 0.1, "0.2": 0.2,
+                                    "0.4": 0.4, "0.8": 0.8}}
diff --git a/...re_importance/fi_config/mdi_local/real_x_sim_y/diabetes-regression/linear-model/models.py b/...re_importance/fi_config/mdi_local/real_x_sim_y/diabetes-regression/linear-model/models.py
@@ -5,10 +5,9 @@
 from feature_importance.scripts.competing_methods_local import *
 from sklearn.linear_model import Ridge
 
-
 ESTIMATORS = [
     [ModelConfig('RF', RandomForestRegressor, model_type='tree',
-                other_params={'n_estimators': 100, 'min_samples_leaf': 5, 'max_features': 0.33, 'random_state': 42})]
+                other_params={'n_estimators': 100, 'min_samples_leaf': 1, 'max_features': 0.33, 'random_state': 42})]
 ]
 
 FI_ESTIMATORS = [