-
Notifications
You must be signed in to change notification settings - Fork 62
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
Add to part 6: DFA + fragmentation metrics + IV and IS (including major updates to IV and IS) #1028
Closed
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
Hi Vincent,
|
Co-Authored-By: Victor Barreto Mesquita <54644227+victormesquita40@users.noreply.github.com> Co-Authored-By: Ian Danilevicz <43249776+iandanilevicz@users.noreply.github.com>
vincentvanhees
force-pushed
the
issue839_add_DFA_to_part6
branch
from
February 2, 2024 13:45
3e4909d
to
7bc3bbe
Compare
…on, update documentation #955
5 tasks
Revise IV and IS calculation + integrate in both part2 and part6
vincentvanhees
changed the title
Add DFA functionality
Add DFA functionality + Major update to IV and IS
Feb 15, 2024
…S and putting scaling inside function
…9_add_DFA_to_part6
- moving LXMX from part 5 to part 6 - ignoring invalid windows in part 6 with new parameter includecrit.part6 to control this - remove fragmentation metrics for the spt window in part 5 as not meaningful, part5 is focused on daytime behaviours
22 tasks
modifications to PR #1028
- part 5 time series export now is flexible to work with any timewindow type (MM, OO, WW) - part 6 now correctly handles O-1 as being the last onset in the time series.
- includecrit.part6 changed to refer to minimum valid fraction to be consistent with similar parameters (it was max invalid fraction in the non-released code). - includenightcrit.part5 added to allow for controlling inclusion of windows in part 5 based on their amount of valid data during spt window. Default remains 0, which is to allow for spt windows without wear. - fix incorrect usage of part 5 inclusion criteria testing
…_part5 revise inclusion criteria part 5 and 6 #1028
… reflect what they do
closing this PR, because this is not going to be merged anytime soon |
Merged
22 tasks
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.
This PR adds the DFA functionality to GGIR part 6, and by that fixes #839 and fixes #955
By default GGIR will not perform DFA. Only when user provides argument
part6DFA=TRUE
, and include 6 in argumentmode
to theGGIR()
function then DFA will be run.I made a couple of minor changes/edits to the SSP/DFA/ABI code as provided by @iandanilevicz:
file
todata
, because the object represents the data and not a file.dfa_hat
is set to value NA while a few lines lower we are extracting its non-existing second column. By moving the last couple of lines in the else-conditions it seems to work now.class(file) == "data.frame"
is no longer allowed and I have replaced it byinherits(x = data, "data.frame")
Additionally, I have now expanded this PR with:
Checklist before merging:
inst/NEWS.Rd
with a user-readable summary. Please, include references to relevant issues or PR discussions.DESCRIPTION
file, if you think you made a significant contribution.