start work on binary search for param synth + add indeterminate names
This commit is contained in:
parent
8e728abfa8
commit
79bf4f4d20
2 changed files with 29 additions and 2 deletions
|
|
@ -49,8 +49,8 @@ prime = "'"
|
||||||
|
|
||||||
pm = "+" / "-"
|
pm = "+" / "-"
|
||||||
dt = "dt"
|
dt = "dt"
|
||||||
unbound = "?"
|
unbound = "?" id
|
||||||
id = ~r"[a-zA-z\d]*"
|
id = ~r"[a-zA-z\d]+"
|
||||||
const = ~r"[\+\-]?\d*(\.\d+)?"
|
const = ~r"[\+\-]?\d*(\.\d+)?"
|
||||||
op = ">=" / "<=" / "<" / ">" / "="
|
op = ">=" / "<=" / "<" / ">" / "="
|
||||||
_ = ~r"\s"+
|
_ = ~r"\s"+
|
||||||
|
|
|
||||||
|
|
@ -62,3 +62,30 @@ def eval_terms(lineq, x, t):
|
||||||
|
|
||||||
def eval_term(x, t):
|
def eval_term(x, t):
|
||||||
return lambda term: term.coeff*x[term.id.name][t]
|
return lambda term: term.coeff*x[term.id.name][t]
|
||||||
|
|
||||||
|
|
||||||
|
def binsearch(stleval, *, tol=1e-3, lo, hi):
|
||||||
|
"""Only run search if tightest robustness was positive."""
|
||||||
|
# Only check low since hi taken care of by precondition.
|
||||||
|
r = stleval(lo)
|
||||||
|
if r > 0 or abs(r) < tol:
|
||||||
|
return r, lo
|
||||||
|
|
||||||
|
while abs(r) < tol:
|
||||||
|
mid = lo + (hi - lo) / 2
|
||||||
|
r = stleval(mid)
|
||||||
|
if r < 0:
|
||||||
|
lo, hi = mid, hi
|
||||||
|
else:
|
||||||
|
lo, hi = lo, mid
|
||||||
|
return r, mid
|
||||||
|
|
||||||
|
|
||||||
|
def lex_param_project(stl, x, *, order, polarity, ranges, tol=1e-3):
|
||||||
|
val = {var: (ranges[0] if polarity[var] else ranges[1]) for var in order}
|
||||||
|
# TODO: evaluate top paramater
|
||||||
|
for var in order:
|
||||||
|
r, param = binsearch() #TODO
|
||||||
|
# TODO: update val
|
||||||
|
return val
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue