diff --git a/.Rbuildignore b/.Rbuildignore index cbad3e9..89416d3 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -1,9 +1,27 @@ ^.*\.Rproj$ ^\.Rproj\.user$ -^README.Rmd$ -^_pkgdown\.yml$ + +^\.git$ +^\.github$ + +^README\.Rmd$ +^README-.*\.png$ + +^Meta$ ^docs$ +^doc$ ^pkgdown$ -^\.github$ -^LICENSE$ -^.lintr$ +^_pkgdown\.yml$ + +^\.lintr$ + +^appveyor\.yml$ +.travis.yml + +cran-comments.md + +^\.DS_Store$ + +^revdep$ +^reconf\.sh$ +^rjd3toolkit-java-deps\.xml$ diff --git a/.gitignore b/.gitignore index f87d9b5..de7c8b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,55 @@ -.Rproj.user +# History files .Rhistory +.Rapp.history + +# Session Data files .RData +.RDataTmp + +# User-specific files .Ruserdata -TO_DO -docs +# Example code in package build process +*-Ex.R + +# Output files from R CMD build +/*.tar.gz + +# Output files from R CMD check +/*.Rcheck/ + +# RStudio files +.Rproj.user/ + +# produced vignettes +vignettes/*.html +vignettes/*.pdf +Meta/ +inst/doc/ +doc/ + +# OAuth2 token, see https://github.com/hadley/httr/releases/tag/v0.3 +.httr-oauth + +# knitr and R markdown default cache directories +*_cache/ +/cache/ + +# Temporary files created by R markdown +*.utf8.md +*.knit.md + +# R Environment Variables +.Renviron + +# pkgdown site +docs/ + +# translation temp files +po/*~ + +# RStudio Connect folder +rsconnect/ + +# Hidden file from mac-os +.DS_Store diff --git a/NEWS.md b/NEWS.md index e20f740..9574aa9 100644 --- a/NEWS.md +++ b/NEWS.md @@ -22,5 +22,5 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [2.0.0] - 2023-12-12 -[Unreleased]: https://github.com/rjdemetra/rjd3highfreq/compare/v2.0.0...HEAD -[2.0.0]: https://github.com/rjdemetra/rjd3highfreq/releases/tag/v2.0.0 +[Unreleased]: https://github.com/rjdverse/rjd3highfreq/compare/v2.0.0...HEAD +[2.0.0]: https://github.com/rjdverse/rjd3highfreq/releases/tag/v2.0.0 diff --git a/R/jd3_fractionalairline.R b/R/jd3_fractionalairline.R index 0c7755e..6d44bda 100644 --- a/R/jd3_fractionalairline.R +++ b/R/jd3_fractionalairline.R @@ -148,7 +148,7 @@ fractionalAirlineEstimation <- function(y, checkmate::assertNumeric(precision, len = 1, null.ok = FALSE) checkmate::assertLogical(mean, len = 1, null.ok = FALSE) - + if (is.null(outliers)) { joutliers <- .jnull("[Ljava/lang/String;") } else { @@ -243,8 +243,7 @@ fractionalAirlineEstimation <- function(y, .proc_variable_outlier_names<-function(var_out_names,nX) { o<-.jevalArray(var_out_names) nO<-length(o) - - if(nO>0){ + if (nO > 0) { regvar_outliers<-rep(NA,nX-nO) for(j in 1:nX-nO) { regvar_outliers[j]=paste("x-", j)} diff --git a/R/print.R b/R/print.R index e03c4f9..ac08a57 100644 --- a/R/print.R +++ b/R/print.R @@ -129,7 +129,7 @@ print.JDFractionalAirlineEstimation <- function(x, digits = max(3L, getOption("d cat("Number of calendar regressors:", nb_reg_cjo, ", Number of outliers :", nb_outliers) cat("\n\n") - if(nb_reg_cjo > 0) { + if (nb_reg_cjo > 0) { cat("TD regressors coefficients:") cat("\n") print(reg_cjo_coeff, row.names = FALSE) @@ -138,7 +138,7 @@ print.JDFractionalAirlineEstimation <- function(x, digits = max(3L, getOption("d cat("\n") } - if(nb_outliers > 0) { + if (nb_outliers > 0) { cat("Outliers coefficients:") cat("\n") print(outliers_coeff, row.names = FALSE) diff --git a/R/zzz.R b/R/zzz.R index 4f475b0..f9b1c27 100644 --- a/R/zzz.R +++ b/R/zzz.R @@ -2,7 +2,7 @@ #' @import rjd3sts .onLoad <- function(libname, pkgname) { - if (! requireNamespace("rjd3sts", quietly=TRUE)) stop("Loading rjd3 libraries failed") + if (!requireNamespace("rjd3sts", quietly = TRUE)) stop("Loading rjd3 libraries failed") result <- .jpackage(pkgname, lib.loc=libname) if (!result) stop("Loading java packages failed") diff --git a/README.Rmd b/README.Rmd index 2e73333..f24784c 100644 --- a/README.Rmd +++ b/README.Rmd @@ -188,4 +188,4 @@ pull requests should include **updated tests** and **updated documentation**. If ## Licensing -The code of this project is licensed under the [European Union Public Licence (EUPL)](https://joinup.ec.europa.eu/page/eupl-text-11-12). +The code of this project is licensed under the [European Union Public Licence (EUPL)](https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12). diff --git a/README.md b/README.md index 61721e0..f09bb49 100644 --- a/README.md +++ b/README.md @@ -233,4 +233,5 @@ should be added or updated. ## Licensing The code of this project is licensed under the [European Union Public -Licence (EUPL)](https://joinup.ec.europa.eu/page/eupl-text-11-12). +Licence +(EUPL)](https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12). diff --git a/_pkgdown.yml b/_pkgdown.yml index 70a7bc2..ac6f981 100644 --- a/_pkgdown.yml +++ b/_pkgdown.yml @@ -1,4 +1,4 @@ -url: https://rjdemetra.github.io/rjd3highfreq/ +url: https://rjdverse.github.io/rjd3highfreq/ template: bootstrap: 5