owlplanner 2025.5.30__tar.gz → 2025.6.21__tar.gz

{owlplanner-2025.5.30 → owlplanner-2025.6.21}/INSTALL.md

@@ -24,13 +24,15 @@ git clone https://github.com/mdlacasse/Owl.git
 
 ```
 Then go (`cd`) to the directory where you installed Owl.
-You can install the Owl package directly from the [Python Package Index](http://pypi.org).
 From the top directory of the source code run:
 The following command will install the current version of owlplanner and all its dependencies:
 ```shell
 pip install -r ui/requirements.txt
 ```
 
+You can also install the Owl package directly from the [Python Package Index](http://pypi.org).
+
+
 ### Running the streamlit frontend locally
 Running the Owl user interface locally from Windows:
 ```shell
@@ -64,7 +66,7 @@ Run checks before all commits:
 flake8 ui src tests
 pytest
 ```
-Edit version number in `src/owlplanner/version.py`, `ui/requirements.txt`, and in `pyproject.toml`. Then,
+Edit version number in `src/owlplanner/version.py` and in `pyproject.toml`. Then,
 ```shell
 rm dist/*
 python -m build

{owlplanner-2025.5.30 → owlplanner-2025.6.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: owlplanner
-Version: 2025.5.30
+Version: 2025.6.21
 Summary: Owl: Retirement planner with great wisdom
 Project-URL: HomePage, https://github.com/mdlacasse/owl
 Project-URL: Repository, https://github.com/mdlacasse/owl
@@ -748,13 +748,6 @@ This is exactly where this tool fits it. Given your savings capabilities and spe
 it can generate different future realizations of
 your strategy under different market assumptions, helping to better understand your financial situation.
 
-Disclaimers: I am not a financial planner. You make your own decisions.
-This program comes with no guarantee. Use at your own risk.
-
-More disclaimers: While some output of the code has been verified with other approaches,
-this code is still under development and I cannot guarantee the accuracy of the results.
-Use at your own risk.
-
 -------------------------------------------------------------------------------------
 ## Purpose and vision
 The goal of Owl is to create a free and open-source ecosystem that has cutting-edge optimization capabilities,
@@ -839,11 +832,13 @@ an Excel spreadsheet that contains future wages, contributions
 to savings accounts, and planned *big-ticket items* such as the purchase of a lake house,
 the sale of a boat, large gifts, or inheritance.
 
-Three types of savings accounts are considered: taxable, tax-deferred, and tax-exempt,
+Three types of savings accounts are considered: taxable, tax-deferred, and tax-free,
 which are all tracked separately for married individuals. Asset transition to the surviving spouse
 is done according to beneficiary fractions for each type of savings account.
 Tax status covers married filing jointly and single, depending on the number of individuals reported.
 
+Maturation rules for Roth contributions and conversions are implemented as constraints
+limiting withdrawal amounts to cover Roth account balances for 5 years after the events.
 Medicare and IRMAA calculations are performed through a self-consistent loop on cash flow constraints.
 Future values are simple projections of current values with the assumed inflation rates.
 
@@ -892,14 +887,16 @@ assets to support, even with no estate being left.
 - Streamlit Community Cloud [Streamlit](https://streamlit.io)
 - 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.
+ Robert E. Anderson (NH-RedAnt) for bug fixes and suggestions, Clark Jefcoat (hubcity) for fruitful interactions.
 
 ---------------------------------------------------------------------
 
 Copyright © 2024 - Martin-D. Lacasse
 
-Disclaimers: I am not a financial planner. You make your own decisions.
-This program comes with no guarantee. Use at your own risk.
+Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
+
+Code output has been verified with analytical solutions when applicable, and comparative approaches otherwise.
+Nevertheless, accuracy of results is not guaranteed.
 
 --------------------------------------------------------
 

{owlplanner-2025.5.30 → owlplanner-2025.6.21}/README.md

@@ -42,13 +42,6 @@ This is exactly where this tool fits it. Given your savings capabilities and spe
 it can generate different future realizations of
 your strategy under different market assumptions, helping to better understand your financial situation.
 
-Disclaimers: I am not a financial planner. You make your own decisions.
-This program comes with no guarantee. Use at your own risk.
-
-More disclaimers: While some output of the code has been verified with other approaches,
-this code is still under development and I cannot guarantee the accuracy of the results.
-Use at your own risk.
-
 -------------------------------------------------------------------------------------
 ## Purpose and vision
 The goal of Owl is to create a free and open-source ecosystem that has cutting-edge optimization capabilities,
@@ -133,11 +126,13 @@ an Excel spreadsheet that contains future wages, contributions
 to savings accounts, and planned *big-ticket items* such as the purchase of a lake house,
 the sale of a boat, large gifts, or inheritance.
 
-Three types of savings accounts are considered: taxable, tax-deferred, and tax-exempt,
+Three types of savings accounts are considered: taxable, tax-deferred, and tax-free,
 which are all tracked separately for married individuals. Asset transition to the surviving spouse
 is done according to beneficiary fractions for each type of savings account.
 Tax status covers married filing jointly and single, depending on the number of individuals reported.
 
+Maturation rules for Roth contributions and conversions are implemented as constraints
+limiting withdrawal amounts to cover Roth account balances for 5 years after the events.
 Medicare and IRMAA calculations are performed through a self-consistent loop on cash flow constraints.
 Future values are simple projections of current values with the assumed inflation rates.
 
@@ -186,14 +181,16 @@ assets to support, even with no estate being left.
 - Streamlit Community Cloud [Streamlit](https://streamlit.io)
 - 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.
+ Robert E. Anderson (NH-RedAnt) for bug fixes and suggestions, Clark Jefcoat (hubcity) for fruitful interactions.
 
 ---------------------------------------------------------------------
 
 Copyright © 2024 - Martin-D. Lacasse
 
-Disclaimers: I am not a financial planner. You make your own decisions.
-This program comes with no guarantee. Use at your own risk.
+Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
+
+Code output has been verified with analytical solutions when applicable, and comparative approaches otherwise.
+Nevertheless, accuracy of results is not guaranteed.
 
 --------------------------------------------------------
 

{owlplanner-2025.5.30 → owlplanner-2025.6.21}/USER_GUIDE.md

@@ -20,7 +20,7 @@ import owlplanner as owl
 # Jack was born in 1962 and expects to live to age 89. Jill was born in 1965 and hopes to live to age 92.
 # Plan starts on Jan 1st of this year.
 plan = owl.Plan(['Jack', 'Jill'], [1962, 1965], [89, 92], 'jack & jill - tutorial', startDate='01-01')
-# Jack has $90.5k in a taxable investment account, $600.5k in a tax-deferred account and $70k from 2 tax-exempt accounts.
+# Jack has $90.5k in a taxable investment account, $600.5k in a tax-deferred account and $70k from 2 tax-free accounts.
 # Jill has $60.2k in her taxable account, $150k in a 403b, and $40k in a Roth IRA.
 plan.setAccountBalances(taxable=[90.5, 60.2], taxDeferred=[600.5, 150], taxFree=[50.6 + 20, 40.8])
 # An Excel file contains 2 tabs (one for Jill, one for Jack) describing anticipated wages and contributions.

{owlplanner-2025.5.30 → owlplanner-2025.6.21}/docs/owl.tex

@@ -32,7 +32,7 @@
 \begin{document}
 \title{Formulation of the optimization model in Owl}
 \author{Martin-D. Lacasse}
-\date{March 14, 2025}
+\date{June 13, 2025}
 \maketitle
 \thispagestyle{fancy}
 \fancyfoot[R]{\copyright\ 2024 - Martin-D. Lacasse}
@@ -81,7 +81,7 @@ index name as a subscript, e.g., $N_i$ for index $i$.
 		is denoted by $i_d$ while the survivor is $i_s$.
 \item [$j$]
 	Type of savings account. $j$ goes from 0 to $N_j - 1$, for taxable, tax-deferred,
-	and tax-exempt accounts respectively. Therefore $N_j = 3$.
+	and tax-free accounts respectively. Therefore $N_j = 3$.
 \item[$k$]
 	Type of asset class. $k$ goes from 0 to $N_k -1 $, for S\&P 500,
 	Baa corporate bonds, Treasury notes, and cash, respectively. $N_k = 4$.
@@ -583,7 +583,7 @@ add the market returns to the savings balances.
 	Changes include contributions $\kappa$, distributions and withdrawals $w$,
 	conversions $x$, surplus deposits $d$, and growth $\tau$ on the account through the year.
 	For each spouse $i$, we track each savings account $j$ separately, and tax-deferred accounts
-	are coupled to the corresponding tax-exempt account through Roth conversions.
+	are coupled to the corresponding tax-free account through Roth conversions.
 
 	The timing of Roth conversions, withdrawals, and deposits brings
 	additional coupling between these variables, and is worth a detailed discussion.
@@ -605,7 +605,7 @@ add the market returns to the savings balances.
 	a direct withdrawal from the tax-deferred account at mid-year will always
 	be unfavorable when compared to a Roth conversion
 	at the beginning of the year, followed
-	by a tax-exempt withdrawal later in the same year.
+	by a tax-free withdrawal later in the same year.
 	This is because the second
 	scenario involves gains which are tax-free over the half-year, while
 	the first one does not. Moving account withdrawals at the beginning
@@ -620,7 +620,7 @@ add the market returns to the savings balances.
 	\end{eqnarray*}
 	for $j \neq 1$, i.e., for all withdrawals except those from tax-deferred accounts.
 	For example, to favor tax-deferred withdrawals in most reasonable situations,
-	it is desirable to make Roth conversions and tax-exempt distributions exclusive events
+	it is desirable to make Roth conversions and tax-free distributions exclusive events
 	by introducing binary variables $z_{in} \in \{0, 1\}$ with the following constraints:
 	\begin{alignat}{2}
 		\label{Eq:Binary}
@@ -709,6 +709,24 @@ add the market returns to the savings balances.
 		x_{in} \le \min(b_{i1n}, x_{max}).
 	\end{equation}
 
+	Roth conversions are also governed by a 5-year maturation rule for withdrawals. This means
+	that withdrawals will need to be smaller than the balance minus the sum of all contributions
+	and conversions that happened over the last 5 years. For that purpose, the Wages and Contributions
+	file which stores $\omega_{in}, \kappa_{ijn}, \ldots$, will go back 5 years, and the Roth
+	conversions in that year range will be interpreted as having happened. We will use
+	these arrays to store previous conversions and contributions at the end of the array so that
+	they can be retrieved with negative indices in Python. Mathematically, we want that
+	\begin{equation}
+		w_{i2n} \le b_{i2n} - \sum_{n'=n-5}^n [ \kappa{i2n'} + x_{in'}.
+	\end{equation}
+	However, conversions are sometimes a variable $x_{in}$
+	and sometimes a parameter $X_{in}$, depending on the sign of $n$.
+	This leads to
+	\begin{equation}
+		b_{i2n} - w_{i2n} - \sum_{n'=\max(n-5, 0}^{n-1} x_{in'}
+		\ge \sum_{n'=n-5}^{\min(-1, n-1)} X_{in} + \sum_{n'=n-5}^{n-1} \kappa{i2n'}.
+	\end{equation}
+
 \paragraph*{Net spending}
 	For calculating the net spending $g_n$, we consider the cash flow of all withdrawals,
 	wages, social security and pension benefits, and big-ticket items. 
@@ -1087,9 +1105,9 @@ with
 
 \section{Other considerations}
 \paragraph*{Beneficiaries}
-Tax-exempt and tax-deferred accounts have special tax rules that allow giving part
+Tax-free and tax-deferred accounts have special tax rules that allow giving part
 or the entire value of
-tax-exempt accounts to a spouse who can then consider it as his/her own.
+tax-free accounts to a spouse who can then consider it as his/her own.
 These accounts typically use percentages to designate beneficiaries.
 Let $\phi_j$ be the fraction of the account $j$ that a spouse $i_d$ wishes
 to leave to his/her surviving spouse $i_s$

{owlplanner-2025.5.30 → owlplanner-2025.6.21}/pyproject.toml

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

{owlplanner-2025.5.30 → owlplanner-2025.6.21}/requirements.txt

@@ -7,5 +7,5 @@ odfpy
 plotly
 pulp
 scipy
-streamlit
+streamlit >= 1.46
 toml

{owlplanner-2025.5.30 → owlplanner-2025.6.21}/src/owlplanner/abcapi.py

@@ -16,9 +16,9 @@ solvers for comparison.
 This approach has been successful with the MOSEK and the HiGHS solvers.
 A for matrix, B for bounds, C for constraints. Thus the name ABCAPI.
 
-Copyright (C) 2024 -- Martin-D. Lacasse
+Copyright © 2024 - Martin-D. Lacasse
 
-Disclaimer: This program comes with no guarantee. Use at your own risk.
+Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
 
 """
 

{owlplanner-2025.5.30 → owlplanner-2025.6.21}/src/owlplanner/config.py

@@ -4,9 +4,10 @@ Owl/conftoml
 
 This file contains utility functions to save case parameters.
 
-Copyright (C) 2024 -- Martin-D. Lacasse
+Copyright © 2024 - Martin-D. Lacasse
+
+Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
 
-Disclaimer: This program comes with no guarantee. Use at your own risk.
 """
 
 import toml as toml

{owlplanner-2025.5.30 → owlplanner-2025.6.21}/src/owlplanner/mylogging.py

@@ -4,9 +4,9 @@ Owl/logging
 
 This file contains routines for handling error messages.
 
-Copyright (C) 2024 -- Martin-D. Lacasse
+Copyright © 2024 - Martin-D. Lacasse
 
-Disclaimer: This program comes with no guarantee. Use at your own risk.
+Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
 
 """
 

{owlplanner-2025.5.30 → owlplanner-2025.6.21}/src/owlplanner/plan.py

@@ -8,9 +8,10 @@ A retirement planner using linear programming optimization.
 See companion PDF document for an explanation of the underlying
 mathematical model and a description of all variables and parameters.
 
-Copyright (C) 2024 -- Martin-D. Lacasse
+Copyright © 2024 - Martin-D. Lacasse
+
+Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
 
-Disclaimer: This program comes with no guarantee. Use at your own risk.
 """
 
 ###########################################################################
@@ -303,11 +304,11 @@ class Plan(object):
         # Parameters from timeLists initialized to zero.
         self.omega_in = np.zeros((self.N_i, self.N_n))
         self.Lambda_in = np.zeros((self.N_i, self.N_n))
-        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))
+        self.myRothX_in = np.zeros((self.N_i, self.N_n + 5))
+        self.kappa_ijn = np.zeros((self.N_i, self.N_j, self.N_n + 5))
 
         # Previous 3 years for Medicare.
-        self.prevMAGI = np.zeros((3))
+        self.prevMAGI = np.zeros((2))
 
         # Init previous balance to none.
         self.beta_ij = None
@@ -498,7 +499,7 @@ class Plan(object):
     def setBeneficiaryFractions(self, phi):
         """
         Set fractions of savings accounts that is left to surviving spouse.
-        Default is [1, 1, 1] for taxable, tax-deferred, adn tax-exempt accounts.
+        Default is [1, 1, 1] for taxable, tax-deferred, and tax-free accounts.
         """
         if len(phi) != self.N_j:
             raise ValueError(f"Fractions must have {self.N_j} entries.")
@@ -901,7 +902,7 @@ class Plan(object):
         try:
             filename, self.timeLists = timelists.read(filename, self.inames, self.horizons, self.mylog)
         except Exception as e:
-            raise Exception(f"Unsuccessful read of contributions: {e}") from e
+            raise Exception(f"Unsuccessful read of Wages and Contributions: {e}") from e
 
         self.timeListsFileName = filename
         self.setContributions()
@@ -909,6 +910,9 @@ class Plan(object):
         return True
 
     def setContributions(self, timeLists=None):
+        """
+        If no argument is given, use the values that have been stored in self.timeLists.
+        """
         if timeLists is not None:
             timelists.check(timeLists, self.inames, self.horizons)
             self.timeLists = timeLists
@@ -916,14 +920,17 @@ class Plan(object):
         # Now fill in parameters which are in $.
         for i, iname in enumerate(self.inames):
             h = self.horizons[i]
-            self.omega_in[i, :h] = self.timeLists[iname]["anticipated wages"].iloc[:h]
-            self.kappa_ijn[i, 0, :h] = self.timeLists[iname]["taxable ctrb"].iloc[:h]
-            self.kappa_ijn[i, 1, :h] = self.timeLists[iname]["401k ctrb"].iloc[:h]
-            self.kappa_ijn[i, 2, :h] = self.timeLists[iname]["Roth 401k ctrb"].iloc[:h]
-            self.kappa_ijn[i, 1, :h] += self.timeLists[iname]["IRA ctrb"].iloc[:h]
-            self.kappa_ijn[i, 2, :h] += self.timeLists[iname]["Roth IRA ctrb"].iloc[:h]
-            self.myRothX_in[i, :h] = self.timeLists[iname]["Roth conv"].iloc[:h]
-            self.Lambda_in[i, :h] = self.timeLists[iname]["big-ticket items"].iloc[:h]
+            self.omega_in[i, :h] = self.timeLists[iname]["anticipated wages"].iloc[5:5+h]
+            self.Lambda_in[i, :h] = self.timeLists[iname]["big-ticket items"].iloc[5:5+h]
+
+            # Values for last 5 years of Roth conversion and contributions stored at the end
+            # of array and accessed with negative index.
+            self.kappa_ijn[i, 0, :h+5] = np.roll(self.timeLists[iname]["taxable ctrb"], -5)
+            self.kappa_ijn[i, 1, :h+5] = np.roll(self.timeLists[iname]["401k ctrb"], -5)
+            self.kappa_ijn[i, 1, :h+5] += np.roll(self.timeLists[iname]["IRA ctrb"], -5)
+            self.kappa_ijn[i, 2, :h+5] = np.roll(self.timeLists[iname]["Roth 401k ctrb"], -5)
+            self.kappa_ijn[i, 2, :h+5] += np.roll(self.timeLists[iname]["Roth IRA ctrb"], -5)
+            self.myRothX_in[i, :h+5] = np.roll(self.timeLists[iname]["Roth conv"], -5)
 
         self.caseStatus = "modified"
 
@@ -980,8 +987,9 @@ class Plan(object):
         ]
         for i, iname in enumerate(self.inames):
             h = self.horizons[i]
-            df = pd.DataFrame(0, index=np.arange(h), columns=cols)
-            df["year"] = self.year_n[:h]
+            df = pd.DataFrame(0, index=np.arange(0, h+5), columns=cols)
+            # df["year"] = self.year_n[:h]
+            df["year"] = np.arange(self.year_n[0] - 5, self.year_n[h-1]+1)
             self.timeLists[iname] = df
 
         self.caseStatus = "modified"
@@ -1074,8 +1082,6 @@ class Plan(object):
         Utility function that builds constraint matrix and vectors.
         Refactored for clarity and maintainability.
         """
-        self._setup_constraint_shortcuts(options)
-
         self.A = abc.ConstraintMatrix(self.nvars)
         self.B = abc.Bounds(self.nvars, self.nbins)
 
@@ -1084,6 +1090,7 @@ class Plan(object):
         self._add_standard_exemption_bounds()
         self._add_defunct_constraints()
         self._add_roth_conversion_constraints(options)
+        self._add_roth_maturation_constraints()
         self._add_withdrawal_limits()
         self._add_conversion_limits()
         self._add_objective_constraints(objective, options)
@@ -1098,12 +1105,6 @@ class Plan(object):
 
         return None
 
-    def _setup_constraint_shortcuts(self, options):
-        # Set up all the local variables as attributes for use in helpers.
-        oppCostX = options.get("oppCostX", 0.)
-        self.xnet = 1 - oppCostX / 100.
-        self.optionsUnits = u.getUnits(options.get("units", "k"))
-
     def _add_rmd_inequalities(self):
         for i in range(self.N_i):
             if self.beta_ij[i, 1] > 0:
@@ -1131,6 +1132,45 @@ class Plan(object):
                 for j in range(self.N_j):
                     self.B.setRange(_q3(self.C["w"], self.i_d, j, n, self.N_i, self.N_j, self.N_n), 0, 0)
 
+    def _add_roth_maturation_constraints(self):
+        """
+        Withdrawals from Roth accounts are subject to the 5-year rule for conversion.
+        Conversions and gains are subject to the 5-year rule since conversion.
+        Contributions can be withdrawn at any time (without 59.5 penalty) but
+        gains on contributions are subject to the 5-year rule since the opening of the account.
+        A retainer is put on all conversions and associated gains, and gains on all recent contributions.
+        """
+        # Assume 10% per year for contributions and conversions for past 5 years.
+        # Future years will use the assumed returns.
+        oldTau1 = 1.10
+        for i in range(self.N_i):
+            h = self.horizons[i]
+            for n in range(h):
+                rhs = 0
+                # To add compounded gains to original amount.
+                cgains = 1
+                row = self.A.newRow()
+                row.addElem(_q3(self.C["b"], i, 2, n, self.N_i, self.N_j, self.N_n + 1), 1)
+                row.addElem(_q3(self.C["w"], i, 2, n, self.N_i, self.N_j, self.N_n), -1)
+                for dn in range(1, 6):
+                    nn = n - dn
+                    if nn < 0:  # Past of future is in the past:
+                        # Parameters are stored at the end of contributions and conversions arrays.
+                        cgains *= oldTau1
+                        # If only an contribution - without conversion.
+                        # rhs += (cgains - 1) * self.kappa_ijn[i, 2, nn] + cgains * self.myRothX_in[i, nn]
+                        rhs += cgains * self.kappa_ijn[i, 2, nn] + cgains * self.myRothX_in[i, nn]
+                    else:       # Past of future is in the future: use variables and parameters.
+                        ksum2 = np.sum(self.alpha_ijkn[i, 2, :, nn] * self.tau_kn[:, nn], axis=0)
+                        Tau1 = 1 + ksum2
+                        cgains *= Tau1
+                        row.addElem(_q2(self.C["x"], i, nn, self.N_i, self.N_n), -cgains)
+                        # If only a contribution - without conversion.
+                        # rhs += (cgains - 1) * self.kappa_ijn[i, 2, nn]
+                        rhs += cgains * self.kappa_ijn[i, 2, nn]
+
+                self.A.addRow(row, rhs, np.inf)
+
     def _add_roth_conversion_constraints(self, options):
         if "maxRothConversion" in options and options["maxRothConversion"] == "file":
             for i in range(self.N_i):
@@ -1579,14 +1619,18 @@ class Plan(object):
         if objective == "maxSpending" and "bequest" not in myoptions:
             self.mylog.vprint("Using bequest of $1.")
 
-        self.prevMAGI = np.zeros(3)
+        self.optionsUnits = u.getUnits(myoptions.get("units", "k"))
+
+        oppCostX = options.get("oppCostX", 0.)
+        self.xnet = 1 - oppCostX / 100.
+
+        self.prevMAGI = np.zeros(2)
         if "previousMAGIs" in myoptions:
             magi = myoptions["previousMAGIs"]
-            if len(magi) != 3:
-                raise ValueError("previousMAGIs must have 3 values.")
+            if 3 < len(magi) < 2:
+                raise ValueError("previousMAGIs must have 2 values.")
 
-            units = u.getUnits(options.get("units", "k"))
-            self.prevMAGI = units * np.array(magi)
+            self.prevMAGI = self.optionsUnits * np.array(magi)
 
         lambdha = myoptions.get("spendingSlack", 0)
         if lambdha < 0 or lambdha > 50:
@@ -1949,7 +1993,7 @@ class Plan(object):
         self.Q_n = np.sum(
             (
                 self.mu
-                * (self.b_ijn[:, 0, :-1] - self.w_ijn[:, 0, :] + self.d_in[:, :] + 0.5 * self.kappa_ijn[:, 0, :])
+                * (self.b_ijn[:, 0, :-1] - self.w_ijn[:, 0, :] + self.d_in[:, :] + 0.5 * self.kappa_ijn[:, 0, :Nn])
                 + tau_0prev * self.w_ijn[:, 0, :]
             )
             * self.alpha_ijkn[:, 0, 0, :-1],
@@ -2058,7 +2102,7 @@ class Plan(object):
         dic = {}
         # Results
         dic["Plan name"] = self._name
-        dic["Net yearly spending basis"] = u.d(self.g_n[0] / self.xi_n[0])
+        dic["Net yearly spending basis" + 26*" ."] = u.d(self.g_n[0] / self.xi_n[0])
         dic[f"Net spending for year {now}"] = u.d(self.g_n[0])
         dic[f"Net spending remaining in year {now}"] = u.d(self.g_n[0] * self.yearFracLeft)
 
@@ -2370,7 +2414,7 @@ class Plan(object):
         the default behavior of setDefaultPlots().
         """
         value = self._checkValue(value)
-        title = self._name + "\nIncome Tax"
+        title = self._name + "\nFederal Income Tax"
         if tag:
             title += " - " + tag
         # All taxes: ordinary income and dividends.
@@ -2489,16 +2533,16 @@ class Plan(object):
         # Account balances except final year.
         accDic = {
             "taxable bal": self.b_ijn[:, 0, :-1],
-            "taxable ctrb": self.kappa_ijn[:, 0, :],
+            "taxable ctrb": self.kappa_ijn[:, 0, :self.N_n],
             "taxable dep": self.d_in,
             "taxable wdrwl": self.w_ijn[:, 0, :],
             "tax-deferred bal": self.b_ijn[:, 1, :-1],
-            "tax-deferred ctrb": self.kappa_ijn[:, 1, :],
+            "tax-deferred ctrb": self.kappa_ijn[:, 1, :self.N_n],
             "tax-deferred wdrwl": self.w_ijn[:, 1, :],
             "(included RMDs)": self.rmd_in[:, :],
             "Roth conv": self.x_in,
             "tax-free bal": self.b_ijn[:, 2, :-1],
-            "tax-free ctrb": self.kappa_ijn[:, 2, :],
+            "tax-free ctrb": self.kappa_ijn[:, 2, :self.N_n],
             "tax-free wdrwl": self.w_ijn[:, 2, :],
         }
         for i in range(self.N_i):
@@ -2595,12 +2639,12 @@ class Plan(object):
             planData[self.inames[i] + " txbl dep"] = self.d_in[i, :]
             planData[self.inames[i] + " txbl wrdwl"] = self.w_ijn[i, 0, :]
             planData[self.inames[i] + " tx-def bal"] = self.b_ijn[i, 1, :-1]
-            planData[self.inames[i] + " tx-def ctrb"] = self.kappa_ijn[i, 1, :]
+            planData[self.inames[i] + " tx-def ctrb"] = self.kappa_ijn[i, 1, :self.N_n]
             planData[self.inames[i] + " tx-def wdrl"] = self.w_ijn[i, 1, :]
             planData[self.inames[i] + " (RMD)"] = self.rmd_in[i, :]
             planData[self.inames[i] + " Roth conv"] = self.x_in[i, :]
             planData[self.inames[i] + " tx-free bal"] = self.b_ijn[i, 2, :-1]
-            planData[self.inames[i] + " tx-free ctrb"] = self.kappa_ijn[i, 2, :]
+            planData[self.inames[i] + " tx-free ctrb"] = self.kappa_ijn[i, 2, :self.N_n]
             planData[self.inames[i] + " tax-free wdrwl"] = self.w_ijn[i, 2, :]
             planData[self.inames[i] + " big-ticket items"] = self.Lambda_in[i, :]
 

owlplanner-2025.6.21/src/owlplanner/plotting/__init__.py

@@ -0,0 +1,12 @@
+"""
+Plotting backends for Owl.
+
+Copyright © 2025 - Martin-D. Lacasse
+
+Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
+
+"""
+
+from .factory import PlotFactory
+
+__all__ = ['PlotFactory']

{owlplanner-2025.5.30 → owlplanner-2025.6.21}/src/owlplanner/plotting/base.py

@@ -1,5 +1,10 @@
 """
 Base classes for plot backends.
+
+Copyright © 2025 - Martin-D. Lacasse
+
+Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
+
 """
 
 from abc import ABC, abstractmethod

{owlplanner-2025.5.30 → owlplanner-2025.6.21}/src/owlplanner/plotting/factory.py

@@ -1,5 +1,10 @@
 """
 Factory for creating plot backends.
+
+Copyright © 2025 - Martin-D. Lacasse
+
+Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
+
 """
 
 from .base import PlotBackend

{owlplanner-2025.5.30 → owlplanner-2025.6.21}/src/owlplanner/plotting/matplotlib_backend.py

@@ -1,5 +1,10 @@
 """
 Matplotlib implementation of plot backend.
+
+Copyright © 2025 - Martin-D. Lacasse
+
+Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
+
 """
 
 import numpy as np
@@ -372,17 +377,19 @@ class MatplotlibBackend(PlotBackend):
             raise ValueError(f"Unknown coordination {ARCoord}.")
         figures = []
         assetDic = {"stocks": 0, "C bonds": 1, "T notes": 2, "common": 3}
+        blank = ["", ""]
         for i in range(count):
             y2stack = {}
             for acType in acList:
                 stackNames = []
                 for key in assetDic:
-                    aname = key + " / " + acType
+                    # aname = key + " / " + acType
+                    aname = key
                     stackNames.append(aname)
                     y2stack[aname] = np.zeros((count, len(year_n)))
                     y2stack[aname][i][:] = alpha_ijkn[i, acList.index(acType), assetDic[key], : len(year_n)]
-                t = title + f" - {acType}"
-                fig, ax = self._stack_plot(year_n, inames, t, [i], y2stack, stackNames, "upper left", "percent")
+                t = title + f" - {acType} {inames[i]}"
+                fig, ax = self._stack_plot(year_n, blank, t, [i], y2stack, stackNames, "upper left", "percent")
                 figures.append(fig)
 
         return figures

{owlplanner-2025.5.30 → owlplanner-2025.6.21}/src/owlplanner/plotting/plotly_backend.py

@@ -1,5 +1,10 @@
 """
 Plotly implementation of plot backend.
+
+Copyright © 2025 - Martin-D. Lacasse
+
+Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
+
 """
 
 import numpy as np
@@ -815,7 +820,8 @@ class PlotlyBackend(PlotBackend):
                 stack_data = []
                 stack_names = []
                 for key in assetDic:
-                    aname = f"{key} / {acType}"
+                    # aname = f"{key} / {acType}"
+                    aname = key
                     stack_names.append(aname)
 
                     # Get allocation data
@@ -834,7 +840,7 @@ class PlotlyBackend(PlotBackend):
                     ))
 
                 # Update layout
-                plot_title = f"{title} - {acType}"
+                plot_title = f"{title} - {acType} {inames[i]}"
                 fig.update_layout(
                     title=plot_title,
                     # xaxis_title="year",

{owlplanner-2025.5.30 → owlplanner-2025.6.21}/src/owlplanner/progress.py

@@ -1,6 +1,10 @@
 """
 A simple object to display progress.
 
+Copyright © 2024 - Martin-D. Lacasse
+
+Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
+
 """
 
 from owlplanner import utils as u