Skip to content

[FIX] owheatmap: Handle all N/A column for color annotation #4742

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

Merged
ajdapretnar merged 1 commit into from
May 7, 2020
Merged

[FIX] owheatmap: Handle all N/A column for color annotation #4742

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
4 changes: 3 additions & 1 deletion Orange/widgets/visualize/owheatmap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -990,12 +990,14 @@ def row_side_colors(self):
if var is None:
return None
column_data = column_data_from_table(self.input_data, var)
span = (np.nanmin(column_data), np.nanmax(column_data))
merges = self._merge_row_indices()
if merges is not None:
column_data = aggregate(var, column_data, merges)
data, colormap = self._colorize(var, column_data)
if var.is_continuous:
span = (np.nanmin(column_data), np.nanmax(column_data))
if np.any(np.isnan(span)):
span = 0., 1.
colormap.span = span
return data, colormap, var

Expand Down
22 changes: 21 additions & 1 deletion Orange/widgets/visualize/tests/test_owheatmap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,13 +277,33 @@ def test_migrate_settings_v3(self):

def test_row_color_annotations(self):
widget = self.widget
data = Table("brown-selected")[::5]
data = self.brown_selected[::5]
self.send_signal(widget.Inputs.data, data, widget=widget)
widget.set_annotation_color_var(data.domain["function"])
self.assertTrue(widget.scene.widget.right_side_colors[0].isVisible())
widget.set_annotation_color_var(None)
self.assertFalse(widget.scene.widget.right_side_colors[0].isVisible())

def test_row_color_annotations_with_na(self):
widget = self.widget
data = self.brown_selected[::5]
data = data.transform(
Domain(data.domain.attributes[:10], data.domain.class_vars,
data.domain.metas + (data.domain["diau g"], )))
data.Y[:3] = np.nan
data.metas[:3, -1] = np.nan
self.send_signal(widget.Inputs.data, data, widget=widget)
widget.set_annotation_color_var(data.domain["function"])
self.assertTrue(widget.scene.widget.right_side_colors[0].isVisible())
widget.set_annotation_color_var(data.domain["diau g"])
data.Y[:] = np.nan
data.metas[:, -1] = np.nan
self.send_signal(widget.Inputs.data, data, widget=widget)
widget.set_annotation_color_var(data.domain["function"])
widget.set_annotation_color_var(data.domain["diau g"])
widget.set_annotation_color_var(None)
self.assertFalse(widget.scene.widget.right_side_colors[0].isVisible())

def test_summary(self):
"""Check if status bar is updated when data is received"""
info = self.widget.info
Expand Down
5 changes: 4 additions & 1 deletion Orange/widgets/visualize/utils/heatmap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,10 @@ def adjust_levels(self, low: float, high: float) -> Tuple[float, float]:
Adjust the data low, high levels by applying the thresholding and
centering.
"""
assert low <= high
if np.any(np.isnan([low, high])):
return np.nan, np.nan
elif low > high:
raise ValueError(f"low > high ({low} > {high})")
threshold_low, threshold_high = self.thresholds
lt = low + (high - low) * threshold_low
ht = low + (high - low) * threshold_high
Expand Down