Allow expr_matches to better handle presence of extra data #93
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
oqpy/base.py
Outdated
| @@ -328,7 +330,7 @@ def expr_matches(a: Any, b: Any) -> bool: | |||
| if a.keys() != b.keys(): | |||
| return False | |||
| return all(expr_matches(va, b[k]) for k, va in a.items()) | |||
| if hasattr(a, "__dict__"): | |||
| if hasattr(a, "__dict__") and type(a).__module__.startswith("oqpy"): | |||
There was a problem hiding this comment.
Does this mean that oqpy classes shouldn't be subclassed outside of these modules (vaguely what sealed means in some other languages)?
There was a problem hiding this comment.
Hmm, good point I hadn't considered that. Passing in a trivial subclass probably shouldn't break things.
Thinking about it more, we only need to avoid using a == b test when it's an instance of OQPyExpression since it's subtypes of that class which have __eq__ overridden, so I've changed this clause to look for that instead.
I've added a test for the case of using a trivial subclass.
There was a problem hiding this comment.
Also have added a method to allow subclasses to control how matching works if required
braised-babbage
approved these changes
Aug 28, 2024
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.
I am creating
oqpyvariables from some other representation, and I wanted to attach some extra data to the oqpy variables to indicate their provenance. When I did this, I got failures fromexpr_matchessince it's method of traversing the__dict__recursively is not applicable to my data, which has reference cycles.I've modified
expr_matchesso that it short circuits on object identity, and so that it only descends intoobj.__dict__for objects from the oqpy package, rather than any externally produced data.