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

implemented boolean evaluator + increasing converage

Browse source
This commit is contained in:
Marcell Vazquez-Chanlatte 2017-11-12 11:04:56 -08:00
parent f53cab4485
commit 77a904d050
4 changed files with 123 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

13
stl/utils.py
View file

@ -9,6 +9,9 @@ from stl.ast import (And, F, G, Interval, LinEq, Neg, Or, AP_lens)
from stl.types import STL
oo = float('inf')
def f_neg_or_canonical_form(phi: STL) -> STL:
if isinstance(phi, LinEq):
return phi
@ -67,15 +70,15 @@ def get_times(x):
return sorted(times)
def const_trace(x):
oo = float('inf')
return traces.TimeSeries([(-oo, x)])
def const_trace(x, start=0):
return traces.TimeSeries([(start, x)], domain=traces.Domain(start, oo))
def eval_lineq(lineq, x, domain, compact=True):
lhs = sum(const_trace(term.coeff)*x[term.id] for term in lineq.terms)
compare = op_lookup.get(lineq.op)
output = lhs.operation(const_trace(lineq.const), compare)
output.domain = domain
if compact:
output.compact()
@ -101,10 +104,6 @@ def env(phi, *, lo=0, hi=float('inf')):
return F(Interval(lo, hi), phi)
def until(phi1, phi2, *, lo, hi):
return stl.ast.Until(Interval(lo, hi), phi1, phi2)
def andf(*args):
return reduce(op.and_, args) if args else stl.TOP