[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master a52e71df 2/3: Annotate each scalable vector w
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master a52e71df 2/3: Annotate each scalable vector with its format |
|
Date: |
Wed, 27 Apr 2022 16:19:13 -0400 (EDT) |
branch: master
commit a52e71dffc0c81607f54bc07d68fbeeed4c01e58
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Annotate each scalable vector with its format
Most are already held as cents rather than dollars. The lack of
uniformity was the root cause of the defect just fixed.
---
ledger_invariant.cpp | 32 ++++++++++++++--------------
ledger_variant.cpp | 60 ++++++++++++++++++++++++++--------------------------
2 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/ledger_invariant.cpp b/ledger_invariant.cpp
index 5e3637cb..ceecc0c5 100644
--- a/ledger_invariant.cpp
+++ b/ledger_invariant.cpp
@@ -81,26 +81,26 @@ void LedgerInvariant::Alloc(int len)
Length = len;
// BOY vectors.
- BegYearVectors ["GrossPmt" ] = &GrossPmt
;
- BegYearVectors ["EeGrossPmt" ] = &EeGrossPmt
;
- BegYearVectors ["ErGrossPmt" ] = &ErGrossPmt
;
- BegYearVectors ["NetWD" ] = &NetWD
;
- BegYearVectors ["NewCashLoan" ] = &NewCashLoan
;
- BegYearVectors ["Outlay" ] = &Outlay
;
- BegYearVectors ["GptForceout" ] = &GptForceout
;
- BegYearVectors ["NaarForceout" ] = &NaarForceout
;
- BegYearVectors ["ModalMinimumPremium" ] = &ModalMinimumPremium
;
- BegYearVectors ["EeModalMinimumPremium" ] = &EeModalMinimumPremium
;
- BegYearVectors ["ErModalMinimumPremium" ] = &ErModalMinimumPremium
;
- BegYearVectors ["AddonMonthlyFee" ] = &AddonMonthlyFee
;
+ BegYearVectors ["GrossPmt" ] = &GrossPmt
; // f5
+ BegYearVectors ["EeGrossPmt" ] = &EeGrossPmt
; // f5
+ BegYearVectors ["ErGrossPmt" ] = &ErGrossPmt
; // f5
+ BegYearVectors ["NetWD" ] = &NetWD
; // f5
+ BegYearVectors ["NewCashLoan" ] = &NewCashLoan
; // f5
+ BegYearVectors ["Outlay" ] = &Outlay
; // f5
+ BegYearVectors ["GptForceout" ] = &GptForceout
; // f5
+ BegYearVectors ["NaarForceout" ] = &NaarForceout
; // f5
+ BegYearVectors ["ModalMinimumPremium" ] = &ModalMinimumPremium
; // f5
+ BegYearVectors ["EeModalMinimumPremium" ] = &EeModalMinimumPremium
; // f5
+ BegYearVectors ["ErModalMinimumPremium" ] = &ErModalMinimumPremium
; // f5
+ BegYearVectors ["AddonMonthlyFee" ] = &AddonMonthlyFee
; // f2
// EOY vectors.
- EndYearVectors ["TermSpecAmt" ] = &TermSpecAmt
;
- EndYearVectors ["SpecAmt" ] = &SpecAmt
;
- EndYearVectors ["Dcv" ] = &Dcv
;
+ EndYearVectors ["TermSpecAmt" ] = &TermSpecAmt
; // f5
+ EndYearVectors ["SpecAmt" ] = &SpecAmt
; // f5
+ EndYearVectors ["Dcv" ] = &Dcv
; // f5
// Forborne vectors.
- ForborneVectors ["Salary" ] = &Salary
;
+ ForborneVectors ["Salary" ] = &Salary
; // f1
// Nonscalable vectors.
OtherVectors ["IndvTaxBracket" ] = &IndvTaxBracket
;
diff --git a/ledger_variant.cpp b/ledger_variant.cpp
index 0a89d157..10189b60 100644
--- a/ledger_variant.cpp
+++ b/ledger_variant.cpp
@@ -74,9 +74,9 @@ void LedgerVariant::Alloc(int len)
{
Length = len;
- BegYearVectors ["COICharge" ] = &COICharge ;
- BegYearVectors ["RiderCharges" ] = &RiderCharges ;
- BegYearVectors ["ExpenseCharges" ] = &ExpenseCharges ;
+ BegYearVectors ["COICharge" ] = &COICharge ; //
f5
+ BegYearVectors ["RiderCharges" ] = &RiderCharges ; //
f5
+ BegYearVectors ["ExpenseCharges" ] = &ExpenseCharges ; //
f5
// Account value released on death might at first seem to be
// an end-of-year item, since we use curtate mortality and the
@@ -88,37 +88,37 @@ void LedgerVariant::Alloc(int len)
// rather than at either of the year's endpoints. The same is
// true of various other items such as policy fee and interest
// credited as used here.
- BegYearVectors ["AVRelOnDeath" ] = &AVRelOnDeath ;
- BegYearVectors ["NetIntCredited" ] = &NetIntCredited ;
- BegYearVectors ["GrossIntCredited" ] = &GrossIntCredited ;
- BegYearVectors ["LoanIntAccrued" ] = &LoanIntAccrued ;
+ BegYearVectors ["AVRelOnDeath" ] = &AVRelOnDeath ; //
f1
+ BegYearVectors ["NetIntCredited" ] = &NetIntCredited ; //
f5
+ BegYearVectors ["GrossIntCredited" ] = &GrossIntCredited ; //
f5
+ BegYearVectors ["LoanIntAccrued" ] = &LoanIntAccrued ; //
f5
- BegYearVectors ["PolicyFee" ] = &PolicyFee ;
- BegYearVectors ["PremTaxLoad" ] = &PremTaxLoad ;
- BegYearVectors ["DacTaxLoad" ] = &DacTaxLoad ;
- BegYearVectors ["SpecAmtLoad" ] = &SpecAmtLoad ;
- BegYearVectors ["SepAcctCharges" ] = &SepAcctCharges ;
+ BegYearVectors ["PolicyFee" ] = &PolicyFee ; //
f5
+ BegYearVectors ["PremTaxLoad" ] = &PremTaxLoad ; //
f1
+ BegYearVectors ["DacTaxLoad" ] = &DacTaxLoad ; //
f1
+ BegYearVectors ["SpecAmtLoad" ] = &SpecAmtLoad ; //
f5
+ BegYearVectors ["SepAcctCharges" ] = &SepAcctCharges ; //
f5
// Deaths are assumed to come at the end of the year only; but
// they're discounted by the proportion in force at the beginning.
- BegYearVectors ["ClaimsPaid" ] = &ClaimsPaid ;
- BegYearVectors ["DeathProceedsPaid" ] = &DeathProceedsPaid ;
- BegYearVectors ["NetClaims" ] = &NetClaims ;
- BegYearVectors ["NetPmt" ] = &NetPmt ;
-
- EndYearVectors ["AcctVal" ] = &AcctVal ;
- EndYearVectors ["AVGenAcct" ] = &AVGenAcct ;
- EndYearVectors ["AVSepAcct" ] = &AVSepAcct ;
- EndYearVectors ["DacTaxRsv" ] = &DacTaxRsv ;
- EndYearVectors ["CSVNet" ] = &CSVNet ;
- EndYearVectors ["CV7702" ] = &CV7702 ;
- EndYearVectors ["EOYDeathBft" ] = &EOYDeathBft ;
- EndYearVectors ["PrefLoanBalance" ] = &PrefLoanBalance ;
- EndYearVectors ["TotalLoanBalance" ] = &TotalLoanBalance ;
- EndYearVectors ["AvgDeathBft" ] = &AvgDeathBft ;
- EndYearVectors ["SurrChg" ] = &SurrChg ;
- EndYearVectors ["TermPurchased" ] = &TermPurchased ;
- EndYearVectors ["BaseDeathBft" ] = &BaseDeathBft ;
+ BegYearVectors ["ClaimsPaid" ] = &ClaimsPaid ; //
f1
+ BegYearVectors ["DeathProceedsPaid" ] = &DeathProceedsPaid ; //
f1
+ BegYearVectors ["NetClaims" ] = &NetClaims ; //
f1
+ BegYearVectors ["NetPmt" ] = &NetPmt ; //
f5
+
+ EndYearVectors ["AcctVal" ] = &AcctVal ; //
f5
+ EndYearVectors ["AVGenAcct" ] = &AVGenAcct ; //
f5
+ EndYearVectors ["AVSepAcct" ] = &AVSepAcct ; //
f5
+ EndYearVectors ["DacTaxRsv" ] = &DacTaxRsv ; //
f1
+ EndYearVectors ["CSVNet" ] = &CSVNet ; //
f5
+ EndYearVectors ["CV7702" ] = &CV7702 ; //
f5
+ EndYearVectors ["EOYDeathBft" ] = &EOYDeathBft ; //
f5
+ EndYearVectors ["PrefLoanBalance" ] = &PrefLoanBalance ; //
f5
+ EndYearVectors ["TotalLoanBalance" ] = &TotalLoanBalance ; //
f5
+ EndYearVectors ["AvgDeathBft" ] = &AvgDeathBft ; //
f1
+ EndYearVectors ["SurrChg" ] = &SurrChg ; //
f5
+ EndYearVectors ["TermPurchased" ] = &TermPurchased ; //
f5
+ EndYearVectors ["BaseDeathBft" ] = &BaseDeathBft ; //
f5
OtherVectors ["MlySAIntRate" ] = &MlySAIntRate ;
OtherVectors ["MlyGAIntRate" ] = &MlyGAIntRate ;