]> gitweb.factorcode.org Git - factor.git/commitdiff
sequences, tetris, rosetta-code: Simplify some code.
authorDoug Coleman <doug.coleman@gmail.com>
Tue, 12 Mar 2013 01:57:54 +0000 (18:57 -0700)
committerDoug Coleman <doug.coleman@gmail.com>
Tue, 12 Mar 2013 01:57:54 +0000 (18:57 -0700)
extra/rosetta-code/ordered-words/ordered-words.factor
extra/sequences/modified/modified.factor
extra/tetris/tetromino/tetromino.factor

index 95b6d3f42cc1d9ab1cf8ea319ad57daca494c98b..e0ca3cd14057d618bf704dffc035cb270ebcea18 100644 (file)
@@ -26,12 +26,8 @@ MEMO: word-list ( -- seq )
 : ordered-word? ( word -- ? )
     >lower 2 <clumps> [ first2 <= ] all? ;
 
-: filter-longest-words ( seq -- seq' )
-    dup [ length ] [ max ] map-reduce
-    '[ length _ = ] filter ;
-
 : ordered-words-main ( -- )
     word-list [ ordered-word? ] filter
-    filter-longest-words [ print ] each ;
+    all-longest [ print ] each ;
 
 MAIN: ordered-words-main
index 9205b91c4aef84340eeeb3c1805911664fa2d665..aa4cb57bb52fb882ddb759de1559c3f1c2691d6f 100644 (file)
@@ -51,7 +51,7 @@ M:: offset modified-set-nth ( elt n seq -- )
 TUPLE: summed < modified seqs ;
 C: <summed> summed
 
-M: summed length seqs>> [ length ] [ max ] map-reduce ;
+M: summed length seqs>> longest length ;
 
 <PRIVATE
 : ?+ ( x/f y/f -- sum )
index 510daaec41085c5a6dde36b96cbcf11f5535b38d..8eaf1c04266a76611828a834174036fe4f979a6a 100644 (file)
@@ -104,7 +104,7 @@ SYMBOL: tetrominoes
     tetrominoes get random ;
 
 : blocks-max ( blocks quot -- max )
-    map [ 1 + ] [ max ] map-reduce ; inline
+    map supremum 1 + ; inline
 
 : blocks-width ( blocks -- width )
     [ first ] blocks-max ;