[Vegan-commits] r1502 - in branches/1.17: R inst

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

Author: jarioksa
Date: 2011-02-20 18:34:08 +0100 (Sun, 20 Feb 2011)
New Revision: 1502

Modified:
   branches/1.17/R/as.preston.R
   branches/1.17/inst/ChangeLog
Log:
merge 1501: as.preston tiesplit bug

Modified: branches/1.17/R/as.preston.R
===================================================================
--- branches/1.17/R/as.preston.R	2011-02-20 17:30:08 UTC (rev 1501)
+++ branches/1.17/R/as.preston.R	2011-02-20 17:34:08 UTC (rev 1502)
@@ -14,7 +14,7 @@
         notiefreq <- table(ceiling(xlog2[!ties]))
         itie <- as.numeric(names(tiefreq)) + 1
         nitie <- as.numeric(names(notiefreq)) + 1
-        freq <- numeric(max(itie, nitie))
+        freq <- numeric(max(itie+1, nitie))
         ## split tied values between two adjacent octaves
         freq[itie] <- tiefreq/2
         freq[itie+1] <- freq[itie+1] + tiefreq/2

Modified: branches/1.17/inst/ChangeLog
===================================================================
--- branches/1.17/inst/ChangeLog	2011-02-20 17:30:08 UTC (rev 1501)
+++ branches/1.17/inst/ChangeLog	2011-02-20 17:34:08 UTC (rev 1502)
@@ -10,6 +10,8 @@
 
 	* merged r1496,7: FAQ updates.
 
+	* merged r1501: as.preston 'tiesplit = TRUE' bug.
+
 Version 1.17-7 (released February 16, 2011)
 
 	* merged r1489: nestednodf with weighted = FALSE.