math-binpack: Some cleanups recommended on IRC.

diff --git a/extra/math/binpack/binpack.factor b/extra/math/binpack/binpack.factor
index f6473f2e25a7d62b9f230b9f76540a97207ef5ad..e3a009feb5c6dfebefb96d972d156051c68542f2 100644 (file)
--- a/extra/math/binpack/binpack.factor
+++ b/extra/math/binpack/binpack.factor
@@ -6,16 +6,17 @@ USING: sequences kernel arrays vectors accessors assocs sorting math math.functi
 IN: math.binpack 
 
 : (binpack) ( bins item -- )
-    swap dup [ [ second ] map sum ] map swap zip sort-keys values first push ;
+    [ [ values sum ] map ] keep
+    zip sort-keys values first push ;
 
 : binpack ( assoc n -- bins )
-    [ sort-values reverse [ length ] keep swap ] dip 
-    [ / ceiling ] keep swap <array> [ <vector> ] map 
-    swap [ dupd (binpack) ] each ;
+    [ sort-values <reversed> dup length ] dip
+    tuck / ceiling <array> [ <vector> ] map
+    tuck [ (binpack) ] curry each ;
 
 : binpack* ( items n -- bins )
     [ dup zip ] dip binpack [ keys ] map ;
 
 : binpack! ( items quot n -- bins ) 
-    [ dup ] 2dip [ map zip ] dip binpack [ keys ] map ;
+    [ dupd map zip ] dip binpack [ keys ] map ;