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

Remove LinEq type

Browse source
This commit is contained in:
Marcell Vazquez-Chanlatte 2018-09-06 01:24:42 -07:00
parent b9b10ac835
commit d2cd678018
4 changed files with 7 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

11
stl/utils.py
View file

@ -7,15 +7,14 @@ import numpy as np
from lenses import bind
import stl.ast
from stl.ast import (And, F, G, Interval, LinEq, Neg, Or, Next, Until,
from stl.ast import (And, F, G, Interval, Neg, Or, Next, Until,
AtomicPred, _Top, _Bot)
from stl.types import STL
oo = float('inf')
def f_neg_or_canonical_form(phi: STL) -> STL:
if isinstance(phi, (LinEq, AtomicPred, _Top, _Bot)):
def f_neg_or_canonical_form(phi):
if isinstance(phi, (AtomicPred, _Top, _Bot)):
return phi
children = [f_neg_or_canonical_form(s) for s in phi.children]
@ -120,7 +119,7 @@ def discretize(phi, dt, distribute=False, *, horizon=None):
def _discretize(phi, dt, horizon):
if isinstance(phi, (LinEq, AtomicPred, _Top, _Bot)):
if isinstance(phi, (AtomicPred, _Top, _Bot)):
return phi
if not isinstance(phi, (F, G, Until)):
@ -153,7 +152,7 @@ def _interval_discretizable(itvl, dt):
def _distribute_next(phi, i=0):
if isinstance(phi, (LinEq, AtomicPred)):
if isinstance(phi, AtomicPred):
return stl.utils.next(phi, i=i)
elif isinstance(phi, Next):
return _distribute_next(phi.arg, i=i+1)