diff --git a/code/bolsonaro/models/model_raw_results.py b/code/bolsonaro/models/model_raw_results.py index fc22406bcd6fc1d44023be79783961a32eccb172..fbb80a591f9c1f42ac6fe3d1982d43d108faa026 100644 --- a/code/bolsonaro/models/model_raw_results.py +++ b/code/bolsonaro/models/model_raw_results.py @@ -25,7 +25,7 @@ class ModelRawResults(object): @property def model_weights(self): - return self.model_weights + return self._model_weights @property def training_time(self): diff --git a/code/compute_results.py b/code/compute_results.py index cff7ba253acfa67d7b4b8eabadcd69a19522e2df..6630279e8778196746bae151d4574cec400a019e 100644 --- a/code/compute_results.py +++ b/code/compute_results.py @@ -138,7 +138,6 @@ def extract_weights_across_seeds(models_dir, results_dir, experiment_id): extracted_forest_sizes = os.listdir(extracted_forest_sizes_root_path) extracted_forest_sizes = [nb_tree for nb_tree in extracted_forest_sizes if not 'no_weights' in nb_tree ] extracted_forest_sizes.sort(key=int) - all_extracted_forest_sizes.append(list(map(int, extracted_forest_sizes))) for extracted_forest_size in extracted_forest_sizes: # models/{experiment_id}/seeds/{seed}/extracted_forest_sizes/{extracted_forest_size} extracted_forest_size_path = extracted_forest_sizes_root_path + os.sep + extracted_forest_size @@ -392,7 +391,7 @@ if __name__ == "__main__": omp_with_params_experiment_score_metric = extract_scores_across_seeds_and_extracted_forest_sizes( args.models_dir, args.results_dir, args.experiment_ids[2]) #omp_with_params_without_weights - logger.info('Loading omp_with_params experiment scores...') + logger.info('Loading omp_with_params without weights experiment scores...') omp_with_params_without_weights_train_scores, omp_with_params_without_weights_dev_scores, omp_with_params_without_weights_test_scores, _, \ omp_with_params_experiment_score_metric = extract_scores_across_seeds_and_extracted_forest_sizes( args.models_dir, args.results_dir, args.experiment_ids[2], weights=False)