project-euler.186: merge next/advance.

diff --git a/extra/project-euler/186/186-tests.factor b/extra/project-euler/186/186-tests.factor
index a7dab4e43566b4d898a5c844b7df9f6704b53917..aa1d8093568625302cb10034ab888f09040c8ab8 100644 (file)
--- a/extra/project-euler/186/186-tests.factor
+++ b/extra/project-euler/186/186-tests.factor
@@ -1,3 +1,3 @@
 USING: project-euler.186 tools.test ;
 
-[ 2325629 ] [ euler186 ] unit-test
+{ 2325629 } [ euler186 ] unit-test

diff --git a/extra/project-euler/186/186.factor b/extra/project-euler/186/186.factor
index b9812381671ef279b3e877a5f0dce9530eb9823b..0a6179acee605c7b8d9cfe13c9af78306c6c2352 100644 (file)
--- a/extra/project-euler/186/186.factor
+++ b/extra/project-euler/186/186.factor
@@ -44,11 +44,8 @@ IN: project-euler.186
 : <generator> ( -- lag )
     55 [1,b] [ (generator) ] map <circular> ;
 
-: advance ( lag -- )
-    [ [ 0 swap nth ] [ 31 swap nth ] bi + 1000000 rem ] keep circular-push ;
-
 : next ( lag -- n )
-    [ first ] [ advance ] bi ;
+    [ [ first dup ] [ 31 swap nth ] bi + 1000000 rem ] keep circular-push ;
 
 : 2unless? ( x y ?quot quot -- )
     [ 2keep rot [ 2drop ] ] dip if ; inline