浏览代码

R set_date robust to NAs

Ben Letham 7 年之前
父节点
当前提交
f54d3b50ae
共有 1 个文件被更改,包括 4 次插入3 次删除
  1. 4 3
      R/R/prophet.R

+ 4 - 3
R/R/prophet.R

@@ -274,7 +274,7 @@ set_date <- function(ds = NULL, tz = "GMT") {
     ds <- as.character(ds)
   }
 
-  if (min(nchar(ds)) < 12) {
+  if (min(nchar(ds), na.rm=TRUE) < 12) {
     ds <- as.POSIXct(ds, format = "%Y-%m-%d", tz = tz)
   } else {
     ds <- as.POSIXct(ds, format = "%Y-%m-%d %H:%M:%S", tz = tz)
@@ -321,8 +321,9 @@ setup_dataframe <- function(m, df, initialize_scales = FALSE) {
   }
   df$ds <- set_date(df$ds)
   if (anyNA(df$ds)) {
-    stop(paste('Unable to parse date format in column ds. Convert to date ',
-               'format. Either %Y-%m-%d or %Y-%m-%d %H:%M:%S'))
+    stop(paste('Unable to parse date format in column ds. Convert to date',
+               'format (%Y-%m-%d or %Y-%m-%d %H:%M:%S) and check that there',
+               'are no NAs.'))
   }
   for (name in names(m$extra_regressors)) {
     if (!(name %in% colnames(df))) {