diff --git a/DESCRIPTION b/DESCRIPTION index f9ad8cb..5bd38a6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: rjd3toolkit Type: Package Title: Toolkit Functions Around 'JDemetra+ 3.0' -Version: 3.1.1 +Version: 3.2.0 Authors@R: c( person("Jean", "Palate", role = c("aut", "cre"), email = "jean.palate@nbb.be"), diff --git a/NAMESPACE b/NAMESPACE index 2e8d6a4..ae00fd0 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -154,6 +154,7 @@ export(add_ramp) export(add_usrdefvar) export(aggregate) export(ao_variable) +export(arima_difference) export(arima_model) export(arima_properties) export(arima_sum) diff --git a/R/arima.R b/R/arima.R index 9c0f6a8..a96c26e 100644 --- a/R/arima.R +++ b/R/arima.R @@ -185,6 +185,30 @@ arima_lsum<-function(components){ return (.jd2r_arima(jsum)) } +#' Remove an arima model from an existing one +#' +#' @param left Left operand +#' @param right Right operand +#' @param simplify Simplify the results +#' +#' @return a `"JD3_ARIMA"` model. +#' @export +#' +#' @details +#' +#' @examples +#' mod1 = arima_model(delta = c(1,-2,1)) +#' mod2 = arima_model(variance=.01) +#' diff<- arima_difference(mod1, mod2) +#' +arima_difference<-function(left, right, simplify=TRUE){ + jleft<-.r2jd_arima(left) + jright<-.r2jd_arima(right) + jdiff<-.jcall(jleft, "Ljdplus/toolkit/base/core/arima/ArimaModel;", "minus", jright, as.logical(simplify)) + return (.jd2r_arima(jdiff)) +} + + #' ARIMA Properties #' #' @param model a `"JD3_ARIMA"` model (created with [arima_model()]). @@ -291,7 +315,7 @@ ucarima_canonical<-function(ucm, cmp=0, adjust=TRUE){ #' @examples ucarima_estimate<-function(x, ucm, stdev=TRUE){ jucm<-.r2jd_ucarima(ucm) - jcmps<-.jcall("jdplus/toolkit/base/r/arima/UcarimaModels", "Ljdplus/toolkit/base/core/math/matrices/Matrix;", "estimate", + jcmps<-.jcall("jdplus/toolkit/base/r/arima/UcarimaModels", "Ljdplus/toolkit/base/api/math/matrices/Matrix;", "estimate", as.numeric(x), jucm, as.logical(stdev)) return (.jd2r_matrix(jcmps)) } diff --git a/inst/java/jdplus-sa-base-api-3.1.0.jar b/inst/java/jdplus-sa-base-api-3.2.0.jar similarity index 77% rename from inst/java/jdplus-sa-base-api-3.1.0.jar rename to inst/java/jdplus-sa-base-api-3.2.0.jar index 1ce7536..877b752 100644 Binary files a/inst/java/jdplus-sa-base-api-3.1.0.jar and b/inst/java/jdplus-sa-base-api-3.2.0.jar differ diff --git a/inst/java/jdplus-sa-base-core-3.1.0.jar b/inst/java/jdplus-sa-base-core-3.2.0.jar similarity index 80% rename from inst/java/jdplus-sa-base-core-3.1.0.jar rename to inst/java/jdplus-sa-base-core-3.2.0.jar index 5000dff..b1d87cd 100644 Binary files a/inst/java/jdplus-sa-base-core-3.1.0.jar and b/inst/java/jdplus-sa-base-core-3.2.0.jar differ diff --git a/inst/java/jdplus-sa-base-protobuf-3.1.0.jar b/inst/java/jdplus-sa-base-protobuf-3.2.0.jar similarity index 92% rename from inst/java/jdplus-sa-base-protobuf-3.1.0.jar rename to inst/java/jdplus-sa-base-protobuf-3.2.0.jar index 709e80a..c8c786b 100644 Binary files a/inst/java/jdplus-sa-base-protobuf-3.1.0.jar and b/inst/java/jdplus-sa-base-protobuf-3.2.0.jar differ diff --git a/inst/java/jdplus-sa-base-r-3.1.0.jar b/inst/java/jdplus-sa-base-r-3.2.0.jar similarity index 85% rename from inst/java/jdplus-sa-base-r-3.1.0.jar rename to inst/java/jdplus-sa-base-r-3.2.0.jar index 3ae37ef..8a7780e 100644 Binary files a/inst/java/jdplus-sa-base-r-3.1.0.jar and b/inst/java/jdplus-sa-base-r-3.2.0.jar differ diff --git a/inst/java/jdplus-toolkit-base-api-3.1.0.jar b/inst/java/jdplus-toolkit-base-api-3.2.0.jar similarity index 64% rename from inst/java/jdplus-toolkit-base-api-3.1.0.jar rename to inst/java/jdplus-toolkit-base-api-3.2.0.jar index 4dbe205..bdd0acb 100644 Binary files a/inst/java/jdplus-toolkit-base-api-3.1.0.jar and b/inst/java/jdplus-toolkit-base-api-3.2.0.jar differ diff --git a/inst/java/jdplus-toolkit-base-core-3.1.0.jar b/inst/java/jdplus-toolkit-base-core-3.2.0.jar similarity index 81% rename from inst/java/jdplus-toolkit-base-core-3.1.0.jar rename to inst/java/jdplus-toolkit-base-core-3.2.0.jar index 228a20c..853d27b 100644 Binary files a/inst/java/jdplus-toolkit-base-core-3.1.0.jar and b/inst/java/jdplus-toolkit-base-core-3.2.0.jar differ diff --git a/inst/java/jdplus-toolkit-base-protobuf-3.1.0.jar b/inst/java/jdplus-toolkit-base-protobuf-3.1.0.jar deleted file mode 100644 index 5fd1af3..0000000 Binary files a/inst/java/jdplus-toolkit-base-protobuf-3.1.0.jar and /dev/null differ diff --git a/inst/java/jdplus-toolkit-base-protobuf-3.2.0.jar b/inst/java/jdplus-toolkit-base-protobuf-3.2.0.jar new file mode 100644 index 0000000..6ab00ba Binary files /dev/null and b/inst/java/jdplus-toolkit-base-protobuf-3.2.0.jar differ diff --git a/inst/java/jdplus-toolkit-base-r-3.1.0.jar b/inst/java/jdplus-toolkit-base-r-3.2.0.jar similarity index 90% rename from inst/java/jdplus-toolkit-base-r-3.1.0.jar rename to inst/java/jdplus-toolkit-base-r-3.2.0.jar index 1dec933..f2bb2d6 100644 Binary files a/inst/java/jdplus-toolkit-base-r-3.1.0.jar and b/inst/java/jdplus-toolkit-base-r-3.2.0.jar differ diff --git a/inst/java/protobuf-java-3.24.4.jar b/inst/java/protobuf-java-3.24.4.jar deleted file mode 100644 index 56edbb8..0000000 Binary files a/inst/java/protobuf-java-3.24.4.jar and /dev/null differ diff --git a/inst/java/protobuf-java-3.25.1.jar b/inst/java/protobuf-java-3.25.1.jar new file mode 100644 index 0000000..e7b795c Binary files /dev/null and b/inst/java/protobuf-java-3.25.1.jar differ diff --git a/man/arima_difference.Rd b/man/arima_difference.Rd new file mode 100644 index 0000000..2203d46 --- /dev/null +++ b/man/arima_difference.Rd @@ -0,0 +1,27 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/arima.R +\name{arima_difference} +\alias{arima_difference} +\title{Remove an arima model from an existing one} +\usage{ +arima_difference(left, right, simplify = TRUE) +} +\arguments{ +\item{left}{Left operand} + +\item{right}{Right operand} + +\item{simplify}{Simplify the results} +} +\value{ +a \code{"JD3_ARIMA"} model. +} +\description{ +Remove an arima model from an existing one +} +\examples{ +mod1 = arima_model(delta = c(1,-2,1)) +mod2 = arima_model(variance=.01) +diff<- arima_difference(mod1, mod2) + +}