owlplanner 2025.3.15__py3-none-any.whl → 2025.3.27__py3-none-any.whl

owlplanner/plan.py

@@ -307,6 +307,9 @@ class Plan(object):
         # Previous 2 years for Medicare.
         self.prevMAGI = np.zeros((2))
 
+        # Default slack on profile.
+        self.lambdha = 0
+
         # Scenario starts at the beginning of this year and ends at the end of the last year.
         s = ["", "s"][self.N_i - 1]
         self.mylog.vprint(f"Preparing scenario of {self.N_n} years for {self.N_i} individual{s}.")
@@ -1071,6 +1074,9 @@ class Plan(object):
         Cx = self.C["x"]
         Cz = self.C["z"]
 
+        spLo = 1 - self.lambdha
+        spHi = 1 + self.lambdha
+
         tau_ijn = np.zeros((Ni, Nj, Nn))
         for i in range(Ni):
             for j in range(Nj):
@@ -1191,7 +1197,7 @@ class Plan(object):
             # Account for time elapsed in the current year.
             spending *= units * self.yearFracLeft
             # self.mylog.vprint('Maximizing bequest with desired net spending of:', u.d(spending))
-            A.addNewRow({_q1(Cg, 0): 1}, spending, spending)
+            A.addNewRow({_q1(Cg, 0): 1}, spLo * spending, spHi * spending)
 
         # Set initial balances through constraints.
         for i in range(Ni):
@@ -1297,8 +1303,10 @@ class Plan(object):
 
         # Impose income profile.
         for n in range(1, Nn):
-            rowDic = {_q1(Cg, 0, Nn): -self.xiBar_n[n], _q1(Cg, n, Nn): self.xiBar_n[0]}
-            A.addNewRow(rowDic, zero, zero)
+            rowDic = {_q1(Cg, 0, Nn): -spLo * self.xiBar_n[n], _q1(Cg, n, Nn): self.xiBar_n[0]}
+            A.addNewRow(rowDic, zero, inf)
+            rowDic = {_q1(Cg, 0, Nn): spHi * self.xiBar_n[n], _q1(Cg, n, Nn): -self.xiBar_n[0]}
+            A.addNewRow(rowDic, zero, inf)
 
         # Taxable ordinary income.
         for n in range(Nn):
@@ -1362,7 +1370,9 @@ class Plan(object):
         # Now build a solver-neutral objective vector.
         c = abc.Objective(self.nvars)
         if objective == "maxSpending":
-            c.setElem(_q1(Cg, 0, Nn), -1)
+            # c.setElem(_q1(Cg, 0, Nn), -1)
+            for n in range(Nn):
+                c.setElem(_q1(Cg, n, Nn), -1/self.gamma_n[n])
         elif objective == "maxBequest":
             for i in range(Ni):
                 c.setElem(_q3(Cb, i, 0, Nn, Ni, Nj, Nn + 1), -1)
@@ -1608,6 +1618,7 @@ class Plan(object):
             "units",
             "maxRothConversion",
             "netSpending",
+            "spendingSlack",
             "bequest",
             "bigM",
             "noRothConversions",
@@ -1642,6 +1653,7 @@ class Plan(object):
         if objective == "maxSpending" and "bequest" not in myoptions:
             self.mylog.vprint("Using bequest of $1.")
 
+        self.prevMAGI = np.zeros(2)
         if "previousMAGIs" in myoptions:
             magi = myoptions["previousMAGIs"]
             if len(magi) != 2:
@@ -1653,6 +1665,13 @@ class Plan(object):
                 units = 1000
             self.prevMAGI = units * np.array(magi)
 
+        self.lambdha = 0
+        if "spendingSlack" in myoptions:
+            lambdha = myoptions["spendingSlack"]
+            if lambdha < 0 or lambdha > 50:
+                raise ValueError(f"Slack value out of range {lambdha}.")
+            self.lambdha = lambdha / 100
+
         self._adjustParameters()
 
         if "solver" in options:

owlplanner/rates.py

@@ -110,6 +110,9 @@ def getRatesDistributions(frm, to, mylog=None):
     # Build correlation matrix by dividing by the stdev for each column and row.
     corr = covar / stdev[:, None]
     corr = corr.T / stdev[:, None]
+    # Fold round-off errors in proper bounds.
+    corr[corr > 1] = 1
+    corr[corr < -1] = -1
     mylog.print("correlation matrix: \n\t\t%s" % str(corr).replace("\n", "\n\t\t"))
 
     return means, stdev, corr, covar

owlplanner/version.py

@@ -1 +1 @@
-__version__ = "2025.03.15"
+__version__ = "2025.03.27"

{owlplanner-2025.3.15.dist-info → owlplanner-2025.3.27.dist-info}/METADATA

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

@@ -2,16 +2,16 @@ owlplanner/__init__.py,sha256=QqrdT0Qks20osBTg7h0vJHAxpP9lL7DA99xb0nYbtw4,254
 owlplanner/abcapi.py,sha256=LbzW_KcNy0IeHp42MUHwGu_H67B2h_e1_vu-c2ACTkQ,6646
 owlplanner/config.py,sha256=uJ6jZ9Rx2CB2P5cFRscsUCXOW6uml7I4pta2ozjW0uo,12263
 owlplanner/logging.py,sha256=tYMw04O-XYSzjTj36fmKJGLcE1VkK6k6oJNeqtKXzuc,2530
-owlplanner/plan.py,sha256=SWTqNMC0Mk2BUO3CBeeyBaz_cCbLddlSgPJaIj2Cc-I,116090
+owlplanner/plan.py,sha256=F243hFv85IIanKtnyjgbGJ1W0Mz8uBBeHBBwW5b9u0k,116830
 owlplanner/progress.py,sha256=8jlCvvtgDI89zXVNMBg1-lnEyhpPvKQS2X5oAIpoOVQ,384
-owlplanner/rates.py,sha256=TN407qU4n-bac1oymkQ_n2QKEPwFQxy6JZVGwgIkLQU,15585
+owlplanner/rates.py,sha256=gJaoe-gJqWCQV5qVLlHp-Yn9TSJs-PJzeTbOwMCbqWs,15682
 owlplanner/tax2025.py,sha256=B-A5eU3wxdcAaxRCbT3qI-JEKoD_ZeNbg_86XhNdQEI,7745
 owlplanner/timelists.py,sha256=tYieZU67FT6TCcQQis36JaXGI7dT6NqD7RvdEjgJL4M,4026
 owlplanner/utils.py,sha256=WpJgn79YZfH8UCkcmhd-AZlxlGuz1i1-UDBRXImsY6I,2485
-owlplanner/version.py,sha256=bgb6jaI7G-g19wcFJKSKnZXFRyBbqhxpo45gREhwu-U,28
+owlplanner/version.py,sha256=eT4mV245NLOvKScOuf87I7NOI5wxmOs9MVCyrVUkZeQ,28
 owlplanner/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 owlplanner/data/rates.csv,sha256=6fxg56BVVORrj9wJlUGFdGXKvOX5r7CSca8uhUbbuIU,3734
-owlplanner-2025.3.15.dist-info/METADATA,sha256=aM0PuxyPW8mmVvJ-jmq_qBnpAAzd1mFM5OZ_JYx8v1o,53801
-owlplanner-2025.3.15.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-owlplanner-2025.3.15.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-owlplanner-2025.3.15.dist-info/RECORD,,
+owlplanner-2025.3.27.dist-info/METADATA,sha256=hBZoDMbIKBNeQ2vnRLzDovLileZGC05aTXDzo4BxJ04,53801
+owlplanner-2025.3.27.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+owlplanner-2025.3.27.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+owlplanner-2025.3.27.dist-info/RECORD,,