From 1329239c8da39afa2972046dbd37b7d1bfeb5f61 Mon Sep 17 00:00:00 2001 From: Tanguy BARTHELEMY Date: Thu, 8 Feb 2024 14:03:31 +0100 Subject: [PATCH 1/2] lint T in TRUE and F in FALSE --- R/saitem.R | 1 - R/workspace.R | 6 +++--- R/zzz.R | 7 +++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/R/saitem.R b/R/saitem.R index c1b7f9a..a1d148f 100644 --- a/R/saitem.R +++ b/R/saitem.R @@ -106,4 +106,3 @@ NULL val<-.jcall("jdplus/sa/base/workspace/Utility", "S", "getSingleTsMetaData", jsa, as.character(key)) return (val) } - diff --git a/R/workspace.R b/R/workspace.R index a311ac9..d4cfa0a 100644 --- a/R/workspace.R +++ b/R/workspace.R @@ -79,8 +79,8 @@ NULL #' @export .jws_refresh<-function(jws, policy=c("FreeParameters", "Complete", "Outliers_StochasticComponent", "Outliers", "FixedParameters", "FixedAutoRegressiveParameters", "Fixed"), period=0, start=NULL, end=NULL, info=c("All", "Data", "None")){ - policy=match.arg(policy) - info=match.arg(info) + policy <- match.arg(policy) + info <- match.arg(info) jdom<-rjd3toolkit::.jdomain(period, start, end) return (.jcall(jws, "V", "refreshAll", policy, jdom, info)) } @@ -203,7 +203,7 @@ get_context<-function(jws){ #' jws<-.jws_load(file) #' # We don't compute the workspace #' rws<-read_workspace(jws, FALSE) -read_workspace<-function(jws, compute=T){ +read_workspace<-function(jws, compute=TRUE){ if (compute) .jws_compute(jws) n<-.jws_sap_count(jws) jsaps<-lapply(1:n, function(i){read_sap(.jws_sap(jws,i))}) diff --git a/R/zzz.R b/R/zzz.R index f18ed7b..c8117a5 100644 --- a/R/zzz.R +++ b/R/zzz.R @@ -3,11 +3,10 @@ NULL .onLoad <- function(libname, pkgname) { - if (! requireNamespace("rjd3tramoseats", quietly = T)) stop("Loading rjd3 libraries failed") - if (! requireNamespace("rjd3x13", quietly = T)) stop("Loading rjd3 libraries failed") - if (! requireNamespace("rjd3providers", quietly = T)) stop("Loading rjd3 libraries failed") + if (! requireNamespace("rjd3tramoseats", quietly = TRUE)) stop("Loading rjd3 libraries failed") + if (! requireNamespace("rjd3x13", quietly = TRUE)) stop("Loading rjd3 libraries failed") + if (! requireNamespace("rjd3providers", quietly = TRUE)) stop("Loading rjd3 libraries failed") result <- rJava::.jpackage(pkgname, lib.loc=libname) if (!result) stop("Loading java packages failed") } - From b7b0edb10a8eced184b3e8bfdb29d8fb8b5e4f40 Mon Sep 17 00:00:00 2001 From: Tanguy BARTHELEMY Date: Sun, 17 Mar 2024 13:05:41 +0100 Subject: [PATCH 2/2] update description and sole a bug --- DESCRIPTION | 2 +- R/saprocessing.R | 2 +- RJDemetra3.Rproj | 14 ++++++++------ man/read_workspace.Rd | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 75b110a..b09ecc4 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -35,7 +35,7 @@ BugReports: https://github.com/rjdemetra/rjdemetra3/issues Suggests: knitr, rmarkdown, -RoxygenNote: 7.2.3 +RoxygenNote: 7.3.1 Roxygen: list(markdown = TRUE) Encoding: UTF-8 Collate: diff --git a/R/saprocessing.R b/R/saprocessing.R index 7a1b016..706f371 100644 --- a/R/saprocessing.R +++ b/R/saprocessing.R @@ -265,7 +265,7 @@ transfer_series <- function(jsap_from, jsap_to, selected_series, if (length(index_to) > 1) { stop("Several series from second SA Processing have the same name : ", serie_name) } else if (length(index_to) == 0) { - add_sa_item(jsap = jsap_to, name = serie_name, x = .jsa_read(jsa1)) + add_sa_item(jsap = jsap_to, name = serie_name, x = jsa1) } else { replace_sa_item(jsap = jsap_to, jsa = jsa1, idx = index_to) } diff --git a/RJDemetra3.Rproj b/RJDemetra3.Rproj index 4eaf8aa..49a8d8d 100644 --- a/RJDemetra3.Rproj +++ b/RJDemetra3.Rproj @@ -1,12 +1,12 @@ Version: 1.0 -RestoreWorkspace: Default -SaveWorkspace: Default -AlwaysSaveHistory: Default +RestoreWorkspace: No +SaveWorkspace: No +AlwaysSaveHistory: No EnableCodeIndexing: Yes UseSpacesForTab: Yes -NumSpacesForTab: 2 +NumSpacesForTab: 4 Encoding: UTF-8 RnwWeave: knitr @@ -19,5 +19,7 @@ BuildType: Package PackageUseDevtools: Yes PackageInstallArgs: --no-multiarch --with-keep.source PackageBuildBinaryArgs: --no-multiarch -PackageCheckArgs: --no-multiarch -PackageRoxygenize: rd,collate,namespace +PackageCheckArgs: --no-multiarch --as-cran +PackageRoxygenize: rd,collate,namespace,vignette + +UseNativePipeOperator: Yes diff --git a/man/read_workspace.Rd b/man/read_workspace.Rd index a8abb88..e42341c 100644 --- a/man/read_workspace.Rd +++ b/man/read_workspace.Rd @@ -7,7 +7,7 @@ \usage{ read_sap(jsap) -read_workspace(jws, compute = T) +read_workspace(jws, compute = TRUE) } \arguments{ \item{jsap}{Java SAProcessing.}