Merge pull request #5152 from ales-erjavec/fixes/feature-statistics-time-format

[FIX] Feature Statistics: Error in time variable display

Author: ajdapretnar

Orange/widgets/data/owfeaturestatistics.py

@@ -149,6 +149,10 @@ def __init__(self, data=None, parent=None):
         self.n_attributes = self.n_instances = 0
 
         self.__attributes = self.__class_vars = self.__metas = None
+        # sets of variables for fast membership tests
+        self.__attributes_set = set()
+        self.__class_vars_set = set()
+        self.__metas_set = set()
         self.__distributions_cache = {}
 
         no_data = np.array([])
@@ -176,7 +180,9 @@ def set_data(self, data):
         # while we need a 2d array, which `_Y` provides
         self.__class_vars = self.__filter_attributes(domain.class_vars, self.table._Y)  # pylint: disable=protected-access
         self.__metas = self.__filter_attributes(domain.metas, self.table.metas)
-
+        self.__attributes_set = set(self.__metas[0])
+        self.__class_vars_set = set(self.__class_vars[0])
+        self.__metas_set = set(self.__metas[0])
         self.n_attributes = len(self.variables)
         self.n_instances = len(data)
 
@@ -191,6 +197,9 @@ def clear(self):
         self.__attributes = (np.array([]), np.array([]))
         self.__class_vars = (np.array([]), np.array([]))
         self.__metas = (np.array([]), np.array([]))
+        self.__attributes_set = set()
+        self.__class_vars_set = set()
+        self.__metas_set = set()
         self.__distributions_cache.clear()
         self.endResetModel()
 
@@ -471,11 +480,11 @@ def headerData(self, section, orientation, role):
     def data(self, index, role):
         # type: (QModelIndex, Qt.ItemDataRole) -> Any
         def background():
-            if attribute in self.domain.attributes:
+            if attribute in self.__attributes_set:
                 return self.COLOR_FOR_ROLE[self.ATTRIBUTE]
-            if attribute in self.domain.metas:
+            if attribute in self.__metas_set:
                 return self.COLOR_FOR_ROLE[self.META]
-            if attribute in self.domain.class_vars:
+            if attribute in self.__class_vars_set:
                 return self.COLOR_FOR_ROLE[self.CLASS_VAR]
             return None
 
@@ -505,7 +514,7 @@ def render_value(value):
                     return "∞"
 
                 str_val = attribute.str_val(value)
-                if attribute.is_continuous:
+                if attribute.is_continuous and not attribute.is_time:
                     str_val = format_zeros(str_val)
 
                 return str_val

Orange/widgets/data/tests/test_owfeaturestatistics.py

@@ -105,7 +105,7 @@ def _to_timestamps(years):
 # Time variable variations, windows timestamps need to be valid timestamps so
 # we'll just fill it in with arbitrary years
 time_full = VarDataPair(
-    TimeVariable('time_full'),
+    TimeVariable('time_full', have_date=True, have_time=True),
     np.array(_to_timestamps([2000, 2001, 2002, 2003, 2004]), dtype=float),
 )
 time_missing = VarDataPair(
@@ -117,7 +117,7 @@ def _to_timestamps(years):
     np.array(_to_timestamps([np.nan] * 5), dtype=float),
 )
 time_same = VarDataPair(
-    TimeVariable('time_same'),
+    TimeVariable('time_same', have_date=True, have_time=True),
     np.array(_to_timestamps([2004] * 5), dtype=float),
 )
 time = [