[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [5769] Use 7702-specific DBO enumerations as appropriate
From: |
Greg Chicares |
Subject: |
[lmi-commits] [5769] Use 7702-specific DBO enumerations as appropriate |
Date: |
Wed, 18 Sep 2013 12:50:28 +0000 |
Revision: 5769
http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5769
Author: chicares
Date: 2013-09-18 12:50:26 +0000 (Wed, 18 Sep 2013)
Log Message:
-----------
Use 7702-specific DBO enumerations as appropriate
Modified Paths:
--------------
lmi/trunk/ChangeLog
lmi/trunk/commutation_functions.cpp
lmi/trunk/commutation_functions.hpp
lmi/trunk/commutation_functions_test.cpp
lmi/trunk/gpt_commutation_functions.hpp
lmi/trunk/ihs_irc7702.cpp
lmi/trunk/mec_server.cpp
Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2013-09-12 12:48:47 UTC (rev 5768)
+++ lmi/trunk/ChangeLog 2013-09-18 12:50:26 UTC (rev 5769)
@@ -32559,3 +32559,13 @@
gpt_commutation_functions.hpp [new file]
Add special commutation functions for GPT.
+20130918T1250Z <address@hidden> [542]
+
+ commutation_functions.cpp
+ commutation_functions.hpp
+ commutation_functions_test.cpp
+ gpt_commutation_functions.hpp
+ ihs_irc7702.cpp
+ mec_server.cpp
+Use 7702-specific DBO enumerations as appropriate.
+
Modified: lmi/trunk/commutation_functions.cpp
===================================================================
--- lmi/trunk/commutation_functions.cpp 2013-09-12 12:48:47 UTC (rev 5768)
+++ lmi/trunk/commutation_functions.cpp 2013-09-18 12:50:26 UTC (rev 5769)
@@ -126,7 +126,7 @@
(std::vector<double> const& a_qc
,std::vector<double> const& a_ic
,std::vector<double> const& a_ig
- ,mcenum_dbopt dbo
+ ,mcenum_dbopt_7702 dbo
,mcenum_mode mode
)
:qc (a_qc)
@@ -163,7 +163,7 @@
// Eckley equation (12).
double q = f * g;
// Eckley equation (19).
- if(mce_option2 == dbo_)
+ if(mce_option2_for_7702 == dbo_)
{
i = i - q;
}
Modified: lmi/trunk/commutation_functions.hpp
===================================================================
--- lmi/trunk/commutation_functions.hpp 2013-09-12 12:48:47 UTC (rev 5768)
+++ lmi/trunk/commutation_functions.hpp 2013-09-18 12:50:26 UTC (rev 5769)
@@ -91,7 +91,7 @@
(std::vector<double> const& a_qc
,std::vector<double> const& a_ic
,std::vector<double> const& a_ig
- ,mcenum_dbopt dbo
+ ,mcenum_dbopt_7702 dbo
,mcenum_mode mode
);
@@ -106,13 +106,13 @@
std::vector<double> const& kM() const {return km;}
private:
- std::vector<double> qc;
- std::vector<double> ic;
- std::vector<double> ig;
+ std::vector<double> qc;
+ std::vector<double> ic;
+ std::vector<double> ig;
// SOMEDAY !! It would be nice to let dbo_ vary by year.
- mcenum_dbopt dbo_;
- mcenum_mode mode_;
+ mcenum_dbopt_7702 dbo_;
+ mcenum_mode mode_;
int Length;
Modified: lmi/trunk/commutation_functions_test.cpp
===================================================================
--- lmi/trunk/commutation_functions_test.cpp 2013-09-12 12:48:47 UTC (rev
5768)
+++ lmi/trunk/commutation_functions_test.cpp 2013-09-18 12:50:26 UTC (rev
5769)
@@ -81,7 +81,7 @@
,std::vector<double> const& ig
)
{
- ULCommFns(q, ic, ig, mce_option1, mce_monthly);
+ ULCommFns(q, ic, ig, mce_option1_for_7702, mce_monthly);
}
void mete_reserve
@@ -165,13 +165,7 @@
std::vector<double>ic (coi.size(), 0.10);
std::vector<double>ig (coi.size(), 0.04);
- ULCommFns CF
- (coi
- ,ic
- ,ig
- ,mce_option1
- ,mce_annual
- );
+ ULCommFns CF(coi, ic, ig, mce_option1_for_7702, mce_annual);
std::vector<double> nsp (coi.size());
nsp += (CF.aDomega() + CF.kM()) / CF.aD();
@@ -300,13 +294,7 @@
std::vector<double>ic (coi.size(), 0.10);
std::vector<double>ig (coi.size(), 0.04);
- ULCommFns CF
- (coi
- ,ic
- ,ig
- ,mce_option2
- ,mce_annual
- );
+ ULCommFns CF(coi, ic, ig, mce_option2_for_7702, mce_annual);
std::vector<double> premium(coi.size());
premium += (2.0 * CF.aDomega() + CF.kM()) / CF.aN();
@@ -397,13 +385,7 @@
std::vector<double>ic (coi.size(),
i_upper_12_over_12_from_i<double>()(0.10));
std::vector<double>ig (coi.size(),
i_upper_12_over_12_from_i<double>()(0.04));
- ULCommFns CF
- (coi
- ,ic
- ,ig
- ,mce_option2
- ,mce_monthly
- );
+ ULCommFns CF(coi, ic, ig, mce_option2_for_7702, mce_monthly);
double tolerance = 0.0000005;
double worst_discrepancy = 0.0;
@@ -667,13 +649,7 @@
std::vector<double>ic(q.size(), i_upper_12_over_12_from_i<double>()(0.07));
std::vector<double>ig(q.size(), i_upper_12_over_12_from_i<double>()(0.03));
- ULCommFns ulcf
- (q
- ,ic
- ,ig
- ,mce_option2
- ,mce_monthly
- );
+ ULCommFns ulcf(q, ic, ig, mce_option2_for_7702, mce_monthly);
double premium = (10.0 * ulcf.aDomega() + ulcf.kM()[0]) / ulcf.aN()[0];
std::vector<double> reserve(q.size());
@@ -757,7 +733,7 @@
void TestLimits()
{
std::vector<double> zero(10, 0.0);
- ULCommFns ulcf(zero, zero, zero, mce_option1, mce_monthly);
+ ULCommFns ulcf(zero, zero, zero, mce_option1_for_7702, mce_monthly);
BOOST_TEST_EQUAL(1.0, ulcf.aDomega());
BOOST_TEST_EQUAL(0.0, ulcf.kC().back());
}
Modified: lmi/trunk/gpt_commutation_functions.hpp
===================================================================
--- lmi/trunk/gpt_commutation_functions.hpp 2013-09-12 12:48:47 UTC (rev
5768)
+++ lmi/trunk/gpt_commutation_functions.hpp 2013-09-18 12:50:26 UTC (rev
5769)
@@ -26,7 +26,7 @@
#include "config.hpp"
-#include "oecumenic_enumerations.hpp" // oenum_dbo_1_or_2
+#include "mc_enum_type_enums.hpp" // mcenum_dbopt_7702
#include <vector>
@@ -67,7 +67,7 @@
,std::vector<double> const& qc
,std::vector<double> const& ic
,std::vector<double> const& ig
- ,oenum_dbo_1_or_2 const dbo
+ ,mcenum_dbopt_7702 const dbo
,std::vector<double> const& prem_load_target
,std::vector<double> const& prem_load_excess
,std::vector<double> const& policy_fee_monthly
Modified: lmi/trunk/ihs_irc7702.cpp
===================================================================
--- lmi/trunk/ihs_irc7702.cpp 2013-09-12 12:48:47 UTC (rev 5768)
+++ lmi/trunk/ihs_irc7702.cpp 2013-09-18 12:50:26 UTC (rev 5769)
@@ -443,7 +443,7 @@
(Qc
,GLPic
,glp_naar_disc_rate
- ,mce_option1
+ ,mce_option1_for_7702
,mce_monthly
)
);
@@ -454,7 +454,7 @@
(Qc
,GLPic
,glp_naar_disc_rate
- ,mce_option2
+ ,mce_option2_for_7702
,mce_monthly
)
);
@@ -466,7 +466,7 @@
(Qc
,GSPic
,gsp_naar_disc_rate
- ,mce_option1
+ ,mce_option1_for_7702
,mce_monthly
)
);
Modified: lmi/trunk/mec_server.cpp
===================================================================
--- lmi/trunk/mec_server.cpp 2013-09-12 12:48:47 UTC (rev 5768)
+++ lmi/trunk/mec_server.cpp 2013-09-18 12:50:26 UTC (rev 5769)
@@ -214,7 +214,7 @@
(Mly7702qc
,Mly7702iGlp
,naar_disc_rate
- ,mce_option1
+ ,mce_option1_for_7702
,mce_monthly
);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [5769] Use 7702-specific DBO enumerations as appropriate,
Greg Chicares <=