Skip to content

Commit

Permalink
Merge pull request #55 from palatej/develop
Browse files Browse the repository at this point in the history
New jars
  • Loading branch information
TanguyBarthelemy authored Jul 12, 2024
2 parents 9d93030 + c3cb57e commit b7b918d
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 13 deletions.
2 changes: 2 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
^\.Rproj\.user$
^\.git$
^\.github$
^\.lintr$
^LICENSE$
^README\.Rmd$
^README\.html$
^_pkgdown\.yml$
^docs$
^pkgdown$
2 changes: 1 addition & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ S3method(vcov,JD3_X13_OUTPUT)
export(.jd2r_spec_regarima)
export(.jd2r_spec_x11)
export(.jd2r_spec_x13)
export(.jx13)
export(.r2jd_spec_regarima)
export(.r2jd_spec_x11)
export(.r2jd_spec_x13)
export(.x13_rslts)
export(fast_regarima)
export(fast_x13)
export(jx13)
export(regarima)
export(regarima_fast)
export(regarima_outliers)
Expand Down
4 changes: 2 additions & 2 deletions R/x13.R
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ regarima_fast<-function(ts, spec= c("rg4", "rg0", "rg1", "rg2c", "rg3","rg5c"),
#' x13_fast(y, spec = sp)
#'
#' @return the `x13()` function returns a list with the results, the estimation specification and the result specification, while `x13_fast()` is a faster function that only returns the results.
#' The `jx13()` functions only returns results in a java object which will allow to customize outputs in other packages (use [rjd3toolkit::dictionary()] to
#' The `.jx13()` functions only returns results in a java object which will allow to customize outputs in other packages (use [rjd3toolkit::dictionary()] to
#' get the list of variables and [rjd3toolkit::result()] to get a specific variable).
#' In the estimation functions `x13()` and `x13_fast()` you can directly use a specification name (string).
#' If you want to customize a specification you have to create a specification object first.
Expand Down Expand Up @@ -181,7 +181,7 @@ x13_fast<-function(ts, spec=c("rsa4", "rsa0", "rsa1", "rsa2c", "rsa3", "rsa5c"),

#' @export
#' @rdname x13
jx13<-function(ts, spec=c("rsa4", "rsa0", "rsa1", "rsa2c", "rsa3", "rsa5c"), context=NULL, userdefined = NULL){
.jx13<-function(ts, spec=c("rsa4", "rsa0", "rsa1", "rsa2c", "rsa3", "rsa5c"), context=NULL, userdefined = NULL){
jts<-rjd3toolkit::.r2jd_tsdata(ts)
if (is.character(spec)){
spec = gsub("g", "sa", tolower(spec), fixed = TRUE)
Expand Down
2 changes: 1 addition & 1 deletion R/x13_spec.R
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ x11_spec<-function(){
adjust=rjd3toolkit::.enum_extract(modelling.LengthOfPeriod, pspec$transform$adjust),
aicdiff=pspec$transform$aicdiff,
outliers=pspec$transform$outliers_correction
)
)
automodel=list(
enabled=pspec$automodel$enabled,
ljungbox=pspec$automodel$ljungbox,
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
6 changes: 3 additions & 3 deletions man/x13.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 7 additions & 6 deletions man/x13_spec.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b7b918d

Please sign in to comment.