[Vegan-commits] r1178 - in pkg/gravy: . R inst

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

Author: jarioksa
Date: 2010-03-18 18:32:36 +0100 (Thu, 18 Mar 2010)
New Revision: 1178

Modified:
   pkg/gravy/DESCRIPTION
   pkg/gravy/R/ssHOF.R
   pkg/gravy/inst/ChangeLog
Log:
no more useless warnings when HOF is used correctly with non-integer data

Modified: pkg/gravy/DESCRIPTION
===================================================================
--- pkg/gravy/DESCRIPTION	2010-03-15 13:52:02 UTC (rev 1177)
+++ pkg/gravy/DESCRIPTION	2010-03-18 17:32:36 UTC (rev 1178)
@@ -1,7 +1,7 @@
 Package: gravy
 Title: Gradient Analysis of Vegetation
 Version: 0.1-2
-Date: Nov 24, 2008
+Date: March 18, 2010
 Author: Jari Oksanen
 Maintainer: Jari Oksanen <jari.oksanen at oulu.fi>
 Suggests: lattice 

Modified: pkg/gravy/R/ssHOF.R
===================================================================
--- pkg/gravy/R/ssHOF.R	2010-03-15 13:52:02 UTC (rev 1177)
+++ pkg/gravy/R/ssHOF.R	2010-03-18 17:32:36 UTC (rev 1178)
@@ -3,10 +3,11 @@
 {
     x <- scale01(x)
     if (model >= 4) {
-        m2 <- glm(cbind(y, M - y) ~ x + I(x^2), family = binomial)
+        m2 <- glm(cbind(y, M - y) ~ x + I(x^2), family = quasibinomial)
         k <- coef(m2)
         if (k[3] > 0) {
-            m2 <- glm(cbind(y, M-y) ~ x + offset(-x^2), family=binomial)
+            m2 <- glm(cbind(y, M-y) ~ x + offset(-x^2),
+                      family=quasibinomial)
             k <- c(coef(m2), -1)
         }
         names(k) <- NULL
@@ -22,7 +23,7 @@
         c <- b * u + r
     }
     else if (model > 1) {
-        m1 <- glm(cbind(y, M - y) ~ x, family = binomial)
+        m1 <- glm(cbind(y, M - y) ~ x, family = quasibinomial)
         k <- coef(m1)
         names(k) <- NULL
         a <- -k[1]

Modified: pkg/gravy/inst/ChangeLog
===================================================================
--- pkg/gravy/inst/ChangeLog	2010-03-15 13:52:02 UTC (rev 1177)
+++ pkg/gravy/inst/ChangeLog	2010-03-18 17:32:36 UTC (rev 1178)
@@ -1,3 +1,6 @@
+Version 0.1-2 March 18, 2010
+	* ssHOF: HOF gave unnecesarry warnings when used with non-integer
+	data. 
 Version 0.1-1 March 28, 2008
 	* plot.HOF.frame: gained argument 'species' to list only selected
 	species (on Rob Marrs's request).