Hotfix/1.11.10 #46
Merged
Hotfix/1.11.10 #46
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
simondsmart
approved these changes
Apr 9, 2024
| step("0/to/6/by/30m", "0/30m/1/1h30m/2/2h30m/3/3h30m/4/4h30m/5/5h30m/6"); | ||
| step("0-6/to/18-24/by/6", "0-6/6-12/12-18/18-24"); | ||
| step("0-24/to/48-72/by/24", "0-24/24-48/48-72"); | ||
| step("0/to/24/by/3/0-6/to/18-24/by/6", "0/3/6/9/12/15/18/21/24/0-6/6-12/12-18/18-24"); |
There was a problem hiding this comment.
Can we make sure there is a test here testing the ranges with the by syntax using e.g.
0-24/to/48-72/by/90m
| @@ -102,7 +102,8 @@ void StepRange::print(std::ostream& s) const | |||
| eckit::Time t{static_cast<long>(to_*3600.), true}; | |||
|
|
|||
| TimeUnit unit = std::min(maxUnit(f), maxUnit(t)); | |||
| s << canonical(f, unit) << '-' << canonical(t, unit); | |||
| // s << canonical(f, unit) << '-' << canonical(t, unit); | |||
| s << canonical(f) << '-' << canonical(t); | |||
There was a problem hiding this comment.
Why are we no longer using unit here?
There was a problem hiding this comment.
the initial request was to use the same unit for stepranges,
so 30m-1h ==> 30m-60m
with the to-by, we have horrible sequences:
0-6/to/3-9/by/30m ==> 0-6/30m-390m/1-7/90m-450m/2-8/150m-510m/3-9
with the proposed change we have:
0-6/to/3-9/by/30m ==> 0-6/30m-6h30m/1-7/1h30m-7h30m/2-8/2h30m-8h30m/3-9
|
You need to address why the tests aren't passing ... |
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.
added support for to-by for stepRanges
step=0-6/to/18-24/by/6 ==> 0-6/6-12/12-18/18-24