owlplanner 2025.8.1__py3-none-any.whl → 2025.9.15__py3-none-any.whl

owlplanner/config.py

@@ -296,6 +296,10 @@ def readConfig(file, *, verbose=True, logstreams=None, readContributions=True):
     # Solver Options.
     p.solverOptions = diconf["Solver Options"]
 
+    # Address legacy case files.
+    if diconf["Solver Options"].get("withMedicare", None) is True:
+        p.solverOptions["withMedicare"] = "loop"
+
     # Check consistency of noRothConversions.
     name = p.solverOptions.get("noRothConversions", "None")
     if name != "None" and name not in p.inames:

owlplanner/plan.py

@@ -1021,7 +1021,7 @@ class Plan(object):
         Refer to companion document for explanations.
         All binary variables must be lumped at the end of the vector.
         """
-        medi = options.get("optimizeMedicare", False)
+        medi = options.get("withMedicare", "loop") == "optimize"
 
         # Stack all variables in a single block vector with all binary variables at the end.
         C = {}
@@ -1386,7 +1386,7 @@ class Plan(object):
                 self.B.setRange(_q3(self.C["zx"], i, n, 1, self.N_i, self.N_n, self.N_zx), 0, 0)
 
     def _configure_Medicare_binary_variables(self, options):
-        if not options.get("optimizeMedicare", False):
+        if options.get("withMedicare", "loop") != "optimize":
             return
 
         bigM = options.get("bigM", 5e6)
@@ -1444,7 +1444,7 @@ class Plan(object):
                 self.A.addRow(row2, -np.inf, rhs2)
 
     def _add_Medicare_costs(self, options):
-        if not options.get("optimizeMedicare", False):
+        if options.get("withMedicare", "loop") != "optimize":
             return
 
         for n in range(self.nm):
@@ -1627,7 +1627,7 @@ class Plan(object):
             "netSpending",
             "noRothConversions",
             "oppCostX",
-            "optimizeMedicare",
+            "withMedicare",
             "previousMAGIs",
             "solver",
             "spendingSlack",
@@ -1635,7 +1635,6 @@ class Plan(object):
             "units",
             "xorConstraints",
             "withSCLoop",
-            "withMedicare",    # Ignore keyword.
         ]
         # We might modify options if required.
         options = {} if options is None else options
@@ -1713,7 +1712,7 @@ class Plan(object):
         """
         Self-consistent loop, regardless of solver.
         """
-        optimizeMedicare = options.get("optimizeMedicare", False)
+        includeMedicare = options.get("withMedicare", "loop") == "loop"
         withSCLoop = options.get("withSCLoop", True)
 
         if objective == "maxSpending":
@@ -1724,7 +1723,7 @@ class Plan(object):
         it = 0
         old_x = np.zeros(self.nvars)
         old_objfns = [np.inf]
-        self._computeNLstuff(None, optimizeMedicare)
+        self._computeNLstuff(None, includeMedicare)
         while True:
             objfn, xx, solverSuccess, solverMsg = solverMethod(objective, options)
 
@@ -1735,7 +1734,7 @@ class Plan(object):
             if not withSCLoop:
                 break
 
-            self._computeNLstuff(xx, optimizeMedicare)
+            self._computeNLstuff(xx, includeMedicare)
 
             delta = xx - old_x
             absSolDiff = np.sum(np.abs(delta), axis=0)/100
@@ -1955,7 +1954,7 @@ class Plan(object):
 
         return J_n
 
-    def _computeNLstuff(self, x, optimizeMedicare):
+    def _computeNLstuff(self, x, includeMedicare):
         """
         Compute MAGI, Medicare costs, long-term capital gain tax rate, and
         net investment income tax (NIIT).
@@ -1972,7 +1971,7 @@ class Plan(object):
         self.J_n = self._computeNIIT(self.MAGI_n, self.I_n, self.Q_n)
         self.psi_n = tx.capitalGainTaxRate(self.N_i, self.MAGI_n, self.gamma_n[:-1], self.n_d, self.N_n)
         # Compute Medicare through self-consistent loop.
-        if not optimizeMedicare:
+        if includeMedicare:
             self.M_n = tx.mediCosts(self.yobs, self.horizons, self.MAGI_n, self.prevMAGI, self.gamma_n[:-1], self.N_n)
 
         return None

owlplanner/version.py

@@ -1 +1 @@
-__version__ = "2025.08.01"
+__version__ = "2025.09.15"

{owlplanner-2025.8.1.dist-info → owlplanner-2025.9.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: owlplanner
-Version: 2025.8.1
+Version: 2025.9.15
 Summary: Owl: Retirement planner with great wisdom
 Project-URL: HomePage, https://github.com/mdlacasse/owl
 Project-URL: Repository, https://github.com/mdlacasse/owl
@@ -744,7 +744,7 @@ Look at *Basic capabilities* below for more detail.
 One can certainly have a savings plan, but due to the volatility of financial investments,
 it is impossible to have a certain asset earnings plan. This does not mean one cannot make decisions.
 These decisions need to be guided with an understanding of the sensitivity of the parameters.
-This is exactly where this tool fits it. Given your savings capabilities and spending desires,
+This is exactly where this tool fits in. Given your savings capabilities and spending desires,
 it can generate different future realizations of
 your strategy under different market assumptions, helping to better understand your financial situation.
 

{owlplanner-2025.8.1.dist-info → owlplanner-2025.9.15.dist-info}/RECORD

@@ -1,14 +1,14 @@
 owlplanner/__init__.py,sha256=hJ2i4m2JpHPAKyQLjYOXpJzeEsgcTcKD-Vhm0AIjjWg,592
 owlplanner/abcapi.py,sha256=rtg7d0UbftinokR9VlB49VUjDjzUq3ONnJbhMXVIrgo,6879
-owlplanner/config.py,sha256=JJOtS6HyqA4qUHUZydSGG_RMWaCfVMRSOAfWbt4evMI,12461
+owlplanner/config.py,sha256=UF2Dy6E9PiX6Ua8B1R0aYCNUoIYmY46up8awf_36B_Q,12615
 owlplanner/mylogging.py,sha256=OVGeDFO7LIZG91R6HMpZBzjno-B8PH8Fo00Jw2Pdgqw,2558
-owlplanner/plan.py,sha256=keKC9-XeQxza9--D7TaQfcZCLkGDy5yVV9D5pN25MHg,115211
+owlplanner/plan.py,sha256=pIKULy5GFo_8xOZByZ9_CXrHx9TcXQpaob8cblK46N8,115180
 owlplanner/progress.py,sha256=dUUlFmSAKUei36rUj2BINRY10f_YEUo_e23d0es6nrc,530
 owlplanner/rates.py,sha256=9Nmo8AKsyi5PoCUrzhr06phkSlNTv-TXzj5iYFU76AY,14113
 owlplanner/tax2025.py,sha256=2Jb_UbPT6ye-znRjA0nSaF8T8M17QW4MoRPDoW9XJ8s,10833
 owlplanner/timelists.py,sha256=Q4kBt9kKAa5qxsvOe9wfyUtCQVgiwPmJXTwXUPRBBv8,4066
 owlplanner/utils.py,sha256=afAjeO6Msf6Rn4jwz_7Ody9rHGWlBR7iQFqe1xzLNQc,2513
-owlplanner/version.py,sha256=Or3KaHd8BXidAsAkScGwQRvtWIF5uufpsnfgNdR-Kpw,28
+owlplanner/version.py,sha256=zy-IhWuHFT4sXG7yuvz7mQvMfgQ6BwWFA7KrAtVvwYg,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
@@ -16,7 +16,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.8.1.dist-info/METADATA,sha256=9WRoRbNMdk2kxbT4-Coq912VJixT9rlF1Cv48Po4VJw,54044
-owlplanner-2025.8.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-owlplanner-2025.8.1.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-owlplanner-2025.8.1.dist-info/RECORD,,
+owlplanner-2025.9.15.dist-info/METADATA,sha256=yacvHpuuPAtZ4fvLHH2UcbIdtkWwgVc0zwIvtOBNw64,54045
+owlplanner-2025.9.15.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+owlplanner-2025.9.15.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+owlplanner-2025.9.15.dist-info/RECORD,,