owlplanner 2025.12.3__py3-none-any.whl → 2025.12.5__py3-none-any.whl

owlplanner/plan.py

@@ -1160,25 +1160,26 @@ class Plan(object):
             h = self.horizons[i]
             for n in range(h):
                 rhs = 0
-                # To add compounded gains to original amount.
+                # To add compounded gains to cumulative amounts. Always keep cgains >= 1.
                 cgains = 1
                 row = self.A.newRow()
                 row.addElem(_q3(self.C["b"], i, 2, n, self.N_i, self.N_j, self.N_n + 1), 1)
                 row.addElem(_q3(self.C["w"], i, 2, n, self.N_i, self.N_j, self.N_n), -1)
                 for dn in range(1, 6):
                     nn = n - dn
-                    if nn >= 0:       # Past of future is now or in the future: use variables and parameters.
+                    if nn >= 0:   # Past of future is now or in the future: use variables or parameters.
                         Tau1 = 1 + np.sum(self.alpha_ijkn[i, 2, :, nn] * self.tau_kn[:, nn], axis=0)
-                        cgains *= Tau1
+                        # Ignore market downs.
+                        cgains *= max(1, Tau1)
                         row.addElem(_q2(self.C["x"], i, nn, self.N_i, self.N_n), -cgains)
-                        # If a contribution - it can be withdrawn but not the gains.
+                        # If a contribution, it has only penalty on gains, not on deposited amount.
                         rhs += (cgains - 1) * self.kappa_ijn[i, 2, nn]
                     else:  # Past of future is in the past:
-                        # Parameters are stored at the end of contributions and conversions arrays.
                         cgains *= oldTau1
-                        # If a contribution, it has no penalty, but assume a conversion.
-                        # rhs += (cgains - 1) * self.kappa_ijn[i, 2, nn] + cgains * self.myRothX_in[i, nn]
-                        rhs += cgains * self.kappa_ijn[i, 2, nn] + cgains * self.myRothX_in[i, nn]
+                        # Past years are stored at the end of contributions and conversions arrays.
+                        # Use negative index to access tail of array.
+                        rhs += (cgains - 1) * self.kappa_ijn[i, 2, nn] + cgains * self.myRothX_in[i, nn]
+                        # rhs += cgains * self.kappa_ijn[i, 2, nn] + cgains * self.myRothX_in[i, nn]
 
                 self.A.addRow(row, rhs, np.inf)
 

owlplanner/version.py

@@ -1 +1 @@
-__version__ = "2025.12.03"
+__version__ = "2025.12.05"

{owlplanner-2025.12.3.dist-info → owlplanner-2025.12.5.dist-info}/METADATA

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

{owlplanner-2025.12.3.dist-info → owlplanner-2025.12.5.dist-info}/RECORD

@@ -2,7 +2,7 @@ owlplanner/__init__.py,sha256=hJ2i4m2JpHPAKyQLjYOXpJzeEsgcTcKD-Vhm0AIjjWg,592
 owlplanner/abcapi.py,sha256=rtg7d0UbftinokR9VlB49VUjDjzUq3ONnJbhMXVIrgo,6879
 owlplanner/config.py,sha256=bEO5-QAy_rXjzTIJFEIFSfFSdELbJUDp4mRyU2wRBvA,12790
 owlplanner/mylogging.py,sha256=OVGeDFO7LIZG91R6HMpZBzjno-B8PH8Fo00Jw2Pdgqw,2558
-owlplanner/plan.py,sha256=NgrzZPWvxV9lMWfLLilVdxY4QdswZjuOjxgPR8CgSHA,117522
+owlplanner/plan.py,sha256=FCtiG60AfdvgcUQgnQ4N2KlFXl6T0xC1pdyj9-GGwgY,117597
 owlplanner/progress.py,sha256=dUUlFmSAKUei36rUj2BINRY10f_YEUo_e23d0es6nrc,530
 owlplanner/rates.py,sha256=9Nmo8AKsyi5PoCUrzhr06phkSlNTv-TXzj5iYFU76AY,14113
 owlplanner/socialsecurity.py,sha256=ODxJ7QqHomzKVVlCPMNa-H8ywOcEk8ktyyDJ2MDrMxo,2195
@@ -10,7 +10,7 @@ owlplanner/tax2025.py,sha256=4KYaT6TO6WU7wDjgdRW48lqfwvVCtaXs9tcw1nleKhg,10834
 owlplanner/tax2026.py,sha256=hgCiCJWVzJITk0cA8W-zxl-a0kObijPZ1yXc0F6MAwk,10848
 owlplanner/timelists.py,sha256=UdzH6A_-w4REn4A1po7yndSiy1R8_R-i_C-94re4JYY,4093
 owlplanner/utils.py,sha256=afAjeO6Msf6Rn4jwz_7Ody9rHGWlBR7iQFqe1xzLNQc,2513
-owlplanner/version.py,sha256=4vemu4v7aVVvv0jXrGPQlk_6PPXwT_p-wdqdrbPl7QI,28
+owlplanner/version.py,sha256=tIESH6G3DgWFtRScfgtDIL48ULuRpQ0KcMjAFDHJ1D8,28
 owlplanner/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 owlplanner/data/rates.csv,sha256=6fxg56BVVORrj9wJlUGFdGXKvOX5r7CSca8uhUbbuIU,3734
 owlplanner/plotting/__init__.py,sha256=uhxqtUi0OI-QWNOO2LkXgQViW_9yM3rYb-204Wit974,250
@@ -18,7 +18,7 @@ owlplanner/plotting/base.py,sha256=UimGKpMTV-dVm3BX5Apr_Ltorc7dlDLCRPRQ3RF_v7c,2
 owlplanner/plotting/factory.py,sha256=EDopIAPQr9zHRgemObko18FlCeRNhNCoLNNFAOq-X6s,1030
 owlplanner/plotting/matplotlib_backend.py,sha256=AOEkapD94U5hGNoS0EdbRoe8mgdMHH4oOvkXADZS914,17957
 owlplanner/plotting/plotly_backend.py,sha256=AO33GxBHGYG5osir_H1iRRtGxdhs4AjfLV2d_xm35nY,33138
-owlplanner-2025.12.3.dist-info/METADATA,sha256=V7_0-bsuSMQqs1wsbMAVxMcY3bg2gAwjs3z9Fm139Mk,55234
-owlplanner-2025.12.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-owlplanner-2025.12.3.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-owlplanner-2025.12.3.dist-info/RECORD,,
+owlplanner-2025.12.5.dist-info/METADATA,sha256=S8mJrqS-nw6cS91G6jOtK6kkN-xGvDKnMEwpBRv1LPs,55234
+owlplanner-2025.12.5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+owlplanner-2025.12.5.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+owlplanner-2025.12.5.dist-info/RECORD,,