begin work on addressing #64

genedan · Sep 26, 2020 · a66bf76 · a66bf76
1 parent ffe589f
commit a66bf76
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/tmval/annuity.py b/tmval/annuity.py
@@ -449,9 +449,9 @@ def sv(self):
                 sv = self.sbar_angln()
 
             else:
-                sv = self.amount * \
-                     ((1 + self.gr.interest_rate) ** self.term - 1) / \
-                     (self.gr.val(self.period) - 1)
+                i = self.gr.val(self.period) - 1
+                n = self.n_payments
+                sv = self.amount * ((1 + i) ** n - 1) / i
 
         elif self.aprog != 0 and self.mprog == 0:
 
@@ -934,7 +934,7 @@ def olb_p(
 
     else:
         ann = Annuity(
-            period=period,
+            period=min(period, term - t),
             term=term - t,
             gr=gr,
             amount=q

diff --git a/tmval/loan.py b/tmval/loan.py
@@ -135,6 +135,9 @@ def __init__(
             elif pp:
                 self.pmt_sched = self.get_payments()
                 self.pmt = self.pmt_sched.amounts[0]
+            else:
+                self.pmt_sched = Payments(times=[], amounts=[])
+                self.pmt = None
 
         elif pmt and isinstance(pmt, (float, int)) and period and term:
             n_payments = ceil(term / period)