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

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

Revision: 1026
          http://svn.sourceforge.net/r-gregmisc/?rev=1026&view=rev
Author:   warnes
Date:     2006-11-28 16:04:54 -0800 (Tue, 28 Nov 2006)

Log Message:
-----------
- Add generic
- Fix code vs. doc inconsistiencies

Modified Paths:
--------------
    trunk/gmodels/R/estimable.R
    trunk/gmodels/man/estimable.Rd

Modified: trunk/gmodels/R/estimable.R
===================================================================
--- trunk/gmodels/R/estimable.R	2006-11-28 22:38:11 UTC (rev 1025)
+++ trunk/gmodels/R/estimable.R	2006-11-29 00:04:54 UTC (rev 1026)
@@ -1,12 +1,10 @@
 # $Id$
-estimable <- function (obj, cm, beta0, conf.int=NULL, joint.test=FALSE,
-                       show.beta0, ...)
+estimable <- function (obj, cm, beta0, conf.int=NULL,  show.beta0, ...)
   {
     UseMethod("estimable")
   }
 
-estimable.default <- function (obj, cm, beta0, conf.int=NULL, joint.test=FALSE,
-                           show.beta0, ...)
+estimable.default <- function (obj, cm, beta0, conf.int=NULL, show.beta0, joint.test=FALSE, ...)
 {
   if (is.matrix(cm) || is.data.frame(cm))
     {
@@ -202,8 +200,8 @@
     print(as.data.frame(retval))
 }
 
-estimable.lmer <- function (obj, cm, beta0, conf.int=NULL,
-                            show.beta0, sim.lmer=TRUE, n.sim=1000, ...)
+estimable.lmer <- function (obj, cm, beta0, conf.int=NULL, show.beta0,
+                                             sim.lmer=TRUE, n.sim=1000, ...)
 {
   if (is.matrix(cm) || is.data.frame(cm))
     {

Modified: trunk/gmodels/man/estimable.Rd
===================================================================
--- trunk/gmodels/man/estimable.Rd	2006-11-28 22:38:11 UTC (rev 1025)
+++ trunk/gmodels/man/estimable.Rd	2006-11-29 00:04:54 UTC (rev 1026)
@@ -2,16 +2,21 @@
 %
 \name{estimable}
 \alias{estimable}
+\alias{estimable.default}
 \alias{estimable.lmer}
 %\alias{.wald}
 %\alias{.to.est}
 \title{Contrasts and estimable linear functions of model coefficients}
-\description{Compute and test contrasts and other estimable linear
+\description{
+  Compute and test contrasts and other estimable linear
   functions of model coefficients for for lm, glm, lme, lmer, and geese
-  objects}
+  objects
+}
 \usage{
-estimable(obj, cm, beta0, conf.int=NULL, joint.test=FALSE, show.beta0)
-\method{estimable}{lmer}(obj, cm, beta0, conf.int = NULL, show.beta0, sim.lmer = TRUE, n.sim = 1000)         %%%%%%%%%%% added this line
+estimable(obj, cm, beta0, conf.int=NULL,  show.beta0, ...)
+\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, ...) 
 %.wald(obj, cm,beta0=rep(0, ifelse(is.null(nrow(cm)), 1, nrow(cm))))
 %.to.est(obj, params)
 }
@@ -30,9 +35,13 @@
    \item{show.beta0}{Logical value. If TRUE a column for beta0 will be
      included in the output table.  Defaults to TRUE when beta0 is
      specified, FALSE otherwise.}
-   \item{sim.lmer}{Logical value. If TRUE p-values and confidence                 %%%
-     intervals will be estimated using \code{\Link[Matrix]{mcmcsamp}}.}           %%% Added these sections
-   \item{n.sim}{Number of MCMC samples to take in \code{\Link[Matrix]{mcmcsamp}}.}%%%
+   \item{sim.lmer}{Logical value. If TRUE p-values and confidence
+     intervals will be estimated using \code{\Link[Matrix]{mcmcsamp}}.
+   }
+   \item{n.sim}{Number of MCMC samples to take in
+     \code{\Link[Matrix]{mcmcsamp}}.
+   }
+   \item{...}{ignored}
 }
 \details{
   \code{estimable} computes an estimate, test statitic, significance


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