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

Pattern.get_bounds() should return None if it's empty

Browse Source 
s
This commit is contained in:
Jan Petykiewicz 2019-05-25 12:40:59 -07:00
parent 49982f1207
commit b5bd7cd9c8
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
masque/pattern.py
View File

@ -9,6 +9,7 @@ import pickle
from collections import defaultdict from collections import defaultdict
import numpy import numpy
from numpy import inf
# .visualize imports matplotlib and matplotlib.collections # .visualize imports matplotlib and matplotlib.collections
from .subpattern import SubPattern from .subpattern import SubPattern
@ -387,13 +388,17 @@ class Pattern:
if not entries: if not entries:
return None return None
init_bounds = entries[0].get_bounds() min_bounds = numpy.array((+inf, +inf))
min_bounds = init_bounds[0, :] max_bounds = numpy.array((+inf, +inf))
max_bounds = init_bounds[1, :] for entry in entries:
for entry in entries[1:]:
bounds = entry.get_bounds() bounds = entry.get_bounds()
if bounds is None:
continue
min_bounds = numpy.minimum(min_bounds, bounds[0, :]) min_bounds = numpy.minimum(min_bounds, bounds[0, :])
max_bounds = numpy.maximum(max_bounds, bounds[1, :]) max_bounds = numpy.maximum(max_bounds, bounds[1, :])
if (max_bounds < min_bounds).any():
return None
else:
return numpy.vstack((min_bounds, max_bounds)) return numpy.vstack((min_bounds, max_bounds))
def flatten(self) -> 'Pattern': def flatten(self) -> 'Pattern':