Skip to content

Commit 78d1c91

Browse files
author
Daniel Anderson
authored
Merge pull request #135 from datalorax/cran-release
fixes before cran release
2 parents 368bb50 + 93e67c0 commit 78d1c91

29 files changed

+38
-31
lines changed

DESCRIPTION

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: equatiomatic
22
Title: Transform Models into 'LaTeX' Equations
3-
Version: 0.1.0.9000
3+
Version: 0.2.0
44
Authors@R: c(
55
person(given = "Daniel",
66
family = "Anderson",
@@ -12,6 +12,10 @@ Authors@R: c(
1212
role = "aut",
1313
email = "[email protected]",
1414
comment = c(ORCID = "https://orcid.org/0000-0002-3948-3914")),
15+
person(given = 'Jay',
16+
family = 'Sumners',
17+
role = 'aut',
18+
email = '[email protected]'),
1519
person(given = "Joshua",
1620
family = "Rosenberg",
1721
role = "ctb",
@@ -36,11 +40,7 @@ Authors@R: c(
3640
family = 'Norouzian',
3741
role = 'ctb',
3842
email = '[email protected]',
39-
comment = c(ORCID = "https://orcid.org/0000-0002-0531-6886")),
40-
person(given = 'Jay',
41-
family = 'Sumners',
42-
role = 'ctb',
43-
email = '[email protected]')
43+
comment = c(ORCID = "https://orcid.org/0000-0002-0531-6886"))
4444
)
4545
Description: The goal of 'equatiomatic' is to reduce the pain associated with
4646
writing 'LaTeX' formulas from fitted models. The primary function of

NEWS.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
# equatiomatic (development version)
1+
# equatiomatic 0.2.0
2+
* **New models**: This is the first version to support `lme4::lmer()` models and `forecast::Arima()` models.
3+
* New vignettes for each of the new models supported.
4+
* New vignette showing how to use the package with plotting
5+
* Switched the testing framework to use snapshot testing
26
* Uses new print method so users no longer have to specify `results = "asis"` in the R Markdown chunk option
37
* Fixed error in rendering logistic/probit regression equations by removing the epsilon (error term) at the end of the left-hand side
4-
* The epsilon (error term) is no longer being shown when rendering the fitted model equation, i.e. `use_coefs = TRUE`, for `lm` models. The hat sign is also added to the response variable.
5-
* Includes the first function from the `forecast` package, specifically `forecast::Arima`. The equation will print in backshift (or lag) operator notation and includes pure ARIMA models as well as Regression w/ ARIMA errors (both of which are generated by `forecast::Arima`).
8+
* The epsilon (error term) is no longer shown when rendering the fitted model equation, i.e. `use_coefs = TRUE`, for `lm` models. The hat sign is also added to the response variable.
9+
610

711
# equatiomatic 0.1.0
812
* Initial CRAN Release

R/penguins.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#' \item{sex}{a factor denoting penguin sex (female, male)}
1616
#' \item{year}{an integer denoting the study year (2007, 2008, or 2009)}
1717
#' }
18-
#' @source {Adélie penguins: Palmer Station Antarctica LTER and K. Gorman. 2020. Structural size measurements and isotopic signatures of foraging among adult male and female Adélie penguins (Pygoscelis adeliae) nesting along the Palmer Archipelago near Palmer Station, 2007-2009 ver 5. Environmental Data Initiative} \url{https://doi.org/10.6073/pasta/98b16d7d563f265cb52372c8ca99e60f}
19-
#' @source {Gentoo penguins: Palmer Station Antarctica LTER and K. Gorman. 2020. Structural size measurements and isotopic signatures of foraging among adult male and female Gentoo penguin (Pygoscelis papua) nesting along the Palmer Archipelago near Palmer Station, 2007-2009 ver 5. Environmental Data Initiative} \url{https://doi.org/10.6073/pasta/7fca67fb28d56ee2ffa3d9370ebda689}
20-
#' @source {Chinstrap penguins: Palmer Station Antarctica LTER and K. Gorman. 2020. Structural size measurements and isotopic signatures of foraging among adult male and female Chinstrap penguin (Pygoscelis antarcticus) nesting along the Palmer Archipelago near Palmer Station, 2007-2009 ver 6. Environmental Data Initiative} \url{https://doi.org/10.6073/pasta/c14dfcfada8ea13a17536e73eb6fbe9e}
18+
#' @source {Adélie penguins: Palmer Station Antarctica LTER and K. Gorman. 2020. Structural size measurements and isotopic signatures of foraging among adult male and female Adélie penguins (Pygoscelis adeliae) nesting along the Palmer Archipelago near Palmer Station, 2007-2009 ver 5. Environmental Data Initiative} \doi{10.6073/pasta/98b16d7d563f265cb52372c8ca99e60f}
19+
#' @source {Gentoo penguins: Palmer Station Antarctica LTER and K. Gorman. 2020. Structural size measurements and isotopic signatures of foraging among adult male and female Gentoo penguin (Pygoscelis papua) nesting along the Palmer Archipelago near Palmer Station, 2007-2009 ver 5. Environmental Data Initiative} \doi{10.6073/pasta/7fca67fb28d56ee2ffa3d9370ebda689}
20+
#' @source {Chinstrap penguins: Palmer Station Antarctica LTER and K. Gorman. 2020. Structural size measurements and isotopic signatures of foraging among adult male and female Chinstrap penguin (Pygoscelis antarcticus) nesting along the Palmer Archipelago near Palmer Station, 2007-2009 ver 6. Environmental Data Initiative} \doi{10.6073/pasta/c14dfcfada8ea13a17536e73eb6fbe9e}
2121
#' @source {Originally published in: Gorman KB, Williams TD, Fraser WR (2014) Ecological Sexual Dimorphism and Environmental Variability within a Community of Antarctic Penguins (Genus Pygoscelis). PLoS ONE 9(3): e90081. doi:10.1371/journal.pone.0090081}
2222
"penguins"

README.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ usrPackages <- "\\renewcommand*\\familydefault{\\rmdefault}"
3535
# equatiomatic <img src="man/figures/logo.png" align="right"/>
3636

3737
<!-- badges: start -->
38-
[![lifecycle](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://www.tidyverse.org/lifecycle/#maturing)
38+
[![lifecycle](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://lifecycle.r-lib.org/articles/stages.html#maturing)
3939

4040
[![Covrpage Summary](https://img.shields.io/badge/covrpage-Last_Build_2020_08_24-brightgreen.svg)](https://tinyurl.com/y43gpto4)
4141
<!-- [![codecov](https://codecov.io/gh/datalorax/equatiomatic/branch/master/graph/badge.svg)](https://codecov.io/gh/datalorax/equatiomatic) -->

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<!-- badges: start -->
77

8-
[![lifecycle](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://www.tidyverse.org/lifecycle/#maturing)
8+
[![lifecycle](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://lifecycle.r-lib.org/articles/stages.html#maturing)
99

1010
[![Covrpage
1111
Summary](https://img.shields.io/badge/covrpage-Last_Build_2020_08_24-brightgreen.svg)](https://tinyurl.com/y43gpto4)

cran-comments.md

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
1-
## Resubmission
2-
This is a resubmission. In this version we have
3-
4-
* Added single quotes in description around the package name, e.g., 'equatiomatic'.
5-
61
## Test environments
72
* local R installation, R 4.0.2
83
* mac OS 10.15 (on github actions) 4.0.2
9-
* ubuntu 16.04 (on github actions), R 4.0.2, R-devel, R 3.6.3
4+
* ubuntu 16.04 (on github actions), R 4.0.2, R-devel, R 3.6.3, R 3.5.3, R 3.4.4, R 3.3.3
105
* Microsoft Windows Server 2019 20200726.1 (on github actions) R 4.0.2, R 3.6.3
116
* win-builder (devel)
127

138
## R CMD check results
149

15-
0 errors | 0 warnings | 1 note
10+
0 errors | 0 warnings | 0 notes
1611

17-
* This is a new release.

img/equatiomatic.gif

32.1 MB
Loading

man/equatiomatic-package.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
117 Bytes
Loading
117 Bytes
Loading

0 commit comments

Comments
 (0)