[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master c98b52d 1/5: Replace 7702 interest-rate vecto
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master c98b52d 1/5: Replace 7702 interest-rate vectors in ledger |
|
Date: |
Mon, 15 Mar 2021 11:03:44 -0400 (EDT) |
branch: master
commit c98b52dad7e5e1061e9c3f4b75aa9347ecad0f9d
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Replace 7702 interest-rate vectors in ledger
---
ledger_evaluator.cpp | 30 ++++++++++++++++++------------
ledger_invariant.cpp | 10 ++++++----
ledger_invariant.hpp | 10 ++++++----
ledger_invariant_init.cpp | 10 ++++++----
4 files changed, 36 insertions(+), 24 deletions(-)
diff --git a/ledger_evaluator.cpp b/ledger_evaluator.cpp
index 9604e9c..a5c0ce9 100644
--- a/ledger_evaluator.cpp
+++ b/ledger_evaluator.cpp
@@ -214,10 +214,12 @@ title_map_t static_titles()
,{"HoneymoonValueSpread" , "Honeymoon\nValue\nSpread"}
,{"IndvTaxBracket" , "EE Tax\nBracket"}
,{"InforceLives" , "BOY\nLives\nInforce"}
- ,{"Irc7702ig" , "7702 i\nfor NAAR\nDiscount"}
- ,{"Irc7702Gross" , "7702 i\nGross"}
- ,{"Irc7702NetGLP" , "7702 i\nNet for\nGLP"}
- ,{"Irc7702NetGSP" , "7702 i\nNet for\nGSP"}
+ ,{"Irc7702ic_usual" , "7702 ic\nUsual"}
+ ,{"Irc7702ic_glp" , "7702 ic\nfor GLP"}
+ ,{"Irc7702ic_gsp" , "7702 ic\nfor GSP"}
+ ,{"Irc7702ig_usual" , "7702 ig\nUsual"}
+ ,{"Irc7702ig_glp" , "7702 ig\nfor GLP"}
+ ,{"Irc7702ig_gsp" , "7702 ig\nfor GSP"}
,{"IrrCsv_Current" , "Curr IRR\non CSV"}
,{"IrrCsv_Guaranteed" , "Guar IRR\non CSV"}
,{"IrrDb_Current" , "Curr IRR\non DB"}
@@ -351,10 +353,12 @@ mask_map_t static_masks()
,{"HoneymoonValueSpread" , "99.99%"}
,{"IndvTaxBracket" , "99.99%"}
,{"InforceLives" , "999,999,999"}
- ,{"Irc7702ig" , "99.99%"}
- ,{"Irc7702Gross" , "99.99%"}
- ,{"Irc7702NetGLP" , "99.99%"}
- ,{"Irc7702NetGSP" , "99.99%"}
+ ,{"Irc7702ic_usual" , "99.99%"}
+ ,{"Irc7702ic_glp" , "99.99%"}
+ ,{"Irc7702ic_gsp" , "99.99%"}
+ ,{"Irc7702ig_usual" , "99.99%"}
+ ,{"Irc7702ig_glp" , "99.99%"}
+ ,{"Irc7702ig_gsp" , "99.99%"}
,{"IrrCsv_Current" , "100000.00%"}
,{"IrrCsv_Guaranteed" , "100000.00%"}
,{"IrrDb_Current" , "100000.00%"}
@@ -568,10 +572,12 @@ format_map_t static_formats()
,{"IndvTaxBracket" , f4}
,{"InforceHMVector" , f4}
- ,{"Irc7702ig" , f4}
- ,{"Irc7702Gross" , f4}
- ,{"Irc7702NetGLP" , f4}
- ,{"Irc7702NetGSP" , f4}
+ ,{"Irc7702ic_usual" , f4}
+ ,{"Irc7702ic_glp" , f4}
+ ,{"Irc7702ic_gsp" , f4}
+ ,{"Irc7702ig_usual" , f4}
+ ,{"Irc7702ig_glp" , f4}
+ ,{"Irc7702ig_gsp" , f4}
,{"IrrCsv_Current" , f4}
,{"IrrCsv_CurrentZero" , f4}
diff --git a/ledger_invariant.cpp b/ledger_invariant.cpp
index 5b66bc0..59e296d 100644
--- a/ledger_invariant.cpp
+++ b/ledger_invariant.cpp
@@ -110,10 +110,12 @@ void LedgerInvariant::Alloc(int len)
OtherVectors ["AddonCompOnAssets" ] = &AddonCompOnAssets
;
OtherVectors ["AddonCompOnPremium" ] = &AddonCompOnPremium
;
OtherVectors ["CorridorFactor" ] = &CorridorFactor
;
- OtherVectors ["Irc7702ig" ] = &Irc7702ig
;
- OtherVectors ["Irc7702Gross" ] = &Irc7702Gross
;
- OtherVectors ["Irc7702NetGLP" ] = &Irc7702NetGLP
;
- OtherVectors ["Irc7702NetGSP" ] = &Irc7702NetGSP
;
+ OtherVectors ["Irc7702ic_usual" ] = &Irc7702ic_usual
;
+ OtherVectors ["Irc7702ic_glp" ] = &Irc7702ic_glp
;
+ OtherVectors ["Irc7702ic_gsp" ] = &Irc7702ic_gsp
;
+ OtherVectors ["Irc7702ig_usual" ] = &Irc7702ig_usual
;
+ OtherVectors ["Irc7702ig_glp" ] = &Irc7702ig_glp
;
+ OtherVectors ["Irc7702ig_gsp" ] = &Irc7702ig_gsp
;
OtherVectors ["AnnLoanDueRate" ] = &AnnLoanDueRate
;
OtherVectors ["CurrMandE" ] = &CurrMandE
;
OtherVectors ["TotalIMF" ] = &TotalIMF
;
diff --git a/ledger_invariant.hpp b/ledger_invariant.hpp
index b78e2fa..6ae7ab6 100644
--- a/ledger_invariant.hpp
+++ b/ledger_invariant.hpp
@@ -98,10 +98,12 @@ class LMI_SO LedgerInvariant final
std::vector<double> AddonCompOnAssets;
std::vector<double> AddonCompOnPremium;
std::vector<double> CorridorFactor;
- std::vector<double> Irc7702ig;
- std::vector<double> Irc7702Gross;
- std::vector<double> Irc7702NetGLP;
- std::vector<double> Irc7702NetGSP;
+ std::vector<double> Irc7702ic_usual;
+ std::vector<double> Irc7702ic_glp;
+ std::vector<double> Irc7702ic_gsp;
+ std::vector<double> Irc7702ig_usual;
+ std::vector<double> Irc7702ig_glp;
+ std::vector<double> Irc7702ig_gsp;
std::vector<double> AnnLoanDueRate;
// TODO ?? M&E varies by basis (cf. 'GuarMaxMandE' below), so it
// belongs in the variant ledger.
diff --git a/ledger_invariant_init.cpp b/ledger_invariant_init.cpp
index 3268dd7..08b09c4 100644
--- a/ledger_invariant_init.cpp
+++ b/ledger_invariant_init.cpp
@@ -138,10 +138,12 @@ void LedgerInvariant::Init(BasicValues const* b)
CorridorFactor = b->GetCorridorFactor();
if(!is_antediluvian_fork())
{
- Irc7702ig = b->i7702_->ig();
- Irc7702Gross = b->i7702_->gross();
- Irc7702NetGLP = b->i7702_->net_glp();
- Irc7702NetGSP = b->i7702_->net_gsp();
+ Irc7702ic_usual = b->i7702_->ic_usual();
+ Irc7702ic_glp = b->i7702_->ic_glp ();
+ Irc7702ic_gsp = b->i7702_->ic_gsp ();
+ Irc7702ig_usual = b->i7702_->ig_usual();
+ Irc7702ig_glp = b->i7702_->ig_glp ();
+ Irc7702ig_gsp = b->i7702_->ig_gsp ();
}
AnnLoanDueRate = b->InterestRates_->RegLnDueRate