[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master c4515973: Expunge /^Irc7702i/ and /^Mly/ fiel
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master c4515973: Expunge /^Irc7702i/ and /^Mly/ fields from ledger |
|
Date: |
Thu, 19 May 2022 16:28:12 -0400 (EDT) |
branch: master
commit c4515973bbf1925ddf6dacfa8429eccec5b55b88
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Expunge /^Irc7702i/ and /^Mly/ fields from ledger
See:
https://lists.nongnu.org/archive/html/lmi/2022-05/msg00024.html
---
ihs_acctval.cpp | 6 ------
ledger_evaluator.cpp | 38 --------------------------------------
ledger_invariant.cpp | 6 ------
ledger_invariant.hpp | 6 ------
ledger_invariant_init.cpp | 9 ---------
ledger_variant.cpp | 6 ------
ledger_variant.hpp | 5 -----
ledger_variant_init.cpp | 17 -----------------
nychthemeral_test.sh | 2 --
9 files changed, 95 deletions(-)
diff --git a/ihs_acctval.cpp b/ihs_acctval.cpp
index 828c5306..0af0f8f1 100644
--- a/ihs_acctval.cpp
+++ b/ihs_acctval.cpp
@@ -1293,12 +1293,6 @@ void AccountValue::FinalizeYear()
,mce_annual_rate
)
[Year]
- ,InterestRates_->SepAcctNetRate
- (SepBasis_
- ,GenBasis_
- ,mce_monthly_rate
- )
- [Year]
,Year
);
}
diff --git a/ledger_evaluator.cpp b/ledger_evaluator.cpp
index 69aec38a..e6304726 100644
--- a/ledger_evaluator.cpp
+++ b/ledger_evaluator.cpp
@@ -212,26 +212,12 @@ title_map_t static_titles()
,{"HoneymoonValueSpread" , "Honeymoon\nValue\nSpread"}
,{"IndvTaxBracket" , "EE Tax\nBracket"}
,{"InforceLives" , "BOY\nLives\nInforce"}
- ,{"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"}
,{"IrrDb_Guaranteed" , "Guar IRR\non DB"}
,{"LoanIntAccrued_Current" , "Curr Loan\nInt\nAccrued"}
,{"LoanIntAccrued_Guaranteed" , "Guar Loan\nInt\nAccrued"}
- ,{"MlyGAIntRate_Current" , "Curr Monthly\nGen Acct\nInt Rate"}
- ,{"MlyGAIntRate_Guaranteed" , "Guar Monthly\nGen Acct\nInt Rate"}
- ,{"MlyHoneymoonValueRate_Current" , "Curr Monthly\nHoneymoon\nValue
Rate"}
- ,{"MlyHoneymoonValueRate_Guaranteed", "Guar Monthly\nHoneymoon\nValue
Rate"}
- ,{"MlyPostHoneymoonRate_Current" , "Curr
Monthly\nPost\nHoneymoon\nRate"}
- ,{"MlyPostHoneymoonRate_Guaranteed" , "Guar
Monthly\nPost\nHoneymoon\nRate"}
- ,{"MlySAIntRate_Current" , "Curr Monthly\nSep Acct\nInt Rate"}
- ,{"MlySAIntRate_Guaranteed" , "Guar Monthly\nSep Acct\nInt Rate"}
,{"ModalMinimumPremium" , "Modal\nMinimum\nPremium"}
// ,{"NaarForceout" , "Forced\nWithdrawal\ndue to\nNAAR
Limit"}
,{"NetClaims_Current" , "Curr Net\nClaims"}
@@ -351,26 +337,12 @@ mask_map_t static_masks()
,{"HoneymoonValueSpread" , "99.99%"}
,{"IndvTaxBracket" , "99.99%"}
,{"InforceLives" , "999,999,999"}
- ,{"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%"}
,{"IrrDb_Guaranteed" , "100000.00%"}
,{"LoanIntAccrued_Current" , "999,999,999"}
,{"LoanIntAccrued_Guaranteed" , "999,999,999"}
- ,{"MlyGAIntRate_Current" , "99.99%"}
- ,{"MlyGAIntRate_Guaranteed" , "99.99%"}
- ,{"MlyHoneymoonValueRate_Current" , "99.99%"}
- ,{"MlyHoneymoonValueRate_Guaranteed", "99.99%"}
- ,{"MlyPostHoneymoonRate_Current" , "99.99%"}
- ,{"MlyPostHoneymoonRate_Guaranteed" , "99.99%"}
- ,{"MlySAIntRate_Current" , "99.99%"}
- ,{"MlySAIntRate_Guaranteed" , "99.99%"}
,{"ModalMinimumPremium" , "999,999,999"}
// ,{"NaarForceout" , "999,999,999"}
,{"NetClaims_Current" , "999,999,999"}
@@ -584,12 +556,6 @@ format_map_t static_formats()
,{"HoneymoonValueSpread" , f4}
,{"IndvTaxBracket" , f4}
,{"InforceHMVector" , 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}
,{"IrrCsv_Guaranteed" , f4}
@@ -598,10 +564,6 @@ format_map_t static_formats()
,{"IrrDb_CurrentZero" , f4}
,{"IrrDb_Guaranteed" , f4}
,{"IrrDb_GuaranteedZero" , f4}
- ,{"MlyGAIntRate" , f4}
- ,{"MlyHoneymoonValueRate" , f4}
- ,{"MlyPostHoneymoonRate" , f4}
- ,{"MlySAIntRate" , f4}
,{"TotalIMF" , f4}
// F5: zero decimals, commas, cents to dollars
// > Format as a number with thousand separators and no decimal places
(#,###,##0)
diff --git a/ledger_invariant.cpp b/ledger_invariant.cpp
index cb61fa1b..df367210 100644
--- a/ledger_invariant.cpp
+++ b/ledger_invariant.cpp
@@ -111,12 +111,6 @@ void LedgerInvariant::Alloc(int len)
OtherVectors ["AddonCompOnAssets" ] = &AddonCompOnAssets
;
OtherVectors ["AddonCompOnPremium" ] = &AddonCompOnPremium
;
OtherVectors ["CorridorFactor" ] = &CorridorFactor
;
- 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 f9fb0e34..8995f57c 100644
--- a/ledger_invariant.hpp
+++ b/ledger_invariant.hpp
@@ -98,12 +98,6 @@ class LMI_SO LedgerInvariant final
std::vector<double> AddonCompOnAssets;
std::vector<double> AddonCompOnPremium;
std::vector<double> CorridorFactor;
- 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 50131860..71ee1795 100644
--- a/ledger_invariant_init.cpp
+++ b/ledger_invariant_init.cpp
@@ -139,15 +139,6 @@ void LedgerInvariant::Init(BasicValues const* b)
AddonCompOnAssets = b->yare_input_.ExtraCompensationOnAssets ;
AddonCompOnPremium = b->yare_input_.ExtraCompensationOnPremium;
CorridorFactor = b->GetCorridorFactor();
- if(!is_antediluvian_fork())
- {
- 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
(mce_gen_curr
diff --git a/ledger_variant.cpp b/ledger_variant.cpp
index e4a0734e..12333753 100644
--- a/ledger_variant.cpp
+++ b/ledger_variant.cpp
@@ -120,10 +120,6 @@ void LedgerVariant::Alloc(int len)
EndYearVectors ["TermPurchased" ] = &TermPurchased ; //
f5
EndYearVectors ["BaseDeathBft" ] = &BaseDeathBft ; //
f5
- OtherVectors ["MlySAIntRate" ] = &MlySAIntRate ;
- OtherVectors ["MlyGAIntRate" ] = &MlyGAIntRate ;
- OtherVectors ["MlyHoneymoonValueRate" ] = &MlyHoneymoonValueRate ;
- OtherVectors ["MlyPostHoneymoonRate" ] = &MlyPostHoneymoonRate ;
OtherVectors ["AnnSAIntRate" ] = &AnnSAIntRate ;
OtherVectors ["AnnGAIntRate" ] = &AnnGAIntRate ;
OtherVectors ["AnnHoneymoonValueRate" ] = &AnnHoneymoonValueRate ;
@@ -218,7 +214,6 @@ LedgerVariant& LedgerVariant::PlusEq
//============================================================================
void LedgerVariant::RecordDynamicSepAcctRate
(double annual_rate
- ,double monthly_rate
,int year
)
{
@@ -227,7 +222,6 @@ void LedgerVariant::RecordDynamicSepAcctRate
{
InitAnnSepAcctNetInt = annual_rate;
}
- MlySAIntRate[year] = monthly_rate;
}
//============================================================================
diff --git a/ledger_variant.hpp b/ledger_variant.hpp
index 287fa5a7..60526256 100644
--- a/ledger_variant.hpp
+++ b/ledger_variant.hpp
@@ -67,7 +67,6 @@ class LMI_SO LedgerVariant final
void RecordDynamicSepAcctRate
(double annual_rate
- ,double monthly_rate
,int year
);
@@ -123,10 +122,6 @@ class LMI_SO LedgerVariant final
// Forborne vectors [none presently].
// Nonscalable vectors.
- std::vector<double> MlySAIntRate;
- std::vector<double> MlyGAIntRate;
- std::vector<double> MlyHoneymoonValueRate;
- std::vector<double> MlyPostHoneymoonRate;
std::vector<double> AnnSAIntRate;
std::vector<double> AnnGAIntRate;
std::vector<double> AnnHoneymoonValueRate;
diff --git a/ledger_variant_init.cpp b/ledger_variant_init.cpp
index c091a876..b3c408e2 100644
--- a/ledger_variant_init.cpp
+++ b/ledger_variant_init.cpp
@@ -45,23 +45,6 @@ void LedgerVariant::Init
// COICharge =
// RiderCharges =
// ExpenseCharges =
- MlySAIntRate = bv.InterestRates_->SepAcctNetRate
- (SepBasis_
- ,GenBasis_
- ,mce_monthly_rate
- );
- MlyGAIntRate = bv.InterestRates_->GenAcctNetRate
- (GenBasis_
- ,mce_monthly_rate
- );
- MlyHoneymoonValueRate = bv.InterestRates_->HoneymoonValueRate
- (GenBasis_
- ,mce_monthly_rate
- );
- MlyPostHoneymoonRate = bv.InterestRates_->PostHoneymoonGenAcctRate
- (GenBasis_
- ,mce_monthly_rate
- );
AnnSAIntRate = bv.InterestRates_->SepAcctNetRate
(SepBasis_
,GenBasis_
diff --git a/nychthemeral_test.sh b/nychthemeral_test.sh
index a60e82e7..9c0e7b78 100755
--- a/nychthemeral_test.sh
+++ b/nychthemeral_test.sh
@@ -415,13 +415,11 @@ mv sample.summary.tsv
sample.summary.tsv.touchstone
mv sample.test0 sample.test0.touchstone
mv sample.test1 sample.test1.touchstone
-# MlySAIntRate = 0.0053403194199831...; differs slightly for x87
# DatePrepared: it's unclear why ".*" is needed, but it "works"
for z in *.touchstone; do \
diff \
--unified=0 \
--strip-trailing-cr \
- --ignore-matching-lines="^0\.0053403194199831" \
--ignore-matching-lines="^DatePrepared[ \t]*.*'[0-9-]*'$" \
"$z" "$srcdir/$z" \
|| true ; \
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [lmi] master c4515973: Expunge /^Irc7702i/ and /^Mly/ fields from ledger,
Greg Chicares <=