factor: trim using lists

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

diff --git a/extra/project-euler/203/203.factor b/extra/project-euler/203/203.factor
index 806098b865ebea4754e88b3c9be2226377870306..a3e011fee0ee4b634833a627b4ca84a876aa5032 100644 (file)
--- a/extra/project-euler/203/203.factor
+++ b/extra/project-euler/203/203.factor
@@ -1,6 +1,7 @@
 ! Copyright (c) 2008 Eric Mertens.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: fry kernel math math.primes.factors sequences sets project-euler.common ;
+USING: kernel math math.primes.factors math.vectors sequences sets
+project-euler.common ;
 IN: project-euler.203
 
 ! http://projecteuler.net/index.php?section=problems&id=203
@@ -42,10 +43,10 @@ IN: project-euler.203
     swapd '[ @ dup ] replicate nip ; inline
 
 : (generate) ( seq -- seq )
-    [ 0 prefix ] [ 0 suffix ] bi [ + ] 2map ;
+    [ 0 prefix ] [ 0 suffix ] bi v+ ;
 
 : generate ( n -- seq )
-    1 - { 1 } [ (generate) ] iterate concat prune ;
+    1 - { 1 } [ (generate) ] iterate union-all ;
 
 : squarefree ( n -- ? )
     factors all-unique? ;