Fixed bug with transmute_weights()

marberts · Mar 23, 2024 · 120528f · 120528f
1 parent 8803146
commit 120528f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: gpindex
 Title: Generalized Price and Quantity Indexes
-Version: 0.6.0.9013
+Version: 0.6.0.9014
 Authors@R: c(
     person("Steve", "Martin", role = c("aut", "cre", "cph"),
     email = "[email protected]",

diff --git a/R/weights.R b/R/weights.R
@@ -200,7 +200,7 @@ transmute_weights <- function(r, s) {
   function(x, w = NULL) {
     if (r == s) {
       if (is.null(w)) {
-        return(rep.int(1 / length(x), length(x)))
+        w <- rep.int(1, length(x))
       }
       if (length(x) != length(w)) {
         stop("'x' and 'w' must be the same length")

diff --git a/tests/testthat/test-weights.R b/tests/testthat/test-weights.R
@@ -6,6 +6,7 @@ f <- factor(sample(letters[1:3], 15, TRUE))
 
 test_that("weights transmute correctly", {
   expect_equal(transmute_weights(2, 2)(x), rep(1 / 15, length(x)))
+  expect_equal(transmute_weights(2, 2)(c(1:3, NA)), c(1, 1, 1, NA) / 3)
   expect_equal(
     transmute_weights(0, 0)(xna, w),
     scale_weights(replace(w, 2, NA))