Merge pull request #6933 from ales-erjavec/fixes/owpredictions-error-…

…magic-2

[FIX] owpredicttions: Remove special magic value 2

Orange/widgets/evaluate/owpredictions.py

@@ -915,7 +915,6 @@ def _add_error_out_columns(self, slot, newmetas, newcolumns, index):
             name = f"{slot.predictor.name} (error)"
             newmetas.append(ContinuousVariable(name=name))
             err = self.predictionsview.model().errorColumn(index)
-            err[err == 2] = numpy.nan
             newcolumns.append(err)
 
     def send_report(self):
@@ -1383,8 +1382,7 @@ def errorColumn(self, column):
             nans = numpy.isnan(actuals)
             actuals[nans] = 0
             errors = 1 - numpy.choose(actuals.astype(int), self._probs[column].T)
-            errors[nans] = 2
-            errors[numpy.isnan(errors)] = 2
+            errors[nans] = numpy.nan
             return errors
         else:
             actual = self._actual

Orange/widgets/evaluate/tests/test_owpredictions.py

@@ -1,6 +1,7 @@
 """Tests for OWPredictions"""
 # pylint: disable=protected-access,too-many-lines,too-many-public-methods
 import os
+import random
 import unittest
 from functools import partial
 from tempfile import NamedTemporaryFile
@@ -1766,6 +1767,16 @@ def test_sorting_classification_error(self):
             [model.data(model.index(row, 3)) for row in range(5)],
             1 - np.array(sorted([80, 5, 20, 60, 50])) / 100)
 
+        # Numpy's sort puts nan's at the end, and the widget counts on it
+        # because we want to show them last. If this test fails, this
+        # (undocumented) numpy's behavior has changed, and the widget needs
+        # to be updated.
+        data = list(range(10)) + [np.nan] * 10
+        copy = data.copy()
+        for _ in range(10):
+            random.shuffle(data)
+            np.testing.assert_equal(np.sort(data), copy)
+
     def test_sorting_classification_different(self):
         model = PredictionsModel(self.values, self.probs, self.actual)