diff --git a/experiments/kin8nm/stage4/none_with_params.json b/experiments/kin8nm/stage4/none_with_params.json index 16e4eb06ee9817c81303ed1b8d36471aee150a1e..e76625b70c85ca8cc43081155a2cee728fa856f1 100644 --- a/experiments/kin8nm/stage4/none_with_params.json +++ b/experiments/kin8nm/stage4/none_with_params.json @@ -32,35 +32,35 @@ "job_number": -1, "extraction_strategy": "none", "extracted_forest_size": [ - 3, - 6, - 10, - 13, - 16, - 19, - 23, - 26, - 29, 32, - 35, - 39, - 42, - 45, - 48, - 52, - 55, - 58, - 61, 65, - 68, - 71, - 74, - 77, - 81, - 84, - 87, - 90, - 94, - 97 + 97, + 129, + 161, + 194, + 226, + 258, + 290, + 323, + 355, + 387, + 419, + 452, + 484, + 516, + 548, + 581, + 613, + 645, + 677, + 710, + 742, + 774, + 806, + 839, + 871, + 903, + 935, + 968 ] } \ No newline at end of file diff --git a/experiments/kin8nm/stage4/omp_with_params.json b/experiments/kin8nm/stage4/omp_with_params.json index 58c36532a7e5a494346664e8220c215cb4f32c7a..323ab05c32c90fb9db64672897609e0e0e430732 100644 --- a/experiments/kin8nm/stage4/omp_with_params.json +++ b/experiments/kin8nm/stage4/omp_with_params.json @@ -32,35 +32,35 @@ "job_number": -1, "extraction_strategy": "omp", "extracted_forest_size": [ - 3, - 6, - 10, - 13, - 16, - 19, - 23, - 26, - 29, 32, - 35, - 39, - 42, - 45, - 48, - 52, - 55, - 58, - 61, 65, - 68, - 71, - 74, - 77, - 81, - 84, - 87, - 90, - 94, - 97 + 97, + 129, + 161, + 194, + 226, + 258, + 290, + 323, + 355, + 387, + 419, + 452, + 484, + 516, + 548, + 581, + 613, + 645, + 677, + 710, + 742, + 774, + 806, + 839, + 871, + 903, + 935, + 968 ] } \ No newline at end of file diff --git a/experiments/kin8nm/stage4/random_with_params.json b/experiments/kin8nm/stage4/random_with_params.json index f03aed7830dd5bcb74cc122d9d8bbd9da98872e4..2d97ca6c226b4dcc505e1be3bfd60e174c5424fb 100644 --- a/experiments/kin8nm/stage4/random_with_params.json +++ b/experiments/kin8nm/stage4/random_with_params.json @@ -32,35 +32,35 @@ "job_number": -1, "extraction_strategy": "random", "extracted_forest_size": [ - 3, - 6, - 10, - 13, - 16, - 19, - 23, - 26, - 29, 32, - 35, - 39, - 42, - 45, - 48, - 52, - 55, - 58, - 61, 65, - 68, - 71, - 74, - 77, - 81, - 84, - 87, - 90, - 94, - 97 + 97, + 129, + 161, + 194, + 226, + 258, + 290, + 323, + 355, + 387, + 419, + 452, + 484, + 516, + 548, + 581, + 613, + 645, + 677, + 710, + 742, + 774, + 806, + 839, + 871, + 903, + 935, + 968 ] } \ No newline at end of file diff --git a/results/california_housing/stage4_fix/losses.png b/results/california_housing/stage4_fix/losses.png index a43d3ff92aebddcf7d7fe02608fd52a38e2b0450..557a941d32d6eaf95bb14c3affc636c5cbd7a930 100644 Binary files a/results/california_housing/stage4_fix/losses.png and b/results/california_housing/stage4_fix/losses.png differ diff --git a/scripts/run_compute_results.sh b/scripts/run_compute_results.sh index b25f0901f20d40a2fdfc2e987fc5613912e2279b..4399f8f502f1eb2eab970dcb8777d34c3c278704 100644 --- a/scripts/run_compute_results.sh +++ b/scripts/run_compute_results.sh @@ -1,4 +1,5 @@ -for dataset in breast_cancer diabetes diamonds california_housing boston linnerud steel-plates kr-vs-kp digits iris kin8nm lfw_pairs linnerud olivetti_faces wine spambase +for dataset in california_housing +#for dataset in breast_cancer diabetes diamonds california_housing boston linnerud steel-plates kr-vs-kp digits iris kin8nm lfw_pairs linnerud olivetti_faces wine spambase do python code/compute_results.py --stage=4 --experiment_ids 1 2 3 --dataset_name=$dataset --models_dir=models/$dataset/stage4 done diff --git a/scripts/run_stage4_experiments.sh b/scripts/run_stage4_experiments.sh index 9202ca03ca674179ae4f9bcb5fe951c920fafe35..fc8cf64dc4e678460b0373c5f9ff7435c050e41b 100644 --- a/scripts/run_stage4_experiments.sh +++ b/scripts/run_stage4_experiments.sh @@ -3,8 +3,9 @@ core_number=5 walltime=1:00 seeds='1 2 3 4 5 6 7' +for dataset in kin8nm #for dataset in gamma -for dataset in breast_cancer diabetes diamonds california_housing boston linnerud steel-plates kr-vs-kp digits iris kin8nm lfw_pairs linnerud olivetti_faces wine spambase +#for dataset in breast_cancer diabetes diamonds california_housing boston linnerud steel-plates kr-vs-kp digits iris kin8nm lfw_pairs linnerud olivetti_faces wine spambase do oarsub -p "(gpu is null)" -l /core=$core_number,walltime=1:00 "conda activate test_env && python code/train.py --dataset_name=$dataset --seeds $seeds --extraction_strategy=none --save_experiment_configuration 4 none_with_params --extracted_forest_size_stop=1 --extracted_forest_size_samples=30 --experiment_id=1 --models_dir=models/$dataset/stage4 --subsets_used train+dev,train+dev" oarsub -p "(gpu is null)" -l /core=$core_number,walltime=1:00 "conda activate test_env && python code/train.py --dataset_name=$dataset --seeds $seeds --extraction_strategy=random --save_experiment_configuration 4 random_with_params --extracted_forest_size_stop=1 --extracted_forest_size_samples=30 --experiment_id=2 --models_dir=models/$dataset/stage4 --subsets_used train+dev,train+dev"