From 7361ee58a8bfc5b99dd79a86dcfd9df5caa455f0 Mon Sep 17 00:00:00 2001 From: Aaron Schaefer Date: Mon, 11 Feb 2008 15:14:56 -0500 Subject: [PATCH] Fix Project Euler solutions using combinators.lib stuff that moved --- extra/project-euler/017/017.factor | 4 ++-- extra/project-euler/019/019.factor | 6 +++--- extra/project-euler/021/021.factor | 2 +- extra/project-euler/028/028.factor | 2 +- extra/project-euler/030/030.factor | 2 +- extra/project-euler/034/034.factor | 2 +- extra/project-euler/035/035.factor | 4 ++-- extra/project-euler/042/042.factor | 4 ++-- extra/project-euler/043/043.factor | 2 +- extra/project-euler/048/048.factor | 2 +- extra/project-euler/053/053.factor | 2 +- extra/project-euler/055/055.factor | 2 +- extra/project-euler/075/075.factor | 2 +- extra/project-euler/common/common.factor | 6 +++--- 14 files changed, 21 insertions(+), 21 deletions(-) diff --git a/extra/project-euler/017/017.factor b/extra/project-euler/017/017.factor index f87e9937fe..ffff10d4fe 100644 --- a/extra/project-euler/017/017.factor +++ b/extra/project-euler/017/017.factor @@ -1,7 +1,7 @@ ! Copyright (c) 2007 Aaron Schaefer. ! See http://factorcode.org/license.txt for BSD license. -USING: combinators.lib kernel math.ranges math.text.english sequences strings - ascii ; +USING: kernel math.ranges math.text.english sequences sequences.lib strings + ascii ; IN: project-euler.017 ! http://projecteuler.net/index.php?section=problems&id=17 diff --git a/extra/project-euler/019/019.factor b/extra/project-euler/019/019.factor index 58a2dc9668..fd3ca02135 100644 --- a/extra/project-euler/019/019.factor +++ b/extra/project-euler/019/019.factor @@ -1,7 +1,7 @@ ! Copyright (c) 2007 Samuel Tardieu, Aaron Schaefer. ! See http://factorcode.org/license.txt for BSD license. -USING: calendar combinators combinators.lib kernel math math.ranges namespaces - sequences ; +USING: calendar combinators kernel math math.ranges namespaces sequences + sequences.lib ; IN: project-euler.019 ! http://projecteuler.net/index.php?section=problems&id=19 @@ -32,7 +32,7 @@ IN: project-euler.019 : euler019 ( -- answer ) 1901 2000 [a,b] [ - 12 [1,b] [ 1 zeller-congruence ] 1 map-withn + 12 [1,b] [ 1 zeller-congruence ] map-with ] map concat [ zero? ] count ; ! [ euler019 ] 100 ave-time diff --git a/extra/project-euler/021/021.factor b/extra/project-euler/021/021.factor index c3859665e7..d8f81717af 100644 --- a/extra/project-euler/021/021.factor +++ b/extra/project-euler/021/021.factor @@ -1,7 +1,7 @@ ! Copyright (c) 2007 Aaron Schaefer. ! See http://factorcode.org/license.txt for BSD license. USING: combinators.lib kernel math math.functions math.ranges namespaces - project-euler.common sequences ; + project-euler.common sequences sequences.lib ; IN: project-euler.021 ! http://projecteuler.net/index.php?section=problems&id=21 diff --git a/extra/project-euler/028/028.factor b/extra/project-euler/028/028.factor index c8ac19ef82..3ef65481ed 100644 --- a/extra/project-euler/028/028.factor +++ b/extra/project-euler/028/028.factor @@ -1,6 +1,6 @@ ! Copyright (c) 2008 Aaron Schaefer. ! See http://factorcode.org/license.txt for BSD license. -USING: combinators.lib kernel math math.ranges ; +USING: kernel math math.ranges sequences.lib ; IN: project-euler.028 ! http://projecteuler.net/index.php?section=problems&id=28 diff --git a/extra/project-euler/030/030.factor b/extra/project-euler/030/030.factor index 22d05524b2..10fb4054f0 100644 --- a/extra/project-euler/030/030.factor +++ b/extra/project-euler/030/030.factor @@ -1,6 +1,6 @@ ! Copyright (c) 2008 Aaron Schaefer. ! See http://factorcode.org/license.txt for BSD license. -USING: combinators.lib kernel math math.functions project-euler.common sequences ; +USING: kernel math math.functions project-euler.common sequences sequences.lib ; IN: project-euler.030 ! http://projecteuler.net/index.php?section=problems&id=30 diff --git a/extra/project-euler/034/034.factor b/extra/project-euler/034/034.factor index 83cffeb248..c15d722266 100644 --- a/extra/project-euler/034/034.factor +++ b/extra/project-euler/034/034.factor @@ -1,6 +1,6 @@ ! Copyright (c) 2008 Aaron Schaefer. ! See http://factorcode.org/license.txt for BSD license. -USING: combinators.lib kernel math.ranges project-euler.common sequences ; +USING: kernel math.ranges project-euler.common sequences sequences.lib ; IN: project-euler.034 ! http://projecteuler.net/index.php?section=problems&id=34 diff --git a/extra/project-euler/035/035.factor b/extra/project-euler/035/035.factor index 29172111c1..d8d38d1647 100755 --- a/extra/project-euler/035/035.factor +++ b/extra/project-euler/035/035.factor @@ -1,7 +1,7 @@ ! Copyright (c) 2008 Aaron Schaefer. ! See http://factorcode.org/license.txt for BSD license. -USING: combinators.lib kernel math math.combinatorics math.parser math.primes - project-euler.common sequences ; +USING: kernel math math.combinatorics math.parser math.primes + project-euler.common sequences sequences.lib ; IN: project-euler.035 ! http://projecteuler.net/index.php?section=problems&id=35 diff --git a/extra/project-euler/042/042.factor b/extra/project-euler/042/042.factor index 95b3062e95..c66be27df7 100644 --- a/extra/project-euler/042/042.factor +++ b/extra/project-euler/042/042.factor @@ -1,7 +1,7 @@ ! Copyright (c) 2008 Aaron Schaefer. ! See http://factorcode.org/license.txt for BSD license. -USING: ascii combinators.lib io.files kernel math math.functions namespaces - project-euler.common sequences splitting ; +USING: ascii io.files kernel math math.functions namespaces + project-euler.common sequences sequences.lib splitting ; IN: project-euler.042 ! http://projecteuler.net/index.php?section=problems&id=42 diff --git a/extra/project-euler/043/043.factor b/extra/project-euler/043/043.factor index 54d75c6980..ffe3a4bca1 100644 --- a/extra/project-euler/043/043.factor +++ b/extra/project-euler/043/043.factor @@ -1,7 +1,7 @@ ! Copyright (c) 2008 Aaron Schaefer. ! See http://factorcode.org/license.txt for BSD license. USING: combinators.lib hashtables kernel math math.combinatorics math.parser - math.ranges project-euler.common sequences sorting ; + math.ranges project-euler.common sequences sequences.lib sorting ; IN: project-euler.043 ! http://projecteuler.net/index.php?section=problems&id=43 diff --git a/extra/project-euler/048/048.factor b/extra/project-euler/048/048.factor index ba58792987..011511c560 100644 --- a/extra/project-euler/048/048.factor +++ b/extra/project-euler/048/048.factor @@ -1,6 +1,6 @@ ! Copyright (c) 2008 Aaron Schaefer. ! See http://factorcode.org/license.txt for BSD license. -USING: combinators.lib kernel math math.functions ; +USING: kernel math math.functions sequences.lib ; IN: project-euler.048 ! http://projecteuler.net/index.php?section=problems&id=48 diff --git a/extra/project-euler/053/053.factor b/extra/project-euler/053/053.factor index 9d1692556e..ae47440415 100644 --- a/extra/project-euler/053/053.factor +++ b/extra/project-euler/053/053.factor @@ -1,6 +1,6 @@ ! Copyright (c) 2008 Aaron Schaefer. ! See http://factorcode.org/license.txt for BSD license. -USING: combinators.lib kernel math math.combinatorics math.ranges ; +USING: kernel math math.combinatorics math.ranges sequences.lib ; IN: project-euler.053 ! http://projecteuler.net/index.php?section=problems&id=53 diff --git a/extra/project-euler/055/055.factor b/extra/project-euler/055/055.factor index eb6ad82e0e..289f3a002a 100644 --- a/extra/project-euler/055/055.factor +++ b/extra/project-euler/055/055.factor @@ -1,6 +1,6 @@ ! Copyright (c) 2008 Aaron Schaefer. ! See http://factorcode.org/license.txt for BSD license. -USING: combinators.lib kernel math math.parser project-euler.common sequences ; +USING: kernel math math.parser project-euler.common sequences sequences.lib ; IN: project-euler.055 ! http://projecteuler.net/index.php?section=problems&id=55 diff --git a/extra/project-euler/075/075.factor b/extra/project-euler/075/075.factor index 141a737305..d9113ac67f 100644 --- a/extra/project-euler/075/075.factor +++ b/extra/project-euler/075/075.factor @@ -1,7 +1,7 @@ ! Copyright (c) 2008 Aaron Schaefer. ! See http://factorcode.org/license.txt for BSD license. USING: arrays combinators.cleave combinators.lib kernel math math.ranges - namespaces project-euler.common sequences ; + namespaces project-euler.common sequences sequences.lib ; IN: project-euler.075 ! http://projecteuler.net/index.php?section=problems&id=75 diff --git a/extra/project-euler/common/common.factor b/extra/project-euler/common/common.factor index d1d0c470b9..087b216b3a 100644 --- a/extra/project-euler/common/common.factor +++ b/extra/project-euler/common/common.factor @@ -1,6 +1,6 @@ -USING: arrays combinators.lib kernel math math.functions math.miller-rabin - math.matrices math.parser math.primes.factors math.ranges namespaces - sequences sorting unicode.case ; +USING: arrays kernel math math.functions math.miller-rabin math.matrices + math.parser math.primes.factors math.ranges namespaces sequences + sequences.lib sorting unicode.case ; IN: project-euler.common ! A collection of words used by more than one Project Euler solution