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

reverted back to nametuple repr + time filters

Browse source
This commit is contained in:
Marcell Vazquez-Chanlatte 2016-07-10 16:36:53 -07:00
parent bed8c51756
commit c4cfda6e19
3 changed files with 40 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

31
stl.py
View file

@ -7,10 +7,11 @@ from itertools import repeat
from typing import Union
from enum import Enum
from sympy import Symbol
import funcy as fn
from lenses import lens
import funcy as fn
VarKind = Enum("VarKind", ["x", "u", "w"])
str_to_varkind = {"x": VarKind.x, "u": VarKind.u, "w": VarKind.w}
dt_sym = Symbol('dt', positive=True)
@ -18,13 +19,23 @@ t_sym = Symbol('t', positive=True)
class LinEq(namedtuple("LinEquality", ["terms", "op", "const"])):
def __repr__(self):
rep = "{lhs} {op} {c}"
return rep.format(lhs=self.terms, op=self.op, c=self.const)
n = len(self.terms)
rep = "{}"
if n > 1:
rep += " + {}"*(n - 1)
rep += " {op} {c}"
return rep.format(*self.terms, op=self.op, c=self.const)
def children(self):
return []
class Var(namedtuple("Var", ["coeff", "id", "time"])):
def __repr__(self):
time_str = "[{}]".format(self.time)
return "{c}*{i}{t}".format(c=self.coeff, i=self.id, t=time_str)
class Interval(namedtuple('I', ['lower', 'upper'])):
def __repr__(self):
return "[{},{}]".format(self.lower, self.upper)
@ -93,12 +104,16 @@ def tree(stl):
return {x:set(x.children()) for x in walk(stl) if x.children()}
def terms_lens(phi:"STL", bind=True) -> lens:
tls = list(fn.flatten(_terms_lens(phi)))
def lineq_lens(phi:"STL", bind=True) -> lens:
tls = list(fn.flatten(_lineq_lens(phi)))
tl = lens().tuple_(*tls).each_()
return tl.bind(phi) if bind else tl
def terms_lens(phi:"STL", bind=True) -> lens:
return lineq_lens(phi, bind).terms.each_()
def _child_lens(psi, focus):
if isinstance(psi, NaryOpSTL):
for j, _ in enumerate(psi.args):
@ -107,9 +122,9 @@ def _child_lens(psi, focus):
yield focus.arg
def _terms_lens(phi, focus=lens()):
def _lineq_lens(phi, focus=lens()):
psi = focus.get(state=phi)
if isinstance(psi, LinEq):
return [focus.terms]
return [focus]
child_lenses = list(_child_lens(psi, focus=focus))
return [_terms_lens(phi, focus=cl) for cl in child_lenses]
return [_lineq_lens(phi, focus=cl) for cl in child_lenses]