[lmi-commits] [5283] Marshal switch-statement cases in enum-declaration order

[Greg Chicares]

Revision: 5283
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5283
Author:   chicares
Date:     2011-09-13 11:39:20 +0000 (Tue, 13 Sep 2011)
Log Message:
-----------
Marshal switch-statement cases in enum-declaration order

Modified Paths:
--------------
    lmi/trunk/ihs_avstrtgy.cpp

Modified: lmi/trunk/ihs_avstrtgy.cpp
===================================================================
--- lmi/trunk/ihs_avstrtgy.cpp  2011-09-13 11:19:28 UTC (rev 5282)
+++ lmi/trunk/ihs_avstrtgy.cpp  2011-09-13 11:39:20 UTC (rev 5283)
@@ -92,20 +92,6 @@
     double z = 0.0;
     switch(yare_input_.SpecifiedAmountStrategy[actual_year])
         {
-        case mce_sa_salary:
-            {
-            double y =
-                  yare_input_.ProjectedSalary[actual_year]
-                * yare_input_.SalarySpecifiedAmountFactor
-                ;
-            if(0.0 != yare_input_.SalarySpecifiedAmountCap)
-                {
-                y = std::min(y, yare_input_.SalarySpecifiedAmountCap);
-                }
-            y -= yare_input_.SalarySpecifiedAmountOffset;
-            z = std::max(0.0, y);
-            }
-            break;
         case mce_sa_input_scalar:
             {
             z = DeathBfts_->specamt()[actual_year];
@@ -141,9 +127,9 @@
                 );
             }
             break;
-        case mce_sa_corridor:
+        case mce_sa_glp:
             {
-            z = GetModalSpecAmtCorridor
+            z = GetModalSpecAmtGLP
                 (InvariantValues().EeMode[reference_year].value()
                 ,InvariantValues().EePmt [reference_year]
                 ,InvariantValues().ErMode[reference_year].value()
@@ -151,9 +137,9 @@
                 );
             }
             break;
-        case mce_sa_glp:
+        case mce_sa_gsp:
             {
-            z = GetModalSpecAmtGLP
+            z = GetModalSpecAmtGSP
                 (InvariantValues().EeMode[reference_year].value()
                 ,InvariantValues().EePmt [reference_year]
                 ,InvariantValues().ErMode[reference_year].value()
@@ -161,9 +147,9 @@
                 );
             }
             break;
-        case mce_sa_gsp:
+        case mce_sa_corridor:
             {
-            z = GetModalSpecAmtGSP
+            z = GetModalSpecAmtCorridor
                 (InvariantValues().EeMode[reference_year].value()
                 ,InvariantValues().EePmt [reference_year]
                 ,InvariantValues().ErMode[reference_year].value()
@@ -171,6 +157,20 @@
                 );
             }
             break;
+        case mce_sa_salary:
+            {
+            double y =
+                  yare_input_.ProjectedSalary[actual_year]
+                * yare_input_.SalarySpecifiedAmountFactor
+                ;
+            if(0.0 != yare_input_.SalarySpecifiedAmountCap)
+                {
+                y = std::min(y, yare_input_.SalarySpecifiedAmountCap);
+                }
+            y -= yare_input_.SalarySpecifiedAmountOffset;
+            z = std::max(0.0, y);
+            }
+            break;
         default:
             {
             fatal_error()
@@ -279,14 +279,6 @@
                 ,InvariantValues().SpecAmt[0] + 
InvariantValues().TermSpecAmt[0]
                 );
             }
-        case mce_pmt_table:
-            {
-            return
-                ActualSpecAmt
-                * MortalityRates_->TableYRates()[Year]
-                * (12.0 / a_CurrentMode)
-                * a_TblMult;
-            }
         case mce_pmt_corridor:
             {
 // TODO ?? This assumes that the term rider continues to at least age 95.
@@ -300,6 +292,15 @@
 //                ,ActualSpecAmt + TermSpecAmt
                 );
             }
+        case mce_pmt_table:
+            {
+            return
+                  ActualSpecAmt
+                * MortalityRates_->TableYRates()[Year]
+                * (12.0 / a_CurrentMode)
+                * a_TblMult
+                ;
+            }
         default:
             {
             fatal_error()