owlplanner 2025.1.24__tar.gz → 2025.1.27__tar.gz

{owlplanner-2025.1.24 → owlplanner-2025.1.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: owlplanner
-Version: 2025.1.24
+Version: 2025.1.27
 Summary: Owl: Retirement planner with great wisdom
 Project-URL: HomePage, https://github.com/mdlacasse/owl
 Project-URL: Repository, https://github.com/mdlacasse/owl
@@ -698,6 +698,7 @@ Requires-Dist: pandas
 Requires-Dist: scipy
 Requires-Dist: seaborn
 Requires-Dist: streamlit
+Requires-Dist: toml
 Description-Content-Type: text/markdown
 
 
@@ -707,6 +708,15 @@ Description-Content-Type: text/markdown
 
 <img align=right src="https://raw.github.com/mdlacasse/Owl/main/docs/images/owl.png" width="250">
 
+-----
+
+### TLDR
+Owl is a planning tool that uses a linear programming optimization algorithm to provide guidance on retirement decisions.
+
+Go to [owlplanner.streamlit.app](https://owlplanner.streamlit.app) and explore the app to learn about its capabilities.
+
+-----
+
 This package is a retirement modeling framework for exploring the sensitivity of retirement financial decisions.
 Strictly speaking, it is not a planning tool, but more an environment for exploring *what if* scenarios.
 It provides different realizations of a financial strategy through the rigorous

{owlplanner-2025.1.24 → owlplanner-2025.1.27}/README.md

@@ -5,6 +5,15 @@
 
 <img align=right src="https://raw.github.com/mdlacasse/Owl/main/docs/images/owl.png" width="250">
 
+-----
+
+### TLDR
+Owl is a planning tool that uses a linear programming optimization algorithm to provide guidance on retirement decisions.
+
+Go to [owlplanner.streamlit.app](https://owlplanner.streamlit.app) and explore the app to learn about its capabilities.
+
+-----
+
 This package is a retirement modeling framework for exploring the sensitivity of retirement financial decisions.
 Strictly speaking, it is not a planning tool, but more an environment for exploring *what if* scenarios.
 It provides different realizations of a financial strategy through the rigorous

owlplanner-2025.1.24/notebooks/case_john+sally.ipynb → owlplanner-2025.1.27/notebooks/john+sally.ipynb

@@ -29,7 +29,7 @@
    "source": [
     "%%time\n",
     "import owlplanner as owl\n",
-    "plan = owl.Plan(['John', 'Sally'], [1962, 1962], [92, 92], 'case_john+sally')\n",
+    "plan = owl.Plan(['John', 'Sally'], [1962, 1962], [92, 92], 'john+sally')\n",
     "plan.setAccountBalances(taxable=[200, 200], taxDeferred=[750, 750], taxFree=[50, 50])\n",
     "# Unrealistic empty contributions and wages\n",
     "plan.readContributions('../examples/john+sally.xlsx')\n",

owlplanner-2025.1.24/notebooks/case_kim+sam.ipynb → owlplanner-2025.1.27/notebooks/kim+sam.ipynb

@@ -25,7 +25,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "p = owl.Plan(['Kim', 'Sam'], [1966, 1967], [86, 89], 'case_kim+sam-spending', verbose=True)"
+    "p = owl.Plan(['Kim', 'Sam'], [1966, 1967], [86, 89], 'kim+sam-spending', verbose=True)"
    ]
   },
   {

{owlplanner-2025.1.24 → owlplanner-2025.1.27}/notebooks/tutorial_1.ipynb

@@ -672,7 +672,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "newplan = owl.readConfig('jack+jill-spending-69')\n",
+    "newplan = owl.readConfig('../examples/case_jack+jill')\n",
     "newplan.resolve()"
    ]
   },
@@ -921,8 +921,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "plan2 = owl.readConfig('jack+jill-spending-69')\n",
-    "plan2.rename('jack+jill-bequest-69')"
+    "plan2 = owl.readConfig('../examples/case_jack+jill')\n",
+    "plan2.rename('jack+jill-bequest')"
    ]
   },
   {

owlplanner-2025.1.27/notebooks/tutorial_2.ipynb

@@ -0,0 +1,377 @@
+{
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "id": "05fad639-5e11-4b6c-8911-0707768ac8ad",
+   "metadata": {},
+   "source": [
+    "# Owl\n",
+    "## A Retirement Planning Laboratory"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "8e98ec63-fce8-4098-8179-2d597bfb4c2e",
+   "metadata": {},
+   "source": [
+    "This package is a retirement modeling framework for exploring the sensitivity of retirement financial decisions. Strictly speaking, it is not a planning tool, but more an environment for exploring *what if* scenarios. It provides different realizations of a financial strategy. 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 and spending desires, it can generate different future realizations of your strategy under different market assumptions, helping to better understand your financial situation.\n",
+    "\n",
+    "The algorithm in Owl is using the open-source HiGHS linear programming solver.\n",
+    "The complete formulation and detailed description of the underlying\n",
+    "mathematical model can be found\n",
+    "[here](https://raw.githubusercontent.com/mdlacasse/Owl/main/docs/owl.pdf).\n",
+    "\n",
+    "Copyright © 2024 - Martin-D. Lacasse\n",
+    "\n",
+    "Disclaimers: *I am not a financial planner. You make your own decisions. This program comes with no guarantee. Use at your own risk.*"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "01e6c7da-cd31-41de-9b67-e493ae77dea8",
+   "metadata": {},
+   "source": [
+    "### <span style=\"color: blue\"> README FIRST </span>\n",
+    "<span style=\"color:black;background:yellow;font-weight:bold\">\n",
+    "Don't make changes directly to this file. Keep it as a working example. Therefore, it is recommended that you build your own case by making a copy of the template files provided where you will be able to enter your own numbers and explore your own assumptions.\n",
+    "</span>"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "f65fbb58-4975-4a0a-beae-bff23f484b66",
+   "metadata": {},
+   "source": [
+    "# Tutorial 2 - Using the case of Jack and Jill\n",
+    "This tutorial shows how to use advanced capabilities of Owl such as Monte Carlo simulations and running simulations over a historical range. We use the same case as the one in Tutorial 1. "
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "6df2872d-93b6-47cf-9a7d-667c44901054",
+   "metadata": {},
+   "source": [
+    "### Just some Python module bookkeeping\n",
+    "This command needs to be at the beginning of every Owl notebook."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "63c9604f-4e6e-4e72-93d7-cdb5788d81d5",
+   "metadata": {
+    "scrolled": true
+   },
+   "outputs": [],
+   "source": [
+    "import owlplanner as owl"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "a1033e24-bfab-47d1-9083-e8cf739b086f",
+   "metadata": {},
+   "source": [
+    "### Creating the plan (see Tutorial 1 for details)\n",
+    "We first create a plan as we did in the *Tutorial 1*. We removed the comments for reducing the clutter."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "39121d7a",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "plan = owl.Plan(['Jack', 'Jill'], [1962, 1965], [89, 92], 'jack+jill-spending-MC', verbose=True)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "ee55774b-6f33-49fa-ae5c-85d2d466e026",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "plan.setAccountBalances(\n",
+    "    taxable=[90.5, 60],\n",
+    "    taxDeferred=[600.2, 150],\n",
+    "    taxFree=[50 + 20.6, 40.8],\n",
+    ")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "3e1ac651-ef61-47c1-9d2e-c47a0475e807",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "plan.readContributions('../examples/jack+jill.xlsx')"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "747f1a39-501e-4560-b856-b838720289fe",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "plan.setInterpolationMethod('s-curve')\n",
+    "plan.setAllocationRatios(\n",
+    "    'individual',\n",
+    "    generic=[[[60, 40, 0, 0], [70, 30, 0, 0]], [[60, 40, 0, 0], [70, 30, 0, 0]]],\n",
+    ")\n",
+    "plan.showAllocations()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "435a0599-accb-42cd-a1c2-382b97383626",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "plan.setPension([0, 10], [65, 65])\n",
+    "plan.setSocialSecurity([28, 25], [70, 70])"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "0b622cd0-f176-4a2f-8470-a0b457294e87",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "plan.setSpendingProfile('smile', 60)\n",
+    "plan.showProfile()"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "ec690bc0-cfba-4b4d-a11d-a8fd740346c1",
+   "metadata": {},
+   "source": [
+    "### Running Monte Carlo simulations\n",
+    "Before running Monte Carlo simulations, the user has to select one of two rate-generating stochastic methods."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "ee6a032a-7a62-4c88-9e78-a94754265440",
+   "metadata": {},
+   "source": [
+    "#### Selecting stochastic rates\n",
+    "\n",
+    "##### The *histochastic* method\n",
+    "In Owl, there are two mechanisms that can be used to generate random series of return rates for performing statistical analysis. The first one is to pick a range of historical returns and to derive statistics out of these values. This is achieved by using what I coined the *histochastic* method that is called as follows:\n",
+    "\n",
+    "    plan.setRates('histochastic', 1970, 2023)\n",
+    "\n",
+    "As called, this method will extract the statistical features of annual returns which happened from 1970 to 2023 inclusively. Using this approach, the means and covariances are all set under the hood, and the user has nothing more to specify.  \n",
+    "The means and covariance matrix calculated from this time series are then used to generate a series with similar characteristics. Note that the mathematical model used assumes that the rates follow a normal distribution which is a known incorrect approximation. This implies that the distribution of events in the tails might be slightly incorrect but for the time being, there is no known distribution that will capture the tails more accurately. The mean values however, are more robust to our choice of distribution, due to a averaging effect known as the central limit theorem. \n",
+    "\n",
+    "##### The *stochastic* method\n",
+    "The means and covariance matrix can also be explicitly specified by the user. Let's look at a specific example:\n",
+    "\n",
+    "    my_means = [8, 5, 4, 3]\n",
+    "    my_stdev = [17, 8, 8, 2]\n",
+    "    # my_corr = [[1, 0.46, 0.06, -.12], [0.46, 1, 0.68, -.27], [0.06, 0.68, 1, -.21], [-.12, -.27, -.21, 1]]\n",
+    "    offdiag_corr = [.46, .06, -.12, .68, -.27, -.21]\n",
+    "    plan.setRates('stochastic', values=my_means, stdev=my_stdev, corr=offdiag_corr)\n",
+    "    \n",
+    "Here, we set the rates to *stochastic* with mean return values of 8% +/- 17% for the S&P 500, 5% +/- 8% for corporate bonds, 4% +/- 8% for T-notes, and 3% +/- 2% for the inflation/common assets. Specifying the correlation matrix is optional but highly recommended. The one we use here was obtained by looking at historical data using the year range of our choice, for example,\n",
+    "\n",
+    "    owl.getRatesDistributions(1970, 2019)\n",
+    "\n",
+    "The matrix `my_corr` can be used to specify the correlation matrix, but to make the call less cumbersome, only the off-diagonal elements of the correlation matrix can be specified and Owl will figure it out.\n",
+    "\n",
+    "We will now enable the *stochastic* method with the values just mentioned:\n",
+    "    "
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "726966bd-be52-464e-81a5-ac1b9323fcec",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Mean returns\n",
+    "my_means = [8, 5, 4, 3]\n",
+    "# Volatility\n",
+    "my_stdev = [17, 8, 8, 2]\n",
+    "# Correlations matrix between rates of return of different assets\n",
+    "# my_corr = [[1, 0.46, 0.06, -.12], [0.46, 1, 0.68, -.27], [0.06, 0.68, 1, -.21], [-.12, -.27, -.21, 1]]\n",
+    "# These are only the off-diagonal elements\n",
+    "offdiag_corr = [.46, .06, -.12, .68, -.27, -.21]\n",
+    "plan.setRates('stochastic', values=my_means, stdev=my_stdev, corr=offdiag_corr)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "cce791e5-1dd6-4b4b-9997-cb8430900034",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Display a single instance resulting from this choice.\n",
+    "plan.showRatesCorrelations(shareRange=False)\n",
+    "plan.showRates()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "eacb5bc8-aca8-481a-9991-6aa494b493a0",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "plan.setHeirsTaxRate(33)\n",
+    "plan.setLongTermCapitalTaxRate(15)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "ec99f081-a999-4452-87f2-572c85158643",
+   "metadata": {},
+   "source": [
+    "### Preparing the case to run\n",
+    "In order to run Monte Carlo simulations, one has first to set the rates to either *stochastic* or 'histochastic*. Then a call to \n",
+    "\n",
+    "    runMC(objective, options, N)\n",
+    "    \n",
+    "specifying the objective and options will generate a desired number of simulations and provide statistics. The last argument $N$ is the number of cases to consider. Unlike event-driven simulator, Owl performs an optimization for each case, which adds considerable computing costs. For this reason, the default behavior of Owl is to turn off Medicare calculations for these runs. It can be turned back on using 'withMedicare' to `True` in the options, but this will significantly increase (about 3X) the computing time while providing little more insight. These simulations are performed with no verbosity as many simulations are performed, but `runMC` accepts the `verbose=True` argument for debugging or curiosity purposes.\n",
+    "\n",
+    "Running 500 cases takes about 5 min to complete. Be patient. At the end of the run, a histogram of the optimized values is displayed.\n",
+    "When running $N$ cases, the error on the estimate for the mean value being estimated decreases as $1/\\sqrt{N - 1}$. Therefore, 500 cases are more than sufficient to obtain reliable and meaningful estimates of mean statistics.\n",
+    "\n",
+    "Jack and Jill desire to leave a bequest of \\\\$500k (in today's \\\\$). \n",
+    "We limit Roth conversions to a maximum of \\\\$150k for Jack and none for Jill.\n",
+    "\n",
+    "What are these cases telling us?"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "856cdfb8-0472-475f-afa9-5dae92f1a52d",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "options = {'maxRothConversion': 150, 'noRothConversions': 'Jill'}\n",
+    "# options['solver'] = 'MOSEK'"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "ede7fa05-8a6e-41b4-8b7c-a217d28ad41b",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "options['bequest'] = 500\n",
+    "plan.runMC('maxSpending', options, 500);"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "8553d877-c44c-43f0-a015-9055f7d76e25",
+   "metadata": {},
+   "source": [
+    "All cases are successful at leaving a \\\\$500k bequest, but the net spending required for achieving this constraint can lead to small values in some scenarios. However, the median value for the net spending is about \\\\$88k, very close to the \\\\$90k desired by Jack and Jill. Recall that we are using a more conservative return of 8%, with a volatility of 17% for the S&P 500. It is therefore natural that the number we find here is slightly lower than what the historical return of the market has been able to predict. Some of these scenarios will provide more than the median (\\$M\\$), but some others will require a net spending of about \\\\$50k. All these scenarios make a probability of 100\\% for leaving a \\\\$500k bequest as requested. The mean value is indicated by $\\bar{x}$.\n",
+    "\n",
+    "A more practical example is to look at the maximum bequest left under the constraint of a fixed net spending."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "2e63e1b0-480e-4065-bb73-a5d7561cb328",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "options['netSpending'] = 90\n",
+    "plan.runMC('maxBequest', options, 500);"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "bd6356bb-7901-4316-80d9-2ab5e0f531a8",
+   "metadata": {},
+   "source": [
+    "In this case, a relatively large percentage of scenarios are successful in providing the desired \\\\$90k net spending amount over the duration of the plan. The median bequest left at the end of the plan is close to \\\\$1 M, twice what Jack and Jill are intending to leave. This might first suggest that the amount of \\\\$90k might be too conservative on average. The success rate is 85%, which is relatively good, especially considering the fact that Jack and Jill are always able to re-adjust their net spending plan as other forecast estimates are performed in the future."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "5c706722-4557-4537-94ec-4d13b29e2f61",
+   "metadata": {},
+   "source": [
+    "### Running cases over a historical range or years\n",
+    "We can also run cases using the historical data over a range of years and compile the outcomes in a histogram. For this purpose, there is no need to pre-select specific rates using the `setRates()` method as the choice of *historical* rates is implicit. Only the year range is required.\n",
+    "\n",
+    "Let's look at a specific example. For optimizing the net spending amount, we specify *maxSpending* in the following call to optimize the plan over the 63 years following 1928:"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "6a9be559-2f2e-4326-adef-18af5c14aeb3",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "plan.runHistoricalRange('maxSpending', options, 1928, 1990);"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "bccce068-c9a0-4001-a42d-868bde9d481b",
+   "metadata": {},
+   "source": [
+    "When considering more historical data than a single year, we find a slightly larger net spending value than the one dictated from when only looking at the year 1969. This is not surprising as 1969 was not a good year to retire due to the high inflation rates that prevailed during the following decade. \n",
+    "\n",
+    "Let's now consider the case for *maxBequest* under a desired net spending."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "6471720b-4704-4850-a341-1d9a0e5e58e2",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "plan.runHistoricalRange('maxBequest', options, 1928, 1990);"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "7fa4f26a-0ea2-4804-8013-84b4b24a98e2",
+   "metadata": {},
+   "source": [
+    "The resulting success rate when considering all historical data is 100%. This is also not surprising as the original estimates for the net spending and the bequest were derived from running a case in 1969, the second next worst year of historical sequences of returns. "
+   ]
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3 (ipykernel)",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.12.7"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}

{owlplanner-2025.1.24 → owlplanner-2025.1.27}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "owlplanner"
-version = "2025.01.24"
+version = "2025.01.27"
 authors = [
   { name="Martin-D. Lacasse", email="martin.d.lacasse@gmail.com" },
 ]
@@ -31,6 +31,7 @@ dependencies = [
     "openpyxl",
     "scipy",
     "streamlit",
+    "toml",
 ]
 license = {file = "LICENSE"}
 

owlplanner-2025.1.27/src/owlplanner/data/rates.csv

@@ -0,0 +1,98 @@
+year,S&P 500,Bonds Baa,Bonds Aaa,TBills,TNotes,Inflation
+1928,43.81,3.22,3.22,3.08,0.84,-1.16
+1929,-8.3,3.02,3.02,3.16,4.2,0.58
+1930,-25.12,0.54,0.54,4.55,4.54,-6.4
+1931,-43.84,-15.68,-15.68,2.31,-2.56,-9.32
+1932,-8.64,23.59,23.59,1.07,8.79,-10.27
+1933,49.98,12.97,12.97,0.96,1.86,0.76
+1934,-1.19,18.82,18.82,0.28,7.96,1.52
+1935,46.74,13.31,13.31,0.17,4.47,2.99
+1936,31.94,11.38,11.38,0.17,5.02,1.45
+1937,-35.34,-4.42,-4.42,0.28,1.38,2.86
+1938,29.28,9.24,9.24,0.07,4.21,-2.78
+1939,-1.1,7.98,7.98,0.05,4.41,0.0
+1940,-10.67,8.65,8.65,0.04,5.4,0.71
+1941,-12.77,5.01,5.01,0.13,-2.02,9.93
+1942,19.17,5.18,5.18,0.34,2.29,9.03
+1943,25.06,8.04,8.04,0.38,2.49,2.96
+1944,19.03,6.57,6.57,0.38,2.58,2.3
+1945,35.82,6.8,6.8,0.38,3.8,2.25
+1946,-8.43,2.51,2.51,0.38,3.13,18.13
+1947,5.2,0.26,0.26,0.6,0.92,8.84
+1948,5.7,3.44,3.44,1.05,1.95,2.99
+1949,18.3,5.38,5.38,1.12,4.66,-2.07
+1950,30.81,4.24,4.24,1.2,0.43,5.93
+1951,23.68,-0.19,-0.19,1.52,-0.3,6.0
+1952,18.15,4.44,4.44,1.72,2.27,0.75
+1953,-1.21,1.62,1.62,1.89,4.14,0.75
+1954,52.56,6.16,6.16,0.94,3.29,-0.74
+1955,32.6,2.04,2.04,1.72,-1.34,0.37
+1956,7.44,-2.35,-2.35,2.62,-2.26,2.99
+1957,-10.46,-0.72,-0.72,3.22,6.8,2.9
+1958,43.72,6.43,6.43,1.77,-2.1,1.76
+1959,12.06,1.57,1.57,3.39,-2.65,1.73
+1960,0.34,6.66,6.66,2.87,11.64,1.36
+1961,26.64,5.1,5.1,2.35,2.06,0.67
+1962,-8.81,6.5,6.5,2.77,5.69,1.33
+1963,22.61,5.46,5.46,3.16,1.68,1.64
+1964,16.42,5.16,5.16,3.55,3.73,0.97
+1965,12.4,3.19,3.19,3.95,0.72,1.92
+1966,-9.97,-3.45,-3.45,4.86,2.91,3.46
+1967,23.8,0.9,0.9,4.29,-1.58,3.04
+1968,10.81,4.85,4.85,5.34,3.27,4.72
+1969,-8.24,-2.03,-2.03,6.67,-5.01,6.2
+1970,3.56,5.65,5.65,6.39,16.75,5.57
+1971,14.22,14.0,14.0,4.33,9.79,3.27
+1972,18.76,11.41,11.41,4.06,2.82,3.41
+1973,-14.31,4.32,4.32,7.04,3.66,8.71
+1974,-25.9,-4.38,-4.38,7.85,1.99,12.34
+1975,37.0,11.05,11.05,5.79,3.61,6.94
+1976,23.83,19.75,19.75,4.98,15.98,4.86
+1977,-6.98,9.95,9.95,5.26,1.29,6.7
+1978,6.51,3.14,3.14,7.18,-0.78,9.02
+1979,18.52,-2.01,-2.01,10.05,0.67,13.29
+1980,31.74,-3.32,-3.32,11.39,-2.99,12.52
+1981,-4.7,8.46,8.46,14.04,8.2,8.92
+1982,20.42,29.05,29.05,10.6,32.81,3.83
+1983,22.34,16.19,16.19,8.62,3.2,3.79
+1984,6.15,15.62,15.62,9.54,13.73,3.95
+1985,31.24,23.86,23.86,7.47,25.71,3.8
+1986,18.49,21.35,21.35,5.97,24.28,1.1
+1987,5.81,2.81,2.81,5.78,-4.96,4.43
+1988,16.54,14.38,14.38,6.67,8.22,4.42
+1989,31.48,15.95,15.95,8.11,17.69,4.65
+1990,-3.06,6.28,6.28,7.5,6.24,6.11
+1991,30.23,18.93,18.93,5.38,15.0,3.06
+1992,7.49,11.31,11.31,3.43,9.36,2.9
+1993,9.97,15.47,15.47,3.0,14.21,2.75
+1994,1.33,-0.97,-0.97,4.25,-8.04,2.67
+1995,37.2,21.29,21.29,5.49,23.48,2.54
+1996,22.68,3.42,3.42,5.01,1.43,3.32
+1997,33.1,12.75,12.75,5.06,9.94,1.7
+1998,28.34,7.63,7.63,4.78,14.92,1.61
+1999,20.89,0.91,0.91,4.64,-8.25,2.68
+2000,-9.03,9.39,9.39,5.82,16.66,3.39
+2001,-11.85,8.54,8.54,3.4,5.57,1.55
+2002,-21.97,12.14,12.14,1.61,15.12,2.38
+2003,28.36,12.32,12.32,1.01,0.38,1.88
+2004,10.74,10.35,10.35,1.37,4.49,3.26
+2005,4.83,5.3,5.3,3.15,2.87,3.42
+2006,15.61,5.2,5.2,4.73,1.96,2.54
+2007,5.48,4.84,4.84,4.36,10.21,4.08
+2008,-36.55,-3.54,-3.54,1.37,20.1,0.09
+2009,25.94,20.21,20.21,0.15,-11.12,2.72
+2010,14.82,9.41,9.41,0.14,8.46,1.5
+2011,2.1,12.26,12.26,0.05,16.04,2.96
+2012,15.89,9.33,9.33,0.09,2.97,1.74
+2013,32.15,-0.98,-0.98,0.06,-9.1,1.5
+2014,13.52,10.78,10.78,0.03,10.75,0.76
+2015,1.38,-1.5,-1.5,0.05,1.28,0.73
+2016,11.77,11.52,11.52,0.32,0.69,2.07
+2017,21.61,9.23,9.23,0.93,2.8,2.11
+2018,-4.23,-3.27,-3.27,1.94,-0.02,1.91
+2019,31.21,15.25,15.25,2.06,9.64,2.29
+2020,18.02,10.6,10.6,0.35,11.33,1.36
+2021,28.47,0.93,0.93,0.05,-4.42,7.04
+2022,-18.04,-15.14,-15.14,2.02,-17.83,6.45
+2023,26.06,8.74,8.74,5.07,3.88,3.35
+2024,24.88,1.74,1.74,4.97,-1.64,2.75

{owlplanner-2025.1.24 → owlplanner-2025.1.27}/src/owlplanner/plan.py

@@ -315,7 +315,7 @@ class Plan(object):
         self._adjustedParameters = False
         self.timeListsFileName = "None"
         self.timeLists = {}
-        self.resetContributions()
+        self.zeroContributions()
         self.caseStatus = 'unsolved'
         self.rateMethod = None
 
@@ -900,10 +900,18 @@ class Plan(object):
         try:
             filename, self.timeLists = timelists.read(filename, self.inames, self.horizons, self.mylog)
         except Exception as e:
-            raise Exception('Unsuccessful read: %s' % e)
+            raise Exception('Unsuccessful read of contributions: %s' % e)
+            return False
 
-        timelists.check(self.inames, self.timeLists, self.horizons)
         self.timeListsFileName = filename
+        self.setContributions()
+
+        return True
+
+    def setContributions(self, timeLists=None):
+        if timeLists is not None:
+            timelists.check(timeLists, self.inames, self.horizons)
+            self.timeLists = timeLists
 
         # Now fill in parameters which are in $.
         for i, iname in enumerate(self.inames):
@@ -926,7 +934,7 @@ class Plan(object):
 
         self.caseStatus = 'modified'
 
-        return True
+        return self.timeLists
 
     def saveContributions(self):
         """
@@ -954,7 +962,7 @@ class Plan(object):
 
         return wb
 
-    def resetContributions(self):
+    def zeroContributions(self):
         """
         Reset all contributions variables to zero.
         """