factor: trim using lists

[factor.git] / extra / project-euler / 190 / 190.factor

diff --git a/extra/project-euler/190/190.factor b/extra/project-euler/190/190.factor
index 35b93443622ce14869aad9228974bfd468de4f2b..69f9a024b808a6d450cc5274dd82d823b0d6d991 100644 (file)
--- a/extra/project-euler/190/190.factor
+++ b/extra/project-euler/190/190.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2008 Eric Mertens.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel sequences sequences.lib math math.functions math.ranges locals ;
+USING: kernel sequences math math.functions ranges project-euler.common ;
 IN: project-euler.190
 
 ! http://projecteuler.net/index.php?section=problems&id=190
@@ -43,12 +43,12 @@ IN: project-euler.190
 PRIVATE>
 
 :: P_m ( m -- P_m )
-    m [1,b] [| i | 2 i * m 1+ / i ^ ] PI ;
+    m [1..b] [| i | 2 i * m 1 + / i ^ ] PI ;
 
 : euler190 ( -- answer )
-    2 15 [a,b] [ P_m truncate ] sigma ;
+    2 15 [a..b] [ P_m truncate ] map-sum ;
 
 ! [ euler150 ] 100 ave-time
-! 7 ms run time - 100 trials
+! 5 ms ave run time - 1.01 SD (100 trials)
 
-MAIN: euler190
+SOLUTION: euler190