[lmi-commits] [5618] Express earliest loan and withdrawal durations as months, not years

[Greg Chicares]

Revision: 5618
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5618
Author:   chicares
Date:     2012-12-10 20:03:17 +0000 (Mon, 10 Dec 2012)
Log Message:
-----------
Express earliest loan and withdrawal durations as months, not years

Modified Paths:
--------------
    lmi/trunk/dbdict.cpp
    lmi/trunk/dbdict.hpp
    lmi/trunk/dbnames.hpp
    lmi/trunk/dbnames.xpp

Modified: lmi/trunk/dbdict.cpp
===================================================================
--- lmi/trunk/dbdict.cpp        2012-12-08 17:11:12 UTC (rev 5617)
+++ lmi/trunk/dbdict.cpp        2012-12-10 20:03:17 UTC (rev 5618)
@@ -314,7 +314,7 @@
     ascribe("WdCanDecrSpecAmtDbo1", &DBDictionary::WdCanDecrSpecAmtDbo1);
     ascribe("WdCanDecrSpecAmtDbo2", &DBDictionary::WdCanDecrSpecAmtDbo2);
     ascribe("WdCanDecrSpecAmtDbo3", &DBDictionary::WdCanDecrSpecAmtDbo3);
-    ascribe("FirstWdYear"         , &DBDictionary::FirstWdYear         );
+    ascribe("FirstWdMonth"        , &DBDictionary::FirstWdMonth        );
     ascribe("AllowLoan"           , &DBDictionary::AllowLoan           );
     ascribe("AllowPrefLoan"       , &DBDictionary::AllowPrefLoan       );
     ascribe("AllowFixedLoan"      , &DBDictionary::AllowFixedLoan      );
@@ -328,7 +328,7 @@
     ascribe("GuarRegLoanSpread"   , &DBDictionary::GuarRegLoanSpread   );
     ascribe("CurrPrefLoanSpread"  , &DBDictionary::CurrPrefLoanSpread  );
     ascribe("CurrRegLoanSpread"   , &DBDictionary::CurrRegLoanSpread   );
-    ascribe("FirstLoanYear"       , &DBDictionary::FirstLoanYear       );
+    ascribe("FirstLoanMonth"      , &DBDictionary::FirstLoanMonth      );
     ascribe("MinPremType"         , &DBDictionary::MinPremType         );
     ascribe("MinPremIntSpread"    , &DBDictionary::MinPremIntSpread    );
     ascribe("TgtPremType"         , &DBDictionary::TgtPremType         );
@@ -591,7 +591,7 @@
     Add(database_entity(DB_PremTaxFundCharge   , 0.0));
     Add(database_entity(DB_DacTaxFundCharge    , 0.0));
     Add(database_entity(DB_WaivePremTaxInt1035 , true));
-    Add(database_entity(DB_FirstWdYear         , 0.0));
+    Add(database_entity(DB_FirstWdMonth        , 0.0));
     Add(database_entity(DB_MaxWdAcctValMult    , 1.0));
     Add(database_entity(DB_MaxWdDed            , mce_to_next_anniversary));
     Add(database_entity(DB_MinWd               , 100.0));
@@ -600,7 +600,7 @@
     Add(database_entity(DB_WdCanDecrSpecAmtDbo1, true));
     Add(database_entity(DB_WdCanDecrSpecAmtDbo2, true));
     Add(database_entity(DB_WdCanDecrSpecAmtDbo3, true));
-    Add(database_entity(DB_FirstLoanYear       , 0.0));
+    Add(database_entity(DB_FirstLoanMonth      , 0.0));
     Add(database_entity(DB_AllowPrefLoan       , false));
     Add(database_entity(DB_AllowFixedLoan      , true));
     Add(database_entity(DB_FixedLoanRate       , 0.06));

Modified: lmi/trunk/dbdict.hpp
===================================================================
--- lmi/trunk/dbdict.hpp        2012-12-08 17:11:12 UTC (rev 5617)
+++ lmi/trunk/dbdict.hpp        2012-12-10 20:03:17 UTC (rev 5618)
@@ -290,7 +290,7 @@
     database_entity WdCanDecrSpecAmtDbo1;
     database_entity WdCanDecrSpecAmtDbo2;
     database_entity WdCanDecrSpecAmtDbo3;
-    database_entity FirstWdYear         ;
+    database_entity FirstWdMonth        ;
     database_entity AllowLoan           ;
     database_entity AllowPrefLoan       ;
     database_entity AllowFixedLoan      ;
@@ -304,7 +304,7 @@
     database_entity GuarRegLoanSpread   ;
     database_entity CurrPrefLoanSpread  ;
     database_entity CurrRegLoanSpread   ;
-    database_entity FirstLoanYear       ;
+    database_entity FirstLoanMonth      ;
     database_entity MinPremType         ;
     database_entity MinPremIntSpread    ;
     database_entity TgtPremType         ;

Modified: lmi/trunk/dbnames.hpp
===================================================================
--- lmi/trunk/dbnames.hpp       2012-12-08 17:11:12 UTC (rev 5617)
+++ lmi/trunk/dbnames.hpp       2012-12-10 20:03:17 UTC (rev 5618)
@@ -370,7 +370,7 @@
         ,DB_WdCanDecrSpecAmtDbo2
         ,DB_WdCanDecrSpecAmtDbo3
 
-        ,DB_FirstWdYear
+        ,DB_FirstWdMonth
 
     ,DB_Topic_Loans
 
@@ -391,7 +391,7 @@
         ,DB_CurrPrefLoanSpread
         ,DB_CurrRegLoanSpread
 
-        ,DB_FirstLoanYear
+        ,DB_FirstLoanMonth
 
     ,DB_Topic_Premiums
 

Modified: lmi/trunk/dbnames.xpp
===================================================================
--- lmi/trunk/dbnames.xpp       2012-12-08 17:11:12 UTC (rev 5617)
+++ lmi/trunk/dbnames.xpp       2012-12-10 20:03:17 UTC (rev 5618)
@@ -231,7 +231,7 @@
 
{DB_WdCanDecrSpecAmtDbo1,DB_Topic_Withdrawals,"WdCanDecrSpecAmtDbo1","Withdrawals
 decrease specified amount for level death benefit option",}, \
 
{DB_WdCanDecrSpecAmtDbo2,DB_Topic_Withdrawals,"WdCanDecrSpecAmtDbo2","Withdrawals
 decrease specified amount for increasing death benefit option",}, \
 
{DB_WdCanDecrSpecAmtDbo3,DB_Topic_Withdrawals,"WdCanDecrSpecAmtDbo3","Withdrawals
 decrease specified amount for return of premium death benefit option",}, \
-{DB_FirstWdYear,DB_Topic_Withdrawals,"FirstWdYear","Number of years 
withdrawals not allowed [not supported yet; should be months instead]",}, \
+{DB_FirstWdMonth,DB_Topic_Withdrawals,"FirstWdMonth","Number of months 
withdrawals not allowed [not supported yet]",}, \
 {DB_Topic_Loans,DB_FIRST,"Loans","Loan rates, spreads, options, and 
restrictions",}, \
 {DB_AllowLoan,DB_Topic_Loans,"AllowLoan","Allow loans: 0=no, 1=yes",}, \
 {DB_AllowPrefLoan,DB_Topic_Loans,"AllowPrefLoan","Preferred loans permitted: 
0=no, 1=yes [preferred loans not yet supported]",}, \
@@ -246,7 +246,7 @@
 {DB_GuarRegLoanSpread,DB_Topic_Loans,"GuarRegLoanSpread","Guaranteed interest 
spread for regular loans",}, \
 {DB_CurrPrefLoanSpread,DB_Topic_Loans,"CurrPrefLoanSpread","Current interest 
spread for preferred loans [preferred loans not yet supported]",}, \
 {DB_CurrRegLoanSpread,DB_Topic_Loans,"CurrRegLoanSpread","Current interest 
spread for regular loans",}, \
-{DB_FirstLoanYear,DB_Topic_Loans,"FirstLoanYear","Number of years loans not 
allowed [not supported yet; should be months instead]",}, \
+{DB_FirstLoanMonth,DB_Topic_Loans,"FirstLoanMonth","Number of months loans not 
allowed [not supported yet]",}, \
 {DB_Topic_Premiums,DB_FIRST,"Premiums","Minimum and target premiums",}, \
 {DB_MinPremType,DB_Topic_Premiums,"MinPremType","Minimum premium: 0=based on 
monthly deductions, 1=7702A seven-pay premium",}, \
 {DB_MinPremIntSpread,DB_Topic_Premiums,"MinPremIntSpread","Interest spread 
from general-account rate used to capitalize monthly deductions for minimum 
premium calculation",}, \