Merge pull request #1199 from wadpac/issue1198_addfirstwake

Issue1198 addfirstwake
wadpac · Sep 30, 2024 · 7a402c7 · 7a402c7
2 parents da87efb + d5a7b8c
commit 7a402c7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,8 @@
 # CHANGES IN GGIR VERSION 3.1-?
 
+- Part 5: Fixed minor bug in g.part5.addfirstwake causing the first wake is not correctly added when
+no SIBs are detected from the beginning of the recording until the first detected night. #1198
+
 - Part 5: Add parameters require_complete_lastnight_part5 to control whether last window is included if last night is incomplete. #1196
 
 - General: GGIR version look-up in .onattach() no longer crashes when computer is offline, fixes #1203.

diff --git a/R/g.part5.addfirstwake.R b/R/g.part5.addfirstwake.R
@@ -73,7 +73,9 @@ g.part5.addfirstwake = function(ts, summarysleep, nightsi, sleeplog, ID,
     if (is.na(wake_night1_index)) wake_night1_index = 0
     if (wake_night1_index < firstwake & wake_night1_index > 1 &
         (wake_night1_index - 1) > nightsi[1]) {
-      newWakeIndex = max(which(ts$sibdetection[1:(wake_night1_index - 1)] == 1))
+      newWakeIndex = c()
+      firstSIBs = which(ts$sibdetection[1:(wake_night1_index - 1)] == 1)
+      if (length(firstSIBs) > 0) newWakeIndex = max(firstSIBs)
       if (length(newWakeIndex) == 0) {
         newWakeIndex = wake_night1_index - 1
       }
@@ -94,4 +96,4 @@ g.part5.addfirstwake = function(ts, summarysleep, nightsi, sleeplog, ID,
     }
   }
   return(ts)
-}
+}