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

fix bug in 1 arg and

Browse source
This commit is contained in:
Marcell Vazquez-Chanlatte 2017-02-27 22:42:19 -08:00
parent 8760996bba
commit a34e4c2b0e
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
stl/ast.py
View file

@ -15,10 +15,13 @@ t_sym = Symbol('t', positive=True)
def flatten_binary(phi, op, dropT, shortT): def flatten_binary(phi, op, dropT, shortT):
f = lambda x: x.args if isinstance(x, op) else [x] f = lambda x: x.args if isinstance(x, op) else [x]
args = [arg for arg in phi.args if arg is not dropT] args = [arg for arg in phi.args if arg is not dropT]
if any(arg is shortT for arg in args): if any(arg is shortT for arg in args):
return shortT return shortT
elif not args: elif not args:
return dropT return dropT
elif len(args) == 1:
return args[0]
else: else:
return op(tuple(fn.mapcat(f, phi.args))) return op(tuple(fn.mapcat(f, phi.args)))

4
stl/test_ast.py
View file

@ -7,6 +7,10 @@ class TestSTLAST(unittest.TestCase):
phi = stl.parse("x") phi = stl.parse("x")
self.assertEqual(stl.TOP, stl.TOP | phi) self.assertEqual(stl.TOP, stl.TOP | phi)
self.assertEqual(stl.BOT, stl.BOT & phi) self.assertEqual(stl.BOT, stl.BOT & phi)
self.assertEqual(stl.TOP, phi | stl.TOP)
self.assertEqual(stl.BOT, phi & stl.BOT)
self.assertEqual(phi, phi & stl.TOP)
self.assertEqual(phi, phi | stl.BOT)
self.assertEqual(stl.TOP, stl.TOP & stl.TOP) self.assertEqual(stl.TOP, stl.TOP & stl.TOP)
self.assertEqual(stl.BOT, stl.BOT | stl.BOT) self.assertEqual(stl.BOT, stl.BOT | stl.BOT)
self.assertEqual(stl.TOP, stl.TOP | stl.BOT) self.assertEqual(stl.TOP, stl.TOP | stl.BOT)