From 7f03aa89a0163f608e083439f52920c479410887 Mon Sep 17 00:00:00 2001 From: AQLT Date: Sun, 4 Feb 2024 10:57:42 +0100 Subject: [PATCH 1/7] v0.2.6 --- DESCRIPTION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 4ae4355..c9481a9 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: RJDemetra Type: Package Title: Interface to 'JDemetra+' Seasonal Adjustment Software -Version: 0.2.5 +Version: 0.2.6 Authors@R: c( person("Alain", "Quartier-la-Tente", role = c("aut", "cre"), email = "alain.quartier@yahoo.fr", @@ -27,11 +27,11 @@ Imports: utils SystemRequirements: Java (>= 8) License: EUPL -URL: https://jdemetra.github.io/rjdemetra/, https://github.com/jdemetra/rjdemetra LazyData: TRUE Suggests: knitr, rmarkdown +URL: https://jdemetra.github.io/rjdemetra/, https://github.com/jdemetra/rjdemetra BugReports: https://github.com/jdemetra/rjdemetra/issues Encoding: UTF-8 RoxygenNote: 7.3.1 From e9db447db9089671d89516597aa070f6417d8f80 Mon Sep 17 00:00:00 2001 From: AQLT Date: Sun, 4 Feb 2024 10:57:53 +0100 Subject: [PATCH 2/7] url added --- README.Rmd | 2 +- README.md | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.Rmd b/README.Rmd index d5c4ca8..7d32675 100644 --- a/README.Rmd +++ b/README.Rmd @@ -24,7 +24,7 @@ options(enable_print_style = FALSE) [![CRAN downloads](http://cranlogs.r-pkg.org/badges/grand-total/RJDemetra?color=lightgrey)](https://cran.r-project.org/package=RJDemetra) [![Mentioned in Awesome Official Statistics ](https://awesome.re/mentioned-badge.svg)](https://github.com/SNStatComp/awesome-official-statistics-software) -RJDemetra is an R interface to JDemetra+, the seasonal adjustment software officially recommended to the members of the European Statistical System (ESS) and the European System of Central Banks. JDemetra+ implements the two leading seasonal adjustment methods [TRAMO/SEATS+](https://gretl.sourceforge.net/tramo/tramo-seats.html) and [X-12ARIMA/X-13ARIMA-SEATS](https://www.census.gov/data/software/x13as.html). +RJDemetra is an R interface to JDemetra+, the seasonal adjustment software [officially recommended](https://wayback.archive-it.org/12090/20240102173448/https://cros-legacy.ec.europa.eu/system/files/Jdemetra_%20release.pdf) to the members of the European Statistical System (ESS) and the European System of Central Banks. JDemetra+ implements the two leading seasonal adjustment methods [TRAMO/SEATS+](https://gretl.sourceforge.net/tramo/tramo-seats.html) and [X-12ARIMA/X-13ARIMA-SEATS](https://www.census.gov/data/software/x13as.html). Besides seasonal adjustment, JDemetra+ bundles other time series models that are useful in the production or analysis of economic statistics, including for instance outlier detection, nowcasting, temporal disaggregation or benchmarking. diff --git a/README.md b/README.md index b4e2938..c4fc4d4 100644 --- a/README.md +++ b/README.md @@ -15,9 +15,11 @@ downloads](http://cranlogs.r-pkg.org/badges/grand-total/RJDemetra?color=lightgre Statistics](https://awesome.re/mentioned-badge.svg)](https://github.com/SNStatComp/awesome-official-statistics-software) RJDemetra is an R interface to JDemetra+, the seasonal adjustment -software officially recommended to the members of the European -Statistical System (ESS) and the European System of Central Banks. -JDemetra+ implements the two leading seasonal adjustment methods +software [officially +recommended](https://wayback.archive-it.org/12090/20240102173448/https://cros-legacy.ec.europa.eu/system/files/Jdemetra_%20release.pdf) +to the members of the European Statistical System (ESS) and the European +System of Central Banks. JDemetra+ implements the two leading seasonal +adjustment methods [TRAMO/SEATS+](https://gretl.sourceforge.net/tramo/tramo-seats.html) and [X-12ARIMA/X-13ARIMA-SEATS](https://www.census.gov/data/software/x13as.html). From 5701ae3da76fe7fad5dc0c9c1e3c3c6236fe0d59 Mon Sep 17 00:00:00 2001 From: AQLT Date: Sun, 4 Feb 2024 10:58:13 +0100 Subject: [PATCH 3/7] news v0.2.5 corrected --- NEWS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS.md b/NEWS.md index 241b72d..868d872 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,6 +2,8 @@ - `proc_data()` update to export more data from Java object. +- seasonality Kurskal-Wallis test corrected (issue #128). + - `vcov()` correction when matrix NULL and new parameter `component`. - some corrections in `print()` methods. From e1dfc83f2a248fa20f7ab26f39fa4db420add3b6 Mon Sep 17 00:00:00 2001 From: AQLT Date: Sun, 4 Feb 2024 22:23:26 +0100 Subject: [PATCH 4/7] single-commit: true --- .github/workflows/pkgdown.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index aa8aa65..00d96b6 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -44,3 +44,4 @@ jobs: clean: false branch: gh-pages folder: docs + single-commit: true From 69ef8fb38f2914e0ea103919ef92cc8fe6630856 Mon Sep 17 00:00:00 2001 From: AQLT Date: Fri, 9 Feb 2024 16:21:24 +0100 Subject: [PATCH 5/7] improve X-11 export --- NEWS.md | 7 +++++++ inst/java/jdr-2.2.4.jar | Bin 444443 -> 444709 bytes 2 files changed, 7 insertions(+) diff --git a/NEWS.md b/NEWS.md index 868d872..d3155ed 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,10 @@ +# RJDemetra 0.2.6 + +- possibility to export last msr for monthly data (issue #122). + +- possibility to export X-11 some components: `y_cmp`, `y_cmp_f`, `t_cmp`, `t_cmp_f`, `sa_cmp`, `s_cmp`, `s_cmp_f`, and `i_cmp`. + + # RJDemetra 0.2.5 - `proc_data()` update to export more data from Java object. diff --git a/inst/java/jdr-2.2.4.jar b/inst/java/jdr-2.2.4.jar index 36d676363c375dcef4406ac5fb8625f3c3927c72..47b96b705d6d25bfcb8f1f7ca41aefeb078a5603 100644 GIT binary patch delta 12802 zcmZ8n2|N|;_rG`M-XVLTxVDgrkYtS%CE6@4_B|?;B^6n^lqfvh4xgo z7B3>A5-M5R{xkDDz3;DopK8uM=RD_p&-ToE@r*?7SqXlN%_xJ1M&qW@sv|Zg@-ITk zgT`I7k~sX5L8~G*CM~2dqmE{DMd~PniY6t{7f^Ho_@O4^9} zpM`kk7@a>U9^oM!Bwa*+#k+_+r7(&thl2q%S938>!pFHeZw1IuyTvv97?pz zN|c)-);YB@C_;4CUX&ujcbihNmOu3S$xCq_hRziQFcRZXittTtqEjL*90Qiuq`3g6 z**S3xQYT40{~>w2UN8xwnl1?eiw|GV#V9M%RoQ}+l{@#AQftaTJxT@P#dK^1uwK1% z0YF#x%OL`UJsUq&i?Ej{jb=Irf5W1S<6~TOA^e^TU8wxZ+ddG&sbMidT>hZXMY$UI z90oYMzPSTe4`%Zjl)Zr)X~WM6d+YzlUU|Xq5tNd?yZmI;Fd_B)A1UWPO8-s8!gK=x=JU~osBCi-1?cS*_?yD?aXMwi$WvQu6GEfSVd9xC1m*@mjEf^JO7}!abexz4 z^cPeF6jP|_+G@5FX|2HxG=K)Nd<1b6UMJ0)& zszf(p2oSAfGgBAZzK2eu^&&~7AH?z608E&3Rh8}!j7zK07g7*8h8pyJAb>I*x+v8g zoO_0J7LX1a(?9W15IeWgwSbqakxTMi5fn|wIdO2A8ERU`O zR`3~sS?ijQnMj_6~$IEZq^GrB(T z;nz+#0+uUY(p7-B!9Kbth}ZHx-5f}B#^`y#@74)=CRjWEl^zc)N6-;hfPRn**#@Mm zc#$%IWt0!u0<7rILly%o9>Pd9sN1>N$ijMzMms+@DdM^a?i@kXZKoJ=pPCqstPBzh z;wY6vKEn?Exx2T3Sg}cvT48aFSkbu{DF+Bns~|$4Mj0y*Fn}B>O+*}6(bYk$L9UWk zAua&lH$8-pm#R6_1PKQ@IBAC10O^1^;g^!W*p3_rmYr-64S+A%32C9Go#W(=JOtTQ z_C%aOlyP1N%EeF4aD?;p!zp5_6mXYNL;??v#zZ-f{Si8__v{ej0(@v3L1aMwtU{4( zz+PcEqDNuDM3d+l4NHY}%o^=B0rm7nrg=_}ap2Q$)L5y?bka-}U#pe)HV8cHd z>7{IJPeDSNbE(l$D7z_3j7}r*ZxQaAf{1b^FCwc!44Rh^IOe7q$U(rX&qRnGAP3p) zGD2*OB&B!-xemPcZ<)*^`jz>Nk30R^aPM&1G_ znRk(|K#D&^B7s!;88QmeBhZN?04nnp0hHQjzG*B8XA|YA;-b-(0aQN|v3Z=MZ;(^K z63-x#55~OW9a0JW_>CYL3@WP5O|u#q#QC|6_@|0DRwLrLLlP#2TYf?csOsG^u4ngU#36GBf@=YGyw z3G_4Qd`&r&4SaAGqn1FAcPY9JbgGLg`VsgrS4W96C|NThP4p+EbkJfzHLOC#fZx{! zXeU^4!w6jlc>NpDWdNU$IT{P5I(-KUXH?k+Fc#(I2xg)efQOQo|fL;R?PCjA>))ZSAPo5t zR0V+AK8kt+bB*IDvB8o}DES%fqImeXNuotb?1SIXWZ*w+78RqqyW%|K1qdPlWn2d> zxRj4!4q7W%h@lU60a1nspq{cAzrmjKB`eG&nn~;^d^DOOb>+HA8dIjk_P2_FB9BKP%mp}qIVQ-ta-Ok`L3LGtf+^q4ON^~6*t=y;dCR3e zzrE)B*)_K7kDBnPMfbn-R+H>Ket%j~@|g1-^=?4}ecD`}{dsff_#9CmQO_Hh65nDB z$8U*o$;6%-&pCfu+zk^Dj&_N#IT_Hb?x4gP7rVylie30?!}{@U{z#AVlg95&3e%C( zQgw1Z&4SIf)0bYTboZ}FR7s!DuIg8?RO*=*+sx&bJMExxYOLuLPYka}LS_2Z`yuBV z`{#Px2y(hFI;N!1zuDvFu}!)CJ5!W)CCi^Hh)Kvi^nk~s_PUj>)64v{D`~lDr49uS zCEXBte$$ED6+DNJ71jN@yew_%eGj!SiJtGUHvt? zJvPPV9bX=G&b;@1+-Yp}VVifisMQCr!b8O!w;H|vaj)>Hu;bVl>vgO-UmQ}@sZ|&l z-SNt!;+suzbWvxH)rUES649nyTuUec%I#rmg@*t7VV9a_t8W7IrMJGf^!)A+fgtvoFrF z@{a6a?XPIDE!=X$u4==>oqb9NMXQ%;+!nGJ-&C?p{hw@ZrvqCr;iDIZF1%SKcKx@2 zAbA%hLfqPN)5xK)e#%${M)uruh6_J6J5#-kCn8jf-TTVO2fP4;xdQ0rF__cysF77p z=ajxDF2|X~*eWD7GDL7cc_tU$T7mI%UMygK1(VgvVuo^4`X&9J3kL;gwAJ#&S^AIu zLbhP2NVDkO-fo4etp_5?7BY*@Z)>6%Rr1apZ(MWVN$weMqr+M`cK?tM%7s^Jgcv@( z`K!y$+kSs>?#)iS!s3egjWJB)!cM!`9TUqp6<2r_|Mse|@-F^1)#Ip&ZbZ)sYJaKo z-QDwj^y9~m`=oyby%vzW@Il<#RQmJm(pK{s_KwWGw}gvLt4DSyUDHZ0u@U}IXd}bD zLz$mpWTw&4cJaW#NRZOYw2x+rpDWsz+qKt>FEZYK$J?zjMyDohwN_yMUg;b5AA5R& z4(xQCE52hmM{bR1lC$LqE98=6Vp&q5l3jJD&a)fY$7Uwn^}}l9d}qEY7_f4Oha1ge zlYH20U*D_CN1NNvG*TI7YP`c}F)yodxa{+|%T3c;37Y24ZcklfK0lwcWF*I2k+t$g zu5RjKE8Q?-jl{(>!+vYRF2q|L)LHzrf@`sw-jV(B?AIBl)#tD8G+X7Kx8GRvj(eN_ zeBRQF(mm|6@A+13vvgG!`WV0DxmiYnL3!(r-E!hzZBHJSeU+IbB7W@%TAR?4_9-B? zZ9@9)q1pa;`!_8i!NO**iuVTE<`}k#9{Ct08CV_|t83#q`=Jx~2DcDDx19cB1j=<>Cw%?_hk@*12YgJ~} zGPS#z9&QW!c~%Hr-_F-`qj~Mqe6f@7Pezm#Hm&Wh6yvU8Tk);`;Dut>xuS0dZSCRBp(gbdYbgb&!Aju4+Td@&j>;-W`aOd>0TWvOv!GT(h$>CUhIf}{AKSMnbLcT zz9OM4v8t!{`^dBI$tb>8{Ivq-^cyvwuW8miU~pX4Y+=K?^vSk>Dz57qW$1c2;3dI zN85X*I-|!`#h}VjB{uY{pz(Hrn$-)QRev?_nbT{nQ4%_A78y70Z0gav>9ymWyDC@M zZ6*e@2^j`g%*PQiS;GPL?7~$+V9Dr2R;W+3K&%M*k-VR>80LD2Y#% zrz6Oi=XXSM3fUQ6NH%~9+shaLWn8zr8usL#4m{!(4UjH}sEv;0D_x-R19t+F7k zT2{^ELHIdC#bvo^%RG|Lb!_W2wOy8bn%}MHu3Of8-U^%iWYHMTNpUH&{AMGS`Civ7 zVo%tKXKg-GH74IqXe=pTpRZt~GS};r#pXymx%PQkDclu+#d6DH%g!hM&nmL0348Ry z&uE>pMicx`JnM%;%eT3NRMu?1Th@`Kqgy%@>cYd7hfN zYsEna#lp))DTy7aPl>;pQMcA>4YC^T6piONA2!_Uw8wsPlLh|8E^dIw@Jxn3r$W_9 zOkJeM_XIm^wU7PPHR1#E3s~}RT27?$a!c^|>dEw|Upf_}9w0UDs8YA~$%4o+y?)-I z(B$zj^U!2*XM9FMtgJ==YKI ze?KE(++LZsB=P;ors86q`x`$`#S7m#^K4Fa-m=~1hpOxkDy5%xnK>CVIpz5+Ha9*& zvfx+U(t|Q9`uk*OyapeKl+7F{&G?z!&Ns0`aKa^4C#-Vn%RP3L;ODj|e53y8SHAnJ z0#D{0IJrcpNm#7E(aGac!s6>051ROU({uF&HQGqR5X#+3)@@hv1H!d z?z^|PO|BXfT34SEJrmyYwbnLr-AntU71pbFUhT2E(YJQth|rQJQk6WS}q9Ii|(9p9rNjizT$>}fRdoOsySrjbrJ zup8LbFvx1f%)5dFf}&as$G5QK-W^MLR>{)eJYYAzFD`*;y*E@pD8A)OBR$TX!KLYg zSbNpb^sNVy8h5@5Elam6Ud@-DH(@k>jkO%<^6bXaOPlosLXUO!2pCunDD(x#;m0I2 z45apX)<{Y|4^pVK99Y?~l@%Ca{#*xh%JkQ+v>oW^OVV^g4U7jEIz{Y>cMU46>b?`K zspIw)Gkr5&ZLeAxCK^37pRVbB<8E>FG^gxlJ^t>jiVW1iao5qKDW0M9psJPy5d_jX zLAfpXF+I&XzR;)^{P_O3dhFBlX&%2F1HR$ASkBDD8g;Dh;)%et@q|j>(KugbXfLMPn(UuWci|Or?$Hv-bfbzR2{EkjnOjlCTjb>Xx0gaMzjcqFK?eV95=SB zi*0m%{z?XMzB+NIZ@G7kaA>O5uVsCuUXMNu@)Z9T8Bey;E5!@h8o%aGzh?O|oO4!` z;@+CS45qnQUxF(Q2V^3ApPwK5{h0MzS?1VphXMb-t*@qEH`w3!cDI4! z{X=JZ0c*{ix^)A2jrN*7ymi|LtQ+dvr;m(l#W^#5yQZ1rj;wmD&VFD)qn^f5G&G@Q zdBj-9w917Bwng;n2=;Ftl}XK)v(NVZbhvqRiT%6n^p@Y7hTa({Wf>i+52k%9ePig} z&pvW-<9@kcZQaM0@;1Frmii*`R%J2!@OqUaxrf?M7r%XNrXV#mT&yu9J)*1AxkE7P z>z?4Ny;q~>&IYDhRV3x#I4P)Irt5Y{E1Mmq`$RHf$!8~4y=Q&UvI=(4(aDg>{H6wf z&%LMb?@n!6`g%=EjO#9agS2?X-<$7#Cdd_O@dX5V-E~)A{`ok6#4X5TL2H_;S&~rO zH^FDJvMqaV735u8YpN`8Md)Mdx;ZzeX^r0`H|VS4j@a+gvj^&sX8Wyf1v`avrIk%XuvJU|YGwpjdz=dsCak@dHJv zYlq&h9cuO8jjx;v7+R_O1$z>D)BV>mcLNjkj3ued&pcYNacJ|RFS%!D)bEE@x&ON0 zUT37vUZ?J?kXpK7C@xocWorGy)Y8F6UH(HKbieSY&1|^;W7qxAa`!r8^MV>Wj9 zyfEi^h`s5N4~zF-iIVEtzHp83XEZW$&o;FKOTxrj1XNwjE>^|i!%|9PM%%Q*KC@4r z-t6X}w$i6a-Q8uI%=t$G$}Gvs?U+wH*ZhYKakC9^FC!Gb3wGxUN-Cg%BWR!pSIVa~ zehCJCr}?^b1iO=@bPoTH@ZHrXvLoqOYP|0ry?BX_l?(W5R{Cy_K9w~0;!iD2+32LI zLv8|h{XZ;fe63dK^pa81)EJr1ld-EqhkdN$s*qISx96dg22$?|vV~Vqx*sviI`fXt z>uY71_S22&yn7?|$ZLl9MAW95O>`T(w)%KY)bM>jCcTTV zYGv&{uIB&7v+8kmOiFM_{+$rjkFlPqQ%ZK9Y9p+II8Qf?g|#b6Jhy#o^5oieS;Yk7 z4)*&a6;gU#Eoo!>uHK(L{4SIuI9=1M+j~*hd2hqJODSI_--cc~c(5h!*U2Au&-|88 z$ThfpHKFWhm}!Unjy5%X`MsO7OD5&s`zUQ=M~!JtM$OuH&W1dhHF*-eW>47p@?R@m zj@%n~Yom)cdN}j41zY{sDcj@o)>}Lzm|GOh6pIjYY!K?$%wY0UEN5CtD zazmybKXpewVaC)44`$VNGBbrJUYiGV4R~oI>c@1QN8Q68ImT22Ym4HTe&7|6%mwC2 z@Pg}VHuECo12@fM5)bVNx8nIsdvL=Zc$GOHJasyAojDC2yT#sO27~8M+;vQ0KuI?; z!JAgjmlh@ho_0+?U_J)Ydrz2C;H_QAQfVZcc(WoPikEdUS@@PZ;?dN%r_3Vo;48O_ zsSV=oea%b&j|%<&VLAdZ&w82Q!7Qh+pSg|V-5ewlkPk2B4>JWoKugA%+X2$BDds~U z-Ta-I2MkaCX1ari7Y+z!4$@b`ja>v!nzsmG7(%`6(}}w4`-DJxYXSa7mU#aYAcVaG z+KvmbA>e7lLM#q|?3BgAfmPc@muQV;I~9ETNm6VK$Vh!>60xT`s~fU{>A z77PHrU5?cNDn|n&o>P*+gy~?lfVX-z=1skCRRsv^ljIq@~Pj(}=9Dv$xPU;cw z!0|>a>;y$za>gWZcWX?X`W0@Cts!mW-X!}UYfOYJHQsGc{1UXm7E-^)Y>8i6Z7^x- zR~h;1lno~PpX}ZrnGz{u*kbaOjQC|h5nCMzc9bnfy{pFw1NxLt!mchQUuK7`qzG3# z0uBj)a#Cjpoh&24{j|g6D4Co+rbQ9<_Lw0>WY}Y?D1yMPM-eOs!ZjI}y#q#l-hiKW zz;q}PWxC%1n#LTl^%R@HX!M7Wz>6Ir*e*xRm|_#qB=A*E;4=i=)d^esAG`h!n+lZf zOspk+6R=nRN$zrrAd;`~-?A}hXpO)ofv<4Eq$njz7fhQ{A_ximiVG%5m5K;b0`GGn zzK0;|Nxb;nND*eP*j7qA-4)wQ5p&$I-ISpNZrFB;bI%R)pa`{H*nW!0+=V$%#P400 z6{T$Bj_ss~GIt`YB>b=L*fxsT=z*D1#5oVbASrt9L3k$#t=({W!fq%U+>Py^MEZN+ z^29yZ7Rp!O9&9s3sP4rqD4mEuMEhPsL>iRy#5Pbm-kyXG*$Q=@gfEid@xrVr!rcoR zEcb$#dA(scUfxir$s2R03@+OTp$6`Q-kbMf_LN9|KSUU`AG4$^KiUt0$@pOA6vy8O zikf|hRU`~~Ur0pwVlEWttuNt}1aII+)Pf}9{V-=rH13DlQN&h%%!v|}_{01#4?sJ+ z4q&?|o%;tcTS`YEfZ&jJVgm^8B+(l{*dYo1gRtDE4-yDTPR~Io(mOF#WJ`Bq=eHb&NbT$UU051hXgJXe&h+MTc2pUWdf_WYdg5}0j$d=%mtJqqotW5eZ1e~1A#6zPV;PQb$n9TLX7aMb#DD!?+|C;)#fblhPIoi@WqR#KS%fbNJ*m ztj_#6m^zO**gxfQpf^(DVKQvuVM#0EiJ2yGi6p>?JrZD^Difejo-;71E@$A}-}=K5 zN`#s7OeCg?OkwjMj`UerZJ)Dn+jx8yMzbUdDj!dRcwQ&LW?69#HcJ9YkOoK3VXhQm znG6HXOosc%mp>e%6o~MA3LLNZDX=DnI7D~>hkZ1R!(Ll?9&Rlu=i#PKPlbu!nhL>R zN`>{GOoeGNy#RfsUw|+sE)aDiq3T_PZJ2NoF7Levmusg%V5icc=w%udt+)h}aEc^I zJ8v$*MCqkN@aNJoZ>mhhHx1xSx-kQWga080GhhX^GNCAvB*@}E&m;zgv@Di|*-)H- zEZC}bSrCsvHYA*~p;Jyaw8PASowb!DNQ22aunph;5vgA$mXo4mm!Zys%Mj|^TCQ1m|L2 zF~qZ{7&>h(hTS4jg1J#~g_pp=?J9w%FWpkOqr{cMD~QQbc(SrDgLbOQ2&g15k!z6f zy#~kX$u($D;W}&^_H`K7tLvEAzwe!KwQ`uY@N&W`nd6>vSZeJX@T8b@0}lP*4LCsh z6>wP3SHQG=sK9Kf?*RXMk%(K~#LO2G_-vH!HQqTwTyJkCJ^@ntpO0EEM+B(j4L6C) zL(=j0o0tTuq0PjJPtZhhRSqUAOD?t&#t$dhi$lRCBc5Wn_{ct zxs{l-ENQcQtbeP>JQ{68kw#Ph%jP_PN>>HX3B%@5fct0jI(vyoRU~ONt-o{+AE$K1 z@P;Z(9Iv{DQTKy*Ocmj?ApSp@GF8lU$u%+=;wge)(Il4;^&*-Qbv zCkTd6O~?@AeEh{Nc%>{+O)%yc;EC1PeB7)Wlc$PO5TX6Cjd(lkB21$#{R`&7LQ)l6 z=|3RX#+8G$2Khvu%ZSgUC=9YSgy>{75S86x3gh7yi4u@CvyIHLeonl7&LhgO_%GYc zdZ4dT$DD^3o*^KU4g7#KC2<>we%26|<0MzAmf()x1zd|-;%c1a`jXtqhkz^fkST%} z)j_vy+gC5WNqk5aNqpG#x7+4cpg;PAa4UEgx)rY@Ow~UFBI4Fpf^y(RaQoXPr|{XAgjNhuB$>aoeh%WY4d63v+_HgiBRqopG+^LPCzE6> znjq~+|5vPWk{djY^EYBksg5?eSV?>qOQTH@ox1QZ>!v@LxczsgELBcQ_i1ullM;a> zo6!Fo$!8jt%)}P{7h1xHn(_HW)vbkyTkF5f+M@V)Bc@CxQ|302)xtR#UdK&qW9R3Szi}0AZ6X6P2$2ZvAOAVy6E6b2(z$T)h1@rbOAK-ytHj6T_wNU`r{+Mv}2k z7T7toO1_Lq6}Z|QJLf>YLG}|`0qMcDd6-bOr4tN4?-_4m=ju$iLm~j z{mi8pUcDZZ#QmBuc`8$XJz4k{D2;YGVvRC}uh@u*;P;xa1(a@lkiFYcBBSPW{{P1I zMh(L!j4>82phkRU^&%YRLC=4IRXPF0jacw^ZZkD;i)NTxb~BO0U|s0#S~Iqo3jP(z zUS$B;d@XRslv@aPzA+Vt9G(yjD-lAndp1xoWbs=qkbR$IOK+l#u!yf!=!gjV@AoRW z&|N}mVF6tPnqvaE#a*I0w4E6K%nDng7PNog|E?kKrfnwQJbI}^B#Qi}_E*B{tf^Hi PaOOQs2wQJMWS{nb=_!PB delta 12457 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 nD1|-sgeLaglzdZ9$dmW#2|l Date: Sat, 2 Mar 2024 20:55:28 +0100 Subject: [PATCH 6/7] ramp correction when frequency != 12 --- NEWS.md | 2 ++ R/utils.R | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index d3155ed..84c995f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,6 +4,8 @@ - possibility to export X-11 some components: `y_cmp`, `y_cmp_f`, `t_cmp`, `t_cmp_f`, `sa_cmp`, `s_cmp`, `s_cmp_f`, and `i_cmp`. +- correction when importing models containing ramp regressors when the frequency is not 12 (monthly). + # RJDemetra 0.2.5 diff --git a/R/utils.R b/R/utils.R index 34cbd28..bfc22bd 100644 --- a/R/utils.R +++ b/R/utils.R @@ -8,10 +8,18 @@ identical_na <- function(x){ } -ramp <- function(start = 1990, end = 2020, +ramp <- function(start = 1900, end = 2100, start_ramp, end_ramp, frequency = 12){ start <- format_ts_date(start, frequency) end <- format_ts_date(end, frequency) + # start_ramp and end_ramp are defined in month and not in the frequency of the model + new_period <- rep(seq.int(from = 1, to = frequency), each = 12 / frequency) + if (length(start_ramp) == 2) { + start_ramp[2] <- new_period[start_ramp[2]] + } + if (length(end_ramp) == 2) { + end_ramp[2] <- new_period[end_ramp[2]] + } start_ramp <- format_ts_date(start_ramp, frequency) end_ramp <- format_ts_date(end_ramp, frequency) @@ -20,7 +28,7 @@ ramp <- function(start = 1990, end = 2020, if (missing(start) || missing(end)) { # if start and end not specified by hand start <- min(start_ramp - 1, start) - end <- min(end_ramp + 1, end) + end <- max(end_ramp + 1, end) } x <- ts(-1, start = start, end = end, From 40b12f74f9afd611b806e4437301927dbc1fe865 Mon Sep 17 00:00:00 2001 From: AQLT Date: Sat, 9 Mar 2024 18:32:12 +0100 Subject: [PATCH 7/7] correction of `get_jmodel()` with empty multiprocessings --- NEWS.md | 4 +++- R/get_jmodel.R | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/NEWS.md b/NEWS.md index 84c995f..1fb5742 100644 --- a/NEWS.md +++ b/NEWS.md @@ -6,12 +6,14 @@ - correction when importing models containing ramp regressors when the frequency is not 12 (monthly). +- correction of `get_jmodel()` with empty multiprocessings. + # RJDemetra 0.2.5 - `proc_data()` update to export more data from Java object. -- seasonality Kurskal-Wallis test corrected (issue #128). +- seasonality Kurskal-Wallis test corrected (issue #128). - `vcov()` correction when matrix NULL and new parameter `component`. diff --git a/R/get_jmodel.R b/R/get_jmodel.R index 659d101..11d4211 100644 --- a/R/get_jmodel.R +++ b/R/get_jmodel.R @@ -13,7 +13,7 @@ get_jmodel.workspace <- function(x, workspace, multiprocessings <- get_all_objects(x) nb_mp <- length(multiprocessings) - result <- lapply(1:nb_mp, function(i){ + result <- lapply(seq_len(nb_mp), function(i){ if (progress_bar) cat(sprintf("Multiprocessing %i on %i:\n", i, nb_mp)) get_jmodel(multiprocessings[[i]], @@ -34,7 +34,7 @@ get_jmodel.multiprocessing <- function(x, workspace, if (progress_bar) pb <- txtProgressBar(min = 0, max = nb_sa_objs, style = 3) - result <- lapply(1:nb_sa_objs, function(i){ + result <- lapply(seq_len(nb_sa_objs), function(i){ res <- get_jmodel(all_sa_objects[[i]], workspace = workspace, userdefined = userdefined) if (progress_bar)