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

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

Author: jarioksa
Date: 2011-03-10 13:01:00 +0100 (Thu, 10 Mar 2011)
New Revision: 1536

Modified:
   branches/1.17/R/rrarefy.R
   branches/1.17/inst/ChangeLog
Log:
merge r1532: stop message in d/r/rarefy

Modified: branches/1.17/R/rrarefy.R
===================================================================
--- branches/1.17/R/rrarefy.R	2011-03-10 11:50:11 UTC (rev 1535)
+++ branches/1.17/R/rrarefy.R	2011-03-10 12:01:00 UTC (rev 1536)
@@ -7,8 +7,8 @@
     if (ncol(x) == 1)
         x <- t(x)
     if (length(sample) > 1 && length(sample) != nrow(x))
-        stop(gettextf,
-             "length of 'sample' and number of rows of 'x' do not match")
+        stop(gettextf(
+             "length of 'sample' and number of rows of 'x' do not match"))
     sample <- rep(sample, length=nrow(x))
     colnames(x) <- colnames(x, do.NULL = FALSE)
     nm <- colnames(x)
@@ -28,8 +28,8 @@
     function(x, sample)
 {
     if (length(sample) > 1 &&  length(sample) != nrow(x))
-        stop(gettextf,
-             "length of  'sample' and number of rows of 'x' do not match")
+        stop(gettextf(
+             "length of  'sample' and number of rows of 'x' do not match"))
     x <- drop(as.matrix(x))
     ## dfun is kluge: first item of  vector x must be the sample size,
     ## and the rest  is the community data. This  seemed an easy trick

Modified: branches/1.17/inst/ChangeLog
===================================================================
--- branches/1.17/inst/ChangeLog	2011-03-10 11:50:11 UTC (rev 1535)
+++ branches/1.17/inst/ChangeLog	2011-03-10 12:01:00 UTC (rev 1536)
@@ -4,6 +4,8 @@
 
 Version 1.17-9 (opened March 9, 2011)
 
+	* merged r1532: fix gettextf in d/r/rarefy.
+
 	* merged r1527,8: doc updates in CCorA.Rd & ordihull.Rd.
 
 	* merged r1522 thru r1526: implement drarefy; drarefy, rrarefy,