DM-13790: Remove all use of the geom package #19
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
PaulPrice
approved these changes
May 10, 2018
For both PatchInfo and TractInfo replace getPolygon with getInnerSkyPolygon and getOuterSkyPolygon. Also add unit tests for the new methods Also add a new function makeSkyPolygonFromBBox, which is used to implement the new methods.
Two notes claimed that the vertex list in a TractInfo might someday become SphericalConvexPolygon but that will not happen. SphericalConvexPolygon is a class in the `geom` package, which we are no longer using.
|
I fixed the commit message |
PaulPrice
approved these changes
May 10, 2018
tests/test_dodecaSkyMap.py
Outdated
| cornerShiftedIn = skyCorner.offset(bearing=bearingToCenter, amount=shiftAngle) | ||
| cornerShiftedOut = skyCorner.offset(bearing=bearingToCenter, amount=-shiftAngle) | ||
| self.assertTrue(outerPolygon.contains(cornerShiftedIn.getVector())) | ||
| self.assertFalse(outerPolygon.contains(cornerShiftedOut.getVector())) |
There was a problem hiding this comment.
This is the same code as above for the inner polygon. Can you factor it into a function?
tests/test_dodecaSkyMap.py
Outdated
| cornerShiftedIn = skyCorner.offset(bearing=bearingToCenter, amount=shiftAngle) | ||
| cornerShiftedOut = skyCorner.offset(bearing=bearingToCenter, amount=-shiftAngle) | ||
| self.assertTrue(outerPolygon.contains(cornerShiftedIn.getVector())) | ||
| self.assertFalse(outerPolygon.contains(cornerShiftedOut.getVector())) |
|
Thank you for another excellent suggestion. I centralized the polygon test code, which significantly reduced code duplication. I also did the following:
|
PaulPrice
reviewed
May 11, 2018
PaulPrice
approved these changes
May 11, 2018
| """ | ||
| _SkyMapConfig = None | ||
| def setAttributes(self, *, |
There was a problem hiding this comment.
I don't recognise this syntax. Is it py3? What's it mean?
There was a problem hiding this comment.
Yes it is py3; all arguments following a bare asterisk can only be specified by name.
| self.numTracts = numTracts | ||
| self.neighborAngularSeparation = neighborAngularSeparation | ||
| self.numNeighbors = numNeighbors | ||
| np.random.seed(47) |
There was a problem hiding this comment.
How did you choose 47? (:
There was a problem hiding this comment.
Pomona College had a thing about 47
`BaseSkyMap.findTract` assumed that all found distances would be different, so a list of (distance, tractInfo) could be sorted. Fixed by sorting on `(distance, index, tractInfo)` in order to break any degeneracy in distance.
So that all skymap test cases run it.
Update SkyMapTestCase to support sky maps with small numbers of tracts (e.g. EquatSkyMap). As part of this, start using numpy to randomly select patches to test. Thus SkyMapTestCase.setUp now needs to be reliably run so it can set the random number seed. I was reluctant to force subclasses to call super(setUp) since forgetting to do so would be an invisible error (it would silently fail to set the random seed) unless I added some special test. Instead I overhauled the way subclasses of SkyMapTestCase set parameters needed by the base class. The result is a significant improvement in safety, since a spelling error will be caught immediately. I think the new code is also more readable.
|
I fixed the far-too-long lines in the commit message for "Fix sorting bug in BaseSkyMap.findTract". |
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.