owlplanner 2025.3.14__py3-none-any.whl → 2025.3.16__py3-none-any.whl

owlplanner/plan.py

@@ -1284,19 +1284,15 @@ class Plan(object):
                 # Minus capital gains on taxable withdrawals using last year's rate if >=0.
                 # Plus taxable account withdrawals, and all other withdrawals.
                 row.addElem(_q3(Cw, i, 0, n, Ni, Nj, Nn), fac * (tau_0prev[n] - self.mu) - 1)
-                row.addElem(_q3(Cw, i, 1, n, Ni, Nj, Nn), -1)
-                row.addElem(_q3(Cw, i, 2, n, Ni, Nj, Nn), -1)
+                penalty = 0.1 if n < self.n59[i] else 0
+                row.addElem(_q3(Cw, i, 1, n, Ni, Nj, Nn), -1 + penalty)
+                row.addElem(_q3(Cw, i, 2, n, Ni, Nj, Nn), -1 + penalty)
                 row.addElem(_q2(Cd, i, n, Ni, Nn), fac * self.mu)
 
             # Minus tax on ordinary income, T_n.
             for t in range(Nt):
                 row.addElem(_q2(CF, t, n, Nt, Nn), self.theta_tn[t, n])
 
-            # Minus 10% penalty on early withdrawals.
-            if n < self.n59[i]:
-                row.addElem(_q3(Cw, i, 1, n, Ni, Nj, Nn), 0.1)
-                row.addElem(_q3(Cw, i, 2, n, Ni, Nj, Nn), 0.1)
-
             A.addRow(row, rhs, rhs)
 
         # Impose income profile.
@@ -1978,12 +1974,12 @@ class Plan(object):
         self.G_n = np.sum(self.F_tn, axis=0)
         self.T_tn = self.F_tn * self.theta_tn
         self.T_n = np.sum(self.T_tn, axis=0)
-        self.penalty_n = np.zeros(Nn)
-        # Add early withdrawal penalties if any.
+        self.P_n = np.zeros(Nn)
+        # Add early withdrawal penalty if any.
         for i in range(Ni):
-            self.penalty_n[0:self.n59[i]] += 0.1*(self.w_ijn[i, 1, 0:self.n59[i]] + self.w_ijn[i, 2, 0:self.n59[i]])
+            self.P_n[0:self.n59[i]] += 0.1*(self.w_ijn[i, 1, 0:self.n59[i]] + self.w_ijn[i, 2, 0:self.n59[i]])
 
-        self.T_n += self.penalty_n
+        self.T_n += self.P_n
 
         tau_0 = np.array(self.tau_kn[0, :])
         tau_0[tau_0 < 0] = 0
@@ -2126,8 +2122,8 @@ class Plan(object):
             dic[f"-- Subtotal in tax bracket {tname}"] = f"{u.d(taxPaidNow)}"
             dic[f"-- [Subtotal in tax bracket {tname}]"] = f"{u.d(taxPaid)}"
 
-        penaltyPaid = np.sum(self.penalty_n, axis=0)
-        penaltyPaidNow = np.sum(self.penalty_n / self.gamma_n[:-1], axis=0)
+        penaltyPaid = np.sum(self.P_n, axis=0)
+        penaltyPaidNow = np.sum(self.P_n / self.gamma_n[:-1], axis=0)
         dic["-- Subtotal in early withdrawal penalty"] = f"{u.d(penaltyPaidNow)}"
         dic["-- [Subtotal in early withdrawal penalty]"] = f"{u.d(penaltyPaid)}"
 

owlplanner/rates.py

@@ -110,6 +110,9 @@ def getRatesDistributions(frm, to, mylog=None):
     # Build correlation matrix by dividing by the stdev for each column and row.
     corr = covar / stdev[:, None]
     corr = corr.T / stdev[:, None]
+    # Fold round-off errors in proper bounds.
+    corr[corr > 1] = 1
+    corr[corr < -1] = -1
     mylog.print("correlation matrix: \n\t\t%s" % str(corr).replace("\n", "\n\t\t"))
 
     return means, stdev, corr, covar

owlplanner/version.py

@@ -1 +1 @@
-__version__ = "2025.03.14"
+__version__ = "2025.03.16"

{owlplanner-2025.3.14.dist-info → owlplanner-2025.3.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: owlplanner
-Version: 2025.3.14
+Version: 2025.3.16
 Summary: Owl: Retirement planner with great wisdom
 Project-URL: HomePage, https://github.com/mdlacasse/owl
 Project-URL: Repository, https://github.com/mdlacasse/owl

{owlplanner-2025.3.14.dist-info → owlplanner-2025.3.16.dist-info}/RECORD

@@ -2,16 +2,16 @@ owlplanner/__init__.py,sha256=QqrdT0Qks20osBTg7h0vJHAxpP9lL7DA99xb0nYbtw4,254
 owlplanner/abcapi.py,sha256=LbzW_KcNy0IeHp42MUHwGu_H67B2h_e1_vu-c2ACTkQ,6646
 owlplanner/config.py,sha256=uJ6jZ9Rx2CB2P5cFRscsUCXOW6uml7I4pta2ozjW0uo,12263
 owlplanner/logging.py,sha256=tYMw04O-XYSzjTj36fmKJGLcE1VkK6k6oJNeqtKXzuc,2530
-owlplanner/plan.py,sha256=2uS_N121p-fPhCboVSAthdt_uVw109ltLTvCLeGouuo,116263
+owlplanner/plan.py,sha256=SWTqNMC0Mk2BUO3CBeeyBaz_cCbLddlSgPJaIj2Cc-I,116090
 owlplanner/progress.py,sha256=8jlCvvtgDI89zXVNMBg1-lnEyhpPvKQS2X5oAIpoOVQ,384
-owlplanner/rates.py,sha256=TN407qU4n-bac1oymkQ_n2QKEPwFQxy6JZVGwgIkLQU,15585
+owlplanner/rates.py,sha256=gJaoe-gJqWCQV5qVLlHp-Yn9TSJs-PJzeTbOwMCbqWs,15682
 owlplanner/tax2025.py,sha256=B-A5eU3wxdcAaxRCbT3qI-JEKoD_ZeNbg_86XhNdQEI,7745
 owlplanner/timelists.py,sha256=tYieZU67FT6TCcQQis36JaXGI7dT6NqD7RvdEjgJL4M,4026
 owlplanner/utils.py,sha256=WpJgn79YZfH8UCkcmhd-AZlxlGuz1i1-UDBRXImsY6I,2485
-owlplanner/version.py,sha256=gPOv802nGWM84uQsfLVWHJKlgbpuozzBAjyW-OgDkzE,28
+owlplanner/version.py,sha256=Jcl8LadUqoYB6SO4YGpB9C3ZbDxgmTQBNGqCWqKkUzE,28
 owlplanner/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 owlplanner/data/rates.csv,sha256=6fxg56BVVORrj9wJlUGFdGXKvOX5r7CSca8uhUbbuIU,3734
-owlplanner-2025.3.14.dist-info/METADATA,sha256=C5BlpAPu2CwtVQmuBUPDTYi7mXg86T3b0dYR5anPUak,53801
-owlplanner-2025.3.14.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-owlplanner-2025.3.14.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-owlplanner-2025.3.14.dist-info/RECORD,,
+owlplanner-2025.3.16.dist-info/METADATA,sha256=C1iW41089-MQsqEn1cp1-L7kTcwQWnSKGgGOLiZdt-g,53801
+owlplanner-2025.3.16.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+owlplanner-2025.3.16.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+owlplanner-2025.3.16.dist-info/RECORD,,