[lmi-commits] [6354] Fix defect introduced 20130510T2251Z

[Greg Chicares]

Revision: 6354
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6354
Author:   chicares
Date:     2015-10-15 14:03:32 +0000 (Thu, 15 Oct 2015)
Log Message:
-----------
Fix defect introduced 20130510T2251Z

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

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2015-10-15 14:01:39 UTC (rev 6353)
+++ lmi/trunk/ChangeLog 2015-10-15 14:03:32 UTC (rev 6354)
@@ -37205,3 +37205,17 @@
   group_quote_pdf_gen_wx.cpp
 Remove a needless attribute; fix the 20151011T1607Z commit message.
 
+20151015T1401Z <address@hidden> [472]
+
+  census_view.cpp
+  group_quote_pdf_gen_wx.cpp
+  illustrator.cpp
+  illustrator.hpp
+Verify census consistency before running a group quote.
+
+20151015T1403Z <address@hidden> [472]
+
+  input_harmonization.cpp
+Fix defect introduced 20130510T2251Z: assertion failure when changing
+definition of life insurance with a password never given to end users.
+

Modified: lmi/trunk/input_harmonization.cpp
===================================================================
--- lmi/trunk/input_harmonization.cpp   2015-10-15 14:01:39 UTC (rev 6353)
+++ lmi/trunk/input_harmonization.cpp   2015-10-15 14:03:32 UTC (rev 6354)
@@ -153,36 +153,37 @@
     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)
+    if(anything_goes)
         {
-        // Nothing to do: all choices ignored because control is disabled.
+        DefinitionOfMaterialChange.enable(mce_noncompliant != 
DefinitionOfLifeInsurance);
+        if(mce_noncompliant == DefinitionOfLifeInsurance)
+            {
+            // Nothing to do: all choices ignored because control is disabled.
+            }
+        else if(mce_cvat == DefinitionOfLifeInsurance)
+            {
+            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        );
+            }
+        else if(mce_gpt == DefinitionOfLifeInsurance)
+            {
+            DefinitionOfMaterialChange.allow(mce_unnecessary_premium           
             ,false        );
+            DefinitionOfMaterialChange.allow(mce_benefit_increase              
             ,false        );
+            
DefinitionOfMaterialChange.allow(mce_later_of_increase_or_unnecessary_premium   
,false        );
+            
DefinitionOfMaterialChange.allow(mce_earlier_of_increase_or_unnecessary_premium 
,false        );
+            DefinitionOfMaterialChange.allow(mce_adjustment_event              
             ,true         );
+            }
+        else
+            {
+            fatal_error()
+                << "No option selected for definition of life insurance."
+                << LMI_FLUSH
+                ;
+            }
         }
-    else if(mce_cvat == DefinitionOfLifeInsurance)
-        {
-        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        );
-        }
-    else if(mce_gpt == DefinitionOfLifeInsurance)
-        {
-        DefinitionOfMaterialChange.allow(mce_unnecessary_premium               
         ,false        );
-        DefinitionOfMaterialChange.allow(mce_benefit_increase                  
         ,false        );
-        
DefinitionOfMaterialChange.allow(mce_later_of_increase_or_unnecessary_premium   
,false        );
-        
DefinitionOfMaterialChange.allow(mce_earlier_of_increase_or_unnecessary_premium 
,false        );
-        DefinitionOfMaterialChange.allow(mce_adjustment_event                  
         ,true         );
-        }
-    else
-        {
-        fatal_error()
-            << "No option selected for definition of life insurance."
-            << LMI_FLUSH
-            ;
-        }
-#endif // 0
 
     MaximumNaar.enable(anything_goes);