support for multiple averaging intervals

1 files changed, 9 insertions, 1 deletions

diff --git a/test/test_function.py b/test/test_function.py
index ed0b2ed..ba87db8 100644
--- a/test/test_function.py
+++ b/test/test_function.py
@@ -39,6 +39,10 @@ def test_pwc():
     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)
 
+    # averaging over multiple intervals
+    a = f.avrg([(0.5, 1.5), (1.5, 3.5)])
+    assert_almost_equal(a, (0.5-0.5+0.5*1.5+1.0*0.75)/3.0, decimal=16)
+
 
 def test_pwc_add():
     # some random data
@@ -116,12 +120,16 @@ def test_pwl():
     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])
+    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)
 
+    # averaging over multiple intervals
+    a = f.avrg([(0.5, 1.5), (1.5, 2.5)])
+    assert_almost_equal(a, (1.375*0.5 - 0.45 + 0.75)/2.0, decimal=16)
+
 
 def test_pwl_add():
     x = [0.0, 1.0, 2.0, 2.5, 4.0]