X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=blobdiff_plain;f=extra%2Fassocs%2Fextras%2Fextras.factor;h=7073a074382ca3ed6fa105dcb0466d9b8327c444;hp=116fa43c3d721ff29ea353512daee3fda21e0a08;hb=baa7f3b31f3686dd30a70a3a32566c3097068e5d;hpb=a28a249dbe248e57341867358c9c3c8a5396e9ae

diff --git a/extra/assocs/extras/extras.factor b/extra/assocs/extras/extras.factor
index 116fa43c3d..7073a07438 100644
--- a/extra/assocs/extras/extras.factor
+++ b/extra/assocs/extras/extras.factor
@@ -4,7 +4,10 @@ USING: arrays assocs assocs.private kernel math math.statistics
 sequences sets ;
 IN: assocs.extras
 
-: deep-at ( assoc seq -- value/f )
+: push-at-each ( value keys assoc -- )
+    '[ _ push-at ] with each ; inline
+
+: deep-of ( assoc seq -- value/f )
     [ of ] each ; inline
 
 : substitute! ( seq assoc -- seq )
@@ -148,7 +151,7 @@ PRIVATE>
 : expand-keys-push-at-as ( assoc exemplar -- hashtable' )
     [
         [ swap dup sequence? [ 1array ] unless ]
-        [ '[ _ push-at ] with each ]
+        [ push-at-each ]
     ] dip assoc>object ;
 
 : expand-keys-push-at ( assoc -- hashtable' )
@@ -214,11 +217,66 @@ PRIVATE>
 : flatten-values ( assoc -- assoc' )
     dup any-multi-value? [ expand-values-set-at flatten-values ] when ;
 
+: intersect-keys-as ( assoc seq exemplar -- elts )
+  [ [ of ] with ] dip zip-with-as sift-values ; inline
+
 : intersect-keys ( assoc seq -- elts )
-    [ of ] with zip-with sift-values ; inline
+    over intersect-keys-as ; inline
 
-: values-of ( assoc seq -- elts )
-    [ of ] with map sift ; inline
+: values-of ( assoc seq -- seq' )
+    [ of ] with map ; inline
 
 : counts ( seq elts -- counts )
     [ histogram ] dip intersect-keys ;
+
+: histogram-diff ( hashtable1 hashtable2 -- hashtable3 )
+    [ neg swap pick at+ ] assoc-each
+    [ 0 > ] filter-values ;
+
+: collect-by-multi! ( ... assoc seq quot: ( ... obj -- ... new-keys ) -- ... assoc )
+    [ keep swap ] curry rot [
+        [ push-at-each ] curry compose each
+    ] keep ; inline
+
+: collect-by-multi ( ... seq quot: ( ... obj -- ... new-keys ) -- ... assoc )
+    [ H{ } clone ] 2dip collect-by-multi! ; inline
+
+
+: collect-assoc-by! ( ... assoc input-assoc quot: ( ... key value -- ... key' value' ) -- ... assoc )
+    rot [ '[ @ swap _ push-at ] assoc-each ] keep ; inline
+
+: collect-assoc-by ( ... input-assoc quot: ( ... key value -- ... key value ) -- ... assoc )
+    [ H{ } clone ] 2dip collect-assoc-by! ; inline
+
+: collect-key-by! ( ... assoc input-assoc quot: ( ... key value -- ... new-key ) -- ... assoc )
+    '[ _ keepd ] collect-assoc-by! ; inline
+
+: collect-key-by ( ... input-assoc quot: ( ... key value -- ... new-key ) -- ... assoc )
+    [ H{ } clone ] 2dip collect-key-by! ; inline
+
+: collect-value-by! ( ... assoc input-assoc quot: ( ... key value -- ... new-key ) -- ... assoc )
+    '[ _ keep ] collect-assoc-by! ; inline
+
+: collect-value-by ( ... input-assoc quot: ( ... key value -- ... new-key ) -- ... assoc )
+    [ H{ } clone ] 2dip collect-value-by! ; inline
+
+
+: collect-assoc-by-multi! ( ... assoc input-assoc quot: ( ... key value -- ... new-keys value' ) -- ... assoc )
+    rot [ '[ @ swap _ push-at-each ] assoc-each ] keep ; inline
+
+: collect-assoc-by-multi ( ... assoc quot: ( ... key value -- ... new-keys value' ) -- ... assoc )
+    [ H{ } clone ] 2dip collect-assoc-by-multi! ; inline
+
+
+: collect-key-by-multi! ( ... assoc input-assoc quot: ( ... key value -- ... new-keys ) -- ... assoc )
+    '[ _ keepd ] collect-assoc-by-multi! ; inline
+
+: collect-key-by-multi ( ... assoc quot: ( ... key -- ... new-keys ) -- ... assoc )
+    [ H{ } clone ] 2dip collect-key-by-multi! ; inline
+
+
+: collect-value-by-multi! ( ... assoc input-assoc quot: ( ... key value -- ... new-keys ) -- ... assoc )
+    '[ _ keep ] collect-assoc-by-multi! ; inline
+
+: collect-value-by-multi ( ... assoc quot: ( ... value -- ... new-keys ) -- ... assoc )
+    [ H{ } clone ] 2dip collect-value-by-multi! ; inline