add depenedencies + bounds checks

This commit is contained in:
Marcell Vazquez-Chanlatte 2016-10-11 10:52:52 -07:00
parent b040a6c425
commit 374b080c42

View file

@ -27,14 +27,14 @@ def _(stl):
@pointwise_sat.register(stl.F) @pointwise_sat.register(stl.F)
def _(stl): def _(stl):
lo, hi = stl.interval lo, hi = stl.interval
return lambda x, t: any((pointwise_sat(stl.arg)(x, t + t2) return lambda x, t: any((pointwise_sat(stl.arg)(x, min(t + t2, x.index[-1]))
for t2 in x[lo:hi].index)) for t2 in x[lo:hi].index))
@pointwise_sat.register(stl.G) @pointwise_sat.register(stl.G)
def _(stl): def _(stl):
lo, hi = stl.interval lo, hi = stl.interval
return lambda x, t: all((pointwise_sat(stl.arg)(x, t + t2) return lambda x, t: all((pointwise_sat(stl.arg)(x, min(t + t2, x.index[-1]))
for t2 in x[lo:hi].index)) for t2 in x[lo:hi].index))