[lmi-commits] [5284] Refactor

[Greg Chicares]

Revision: 5284
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5284
Author:   chicares
Date:     2011-09-13 12:19:27 +0000 (Tue, 13 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 11:39:20 UTC (rev 5283)
+++ lmi/trunk/ihs_avstrtgy.cpp  2011-09-13 12:19:27 UTC (rev 5284)
@@ -78,6 +78,8 @@
     ,int reference_year
     ) const
 {
+    double z = DeathBfts_->specamt()[actual_year];
+
     // Don't override a specamt that's being solved for.
     if
         (
@@ -86,15 +88,14 @@
         &&  actual_year < std::min(yare_input_.SolveEndYear, 
BasicValues::Length)
         )
         {
-        return DeathBfts_->specamt()[actual_year];
+        return z;
         }
 
-    double z = 0.0;
     switch(yare_input_.SpecifiedAmountStrategy[actual_year])
         {
         case mce_sa_input_scalar:
             {
-            z = DeathBfts_->specamt()[actual_year];
+            // Do nothing: initial value of 'z' is appropriate.
             }
             break;
         case mce_sa_maximum:
@@ -231,11 +232,8 @@
             }
         case mce_pmt_minimum:
             {
-            return GetModalMinPrem
-                (Year
-                ,a_CurrentMode
-                ,ActualSpecAmt + TermSpecAmt
-                );
+            double sa = ActualSpecAmt + TermSpecAmt;
+            return GetModalMinPrem(Year, a_CurrentMode, sa);
             }
         case mce_pmt_target:
             {
@@ -245,52 +243,43 @@
 // be used instead, at least in the
 //       if(Database_->Query(DB_TgtPremFixedAtIssue))
 // case?
-            return GetModalTgtPrem
-                (Year
-                ,a_CurrentMode
-                ,ActualSpecAmt
-                );
+            return GetModalTgtPrem(Year, a_CurrentMode, ActualSpecAmt);
             }
         case mce_pmt_mep:
             {
 // TODO ?? This assumes that the term rider continues to at least age 95.
 // We ought to have a database flag for that.
-            return GetModalPremMaxNonMec
-                (0
-                ,a_InitialMode
-                ,InvariantValues().SpecAmt[0] + 
InvariantValues().TermSpecAmt[0]
-                );
+            double sa =
+                  InvariantValues().SpecAmt[0]
+                + InvariantValues().TermSpecAmt[0]
+                ;
+            return GetModalPremMaxNonMec(0, a_InitialMode, sa);
             }
         case mce_pmt_glp:
             {
-            return GetModalPremGLP
-                (0
-                ,a_InitialMode
-                ,InvariantValues().SpecAmt[0] + 
InvariantValues().TermSpecAmt[0]
-                ,InvariantValues().SpecAmt[0] + 
InvariantValues().TermSpecAmt[0]
-                );
+            double sa =
+                  InvariantValues().SpecAmt[0]
+                + InvariantValues().TermSpecAmt[0]
+                ;
+            return GetModalPremGLP(0, a_InitialMode, sa, sa);
             }
         case mce_pmt_gsp:
             {
-            return GetModalPremGSP
-                (0
-                ,a_InitialMode
-                ,InvariantValues().SpecAmt[0] + 
InvariantValues().TermSpecAmt[0]
-                ,InvariantValues().SpecAmt[0] + 
InvariantValues().TermSpecAmt[0]
-                );
+            double sa =
+                  InvariantValues().SpecAmt[0]
+                + InvariantValues().TermSpecAmt[0]
+                ;
+            return GetModalPremGSP(0, a_InitialMode, sa, sa);
             }
         case mce_pmt_corridor:
             {
 // TODO ?? This assumes that the term rider continues to at least age 95.
 // We ought to have a database flag for that.
-            return GetModalPremCorridor
-                (0
-                ,a_InitialMode
 // TODO ?? Shouldn't this be initial specified amount?
-                ,ActualSpecAmt
+            double sa = ActualSpecAmt;
 // TODO ?? This may be wanted for an 'integrated' term rider.
 //                ,ActualSpecAmt + TermSpecAmt
-                );
+            return GetModalPremCorridor(0, a_InitialMode, sa);
             }
         case mce_pmt_table:
             {