owlplanner 2025.5.1__py3-none-any.whl → 2025.5.2__py3-none-any.whl

owlplanner/plan.py

@@ -1081,6 +1081,9 @@ class Plan(object):
         spLo = 1 - self.lambdha
         spHi = 1 + self.lambdha
 
+        oppCostX = options.get("oppCostX", 0.)
+        xnet = 1 - oppCostX/100.
+
         tau_ijn = np.zeros((Ni, Nj, Nn))
         for i in range(Ni):
             for j in range(Nj):
@@ -1277,7 +1280,7 @@ class Plan(object):
                     row.addElem(_q2(Cd, i, n, Ni, Nn), -fac1 * u.krond(j, 0) * Tau1_ijn[i, 0, n])
                     row.addElem(
                         _q2(Cx, i, n, Ni, Nn),
-                        -fac1 * (u.krond(j, 2) - u.krond(j, 1)) * Tau1_ijn[i, j, n],
+                        -fac1 * (xnet*u.krond(j, 2) - u.krond(j, 1)) * Tau1_ijn[i, j, n],
                     )
 
                     if Ni == 2 and n_d < Nn and i == i_s and n == n_d - 1:
@@ -1288,7 +1291,7 @@ class Plan(object):
                         row.addElem(_q2(Cd, i_d, n, Ni, Nn), -fac2 * u.krond(j, 0) * Tau1_ijn[i_d, 0, n])
                         row.addElem(
                             _q2(Cx, i_d, n, Ni, Nn),
-                            -fac2 * (u.krond(j, 2) - u.krond(j, 1)) * Tau1_ijn[i_d, j, n],
+                            -fac2 * (xnet*u.krond(j, 2) - u.krond(j, 1)) * Tau1_ijn[i_d, j, n],
                         )
                     A.addRow(row, rhs, rhs)
 
@@ -1655,6 +1658,7 @@ class Plan(object):
             "startRothConversions",
             "units",
             "withMedicare",
+            "oppCostX",
         ]
         # We might modify options if required.
         myoptions = dict(options)

owlplanner/version.py

@@ -1 +1 @@
-__version__ = "2025.05.01"
+__version__ = "2025.05.02"

{owlplanner-2025.5.1.dist-info → owlplanner-2025.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: owlplanner
-Version: 2025.5.1
+Version: 2025.5.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.5.1.dist-info → owlplanner-2025.5.2.dist-info}/RECORD

@@ -2,16 +2,16 @@ owlplanner/__init__.py,sha256=QqrdT0Qks20osBTg7h0vJHAxpP9lL7DA99xb0nYbtw4,254
 owlplanner/abcapi.py,sha256=Lt8OUgbrfOPzAw0HyxyT2wT-IXI3d9Zo26MwyqdX56Y,6617
 owlplanner/config.py,sha256=F6GS3n02VeFX0GCVeM4J7Ra0in4N632W6TZIXk7Yj2w,12519
 owlplanner/logging.py,sha256=tYMw04O-XYSzjTj36fmKJGLcE1VkK6k6oJNeqtKXzuc,2530
-owlplanner/plan.py,sha256=yfJRP41ExY5cqKDfBXFox9M0a3O7GeYRy4fk9EPTduk,118954
+owlplanner/plan.py,sha256=MiKPvyLE6GQCIz4OgmsMCXsAJEEBfGOyjahGtHVvz9U,119073
 owlplanner/progress.py,sha256=8jlCvvtgDI89zXVNMBg1-lnEyhpPvKQS2X5oAIpoOVQ,384
 owlplanner/rates.py,sha256=gJaoe-gJqWCQV5qVLlHp-Yn9TSJs-PJzeTbOwMCbqWs,15682
 owlplanner/tax2025.py,sha256=JDBtFFAf2bWtKUMuE3W5F0nBhYaKBjmdJj0iayM2iGA,7829
 owlplanner/timelists.py,sha256=tYieZU67FT6TCcQQis36JaXGI7dT6NqD7RvdEjgJL4M,4026
 owlplanner/utils.py,sha256=WpJgn79YZfH8UCkcmhd-AZlxlGuz1i1-UDBRXImsY6I,2485
-owlplanner/version.py,sha256=i0t7xBSM4RiKs64A-MRBD5qug-N0BpH70YpBYsc7Lbw,28
+owlplanner/version.py,sha256=UedHid5K_TIr2csXNt34h9ScX8Qk40-BCQcUtqPIwG0,28
 owlplanner/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 owlplanner/data/rates.csv,sha256=6fxg56BVVORrj9wJlUGFdGXKvOX5r7CSca8uhUbbuIU,3734
-owlplanner-2025.5.1.dist-info/METADATA,sha256=wfo48m-vul82qOlWxk3X6lrbabChuLTxNBJktKCgse0,53926
-owlplanner-2025.5.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-owlplanner-2025.5.1.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-owlplanner-2025.5.1.dist-info/RECORD,,
+owlplanner-2025.5.2.dist-info/METADATA,sha256=WBjjlcC7pqqncmR2fN4oE6urUT6nLH042AwKwMix2oA,53926
+owlplanner-2025.5.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+owlplanner-2025.5.2.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+owlplanner-2025.5.2.dist-info/RECORD,,