owlplanner 2025.4.7__py3-none-any.whl → 2025.4.26__py3-none-any.whl

owlplanner/plan.py

@@ -304,8 +304,8 @@ class Plan(object):
         self.myRothX_in = np.zeros((self.N_i, self.N_n))
         self.kappa_ijn = np.zeros((self.N_i, self.N_j, self.N_n))
 
-        # Previous 2 years for Medicare.
-        self.prevMAGI = np.zeros((2))
+        # Previous 3 years for Medicare.
+        self.prevMAGI = np.zeros((3))
 
         # Default slack on profile.
         self.lambdha = 0
@@ -1087,15 +1087,10 @@ class Plan(object):
         Tau1_ijn = 1 + tau_ijn
         Tauh_ijn = 1 + tau_ijn / 2
 
-        if "units" in options:
-            units = u.getUnits(options["units"])
-        else:
-            units = 1000
-
-        bigM = 5e6
-        if "bigM" in options:
-            # No units for bigM.
-            bigM = options["bigM"]
+        units = u.getUnits(options.get("units", "k"))
+        # No units for bigM.
+        bigM = options.get("bigM", 5e6)
+        assert isinstance(bigM, (int, float)), f"bigM {bigM} is not a number."
 
         ###################################################################
         # Inequality constraint matrix with upper and lower bound vectors.
@@ -1668,16 +1663,13 @@ class Plan(object):
         if objective == "maxSpending" and "bequest" not in myoptions:
             self.mylog.vprint("Using bequest of $1.")
 
-        self.prevMAGI = np.zeros(2)
+        self.prevMAGI = np.zeros(3)
         if "previousMAGIs" in myoptions:
             magi = myoptions["previousMAGIs"]
-            if len(magi) != 2:
-                raise ValueError("previousMAGIs must have two values.")
+            if len(magi) != 3:
+                raise ValueError("previousMAGIs must have 3 values.")
 
-            if "units" in options:
-                units = u.getUnits(options["units"])
-            else:
-                units = 1000
+            units = u.getUnits(options.get("units", "k"))
             self.prevMAGI = units * np.array(magi)
 
         self.lambdha = 0
@@ -1722,7 +1714,7 @@ class Plan(object):
             objFac = -1 / self.gamma_n[-1]
 
         # mip_rel_gap smaller than 1e-6 can lead to oscillatory solutions.
-        milpOptions = {"disp": False, "mip_rel_gap": 1e-6}
+        milpOptions = {"disp": False, "mip_rel_gap": 1e-7}
 
         it = 0
         absdiff = np.inf

owlplanner/tax2025.py

@@ -90,16 +90,17 @@ def mediCosts(yobs, horizons, magi, prevmagi, gamma_n, Nn):
     Ni = len(yobs)
     costs = np.zeros(Nn)
     for n in range(Nn):
+        status = 0 if Ni == 1 else 1 if n < horizons[0] and n < horizons[1] else 0
         for i in range(Ni):
             if thisyear + n - yobs[i] >= 65 and n < horizons[i]:
                 # Start with the (indexed) basic Medicare part B premium.
                 costs[n] += gamma_n[n] * irmaaFees[0]
-                if n < 2:
+                if n < 3:
                     mymagi = prevmagi[n]
                 else:
                     mymagi = magi[n - 2]
                 for q in range(1, 6):
-                    if mymagi > gamma_n[n] * irmaaBrackets[Ni - 1][q]:
+                    if mymagi > gamma_n[n] * irmaaBrackets[status][q]:
                         costs[n] += gamma_n[n] * irmaaFees[q]
 
     return costs

owlplanner/version.py

@@ -1 +1 @@
-__version__ = "2025.04.07"
+__version__ = "2025.04.26"

{owlplanner-2025.4.7.dist-info → owlplanner-2025.4.26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: owlplanner
-Version: 2025.4.7
+Version: 2025.4.26
 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.4.7.dist-info → owlplanner-2025.4.26.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=obzXmEJhtkIhmTFOR02Q6g1deigUkFnufyv54EqvD5o,117672
+owlplanner/plan.py,sha256=X__wXxR0teB8RfkfV1BMgo_F_uxNYEBWsVnYHJtifW0,117550
 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/tax2025.py,sha256=JDBtFFAf2bWtKUMuE3W5F0nBhYaKBjmdJj0iayM2iGA,7829
 owlplanner/timelists.py,sha256=tYieZU67FT6TCcQQis36JaXGI7dT6NqD7RvdEjgJL4M,4026
 owlplanner/utils.py,sha256=WpJgn79YZfH8UCkcmhd-AZlxlGuz1i1-UDBRXImsY6I,2485
-owlplanner/version.py,sha256=FPy7IEsRPBEknOcrDUo7NESyU6IKoRY8pe0GXqxDOTc,28
+owlplanner/version.py,sha256=UZqcSzscXDdd_zdDICloqhxdi1jWHPfAWPlpO1-9dSA,28
 owlplanner/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 owlplanner/data/rates.csv,sha256=6fxg56BVVORrj9wJlUGFdGXKvOX5r7CSca8uhUbbuIU,3734
-owlplanner-2025.4.7.dist-info/METADATA,sha256=IwB3uWgLwMizW1VVyuL5lSGFtKZmBzf2syDspcf6qOA,53926
-owlplanner-2025.4.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-owlplanner-2025.4.7.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-owlplanner-2025.4.7.dist-info/RECORD,,
+owlplanner-2025.4.26.dist-info/METADATA,sha256=3jihkQ5yNqbYpnyzZpImLUwYsyf9KnDu0Rn8HIewhu8,53927
+owlplanner-2025.4.26.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+owlplanner-2025.4.26.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+owlplanner-2025.4.26.dist-info/RECORD,,