Skip to content

Commit

Permalink
Merge pull request #30 from TanguyBarthelemy/develop
Browse files Browse the repository at this point in the history
Update rjdemetra --> rjdverse
  • Loading branch information
clemasso authored May 13, 2024
2 parents 441f3f4 + a0178eb commit 3bade70
Show file tree
Hide file tree
Showing 9 changed files with 85 additions and 19 deletions.
28 changes: 23 additions & 5 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -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$
54 changes: 51 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 2 additions & 3 deletions R/jd3_fractionalairline.R
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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)}
Expand Down
4 changes: 2 additions & 2 deletions R/print.R
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion R/zzz.R
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -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).
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
2 changes: 1 addition & 1 deletion _pkgdown.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
url: https://rjdemetra.github.io/rjd3highfreq/
url: https://rjdverse.github.io/rjd3highfreq/
template:
bootstrap: 5

0 comments on commit 3bade70

Please sign in to comment.