new results for california housing

0edaa3f0 · leo.bouscarrat · 1d5b54a1 · 0edaa3f0 · 0edaa3f0 · 0edaa3f0
Commit 0edaa3f0 authored 5 years ago by leo.bouscarrat
--- 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
--- 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
--- 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
--- a/results/california_housing/stage4_fix/losses.png
+++ b/results/california_housing/stage4_fix/losses.png
--- a/scripts/run_compute_results.sh
+++ b/scripts/run_compute_results.sh
-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
--- 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"