Merge pull request #199 from hneth/master

Increment to devel version
ndphillips · Jun 8, 2023 · 926d3ab · 926d3ab
2 parents fde1f58 + 7ae8f50
commit 926d3ab
Show file tree

Hide file tree

Showing 22 changed files with 281 additions and 244 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: FFTrees
 Type: Package
 Title: Generate, Visualise, and Evaluate Fast-and-Frugal Decision Trees
-Version: 2.0.0
+Version: 2.0.0.9001
 Date: 2023-06-06
 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")),

diff --git a/NEWS.md b/NEWS.md
@@ -1,14 +1,60 @@
 
 # FFTrees 2.0
 
-## 2.0.0
+## 2.0.0.9001
 
-**FFTrees** version 2.0.0 was released [on CRAN](https://CRAN.R-project.org/package=FFTrees) [on 2023-06-06]. 
+<!-- **FFTrees** version 2.0.0 was released [on CRAN](https://CRAN.R-project.org/package=FFTrees) [on 2023-06-06]. -->
+
+<!-- Development version: --> 
+
+This the current development version of **FFTrees**, available at <https://github.com/ndphillips/FFTrees>. 
+This version adds features and fixes bugs. 
 
 <!-- Log of changes: --> 
 
+Changes since last release: 
+
+<!-- Major: --> 
+
+### Major changes 
+
+<!-- Topic --> 
+
+- None yet.
+
+
+<!-- Minor: --> 
+
+### Minor changes 
+
+<!-- Topic --> 
+
+- None yet.
+
+
+<!-- Details: --> 
+
+### Details 
+
+<!-- Topic --> 
+
+- None yet.
+
+
+<!-- Development version: --> 
+
+The current development version of **FFTrees** is available at <https://github.com/ndphillips/FFTrees>. 
+
+
+<!-- Older versions: --> 
+
+## 2.0.0
+
+**FFTrees** version 2.0.0 was released [on CRAN](https://CRAN.R-project.org/package=FFTrees) [on 2023-06-06]. 
 This version adds functionality, improves consistency, and increases robustness.
 
+<!-- Log of changes: --> 
+
 Changes since last release: 
 
 <!-- Major: --> 

diff --git a/R/FFTreesdata_doc.R b/R/FFTreesdata_doc.R
diff --git a/R/util_stats.R b/R/util_stats.R
@@ -5,16 +5,17 @@
 # Statistical calculations (based on classification outcomes in 2x2 matrix and models): ------
 
 
-# add_stats (from frequency of 4 classification outcomes): ------
+# add_stats (from frequency counts of 4 classification outcomes): ------
 
 # Outcome statistics based on frequency counts (of 4 classification outcomes)
 # [used to set cue thresholds in fftrees_threshold_factor_grid() and fftrees_threshold_numeric_grid()]:
 
 
-#' Add decision statistics to data (based on frequency counts of a 2x2 classification outcomes)
+#' Add decision statistics to data (based on frequency counts of a 2x2 matrix of classification outcomes)
 #'
 #' \code{add_stats} assumes the input of the 4 essential classification outcomes
-#' (as frequency counts in a data frame \code{"data"} with variable names \code{"hi"}, \code{"fa"}, \code{"mi"}, and \code{"cr"})
+#' (as frequency counts in a data frame \code{"data"}
+#' with variable names \code{"hi"}, \code{"fa"}, \code{"mi"}, and \code{"cr"})
 #' and uses them to compute various decision accuracy measures.
 #'
 #' Providing numeric values for \code{cost.each} (as a vector) and \code{cost.outcomes} (as a named list)

diff --git a/README.Rmd b/README.Rmd
@@ -33,17 +33,16 @@ url_JDM_doi <- "https://doi.org/10.1017/S1930297500006239"
 
 # FFTrees `r packageVersion("FFTrees")` <img src = "./inst/FFTrees_Logo.jpg" align = "right" alt = "FFTrees" width = "225" />
 
-
-<!-- Release badges start: -->
+<!-- Devel badges start: --> 
 [![CRAN status](https://www.r-pkg.org/badges/version/FFTrees)](https://CRAN.R-project.org/package=FFTrees)
-[![Total downloads](https://cranlogs.r-pkg.org/badges/grand-total/FFTrees?color='00a9e0')](https://www.r-pkg.org/pkg/FFTrees)
-<!-- Release badges end. -->
+[![Downloads/month](https://cranlogs.r-pkg.org/badges/FFTrees?color='00a9e0')](https://www.r-pkg.org/pkg/FFTrees)
+[![R-CMD-check](https://github.com/ndphillips/FFTrees/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/ndphillips/FFTrees/actions/workflows/R-CMD-check.yaml)
+<!-- Devel badges end. -->
 
-<!-- Devel badges start: --> 
+<!-- Release badges start: -->
 <!-- [![CRAN status](https://www.r-pkg.org/badges/version/FFTrees)](https://CRAN.R-project.org/package=FFTrees) -->
-<!-- [![Downloads/month](https://cranlogs.r-pkg.org/badges/FFTrees?color='00a9e0')](https://www.r-pkg.org/pkg/FFTrees) -->
-<!-- [![R-CMD-check](https://github.com/ndphillips/FFTrees/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/ndphillips/FFTrees/actions/workflows/R-CMD-check.yaml) -->
-<!-- Devel badges end. -->
+<!-- [![Total downloads](https://cranlogs.r-pkg.org/badges/grand-total/FFTrees?color='00a9e0')](https://www.r-pkg.org/pkg/FFTrees) -->
+<!-- Release badges end. -->
 
 <!-- ALL badges start: --> 
 <!-- [![CRAN status](https://www.r-pkg.org/badges/version/FFTrees)](https://CRAN.R-project.org/package=FFTrees) -->

diff --git a/README.md b/README.md
@@ -2,21 +2,20 @@
 <!-- README.md is generated from README.Rmd. Please only edit the .Rmd file! -->
 <!-- Title, version and logo: -->
 
-# FFTrees 2.0.0 <img src = "./inst/FFTrees_Logo.jpg" align = "right" alt = "FFTrees" width = "225" />
+# FFTrees 2.0.0.9001 <img src = "./inst/FFTrees_Logo.jpg" align = "right" alt = "FFTrees" width = "225" />
 
-<!-- Release badges start: -->
+<!-- Devel badges start: -->
 
 [![CRAN
 status](https://www.r-pkg.org/badges/version/FFTrees)](https://CRAN.R-project.org/package=FFTrees)
-[![Total
-downloads](https://cranlogs.r-pkg.org/badges/grand-total/FFTrees?color='00a9e0')](https://www.r-pkg.org/pkg/FFTrees)
-<!-- Release badges end. -->
+[![Downloads/month](https://cranlogs.r-pkg.org/badges/FFTrees?color='00a9e0')](https://www.r-pkg.org/pkg/FFTrees)
+[![R-CMD-check](https://github.com/ndphillips/FFTrees/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/ndphillips/FFTrees/actions/workflows/R-CMD-check.yaml)
+<!-- Devel badges end. -->
 
-<!-- Devel badges start: -->
+<!-- Release badges start: -->
 <!-- [![CRAN status](https://www.r-pkg.org/badges/version/FFTrees)](https://CRAN.R-project.org/package=FFTrees) -->
-<!-- [![Downloads/month](https://cranlogs.r-pkg.org/badges/FFTrees?color='00a9e0')](https://www.r-pkg.org/pkg/FFTrees) -->
-<!-- [![R-CMD-check](https://github.com/ndphillips/FFTrees/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/ndphillips/FFTrees/actions/workflows/R-CMD-check.yaml) -->
-<!-- Devel badges end. -->
+<!-- [![Total downloads](https://cranlogs.r-pkg.org/badges/grand-total/FFTrees?color='00a9e0')](https://www.r-pkg.org/pkg/FFTrees) -->
+<!-- Release badges end. -->
 <!-- ALL badges start: -->
 <!-- [![CRAN status](https://www.r-pkg.org/badges/version/FFTrees)](https://CRAN.R-project.org/package=FFTrees) -->
 <!-- [![Build Status](https://travis-ci.org/ndphillips/FFTrees.svg?branch=master)](https://travis-ci.org/ndphillips/FFTrees) -->
@@ -334,6 +333,6 @@ Examples include:
 
 ------------------------------------------------------------------------
 
-\[File `README.Rmd` last updated on 2023-06-03.\]
+\[File `README.Rmd` last updated on 2023-06-06.\]
 
 <!-- eof. -->
diff --git a/man/add_stats.Rd b/man/add_stats.Rd
diff --git a/man/blood.Rd b/man/blood.Rd
diff --git a/man/breastcancer.Rd b/man/breastcancer.Rd
diff --git a/man/car.Rd b/man/car.Rd
diff --git a/man/contraceptive.Rd b/man/contraceptive.Rd
diff --git a/man/creditapproval.Rd b/man/creditapproval.Rd
diff --git a/man/fertility.Rd b/man/fertility.Rd
diff --git a/man/forestfires.Rd b/man/forestfires.Rd
diff --git a/man/heart.cost.Rd b/man/heart.cost.Rd
diff --git a/man/heartdisease.Rd b/man/heartdisease.Rd
diff --git a/man/iris.v.Rd b/man/iris.v.Rd
diff --git a/man/mushrooms.Rd b/man/mushrooms.Rd