Skip to content

Commit

Permalink
Merge pull request #32 from TanguyBarthelemy/develop
Browse files Browse the repository at this point in the history
Change T in TRUE and F in FALSE
  • Loading branch information
annasmyk authored Mar 18, 2024
2 parents 2da4b26 + f8641e7 commit e905983
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
1 change: 0 additions & 1 deletion R/saitem.R
Original file line number Diff line number Diff line change
Expand Up @@ -106,4 +106,3 @@ NULL
val<-.jcall("jdplus/sa/base/workspace/Utility", "S", "getSingleTsMetaData", jsa, as.character(key))
return (val)
}

2 changes: 1 addition & 1 deletion R/saprocessing.R
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
6 changes: 3 additions & 3 deletions R/workspace.R
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
Expand Down Expand Up @@ -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))})
Expand Down
7 changes: 3 additions & 4 deletions R/zzz.R
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

14 changes: 8 additions & 6 deletions RJDemetra3.Rproj
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion man/read_workspace.Rd

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

0 comments on commit e905983

Please sign in to comment.