diff options
| author | Mario Mulansky <mario.mulansky@gmx.net> | 2014-10-22 22:17:27 +0200 |
|---|---|---|
| committer | Mario Mulansky <mario.mulansky@gmx.net> | 2014-10-22 22:17:27 +0200 |
| commit | 11f05d9dac3711d89db37a043db3d9437958c6f3 (patch) | |
| tree | ddcad0d56d33ff69907a92fe4c5cbcb734311c27 /test | |
| parent | 7dbb5f87321fc89b6c84552cfd821f96fe364bbe (diff) | |
avrg functions now take intervals
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_function.py | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/test/test_function.py b/test/test_function.py index cabcf44..ed0b2ed 100644 --- a/test/test_function.py +++ b/test/test_function.py @@ -31,8 +31,13 @@ def test_pwc(): # interval averaging a = f.avrg([0.5, 3.5]) - print(a) assert_almost_equal(a, (0.5-0.5+0.5*1.5+1.0*0.75)/3.0, decimal=16) + a = f.avrg([1.5, 3.5]) + assert_almost_equal(a, (-0.5*0.5+0.5*1.5+1.0*0.75)/2.0, decimal=16) + a = f.avrg([1.0, 3.5]) + assert_almost_equal(a, (-0.5*1.0+0.5*1.5+1.0*0.75)/2.5, decimal=16) + a = f.avrg([1.0, 4.0]) + assert_almost_equal(a, (-0.5*1.0+0.5*1.5+1.5*0.75)/3.0, decimal=16) def test_pwc_add(): @@ -105,6 +110,18 @@ def test_pwl(): avrg_expected = (1.25 - 0.45 + 0.75 + 1.5*0.5) / 4.0 assert_almost_equal(f.avrg(), avrg_expected, decimal=16) + # interval averaging + a = f.avrg([0.5, 2.5]) + assert_almost_equal(a, (1.375*0.5 - 0.45 + 0.75)/2.0, decimal=16) + a = f.avrg([1.5, 3.5]) + assert_almost_equal(a, (-0.425*0.5 + 0.75 + (0.75+0.75-0.5/1.5)/2) / 2.0, + decimal=16) + a = f.avrg([1.0, 3.5]) + assert_almost_equal(a, (-0.45 + 0.75 + (0.75+0.75-0.5/1.5)/2) / 2.5, + decimal=16) + a = f.avrg([1.0, 4.0]) + assert_almost_equal(a, (-0.45 + 0.75 + 1.5*0.5) / 3.0, decimal=16) + def test_pwl_add(): x = [0.0, 1.0, 2.0, 2.5, 4.0] |