[lmi-commits] [5369] Remove unwanted arguments from Irc7702::Irc7702()

[Greg Chicares]

Revision: 5369
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5369
Author:   chicares
Date:     2012-01-20 10:34:10 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
Remove unwanted arguments from Irc7702::Irc7702()

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/ihs_basicval.cpp
    lmi/trunk/ihs_irc7702.cpp
    lmi/trunk/ihs_irc7702.hpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2012-01-20 10:26:12 UTC (rev 5368)
+++ lmi/trunk/ChangeLog 2012-01-20 10:34:10 UTC (rev 5369)
@@ -29467,3 +29467,30 @@
   ihs_acctval.cpp
 Do not increment cumulative GLP in an incomplete initial inforce year.
 
+20120118T1122Z <address@hidden> [587]
+
+  ihs_avmly.cpp
+Mark a defect.
+
+20120118T1340Z <address@hidden> [587]
+
+  ihs_avdebug.cpp
+Suppress irrelevant monthly-trace data.
+
+20120119T2209Z <address@hidden> [586]
+
+  ihs_basicval.cpp
+Remove a comment rendered senseless by the passage of time.
+
+20120120T1026Z <address@hidden> [586]
+
+  test_coding_rules.cpp
+Allow a new marker for issues of taxation.
+
+20120120T1034Z <address@hidden> [586]
+
+  ihs_basicval.cpp
+  ihs_irc7702.cpp
+  ihs_irc7702.hpp
+Remove unwanted arguments from Irc7702::Irc7702().
+

Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp  2012-01-20 10:26:12 UTC (rev 5368)
+++ lmi/trunk/ihs_basicval.cpp  2012-01-20 10:34:10 UTC (rev 5369)
@@ -647,12 +647,8 @@
             ,yare_input_.InforceGlp
             ,yare_input_.InforceCumulativeGlp
             ,yare_input_.InforceGsp
-            ,yare_input_.InforceCumulativePayments // Wrong--this is not 7702 
"premiums paid".
-// If these are never passed, then should they be arguments at all?
-//            ,a_PriorBftAmt
-//            ,a_PriorSpecAmt
-//            ,a_LeastBftAmtEver
-//            ,a_PriorDBOpt
+            ,yare_input_.InforceCumulativePayments // TAXATION !! INPUT !! 
Wrong--this is not 7702 "premiums paid".
+            ,yare_input_.SpecifiedAmount[0] + yare_input_.TermRiderAmount
             )
         );
 }

Modified: lmi/trunk/ihs_irc7702.cpp
===================================================================
--- lmi/trunk/ihs_irc7702.cpp   2012-01-20 10:26:12 UTC (rev 5368)
+++ lmi/trunk/ihs_irc7702.cpp   2012-01-20 10:34:10 UTC (rev 5369)
@@ -138,10 +138,7 @@
     ,double                     a_InforceCumGLP
     ,double                     a_InforceGSP
     ,double                     a_InforceCumPremsPaid
-    ,double                     a_PriorBftAmt
-    ,double                     a_PriorSpecAmt
     ,double                     a_LeastBftAmtEver
-    ,mcenum_dbopt_7702          a_PriorDBOpt
     )
     :Test7702           (a_Test7702)
     ,IssueAge           (a_IssueAge)
@@ -152,11 +149,11 @@
     ,Ig                 (a_Ig)
     ,IntDed             (a_IntDed)
     ,PresentBftAmt      (a_PresentBftAmt)
-    ,PriorBftAmt        (a_PriorBftAmt)
+    ,PriorBftAmt        (a_PresentBftAmt)
     ,PresentSpecAmt     (a_PresentSpecAmt)
-    ,PriorSpecAmt       (a_PriorSpecAmt)
+    ,PriorSpecAmt       (a_PresentSpecAmt)
     ,PresentDBOpt       (a_PresentDBOpt)
-    ,PriorDBOpt         (a_PriorDBOpt)
+    ,PriorDBOpt         (a_PresentDBOpt)
     ,AnnChgPol          (a_AnnChgPol)
     ,MlyChgPol          (a_MlyChgPol)
     ,MlyChgSpecAmt      (a_MlyChgSpecAmt)
@@ -178,7 +175,6 @@
     ,InforceCumPremsPaid(a_InforceCumPremsPaid)
 {
     LMI_ASSERT(a_PresentSpecAmt <= a_PresentBftAmt);
-    LMI_ASSERT(a_PriorSpecAmt <= a_PriorBftAmt);
     LMI_ASSERT(0.0 <= a_TargetPremium);
     // TODO ?? Instead put these in initializer-list and write assertions?
     if(0 == InforceYear && 0 == InforceMonth)
@@ -198,12 +194,12 @@
         }
     else
         {
-        PriorBftAmt     = a_PriorBftAmt;
-        PriorSpecAmt    = a_PriorSpecAmt;
+        PriorBftAmt     = a_PresentBftAmt;
+        PriorSpecAmt    = a_PresentSpecAmt;
         LeastBftAmtEver = a_LeastBftAmtEver;
         LMI_ASSERT(LeastBftAmtEver <= PriorBftAmt);
         LMI_ASSERT(LeastBftAmtEver <= PresentBftAmt);
-        PriorDBOpt      = PresentDBOpt; // TODO ?? a_PriorDBOpt is unused; is 
it even wanted?
+        PriorDBOpt      = PresentDBOpt; // TODO ?? handle this (and some 
others) in initializer-list instead
         // TODO ?? Must these be members? The arguments could be used here 
instead.
         PresentGLP      = InforceGLP;
         PriorGLP        = InforceGLP;
@@ -761,9 +757,9 @@
         // be expunged, then the 'Inforce*' members may be unneeded.
         PresentGLP = InforceGLP;
         PriorGLP   = PresentGLP;
+        CumGLP     = InforceCumGLP;
         PresentGSP = InforceGSP;
         PriorGSP   = PresentGSP;
-        CumGLP     = InforceCumGLP;
         GptLimit   = std::max(CumGLP, PresentGSP);
         CumPmts    = InforceCumPremsPaid;
         }

Modified: lmi/trunk/ihs_irc7702.hpp
===================================================================
--- lmi/trunk/ihs_irc7702.hpp   2012-01-20 10:26:12 UTC (rev 5368)
+++ lmi/trunk/ihs_irc7702.hpp   2012-01-20 10:34:10 UTC (rev 5369)
@@ -94,10 +94,7 @@
         ,double                     a_InforceCumGLP       = 0.0
         ,double                     a_InforceGSP          = 0.0
         ,double                     a_InforceCumPremsPaid = 0.0
-        ,double                     a_PriorBftAmt         = 0.0
-        ,double                     a_PriorSpecAmt        = 0.0
         ,double                     a_LeastBftAmtEver     = 0.0
-        ,mcenum_dbopt_7702          a_PriorDBOpt          = 
mce_option1_for_7702
         // TODO ?? Perhaps other arguments are needed for inforce.
         );
     ~Irc7702();