Skip to content

Commit

Permalink
Merge pull request #102 from hneth/master
Browse files Browse the repository at this point in the history
Prepare for next CRAN release (FFTrees v1.7.5)
  • Loading branch information
hneth committed Sep 15, 2022
2 parents b130fea + 6104a05 commit 60a758d
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 15 deletions.
4 changes: 2 additions & 2 deletions 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")),
Expand Down
17 changes: 9 additions & 8 deletions NEWS.md
@@ -1,11 +1,10 @@

# FFTrees 1.7
# FFTrees 1.7

## 1.7.0.9010
## 1.7.5

<!-- Development version: -->

The current development version of **FFTrees** is available at <https://github.com/ndphillips/FFTrees>.
**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.

<!-- Log of changes: -->

Expand Down Expand Up @@ -39,13 +38,15 @@ Changes since last release:
- Revised documentation and vignettes.
- Renamed internal functions and variables.

<!-- Development version: -->

The current development version of **FFTrees** is available at <https://github.com/ndphillips/FFTrees>.


<!-- Released versions: -->

------

## 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.
Expand Down Expand Up @@ -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.]

<!-- eof. -->
2 changes: 1 addition & 1 deletion R/helper.R
Expand Up @@ -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).
#'
Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -2,7 +2,7 @@
<!-- README.md is generated from README.Rmd. Please only edit the .Rmd file! -->
<!-- Title, version and logo: -->

# FFTrees 1.7.0.9010 <img src = "./inst/FFTrees_Logo.jpg" align = "right" alt = "FFTrees" width = "225" />
# FFTrees 1.7.5 <img src = "./inst/FFTrees_Logo.jpg" align = "right" alt = "FFTrees" width = "225" />

<!-- Status badges: -->

Expand Down Expand Up @@ -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.\]

<!-- eof. -->
2 changes: 1 addition & 1 deletion inst/CITATION
Expand Up @@ -12,7 +12,7 @@ citEntry(entry = "article",
number = "4",
pages = "344--368",
address = "PDF at <https://journal.sjdm.org/17/17217/jdm17217.pdf>",
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 =
Expand Down
2 changes: 1 addition & 1 deletion man/comp_pred.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 60a758d

Please sign in to comment.