DM-12611: FrameDict(FrameSet const &) broken #34
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
astshim.h did not include FrameDict.h
FrameDict(AstFrameSet*) was needlessly testing that the result was a FrameSet; it calls the FrameSet(AstFrameSet *) constructor, which performs the same test.
In C++ FrameDict(FrameSet const &) resulted in an unusable FrameDict, as AST had already deallocated the AST pointer. The pybind11 wrapper for that constructor did not show the problem, making the bug difficult to test in Python. Add a function that shows the bug in Python and call it in test_frameDict.py
FrameDict(FrameSet const &) constructed an unusable FrameDict because AST had already deallocated the raw pointer. Fix the constructor. The test added in the previous commit now passes.
r-owen
force-pushed
the
tickets/DM-12611
branch
from
8178593
to
e01670d
Compare
kfindeisen
approved these changes
Nov 14, 2017
| explicit FrameDict(FrameSet const &frameSet) : FrameSet(std::move(*frameSet.copy())), _domainIndexDict() { | ||
| _domainIndexDict = _makeNewDict(*this); | ||
| } | ||
|
|
There was a problem hiding this comment.
Is the constructor from an AstFrameSet* still used for anything?
There was a problem hiding this comment.
Yes, it is used by Object::makeShim
| indata = np.array([[1.1, 2.1, 3.1], [1.2, 2.2, 3.2]]) | ||
| predictedOut = indata * self.zoom | ||
| assert_allclose(frameDict.applyForward(indata), predictedOut) | ||
| assert_allclose(frameDict.applyInverse(predictedOut), indata) | ||
|
|
||
| frameDict2 = makeFrameDict(frameSet) | ||
| self.assertEqual(frameDict2.getRefCount(), 1) |
There was a problem hiding this comment.
Out of curiosity, what was the failure? Was frameDict2.getRefCount() 0?
There was a problem hiding this comment.
Attempting to get the refcount fails.
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.
No description provided.