R set_date robust to NAs

This commit is contained in:
Ben Letham 2018-02-01 17:21:55 -08:00
parent 967a17bb4e
commit f54d3b50ae

View file

@ -274,7 +274,7 @@ set_date <- function(ds = NULL, tz = "GMT") {
ds <- as.character(ds) 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) ds <- as.POSIXct(ds, format = "%Y-%m-%d", tz = tz)
} else { } else {
ds <- as.POSIXct(ds, format = "%Y-%m-%d %H:%M:%S", tz = tz) 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) df$ds <- set_date(df$ds)
if (anyNA(df$ds)) { if (anyNA(df$ds)) {
stop(paste('Unable to parse date format in column ds. Convert to date ', 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')) '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)) { for (name in names(m$extra_regressors)) {
if (!(name %in% colnames(df))) { if (!(name %in% colnames(df))) {