[lmi-commits] [5286] Refactor

[Greg Chicares]

Revision: 5286
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5286
Author:   chicares
Date:     2011-09-14 00:17:21 +0000 (Wed, 14 Sep 2011)
Log Message:
-----------
Refactor

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

Modified: lmi/trunk/ihs_avstrtgy.cpp
===================================================================
--- lmi/trunk/ihs_avstrtgy.cpp  2011-09-13 14:44:31 UTC (rev 5285)
+++ lmi/trunk/ihs_avstrtgy.cpp  2011-09-14 00:17:21 UTC (rev 5286)
@@ -71,7 +71,7 @@
     ,int reference_year
     ) const
 {
-    double z = DeathBfts_->specamt()[actual_year];
+    double r = DeathBfts_->specamt()[actual_year];
 
     // Don't override a specamt that's being solved for.
     if
@@ -81,90 +81,82 @@
         &&  actual_year < std::min(yare_input_.SolveEndYear, 
BasicValues::Length)
         )
         {
-        return z;
+        return r;
         }
 
     switch(yare_input_.SpecifiedAmountStrategy[actual_year])
         {
         case mce_sa_input_scalar:
             {
-            // Do nothing: initial value of 'z' is appropriate.
+            return r;
             }
-            break;
         case mce_sa_maximum:
             {
-            z = GetModalSpecAmtMax
+            return GetModalSpecAmtMax
                 (InvariantValues().EeMode[reference_year].value()
                 ,InvariantValues().EePmt [reference_year]
                 ,InvariantValues().ErMode[reference_year].value()
                 ,InvariantValues().ErPmt [reference_year]
                 );
             }
-            break;
         case mce_sa_target:
             {
-            z = GetModalSpecAmtTgt
+            return GetModalSpecAmtTgt
                 (InvariantValues().EeMode[reference_year].value()
                 ,InvariantValues().EePmt [reference_year]
                 ,InvariantValues().ErMode[reference_year].value()
                 ,InvariantValues().ErPmt [reference_year]
                 );
             }
-            break;
         case mce_sa_mep:
             {
-            z = GetModalSpecAmtMinNonMec
+            return GetModalSpecAmtMinNonMec
                 (InvariantValues().EeMode[reference_year].value()
                 ,InvariantValues().EePmt [reference_year]
                 ,InvariantValues().ErMode[reference_year].value()
                 ,InvariantValues().ErPmt [reference_year]
                 );
             }
-            break;
         case mce_sa_glp:
             {
-            z = GetModalSpecAmtGLP
+            return GetModalSpecAmtGLP
                 (InvariantValues().EeMode[reference_year].value()
                 ,InvariantValues().EePmt [reference_year]
                 ,InvariantValues().ErMode[reference_year].value()
                 ,InvariantValues().ErPmt [reference_year]
                 );
             }
-            break;
         case mce_sa_gsp:
             {
-            z = GetModalSpecAmtGSP
+            return GetModalSpecAmtGSP
                 (InvariantValues().EeMode[reference_year].value()
                 ,InvariantValues().EePmt [reference_year]
                 ,InvariantValues().ErMode[reference_year].value()
                 ,InvariantValues().ErPmt [reference_year]
                 );
             }
-            break;
         case mce_sa_corridor:
             {
-            z = GetModalSpecAmtCorridor
+            return GetModalSpecAmtCorridor
                 (InvariantValues().EeMode[reference_year].value()
                 ,InvariantValues().EePmt [reference_year]
                 ,InvariantValues().ErMode[reference_year].value()
                 ,InvariantValues().ErPmt [reference_year]
                 );
             }
-            break;
         case mce_sa_salary:
             {
-            double y =
+            double z =
                   yare_input_.ProjectedSalary[actual_year]
                 * yare_input_.SalarySpecifiedAmountFactor
                 ;
             if(0.0 != yare_input_.SalarySpecifiedAmountCap)
                 {
-                y = std::min(y, yare_input_.SalarySpecifiedAmountCap);
+                z = std::min(z, yare_input_.SalarySpecifiedAmountCap);
                 }
-            y -= yare_input_.SalarySpecifiedAmountOffset;
-            z = std::max(0.0, y);
+            z -= yare_input_.SalarySpecifiedAmountOffset;
+            return std::max(0.0, z);
             }
-            break;
         default:
             {
             fatal_error()
@@ -173,9 +165,9 @@
                 << " not found."
                 << LMI_FLUSH
                 ;
+            throw "Unreachable--silences a compiler diagnostic.";
             }
         }
-    return z;
 }
 
 /// Set specamt according to selected strategy.