Better check of maxDistance argument in Trace method

stewid · Jan 21, 2017 · d66aec9 · d66aec9
1 parent 7627b48
commit d66aec9
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/R/trace.r b/R/trace.r
@@ -438,12 +438,13 @@ Trace <- function(movements,
     ##
     if (is.null(maxDistance)) {
         maxDistance <- 0L
-    } else if (!is.numeric(maxDistance)) {
-        stop("'maxDistance' must be an integer")
     }
 
-    if (!is_wholenumber(maxDistance)) {
-        stop("'maxDistance' must be an integer")
+    if (!all(identical(is.numeric(maxDistance), TRUE),
+             identical(length(maxDistance), 1L),
+             identical(is_wholenumber(maxDistance), TRUE),
+             as.integer(maxDistance) >= 0L)) {
+        stop("'maxDistance' must be an integer >= 0")
     }
 
     ## Arguments seems ok...go on with contact tracing