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

wrap: 25% faster on benchmark.

db4
John Benediktsson 2012-08-29 09:20:55 -07:00
parent 719f190e99
commit aa7790c645
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
basis/wrap/wrap.factor
View File

@ -1,35 +1,36 @@
! Copyright (C) 2009 Daniel Ehrenberg ! Copyright (C) 2009 Daniel Ehrenberg
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: combinators kernel sequences math arrays locals fry accessors USING: accessors arrays combinators combinators.short-circuit
lists splitting make combinators.short-circuit namespaces fry kernel lists locals math sequences typed ;
grouping splitting.monotonic ;
IN: wrap IN: wrap
! black is the text length, white is the whitespace length ! black is the text length, white is the whitespace length
TUPLE: element contents black white ; TUPLE: element contents black white ;
C: <element> element C: <element> element
: element-length ( element -- n ) <PRIVATE
TYPED: element-length ( element: element -- n )
[ black>> ] [ white>> ] bi + ; [ black>> ] [ white>> ] bi + ;
TUPLE: paragraph line-max line-ideal lines head-width tail-cost ; TUPLE: paragraph line-max line-ideal lines head-width tail-cost ;
C: <paragraph> paragraph C: <paragraph> paragraph
: top-fits? ( paragraph -- ? ) TYPED: top-fits? ( paragraph: paragraph -- ? )
[ head-width>> ] [ head-width>> ]
[ dup lines>> 1list? [ line-ideal>> ] [ line-max>> ] if ] bi <= ; [ dup lines>> 1list? [ line-ideal>> ] [ line-max>> ] if ] bi <= ;
: fits? ( paragraph -- ? ) TYPED: fits? ( paragraph: paragraph -- ? )
! Make this not count spaces at end ! Make this not count spaces at end
{ [ lines>> car 1list? ] [ top-fits? ] } 1|| ; { [ lines>> car 1list? ] [ top-fits? ] } 1|| ;
:: min-by ( seq quot -- elt ) :: min-by ( seq quot -- elt )
f 1/0. seq [| key value new | f 1/0. seq [| key value newkey |
new quot call :> newvalue newkey quot call :> newvalue
newvalue value < [ new newvalue ] [ key value ] if newvalue value < [ newkey newvalue ] [ key value ] if
] each drop ; inline ] each drop ; inline
: paragraph-cost ( paragraph -- cost ) TYPED: paragraph-cost ( paragraph: paragraph -- cost )
dup lines>> 1list? [ drop 0 ] [ dup lines>> 1list? [ drop 0 ] [
[ [ head-width>> ] [ line-ideal>> ] bi - sq ] [ [ head-width>> ] [ line-ideal>> ] bi - sq ]
[ tail-cost>> ] bi + [ tail-cost>> ] bi +
@ -46,18 +47,15 @@ C: <paragraph> paragraph
[ drop paragraph-cost ] [ drop paragraph-cost ]
} 2cleave <paragraph> ; } 2cleave <paragraph> ;
: glue ( paragraph element -- paragraph ) TYPED: add-element ( paragraph: paragraph element: element -- )
{ [ element-length [ + ] curry change-head-width ]
[ drop [ line-max>> ] [ line-ideal>> ] bi ] [ [ [ unswons ] dip swons swons ] curry change-lines ]
[ [ lines>> unswons ] dip swons swons ] bi drop ;
[ [ head-width>> ] [ element-length ] bi* + ]
[ drop tail-cost>> ]
} 2cleave <paragraph> ;
: wrap-step ( paragraphs element -- paragraphs ) : wrap-step ( paragraphs element -- paragraphs )
[ '[ _ glue ] map ]
[ [ min-cost ] dip new-line ] [ [ min-cost ] dip new-line ]
2bi prefix [ dupd '[ _ add-element ] each ]
2bi swap prefix
[ fits? ] filter ; [ fits? ] filter ;
: 1paragraph ( line-max line-ideal element -- paragraph ) : 1paragraph ( line-max line-ideal element -- paragraph )
@ -67,9 +65,11 @@ C: <paragraph> paragraph
lines>> [ [ contents>> ] lmap>array ] lmap>array ; lines>> [ [ contents>> ] lmap>array ] lmap>array ;
: initialize ( line-max line-ideal elements -- elements paragraph ) : initialize ( line-max line-ideal elements -- elements paragraph )
<reversed> unclip-slice [ -rot ] dip 1paragraph 1array ; reverse unclip [ -rot ] dip 1paragraph 1array ;
: wrap ( elements line-max line-ideal -- paragraph ) PRIVATE>
: wrap ( elements line-max line-ideal -- array )
rot [ 2drop { } ] [ rot [ 2drop { } ] [
initialize initialize
[ wrap-step ] reduce [ wrap-step ] reduce