factor: trim using lists

[factor.git] / extra / benchmark / fannkuch / fannkuch.factor

diff --git a/extra/benchmark/fannkuch/fannkuch.factor b/extra/benchmark/fannkuch/fannkuch.factor
index a69c53852deab7ad5e91b56d2e0d154940fb2abf..4f10e20a0f56fc1ffbfede3f8365dc7b997ca24c 100644 (file)
--- a/extra/benchmark/fannkuch/fannkuch.factor
+++ b/extra/benchmark/fannkuch/fannkuch.factor
@@ -1,35 +1,35 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel fry math math.combinatorics math.order sequences
+USING: kernel math math.combinatorics math.order sequences
 io prettyprint ;
 IN: benchmark.fannkuch
 
 : count ( quot: ( -- ? ) -- n )
-    #! Call quot until it returns false, return number of times
-    #! it was true
-    [ 0 ] dip '[ _ dip swap [ [ 1+ ] when ] keep ] loop ; inline
+    ! Call quot until it returns false, return number of times
+    ! it was true
+    [ 0 ] dip '[ _ dip swap [ [ 1 + ] when ] keep ] loop ; inline
 
 : count-flips ( perm -- flip# )
     '[
         _ dup first dup 1 =
-        [ 2drop f ] [ head-slice reverse-here t ] if
+        [ 2drop f ] [ head-slice reverse! drop t ] if
     ] count ; inline
 
 : write-permutation ( perm -- )
     [ CHAR: 0 + write1 ] each nl ; inline
 
 : fannkuch-step ( counter max-flips perm -- counter max-flips )
-    pick 30 < [ [ 1+ ] [ ] [ dup write-permutation ] tri* ] when
+    pick 30 < [ [ 1 + ] [ ] [ dup write-permutation ] tri* ] when
     count-flips max ; inline
 
 : fannkuch ( n -- )
     [
-        [ 0 0 ] dip [ 1+ ] B{ } map-as
+        [ 0 0 ] dip <iota> [ 1 + ] B{ } map-as
         [ fannkuch-step ] each-permutation nip
     ] keep
     "Pfannkuchen(" write pprint ") = " write . ;
 
-: fannkuch-main ( -- )
+: fannkuch-benchmark ( -- )
     9 fannkuch ;
 
-MAIN: fannkuch-main
+MAIN: fannkuch-benchmark