owlplanner 2025.1.28__py3-none-any.whl → 2025.2__py3-none-any.whl

owlplanner/plan.py

@@ -295,6 +295,9 @@ 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))
+
         # Scenario starts at the beginning of this year and ends at the end of the last year.
         self.mylog.vprint('Preparing scenario of %d years for %d individual%s.'
                           % (self.N_n, self.N_i, ['', 's'][self.N_i - 1]))
@@ -403,8 +406,6 @@ class Plan(object):
         self.mylog.vprint('Renaming plan %s -> %s.' % (self._name, newname))
         self._name = newname
 
-        return None
-
     def setSpousalDepositFraction(self, eta):
         """
         Set spousal deposit and withdrawal fraction. Default 0.5.
@@ -424,8 +425,6 @@ class Plan(object):
             self.mylog.vprint('\t%s: %.1f, %s: %.1f' % (self.inames[0], (1 - eta), self.inames[1], eta))
             self.eta = eta
 
-        return None
-
     def setDefaultPlots(self, value):
         """
         Set plots between nominal values or today's $.
@@ -434,8 +433,6 @@ class Plan(object):
         self.defaultPlots = self._checkValue(value)
         self.mylog.vprint('Setting plots default value to %s.' % value)
 
-        return None
-
     def setDividendRate(self, mu):
         """
         Set dividend rate on equities. Rate is in percent. Default 2%.
@@ -446,8 +443,6 @@ class Plan(object):
         self.mu = mu
         self.caseStatus = 'modified'
 
-        return None
-
     def setLongTermCapitalTaxRate(self, psi):
         """
         Set long-term income tax rate. Rate is in percent. Default 15%.
@@ -458,8 +453,6 @@ class Plan(object):
         self.psi = psi
         self.caseStatus = 'modified'
 
-        return None
-
     def setBeneficiaryFractions(self, phi):
         """
         Set fractions of savings accounts that is left to surviving spouse.
@@ -477,8 +470,6 @@ class Plan(object):
             self.mylog.vprint('Consider changing spousal deposit fraction for better convergence.')
             self.mylog.vprint('\tRecommended: setSpousalDepositFraction(%d)' % self.i_d)
 
-        return None
-
     def setHeirsTaxRate(self, nu):
         """
         Set the heirs tax rate on the tax-deferred portion of the estate.
@@ -490,8 +481,6 @@ class Plan(object):
         self.nu = nu
         self.caseStatus = 'modified'
 
-        return None
-
     def setPension(self, amounts, ages, units='k'):
         """
         Set value of pension for each individual and commencement age.
@@ -521,8 +510,6 @@ class Plan(object):
         self.pensionAges = np.array(ages, dtype=np.int32)
         self.caseStatus = 'modified'
 
-        return None
-
     def setSocialSecurity(self, amounts, ages, units='k'):
         """
         Set value of social security for each individual and commencement age.
@@ -560,8 +547,6 @@ class Plan(object):
         self.caseStatus = 'modified'
         self._adjustedParameters = False
 
-        return None
-
     def setSpendingProfile(self, profile, percent=60, dip=15, increase=12, delay=0):
         """
         Generate time series for spending profile. Surviving spouse fraction can be specified
@@ -589,8 +574,6 @@ class Plan(object):
         self.smileDelay = delay
         self.caseStatus = 'modified'
 
-        return None
-
     def setRates(self, method, frm=None, to=None, values=None, stdev=None, corr=None):
         """
         Generate rates for return and inflation based on the method and
@@ -632,8 +615,6 @@ class Plan(object):
         self._adjustedParameters = False
         self.caseStatus = 'modified'
 
-        return None
-
     def regenRates(self):
         """
         Regenerate the rates using the arguments specified during last setRates() call.
@@ -648,8 +629,6 @@ class Plan(object):
             corr=self.rateCorr,
         )
 
-        return None
-
     def value(self, amount, year):
         """
         Return value of amount deflated or inflated at the beginning
@@ -711,8 +690,6 @@ class Plan(object):
             u.d(np.sum(taxable) + 0.7 * np.sum(taxDeferred) + np.sum(taxFree)),
         )
 
-        return None
-
     def setInterpolationMethod(self, method, center=15, width=5):
         """
         Interpolate assets allocation ratios from initial value (today) to
@@ -739,8 +716,6 @@ class Plan(object):
 
         self.mylog.vprint('Asset allocation interpolation method set to %s.' % method)
 
-        return None
-
     def setAllocationRatios(self, allocType, taxable=None, taxDeferred=None, taxFree=None, generic=None):
         """
         Single function for setting all types of asset allocations.
@@ -874,8 +849,6 @@ class Plan(object):
 
         self.mylog.vprint('Interpolating assets allocation ratios using', self.interpMethod, 'method.')
 
-        return None
-
     def readContributions(self, filename):
         """
         Provide the name of the file containing the financial events
@@ -1636,6 +1609,7 @@ class Plan(object):
             'noRothConversions',
             'withMedicare',
             'solver',
+            'previousMAGIs',
         ]
         # We will modify options if required.
         if options is None:
@@ -1664,6 +1638,17 @@ class Plan(object):
         if objective == 'maxSpending' and 'bequest' not in myoptions:
             self.mylog.vprint('Using bequest of $1.')
 
+        if 'previousMAGIs' in myoptions:
+            magi = myoptions['previousMAGIs']
+            if len(magi) != 2:
+                raise ValueError("previousMAGIs must have two values.")
+
+            if 'units' in options:
+                units = u.getUnits(options['units'])
+            else:
+                units = 1000
+            self.prevMAGI = units * np.array(magi)
+
         self._adjustParameters()
 
         if 'solver' in options:
@@ -1897,7 +1882,7 @@ class Plan(object):
             self.F_tn = self.F_tn.reshape((self.N_t, self.N_n))
             MAGI_n = np.sum(self.F_tn, axis=0) + np.array(x[self.C['e']:self.C['F']])
 
-        self.M_n = tx.mediCosts(self.yobs, self.horizons, MAGI_n, self.gamma_n[:-1], self.N_n)
+        self.M_n = tx.mediCosts(self.yobs, self.horizons, MAGI_n, self.prevMAGI, self.gamma_n[:-1], self.N_n)
 
         return None
 

owlplanner/tax2025.py

@@ -69,7 +69,7 @@ extra65Deduction_2025 = np.array([2000, 1600])
 ##############################################################################
 
 
-def mediCosts(yobs, horizons, magi, gamma_n, Nn):
+def mediCosts(yobs, horizons, magi, prevmagi, gamma_n, Nn):
     """
     Compute Medicare costs directly.
     """
@@ -79,14 +79,14 @@ def mediCosts(yobs, horizons, magi, gamma_n, Nn):
     for n in range(Nn):
         for i in range(Ni):
             if thisyear + n - yobs[i] >= 65 and n < horizons[i]:
-                # The standard Medicare part B premium
+                # Start with the (indexed) basic Medicare part B premium.
                 costs[n] += gamma_n[n] * irmaaFees_2025[0]
                 if n < 2:
-                    nn = n
+                    mymagi = prevmagi[n]
                 else:
-                    nn = 2
+                    mymagi = magi[n - 2]
                 for q in range(1, 6):
-                    if magi[n - nn] > gamma_n[n] * irmaaBrackets_2025[Ni - 1][q]:
+                    if mymagi > gamma_n[n] * irmaaBrackets_2025[Ni - 1][q]:
                         costs[n] += gamma_n[n] * irmaaFees_2025[q]
 
     return costs

owlplanner/version.py

@@ -1 +1 @@
-__version__ = "2025.1.28"
+__version__ = "2025.02"

{owlplanner-2025.1.28.dist-info → owlplanner-2025.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: owlplanner
-Version: 2025.1.28
+Version: 2025.2
 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.1.28.dist-info → owlplanner-2025.2.dist-info}/RECORD

@@ -2,16 +2,16 @@ owlplanner/__init__.py,sha256=QqrdT0Qks20osBTg7h0vJHAxpP9lL7DA99xb0nYbtw4,254
 owlplanner/abcapi.py,sha256=eemIsdbtzdWCIj5VuuswgphxXMcxJ_GZfUlDi6lttFM,6658
 owlplanner/config.py,sha256=ouADb6YES5Zgv0UwnEK9Axwvs8drp-ahboQjI4WTrr0,12069
 owlplanner/logging.py,sha256=pXg_mMgBll-kklqaDRLDNVUFo-5DAa-yqTKtiVrhNWw,2530
-owlplanner/plan.py,sha256=eRX04KT8DVkWD6sFzqm18OZZazSONQviuIYe7WNW7BM,115405
+owlplanner/plan.py,sha256=hZhx-Dp_t1Lli2q2VdtXkM03qsdPdM7KcDu4wgAxDIE,115577
 owlplanner/progress.py,sha256=YZjL5_m4MMgKPlWlhhKacPLt54tVhVGF1eXxxZapMYs,386
 owlplanner/rates.py,sha256=aKOmau8i3uqxZGi7HQJpzooT3X-yAZhga5MZJ56pBzk,15627
-owlplanner/tax2025.py,sha256=W3yXKC3rgcqPjZMguOyejgsox9J42w3ogBNN1mIBHBI,6965
+owlplanner/tax2025.py,sha256=b2RgM6TBQa8ggo6ODyh0p_J7j79UUm8z5NiENqa1l_k,7016
 owlplanner/timelists.py,sha256=ifxbyMlRW3IMwsiu8zsoodA1CKJQthgk3iPq50vQIds,4104
 owlplanner/utils.py,sha256=adIwqGVQFfvekke0JCxYJD3PKHbptVCj3NrQT2TQIB4,2351
-owlplanner/version.py,sha256=IsA0LMM6U46XS2G3Hhe2lWjxXVKcighNZH7REVFvu3M,27
+owlplanner/version.py,sha256=1_pf7w0m_4k4eWcDSLOiWoM_lv54EH6pA9nuPETGRtk,25
 owlplanner/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 owlplanner/data/rates.csv,sha256=6fxg56BVVORrj9wJlUGFdGXKvOX5r7CSca8uhUbbuIU,3734
-owlplanner-2025.1.28.dist-info/METADATA,sha256=ZLZXTjtEXy-eQaYHJbhKP9RfJcYf06jg95TIrr4Gpmk,64515
-owlplanner-2025.1.28.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-owlplanner-2025.1.28.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-owlplanner-2025.1.28.dist-info/RECORD,,
+owlplanner-2025.2.dist-info/METADATA,sha256=xII-8KNAoNNr_19KWjuS-9seZBzoBK4P9hEKLfcprto,64512
+owlplanner-2025.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+owlplanner-2025.2.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+owlplanner-2025.2.dist-info/RECORD,,