Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ENH] Mosaic: Selectable color variable #2133

Merged
merged 1 commit into from
May 5, 2017
Merged

[ENH] Mosaic: Selectable color variable #2133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 50 additions & 18 deletions Orange/widgets/visualize/owmosaic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# pylint: disable=too-many-lines
from collections import defaultdict
from functools import reduce
from itertools import product, chain
Expand All @@ -10,7 +11,7 @@
from AnyQt.QtGui import QColor, QPainter, QPen, QStandardItem
from AnyQt.QtWidgets import QGraphicsScene, QGraphicsLineItem

from Orange.data import Table, filter, Variable
from Orange.data import Table, filter, Variable, Domain
from Orange.data.sql.table import SqlTable, LARGE_TABLE, DEFAULT_SAMPLE_TIME
from Orange.preprocess import Discretize
from Orange.preprocess.discretize import EqualFreq
Expand All @@ -23,6 +24,7 @@
from Orange.widgets.utils import to_html, get_variable_values_sorted
from Orange.widgets.utils.annotated_data import (create_annotated_table,
ANNOTATED_DATA_SIGNAL_NAME)
from Orange.widgets.utils.itemmodels import DomainModel
from Orange.widgets.visualize.utils import (
CanvasText, CanvasRectangle, ViewWithPress, VizRankDialog)
from Orange.widgets.widget import OWWidget, Default, Msg
Expand Down Expand Up @@ -118,7 +120,7 @@ def check_preconditions(self):
def compute_attr_order(self):
"""
Order attributes by Relief if there is a target variable. In case of
ties or without target, other by name.
ties or without target, order by name.

Add the class variable at the beginning when not coloring by class
distribution.
Expand Down Expand Up @@ -250,7 +252,7 @@ def on_selection_changed(self, selected, deselected):
def row_for_state(self, score, state):
"""The row consists of attributes sorted by name; class is at the
beginning, if present, so it's on the x-axis and not lost somewhere."""
class_var = self.master.data.domain.class_var
class_var = self.master.color_data.domain.class_var
attrs = tuple(
sorted((self.attr_ordering[x] for x in state),
key=lambda attr: (1 - (attr is class_var), attr.name)))
Expand All @@ -271,8 +273,6 @@ class OWMosaicDisplay(OWWidget):
(ANNOTATED_DATA_SIGNAL_NAME, Table)]

PEARSON, CLASS_DISTRIBUTION = 0, 1
interior_coloring_opts = ["Pearson residuals",
"Class distribution"]

settingsHandler = DomainContextHandler()
use_boxes = Setting(True)
Expand All @@ -281,6 +281,7 @@ class OWMosaicDisplay(OWWidget):
variable2 = ContextSetting("", exclude_metas=False)
variable3 = ContextSetting("", exclude_metas=False)
variable4 = ContextSetting("", exclude_metas=False)
variable_color = ContextSetting("", exclude_metas=False)
selection = ContextSetting(set())

BAR_WIDTH = 5
Expand Down Expand Up @@ -310,6 +311,8 @@ def __init__(self):
self.unprocessed_subset_data = None
self.subset_data = None

self.color_data = None

self.areas = []

self.canvas = QGraphicsScene()
Expand All @@ -331,13 +334,18 @@ def __init__(self):
self.vizrank, self.vizrank_button = MosaicVizRank.add_vizrank(
box, self, "Find Informative Mosaics", self.set_attr)

self.rb_colors = gui.radioButtonsInBox(
self.controlArea, self, "interior_coloring",
self.interior_coloring_opts, box="Interior Coloring",
callback=self.coloring_changed)
box2 = gui.vBox(self.controlArea, box="Interior Coloring")
dmod = DomainModel
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please tell more.

self.color_model = DomainModel(order=dmod.MIXED,
valid_types=dmod.PRIMITIVE,
placeholder="(Pearson residuals)")
self.cb_attr_color = gui.comboBox(
box2, self, value="variable_color",
orientation=Qt.Horizontal, contentsLength=12, labelWidth=50,
callback=self.set_color_data,
sendSelectedValue=True, model=self.color_model, valueType=str)
self.bar_button = gui.checkBox(
gui.indentedBox(self.rb_colors),
self, 'use_boxes', label='Compare with total',
box2, self, 'use_boxes', label='Compare with total',
callback=self._compare_with_total)
gui.rubber(self.controlArea)

Expand Down Expand Up @@ -380,7 +388,7 @@ def init_combos(self, data):

icons = gui.attributeIconDict
for attr in chain(data.domain, data.domain.metas):
if attr.is_discrete or attr.is_continuous:
if attr.is_primitive:
for combo in self.attr_combos:
combo.addItem(icons[attr], attr.name)

Expand All @@ -390,6 +398,12 @@ def init_combos(self, data):
2 * (self.attr_combos[1].count() > 2))
self.variable3 = self.attr_combos[2].itemText(0)
self.variable4 = self.attr_combos[3].itemText(0)
if self.data.domain.class_var:
self.variable_color = self.data.domain.class_var.name
idx = self.cb_attr_color.findText(self.variable_color)
else:
idx = 0
self.cb_attr_color.setCurrentIndex(idx)

def get_attr_list(self):
return [
Expand All @@ -416,8 +430,6 @@ def set_data(self, data):

self.closeContext()
self.data = data
self.init_combos(self.data)
self.discrete_data = self._get_discrete_data(self.data)

self.vizrank.stop_and_reset()
self.vizrank_button.setEnabled(
Expand All @@ -427,10 +439,8 @@ def set_data(self, data):
if self.data is None:
return

has_class = self.data.domain.class_var is not None
self.rb_colors.setDisabled(not has_class)
self.interior_coloring = \
self.CLASS_DISTRIBUTION if has_class else self.PEARSON
self.color_model.set_domain(self.data.domain)
self.init_combos(self.data)

self.openContext(self.data)

Expand All @@ -439,6 +449,8 @@ def set_data(self, data):
self.set_subset_data(self.unprocessed_subset_data)
self.unprocessed_subset_data = None

self.set_color_data()

def set_subset_data(self, data):
self.Warning.incompatible_subset.clear()
if self.data is None:
Expand Down Expand Up @@ -468,6 +480,26 @@ def reset_graph(self):
self.clear_selection()
self.update_graph()

def set_color_data(self):
if self.data is None or len(self.data) < 2 or len(self.data.domain.attributes) < 1:
return
if self.cb_attr_color.currentIndex() <= 0:
color_var = None
self.interior_coloring = self.PEARSON
self.bar_button.setEnabled(False)
else:
color_var = self.data.domain[self.cb_attr_color.currentText()]
self.interior_coloring = self.CLASS_DISTRIBUTION
self.bar_button.setEnabled(True)
attributes = [v for v in self.data.domain if v != color_var]
metas = [v for v in self.data.domain.metas if v != color_var]
domain = Domain(attributes, color_var, metas)
self.color_data = color_data = self.data.from_table(domain, self.data)
self.discrete_data = self._get_discrete_data(color_data)
self.vizrank.stop_and_reset()
self.vizrank_button.setEnabled(True)
self.coloring_changed()

def update_selection_rects(self):
for i, (_, _, area) in enumerate(self.areas):
if i in self.selection:
Expand Down
65 changes: 64 additions & 1 deletion Orange/widgets/visualize/tests/test_owmosaic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
StringVariable
from Orange.widgets.tests.base import WidgetTest, WidgetOutputsTestMixin
from Orange.widgets.visualize.owmosaic import OWMosaicDisplay

from Orange.widgets.tests.utils import simulate

class TestOWMosaicDisplay(WidgetTest, WidgetOutputsTestMixin):
@classmethod
Expand Down Expand Up @@ -227,3 +227,66 @@ def test_nan_column(self):
])
)
self.send_signal("Data", table)

def test_color_combo(self):
"""
Color combo enables to select class values. Checks if class values
are selected correctly.
GH-2133
GH-2036
"""
table = Table("iris")
self.send_signal("Data", table)
color_vars = ["(Pearson residuals)"] + [str(x) for x in table.domain]
for i in range(0, len(color_vars)):
idx = self.widget.cb_attr_color.findText(color_vars[i])
self.widget.cb_attr_color.setCurrentIndex(idx)
color = self.widget.cb_attr_color.currentText()
simulate.combobox_activate_index(self.widget.controls.variable_color, idx, 0)
discrete_data = self.widget.discrete_data

if color == "(Pearson residuals)":
self.assertIsNone(discrete_data.domain.class_var)
else:
self.assertEqual(color, str(discrete_data.domain.class_var))
output = self.get_output("Data")
self.assertEqual(output.domain.class_var, table.domain.class_var)

def test_vizrank(self):
"""
Tests if vizrank works accordingly to selected color value.
GH-2133
GH-2036
"""
def test(i):
self.send_signal("Data", table)
idx = self.widget.cb_attr_color.findText(color_vars[i])
self.widget.cb_attr_color.setCurrentIndex(idx)
color = self.widget.cb_attr_color.currentText()
simulate.combobox_activate_index(self.widget.controls.variable_color, idx, 0)
self.widget.vizrank.button.click()
time.sleep(.5)
model = self.widget.vizrank.rank_model
nrows = model.rowCount()
all_data = []
self.assertTrue((nrows == 7 and i != 0) or (nrows == 10 and i == 0))
for row in range(nrows):
data = []
for column in range(model.columnCount()):
index = model.index(row, column)
data.append(str(model.data(index)))
all_data = all_data + str(model.data(index)).replace(',', '').split()
for text in data:
self.assertNotIn(color, text)
self.assertEqual(len(set(all_data)), 3 if color != "(Pearson residuals)" else 4)
self.vizrank.stop_and_reset()
self.vizrank.toggle()

table = Table("titanic")
self.send_signal("Data", table)
self.widget.vizrank.max_attrs = 4
color_vars = ["(Pearson residuals)"] + [str(x) for x in table.domain]

for i in range(len(color_vars)):
self.widget = self.create_widget(OWMosaicDisplay)
test(i)