dimitri/orbit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct bug in tree creation leading to Empty leaves

Browse source
This commit is contained in:
Dimitri Lozeve 2017-11-09 19:36:13 +00:00
parent 57ddd56775
commit 82bb1d438b
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Lib.hs
View file

@ -143,7 +143,7 @@ insertBody b t = case t of
-- If it is empty, we turn it into a singleton Region, adjusting its -- If it is empty, we turn it into a singleton Region, adjusting its
-- mass and center of mass. However, if the body is too far away -- mass and center of mass. However, if the body is too far away
-- (i.e. outside the diameter of the Region), we just ignore it. -- (i.e. outside the diameter of the Region), we just ignore it.
Empty r -> if distance (_bodyPosition b) (_regionCenter r) > (_regionDiameter r / 2) Empty r -> if distance (_bodyPosition b) (_regionCenter r) > (_regionDiameter r)
then Empty r then Empty r
else Single (updateRegion b r) b else Single (updateRegion b r) b
-- If it is a singleton, we create the 8 subtrees and we insert the -- If it is a singleton, we create the 8 subtrees and we insert the
@ -170,6 +170,11 @@ insertBody b t = case t of
-- | Build a Barnes-Hut Octree from a list of Bodies -- | Build a Barnes-Hut Octree from a list of Bodies
buildTree :: [Body] -> Octree buildTree :: [Body] -> Octree
buildTree [] = Empty (Region { _regionCenter = P $ V3 0 0 0,
_regionCenterOfMass = P $ V3 0 0 0,
_regionMass = 0,
_regionDiameter = 0
})
buildTree bs = foldr insertBody (Empty r) bs buildTree bs = foldr insertBody (Empty r) bs
where r = Region { _regionCenter = center, where r = Region { _regionCenter = center,
_regionCenterOfMass = center, _regionCenterOfMass = center,