From 1f56a5e2dee4691fc8254ac96688bccb2f5bcc1f Mon Sep 17 00:00:00 2001 From: Sourcery AI <> Date: Thu, 8 Oct 2020 08:25:15 +0000 Subject: [PATCH] 'Refactored by Sourcery' --- .../acquisition_functions/functions.py | 6 ++---- src/superintendent/base.py | 16 +++++++--------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/superintendent/acquisition_functions/functions.py b/src/superintendent/acquisition_functions/functions.py index e209660..f8ab548 100644 --- a/src/superintendent/acquisition_functions/functions.py +++ b/src/superintendent/acquisition_functions/functions.py @@ -58,11 +58,10 @@ def margin(probabilities: np.ndarray) -> np.ndarray: new labels and catching any minority classes the algorithm currently classifies as a different label. """ - margin = ( + return ( np.sort(probabilities, axis=1)[:, -1] - np.sort(probabilities, axis=1)[:, -2] ) - return margin @make_acquisition_function(handle_multioutput="mean") # noqa: D002 @@ -86,8 +85,7 @@ def certainty(probabilities: np.ndarray): classifies as a different label. """ - certainty = probabilities.max(axis=-1) - return certainty + return probabilities.max(axis=-1) @make_acquisition_function(handle_multioutput="mean") diff --git a/src/superintendent/base.py b/src/superintendent/base.py index 8134c8e..eb82d83 100644 --- a/src/superintendent/base.py +++ b/src/superintendent/base.py @@ -189,9 +189,7 @@ def _annotation_iterator(self): self._display(x) y = yield - if y is None: - pass - else: + if y is not None: self.queue.submit(id_, y) self.progressbar.value = self.queue.progress @@ -285,13 +283,13 @@ def _compose(self): ] def _render_processing(self, message="Rendering..."): - message = ( - "