Merge pull request #105 from mayer79/remove-special-case

Remove special case of a one-column matrix in wcolMean()
ModelOriented · Nov 14, 2023 · 29597c2 · 29597c2
2 parents f7e61e6 + bedf559
commit 29597c2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: hstats
 Title: Interaction Statistics
-Version: 1.1.0
+Version: 1.1.1
 Authors@R: 
     person("Michael", "Mayer", , "[email protected]", role = c("aut", "cre"))
 Description: Fast, model-agnostic implementation of different H-statistics

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,9 @@
+# hstats 1.1.1
+
+## Other changes
+
+- Removed an unnecessary special case when calculating column means.
+
 # hstats 1.1.0
 
 ## Enhancements

diff --git a/R/utils_calculate.R b/R/utils_calculate.R
@@ -50,10 +50,6 @@ fdummy <- function(x) {
 #' @param w Optional case weights.
 #' @returns A vector of column means.
 wcolMeans <- function(x, w = NULL) {
-  if (NCOL(x) == 1L && is.atomic(x) && !is.factor(x) && is.null(w)) {
-    # stat::weighted.mean() is much slower than via colSums()
-    return(mean(x))
-  }
   if (is.factor(x)) {
     if (is.null(w)) {
       return(colMeans_factor(x))

diff --git a/packaging.R b/packaging.R
@@ -15,7 +15,7 @@ library(usethis)
 use_description(
   fields = list(
     Title = "Interaction Statistics",
-    Version = "1.1.0",
+    Version = "1.1.1",
     Description = "Fast, model-agnostic implementation of different H-statistics
     introduced by Jerome H. Friedman and Bogdan E. Popescu (2008) <doi:10.1214/07-AOAS148>. 
     These statistics quantify interaction strength per feature, feature pair,