factor: trim using lists

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

diff --git a/extra/project-euler/067/067.factor b/extra/project-euler/067/067.factor
index f206f59472ad1fe76994622ee0a4c8e227c2315a..b4fb69a9f0efa9da511718763ef5adaed5b65150 100644 (file)
--- a/extra/project-euler/067/067.factor
+++ b/extra/project-euler/067/067.factor
@@ -1,6 +1,7 @@
 ! Copyright (c) 2007 Samuel Tardieu, Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: io.files math.parser namespaces project-euler.common sequences splitting ;
+USING: io.files math.parser project-euler.common
+io.encodings.ascii sequences splitting ;
 IN: project-euler.067
 
 ! http://projecteuler.net/index.php?section=problems&id=67
@@ -37,8 +38,8 @@ IN: project-euler.067
 <PRIVATE
 
 : source-067 ( -- seq )
-    "extra/project-euler/067/triangle.txt" resource-path
-    file-lines [ " " split [ string>number ] map ] map ;
+    "resource:extra/project-euler/067/triangle.txt"
+    ascii file-lines [ split-words [ string>number ] map ] map ;
 
 PRIVATE>
 
@@ -46,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
@@ -56,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
+SOLUTION: euler067a