Version bump; test fixes; R build

This commit is contained in:
Ben Letham 2018-12-03 22:21:37 -08:00
parent 635ae5a1a6
commit c9f1ccaa63
12 changed files with 17 additions and 15 deletions

View file

@ -1,6 +1,6 @@
Package: prophet Package: prophet
Title: Automatic Forecasting Procedure Title: Automatic Forecasting Procedure
Version: 0.3.0.1 Version: 0.4
Date: 2018-06-13 Date: 2018-06-13
Authors@R: c( Authors@R: c(
person("Sean", "Taylor", email = "sjt@fb.com", role = c("cre", "aut")), person("Sean", "Taylor", email = "sjt@fb.com", role = c("cre", "aut")),

View file

@ -17,4 +17,5 @@ export(predictive_samples)
export(prophet) export(prophet)
export(prophet_plot_components) export(prophet_plot_components)
import(Rcpp) import(Rcpp)
import(rlang)
importFrom(dplyr,"%>%") importFrom(dplyr,"%>%")

View file

@ -154,7 +154,6 @@ prophet_copy <- function(m, cutoff = NULL) {
weekly.seasonality = FALSE, weekly.seasonality = FALSE,
daily.seasonality = FALSE, daily.seasonality = FALSE,
holidays = m$holidays, holidays = m$holidays,
append.holidays = m$append.holidays,
seasonality.mode = m$seasonality.mode, seasonality.mode = m$seasonality.mode,
seasonality.prior.scale = m$seasonality.prior.scale, seasonality.prior.scale = m$seasonality.prior.scale,
changepoint.prior.scale = m$changepoint.prior.scale, changepoint.prior.scale = m$changepoint.prior.scale,
@ -166,6 +165,7 @@ prophet_copy <- function(m, cutoff = NULL) {
) )
m2$extra_regressors <- m$extra_regressors m2$extra_regressors <- m$extra_regressors
m2$seasonalities <- m$seasonalities m2$seasonalities <- m$seasonalities
m2$country_holidays <- m$country_holidays
return(m2) return(m2)
} }

View file

@ -11,7 +11,7 @@
#' @param country.name Country name (character). #' @param country.name Country name (character).
#' #'
#' @return A vector of all possible holiday names (unique) of given country. #' @return A vector of all possible holiday names (unique) of given country.
#' @internal #' @keywords internal
get_holiday_names <- function(country.name){ get_holiday_names <- function(country.name){
holidays <- generated_holidays %>% holidays <- generated_holidays %>%
dplyr::filter(country == country.name) %>% dplyr::filter(country == country.name) %>%
@ -28,7 +28,7 @@ get_holiday_names <- function(country.name){
#' #'
#' @return Dataframe with 'ds' and 'holiday', which can directly feed #' @return Dataframe with 'ds' and 'holiday', which can directly feed
#' to 'holidays' params in Prophet #' to 'holidays' params in Prophet
#' @internal #' @keywords internal
make_holidays_df <- function(years, country.name){ make_holidays_df <- function(years, country.name){
country.holidays = generated_holidays %>% country.holidays = generated_holidays %>%
dplyr::filter(country == country.name) dplyr::filter(country == country.name)

View file

@ -80,6 +80,7 @@ globalVariables(c(
#' @export #' @export
#' @importFrom dplyr "%>%" #' @importFrom dplyr "%>%"
#' @import Rcpp #' @import Rcpp
#' @import rlang
prophet <- function(df = NULL, prophet <- function(df = NULL,
growth = 'linear', growth = 'linear',
changepoints = NULL, changepoints = NULL,
@ -1219,7 +1220,7 @@ fit.prophet <- function(m, df, ...) {
init = stan_init, init = stan_init,
iter = m$mcmc.samples iter = m$mcmc.samples
) )
args <- modifyList(args, list(...)) args <- utils::modifyList(args, list(...))
stan.fit <- do.call(rstan::sampling, args) stan.fit <- do.call(rstan::sampling, args)
m$params <- rstan::extract(stan.fit) m$params <- rstan::extract(stan.fit)
n.iteration <- length(m$params$k) n.iteration <- length(m$params$k)
@ -1231,7 +1232,7 @@ fit.prophet <- function(m, df, ...) {
iter = 1e4, iter = 1e4,
as_vector = FALSE as_vector = FALSE
) )
args <- modifyList(args, list(...)) args <- utils::modifyList(args, list(...))
stan.fit <- do.call(rstan::optimizing, args) stan.fit <- do.call(rstan::optimizing, args)
m$params <- stan.fit$par m$params <- stan.fit$par
n.iteration <- 1 n.iteration <- 1

View file

@ -15,3 +15,4 @@ A vector of all possible holiday names (unique) of given country.
\description{ \description{
Return all possible holiday names of given country Return all possible holiday names of given country
} }
\keyword{internal}

View file

@ -18,3 +18,4 @@ Dataframe with 'ds' and 'holiday', which can directly feed
\description{ \description{
Make dataframe of holidays for given years and countries Make dataframe of holidays for given years and countries
} }
\keyword{internal}

View file

@ -121,7 +121,6 @@ test_that("copy", {
weekly.seasonality = c(TRUE, FALSE), weekly.seasonality = c(TRUE, FALSE),
daily.seasonality = c(TRUE, FALSE), daily.seasonality = c(TRUE, FALSE),
holidays = c('null', 'insert_dataframe'), holidays = c('null', 'insert_dataframe'),
append.holidays = c(NULL, 'US'),
seasonality.mode = c('additive', 'multiplicative') seasonality.mode = c('additive', 'multiplicative')
) )
products <- expand.grid(inputs) products <- expand.grid(inputs)
@ -140,7 +139,6 @@ test_that("copy", {
weekly.seasonality = products$weekly.seasonality[i], weekly.seasonality = products$weekly.seasonality[i],
daily.seasonality = products$daily.seasonality[i], daily.seasonality = products$daily.seasonality[i],
holidays = holidays, holidays = holidays,
append.holidays = products$append.holidays[i],
seasonality.prior.scale = 1.1, seasonality.prior.scale = 1.1,
holidays.prior.scale = 1.1, holidays.prior.scale = 1.1,
changepoints.prior.scale = 0.1, changepoints.prior.scale = 0.1,
@ -149,13 +147,14 @@ test_that("copy", {
uncertainty.samples = 200, uncertainty.samples = 200,
fit = FALSE fit = FALSE
) )
m1$country_holidays <- 'US'
out <- prophet:::setup_dataframe(m1, df, initialize_scales = TRUE) out <- prophet:::setup_dataframe(m1, df, initialize_scales = TRUE)
m1 <- out$m m1 <- out$m
m1$history <- out$df m1$history <- out$df
m1 <- prophet:::set_auto_seasonalities(m1) m1 <- prophet:::set_auto_seasonalities(m1)
m2 <- prophet:::prophet_copy(m1) m2 <- prophet:::prophet_copy(m1)
# Values should be copied correctly # Values should be copied correctly
args <- c('growth', 'changepoints', 'n.changepoints', 'holidays', 'append.holidays', args <- c('growth', 'changepoints', 'n.changepoints', 'holidays', 'country_holidays',
'seasonality.prior.scale', 'holidays.prior.scale', 'seasonality.prior.scale', 'holidays.prior.scale',
'changepoints.prior.scale', 'mcmc.samples', 'interval.width', 'changepoints.prior.scale', 'mcmc.samples', 'interval.width',
'uncertainty.samples', 'seasonality.mode', 'changepoint.range') 'uncertainty.samples', 'seasonality.mode', 'changepoint.range')

View file

@ -7,4 +7,4 @@
from fbprophet.forecaster import Prophet from fbprophet.forecaster import Prophet
__version__ = '0.4.dev' __version__ = '0.4'

View file

@ -159,7 +159,6 @@ def prophet_copy(m, cutoff=None):
weekly_seasonality=False, weekly_seasonality=False,
daily_seasonality=False, daily_seasonality=False,
holidays=m.holidays, holidays=m.holidays,
append_holidays=m.append_holidays,
seasonality_mode=m.seasonality_mode, seasonality_mode=m.seasonality_mode,
seasonality_prior_scale=m.seasonality_prior_scale, seasonality_prior_scale=m.seasonality_prior_scale,
changepoint_prior_scale=m.changepoint_prior_scale, changepoint_prior_scale=m.changepoint_prior_scale,
@ -170,6 +169,7 @@ def prophet_copy(m, cutoff=None):
) )
m2.extra_regressors = deepcopy(m.extra_regressors) m2.extra_regressors = deepcopy(m.extra_regressors)
m2.seasonalities = deepcopy(m.seasonalities) m2.seasonalities = deepcopy(m.seasonalities)
m2.country_holidays = deepcopy(m.country_holidays)
return m2 return m2

View file

@ -141,7 +141,6 @@ class TestDiagnostics(TestCase):
# These values are created except for its default values # These values are created except for its default values
holiday = pd.DataFrame( holiday = pd.DataFrame(
{'ds': pd.to_datetime(['2016-12-25']), 'holiday': ['x']}) {'ds': pd.to_datetime(['2016-12-25']), 'holiday': ['x']})
append_holidays = 'US'
products = itertools.product( products = itertools.product(
['linear', 'logistic'], # growth ['linear', 'logistic'], # growth
[None, pd.to_datetime(['2016-12-25'])], # changepoints [None, pd.to_datetime(['2016-12-25'])], # changepoints
@ -151,7 +150,6 @@ class TestDiagnostics(TestCase):
[True, False], # weekly_seasonality [True, False], # weekly_seasonality
[True, False], # daily_seasonality [True, False], # daily_seasonality
[None, holiday], # holidays [None, holiday], # holidays
[None, append_holidays], # append_holidays
['additive', 'multiplicative'], # seasonality_mode ['additive', 'multiplicative'], # seasonality_mode
[1.1], # seasonality_prior_scale [1.1], # seasonality_prior_scale
[1.1], # holidays_prior_scale [1.1], # holidays_prior_scale
@ -163,6 +161,7 @@ class TestDiagnostics(TestCase):
# Values should be copied correctly # Values should be copied correctly
for product in products: for product in products:
m1 = Prophet(*product) m1 = Prophet(*product)
m1.country_holidays = 'US'
m1.history = m1.setup_dataframe( m1.history = m1.setup_dataframe(
df.copy(), initialize_scales=True) df.copy(), initialize_scales=True)
m1.set_auto_seasonalities() m1.set_auto_seasonalities()
@ -184,7 +183,7 @@ class TestDiagnostics(TestCase):
self.assertEqual(m1.holidays, m2.holidays) self.assertEqual(m1.holidays, m2.holidays)
else: else:
self.assertTrue((m1.holidays == m2.holidays).values.all()) self.assertTrue((m1.holidays == m2.holidays).values.all())
self.assertEqual(m1.append_holidays, m2.append_holidays) self.assertEqual(m1.country_holidays, m2.country_holidays)
self.assertEqual(m1.seasonality_mode, m2.seasonality_mode) self.assertEqual(m1.seasonality_mode, m2.seasonality_mode)
self.assertEqual(m1.seasonality_prior_scale, m2.seasonality_prior_scale) self.assertEqual(m1.seasonality_prior_scale, m2.seasonality_prior_scale)
self.assertEqual(m1.changepoint_prior_scale, m2.changepoint_prior_scale) self.assertEqual(m1.changepoint_prior_scale, m2.changepoint_prior_scale)

View file

@ -98,7 +98,7 @@ with open('requirements.txt', 'r') as f:
setup( setup(
name='fbprophet', name='fbprophet',
version='0.3.post2', version='0.4',
description='Automatic Forecasting Procedure', description='Automatic Forecasting Procedure',
url='https://facebook.github.io/prophet/', url='https://facebook.github.io/prophet/',
author='Sean J. Taylor <sjt@fb.com>, Ben Letham <bletham@fb.com>', author='Sean J. Taylor <sjt@fb.com>, Ben Letham <bletham@fb.com>',