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

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

Author: mvkorpel
Date: 2015-02-10 10:55:58 +0100 (Tue, 10 Feb 2015)
New Revision: 963

Modified:
   pkg/dplR/ChangeLog
   pkg/dplR/DESCRIPTION
   pkg/dplR/R/corr.rwl.seg.R
   pkg/dplR/R/corr.series.seg.R
   pkg/dplR/R/series.rwl.plot.R
Log:
Reduced the number of calls to options()

Modified: pkg/dplR/ChangeLog
===================================================================
--- pkg/dplR/ChangeLog	2015-02-09 14:41:12 UTC (rev 962)
+++ pkg/dplR/ChangeLog	2015-02-10 09:55:58 UTC (rev 963)
@@ -39,6 +39,8 @@
   column names anymore.
 - Using base::rowSums and functions from the matrixStats package
   to speed up some operations on rows or columns of matrices.
+- Reduced the number of calls to options() by one when setting and
+  restoring options
 
 File: ffcsaps.R
 ---------------

Modified: pkg/dplR/DESCRIPTION
===================================================================
--- pkg/dplR/DESCRIPTION	2015-02-09 14:41:12 UTC (rev 962)
+++ pkg/dplR/DESCRIPTION	2015-02-10 09:55:58 UTC (rev 963)
@@ -3,7 +3,7 @@
 Type: Package
 Title: Dendrochronology Program Library in R
 Version: 1.6.3
-Date: 2015-02-09
+Date: 2015-02-10
 Authors at R: c(person("Andy", "Bunn", role = c("aut", "cph",
         "cre", "trl"), email = "andy.bunn at wwu.edu"), person("Mikko",
         "Korpela", role = c("aut", "trl")), person("Franco", "Biondi",

Modified: pkg/dplR/R/corr.rwl.seg.R
===================================================================
--- pkg/dplR/R/corr.rwl.seg.R	2015-02-09 14:41:12 UTC (rev 962)
+++ pkg/dplR/R/corr.rwl.seg.R	2015-02-10 09:55:58 UTC (rev 963)
@@ -15,9 +15,8 @@
 
     ## turn off warnings for this function
     ## The sig test for spearman's rho often produces warnings.
-    w <- options("warn")
+    w <- options(warn = -1)
     on.exit(options(w))
-    options(warn = -1)
 
     nseries <- length(rwl)
     if (is.null(master) && nseries < 2) {

Modified: pkg/dplR/R/corr.series.seg.R
===================================================================
--- pkg/dplR/R/corr.series.seg.R	2015-02-09 14:41:12 UTC (rev 962)
+++ pkg/dplR/R/corr.series.seg.R	2015-02-10 09:55:58 UTC (rev 963)
@@ -17,9 +17,8 @@
 
     ## turn off warnings for this function
     ## The sig test for spearman's rho often produces warnings.
-    w <- options("warn")
+    w <- options(warn = -1)
     on.exit(options(w))
-    options(warn = -1)
 
     seg.lag <- seg.length / 2
 

Modified: pkg/dplR/R/series.rwl.plot.R
===================================================================
--- pkg/dplR/R/series.rwl.plot.R	2015-02-09 14:41:12 UTC (rev 962)
+++ pkg/dplR/R/series.rwl.plot.R	2015-02-10 09:55:58 UTC (rev 963)
@@ -14,9 +14,8 @@
 
     ## turn off warnings for this function
     ## The sig test for spearman's rho often produces warnings.
-    w <- options("warn")
+    w <- options(warn = -1)
     on.exit(options(w))
-    options(warn = -1)
 
     seg.lag <- seg.length / 2