From 3023f42aa453f78eeec407830e52a6007ba5ecd3 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Wed, 14 Feb 2018 19:38:37 -0800 Subject: [PATCH] project-euler.186: merge next/advance. --- extra/project-euler/186/186-tests.factor | 2 +- extra/project-euler/186/186.factor | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/extra/project-euler/186/186-tests.factor b/extra/project-euler/186/186-tests.factor index a7dab4e435..aa1d809356 100644 --- 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 b981238167..0a6179acee 100644 --- a/extra/project-euler/186/186.factor +++ b/extra/project-euler/186/186.factor @@ -44,11 +44,8 @@ IN: project-euler.186 : ( -- lag ) 55 [1,b] [ (generator) ] map ; -: 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