version 1.3-5

cran · Jul 24, 2014 · 45c3381 · 45c3381
1 parent fa672cb
commit 45c3381
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 17 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7  1,7 @@
 Package: multcomp
 Title: Simultaneous Inference in General Parametric Models
-Version: 1.3-4
-Date: 2014-05-05
 Version: 1.3-5
 Date: 2014-07-23
 Authors@R: c(person("Torsten", "Hothorn", role = c("aut", "cre"), 
                     email = "[email protected]"), 
         person("Frank", "Bretz", role = "aut"), 
@@ -23,7  23,7 @@ URL: http://multcomp.R-forge.R-project.org The publishers web page is
         http://www.crcpress.com/product/isbn/9781584885740
 LazyData: yes
 License: GPL-2
-Packaged: 2014-07-09 08:10:28 UTC; hothorn
 Packaged: 2014-07-23 15:21:48 UTC; hothorn
 Author: Torsten Hothorn [aut, cre],
   Frank Bretz [aut],
   Peter Westfall [aut],
@@ -32,4  32,4 @@ Author: Torsten Hothorn [aut, cre],
 Maintainer: Torsten Hothorn <[email protected]>
 NeedsCompilation: no
 Repository: CRAN
-Date/Publication: 2014-07-09 12:02:54
 Date/Publication: 2014-07-24 21:01:25
diff --git a/MD5 b/MD5
@@ -1,10  1,10 @@
-6a9768a9fb10eb5fafd12549df8b53c1 *DESCRIPTION
 46a29dc541d75e7a776dbde4366ae8bb *DESCRIPTION
 1a2e3db2b9037a1cf82694f97feaf2c4 *NAMESPACE
 04d2a926addbc79ec5839ed9b86b63a0 *R/cld.R
 fb371dc9bf3a59db5b2045f190fbd296 *R/contrMat.R
 0b3bd5bfb64a2aee867e948634aebe7b *R/expressions.R
 1294aa3aa84a03075242654a1f9e7679 *R/glht.R
-463585ef7b1cf8451647b1f6622cc9f4 *R/helpers.R
 498b5cfbb3ef4d57cee77f13324b728a *R/helpers.R
 9dba312a1100ead0426531dc7ef25732 *R/maxsets.R
 da58d49e95f4b860f27a2180ee6d395f *R/mcp.R
 57bb109cca04b10b6fff06b164b108a9 *R/methods.R
@@ -13,14  13,14 @@ da58d49e95f4b860f27a2180ee6d395f *R/mcp.R
 89a738f023fdbe16cff5ed42b8c313e3 *R/plot.R
 52eea39986a79fbada86526e908be80d *R/pqfunctions.R
 9b032ed24188c147c36282dbcdcfa503 *R/print.R
-fef3e55ed4efa61920a7bdd5d1ddc198 *build/vignette.rds
 b52e841d4b7ec70e07bae70a0f7ca228 *build/vignette.rds
 591f052540e1edca9c1d4181661bce2e *cleanup
 e47d77ece20d7b6bd5360908b8cb9821 *data/adevent.rda
-3e4c08d96b38047e7eb898d2565a8556 *data/cholesterol.rda
 7fd0660013d0dce66b3cac7bcd9799e4 *data/cholesterol.rda
 592dcf8253e902597f2de495e6bc48ec *data/cml.rda
 72a8a2a4a8edb1b8ff35ce0148db1307 *data/detergent.rda
 e8a33847c94deda1b7df7c0c522cf887 *data/fattyacid.rda
-1b47c2e0fcaaf2a86ac68be7d4f04ce8 *data/litter.rda
 da507d271a540f066e2e870efa9b9b0c *data/litter.rda
 9bea2474d2f805a25420293991b6c531 *data/mtept.rda
 c298df5ee9c95d89980ac42b97e7a837 *data/recovery.rda
 f3033fee09f12f3cfad26e8fccf308ec *data/sbp.rda
@@ -38,20  38,20 @@ c330e0321b00523651d707a8b4399020 *inst/MCMT/MCMT.R
 5ccc54941334fbd572cd4891c2009ccc *inst/MCMT/MCMT.Rout.save
 26ccee8d5d8bc87c503e43bde27e282f *inst/MCMT/MCMT.rda
 abd0ee3bb82571b7fb64e8a2e1cf03a2 *inst/MCMT/multcomp.sas
-7c694711103056a186df99fdd6d087de *inst/NEWS
 ef975f6358068a74888f7e68c3dc9fec *inst/NEWS
 09ce7512593c1be00ee89ee431ca6112 *inst/deprecated/deprecated.R
 fe4cbe4e17edf996147191527f7e9efa *inst/deprecated/multcomp-deprecated.Rd
 4fcad824fe2a0c192b10a18cd7da2146 *inst/deprecated/multcomp-oldtests.R
 6f2f2667a0374a4f82e3a01067e18b11 *inst/deprecated/multcomp-oldtests.Rout.save
 3218dcf4f93b9f33cb0bf21e2d768131 *inst/doc/chfls1.R
 624888bf9e4e1fcb49a0de92f401239d *inst/doc/chfls1.Rnw
-158b7653e83bbc2e68b057a51fc8ac77 *inst/doc/chfls1.pdf
 8a7dd7bd127fc8b3010eb316715f7c93 *inst/doc/chfls1.pdf
 5d48e43ba5bae75f7a0a01fc367f2a9b *inst/doc/generalsiminf.R
 b70a30854ca827a6b30a25f7a4db8dc2 *inst/doc/generalsiminf.Rnw
-8af074b22b32736a462b18f349cbdcd9 *inst/doc/generalsiminf.pdf
 693cfa38bd28402c0c9a1ef23c6bee15 *inst/doc/generalsiminf.pdf
 bbff4721083ff42b2d9d57887185a67d *inst/doc/multcomp-examples.R
 82322f132b08bd74ef22090b07f30a38 *inst/doc/multcomp-examples.Rnw
-7589457f39340dbb27939dd56875a0db *inst/doc/multcomp-examples.pdf
 7efcc1363d16449e4727e79ba7dbcc0f *inst/doc/multcomp-examples.pdf
 b8db88a39fe73ccefbd7deaaffdec3cd *inst/multcomp_VA.R
 625d3532deb47821fb6964cc748cd343 *inst/multcomp_coxme.R
 02a0956bb972a95339c890c34435a986 *man/adevent.Rd
@@ -66,7  66,7 @@ d2f6588848af8b44fc5c25ce9b49371a *man/contrMat.Rd
 6b615e7eb07187bd068ab28950328102 *man/litter.Rd
 666b52f3ba42af0a0794161b9a510974 *man/methods.Rd
 853437346743447678331c3d0ac04930 *man/mmm.Rd
-595cf8df853ebc94a0d839cb401bf8b4 *man/modelparm.Rd
 17229641e7401df8fa72c6e8e5ff3d38 *man/modelparm.Rd
 b4ed73769640f2fa2538195dcfd66c8d *man/mtept.Rd
 d7fed970443d0dd838a37bace993e040 *man/parm.Rd
 a0d6c0fa048c8628f9ac388a20021a9a *man/plot.cld.Rd

diff --git a/R/helpers.R b/R/helpers.R
@@ -1,5  1,5 @@
 
-# $Id: helpers.R 362 2013-09-02 12:55:44Z thothorn $
 # $Id: helpers.R 401 2014-07-21 11:29:44Z thothorn $
 
 ### model.matrix.coxph doesn't return contrasts etc.
 model.matrix.coxph <- function(object, ...) {
@@ -93,6  93,16 @@ modelparm.default <- function(model, coef. = coef, vcov. = vcov,
                               df = NULL, ...) 
 {
 
     ### allow specification of coef and vcov directly
     if (!is.function(coef.)) {
         beta <- coef.
         coef. <- function(model) return(beta)
     }
     if (!is.function(vcov.)) {
         sigma <- vcov.
         vcov. <- function(model) return(sigma)
     }
 
     ### extract coefficients and their covariance matrix
     beta <- try(coef.(model))
     if (inherits(beta, "try-error"))

diff --git a/build/vignette.rds b/build/vignette.rds
diff --git a/data/cholesterol.rda b/data/cholesterol.rda
diff --git a/data/litter.rda b/data/litter.rda
diff --git a/inst/NEWS b/inst/NEWS
@@ -1,4  1,9 @@
 
 Changes in 1.3-5 (2014-07-23)
 
     o    allow coefficients and covariance matrices to be
          fed into modelparm via coef. and vcov. directly
 
 Changes in 1.3-4 (2014-07-09)
 
     o    suggest ISwR (for demo())

diff --git a/inst/doc/chfls1.pdf b/inst/doc/chfls1.pdf
diff --git a/inst/doc/generalsiminf.pdf b/inst/doc/generalsiminf.pdf
diff --git a/inst/doc/multcomp-examples.pdf b/inst/doc/multcomp-examples.pdf
diff --git a/man/modelparm.Rd b/man/modelparm.Rd
@@ -13,9  13,9 @@ modelparm(model, coef., vcov., df, ...)
                for example an object returned by \code{\link{lm}},
                \code{\link{glm}}, \code{\link{aov}}, \code{\link[survival]{survreg}},
                or \code{\link[lme4]{lmer}} etc. }
-  \item{coef.}{ an accessor function for the model parameters. }
   \item{coef.}{ an accessor function for the model parameters. Alternatively, the vector of coefficients.}
   \item{vcov.}{ an accessor function for the covariance matrix of the
-                model parameters. }
                 model parameters. Alternatively, the covariance matrix directly.}
   \item{df}{ an optional specification of the degrees of freedom to be used in
              subsequent computations. }
   \item{\dots}{ additional arguments, currently ignored. }