[Dplr-commits] r938 - in pkg/dplR: . R

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

Author: mvkorpel
Date: 2015-01-14 15:29:46 +0100 (Wed, 14 Jan 2015)
New Revision: 938

Modified:
   pkg/dplR/ChangeLog
   pkg/dplR/R/ccf.series.rwl.R
   pkg/dplR/R/corr.rwl.seg.R
   pkg/dplR/R/corr.series.seg.R
   pkg/dplR/R/redfit.R
   pkg/dplR/R/series.rwl.plot.R
Log:
Using deparse.level=0 in some calls to cbind() and rbind().


Modified: pkg/dplR/ChangeLog
===================================================================
--- pkg/dplR/ChangeLog	2015-01-12 09:09:50 UTC (rev 937)
+++ pkg/dplR/ChangeLog	2015-01-14 14:29:46 UTC (rev 938)
@@ -12,6 +12,15 @@
 
 - Import captureOutput from R.utils.
 
+Various .R files
+----------------
+
+- Using deparse.level=0 in some calls to cbind() and rbind() when names
+  are not needed in the result.  Due to this change, the first column of
+  the $bins matrix in the return value of ccf.series.rwl(),
+  corr.rwl.seg(), and corr.series.seg() does not have (undocumented)
+  column names anymore.
+
 File: latexify.R
 ----------------
 

Modified: pkg/dplR/R/ccf.series.rwl.R
===================================================================
--- pkg/dplR/R/ccf.series.rwl.R	2015-01-12 09:09:50 UTC (rev 937)
+++ pkg/dplR/R/ccf.series.rwl.R	2015-01-14 14:29:46 UTC (rev 938)
@@ -58,7 +58,7 @@
         stop("shorten 'seg.length' or adjust 'bin.floor'")
     }
     bins <- seq(from=min.bin, to=to + seg.lag, by=seg.lag)
-    bins <- cbind(bins, bins + (seg.length - 1))
+    bins <- cbind(bins, bins + (seg.length - 1), deparse.level=0)
     nbins <- nrow(bins)
     bin.names <- paste0(bins[, 1], ".", bins[, 2])
 

Modified: pkg/dplR/R/corr.rwl.seg.R
===================================================================
--- pkg/dplR/R/corr.rwl.seg.R	2015-01-12 09:09:50 UTC (rev 937)
+++ pkg/dplR/R/corr.rwl.seg.R	2015-01-14 14:29:46 UTC (rev 938)
@@ -128,7 +128,7 @@
         stop("shorten 'seg.length' or adjust 'bin.floor'")
     }
     bins <- seq(from=min.bin, to=max.bin, by=seg.lag)
-    bins <- cbind(bins, bins + (seg.length - 1))
+    bins <- cbind(bins, bins + (seg.length - 1), deparse.level=0)
     nbins <- nrow(bins)
     bin.names <- paste0(bins[, 1], ".", bins[, 2])
     ## structures for results

Modified: pkg/dplR/R/corr.series.seg.R
===================================================================
--- pkg/dplR/R/corr.series.seg.R	2015-01-12 09:09:50 UTC (rev 937)
+++ pkg/dplR/R/corr.series.seg.R	2015-01-14 14:29:46 UTC (rev 938)
@@ -67,7 +67,7 @@
         stop("shorten 'seg.length' or adjust 'bin.floor'")
     }
     bins <- seq(from=min.bin, to=to + seg.lag, by=seg.lag)
-    bins <- cbind(bins, bins + (seg.length - 1))
+    bins <- cbind(bins, bins + (seg.length - 1), deparse.level=0)
     nbins <- nrow(bins)
     bin.names <- paste0(bins[, 1], ".", bins[, 2])
     ## structures for results

Modified: pkg/dplR/R/redfit.R
===================================================================
--- pkg/dplR/R/redfit.R	2015-01-12 09:09:50 UTC (rev 937)
+++ pkg/dplR/R/redfit.R	2015-01-14 14:29:46 UTC (rev 938)
@@ -1134,11 +1134,11 @@
         lowlow[lowGood] <- pnorm(rcritlo[lowGood] - 0.5,
                                  mean = nMean[lowGood], sd = nSd[lowGood])
         lowhigh <- pnorm(rcritlo + 0.5, mean = nMean, sd = nSd)
-        list(rbind(rcritlo, rcrithi),
+        list(rbind(rcritlo, rcrithi, deparse.level=0),
              pmin = 2 * max(lowlow),
              pmax = 2 * min(lowhigh))
     } else {
-        rbind(rcritlo, rcrithi)
+        rbind(rcritlo, rcrithi, deparse.level=0)
     }
 }
 

Modified: pkg/dplR/R/series.rwl.plot.R
===================================================================
--- pkg/dplR/R/series.rwl.plot.R	2015-01-12 09:09:50 UTC (rev 937)
+++ pkg/dplR/R/series.rwl.plot.R	2015-01-14 14:29:46 UTC (rev 938)
@@ -62,7 +62,7 @@
         stop("shorten 'seg.length' or adjust 'bin.floor'")
     }
     bins <- seq(from=min.bin, to=to + seg.lag, by=seg.lag)
-    bins <- cbind(bins, bins + (seg.length - 1))
+    bins <- cbind(bins, bins + (seg.length - 1), deparse.level=0)
     nbins <- nrow(bins)
 
     op <- par(no.readonly=TRUE)