diff --git a/.travis.yml b/.travis.yml index a039d87..4593b27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,6 @@ language: python python: - "3.6" install: "pip install -r requirements.txt" -script: pytest --flake8 --cov=stl -x --cov-report=html +script: pytest --flake8 --cov=mtl -x --cov-report=html after_success: - codecov diff --git a/mtl/parser.py b/mtl/parser.py index 9523fa5..eedb03a 100644 --- a/mtl/parser.py +++ b/mtl/parser.py @@ -38,10 +38,10 @@ interval = "[" __ const_or_unbound __ "," __ const_or_unbound __ "]" const_or_unbound = const / "inf" / id -AP = ~r"[a-z\d]+" +AP = ~r"[a-z][a-z\d]*" -bot = "0" -top = "1" +bot = "False" +top = "True" id = ~r"[a-z\d]+" const = ~r"[-+]?(\d*\.\d+|\d+)" diff --git a/setup.py b/setup.py index bb8ad96..07268fd 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setup( name='metric-temporal-logic', version='0.2', description='TODO', - url='http://github.com/mvcisback/py-mtl', + url='http://github.com/mvcisback/py-metric-temporal-logic', author='Marcell Vazquez-Chanlatte', author_email='marcell.vc@eecs.berkeley.edu', license='MIT',