[lmi-commits] [5312] Simplify, resolving a marked defect

[Greg Chicares]

Revision: 5312
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5312
Author:   chicares
Date:     2011-11-21 17:05:12 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------
Simplify, resolving a marked defect

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

Modified: lmi/trunk/ihs_irc7702.cpp
===================================================================
--- lmi/trunk/ihs_irc7702.cpp   2011-11-19 20:16:19 UTC (rev 5311)
+++ lmi/trunk/ihs_irc7702.cpp   2011-11-21 17:05:12 UTC (rev 5312)
@@ -885,22 +885,8 @@
     LMI_ASSERT(0.0 != a_NetPmtFactorExc);
 
     // TODO ?? This implementation is correct only if TargetPremium
-    // is fixed forever at issue; otherwise, we need either a
-    // callback function or separately passed target premiums for
-    // each of the quantities A, B, and C.
-    //
-    // TODO ?? It's also correct only if the supplied target premium
-    // is correct.
-#if 1
-    double target = TargetPremium;
-#else // About to be removed:
-    double target = Values.GetTgtPrem
-        (a_Duration
-        ,a_SpecAmt
-        ,mce_option1 // Should pass dbopt [marked as a defect below].
-        ,mce_annual
-        );
-#endif
+    // is fixed forever at issue; otherwise, distinct target premiums
+    // must be passed for each of the quantities A, B, and C.
     double z =
         (   DEndt[a_EIOBasis] * a_LeastBftAmtEver
         +   PvChgPol[a_EIOBasis][a_Duration]
@@ -911,7 +897,7 @@
         /
         a_NetPmtFactorTgt
         ;
-    if(z <= target)
+    if(z <= TargetPremium)
         {
         return z;
         }
@@ -922,7 +908,7 @@
         +   std::min(SpecAmtLoadLimit, a_SpecAmt) * 
PvChgSpecAmt[a_EIOBasis][a_Duration]
         +   std::min(ADDLimit, a_SpecAmt) * PvChgADD[a_EIOBasis][a_Duration]
         +   a_BftAmt * PvChgMort[a_EIOBasis][a_Duration]
-        +       target
+        +       TargetPremium
             *   (a_NetPmtFactorExc - a_NetPmtFactorTgt)
         )
         /