sequences.extras: rename supremum-by*/infimum-by*

diff --git a/extra/sequences/extras/extras-docs.factor b/extra/sequences/extras/extras-docs.factor
index 98f0e594b6c07a9fb630fd14ee55c06ed2aa0d5d..4019aa4138a38a0c3e1c09833586e3602db4f859 100644 (file)
--- a/extra/sequences/extras/extras-docs.factor
+++ b/extra/sequences/extras/extras-docs.factor
@@ -857,12 +857,12 @@ HELP: index-selector-as
     { "selector" object } { "accum" object }
 } ;
 
-HELP: infimum-by*
+HELP: minimum-by*
 { $values
     { "seq" sequence } { "quot" quotation }
     { "i" integer } { "elt" object }
 }
-{ $description "A variant of " { $link infimum-by } " that pushes the index of the least element along with the least element." } ;
+{ $description "A variant of " { $link minimum-by } " that pushes the index of the least element along with the least element." } ;
 
 HELP: insert-nth!
 { $values
@@ -1324,11 +1324,12 @@ HELP: span-slices
 }
 { $description "Create a virtual sequence spanning the length covered by " { $snippet "slice1" } " and " { $snippet "slice2" } ". Slices must refer to the same sequence." } ;
 
-HELP: supremum-by*
+HELP: maximum-by*
 { $values
     { "seq" sequence } { "quot" quotation }
     { "i" integer } { "elt" object }
-} ;
+}
+{ $description "A variant of " { $link maximum-by } " that pushes the index of the greated element along with the greatest element." } ;
 
 HELP: tail*-as
 { $values

diff --git a/extra/sequences/extras/extras-tests.factor b/extra/sequences/extras/extras-tests.factor
index c74c8e12b593db4cdb14c8cb994083d92fa7c1b8..b63313fe5199fb634fa193df80da3bb1d483b178 100644 (file)
--- a/extra/sequences/extras/extras-tests.factor
+++ b/extra/sequences/extras/extras-tests.factor
@@ -268,9 +268,9 @@ strings tools.test ;
 
 { { 4 0 3 1 2 } } [ { 0 4 1 3 2 } 5 <iota> [ nth* ] curry map ] unit-test
 
-{ 1 "beef" } [ { "chicken" "beef" "moose" } [ length ] infimum-by* ] unit-test
-{ 0 "chicken" } [ { "chicken" "beef" "moose" } [ length ] supremum-by* ] unit-test
-{ 2 "moose" } [ { "chicken" "beef" "moose" } [ first ] supremum-by* ] unit-test
+{ 1 "beef" } [ { "chicken" "beef" "moose" } [ length ] minimum-by* ] unit-test
+{ 0 "chicken" } [ { "chicken" "beef" "moose" } [ length ] maximum-by* ] unit-test
+{ 2 "moose" } [ { "chicken" "beef" "moose" } [ first ] maximum-by* ] unit-test
 { f } [ f ?supremum ] unit-test
 { f } [ { } ?supremum ] unit-test
 { f } [ { f } ?supremum ] unit-test

diff --git a/extra/sequences/extras/extras.factor b/extra/sequences/extras/extras.factor
index 3d39c6f7a8022058e9a0cca7689c11656bfa7632..07239ed9171574e767adab1e45c53af8da73ff78 100644 (file)
--- a/extra/sequences/extras/extras.factor
+++ b/extra/sequences/extras/extras.factor
@@ -890,17 +890,20 @@ ERROR: slice-error-of from to seq ;
 
 PRIVATE>
 
-: supremum-by* ( ... seq quot: ( ... elt -- ... x ) -- ... i elt )
+: maximum-by* ( ... seq quot: ( ... elt -- ... x ) -- ... i elt )
     [ after? ] select-by* ; inline
 
-: infimum-by* ( ... seq quot: ( ... elt -- ... x ) -- ... i elt )
+: minimum-by* ( ... seq quot: ( ... elt -- ... x ) -- ... i elt )
     [ before? ] select-by* ; inline
 
+ALIAS: supremum-by* maximum-by* deprecated
+ALIAS: infimum-by* minimum-by* deprecated
+
 : arg-max ( seq -- n )
-    [ ] supremum-by* drop ;
+    [ ] maximum-by* drop ;
 
 : arg-min ( seq -- n )
-    [ ] infimum-by* drop ;
+    [ ] minimum-by* drop ;
 
 : ?supremum ( seq/f -- elt/f )
     [ f ] [