From 0b0af680c49938a950ec2187e8da53d72bad0ad7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Bouscarrat?= <leo.bouscarrat@euranova.eu>
Date: Thu, 5 Mar 2020 15:20:42 +0100
Subject: [PATCH] Correction for predict_no_weights

---
 code/bolsonaro/models/omp_forest_classifier.py | 2 +-
 code/bolsonaro/trainer.py                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/bolsonaro/models/omp_forest_classifier.py b/code/bolsonaro/models/omp_forest_classifier.py
index 31ca945..a51405a 100644
--- a/code/bolsonaro/models/omp_forest_classifier.py
+++ b/code/bolsonaro/models/omp_forest_classifier.py
@@ -48,7 +48,7 @@ class OmpForestBinaryClassifier(SingleOmpForest):
 
         result_omp = np.mean(omp_trees_predictions, axis=1)
 
-        result_omp = np.array([-1 if pred < 0.5 else 1 for pred in result_omp])
+        result_omp = (result_omp - 0.5) * 2
 
         return result_omp
 
diff --git a/code/bolsonaro/trainer.py b/code/bolsonaro/trainer.py
index 0e437d2..cb1702d 100644
--- a/code/bolsonaro/trainer.py
+++ b/code/bolsonaro/trainer.py
@@ -108,7 +108,7 @@ class Trainer(object):
             else:
                 y_pred = model.predict_no_weights(X)
             if type(model) is OmpForestBinaryClassifier:
-                y_pred = y_pred.round()
+                y_pred = np.sign(y_pred)
             result = self._classification_score_metric(y_true, y_pred)
         return result
 
-- 
GitLab