version 4.1-6

Changelog

@@ -1,3 +1,6 @@
+2014 Mar 07	4.1-6	model.frame method could fail when the recorded
+			call was rpart::rpart().
+
 2014 Jan 25	4.1-5	Avoid abbreviation in tests/treble.R
 			More comprehensive Description: field.
 

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: rpart
 Priority: recommended
-Version: 4.1-5
-Date: 2014-01-25
+Version: 4.1-6
+Date: 2014-03-07
 Authors@R: c(person("Terry", "Therneau", role = "aut",
 	             email = "[email protected]"),
              person("Beth", "Atkinson", role = "aut",	
@@ -20,11 +20,11 @@ LazyData: yes
 ByteCompile: yes
 Note: Maintainers are not available to give advice on using a package
         they did not author.
-Packaged: 2014-01-25 18:14:23 UTC; ripley
+Packaged: 2014-03-07 12:11:23 UTC; ripley
 Author: Terry Therneau [aut],
   Beth Atkinson [aut],
   Brian Ripley [aut, trl, cre] (author of R port)
 Maintainer: Brian Ripley <[email protected]>
 NeedsCompilation: yes
 Repository: CRAN
-Date/Publication: 2014-01-25 19:29:10
+Date/Publication: 2014-03-08 11:01:53

MD5

@@ -1,13 +1,13 @@
-b1a64261ed5e7ca8ed0c280b48a171c8 *ChangeLog
+7871f512c08b5c55b56a80b654b8bbe5 *ChangeLog
 c3a78d906ce7e11764be494ca072ab85 *Changelog.TMT
-0c8ee847a77dc2a223e8a3f43070d094 *DESCRIPTION
+15818f50c5252dfb96bf848c10e311ff *DESCRIPTION
 73cac1c067f00591afe1f6c05364934a *NAMESPACE
 63fbade7d5b393e3107669ae0b1bd8b0 *PORTING
 cb1fe3dc41870fdc62bcaf87a40664b7 *R/formatg.R
 aa5afc20386b8705ba44f575f902efef *R/importance.R
 1080f1867f4663f6bddc19e2a3ca2f0b *R/labels.rpart.R
 274548a5479fe1d91ce7bbfb60414995 *R/meanvar.rpart.R
-51ba77a4695ec005c42c072017c2cce3 *R/model.frame.rpart.R
+58e5624268fa2b9260a7568dea013c38 *R/model.frame.rpart.R
 546561c031c0158df96c287eda76a11f *R/na.rpart.R
 2d37a00508bd10a6a9c2db62a775c947 *R/path.rpart.R
 0234957cb2f20903ec875cbdfa3ae324 *R/plot.rpart.R
@@ -49,10 +49,10 @@ c074ec48b3561a633f13dfd4bfbcccd6 *data/car90.rda
 d90ecb38c94a2b9d6b84772daee39def *inst/NEWS.Rd
 826935d99a3cb923990d55b0e9454f18 *inst/doc/longintro.R
 d59df045075a1735e6d1bf2510b6a90a *inst/doc/longintro.Rnw
-22bd96f247aa675f1abc6df165efe80a *inst/doc/longintro.pdf
+87e6a4959535501dab6bc9921f6199b7 *inst/doc/longintro.pdf
 e5598bd99b989df58f9fc60e19de4cd3 *inst/doc/usercode.R
 cc52160d413d59a2967d5d201adf9319 *inst/doc/usercode.Rnw
-d5c2e6f4948b547f340ced4893f60e1a *inst/doc/usercode.pdf
+aadb5fa064fb05abf9c2f6dbb5673f83 *inst/doc/usercode.pdf
 2497850af8f9ea1fa46563c82948f40a *inst/po/de/LC_MESSAGES/R-rpart.mo
 1b19982c4f9311d321fc00700459d9c6 *inst/po/de/LC_MESSAGES/rpart.mo
 d8bc881816e296570147df78c9787e58 *inst/po/en@quot/LC_MESSAGES/R-rpart.mo

R/model.frame.rpart.R

@@ -11,7 +11,8 @@ model.frame.rpart <- function(formula, ...)
         }
         return(m)
     }
-    while(deparse(oc[[1L]]) != "rpart") oc <- eval(oc[[2L]])$call
+    while(!deparse(oc[[1L]]) %in%  c("rpart", "rpart::rpart", "rpart:::rpart"))
+        oc <- eval(oc[[2L]])$call
     oc$subset <- names(formula$where)
     oc$method <- formula$method
     eval(oc)