[FIX] Variable.make returns proxies #2667
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Attributes are used to store colors/origin, which might be different for different datasets, even if the variable is "the same".
astaric
force-pushed
the
proxy-origin
branch
2 times, most recently
from
2883f1a
to
d63b672
Compare
Codecov Report
@@ Coverage Diff @@
## master #2667 +/- ##
==========================================
+ Coverage 75.52% 75.66% +0.13%
==========================================
Files 332 333 +1
Lines 58040 58357 +317
==========================================
+ Hits 43834 44155 +321
+ Misses 14206 14202 -4 |
Since variable proxies were introduced in 94832f2, variables can be equal without being the same variable.
The old implementation allowed Variable instances which were equal to have different hash.
Fixes a bug when different Tables would share the origin attribute of the features, even though the datasets were loaded from separate folders.
janezd
reviewed
Oct 13, 2017
| @@ -441,6 +443,8 @@ def test_make_proxy_disc(self): | |||
| self.assertEqual(abc, abc1) | |||
| self.assertEqual(abc, abc2) | |||
| self.assertEqual(abc1, abc2) | |||
| self.assertEqual(hash(abc), hash(abc1)) | |||
| self.assertEqual(hash(abc1), hash(abc2)) | |||
There was a problem hiding this comment.
Maybe add a test for non-equal hashes? I can imagine a scenario in which we mess the code so that all variables have the same hash. :)
janezd
reviewed
Oct 13, 2017
|
|
||
| self.assertEqual(image.attributes["origin"], "a") | ||
| self.assertEqual(image1.attributes["origin"], "b") | ||
| self.assertEqual(image2.attributes["origin"], "c") |
There was a problem hiding this comment.
You could also add a simpler and more explicit test self.assertIsNot(image.attributes, image1.attributes), and same for the other pairs.
ales-erjavec
added a commit
to ales-erjavec/orange3
that referenced
this pull request
Sep 11, 2018
As already done in biolabgh-2667 for other variables.
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue
gh-1592
Description of changes
make returns proxies
Includes