Skip to content

Commit

Permalink
Merge pull request #46 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 ef49894 + c37e0ab commit 5e9bc98
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 26 deletions.
24 changes: 4 additions & 20 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,27 +1,11 @@
^.*\.Rproj$
^\.Rproj\.user$

^\.git$
^\.github$

^\.lintr$
^LICENSE$
^README\.Rmd$
^README-.*\.png$

^Meta$
^README\.html$
^_pkgdown\.yml$
^docs$
^doc$
^pkgdown$
^_pkgdown\.yml$

^\.lintr$

^appveyor\.yml$
.travis.yml

cran-comments.md

^\.DS_Store$

^revdep$
^reconf\.sh$
^pom\.xml$
2 changes: 1 addition & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ S3method(vcov,JD3_TRAMOSEATS_OUTPUT)
S3method(vcov,JD3_TRAMO_OUTPUT)
export(.jd2r_spec_tramo)
export(.jd2r_spec_tramoseats)
export(.jtramoseats)
export(.r2jd_spec_tramo)
export(.r2jd_spec_tramoseats)
export(.tramoseats_rslts)
export(fast_tramo)
export(fast_tramoseats)
export(jtramoseats)
export(seats_decompose)
export(set_seats)
export(spec_tramo)
Expand Down
4 changes: 2 additions & 2 deletions R/tramoseats.R
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ tramo_fast<-function(ts, spec=c("trfull", "tr0", "tr1", "tr2", "tr3", "tr4", "tr
#' )
#' tramoseats_fast(y, spec = sp)
#' @return the `tramoseats()` function returns a list with the results, the estimation specification and the result specification, while `tramoseats_fast()` is a faster function that only returns the results.
#' The `jtramoseats()` functions only results the java object to custom outputs in other packages (use [rjd3toolkit::dictionary()] to
#' The `.jtramoseats()` functions only results the java object to custom outputs in other packages (use [rjd3toolkit::dictionary()] to
#' get the list of variables and [rjd3toolkit::result()] to get a specific variable).
#' @export
tramoseats<-function(ts, spec=c("rsafull", "rsa0", "rsa1", "rsa2", "rsa3", "rsa4", "rsa5"), context=NULL, userdefined = NULL){
Expand Down Expand Up @@ -177,7 +177,7 @@ tramoseats_fast<-function(ts, spec=c("rsafull", "rsa0", "rsa1", "rsa2", "rsa3",

#' @export
#' @rdname tramoseats
jtramoseats<-function(ts, spec=c("rsafull", "rsa0", "rsa1", "rsa2", "rsa3", "rsa4", "rsa5"), context=NULL, userdefined = NULL){
.jtramoseats<-function(ts, spec=c("rsafull", "rsa0", "rsa1", "rsa2", "rsa3", "rsa4", "rsa5"), context=NULL, userdefined = NULL){
jts<-rjd3toolkit::.r2jd_tsdata(ts)
if (is.character(spec)){
spec = gsub("tr", "rsa", tolower(spec), fixed = TRUE)
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/tramoseats.Rd

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

0 comments on commit 5e9bc98

Please sign in to comment.