Skip to content

Commit

Permalink
encoder data
Browse files Browse the repository at this point in the history
  • Loading branch information
jacob-evarts committed Jul 15, 2024
1 parent 24debc9 commit 553616c
Show file tree
Hide file tree
Showing 18 changed files with 120,101 additions and 21 deletions.
9,001 changes: 9,001 additions & 0 deletions data/repr_learning_128/32_0/full_data.csv

Large diffs are not rendered by default.

9,001 changes: 9,001 additions & 0 deletions data/repr_learning_128/32_1/full_data.csv

Large diffs are not rendered by default.

9,001 changes: 9,001 additions & 0 deletions data/repr_learning_128/32_2/full_data.csv

Large diffs are not rendered by default.

9,001 changes: 9,001 additions & 0 deletions data/repr_learning_128/32_3/full_data.csv

Large diffs are not rendered by default.

9,001 changes: 9,001 additions & 0 deletions data/repr_learning_128/32_4/full_data.csv

Large diffs are not rendered by default.

15,001 changes: 15,001 additions & 0 deletions data/repr_learning_vae_vasc/16_0/CH-features_all_metric_all.csv

Large diffs are not rendered by default.

15,001 changes: 15,001 additions & 0 deletions data/repr_learning_vae_vasc/16_1/CH-features_all_metric_all.csv

Large diffs are not rendered by default.

15,001 changes: 15,001 additions & 0 deletions data/repr_learning_vae_vasc/16_2/CH-features_all_metric_all.csv

Large diffs are not rendered by default.

15,001 changes: 15,001 additions & 0 deletions data/repr_learning_vae_vasc/16_3/CH-features_all_metric_all.csv

Large diffs are not rendered by default.

15,001 changes: 15,001 additions & 0 deletions data/repr_learning_vae_vasc/16_4/CH-features_all_metric_all.csv

Large diffs are not rendered by default.

9 changes: 1 addition & 8 deletions run.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,2 @@
rm -rf results/ARCADE/*
python src/config.py cs=topological_0_metric_8
python src/config.py cs=topological_0_metric_15

python src/config.py cs=hemodynamic_0_metric_8
python src/config.py cs=hemodynamic_0_metric_15

python src/config.py cs=spatial_0_metric_8
python src/config.py cs=spatial_0_metric_15
python src/config.py cs=repr_learning_all_metric_all
6 changes: 3 additions & 3 deletions src/conf/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ defaults:
- cs: MISSING
- _self_

sobol_power: 4
stratify: LAYOUT
sobol_power: 2
stratify:
quantity_experiment: false
clean_data: true
clean_data: false
debug: true
9 changes: 2 additions & 7 deletions src/conf/cs/models/mlp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ mlp:
search: log
discrete:
activation:
- identity
- logistic
- tanh
- relu
hidden_layer_sizes:
- (5,)
Expand All @@ -17,9 +15,6 @@ mlp:
- (25,)
- (25, 25)
- (25, 50)
- (50,)
- (50, 25)
- (50, 50)
static:
solver: lbfgs
max_iter: 1000
solver: adam
max_iter: 2000
1 change: 0 additions & 1 deletion src/conf/cs/models/svr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ svr:
search: log
discrete:
kernel:
- linear
- poly
- rbf
- sigmoid
82 changes: 82 additions & 0 deletions src/conf/cs/repr_learning_all_metric_all.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
defaults:
- models/mlr
- models/rf
- models/svr
- models/mlp
- _self_
experiments:
REPR-LEARNING_32d_0:
files:
data: full_data.csv
paths:
log: ${hydra:runtime.cwd}/logs/repr_learning_128/32_0/
data: ${hydra:runtime.cwd}/data/repr_learning_128/32_0/
results: ${hydra:runtime.cwd}/results/repr_learning_128/32_0/
REPR-LEARNING_32d_1:
files:
data: full_data.csv
paths:
log: ${hydra:runtime.cwd}/logs/repr_learning_128/32_1/
data: ${hydra:runtime.cwd}/data/repr_learning_128/32_1/
results: ${hydra:runtime.cwd}/results/repr_learning_128/32_1/
REPR-LEARNING_32d_2:
files:
data: full_data.csv
paths:
log: ${hydra:runtime.cwd}/logs/repr_learning_128/32_2/
data: ${hydra:runtime.cwd}/data/repr_learning_128/32_2/
results: ${hydra:runtime.cwd}/results/repr_learning_128/32_2/
REPR-LEARNING_32d_3:
files:
data: full_data.csv
paths:
log: ${hydra:runtime.cwd}/logs/repr_learning_128/32_3/
data: ${hydra:runtime.cwd}/data/repr_learning_128/32_3/
results: ${hydra:runtime.cwd}/results/repr_learning_128/32_3/
REPR-LEARNING_32d_4:
files:
data: full_data.csv
paths:
log: ${hydra:runtime.cwd}/logs/repr_learning_128/32_4/
data: ${hydra:runtime.cwd}/data/repr_learning_128/32_4/
results: ${hydra:runtime.cwd}/results/repr_learning_128/32_4/

data:
features:
- dim_0
- dim_1
- dim_2
- dim_3
- dim_4
- dim_5
- dim_6
- dim_7
- dim_8
- dim_9
- dim_10
- dim_11
- dim_12
- dim_13
- dim_14
- dim_15
- dim_16
- dim_17
- dim_18
- dim_19
- dim_20
- dim_21
- dim_22
- dim_23
- dim_24
- dim_25
- dim_26
- dim_27
- dim_28
- dim_29
- dim_30
- dim_31

response:
- activity
- growth
- symmetry
3 changes: 2 additions & 1 deletion src/permutation/experiments/experiment.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ def _get_best_cv_model(self) -> None:

for algorithm, runner_list in self._models.items():
for runner in runner_list:
print(runner.model.hparams)
runner.cross_validation()
progress_counter += 1
self.logger.log(f"Progress: {progress_counter} of {self._n_models} - {runner.id}")
Expand Down Expand Up @@ -330,7 +331,7 @@ def _run_experiment(self) -> None:
pass
self.train_models()
self.test_models()
self.permutation_testing()
# self.permutation_testing()

def _log_initialization(self) -> None:
self.logger.log(f"(Standard Experiment) {self.name} initialized.")
Expand Down
1 change: 1 addition & 0 deletions src/permutation/loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ def clean_data(self) -> Tuple[pd.Index, pd.DataFrame, pd.DataFrame]:
feature for feature in self.features if feature not in removed_feature_columns
]
self._X, self._y = features_response_split(full_data, self.features, self.response)

self._set_working()
self._split_data(self.stratify)

Expand Down
1 change: 0 additions & 1 deletion src/permutation/models/sklearnmodel.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ def _set_model(
"""
model = cls()
model.hparams = hparams

pipeline_list = []

if preprocessing_dependencies:
Expand Down

0 comments on commit 553616c

Please sign in to comment.