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

switch to Boolean semantics for synth

Browse source
This commit is contained in:
Marcell Vazquez-Chanlatte 2016-10-10 00:19:07 -07:00
parent 1882f24506
commit 399bf2f421
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
synth.py
View file

@ -1,23 +1,22 @@
import operator as op
from stl.utils import set_params, param_lens
from stl.robustness import pointwise_robustness
from stl.boolean_eval import pointwise_sat
from lenses import lens
def binsearch(stleval, *, tol=1e-3, lo, hi, polarity):
"""Only run search if tightest robustness was positive."""
# Early termination via bounds checks
if polarity and stleval(lo) > 0:
if polarity and stleval(lo):
return lo
elif not polarity and stleval(hi) > 0:
elif not polarity and stleval(hi):
return hi
test = op.le if polarity else op.gt
while hi - lo > tol:
mid = lo + (hi - lo) / 2
r = stleval(mid)
lo, hi = (mid, hi) if test(r, 0) else (lo, mid)
lo, hi = (mid, hi) if r ^ polarity else (lo, mid)
# Want satisifiable formula
return hi if polarity else lo
@ -28,7 +27,7 @@ def lex_param_project(stl, x, *, order, polarity, ranges, tol=1e-3):
p_lens = param_lens(stl)
def stleval_fact(var, val):
l = lens(val)[var]
return lambda p: pointwise_robustness(set_params(stl, l.set(p)))(x, 0)
return lambda p: pointwise_sat(set_params(stl, l.set(p)))(x, 0)
for var in order:
stleval = stleval_fact(var, val)

1
test_robustness.py
View file

@ -17,7 +17,6 @@ x = pd.DataFrame([[1,2], [1,4], [4,2]], index=[0,0.1,0.2],
columns=["A", "B"])
class TestSTLRobustness(unittest.TestCase):
@params(ex1, ex2, ex3, ex4, ex5, ex6)
def test_stl(self, phi_str, r):