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

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

diff --git a/extra/project-euler/150/150.factor b/extra/project-euler/150/150.factor
index e013e165751fc7128e4ee3b71b2833052bbef935..a54b7d1db0faa147fd98c6b2a82ba21efaa163b8 100644 (file)
--- a/extra/project-euler/150/150.factor
+++ b/extra/project-euler/150/150.factor
@@ -1,6 +1,7 @@
 ! Copyright (c) 2008 Eric Mertens.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: hints kernel locals math math.order sequences sequences.private project-euler.common ;
+USING: hints kernel locals math math.order math.ranges project-euler.common
+    sequences sequences.private ;
 IN: project-euler.150
 
 ! http://projecteuler.net/index.php?section=problems&id=150
@@ -50,15 +51,15 @@ IN: project-euler.150
     615949 * 797807 + 20 2^ rem dup 19 2^ - ; inline
 
 : sums-triangle ( -- seq )
-    0 1000 [ 1+ [ next ] replicate partial-sums ] map nip ;
+    0 1000 [1,b] [ [ next ] replicate partial-sums ] map nip ;
 
 :: (euler150) ( m -- n )
     [let | table [ sums-triangle ] |
         m [| x |
-            x 1+ [| y |
-                m x - [| z |
+            x 1 + [| y |
+                m x - [0,b) [| z |
                     x z + table nth-unsafe
-                    [ y z + 1+ swap nth-unsafe ]
+                    [ y z + 1 + swap nth-unsafe ]
                     [ y        swap nth-unsafe ] bi -
                 ] map partial-sum-infimum
             ] map-infimum