fix issue with date assignation to sleep periods

Author: jhmigueles

DESCRIPTION

@@ -20,7 +20,7 @@ LazyData: true
 Suggests: 
     testthat (>= 3.0.0), randomForest, gsignal, rattle
 Config/testthat/edition: 3
-RoxygenNote: 7.3.1
+RoxygenNote: 7.3.2
 Depends: 
     R (>= 2.10)
 Imports: 

NEWS.md

@@ -1,6 +1,8 @@
 # actimetric 0.1.4
 
-* Time series: stores classes as factor in time series to ease interpretation #51
+* Time series: 
+    - stores classes as factor in time series to ease interpretation #51
+    - fixed minor bug related to assignation of date to sleep periods #60
 * Documentation: minor revision of documentation for functions check_classifier and getBout #41
 * Reading data: minor revision of ReadAndCalibrate when reading ActiGraph devices with the Idle Sleep Mode activated #58
 

R/aggregate_per_date.R

@@ -104,9 +104,15 @@ aggregate_per_date = function(tsDir, epoch, classifier, classes,
       return(list(starts = starts, ends = ends))
     }
     if ("nighttime.awake" %in% classes) {
+      noons = which(ts$time == "12:00:00")
       start_end_nighttime = find_start_end(ts, column = "activity",
                                            class = c("nighttime.awake", "nighttime.sleep"))
-      start_end_nighttime_dates = ts$date[start_end_nighttime$ends] # dates based on wakeup
+      start_end_nighttime_dates = NULL
+      for (ni in 1:length(start_end_nighttime$ends)) {
+        next_noon = which(noons > start_end_nighttime$ends[ni])[1]
+        start_end_nighttime_dates[ni] = ts$date[noons[next_noon]]
+      }
+      # start_end_nighttime_dates = ts$date[start_end_nighttime$ends] # dates based on wakeup
       rows2fill = which(availableDates %in% start_end_nighttime_dates)
       ds[rows2fill, ci] = as.character(ts$timestamp[start_end_nighttime$starts])
       ds[rows2fill, ci + 1] = as.character(ts$timestamp[start_end_nighttime$ends])

R/classifySleep.R

@@ -129,6 +129,9 @@ classifySleep = function(anglez, starttime, classifier, infoClassifier, ts, do.s
       ts$activity[which(ts$sleep_periods == 1)] = sleep_id
     }
   }
+  # recode nighttime as nighttime.awake and sleep as nighttime.sleep
+  classes = gsub("nighttime", "nighttime.awake", classes)
+  classes = gsub("sleep", "nighttime.sleep", classes)
   activity = factor(x = ts$activity, levels = 1:length(classes), labels = classes)
   return(activity)
 }