[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master dcfe8da 1/5: Rearrange taxation-related TxSet
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master dcfe8da 1/5: Rearrange taxation-related TxSetDeathBft() comments |
Date: |
Thu, 25 Oct 2018 13:53:13 -0400 (EDT) |
branch: master
commit dcfe8da9dc708ef671d54057fc6d8d43dc66cb08
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Rearrange taxation-related TxSetDeathBft() comments
Moved certain comments without reformatting yet, so that
git diff --color-moved=plain
shows the changes clearly.
---
ihs_avmly.cpp | 36 +++++++++++++++++++-----------------
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/ihs_avmly.cpp b/ihs_avmly.cpp
index 4b78a13..03ba74c 100644
--- a/ihs_avmly.cpp
+++ b/ihs_avmly.cpp
@@ -1569,16 +1569,6 @@ void AccountValue::TxSetBOMAV()
/// Set death benefit reflecting corridor and death benefit option.
-void AccountValue::TxSetDeathBft()
-{
- // TODO ?? TAXATION !! Should 7702 or 7702A processing be done here?
- // If so, then this code may be useful:
-// double prior_db_7702A = DB7702A;
-// double prior_sa_7702A = ActualSpecAmt;
-
- // Total account value is unloaned plus loaned.
- // TODO ?? Should we use CSV here?
- double AV = TotalAccountValue();
// TAXATION !! Revisit this--it affects 'DB7702A':
// > TxSetDeathBft() needs to be called every time a new solve-spec amt
// > is applied to determine the death benefit. But you don't really want to
@@ -1588,6 +1578,25 @@ void AccountValue::TxSetDeathBft()
// > from within DoYear() and needs to be called from outside of DoYear(0)
// > even a non-solve will end up double counting the refund of PPL's.
+ // TODO ?? TAXATION !! Should 7702 or 7702A processing be done here?
+ // If so, then this code may be useful:
+// double prior_db_7702A = DB7702A;
+// double prior_sa_7702A = ActualSpecAmt;
+
+ // TODO ?? TAXATION !! Should 7702 or 7702A processing be done here?
+ // If so, then this code may be useful:
+/*
+ // Try moving this here...
+ Irc7702A_->UpdateBft7702A(...);
+ LMI_ASSERT(0.0 <= Dcv);
+*/
+
+void AccountValue::TxSetDeathBft()
+{
+ // Total account value is unloaned plus loaned.
+ // TODO ?? Should we use CSV here?
+ double AV = TotalAccountValue();
+
switch(YearsDBOpt)
{
case mce_option1:
@@ -1651,13 +1660,6 @@ void AccountValue::TxSetDeathBft()
)
)
);
- // TODO ?? TAXATION !! Should 7702 or 7702A processing be done here?
- // If so, then this code may be useful:
-/*
- // Try moving this here...
- Irc7702A_->UpdateBft7702A(...);
- LMI_ASSERT(0.0 <= Dcv);
-*/
// SOMEDAY !! Accumulate average death benefit for profit testing here.
}