BUG: Changed ipmt to accept array_like arguments.

The ipmt function was also fixed to handle broadcasting. The tests
were improved and extended to cover the broadcasting capability.

2 files changed, 97 insertions, 11 deletions

diff --git a/numpy/lib/financial.py b/numpy/lib/financial.py
index d686aeca2..599a36198 100644
--- a/numpy/lib/financial.py
+++ b/numpy/lib/financial.py
@@ -18,9 +18,13 @@ _when_to_num = {'end':0, 'begin':1,
                 'finish':0}
 
 def _convert_when(when):
+    #Test to see if when has already been converted to ndarray
+    #This will happen if one function calls another, for example ppmt
+    if isinstance(when, np.ndarray):
+        return when
     try:
         return _when_to_num[when]
-    except KeyError:
+    except (KeyError, TypeError):
         return [_when_to_num[x] for x in when]
 
 
@@ -236,8 +240,8 @@ def nper(rate, pmt, pv, fv=0, when='end'):
     If you only had $150/month to pay towards the loan, how long would it take
     to pay-off a loan of $8,000 at 7% annual interest?
 
-    >>> np.nper(0.07/12, -150, 8000)
-    64.073348770661852
+    >>> print round(np.nper(0.07/12, -150, 8000), 5)
+    64.07335
 
     So, over 64 months would be required to pay off the loan.
 
@@ -354,17 +358,19 @@ def ipmt(rate, per, nper, pv, fv=0.0, when='end'):
     12  -216.26    -1.49    -0.00
 
     >>> interestpd = np.sum(ipmt)
-    >>> interestpd
-    -112.98308424136215
+    >>> np.round(interestpd, 2)
+    -112.98
 
     """
     when = _convert_when(when)
-    if when == 1 and per == 1:
-        return 0.0
+    rate, per, nper, pv, fv, when = np.broadcast_arrays(rate, per, nper, pv, fv, when)
     total_pmt = pmt(rate, nper, pv, fv, when)
     ipmt = _rbl(rate, per, total_pmt, pv, when)*rate
-    if when == 1:
-        return ipmt/(1 + rate)
+    try:
+        ipmt = np.where(when == 1, ipmt/(1 + rate), ipmt)
+        ipmt = np.where(np.logical_and(when == 1, per == 1), 0.0, ipmt)
+    except IndexError:
+        pass
     return ipmt
 
 def _rbl(rate, per, pmt, pv, when):
@@ -620,8 +626,8 @@ def irr(values):
 
     Examples
     --------
-    >>> np.irr([-100, 39, 59, 55, 20])
-    0.2809484211599611
+    >>> print round(np.irr([-100, 39, 59, 55, 20]), 5)
+    0.28095
 
     (Compare with the Example given for numpy.lib.financial.npv)
 
diff --git a/numpy/lib/tests/test_financial.py b/numpy/lib/tests/test_financial.py
index ba6846bf0..5fe976143 100644
--- a/numpy/lib/tests/test_financial.py
+++ b/numpy/lib/tests/test_financial.py
@@ -54,6 +54,86 @@ class TestFinancial(TestCase):
         val = [39000,30000,21000,37000,46000]
         assert_(np.isnan(np.mirr(val, 0.10, 0.12)))
 
+    def test_when(self):
+        #begin
+        assert_almost_equal(np.rate(10,20,-3500,10000,1),
+                            np.rate(10,20,-3500,10000,'begin'), 4)
+        #end
+        assert_almost_equal(np.rate(10,20,-3500,10000),
+                            np.rate(10,20,-3500,10000,'end'), 4)
+        assert_almost_equal(np.rate(10,20,-3500,10000,0),
+                            np.rate(10,20,-3500,10000,'end'), 4)
+
+        # begin
+        assert_almost_equal(np.pv(0.07,20,12000,0,1),
+                            np.pv(0.07,20,12000,0,'begin'), 2)
+        # end
+        assert_almost_equal(np.pv(0.07,20,12000,0),
+                            np.pv(0.07,20,12000,0,'end'), 2)
+        assert_almost_equal(np.pv(0.07,20,12000,0,0),
+                            np.pv(0.07,20,12000,0,'end'), 2)
+
+        # begin
+        assert_almost_equal(np.fv(0.075, 20, -2000,0,1),
+                            np.fv(0.075, 20, -2000,0,'begin'), 4)
+        # end
+        assert_almost_equal(np.fv(0.075, 20, -2000,0),
+                            np.fv(0.075, 20, -2000,0,'end'), 4)
+        assert_almost_equal(np.fv(0.075, 20, -2000,0,0),
+                            np.fv(0.075, 20, -2000,0,'end'), 4)
+
+        # begin
+        assert_almost_equal(np.pmt(0.08/12,5*12,15000.,0,1),
+                            np.pmt(0.08/12,5*12,15000.,0,'begin'), 4)
+        # end
+        assert_almost_equal(np.pmt(0.08/12,5*12,15000.,0),
+                            np.pmt(0.08/12,5*12,15000.,0,'end'), 4)
+        assert_almost_equal(np.pmt(0.08/12,5*12,15000.,0,0),
+                            np.pmt(0.08/12,5*12,15000.,0,'end'), 4)
+
+        # begin
+        assert_almost_equal(np.ppmt(0.1/12,1,60,55000,0,1),
+                            np.ppmt(0.1/12,1,60,55000,0,'begin'), 4)
+        # end
+        assert_almost_equal(np.ppmt(0.1/12,1,60,55000,0),
+                            np.ppmt(0.1/12,1,60,55000,0,'end'), 4)
+        assert_almost_equal(np.ppmt(0.1/12,1,60,55000,0,0),
+                            np.ppmt(0.1/12,1,60,55000,0,'end'), 4)
+
+        # begin
+        assert_almost_equal(np.ipmt(0.1/12,1,24,2000,0,1),
+                            np.ipmt(0.1/12,1,24,2000,0,'begin'), 4)
+        # end
+        assert_almost_equal(np.ipmt(0.1/12,1,24,2000,0),
+                            np.ipmt(0.1/12,1,24,2000,0,'end'), 4)
+        assert_almost_equal(np.ipmt(0.1/12,1,24,2000,0,0),
+                            np.ipmt(0.1/12,1,24,2000,0,'end'), 4)
+
+        # begin
+        assert_almost_equal(np.nper(0.075,-2000,0,100000.,1),
+                            np.nper(0.075,-2000,0,100000.,'begin'), 4)
+        # end
+        assert_almost_equal(np.nper(0.075,-2000,0,100000.),
+                            np.nper(0.075,-2000,0,100000.,'end'), 4)
+        assert_almost_equal(np.nper(0.075,-2000,0,100000.,0),
+                            np.nper(0.075,-2000,0,100000.,'end'), 4)
+
+    def test_broadcast(self):
+        assert_almost_equal(np.nper(0.075,-2000,0,100000.,[0,1]),
+                            [ 21.5449442 ,  20.76156441], 4)
+
+        assert_almost_equal(np.ipmt(0.1/12,range(5), 24, 2000),
+                            [-17.29165168, -16.66666667, -16.03647345,
+                                -15.40102862, -14.76028842], 4)
+
+        assert_almost_equal(np.ppmt(0.1/12,range(5), 24, 2000),
+                            [-74.998201  , -75.62318601, -76.25337923,
+                                -76.88882405, -77.52956425], 4)
+
+        assert_almost_equal(np.ppmt(0.1/12,range(5), 24, 2000, 0,
+            [0,0,1,'end','begin']),
+                            [-74.998201  , -75.62318601, -75.62318601,
+                                -76.88882405, -76.88882405], 4)
 
 if __name__ == "__main__":
     run_module_suite()