new sleep disturbance event #1861
Open
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
pims
reviewed
Jan 24, 2017
| @@ -18,7 +18,8 @@ | |||
| GOT_OUT_OF_BED(13), | |||
| WOKE_UP(14), | |||
| ALARM_RANG(15), | |||
| UNKNOWN(16); | |||
| SLEEP_DISTURBANCE(16), | |||
| UNKNOWN(17); | |||
There was a problem hiding this comment.
don't change the enum values if you can avoid it.
| @@ -28,9 +28,11 @@ | |||
| public final static String ALARM_NOT_SO_SMART_MESSAGE = "Your Smart Alarm rang at **%s**."; | |||
| public final static String ALARM_SMART_MESSAGE = "Your Smart Alarm rang at **%s**.\nYou set it to wake you up by **%s**."; | |||
| public final static String NOISE_MESSAGE = "There was a noise disturbance."; | |||
| public final static String SLEEP_DISTURBANCE_MESSAGE = "Your sleep was interrupted."; | |||
There was a problem hiding this comment.
Has this been approved by product/copy/james?
There was a problem hiding this comment.
Checked it with copy/product. Consulting with Matt Walker following James' advices
| } | ||
|
|
||
| //Finds intances where the pill recorded 15seconds + of motion within a 4 minute window | ||
| public HashMap<Long, Long> getSleepDisturbances(final List<TrackerMotion> trackerMotions){ |
There was a problem hiding this comment.
Use Map<Long, Long> instead of the more specific HashMap
| long previousMotionTS = 0L; | ||
|
|
||
| List<TrackerMotion> trackerMotionWindowCurrent = new ArrayList<>(); | ||
| final HashMap<Long,Integer> sleepDisturbances = new HashMap<>(); |
|
|
||
| currentDisturbanceEndTS = currentTS; | ||
| int onDurationSum = trackerMotionCurrent.onDurationInSeconds.intValue(); | ||
| if (!trackerMotionWindowPrevious.isEmpty()) { |
There was a problem hiding this comment.
I believe that some of this would benefit from being refactored. It's a little too much of twisted logic to be easily readable.
benejoseph
reviewed
Feb 10, 2017
| @@ -161,7 +163,11 @@ public Integer categorizeSleepDepth(final Integer sleepDepth) { | |||
| return positiveMotions; | |||
| } | |||
|
|
|||
| public List<MotionEvent> generateMotionEvents(final List<TrackerMotion> trackerMotions) { | |||
| public List<MotionEvent> generateMotionEvents(final List<TrackerMotion> trackerMotions, final boolean hasSleepDisturbance) { | |||
| int minSleepDepth = 0; | |||
There was a problem hiding this comment.
put comments about why min sleep depth is added
benejoseph
reviewed
Feb 10, 2017
| @@ -476,6 +482,37 @@ public Integer getMaxSVM(final List<TrackerMotion> amplitudes){ | |||
| return result; | |||
| } | |||
|
|
|||
| public List<Event> cleanEventWindow(final List<Event> eventList){ | |||
There was a problem hiding this comment.
add comments for what this does and why it's here
benejoseph
reviewed
Feb 10, 2017
| @@ -1457,6 +1492,109 @@ public Insight generateInSleepSoundInsight(final int soundEventCount) { | |||
| return events; | |||
| } | |||
|
|
|||
| public List<Event> getSleepDisturbanceEvents(final OneDaysTrackerMotion oneDaysTrackerMotion, final Long sleepTime, final Long wakeTime, final TimeZoneOffsetMap timeZoneOffsetMap){ | |||
There was a problem hiding this comment.
describe algo briefly in comments
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.
New event to label possible wake events during sleep based on heuristic classifier.
https://hello.hackpad.com/Sleep-Disturbance-Event-igLaLwPeAqE