From a59c05b1ff23415ee8c7ca5089a6cea05a240af2 Mon Sep 17 00:00:00 2001
From: Charly Lamothe <charly.lamothe@univ-amu.fr>
Date: Fri, 6 Mar 2020 09:00:05 +0100
Subject: [PATCH] Fix plot in compute_results.py and fix model_weights getter
in model_raw_results
---
code/bolsonaro/models/model_raw_results.py | 2 +-
code/compute_results.py | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/code/bolsonaro/models/model_raw_results.py b/code/bolsonaro/models/model_raw_results.py
index fc22406..fbb80a5 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 cff7ba2..6630279 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)
--
GitLab