Skip to content

Commit

Permalink
prepare for CRAN
Browse files Browse the repository at this point in the history
  • Loading branch information
dashaub committed Jul 10, 2017
1 parent 48af35f commit 264a090
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 9 deletions.
6 changes: 3 additions & 3 deletions pkg/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ Description: Convenient functions for ensemble forecasts in R combining
and user-supplied models and forecasting functions is also supported to evaluate model accuracy.
Depends:
R (>= 3.1.1),
doParallel(>= 1.0.10),
doParallel (>= 1.0.10),
forecast (>= 8.1),
foreach(>= 1.4.3),
ggplot2 (>= 2.2.0),
foreach (>= 1.4.3),
ggplot2 (>= 2.2.0)
Imports:
reshape2 (>= 1.4.2),
zoo (>= 1.7)
Expand Down
7 changes: 6 additions & 1 deletion pkg/NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,13 @@ export(tsCombine)
export(tsPartition)
export(tsSubsetWithIndices)
import(doParallel)
import(foreach)
import(forecast)
import(ggplot2)
import(graphics)
import(stats)
import(zoo)
importFrom(ggplot2,aes)
importFrom(ggplot2,autoplot)
importFrom(ggplot2,geom_line)
importFrom(ggplot2,ggplot)
importFrom(ggplot2,scale_y_continuous)
1 change: 1 addition & 0 deletions pkg/R/cvts.R
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#' Perform cross validation on a time series.
#'
#' @import doParallel
#' @import foreach
#' @export
#' @param x the input time series.
#' @param FUN the model function used. Custom functions are allowed. See details and examples.
Expand Down
2 changes: 1 addition & 1 deletion pkg/R/hybridModel.R
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ print.hybridModel <- function(x, ...){
#' @export
#'
#' @author David Shaub
#' @import ggplot2
#' @importFrom ggplot2 ggplot aes autoplot geom_line scale_y_continuous
#'
plot.hybridModel <- function(x,
type = c("fit", "models"),
Expand Down
1 change: 1 addition & 0 deletions pkg/inst/NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Note that if the model that you are fitting also utilizes parallelization,
the number of cores used by each model multiplied by `num.cores` passed to
`cvts()` should not exceed the number of cores on your machine.
* The package versioning now follows [semantic versioning](http://semver.org/) more closely; however, the convention used will be `MAJOR.MINOR.RELEASE_NUM`.
* Instead of loading the entire `ggplot2` namespace, only specific functions are now imported.

# Version 0.4.1 [2017-06-18]
* The "forecast" package v8.1 now declares the S3 method `accuracy()`, so this is imported and no longer declared in "forecastHybrid".
Expand Down
6 changes: 2 additions & 4 deletions pkg/inst/doc/forecastHybrid.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,9 @@ beaverhm <- hybridModel(ts(trainSet$temp, f = 6),
n.args = list(xreg = trainXreg),
s.args = list(xreg = trainXreg, method = "arima"))
# Forecast future values
#forecast won't run in current version, next release allows
#forecast with stlm with xreg
#beaverfc <- forecast(beaverhm, xreg = testXreg)
beaverfc <- forecast(beaverhm, xreg = testXreg)
# View the accuracy of the model
#accuracy(beaverfc, testSet$temp)
accuracy(beaverfc, testSet$temp)
```

0 comments on commit 264a090

Please sign in to comment.