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

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

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

Log Message:
-----------
Remove extraneous comma that causes errors in R 2.5.0

Modified Paths:
--------------
    trunk/gmodels/R/ci.R
    trunk/gmodels/R/estimable.R
    trunk/gmodels/R/fast.prcomp.R

Modified: trunk/gmodels/R/ci.R
===================================================================
--- trunk/gmodels/R/ci.R	2006-11-28 00:59:53 UTC (rev 1024)
+++ trunk/gmodels/R/ci.R	2006-11-28 22:38:11 UTC (rev 1025)
@@ -12,7 +12,7 @@
                Estimate=est,
                "CI lower"=ci.low,
                "CI upper"=ci.high,
-               "Std. Error"=stderr,
+               "Std. Error"=stderr
                )
 
   retval

Modified: trunk/gmodels/R/estimable.R
===================================================================
--- trunk/gmodels/R/estimable.R	2006-11-28 00:59:53 UTC (rev 1024)
+++ trunk/gmodels/R/estimable.R	2006-11-28 22:38:11 UTC (rev 1025)
@@ -1,7 +1,12 @@
 # $Id$
+estimable <- function (obj, cm, beta0, conf.int=NULL, joint.test=FALSE,
+                       show.beta0, ...)
+  {
+    UseMethod("estimable")
+  }
 
-estimable <- function (obj, cm, beta0, conf.int=NULL, joint.test=FALSE,
-                           show.beta0)
+estimable.default <- function (obj, cm, beta0, conf.int=NULL, joint.test=FALSE,
+                           show.beta0, ...)
 {
   if (is.matrix(cm) || is.data.frame(cm))
     {
@@ -198,7 +203,7 @@
 }
 
 estimable.lmer <- function (obj, cm, beta0, conf.int=NULL,
-                            show.beta0, sim.lmer=TRUE, n.sim=1000)
+                            show.beta0, sim.lmer=TRUE, n.sim=1000, ...)
 {
   if (is.matrix(cm) || is.data.frame(cm))
     {

Modified: trunk/gmodels/R/fast.prcomp.R
===================================================================
--- trunk/gmodels/R/fast.prcomp.R	2006-11-28 00:59:53 UTC (rev 1024)
+++ trunk/gmodels/R/fast.prcomp.R	2006-11-28 22:38:11 UTC (rev 1025)
@@ -30,7 +30,7 @@
         s$d <- s$d/sqrt(max(1, nrow(x) - 1))
 
         dimnames(s$vt) <- list(paste("PC", seq(len = nrow(s$vt)), sep = ""),
-                               colnames(x), )
+                               colnames(x) )
         r <- list(sdev = s$d, rotation = t(s$vt) )
         if (retx)
             r$x <- x %*% t(s$vt)


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