[lmi-commits] [lmi] master 19b5b07: No longer emulate a vendor-system error

[Greg Chicares]

branch: master
commit 19b5b07e033b9f314dc65f1d4ba0550f13645193
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    No longer emulate a vendor-system error
---
 account_value.hpp |  2 +-
 accountvalue.cpp  |  2 +-
 ihs_acctval.cpp   |  6 +++---
 ihs_avmly.cpp     | 29 ++++++-----------------------
 4 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/account_value.hpp b/account_value.hpp
index b7d5551..bbd408b 100644
--- a/account_value.hpp
+++ b/account_value.hpp
@@ -250,7 +250,7 @@ class LMI_SO AccountValue
     void TxSetBOMAV              ();
     void TxTestHoneymoonForExpiration();
     void TxSetTermAmt            ();
-    void TxSetDeathBft           (bool force_eoy_behavior = false);
+    void TxSetDeathBft           ();
     void TxSetCoiCharge          ();
     void TxSetRiderDed           ();
     void TxDoMlyDed              ();
diff --git a/accountvalue.cpp b/accountvalue.cpp
index 7fd3ef9..b4efd1d 100644
--- a/accountvalue.cpp
+++ b/accountvalue.cpp
@@ -729,7 +729,7 @@ void AccountValue::TxSetBOMAV()
 
 //============================================================================
 // Set death benefit reflecting corridor and option 2.
-void AccountValue::TxSetDeathBft(bool)
+void AccountValue::TxSetDeathBft()
 {
     // Total account value is unloaned plus loaned.
     double AV = AVUnloaned + AVRegLn + AVPrfLn;
diff --git a/ihs_acctval.cpp b/ihs_acctval.cpp
index 1d9beeb..eb0f4eb 100644
--- a/ihs_acctval.cpp
+++ b/ihs_acctval.cpp
@@ -1322,7 +1322,7 @@ void AccountValue::SetClaims()
         return;
         }
 
-    TxSetDeathBft(true);
+    TxSetDeathBft();
     TxSetTermAmt();
 
     YearsGrossClaims       = partial_mortality_q[Year] * DBReflectingCorr;
@@ -1363,7 +1363,7 @@ void AccountValue::SetProjectedCoiCharge()
         return;
         }
 
-    TxSetDeathBft(true);
+    TxSetDeathBft();
     TxSetTermAmt();
     double this_years_terminal_naar = material_difference
         (DBReflectingCorr + TermDB
@@ -1469,7 +1469,7 @@ void AccountValue::FinalizeYear()
     // end-of-year value (as of the end of the twelfth month) is
     // needed.
 
-    TxSetDeathBft(true);
+    TxSetDeathBft();
     TxSetTermAmt();
     // post values to LedgerVariant
     InvariantValues().TermSpecAmt   [Year] = TermSpecAmt;
diff --git a/ihs_avmly.cpp b/ihs_avmly.cpp
index fdcc621..c6e693d 100644
--- a/ihs_avmly.cpp
+++ b/ihs_avmly.cpp
@@ -1571,7 +1571,7 @@ void AccountValue::TxSetBOMAV()
 
 //============================================================================
 // Set death benefit reflecting corridor and death benefit option.
-void AccountValue::TxSetDeathBft(bool force_eoy_behavior)
+void AccountValue::TxSetDeathBft()
 {
     // TODO ?? TAXATION !! Should 7702 or 7702A processing be done here?
     // If so, then this code may be useful:
@@ -1628,28 +1628,11 @@ void AccountValue::TxSetDeathBft(bool 
force_eoy_behavior)
 //        + std::max(0.0, ExpRatReserve) // This would be added if it existed.
         ;
 
-    if
-        (   force_eoy_behavior
-        ||  contains(yare_input_.Comments, "idiosyncrasyV")
-        )
-        {
-        // The corridor death benefit ought always to reflect the
-        // honeymoon value. It always does if "idiosyncrasyV" is
-        // specified; otherwise, to match account values (but not
-        // death benefits) with an incorrect admin system, the
-        // honeymoon value is respected only if end-of-year behavior
-        // is forced--thus, year-end death benefit is correct, but
-        // the effect of the honeymoon value on corridor calculations
-        // (and hence mortality charges) is ignored for monthiversary
-        // processing. The idea is that in the event of death the
-        // faulty admin system's death-benefit calculation is ignored
-        // and the correct death benefit is calculated manually.
-        //
-        cash_value_for_corridor = std::max
-            (cash_value_for_corridor
-            ,HoneymoonValue
-            );
-        }
+    cash_value_for_corridor = std::max
+        (cash_value_for_corridor
+        ,HoneymoonValue
+        );
+
     DBReflectingCorr = std::max
         (DBIgnoringCorr
         ,YearsCorridorFactor * cash_value_for_corridor