add origin to make GGIR compatible with R 4.2.0, see also #1181 and #…

…1245
wadpac · Jan 22, 2025 · 2d22dd9 · 2d22dd9
1 parent cf9b048
commit 2d22dd9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,4 @@
-# CHANGES IN GGIR VERSION 3.1-??
+# CHANGES IN GGIR VERSION 3.1-11
 
 - Part 2:
 
@@ -21,6 +21,10 @@
   - Added warning when there are two accelerometer recordings with the same ID.
 
   - Change extraction of imputation code from sleep diary, which is now assumed to correspond to preceding night. This is now also documented. #1251
+
+- Part 1, 5 and 6:
+
+  - Update code to be backward compatible with R 4.2.0
 
 # CHANGES IN GGIR VERSION 3.1-10
 

diff --git a/R/g.part6.R b/R/g.part6.R
@@ -169,7 +169,9 @@ g.part6 = function(datadir = c(), metadatadir = c(), f0 = c(), f1 = c(),
           mdat$window[invalid] = 9999
           mdat$invalid_sleepperiod[invalid] = 100
           mdat$invalid_wakinghours[invalid] = 100
-          mdat$time = mdat$timestamp = as.POSIXct(mdat$timenum, tz =  params_general[["desiredtz"]])
+          mdat$time = mdat$timestamp = as.POSIXct(mdat$timenum,
+                                                  tz =  params_general[["desiredtz"]],
+                                                  origin = "1970-01-01")
           return(mdat)
         }
         mdat = imputeTimeGaps(mdat, epochSize)
@@ -238,7 +240,8 @@ g.part6 = function(datadir = c(), metadatadir = c(), f0 = c(), f1 = c(),
       summary[fi] = unlist(strsplit(fnames.ms5raw[i], "_"))[1]
       s_names[fi] = "ID"
       fi = fi + 1
-      starttime = as.POSIXlt(ts$time[1], tz = params_general[["desiredtz"]])
+      starttime = as.POSIXlt(ts$time[1], tz = params_general[["desiredtz"]],
+                             origin = "1970-01-01")
       summary[fi] = format(starttime)
       s_names[fi] = "starttime"
       fi = fi + 1
@@ -291,7 +294,7 @@ g.part6 = function(datadir = c(), metadatadir = c(), f0 = c(), f1 = c(),
         threshold = as.numeric(unlist(strsplit( params_phyact[["part6_threshold_combi"]], "_"))[1])
 
         # extract nightsi again
-        tempp = unclass(as.POSIXlt(acc4cos$time, tz = params_general[["desiredtz"]]))
+        tempp = unclass(as.POSIXlt(acc4cos$time, tz = params_general[["desiredtz"]], origin = "1970-01-01"))
         sec = tempp$sec
         min = tempp$min
         hour = tempp$hour

diff --git a/tests/testthat/test_part6.R b/tests/testthat/test_part6.R
@@ -39,15 +39,15 @@ test_that("Part 6 with household co-analysis", {
              "day_IN_bts_10_30", "day_LIG_bts_10")
 
   mdat$timenum = mdat$timenum - (5 * 60) 
-  mdat$timestamp = as.POSIXct(mdat$timenum, tz =  params_general[["desiredtz"]])
+  mdat$timestamp = as.POSIXct(mdat$timenum, tz =  params_general[["desiredtz"]], origin = "1970-01-01")
   filename = "800-900-001_left wrist.bin"
   save(mdat, filename, Lnames, file = paste0(dn, "/800-900-001_left wrist.RData"))
   mdat$timenum = mdat$timenum + (7 * 60)
-  mdat$timestamp = as.POSIXct(mdat$timenum, tz =  params_general[["desiredtz"]])
+  mdat$timestamp = as.POSIXct(mdat$timenum, tz =  params_general[["desiredtz"]], origin = "1970-01-01")
   filename = "800-900-002_left wrist.bin"
   save(mdat, filename, Lnames, file = paste0(dn, "/800-900-002_left wrist.RData"))
   mdat$timenum = mdat$timenum + (14 * 60)
-  mdat$timestamp = as.POSIXct(mdat$timenum, tz =  params_general[["desiredtz"]])
+  mdat$timestamp = as.POSIXct(mdat$timenum, tz =  params_general[["desiredtz"]], origin = "1970-01-01")
   filename = "800-900-003_left wrist.bin"
   save(mdat, filename, Lnames, file = paste0(dn, "/800-900-003_left wrist.RData"))
   mdat_file3 = mdat