factor: trim using lists

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

diff --git a/extra/project-euler/035/035.factor b/extra/project-euler/035/035.factor
index 7d98de62b1bb26a7825e75ff71a91d79cae19f29..30a4f6d09b5a6acf006792eaa4504623f4f6ea84 100644 (file)
--- a/extra/project-euler/035/035.factor
+++ b/extra/project-euler/035/035.factor
@@ -1,7 +1,6 @@
 ! Copyright (c) 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math math.combinatorics math.parser math.primes
-    project-euler.common sequences sets ;
+USING: kernel math math.primes project-euler.common sequences ;
 IN: project-euler.035
 
 ! http://projecteuler.net/index.php?section=problems&id=35
@@ -28,7 +27,7 @@ IN: project-euler.035
 
 : possible? ( seq -- ? )
     dup length 1 > [
-        dup { 0 2 4 5 6 8 } diff =
+        [ even? ] none?
     ] [
         drop t
     ] if ;
@@ -38,7 +37,7 @@ IN: project-euler.035
 
 : (circular?) ( seq n -- ? )
     dup 0 > [
-        2dup rotate 10 digits>integer
+        2dup rotate digits>number
         prime? [ 1 - (circular?) ] [ 2drop f ] if
     ] [
         2drop t