From d45703ce7e6df769f1a4416e6e0f09a7058d2764 Mon Sep 17 00:00:00 2001 From: Marko Toplak Date: Thu, 7 Oct 2021 16:11:31 +0200 Subject: [PATCH] Remove suggested shortcuts that reuse tables or parts of tables due to locking problems --- Orange/data/table.py | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/Orange/data/table.py b/Orange/data/table.py index 85b9d336c9b..1a6971b5ca7 100644 --- a/Orange/data/table.py +++ b/Orange/data/table.py @@ -1616,9 +1616,6 @@ def _filter_has_class(self, negate=False): retain = bn.anynan(self._Y, axis=1) if not negate: retain = np.logical_not(retain) - # TODO: Decide whether to keep this or not; - if np.all(retain): - return self return self.from_table_rows(self, retain) def _filter_same_value(self, column, value, negate=False): @@ -2288,25 +2285,6 @@ def _subarray(arr, rows, cols): return arr[_rxc_ix(rows, cols)] -# TODO: Pick that one or the one above -def _subarray2(arr, rows, cols): - rows = _optimize_indices(rows, arr.shape[0]) - if arr.ndim == 1: - sub_arr = arr[rows] - else: - cols = _optimize_indices(cols, arr.shape[1]) - sub_arr = arr[_rxc_ix(rows, cols)] - # Don't return a view when it is the same as the original - if isinstance(sub_arr, np.ndarray) \ - and type(sub_arr) is type(arr) \ - and sub_arr.base is arr \ - and sub_arr.shape == arr.shape \ - and sub_arr.strides == arr.strides: - return arr - else: - return sub_arr - - def _optimize_indices(indices, maxlen): """ Convert integer indices to slice if possible. It only converts increasing