Delete empty unit tests files, remove 1- and 1+, reorder IN: lines in a lot of places...

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

diff --git a/extra/project-euler/047/047.factor b/extra/project-euler/047/047.factor
index e251045cd4d324970f692564e36237ba4cd031e4..e7b585bf0d5b030edf1216c6c9fd49fc66178e5c 100644 (file)
--- a/extra/project-euler/047/047.factor
+++ b/extra/project-euler/047/047.factor
@@ -36,8 +36,8 @@ IN: project-euler.047
         swap - nip
     ] [
         dup prime? [ [ drop 0 ] 2dip ] [
-            2dup unique-factors length = [ [ 1+ ] 2dip ] [ [ drop 0 ] 2dip ] if
-        ] if 1+ (consecutive)
+            2dup unique-factors length = [ [ 1 + ] 2dip ] [ [ drop 0 ] 2dip ] if
+        ] if 1 + (consecutive)
     ] if ;
 
 : consecutive ( goal test -- n )
@@ -69,10 +69,10 @@ SYMBOL: sieve
     sieve get nth 0 = ;
 
 : multiples ( n -- seq )
-    sieve get length 1- over <range> ;
+    sieve get length 1 - over <range> ;
 
 : increment-counts ( n -- )
-     multiples [ sieve get [ 1+ ] change-nth ] each ;
+     multiples [ sieve get [ 1 + ] change-nth ] each ;
 
 : prime-tau-upto ( limit -- seq )
     dup initialize-sieve 2 swap [a,b) [