Merge pull request #1421 from kernc/fixups

[FIX] OWTestLearners: Fix reporting results table

Author: lanzagar

Orange/canvas/report/report.py

@@ -3,7 +3,7 @@
 from collections import OrderedDict, Iterable
 from itertools import chain
 from PyQt4.QtCore import Qt, QAbstractItemModel, QByteArray, QBuffer, QIODevice, QLocale
-from PyQt4.QtGui import QGraphicsScene, QAbstractItemView, QColor
+from PyQt4.QtGui import QGraphicsScene, QTableView, QColor
 
 from Orange.util import try_
 from Orange.widgets.io import PngFormat
@@ -286,7 +286,7 @@ def report_list(data,
             ) for rowi, row in enumerate(data))
 
         self.report_name(name)
-        if isinstance(table, QAbstractItemView):
+        if isinstance(table, QTableView):
             body = report_abstract_model(table.model(), table)
         elif isinstance(table, QAbstractItemModel):
             body = report_abstract_model(table)

Orange/data/variable.py

@@ -852,6 +852,8 @@ class TimeVariable(ContinuousVariable):
 
         (1, 0, '%Y-%m-%d'),
 
+        (1, 1, '%Y-%m-%d %H:%M:%S.%f'),
+        (1, 1, '%Y-%m-%dT%H:%M:%S.%f'),
         (1, 1, '%Y-%m-%d %H:%M:%S.%f%z'),
         (1, 1, '%Y-%m-%dT%H:%M:%S.%f%z'),
 

Orange/statistics/util.py

@@ -23,12 +23,12 @@ def bincount(X, max_val=None, weights=None, minlength=None):
         if weights is not None:
             weights = weights[nonnan]
     else:
-        nans = 0 if X.ndim == 1 else np.zeros(X.shape[1])
+        nans = 0. if X.ndim == 1 else np.zeros(X.shape[1], dtype=float)
     if minlength is None and max_val is not None:
         minlength = max_val + 1
     return (np.bincount(X.astype(np.int32, copy=False),
                         weights=weights,
-                        minlength=minlength),
+                        minlength=minlength).astype(float),
             nans)
 
 

Orange/tests/test_variable.py

@@ -290,6 +290,8 @@ class TestTimeVariable(VariableTest):
         # in str, UTC timestamp, out str (in UTC)
         ('2015-10-12 14:13:11.01+0200', 1444651991.01, '2015-10-12 14:13:11.010000+0200'),
         ('2015-10-12T14:13:11.81+0200', 1444651991.81, '2015-10-12 14:13:11.810000+0200'),
+        ('2015-10-12 14:13:11.81', 1444659191.81, '2015-10-12 14:13:11.810000'),
+        ('2015-10-12T14:13:11.81', 1444659191.81, '2015-10-12 14:13:11.810000'),
         ('2015-10-12 14:13:11+0200', 1444651991, '2015-10-12 14:13:11+0200'),
         ('2015-10-12T14:13:11+0200', 1444651991, '2015-10-12 14:13:11+0200'),
         ('20151012T141311+0200', 1444651991, '2015-10-12 14:13:11+0200'),

Orange/widgets/classify/owclassificationtreegraph.py

@@ -279,7 +279,6 @@ def split_condition(self):
         :return: split condition to reach a particular node.
         """
         if self.i > 0:
-            attribute = self.domain.attributes[self.attribute()]
             parent_attr = self.domain.attributes[self.parent.attribute()]
             parent_attr_cv = parent_attr.compute_value
             is_left_child = self.tree.children_left[self.parent.i] == self.i
@@ -292,7 +291,7 @@ def split_condition(self):
             else:
                 thresh = self.tree.threshold[self.parent.i]
                 return "%s %s" % ([">", "≤"][is_left_child],
-                                  attribute.str_val(thresh))
+                                  parent_attr.str_val(thresh))
         else:
             return ""
 

Orange/widgets/evaluate/owtestlearners.py

@@ -8,7 +8,7 @@
 
 from PyQt4 import QtGui
 from PyQt4.QtGui import (
-    QTreeView, QStandardItemModel, QStandardItem, QHeaderView,
+    QStandardItemModel, QStandardItem, QHeaderView,
     QStyledItemDelegate
 )
 from PyQt4.QtCore import Qt, QSize
@@ -221,13 +221,10 @@ def __init__(self):
 
         gui.rubber(self.controlArea)
 
-        self.view = QTreeView(
-            rootIsDecorated=False,
-            uniformRowHeights=True,
+        self.view = gui.TableView(
             wordWrap=True,
-            editTriggers=QTreeView.NoEditTriggers
         )
-        header = self.view.header()
+        header = self.view.horizontalHeader()
         header.setResizeMode(QHeaderView.ResizeToContents)
         header.setDefaultAlignment(Qt.AlignCenter)
         header.setStretchLastSection(False)