r-gregmisc-users

[R-gregmisc-users] SF.net SVN: r-gregmisc: [1214] trunk/gplots/R/plot.lm.R

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

Revision: 1214
          http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1214&view=rev
Author:   warnes
Date:     2007-11-02 11:18:00 -0700 (Fri, 02 Nov 2007)

Log Message:
-----------
Update plot.lm2 to match changes made to bandplot

Modified Paths:
--------------
    trunk/gplots/R/plot.lm.R

Modified: trunk/gplots/R/plot.lm.R
===================================================================
--- trunk/gplots/R/plot.lm.R	2007-11-01 20:20:10 UTC (rev 1213)
+++ trunk/gplots/R/plot.lm.R	2007-11-02 18:18:00 UTC (rev 1214)
@@ -74,7 +74,7 @@
 	     ylim = ylim, type = "n", ...)
 	panel(yh, r, ...)
         if(rug)  rug(yh)                    ## GRW 2001-06-08
-        if(band) bandplot(yh,r,add=TRUE,lty=3) ## GRW 2001-06-08
+        if(band) bandplot(yh,r,add=TRUE)    ## GRW 2001-06-08
 	if (one.fig)
 	    title(sub = sub.caption, ...)
 	mtext(caption[1], 3, 0.25)
@@ -107,7 +107,7 @@
 
         abline(h=mean(sqrtabsr),lty = 3, col = "gray")
         if(rug)  rug(yh)                             ## GRW 2001-06-08
-        if(band) bandplot(yhn0,sqrtabsr,add=TRUE,lty=3) ## GRW 2001-06-08
+        if(band) bandplot(yhn0,sqrtabsr,add=TRUE) ## GRW 2001-06-08
 
 	if (one.fig)
 	    title(sub = sub.caption, ...)
@@ -141,7 +141,7 @@
                                xlab=names(data)[i], ylab="Residuals", type="n")
                           panel( data[,i], r, ... )
                           if(rug)  rug(data[,i])
-                          if(band) bandplot(data[,i],r,add=TRUE,lty=3)
+                          if(band) bandplot(data[,i],r,add=TRUE)
                           abline(h=0,lty = 3, col = "gray")
                         }
                        )


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

[R-gregmisc-users] SF.net SVN: r-gregmisc: [1263] trunk/gplots/R/plot.lm.R

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

Revision: 1263
          http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1263&view=rev
Author:   warnes
Date:     2008-05-07 11:57:29 -0700 (Wed, 07 May 2008)

Log Message:
-----------
Improve performance of plot.lm for large lm objects by using fitted() instead of predict() to get y-hat

Modified Paths:
--------------
    trunk/gplots/R/plot.lm.R

Modified: trunk/gplots/R/plot.lm.R
===================================================================
--- trunk/gplots/R/plot.lm.R	2008-05-05 20:28:53 UTC (rev 1262)
+++ trunk/gplots/R/plot.lm.R	2008-05-07 18:57:29 UTC (rev 1263)
@@ -1,6 +1,3 @@
-
-##!!! BROKEN !!!
-
 plot.lm2 <- function(
                      x,
                      which = 1:5,
@@ -15,7 +12,10 @@
                      id.n = 3,
                      labels.id = names(residuals(x)),
                      cex.id = 0.75,
-                     band=TRUE,rug=TRUE
+                     band=TRUE,
+                     rug=TRUE,
+                     width=1/10,
+                     max.n=5000
                      )
 {
     if (!inherits(x, "lm"))
@@ -26,7 +26,10 @@
     show[which] <- TRUE
     r <- residuals(x)
     n <- length(r)
-    yh <- predict(x) # != fitted() for glm
+    if(inherits(x,"glm"))
+       yh <- predict(x) # != fitted() for glm
+    else
+       yh <- fitted(x)
     if (any(show[2:4]))
         s <- if(inherits(x, "rlm")) x$s else sqrt(deviance(x)/df.residual(x))
     if (any(show[2:3])) {
@@ -73,8 +76,8 @@
 	plot(yh, r, xlab = l.fit, ylab = "Residuals", main = main,
 	     ylim = ylim, type = "n", ...)
 	panel(yh, r, ...)
-        if(rug)  rug(yh)                    ## GRW 2001-06-08
-        if(band) bandplot(yh,r,add=TRUE)    ## GRW 2001-06-08
+        if(rug)  rug(yh)                                 ## GRW 2001-06-08
+        if(band) bandplot(yh,r,add=TRUE,width=width)    ## GRW 2001-06-08
 	if (one.fig)
 	    title(sub = sub.caption, ...)
 	mtext(caption[1], 3, 0.25)


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