From 1ca957e3ace4eea4d4ea9a1afb1b2902f99a4224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hansj=C3=B6rg=20Neth?= Date: Thu, 15 Sep 2022 08:31:30 +0200 Subject: [PATCH 1/2] prepare for CRAN release of version 1.7.5 --- DESCRIPTION | 4 ++-- NEWS.md | 17 +++++++++-------- README.md | 4 ++-- inst/CITATION | 2 +- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index a98380ee..c36fe8ea 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: FFTrees Type: Package Title: Generate, Visualise, and Evaluate Fast-and-Frugal Decision Trees -Version: 1.7.0.9010 -Date: 2022-09-14 +Version: 1.7.5 +Date: 2022-09-15 Authors@R: c(person("Nathaniel", "Phillips", role = c("aut"), email = "Nathaniel.D.Phillips.is@gmail.com", comment = c(ORCID = "0000-0002-8969-7013")), person("Hansjoerg", "Neth", role = c("aut", "cre"), email = "h.neth@uni.kn", comment = c(ORCID = "0000-0001-5427-3141")), person("Jan", "Woike", role = "aut", comment = c(ORCID = "0000-0002-6816-121X")), diff --git a/NEWS.md b/NEWS.md index d3b9e25f..9f375254 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,11 +1,10 @@ -# FFTrees 1.7 +# FFTrees 1.7 -## 1.7.0.9010 +## 1.7.5 - - -The current development version of **FFTrees** is available at . +**FFTrees** version 1.7.5 was released [on CRAN](https://CRAN.R-project.org/package=FFTrees) [on 2022-09-15]. +This version contains mostly bug fixes, but also improves and revises existing functionality. @@ -39,13 +38,15 @@ Changes since last release: - Revised documentation and vignettes. - Renamed internal functions and variables. + + +The current development version of **FFTrees** is available at . ------- -## 1.7.0 +## 1.7.0 **FFTrees** version 1.7.0 was released [on CRAN](https://CRAN.R-project.org/package=FFTrees) [on 2022-08-31]. This version contains numerous bug fixes and improves or revises existing functionality. @@ -305,6 +306,6 @@ Thus, the main tree building function is now `FFTrees()` and the new tree object ------ -[File `NEWS.md` last updated on 2022-09-14.] +[File `NEWS.md` last updated on 2022-09-15.] diff --git a/README.md b/README.md index 92ecba79..cc65b8dc 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ -# FFTrees 1.7.0.9010 FFTrees +# FFTrees 1.7.5 FFTrees @@ -312,6 +312,6 @@ for the full list): ------------------------------------------------------------------------ -\[File `README.Rmd` last updated on 2022-09-14.\] +\[File `README.Rmd` last updated on 2022-09-15.\] diff --git a/inst/CITATION b/inst/CITATION index 07d5e20d..c28c9d56 100644 --- a/inst/CITATION +++ b/inst/CITATION @@ -12,7 +12,7 @@ citEntry(entry = "article", number = "4", pages = "344--368", address = "PDF at ", - note = "R package (version 1.7.0, August 31, 2022)", + note = "R package (version 1.7.5, September 15, 2022)", url = "https://CRAN.R-project.org/package=FFTrees", textVersion = From 6104a0539f1d5d6939f2ec2c49add15d92b0e637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hansj=C3=B6rg=20Neth?= Date: Thu, 15 Sep 2022 08:34:12 +0200 Subject: [PATCH 2/2] bug fix: typo --- R/helper.R | 2 +- man/comp_pred.Rd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/R/helper.R b/R/helper.R index 1461a1ee..0cbe0769 100644 --- a/R/helper.R +++ b/R/helper.R @@ -312,7 +312,7 @@ cost_cues_append <- function(formula, #' \code{comp_pred} provides the main wrapper for running alternative classification algorithms, such as CART (\code{rpart::rpart}), #' logistic regression (\code{glm}), support vector machines (\code{svm::svm}), and random forests (\code{randomForest::randomForest}). #' -#' @param formula A formula (ususally \code{x$formula}, for an \code{FFTrees} object \code{x}). +#' @param formula A formula (usually \code{x$formula}, for an \code{FFTrees} object \code{x}). #' @param data.train A training dataset (as data frame). #' @param data.test A testing dataset (as data frame). #' diff --git a/man/comp_pred.Rd b/man/comp_pred.Rd index e29beb48..cd71d375 100644 --- a/man/comp_pred.Rd +++ b/man/comp_pred.Rd @@ -15,7 +15,7 @@ comp_pred( ) } \arguments{ -\item{formula}{A formula (ususally \code{x$formula}, for an \code{FFTrees} object \code{x}).} +\item{formula}{A formula (usually \code{x$formula}, for an \code{FFTrees} object \code{x}).} \item{data.train}{A training dataset (as data frame).}