[lmi-commits] [5278] Use certain database entities added 20110912T1917Z

[Greg Chicares]

Revision: 5278
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5278
Author:   chicares
Date:     2011-09-12 19:33:19 +0000 (Mon, 12 Sep 2011)
Log Message:
-----------
Use certain database entities added 20110912T1917Z

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/input_harmonization.cpp
    lmi/trunk/input_realization.cpp
    lmi/trunk/mec_input.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2011-09-12 19:17:46 UTC (rev 5277)
+++ lmi/trunk/ChangeLog 2011-09-12 19:33:19 UTC (rev 5278)
@@ -28422,10 +28422,35 @@
   ihs_avstrtgy.cpp
 Constrain salary-based specamt as newly documented.
 
-20110825T1700Z <address@hidden> [615]
+20110825T1701Z <address@hidden> [615]
 
   skin_coli_boli.xrc
   skin_group_carveout2.xrc
   skin_reg_d.xrc
 Correct misalignment and typos.
 
+20110912T1729Z <address@hidden> [615]
+
+  dbdict.cpp
+  dbdict.hpp
+  dbnames.hpp
+  dbnames.xpp
+Move certain database entities.
+
+20110912T1917Z <address@hidden> [615]
+
+  dbdict.cpp
+  dbdict.hpp
+  dbnames.hpp
+  dbnames.xpp
+  premium_tax.cpp
+  premium_tax.hpp
+Remove an obsolete database entity; add several new ones.
+
+20110912T1933Z <address@hidden> [614]
+
+  input_harmonization.cpp
+  input_realization.cpp
+  mec_input.cpp
+Use certain database entities added 20110912T1917Z.
+

Modified: lmi/trunk/input_harmonization.cpp
===================================================================
--- lmi/trunk/input_harmonization.cpp   2011-09-12 19:17:46 UTC (rev 5277)
+++ lmi/trunk/input_harmonization.cpp   2011-09-12 19:33:19 UTC (rev 5278)
@@ -173,14 +173,11 @@
 
     RetireesCanEnroll.enable(database_->Query(DB_AllowRetirees));
 
-    // TODO ?? DATABASE !! There should be flags in the database to allow or
-    // forbid paramedical and nonmedical underwriting; arbitrarily,
-    // until they are added, those options are always inhibited.
-    GroupUnderwritingType.allow(mce_medical, database_->Query(DB_AllowFullUw));
-    GroupUnderwritingType.allow(mce_paramedical, false);
-    GroupUnderwritingType.allow(mce_nonmedical, false);
-    GroupUnderwritingType.allow(mce_simplified_issue, 
database_->Query(DB_AllowSimpUw));
-    GroupUnderwritingType.allow(mce_guaranteed_issue, 
database_->Query(DB_AllowGuarUw));
+    GroupUnderwritingType.allow(mce_medical         , 
database_->Query(DB_AllowFullUw   ));
+    GroupUnderwritingType.allow(mce_paramedical     , 
database_->Query(DB_AllowParamedUw));
+    GroupUnderwritingType.allow(mce_nonmedical      , 
database_->Query(DB_AllowNonmedUw ));
+    GroupUnderwritingType.allow(mce_simplified_issue, 
database_->Query(DB_AllowSimpUw   ));
+    GroupUnderwritingType.allow(mce_guaranteed_issue, 
database_->Query(DB_AllowGuarUw   ));
 
     bool part_mort_used = mce_yes == UsePartialMortality;
 
@@ -639,17 +636,11 @@
         }
 */
 
-// genacct: earned is suppressed for "compliance" reasons
-// sepacct: net is suppressed for "compliance" reasons
-//
-// The "compliance" reasons don't seem sensible, but that's another
-// matter. DATABASE !! Control that in the product database.
-
     GeneralAccountRateType .allow(mce_credited_rate , true);
-    GeneralAccountRateType .allow(mce_earned_rate, anything_goes && mce_no == 
UseCurrentDeclaredRate);
+    GeneralAccountRateType .allow(mce_earned_rate, mce_no == 
UseCurrentDeclaredRate && (anything_goes || 
database_->Query(DB_AllowGenAcctEarnRate)));
 
     SeparateAccountRateType.allow(mce_gross_rate, true);
-    SeparateAccountRateType.allow(mce_net_rate  , anything_goes);
+    SeparateAccountRateType.allow(mce_net_rate  , anything_goes || 
database_->Query(DB_AllowSepAcctNetRate));
 
     bool curr_int_rate_solve = false; // May be useful someday.
     UseCurrentDeclaredRate .enable(!curr_int_rate_solve && allow_gen_acct);

Modified: lmi/trunk/input_realization.cpp
===================================================================
--- lmi/trunk/input_realization.cpp     2011-09-12 19:17:46 UTC (rev 5277)
+++ lmi/trunk/input_realization.cpp     2011-09-12 19:33:19 UTC (rev 5278)
@@ -375,7 +375,7 @@
         return s;
         }
 
-    double z = 0.9; // DATABASE !! This belongs in the product database.
+    double const z = database_->Query(DB_MinInputCoiMult);
     double lowest = std::min_element
         (CurrentCoiMultiplierRealized_.begin()
         ,CurrentCoiMultiplierRealized_.end()

Modified: lmi/trunk/mec_input.cpp
===================================================================
--- lmi/trunk/mec_input.cpp     2011-09-12 19:17:46 UTC (rev 5277)
+++ lmi/trunk/mec_input.cpp     2011-09-12 19:33:19 UTC (rev 5278)
@@ -353,14 +353,11 @@
             ;
         }
 
-    // DATABASE !! There should be flags in the database to allow or
-    // forbid paramedical and nonmedical underwriting; arbitrarily,
-    // until they are added, those options are always inhibited.
-    GroupUnderwritingType.allow(mce_medical, database_->Query(DB_AllowFullUw));
-    GroupUnderwritingType.allow(mce_paramedical, false);
-    GroupUnderwritingType.allow(mce_nonmedical, false);
-    GroupUnderwritingType.allow(mce_simplified_issue, 
database_->Query(DB_AllowSimpUw));
-    GroupUnderwritingType.allow(mce_guaranteed_issue, 
database_->Query(DB_AllowGuarUw));
+    GroupUnderwritingType.allow(mce_medical         , 
database_->Query(DB_AllowFullUw   ));
+    GroupUnderwritingType.allow(mce_paramedical     , 
database_->Query(DB_AllowParamedUw));
+    GroupUnderwritingType.allow(mce_nonmedical      , 
database_->Query(DB_AllowNonmedUw ));
+    GroupUnderwritingType.allow(mce_simplified_issue, 
database_->Query(DB_AllowSimpUw   ));
+    GroupUnderwritingType.allow(mce_guaranteed_issue, 
database_->Query(DB_AllowGuarUw   ));
 
     IssueAge        .enable(mce_no  == UseDOB);
     DateOfBirth     .enable(mce_yes == UseDOB);