teaching/mtl-aas
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2 from shromonag/master

Browse source 
Updated Globally and conjunction
This commit is contained in:
Marcell Vazquez-Chanlatte 2016-12-09 10:50:17 -08:00 • committed by GitHub
commit 7064f2b4a5
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
stl/fastboolean_eval.py
View file

@ -22,10 +22,9 @@ def _(stl):
@pointwise_satf.register(stl.And) @pointwise_satf.register(stl.And)
def _(stl): def _(stl):
def sat_comp(x,t): def sat_comp(x,t):
sat = bitarray(len(t)) sat = ~bitarray(len(t))
sat.setall('True')
for arg in stl.args: for arg in stl.args:
sat = pointwise_satf(arg)(x, t) & sat sat = ~(~pointwise_satf(arg)(x, t) | ~sat)
return sat return sat
return sat_comp return sat_comp
@ -49,8 +48,7 @@ def _(stl):
sat = bitarray() sat = bitarray()
for tau in t: for tau in t:
tau_t = [min(tau + t2, x.index[-1]) for t2 in x[lo:hi].index] tau_t = [min(tau + t2, x.index[-1]) for t2 in x[lo:hi].index]
point_sat = pointwise_satf(stl.arg)(x, tau_t) sat.append((~(pointwise_satf(stl.arg)(x, tau_t))).count() == 0)
sat.append(point_sat.count() == point_sat.length())
return sat return sat
return sat_comp return sat_comp