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

syntactic sugar + fix hashing bug

Browse source
This commit is contained in:
Marcell Vazquez-Chanlatte 2017-02-25 23:12:59 -08:00
parent f69a52fae7
commit 877523d531
2 changed files with 39 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

29
stl/ast.py
View file

@ -29,7 +29,6 @@ class AST(object):
return Neg(self)
class AtomicPred(namedtuple("AP", ["id", "time"]), AST):
def __repr__(self):
return f"{self.id}[{self.time}]"
@ -45,6 +44,10 @@ class LinEq(namedtuple("LinEquality", ["terms", "op", "const"]), AST):
def children(self):
return []
def __hash__(self):
# TODO: compute hash based on contents
return hash(repr(self))
class Var(namedtuple("Var", ["coeff", "id", "time"])):
def __repr__(self):
@ -71,9 +74,17 @@ class NaryOpSTL(namedtuple('NaryOp', ['args']), AST):
class Or(NaryOpSTL):
OP = "∨"
def __hash__(self):
# TODO: compute hash based on contents
return hash(repr(self))
class And(NaryOpSTL):
OP = "∧"
def __hash__(self):
# TODO: compute hash based on contents
return hash(repr(self))
class ModalOp(namedtuple('ModalOp', ['interval', 'arg']), AST):
def __repr__(self):
@ -86,9 +97,17 @@ class ModalOp(namedtuple('ModalOp', ['interval', 'arg']), AST):
class F(ModalOp):
OP = "◇"
def __hash__(self):
# TODO: compute hash based on contents
return hash(repr(self))
class G(ModalOp):
OP = "□"
def __hash__(self):
# TODO: compute hash based on contents
return hash(repr(self))
class Until(namedtuple('ModalOp', ['interval', 'arg1', 'arg2']), AST):
def __repr__(self):
@ -97,6 +116,10 @@ class Until(namedtuple('ModalOp', ['interval', 'arg1', 'arg2']), AST):
def children(self):
return [self.arg1, self.arg2]
def __hash__(self):
# TODO: compute hash based on contents
return hash(repr(self))
class Neg(namedtuple('Neg', ['arg']), AST):
def __repr__(self):
@ -104,3 +127,7 @@ class Neg(namedtuple('Neg', ['arg']), AST):
def children(self):
return [self.arg]
def __hash__(self):
# TODO: compute hash based on contents
return hash(repr(self))