remove some uses of conjoin.

diff --git a/extra/project-euler/023/023.factor b/extra/project-euler/023/023.factor
index 79aeccd8b44dacd443c580ec15586883938d04d7..1f45c5d88fcb41924042c5357103a15443b22e6f 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: fry kernel math math.ranges project-euler.common
+sequences sets ;
 IN: project-euler.023
 
 ! http://projecteuler.net/index.php?section=problems&id=23
@@ -42,9 +43,9 @@ IN: project-euler.023
     [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>
 

diff --git a/extra/project-euler/051/051.factor b/extra/project-euler/051/051.factor
index 40d53109cb9f096e349e17dbe738fa1919011742..7ade2177896aa49776d3d5f0587493d8b57f57d8 100644 (file)
--- a/extra/project-euler/051/051.factor
+++ b/extra/project-euler/051/051.factor
@@ -26,16 +26,16 @@
 
 ! 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 ;
+USING: assocs fry kernel math math.combinatorics math.functions
+math.order math.parser math.primes math.ranges namespaces
+project-euler.common sequences sets ;
 IN: project-euler.051
 <PRIVATE
 SYMBOL: family-count
 SYMBOL: large-families
 : reset-globals ( -- )
     H{ } clone family-count namespaces:set
-    H{ } clone large-families namespaces:set ;
+    HS{ } clone large-families namespaces:set ;
 
 : digits-positions ( str -- positions )
     H{ } clone [ '[ swap _ push-at ] each-index ] keep ;
@@ -52,7 +52,7 @@ SYMBOL: large-families
     [ 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 -- )
@@ -65,17 +65,19 @@ SYMBOL: large-families
     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 )

diff --git a/extra/project-euler/074/074.factor b/extra/project-euler/074/074.factor
index 9962847b758a9f6e54643fd0e4ad10ef7fdb4f8d..df062631cf1196a4f30c798918cc7f815bd126bb 100644 (file)
--- a/extra/project-euler/074/074.factor
+++ b/extra/project-euler/074/074.factor
@@ -1,7 +1,7 @@
 ! Copyright (c) 2009 Guillaume Nargeot.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: assocs hashtables kernel math math.ranges
-project-euler.common sequences sets ;
+USING: hash-sets kernel math.ranges project-euler.common
+sequences sets ;
 IN: project-euler.074
 
 ! http://projecteuler.net/index.php?section=problems&id=074
@@ -51,10 +51,9 @@ IN: project-euler.074
     number>digits [ digit-factorial ] map-sum ;
 
 : chain-length ( n -- n )
-    61 <hashtable>
-    [ 2dup key? not ]
-    [ [ conjoin ] [ [ digits-factorial-sum ] dip ] 2bi ]
-    while nip assoc-size ;
+    61 <hash-set> [ 2dup ?adjoin ] [
+        [ digits-factorial-sum ] dip
+    ] while nip cardinality ;
 
 PRIVATE>
 

diff --git a/extra/trees/splay/splay-tests.factor b/extra/trees/splay/splay-tests.factor
index b108f23824dc9ab6a253888f2ccb144b7a6c4fb7..40083da4656803b1c69d84c678f05b25c54e7572 100644 (file)
--- a/extra/trees/splay/splay-tests.factor
+++ b/extra/trees/splay/splay-tests.factor
@@ -1,6 +1,6 @@
 ! Copyright (c) 2005 Mackenzie Straight.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: assocs grouping kernel math random sequences sets
+USING: assocs fry grouping kernel math random sequences sets
 tools.test trees.splay ;
 IN: trees.splay.tests
 
@@ -8,7 +8,7 @@ IN: trees.splay.tests
     100 iota [ drop 100 random of drop ] with each ;
 
 : make-numeric-splay-tree ( n -- splay-tree )
-    iota <splay> [ [ conjoin ] curry each ] keep ;
+    iota <splay> [ '[ dup _ set-at ] each ] keep ;
 
 { t } [
     100 make-numeric-splay-tree dup randomize-numeric-splay-tree