[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [5935] Correct a misnomer
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [5935] Correct a misnomer |
|
Date: |
Thu, 14 Aug 2014 13:58:17 +0000 |
Revision: 5935
http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5935
Author: chicares
Date: 2014-08-14 13:58:15 +0000 (Thu, 14 Aug 2014)
Log Message:
-----------
Correct a misnomer
Modified Paths:
--------------
lmi/trunk/ihs_mortal.cpp
lmi/trunk/ledger_invariant.cpp
lmi/trunk/ledger_invariant.hpp
lmi/trunk/ledger_text_formats.cpp
lmi/trunk/ledger_xml_io.cpp
lmi/trunk/mortality_rates.hpp
lmi/trunk/mortality_rates_fetch.cpp
lmi/trunk/reg_d_group.xsl
lmi/trunk/reg_d_individual.xsl
lmi/trunk/reg_d_offshore.xsl
Modified: lmi/trunk/ihs_mortal.cpp
===================================================================
--- lmi/trunk/ihs_mortal.cpp 2014-08-06 13:13:16 UTC (rev 5934)
+++ lmi/trunk/ihs_mortal.cpp 2014-08-14 13:58:15 UTC (rev 5935)
@@ -280,7 +280,7 @@
for(int j = 0; j < Length_; ++j)
{
// Flat extra: input as annual per K, want monthly per $.
- double flat_extra = MonthlyFlatExtra_[j] / 12000.0;
+ double flat_extra = AnnualFlatExtra_[j] / 12000.0;
coi_rates[j] = std::min
(MaxMonthlyCoiRate_
Modified: lmi/trunk/ledger_invariant.cpp
===================================================================
--- lmi/trunk/ledger_invariant.cpp 2014-08-06 13:13:16 UTC (rev 5934)
+++ lmi/trunk/ledger_invariant.cpp 2014-08-14 13:58:15 UTC (rev 5935)
@@ -119,7 +119,7 @@
OtherVectors ["IndvTaxBracket" ] = &IndvTaxBracket ;
OtherVectors ["CorpTaxBracket" ] = &CorpTaxBracket ;
OtherVectors ["Salary" ] = &Salary ;
- OtherVectors ["MonthlyFlatExtra" ] = &MonthlyFlatExtra ;
+ OtherVectors ["AnnualFlatExtra" ] = &AnnualFlatExtra ;
OtherVectors ["HoneymoonValueSpread" ] = &HoneymoonValueSpread ;
OtherVectors ["PartMortTableMult" ] = &PartMortTableMult ;
OtherVectors ["AddonMonthlyFee" ] = &AddonMonthlyFee ;
@@ -464,7 +464,7 @@
IndvTaxBracket = b->yare_input_.TaxBracket ;
CorpTaxBracket = b->yare_input_.CorporationTaxBracket ;
Salary = b->yare_input_.ProjectedSalary ;
- MonthlyFlatExtra = b->yare_input_.FlatExtra ;
+ AnnualFlatExtra = b->yare_input_.FlatExtra ;
HoneymoonValueSpread = b->yare_input_.HoneymoonValueSpread ;
AddonMonthlyFee = b->yare_input_.ExtraMonthlyCustodialFee ;
AddonCompOnAssets = b->yare_input_.ExtraCompensationOnAssets ;
Modified: lmi/trunk/ledger_invariant.hpp
===================================================================
--- lmi/trunk/ledger_invariant.hpp 2014-08-06 13:13:16 UTC (rev 5934)
+++ lmi/trunk/ledger_invariant.hpp 2014-08-14 13:58:15 UTC (rev 5935)
@@ -103,7 +103,7 @@
std::vector<double> IndvTaxBracket;
std::vector<double> CorpTaxBracket;
std::vector<double> Salary;
- std::vector<double> MonthlyFlatExtra;
+ std::vector<double> AnnualFlatExtra;
std::vector<double> HoneymoonValueSpread;
std::vector<double> PartMortTableMult;
std::vector<double> AddonMonthlyFee;
Modified: lmi/trunk/ledger_text_formats.cpp
===================================================================
--- lmi/trunk/ledger_text_formats.cpp 2014-08-06 13:13:16 UTC (rev 5934)
+++ lmi/trunk/ledger_text_formats.cpp 2014-08-14 13:58:15 UTC (rev 5935)
@@ -546,7 +546,7 @@
// account value released?
,"PolicyFee"
,"SpecifiedAmountLoad"
- ,"MonthlyFlatExtra"
+ ,"AnnualFlatExtra"
,"MortalityCharge"
,"RiderCharges"
,"NetMortalityCharge"
@@ -608,7 +608,7 @@
os << Curr_.value_str("DacTaxLoad" ,j) << '\t';
os << Curr_.value_str("PolicyFee" ,j) << '\t';
os << Curr_.value_str("SpecAmtLoad" ,j) << '\t';
- os << Invar.value_str("MonthlyFlatExtra" ,j) << '\t';
+ os << Invar.value_str("AnnualFlatExtra" ,j) << '\t';
os << Curr_.value_str("COICharge" ,j) << '\t';
os << Curr_.value_str("RiderCharges" ,j) << '\t';
os << Curr_.value_str("NetCOICharge" ,j) << '\t';
Modified: lmi/trunk/ledger_xml_io.cpp
===================================================================
--- lmi/trunk/ledger_xml_io.cpp 2014-08-06 13:13:16 UTC (rev 5934)
+++ lmi/trunk/ledger_xml_io.cpp 2014-08-14 13:58:15 UTC (rev 5935)
@@ -273,7 +273,7 @@
title_map["MlySAIntRate_Current" ] = "Curr Monthly Sep Acct Int
Rate";
title_map["MlySAIntRate_Guaranteed" ] = "Guar Monthly Sep Acct Int
Rate";
title_map["ModalMinimumPremium" ] = "Modal Minimum Premium";
- title_map["MonthlyFlatExtra" ] = " _____________ Monthly
Flat Extra";
+ title_map["AnnualFlatExtra" ] = " _____________ Annual
Flat Extra";
// title_map["NaarForceout" ] = "Forced Withdrawal due
to NAAR Limit";
title_map["NetCOICharge_Current" ] = "Experience _______Rating
_______Net COI Charge";
title_map["NetClaims_Current" ] = " _____________
_____________ Curr Net Claims";
@@ -507,7 +507,7 @@
// Is every other format OK?
format_map["InforceLives" ] = f2;
format_map["KFactor" ] = f2;
- format_map["MonthlyFlatExtra" ] = f2;
+ format_map["AnnualFlatExtra" ] = f2;
// >
// F1: zero decimals, commas
// > Format as a number with thousand separators and no decimal places
(#,###,##0)
Modified: lmi/trunk/mortality_rates.hpp
===================================================================
--- lmi/trunk/mortality_rates.hpp 2014-08-06 13:13:16 UTC (rev 5934)
+++ lmi/trunk/mortality_rates.hpp 2014-08-14 13:58:15 UTC (rev 5935)
@@ -127,7 +127,7 @@
mcenum_table_rating SubstandardTable_;
std::vector<double> CurrentCoiMultiplier_;
- std::vector<double> MonthlyFlatExtra_;
+ std::vector<double> AnnualFlatExtra_;
std::vector<double> PartialMortalityMultiplier_;
round_to<double> round_coi_rate_;
Modified: lmi/trunk/mortality_rates_fetch.cpp
===================================================================
--- lmi/trunk/mortality_rates_fetch.cpp 2014-08-06 13:13:16 UTC (rev 5934)
+++ lmi/trunk/mortality_rates_fetch.cpp 2014-08-14 13:58:15 UTC (rev 5935)
@@ -76,7 +76,7 @@
SubstandardTable_ = basic_values.yare_input_.SubstandardTable;
CurrentCoiMultiplier_ = basic_values.yare_input_.CurrentCoiMultiplier;
- MonthlyFlatExtra_ = basic_values.yare_input_.FlatExtra;
+ AnnualFlatExtra_ = basic_values.yare_input_.FlatExtra;
// TODO ?? Defectively, this data member is not yet used.
PartialMortalityMultiplier_ =
basic_values.yare_input_.PartialMortalityMultiplier;
Modified: lmi/trunk/reg_d_group.xsl
===================================================================
--- lmi/trunk/reg_d_group.xsl 2014-08-06 13:13:16 UTC (rev 5934)
+++ lmi/trunk/reg_d_group.xsl 2014-08-14 13:58:15 UTC (rev 5935)
@@ -819,7 +819,7 @@
<column composite="0" name="EeMode">|Indiv _Pmt Mode</column>
<column composite="0" name="ErMode">|Corp _Pmt Mode</column>
<column composite="0" scalar="InitAnnLoanDueRate">|Assumed _Loan
Interest</column>
- <column composite="0" name="MonthlyFlatExtra">|Flat Extra _Per
1,000</column>
+ <column composite="0" name="AnnualFlatExtra">|Flat Extra _Per
1,000</column>
</xsl:variable>
<xsl:variable name="illustration_assumption_columns"
select="document('')//xsl:address@hidden'illustration_assumption_columns_raw']/column"/>
<xsl:variable name="columns"
select="$illustration_assumption_columns[not(@composite) or
(boolean(@composite='1')=$is_composite)]"/>
Modified: lmi/trunk/reg_d_individual.xsl
===================================================================
--- lmi/trunk/reg_d_individual.xsl 2014-08-06 13:13:16 UTC (rev 5934)
+++ lmi/trunk/reg_d_individual.xsl 2014-08-14 13:58:15 UTC (rev 5935)
@@ -713,9 +713,13 @@
Table Rating:
<xsl:value-of select="$scalars/SubstandardTable"/>
</fo:block>
+ <!-- Flats don't require "Rated" class; and does this
value actually print anyway?
+ These questions apply as well to the original:
+
http://svn.savannah.nongnu.org/viewvc/lmi/trunk/individual_private_placement.xsl?annotate=696&root=lmi&pathrev=3585
+ -->
<fo:block>
Initial Annual Flat Extra:
- <xsl:value-of
select="address@hidden'MonthlyFlatExtra']/duration[1]/@column_value"/>
+ <xsl:value-of
select="address@hidden'AnnualFlatExtra']/duration[1]/@column_value"/>
per 1,000
</fo:block>
</fo:block>
Modified: lmi/trunk/reg_d_offshore.xsl
===================================================================
--- lmi/trunk/reg_d_offshore.xsl 2014-08-06 13:13:16 UTC (rev 5934)
+++ lmi/trunk/reg_d_offshore.xsl 2014-08-14 13:58:15 UTC (rev 5935)
@@ -984,7 +984,7 @@
<column composite="0" name="EeMode">|Indiv _Pmt Mode</column>
<column composite="0" name="ErMode">|Corp _Pmt Mode</column>
<column composite="0" scalar="InitAnnLoanDueRate">|Assumed _Loan
Interest</column>
- <column composite="0" name="MonthlyFlatExtra">|Flat Extra _Per
1,000</column>
+ <column composite="0" name="AnnualFlatExtra">|Flat Extra _Per
1,000</column>
</xsl:variable>
<xsl:variable name="illustration_assumption_columns"
select="document('')//xsl:address@hidden'illustration_assumption_columns_raw']/column"/>
<xsl:variable name="columns"
select="$illustration_assumption_columns[not(@composite) or
(boolean(@composite='1')=$is_composite)]"/>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [5935] Correct a misnomer,
Greg Chicares <=