[Vegan-commits] r687 - in branches/1.15: R inst

[noreply at r-forge.r-project.org]

Author: jarioksa
Date: 2009-02-17 10:05:39 +0100 (Tue, 17 Feb 2009)
New Revision: 687

Modified:
   branches/1.15/R/rad.null.R
   branches/1.15/inst/ChangeLog
Log:
merged r686 to branches/1.15: rad.null failed with families gaussian and Gamma

Modified: branches/1.15/R/rad.null.R
===================================================================
--- branches/1.15/R/rad.null.R	2009-02-17 08:45:51 UTC (rev 686)
+++ branches/1.15/R/rad.null.R	2009-02-17 09:05:39 UTC (rev 687)
@@ -9,14 +9,16 @@
     wt <- rep(1, nsp)
     if (nsp > 0) { 
         fit <- rev(cumsum(1/nsp:1)/nsp) * sum(x)
+        res <- dev.resids(x, fit, wt)
+        deviance <- sum(res)
         aic <- aicfun(x, nsp, fit, wt, deviance)
     }
     else {
         fit <- NA
         aic <- NA
+        res <- NA
+        deviance <- NA
     }
-    res <- dev.resids(x, fit, wt)
-    deviance <- sum(res)
     residuals <- x - fit
     rdf <- nsp
     p <- NA

Modified: branches/1.15/inst/ChangeLog
===================================================================
--- branches/1.15/inst/ChangeLog	2009-02-17 08:45:51 UTC (rev 686)
+++ branches/1.15/inst/ChangeLog	2009-02-17 09:05:39 UTC (rev 687)
@@ -5,6 +5,8 @@
 
 Version 1.15-2 (opened January 14, 2009)
 
+	* merged r686: rad.null failed with families gaussian and Gamma.
+
 	* merged r678: anovacca.bymargin was not setting RNG properly for
 	the second term.