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

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

Author: andybunn
Date: 2016-11-09 17:34:27 +0100 (Wed, 09 Nov 2016)
New Revision: 1038

Modified:
   pkg/dplR/ChangeLog
   pkg/dplR/R/combine.rwl.R
   pkg/dplR/man/combine.rwl.Rd
Log:
combine.rwl wasn't returning class rwl.

Modified: pkg/dplR/ChangeLog
===================================================================
--- pkg/dplR/ChangeLog	2016-09-07 13:15:46 UTC (rev 1037)
+++ pkg/dplR/ChangeLog	2016-11-09 16:34:27 UTC (rev 1038)
@@ -1,5 +1,10 @@
 * CHANGES IN dplR VERSION 1.6.5
 
+File: combine.rwl.R
+----------------
+-Changed so that combine.rwl returns class data.frame and class rwl.
+
+
 File: crn.plot.R
 ----------------
 

Modified: pkg/dplR/R/combine.rwl.R
===================================================================
--- pkg/dplR/R/combine.rwl.R	2016-09-07 13:15:46 UTC (rev 1037)
+++ pkg/dplR/R/combine.rwl.R	2016-11-09 16:34:27 UTC (rev 1038)
@@ -42,5 +42,7 @@
     } else {
         stop("Nothing to combine here. Please supply data.frames formatted according to the data standards in dplR.")
     }
-    as.data.frame(new.mat)
+    new.mat <- as.data.frame(new.mat)
+    class(new.mat) <- c("rwl", "data.frame")
+    new.mat
 }

Modified: pkg/dplR/man/combine.rwl.Rd
===================================================================
--- pkg/dplR/man/combine.rwl.Rd	2016-09-07 13:15:46 UTC (rev 1037)
+++ pkg/dplR/man/combine.rwl.Rd	2016-11-09 16:34:27 UTC (rev 1038)
@@ -24,7 +24,8 @@
   also fulfills this condition.  If the input is differently formatted,
   the result will be wrong.}
 
-\value{ A \code{data.frame} with the series in columns and the years as
+\value{An object of class \code{c("rwl", "data.frame")} with the series in 
+  columns and the years as
   rows.  The keycodes are the column names and the years are the row
   names. }