Add test files for all Project Euler solutions

diff --git a/extra/project-euler/008/008-tests.factor b/extra/project-euler/008/008-tests.factor
new file mode 100644 (file)
index 0000000..15fd9f4
--- /dev/null
+++ 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

diff --git a/extra/project-euler/009/009-tests.factor b/extra/project-euler/009/009-tests.factor
new file mode 100644 (file)
index 0000000..20be369
--- /dev/null
+++ 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

diff --git a/extra/project-euler/010/010-tests.factor b/extra/project-euler/010/010-tests.factor
new file mode 100644 (file)
index 0000000..b110ce8
--- /dev/null
+++ 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

diff --git a/extra/project-euler/010/010.factor b/extra/project-euler/010/010.factor
index 172bb9d2907fcc5c2b40ae508e281eae679d9865..c8bbe3d72e91083d3f75789475b6bee37f15f451 100644 (file)
--- 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

diff --git a/extra/project-euler/011/011-tests.factor b/extra/project-euler/011/011-tests.factor
new file mode 100644 (file)
index 0000000..5c48320
--- /dev/null
+++ 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

diff --git a/extra/project-euler/012/012-tests.factor b/extra/project-euler/012/012-tests.factor
new file mode 100644 (file)
index 0000000..c2d9730
--- /dev/null
+++ 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

diff --git a/extra/project-euler/012/012.factor b/extra/project-euler/012/012.factor
index 583bad8f726e4fcc72a4e94a7942da540edf5b69..b25bfc90f1b4133bf34becb35141646edea40647 100644 (file)
--- 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

diff --git a/extra/project-euler/013/013-tests.factor b/extra/project-euler/013/013-tests.factor
new file mode 100644 (file)
index 0000000..3d9f88d
--- /dev/null
+++ 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

diff --git a/extra/project-euler/013/013.factor b/extra/project-euler/013/013.factor
index 907029cfb29470e589cad4c66750ee003e4ca837..857bd62cc40c7bce093c8796396a8c3b73aa282b 100644 (file)
--- 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

diff --git a/extra/project-euler/014/014-tests.factor b/extra/project-euler/014/014-tests.factor
new file mode 100644 (file)
index 0000000..b423c90
--- /dev/null
+++ 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

diff --git a/extra/project-euler/015/015-tests.factor b/extra/project-euler/015/015-tests.factor
new file mode 100644 (file)
index 0000000..9c86421
--- /dev/null
+++ 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

diff --git a/extra/project-euler/015/015.factor b/extra/project-euler/015/015.factor
index 305426902bca798070c4b7e1f84b81feaa4380be..fb720c7e7c76545484921e6d267ee9f4e0ad6b72 100644 (file)
--- 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

diff --git a/extra/project-euler/016/016-tests.factor b/extra/project-euler/016/016-tests.factor
new file mode 100644 (file)
index 0000000..e75a114
--- /dev/null
+++ 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

diff --git a/extra/project-euler/017/017-tests.factor b/extra/project-euler/017/017-tests.factor
new file mode 100644 (file)
index 0000000..3c2b2d5
--- /dev/null
+++ 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

diff --git a/extra/project-euler/018/018-tests.factor b/extra/project-euler/018/018-tests.factor
new file mode 100644 (file)
index 0000000..1d4d650
--- /dev/null
+++ 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

diff --git a/extra/project-euler/018/018.factor b/extra/project-euler/018/018.factor
index eb2df5e0daa9de04547846da930512fceea30fff..21831b90d49b1217735a9f183dc2dd726757e231 100644 (file)
--- 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

diff --git a/extra/project-euler/019/019-tests.factor b/extra/project-euler/019/019-tests.factor
new file mode 100644 (file)
index 0000000..543c01b
--- /dev/null
+++ 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

diff --git a/extra/project-euler/019/019.factor b/extra/project-euler/019/019.factor
index 9482b337bb56da9db95be82dcd7a68403e436371..62e2e066fffebbf6fce9faf27fafd479525df146 100644 (file)
--- 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

diff --git a/extra/project-euler/020/020-tests.factor b/extra/project-euler/020/020-tests.factor
new file mode 100644 (file)
index 0000000..2d9175b
--- /dev/null
+++ 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

diff --git a/extra/project-euler/021/021-tests.factor b/extra/project-euler/021/021-tests.factor
new file mode 100644 (file)
index 0000000..f20ae56
--- /dev/null
+++ 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

diff --git a/extra/project-euler/021/021.factor b/extra/project-euler/021/021.factor
index af6bb3270baf5265178bb048e5b42902dde409cd..2e2f6a6453e50a61c653b9b3342e40c4be6b21c7 100644 (file)
--- a/extra/project-euler/021/021.factor
+++ b/extra/project-euler/021/021.factor
@@ -33,6 +33,6 @@ IN: project-euler.021
     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

diff --git a/extra/project-euler/022/022-tests.factor b/extra/project-euler/022/022-tests.factor
new file mode 100644 (file)
index 0000000..bcd5c18
--- /dev/null
+++ 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

diff --git a/extra/project-euler/022/022.factor b/extra/project-euler/022/022.factor
index a508ddea6c9a9fb0f2e56883dd52ea0f800cd8be..a12838406ab6d8f9fe973d3ab6b4fa03eaff7c12 100644 (file)
--- 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

diff --git a/extra/project-euler/023/023-tests.factor b/extra/project-euler/023/023-tests.factor
new file mode 100644 (file)
index 0000000..bba4173
--- /dev/null
+++ 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

diff --git a/extra/project-euler/024/024-tests.factor b/extra/project-euler/024/024-tests.factor
new file mode 100644 (file)
index 0000000..fe722e5
--- /dev/null
+++ 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

diff --git a/extra/project-euler/024/024.factor b/extra/project-euler/024/024.factor
index 0cc0c39e0788d8d0b5493e0b656f5316903529cc..c10ce418c4e471cefe8b7730c7a7ae18ce82a1ea 100755 (executable)
--- 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

diff --git a/extra/project-euler/025/025-tests.factor b/extra/project-euler/025/025-tests.factor
new file mode 100644 (file)
index 0000000..0de6820
--- /dev/null
+++ 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

diff --git a/extra/project-euler/025/025.factor b/extra/project-euler/025/025.factor
index 6d15a9f6ec89d136bdba730973568d6c6b198672..a2934c23c71f8c5771e07c7e3c41e3b8369d3863 100644 (file)
--- a/extra/project-euler/025/025.factor
+++ b/extra/project-euler/025/025.factor
@@ -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

diff --git a/extra/project-euler/026/026-tests.factor b/extra/project-euler/026/026-tests.factor
new file mode 100644 (file)
index 0000000..1b9b953
--- /dev/null
+++ 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

diff --git a/extra/project-euler/026/026.factor b/extra/project-euler/026/026.factor
index 8cbf20d0bfd497632af1320e582e1fe72cfbb1f8..cf30d0ee4288a8793a9663bc96a1b4ac87c59ffd 100644 (file)
--- 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

diff --git a/extra/project-euler/027/027-tests.factor b/extra/project-euler/027/027-tests.factor
new file mode 100644 (file)
index 0000000..614d8a5
--- /dev/null
+++ 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

diff --git a/extra/project-euler/027/027.factor b/extra/project-euler/027/027.factor
index 7680112af79dba1fe97861560ab425712177574e..5bf753074e4c05295e39f9ad4dd5d7d7d85d98ca 100644 (file)
--- 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
 

diff --git a/extra/project-euler/028/028-tests.factor b/extra/project-euler/028/028-tests.factor
new file mode 100644 (file)
index 0000000..fea5ef1
--- /dev/null
+++ 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

diff --git a/extra/project-euler/029/029-tests.factor b/extra/project-euler/029/029-tests.factor
new file mode 100644 (file)
index 0000000..5fd064f
--- /dev/null
+++ 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

diff --git a/extra/project-euler/029/029.factor b/extra/project-euler/029/029.factor
index 9cfe0aacffc510dddc235ff8d828d23a38f22e66..2586e6182ae4c9eaaf18eab6a4a0c0ee336b2e4c 100644 (file)
--- 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

diff --git a/extra/project-euler/030/030-tests.factor b/extra/project-euler/030/030-tests.factor
new file mode 100644 (file)
index 0000000..3b0d030
--- /dev/null
+++ 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

diff --git a/extra/project-euler/030/030.factor b/extra/project-euler/030/030.factor
index 250494c0dc2f4953fdc32a0cc528b9ce578c5cac..63693f96d8a38f2119e9cf475f2432a5701083d5 100644 (file)
--- 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

diff --git a/extra/project-euler/031/031-tests.factor b/extra/project-euler/031/031-tests.factor
new file mode 100644 (file)
index 0000000..5e81717
--- /dev/null
+++ 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

diff --git a/extra/project-euler/032/032-tests.factor b/extra/project-euler/032/032-tests.factor
new file mode 100644 (file)
index 0000000..039c31d
--- /dev/null
+++ 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

diff --git a/extra/project-euler/032/032.factor b/extra/project-euler/032/032.factor
index 02c1d44e43c12096a9d5641e22d9e23f571a98d7..07c643659c723c911b74e0b17022869db43cdd14 100755 (executable)
--- a/extra/project-euler/032/032.factor
+++ b/extra/project-euler/032/032.factor
@@ -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

diff --git a/extra/project-euler/033/033-tests.factor b/extra/project-euler/033/033-tests.factor
new file mode 100644 (file)
index 0000000..e57d623
--- /dev/null
+++ 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

diff --git a/extra/project-euler/033/033.factor b/extra/project-euler/033/033.factor
index 8cb0dc45c3bfc44a1aaa301aea8d459e761a5d53..d0c79c220a151e2e2ae0bdb093bb65bc218a2084 100644 (file)
--- 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

diff --git a/extra/project-euler/034/034-tests.factor b/extra/project-euler/034/034-tests.factor
new file mode 100644 (file)
index 0000000..56d2bbb
--- /dev/null
+++ 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

diff --git a/extra/project-euler/034/034.factor b/extra/project-euler/034/034.factor
index 28c4fa5dc783c9b0a4540af2fe327cb021a96381..11b7efa8b55fedae275d5b4fd11ef4458510e07f 100644 (file)
--- 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

diff --git a/extra/project-euler/035/035-tests.factor b/extra/project-euler/035/035-tests.factor
new file mode 100644 (file)
index 0000000..0ede690
--- /dev/null
+++ 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

diff --git a/extra/project-euler/035/035.factor b/extra/project-euler/035/035.factor
index 8e8b654d28f163bdb0caa6246dfb73794bba1ce2..517e5211d20e4d1461b7c145406f5ed4c296159b 100755 (executable)
--- 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

diff --git a/extra/project-euler/036/036-tests.factor b/extra/project-euler/036/036-tests.factor
new file mode 100644 (file)
index 0000000..07c2d76
--- /dev/null
+++ 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

diff --git a/extra/project-euler/036/036.factor b/extra/project-euler/036/036.factor
index fc9df9a8fe8b7490de0718ed702687d12ce7ca4d..02d9372a8bcf5ade185c35d871bb7eae5784fbd1 100644 (file)
--- a/extra/project-euler/036/036.factor
+++ b/extra/project-euler/036/036.factor
@@ -35,6 +35,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

diff --git a/extra/project-euler/037/037-tests.factor b/extra/project-euler/037/037-tests.factor
new file mode 100644 (file)
index 0000000..b661e5b
--- /dev/null
+++ 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

diff --git a/extra/project-euler/037/037.factor b/extra/project-euler/037/037.factor
index a5bc0581e6f38439c3686463c02215b44959eeba..4562c4588f90c7f559455cf85dcb651a3dff62a7 100755 (executable)
--- 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

diff --git a/extra/project-euler/038/038-tests.factor b/extra/project-euler/038/038-tests.factor
new file mode 100644 (file)
index 0000000..0bad869
--- /dev/null
+++ 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

diff --git a/extra/project-euler/038/038.factor b/extra/project-euler/038/038.factor
index 05bab5fc366b9a07a844b77a42317382d3c2819e..2df993b341dda71ca60781fa780be60fe1d90d9c 100755 (executable)
--- a/extra/project-euler/038/038.factor
+++ b/extra/project-euler/038/038.factor
@@ -51,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

diff --git a/extra/project-euler/039/039-tests.factor b/extra/project-euler/039/039-tests.factor
new file mode 100644 (file)
index 0000000..742550a
--- /dev/null
+++ 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

diff --git a/extra/project-euler/039/039.factor b/extra/project-euler/039/039.factor
index d0caa6d0e407961b5454bb5cb2835d045d22bff7..6b5601566762f0e0be2721afef150948594abd44 100755 (executable)
--- 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

diff --git a/extra/project-euler/040/040-tests.factor b/extra/project-euler/040/040-tests.factor
new file mode 100644 (file)
index 0000000..5934e65
--- /dev/null
+++ 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

diff --git a/extra/project-euler/040/040.factor b/extra/project-euler/040/040.factor
index e2df1df2c9ccd08992794cf08ea7044ad979ce8e..6b8a3f267ac59321573886fdb00bc5e0e180ff5d 100755 (executable)
--- 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

diff --git a/extra/project-euler/041/041-tests.factor b/extra/project-euler/041/041-tests.factor
new file mode 100644 (file)
index 0000000..5226860
--- /dev/null
+++ 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

diff --git a/extra/project-euler/041/041.factor b/extra/project-euler/041/041.factor
index 14084cc01d4c71dde1c8c8d8c4a6eeccf4c71893..d6d428a11f5a191c1440d1e70ad90e51771bebca 100644 (file)
--- 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

diff --git a/extra/project-euler/042/042-tests.factor b/extra/project-euler/042/042-tests.factor
new file mode 100644 (file)
index 0000000..ef8f06f
--- /dev/null
+++ 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

diff --git a/extra/project-euler/042/042.factor b/extra/project-euler/042/042.factor
index 009570d92c14d469dcfc6bd426820697976317e9..c8236db1185c2de5332ebd26fcdc91d2005669f1 100644 (file)
--- a/extra/project-euler/042/042.factor
+++ b/extra/project-euler/042/042.factor
@@ -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

diff --git a/extra/project-euler/043/043-tests.factor b/extra/project-euler/043/043-tests.factor
new file mode 100644 (file)
index 0000000..4c96721
--- /dev/null
+++ 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

diff --git a/extra/project-euler/043/043.factor b/extra/project-euler/043/043.factor
index 9eb78e51536327ebfa4c2359af88e81a1caa384c..28dc0b8bd6e1afff6d746b4c958e4473293735b0 100644 (file)
--- a/extra/project-euler/043/043.factor
+++ b/extra/project-euler/043/043.factor
@@ -56,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
@@ -92,6 +92,6 @@ PRIVATE>
     interesting-pandigitals [ 10 digits>integer ] sigma ;
 
 ! [ euler043a ] 100 ave-time
-! 12 ms ave run time - 2.32 SD (100 trials)
+! 10 ms ave run time - 1.37 SD (100 trials)
 
 MAIN: euler043a

diff --git a/extra/project-euler/044/044-tests.factor b/extra/project-euler/044/044-tests.factor
new file mode 100644 (file)
index 0000000..df93dd6
--- /dev/null
+++ 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

diff --git a/extra/project-euler/044/044.factor b/extra/project-euler/044/044.factor
index 0af3a3167ef7c647dda0237d90bee2da62cdbd27..e7b1959023840c568115257eafa17113da454b60 100644 (file)
--- a/extra/project-euler/044/044.factor
+++ b/extra/project-euler/044/044.factor
@@ -40,7 +40,7 @@ PRIVATE>
     [ first2 sum-and-diff? ] filter [ first2 - abs ] map infimum ;
 
 ! [ euler044 ] 10 ave-time
-! 5727 ms ave run time - 1102.38 SD (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
 

diff --git a/extra/project-euler/045/045-tests.factor b/extra/project-euler/045/045-tests.factor
new file mode 100644 (file)
index 0000000..4beb8f8
--- /dev/null
+++ 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

diff --git a/extra/project-euler/045/045.factor b/extra/project-euler/045/045.factor
index d9cf8c99f8c4fd8c4534cf0625daddf138d877cf..ca5cd83f41aba82ca15d84e5c34a3e8fc713f7a5 100644 (file)
--- 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

diff --git a/extra/project-euler/046/046-tests.factor b/extra/project-euler/046/046-tests.factor
new file mode 100644 (file)
index 0000000..ecfff9d
--- /dev/null
+++ 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

diff --git a/extra/project-euler/046/046.factor b/extra/project-euler/046/046.factor
index 1e7630c142fbbf1966c20918e368755dbecde019..7f5ad9e0d845d1f2ae1312bc57d25ad71f52f2d9 100644 (file)
--- 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

diff --git a/extra/project-euler/047/047-tests.factor b/extra/project-euler/047/047-tests.factor
new file mode 100644 (file)
index 0000000..fb3c72f
--- /dev/null
+++ 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

diff --git a/extra/project-euler/047/047.factor b/extra/project-euler/047/047.factor
index 87a13878873c43ed3143224cb85c1bba43498aba..84041babb79a7dd84576a741ed0a140e739f9467 100644 (file)
--- 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?

diff --git a/extra/project-euler/048/048-tests.factor b/extra/project-euler/048/048-tests.factor
new file mode 100644 (file)
index 0000000..172623a
--- /dev/null
+++ 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

diff --git a/extra/project-euler/052/052-tests.factor b/extra/project-euler/052/052-tests.factor
new file mode 100644 (file)
index 0000000..be032c8
--- /dev/null
+++ 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

diff --git a/extra/project-euler/052/052.factor b/extra/project-euler/052/052.factor
index 3f562baa8505ee3572829cfa0bb127c39e38bde1..cfbb718200ae2dd4155538a0bb8e94814d265926 100644 (file)
--- a/extra/project-euler/052/052.factor
+++ b/extra/project-euler/052/052.factor
@@ -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

diff --git a/extra/project-euler/053/053-tests.factor b/extra/project-euler/053/053-tests.factor
new file mode 100644 (file)
index 0000000..6c9ffae
--- /dev/null
+++ 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

diff --git a/extra/project-euler/053/053.factor b/extra/project-euler/053/053.factor
index b2a50e4ac7b71d1937c8310fe4f3d7a6ba19ef3a..d264bca4bff1a8b80a174551976c15aa2de98f52 100644 (file)
--- 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

diff --git a/extra/project-euler/055/055-tests.factor b/extra/project-euler/055/055-tests.factor
new file mode 100644 (file)
index 0000000..ad23695
--- /dev/null
+++ b/extra/project-euler/055/055-tests.factor
@@ -0,0 +1,4 @@
+USING: project-euler.055 tools.test ;
+IN: project-euler.055.tests
+
+[ 249 ] [ euler055 ] unit-test

diff --git a/extra/project-euler/055/055.factor b/extra/project-euler/055/055.factor
index bf1dd43b979acde78f78125aa9ee59d790454cb6..d07d0c8e31dabbcff6cdf2075e4f2b7c7b16aa6a 100644 (file)
--- a/extra/project-euler/055/055.factor
+++ b/extra/project-euler/055/055.factor
@@ -64,6 +64,6 @@ PRIVATE>
     10000 [ lychrel? ] count ;
 
 ! [ euler055 ] 100 ave-time
-! 1370 ms run / 31 ms GC ave time - 100 trials
+! 478 ms ave run time - 30.63 SD (100 trials)
 
 MAIN: euler055

diff --git a/extra/project-euler/056/056-tests.factor b/extra/project-euler/056/056-tests.factor
new file mode 100644 (file)
index 0000000..b1f3751
--- /dev/null
+++ b/extra/project-euler/056/056-tests.factor
@@ -0,0 +1,4 @@
+USING: project-euler.056 tools.test ;
+IN: project-euler.056.tests
+
+[ 972 ] [ euler056 ] unit-test

diff --git a/extra/project-euler/056/056.factor b/extra/project-euler/056/056.factor
index 0efe32b25429dbcb268beb35262a0fc590c2624d..34626b796d8de38d202b2dc184f9f420755917e3 100644 (file)
--- a/extra/project-euler/056/056.factor
+++ b/extra/project-euler/056/056.factor
@@ -26,6 +26,6 @@ IN: project-euler.056
     [ first2 ^ number>digits sum ] map supremum ;
 
 ! [ euler056 ] 100 ave-time
-! 33 ms run / 1 ms GC ave time - 100 trials
+! 22 ms ave run time - 2.13 SD (100 trials)
 
 MAIN: euler056

diff --git a/extra/project-euler/059/059-tests.factor b/extra/project-euler/059/059-tests.factor
new file mode 100644 (file)
index 0000000..231c733
--- /dev/null
+++ b/extra/project-euler/059/059-tests.factor
@@ -0,0 +1,4 @@
+USING: project-euler.059 tools.test ;
+IN: project-euler.059.tests
+
+[ 107359 ] [ euler059 ] unit-test

diff --git a/extra/project-euler/059/059.factor b/extra/project-euler/059/059.factor
index e3ab9762d8b6c2dbdfe73db7dd3eb8cab14e144c..bbeeff1eec8b0b83db2f67a0bf3bb506ce4a1bb4 100644 (file)
--- a/extra/project-euler/059/059.factor
+++ b/extra/project-euler/059/059.factor
@@ -87,6 +87,6 @@ PRIVATE>
     source-059 dup 3 crack-key decrypt sum ;
 
 ! [ euler059 ] 100 ave-time
-! 13 ms run / 0 ms GC ave time - 100 trials
+! 8 ms ave run time - 1.4 SD (100 trials)
 
 MAIN: euler059

diff --git a/extra/project-euler/067/067-tests.factor b/extra/project-euler/067/067-tests.factor
new file mode 100644 (file)
index 0000000..1e8940f
--- /dev/null
+++ b/extra/project-euler/067/067-tests.factor
@@ -0,0 +1,5 @@
+USING: project-euler.067 tools.test ;
+IN: project-euler.067.tests
+
+[ 7273 ] [ euler067 ] unit-test
+[ 7273 ] [ euler067a ] unit-test

diff --git a/extra/project-euler/067/067.factor b/extra/project-euler/067/067.factor
index 3e16996e0424c4cea61404d9349996ce286e5ca2..3f9d67091dad9ceef9066042b5138047ee064f1b 100644 (file)
--- a/extra/project-euler/067/067.factor
+++ b/extra/project-euler/067/067.factor
@@ -47,7 +47,7 @@ PRIVATE>
     source-067 propagate-all first first ;
 
 ! [ euler067 ] 100 ave-time
-! 18 ms run / 0 ms GC time
+! 20 ms ave run time - 2.12 SD (100 trials)
 
 
 ! ALTERNATE SOLUTIONS
@@ -57,6 +57,6 @@ PRIVATE>
     source-067 max-path ;
 
 ! [ euler067a ] 100 ave-time
-! 14 ms run / 0 ms GC ave time - 100 trials
+! 21 ms ave run time - 2.65 SD (100 trials)
 
 MAIN: euler067a

diff --git a/extra/project-euler/075/075-tests.factor b/extra/project-euler/075/075-tests.factor
new file mode 100644 (file)
index 0000000..8c69a99
--- /dev/null
+++ b/extra/project-euler/075/075-tests.factor
@@ -0,0 +1,4 @@
+USING: project-euler.075 tools.test ;
+IN: project-euler.075.tests
+
+[ 214954 ] [ euler075 ] unit-test

diff --git a/extra/project-euler/075/075.factor b/extra/project-euler/075/075.factor
index 76f2a2a26ec8f6762017c55710b668ded5748128..2b5b9311650b530fa22f274ffaf92c267823d0c3 100755 (executable)
--- a/extra/project-euler/075/075.factor
+++ b/extra/project-euler/075/075.factor
@@ -26,7 +26,7 @@ IN: project-euler.075
 
 !     120 cm: (30,40,50), (20,48,52), (24,45,51)
 
-! Given that L is the length of the wire, for how many values of L ≤ 1,000,000
+! Given that L is the length of the wire, for how many values of L ≤ 2,000,000
 ! can exactly one right angle triangle be formed?
 
 
@@ -36,9 +36,9 @@ IN: project-euler.075
 ! Algorithm adapted from http://mathworld.wolfram.com/PythagoreanTriple.html
 ! Identical implementation as problem #39
 
-! Basically, this makes an array of 1000000 zeros, recursively creates
+! Basically, this makes an array of 2000000 zeros, recursively creates
 ! primitive triples using the three transforms and then increments the array at
-! index [a+b+c] by one for each triple's sum AND its multiples under 1000000
+! index [a+b+c] by one for each triple's sum AND its multiples under 2000000
 ! (to account for non-primitive triples). The answer is just the total number
 ! of indexes that are equal to one.
 
@@ -69,10 +69,10 @@ PRIVATE>
 
 : euler075 ( -- answer )
     [
-        1000000 count-perimeters p-count get [ 1 = ] count
+        2000000 count-perimeters p-count get [ 1 = ] count
     ] with-scope ;
 
-! [ euler075 ] 100 ave-time
-! 1873 ms run / 123 ms GC ave time - 100 trials
+! [ euler075 ] 10 ave-time
+! 3341 ms ave run timen - 157.77 SD (10 trials)
 
 MAIN: euler075

diff --git a/extra/project-euler/076/076-tests.factor b/extra/project-euler/076/076-tests.factor
new file mode 100644 (file)
index 0000000..9d435b1
--- /dev/null
+++ b/extra/project-euler/076/076-tests.factor
@@ -0,0 +1,4 @@
+USING: project-euler.076 tools.test ;
+IN: project-euler.076.tests
+
+[ 190569291 ] [ euler076 ] unit-test

diff --git a/extra/project-euler/079/079-tests.factor b/extra/project-euler/079/079-tests.factor
new file mode 100644 (file)
index 0000000..d9f47cf
--- /dev/null
+++ b/extra/project-euler/079/079-tests.factor
@@ -0,0 +1,4 @@
+USING: project-euler.079 tools.test ;
+IN: project-euler.079.tests
+
+[ 73162890 ] [ euler079 ] unit-test

diff --git a/extra/project-euler/079/079.factor b/extra/project-euler/079/079.factor
index 29b76c7ba458b52a28707304fdeb9f7e8525ef8a..ad75c43c42772c2fe8f37bf9d3a40c84792d1b52 100644 (file)
--- a/extra/project-euler/079/079.factor
+++ b/extra/project-euler/079/079.factor
@@ -58,7 +58,7 @@ PRIVATE>
     source-079 >edges topological-sort 10 digits>integer ;
 
 ! [ euler079 ] 100 ave-time
-! 1 ms ave run time - 1.41 SD (100 trials)
+! 1 ms ave run time - 0.46 SD (100 trials)
 
 ! TODO: prune and diff are relatively slow; topological sort could be
 ! cleaned up and generalized much better, but it works for this problem

diff --git a/extra/project-euler/092/092-tests.factor b/extra/project-euler/092/092-tests.factor
new file mode 100644 (file)
index 0000000..0a89e18
--- /dev/null
+++ b/extra/project-euler/092/092-tests.factor
@@ -0,0 +1,4 @@
+USING: project-euler.092 tools.test ;
+IN: project-euler.092.tests
+
+[ 8581146 ] [ euler092 ] unit-test

diff --git a/extra/project-euler/097/097-tests.factor b/extra/project-euler/097/097-tests.factor
new file mode 100644 (file)
index 0000000..3a48403
--- /dev/null
+++ b/extra/project-euler/097/097-tests.factor
@@ -0,0 +1,4 @@
+USING: project-euler.097 tools.test ;
+IN: project-euler.097.tests
+
+[ 8739992577 ] [ euler097 ] unit-test

diff --git a/extra/project-euler/097/097.factor b/extra/project-euler/097/097.factor
index 50e7af563ddadefd5f46c15b7941f3888527df99..6e6547a7e961e563d670ecff987fab769313e5de 100644 (file)
--- a/extra/project-euler/097/097.factor
+++ b/extra/project-euler/097/097.factor
@@ -26,6 +26,6 @@ IN: project-euler.097
      2 7830457 10 10 ^ ^mod 28433 * 10 10 ^ mod 1+ ;
 
 ! [ euler097 ] 100 ave-time
-! 0 ms run / 0 ms GC ave time - 100 trials
+! 0 ms ave run timen - 0.22 SD (100 trials)
 
 MAIN: euler097

diff --git a/extra/project-euler/100/100-tests.factor b/extra/project-euler/100/100-tests.factor
new file mode 100644 (file)
index 0000000..bbe84eb
--- /dev/null
+++ b/extra/project-euler/100/100-tests.factor
@@ -0,0 +1,4 @@
+USING: project-euler.100 tools.test ;
+IN: project-euler.100.tests
+
+[ 756872327473 ] [ euler100 ] unit-test

diff --git a/extra/project-euler/100/100.factor b/extra/project-euler/100/100.factor
index fca1bf8af8b9a490884520682714b746cccdde80..98dbba19fd27bd1b6b08e0c60682ed8613e587ff 100644 (file)
--- a/extra/project-euler/100/100.factor
+++ b/extra/project-euler/100/100.factor
@@ -28,9 +28,9 @@ IN: project-euler.100
     [ dup dup 1- * 2 * 10 24 ^ <= ]
     [ tuck 6 * swap - 2 - ] [ ] while nip ;
 
-! TODO: solution is incredibly slow (>30 minutes) and needs generalization
+! TODO: solution needs generalization
 
-! [ euler100 ] time
-! ? ms run time
+! [ euler100 ] 100 ave-time
+! 0 ms ave run time - 0.14 SD (100 trials)
 
 MAIN: euler100

diff --git a/extra/project-euler/116/116-tests.factor b/extra/project-euler/116/116-tests.factor
new file mode 100644 (file)
index 0000000..fae67f3
--- /dev/null
+++ b/extra/project-euler/116/116-tests.factor
@@ -0,0 +1,4 @@
+USING: project-euler.116 tools.test ;
+IN: project-euler.116.tests
+
+[ 20492570929 ] [ euler116 ] unit-test

diff --git a/extra/project-euler/116/116.factor b/extra/project-euler/116/116.factor
index 0e3633dc9a6f3a79318d6eefaf58c0fd793204cc..742fe9d625b324b3c9f739026041a0ad9f392f0f 100644 (file)
--- a/extra/project-euler/116/116.factor
+++ b/extra/project-euler/116/116.factor
@@ -55,6 +55,6 @@ PRIVATE>
     50 (euler116) ;
 
 ! [ euler116 ] 100 ave-time
-! 0 ms run time - 100 trials
+! 0 ms ave run time - 0.34 SD (100 trials)
 
 MAIN: euler116

diff --git a/extra/project-euler/117/117-tests.factor b/extra/project-euler/117/117-tests.factor
new file mode 100644 (file)
index 0000000..ba677cf
--- /dev/null
+++ b/extra/project-euler/117/117-tests.factor
@@ -0,0 +1,4 @@
+USING: project-euler.117 tools.test ;
+IN: project-euler.117.tests
+
+[ 100808458960497 ] [ euler117 ] unit-test

diff --git a/extra/project-euler/117/117.factor b/extra/project-euler/117/117.factor
index cc5dea8f3703898666a1e2b792b273681d0f811e..7174066227c2a9351b4fe06bdc5c9b08271d031d 100644 (file)
--- a/extra/project-euler/117/117.factor
+++ b/extra/project-euler/117/117.factor
@@ -42,6 +42,6 @@ PRIVATE>
     50 (euler117) ;
 
 ! [ euler117 ] 100 ave-time
-! 0 ms run time - 100 trials
+! 0 ms ave run time - 0.29 SD (100 trials)
 
 MAIN: euler117

diff --git a/extra/project-euler/134/134-tests.factor b/extra/project-euler/134/134-tests.factor
new file mode 100644 (file)
index 0000000..63c25ea
--- /dev/null
+++ b/extra/project-euler/134/134-tests.factor
@@ -0,0 +1,4 @@
+USING: project-euler.134 tools.test ;
+IN: project-euler.134.tests
+
+[ 18613426663617118 ] [ euler134 ] unit-test

diff --git a/extra/project-euler/134/134.factor b/extra/project-euler/134/134.factor
index 4e54a18f197794c4ce1e84f9f145dfc1abaf5fed..7bdf17ef684260c36cc65e0d64f5feac11811aff 100644 (file)
--- a/extra/project-euler/134/134.factor
+++ b/extra/project-euler/134/134.factor
@@ -43,6 +43,6 @@ PRIVATE>
     [ [ s + ] keep ] leach drop ;
 
 ! [ euler134 ] 10 ave-time
-! 2430 ms run / 36 ms GC ave time - 10 trials
+! 933 ms ave run timen - 19.58 SD (10 trials)
 
 MAIN: euler134

diff --git a/extra/project-euler/148/148-tests.factor b/extra/project-euler/148/148-tests.factor
new file mode 100644 (file)
index 0000000..66c8f6c
--- /dev/null
+++ b/extra/project-euler/148/148-tests.factor
@@ -0,0 +1,4 @@
+USING: project-euler.148 tools.test ;
+IN: project-euler.148.tests
+
+[ 2129970655314432 ] [ euler148 ] unit-test

diff --git a/extra/project-euler/148/148.factor b/extra/project-euler/148/148.factor
index 0509936e524069ca82da983fc4c0fccb32e27118..533874fa67819b0f5f8b4013376c52079418b2ee 100644 (file)
--- a/extra/project-euler/148/148.factor
+++ b/extra/project-euler/148/148.factor
@@ -49,6 +49,6 @@ PRIVATE>
     10 9 ^ (euler148) ;
 
 ! [ euler148 ] 100 ave-time
-! 0 ms run time - 100 trials
+! 0 ms ave run time - 0.17 SD (100 trials)
 
 MAIN: euler148

diff --git a/extra/project-euler/150/150-tests.factor b/extra/project-euler/150/150-tests.factor
new file mode 100644 (file)
index 0000000..19fb31b
--- /dev/null
+++ b/extra/project-euler/150/150-tests.factor
@@ -0,0 +1,4 @@
+USING: project-euler.150 tools.test ;
+IN: project-euler.150.tests
+
+[ -271248680 ] [ euler150 ] unit-test

diff --git a/extra/project-euler/150/150.factor b/extra/project-euler/150/150.factor
index c7d878edcb24a3cf5df100769c7a21209629b2cc..1b84b25d37a1b27dedaec1731dd396102b431a2e 100644 (file)
--- a/extra/project-euler/150/150.factor
+++ b/extra/project-euler/150/150.factor
@@ -73,6 +73,6 @@ PRIVATE>
     1000 (euler150) ;
 
 ! [ euler150 ] 10 ave-time
-! 32858 ms run time - 10 trials
+! 30208 ms ave run time - 593.45 SD (10 trials)
 
 MAIN: euler150

diff --git a/extra/project-euler/164/164-tests.factor b/extra/project-euler/164/164-tests.factor
new file mode 100644 (file)
index 0000000..013e8bd
--- /dev/null
+++ b/extra/project-euler/164/164-tests.factor
@@ -0,0 +1,4 @@
+USING: project-euler.164 tools.test ;
+IN: project-euler.164.tests
+
+[ 378158756814587 ] [ euler164 ] unit-test

diff --git a/extra/project-euler/164/164.factor b/extra/project-euler/164/164.factor
index 9d88e49e0e501f72983ad0cb23209231e9f56be8..5bc4fdc74e3026162e52c9f45c9fc1fa9dd77475 100644 (file)
--- a/extra/project-euler/164/164.factor
+++ b/extra/project-euler/164/164.factor
@@ -33,6 +33,6 @@ PRIVATE>
     init-table 19 [ next-table ] times values sum ;
 
 ! [ euler164 ] 100 ave-time
-! 8 ms run time - 100 trials
+! 7 ms ave run time - 1.23 SD (100 trials)
 
 MAIN: euler164

diff --git a/extra/project-euler/169/169-tests.factor b/extra/project-euler/169/169-tests.factor
new file mode 100644 (file)
index 0000000..0722e7f
--- /dev/null
+++ b/extra/project-euler/169/169-tests.factor
@@ -0,0 +1,4 @@
+USING: project-euler.169 tools.test ;
+IN: project-euler.169.tests
+
+[ 178653872807 ] [ euler169 ] unit-test

diff --git a/extra/project-euler/169/169.factor b/extra/project-euler/169/169.factor
index 4387662c90f033f0d63a51a6e682554b865982e6..ef43fc3c340cdc97b5883ac19828f1d4fa61757d 100644 (file)
--- a/extra/project-euler/169/169.factor
+++ b/extra/project-euler/169/169.factor
@@ -20,7 +20,7 @@ USING: combinators kernel math math.functions memoize ;
 ! 2 + 4 + 4
 ! 2 + 8
 
-! What is f(1025)?
+! What is f(10^25)?
 
 
 ! SOLUTION
@@ -37,6 +37,6 @@ MEMO: fn ( n -- x )
     10 25 ^ fn ;
 
 ! [ euler169 ] 100 ave-time
-! 0 ms run / 0 ms GC ave time - 100 trials
+! 0 ms ave run time - 0.2 SD (100 trials)
 
 MAIN: euler169

diff --git a/extra/project-euler/173/173-tests.factor b/extra/project-euler/173/173-tests.factor
new file mode 100644 (file)
index 0000000..9417ba8
--- /dev/null
+++ b/extra/project-euler/173/173-tests.factor
@@ -0,0 +1,4 @@
+USING: project-euler.173 tools.test ;
+IN: project-euler.173.tests
+
+[ 1572729 ] [ euler173 ] unit-test

diff --git a/extra/project-euler/173/173.factor b/extra/project-euler/173/173.factor
index 9f2984d37df9e7ea16bf481a428ba6c1a5763839..757dfb017a223b339586fb3153a19e50f15ca9a8 100644 (file)
--- a/extra/project-euler/173/173.factor
+++ b/extra/project-euler/173/173.factor
@@ -33,6 +33,6 @@ PRIVATE>
     1000000 laminae ;
 
 ! [ euler173 ] 100 ave-time
-! 0 ms run / 0 ms GC ave time - 100 trials
+! 0 ms ave run time - 0.35 SD (100 trials)
 
 MAIN: euler173

diff --git a/extra/project-euler/175/175-tests.factor b/extra/project-euler/175/175-tests.factor
new file mode 100644 (file)
index 0000000..541aa7d
--- /dev/null
+++ b/extra/project-euler/175/175-tests.factor
@@ -0,0 +1,4 @@
+USING: project-euler.175 tools.test ;
+IN: project-euler.175.tests
+
+[ "1,13717420,8" ] [ euler175 ] unit-test

diff --git a/extra/project-euler/175/175.factor b/extra/project-euler/175/175.factor
index 853bf9a10f1b7c28841ee68da0ea9579cd52b3cb..9aebcf565cc44ab575187cf45726fb69b4bc0129 100644 (file)
--- a/extra/project-euler/175/175.factor
+++ b/extra/project-euler/175/175.factor
@@ -53,6 +53,6 @@ PRIVATE>
     V{ 1 } clone dup 123456789/987654321 compute [ number>string ] map "," join ;
 
 ! [ euler175 ] 100 ave-time
-! 0 ms run / 0 ms GC ave time - 100 trials
+! 0 ms ave run time - 0.31 SD (100 trials)
 
 MAIN: euler175

diff --git a/extra/project-euler/186/186-tests.factor b/extra/project-euler/186/186-tests.factor
new file mode 100644 (file)
index 0000000..71d2f1c
--- /dev/null
+++ b/extra/project-euler/186/186-tests.factor
@@ -0,0 +1,4 @@
+USING: project-euler.186 tools.test ;
+IN: project-euler.186.tests
+
+[ 2325629 ] [ euler186 ] unit-test

diff --git a/extra/project-euler/186/186.factor b/extra/project-euler/186/186.factor
index b86f3675a198dae3553c06d83dee6117a9fa30b7..679748b3c2fb694e61c38ae9bec8b13680205a42 100644 (file)
--- a/extra/project-euler/186/186.factor
+++ b/extra/project-euler/186/186.factor
@@ -51,11 +51,10 @@ IN: project-euler.186
     [ first ] [ advance ] bi ;
 
 : 2unless? ( x y ?quot quot -- )
-    >r 2keep rot [ 2drop ] r> if ; inline
+    [ 2keep rot [ 2drop ] ] dip if ; inline
 
 : (p186) ( generator counter unionfind -- counter )
-    524287 over equiv-set-size 990000 <
-    [
+    524287 over equiv-set-size 990000 < [
         pick [ next ] [ next ] bi
         [ = ] [
             pick equate

diff --git a/extra/project-euler/190/190-tests.factor b/extra/project-euler/190/190-tests.factor
new file mode 100644 (file)
index 0000000..edcfa98
--- /dev/null
+++ b/extra/project-euler/190/190-tests.factor
@@ -0,0 +1,4 @@
+USING: project-euler.190 tools.test ;
+IN: project-euler.190.tests
+
+[ 371048281 ] [ euler190 ] unit-test

diff --git a/extra/project-euler/190/190.factor b/extra/project-euler/190/190.factor
index c0b7cb577fbf563796987b5dd82f2a11f6795a23..84ab74bb031177a7c0dddd9c3006518cb40718ec 100644 (file)
--- a/extra/project-euler/190/190.factor
+++ b/extra/project-euler/190/190.factor
@@ -49,6 +49,6 @@ PRIVATE>
     2 15 [a,b] [ P_m truncate ] sigma ;
 
 ! [ euler150 ] 100 ave-time
-! 7 ms run time - 100 trials
+! 5 ms ave run time - 1.01 SD (100 trials)
 
 MAIN: euler190