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

fix bugs in binary search (still broken)

Browse source
This commit is contained in:
Marcell Vazquez-Chanlatte 2016-10-09 22:34:28 -07:00
parent 28f755edc5
commit c6810d8d75
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

25
robustness.py
View file

@ -69,30 +69,31 @@ def eval_term(x, t):
def binsearch(stleval, *, tol=1e-3, lo, hi, polarity):
"""Only run search if tightest robustness was positive."""
# Only check low since hi taken care of by precondition.
r = stleval(lo)
# TODO: allow for different polarities
rL, rH = stleval(lo), stleval(hi)
# Early termination via bounds checks
posL, posH = rL > 0, rH > 0
if polarity and posL:
return lo
elif not polarity and posH:
return hi
# TODO: early termination by bounds checks
mid = lo
if abs(r) < tol:
return r, mid
while abs(r) > tol and hi - lo > tol:
while hi - lo > tol:
mid = lo + (hi - lo) / 2
r = stleval(mid)
if polarity: # swap direction
if not polarity: # swap direction
r *= -1
if r < 0:
lo, hi = mid, hi
else:
lo, hi = lo, mid
return r, mid
return mid
def lex_param_project(stl, x, *, order, polarity, ranges, tol=1e-3):
val = {var: (ranges[var][0] if polarity[var] else ranges[var][1]) for var in order}
val = {var: (ranges[var][0] if not polarity[var] else ranges[var][1]) for var in order}
# TODO: evaluate top paramater
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)
@ -100,7 +101,7 @@ def lex_param_project(stl, x, *, order, polarity, ranges, tol=1e-3):
for var in order:
stleval = stleval_fact(var, val)
lo, hi = ranges[var]
_, param = binsearch(stleval, lo=lo, hi=hi, tol=tol, polarity=polarity[var])
param = binsearch(stleval, lo=lo, hi=hi, tol=tol, polarity=polarity[var])
val[var] = param
return val