Merge pull request #26 from TanguyBarthelemy/develop

add new logo and badges

R/jd3_seasonalbreaks.R

@@ -44,8 +44,8 @@ seasonalbreaks<-function(y, period=NA, level=1, slope=1, noise=1, seasonal=c("Ha
                as.integer(level), as.integer(slope), as.integer(noise), seasonal, rjd3toolkit::.r2jd_matrix(X))
 
   if (is.ts(y)){
-    return (ts(so, frequency = period, start=start(y)))
+    return(ts(so, frequency = period, start=start(y)))
   } else{
-    return (so)
+    return(so)
   }
 }

R/jd3_sts.R

@@ -31,7 +31,7 @@ sts<-function(y, X=NULL, X.td=NULL, level=1, slope=1, cycle=-1, noise=1
               as.integer(level), as.integer(slope), as.integer(cycle), as.integer(noise), seasonal, as.logical(diffuse.regs), tol)
   buffer<-.jcall("jdplus/sts/base/r/Bsm", "[B", "toBuffer", jsts)
   p<-RProtoBuf::read(sts.Bsm, buffer)
-  return (p2r_sts_rslts(p))
+  return(p2r_sts_rslts(p))
 }
 
 #' Title
@@ -119,13 +119,13 @@ sts_forecast<-function(y, model=c("none", "td2", "td3", "td7", "full"), nf=12){
     stop("y must be a time series")
   }
   jf<-.jcall("jdplus/sts/base/r/Bsm", "Ljdplus/toolkit/base/api/math/matrices/Matrix;", "forecast", rjd3toolkit::.r2jd_tsdata(y), model, as.integer((nf)))
-  return (rjd3toolkit::.jd2r_matrix(jf))
+  return(rjd3toolkit::.jd2r_matrix(jf))
 
 }
 
 p2r_sts_rslts<-function(p){
 
-  return (structure(list(
+  return(structure(list(
     description=p2r_sts_description(p$description),
     estimation=p2r_sts_estimation(p$estimation),
     decomposition=p2r_sts_components(p$components)),
@@ -134,7 +134,7 @@ p2r_sts_rslts<-function(p){
 }
 
 p2r_sts_estimation<-function(p){
-  return (list(
+  return(list(
     y=p$y,
     X=rjd3toolkit::.p2r_matrix(p$x),
     parameters=rjd3toolkit::.p2r_parameters_estimation(p$parameters),
@@ -145,15 +145,15 @@ p2r_sts_estimation<-function(p){
 }
 
 p2r_sts_description<-function(p){
-  return (list(
+  return(list(
     log=p$log,
     preadjustment = rjd3toolkit::.enum_extract(modelling.LengthOfPeriod, p$preadjustment),
     bsm=p2r_spec_bsm(p$bsm),
     variables=rjd3toolkit::.p2r_variables(p$variables)))
 }
 
 p2r_sts_components<-function(p){
-  return (list(
+  return(list(
     level=p2r_sts_component(p$level),
     slope=p2r_sts_component(p$slope),
     cycle=p2r_sts_component(p$cycle),
@@ -163,14 +163,14 @@ p2r_sts_components<-function(p){
 }
 
 p2r_sts_component<-function(p){
-  if (is.null(p)) return (NULL) else return (p$as.list())
+  if (is.null(p)) return(NULL) else return(p$as.list())
 }
 
 
 
 
 p2r_spec_bsm<-function(p){
-  return (list(
+  return(list(
     level=rjd3toolkit::.p2r_parameter(p$level),
     slope=rjd3toolkit::.p2r_parameter(p$slope),
     seas=rjd3toolkit::.p2r_parameter(p$seas),

R/protobuf.R

@@ -1,15 +1,15 @@
 #' @include utils.R
 
 p2r_diffuselikelihood<-function(p){
-  return (structure(list(nobs=p$nobs, nparams=p$nparams, ndf=p$degrees_of_freedom,
+  return(structure(list(nobs=p$nobs, nparams=p$nparams, ndf=p$degrees_of_freedom,
                          ll=p$log_likelihood, adjll=p$adjusted_log_likelihood,
                          aic=p$aic, aicc=p$aicc, bic=p$bic, ssq=p$ssq, ldet=p$ldet, dcorr=p$dcorrection),
                     class = "JD3DIFFUSELIKELIHOOD"))
 }
 
 
 .proc_diffuselikelihood<-function(jrslt, prefix){
-  return (list(
+  return(list(
     ll=rjd3toolkit::.proc_numeric(jrslt, paste(prefix,"ll", sep="")),
     adjustedll=rjd3toolkit::.proc_numeric(jrslt, paste(prefix,"adjustedll", sep="")),
     ssq=rjd3toolkit::.proc_numeric(jrslt, paste(prefix,"ssqerr", sep="")),
@@ -27,14 +27,14 @@ likelihood<-function(nobs, neffectiveobs=NA, nparams=0, ll, adjustedll=NA, aic,
   if (is.na(neffectiveobs)) neffectiveobs <- nobs
   if (is.na(adjustedll)) adjustedll <- ll
 
-  return (structure(list(nobs=nobs, neffectiveobs=neffectiveobs, nparams=nparams,
+  return(structure(list(nobs=nobs, neffectiveobs=neffectiveobs, nparams=nparams,
                          ll=ll, adjustedll=adjustedll,
                          aic=aic, aicc=aicc, bic=bic, bicc=bicc, ssq=ssq),
                     class = "JD3_LIKELIHOOD"))
 }
 
 .p2r_likelihood<-function(p){
-  return (likelihood(p$nobs, p$neffectiveobs, p$nparams,
+  return(likelihood(p$nobs, p$neffectiveobs, p$nparams,
                      p$log_likelihood, p$adjusted_log_likelihood,
                      p$aic, p$aicc, p$bic, p$bicc, p$ssq))
 }

README.Rmd

@@ -13,7 +13,16 @@ knitr::opts_chunk$set(
 )
 ```
 
-# rjd3sts
+# `rjd3sts` <a href="https://rjdverse.github.io/rjd3sts/"><img src="man/figures/logo.png" align="right" height="150" style="float:right; height:150px;"/></a>
+
+<!-- badges: start -->
+[![CRAN status](https://www.r-pkg.org/badges/version/rjd3sts)](https://CRAN.R-project.org/package=rjd3sts)
+
+[![R-CMD-check](https://github.com/rjdverse/rjd3sts/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/rjdverse/rjd3sts/actions/workflows/R-CMD-check.yaml)
+[![lint](https://github.com/rjdverse/rjd3sts/actions/workflows/lint.yaml/badge.svg)](https://github.com/rjdverse/rjd3sts/actions/workflows/lint.yaml)
+
+[![GH Pages built](https://github.com/rjdverse/rjd3sts/actions/workflows/pkgdown.yaml/badge.svg)](https://github.com/rjdverse/rjd3sts/actions/workflows/pkgdown.yaml)
+<!-- badges: end -->
 
 
 ## Installation

README.md

@@ -1,7 +1,19 @@
 
 <!-- README.md is generated from README.Rmd. Please edit that file -->
 
-# rjd3sts
+# `rjd3sts` <a href="https://rjdverse.github.io/rjd3sts/"><img src="man/figures/logo.png" align="right" height="150" style="float:right; height:150px;"/></a>
+
+<!-- badges: start -->
+
+[![CRAN
+status](https://www.r-pkg.org/badges/version/rjd3sts)](https://CRAN.R-project.org/package=rjd3sts)
+
+[![R-CMD-check](https://github.com/rjdverse/rjd3sts/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/rjdverse/rjd3sts/actions/workflows/R-CMD-check.yaml)
+[![lint](https://github.com/rjdverse/rjd3sts/actions/workflows/lint.yaml/badge.svg)](https://github.com/rjdverse/rjd3sts/actions/workflows/lint.yaml)
+
+[![GH Pages
+built](https://github.com/rjdverse/rjd3sts/actions/workflows/pkgdown.yaml/badge.svg)](https://github.com/rjdverse/rjd3sts/actions/workflows/pkgdown.yaml)
+<!-- badges: end -->
 
 ## Installation
 
@@ -33,6 +45,9 @@ library("rjd3sts")
 #> The following objects are masked from 'package:stats':
 #> 
 #>     ar, arima, cycle
+```
+
+``` r
 
 y <- log(rjd3toolkit::ABS$X0.2.09.10.M)
 days<-c(1,1,1,1,2,3,0)