mnt: fixed and simplified some logic in the read_multiple function #2
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
zerothi
commented
Mar 7, 2023
|
|
||
| Returns | ||
| ------- | ||
| single entry or list from multiple reads | ||
| """ | ||
| def decorator(func): | ||
| # ensure we can access the callables | ||
| nonlocal skip_call, pre_call, post_call, postprocess |
There was a problem hiding this comment.
the nonlocal ensures that the variables are kept in scope
It should now be able to handle more cases and more easily transfer data to a required data-structure. Added an xyz skip function which is much faster than the read_geometry call. Changed default all=True for the ANI file. Changed the suffix for ANI files to be capitalized. Added a postprocess function for post-processing the data returned by the read_multiple function. This would enable one to merge stuff etc. Signed-off-by: Nick Papior <[email protected]>
zerothi
force-pushed
the
aniSileSiesta-changes-1
branch
from
35b2374
to
e577063
Compare
zerothi
commented
Mar 7, 2023
| # they should be equivalent but skip can be used to | ||
| # skip some processing of the read data. | ||
| if skip_call is None: | ||
| skip_call = wrap_func |
There was a problem hiding this comment.
I came to think that a skip_call should not do any of the pre_call and post_call since then it can be used in larger chunks of files. Say complicated files that doesn't really fit regular data files.
It may be weird for users supplying a skip call to be wrapped with the pre and post if they are not needed. It is simpler to manually put them in if needed.
zerothi
commented
Mar 7, 2023
| r = skip_call(self, *args, **kwargs) | ||
| post_call() | ||
| return r | ||
| def multiple(*args, start=start, stop=stop, step=step, all=all, **kwargs): |
There was a problem hiding this comment.
My fault was that * is not required when you have *args. All arguments between *args and **kwargs are keyword only arguments! So nothing needs to be changed.
pfebrer
reviewed
Mar 8, 2023
|
Looks good. Thanks! |
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.
It should now be able to handle more cases and more easily transfer data to a required data-structure.
Added an xyz skip function which is much faster than the read_geometry call.
Changed default all=True for the ANI file.
Changed the suffix for ANI files to be capitalized.
Added a postprocess function for post-processing the data returned by the read_multiple function. This would enable one to merge stuff etc.