[Vegan-commits] r652 - in pkg/vegan: R inst

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

Author: jarioksa
Date: 2009-01-08 20:10:31 +0100 (Thu, 08 Jan 2009)
New Revision: 652

Modified:
   pkg/vegan/R/summary.cca.R
   pkg/vegan/inst/ChangeLog
Log:
summary.cca: accounted for statistic failed in unconstrained models

Modified: pkg/vegan/R/summary.cca.R
===================================================================
--- pkg/vegan/R/summary.cca.R	2009-01-07 14:19:06 UTC (rev 651)
+++ pkg/vegan/R/summary.cca.R	2009-01-08 19:10:31 UTC (rev 652)
@@ -30,7 +30,7 @@
         ev.account <- ev.account - summ$partial.chi
     summ$ev.con.account <- cumsum(summ$ev.con)/ev.account
     summ$ev.uncon.account <-
-        (summ$constr.chi + cumsum(summ$ev.uncon))/ev.account
+        (max(summ$constr.chi, 0) + cumsum(summ$ev.uncon))/ev.account
     summ$cca.acc <- cumsum(summ$ev.con)/summ$constr.chi
     summ$ev.head <- c(summ$ev.con, summ$ev.uncon)[1:axes]
     summ$scaling <- scaling

Modified: pkg/vegan/inst/ChangeLog
===================================================================
--- pkg/vegan/inst/ChangeLog	2009-01-07 14:19:06 UTC (rev 651)
+++ pkg/vegan/inst/ChangeLog	2009-01-08 19:10:31 UTC (rev 652)
@@ -7,6 +7,9 @@
 	* nestednodf: gained argument 'order = TRUE' allowing tests for
 	other orderings than using marginal frequencies (default)
 	following suggestion by Almeida-Neto et al. (2008).
+
+	* summary.cca:  cumulative "accounted for" statistics failed in
+	unconstrained models. 
 	
 Version 1.16-8 (closed Jan 7, 2009)