owlplanner 2025.4.1__py3-none-any.whl → 2025.4.6__py3-none-any.whl

owlplanner/plan.py

@@ -1122,16 +1122,17 @@ class Plan(object):
             B.set0_Ub(_q1(Ce, n, Nn), self.sigmaBar_n[n])
 
         # Roth conversions equalities/inequalities.
-        if "maxRothConversion" in options:
-            if options["maxRothConversion"] == "file":
-                # self.mylog.vprint(f"Fixing Roth conversions to those from file {self.timeListsFileName}.")
-                for i in range(Ni):
-                    for n in range(self.horizons[i]):
-                        rhs = self.myRothX_in[i][n]
-                        B.setRange(_q2(Cx, i, n, Ni, Nn), rhs, rhs)
-            else:
+        # This condition supercedes everything else.
+        if "maxRothConversion" in options and options["maxRothConversion"] == "file":
+            # self.mylog.vprint(f"Fixing Roth conversions to those from file {self.timeListsFileName}.")
+            for i in range(Ni):
+                for n in range(self.horizons[i]):
+                    rhs = self.myRothX_in[i][n]
+                    B.setRange(_q2(Cx, i, n, Ni, Nn), rhs, rhs)
+        else:
+            if "maxRothConversion" in options:
                 rhsopt = options["maxRothConversion"]
-                assert isinstance(rhsopt, (int, float)), "Specified maxConversion is not a number."
+                assert isinstance(rhsopt, (int, float)), "Specified maxRothConversion is not a number."
                 rhsopt *= units
                 if rhsopt < 0:
                     # self.mylog.vprint('Unlimited Roth conversions (<0)')
@@ -1143,27 +1144,28 @@ class Plan(object):
                             #  Should we adjust Roth conversion cap with inflation?
                             B.set0_Ub(_q2(Cx, i, n, Ni, Nn), rhsopt)
 
-        # Process startRothConversions option.
-        if "startRothConversions" in options:
-            rhsopt = options["startRothConversions"]
-            thisyear = date.today().year
-            yearn = max(rhsopt - thisyear, 0)
+            # Process startRothConversions option.
+            if "startRothConversions" in options:
+                rhsopt = options["startRothConversions"]
+                assert isinstance(rhsopt, (int, float)), "Specified startRothConversions is not a number."
+                thisyear = date.today().year
+                yearn = max(rhsopt - thisyear, 0)
 
-            for i in range(Ni):
-                nstart = min(yearn, self.horizons[i])
-                for n in range(0, nstart):
-                    B.set0_Ub(_q2(Cx, i, n, Ni, Nn), zero)
-
-        # Process noRothConversions option. Also valid when N_i == 1, why not?
-        if "noRothConversions" in options and options["noRothConversions"] != "None":
-            rhsopt = options["noRothConversions"]
-            try:
-                i_x = self.inames.index(rhsopt)
-            except ValueError:
-                raise ValueError(f"Unknown individual {rhsopt} for noRothConversions:")
+                for i in range(Ni):
+                    nstart = min(yearn, self.horizons[i])
+                    for n in range(0, nstart):
+                        B.set0_Ub(_q2(Cx, i, n, Ni, Nn), zero)
+
+            # Process noRothConversions option. Also valid when N_i == 1, why not?
+            if "noRothConversions" in options and options["noRothConversions"] != "None":
+                rhsopt = options["noRothConversions"]
+                try:
+                    i_x = self.inames.index(rhsopt)
+                except ValueError:
+                    raise ValueError(f"Unknown individual {rhsopt} for noRothConversions:")
 
-            for n in range(Nn):
-                B.set0_Ub(_q2(Cx, i_x, n, Ni, Nn), zero)
+                for n in range(Nn):
+                    B.set0_Ub(_q2(Cx, i_x, n, Ni, Nn), zero)
 
         # Impose withdrawal limits on taxable and tax-exempt accounts.
         for i in range(Ni):

owlplanner/version.py

@@ -1 +1 @@
-__version__ = "2025.04.01"
+__version__ = "2025.04.06"

{owlplanner-2025.4.1.dist-info → owlplanner-2025.4.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: owlplanner
-Version: 2025.4.1
+Version: 2025.4.6
 Summary: Owl: Retirement planner with great wisdom
 Project-URL: HomePage, https://github.com/mdlacasse/owl
 Project-URL: Repository, https://github.com/mdlacasse/owl
@@ -885,7 +885,9 @@ assets to support, even with no estate being left.
 - Image from [freepik](https://freepik.com)
 - Optimization solver from [HiGHS](https://highs.dev)
 - Streamlit Community Cloud [Streamlit](https://streamlit.io)
-- Contributors: Josh (noimjosh@gmail.com) for Docker image code
+- Contributors: Josh (noimjosh@gmail.com) for Docker image code,
+ Dale Seng (sengsational) for great insights and suggestions,
+ Robert E. Anderson (NH-RedAnt) for bug fixes and suggestions.
 
 ---------------------------------------------------------------------
 

{owlplanner-2025.4.1.dist-info → owlplanner-2025.4.6.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=F6GS3n02VeFX0GCVeM4J7Ra0in4N632W6TZIXk7Yj2w,12519
 owlplanner/logging.py,sha256=tYMw04O-XYSzjTj36fmKJGLcE1VkK6k6oJNeqtKXzuc,2530
-owlplanner/plan.py,sha256=glDdZIwHrSBl73SrEvuueP6HhpZYJcdkIZUTyEMgufQ,117423
+owlplanner/plan.py,sha256=obzXmEJhtkIhmTFOR02Q6g1deigUkFnufyv54EqvD5o,117672
 owlplanner/progress.py,sha256=8jlCvvtgDI89zXVNMBg1-lnEyhpPvKQS2X5oAIpoOVQ,384
 owlplanner/rates.py,sha256=gJaoe-gJqWCQV5qVLlHp-Yn9TSJs-PJzeTbOwMCbqWs,15682
 owlplanner/tax2025.py,sha256=HEXfL0HfwUvZOQRjivXO2jFeoVZ5m_yk_hoMiVi-hR0,7745
 owlplanner/timelists.py,sha256=tYieZU67FT6TCcQQis36JaXGI7dT6NqD7RvdEjgJL4M,4026
 owlplanner/utils.py,sha256=WpJgn79YZfH8UCkcmhd-AZlxlGuz1i1-UDBRXImsY6I,2485
-owlplanner/version.py,sha256=Kr7kuAxBy9BosIPj1QB_sXrE5p_ga2ZEalol7JPRHL0,28
+owlplanner/version.py,sha256=g2rr_JMOkjQqdPnnJCF1R7Ur7UK6nLUHhkYYqz9ozkE,28
 owlplanner/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 owlplanner/data/rates.csv,sha256=6fxg56BVVORrj9wJlUGFdGXKvOX5r7CSca8uhUbbuIU,3734
-owlplanner-2025.4.1.dist-info/METADATA,sha256=ncoHFUU3X9fTZ0ug2NJX3KAkA4958htE1AafkwkbuOg,53800
-owlplanner-2025.4.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-owlplanner-2025.4.1.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-owlplanner-2025.4.1.dist-info/RECORD,,
+owlplanner-2025.4.6.dist-info/METADATA,sha256=VH6gVr3ZQf2itgEs01hvc1n86qd1jp1xAysEosQcXN4,53926
+owlplanner-2025.4.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+owlplanner-2025.4.6.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+owlplanner-2025.4.6.dist-info/RECORD,,