r/R/utils.R: Use collapse::frange.

MLopez-Ibanez · MLopez-Ibanez · commit 670564f7883f · 2025-05-11T15:25:21.000+01:00
diff --git a/r/R/utils.R b/r/R/utils.R
@@ -8,6 +8,9 @@ get_xylim <- function(lim, maximise, x)
   lim
 }
 
+get_extremes_ggplot <- function(maximise)
+  c(if (maximise[1L]) -Inf else Inf, if (maximise[2L]) -Inf else Inf)
+
 get_extremes <- function(xlim, ylim, maximise, log)
 {
   if (length(log) && log != "")
@@ -38,7 +41,7 @@ add_extremes <- function(x, extremes, maximise)
 range_finite <- function(x)
 {
   if (is.null(x)) return(NULL)
-  x <- frange(x, finite=TRUE)
+  x <- collapse::frange(x, finite=TRUE)
   if (anyNA(x)) return(NULL)
   x
 }
@@ -62,3 +65,6 @@ nunique <- collapse::fnunique
 
 has_file_extension <- function(filename, extension)
   grepl(paste0('[.]', extension, '$'), filename, ignore.case = TRUE)
+
+starts_or_ends_with <- function(x, substr)
+  startsWith(x, substr) | endsWith(x, substr)

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,9 @@ get_xylim <- function(lim, maximise, x)`
`8`	`8`	`lim`
`9`	`9`	`}`
`10`	`10`
	`11`	`+get_extremes_ggplot <- function(maximise)`
	`12`	`+ c(if (maximise[1L]) -Inf else Inf, if (maximise[2L]) -Inf else Inf)`
	`13`	`+`
`11`	`14`	`get_extremes <- function(xlim, ylim, maximise, log)`
`12`	`15`	`{`
`13`	`16`	`if (length(log) && log != "")`
`@@ -38,7 +41,7 @@ add_extremes <- function(x, extremes, maximise)`
`38`	`41`	`range_finite <- function(x)`
`39`	`42`	`{`
`40`	`43`	`if (is.null(x)) return(NULL)`
`41`		`- x <- frange(x, finite=TRUE)`
	`44`	`+ x <- collapse::frange(x, finite=TRUE)`
`42`	`45`	`if (anyNA(x)) return(NULL)`
`43`	`46`	`x`
`44`	`47`	`}`
`@@ -62,3 +65,6 @@ nunique <- collapse::fnunique`
`62`	`65`
`63`	`66`	`has_file_extension <- function(filename, extension)`
`64`	`67`	`grepl(paste0('[.]', extension, '$'), filename, ignore.case = TRUE)`
	`68`	`+`
	`69`	`+starts_or_ends_with <- function(x, substr)`
	`70`	`+ startsWith(x, substr) \| endsWith(x, substr)`