updates

.github/workflows/python.yaml

@@ -217,7 +217,6 @@ jobs:
           output-dir: wheelhouse
 
       - uses: actions/upload-artifact@v3
-        if: "github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')"
         with:
           name: wheels
           path: wheelhouse/*.whl

r/NAMESPACE

@@ -2,6 +2,7 @@
 
 export(attsurf2df)
 export(avg_hausdorff_dist)
+export(choose_eafdiff)
 export(eafdiff)
 export(eafs)
 export(epsilon_additive)

r/R/interactive.R

@@ -75,14 +75,44 @@ largest_eafdiff <- function(x, maximise = FALSE, intervals = 5L, reference,
   list(pair=best_pair, value = best_value)
 }
 
-
+#' Interactively choose according to empirical attainment function differences
+#' 
 #' @param x (`matrix()`) Matrix of rectangles representing EAF differences
 #'   (returned by [eafdiff()] with `rectangles=TRUE`).
 #' 
 #' @param left (`logical(1)`) With `left=TRUE` return the rectangles with
 #'   positive differences, otherwise return those with negative differences but
 #'   differences are converted to positive.
 #' 
+#' @return `matrix` where the first 4 columns give the coordinates of two
+#'   corners of each rectangle and the last column. In both cases, the last
+#'   column gives the positive differences in favor of the chosen side.
+#'
+#' @examples
+#' \donttest{
+#' extdata_dir <- system.file(package="moocore", "extdata") 
+#' A1 <- read_datasets(file.path(extdata_dir, "wrots_l100w10_dat"))
+#' A2 <- read_datasets(file.path(extdata_dir, "wrots_l10w100_dat"))
+#' # Choose A1
+#' rectangles <- eafdiff(A1, A2, intervals = 5, rectangles = TRUE)
+#' rectangles <- choose_eafdiff(rectangles, left = TRUE)
+#' reference <- c(max(A1[, 1], A2[, 1]), max(A1[, 2], A2[, 2]))
+#' x <- split.data.frame(A1[,1:2], A1[,3])
+#' hv_A1 <- sapply(split.data.frame(A1[, 1:2], A1[, 3]),
+#'                  hypervolume, reference=reference)
+#' hv_A2 <- sapply(split.data.frame(A2[, 1:2], A2[, 3]),
+#'                  hypervolume, reference=reference)
+#' print(fivenum(hv_A1))
+#' print(fivenum(hv_A2))
+
+#' whv_A1 <- sapply(split.data.frame(A1[, 1:2], A1[, 3]),
+#'                  whv_rect, rectangles=rectangles, reference=reference)
+#' whv_A2 <- sapply(split.data.frame(A2[, 1:2], A2[, 3]),
+#'                  whv_rect, rectangles=rectangles, reference=reference)
+#' print(fivenum(whv_A1))
+#' print(fivenum(whv_A2))
+#' }
+#'
 #'@concept eaf
 #'@export
 choose_eafdiff <- function(x, left = stop("'left' must be either TRUE or FALSE"))

r/inst/WORDLIST

@@ -36,6 +36,7 @@ TPLS
 TR
 Tabu
 TabuCol
+Vanzyl
 Vanzyl's
 Vorob'ev
 behavior