Merge pull request #1 from caijun/master

Use POSIXct

Author: isalgueiro

DESCRIPTION

@@ -16,3 +16,4 @@ Suggests: testthat
 License: GPL-3
 LazyData: true
 Packaged: 2014-12-08 07:54:07 UTC; owenvallis
+RoxygenNote: 6.0.1

NAMESPACE

@@ -1,4 +1,4 @@
-# Generated by roxygen2 (4.1.0): do not edit by hand
+# Generated by roxygen2: do not edit by hand
 
 export(AnomalyDetectionTs)
 export(AnomalyDetectionVec)

R/date_utils.R

@@ -1,40 +1,41 @@
 format_timestamp <- function(indf, index = 1) {
-  if (class(indf[[index]])[1] == "POSIXlt") {
+  if (class(indf[[index]])[1] == "POSIXct") {
     return(indf)
   }
   if (stringr::str_detect(indf[[index]][1], "^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2} \\+\\d{4}$")) {
-    indf[[index]] <- strptime(indf[[index]], format="%Y-%m-%d %H:%M:%S", tz="UTC")
+    indf[[index]] <- strptime(indf[[index]], format = "%Y-%m-%d %H:%M:%S", tz = "UTC")
   }
   else if (stringr::str_detect(indf[[index]][1], "^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}$")) {
-    indf[[index]] <- strptime(indf[[index]], format="%Y-%m-%d %H:%M:%S", tz="UTC")
+    indf[[index]] <- strptime(indf[[index]], format = "%Y-%m-%d %H:%M:%S", tz = "UTC")
   }
   else if (stringr::str_detect(indf[[index]][1], "^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}$")) {
-    indf[[index]] <- strptime(indf[[index]], format="%Y-%m-%d %H:%M", tz="UTC")
+    indf[[index]] <- strptime(indf[[index]], format = "%Y-%m-%d %H:%M", tz = "UTC")
   }
   else if (stringr::str_detect(indf[[index]][1], "^\\d{2}/\\d{2}/\\d{2}$")) {
-    indf[[index]] <- strptime(indf[[index]], format="%m/%d/%y", tz="UTC")
+    indf[[index]] <- strptime(indf[[index]], format = "%m/%d/%y", tz = "UTC")
   }
   else if (stringr::str_detect(indf[[index]][1], "^\\d{2}/\\d{2}/\\d{4}$")) {
-    indf[[index]] <- strptime(indf[[index]], format="%m/%d/%Y", tz="UTC")
+    indf[[index]] <- strptime(indf[[index]], format = "%m/%d/%Y", tz = "UTC")
   }
   else if (stringr::str_detect(indf[[index]][1], "^\\d{4}\\d{2}\\d{2}$")) {
-    indf[[index]] <- strptime(indf[[index]], format="%Y%m%d", tz="UTC")
+    indf[[index]] <- strptime(indf[[index]], format = "%Y%m%d", tz = "UTC")
   }
   else if (stringr::str_detect(indf[[index]][1], "^\\d{4}/\\d{2}/\\d{2}/\\d{2}$")) {
-    indf[[index]] <- strptime(indf[[index]], format="%Y/%m/%d/%H", tz="UTC")
+    indf[[index]] <- strptime(indf[[index]], format = "%Y/%m/%d/%H", tz = "UTC")
   }
   else if (stringr::str_detect(indf[[index]][1], "^\\d{10}$")) {
     # Handle Unix seconds in milliseconds
-    indf[[index]] <- as.POSIXlt(indf[[index]], origin="1970-01-01", tz="UTC")
+    indf[[index]] <- as.POSIXlt(indf[[index]], origin = "1970-01-01", tz = "UTC")
   }
 
+  indf[[index]] <- as.POSIXct(indf[[index]], tz = "UTC")
   return(indf)
 }
 
 get_gran = function(tsdf, index=1) {
   n = length(tsdf[[index]])
   # We calculate the granularity from the time difference between the last 2 entries (sorted)
-  gran = round(difftime(max(tsdf[[index]]), sort(tsdf[[index]], partial = n-1)[n-1], 
+  gran = round(difftime(max(tsdf[[index]]), sort(tsdf[[index]], partial = n - 1)[n - 1], 
                         units = "secs"))
 
   if (gran >= 86400) {