-
Notifications
You must be signed in to change notification settings - Fork 63
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Facilitate research on comparing self-reported nap/nonwear with acc-based daytime rest detection #900
Merged
+510
−90
Merged
Facilitate research on comparing self-reported nap/nonwear with acc-based daytime rest detection #900
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit
Hold shift + click to select a range
8069dba
progress on mapping overlap selfreported nonwear, nap and sibs #687
vincentvanhees 64c02fc
splitting nap classification from sibreport analyses, first draft of …
vincentvanhees e527e45
limit sibanalyses to waking hours only
vincentvanhees 39d23a2
#687 updating var names, addressing timestamp issue and including ext…
vincentvanhees 632c5df
Merge branch 'master' into issue687_nap_enhancement2
vincentvanhees 409670f
#687 sibreport now has duration for selfreported naps and nonwear and…
vincentvanhees 06aeeb7
#687 move code to separate function and add unit test
vincentvanhees d2fedee
merge master
vincentvanhees 8090dfc
Merge branch 'master' into issue687_nap_enhancement2
vincentvanhees 9b82e13
merge master branch
vincentvanhees 9f5a278
merge master
vincentvanhees 502f153
Merge branch 'master' into issue687_nap_enhancement2
vincentvanhees 0f83af1
Merge branch 'master' into issue687_nap_enhancement2
vincentvanhees 1e17a81
Merge branch 'master' into issue687_nap_enhancement2
vincentvanhees 59719fa
Merge branch 'master' into issue687_nap_enhancement2
vincentvanhees d6c924e
merge master
vincentvanhees 852bad1
Merge branch 'master' into issue687_nap_enhancement2
vincentvanhees d57721d
Merge branch 'master' into issue687_nap_enhancement2
vincentvanhees d4b12ca
Merge branch 'master' into issue687_nap_enhancement2
vincentvanhees 09563b7
merge master
vincentvanhees ac8f05b
Merge branch 'master' into issue687_nap_enhancement2
vincentvanhees 1730e5c
Merge branch 'master' into issue687_nap_enhancement2
vincentvanhees db73f8f
Merge branch 'master' into issue687_nap_enhancement2
vincentvanhees adeeab4
Merge branch 'master' into issue687_nap_enhancement2
vincentvanhees 37c165e
merge master
vincentvanhees d8b79c0
Merge branch 'master' into issue687_nap_enhancement2
vincentvanhees e220dc1
Merge branch 'master' into issue687_nap_enhancement2
vincentvanhees 65e5cf3
Merge branch 'master' into issue687_nap_enhancement2
vincentvanhees 6e4b828
Merge branch 'master' into issue687_nap_enhancement2_test_merge_master
vincentvanhees 59887b0
Merge branch 'master' into issue687_nap_test_merge_master
vincentvanhees b6e61da
Moving rest analyses to new g.part5_analyseSegment function #687
vincentvanhees 9158f57
update documentation for previous commit
vincentvanhees b235928
make indentation align with rest of repo
vincentvanhees 99501e7
Merge branch 'master' into issue687_nap_enhancement2
vincentvanhees 17e35e8
Merge branch 'master' into issue687_nap_enhancement2
vincentvanhees 129c5bc
making sure rest analysis is not run when no sibreport object is avai…
vincentvanhees 4ddaebe
Improving documentation for #687 and updating changelog
vincentvanhees 6bfcc41
making sure code can run when nap_model is not specified
vincentvanhees fef0bd0
reusing argument possible_nap_duration to specify minimum sib duratio…
vincentvanhees 848ebd5
Adding filter options for sibreport anlaysis #687
vincentvanhees ebbe8fa
Update NEWS.md
vincentvanhees cf90d60
fix typo in documentation
vincentvanhees c80331e
transform time in g.part5.analyseRest if needed
jhmigueles ee01f80
fix issue introduced in previous commit, make sure time is character …
jhmigueles 708cfff
improve code comments
vincentvanhees 00561e7
update to master
jhmigueles c21adc4
add check that input is character and condense code
vincentvanhees 3c36304
Merge branch 'issue687_nap_enhancement2' of https://github.com/wadpac…
vincentvanhees File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
improve code comments
commit 708cfff66661fba53ab18bdb1e0fc06634e0f5ac
There are no files selected for viewing
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was not getting the expected output when testing this, and it is because time here is introduced as ISO6801, but
sibreport$start
andsibreport$end
are stored as POSIX objects, so the function was not able to find anysrep_tmp
.I fixed this locally by introducing these lines at the begining of this function:
@vincentvanhees Should I commit this change or do you want to investigate why do you get the expected output and I don't?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, please. I have been working so far with the csv variant of ms5.outraw. Maybe if you use the RData variant time is also stored different. It is good to facilitate both.