error for N not unique

tdhock · Dec 3, 2024 · 602710a · 602710a
1 parent 66b632c
commit 602710a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: atime
 Type: Package
 Title: Asymptotic Timing
-Version: 2024.11.29
+Version: 2024.12.3
 Authors@R: c(
     person("Toby", "Hocking",
      email="[email protected]",

diff --git a/NEWS b/NEWS
@@ -1,3 +1,7 @@
+Changes in version 2024.12.3
+
+- atime errors if user provides duplicate N values.
+
 Changes in version 2024.11.29
 
 - use seconds.limit=Inf in test, for CRAN.

diff --git a/R/atime.R b/R/atime.R
@@ -114,6 +114,11 @@ atime <- function(N=default_N(), setup, expr.list=NULL, times=10, seconds.limit=
   if(length(N)<2){
     stop("length(N) should be at least 2")
   }
+  N.tab <- table(N)
+  N.bad <- N.tab[N.tab>1]
+  if(length(N.bad)){
+    stop("please remove duplicate values from N: ", paste(names(N.bad), collapse=", "))
+  }
   formal.names <- names(formals())
   mc.args <- as.list(match.call()[-1])
   dots.list <- mc.args[!names(mc.args) %in% formal.names]

diff --git a/man/atime.Rd b/man/atime.Rd
@@ -9,7 +9,7 @@ N, setup, expr.list=NULL, times=10, seconds.limit=0.01, verbose=FALSE,
 result=FALSE, N.env.parent=NULL, ...)}
 
 \arguments{
-  \item{N}{numeric vector of at least two data sizes, default is \code{2^seq(2,20)}.}
+  \item{N}{numeric vector of at least two unique data sizes, default is \code{2^seq(2,20)}.}
   \item{setup}{expression to evaluate for every data size, before timings.}
   \item{expr.list}{named list of expressions to time.}
   \item{times}{number of times to evaluate each timed expression.}

diff --git a/tests/testthat/test-CRAN.R b/tests/testthat/test-CRAN.R
@@ -1,7 +1,15 @@
 library(data.table)
 library(testthat)
 
-test_that("warning for only one N", {
+test_that("error when user provided duplicate N", {
+  expect_error({
+    atime::atime(N=c(1,2,2,3,9,9,9), num=numeric(N))
+  },
+  "please remove duplicate values from N: 2, 9",
+  fixed=TRUE)
+})
+
+test_that("warning when result contains only one N", {
   expect_warning({
     seconds.limit <- 0.001
     atime.list <- atime::atime(