Version 0.6.1

marberts · Apr 12, 2024 · 9d26f17 · 9d26f17
1 parent 62ad7d1
commit 9d26f17
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -10,3 +10,4 @@
 ^pkgdown$
 ^inst/logo\.R$
 ^CRAN-SUBMISSION$
+^revdep$
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,5 @@
 *.Rproj
 inst/doc
 docs
-pkgdown
+pkgdown
+revdep
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: gpindex
 Title: Generalized Price and Quantity Indexes
-Version: 0.6.0.9017
+Version: 0.6.1
 Authors@R: c(
     person("Steve", "Martin", role = c("aut", "cre", "cph"),
     email = "[email protected]",

diff --git a/README.Rmd b/README.Rmd
@@ -19,7 +19,7 @@ knitr::opts_chunk$set(
 [![gpindex status badge](https://marberts.r-universe.dev/badges/gpindex)](https://marberts.r-universe.dev)
 [![Conda Version](https://img.shields.io/conda/vn/conda-forge/r-gpindex.svg)](https://anaconda.org/conda-forge/r-gpindex)
 [![R-CMD-check](https://github.com/marberts/gpindex/workflows/R-CMD-check/badge.svg)](https://github.com/marberts/gpindex/actions)
-[![codecov](https://codecov.io/gh/marberts/gpindex/graph/badge.svg?token=TL7V9QO0BH)](https://codecov.io/gh/marberts/gpindex)
+[![codecov](https://codecov.io/gh/marberts/gpindex/graph/badge.svg?token=TL7V9QO0BH)](https://app.codecov.io/gh/marberts/gpindex)
 [![DOI](https://zenodo.org/badge/261861375.svg)](https://zenodo.org/doi/10.5281/zenodo.10097742)
 <!-- badges: end -->
 

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ badge](https://marberts.r-universe.dev/badges/gpindex)](https://marberts.r-unive
 [![Conda
 Version](https://img.shields.io/conda/vn/conda-forge/r-gpindex.svg)](https://anaconda.org/conda-forge/r-gpindex)
 [![R-CMD-check](https://github.com/marberts/gpindex/workflows/R-CMD-check/badge.svg)](https://github.com/marberts/gpindex/actions)
-[![codecov](https://codecov.io/gh/marberts/gpindex/graph/badge.svg?token=TL7V9QO0BH)](https://codecov.io/gh/marberts/gpindex)
+[![codecov](https://codecov.io/gh/marberts/gpindex/graph/badge.svg?token=TL7V9QO0BH)](https://app.codecov.io/gh/marberts/gpindex)
 [![DOI](https://zenodo.org/badge/261861375.svg)](https://zenodo.org/doi/10.5281/zenodo.10097742)
 <!-- badges: end -->
 

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,9 +1,7 @@
 ## Test environments
 
-- local Ubuntu 20.04 installation, R 4.3.1
+- local Ubuntu 20.04 installation, R 4.3.3
 - win-builder (devel, release, oldrelease)
-- mac-builder (release)
-- R-hub (fedora-clang devel)
 
 ## R CMD check results
 

diff --git a/tests/testthat/test-means.R b/tests/testthat/test-means.R
@@ -42,7 +42,7 @@ test_that("generalized means agree with base implementation", {
                weighted.mean(xna^(3.25), w, na.rm = TRUE)^(1 / 3.25))
 })
 
-test_that("generalized means satifies key properties", {
+test_that("generalized mean satifies key properties", {
   # Reversal
   expect_equal(generalized_mean(-3)(x),
                1 / generalized_mean(3)(1 / x))

diff --git a/tests/testthat/test-weights.R b/tests/testthat/test-weights.R
@@ -13,6 +13,7 @@ test_that("weights transmute correctly", {
   )
   expect_equal(transmute_weights(2, 1)(c(1, NA)), c(1, NA))
   expect_equal(transmute_weights(-1, 1)(x, w), scale_weights(w / x))
+  expect_equal(transmute_weights(1, -1)(xna, w), scale_weights(w * xna))
   expect_equal(
     transmute_weights(7, -3)(x, transmute_weights(-3, 7)(x, w)),
     scale_weights(w)