From dbc31ebf878b4888e0a11fcf48dac406cd1a828a Mon Sep 17 00:00:00 2001 From: Marcell Vazquez-Chanlatte Date: Wed, 27 Sep 2017 21:53:18 -0700 Subject: [PATCH] removing dead tests + add hypothesis-cfg in requirements.txt --- requirements.txt | 1 + setup.py | 2 +- stl/parser.py | 3 --- stl/test_boolean_eval.py | 24 ------------------------ 4 files changed, 2 insertions(+), 28 deletions(-) diff --git a/requirements.txt b/requirements.txt index f79f642..5e6446c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ +-e git://github.com/mvcisback/hypothesis-cfg/ bitarray==0.8.1 funcy==1.7.2 lenses==0.1.7 diff --git a/setup.py b/setup.py index 112e096..8f95cc6 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ setup(name='py-stl', 'lenses', 'sympy', 'bitarray', - 'traces' + 'traces', ], packages=find_packages(), ) diff --git a/stl/parser.py b/stl/parser.py index deb1028..67cc30b 100644 --- a/stl/parser.py +++ b/stl/parser.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- -# TODO: break out into seperate library # TODO: allow multiplication to be distributive -# TODO: support reference specific time points -# TODO: add support for parsing Until # TODO: support variables on both sides of ineq # TODO: Allow -x = -1*x diff --git a/stl/test_boolean_eval.py b/stl/test_boolean_eval.py index 113184b..b3a96c1 100644 --- a/stl/test_boolean_eval.py +++ b/stl/test_boolean_eval.py @@ -57,27 +57,3 @@ def test_temporal_identities(phi): stl_eval4 = stl.fastboolean_eval.pointwise_sat(stl.env(phi, lo=0, hi=4)) assert stl_eval4(x, 0) == stl_eval3(x, 0) -""" - def test_eval(self, phi_str, r): - phi = stl.parse(phi_str) - stl_eval = stl.boolean_eval2.pointwise_sat(phi) - stl_eval2 = stl.boolean_eval2.pointwise_sat(~phi) - self.assertEqual(stl_eval(x, 0)[0], r) - self.assertEqual(stl_eval2(x, 0)[0], not r) - - - - @params(*examples) - def test_fasteval(self, phi_str, _): - phi = stl.parse(phi_str) - stl_eval = stl.boolean_eval.pointwise_sat(phi) - stl_evalf = stl.fastboolean_eval.pointwise_sat(phi) - stl_evalf2 = stl.fastboolean_eval.pointwise_sat(~phi) - - b_slow = stl_eval(x, 0) - b_fast = stl_evalf(x, 0) - b_fast2 = stl_evalf2(x, 0) - self.assertEqual(b_slow, b_fast) - self.assertEqual(b_fast, not b_fast2) - -"""