steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move ratio mediant word to project-euler.common

db4
Aaron Schaefer 2008-11-10 12:51:43 -05:00
parent 9be9538230
commit db7cbed3a5
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extra/project-euler/071/071.factor
View File

@ -1,6 +1,6 @@
! Copyright (c) 2008 Aaron Schaefer. ! Copyright (c) 2008 Aaron Schaefer.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: kernel math math.ratios sequences ; USING: kernel math project-euler.common sequences ;
IN: project-euler.071 IN: project-euler.071
! http://projecteuler.net/index.php?section=problems&id=71 ! http://projecteuler.net/index.php?section=problems&id=71
@ -37,9 +37,6 @@ IN: project-euler.071
: penultimate ( seq -- elt ) : penultimate ( seq -- elt )
dup length 2 - swap nth ; dup length 2 - swap nth ;
: mediant ( a/c b/d -- [a+b]/[c+d] )
[ >fraction ] bi@ swapd [ + ] 2bi@ / ;
PRIVATE> PRIVATE>
: euler071 ( -- answer ) : euler071 ( -- answer )

8
extra/project-euler/common/common.factor
View File

@ -1,8 +1,8 @@
! Copyright (c) 2007-2008 Aaron Schaefer. ! Copyright (c) 2007-2008 Aaron Schaefer.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: arrays kernel make math math.functions math.matrices math.miller-rabin USING: arrays kernel make math math.functions math.matrices math.miller-rabin
math.order math.parser math.primes.factors math.ranges sequences math.order math.parser math.primes.factors math.ranges math.ratios
sequences.lib sorting strings unicode.case ; sequences sequences.lib sorting strings unicode.case ;
IN: project-euler.common IN: project-euler.common
! A collection of words used by more than one Project Euler solution ! A collection of words used by more than one Project Euler solution
@ -14,6 +14,7 @@ IN: project-euler.common
! cartesian-product - #4, #27, #29, #32, #33, #43, #44, #56 ! cartesian-product - #4, #27, #29, #32, #33, #43, #44, #56
! log10 - #25, #134 ! log10 - #25, #134
! max-path - #18, #67 ! max-path - #18, #67
! mediant - #71, #73
! nth-triangle - #12, #42 ! nth-triangle - #12, #42
! number>digits - #16, #20, #30, #34, #35, #38, #43, #52, #55, #56, #92 ! number>digits - #16, #20, #30, #34, #35, #38, #43, #52, #55, #56, #92
! palindrome? - #4, #36, #55 ! palindrome? - #4, #36, #55
@ -60,6 +61,9 @@ PRIVATE>
: log10 ( m -- n ) : log10 ( m -- n )
log 10 log / ; log 10 log / ;
: mediant ( a/c b/d -- (a+b)/(c+d) )
2>fraction [ + ] 2bi@ / ;
: max-path ( triangle -- n ) : max-path ( triangle -- n )
dup length 1 > [ dup length 1 > [
2 cut* first2 max-children [ + ] 2map suffix max-path 2 cut* first2 max-children [ + ] 2map suffix max-path