jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change the way QuadTree.getLeafUnder() locate the leaf. 

* Change: In cumulus/plugins.Block.getLeafUnder(): formerly, we where
    using the cut-lines (x/y) to locate which leaf a point is under.
    But in case of incomplete tree, it is difficult to manage.
      Now we chosse the leaf according to the distance to the center
    of the leaf area. Choose the shorter, of course.
      This solve the H-Tree DFF bad assignment around the PLL (top
    right corner) in LS180.
This commit is contained in:
Jean-Paul Chaput 2021-06-06 10:55:24 +02:00
parent a2daf26fca
commit 352ca94483
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
cumulus/src/plugins/alpha/block/spares.py
View File

@ -345,6 +345,10 @@ class QuadTree ( object ):
if self.tr: self.tr.removeUnusedBuffers()
self.pool._removeUnuseds()
def getDistance ( self, point ):
"""Return the Manhattan distance between ``point`` and the area center."""
return self.area.getCenter().manhattanDistance( point )
def rshowPoolUse ( self ):
rused = 0
rtotal = 0
@ -696,27 +700,27 @@ class QuadTree ( object ):
def getLeafUnder ( self, position ):
"""Find the QuadTree leaf under ``position``."""
if self.isLeaf(): return self
if self.isHBipart():
if position.getX() < self.xcut: return self.bl.getLeafUnder(position)
return self.br.getLeafUnder(position)
if self.isVBipart():
if position.getY() < self.ycut: return self.bl.getLeafUnder(position)
return self.tl.getLeafUnder(position)
leaf = None
if position.getX() < self.xcut:
if position.getY() < self.ycut: leaf = self.bl
else: leaf = self.tl
else:
if position.getY() < self.ycut: leaf = self.br
else: leaf = self.tr
if not leaf:
dx = abs( position.getX() - self.xcut )
dy = abs( position.getY() - self.ycut )
if self.tr and ((dx < dy) or not leaf): leaf = self.tr
if self.tl and ((dx < dy) or not leaf): leaf = self.tl
if self.br and ((dx >= dy) or not leaf): leaf = self.br
if self.bl and ((dx >= dy) or not leaf): leaf = self.bl
return leaf.getLeafUnder(position)
candidate = None
minDist = None
if self.bl:
minDist = self.bl.getDistance( position )
candidate = self.bl
if self.br:
distance = self.br.getDistance( position )
if (candidate is None) or (distance < minDist):
minDist = distance
candidate = self.br
if self.tl:
distance = self.tl.getDistance( position )
if (candidate is None) or (distance < minDist):
minDist = distance
candidate = self.tl
if self.tr:
distance = self.tr.getDistance( position )
if (candidate is None) or (distance < minDist):
minDist = distance
candidate = self.tr
return candidate.getLeafUnder(position)
def getFreeLeafUnder ( self, area, attractor=None ):
"""