From 4797dae4f29cb134dd9c2c2f14958a5faec8f986 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Thu, 5 Sep 2013 21:09:32 -0700
Subject: [PATCH] math.extras: switch to using sorting.extras.

---
 extra/math/extras/extras-tests.factor |  8 --------
 extra/math/extras/extras.factor       | 21 +++++----------------
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/extra/math/extras/extras-tests.factor b/extra/math/extras/extras-tests.factor
index e1cf05faa3..a643169b95 100644
--- a/extra/math/extras/extras-tests.factor
+++ b/extra/math/extras/extras-tests.factor
@@ -73,14 +73,6 @@ IN: math.extras.test
 { 57/200 } [ { 80 60 10 20 30 } herfindahl ] unit-test
 { 17/160 } [ { 80 60 10 20 30 } normalized-herfindahl ] unit-test
 
-{ 1 } [ 1   5 iota search-sorted] ] unit-test
-{ 2 } [ 1.5 5 iota search-sorted] ] unit-test
-{ 2 } [ 2   5 iota search-sorted] ] unit-test
-
-{ 2 } [ 1   5 iota search-sorted) ] unit-test
-{ 2 } [ 1.5 5 iota search-sorted) ] unit-test
-{ 3 } [ 2   5 iota search-sorted) ] unit-test
-
 { { 0 5 1 2 2 } } [
     { -10 10 2 2.5 3 } { 1 2 3 4 5 } digitize]
 ] unit-test
diff --git a/extra/math/extras/extras.factor b/extra/math/extras/extras.factor
index 5003d2129b..0dc792a307 100644
--- a/extra/math/extras/extras.factor
+++ b/extra/math/extras/extras.factor
@@ -6,7 +6,8 @@ combinators combinators.short-circuit compression.zlib fry
 grouping kernel locals math math.combinatorics math.constants
 math.functions math.order math.primes math.ranges
 math.ranges.private math.statistics math.vectors memoize random
-sequences sequences.extras sequences.private sets sorting ;
+sequences sequences.extras sequences.private sets sorting
+sorting.extras ;
 
 IN: math.extras
 
@@ -197,29 +198,17 @@ PRIVATE>
 : exponential-index ( seq -- x )
     dup sum '[ _ / dup ^ ] map-product ;
 
-:: search-sorted] ( obj seq -- i )
-    0 seq length [ 2dup < ] [
-        2dup + 2/ dup seq nth-unsafe obj before?
-        [ swap [ nip 1 + ] dip ] [ nip ] if
-    ] while drop ;
-
-:: search-sorted) ( obj seq -- i )
-    0 seq length [ 2dup < ] [
-        2dup + 2/ dup seq nth-unsafe obj after?
-        [ nip ] [ swap [ nip 1 + ] dip ] if
-    ] while drop ;
-
 : weighted-random ( histogram -- obj )
-    unzip cum-sum [ last random ] [ search-sorted] ] bi swap nth ;
+    unzip cum-sum [ last random ] [ bisect-left ] bi swap nth ;
 
 : unique-indices ( seq -- unique indices )
     [ members ] keep over dup length iota H{ } zip-as '[ _ at ] map ;
 
 : digitize] ( seq bins -- seq' )
-    '[ _ search-sorted] ] map ;
+    '[ _ bisect-left ] map ;
 
 : digitize) ( seq bins -- seq' )
-    '[ _ search-sorted) ] map ;
+    '[ _ bisect-right ] map ;
 
 <PRIVATE