[lmi-commits] [lmi] master bb0eb2c 7/9: Favor problem-domain terminology

[Greg Chicares]

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

    Favor problem-domain terminology
---
 finra_header_lower.mst |  4 ++--
 ledger_evaluator.cpp   | 10 +++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/finra_header_lower.mst b/finra_header_lower.mst
index d5aa394..eddc939 100644
--- a/finra_header_lower.mst
+++ b/finra_header_lower.mst
@@ -59,8 +59,8 @@
         </td>
         <td width="40%">
             Assumed Premium Allocation:**<br>
-            &nbsp;&nbsp;&nbsp;&nbsp;Separate Account: 
{{GenAcctAllocationComplementPercent}}<br>
-            &nbsp;&nbsp;&nbsp;&nbsp;Guaranteed Principal Account (GPA): 
{{GenAcctAllocationPercent}}<br>
+            &nbsp;&nbsp;&nbsp;&nbsp;Separate Account: {{SepAcctAllocation}}<br>
+            &nbsp;&nbsp;&nbsp;&nbsp;Guaranteed Principal Account (GPA): 
{{GenAcctAllocation}}<br>
             Initial
                 {{#HasTermOrSupplSpecAmt}}
                     Total
diff --git a/ledger_evaluator.cpp b/ledger_evaluator.cpp
index df54e37..4c580fe 100644
--- a/ledger_evaluator.cpp
+++ b/ledger_evaluator.cpp
@@ -483,8 +483,6 @@ ledger_evaluator Ledger::make_evaluator() const
     format_map["SalesLoadRefundRate0"              ] = f3;
     format_map["SalesLoadRefundRate1"              ] = f3;
     format_map["GenAcctAllocation"                 ] = f3;
-    format_map["GenAcctAllocationPercent"          ] = f3;
-    format_map["GenAcctAllocationComplementPercent"] = f3;
 
 // >
 // F2: two decimals, commas
@@ -855,11 +853,9 @@ ledger_evaluator Ledger::make_evaluator() const
     scalars["SalesLoadRefundRate0"] = &SalesLoadRefundRate0;
     scalars["SalesLoadRefundRate1"] = &SalesLoadRefundRate1;
 
-    double GenAcctAllocation           = ledger_invariant_->GenAcctAllocation;
-    double GenAcctAllocationComplement = 1.0 - GenAcctAllocation;
-
-    scalars["GenAcctAllocationPercent"          ] = &GenAcctAllocation;
-    scalars["GenAcctAllocationComplementPercent"] = 
&GenAcctAllocationComplement;
+    double SepAcctAllocation = 1.0 - ledger_invariant_->GenAcctAllocation;
+    scalars   ["SepAcctAllocation"] = &SepAcctAllocation;
+    format_map["SepAcctAllocation"] = f3;
 
     std::string ScaleUnit = ledger_invariant_->ScaleUnit();
     strings["ScaleUnit"] = &ScaleUnit;