Skip to content

[FIX] Venn Diagram is slow for big datasets #4400

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
janezd merged 9 commits into from
Feb 20, 2020
Merged

[FIX] Venn Diagram is slow for big datasets #4400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8784364
Rewrite venn over rows
AndrejaKovacic Feb 6, 2020
97a4856
Add output_duplicates function
AndrejaKovacic Feb 10, 2020
6262599
Add test_output_duplicates, fix ids copying
AndrejaKovacic Feb 11, 2020
be2bac3
Fix column selection
AndrejaKovacic Feb 11, 2020
52a70a4
Fix missing string attribute
AndrejaKovacic Feb 11, 2020
0c8c0d7
OWVennDiagram: Micro refactoring
janezd Feb 17, 2020
e8b2416
Fix padded column shape mismatch, remove unnecessary parameters
AndrejaKovacic Feb 18, 2020
9e1a7db
Fix output duplicates dimension mismatch
AndrejaKovacic Feb 19, 2020
eb00fd2
OWVennDiagram: Lint
janezd Feb 20, 2020
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
9 changes: 6 additions & 3 deletions Orange/widgets/tests/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,9 +488,10 @@ class WidgetOutputsTestMixin:
_compare_selected_annotated_domains.
"""

def init(self):
def init(self, same_table_attributes=True):
self.data = Table("iris")
self.same_input_output_domain = True
self.same_table_attributes = same_table_attributes

def test_outputs(self, timeout=DEFAULT_TIMEOUT):
self.send_signal(self.signal_name, self.signal_data)
Expand All @@ -516,12 +517,14 @@ def test_outputs(self, timeout=DEFAULT_TIMEOUT):
self.same_input_output_domain)
np.testing.assert_array_equal(selected.X[:, :n_attr],
self.data.X[selected_indices])
self.assertEqual(selected.attributes, self.data.attributes)
if self.same_table_attributes:
self.assertEqual(selected.attributes, self.data.attributes)

# check annotated data output
annotated = self.get_output(ANNOTATED_DATA_SIGNAL_NAME)
self.assertEqual(n_sel, np.sum([i[feature_name] for i in annotated]))
self.assertEqual(annotated.attributes, self.data.attributes)
if self.same_table_attributes:
self.assertEqual(annotated.attributes, self.data.attributes)

# compare selected and annotated data domains
self._compare_selected_annotated_domains(selected, annotated)
Expand Down
Loading