test boxplot2 🛡️

Author: Kevin Cazelles

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: graphicsutils
 Type: Package
 Title: Collection of graphics utilities
-Version: 1.2-1
+Version: 1.3-0
 Date: 2019-02-16
 Authors@R: c(person("Kevin", "Cazelles", role = c("aut", "cre"), email = "kcazelle@uoguelph.ca", comment = c(ORCID = "0000-0001-6619-9874")),
   person("Nicolas", "Casajus", role = c("aut"), comment = c(ORCID = "0000-0002-5537-5294")),
@@ -17,7 +17,6 @@ Imports:
     utils,
     jpeg (>= 0.1-8),
     png (>= 0.1-7),
-    magrittr (>= 1.5),
     Rcpp (>= 0.12.9)
 Suggests:
     knitr,

R/boxplot2.R

@@ -50,10 +50,11 @@ boxplot2 <- function(x, ..., probs = c(.05, 0.25, .5, .75, .95),
     val <- apply(as.data.frame(x), 2, quantile, probs = probs)
   }
   ##
-  if (!add)
-    plot0(c(.5, ncol(val) +.5), c(range(val)))
-  ##
   if (is.null(at)) xco <- 1:ncol(val) else xco <- rep_len(at, ncol(val))
+  ##
+  if (!add)
+    plot0(c(.5, ncol(val) + .5), range(val))
+
 
   for (i in seq_len(ncol(val))) {
     single_boxplot(xco[i], val[,i], vc_cex = vc_cex, colors = colors,

R/plotAreaColor.R

@@ -8,7 +8,6 @@
 #'
 #' @keywords background, color
 #'
-#' @importFrom magrittr %<>%
 #' @export
 #'
 #' @details The function calls \code{\link{rect}} and draw a colored rectangle (default color is set to light blue) whose dimensions are given by argument `usr` of function \code{\link{par}}.

R/showPalette.R

@@ -10,8 +10,6 @@
 #'
 #' @keywords color, selection
 #'
-#' @importFrom magrittr %<>%
-#'
 #' @return The color palette displayed as an invisible output.
 #'
 #' @export
@@ -20,10 +18,10 @@
 #' showPalette()
 #' showPalette(inline=TRUE)
 #' showPalette(1)
-#' showPalette(sample(1:100, 16), add_number=TRUE, add_codecolor = TRUE)
+#' showPalette(sample(1:100, 16), add_number = TRUE, add_codecolor = TRUE)
 
-showPalette <- function(x = grDevices::palette(), inline = FALSE, add_number = FALSE,
-    add_codecolor = FALSE, cex_num = 1.2) {
+showPalette <- function(x = grDevices::palette(), inline = FALSE,
+    add_number = FALSE, add_codecolor = FALSE, cex_num = 1.2) {
 
     opar <- graphics::par(no.readonly = TRUE)
     on.exit(graphics::par(opar))
@@ -36,7 +34,7 @@ showPalette <- function(x = grDevices::palette(), inline = FALSE, add_number = F
     }
     ##
     if (class(x) != "matrix")
-        x %<>% grDevices::col2rgb()
+        x <- grDevices::col2rgb(x)
     ramp <- apply(x, 2, function(x) grDevices::rgb(x[1L], x[2L], x[3L], maxColorValue = 255))
     dark <- (apply(x, 2, sum) > 196) + 1
     ## -- compute the number of column and rows
@@ -53,14 +51,8 @@ showPalette <- function(x = grDevices::palette(), inline = FALSE, add_number = F
     for (i in 1:nb_x) {
         plot0(fill = ramp[i])
         txt <- ""
-        if (add_number) {
-            txt %<>% paste0(i)
-            if (add_codecolor)
-                txt %<>% paste0(":  ", ramp[i])
-        } else {
-            if (add_codecolor)
-                txt %<>% paste0(ramp[i])
-        }
+        if (add_number) txt <- paste0(txt, i, ": ")
+        if (add_codecolor)  txt <- paste0(txt, ramp[i])
         graphics::text(0, 0, txt, cex = cex_num, col = c("white", "black")[dark[i]])
         box2(col = "white")
     }

inst/NEWS.Rd

@@ -4,12 +4,16 @@
 \newcommand{\ghit}{\href{https://github.com/KevCaz/graphicsutils/issues/#1}{##1}}
 
 
-\section{Changes in graphicsutils version 1.2-1}{
+\section{Changes in graphicsutils version 1.3-0}{
   \itemize{
     \item Addition of new functions:
       \itemize{
         \item new function \code{boxplot2()} that generates boxplots with a different visual that \code{boxplot}.
       }
+    \item Changes in the package's structure:
+      \itemize{
+        \item magrittr is no longer imported and change in functions have been made accordingly.
+      }
     \item Change in documentation:
     \itemize{
       \item The vignette has been reviewed.

tests/testthat/test-boxplot2.R

@@ -0,0 +1,34 @@
+context("test boxplot2")
+
+
+df_ex <- replicate(4, runif(100))
+df_ex2 <- data.frame(nam = rep(LETTERS[1:2], each = 50), val = df_ex[, 1L])
+xy <- boxplot2(df_ex)
+xy2 <- boxplot2(df_ex, probs = c(.01, 0.25, .5, .75, .99), at = 2:5)
+xy3 <- boxplot2(val ~ nam, data = df_ex2)
+grDevices::graphics.off()
+
+test_that("expected errors", {
+  expect_error(boxplot2(df_ex, add = TRUE))
+  expect_error(boxplot2(df_ex, probs = c(.01)))
+  expect_error(boxplot2(df_ex, probs = c(.01, 0.25, .5, .75, 2)))
+  expect_error(boxplot2(df_ex, probs = c(.01, 0.25, .5, .75, -2)))
+})
+
+
+test_that("expected output", {
+  expect_identical(xy$x, 1:4)
+  expect_identical(xy2$x, 2:5)
+  expect_identical(xy3$x, 1:2)
+  expect_identical(row.names(xy2$y), c("1%", "25%", "50%", "75%", "99%"))
+  expect_identical(row.names(xy2$y), c("1%", "25%", "50%", "75%", "99%"))
+  expect_true(
+    all(
+      xy2$y[,1] == quantile(df_ex[,1], probs = c(.01, 0.25, .5, .75, .99))
+    )
+  )
+})
+
+
+# dfa <- data.frame(name = rep(LETTERS[1:4], 25), val = runif(100))
+# boxplot2(val ~ name, data = dfa, add = TRUE, vc_cex = c(4, 40, 2))

tests/testthat/test-pointsInPolygon.R

@@ -6,10 +6,10 @@ res <- pointsInPolygon(pts, tria)
 
 
 test_that("does it work properly", {
-  expect_true(all(res == c(T, F, F)))
+  expect_true(all(res == c(TRUE, FALSE, FALSE)))
 })
 
 test_that("expected warnings", {
-  expect_warning(pointsInPolygon(cbind(tria,0), pts), "ncol(points)>2 - only the first two columns are used.", fixed = T)
-  expect_warning(pointsInPolygon(tria, cbind(pts, 0)), "ncol(polygon)>2 - only the first two columns are used.", fixed = T)
+  expect_warning(pointsInPolygon(cbind(tria,0), pts), "ncol(points)>2 - only the first two columns are used.", fixed = TRUE)
+  expect_warning(pointsInPolygon(tria, cbind(pts, 0)), "ncol(polygon)>2 - only the first two columns are used.", fixed = TRUE)
 })