Binary files /tmp/tmp8bU3CQ/SSd1fAnxQk/r-cran-formula-1.2-3/build/partial.rdb and /tmp/tmp8bU3CQ/IjL2yT5VKX/r-cran-formula-1.2-4/build/partial.rdb differ Binary files /tmp/tmp8bU3CQ/SSd1fAnxQk/r-cran-formula-1.2-3/build/vignette.rds and /tmp/tmp8bU3CQ/IjL2yT5VKX/r-cran-formula-1.2-4/build/vignette.rds differ diff -Nru r-cran-formula-1.2-3/debian/changelog r-cran-formula-1.2-4/debian/changelog --- r-cran-formula-1.2-3/debian/changelog 2020-05-16 02:24:16.000000000 +0000 +++ r-cran-formula-1.2-4/debian/changelog 2020-10-20 16:36:33.000000000 +0000 @@ -1,3 +1,13 @@ +r-cran-formula (1.2-4-1) unstable; urgency=medium + + * New upstream release + + * debian/control: Set Build-Depends: to current R version + * debian/control: Switch to virtual debhelper-compat (= 11) + * debian/compat: Removed + + -- Dirk Eddelbuettel Tue, 20 Oct 2020 11:36:33 -0500 + r-cran-formula (1.2-3-3) unstable; urgency=medium * Rebuilt for r-4.0 transition diff -Nru r-cran-formula-1.2-3/debian/compat r-cran-formula-1.2-4/debian/compat --- r-cran-formula-1.2-3/debian/compat 2018-05-08 16:46:22.000000000 +0000 +++ r-cran-formula-1.2-4/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -9 diff -Nru r-cran-formula-1.2-3/debian/control r-cran-formula-1.2-4/debian/control --- r-cran-formula-1.2-3/debian/control 2020-05-16 02:24:16.000000000 +0000 +++ r-cran-formula-1.2-4/debian/control 2020-10-20 16:36:33.000000000 +0000 @@ -2,7 +2,7 @@ Section: gnu-r Priority: optional Maintainer: Dirk Eddelbuettel -Build-Depends: debhelper (>= 10), r-base-dev (>= 4.0.0), dh-r +Build-Depends: debhelper-compat (= 11), r-base-dev (>= 4.0.3), dh-r Standards-Version: 4.5.0 Vcs-Browser: https://salsa.debian.org/edd/r-cran-formula Vcs-Git: https://salsa.debian.org/edd/r-cran-formula.git diff -Nru r-cran-formula-1.2-3/DESCRIPTION r-cran-formula-1.2-4/DESCRIPTION --- r-cran-formula-1.2-3/DESCRIPTION 2018-05-03 07:53:28.000000000 +0000 +++ r-cran-formula-1.2-4/DESCRIPTION 2020-10-16 13:50:06.000000000 +0000 @@ -1,19 +1,19 @@ Package: Formula -Version: 1.2-3 -Date: 2018-05-02 +Version: 1.2-4 +Date: 2020-10-16 Title: Extended Model Formulas Description: Infrastructure for extended formulas with multiple parts on the right-hand side and/or multiple responses on the left-hand side - (see ). + (see ). Authors@R: c(person(given = "Achim", family = "Zeileis", role = c("aut", "cre"), email = "Achim.Zeileis@R-project.org", comment = c(ORCID = "0000-0003-0918-3766")), person(given = "Yves", family = "Croissant", role = "aut", email = "Yves.Croissant@univ-reunion.fr")) Depends: R (>= 2.0.0), stats License: GPL-2 | GPL-3 NeedsCompilation: no -Packaged: 2018-05-02 23:06:48 UTC; zeileis +Packaged: 2020-10-16 12:39:27 UTC; zeileis Author: Achim Zeileis [aut, cre] (), Yves Croissant [aut] Maintainer: Achim Zeileis Repository: CRAN -Date/Publication: 2018-05-03 07:53:28 UTC +Date/Publication: 2020-10-16 13:50:06 UTC diff -Nru r-cran-formula-1.2-3/inst/CITATION r-cran-formula-1.2-4/inst/CITATION --- r-cran-formula-1.2-3/inst/CITATION 2017-07-10 23:06:33.000000000 +0000 +++ r-cran-formula-1.2-4/inst/CITATION 2020-10-16 12:38:48.000000000 +0000 @@ -9,10 +9,5 @@ pages = "1--13", doi = "10.18637/jss.v034.i01", - header = "To cite Formula in publications use:", - textVersion = - paste("Achim Zeileis, Yves Croissant (2010).", - "Extended Model Formulas in R: Multiple Parts and Multiple Responses.", - "Journal of Statistical Software 34(1), 1-13.", - "doi:10.18637/jss.v034.i01") + header = "To cite Formula in publications use:" ) Binary files /tmp/tmp8bU3CQ/SSd1fAnxQk/r-cran-formula-1.2-3/inst/doc/Formula.pdf and /tmp/tmp8bU3CQ/IjL2yT5VKX/r-cran-formula-1.2-4/inst/doc/Formula.pdf differ diff -Nru r-cran-formula-1.2-3/man/Formula.Rd r-cran-formula-1.2-4/man/Formula.Rd --- r-cran-formula-1.2-3/man/Formula.Rd 2014-07-12 12:36:52.000000000 +0000 +++ r-cran-formula-1.2-4/man/Formula.Rd 2020-10-16 12:38:17.000000000 +0000 @@ -103,7 +103,7 @@ \references{ Zeileis A, Croissant Y (2010). Extended Model Formulas in R: Multiple Parts and Multiple Responses. \emph{Journal of Statistical Software}, \bold{34}(1), 1--13. - \url{http://www.jstatsoft.org/v34/i01/}. + \doi{10.18637/jss.v034.i01} } \seealso{\code{\link{model.frame.Formula}}} diff -Nru r-cran-formula-1.2-3/man/model.frame.Formula.Rd r-cran-formula-1.2-4/man/model.frame.Formula.Rd --- r-cran-formula-1.2-3/man/model.frame.Formula.Rd 2017-11-02 12:17:09.000000000 +0000 +++ r-cran-formula-1.2-4/man/model.frame.Formula.Rd 2020-10-16 12:38:11.000000000 +0000 @@ -88,7 +88,7 @@ \references{ Zeileis A, Croissant Y (2010). Extended Model Formulas in R: Multiple Parts and Multiple Responses. \emph{Journal of Statistical Software}, \bold{34}(1), 1--13. - \url{http://www.jstatsoft.org/v34/i01/}. + \doi{10.18637/jss.v034.i01} } \seealso{\code{\link{Formula}}, \code{\link[stats]{model.frame}}, diff -Nru r-cran-formula-1.2-3/MD5 r-cran-formula-1.2-4/MD5 --- r-cran-formula-1.2-3/MD5 2018-05-03 07:53:28.000000000 +0000 +++ r-cran-formula-1.2-4/MD5 2020-10-16 13:50:06.000000000 +0000 @@ -1,14 +1,15 @@ -747e245745bc2d1a817e2800211032eb *DESCRIPTION +0fa4b4798796b90d1bc6ab0bd85ed1d5 *DESCRIPTION d9799c7b3b68df94f6b84382ffecd5a5 *NAMESPACE -062bb22ea4ac54c46bef921df9385525 *NEWS -5088c8e9a6b40366b5edf77e6882d514 *R/Formula.R -67a27ab1db5c960cdfa26eaf4e62505c *build/vignette.rds -3f99497a2434b84a5c2445c4eec6bcd0 *inst/CITATION +0a5056fa0c48a2ea4485ab593be9712f *NEWS.md +6a5b696a6b32afbae1a0ba1ffda07fd8 *R/Formula.R +2c796a976b9a400e95f2a85a81d1200a *build/partial.rdb +5924085cf606cc78c42830a8c88a3bc3 *build/vignette.rds +f96aaae1d6b71bf7af7d9ad09d59400d *inst/CITATION ae4c4bf2ff5a0d0adbdfbb30bc0d23bf *inst/doc/Formula.R 0e62223f1646a8021221d03e42ea4a26 *inst/doc/Formula.Rnw -c5f3bc4e85e9858af9dbbd5a22175691 *inst/doc/Formula.pdf -30b0d76d32423f22294bf9aa4a221371 *man/Formula.Rd -e132cf329c15cbd9f7979c9c51d046ad *man/model.frame.Formula.Rd +67c4ea8c85925c3336ecba01cab5d61c *inst/doc/Formula.pdf +b73ed588198b59490f20a4cafecee44f *man/Formula.Rd +8af46938a49a703fb56b6f30a63432f3 *man/model.frame.Formula.Rd febdc7447a72040aba2b57c87bce228b *tests/Examples/Formula-Ex.Rout.save 0e62223f1646a8021221d03e42ea4a26 *vignettes/Formula.Rnw e99ed6af2b803dc98ec4c6b2f6c042b4 *vignettes/Formula.Rout.save diff -Nru r-cran-formula-1.2-3/NEWS r-cran-formula-1.2-4/NEWS --- r-cran-formula-1.2-3/NEWS 2018-05-02 23:03:24.000000000 +0000 +++ r-cran-formula-1.2-4/NEWS 1970-01-01 00:00:00.000000000 +0000 @@ -1,136 +0,0 @@ -Changes in Version 1.2-3 - - o Extended processing of formulas with one or more '.' on the - right-hand side: In addition to "separate" and "sequential" processing, - there is now dot="previous" which resolves the '.' relative to - the previous right-hand side part. - - o model.part() failed in case of variables/terms with very long - names. Now deparse(..., width.cutoff = 500) is used to support - very long variable names as well. - - -Changes in Version 1.2-2 - - o Enhance Formula() so that if a "Formula" is supplied it is simply - returned unchanged (rather than throwing a warning). - - o Enhance update() method for "Formula" object so that also the "new" - formula can be a "Formula" object. - - -Changes in Version 1.2-1 - - o Bug fix for formulas with transformed variables on the left-hand - side (e.g., cbind(), log(), or Surv()) and one ore more '.' on the - right-hand side. The terms() and hence the model.frame() now work - smoothly. When using model.part() the same Formula (plus 'dot' - argument) has to be supplied when preparing the model.frame() and - the model.part(). - - -Changes in Version 1.2-0 - - o Extended processing of formulas with one or more '.' on the - right-hand side. - - -Changes in Version 1.1-2 - - o Added a str() method. - - -Changes in Version 1.1-1 - - o The CITATION was incorrect and is fixed now. - - -Changes in Version 1.1-0 - - o All methods returning "formula" or "Formula" objects now preserve the - environment of the originally supplied object by default. - - o The default and formula methods of as.Formula() methods now also take - an env argument. - - -Changes in Version 1.0-1 - - o Added a terms = FALSE argument to model.part() method for "Formula" - objects. This can be leveraged when processing multiple offsets. - For example for y ~ x + offset(o1) | z + offset(o2). See ?model.part - for a worked example. - - -Changes in Version 1.0-0 - - o package now published in Journal of Statistical Software, - see http://www.jstatsoft.org/v34/i01/ - and citation("Formula") within R. - - o added an all.equal() method for "Formula" objects that produces - more intelligible output in case the result is not TRUE. - - o fixed an error of the update() method for "Formula" objects - without LHS. - - -Changes in Version 0.2-0 - - o Major revision (not fully backward compatible) to enable support - for multiple responses and multiple parts on the right-hand side - such as - y1 | y2 ~ x - y1 + y2 ~ x1 + x2 | z1 - y ~ u1 + u2 | v1 | x1 + x2 - and combinations of these. - - o Formula objects now consist of the original formula plus two - attributes "lhs" and "rhs" that contain the parts of the decomposed - left- and right-hand side, respectively. - - o Most methods take arguments "lhs" and "rhs" which allow selection - of the desired parts on the left- and right-hand side respectively, - e.g., in a model.frame() or model.matrix(). - - o The previous arguments response = TRUE/FALSE and - part = "first"/"second"/"both" were not flexible enough anymore - and have been deprecated. Use the streamlined lhs/rhs arguments - instead. - - o vignette("Formula", package = "Formula") illustrates usage of - the tools provided by the package and explains the ideas underlying - its implementation. - - -Changes in Version 0.1-3 - - o added CITATION file. - - o added a has.intercept function with methods for formula and - Formula objects. - - o change the default value for model.frame.Formula: "both" for a - two-part formula and "first" otherwise. - - -Changes in Version 0.1-2 - - o Bug fix: as.Formula() failed for very long formulas. - - -Changes in Version 0.1-1 - - o First CRAN release of package "Formula" for extended - formula processing. This package is still under development - and the interface might change in future versions. - - o Currently, this enables processing of formulas such as - y ~ x1 + x2 | z1 + z2 + z3 - with two parts on the right hand side. - - o Generalization to further formulas are planned (i.e., - not implemented yet), e.g., - y1 + y2 ~ x1 + x2 + x3 - y ~ x1 + x2 | u1 | v1 + v2 + v3 | ... - i.e., multiple responses and multi-part formulas. diff -Nru r-cran-formula-1.2-3/NEWS.md r-cran-formula-1.2-4/NEWS.md --- r-cran-formula-1.2-3/NEWS.md 1970-01-01 00:00:00.000000000 +0000 +++ r-cran-formula-1.2-4/NEWS.md 2020-10-16 11:48:28.000000000 +0000 @@ -0,0 +1,143 @@ +# Formula 1.2-4 + +* `model.part()` method tries to avoid calling `has_dot()` by checking the + data attributes first. This can greatly improve speed when there are lots + of variables in a model part that is actually not of interest. + + +# Formula 1.2-3 + +* Extended processing of formulas with one or more `.` on the + right-hand side: In addition to `"separate"` and `"sequential"` processing, + there is now `dot = "previous"` which resolves the `.` relative to + the previous right-hand side part. + +* `model.part()` failed in case of variables/terms with very long + names. Now `deparse(..., width.cutoff = 500)` is used to support + very long variable names as well. + + +# Formula 1.2-2 + +* Enhance `Formula()` so that if a `Formula` is supplied it is simply + returned unchanged (rather than throwing a warning). + +* Enhance `update()` method for `Formula` object so that also the "new" + formula can be a `Formula` object. + + +# Formula 1.2-1 + +* Bug fix for formulas with transformed variables on the left-hand + side (e.g., `cbind()`, `log()`, or `Surv()`) and one ore more `.` on the + right-hand side. The `terms()` and hence the `model.frame()` now work + smoothly. When using `model.part()` the same `Formula` (plus `dot` + argument) has to be supplied when preparing the `model.frame()` and + the `model.part()`. + + +# Formula 1.2-0 + +* Extended processing of formulas with one or more `.` on the + right-hand side. + + +# Formula 1.1-2 + +* Added a `str()` method. + + +# Formula 1.1-1 + +* The `CITATION` was incorrect and is fixed now. + + +# Formula 1.1-0 + +* All methods returning `formula` or `Formula` objects now preserve the + environment of the originally supplied object by default. + +* The default and formula methods of `as.Formula()` methods now also take + an `env` argument. + + +# Formula 1.0-1 + +* Added a `terms = FALSE` argument to `model.part()` method for `Formula` + objects. This can be leveraged when processing multiple offsets. + For example for `y ~ x + offset(o1) | z + offset(o2)`. See `?model.part` + for a worked example. + + +# Formula 1.0-0 + +* Package now published in _Journal of Statistical Software_: + [doi:10.18637/jss.v034.i01](https://doi.org/10.18637/jss.v034.i01) + and `citation("Formula")` within R. + +* Added an `all.equal()` method for `Formula` objects that produces + more intelligible output in case the result is not `TRUE`. + +* Fixed an error of the `update()` method for `Formula` objects + without LHS. + + +# Formula 0.2-0 + +* Major revision (not fully backward compatible) to enable support + for multiple responses and multiple parts on the right-hand side + such as + `y1 | y2 ~ x`, + `y1 + y2 ~ x1 + x2 | z1`, or + `y ~ u1 + u2 | v1 | x1 + x2` + and combinations of these. + +* `Formula` objects now consist of the original formula plus two + attributes `"lhs"` and `"rhs"` that contain the parts of the decomposed + left- and right-hand side, respectively. + +* Most methods take arguments `"lhs"` and `"rhs"` which allow selection + of the desired parts on the left- and right-hand side respectively, + e.g., in a `model.frame()` or `model.matrix()`. + +* The previous arguments `response = TRUE`/`FALSE` and + `part = "first"`/`"second"`/`"both"` were not flexible enough anymore + and have been deprecated. Use the streamlined `lhs`/`rhs` arguments + instead. + +* `vignette("Formula", package = "Formula")` illustrates usage of + the tools provided by the package and explains the ideas underlying + its implementation. + + +# Formula 0.1-3 + +* Added `CITATION` file. + +* Added a `has.intercept()` function with methods for `formula` and + `Formula` objects. + +* Change the default value for `model.frame.Formula`: `"both"` for a + two-part formula and `"first"` otherwise. + + +# Formula 0.1-2 + +* Bug fix: `as.Formula()` failed for very long formulas. + + +# Formula 0.1-1 + +* First CRAN release of package `Formula` for extended + formula processing. This package is still under development + and the interface might change in future versions. + +* Currently, this enables processing of formulas such as + `y ~ x1 + x2 | z1 + z2 + z3` + with two parts on the right hand side. + +* Generalization to further formulas are planned (i.e., + not implemented yet), e.g., + `y1 + y2 ~ x1 + x2 + x3` or + `y ~ x1 + x2 | u1 | v1 + v2 + v3 | ...` + i.e., multiple responses and multi-part formulas. diff -Nru r-cran-formula-1.2-3/R/Formula.R r-cran-formula-1.2-4/R/Formula.R --- r-cran-formula-1.2-3/R/Formula.R 2018-05-02 22:54:14.000000000 +0000 +++ r-cran-formula-1.2-4/R/Formula.R 2020-10-16 11:01:33.000000000 +0000 @@ -173,9 +173,9 @@ } ## - if(has_dot(object) && - !is.null(attr(data, "terms")) && + if(!is.null(attr(data, "terms")) && all(c("Formula_with_dot", "Formula_without_dot", "dot") %in% names(attributes(attr(data, "terms")))) && + has_dot(object) && dot == attr(attr(data, "terms"), "dot") && simplify_to_formula(object, lhs = lhs, rhs = rhs) == simplify_to_formula(attr(attr(data, "terms"), "Formula_with_dot"), lhs = lhs, rhs = rhs) ) {