factor: trim using lists

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

diff --git a/extra/project-euler/023/023.factor b/extra/project-euler/023/023.factor
index 79aeccd8b44dacd443c580ec15586883938d04d7..7d8961ec6d8adbdd959602d1b3b0d41d9165d253 100644 (file)
--- a/extra/project-euler/023/023.factor
+++ b/extra/project-euler/023/023.factor
@@ -1,6 +1,7 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math math.ranges project-euler.common sequences sets sorting assocs fry ;
+USING: kernel math ranges project-euler.common
+sequences sets ;
 IN: project-euler.023
 
 ! http://projecteuler.net/index.php?section=problems&id=23
@@ -36,15 +37,15 @@ IN: project-euler.023
 <PRIVATE
 
 : source-023 ( -- seq )
-    46 [1,b] 47 20161 2 <range> append ;
+    46 [1..b] 47 20161 2 <range> append ;
 
 : abundants-upto ( n -- seq )
-    [1,b] [ abundant? ] filter ;
+    [1..b] [ abundant? ] filter ;
 
 : possible-sums ( seq -- seq )
-    H{ } clone
-    [ dupd '[ _ [ + _ conjoin ] with each ] each ]
-    keep keys ;
+    HS{ } clone
+    [ dupd '[ _ [ + _ adjoin ] with each ] each ]
+    keep members ;
 
 PRIVATE>