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

refactor and simplify repr code using f-strings

Browse source
This commit is contained in:
Marcell Vazquez-Chanlatte 2017-01-03 15:34:46 -08:00
parent 788e6ee58e
commit 13cc7abdf2
1 changed files with 10 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

36
stl/ast.py
View file

@ -4,12 +4,9 @@
from collections import namedtuple, deque from collections import namedtuple, deque
from itertools import repeat from itertools import repeat
from typing import Union
from enum import Enum from enum import Enum
from sympy import Symbol from sympy import Symbol
VarKind = Enum("VarKind", ["x", "u", "w"])
str_to_varkind = {"x": VarKind.x, "u": VarKind.u, "w": VarKind.w}
dt_sym = Symbol('dt', positive=True) dt_sym = Symbol('dt', positive=True)
t_sym = Symbol('t', positive=True) t_sym = Symbol('t', positive=True)
@ -23,12 +20,7 @@ class AtomicPred(namedtuple("AP", ["id"])):
class LinEq(namedtuple("LinEquality", ["terms", "op", "const"])): class LinEq(namedtuple("LinEquality", ["terms", "op", "const"])):
def __repr__(self): def __repr__(self):
n = len(self.terms) return " + ".join(map(str, self.terms)) + f" {self.op} {self.const}"
rep = "{}"
if n > 1:
rep += " + {}"*(n - 1)
rep += " {op} {c}"
return rep.format(*self.terms, op=self.op, c=self.const)
def children(self): def children(self):
return [] return []
@ -36,13 +28,12 @@ class LinEq(namedtuple("LinEquality", ["terms", "op", "const"])):
class Var(namedtuple("Var", ["coeff", "id", "time"])): class Var(namedtuple("Var", ["coeff", "id", "time"])):
def __repr__(self): def __repr__(self):
time_str = "[{}]".format(self.time) return f"{self.coeff}*{self.id}[{self.time}]"
return "{c}*{i}{t}".format(c=self.coeff, i=self.id, t=time_str)
class Interval(namedtuple('I', ['lower', 'upper'])): class Interval(namedtuple('I', ['lower', 'upper'])):
def __repr__(self): def __repr__(self):
return "[{},{}]".format(self.lower, self.upper) return f"[{self.lower},{self.upper}]"
def children(self): def children(self):
return [self.lower, self.upper] return [self.lower, self.upper]
@ -51,14 +42,7 @@ class Interval(namedtuple('I', ['lower', 'upper'])):
class NaryOpSTL(namedtuple('NaryOp', ['args'])): class NaryOpSTL(namedtuple('NaryOp', ['args'])):
OP = "?" OP = "?"
def __repr__(self): def __repr__(self):
n = len(self.args) return f" {self.OP} ".join(f"({x})" for x in self.args)
if n == 1:
return "{}".format(self.args[0])
elif self.args:
rep = " {op} ".join(["({})"]*(len(self.args)))
return rep.format(*self.args, op=self.OP)
else:
return ""
def children(self): def children(self):
return self.args return self.args
@ -72,23 +56,23 @@ class And(NaryOpSTL):
class ModalOp(namedtuple('ModalOp', ['interval', 'arg'])): class ModalOp(namedtuple('ModalOp', ['interval', 'arg'])):
def __repr__(self):
return f"{self.OP}{self.interval}({self.arg})"
def children(self): def children(self):
return [self.arg] return [self.arg]
class F(ModalOp): class F(ModalOp):
def __repr__(self): OP = "◇"
return "◇{}({})".format(self.interval, self.arg)
class G(ModalOp): class G(ModalOp):
def __repr__(self): OP = "□"
return "□{}({})".format(self.interval, self.arg)
class Neg(namedtuple('Neg', ['arg'])): class Neg(namedtuple('Neg', ['arg'])):
def __repr__(self): def __repr__(self):
return "¬({})".format(self.arg) return f"¬({self.arg})"
def children(self): def children(self):
return [self.arg] return [self.arg]