Fix bug in eafdiffplot where colors were plotted in the wrong order.

Author: MLopez-Ibanez

r/DESCRIPTION

@@ -1,7 +1,7 @@
 Package: mooplot
 Type: Package
 Title: Graphical Visualizations for Multi-Objective Optimization
-Version: 0.1.0
+Version: 0.1.1
 Authors@R: c(person("Manuel", "López-Ibáñez", role = c("aut", "cre"),
                     email = "manuel.lopez-ibanez@manchester.ac.uk",
                     comment = c(ORCID = "0000-0001-9974-1295")),

r/NEWS.md

@@ -1,3 +1,7 @@
+# mooplot 0.1.1
+
+ * Fix bug in `eafdiffplot` where colors were plotted in the wrong order.
+
 # mooplot 0.1.0
 
  * Initial version uploaded to CRAN.

r/R/eafdiffplot.R

@@ -189,13 +189,6 @@ eafdiffplot <-
     data_right <- transform_maximise(data_right, maximise)
   }
 
-  compute_attsurfs <- function(x, cumsizes, percentiles, maximise) {
-    x <- compute_eaf_call(x, cumsizes = cumsizes, percentiles = percentiles)
-    if (any(maximise))
-      x[,-ncol(x)] <- transform_maximise(x[, -ncol(x), drop=FALSE], maximise)
-    eaf_as_list(x)
-  }
-
   attsurfs_left <- attsurfs_right <- list()
   if (!any(is.na(percentiles))) {
     attsurfs_left <- compute_attsurfs(data_left, cumsizes_left, percentiles = percentiles, maximise = maximise)
@@ -262,7 +255,7 @@ eafdiffplot <-
 
   # FIXME: This does not generate empty space between the two plots, but the
   # plots are not squared.
-  layout(matrix(1:2, ncol=2L, byrow=TRUE), respect=TRUE)
+  layout(matrix(c(1L,2L), ncol=2L, byrow=TRUE), respect=TRUE)
   bottommar <- 5L
   topmar   <- 4L
   leftmar  <- 4L
@@ -364,7 +357,7 @@ plot_eafdiff_side <- function (eafdiff, attsurfs = list(),
            # Colors are correct for !full.eaf && type == "area"
            if (full.eaf || type == "point") {
              diff_values <- eafdiff[,3L]
-             eafdiff <- eafdiff[, 1L:2L, drop=FALSE]
+             eafdiff <- eafdiff[, c(1L,2L), drop=FALSE]
              # FIXME: This is wrong, we should color (0.0, 1] with col[1], then (1, 2]
              # with col[1], etc, so that we never color the value 0.0 but we always
              # color the maximum value color without having to force it.
@@ -406,6 +399,7 @@ plot_eafdiff_side <- function (eafdiff, attsurfs = list(),
              ## The maximum value should also be painted.
              diff_values[diff_values > length(col)] <- length(col)
              eafdiff <- eafdiff[order(diff_values, decreasing = FALSE), , drop=FALSE]
+             diff_values <- diff_values[order(diff_values, decreasing = FALSE)]
              points(eafdiff[,1L], eafdiff[,2L], col = col[diff_values], type = "p", pch=20)
            }
          }
@@ -419,3 +413,11 @@ plot_eafdiff_side <- function (eafdiff, attsurfs = list(),
   mtext(title, 1, line = 3.5, cex = par("cex.lab"), las = 0, font = 2)
   box()
 }
+
+compute_attsurfs <- function(x, cumsizes, percentiles, maximise)
+{
+  x <- compute_eaf_call(x, cumsizes = cumsizes, percentiles = percentiles)
+  if (any(maximise))
+    x[,-ncol(x)] <- transform_maximise(x[, -ncol(x), drop=FALSE], maximise)
+  eaf_as_list(x)
+}