math.extras: adding moving-count.

diff --git a/extra/math/extras/extras-tests.factor b/extra/math/extras/extras-tests.factor
index fe797d916efb7e5dd3551c57a0899de734c3b130..1f979ffaa08ff4196cd42e1e9aa16632c2034936 100644 (file)
--- a/extra/math/extras/extras-tests.factor
+++ b/extra/math/extras/extras-tests.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2012 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 
-USING: math.extras math.ranges tools.test ;
+USING: math math.extras math.ranges tools.test ;
 
 IN: math.extras.test
 
@@ -21,6 +21,8 @@ IN: math.extras.test
 
 { { 2 5 5 4 3 } } [ { 1 2 5 6 1 4 3 } 3 moving-median ] unit-test
 
+{ { 2 1 1 2 1 1 } } [ { 1 1 2 3 5 8 13 } 2 [ odd? ] moving-count ] unit-test
+
 { { } } [ { 0 0 } nonzero ] unit-test
 { { 1 2 3 } } [ { 0 1 0 2 0 3 0 } nonzero ] unit-test
 

diff --git a/extra/math/extras/extras.factor b/extra/math/extras/extras.factor
index 5d48e351816d35d0e6a93d44d00e2211ade84bda..556549e3b94fae22b5ed6caa1571719550f5118b 100644 (file)
--- a/extra/math/extras/extras.factor
+++ b/extra/math/extras/extras.factor
@@ -105,6 +105,9 @@ PRIVATE>
 : moving-sum ( u n -- v )
     <clumps> [ sum ] map ;
 
+: moving-count ( ... u n quot: ( ... elt -- ... ? ) -- ... v )
+    [ <clumps> ] [ [ count ] curry map ] bi* ; inline
+
 : nonzero ( seq -- seq' )
     [ zero? not ] filter ;