From noreply at r-forge.r-project.org Wed Nov 9 17:34:27 2016 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Wed, 9 Nov 2016 17:34:27 +0100 (CET) Subject: [Dplr-commits] r1038 - in pkg/dplR: . R man Message-ID: <20161109163427.E900A187984@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. } From noreply at r-forge.r-project.org Fri Nov 25 13:35:21 2016 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Fri, 25 Nov 2016 13:35:21 +0100 (CET) Subject: [Dplr-commits] r1039 - pkg/dplR/tests/testthat Message-ID: <20161125123521.52D0218058C@r-forge.r-project.org> Author: mvkorpel Date: 2016-11-25 13:35:20 +0100 (Fri, 25 Nov 2016) New Revision: 1039 Modified: pkg/dplR/tests/testthat/test-dplR.R Log: Change test of combine.rwl() to match recent class change Modified: pkg/dplR/tests/testthat/test-dplR.R =================================================================== --- pkg/dplR/tests/testthat/test-dplR.R 2016-11-09 16:34:27 UTC (rev 1038) +++ pkg/dplR/tests/testthat/test-dplR.R 2016-11-25 12:35:20 UTC (rev 1039) @@ -108,10 +108,12 @@ rnames.3 <- as.character(range.3) range.4 <- range.1 + 450 rnames.4 <- as.character(range.4) - df.1 <- data.frame(col1 = c(v.1, rep.int(NA, 50)), - col2 = c(rep.int(NA, 25), v.1, rep.int(NA, 25)), - col3 = c(rep.int(NA, 50), v.1), - row.names = rnames.1) + df.1 <- + structure(data.frame(col1 = c(v.1, rep.int(NA, 50)), + col2 = c(rep.int(NA, 25), v.1, rep.int(NA, 25)), + col3 = c(rep.int(NA, 50), v.1), + row.names = rnames.1), + class = c("rwl", "data.frame")) df.2 <- df.1 rownames(df.2) <- rnames.2 df.3 <- df.1 From noreply at r-forge.r-project.org Fri Nov 25 13:39:14 2016 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Fri, 25 Nov 2016 13:39:14 +0100 (CET) Subject: [Dplr-commits] r1040 - pkg/dplR Message-ID: <20161125123914.802B2187947@r-forge.r-project.org> Author: mvkorpel Date: 2016-11-25 13:39:14 +0100 (Fri, 25 Nov 2016) New Revision: 1040 Modified: pkg/dplR/DESCRIPTION Log: Suggesting removal of Date field which is optional. Keeping the field up-to-date is tedious. CRAN adds publication date anyway. Modified: pkg/dplR/DESCRIPTION =================================================================== --- pkg/dplR/DESCRIPTION 2016-11-25 12:35:20 UTC (rev 1039) +++ pkg/dplR/DESCRIPTION 2016-11-25 12:39:14 UTC (rev 1040) @@ -3,7 +3,6 @@ Type: Package Title: Dendrochronology Program Library in R Version: 1.6.5 -Date: 2016-09-07 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", From noreply at r-forge.r-project.org Mon Nov 28 11:49:34 2016 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Mon, 28 Nov 2016 11:49:34 +0100 (CET) Subject: [Dplr-commits] r1041 - pkg/dplR Message-ID: <20161128104934.176F8187655@r-forge.r-project.org> Author: mvkorpel Date: 2016-11-28 11:49:33 +0100 (Mon, 28 Nov 2016) New Revision: 1041 Modified: pkg/dplR/.Rbuildignore Log: Ignore output of devtools::revdep_check() Modified: pkg/dplR/.Rbuildignore =================================================================== --- pkg/dplR/.Rbuildignore 2016-11-25 12:39:14 UTC (rev 1040) +++ pkg/dplR/.Rbuildignore 2016-11-28 10:49:33 UTC (rev 1041) @@ -11,3 +11,4 @@ ^.*/auto$ ^(|.*[^[:alpha:]])README-developer(|[^[:alpha:]].*)$ ^vignettes/Rplots.*\.pdf$ +^revdep$ From noreply at r-forge.r-project.org Mon Nov 28 11:51:21 2016 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Mon, 28 Nov 2016 11:51:21 +0100 (CET) Subject: [Dplr-commits] r1042 - pkg/dplR Message-ID: <20161128105121.55C0A187A0B@r-forge.r-project.org> Author: mvkorpel Date: 2016-11-28 11:51:21 +0100 (Mon, 28 Nov 2016) New Revision: 1042 Modified: pkg/dplR/ Log: Make it so that also svn ignores the revdep_check() results Property changes on: pkg/dplR ___________________________________________________________________ Modified: svn:ignore - dplR-Ex.R svn*.tmp .* *~ .Rproj.user *.Rproj + dplR-Ex.R svn*.tmp .* *~ .Rproj.user *.Rproj revdep