[lmi-commits] [lmi] master 11041f1 06/10: Simplify an idiosyncratic gnarl

[Greg Chicares]

branch: master
commit 11041f142aa8d9a8e82c3f6f428ab27df2f6fea2
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Simplify an idiosyncratic gnarl
    
    This commit makes the calculation wrong, although not for any product
    lmi currently supports. It will be replaced by a correct calculation
    soon.
---
 i7702.cpp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/i7702.cpp b/i7702.cpp
index a5e36ec..0e5f47b 100644
--- a/i7702.cpp
+++ b/i7702.cpp
@@ -245,15 +245,12 @@ i7702::i7702
     // the issue date constitutes a short-term guarantee that must be
     // reflected in the 7702 interest rates (excluding the GLP rate).
 
-    if
-        (   database.query<bool>(DB_AllowSepAcct)
-        && !database.query<bool>(DB_AllowGenAcct)
-        )
-        {
-        // 7702 !! DB_CurrAcctValLoad is sepacct only: change its name
-        database.query_into(DB_CurrAcctValLoad, Dsep_);
-        Dsep_ += stratified.minimum_tiered_sepacct_load_for_7702();
-        }
+    // It just so happens that these loads are zero for all products
+    // lmi supports, except for separate-account-only products. The
+    // logic will soon be reworked to make that irrelevant.
+    // 7702 !! DB_CurrAcctValLoad is sepacct only: change its name
+    database.query_into(DB_CurrAcctValLoad, Dsep_);
+    Dsep_ += stratified.minimum_tiered_sepacct_load_for_7702();
 
     gross_.assign(database.length(), 0.0);
     assign