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

wrap: more speedups.

db4
John Benediktsson 2012-09-19 17:08:41 -07:00
parent 8e8712efab
commit 803a1cb565
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
basis/wrap/wrap.factor
View File

@ -1,7 +1,7 @@
! 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: accessors arrays combinators combinators.short-circuit USING: accessors arrays combinators combinators.short-circuit
fry kernel lists locals math sequences typed ; fry kernel kernel.private lists locals math sequences typed ;
IN: wrap IN: wrap
! black is the text length, white is the whitespace length ! black is the text length, white is the whitespace length
@ -10,19 +10,19 @@ C: <element> element
<PRIVATE <PRIVATE
TYPED: element-length ( element: element -- n ) : element-length ( element -- n )
[ black>> ] [ white>> ] bi + ; [ black>> ] [ white>> ] bi + ; inline
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
TYPED: top-fits? ( paragraph: 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 <= ; inline
TYPED: fits? ( paragraph: 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|| ; inline
:: min-by ( seq quot -- elt ) :: min-by ( seq quot -- elt )
f 1/0. seq [| key value newkey | f 1/0. seq [| key value newkey |
@ -34,28 +34,28 @@ 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 +
] if ; ] if ; inline
: min-cost ( paragraphs -- paragraph ) : min-cost ( paragraphs -- paragraph )
[ paragraph-cost ] min-by ; [ paragraph-cost ] min-by ; inline
: new-line ( paragraph element -- paragraph ) TYPED: new-line ( paragraph: paragraph element: element -- paragraph )
{ {
[ drop [ line-max>> ] [ line-ideal>> ] bi ] [ drop [ line-max>> ] [ line-ideal>> ] bi ]
[ [ lines>> ] [ 1list ] bi* swons ] [ [ lines>> ] [ 1list ] bi* swons ]
[ nip black>> ] [ nip black>> ]
[ drop paragraph-cost ] [ drop paragraph-cost ]
} 2cleave <paragraph> ; } 2cleave <paragraph> ; inline
TYPED: add-element ( paragraph: paragraph element: element -- ) TYPED: add-element ( paragraph: paragraph element: element -- )
[ element-length [ + ] curry change-head-width ] [ element-length [ + ] curry change-head-width ]
[ [ [ unswons ] dip swons swons ] curry change-lines ] [ [ [ unswons ] dip swons swons ] curry change-lines ]
bi drop ; bi drop ; inline
: wrap-step ( paragraphs element -- paragraphs ) TYPED: wrap-step ( paragraphs: array element: element -- paragraphs )
[ [ min-cost ] dip new-line ] [ [ min-cost ] dip new-line ]
[ dupd '[ _ add-element ] each ] [ dupd '[ _ add-element ] each ]
2bi swap prefix 2bi swap prefix { array } declare
[ fits? ] filter ; [ fits? ] filter ;
: 1paragraph ( line-max line-ideal element -- paragraph ) : 1paragraph ( line-max line-ideal element -- paragraph )