factor: trim using lists

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

diff --git a/extra/project-euler/051/051.factor b/extra/project-euler/051/051.factor
index ff45e9e58a031552dc6650b3add204d1b957272e..73b6325b2cb56df1a9339f58b965cb7643d601d8 100644 (file)
--- a/extra/project-euler/051/051.factor
+++ b/extra/project-euler/051/051.factor
@@ -16,7 +16,7 @@
 ! 56003, 56113, 56333, 56443, 56663, 56773, and 56993.
 ! Consequently 56003, being the first member of this family,
 ! is the smallest prime with this property.
-! 
+!
 ! Find the smallest prime which, by replacing part of the number
 ! (not necessarily adjacent digits) with the same digit,
 ! is part of an eight prime value family.
@@ -27,17 +27,17 @@
 ! for each prime number, count the families it belongs to. When one reaches count of 8, stop, and get the smallest number by replacing * with ones.
 
 USING: assocs kernel math math.combinatorics math.functions
-math.parser math.primes namespaces project-euler.common
-sequences sets strings grouping math.ranges arrays fry math.order ;
+math.order math.parser math.primes ranges namespaces
+project-euler.common sequences sets ;
 IN: project-euler.051
 <PRIVATE
 SYMBOL: family-count
 SYMBOL: large-families
-: reset-globals ( -- ) 
-    H{ } clone family-count set
-    H{ } clone large-families set ;
+: reset-globals ( -- )
+    H{ } clone family-count namespaces:set
+    HS{ } clone large-families namespaces:set ;
 
-: digits-positions ( str -- positions ) 
+: digits-positions ( str -- positions )
     H{ } clone [ '[ swap _ push-at ] each-index ] keep ;
 
 : *-if-index ( char combination index -- char )
@@ -45,14 +45,14 @@ SYMBOL: large-families
 : replace-positions-with-* ( str positions -- str )
     [ *-if-index ] curry map-index ;
 : all-positions-combinations ( seq -- combinations )
-    dup length [1,b] [ all-combinations ] with map concat ;
+    dup length [1..b] [ all-combinations ] with map concat ;
 
 : families ( stra -- seq )
-    dup digits-positions values 
+    dup digits-positions values
     [ all-positions-combinations [ replace-positions-with-* ] with map ] with map concat ;
 
 : save-family ( family -- )
-    dup family-count get at 8 = [ large-families get conjoin ] [ drop ] if ;
+    dup family-count get at 8 = [ large-families get adjoin ] [ drop ] if ;
 : increment-family ( family -- )
    family-count get inc-at ;
 : handle-family ( family -- )
@@ -60,22 +60,24 @@ SYMBOL: large-families
 
 ! Test all primes that have length n
 : n-digits-primes ( n -- primes )
-    [ 1 - 10^ ] [ 10^ ] bi primes-between ; 
+    [ 1 - 10^ ] [ 10^ ] bi primes-between ;
 : test-n-digits-primes ( n -- seq )
-    reset-globals 
-    n-digits-primes 
+    reset-globals
+    n-digits-primes
     [ number>string families [ handle-family ] each ] each
-    large-families get ;
+    large-families get members ;
 
 : fill-*-with-ones ( str -- str )
     [ dup CHAR: * = [ drop CHAR: 1 ] when ] map ;
 
 ! recursively test all primes by length until we find an answer
 : (euler051) ( i -- answer )
-    dup test-n-digits-primes 
-    dup assoc-size 0 > 
-    [ nip values [ fill-*-with-ones string>number ] [ min ] map-reduce ]
-    [ drop 1 + (euler051) ] if ;
+    dup test-n-digits-primes [
+        1 + (euler051)
+    ] [
+        nip [ fill-*-with-ones string>number ] [ min ] map-reduce
+    ] if-empty ;
+
 PRIVATE>
 
 : euler051 ( -- answer )