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

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

Author: andybunn
Date: 2014-03-30 20:01:14 +0200 (Sun, 30 Mar 2014)
New Revision: 751

Modified:
   pkg/dplR/ChangeLog
   pkg/dplR/R/read.compact.R
   pkg/dplR/R/read.fh.R
   pkg/dplR/R/read.tridas.R
   pkg/dplR/R/read.tucson.R
   pkg/dplR/data/anos1.rda
   pkg/dplR/data/ca533.rda
   pkg/dplR/data/co021.rda
   pkg/dplR/data/gp.rwl.rda
   pkg/dplR/man/plot.rwl.Rd
   pkg/dplR/man/seg.plot.Rd
   pkg/dplR/man/spag.plot.Rd
Log:
Added class changes to the read.rwl family so that classes are now c("rwl","data.frame"). I'll stop now because I know Mikko will want to fixed everything I've done wrong!

Modified: pkg/dplR/ChangeLog
===================================================================
--- pkg/dplR/ChangeLog	2014-03-30 03:19:21 UTC (rev 750)
+++ pkg/dplR/ChangeLog	2014-03-30 18:01:14 UTC (rev 751)
@@ -1,5 +1,37 @@
 * CHANGES IN dplR VERSION 1.6.0
 
+File: read.compact.R
+-------------------------
+- Added class "rwl" to output object.
+
+File: read.fh.R
+-------------------------
+- Added class "rwl" to output object.
+
+File: read.tridas.R
+-------------------------
+- Added class "rwl" to output object $results.
+
+File: read.tucson.R
+-------------------------
+- Added class "rwl" to output object.
+
+File: anos1.rda
+-------------------------
+- Added class "rwl" to object.
+
+File: ca533.rda
+-------------------------
+- Added class "rwl" to object.
+
+File: co021.rda
+-------------------------
+- Added class "rwl" to object.
+
+File: gp.rwl.rda
+-------------------------
+- Added class "rwl" to object.
+
 File: NAMESPACE
 -------------------------
 - Added chron.plot to export list.

Modified: pkg/dplR/R/read.compact.R
===================================================================
--- pkg/dplR/R/read.compact.R	2014-03-30 03:19:21 UTC (rev 750)
+++ pkg/dplR/R/read.compact.R	2014-03-30 18:01:14 UTC (rev 751)
@@ -33,5 +33,6 @@
 
     rw.df <- as.data.frame(rw.mat)
     names(rw.df) <- series.ids
+    class(rw.df) <- c("rwl", "data.frame")
     rw.df
 }

Modified: pkg/dplR/R/read.fh.R
===================================================================
--- pkg/dplR/R/read.fh.R	2014-03-30 03:19:21 UTC (rev 750)
+++ pkg/dplR/R/read.fh.R	2014-03-30 18:01:14 UTC (rev 751)
@@ -320,5 +320,6 @@
                         domain="R-dplR"))
         }
     }
+    class(rwl) <- c("rwl", "data.frame")
     rwl
 }

Modified: pkg/dplR/R/read.tridas.R
===================================================================
--- pkg/dplR/R/read.tridas.R	2014-03-30 03:19:21 UTC (rev 750)
+++ pkg/dplR/R/read.tridas.R	2014-03-30 18:01:14 UTC (rev 751)
@@ -2599,5 +2599,7 @@
                        saxVersion = 2,
                        validate = FALSE,
                        useDotNames = TRUE)
-    h$get.results()
+    res <- h$get.results()
+    class(res$measurements) <- c("rwl", "data.frame")
+    res
 }

Modified: pkg/dplR/R/read.tucson.R
===================================================================
--- pkg/dplR/R/read.tucson.R	2014-03-30 03:19:21 UTC (rev 750)
+++ pkg/dplR/R/read.tucson.R	2014-03-30 18:01:14 UTC (rev 751)
@@ -484,5 +484,6 @@
     }
     rw.df <- as.data.frame(apply(rw.mat, 2, fix.internal.na))
     names(rw.df) <- as.character(series.ids)
+    class(rw.df) <- c("rwl", "data.frame")
     rw.df
 }

Modified: pkg/dplR/data/anos1.rda
===================================================================
(Binary files differ)

Modified: pkg/dplR/data/ca533.rda
===================================================================
(Binary files differ)

Modified: pkg/dplR/data/co021.rda
===================================================================
(Binary files differ)

Modified: pkg/dplR/data/gp.rwl.rda
===================================================================
(Binary files differ)

Modified: pkg/dplR/man/plot.rwl.Rd
===================================================================
--- pkg/dplR/man/plot.rwl.Rd	2014-03-30 03:19:21 UTC (rev 750)
+++ pkg/dplR/man/plot.rwl.Rd	2014-03-30 18:01:14 UTC (rev 751)
@@ -28,11 +28,9 @@
 \seealso{
   \code{\link{read.rwl}}
 }
-\examples{data(ca533)
-## to use as S3Method the class of rwl must be set:
-class(ca533) <- c('rwl','data.frame')
-plot(ca533,plot.type=c('seg'))
-plot(ca533,plot.type=c('spag'))
-plot(ca533,plot.type=c('spag'),zfac=2)
+\examples{data(co021)
+plot(co021,plot.type=c('seg'))
+plot(co021,plot.type=c('spag'))
+plot(co021,plot.type=c('spag'),zfac=2)
 }
-\keyword{ plot }
+\keyword{ hplot }

Modified: pkg/dplR/man/seg.plot.Rd
===================================================================
--- pkg/dplR/man/seg.plot.Rd	2014-03-30 03:19:21 UTC (rev 750)
+++ pkg/dplR/man/seg.plot.Rd	2014-03-30 18:01:14 UTC (rev 751)
@@ -22,7 +22,7 @@
 }
 \author{ Andy Bunn. Patched and improved by Mikko Korpela. }
 \seealso{ \code{\link{spag.plot}} }
-\examples{data(ca533)
-seg.plot(ca533, main = "Campito Mountain")
+\examples{data(co021)
+seg.plot(co021, main = "Campito Mountain")
 }
 \keyword{ hplot }

Modified: pkg/dplR/man/spag.plot.Rd
===================================================================
--- pkg/dplR/man/spag.plot.Rd	2014-03-30 03:19:21 UTC (rev 750)
+++ pkg/dplR/man/spag.plot.Rd	2014-03-30 18:01:14 UTC (rev 751)
@@ -27,8 +27,8 @@
 }
 \author{ Andy Bunn. Patched and improved by Mikko Korpela. }
 \seealso{ \code{\link{seg.plot}} }
-\examples{data(ca533)
-spag.plot(ca533, main = "Campito Mountain")
-spag.plot(ca533, zfac = 2, main = "Campito Mountain")
+\examples{data(co021)
+spag.plot(co021)
+spag.plot(co021, zfac = 2)
 }
 \keyword{ hplot }