Use floor() instead of round() in %% (#365)

* Fix `%/%` and `%%` * Enhance tests `%/%` and `%%`
r-quantities · Feb 21, 2024 · 23751a7 · 23751a7
1 parent 928e883
commit 23751a7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/R/arith.R b/R/arith.R
@@ -102,7 +102,7 @@ Ops.units <- function(e1, e2) {
 
   if (mod) {
     div <- e1 / e2
-    int <- round(div)
+    int <- floor(div)
     if (.Generic == "%/%") {
       return(int)
     } else {

diff --git a/tests/testthat/test_arith.R b/tests/testthat/test_arith.R
@@ -174,7 +174,7 @@ test_that("we can undo logatithms", {
 })
 
 test_that("%/% and %% work", {
-  x <- set_units(3, m^2)
+  x <- set_units(1:5, m^2)
   y <- set_units(1.4, foot)
 
   expect_true(all.equal(x, y * (x %/% y) + x %% y))
@@ -193,6 +193,8 @@ test_that("%/% and %% work", {
   expect_equal(set_units(x, foot^2) %% drop_units(y), z)
   expect_equal(set_units(x, foot^2) %% set_units(drop_units(y), 1), z)
   expect_error(drop_units(set_units(x, foot^2)) %% y)
+
+  expect_true(all(x %% y >= set_units(0, m^2)))
 })
 
 #test_that("%*% work", {