owlplanner 2025.4.22__tar.gz → 2025.4.26__tar.gz

{owlplanner-2025.4.22 → owlplanner-2025.4.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: owlplanner
-Version: 2025.4.22
+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.22 → owlplanner-2025.4.26}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "owlplanner"
-version = "2025.04.22"
+version = "2025.04.26"
 authors = [
   { name="Martin-D. Lacasse", email="martin.d.lacasse@gmail.com" },
 ]

{owlplanner-2025.4.22 → owlplanner-2025.4.26}/src/owlplanner/plan.py

@@ -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.
@@ -1674,10 +1669,7 @@ class Plan(object):
             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-2025.4.26/src/owlplanner/version.py

@@ -0,0 +1 @@
+__version__ = "2025.04.26"

{owlplanner-2025.4.22 → owlplanner-2025.4.26}/ui/Documentation.py

@@ -279,9 +279,11 @@ conversions will be allowed before the year specified.
 
 Calculations of Medicare and IRMAA can be turned on or off. This will typically speed up
 the calculations by a factor of 2 to 3, which can be useful when running Monte Carlo simulations.
-If the age of individuals makes them eligible for Medicare within the next two years,
-additional cells will appear for entering the Modified Adjusted Gross Income (MAGI) for past years.
+If the age of individuals makes them eligible for Medicare within the next three years,
+additional cells will appear for entering the Modified Adjusted Gross Income (MAGI) for the current
+and past 2 years, when applicable. Values default to zero.
 These numbers are needed to calculate the Income-Related Monthly Adjusted Amounts (IRMAA).
+MAGI for current year is required as it allows plan to start in mid-year for the first year.
 
 The time profile modulating the net spending amount
 can be selected to either be *flat* or follow a *smile* shape.

{owlplanner-2025.4.22 → owlplanner-2025.4.26}/ui/requirements.txt

@@ -7,4 +7,4 @@ odfpy
 scipy
 streamlit
 toml
-owlplanner >= 2025.04.22
+owlplanner >= 2025.04.26

owlplanner-2025.4.22/src/owlplanner/version.py

@@ -1 +0,0 @@
-__version__ = "2025.04.22"