jan/masque
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't include None in referenced_patterns_by_id() by default

Browse Source
This commit is contained in:
Jan Petykiewicz 2020-05-17 14:03:17 -07:00
parent 09cef1e754
commit 247b31a9d6
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
masque/file/gdsii.py
View File

@ -101,7 +101,6 @@ def write(patterns: Union[Pattern, List[Pattern]],
patterns_by_id = {id(pattern): pattern for pattern in patterns} patterns_by_id = {id(pattern): pattern for pattern in patterns}
for pattern in patterns: for pattern in patterns:
for i, p in pattern.referenced_patterns_by_id().items(): for i, p in pattern.referenced_patterns_by_id().items():
if p is not None:
patterns_by_id[i] = p patterns_by_id[i] = p
disambiguate_func(patterns_by_id.values()) disambiguate_func(patterns_by_id.values())
@ -173,7 +172,6 @@ def dose2dtype(patterns: List[Pattern],
patterns_by_id = {id(pattern): pattern for pattern in patterns} patterns_by_id = {id(pattern): pattern for pattern in patterns}
for pattern in patterns: for pattern in patterns:
for i, p in pattern.referenced_patterns_by_id().items(): for i, p in pattern.referenced_patterns_by_id().items():
if p is not None:
patterns_by_id[i] = p patterns_by_id[i] = p
# Get a table of (id(pat), written_dose) for each pattern and subpattern # Get a table of (id(pat), written_dose) for each pattern and subpattern

32
masque/pattern.py
View File

@ -2,7 +2,7 @@
Base object representing a lithography mask. Base object representing a lithography mask.
""" """
from typing import List, Callable, Tuple, Dict, Union, Set, Sequence, Optional, Type from typing import List, Callable, Tuple, Dict, Union, Set, Sequence, Optional, Type, overload
from typing import MutableMapping, Iterable from typing import MutableMapping, Iterable
import copy import copy
import itertools import itertools
@ -432,23 +432,40 @@ class Pattern:
pat = self.deepcopy().deepunlock().polygonize().flatten() pat = self.deepcopy().deepunlock().polygonize().flatten()
return [shape.vertices + shape.offset for shape in pat.shapes] # type: ignore # mypy can't figure out that shapes are all Polygons now return [shape.vertices + shape.offset for shape in pat.shapes] # type: ignore # mypy can't figure out that shapes are all Polygons now
def referenced_patterns_by_id(self) -> Dict[int, Optional['Pattern']]: @overload
def referenced_patterns_by_id(self) -> Dict[int, 'Pattern']:
pass
@overload
def referenced_patterns_by_id(self, include_none: bool) -> Dict[int, Optional['Pattern']]:
pass
def referenced_patterns_by_id(self,
include_none: bool = False
) -> Union[Dict[int, Optional['Pattern']],
Dict[int, 'Pattern']]:
""" """
Create a dictionary with `{id(pat): pat}` for all Pattern objects referenced by this Create a dictionary with `{id(pat): pat}` for all Pattern objects referenced by this
Pattern (operates recursively on all referenced Patterns as well) Pattern (operates recursively on all referenced Patterns as well)
Args:
include_none: If `True`, references to `None` will be included. Default `False`.
Returns: Returns:
Dictionary with `{id(pat): pat}` for all referenced Pattern objects Dictionary with `{id(pat): pat}` for all referenced Pattern objects
""" """
ids = {} ids: Dict[int, Optional['Pattern']] = {}
for subpat in self.subpatterns: for subpat in self.subpatterns:
if id(subpat.pattern) not in ids: if id(subpat.pattern) not in ids:
ids[id(subpat.pattern)] = subpat.pattern
if subpat.pattern is not None: if subpat.pattern is not None:
ids[id(subpat.pattern)] = subpat.pattern
ids.update(subpat.pattern.referenced_patterns_by_id()) ids.update(subpat.pattern.referenced_patterns_by_id())
elif include_none:
ids[id(subpat.pattern)] = subpat.pattern
return ids return ids
def referenced_patterns_by_name(self) -> List[Tuple[Optional[str], Optional['Pattern']]]: def referenced_patterns_by_name(self, **kwargs) -> List[Tuple[Optional[str], Optional['Pattern']]]:
""" """
Create a list of `(pat.name, pat)` tuples for all Pattern objects referenced by this Create a list of `(pat.name, pat)` tuples for all Pattern objects referenced by this
Pattern (operates recursively on all referenced Patterns as well). Pattern (operates recursively on all referenced Patterns as well).
@ -456,10 +473,13 @@ class Pattern:
Note that names are not necessarily unique, so a list of tuples is returned Note that names are not necessarily unique, so a list of tuples is returned
rather than a dict. rather than a dict.
Args:
**kwargs: passed to `referenced_patterns_by_id()`.
Returns: Returns:
List of `(pat.name, pat)` tuples for all referenced Pattern objects List of `(pat.name, pat)` tuples for all referenced Pattern objects
""" """
pats_by_id = self.referenced_patterns_by_id() pats_by_id = self.referenced_patterns_by_id(**kwargs)
pat_list = [(p.name if p is not None else None, p) for p in pats_by_id.values()] pat_list = [(p.name if p is not None else None, p) for p in pats_by_id.values()]
return pat_list return pat_list