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

fill some holes in quadtree docs, rename quadtrees:prune to prune-quadtree to avoid colliding with sets:prune, and kill silly call to boa

db4
Joe Groff 2009-02-03 20:09:28 -06:00
parent 246c4bb13c
commit 6babe4bf3f
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
extra/quadtrees/quadtrees-docs.factor
View File

@ -2,9 +2,11 @@ USING: arrays assocs help.markup help.syntax math.geometry.rect quadtrees quotat
IN: quadtrees IN: quadtrees
ARTICLE: "quadtrees" "Quadtrees" ARTICLE: "quadtrees" "Quadtrees"
"The " { $snippet "quadtrees" } " vocabulary implements the quadtree structure in Factor. Quadtrees follow the " { $link "assocs-protocol" } " for insertion, deletion, and querying of exact points, using two-dimensional vectors as keys. Additional words are provided for spatial queries and pruning the tree structure:" "The " { $snippet "quadtrees" } " vocabulary implements the quadtree data structure in Factor."
{ $subsection prune } { $subsection <quadtree> }
"Quadtrees follow the " { $link "assocs-protocol" } " for insertion, deletion, and querying of exact points, using two-dimensional vectors as keys. Additional words are provided for spatial queries and pruning the tree structure:"
{ $subsection in-rect } { $subsection in-rect }
{ $subsection prune-quadtree }
"The following words are provided to help write quadtree algorithms:" "The following words are provided to help write quadtree algorithms:"
{ $subsection descend } { $subsection descend }
{ $subsection each-quadrant } { $subsection each-quadrant }
@ -12,7 +14,11 @@ ARTICLE: "quadtrees" "Quadtrees"
ABOUT: "quadtrees" ABOUT: "quadtrees"
HELP: prune HELP: <quadtree>
{ $values { "bounds" rect } { "quadtree" quadtree } }
{ $description "Constructs an empty quadtree covering the axis-aligned rectangle indicated by " { $snippet "bounds" } ". All the keys of " { $snippet "quadtree" } " must be two-dimensional vectors lying inside " { $snippet "bounds" } "." } ;
HELP: prune-quadtree
{ $values { "tree" quadtree } } { $values { "tree" quadtree } }
{ $description "Removes empty nodes from " { $snippet "tree" } "." } ; { $description "Removes empty nodes from " { $snippet "tree" } "." } ;

6
extra/quadtrees/quadtrees-tests.factor
View File

@ -98,7 +98,7 @@ IN: quadtrees.tests
"d" { 0.75 0.25 } value>>key "d" { 0.75 0.25 } value>>key
{ 0.25 0.25 } delete>>key { 0.25 0.25 } delete>>key
prune prune-quadtree
] unit-test ] unit-test
[ T{ quadtree f T{ rect f { -1.0 -1.0 } { 2.0 2.0 } } f f [ T{ quadtree f T{ rect f { -1.0 -1.0 } { 2.0 2.0 } } f f
@ -116,7 +116,7 @@ IN: quadtrees.tests
{ 0.25 0.25 } delete>>key { 0.25 0.25 } delete>>key
{ 0.75 0.25 } delete>>key { 0.75 0.25 } delete>>key
prune prune-quadtree
] unit-test ] unit-test
[ T{ quadtree f T{ rect f { -1.0 -1.0 } { 2.0 2.0 } } f f [ T{ quadtree f T{ rect f { -1.0 -1.0 } { 2.0 2.0 } } f f
@ -160,7 +160,7 @@ IN: quadtrees.tests
"g" { 0.25 0.25 } value>>key "g" { 0.25 0.25 } value>>key
"h" { 0.75 0.75 } value>>key "h" { 0.75 0.75 } value>>key
prune prune-quadtree
] unit-test ] unit-test
[ 8 ] [ [ 8 ] [

7
extra/quadtrees/quadtrees.factor
View File

@ -6,7 +6,10 @@ IN: quadtrees
TUPLE: quadtree { bounds rect } point value ll lr ul ur leaf? ; TUPLE: quadtree { bounds rect } point value ll lr ul ur leaf? ;
: <quadtree> ( bounds -- quadtree ) f f f f f f t quadtree boa ; : <quadtree> ( bounds -- quadtree )
quadtree new
swap >>bounds
t >>leaf? ;
: rect-ll ( rect -- point ) loc>> ; : rect-ll ( rect -- point ) loc>> ;
: rect-lr ( rect -- point ) [ loc>> ] [ width ] bi v+x ; : rect-lr ( rect -- point ) [ loc>> ] [ width ] bi v+x ;
@ -165,7 +168,7 @@ DEFER: in-rect*
PRIVATE> PRIVATE>
: prune ( tree -- tree ) [ (prune) ] keep ; : prune-quadtree ( tree -- tree ) [ (prune) ] keep ;
: in-rect ( tree rect -- values ) : in-rect ( tree rect -- values )
[ 16 <vector> ] 2dip in-rect* ; [ 16 <vector> ] 2dip in-rect* ;