[lmi-commits] [lmi] master 592fbe2 1/3: Replace unloaned with total AV in all reports

[Greg Chicares]

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

    Replace unloaned with total AV in all reports
---
 finra_notes2.mst          | 3 +--
 ill_reg_narr_summary2.mst | 3 +--
 ledger_evaluator.cpp      | 2 +-
 ledger_invariant.cpp      | 2 +-
 ledger_invariant.hpp      | 2 +-
 ledger_invariant_init.cpp | 4 +++-
 product_data.cpp          | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/finra_notes2.mst b/finra_notes2.mst
index 26d03b3..fd800c4 100644
--- a/finra_notes2.mst
+++ b/finra_notes2.mst
@@ -146,10 +146,9 @@ The state of issue is {{StateOfJurisdiction}}.
 
 {{#IsInforce}}
 <!-- PDF !! FnInforceAcctVal -->
-<!-- PDF !! Total AV is described, but only unloaned AV is shown. -->
     <p>
     This illustration assumes a beginning account value of
-    ${{InforceUnloanedAV}}
+    ${{InforceTotalAV}}
     as of {{InforceAsOfDate}},
     the end of the last completed {{ContractName}} month.
     </p>
diff --git a/ill_reg_narr_summary2.mst b/ill_reg_narr_summary2.mst
index c887e5d..7eda501 100644
--- a/ill_reg_narr_summary2.mst
+++ b/ill_reg_narr_summary2.mst
@@ -94,10 +94,9 @@ in the Tabular Detail.
 
 {{#IsInforce}}
 <!-- PDF !! FnInforceAcctVal -->
-<!-- PDF !! Total AV is described, but only unloaned AV is shown. -->
     <p>
     This illustration assumes a beginning account value of
-    ${{InforceUnloanedAV}}
+    ${{InforceTotalAV}}
     as of {{InforceAsOfDate}},
     the end of the last completed {{ContractName}} month.
     </p>
diff --git a/ledger_evaluator.cpp b/ledger_evaluator.cpp
index 51dbb43..b4a3d38 100644
--- a/ledger_evaluator.cpp
+++ b/ledger_evaluator.cpp
@@ -472,7 +472,7 @@ format_map_t static_formats()
     ,{"ErListBillPremium"               , f2}
     ,{"GuarPrem"                        , f2}
     ,{"InforceTaxBasis"                 , f2}
-    ,{"InforceUnloanedAV"               , f2}
+    ,{"InforceTotalAV"                  , f2}
     ,{"InitGLP"                         , f2}
     ,{"InitGSP"                         , f2}
     ,{"InitPrem"                        , f2}
diff --git a/ledger_invariant.cpp b/ledger_invariant.cpp
index 204a3de..ada6098 100644
--- a/ledger_invariant.cpp
+++ b/ledger_invariant.cpp
@@ -131,7 +131,7 @@ void LedgerInvariant::Alloc(int len)
     ScalableScalars ["Dumpin"                     ] = &Dumpin                  
   ;
     ScalableScalars ["External1035Amount"         ] = &External1035Amount      
   ;
     ScalableScalars ["Internal1035Amount"         ] = &Internal1035Amount      
   ;
-    ScalableScalars ["InforceUnloanedAV"          ] = &InforceUnloanedAV       
   ;
+    ScalableScalars ["InforceTotalAV"             ] = &InforceTotalAV          
   ;
     ScalableScalars ["InforceTaxBasis"            ] = &InforceTaxBasis         
   ;
 
     // Nonscalable scalars.
diff --git a/ledger_invariant.hpp b/ledger_invariant.hpp
index 781fdbb..ce2a8e1 100644
--- a/ledger_invariant.hpp
+++ b/ledger_invariant.hpp
@@ -122,7 +122,7 @@ class LMI_SO LedgerInvariant final
     double      Dumpin;
     double      External1035Amount;
     double      Internal1035Amount;
-    double      InforceUnloanedAV;
+    double      InforceTotalAV;
     double      InforceTaxBasis;
 
     // Nonscalable scalars.
diff --git a/ledger_invariant_init.cpp b/ledger_invariant_init.cpp
index a973650..67f8262 100644
--- a/ledger_invariant_init.cpp
+++ b/ledger_invariant_init.cpp
@@ -159,8 +159,10 @@ void LedgerInvariant::Init(BasicValues const* b)
 //  External1035Amount         = DYNAMIC
 //  Internal1035Amount         = DYNAMIC
 
-    InforceUnloanedAV =
+    InforceTotalAV =
           b->yare_input_.InforceGeneralAccountValue
+        + b->yare_input_.InforceRegularLoanValue
+        + b->yare_input_.InforcePreferredLoanValue
         + b->yare_input_.InforceSeparateAccountValue
         ;
     InforceTaxBasis            = b->yare_input_.InforceTaxBasis           ;
diff --git a/product_data.cpp b/product_data.cpp
index 3c8f524..010462b 100644
--- a/product_data.cpp
+++ b/product_data.cpp
@@ -529,7 +529,7 @@ static std::string const S_FnProspectus =
 static std::string const S_FnInitialSpecAmt =
   "The initial specified amount is ${{InitTotalSA}}.";
 static std::string const S_FnInforceAcctVal =
-  "The inforce unloaned account value is ${{InforceUnloanedAV}}.";
+  "The inforce account value is ${{InforceTotalAV}}.";
 static std::string const S_FnInforceTaxBasis =
   "The inforce tax basis is ${{InforceTaxBasis}}.";
 static std::string const S_Fn1035Charge =