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

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

Author: mvkorpel
Date: 2015-05-26 15:47:36 +0200 (Tue, 26 May 2015)
New Revision: 984

Modified:
   pkg/dplR/ChangeLog
   pkg/dplR/DESCRIPTION
   pkg/dplR/R/read.fh.R
Log:
read.fh() now ignores empty lines (NA from as.numeric()) at the end of series


Modified: pkg/dplR/ChangeLog
===================================================================
--- pkg/dplR/ChangeLog	2015-05-06 15:16:05 UTC (rev 983)
+++ pkg/dplR/ChangeLog	2015-05-26 13:47:36 UTC (rev 984)
@@ -91,6 +91,11 @@
 
 - New function for computing the NET parameter (Esper et al., 2001).
 
+File: read.fh.R
+---------------
+
+- read.fh() now ignores empty lines at the end of series.
+
 File: read.tucson.R
 -------------------
 

Modified: pkg/dplR/DESCRIPTION
===================================================================
--- pkg/dplR/DESCRIPTION	2015-05-06 15:16:05 UTC (rev 983)
+++ pkg/dplR/DESCRIPTION	2015-05-26 13:47:36 UTC (rev 984)
@@ -3,7 +3,7 @@
 Type: Package
 Title: Dendrochronology Program Library in R
 Version: 1.6.3
-Date: 2015-05-06
+Date: 2015-05-26
 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/read.fh.R
===================================================================
--- pkg/dplR/R/read.fh.R	2015-05-06 15:16:05 UTC (rev 983)
+++ pkg/dplR/R/read.fh.R	2015-05-26 13:47:36 UTC (rev 984)
@@ -223,6 +223,9 @@
             stop(gettextf("in series %s: ", keycodes[i], domain="R-dplR"),
                  gettextf("too few values (expected %d, got %d)",
                           n.expected, n.true, domain="R-dplR"), domain=NA)
+        } else if (all(is.na(data[(n.expected+1):n.true]))) {
+            dendro.matrix[(start.years[i]-r.off):(end.years[i]-r.off), i] <-
+                data[seq_len(n.expected)]
         } else {
             stop(gettextf("in series %s: ", keycodes[i], domain="R-dplR"),
                  gettextf("too many values (expected %d, got %d)",