diff --git a/.gitignore b/.gitignore index 8b7c046e4145459df5142ca6463e9ff8e9ab3848..259eed3fb867dc407f8b0995fdd9eee87c1831b8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ models/* -results/* experiments/unnamed/ */.kile/* @@ -372,6 +371,3 @@ TSWLatexianTemp* *.lpz reports/*.pdf - -# Image -*.png diff --git a/code/train.py b/code/train.py index b922fb591bc4c851e1332d6385951b58cc7beab4..afcf28b400d021ffb9a3d50de9c48e401b8f536a 100644 --- a/code/train.py +++ b/code/train.py @@ -107,7 +107,7 @@ python code/train.py --dataset_name=california_housing --seeds 1 2 3 --save_expe python code/train.py --dataset_name=california_housing --seeds 1 2 3 --extraction_strategy=none --skip_best_hyperparams --save_experiment_configuration 1 none_wo_params python code/train.py --dataset_name=california_housing --seeds 1 2 3 --extraction_strategy=random --skip_best_hyperparams --save_experiment_configuration 1 random_wo_params python code/train.py --dataset_name=california_housing --seeds 1 2 3 --skip_best_hyperparams --save_experiment_configuration 1 omp_wo_params -python code/compute_results.py --stage 1 --experiment_ids 1 2 3 4 5 6 +python code/compute_results.py --stage 1 --experiment_ids 1 2 3 4 5 6 --dataset_name=california_housing --extracted_forest_sizes_number=5 """ if __name__ == "__main__": load_dotenv(find_dotenv('.env')) @@ -160,10 +160,14 @@ if __name__ == "__main__": logger = LoggerFactory.create(LOG_PATH, os.path.basename(__file__)) hyperparameters_path = os.path.join('experiments', args.dataset_name, 'stage1', 'params.json') - if os.path.exists(hyperparameters_path) and not args.skip_best_hyperparams: + if os.path.exists(hyperparameters_path): logger.info("Hyperparameters found for this dataset at '{}'".format(hyperparameters_path)) with open(hyperparameters_path, 'r+') as file_hyperparameter: - hyperparameters = json.load(file_hyperparameter)['best_parameters'] + loaded_hyperparameters = json.load(file_hyperparameter)['best_parameters'] + if args.skip_best_hyperparams: + hyperparameters = {'n_estimators': loaded_hyperparameters['n_estimators']} + else: + hyperparameters = loaded_hyperparameters else: hyperparameters = {} diff --git a/experiments/california_housing/stage1/none_wo_params_4.json b/experiments/california_housing/stage1/none_wo_params_4.json index d7aa2077a0c49197e375b491b9386794e736221b..1f3a8061045a995c019c606f1f5553e2ebb88109 100644 --- a/experiments/california_housing/stage1/none_wo_params_4.json +++ b/experiments/california_housing/stage1/none_wo_params_4.json @@ -27,11 +27,11 @@ "job_number": -1, "extraction_strategy": "none", "extracted_forest_size": [ - 1, - 3, - 5, - 6, - 8 + 16, + 33, + 50, + 66, + 83 ], "experiment_id": 4 } \ No newline at end of file diff --git a/experiments/california_housing/stage1/omp_wo_params_6.json b/experiments/california_housing/stage1/omp_wo_params_6.json index 94a4452072488e83a6d8b6f387c91b565a17f895..c0b1b260b18313f2c0445e494b7112a5e8cdfc69 100644 --- a/experiments/california_housing/stage1/omp_wo_params_6.json +++ b/experiments/california_housing/stage1/omp_wo_params_6.json @@ -27,11 +27,11 @@ "job_number": -1, "extraction_strategy": "omp", "extracted_forest_size": [ - 1, - 3, - 5, - 6, - 8 + 16, + 33, + 50, + 66, + 83 ], "experiment_id": 6 } \ No newline at end of file diff --git a/experiments/california_housing/stage1/random_wo_params_5.json b/experiments/california_housing/stage1/random_wo_params_5.json index 22d6bc7f82833c4b12a964c54c8eec1b85e4888e..db3dfb480fb312992280a8408529f5d9ad3413e8 100644 --- a/experiments/california_housing/stage1/random_wo_params_5.json +++ b/experiments/california_housing/stage1/random_wo_params_5.json @@ -27,11 +27,11 @@ "job_number": -1, "extraction_strategy": "random", "extracted_forest_size": [ - 1, - 3, - 5, - 6, - 8 + 16, + 33, + 50, + 66, + 83 ], "experiment_id": 5 } \ No newline at end of file