Dev small checks in merging #171
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
BSchilperoort
approved these changes
Jul 17, 2023
| Skips measurements for which there is no partner measurement. Little | ||
| protection against swapping fw and bw is implemented. | ||
|
|
||
| If all measurements are recorded: fw_t0, bw_t0, fw_t1, bw_t1, fw_t2, bw_t2, .. |
There was a problem hiding this comment.
Could you add a test for this?
You can then also add an xfail for the uncaught situation :)
Pytest's parameterize might come in useful for this to keep the test short.
There was a problem hiding this comment.
Great idea! Just implemented it.
and added verbose kwarg to merge_double_ended
| ([1, 2], [], [1, 2]), | ||
| ([], [1, 2], [1, 2]), | ||
| ([1], [2], [1, 2]), | ||
| pytest.param([2], [1], [1, 2], marks=pytest.mark.xfail) |
|
Hi! You didn't update the changelog ;) |
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 number of measurements of the forward and backward channels might get out of sync if the device shuts down before the measurement of the last channel is complete. A function is added skips all measurements that are not accompanied with a partner channel.
If all measurements are recorded: fw_t0, bw_t0, fw_t1, bw_t1, fw_t2, bw_t2, .. > all are passed
If some are missing the accompanying measurement is skipped:
Not perfect and the following situation is not caught:
Mixing forward and backward channels can be problematic when there is a pause after measuring all channels. This routine checks that the lowest channel number is measured first (aka the forward channel), but it doesn't catch the last case as it doens't know that fw_t1 and bw_t2 belong to different cycles.