Several performance improvements (3) (#393)

* fix regression #389 * update NEWS
r-quantities · Feb 14, 2025 · 52a9227 · 52a9227
1 parent f056aee
commit 52a9227
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -22,7 +22,7 @@
 
 * Add support for `brew` path discovery in macOS; #384
 
-* Several performance improvements; #387, #388 addressing #386
+* Several performance improvements; #387, #388, #393 addressing #386, #389
 
 # version 0.8-5
 

diff --git a/R/udunits.R b/R/udunits.R
@@ -26,7 +26,8 @@ ud_are_convertible = function(x, y) {
 
 ud_char <- function(x) {
   if (is.character(x)) return(x)
-  res <- paste(x$numerator, collapse=" ")
+  res <- if (length(x$numerator))
+    paste(x$numerator, collapse=" ") else "1"
   if (length(x$denominator))
     res <- paste0(res, " (", paste(x$denominator, collapse=" "), ")-1")
   res

diff --git a/tests/testthat/test_misc.R b/tests/testthat/test_misc.R
@@ -47,6 +47,16 @@ test_that("We can concatenate units if their units can be converted", {
   y <- set_units(y, units(as_units("m")), mode = "standard")
   expect_equal(y, z[1:4 + 4])
   expect_equal(y, z[1:4 + 12])
+
+  x <- 1:4 * as_units("Hz")
+  y <- 5:8 * as_units("1/min")
+  z <- c(x, y)
+
+  expect_equal(length(z), length(x) + length(y))
+  expect_equal(as.character(units(z)), "Hz")
+  expect_equal(x, z[1:4])
+  y <- set_units(y, units(as_units("Hz")), mode = "standard")
+  expect_equal(y, z[1:4 + 4])
 })
 
 test_that("We can use diff on a units object", {