[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [5548] Expunge 'SpecamtHistory'
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [5548] Expunge 'SpecamtHistory' |
|
Date: |
Tue, 21 Aug 2012 13:07:15 +0000 |
Revision: 5548
http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5548
Author: chicares
Date: 2012-08-21 13:07:14 +0000 (Tue, 21 Aug 2012)
Log Message:
-----------
Expunge 'SpecamtHistory'
Modified Paths:
--------------
lmi/trunk/ChangeLog
lmi/trunk/cell.rnc
lmi/trunk/cell.xsd
lmi/trunk/input.cpp
lmi/trunk/input.hpp
lmi/trunk/input_realization.cpp
lmi/trunk/input_xml_io.cpp
lmi/trunk/sample.cns
lmi/trunk/sample.ill
lmi/trunk/skin.xrc
lmi/trunk/yare_input.cpp
lmi/trunk/yare_input.hpp
Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2012-08-21 09:57:31 UTC (rev 5547)
+++ lmi/trunk/ChangeLog 2012-08-21 13:07:14 UTC (rev 5548)
@@ -30593,3 +30593,42 @@
ihs_acctval.cpp
Initialize cumulative sales load from new input field.
+20120818T1147Z <address@hidden> [568]
+
+ diagnostics.sed
+Improve handling of multiple spaces.
+
+20120818T1149Z <address@hidden> [567]
+
+ input_test.cpp
+Remove a marker for a defect resolved 20080803T2323Z.
+
+20120820T1711Z <address@hidden> [567]
+
+ input.hpp
+ input_realization.cpp
+ input_test.cpp
+ input_xml_io.cpp
+Prepare to expunge 'SpecamtHistory'.
+
+20120821T0957Z <address@hidden> [567]
+
+ ihs_acctval.cpp
+ ihs_avmly.cpp
+Prepare to expunge 'SpecamtHistory'.
+
+20120821T1307Z <address@hidden> [567]
+
+ cell.rnc
+ cell.xsd
+ input.cpp
+ input.hpp
+ input_realization.cpp
+ input_xml_io.cpp
+ sample.cns
+ sample.ill
+ skin.xrc
+ yare_input.cpp
+ yare_input.hpp
+Expunge 'SpecamtHistory'.
+
Modified: lmi/trunk/cell.rnc
===================================================================
--- lmi/trunk/cell.rnc 2012-08-21 09:57:31 UTC (rev 5547)
+++ lmi/trunk/cell.rnc 2012-08-21 13:07:14 UTC (rev 5548)
@@ -397,10 +397,9 @@
element SolveToWhich {to_point}
,## Parameter to be solved for.
element SolveType {solve_type}
- ,## Specified amount for each policy year since issue: used only
- ## for certain surrender charges.
- element SpecamtHistory {numeric_sequence}
- ,## Specified amount.
+ ,## Specified amount for each policy year since issue. Inforce
+ ## extracts require only a scalar representing the current
+ ## specified amount.
element SpecifiedAmount {specamt_sequence}
,## [obsolete]
element SpecifiedAmountFromIssue {nonnegative_double}
Modified: lmi/trunk/cell.xsd
===================================================================
--- lmi/trunk/cell.xsd 2012-08-21 09:57:31 UTC (rev 5547)
+++ lmi/trunk/cell.xsd 2012-08-21 13:07:14 UTC (rev 5548)
@@ -195,7 +195,6 @@
<xs:element ref="SolveTgtAtWhich"/>
<xs:element ref="SolveToWhich"/>
<xs:element ref="SolveType"/>
- <xs:element ref="SpecamtHistory"/>
<xs:element ref="SpecifiedAmount"/>
<xs:element ref="SpecifiedAmountFromIssue"/>
<xs:element ref="SpecifiedAmountFromRetirement"/>
@@ -1102,15 +1101,11 @@
<xs:documentation>Parameter to be solved for.</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="SpecamtHistory" type="xs:string">
- <xs:annotation>
- <xs:documentation>Specified amount for each policy year since issue:
used only
-for certain surrender charges.</xs:documentation>
- </xs:annotation>
- </xs:element>
<xs:element name="SpecifiedAmount" type="xs:string">
<xs:annotation>
- <xs:documentation>Specified amount.</xs:documentation>
+ <xs:documentation>Specified amount for each policy year since issue.
Inforce
+extracts require only a scalar representing the current
+specified amount.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="SpecifiedAmountFromIssue" type="nonnegative_double">
Modified: lmi/trunk/input.cpp
===================================================================
--- lmi/trunk/input.cpp 2012-08-21 09:57:31 UTC (rev 5547)
+++ lmi/trunk/input.cpp 2012-08-21 13:07:14 UTC (rev 5548)
@@ -165,7 +165,6 @@
// ,InforceDcv ("")
// ,InforceLeastDeathBenefit ("")
,Inforce7702AAmountsPaidHistory ("0")
- ,SpecamtHistory ("0")
,Country ("US")
// ,OverrideCoiMultiplier ("")
,CountryCoiMultiplier ("1")
@@ -423,7 +422,6 @@
ascribe("InforceDcv" , &Input::InforceDcv
);
ascribe("InforceLeastDeathBenefit" ,
&Input::InforceLeastDeathBenefit );
ascribe("Inforce7702AAmountsPaidHistory" ,
&Input::Inforce7702AAmountsPaidHistory );
- ascribe("SpecamtHistory" , &Input::SpecamtHistory
);
ascribe("Country" , &Input::Country
);
ascribe("OverrideCoiMultiplier" ,
&Input::OverrideCoiMultiplier );
ascribe("CountryCoiMultiplier" ,
&Input::CountryCoiMultiplier );
Modified: lmi/trunk/input.hpp
===================================================================
--- lmi/trunk/input.hpp 2012-08-21 09:57:31 UTC (rev 5547)
+++ lmi/trunk/input.hpp 2012-08-21 13:07:14 UTC (rev 5548)
@@ -210,7 +210,6 @@
std::string RealizeFlatExtra ();
std::string RealizeHoneymoonValueSpread ();
std::string RealizeAmountsPaidHistory ();
- std::string RealizeSpecamtHistory ();
int must_overwrite_specamt_with_obsolete_history
(std::string specamt
@@ -363,7 +362,6 @@
tnr_nonnegative_double InforceDcv ;
tnr_nonnegative_double InforceLeastDeathBenefit ;
numeric_sequence Inforce7702AAmountsPaidHistory ;
- numeric_sequence SpecamtHistory ;
mce_country Country ;
mce_yes_or_no OverrideCoiMultiplier ;
tnr_nonnegative_double CountryCoiMultiplier ;
@@ -484,7 +482,6 @@
std::vector<tnr_unrestricted_double> FlatExtraRealized_ ;
// tnr_nonnegative_double
std::vector<tnr_unrestricted_double> HoneymoonValueSpreadRealized_ ;
// tnr_interest_rate (new)
std::vector<tnr_unrestricted_double> AmountsPaidHistoryRealized_ ;
// tnr_unrestricted_double
- std::vector<tnr_unrestricted_double> SpecamtHistoryRealized_ ;
// tnr_nonnegative_double
};
/// Specialization of struct template reconstitutor for this Model
Modified: lmi/trunk/input_realization.cpp
===================================================================
--- lmi/trunk/input_realization.cpp 2012-08-21 09:57:31 UTC (rev 5547)
+++ lmi/trunk/input_realization.cpp 2012-08-21 13:07:14 UTC (rev 5548)
@@ -234,7 +234,6 @@
s.push_back(RealizeFlatExtra ());
s.push_back(RealizeHoneymoonValueSpread ());
s.push_back(RealizeAmountsPaidHistory ());
- s.push_back(RealizeSpecamtHistory ());
if(report_errors)
{
@@ -896,16 +895,6 @@
);
}
-//============================================================================
-std::string Input::RealizeSpecamtHistory()
-{
- return realize_sequence_string
- (*this
- ,SpecamtHistoryRealized_
- ,SpecamtHistory
- );
-}
-
/// Determine whether specamt must be overwritten with history.
///
/// 'SpecifiedAmount' gives values for all policy years since issue,
Modified: lmi/trunk/input_xml_io.cpp
===================================================================
--- lmi/trunk/input_xml_io.cpp 2012-08-21 09:57:31 UTC (rev 5547)
+++ lmi/trunk/input_xml_io.cpp 2012-08-21 13:07:14 UTC (rev 5548)
@@ -139,6 +139,7 @@
,"PremiumHistory" // Renamed to
'Inforce7702AAmountsPaidHistory'.
,"SocialSecurityNumber" // Withdrawn: would violate privacy.
,"SolveBasis" // Renamed to
'SolveExpenseGeneralAccountBasis'.
+ ,"SpecamtHistory" // Merged into 'SpecifiedAmount'.
,"TermProportion" // Disused: cf. 'TermRiderProportion'.
,"UseOffshoreCorridorFactor" // Withdrawn.
,"YearsOfZeroDeaths" // Withdrawn.
@@ -530,7 +531,7 @@
InforceCumulativeRopPayments =
InforceCumulativeNoLapsePayments.value();
}
- if(file_version < 7 && !contains(residuary_names, "SpecamtHistory"))
+ if(file_version < 7 && contains(detritus_map, "SpecamtHistory"))
{
// Merge obsolete 'SpecamtHistory' into 'SpecifiedAmount'.
//
@@ -564,11 +565,11 @@
if
(must_overwrite_specamt_with_obsolete_history
(SpecifiedAmount.value()
- ,SpecamtHistory .value()
+ ,map_lookup(detritus_map, "SpecamtHistory")
)
)
{
- SpecifiedAmount = SpecamtHistory.value();
+ SpecifiedAmount = map_lookup(detritus_map, "SpecamtHistory");
}
}
}
Modified: lmi/trunk/sample.cns
===================================================================
--- lmi/trunk/sample.cns 2012-08-21 09:57:31 UTC (rev 5547)
+++ lmi/trunk/sample.cns 2012-08-21 13:07:14 UTC (rev 5548)
@@ -161,7 +161,6 @@
<SolveTgtAtWhich>Maturity</SolveTgtAtWhich>
<SolveToWhich>Retirement</SolveToWhich>
<SolveType>No solve</SolveType>
- <SpecamtHistory>0</SpecamtHistory>
<SpecifiedAmount>1000000</SpecifiedAmount>
<SpecifiedAmountFromIssue>1000000</SpecifiedAmountFromIssue>
<SpecifiedAmountFromRetirement>1000000</SpecifiedAmountFromRetirement>
@@ -374,7 +373,6 @@
<SolveTgtAtWhich>Maturity</SolveTgtAtWhich>
<SolveToWhich>Retirement</SolveToWhich>
<SolveType>No solve</SolveType>
- <SpecamtHistory>0</SpecamtHistory>
<SpecifiedAmount>1000000</SpecifiedAmount>
<SpecifiedAmountFromIssue>1000000</SpecifiedAmountFromIssue>
<SpecifiedAmountFromRetirement>1000000</SpecifiedAmountFromRetirement>
@@ -587,7 +585,6 @@
<SolveTgtAtWhich>Maturity</SolveTgtAtWhich>
<SolveToWhich>Retirement</SolveToWhich>
<SolveType>No solve</SolveType>
- <SpecamtHistory>0</SpecamtHistory>
<SpecifiedAmount>1000000</SpecifiedAmount>
<SpecifiedAmountFromIssue>1000000</SpecifiedAmountFromIssue>
<SpecifiedAmountFromRetirement>1000000</SpecifiedAmountFromRetirement>
Modified: lmi/trunk/sample.ill
===================================================================
--- lmi/trunk/sample.ill 2012-08-21 09:57:31 UTC (rev 5547)
+++ lmi/trunk/sample.ill 2012-08-21 13:07:14 UTC (rev 5548)
@@ -160,7 +160,6 @@
<SolveTgtAtWhich>Maturity</SolveTgtAtWhich>
<SolveToWhich>Retirement</SolveToWhich>
<SolveType>No solve</SolveType>
- <SpecamtHistory>0</SpecamtHistory>
<SpecifiedAmount>1000000</SpecifiedAmount>
<SpecifiedAmountFromIssue>1000000</SpecifiedAmountFromIssue>
<SpecifiedAmountFromRetirement>1000000</SpecifiedAmountFromRetirement>
Modified: lmi/trunk/skin.xrc
===================================================================
--- lmi/trunk/skin.xrc 2012-08-21 09:57:31 UTC (rev 5547)
+++ lmi/trunk/skin.xrc 2012-08-21 13:07:14 UTC (rev 5548)
@@ -1822,7 +1822,7 @@
<object class="wxFlexGridSizer">
<cols>2</cols>
<growablecols>1</growablecols>
- <growablerows>0,1</growablerows>
+ <growablerows>0</growablerows>
<object class="sizeritem">
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
<border>4</border>
@@ -1838,21 +1838,6 @@
<size>180,-1</size>
</object>
</object>
- <object class="sizeritem">
-
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
- <border>4</border>
- <object class="wxStaticText">
- <label>Specified-amount history</label>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxGROW</flag>
- <object class="InputSequenceEntry"
name="SpecamtHistory">
- <title>Specified-amount history</title>
- <help>Specified amount by policy year (needed
for certain surrender charges)</help>
- <size>180,-1</size>
- </object>
- </object>
</object>
</object>
</object>
Modified: lmi/trunk/yare_input.cpp
===================================================================
--- lmi/trunk/yare_input.cpp 2012-08-21 09:57:31 UTC (rev 5547)
+++ lmi/trunk/yare_input.cpp 2012-08-21 13:07:14 UTC (rev 5548)
@@ -135,7 +135,6 @@
InforceDcv = z.InforceDcv
.value();
InforceLeastDeathBenefit = z.InforceLeastDeathBenefit
.value();
Inforce7702AAmountsPaidHistory = convert_vector_type<double
>(z.AmountsPaidHistoryRealized_ );
- SpecamtHistory = convert_vector_type<double
>(z.SpecamtHistoryRealized_ );
CountryCoiMultiplier = z.CountryCoiMultiplier
.value();
SurviveToType = z.SurviveToType
.value();
SurviveToYear = z.SurviveToYear
.value();
Modified: lmi/trunk/yare_input.hpp
===================================================================
--- lmi/trunk/yare_input.hpp 2012-08-21 09:57:31 UTC (rev 5547)
+++ lmi/trunk/yare_input.hpp 2012-08-21 13:07:14 UTC (rev 5548)
@@ -189,7 +189,6 @@
double InforceDcv ;
double InforceLeastDeathBenefit ;
std::vector<double> Inforce7702AAmountsPaidHistory ;
- std::vector<double> SpecamtHistory ;
// mcenum_country Country ;
// bool OverrideCoiMultiplier ;
double CountryCoiMultiplier ;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [5548] Expunge 'SpecamtHistory',
Greg Chicares <=