[R-gregmisc-users] SF.net SVN: r-gregmisc: [1105] trunk/gmodels

[<wa...@us...>]

Revision: 1105
          http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1105&view=rev
Author:   warnes
Date:     2007-07-25 17:20:00 -0700 (Wed, 25 Jul 2007)

Log Message:
-----------
Add support for mlm to estimable().

Modified Paths:
--------------
    trunk/gmodels/DESCRIPTION
    trunk/gmodels/NAMESPACE
    trunk/gmodels/NEWS
    trunk/gmodels/R/estimable.mlm.R
    trunk/gmodels/man/estimable.Rd

Modified: trunk/gmodels/DESCRIPTION
===================================================================
--- trunk/gmodels/DESCRIPTION	2007-07-26 00:10:03 UTC (rev 1104)
+++ trunk/gmodels/DESCRIPTION	2007-07-26 00:20:00 UTC (rev 1105)
@@ -1,5 +1,5 @@
 Package: gmodels
-Version: 2.13.2
+Version: 2.14.0
 Title: Various R programming tools for model fitting
 Author: Gregory R. Warnes. Includes R source code and/or documentation
         contributed by Ben Bolker, Thomas Lumley, and Randall C Johnson.
@@ -15,5 +15,4 @@
 	 Contract NO1-CO-12400.
 URL: http://cran.r-project.org/src/contrib/PACKAGES.html 
      http://www.sf.net/projects/r-gregmisc
-Packaged: Mon Jun  5 16:19:14 2006; root
-Date: 2007-03-09
\ No newline at end of file
+Date: 2007-07-24
\ No newline at end of file

Modified: trunk/gmodels/NAMESPACE
===================================================================
--- trunk/gmodels/NAMESPACE	2007-07-26 00:10:03 UTC (rev 1104)
+++ trunk/gmodels/NAMESPACE	2007-07-26 00:20:00 UTC (rev 1105)
@@ -26,6 +26,7 @@
 
 S3method(estimable, default)
 S3method(estimable, lmer)
+S3method(estimable, mlm)
 
 S3method(print, glh.test)
 S3method(summary, glh.test)

Modified: trunk/gmodels/NEWS
===================================================================
--- trunk/gmodels/NEWS	2007-07-26 00:10:03 UTC (rev 1104)
+++ trunk/gmodels/NEWS	2007-07-26 00:20:00 UTC (rev 1105)
@@ -1,6 +1,14 @@
 Version 2.13.2
 --------------
 
+New Features:
+
+- Add support for 'mlm' objects to estimable
+
+
+Version 2.13.2
+--------------
+
 Bug Fixes:
 
 - Lower and upper end of confidence interval for lmer objects were

Modified: trunk/gmodels/R/estimable.mlm.R
===================================================================
--- trunk/gmodels/R/estimable.mlm.R	2007-07-26 00:10:03 UTC (rev 1104)
+++ trunk/gmodels/R/estimable.mlm.R	2007-07-26 00:20:00 UTC (rev 1105)
@@ -1,5 +1,5 @@
 `estimable.mlm` <-
-  function (object, ...) 
+  function (obj, cm, beta0, conf.int=NULL,  show.beta0, ...)
 {
   coef <- coef(object)
   ny <- ncol(coef)
@@ -23,7 +23,7 @@
     object$fitted.values <- fitted[, i]
     object$effects <- effects[, i]
     object$call$formula[[2]] <- object$terms[[2]] <- as.name(ynames[i])
-    value[[i]] <- estimable(object, ...)
+    value[[i]] <- estimable(obj, cm, beta0, conf.int=NULL,  show.beta0, ...)
   }
   class(value) <- "listof"
   value

Modified: trunk/gmodels/man/estimable.Rd
===================================================================
--- trunk/gmodels/man/estimable.Rd	2007-07-26 00:10:03 UTC (rev 1104)
+++ trunk/gmodels/man/estimable.Rd	2007-07-26 00:20:00 UTC (rev 1105)
@@ -4,6 +4,7 @@
 \alias{estimable}
 \alias{estimable.default}
 \alias{estimable.lmer}
+\alias{estimable.mlm}
 %\alias{.wald}
 %\alias{.to.est}
 \title{Contrasts and estimable linear functions of model coefficients}
@@ -17,11 +18,12 @@
 \method{estimable}{default} (obj, cm, beta0, conf.int=NULL, show.beta0, joint.test=FALSE, ...)
 \method{estimable}{lmer}(obj, cm, beta0, conf.int=NULL,
                show.beta0, sim.lmer=TRUE, n.sim=1000, ...) 
+\method{estimable}{mlm}(obj, cm, beta0, conf.int=NULL,  show.beta0, ...)
 %.wald(obj, cm,beta0=rep(0, ifelse(is.null(nrow(cm)), 1, nrow(cm))))
 %.to.est(obj, params)
 }
 \arguments{
-   \item{obj}{Regression (lm,glm,lme,lmer) object. }
+   \item{obj}{Regression (lm,glm,lme,lmer,mlm) object. }
    \item{cm}{Vector, List, or Matrix specifying estimable linear functions or
      contrasts.  See below for details.}
    \item{beta0}{Vector of null hypothesis values}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.