Use "map-sum" instead of "map sum".

db4
John Benediktsson 2012-04-25 13:18:21 -07:00
parent 6f89c1824d
commit f3e1dc5b98
5 changed files with 5 additions and 5 deletions

View File

@ -9,7 +9,7 @@ C: <word> word
<PRIVATE
: words-length ( words -- length )
[ width>> ] map sum ;
[ width>> ] map-sum ;
: make-element ( whites blacks -- element )
[ append ] [ [ words-length ] bi@ ] 2bi <element> ;

View File

@ -62,7 +62,7 @@ DEFER: (euler151)
{ { 0 0 1 0 } [ { 0 0 0 1 } (euler151) 1 + ] }
{ { 0 1 0 0 } [ { 0 0 1 1 } (euler151) 1 + ] }
{ { 1 0 0 0 } [ { 0 1 1 1 } (euler151) 1 + ] }
[ [ dup length iota [ pick-sheet ] with map sum ] [ sum ] bi / ]
[ [ dup length iota [ pick-sheet ] with map-sum ] [ sum ] bi / ]
} case ] cache ;
: euler151 ( -- answer )

View File

@ -119,7 +119,7 @@ TUPLE: observer < turtle projection-mode collision-mode ;
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
: distance ( turtle turtle -- n )
pos>> swap pos>> v- [ sq ] map sum sqrt ;
pos>> swap pos>> v- [ sq ] map-sum sqrt ;
: move-by ( point -- ) turtle-pos> v+ >turtle-pos ;

View File

@ -25,7 +25,7 @@ M: lex-hash set-at
[ swap hash>> set-at ]
} case ;
:: at-pos ( t l c -- p ) t l head-slice [ length ] map sum l 1 - + c + ;
:: at-pos ( t l c -- p ) t l head-slice [ length ] map-sum l 1 - + c + ;
M: lex-hash at*
swap {

View File

@ -16,7 +16,7 @@ C: <pos> pos
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
: distance ( pos pos -- n ) val>> swap val>> v- [ sq ] map sum sqrt ;
: distance ( pos pos -- n ) val>> swap val>> v- [ sq ] map-sum sqrt ;
: move-by ( point -- ) pos> v+ >pos ;