From 9ec19be6ba137724dfc6f67944a118f94c947372 Mon Sep 17 00:00:00 2001
From: Rob J Hyndman <robjhyndman@gmail.com>
Date: Sat, 9 May 2015 20:57:02 +1000
Subject: [PATCH] Made allow.multiplicative.trend=FALSE the default in ets()

---
 ChangeLog   | 2 +-
 DESCRIPTION | 2 +-
 R/ets.R     | 2 +-
 man/ets.Rd  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5b508be7..2b39bcbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Version 6.0 (?? 2015)
+Version 6.0 (9 May 2015)
   * Modified dm.test to give error when variance is zero
   * Corrected help file for splinef().
   * Fixed typo in accuracy help file regarding RMSE
diff --git a/DESCRIPTION b/DESCRIPTION
index c3989291..d9752965 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: forecast
 Version: 6.0
-Date: 2015-??
+Date: 2015-05-09
 Title: Forecasting Functions for Time Series and Linear Models
 Description: Methods and tools for displaying and analysing
              univariate time series forecasts including exponential smoothing
diff --git a/R/ets.R b/R/ets.R
index 6cc75302..5e563439 100644
--- a/R/ets.R
+++ b/R/ets.R
@@ -2,7 +2,7 @@ ets <- function(y, model="ZZZ", damped=NULL,
     alpha=NULL, beta=NULL, gamma=NULL, phi=NULL, additive.only=FALSE, lambda=NULL,
     lower=c(rep(0.0001,3), 0.8), upper=c(rep(0.9999,3),0.98),
     opt.crit=c("lik","amse","mse","sigma","mae"), nmse=3, bounds=c("both","usual","admissible"),
-    ic=c("aicc","aic","bic"),restrict=TRUE, allow.multiplicative.trend=TRUE, 
+    ic=c("aicc","aic","bic"),restrict=TRUE, allow.multiplicative.trend=FALSE, 
     use.initial.values=FALSE, ...)
 {
   #dataname <- substitute(y)
diff --git a/man/ets.Rd b/man/ets.Rd
index 8de70d53..c44c5df1 100644
--- a/man/ets.Rd
+++ b/man/ets.Rd
@@ -8,7 +8,7 @@ ets(y, model="ZZZ", damped=NULL, alpha=NULL, beta=NULL, gamma=NULL,
     lower=c(rep(0.0001,3), 0.8), upper=c(rep(0.9999,3),0.98), 
     opt.crit=c("lik","amse","mse","sigma","mae"), nmse=3, 
     bounds=c("both","usual","admissible"), ic=c("aicc","aic","bic"),
-    restrict=TRUE, allow.multiplicative.trend=TRUE, use.initial.values=FALSE, ...)
+    restrict=TRUE, allow.multiplicative.trend=FALSE, use.initial.values=FALSE, ...)
 }
 
 \arguments{