[lmi-commits] [5632] Establish limits for spouse and child riders

[Greg Chicares]

Revision: 5632
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5632
Author:   chicares
Date:     2012-12-23 13:15:19 +0000 (Sun, 23 Dec 2012)
Log Message:
-----------
Establish limits for spouse and child riders

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-21 08:51:20 UTC (rev 5631)
+++ lmi/trunk/dbdict.cpp        2012-12-23 13:15:19 UTC (rev 5632)
@@ -50,6 +50,7 @@
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/path.hpp>
 
+#include <limits>
 #include <vector>
 
 template class xml_serializable<DBDictionary>;
@@ -301,9 +302,15 @@
     ascribe("AdbCoiRate"          , &DBDictionary::AdbCoiRate          );
     ascribe("AdbPremRate"         , &DBDictionary::AdbPremRate         );
     ascribe("AllowSpouseRider"    , &DBDictionary::AllowSpouseRider    );
+    ascribe("SpouseRiderMinAmt"   , &DBDictionary::SpouseRiderMinAmt   );
+    ascribe("SpouseRiderMaxAmt"   , &DBDictionary::SpouseRiderMaxAmt   );
+    ascribe("SpouseRiderMinIssAge", &DBDictionary::SpouseRiderMinIssAge);
+    ascribe("SpouseRiderMaxIssAge", &DBDictionary::SpouseRiderMaxIssAge);
     ascribe("SpouseRiderGuarTable", &DBDictionary::SpouseRiderGuarTable);
     ascribe("SpouseRiderTable"    , &DBDictionary::SpouseRiderTable    );
     ascribe("AllowChildRider"     , &DBDictionary::AllowChildRider     );
+    ascribe("ChildRiderMinAmt"    , &DBDictionary::ChildRiderMinAmt    );
+    ascribe("ChildRiderMaxAmt"    , &DBDictionary::ChildRiderMaxAmt    );
     ascribe("ChildRiderTable"     , &DBDictionary::ChildRiderTable     );
     ascribe("AllowWd"             , &DBDictionary::AllowWd             );
     ascribe("WdFee"               , &DBDictionary::WdFee               );
@@ -511,6 +518,7 @@
 void DBDictionary::InitDB()
 {
     static double const dbl_inf = infinity<double>();
+    static double const bignum = std::numeric_limits<double>::max();
 
     typedef std::vector<std::string>::const_iterator svci;
     for(svci i = member_names().begin(); i != member_names().end(); ++i)
@@ -548,13 +556,7 @@
     std::vector<int> max_vlr_dimensions(mvd, mvd + e_number_of_axes);
     std::vector<double> max_vlr(e_max_dim_state);
     max_vlr[mce_s_TX] = 0.15;
-    Add
-        (database_entity
-            (DB_MaxVlrRate
-            ,max_vlr_dimensions
-            ,max_vlr
-            )
-        );
+    Add(database_entity(DB_MaxVlrRate, max_vlr_dimensions, max_vlr));
 
     Add(database_entity(DB_GuarIntSpread       , dbl_inf));
 
@@ -567,6 +569,12 @@
     Add(database_entity(DB_DynSepAcctLoadLimit , dbl_inf));
     Add(database_entity(DB_AdbLimit            , dbl_inf));
     Add(database_entity(DB_ExpSpecAmtLimit     , dbl_inf));
+
+    // These are the same as the nominal limits of the associated
+    // members of class Input.
+    Add(database_entity(DB_SpouseRiderMaxAmt   , bignum));
+    Add(database_entity(DB_SpouseRiderMaxIssAge, 99));
+    Add(database_entity(DB_ChildRiderMaxAmt    , bignum));
 }
 
 void DBDictionary::WriteSampleDBFile()

Modified: lmi/trunk/dbdict.hpp
===================================================================
--- lmi/trunk/dbdict.hpp        2012-12-21 08:51:20 UTC (rev 5631)
+++ lmi/trunk/dbdict.hpp        2012-12-23 13:15:19 UTC (rev 5632)
@@ -277,9 +277,15 @@
     database_entity AdbCoiRate          ;
     database_entity AdbPremRate         ;
     database_entity AllowSpouseRider    ;
+    database_entity SpouseRiderMinAmt   ;
+    database_entity SpouseRiderMaxAmt   ;
+    database_entity SpouseRiderMinIssAge;
+    database_entity SpouseRiderMaxIssAge;
     database_entity SpouseRiderGuarTable;
     database_entity SpouseRiderTable    ;
     database_entity AllowChildRider     ;
+    database_entity ChildRiderMinAmt    ;
+    database_entity ChildRiderMaxAmt    ;
     database_entity ChildRiderTable     ;
     database_entity AllowWd             ;
     database_entity WdFee               ;

Modified: lmi/trunk/dbnames.hpp
===================================================================
--- lmi/trunk/dbnames.hpp       2012-12-21 08:51:20 UTC (rev 5631)
+++ lmi/trunk/dbnames.hpp       2012-12-23 13:15:19 UTC (rev 5632)
@@ -350,10 +350,16 @@
         ,DB_AdbPremRate
 
         ,DB_AllowSpouseRider
+        ,DB_SpouseRiderMinAmt
+        ,DB_SpouseRiderMaxAmt
+        ,DB_SpouseRiderMinIssAge
+        ,DB_SpouseRiderMaxIssAge
         ,DB_SpouseRiderGuarTable
         ,DB_SpouseRiderTable
 
         ,DB_AllowChildRider
+        ,DB_ChildRiderMinAmt
+        ,DB_ChildRiderMaxAmt
         ,DB_ChildRiderTable
 
     ,DB_Topic_Withdrawals

Modified: lmi/trunk/dbnames.xpp
===================================================================
--- lmi/trunk/dbnames.xpp       2012-12-21 08:51:20 UTC (rev 5631)
+++ lmi/trunk/dbnames.xpp       2012-12-23 13:15:19 UTC (rev 5632)
@@ -217,9 +217,15 @@
 {DB_AdbCoiRate,DB_Topic_Riders,"AdbCoiRate","[not yet implemented--use 
external table instead]",}, \
 {DB_AdbPremRate,DB_Topic_Riders,"AdbPremRate","[not yet implemented--use 
external table instead]",}, \
 {DB_AllowSpouseRider,DB_Topic_Riders,"AllowSpouseRider","Allow spouse rider: 
0=no, 1=yes",}, \
+{DB_SpouseRiderMinAmt,DB_Topic_Riders,"SpouseRiderMinAmt","Spouse rider 
minimum amount",}, \
+{DB_SpouseRiderMaxAmt,DB_Topic_Riders,"SpouseRiderMaxAmt","Spouse rider 
maximum amount",}, \
+{DB_SpouseRiderMinIssAge,DB_Topic_Riders,"SpouseRiderMinIssAge","Spouse rider 
minimum issue age",}, \
+{DB_SpouseRiderMaxIssAge,DB_Topic_Riders,"SpouseRiderMaxIssAge","Spouse rider 
maximum issue age",}, \
 {DB_SpouseRiderGuarTable,DB_Topic_Riders,"SpouseRiderGuarTable","Spouse rider 
guaranteed charge table (index in mortality table database)",}, \
 {DB_SpouseRiderTable,DB_Topic_Riders,"SpouseRiderTable","Spouse rider current 
charge table (index in mortality table database)",}, \
 {DB_AllowChildRider,DB_Topic_Riders,"AllowChildRider","Allow child rider: 
0=no, 1=yes",}, \
+{DB_ChildRiderMinAmt,DB_Topic_Riders,"ChildRiderMinAmt","Child rider minimum 
amount",}, \
+{DB_ChildRiderMaxAmt,DB_Topic_Riders,"ChildRiderMaxAmt","Child rider maximum 
amount",}, \
 {DB_ChildRiderTable,DB_Topic_Riders,"ChildRiderTable","Child rider charge 
table (index in mortality table database)",}, \
 {DB_Topic_Withdrawals,DB_FIRST,"Withdrawals","Withdrawal fees, options, and 
restrictions; effect on specified amount",}, \
 {DB_AllowWd,DB_Topic_Withdrawals,"AllowWd","Allow withdrawals: 0=no, 1=yes",}, 
\