version 7.3-49

cran · Feb 23, 2018 · e0e8cbf · e0e8cbf
1 parent 6c1baa3
commit e0e8cbf
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 22 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: MASS
 Priority: recommended
-Version: 7.3-48
-Date: 2017-12-24
-Revision: $Rev: 3474 $
+Version: 7.3-49
+Date: 2018-02-23
+Revision: $Rev: 3481 $
 Depends: R (>= 3.1.0), grDevices, graphics, stats, utils
 Imports: methods
 Suggests: lattice, nlme, nnet, survival
@@ -24,7 +24,7 @@ License: GPL-2 | GPL-3
 URL: http://www.stats.ox.ac.uk/pub/MASS4/
 Contact: <MASS@stats.ox.ac.uk>
 NeedsCompilation: yes
-Packaged: 2017-12-24 13:56:45 UTC; ripley
+Packaged: 2018-02-23 05:49:55 UTC; ripley
 Author: Brian Ripley [aut, cre, cph],
   Bill Venables [ctb],
   Douglas M. Bates [ctb],
@@ -33,4 +33,4 @@ Author: Brian Ripley [aut, cre, cph],
   David Firth [ctb]
 Maintainer: Brian Ripley <ripley@stats.ox.ac.uk>
 Repository: CRAN
-Date/Publication: 2017-12-25 17:40:49 UTC
+Date/Publication: 2018-02-23 08:09:50 UTC
diff --git a/MD5 b/MD5
@@ -1,4 +1,4 @@
-2733149dba6be709ce2967da51bc0e79 *DESCRIPTION
+33716af37003e48dc8248f8f2a17c9f0 *DESCRIPTION
 35aff05a505ecf7e81e0473767794ca9 *INDEX
 69dc33cbb77b951a255d313b9a318b0a *LICENCE.note
 0ac7b30ad35a4c19ea69d76a6a366b02 *NAMESPACE
@@ -217,7 +217,7 @@ a186e33c5945178fa1ca69a433c1bf3b *man/eagles.Rd
 df9ff3b3ed9842a6c2d767dfb14233d8 *man/eqscplot.Rd
 d6c9433b3ee2a9fe920dcedecbefdf06 *man/farms.Rd
 7d46e561298348eafcb2464adcfa66b2 *man/fgl.Rd
-fe390cf0437098a11251b103a0788822 *man/fitdistr.Rd
+c9354f03af7c5806071ad7554b0e5306 *man/fitdistr.Rd
 84a1341dab0450af647d63e235728383 *man/forbes.Rd
 6f7df5c4aadc280d302a025110571c4b *man/fractions.Rd
 e2971220e00d364f968079d07203da26 *man/galaxies.Rd
@@ -326,7 +326,7 @@ a0854fee9b36691ca1d0880da31d6f79 *tests/fitdistr.R
 55c6f4de353b9479359459d2718a017e *tests/fitdistr.Rout.save
 afd4f607cba7fda8ec4d22bffd88fc50 *tests/glm.nb.R
 7fea2161b12d01c8940107342815dd0e *tests/hubers.R
-8d87026da3c153e0fa65eb33c150d072 *tests/lme.R
+80c50d5c299f0d0a4dbbb457a235faba *tests/lme.R
 edee76adc2d27e4ba90f1ff79360148b *tests/polr.R
 f4e6b3ffb6521ea7625515e2f0ae7f98 *tests/profile.R
 a23ddf89e02a02ed030e4ed5538d3430 *tests/regression.R

diff --git a/man/fitdistr.Rd b/man/fitdistr.Rd
@@ -25,7 +25,7 @@ fitdistr(x, densfun, start, \dots)
   at its first argument.
 
   Distributions \code{"beta"}, \code{"cauchy"}, \code{"chi-squared"},
-  \code{"exponential"}, \code{"f"}, \code{"gamma"}, \code{"geometric"},
+  \code{"exponential"}, \code{"gamma"}, \code{"geometric"},
   \code{"log-normal"}, \code{"lognormal"}, \code{"logistic"},
   \code{"negative binomial"}, \code{"normal"}, \code{"Poisson"},
   \code{"t"} and \code{"weibull"} are recognised, case being ignored.

diff --git a/tests/lme.R b/tests/lme.R
@@ -1,16 +1,17 @@
 ## stepAIC on an lme object: an example from Robert Cuffe
-library(nlme)
-library(MASS)
-set.seed(321) # to be sure
-a <- data.frame( resp=rnorm(250), cov1=rnorm(250),
-                 cov2=rnorm(250), group=rep(letters[1:10],25) )
-mod1 <- lme(resp~cov1, a, ~cov1|group, method="ML")
-mod2 <- stepAIC(mod1, scope=list(upper=~(cov1+cov2)^2, lower=~1) )
+if(require(nlme)) {
+    library(MASS)
+    set.seed(321) # to be sure
+    a <- data.frame( resp=rnorm(250), cov1=rnorm(250),
+                    cov2=rnorm(250), group=rep(letters[1:10],25) )
+    mod1 <- lme(resp~cov1, a, ~cov1|group, method="ML")
+    mod2 <- stepAIC(mod1, scope=list(upper=~(cov1+cov2)^2, lower=~1) )
 
-beav <- beav2
-set.seed(123)
-beav$dummy <- rnorm(nrow(beav))
-beav.gls <- gls(temp ~ activ + dummy, data = beav,
-                 corr = corAR1(0.8), method = "ML")
-stepAIC(beav.gls)
+    beav <- beav2
+    set.seed(123)
+    beav$dummy <- rnorm(nrow(beav))
+    beav.gls <- gls(temp ~ activ + dummy, data = beav,
+                    corr = corAR1(0.8), method = "ML")
+    stepAIC(beav.gls)
+}