From 038fed15b675dbcf5925f08e797a78a8f768ff0e Mon Sep 17 00:00:00 2001 From: emse-p4a-gwu Date: Wed, 24 Jul 2024 05:45:23 -0400 Subject: [PATCH] dependency fixes with gtsummary, bump to v1.1.2 --- DESCRIPTION | 2 +- NEWS.md | 4 ++++ R/data.R | 8 ++++---- README.md | 1 + man/apolloModeChoiceData.Rd | 2 +- man/electricity.Rd | 2 +- man/runtimes.Rd | 4 ++-- 7 files changed, 14 insertions(+), 9 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index b117f13c..3884ed61 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: logitr Title: Logit Models w/Preference & WTP Space Utility Parameterizations -Version: 1.1.1 +Version: 1.1.2 Authors@R: c( person(given = "John", family = "Helveston", diff --git a/NEWS.md b/NEWS.md index dc736f70..97c8776f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,9 @@ # logitr (development version) +# logitr 1.1.2 + +- Added `broom.helpers (>= 1.15.0)` and `gtsummary (>= 2.0.0)` in DESCRIPTION to accord with an update in {gtsummary}. + # logitr 1.1.1 - Updated the `convergence.Rmd` vignette to not run any actual code using other packages to fix issue on CRAN where not all packages are available on all platforms. Now the results are hard-coded in place. diff --git a/R/data.R b/R/data.R index 25f8954a..95737436 100644 --- a/R/data.R +++ b/R/data.R @@ -154,7 +154,7 @@ -#' Simulated SP dataset of mode choice (from the {apollo} package). +#' Simulated SP dataset of mode choice (from the apollo package). #' #' A simulated dataset containing 7,000 mode choices among four alternatives. #' Data comes from 500 individuals, each with 14 stated stated preference @@ -209,7 +209,7 @@ -#' Stated preference data for the choice of electricity suppliers (from {mlogit} package) +#' Stated preference data for the choice of electricity suppliers (from mlogit package) #' #' A sample of 2308 households in the United States. #' @@ -250,8 +250,8 @@ #' #' This data frame contains the run times for a benchmark comparing the #' relative computation time to estimate a preference space mixed logit model -#' using the following R packages: {logitr}, {mixl}, {mlogit}, {gmnl}, and -#' {apollo}. The run times are exported from the Google colab notebook here: +#' using the following R packages: logitr, mixl, mlogit, gmnl, and +#' apollo. The run times are exported from the Google colab notebook here: #' https://colab.research.google.com/drive/1vYlBdJd4xCV43UwJ33XXpO3Ys8xWkuxx?usp=sharing #' #' @format diff --git a/README.md b/README.md index 2502b53a..990540d2 100644 --- a/README.md +++ b/README.md @@ -88,6 +88,7 @@ article associated with it! You can get the citation by typing ``` r citation("logitr") +#> #> To cite logitr in publications use: #> #> Helveston JP (2023). "logitr: Fast Estimation of Multinomial and diff --git a/man/apolloModeChoiceData.Rd b/man/apolloModeChoiceData.Rd index 28e33933..f5f69b35 100644 --- a/man/apolloModeChoiceData.Rd +++ b/man/apolloModeChoiceData.Rd @@ -3,7 +3,7 @@ \docType{data} \name{apolloModeChoiceData} \alias{apolloModeChoiceData} -\title{Simulated SP dataset of mode choice (from the {apollo} package).} +\title{Simulated SP dataset of mode choice (from the apollo package).} \format{ \tabular{ll}{ Variable \tab Description \cr diff --git a/man/electricity.Rd b/man/electricity.Rd index 076a398c..aee85ff7 100644 --- a/man/electricity.Rd +++ b/man/electricity.Rd @@ -3,7 +3,7 @@ \docType{data} \name{electricity} \alias{electricity} -\title{Stated preference data for the choice of electricity suppliers (from {mlogit} package)} +\title{Stated preference data for the choice of electricity suppliers (from mlogit package)} \format{ \tabular{ll}{ Variable \tab Description \cr diff --git a/man/runtimes.Rd b/man/runtimes.Rd index bb33c4ef..c57520a3 100644 --- a/man/runtimes.Rd +++ b/man/runtimes.Rd @@ -21,8 +21,8 @@ data(runtimes) \description{ This data frame contains the run times for a benchmark comparing the relative computation time to estimate a preference space mixed logit model -using the following R packages: {logitr}, {mixl}, {mlogit}, {gmnl}, and -{apollo}. The run times are exported from the Google colab notebook here: +using the following R packages: logitr, mixl, mlogit, gmnl, and +apollo. The run times are exported from the Google colab notebook here: https://colab.research.google.com/drive/1vYlBdJd4xCV43UwJ33XXpO3Ys8xWkuxx?usp=sharing } \examples{