Re-implement the 1/3 hex asciimap reader #49
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
The old one was not interpreting the leading hyphens properly. The new ones is a more reliable inversion of the writing process, and handles spacing between elements better.
ntouran
approved these changes
Apr 1, 2020
armi/utils/asciimaps.py
Outdated
| @@ -69,6 +70,8 @@ def readMap(self, text): | |||
| for col, char in enumerate(line.split()): | |||
| i, j = self._getIndices(base, col) | |||
| self.lattice[i, j] = char | |||
|
|
|||
| self.lattice = {k: v for k, v in self.lattice.items() if v != "-"} | |||
There was a problem hiding this comment.
we should probably constantize this with
PLACEHOLDER = "-" and then refer to PLACEHOLDER here.
| grid = {} | ||
| # The length of the largest string contents. Useful for spacing everything out | ||
| # nicely | ||
| maxSize = len(str(next(iter(self.lattice.values())))) |
There was a problem hiding this comment.
groan is that really what we have to do to get the length of the first value!? Python 3 whyyyy
There was a problem hiding this comment.
Yeah, I had a private little hissy of my own when I found out that the various dict view classes arent themselves iterators. It feels like the iter() call should be unnecessary.
armi/utils/asciimaps.py
Outdated
| # of our otherwise infinite loop | ||
| break | ||
| if contents is None: | ||
| contents = '-' |
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.
The old one was not interpreting the leading hyphens properly. The new
ones is a more reliable inversion of the writing process, and handles
spacing between elements better.