From f01afa0a8a556bd2ab252e08c64f8162f0c188ee Mon Sep 17 00:00:00 2001 From: Achim Zeileis Date: Thu, 13 Apr 2023 11:13:20 +0000 Subject: [PATCH] version 1.8-12 --- DESCRIPTION | 8 +++---- MD5 | 40 ++++++++++++++++---------------- NAMESPACE | 5 ++-- NEWS | 16 +++++++++++++ R/as.zoo.R | 2 +- R/ggplot2.zoo.R | 12 ++++++---- R/index2char.R | 2 ++ R/na.approx.R | 2 +- R/window.zoo.R | 10 ++++---- build/vignette.rds | Bin 511 -> 511 bytes inst/CITATION | 29 +++++++++-------------- inst/doc/zoo-design.pdf | Bin 34380 -> 34377 bytes inst/doc/zoo-faq.pdf | Bin 89878 -> 89878 bytes inst/doc/zoo-quickref.pdf | Bin 66945 -> 66945 bytes inst/doc/zoo-read.pdf | Bin 65599 -> 65599 bytes inst/doc/zoo.pdf | Bin 199443 -> 199443 bytes man/ggplot2.zoo.Rd | 23 +++++++++--------- man/zoo.Rd | 1 + src/coredata.c | 14 +++++------ src/lag.c | 14 +++++------ tests/Examples/zoo-Ex.Rout.save | 13 +++++------ 21 files changed, 102 insertions(+), 89 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 5256888..ef3fda5 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: zoo -Version: 1.8-11 -Date: 2022-09-15 +Version: 1.8-12 +Date: 2023-04-11 Title: S3 Infrastructure for Regular and Irregular Time Series (Z's Ordered Observations) Authors@R: c(person(given = "Achim", family = "Zeileis", role = c("aut", "cre"), email = "Achim.Zeileis@R-project.org", @@ -22,7 +22,7 @@ Imports: utils, graphics, grDevices, lattice (>= 0.20-27) License: GPL-2 | GPL-3 URL: https://zoo.R-Forge.R-project.org/ NeedsCompilation: yes -Packaged: 2022-09-15 15:20:12 UTC; zeileis +Packaged: 2023-04-11 21:24:32 UTC; zeileis Author: Achim Zeileis [aut, cre] (), Gabor Grothendieck [aut], Jeffrey A. Ryan [aut], @@ -30,4 +30,4 @@ Author: Achim Zeileis [aut, cre] (), Felix Andrews [ctb] Maintainer: Achim Zeileis Repository: CRAN -Date/Publication: 2022-09-17 19:50:02 UTC +Date/Publication: 2023-04-13 12:13:20 UTC diff --git a/MD5 b/MD5 index 0fb37f4..ac1432c 100644 --- a/MD5 +++ b/MD5 @@ -1,24 +1,24 @@ -947ac1f5bb8a05ca965cd09008ae60bf *DESCRIPTION -20c2a110c3d865ff995f5ecf2815bdc3 *NAMESPACE -ea2937e102ed03cceee16d176772802d *NEWS +a5c47eb23bc05dabcdf9adc0a923c06c *DESCRIPTION +1963cacb92c8f76f0865d00740449c43 *NAMESPACE +0a7679340b7f7c973b81f3bf5b1c86c7 *NEWS 7ecaff55c2ae98b77d24c4b6c7f7cf86 *R/MATCH.R 3eebd5fe3394080789fedfea3a45e3ab *R/ORDER.R 9015ff069b28219b6dc44505641d249c *R/Ops.zoo.R 5c3f54c4c9d2692046b3b1049fc771f8 *R/aggregate.zoo.R 65b001243ba9e0edf4c03e60bad35129 *R/as.Date.R 93ff2d240541d0aa3588d410eb235699 *R/as.Date.ts.R -a96668152049b188317455e7cdb61bd7 *R/as.zoo.R +42d2549b937334f78b62e4fb98e7cfa7 *R/as.zoo.R 62c1bf87a7380c654f17b1b8ed71efc6 *R/as.zoo.tis.R faaae6520bab57abe84eaa00ee3ad414 *R/barplot.zoo.R 5af291cb99c193b4db3fc89ac9a59cff *R/coredata.R -53d1efa0fe09fcd4e6e5d5cdced56502 *R/ggplot2.zoo.R +ccb925c40b1398f7c427b934778d1b91 *R/ggplot2.zoo.R 04a26dde3202887ef53a4b78a8e49830 *R/index.R -e0b9e9a919725d282d7b4e608e42a364 *R/index2char.R +4eb9cb572803b612e1735713d0d4fdce *R/index2char.R 1d215aeb25acc0c75a6321f0522e2a76 *R/is.regular.R bdb3ac5e66c6b34351c21dba99ca4c51 *R/merge.zoo.R 7564a94e7eb8117617e4433e69f0b50b *R/na.StructTS.R 4e8c25337f2e1891e0939ebf2e6b0138 *R/na.aggregate.R -85d12003737b84bf77301e05e87e5bc0 *R/na.approx.R +824be88c3d276757f34bf4792223a4f6 *R/na.approx.R 4ed0e2f08381ac59978b36893db30e5a *R/na.fill.R cd801f2e256a937016dfa229969ae118 *R/na.locf.R 7682d00afdbff36fd903883d4df687a3 *R/na.spline.R @@ -27,7 +27,7 @@ e1693ddba5cb8a6c55839564b02d80bd *R/na.trim.R 03db77ea299410fa4c573e370ac2cc48 *R/read.zoo.R f961d86ef885dc7641d30380917b4919 *R/rollapply.R 975b201ae4e5746503ac0fea981e4a4d *R/rollmean.R -4ac2c5e2ce0c7d22b12ed1ffcd5a1b04 *R/window.zoo.R +10144d674a64df659d315a3660b68210 *R/window.zoo.R f00456b37d08ed0da5cd43756e2cf4ea *R/xblocks.R e453aed85b5d4c2a69e8bda7a7fb2f0d *R/xyplot.zoo.R ec1d4ff4cfac5ffdfcededf4c876dd0f *R/yearmon.R @@ -35,10 +35,10 @@ aa3d1814ac79cf44b8c5aa5223f8c3c5 *R/yearqtr.R 0c2817c7040a2d175f2353c2a5342be6 *R/zoo.R 6ce3a445569bd5081a41a2eeca68188e *R/zooreg.R 2384093e877b896e17e0a4db2880d81a *R/zzz.R -34de8b50fe7b4a2bd4d1625599fa3b9c *build/vignette.rds +5dd549a8711e3614dcc034cf8950498f *build/vignette.rds beb8720082847566abaa78c65ee97815 *demo/00Index 1c04abe2bd67fe9ba55d6e1ac3e73cab *demo/zoo-overplot.R -1148328a784117c9ece85e67e7de3c9d *inst/CITATION +46c8080b0ab7f4edc4b376cdd984329d *inst/CITATION 21bede1b02820b648012773b5d3994fe *inst/THANKS bdc15aaa93d42a0e813dbca29806940a *inst/TODO e3acf3d51204abf03613d4db414a318d *inst/WISHLIST @@ -48,19 +48,19 @@ a916af484ffa11d8aa8669404a25e53c *inst/doc/demo1.txt 8ab6ae33767b9f99c8158192e12832c1 *inst/doc/sunw.rda e90680abb6a7cd9bd8de0e07667711b7 *inst/doc/zoo-design.R 5051eb1d34cd0d183e2d84449912c9f8 *inst/doc/zoo-design.Rnw -b1a915b3f49960f42d105ccf55541092 *inst/doc/zoo-design.pdf +0178f6e9cc862e2fb8e34f2ef97fec4a *inst/doc/zoo-design.pdf f258743c6f42e2f350f04b0a5354fa8b *inst/doc/zoo-faq.R abeb6951c1dda54c9f394191dee37559 *inst/doc/zoo-faq.Rnw -d7d48b7f805edf18d67db53e0c378a6b *inst/doc/zoo-faq.pdf +670fac6e9b27643a69f290b8f9989734 *inst/doc/zoo-faq.pdf 8d6f657051d84755ac8455ab71a16af1 *inst/doc/zoo-quickref.R 7ff295aaa718852e5e251f350a5fc0ca *inst/doc/zoo-quickref.Rnw -951c99cfe653112084b86c5deb63a0c6 *inst/doc/zoo-quickref.pdf +d42fda16d1377b924073aa7b353e56bf *inst/doc/zoo-quickref.pdf 7d6ae67bb66889b140f813a41de176ca *inst/doc/zoo-read.R fec411fafcf466d90674fec53e92ff4b *inst/doc/zoo-read.Rnw -78647e88635385643d042ee0ff8b77cd *inst/doc/zoo-read.pdf +cd62f7aa574bda5b3e3b296876dee79b *inst/doc/zoo-read.pdf 429aa6375a73f63cf9fc2ce2e8acbbf5 *inst/doc/zoo.R 4604fde9b40ab9b9c03c5cf6ba4a0939 *inst/doc/zoo.Rnw -86a98694ff7e9c60e2c81d16fea12cf5 *inst/doc/zoo.pdf +b90dc7ce40a04bf042b4bc6a6683156e *inst/doc/zoo.pdf dd2909911733f11d02837283e885402e *inst/include/zoo.h 049de4bce6d54e1245d1f717d46aa214 *man/MATCH.Rd ce5614980ae640df7c8388f72de3a0ca *man/ORDER.Rd @@ -68,7 +68,7 @@ bd9c7117b3bc57122236527f00764538 *man/aggregate.zoo.Rd 9f4520c0da898b2c1015214ad0983a09 *man/as.zoo.Rd e4d5e73b04ea219a68758f5e418cf03d *man/coredata.Rd a91c3b70c28fc5e49376918e6f963781 *man/frequency.Rd -980badf137220c75b960c11262510dbb *man/ggplot2.zoo.Rd +5065376bc3450e37674ae5c4b78f6980 *man/ggplot2.zoo.Rd 0ee53f3c9dd874f11810b2bf48cd2286 *man/index.Rd 8cf1931a2b0bf69932742baa3888633f *man/is.regular.Rd c97b5855503b079c6bb4ec2e47764ede *man/lag.zoo.Rd @@ -89,14 +89,14 @@ bc80d93adebdb275b6ebea39413a1c14 *man/window.zoo.Rd fa0c77d6ec2433b0a48a9f6b481b3180 *man/xyplot.zoo.Rd 36fa499dcea3af90e38d99c0006a46ce *man/yearmon.Rd 9f07c8b098764cf10678e2bcccc98afe *man/yearqtr.Rd -386e7670256237cf3e3f0e601419df5c *man/zoo.Rd +5b2bdbe8dafc1f4282c19bcc2e6715b0 *man/zoo.Rd 58ee858545582658d9d7b4f7532b4e7e *man/zooreg.Rd 3f03da795dd26373156bddc78d41e95d *src/Makevars 3f03da795dd26373156bddc78d41e95d *src/Makevars.win -d0497d676c87199bdef94f8f8a7c2dc5 *src/coredata.c +132711221439cc019865622951f728f3 *src/coredata.c d80f53271535df8c5070377e897052cc *src/init.c -28ea187973338c914a065d7bd1923133 *src/lag.c -b8b5da61bf66a9c5a2c8fe3c8faea58b *tests/Examples/zoo-Ex.Rout.save +91d77ccc8c5941e10405464bce66b4b0 *src/lag.c +5b79779a1a8bde4653841ecdcbf5bea2 *tests/Examples/zoo-Ex.Rout.save cbea17222fe8d8f0846e1ec28ab2b987 *tests/as.Date.R 1882571886517203f54502bc1f8b3fac *tests/as.Date.Rout.save 3208e41199e2d233f5d1272f58d0fd9f *tests/bugfixes.R diff --git a/NAMESPACE b/NAMESPACE index 4d303a8..72aa984 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -304,7 +304,6 @@ if(getRversion() >= "3.6.0") { S3method("as.list", "yearmon") S3method("as.numeric", "yearmon") S3method("as.data.frame", "yearmon") - S3method("axis", "yearmon") S3method("c", "yearmon") S3method("cycle", "yearmon") S3method("diff", "yearmon") @@ -334,7 +333,6 @@ if(getRversion() >= "3.6.0") { S3method("as.list", "yearqtr") S3method("as.numeric", "yearqtr") S3method("as.data.frame", "yearqtr") - S3method("axis", "yearqtr") S3method("c", "yearqtr") S3method("cycle", "yearqtr") S3method("diff", "yearqtr") @@ -369,8 +367,9 @@ if(getRversion() >= "3.6.0") { S3method("coredata", "default") S3method("index", "default") S3method("index2char", "default") - S3method("is.regular", "default") S3method("index2char", "numeric") + S3method("index2char", "POSIXt") + S3method("is.regular", "default") S3method("na.approx", "default") S3method("na.fill", "default") S3method("na.locf", "default") diff --git a/NEWS b/NEWS index 01c476a..38a919c 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,19 @@ +Changes in Version 1.8-12 + + o The autoplot() method for "zoo" objects now uses ggplot() directly rather + than the qplot() function which has been deprecated in recent versions of + ggplot2. + + o Support start = NA and end = NA in addition to start = NULL and end = NULL + for unspecified start and end time of a window() of a zoo series. + + o Remove unnecessary S3 method declarations for axis.yearmon/yearqtr as + axis() is no S3 generic, only Axis() is (reported by Kurt Hornik). + + o The helper function index2char() now calls format() instead of as.character() + for objects inheriting from class POSIXt. + + Changes in Version 1.8-11 o The as.ts() methods for both "zoo" and "zooreg" objects now allow to pass on diff --git a/R/as.zoo.R b/R/as.zoo.R index d1a8c99..0f5dc42 100644 --- a/R/as.zoo.R +++ b/R/as.zoo.R @@ -52,7 +52,7 @@ as.zoo.timeSeries <- function(x, ...) { as.zoo.xts <- function(x, ...) { y <- coredata(x) - if (length(y) == 0) { + if (is.null(dim(y)) && length(y) == 0) { y <- NULL } zoo(y, order.by = index(x), ...) diff --git a/R/ggplot2.zoo.R b/R/ggplot2.zoo.R index 4905ad1..86355fa 100644 --- a/R/ggplot2.zoo.R +++ b/R/ggplot2.zoo.R @@ -78,16 +78,20 @@ autoplot.zoo <- function(object, geom = "line", facets, ...) facets <- if(single) NULL else Series ~ . } else { auto <- FALSE - } + } + ## process defaults as for old qplot-based interface + if(is.character(geom)) geom <- get(paste0("geom_", geom), asNamespace("ggplot2")) + if(inherits(facets, "formula")) facets <- ggplot2::facet_grid(facets) + ## "fake" variables for nonstandard evaluation Index <- Value <- Series <- NULL - + ## call qplot gg <- if(single | (!is.null(facets) & auto)) { - ggplot2::qplot(Index, Value, data = df, geom = geom, facets = facets, ...) + ggplot2::ylab(if(single) levels(df$Series) else "") + ggplot2::xlab("Index") + ggplot2::ggplot(df, ggplot2::aes(x = Index, y = Value, ...)) + geom() + facets + ggplot2::ylab(if(single) levels(df$Series) else "") + ggplot2::xlab("Index") } else { - ggplot2::qplot(Index, Value, data = df, group = Series, geom = geom, facets = facets, colour = Series, ...) + ggplot2::ylab("") + ggplot2::xlab("Index") + ggplot2::ggplot(df, ggplot2::aes(x = Index, y = Value, group = Series, colour = Series, ...)) + geom() + facets + ggplot2::ylab("") + ggplot2::xlab("Index") } return(gg) } diff --git a/R/index2char.R b/R/index2char.R index 4c5ee1e..b1a973c 100644 --- a/R/index2char.R +++ b/R/index2char.R @@ -2,6 +2,8 @@ index2char <- function(x, ...) UseMethod("index2char") index2char.default <- function(x, ...) as.character(x) +index2char.POSIXt <- function(x, ...) format(x, ...) + index2char.numeric <- function(x, frequency = NULL, digits = getOption("digits") - 3, ...) { freq <- frequency diff --git a/R/na.approx.R b/R/na.approx.R index ef3640b..d8ca3c7 100644 --- a/R/na.approx.R +++ b/R/na.approx.R @@ -25,7 +25,7 @@ na.approx.zoo <- function(object, x = index(object), xout, ..., na.rm = TRUE, ma } objectm <- merge(object.x, zoo(, xout)) if (length(dim(objectm)) == 2) colnames(objectm) <- colnames(object) - result <- window(objectm, index = xout) + result <- window(objectm, index. = xout) } result[] <- na.approx.default(object, x = x, xout = xout, na.rm = FALSE, ..., maxgap = maxgap) if ((!missing(order.by) && !is.null(order.by)) || !missing.xout) { diff --git a/R/window.zoo.R b/R/window.zoo.R index 27c74f2..c626719 100644 --- a/R/window.zoo.R +++ b/R/window.zoo.R @@ -12,8 +12,8 @@ window.zoo <- function(x, index. = index(x), start = NULL, end = NULL, ...) end <- floor(end[1]*freq + (end[2] - 1) + .0001)/freq } - if(is.null(start)) { - if(is.null(end)) { + if(is.null(start) || any(is.na(start))) { + if(is.null(end) || any(is.na(end))) { wi <- which(MATCH(all.indexes, index., nomatch = 0) > 0) return(x[wi, , drop = FALSE]) } else { @@ -21,7 +21,7 @@ window.zoo <- function(x, index. = index(x), start = NULL, end = NULL, ...) return(x[wi, , drop = FALSE]) } } else { - if(is.null(end)) { + if(is.null(end) || any(is.na(end))) { wi <- which(in.index & all.indexes >= start) } else { wi <- which(in.index & all.indexes >= start & all.indexes <= end) @@ -44,8 +44,8 @@ window.zoo <- function(x, index. = index(x), start = NULL, end = NULL, ...) end <- floor(end[1]*freq + (end[2] - 1) + .0001)/freq } - if (!is.null(start)) index. <- index.[index. >= start] - if (!is.null(end)) index. <- index.[index. <= end] + if (!is.null(start) && !is.na(start)) index. <- index.[index. >= start] + if (!is.null(end) && !is.na(end)) index. <- index.[index. <= end] wi <- which(MATCH(ix, index., nomatch = 0) > 0) if (length(dim(x)) == 0) diff --git a/build/vignette.rds b/build/vignette.rds index 5d4f340e83ea840283897de05282a45e2a4df25d..bf2fd9d5def7696dd8b4d9d71dfab68e6fefa1f9 100644 GIT binary patch literal 511 zcmV*5_J zE6gseHx2aE|6QqJ*4d5Mriv=W!S>GE@q4px#{Mygq9~5iIF90kmdP>Q_USsJD~r;o zPtOm(lse&9iMbq3<;tP&ELyOK06MbJ!&2n88jAoww75pb1FT0_9k#Uw1jD%23KC&5 zx^m&M4X>;QOtCztNnFp@Akg)b$mDqxbscQgydD=3tP zuae^>3Kq?tF*(1|JO+ zqQuTAJ{$K9?(l7ALGkR=t@daJ(l{8iOi}^n&`Fgb_Dc#o2M zt%Gm)w4y?*j!<8#)zFK*w?+M?+j_nJ)2%4C|D(>=P`fqUxD`czp8@0Re(I+M005^M B1K=1kkaC9#$g1)mQ}hk;OGK9$aeXfBp4>OR*(qO z@wE$2YITaP_@H{eu~yWVOeadtP*XX`r?*4c_?DV6`tcY-=5bJ#g4y z*MYF0#{a-l=e|R-+I#C*t*}+TR|&R&gpXxC6^cIP`ZF!*So z5G8g_acbN*xW~7>1;z7ox9ZUhq;W82nWO^z>3sLnsV%}K+z7J^lCP6#!{i*A;5|z2 zwGKby)0zscIzj`j)*~sA!~`3nwD2*9TW007GV B^CSQO diff --git a/inst/CITATION b/inst/CITATION index 1fe42aa..4d73617 100644 --- a/inst/CITATION +++ b/inst/CITATION @@ -1,19 +1,12 @@ -citHeader("To cite zoo in publications use:") - -citEntry(entry="Article", - title = "zoo: S3 Infrastructure for Regular and Irregular Time Series", - author = personList(as.person("Achim Zeileis"), - as.person("Gabor Grothendieck")), - journal = "Journal of Statistical Software", - year = "2005", - volume = "14", - number = "6", - pages = "1--27", - doi = "10.18637/jss.v014.i06", - - textVersion = - paste("Achim Zeileis and Gabor Grothendieck (2005).", - "zoo: S3 Infrastructure for Regular and Irregular Time Series.", - "Journal of Statistical Software, 14(6), 1-27.", - "doi:10.18637/jss.v014.i06") +bibentry(bibtype = "Article", + title = "zoo: S3 Infrastructure for Regular and Irregular Time Series", + author = c(person(given = "Achim", family = "Zeileis"), + person(given = "Gabor", family = "Grothendieck")), + journal = "Journal of Statistical Software", + year = "2005", + volume = "14", + number = "6", + pages = "1--27", + doi = "10.18637/jss.v014.i06", + header = "To cite zoo in publications use:" ) diff --git a/inst/doc/zoo-design.pdf b/inst/doc/zoo-design.pdf index ec1fac885dda951e081e6458ed2f9810875b811d..8493477da6dc97e6818bdaefb72a757bdf456cf3 100644 GIT binary patch delta 2341 zcmV+=3EK9|i~`Aw0+2HSHX;f(x`U|BZ=X82jbdvLER2tQ%k0Yw|TI zCS(Ho&SrK5&8PPJ*K9V-D?Pz-ED-*3@<5@W(vSOk)Ccv#zLl=7PL}T^$~Num#K5<^ z_ro?->!*FWYByqa9%mn3lQ$~uQk!>^F0O2AvO=)gSvGvgT<5cFI3HNB*Q@g`d4Dy@ z@**G1lDmRL9c?-sy7cECKiNS+p271)QcUfGK9;3E0qV3@0pu{7rv(w6{oq)qAa6&PoG3ok=Rk@aDAd2lLFGtn z4?q{3{ey2iPNo*9EA*DZnz!+-eaHbPz(~npKOF-|8K5P}bFjX%7SJNp^b33Y9++Cz z?OF2#y)NHOY1#DtU$46F`hUlja4w!7WYb~I?ZBvB-G#G(d)Gxo>&^!LZ|CethC5xm z{U^CxDTlhe8?j?lC{b68d)sp0v3g|+~Mu(}z54a{|Ky6+GFS_oq6nA=4)Dr(FRD{UQqrX~DzpuN+} z`$ovL=Ao^S(h)HdQz5>ypMnfZX}DC-WT_}zVJTOvfhVRP0XQRw4Kz!wM@bzcW;a_I z;PAlBx&ji#)RF*Hd`P{U|h22S-M3uoDNRU_&%LM8``8S-HWsDZ(kHej(J)UHJu$gm+h z4+76m5oF|UgqsEb2e3|2TQ^?&`8X3^h*?1>igv0%ccixJE`OO>)R!*;5_+~#*3OKuBg+kYs?o{C}rGsa3;_O&PoTh%B|*Y>B%r`>&Ta{uP(2zYM}8F>Y=Ih%+h@# zY`U+xW8!W7w>9NefP1_i@}OkFHs9(h&DIc3ntL*ojqV7P+%f}ZJuW#m%V(5VmAz~% z3BXVYTYm?f6I*<~q`>L;4pKs`^y3T!K808KFl#bhN8PdGNzaXSRvh|tJ8|?^=e;dV z=hN_cMM~7O)zapcO(WRi-u%zj$P;Wo#RjmG9L9Zsp92?ZGaei|Se9$Exz#eW)s* zBm79^pYg*}H5TkFsO=f`;9my)O<`WHhWQox zJOW-EyFj0>9=1Mkl!hIGNW1A)mqp{`{{eTjKKhRy5$E?EnEHfX_D-r{`vatFUw`#% zQWSUj@01?)_TP4T&+ld#ek$u^voVnU;4|RrkKSdP6u&yO9b~hiot1cY8SSAfz;eXG zYj_I;@&KXAwdimRZh`8c(lV5t0MC*_17+8LfthZSeqN}D%dNHkoOO6;WI#XVdFP&S z)k&Cnyt2|nod~ws5NA38emRdsM}KhK=&}xOihho=Xl$@`@A)y<*RGq}Kj-vEmeD7e zTc}Qm8!i0k8ESZ=up@Eb6n5}i`A>a;9bf_FAFsR6s-pr-jYY>um+D0D+9VgG`T-(Z~YRBennSKB$dG$?|*gqT^F$!$X$(=^I%+ejvkSygc}G zrw|}lMx=HWN1|#1H~Qx&RZ7}8**{y}8#uGN38DfIGc7PQEio}vGBY|dG&(brYYZ$8 zGc7PQEio}vGBY|dG&(brrVParV`DI7WMVWjEio`-Vl6Q-W;wHc4U=~PHc4W;9}DH#uQBlgWi6UlaG47}$h>&J|4r5-dl71ZO&kH62JuuLTlJvOq$>6iBdY zf>??`g3%gCa9jteo6GB{a delta 2318 zcmV+p3Gw#Hi~`Jz0+2HSIg<~C7qLrS0e=LGxaNUiod3qeFO2>2YuOL^1qC z6caK5eP=T}g632E{cAQG=9QjcIR-Ph%gFro%n3;R~Ox;k0DlPKG?uM-2` z?%ogERIQ)(<*MC?)p?wKcun4@v`cN?O}e zB+H9@FiY+V5_PocaOl#XfBa+z1$hR~7fCU-5BgY^`UI%cUImcDY@QZGfDaO||KG5% z5KO|~K2)gkKwAt+3!4@>EFh1(GdoP;gX|j&XYkXJ?f~3F#XA7(4>)=T{VSaIY@W?$ z1DFpdJI+vi*#z%B=-UG3q31`(Ab;F`D`0}Xy}BNi8V7N1-DrA!`sUrs-f!KrUUnO& zNA@=1?0L_Q=hJvb=*x7F4U=?C=v9*Lr+KohI8J7HaX5iqzzj~6BkK(fSS??!8<$-; zEO|70;WR;gc%_zC<0=^z6SN_~#TgOGZG&VM3)b>{;# ztO)~L_;;^uGM-@3KoL|%Q$C|TdPx(S(u@}L2cQLC5l1}-YNW^0c$@<%a-dNE9tV{p zu{{7?aP|+r?KqiQpsvtc25a8NxAq|ioB$&wgZ*?2AZ37-B+tS6&RRf=P}48$?R#Kq zS+{4+6ZE=#Go@wI`+vRazJKc+ONY?`Ii(h(hv5;_I|PU)=!;T@gP9DksAUxy;lUxmd6 z46!W&g;Cln4x@D(Zh=Bu076*Z48R8Fx;NeThkq>uv31Ptq8b%7=7*KG4nNZpemcE(SRWLopkR!HfH7>TJ6-`P(=2BkDyDrmA)6t1w8E7rgh(~kh05yS?XrPiaQjuEq) ztqgE@;AUL`iDK&@*?;1@wjhC6^%Rym@4ve|J+Db^#wS@u!6j4>1?y0eYfuroZCFx) za98P4w(erH(WMxgBqpd~v@8Rs`jCaQ?7FHE^%)_PgT)N_Fa*@V;7c2@SP*L0A`N8N zkevsC=cfoVayP=wg8u_pr>LzPul;7Vo+gpxi4lS}%ZUeTM99eh|BWVg359YT1q=`hYG7-bUpySJV`#&kkqcQLUk z#GTKJ$OEg)&VOv4FztbOfmaPOpw9K{u=TolHsco=xQ1W8 zmRa|`n^!z3Dn}ZaF>E*!Xai^jXIgcoSa;=C^S1P47`Aof%hy+z*H<;rcnS5;RC;FV zJ`pzE*W5Ajw*K3i@+!bRUJrRtvS6EUb(Lmo2q(=w8Ola?1WIn10ka;L9Gm4c%B#v= zHkJfnD1U^l1I~#pK3`JcbbJRXp;r2F1_GbLD}0zWnXaSm*zu(2#yTqweY%}E`m6Ka z7N+xQ_`IT|R%`?7OaiXz7 zYwdY0>KijGRo7~1bIYa?Y;kY?XKV6SYqs~}KuDwY7*3!FtifLz+H)WM=Ee44m(NA@tnp)2`RqPa zmCq4=r1H=B;i(!6b{5rG{6yxTBI5g2R)0*>tU%ieUoCuSlYSEE>Fz`AtY7`Cvwm6X z_QbRPo9D3nY)Tc?h0ma8`@RNkiPw=TmbbUem(FngZ`#4FIU6- z3Vj{{FOFTH&sPsyA2>?G4nd^dbgRpvaq|CwJ6a$8M~{f}`wmQfLN9wK)v)~m(towD zdNwJFyZm=b4}1G>JH6+3vkX6#b+XwQ$bRq{aP>#;GEItK9oi1E+0f2PJiCnc&=p`g zV&OHs1p;}1P~}>5I0m;sbx>&;%1(f1NuhzV>%YKEH%UJ))WhZ0T7S+uJTx+(pYptO z&$#L&%sgIMX`)U9+iZw4odCa_M}MLtIBs-V2RB7OM_DvB*t+-p80>4;&F!Ca`XkHe z6U;4CC&Y~we)J4AyiwSZxNizO_^te>zQ7K!fbx&mU1-%&0j9>HW2A9Phj;=D^+vQ* z{=X6wfa^uoe`|n1#@#`tN6Bbpf$5Rj|8^hLMx$i;y?D{_DYM}rOa1hXtRf!2VKQDG z{JB#IkSilnJBlMwHGv!bbCfD2ZJg{MpNbnov$zSO0uM4RFgYzTHB>P-Ix;XiF_UQw zEDtg*FgYzTHB>P-Ix;XiF_WYW#S%9#IAdfoHaIOdWHL4_F)?O1vwIDbcL6w)4~2F@ zVKQT8WHB*jF)%h|HD+ZrG%z_cVKg){WH2!|He@w2K0IMJGiEkqH!wG1G&wUkVK!o6 zG&C|~HZfv0Ib=34F=Ug+g(Emq_n8>jgn-T!O#~7wM}Y)qI*?$U4kV=30tqHrAR%Z9 olGOwf0*XL_(Hcl_TnC9wW&i-3y9wEoA%-6bGcgJ!B}Gq03fP8NO#lD@ diff --git a/inst/doc/zoo-faq.pdf b/inst/doc/zoo-faq.pdf index 78cacc26067f77f041d305839bda509e76c8d179..199104c6eef27ba4dc0117fa412963b97cd2ede6 100644 GIT binary patch delta 3540 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 OVr4fuVL6vvUIDrtq~2}- delta 3539 zcmV;^4J`7Oz6F-P1(0`t0>p*v^kl}DIB{aTiJc~CI(eWa%4Q>ru0-e3Uw^&@NQojv znX;9cj=~Vv#RAy}kx5p#h>c?hn-LckQJ6T}hC2=flGKnfEU z0&9ekg^&>v3JC>&t`)6~#&UqT5JsU2l!e8bAT2}`gAOR8H`bjNP|%tPN<G3@C>R%VKDg48{Wg zBD8^GMo}W76-Oe9(HNA&*xLX6`YYq7X^{+*B4NftNX{9P^8q7&*dz$d$Uia&u)0WV zlpFsx17BxRXNF~2ioEjeb=lqss(*^nrfE`S`Q$JuQugHV7a2$y#8_>Jt`I*5^1ngw z-=E5M;N!_j@;3dzzGlTWy9U40X*xpntMvQVd^(&}e3}?zO8>a=z>ux@6TY1IA- z#j7g|%Q?xiPWv){Iq>yvepIJw?X=HV^+qn!aqA;$D!V|dMH%PH>&tIRg=hykHm<^`c zZNcJQZFU8kT-;s$l@1E_1nIX~F-|*W4Qr^tn-)(i;XKHH?^`9f&9d-*!$)j|0t+Bea@iS|vjZ=!vZPnEWK1)8%nDbh(XV?ZOPQK#uJ zOZM|`;4HvT$9mVHo7jzFqVYPJqJ5=*=jklJn+`yah#i3#VWrp8X+F3}3((=O505Z- z`mF$gr%&sDd{k`gC$rS`=D$Bbe(~(&=abX({3e+krZ<@gcFxnQyKypQ{MlrX53|V? zbD{xWxzp*8Q_UL<@^#K^xYBEC}EZ77PXg<}J2=t`#H#Ho&(>4)9BF0%lF^W3n`{ zqgBx~LM)A=K#$sznQ(866$Zv}M|sb&#>kY4U~{Ons-<#;C&Wl$?8^ejGu60S(ET*W z(%FEv8+u4Ed;22IuC5EP86k^>qz!(;_xL_P;D`JfKjP2%F+bs_{5SrZzv1Wng1_az z^LPAz5B`xS{E`p&kf(gaulP03_-8)mH+;f#e#?Q3Sw7@{^C_S4f*04*H05{vEC0s7 z^M9afw4cPx4ipyqG)}H&WJ%qQ?N=h}Dxubny8nC%hiGlC$I{y-(JTVN|lg z-sB4UjoF`Ovl#@<2?h*4N-m1@<{ebo)J3O%CUpEmxm*eg*%I`l{nPiaK30PZxwD^- zhcyW|Vae`Xu3z#2P=rhQNSANec1TiSSN4h=ZlOMsos_kz z`s(=@)oAo4o(+&vlXoa}r4MctdXL<`(bnUdmGVZ!>OaNG&^LR zN;S7?UQcEVfq;7g3b=d;+S1z@vYwAD`__##K~z*4X+$3gx(rs0qB^QWYyt^WZd8Jp z7_pD*LwU5NH-%-yzoVf&O%af#FEdSxUD@8b#ijtSVX<9)jm-{Y>1{R^r7F9B*J|r! z{L?|V)qVlH{gS_Ow)?DQz2EZ>H4E<1a**HLB+i;U@;sdkli4*)`)K5F)cyMcOofN& z%sqmi>vRHq{cCRbC)p$g(B}9b4gk59<8)N`)YMTey@K2E-3+e5-*TW^m-^ac2nlf9EShqbZ%5Pcy&YAd;JDY@vWQj=*Yx|cTdL=7scgHY8lF<@23r=O%Fmk%Q0J!hHWbmlhC<1Uj*p_K7eeX-zl$W!lp1ewmKx zX5Xg)-LmQn`IA*&%c|Bf^KF|qVRl6Ke0=-<>Lc8Pvv)_;;14saE6(%f!$T2UUiw&f$YS*B;~ZP= zzLje(eS-S#*K1ZCg_e=OI~k^9&u+O{?`hR9f70a(pN0f2u6!DYI^+~nEuBTRe6T2J z3eY`!*js{s)5@As?NLOwno z4dudTR{JJ~S z0OoqE**+_!P&0_#V9Q$7I&AM0ho1Um@4viP;c9h%>T*14s3%iO3S=u&wFYYq~cVFpkSj#felGQAe%g$Bm2sY``DU^#p{MjrSsGDqp zD8Zk93{hm^m26rC3bzP<=0QR$5}@xwIzC*WI%}lkV_Dl;XRm7{WUap0Xl}nm*CqBw zI@aObuQp|M-Q(v_=g_RyL%k(ERKWxE@JE4*+18}w51Z6RyV;tc-PQyj;+Q;Yf<1R| zTk)te|BfA8*2gL!Z%sSi*0djD6*tz#uBmo^O)n0%G(G)zu&EuVY&?x^g$4TY@Ur2l z(53yB*15RzNaQ4& ze4g`1i@NCq4$k+^n%pOY&sd88f%(mOms;&A8v-JNUHaoSuugy1rnTG^a9n%w-hJrP z!wu;?9;YyI%@NCCHX5Z6C6b*#-IwYzqfxf_o0ECNhft$0(EP`R?o*@D2v0U2BaB(? zYrriHsWkKP*0!dw;Cm&({{y#!#Kg0H4a5QuGA%GUEipAzF*iCgFgh`lQ4lN-GA%GU zEipAzF*iCgFgh`lj1a{pH!wJ3WHL55EjDB_HZ3tRW;iV{FfcGJVlg!}Gc#j2H#BBA zCohxX4km-05x1QY0hLH<;FZUtCt?mgxYDxuua~=>JrA9}zgFY^T0zdm9@PeEgs`s1 z3ERkyNjttApDPd07o&1@(<+sQc&r_g?Dj7^D5%?A-*lG)f^q0wJcZ&p3?91}tUIh| z5;XXCo5$gs#nlh+^IvO|%_g^;S^-r70cN-ITLF3j1Zx^q5tndX0jfedVlrYhHDxwp zIW}Z4G-f$sWM(!wH)An4V`VrwFk&=5JT*5oFl90_G&eIdG-Eh1WiU4|W@IvEI5s&j NH#cK5HkVvp0lKuX*hv5Y diff --git a/inst/doc/zoo-quickref.pdf b/inst/doc/zoo-quickref.pdf index 57a11f4589d6269dfc60f0df9f16b54373e10897..67624a23c76674370c0e7619f1a4e5092ec01c2f 100644 GIT binary patch delta 2968 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 OVr4fuVL6x61OcwMD$b4o delta 2968 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 OFgG`2Gd7pg1Ocudc*VN_ diff --git a/inst/doc/zoo-read.pdf b/inst/doc/zoo-read.pdf index 27acc42fe9e398b0fe8569e0bca2690f7dd3c6b7..a6f16cc6cf52fba66ece4a788a5a1739c3b203d1 100644 GIT binary patch delta 2920 zcmV-u3zzi2fCRsQ1dw+DfRT6}e;_IIBFVI?W-~i94G;v*{T!SFk&}RgL^2|X76FmO z1cE5Sg3u66m=Ga}2-C_CLzpofZwTih#u(v-VUUwBQ~_Zj3035lkkBYbm?T(?aYaO= zF|LVpKv_g2mjb|ulsqIHNF8|2h>WBJa3YNXl8~rS;2Gp7j`xzN2rs!Je>wm@u8EdP z5gw6m~B|`$i7!9OC5ECguK&ml-FP!iKAQ0d=V89?ECr+Rc;64z6 zf*{b5fC#y>KsnJk!D{>me`FR!P7@GOV6=pkAZtt_5|9}Ki4u?*Hv$4fM}P(h z5g;=Ku{aH|2&fex^B{E6Lwo?96QL)zh^KK8L)tKjF`=jN+~zO~ z|8V~0+7fzz_ltB+o;>kO_HK&HG$TLF>}(bULIk)+GRxUl5W;g3AvAs{gxauKp0 z0{&ePeD{4d541lzj?e8|@+m1U$t8HqGCRZTm-fr2G@Ir%Zyr9c_;C0fPqM<#Zh6(> zmR2{e`7VDUIy%zA8p#>x@znBT30m4QeH#W^v2zos%T;jdM6D&9Gy|w zujk*&9I`%1r+10@G)t#96AL*%J3S`PF4MfoCs}e`5Hpf$#4zRT=HfqgQjkaJpC`q_ z)-sp1tXacOY$CLim5s1D_f1uny5bm6HBlP&j_$Dl$ z;4!`_ryx4`rkoTNY+EK?gPj9jb;5lGN0OlfW>Cjm^IkN@e(9^>s zAh(|j0C@7Ge@RD8#(tbzznYE@-ku#j`{DRxoLjwEaxt+c<@I_ zmKO(?appp>$9!l@Wy8-ZUXJ5x3PO@sec=&1^sJ_$#QG+g7MD&%1_3#^^OB%q$Q`n< zwJwrXi!iByNe3F+f>?_q^4f1+Dr(avVFL;q6|A;we?2yb*FBZECE~X0Illay>MeE{ z1aE=uL{x8rYWDk8yv-+0)3ARRim#vBWPVvcLa0u+kLVsfq)+J)eMZOhcN)_RI-!$v zkuK?!TI!e3*({;6n@odMg9+V|zlqhw*hdsLYZ zMqb5NcB8?)z}}Ng_Lg&m2ylFoD!7a0cv_m-G4V8@4Z@C&pL%F*^O8bX%`D)9X)b4X^1+Cif4=pxJ)R~uvw4y?qWmPix{8~zp7w%065UIL z^bIlp+T{}qJ1fdw=Aj@nPSPp;NI%}Bh4pWJuYB9yCh|p`Uv@T&Kj|lI7+?BZhGTrw zmf_1J6f90Ut%#$YSX&Wiv)2#ZHY6LmZ5*DT|Nit%16L;@+O}WFHG!tepBftme;XKR zLe|bmBGt`MM5tQt>kUTra+#LJB13gEBqD%sxy#?Ac5$=DS+*sd^1slo3dZfSpbEZ1 zKIQKI_7t_Zr>JfJFJSFwz3gQUn_a+O%fzJcNywKC83^kBH7Q60P8_nfIkB!eZBX%0 zTjJvGtxNU|>-p<q)vyfA5`&graX+vS(UDa}il3pp`+mM76rR&-c0OwVPlB zjsFk96}0}Zr~jY4@5;h>*f#ThALx&KkUw4p`F|sIF9ZE=b)e5(sLemnxLBLe+mAQ# z!iV~`asEFKj`Y)u#eJfCKfZIba>#aoe=N$kGSvN)QuD4yZuE`8J}K|?e@VgnK6!ll zX8+(9;600%`MrHI;(ed&mcr3cmsCRCGtD12RI%D;74ojA6C2?nNXYtX2)k<7D2|~? zeKd5JeerJp-SK`S1eX{F3LaZkPw@T1Z0J6#d;98utPgvqtLWFi@q06Zu?T9&%J0o0 zx?9IlD~P=GVIcKh`l-7cf68sUp(K%9r*zR(`bJd@_PtG7U*~&c<_^V68pg~WTGxH) zeq5;f+WoLl_5F_uWgoGm>KRgwb&u6_wI}}lW3>wB1CQ0t_x4}ET%{Oii+EYwJG_Yg zmd|_HB;+*A%DZLdwo6y%X1dBKU9q`#Uf3;#+f`+-wx$dQRFpmke{EEgy$Z|m-Kenq zW9yWxeL_}OP3_aL(yxlPSE+4YrAP#8bm-b%rMg~qhXD-st%n_xym-2I^6I>EMDy## zBKde@2U;IvtZ#mQBjXI#o7%e5Eyq$rx#i%~ppEJA$8e|glxj*6UBMaflC61=@U zxmiwamQT{m4y#l;g$nfI-zvCCKU?Y@es6cxfnmag+wNfP&8Q&fHJzND!7#(hQ6 zPMErBQWWecO$vhtq)GQ@Zw*VEbHIr0iaGvOn7c!FTNvfLVpM#CS`2r^ocb2D*ke!Z zioJ&vDsA@ef7Dlx_+3?5;_HNuhkKaX6{BA#lngPvU43{WzE04%uU|#GV(;sOjr*CS z*%fntKWO};erI--pUD4Ne$r!US6PYtCbE(qd%Ma-D{*2Jqf8!VR`@M<#y15*BbQLFyBK>hb z&(Z=l_cXDS4?oY{=m-`3_a5winxXiu2=|{+9QX&w(LFpzMd~P?IGPwUBPk3VOpd~k z5iY|KR}qm?qxI)wt5c%mWcgu5l#}FrsotAhCRd~1Evo1w|9SlQI!oPmz@s#qKb&$A z=@C*-Os>_4X-$MNBaIqp5aGiz-eEz{9o%g>Lp@ApGYgY(Hu8u6Ty{1~Zoda!O?(hE zL%N40JA&+f#Q~Ws1peHH7)5SB3R;ipzu>>|W3x>QumTV>Eig1KF)>s!GdeOfIx{ho z4Gt?1Gc7PQEio}vGBY|dG&(aelSmH45@Ta9Wn^MBGA%JMV`42aF=jcl9uFt*LNQ`C zF)}h^H8W-~G&g2tIXN^kVlZW7V`VosVq-UBVm>@LW@R>GVqrNnHZU+aF=RM5W@9*H SI5je6G-72pIbk`IhyS>(?wAJv delta 2920 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 SGG;h7IWRXjV>33BhyS?hD3^r* diff --git a/inst/doc/zoo.pdf b/inst/doc/zoo.pdf index c14f1fb1a68599ea82420b412f88a385e7b79275..ace34ec60fb882b834e6aeada86bebeea84dd5d7 100644 GIT binary patch delta 6083 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 JxAqAG9Rc$gxWWJc delta 6072 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 0) ? 1 : 0; - int nr = nrows(x); - int nc = ncols(x); + R_xlen_t nr = nrows(x); + R_xlen_t nc = ncols(x); int P=0; int PAD = INTEGER(coerceVector(_pad,INTSXP))[0]; @@ -49,11 +49,11 @@ Rprintf("zoo_lag\n"); error("abs(k) must be less than nrow(x)"); PROTECT(result = allocVector(TYPEOF(x), - length(x) - (PAD ? 0 : abs(k)*nc))); P++; + xlength(x) - (PAD ? 0 : abs(k)*nc))); P++; - int nrr; - if(length(result) > 0) - nrr = (int)(length(result)/nc); + R_xlen_t nrr; + if(xlength(result) > 0) + nrr = (R_xlen_t)(xlength(result)/nc); else /* handle zero-length objects */ nrr = nr - (PAD ? 0 : abs(k)); diff --git a/tests/Examples/zoo-Ex.Rout.save b/tests/Examples/zoo-Ex.Rout.save index 7364f85..a15a433 100644 --- a/tests/Examples/zoo-Ex.Rout.save +++ b/tests/Examples/zoo-Ex.Rout.save @@ -1,5 +1,5 @@ -R version 4.2.1 (2022-06-23) -- "Funny-Looking Kid" +R version 4.2.2 Patched (2022-11-10 r83330) -- "Innocent and Trusting" Copyright (C) 2022 The R Foundation for Statistical Computing Platform: x86_64-pc-linux-gnu (64-bit) @@ -514,11 +514,10 @@ Frequency = 3 + autoplot(z, facets = Series ~ .) ## multiple with series-dependent color/linetype + autoplot(z, facets = NULL) ## single with series-dependent color/linetype + ## by hand with color/linetype and with/without facets -+ qplot(x = Index, y = Value, group = Series, colour = Series, -+ linetype = Series, facets = Series ~ ., data = fortify(z, melt = TRUE)) + -+ geom_line() + xlab("Index") + ylab("") -+ ggplot(aes(x = Index, y = Value, group = Series, colour = Series, linetype = Series), ++ ggz <- ggplot(aes(x = Index, y = Value, group = Series, colour = Series, linetype = Series), + data = fortify(z, melt = TRUE)) + geom_line() + xlab("Index") + ylab("") ++ ggz ++ ggz + facet_grid(Series ~ .) + ## variations + autoplot(z, geom = "point") + autoplot(z, facets = NULL) + geom_point() @@ -2943,7 +2942,7 @@ Feb 2000 NA 6 > ### na.contiguous.list na.contiguous.default na.contiguous.zoo scale.zoo > ### xtfrm.zoo names.zoo names<-.zoo quantile.zoo rev.zoo transform.zoo > ### ifelse.zoo dim<-.zoo index2char index2char.default index2char.numeric -> ### head.ts tail.ts +> ### index2char.POSIXt head.ts tail.ts > ### Keywords: ts > > ### ** Examples @@ -3263,7 +3262,7 @@ NA 1 2 3 NA 6 > cleanEx() > options(digits = 7L) > base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n") -Time elapsed: 1.953 0.048 2.009 0 0 +Time elapsed: 1.909 0.039 1.948 0 0 > grDevices::dev.off() null device 1