Merge branch 'master' of git://projects.elasticdog.com/git/factor

2008-11-06 02:00:08 -06:00 · 2008-11-06 02:00:08 -06:00 · 4c226c7813
parent 29279f305e 4d1d9b2087
commit 4c226c7813
145 changed files with 561 additions and 241 deletions
--- a/extra/math/analysis/analysis.factor
+++ b/extra/math/analysis/analysis.factor
@ -1,7 +1,7 @@
-! Copyright (C) 2008 Doug Coleman, Slava Pestov.
+! Copyright (C) 2008 Doug Coleman, Slava Pestov, Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math math.constants math.functions math.intervals
-math.vectors namespaces sequences combinators.short-circuit ;
+USING: combinators.short-circuit kernel math math.constants math.functions
+    math.vectors sequences ;
 IN: math.analysis

 <PRIVATE
@ -14,7 +14,7 @@ IN: math.analysis
 : gamma-p6
    {
        2.50662827563479526904 225.525584619175212544 -268.295973841304927459
-        80.9030806934622512966 -5.00757863970517583837 0.0114684895434781459556 
+        80.9030806934622512966 -5.00757863970517583837 0.0114684895434781459556
    } ; inline

 : gamma-z ( x n -- seq )
@ -22,16 +22,16 @@ IN: math.analysis

 : (gamma-lanczos6) ( x -- log[gamma[x+1]] )
    #! log(gamma(x+1)
-    [ 0.5 + dup gamma-g6 + dup [ log * ] dip - ]
+    [ 0.5 + dup gamma-g6 + [ log * ] keep - ]
    [ 6 gamma-z gamma-p6 v. log ] bi + ;

 : gamma-lanczos6 ( x -- gamma[x] )
    #! gamma(x) = gamma(x+1) / x
-    dup (gamma-lanczos6) exp swap / ;
+    [ (gamma-lanczos6) exp ] keep / ;

 : gammaln-lanczos6 ( x -- gammaln[x] )
    #! log(gamma(x)) = log(gamma(x+1)) - log(x)
-    dup (gamma-lanczos6) swap log - ;
+    [ (gamma-lanczos6) ] keep log - ;

 : gamma-neg ( gamma[abs[x]] x -- gamma[x] )
    dup pi * sin * * pi neg swap / ; inline
@ -42,22 +42,22 @@ PRIVATE>
    #! gamma(x) = integral 0..inf [ t^(x-1) exp(-t) ] dt
    #! gamma(n+1) = n! for n > 0
    dup { [ 0.0 <= ] [ 1.0 mod zero? ] } 1&& [
-            drop 1./0.
-        ] [
-            dup abs gamma-lanczos6 swap dup 0 > [ drop ] [ gamma-neg ] if
+        drop 1./0.
+    ] [
+        [ abs gamma-lanczos6 ] keep dup 0 > [ drop ] [ gamma-neg ] if
    ] if ;

 : gammaln ( x -- gamma[x] )
    #! gammaln(x) is an alternative when gamma(x)'s range
    #! varies too widely
    dup 0 < [
-            drop 1./0.
-        ] [
-            dup abs gammaln-lanczos6 swap dup 0 > [ drop ] [ gamma-neg ] if
+        drop 1./0.
+    ] [
+        [ abs gammaln-lanczos6 ] keep dup 0 > [ drop ] [ gamma-neg ] if
    ] if ;

 : nth-root ( n x -- y )
-    [ recip ] dip swap ^ ;
+    swap recip ^ ;

 ! Forth Scientific Library Algorithm #1
 !
@ -116,6 +116,6 @@ PRIVATE>

 : stirling-fact ( n -- fact )
    [ pi 2 * * sqrt ]
-    [ dup e / swap ^ ]
-    [ 12 * recip 1 + ]
-    tri * * ;
+    [ [ e / ] keep ^ ]
+    [ 12 * recip 1+ ] tri * * ;
+
--- a/extra/math/text/english/english.factor
+++ b/extra/math/text/english/english.factor
@ -1,7 +1,7 @@
-! Copyright (c) 2007 Aaron Schaefer.
+! Copyright (c) 2007, 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: combinators.lib kernel math math.functions math.parser namespaces
-sequences splitting grouping combinators.short-circuit ;
+USING: combinators.short-circuit grouping kernel math math.parser namespaces
+    sequences ;
 IN: math.text.english

 <PRIVATE
@ -52,13 +52,11 @@ SYMBOL: and-needed?
    ] if ;

 : 3digits>text ( n -- str )
-    dup hundreds-place swap tens-place append ;
+    [ hundreds-place ] [ tens-place ] bi append ;

 : text-with-scale ( index seq -- str )
-    dupd nth 3digits>text swap
-    scale-numbers [
-        " " swap 3append
-    ] unless-empty ;
+    [ nth 3digits>text ] [ drop scale-numbers ] 2bi
+    [ " " swap 3append ] unless-empty ;

 : append-with-conjunction ( str1 str2 -- newstr )
    over length zero? [
@ -68,20 +66,19 @@ SYMBOL: and-needed?
        and-needed? off
    ] if ;

-: (recombine) ( str index seq -- newstr seq )
+: (recombine) ( str index seq -- newstr )
    2dup nth zero? [
-        nip
+        2drop
    ] [
-        [ text-with-scale ] keep
-        -rot append-with-conjunction swap
+        text-with-scale append-with-conjunction
    ] if ;

 : recombine ( seq -- str )
    dup length 1 = [
        first 3digits>text
    ] [
-        dup set-conjunction "" swap
-        dup length [ swap (recombine) ] each drop
+        [ set-conjunction "" ] [ length ] [ ] tri
+        [ (recombine) ] curry each
    ] if ;

 : (number>text) ( n -- str )
--- a/extra/project-euler/001/001-tests.factor
+++ b/extra/project-euler/001/001-tests.factor
@ -0,0 +1,6 @@
+USING: project-euler.001 tools.test ;
+IN: project-euler.001.tests
+
+[ 233168 ] [ euler001 ] unit-test
+[ 233168 ] [ euler001a ] unit-test
+[ 233168 ] [ euler001b ] unit-test
--- a/extra/project-euler/002/002-tests.factor
+++ b/extra/project-euler/002/002-tests.factor
@ -0,0 +1,5 @@
+USING: project-euler.002 tools.test ;
+IN: project-euler.002.tests
+
+[ 4613732 ] [ euler002 ] unit-test
+[ 4613732 ] [ euler002a ] unit-test
--- a/extra/project-euler/002/002.factor
+++ b/extra/project-euler/002/002.factor
@ -13,7 +13,8 @@ IN: project-euler.002

 !     1, 2, 3, 5, 8, 13, 21, 34, 55, 89, ...

-! Find the sum of all the even-valued terms in the sequence which do not exceed one million.
+! Find the sum of all the even-valued terms in the sequence which do not exceed
+! four million.


 ! SOLUTION
@ -30,10 +31,10 @@ PRIVATE>
    V{ 0 } clone 1 rot (fib-upto) ;

 : euler002 ( -- answer )
-    1000000 fib-upto [ even? ] filter sum ;
+    4000000 fib-upto [ even? ] filter sum ;

 ! [ euler002 ] 100 ave-time
-! 0 ms run / 0 ms GC ave time - 100 trials
+! 0 ms ave run time - 0.22 SD (100 trials)


 ! ALTERNATE SOLUTIONS
@ -44,9 +45,9 @@ PRIVATE>
    but-last-slice { 0 1 } prepend ;

 : euler002a ( -- answer )
-    1000000 fib-upto* [ even? ] filter sum ;
+    4000000 fib-upto* [ even? ] filter sum ;

 ! [ euler002a ] 100 ave-time
-! 0 ms run / 0 ms GC ave time - 100 trials
+! 0 ms ave run time - 0.2 SD (100 trials)

 MAIN: euler002a
--- a/extra/project-euler/003/003-tests.factor
+++ b/extra/project-euler/003/003-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.003 tools.test ;
+IN: project-euler.003.tests
+
+[ 6857 ] [ euler003 ] unit-test
--- a/extra/project-euler/003/003.factor
+++ b/extra/project-euler/003/003.factor
@ -10,16 +10,16 @@ IN: project-euler.003

 ! The prime factors of 13195 are 5, 7, 13 and 29.

-! What is the largest prime factor of the number 317584931803?
+! What is the largest prime factor of the number 600851475143 ?


 ! SOLUTION
 ! --------

 : euler003 ( -- answer )
-    317584931803 factors supremum ;
+    600851475143 factors supremum ;

 ! [ euler003 ] 100 ave-time
-! 1 ms run / 0 ms GC ave time - 100 trials
+! 1 ms ave run time - 0.49 SD (100 trials)

 MAIN: euler003
--- a/extra/project-euler/004/004-tests.factor
+++ b/extra/project-euler/004/004-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.004 tools.test ;
+IN: project-euler.004.tests
+
+[ 906609 ] [ euler004 ] unit-test
--- a/extra/project-euler/004/004.factor
+++ b/extra/project-euler/004/004.factor
@ -32,6 +32,6 @@ PRIVATE>
    source-004 dup cartesian-product [ product ] map prune max-palindrome ;

 ! [ euler004 ] 100 ave-time
-! 1608 ms run / 102 ms GC ave time - 100 trials
+! 1164 ms ave run time - 39.35 SD (100 trials)

 MAIN: euler004
--- a/extra/project-euler/005/005-tests.factor
+++ b/extra/project-euler/005/005-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.005 tools.test ;
+IN: project-euler.005.tests
+
+[ 232792560 ] [ euler005 ] unit-test
--- a/extra/project-euler/005/005.factor
+++ b/extra/project-euler/005/005.factor
@ -21,6 +21,6 @@ IN: project-euler.005
    20 1 [ 1+ lcm ] reduce ;

 ! [ euler005 ] 100 ave-time
-! 0 ms run / 0 ms GC ave time - 100 trials
+! 0 ms ave run time - 0.14 SD (100 trials)

 MAIN: euler005
--- a/extra/project-euler/006/006-tests.factor
+++ b/extra/project-euler/006/006-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.006 tools.test ;
+IN: project-euler.006.tests
+
+[ 25164150 ] [ euler006 ] unit-test
--- a/extra/project-euler/006/006.factor
+++ b/extra/project-euler/006/006.factor
@ -1,6 +1,6 @@
-! Copyright (c) 2007 Aaron Schaefer.
+! Copyright (c) 2007, 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math math.functions math.ranges sequences ;
+USING: kernel math math.ranges sequences ;
 IN: project-euler.006

 ! http://projecteuler.net/index.php?section=problems&id=6
@ -35,9 +35,9 @@ IN: project-euler.006
 PRIVATE>

 : euler006 ( -- answer )
-    1 100 [a,b] dup sum-of-squares swap square-of-sum - abs ;
+    100 [1,b] [ sum-of-squares ] [ square-of-sum ] bi - abs ;

 ! [ euler006 ] 100 ave-time
-! 0 ms run / 0 ms GC ave time - 100 trials
+! 0 ms ave run time - 0.24 SD (100 trials)

 MAIN: euler006
--- a/extra/project-euler/007/007-tests.factor
+++ b/extra/project-euler/007/007-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.007 tools.test ;
+IN: project-euler.007.tests
+
+[ 104743 ] [ euler007 ] unit-test
--- a/extra/project-euler/007/007.factor
+++ b/extra/project-euler/007/007.factor
@ -24,6 +24,6 @@ IN: project-euler.007
    10001 nth-prime ;

 ! [ euler007 ] 100 ave-time
-! 10 ms run / 0 ms GC ave time - 100 trials
+! 5 ms ave run time - 1.13 SD (100 trials)

 MAIN: euler007
--- a/extra/project-euler/008/008-tests.factor
+++ b/extra/project-euler/008/008-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.008 tools.test ;
+IN: project-euler.008.tests
+
+[ 40824 ] [ euler008 ] unit-test
--- a/extra/project-euler/008/008.factor
+++ b/extra/project-euler/008/008.factor
@ -1,6 +1,6 @@
-! Copyright (c) 2007 Aaron Schaefer.
+! Copyright (c) 2007, 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: math.parser project-euler.common sequences ;
+USING: grouping math.parser sequences ;
 IN: project-euler.008

 ! http://projecteuler.net/index.php?section=problems&id=8
@ -64,9 +64,9 @@ IN: project-euler.008
 PRIVATE>

 : euler008 ( -- answer )
-    source-008 5 collect-consecutive [ string>digits product ] map supremum ;
+    source-008 5 clump [ string>digits product ] map supremum ;

 ! [ euler008 ] 100 ave-time
-! 11 ms run / 0 ms GC ave time - 100 trials
+! 2 ms ave run time - 0.79 SD (100 trials)

 MAIN: euler008
--- a/extra/project-euler/009/009-tests.factor
+++ b/extra/project-euler/009/009-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.009 tools.test ;
+IN: project-euler.009.tests
+
+[ 31875000 ] [ euler009 ] unit-test
--- a/extra/project-euler/009/009.factor
+++ b/extra/project-euler/009/009.factor
@ -1,6 +1,6 @@
-! Copyright (c) 2007 Aaron Schaefer.
+! Copyright (c) 2007, 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math math.functions namespaces make sequences sorting ;
+USING: kernel make math sequences sorting ;
 IN: project-euler.009

 ! http://projecteuler.net/index.php?section=problems&id=9
@ -30,14 +30,14 @@ IN: project-euler.009

 : abc ( p q -- triplet )
    [
-        2dup * ,                    ! a = p * q
-        [ sq ] bi@ 2dup - 2 / ,  ! b = (p² - q²) / 2
-        + 2 / ,                     ! c = (p² + q²) / 2
+        2dup * ,         ! a = p * q
+        [ sq ] bi@
+        [ - 2 / , ]      ! b = (p² - q²) / 2
+        [ + 2 / , ] 2bi  ! c = (p² + q²) / 2
    ] { } make natural-sort ;

 : (ptriplet) ( target p q triplet -- target p q )
-    roll [ swap sum = ] keep -roll
-    [ next-pq 2dup abc (ptriplet) ] unless ;
+    sum [ pick ] dip = [ next-pq 2dup abc (ptriplet) ] unless ;

 : ptriplet ( target -- triplet )
   3 1 { 3 4 5 } (ptriplet) abc nip ;
@ -48,6 +48,6 @@ PRIVATE>
    1000 ptriplet product ;

 ! [ euler009 ] 100 ave-time
-! 1 ms run / 0 ms GC ave time - 100 trials
+! 1 ms ave run time - 0.73 SD (100 trials)

 MAIN: euler009
--- a/extra/project-euler/010/010-tests.factor
+++ b/extra/project-euler/010/010-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.010 tools.test ;
+IN: project-euler.010.tests
+
+[ 142913828922 ] [ euler010 ] unit-test
--- a/extra/project-euler/010/010.factor
+++ b/extra/project-euler/010/010.factor
@ -10,16 +10,19 @@ IN: project-euler.010

 ! The sum of the primes below 10 is 2 + 3 + 5 + 7 = 17.

-! Find the sum of all the primes below one million.
+! Find the sum of all the primes below two million.


 ! SOLUTION
 ! --------

 : euler010 ( -- answer )
-    1000000 primes-upto sum ;
+    2000000 primes-upto sum ;

-! [ euler010 ] 100 ave-time
-! 14 ms run / 0 ms GC ave time - 100 trials
+! [ euler010 ] time
+! 266425 ms run / 10001 ms GC time
+
+! TODO: this takes well over one minute now that they changed the problem to
+! two million instead of one. the primes vocab could use some improvements

 MAIN: euler010
--- a/extra/project-euler/011/011-tests.factor
+++ b/extra/project-euler/011/011-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.011 tools.test ;
+IN: project-euler.011.tests
+
+[ 70600674 ] [ euler011 ] unit-test
--- a/extra/project-euler/011/011.factor
+++ b/extra/project-euler/011/011.factor
@ -1,7 +1,6 @@
-! Copyright (c) 2007 Aaron Schaefer.
+! Copyright (c) 2007, 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel namespaces make project-euler.common sequences
-splitting grouping ;
+USING: grouping kernel make sequences ;
 IN: project-euler.011

 ! http://projecteuler.net/index.php?section=problems&id=11
@ -88,7 +87,7 @@ IN: project-euler.011
    horizontal pad-front pad-back flip ;

 : max-product ( matrix width -- n )
-    [ collect-consecutive ] curry map concat
+    [ clump ] curry map concat
    [ product ] map supremum ; inline

 PRIVATE>
@ -100,6 +99,6 @@ PRIVATE>
    ] { } make supremum ;

 ! [ euler011 ] 100 ave-time
-! 4 ms run / 0 ms GC ave time - 100 trials
+! 3 ms ave run time - 0.77 SD (100 trials)

 MAIN: euler011
--- a/extra/project-euler/012/012-tests.factor
+++ b/extra/project-euler/012/012-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.012 tools.test ;
+IN: project-euler.012.tests
+
+[ 76576500 ] [ euler012 ] unit-test
--- a/extra/project-euler/012/012.factor
+++ b/extra/project-euler/012/012.factor
@ -37,6 +37,6 @@ IN: project-euler.012
    8 [ dup nth-triangle tau* 500 < ] [ 1+ ] [ ] while nth-triangle ;

 ! [ euler012 ] 10 ave-time
-! 5413 ms run / 1 ms GC ave time - 10 trials
+! 6573 ms ave run time - 346.27 SD (10 trials)

 MAIN: euler012
--- a/extra/project-euler/013/013-tests.factor
+++ b/extra/project-euler/013/013-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.013 tools.test ;
+IN: project-euler.013.tests
+
+[ 5537376230 ] [ euler013 ] unit-test
--- a/extra/project-euler/013/013.factor
+++ b/extra/project-euler/013/013.factor
@ -228,6 +228,6 @@ PRIVATE>
    source-013 sum number>string 10 head string>number ;

 ! [ euler013 ] 100 ave-time
-! 0 ms run / 0 ms GC ave time - 100 trials
+! 0 ms ave run time - 0.31 SD (100 trials)

 MAIN: euler013
--- a/extra/project-euler/014/014-tests.factor
+++ b/extra/project-euler/014/014-tests.factor
@ -0,0 +1,5 @@
+USING: project-euler.014 tools.test ;
+IN: project-euler.014.tests
+
+[ 837799 ] [ euler014 ] unit-test
+[ 837799 ] [ euler014a ] unit-test
--- a/extra/project-euler/014/014.factor
+++ b/extra/project-euler/014/014.factor
@ -1,7 +1,6 @@
 ! Copyright (c) 2007 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays combinators.short-circuit kernel
-math math.ranges namespaces make sequences sorting ;
+USING: combinators.short-circuit kernel make math math.ranges sequences ;
 IN: project-euler.014

 ! http://projecteuler.net/index.php?section=problems&id=14
@ -59,7 +58,7 @@ PRIVATE>
 <PRIVATE

 : worth-calculating? ( n -- ? )
-    { [ dup 1- 3 mod zero? ] [ dup 1- 3 / even? ] } 0&& nip ;
+    1- 3 { [ mod zero? ] [ / even? ] } 2&& ;

 PRIVATE>

--- a/extra/project-euler/015/015-tests.factor
+++ b/extra/project-euler/015/015-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.015 tools.test ;
+IN: project-euler.015.tests
+
+[ 137846528820 ] [ euler015 ] unit-test
--- a/extra/project-euler/015/015.factor
+++ b/extra/project-euler/015/015.factor
@ -28,6 +28,6 @@ PRIVATE>
    20 grid-paths ;

 ! [ euler015 ] 100 ave-time
-! 0 ms run / 0 ms GC ave time - 100 trials
+! 0 ms ave run time - 0.2 SD (100 trials)

 MAIN: euler015
--- a/extra/project-euler/016/016-tests.factor
+++ b/extra/project-euler/016/016-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.016 tools.test ;
+IN: project-euler.016.tests
+
+[ 1366 ] [ euler016 ] unit-test
--- a/extra/project-euler/016/016.factor
+++ b/extra/project-euler/016/016.factor
@ -1,6 +1,6 @@
-! Copyright (c) 2007 Aaron Schaefer.
+! Copyright (c) 2007, 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: math.functions math.parser project-euler.common sequences ;
+USING: math.functions project-euler.common sequences ;
 IN: project-euler.016

 ! http://projecteuler.net/index.php?section=problems&id=16
@ -20,6 +20,6 @@ IN: project-euler.016
    2 1000 ^ number>digits sum ;

 ! [ euler016 ] 100 ave-time
-! 0 ms run / 0 ms GC ave time - 100 trials
+! 0 ms ave run time - 0.67 SD (100 trials)

 MAIN: euler016
--- a/extra/project-euler/017/017-tests.factor
+++ b/extra/project-euler/017/017-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.017 tools.test ;
+IN: project-euler.017.tests
+
+[ 21124 ] [ euler017 ] unit-test
--- a/extra/project-euler/017/017.factor
+++ b/extra/project-euler/017/017.factor
@ -1,7 +1,6 @@
-! Copyright (c) 2007 Aaron Schaefer.
+! Copyright (c) 2007, 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math.ranges math.text.english sequences strings
-    ascii combinators.short-circuit ;
+USING: ascii kernel math.ranges math.text.english sequences ;
 IN: project-euler.017

 ! http://projecteuler.net/index.php?section=problems&id=17
@ -26,7 +25,7 @@ IN: project-euler.017
 : euler017 ( -- answer )
    1000 [1,b] SBUF" " clone [ number>text over push-all ] reduce [ Letter? ] count ;

-! [ euler017a ] 100 ave-time
-! 14 ms run / 0 ms GC ave time - 100 trials
+! [ euler017 ] 100 ave-time
+! 15 ms ave run time - 1.71 SD (100 trials)

 MAIN: euler017
--- a/extra/project-euler/018/018-tests.factor
+++ b/extra/project-euler/018/018-tests.factor
@ -0,0 +1,5 @@
+USING: project-euler.018 tools.test ;
+IN: project-euler.018.tests
+
+[ 1074 ] [ euler018 ] unit-test
+[ 1074 ] [ euler018a ] unit-test
--- a/extra/project-euler/018/018.factor
+++ b/extra/project-euler/018/018.factor
@ -74,7 +74,7 @@ PRIVATE>
    source-018 propagate-all first first ;

 ! [ euler018 ] 100 ave-time
-! 0 ms run / 0 ms GC ave time - 100 trials
+! 0 ms ave run time - 0.29 SD (100 trials)


 ! ALTERNATE SOLUTIONS
@ -84,6 +84,6 @@ PRIVATE>
    source-018 max-path ;

 ! [ euler018a ] 100 ave-time
-! 0 ms run / 0 ms GC ave time - 100 trials
+! 0 ms ave run time - 0.39 SD (100 trials)

 MAIN: euler018a
--- a/extra/project-euler/019/019-tests.factor
+++ b/extra/project-euler/019/019-tests.factor
@ -0,0 +1,5 @@
+USING: project-euler.019 tools.test ;
+IN: project-euler.019.tests
+
+[ 171 ] [ euler019 ] unit-test
+[ 171 ] [ euler019a ] unit-test
--- a/extra/project-euler/019/019.factor
+++ b/extra/project-euler/019/019.factor
@ -36,7 +36,7 @@ IN: project-euler.019
    ] map concat [ zero? ] count ;

 ! [ euler019 ] 100 ave-time
-! 1 ms run / 0 ms GC ave time - 100 trials
+! 1 ms ave run time - 0.51 SD (100 trials)


 ! ALTERNATE SOLUTIONS
@ -61,6 +61,6 @@ PRIVATE>
    end-date start-date first-days [ zero? ] count ;

 ! [ euler019a ] 100 ave-time
-! 131 ms run / 3 ms GC ave time - 100 trials
+! 17 ms ave run time - 2.13 SD (100 trials)

 MAIN: euler019
--- a/extra/project-euler/020/020-tests.factor
+++ b/extra/project-euler/020/020-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.020 tools.test ;
+IN: project-euler.020.tests
+
+[ 648 ] [ euler020 ] unit-test
--- a/extra/project-euler/020/020.factor
+++ b/extra/project-euler/020/020.factor
@ -1,6 +1,6 @@
-! Copyright (c) 2007 Aaron Schaefer.
+! Copyright (c) 2007, 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: math.combinatorics math.parser project-euler.common sequences ;
+USING: math.combinatorics project-euler.common sequences ;
 IN: project-euler.020

 ! http://projecteuler.net/index.php?section=problems&id=20
@ -20,6 +20,6 @@ IN: project-euler.020
    100 factorial number>digits sum ;

 ! [ euler020 ] 100 ave-time
-! 0 ms run / 0 ms GC ave time - 100 trials
+! 0 ms ave run time - 0.55 (100 trials)

 MAIN: euler020
--- a/extra/project-euler/021/021-tests.factor
+++ b/extra/project-euler/021/021-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.021 tools.test ;
+IN: project-euler.021.tests
+
+[ 31626 ] [ euler021 ] unit-test
--- a/extra/project-euler/021/021.factor
+++ b/extra/project-euler/021/021.factor
@ -27,12 +27,12 @@ IN: project-euler.021

 : amicable? ( n -- ? )
    dup sum-proper-divisors
-    { [ 2dup = not ] [ 2dup sum-proper-divisors = ] } 0&& 2nip ;
+    { [ = not ] [ sum-proper-divisors = ] } 2&& ;

 : euler021 ( -- answer )
    10000 [1,b] [ dup amicable? [ drop 0 ] unless ] sigma ;

 ! [ euler021 ] 100 ave-time
-! 328 ms run / 10 ms GC ave time - 100 trials
+! 335 ms ave run time - 18.63 SD (100 trials)

 MAIN: euler021
--- a/extra/project-euler/022/022-tests.factor
+++ b/extra/project-euler/022/022-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.022 tools.test ;
+IN: project-euler.022.tests
+
+[ 871198282 ] [ euler022 ] unit-test
--- a/extra/project-euler/022/022.factor
+++ b/extra/project-euler/022/022.factor
@ -40,6 +40,6 @@ PRIVATE>
    source-022 natural-sort name-scores sum ;

 ! [ euler022 ] 100 ave-time
-! 123 ms run / 4 ms GC ave time - 100 trials
+! 74 ms ave run time - 5.13 SD (100 trials)

 MAIN: euler022
--- a/extra/project-euler/023/023-tests.factor
+++ b/extra/project-euler/023/023-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.023 tools.test ;
+IN: project-euler.023.tests
+
+[ 4179871 ] [ euler023 ] unit-test
--- a/extra/project-euler/023/023.factor
+++ b/extra/project-euler/023/023.factor
@ -1,7 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: hashtables kernel math math.ranges project-euler.common sequences
-    sorting sets ;
+USING: kernel math math.ranges project-euler.common sequences sets sorting ;
 IN: project-euler.023

 ! http://projecteuler.net/index.php?section=problems&id=23
--- a/extra/project-euler/024/024-tests.factor
+++ b/extra/project-euler/024/024-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.024 tools.test ;
+IN: project-euler.024.tests
+
+[ 2783915460 ] [ euler024 ] unit-test
--- a/extra/project-euler/024/024.factor
+++ b/extra/project-euler/024/024.factor
@ -26,6 +26,6 @@ IN: project-euler.024
    999999 10 permutation 10 digits>integer ;

 ! [ euler024 ] 100 ave-time
-! 0 ms run / 0 ms GC ave time - 100 trials
+! 0 ms ave run time - 0.27 SD (100 trials)

 MAIN: euler024
--- a/extra/project-euler/025/025-tests.factor
+++ b/extra/project-euler/025/025-tests.factor
@ -0,0 +1,5 @@
+USING: project-euler.025 tools.test ;
+IN: project-euler.025.tests
+
+[ 4782 ] [ euler025 ] unit-test
+[ 4782 ] [ euler025a ] unit-test
--- a/extra/project-euler/025/025.factor
+++ b/extra/project-euler/025/025.factor
@ -1,7 +1,7 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien.syntax kernel math math.constants math.functions math.parser
-    math.ranges memoize project-euler.common sequences ;
+USING: kernel math math.constants math.functions math.parser memoize
+    project-euler.common sequences ;
 IN: project-euler.025

 ! http://projecteuler.net/index.php?section=problems&id=25
@ -55,7 +55,7 @@ PRIVATE>
    1000 digit-fib ;

 ! [ euler025 ] 10 ave-time
-! 5237 ms run / 72 ms GC ave time - 10 trials
+! 5345 ms ave run time - 105.91 SD (10 trials)


 ! ALTERNATE SOLUTIONS
@ -76,6 +76,6 @@ PRIVATE>
    1000 digit-fib* ;

 ! [ euler025a ] 100 ave-time
-! 0 ms run / 0 ms GC ave time - 100 trials
+! 0 ms ave run time - 0.17 SD (100 trials)

 MAIN: euler025a
--- a/extra/project-euler/026/026-tests.factor
+++ b/extra/project-euler/026/026-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.026 tools.test ;
+IN: project-euler.026.tests
+
+[ 983 ] [ euler026 ] unit-test
--- a/extra/project-euler/026/026.factor
+++ b/extra/project-euler/026/026.factor
@ -66,6 +66,6 @@ PRIVATE>
    source-026 max-period drop denominator ;

 ! [ euler026 ] 100 ave-time
-! 724 ms run / 7 ms GC ave time - 100 trials
+! 290 ms ave run time - 19.2 SD (100 trials)

 MAIN: euler026
--- a/extra/project-euler/027/027-tests.factor
+++ b/extra/project-euler/027/027-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.027 tools.test ;
+IN: project-euler.027.tests
+
+[ -59231 ] [ euler027 ] unit-test
--- a/extra/project-euler/027/027.factor
+++ b/extra/project-euler/027/027.factor
@ -68,7 +68,7 @@ PRIVATE>
    source-027 max-consecutive drop product ;

 ! [ euler027 ] 100 ave-time
-! 687 ms run / 23 ms GC ave time - 100 trials
+! 111 ms ave run time - 6.07 SD (100 trials)

 ! TODO: generalize max-consecutive/max-product (from #26) into a new word

--- a/extra/project-euler/028/028-tests.factor
+++ b/extra/project-euler/028/028-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.028 tools.test ;
+IN: project-euler.028.tests
+
+[ 669171001 ] [ euler028 ] unit-test
--- a/extra/project-euler/028/028.factor
+++ b/extra/project-euler/028/028.factor
@ -30,7 +30,7 @@ IN: project-euler.028
 <PRIVATE

 : sum-corners ( n -- sum )
-    dup 1 = [ [ sq 4 * ] keep 6 * - 6 + ] unless ;
+    dup 1 = [ [ sq 4 * ] [ 6 * ] bi - 6 + ] unless ;

 : sum-diags ( n -- sum )
    1 swap 2 <range> [ sum-corners ] sigma ;
@ -41,6 +41,6 @@ PRIVATE>
    1001 sum-diags ;

 ! [ euler028 ] 100 ave-time
-! 0 ms run / 0 ms GC ave time - 100 trials
+! 0 ms ave run time - 0.39 SD (100 trials)

 MAIN: euler028
--- a/extra/project-euler/029/029-tests.factor
+++ b/extra/project-euler/029/029-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.029 tools.test ;
+IN: project-euler.029.tests
+
+[ 9183 ] [ euler029 ] unit-test
--- a/extra/project-euler/029/029.factor
+++ b/extra/project-euler/029/029.factor
@ -32,6 +32,6 @@ IN: project-euler.029
    2 100 [a,b] dup cartesian-product [ first2 ^ ] map prune length ;

 ! [ euler029 ] 100 ave-time
-! 951 ms run / 12 ms GC ave time - 100 trials
+! 704 ms ave run time - 28.07 SD (100 trials)

 MAIN: euler029
--- a/extra/project-euler/030/030-tests.factor
+++ b/extra/project-euler/030/030-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.030 tools.test ;
+IN: project-euler.030.tests
+
+[ 443839 ] [ euler030 ] unit-test
--- a/extra/project-euler/030/030.factor
+++ b/extra/project-euler/030/030.factor
@ -41,6 +41,6 @@ PRIVATE>
    325537 [ dup sum-fifth-powers = ] filter sum 1- ;

 ! [ euler030 ] 100 ave-time
-! 2537 ms run / 125 ms GC ave time - 100 trials
+! 1700 ms ave run time - 64.84 SD (100 trials)

 MAIN: euler030
--- a/extra/project-euler/031/031-tests.factor
+++ b/extra/project-euler/031/031-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.031 tools.test ;
+IN: project-euler.031.tests
+
+[ 73682 ] [ euler031 ] unit-test
--- a/extra/project-euler/031/031.factor
+++ b/extra/project-euler/031/031.factor
@ -30,25 +30,25 @@ IN: project-euler.031
    drop 1 ;

 : 2p ( m -- n )
-    dup 0 >= [ [ 2 - 2p ] keep 1p + ] [ drop 0 ] if ;
+    dup 0 >= [ [ 2 - 2p ] [ 1p ] bi + ] [ drop 0 ] if ;

 : 5p ( m -- n )
-    dup 0 >= [ [ 5 - 5p ] keep 2p + ] [ drop 0 ] if ;
+    dup 0 >= [ [ 5 - 5p ] [ 2p ] bi + ] [ drop 0 ] if ;

 : 10p ( m -- n )
-    dup 0 >= [ [ 10 - 10p ] keep 5p + ] [ drop 0 ] if ;
+    dup 0 >= [ [ 10 - 10p ] [ 5p ] bi + ] [ drop 0 ] if ;

 : 20p ( m -- n )
-    dup 0 >= [ [ 20 - 20p ] keep 10p + ] [ drop 0 ] if ;
+    dup 0 >= [ [ 20 - 20p ] [ 10p ] bi + ] [ drop 0 ] if ;

 : 50p ( m -- n )
-    dup 0 >= [ [ 50 - 50p ] keep 20p + ] [ drop 0 ] if ;
+    dup 0 >= [ [ 50 - 50p ] [ 20p ] bi + ] [ drop 0 ] if ;

 : 100p ( m -- n )
-    dup 0 >= [ [ 100 - 100p ] keep 50p + ] [ drop 0 ] if ;
+    dup 0 >= [ [ 100 - 100p ] [ 50p ] bi + ] [ drop 0 ] if ;

 : 200p ( m -- n )
-    dup 0 >= [ [ 200 - 200p ] keep 100p + ] [ drop 0 ] if ;
+    dup 0 >= [ [ 200 - 200p ] [ 100p ] bi + ] [ drop 0 ] if ;

 PRIVATE>

@ -56,7 +56,7 @@ PRIVATE>
    200 200p ;

 ! [ euler031 ] 100 ave-time
-! 4 ms run / 0 ms GC ave time - 100 trials
+! 3 ms ave run time - 0.91 SD (100 trials)

 ! TODO: generalize to eliminate duplication; use a sequence to specify denominations?

--- a/extra/project-euler/032/032-tests.factor
+++ b/extra/project-euler/032/032-tests.factor
@ -0,0 +1,5 @@
+USING: project-euler.032 tools.test ;
+IN: project-euler.032.tests
+
+[ 45228 ] [ euler032 ] unit-test
+[ 45228 ] [ euler032a ] unit-test
--- a/extra/project-euler/032/032.factor
+++ b/extra/project-euler/032/032.factor
@ -1,7 +1,7 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: hashtables kernel math math.combinatorics math.functions
-    math.parser math.ranges project-euler.common sequences sets ;
+USING: kernel math math.combinatorics math.functions math.parser math.ranges
+    project-euler.common sequences sets ;
 IN: project-euler.032

 ! http://projecteuler.net/index.php?section=problems&id=32
@ -38,7 +38,7 @@ IN: project-euler.032
    [ string>number ] tri@ [ * ] dip = ;

 : valid? ( n -- ? )
-    dup 1and4 swap 2and3 or ;
+    [ 1and4 ] [ 2and3 ] bi or ;

 : products ( seq -- m )
    [ 10 4 ^ mod ] map ;
@ -49,7 +49,7 @@ PRIVATE>
    source-032 [ valid? ] filter products prune sum ;

 ! [ euler032 ] 10 ave-time
-! 23922 ms run / 1505 ms GC ave time - 10 trials
+! 16361 ms ave run time - 417.8 SD (10 trials)


 ! ALTERNATE SOLUTIONS
@ -72,7 +72,7 @@ PRIVATE>
 : euler032a ( -- answer )
    source-032a [ mmp ] map [ pandigital? ] filter products prune sum ;

-! [ euler032a ] 100 ave-time
-! 5978 ms run / 327 ms GC ave time - 100 trials
+! [ euler032a ] 10 ave-time
+! 2624 ms ave run time - 131.91 SD (10 trials)

 MAIN: euler032a
--- a/extra/project-euler/033/033-tests.factor
+++ b/extra/project-euler/033/033-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.033 tools.test ;
+IN: project-euler.033.tests
+
+[ 100 ] [ euler033 ] unit-test
--- a/extra/project-euler/033/033.factor
+++ b/extra/project-euler/033/033.factor
@ -50,6 +50,6 @@ PRIVATE>
    source-033 curious-fractions product denominator ;

 ! [ euler033 ] 100 ave-time
-! 5 ms run / 0 ms GC ave time - 100 trials
+! 7 ms ave run time - 1.31 SD (100 trials)

 MAIN: euler033
--- a/extra/project-euler/034/034-tests.factor
+++ b/extra/project-euler/034/034-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.034 tools.test ;
+IN: project-euler.034.tests
+
+[ 40730 ] [ euler034 ] unit-test
--- a/extra/project-euler/034/034.factor
+++ b/extra/project-euler/034/034.factor
@ -42,6 +42,6 @@ PRIVATE>
    3 2000000 [a,b] [ factorion? ] filter sum ;

 ! [ euler034 ] 10 ave-time
-! 15089 ms run / 725 ms GC ave time - 10 trials
+! 5506 ms ave run time - 144.0 SD (10 trials)

 MAIN: euler034
--- a/extra/project-euler/035/035-tests.factor
+++ b/extra/project-euler/035/035-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.035 tools.test ;
+IN: project-euler.035.tests
+
+[ 55 ] [ euler035 ] unit-test
--- a/extra/project-euler/035/035.factor
+++ b/extra/project-euler/035/035.factor
@ -53,7 +53,7 @@ PRIVATE>
    source-035 [ possible? ] filter [ circular? ] count ;

 ! [ euler035 ] 100 ave-time
-! 904 ms run / 86 ms GC ave time - 100 trials
+! 538 ms ave run time - 17.16 SD (100 trials)

 ! TODO: try using bit arrays or other methods outlined here:
 !     http://home.comcast.net/~babdulbaki/Circular_Primes.html
--- a/extra/project-euler/036/036-tests.factor
+++ b/extra/project-euler/036/036-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.036 tools.test ;
+IN: project-euler.036.tests
+
+[ 872187 ] [ euler036 ] unit-test
--- a/extra/project-euler/036/036.factor
+++ b/extra/project-euler/036/036.factor
@ -26,8 +26,7 @@ IN: project-euler.036
 <PRIVATE

 : both-bases? ( n -- ? )
-    { [ dup palindrome? ]
-      [ dup >bin dup reverse = ] } 0&& nip ;
+    { [ palindrome? ] [ >bin dup reverse = ] } 1&& ;

 PRIVATE>

@ -35,6 +34,6 @@ PRIVATE>
    1 1000000 2 <range> [ both-bases? ] filter sum ;

 ! [ euler036 ] 100 ave-time
-! 3891 ms run / 173 ms GC ave time - 100 trials
+! 1703 ms ave run time - 96.6 SD (100 trials)

 MAIN: euler036
--- a/extra/project-euler/037/037-tests.factor
+++ b/extra/project-euler/037/037-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.037 tools.test ;
+IN: project-euler.037.tests
+
+[ 748317 ] [ euler037 ] unit-test
--- a/extra/project-euler/037/037.factor
+++ b/extra/project-euler/037/037.factor
@ -47,6 +47,6 @@ PRIVATE>
    23 1000000 primes-between [ r-trunc? ] filter [ l-trunc? ] filter sum ;

 ! [ euler037 ] 100 ave-time
-! 768 ms run / 9 ms GC ave time - 100 trials
+! 130 ms ave run time - 6.27 SD (100 trials)

 MAIN: euler037
--- a/extra/project-euler/038/038-tests.factor
+++ b/extra/project-euler/038/038-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.038 tools.test ;
+IN: project-euler.038.tests
+
+[ 932718654 ] [ euler038 ] unit-test
--- a/extra/project-euler/038/038.factor
+++ b/extra/project-euler/038/038.factor
@ -1,6 +1,7 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math math.parser math.ranges project-euler.common sequences ;
+USING: kernel math math.parser math.ranges project-euler.common sequences
+    strings ;
 IN: project-euler.038

 ! http://projecteuler.net/index.php?section=problems&id=38
@ -50,6 +51,6 @@ PRIVATE>
    9123 9876 [a,b] [ concat-product ] map [ pandigital? ] filter supremum ;

 ! [ euler038 ] 100 ave-time
-! 37 ms run / 1 ms GC ave time - 100 trials
+! 11 ms ave run time - 1.5 SD (100 trials)

 MAIN: euler038
--- a/extra/project-euler/039/039-tests.factor
+++ b/extra/project-euler/039/039-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.039 tools.test ;
+IN: project-euler.039.tests
+
+[ 840 ] [ euler039 ] unit-test
--- a/extra/project-euler/039/039.factor
+++ b/extra/project-euler/039/039.factor
@ -60,6 +60,6 @@ PRIVATE>
    ] with-scope ;

 ! [ euler039 ] 100 ave-time
-! 2 ms run / 0 ms GC ave time - 100 trials
+! 1 ms ave run time - 0.37 SD (100 trials)

 MAIN: euler039
--- a/extra/project-euler/040/040-tests.factor
+++ b/extra/project-euler/040/040-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.040 tools.test ;
+IN: project-euler.040.tests
+
+[ 210 ] [ euler040 ] unit-test
--- a/extra/project-euler/040/040.factor
+++ b/extra/project-euler/040/040.factor
@ -46,6 +46,6 @@ PRIVATE>
    [ swap nth-integer ] with map product ;

 ! [ euler040 ] 100 ave-time
-! 1002 ms run / 43 ms GC ave time - 100 trials
+! 444 ms ave run time - 23.64 SD (100 trials)

 MAIN: euler040
--- a/extra/project-euler/041/041-tests.factor
+++ b/extra/project-euler/041/041-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.041 tools.test ;
+IN: project-euler.041.tests
+
+[ 7652413 ] [ euler041 ] unit-test
--- a/extra/project-euler/041/041.factor
+++ b/extra/project-euler/041/041.factor
@ -35,6 +35,6 @@ IN: project-euler.041
    [ 10 digits>integer ] map [ prime? ] find nip ;

 ! [ euler041 ] 100 ave-time
-! 107 ms run / 7 ms GC ave time - 100 trials
+! 64 ms ave run time - 4.22 SD (100 trials)

 MAIN: euler041
--- a/extra/project-euler/042/042-tests.factor
+++ b/extra/project-euler/042/042-tests.factor
@ -0,0 +1,5 @@
+USING: project-euler.042 tools.test ;
+IN: project-euler.042.tests
+
+[ 162 ] [ euler042 ] unit-test
+[ 162 ] [ euler042a ] unit-test
--- a/extra/project-euler/042/042.factor
+++ b/extra/project-euler/042/042.factor
@ -1,7 +1,7 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: ascii io.files kernel math math.functions namespaces make
-    project-euler.common sequences splitting io.encodings.ascii ;
+USING: ascii io.encodings.ascii io.files kernel make math math.functions
+    namespaces project-euler.common sequences splitting ;
 IN: project-euler.042

 ! http://projecteuler.net/index.php?section=problems&id=42
@ -50,7 +50,7 @@ PRIVATE>
    triangle-upto [ member? ] curry count ;

 ! [ euler042 ] 100 ave-time
-! 27 ms run / 1 ms GC ave time - 100 trials
+! 19 ms ave run time - 1.97 SD (100 trials)


 ! ALTERNATE SOLUTIONS
@ -69,6 +69,6 @@ PRIVATE>
    source-042 [ alpha-value ] map [ triangle? ] count ;

 ! [ euler042a ] 100 ave-time
-! 25 ms run / 1 ms GC ave time - 100 trials
+! 21 ms ave run time - 2.2 SD (100 trials)

 MAIN: euler042a
--- a/extra/project-euler/043/043-tests.factor
+++ b/extra/project-euler/043/043-tests.factor
@ -0,0 +1,5 @@
+USING: project-euler.043 tools.test ;
+IN: project-euler.043.tests
+
+[ 16695334890 ] [ euler043 ] unit-test
+[ 16695334890 ] [ euler043a ] unit-test
--- a/extra/project-euler/043/043.factor
+++ b/extra/project-euler/043/043.factor
@ -1,8 +1,7 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: combinators.short-circuit hashtables kernel math
-    math.combinatorics math.parser math.ranges project-euler.common sequences
-    sorting sets ;
+USING: combinators.short-circuit kernel math math.combinatorics math.parser
+    math.ranges project-euler.common sequences sets sorting ;
 IN: project-euler.043

 ! http://projecteuler.net/index.php?section=problems&id=43
@ -41,14 +40,14 @@ IN: project-euler.043

 : interesting? ( seq -- ? )
    {
-        [ 17 8 pick subseq-divisible? ]
-        [ 13 7 pick subseq-divisible? ]
-        [ 11 6 pick subseq-divisible? ]
-        [ 7 5 pick subseq-divisible? ]
-        [ 5 4 pick subseq-divisible? ]
-        [ 3 3 pick subseq-divisible? ]
-        [ 2 2 pick subseq-divisible? ]
-    } 0&& nip ;
+        [ 17 8 rot subseq-divisible? ]
+        [ 13 7 rot subseq-divisible? ]
+        [ 11 6 rot subseq-divisible? ]
+        [ 7  5 rot subseq-divisible? ]
+        [ 5  4 rot subseq-divisible? ]
+        [ 3  3 rot subseq-divisible? ]
+        [ 2  2 rot subseq-divisible? ]
+    } 1&& ;

 PRIVATE>

@ -57,7 +56,7 @@ PRIVATE>
    [ interesting? ] filter [ 10 digits>integer ] map sum ;

 ! [ euler043 ] time
-! 125196 ms run / 19548 ms GC time
+! 104526 ms run / 42735 ms GC time


 ! ALTERNATE SOLUTIONS
@ -74,13 +73,13 @@ PRIVATE>
    1000 over <range> [ number>digits 3 0 pad-left ] map [ all-unique? ] filter ;

 : overlap? ( seq -- ? )
-    dup first 2 tail* swap second 2 head = ;
+    [ first 2 tail* ] [ second 2 head ] bi = ;

 : clean ( seq -- seq )
    [ unclip 1 head prefix concat ] map [ all-unique? ] filter ;

 : add-missing-digit ( seq -- seq )
-    dup natural-sort 10 swap diff first prefix ;
+    dup natural-sort 10 swap diff prepend ;

 : interesting-pandigitals ( -- seq )
    17 candidates { 13 11 7 5 3 2 } [
@ -93,6 +92,6 @@ PRIVATE>
    interesting-pandigitals [ 10 digits>integer ] sigma ;

 ! [ euler043a ] 100 ave-time
-! 19 ms run / 1 ms GC ave time - 100 trials
+! 10 ms ave run time - 1.37 SD (100 trials)

 MAIN: euler043a
--- a/extra/project-euler/044/044-tests.factor
+++ b/extra/project-euler/044/044-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.044 tools.test ;
+IN: project-euler.044.tests
+
+[ 5482660 ] [ euler044 ] unit-test
--- a/extra/project-euler/044/044.factor
+++ b/extra/project-euler/044/044.factor
@ -31,7 +31,7 @@ IN: project-euler.044
    dup 3 * 1- * 2 / ;

 : sum-and-diff? ( m n -- ? )
-    2dup + -rot - [ pentagonal? ] bi@ and ;
+    [ + ] [ - ] 2bi [ pentagonal? ] bi@ and ;

 PRIVATE>

@ -40,7 +40,7 @@ PRIVATE>
    [ first2 sum-and-diff? ] filter [ first2 - abs ] map infimum ;

 ! [ euler044 ] 10 ave-time
-! 8924 ms run / 2872 ms GC ave time - 10 trials
+! 4996 ms ave run time - 87.46 SD (10 trials)

 ! TODO: this solution is ugly and not very efficient...find a better algorithm

--- a/extra/project-euler/045/045-tests.factor
+++ b/extra/project-euler/045/045-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.045 tools.test ;
+IN: project-euler.045.tests
+
+[ 1533776805 ] [ euler045 ] unit-test
--- a/extra/project-euler/045/045.factor
+++ b/extra/project-euler/045/045.factor
@ -44,6 +44,6 @@ PRIVATE>
    143 next-solution ;

 ! [ euler045 ] 100 ave-time
-! 18 ms run / 1 ms GC ave time - 100 trials
+! 12 ms ave run time - 1.71 SD (100 trials)

 MAIN: euler045
--- a/extra/project-euler/046/046-tests.factor
+++ b/extra/project-euler/046/046-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.046 tools.test ;
+IN: project-euler.046.tests
+
+[ 5777 ] [ euler046 ] unit-test
--- a/extra/project-euler/046/046.factor
+++ b/extra/project-euler/046/046.factor
@ -47,6 +47,6 @@ PRIVATE>
    9 disprove-conjecture ;

 ! [ euler046 ] 100 ave-time
-! 150 ms run / 2 ms GC ave time - 100 trials
+! 37 ms ave run time - 3.39 SD (100 trials)

 MAIN: euler046
--- a/extra/project-euler/047/047-tests.factor
+++ b/extra/project-euler/047/047-tests.factor
@ -0,0 +1,5 @@
+USING: project-euler.047 tools.test ;
+IN: project-euler.047.tests
+
+[ 134043 ] [ euler047 ] unit-test
+[ 134043 ] [ euler047a ] unit-test
--- a/extra/project-euler/047/047.factor
+++ b/extra/project-euler/047/047.factor
@ -49,7 +49,7 @@ PRIVATE>
    4 646 consecutive ;

 ! [ euler047 ] time
-! 542708 ms run / 60548 ms GC time
+! 344688 ms run / 20727 ms GC time


 ! ALTERNATE SOLUTIONS
@ -88,7 +88,7 @@ PRIVATE>
    4 200000 consecutive-under ;

 ! [ euler047a ] 100 ave-time
-! 503 ms run / 5 ms GC ave time - 100 trials
+! 331 ms ave run time - 19.14 SD (100 trials)

 ! TODO: I don't like that you have to specify the upper bound, maybe try making
 ! this lazy so it could also short-circuit when it finds the answer?
--- a/extra/project-euler/048/048-tests.factor
+++ b/extra/project-euler/048/048-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.048 tools.test ;
+IN: project-euler.048.tests
+
+[ 9110846700 ] [ euler048 ] unit-test
--- a/extra/project-euler/052/052-tests.factor
+++ b/extra/project-euler/052/052-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.052 tools.test ;
+IN: project-euler.052.tests
+
+[ 142857 ] [ euler052 ] unit-test
--- a/extra/project-euler/052/052.factor
+++ b/extra/project-euler/052/052.factor
@ -30,7 +30,7 @@ IN: project-euler.052
    [ number>digits natural-sort ] map all-equal? ;

 : candidate? ( n -- ? )
-    { [ dup odd? ] [ dup 3 mod zero? ] } 0&& nip ;
+    { [ odd? ] [ 3 mod zero? ] } 1&& ;

 : next-all-same ( x n -- n )
    dup candidate? [
@ -46,6 +46,6 @@ PRIVATE>
    6 123456 next-all-same ;

 ! [ euler052 ] 100 ave-time
-! 403 ms run / 7 ms GC ave time - 100 trials
+! 92 ms ave run time - 6.29 SD (100 trials)

 MAIN: euler052
--- a/extra/project-euler/053/053-tests.factor
+++ b/extra/project-euler/053/053-tests.factor
@ -0,0 +1,4 @@
+USING: project-euler.053 tools.test ;
+IN: project-euler.053.tests
+
+[ 4075 ] [ euler053 ] unit-test
--- a/extra/project-euler/053/053.factor
+++ b/extra/project-euler/053/053.factor
@ -30,6 +30,6 @@ IN: project-euler.053
    23 100 [a,b] [ dup [ nCk 1000000 > ] with count ] sigma ;

 ! [ euler053 ] 100 ave-time
-! 64 ms run / 2 ms GC ave time - 100 trials
+! 52 ms ave run time - 4.44 SD (100 trials)

 MAIN: euler053
--- a/Show More
+++ b/Show More