[lmi-commits] [5326] Resolve marked defects

[Greg Chicares]

Revision: 5326
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5326
Author:   chicares
Date:     2011-12-04 01:40:25 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Resolve marked defects

Modified Paths:
--------------
    lmi/trunk/basic_values.hpp
    lmi/trunk/gpt_specamt.cpp
    lmi/trunk/ihs_basicval.cpp

Modified: lmi/trunk/basic_values.hpp
===================================================================
--- lmi/trunk/basic_values.hpp  2011-12-04 01:21:46 UTC (rev 5325)
+++ lmi/trunk/basic_values.hpp  2011-12-04 01:40:25 UTC (rev 5326)
@@ -131,12 +131,7 @@
     boost::shared_ptr<Irc7702>            Irc7702_;
     boost::shared_ptr<Irc7702A>           Irc7702A_;
 
-    double GetTgtPrem
-        (int          a_year
-        ,double       a_specamt
-        ,mcenum_dbopt a_dbopt
-        ,mcenum_mode  a_mode
-        ) const;
+    double GetAnnualTgtPrem(int a_year, double a_specamt) const;
 
     std::vector<double> const& GetCorridorFactor() const;
     std::vector<double> const& SpreadFor7702() const;

Modified: lmi/trunk/gpt_specamt.cpp
===================================================================
--- lmi/trunk/gpt_specamt.cpp   2011-12-04 01:21:46 UTC (rev 5325)
+++ lmi/trunk/gpt_specamt.cpp   2011-12-04 01:40:25 UTC (rev 5326)
@@ -104,12 +104,7 @@
         {
         SpecAmt = a_Trial;
         Irc7702_.Initialize7702(a_Trial);
-        const_cast<double&>(Irc7702_.TargetPremium) = Values_.GetTgtPrem
-            (Duration
-            ,SpecAmt
-            ,mce_option1 // TODO ?? Should pass dbopt.
-            ,mce_annual
-            );
+        const_cast<double&>(Irc7702_.TargetPremium) = 
Values_.GetAnnualTgtPrem(Duration, SpecAmt);
         return
                 Irc7702_.CalculatePremium
                     (EIOBasis_

Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp  2011-12-04 01:21:46 UTC (rev 5325)
+++ lmi/trunk/ihs_basicval.cpp  2011-12-04 01:40:25 UTC (rev 5326)
@@ -665,46 +665,11 @@
         );
 }
 
-//============================================================================
-// [This comment block will soon be expunged. This function is called
-// only by FindSpecAmt::operator(), but that GPT calculation could
-// just as well call GetModalTgtPrem() directly. No product design
-// currently supported has a target premium that varies by dbopt,
-// so at most a "SOMEDAY" marker is warranted. The caching of
-// InitialTargetPremium is unreliable if this function isn't first
-// called with an a_year of zero; it's meaningless anyway, because
-// the function happens to be called only with an a_year of zero.]
-// Needed for guideline premium.
-// TODO ?? a_dbopt is ignored for now, but some product designs will need it.
-double BasicValues::GetTgtPrem
-    (int          a_year
-    ,double       a_specamt
-    ,mcenum_dbopt // a_dbopt Unused for now.
-    ,mcenum_mode  a_mode
-    ) const
+/// Public function used for GPT specamt calculation.
+
+double BasicValues::GetAnnualTgtPrem(int a_year, double a_specamt) const
 {
-LMI_ASSERT(0 == a_year); // As noted above.
-// GetModalTgtPrem() now respects DB_TgtPremFixedAtIssue.
-    if(TgtPremFixedAtIssue)
-        {
-        if(0 == a_year)
-            {
-            InitialTargetPremium = GetModalTgtPrem
-                (a_year
-                ,a_mode
-                ,a_specamt
-                );
-            }
-        return InitialTargetPremium;
-        }
-    else
-        {
-        return GetModalTgtPrem
-            (a_year
-            ,a_mode
-            ,a_specamt
-            );
-        }
+    return GetModalTgtPrem(a_year, mce_annual, a_specamt);
 }
 
 /// Establish up front some values that cannot later change.