Update for version 2.4.1

add jars version 2.4.1
add testthat

Author: ChristianeHofer

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: rjd3highfreq
 Type: Package
 Title: Seasonal Adjustment of High Frequency Data with 'JDemetra+ 3.x'
-Version: 2.4.0.9500
+Version: 2.4.1
 Authors@R: c(
   person("Jean", "Palate", role = c("aut", "cre"),
                 email = "palatejean@gmail.com"),
@@ -16,17 +16,16 @@ Imports:
   rjd3toolkit (>= 3.7.1),
   rjd3xjars (>= 0.1.0),
   checkmate,
+  forecast,
   methods
-Remotes:
-    github::rjdverse/rjd3toolkit,
-    github::rjdverse/rjd3xjars
 SystemRequirements: Java (>= 17)
 License: file LICENSE
 URL: https://github.com/rjdverse/rjd3highfreq, https://rjdverse.github.io/rjd3highfreq/
 LazyData: TRUE
 Suggests:
     knitr,
-    rmarkdown
+    rmarkdown,
+    testthat
 RoxygenNote: 7.3.3
 BugReports: https://github.com/rjdverse/rjd3highfreq/issues
 Encoding: UTF-8

R/jd3_fractionalairline.R

@@ -358,7 +358,7 @@ fractionalAirlineDecomposition_ssf<-function(jdecomp) {
 jd2r_multiAirlineDecomposition <- function(jrslt, stde = FALSE, periods,
                                            log = FALSE, y_time = NULL) {
     ncmps <- rjd3toolkit::.proc_int(jrslt, "ucarima.size")
-    model <- .arima_extract(jrslt, "ucarima_model")
+    model <- .arima_extract(jrslt, "ucarima.model")
     cmps <- lapply(1:ncmps, function(cmp) {
         return(.ucm_extract(jrslt, cmp))
     })
@@ -424,7 +424,7 @@ jd2r_fractionalAirlineDecomposition <- function(jrslt,
                                                 log = FALSE,
                                                 y_time = NULL) {
     ncmps <- rjd3toolkit::.proc_int(jrslt, "ucarima.size")
-    model <- .arima_extract(jrslt, "ucarima_model")
+    model <- .arima_extract(jrslt, "ucarima.model")
     cmps <- lapply(
         X = 1:ncmps,
         FUN = function(cmp) .ucm_extract(jrslt, cmp)

R/zzz.R

@@ -2,13 +2,30 @@
 #' @import rjd3xjars
 
 .onLoad <- function(libname, pkgname) {
-    result <- .jpackage(pkgname, lib.loc = libname)
+    if (!requireNamespace("rjd3xjars", quietly = TRUE)) stop("Loading rjd3 libraries failed")
+
+    result <-  rJava::.jpackage(pkgname, lib.loc = libname)
     if (!result)
         stop("Loading java packages failed")
 
     #proto.dir <- system.file("proto", package = pkgname)
     #RProtoBuf::readProtoFiles2(protoPath = proto.dir)
 
+    ## Add all jar files in the "inst/java" directory to the classpath as
+    ## well. This is a kind of workaround for the source package and
+    ## bundle package version of the project where jar files are in
+    ## "inst/java" directory.
+    ##
+    ## The source and bundle package directory structure is used when two useful
+    ## functions: `devtools::load_all()` and `devtools::test()` are executed.
+    ## This workaround is not needed however when you run `devtools::check()` or
+    ## `R CMD check` from command line or when you use this package from a
+    ## third-party code when it is already installed in the system.
+    ## It is not needed in these cases because the binary package directory
+    ## structure is used.
+    rJava::.jaddClassPath(dir(system.file("java", package=pkgname, lib.loc=libname), full.names = TRUE))
+
+
     # reload extractors
     try({
         .jcall(

…dplus-highfreq-base-r-2.4.1-SNAPSHOT.jar …st/java/jdplus-highfreq-base-r-2.4.1.jarinst/java/jdplus-highfreq-base-r-2.4.1-SNAPSHOT.jar renamed to inst/java/jdplus-highfreq-base-r-2.4.1.jar inst/java/jdplus-highfreq-base-r-2.4.1-SNAPSHOT.jar renamed to inst/java/jdplus-highfreq-base-r-2.4.1.jar

@@ -11,7 +11,7 @@
 	<description>Usage: mvn -Pcopy-jars</description>
 
 	<properties>
-		<jdplus-incubator.version>2.4.1-SNAPSHOT</jdplus-incubator.version>
+		<jdplus-incubator.version>2.4.1</jdplus-incubator.version>
 	</properties>
 
 	<dependencies>

pom.xml

@@ -0,0 +1,5 @@
+library(testthat)
+library(rjd3highfreq)
+
+
+test_check("rjd3highfreq")

tests/testthat.R

@@ -0,0 +1,24 @@
+library(rjd3highfreq)
+a <- as.numeric(forecast::taylor)
+mod <- fractionalAirlineDecomposition(
+    y = a,
+    period = 7,
+    log = FALSE)
+
+test_that("Decompose Model", {
+
+    expect_equal("ArimaModel", mod$ucarima$model$name)
+})
+
+test_that("Decompose Model", {
+    #number of components
+
+    expect_equal(3, length(mod$ucarima$components))
+})
+
+reslt<-fractionalAirlineEstimation(a,c(7))
+
+test_that("Estimate Model", {
+    #ll
+    expect_equal(-31687.65, reslt$likelihood$ll, tolerance=0.01)
+})