[lmi-commits] [5728] Disable material-change-definition control in GUI

[Greg Chicares]

Revision: 5728
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5728
Author:   chicares
Date:     2013-05-10 22:51:16 +0000 (Fri, 10 May 2013)
Log Message:
-----------
Disable material-change-definition control in GUI

Modified Paths:
--------------
    lmi/trunk/ihs_basicval.cpp
    lmi/trunk/input.cpp
    lmi/trunk/input_harmonization.cpp

Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp  2013-05-09 21:23:23 UTC (rev 5727)
+++ lmi/trunk/ihs_basicval.cpp  2013-05-10 22:51:16 UTC (rev 5728)
@@ -851,6 +851,15 @@
 
     DefnLifeIns_        = yare_input_.DefinitionOfLifeInsurance;
     DefnMaterialChange_ = yare_input_.DefinitionOfMaterialChange;
+    // TAXATION !! For the nonce, input 'DefinitionOfMaterialChange'
+    // is ignored without the most-privileged password. In the future,
+    // the input class will distinguish CVAT from GPT material-change
+    // definitions, and 'DefinitionOfMaterialChange' will be removed.
+    if(!global_settings::instance().ash_nazg())
+        {
+        mcenum_defn_material_change const z = 
static_cast<mcenum_defn_material_change>(static_cast<int>(Database_->Query(DB_CvatMatChangeDefn)));
+        DefnMaterialChange_ = (mce_gpt == DefnLifeIns_) ? mce_adjustment_event 
: z;
+        }
     Equiv7702DBO3       = 
static_cast<mcenum_dbopt_7702>(static_cast<int>(Database_->Query(DB_Equiv7702Dbo3)));
     MaxNAAR             = yare_input_.MaximumNaar;
 

Modified: lmi/trunk/input.cpp
===================================================================
--- lmi/trunk/input.cpp 2013-05-09 21:23:23 UTC (rev 5727)
+++ lmi/trunk/input.cpp 2013-05-10 22:51:16 UTC (rev 5728)
@@ -113,7 +113,7 @@
     ,CorporationPremiumTableFactor    ("1")
 //    ,EffectiveDate                    ("")
 //    ,DefinitionOfLifeInsurance        ("")
-    ,DefinitionOfMaterialChange       ("Earlier of increase or unnecessary 
premium")
+//    ,DefinitionOfMaterialChange       ("")
 //    ,AvoidMecMethod                   ("")
 //    ,RetireesCanEnroll                ("")
 //    ,GroupUnderwritingType            ("")

Modified: lmi/trunk/input_harmonization.cpp
===================================================================
--- lmi/trunk/input_harmonization.cpp   2013-05-09 21:23:23 UTC (rev 5727)
+++ lmi/trunk/input_harmonization.cpp   2013-05-10 22:51:16 UTC (rev 5728)
@@ -177,6 +177,10 @@
     DefinitionOfLifeInsurance.allow(mce_cvat, database_->Query(DB_AllowCvat));
     DefinitionOfLifeInsurance.allow(mce_noncompliant, 
database_->Query(DB_AllowNo7702));
 
+    DefinitionOfMaterialChange.enable(anything_goes);
+    // INPUT !! TAXATION !! This old code will be useful when
+    // 'DefinitionOfMaterialChange' is replaced.
+#if 0
     DefinitionOfMaterialChange.enable(mce_noncompliant != 
DefinitionOfLifeInsurance);
     if(mce_noncompliant == DefinitionOfLifeInsurance)
         {
@@ -184,19 +188,11 @@
         }
     else if(mce_cvat == DefinitionOfLifeInsurance)
         {
-// Temporarily allow every implemented option, for an extraordinary release.
-        DefinitionOfMaterialChange.allow(mce_unnecessary_premium               
         ,true         );
-        DefinitionOfMaterialChange.allow(mce_benefit_increase                  
         ,true         );
-        
DefinitionOfMaterialChange.allow(mce_later_of_increase_or_unnecessary_premium   
,false        ); // Not implemented.
-        
DefinitionOfMaterialChange.allow(mce_earlier_of_increase_or_unnecessary_premium 
,true         );
-        DefinitionOfMaterialChange.allow(mce_adjustment_event                  
         ,false        );
-#if 0
         DefinitionOfMaterialChange.allow(mce_unnecessary_premium               
         ,anything_goes);
         DefinitionOfMaterialChange.allow(mce_benefit_increase                  
         ,anything_goes);
         
DefinitionOfMaterialChange.allow(mce_later_of_increase_or_unnecessary_premium   
,anything_goes);
         
DefinitionOfMaterialChange.allow(mce_earlier_of_increase_or_unnecessary_premium 
,true         );
         DefinitionOfMaterialChange.allow(mce_adjustment_event                  
         ,false        );
-#endif // 0
         }
     else if(mce_gpt == DefinitionOfLifeInsurance)
         {
@@ -213,6 +209,7 @@
             << LMI_FLUSH
             ;
         }
+#endif // 0
 
     MaximumNaar.enable(anything_goes);