luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove grid argument and fix formatting 

Signed-off-by: Andrew Butt <butta@seas.upenn.edu>
This commit is contained in:
Andrew Butt 2020-07-15 15:54:27 -04:00
parent 67b2749b0a
commit 70f7412374
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
prjxray/overlay.py
View File

@ -15,8 +15,7 @@ class Overlay(object):
"""
def __init__(self, grid, region_dict):
self.grid = grid
def __init__(self, region_dict):
self.region_dict = region_dict
def tile_in_roi(self, grid_loc):

6
tests/test_util.py
View File

@ -22,10 +22,10 @@ environ['XRAY_DATABASE_ROOT'] = '.'
environ['XRAY_PART'] = './'
from prjxray.util import get_roi, get_db_root
from prjxray.db import Database
from prjxray.overlay import Overlay
from prjxray.grid_types import GridLoc
@contextmanager
def setup_database(contents):
with TemporaryDirectory() as d:
@ -72,16 +72,16 @@ class TestUtil(TestCase):
list(get_roi().gen_sites()), [('ATILE', 'FOO', 'BAR')])
def test_in_roi_overlay(self):
db = Database(get_db_root(), './database/artix7/xc7a50tfgg484-1')
region_dict = {}
region_dict['pr1'] = (10, 58, 0, 51)
region_dict['pr2'] = (10, 58, 52, 103)
overlay = Overlay(db.grid(), region_dict)
overlay = Overlay(region_dict)
self.assertFalse(overlay.tile_in_roi(GridLoc(18, 50)))
self.assertFalse(overlay.tile_in_roi(GridLoc(18, 84)))
self.assertTrue(overlay.tile_in_roi(GridLoc(8, 50)))
self.assertTrue(overlay.tile_in_roi(GridLoc(18, 112)))
self.assertTrue(overlay.tile_in_roi(GridLoc(80, 40)))
if __name__ == '__main__':
main()