From 234a5bd7441bede17bbcb4842026fad3156428f9 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Thu, 7 Nov 2019 21:43:22 -0800 Subject: [PATCH] math.extras: don't shadow B (breakpoint). --- extra/math/extras/extras.factor | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/extra/math/extras/extras.factor b/extra/math/extras/extras.factor index b38d98d0bf..47698cee8a 100644 --- a/extra/math/extras/extras.factor +++ b/extra/math/extras/extras.factor @@ -173,8 +173,8 @@ PRIVATE> seq natural-sort :> sorted seq length :> len sorted 0 [ + ] cum-reduce :> ( a b ) - b len a * / :> B - 1 len recip + 2 B * - ; + b len a * / :> c + 1 len recip + 2 c * - ; PRIVATE> @@ -202,7 +202,8 @@ PRIVATE> unzip cum-sum [ last random ] [ bisect-left ] bi swap nth ; : unique-indices ( seq -- unique indices ) - [ members ] keep over dup length H{ } zip-as '[ _ at ] map ; + [ members ] keep over dup length + H{ } zip-as '[ _ at ] map ; : digitize] ( seq bins -- seq' ) '[ _ bisect-left ] map ; @@ -313,9 +314,9 @@ PRIVATE> ] each partials ; :: sum-exact ( partials -- n ) - partials empty? [ 0.0 ] [ + partials [ 0.0 ] [ ! sum from the top, stop when sum becomes inexact - 0.0 0.0 partials [ + [ 0.0 0.0 ] dip [ nip partial+ dup 0.0 = not ] find-last drop :> ( lo n ) @@ -330,7 +331,7 @@ PRIVATE> y yr = [ drop x ] when ] when ] when - ] if ; + ] if-empty ; PRIVATE>