From 7f11136c678efa58e7d6c620ba6e0ae2585611c3 Mon Sep 17 00:00:00 2001
From: Dominique Benielli <dominique.benielli@lis-lab.fr>
Date: Wed, 4 Mar 2020 14:02:08 +0100
Subject: [PATCH] call alpha
---
multimodal/boosting/cumbo.py | 6 +++---
multimodal/boosting/mumbo.py | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/multimodal/boosting/cumbo.py b/multimodal/boosting/cumbo.py
index b498064..158c9ca 100644
--- a/multimodal/boosting/cumbo.py
+++ b/multimodal/boosting/cumbo.py
@@ -216,10 +216,10 @@ class MuCumboClassifier(BaseEnsemble, ClassifierMixin, UBoosting):
"""Compute values of confidence rate alpha given edge values."""
np.where(edges > 1.0, edges, 1.0)
alphas = 0.5 * np.log((1. + edges) / (1. - edges))
- if np.any(np.isinf(alphas)) or np.any(np.isnan(alphas)):
-
- alphas[np.where(np.isnan(alphas))[0]] = 1.0
+ if np.any(np.isinf(alphas)):
alphas[np.where(np.isinf(alphas))[0]] = 1.0
+ if np.any(np.isnan(alphas)):
+ alphas[np.where(np.isnan(alphas))[0]] = 1.0
return alphas
def _compute_cost(self, label_score, predicted_classes, y, alphas, betas,
diff --git a/multimodal/boosting/mumbo.py b/multimodal/boosting/mumbo.py
index 84530d8..23dacff 100644
--- a/multimodal/boosting/mumbo.py
+++ b/multimodal/boosting/mumbo.py
@@ -223,10 +223,10 @@ class MumboClassifier(BaseEnsemble, ClassifierMixin, UBoosting):
"""Compute values of confidence rate alpha given edge values."""
np.where(edges > 1.0, edges, 1.0)
alphas = 0.5 * np.log((1. + edges) / (1. - edges))
- if np.any(np.isinf(alphas)) or np.any(np.isnan(alphas)):
-
- alphas[np.where(np.isnan(alphas))[0]] = 1.0
+ if np.any(np.isinf(alphas)):
alphas[np.where(np.isinf(alphas))[0]] = 1.0
+ if np.any(np.isnan(alphas)):
+ alphas[np.where(np.isnan(alphas))[0]] = 1.0
return alphas
def _compute_cost_global(self, label_score_global, best_predicted_classes,
--
GitLab