[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [5071] Merge two identical types
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [5071] Merge two identical types |
|
Date: |
Tue, 27 Jul 2010 09:45:40 +0000 |
Revision: 5071
http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5071
Author: chicares
Date: 2010-07-27 09:45:40 +0000 (Tue, 27 Jul 2010)
Log Message:
-----------
Merge two identical types
Modified Paths:
--------------
lmi/trunk/ChangeLog
lmi/trunk/input.hpp
lmi/trunk/mec_input.hpp
lmi/trunk/mec_server.cpp
lmi/trunk/tn_range_type_trammels.hpp
lmi/trunk/tn_range_types.cpp
lmi/trunk/tn_range_types.hpp
Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2010-07-27 00:04:38 UTC (rev 5070)
+++ lmi/trunk/ChangeLog 2010-07-27 09:45:40 UTC (rev 5071)
@@ -26566,3 +26566,24 @@
input.cpp
Resolve several marked defects. Yet-unused members aren't harmful.
+20100726T2353Z <address@hidden> [670]
+
+ input_harmonization.cpp
+ tn_range_type_trammels.hpp
+Move a comment, merging two defect markers.
+
+20100727T0004Z <address@hidden> [669]
+
+ tn_range_type_trammels.hpp
+Avoid macros.
+
+20100727T0945Z <address@hidden> [669]
+
+ input.hpp
+ mec_input.hpp
+ mec_server.cpp
+ tn_range_type_trammels.hpp
+ tn_range_types.cpp
+ tn_range_types.hpp
+Merge two identical types. Rationale: vide supra at 20100726T2148Z.
+
Modified: lmi/trunk/input.hpp
===================================================================
--- lmi/trunk/input.hpp 2010-07-27 00:04:38 UTC (rev 5070)
+++ lmi/trunk/input.hpp 2010-07-27 09:45:40 UTC (rev 5071)
@@ -245,8 +245,8 @@
int GleanedMaturityAge_ ;
mcenum_ledger_type GleanedLedgerType_ ;
- tnr_issue_age IssueAge ;
- tnr_attained_age RetirementAge ;
+ tnr_age IssueAge ;
+ tnr_age RetirementAge ;
mce_gender Gender ;
mce_smoking Smoking ;
mce_class UnderwritingClass ;
@@ -351,14 +351,14 @@
tnr_nonnegative_double CountryCoiMultiplier ;
mce_survival_limit SurviveToType ;
tnr_duration SurviveToYear ;
- tnr_attained_age SurviveToAge ;
+ tnr_age SurviveToAge ;
tnr_nonnegative_double MaximumNaar ;
tnr_corridor_factor UseOffshoreCorridorFactor ; // INPUT !!
Obsolete, and apparently wrong type.
mce_yes_or_no ChildRider ;
tnr_nonnegative_double ChildRiderAmount ;
mce_yes_or_no SpouseRider ;
tnr_nonnegative_double SpouseRiderAmount ;
- tnr_issue_age SpouseIssueAge ;
+ tnr_age SpouseIssueAge ;
datum_string Franchise ;
datum_string PolicyNumber ;
tnr_date InforceAsOfDate ;
@@ -436,22 +436,22 @@
mce_sa_strategy SpecifiedAmountStrategyFromIssue;
mce_mode IndividualPaymentMode ;
mce_to_point IndividualPaymentToAlternative ;
- tnr_attained_age IndividualPaymentToAge ;
+ tnr_age IndividualPaymentToAge ;
tnr_duration IndividualPaymentToDuration ;
tnr_nonnegative_double IndividualPaymentAmount ;
mce_pmt_strategy IndividualPaymentStrategy ;
tnr_nonnegative_double LoanAmount ;
- tnr_attained_age LoanFromAge ;
+ tnr_age LoanFromAge ;
mce_from_point LoanFromAlternative ;
tnr_duration LoanFromDuration ;
- tnr_attained_age LoanToAge ;
+ tnr_age LoanToAge ;
mce_to_point LoanToAlternative ;
tnr_duration LoanToDuration ;
tnr_nonnegative_double WithdrawalAmount ;
- tnr_attained_age WithdrawalFromAge ;
+ tnr_age WithdrawalFromAge ;
mce_from_point WithdrawalFromAlternative ;
tnr_duration WithdrawalFromDuration ;
- tnr_attained_age WithdrawalToAge ;
+ tnr_age WithdrawalToAge ;
mce_to_point WithdrawalToAlternative ;
tnr_duration WithdrawalToDuration ;
@@ -540,11 +540,10 @@
z = exact_cast<mce_uw_basis >(m); if(z) return z;
z = exact_cast<mce_yes_or_no >(m); if(z) return z;
// tnr- types.
- z = exact_cast<tnr_attained_age >(m); if(z) return z;
+ z = exact_cast<tnr_age >(m); if(z) return z;
z = exact_cast<tnr_corridor_factor >(m); if(z) return z;
z = exact_cast<tnr_date >(m); if(z) return z;
z = exact_cast<tnr_duration >(m); if(z) return z;
- z = exact_cast<tnr_issue_age >(m); if(z) return z;
z = exact_cast<tnr_month >(m); if(z) return z;
z = exact_cast<tnr_nonnegative_double >(m); if(z) return z;
z = exact_cast<tnr_nonnegative_integer >(m); if(z) return z;
Modified: lmi/trunk/mec_input.hpp
===================================================================
--- lmi/trunk/mec_input.hpp 2010-07-27 00:04:38 UTC (rev 5070)
+++ lmi/trunk/mec_input.hpp 2010-07-27 09:45:40 UTC (rev 5071)
@@ -148,7 +148,7 @@
int GleanedMaturityAge_ ;
mce_yes_or_no Use7702ATables ;
- tnr_issue_age IssueAge ;
+ tnr_age IssueAge ;
mce_gender Gender ;
mce_smoking Smoking ;
mce_class UnderwritingClass ;
@@ -214,9 +214,9 @@
z = exact_cast<mce_uw_basis >(m); if(z) return z;
z = exact_cast<mce_yes_or_no >(m); if(z) return z;
// tnr- types.
+ z = exact_cast<tnr_age >(m); if(z) return z;
z = exact_cast<tnr_date >(m); if(z) return z;
z = exact_cast<tnr_duration >(m); if(z) return z;
- z = exact_cast<tnr_issue_age >(m); if(z) return z;
z = exact_cast<tnr_month >(m); if(z) return z;
z = exact_cast<tnr_nonnegative_double >(m); if(z) return z;
z = exact_cast<tnr_unrestricted_double >(m); if(z) return z;
Modified: lmi/trunk/mec_server.cpp
===================================================================
--- lmi/trunk/mec_server.cpp 2010-07-27 00:04:38 UTC (rev 5070)
+++ lmi/trunk/mec_server.cpp 2010-07-27 09:45:40 UTC (rev 5071)
@@ -71,7 +71,7 @@
)
{
bool Use7702ATables =
exact_cast<mce_yes_or_no >(input["Use7702ATables"
])->value();
-// int IssueAge =
exact_cast<tnr_issue_age >(input["IssueAge"
])->value();
+// int IssueAge =
exact_cast<tnr_age >(input["IssueAge"
])->value();
mcenum_gender Gender =
exact_cast<mce_gender >(input["Gender"
])->value();
mcenum_smoking Smoking =
exact_cast<mce_smoking >(input["Smoking"
])->value();
mcenum_class UnderwritingClass =
exact_cast<mce_class >(input["UnderwritingClass"
])->value();
Modified: lmi/trunk/tn_range_type_trammels.hpp
===================================================================
--- lmi/trunk/tn_range_type_trammels.hpp 2010-07-27 00:04:38 UTC (rev
5070)
+++ lmi/trunk/tn_range_type_trammels.hpp 2010-07-27 09:45:40 UTC (rev
5071)
@@ -78,7 +78,7 @@
};
template<typename T>
-class issue_age_trammel
+class age_trammel
:public trammel_base<T>
{
T nominal_minimum() const {return 0;}
@@ -87,15 +87,6 @@
};
template<typename T>
-class attained_age_trammel
- :public trammel_base<T>
-{
- T nominal_minimum() const {return 0;}
- T default_value() const {return 0;}
- T nominal_maximum() const {return 99;}
-};
-
-template<typename T>
class duration_trammel
:public trammel_base<T>
{
Modified: lmi/trunk/tn_range_types.cpp
===================================================================
--- lmi/trunk/tn_range_types.cpp 2010-07-27 00:04:38 UTC (rev 5070)
+++ lmi/trunk/tn_range_types.cpp 2010-07-27 09:45:40 UTC (rev 5071)
@@ -42,8 +42,7 @@
template class tn_range<double , proportion_trammel <double >
>;
template class tn_range<double , nonnegative_trammel <double >
>;
template class tn_range<int , nonnegative_trammel <int >
>;
-template class tn_range<int , issue_age_trammel <int >
>;
-template class tn_range<int , attained_age_trammel <int >
>;
+template class tn_range<int , age_trammel <int >
>;
template class tn_range<int , duration_trammel <int >
>;
template class tn_range<int , month_trammel <int >
>;
template class tn_range<double , corridor_factor_trammel<double >
>;
Modified: lmi/trunk/tn_range_types.hpp
===================================================================
--- lmi/trunk/tn_range_types.hpp 2010-07-27 00:04:38 UTC (rev 5070)
+++ lmi/trunk/tn_range_types.hpp 2010-07-27 09:45:40 UTC (rev 5071)
@@ -38,8 +38,7 @@
typedef tn_range<double , proportion_trammel <double > >
tnr_proportion;
typedef tn_range<double , nonnegative_trammel <double > >
tnr_nonnegative_double;
typedef tn_range<int , nonnegative_trammel <int > >
tnr_nonnegative_integer;
-typedef tn_range<int , issue_age_trammel <int > >
tnr_issue_age;
-typedef tn_range<int , attained_age_trammel <int > >
tnr_attained_age;
+typedef tn_range<int , age_trammel <int > >
tnr_age;
typedef tn_range<int , duration_trammel <int > >
tnr_duration;
typedef tn_range<int , month_trammel <int > >
tnr_month;
typedef tn_range<double , corridor_factor_trammel<double > >
tnr_corridor_factor;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [5071] Merge two identical types,
Greg Chicares <=