Skip to content

Commit

Permalink
Pre CRAN 0.1.4 p3
Browse files Browse the repository at this point in the history
  • Loading branch information
aravind-j committed Jun 16, 2020
1 parent 055c2e4 commit a67bf59
Show file tree
Hide file tree
Showing 33 changed files with 1,041 additions and 539 deletions.
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Goldberg (1971), Bilbro and Wanjura (1982), and Fakorede and Ayoola (1980).
* Fixed documentation errors in `FourPHFfit` and `CVGermTime`.
* Updated documentation for `GermSpeed`, `GermSpeedAccumulated`, `CUGerm` `MeanGermRate`, `SEGermRate`, `CVG`, `MeanGermTime`, `VarGermTime`, `SEGermTime`, `GermUncertainty`, `GermSynchrony`, `MeanGermPercent`, `MeanGermNumber`, `WeightGermPercent`, `TimsonsIndex`, `GermRateGeorge` and `GermSynchrony`.
* Converted all equations in Rd files to `MathJax`using `mathjaxr`
* Added long running examples to `\donttest` in `germination.indices`, `plot.FourPHFfit`, `gcdata` and `FourPHFfit.bulk`.

# germinationmetrics 0.1.3

Expand Down
2 changes: 2 additions & 0 deletions R/FourPHFfit.bulk.R
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
#'
#' @examples
#'
#' \donttest{
#' data(gcdata)
#'
#' counts.per.intervals <- c("Day01", "Day02", "Day03", "Day04", "Day05",
Expand All @@ -59,6 +60,7 @@
#' intervals = 1:14, partial = TRUE,
#' fix.y0 = TRUE, fix.a = TRUE, xp = c(10, 60),
#' tmax = 20, tries = 3, umax = 90, umin = 10)
#' }
#'
FourPHFfit.bulk <- function(data, total.seeds.col, counts.intervals.cols,
intervals, partial = TRUE,
Expand Down
2 changes: 2 additions & 0 deletions R/gcdata.R
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
#'
#' @examples
#'
#' \donttest{
#' data(gcdata)
#' library(ggplot2)
#' library(reshape2)
Expand Down Expand Up @@ -91,5 +92,6 @@
#' germination.indices(gcdata, total.seeds.col = "Total Seeds",
#' counts.intervals.cols = counts.per.intervals,
#' intervals = 1:14, partial = TRUE, max.int = 5)
#' }
#'
"gcdata"
2 changes: 2 additions & 0 deletions R/germination.indices.R
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@
#'
#' @examples
#'
#' \donttest{
#' data(gcdata)
#'
#' counts.per.intervals <- c("Day01", "Day02", "Day03", "Day04", "Day05",
Expand All @@ -190,6 +191,7 @@
#' germination.indices(gcdata, total.seeds.col = "Total Seeds",
#' counts.intervals.cols = counts.per.intervals,
#' intervals = 1:14, partial = TRUE, max.int = 5)
#' }
#'
#' @seealso This function is a wrapper around the different functions for
#' computation of single-value germination indices in
Expand Down
2 changes: 2 additions & 0 deletions R/plot.FourPHFfit.R
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
#'
#' @examples
#'
#' \donttest{
#' x <- c(0, 0, 0, 0, 4, 17, 10, 7, 1, 0, 1, 0, 0, 0)
#' y <- c(0, 0, 0, 0, 4, 21, 31, 38, 39, 39, 40, 40, 40, 40)
#' int <- 1:length(x)
Expand Down Expand Up @@ -93,6 +94,7 @@
#' # Without y axis limits adjustment
#' plot(fit1, limits = FALSE)
#' plot(fit2, limits = FALSE)
#' }
#'
plot.FourPHFfit <- function(x, rog = TRUE, t50.total = TRUE, t50.germ = TRUE,
tmgr = TRUE, mgt = TRUE, uniformity = TRUE,
Expand Down
24 changes: 12 additions & 12 deletions README.html

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org
[![rstudio mirror
downloads](https://cranlogs.r-pkg.org/badges/grand-total/germinationmetrics?color=green)](https://CRAN.R-project.org/package=germinationmetrics)
<!-- [![packageversion](https://img.shields.io/badge/Package%20version-0.2.3.3-orange.svg)](https://github.com/aravind-j/germinationmetrics) -->
[![develVersion](https://img.shields.io/badge/devel%20version-0.1.3.9000-orange.svg)](https://github.com/aravind-j/germinationmetrics)
[![develVersion](https://img.shields.io/badge/devel%20version-0.1.4-orange.svg)](https://github.com/aravind-j/germinationmetrics)
<!-- [![GitHub Download Count](https://github-basic-badges.herokuapp.com/downloads/aravind-j/germinationmetrics/total.svg)] -->
[![Project Status:
Active](http://www.repostatus.org/badges/latest/active.svg)](http://www.repostatus.org/#active)
[![lifecycle](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://www.tidyverse.org/lifecycle/#stable)
[![Last-changedate](https://img.shields.io/badge/last%20change-2020--06--15-yellowgreen.svg)](https://github.com/aravind-j/germinationmetrics/commits/master)
[![Last-changedate](https://img.shields.io/badge/last%20change-2020--06--16-yellowgreen.svg)](https://github.com/aravind-j/germinationmetrics/commits/master)
[![Rdoc](http://www.rdocumentation.org/badges/version/germinationmetrics)](http://www.rdocumentation.org/packages/germinationmetrics)
[![Zenodo
DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1219630.svg)](https://doi.org/10.5281/zenodo.1219630)
Expand Down Expand Up @@ -98,8 +98,8 @@ citation("germinationmetrics")
To cite the R package 'germinationmetrics' in publications use:
Aravind, J., Vimala Devi, S., Radhamani, J., Jacob, S. R., and Kalyani Srinivasan (2020). germinationmetrics:
Seed Germination Indices and Curve Fitting. R package version 0.1.4,
Aravind, J., Vimala Devi, S., Radhamani, J., Jacob, S. R., and Kalyani Srinivasan (2020). germinationmetrics: Seed
Germination Indices and Curve Fitting. R package version 0.1.4,
https://github.com/aravind-j/germinationmetricshttps://cran.r-project.org/package=germinationmetrics.
A BibTeX entry for LaTeX users is
Expand All @@ -113,6 +113,6 @@ A BibTeX entry for LaTeX users is
note = {https://cran.r-project.org/package=germinationmetrics},
}
This free and open-source software implements academic research by the authors and co-workers. If you use it, please
support the project by citing the package.
This free and open-source software implements academic research by the authors and co-workers. If you use it, please support
the project by citing the package.
```
Loading

0 comments on commit a67bf59

Please sign in to comment.