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

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

Author: mvkorpel
Date: 2013-01-10 10:08:22 +0100 (Thu, 10 Jan 2013)
New Revision: 659

Modified:
   pkg/dplR/ChangeLog
   pkg/dplR/DESCRIPTION
   pkg/dplR/R/helpers.R
Log:
Fixed a probably rarely seen bug in fix.names() (read.tridas(), write.compact(), write.tridas(), write.tucson())


Modified: pkg/dplR/ChangeLog
===================================================================
--- pkg/dplR/ChangeLog	2012-11-01 14:37:20 UTC (rev 658)
+++ pkg/dplR/ChangeLog	2013-01-10 09:08:22 UTC (rev 659)
@@ -7,6 +7,13 @@
   tree ring series by using a data.frame 'master' argument
 - Replaced some for loops with cleaner vectorized operations or apply().
 
+File: helpers.R
+---------------
+
+- Fixed a bug in fix.names(), related to creating unique short names.
+  The bug affected read.tridas(), write.compact(), write.tridas() and
+  write.tucson() but probably manifested itself quite rarely.
+
 File: sea.R
 -----------
 

Modified: pkg/dplR/DESCRIPTION
===================================================================
--- pkg/dplR/DESCRIPTION	2012-11-01 14:37:20 UTC (rev 658)
+++ pkg/dplR/DESCRIPTION	2013-01-10 09:08:22 UTC (rev 659)
@@ -3,7 +3,7 @@
 Type: Package
 Title: Dendrochronology Program Library in R
 Version: 1.5.7
-Date: 2012-11-01
+Date: 2013-01-10
 Authors at R: c(person(c("Andrew", "G."), "Bunn", role = c("aut", "cph",
         "cre", "trl"), email = "andrew.bunn at wwu.edu"), person("Mikko",
         "Korpela", role = c("aut", "cph")), person("Franco", "Biondi",

Modified: pkg/dplR/R/helpers.R
===================================================================
--- pkg/dplR/R/helpers.R	2012-11-01 14:37:20 UTC (rev 658)
+++ pkg/dplR/R/helpers.R	2013-01-10 09:08:22 UTC (rev 659)
@@ -256,7 +256,7 @@
                     suffix.count <- count.base(suffix.count, n.an)
                     proposed <-
                         compose.name(unique.cut[i],alphanumeric,suffix.count,limit)
-                    if (nzchar(proposed)) {
+                    if (!nzchar(proposed)) {
                         warning("could not remap a name: some series will be missing")
                         still.looking <- FALSE
                         ## F for Fail...