[lmi-commits] [5378] Sort ctor arguments to harmonize with member declaration order

[Greg Chicares]

Revision: 5378
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5378
Author:   chicares
Date:     2012-01-22 22:54:47 +0000 (Sun, 22 Jan 2012)
Log Message:
-----------
Sort ctor arguments to harmonize with member declaration order

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

Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp  2012-01-22 19:35:13 UTC (rev 5377)
+++ lmi/trunk/ihs_basicval.cpp  2012-01-22 22:54:47 UTC (rev 5378)
@@ -628,6 +628,7 @@
             ,SpreadFor7702_
             ,yare_input_.SpecifiedAmount[0] + yare_input_.TermRiderAmount
             ,yare_input_.SpecifiedAmount[0] + yare_input_.TermRiderAmount
+            ,yare_input_.SpecifiedAmount[0] + yare_input_.TermRiderAmount
             ,effective_dbopt_7702(yare_input_.DeathBenefitOption[0], 
Equiv7702DBO3)
             ,Loads_->annual_policy_fee    (mce_gen_curr)
             ,Loads_->monthly_policy_fee   (mce_gen_curr)
@@ -648,7 +649,6 @@
             ,yare_input_.InforceCumulativeGlp
             ,yare_input_.InforceGsp
             ,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-22 19:35:13 UTC (rev 5377)
+++ lmi/trunk/ihs_irc7702.cpp   2012-01-22 22:54:47 UTC (rev 5378)
@@ -118,6 +118,7 @@
     ,std::vector<double> const& a_IntDed
     ,double                     a_PresentBftAmt
     ,double                     a_PresentSpecAmt
+    ,double                     a_LeastBftAmtEver
     ,mcenum_dbopt_7702          a_PresentDBOpt
     ,std::vector<double> const& a_AnnChgPol
     ,std::vector<double> const& a_MlyChgPol
@@ -138,7 +139,6 @@
     ,double                     a_InforceCumGLP
     ,double                     a_InforceGSP
     ,double                     a_InforceCumPremsPaid
-    ,double                     a_LeastBftAmtEver
     )
     :Test7702           (a_Test7702)
     ,IssueAge           (a_IssueAge)

Modified: lmi/trunk/ihs_irc7702.hpp
===================================================================
--- lmi/trunk/ihs_irc7702.hpp   2012-01-22 19:35:13 UTC (rev 5377)
+++ lmi/trunk/ihs_irc7702.hpp   2012-01-22 22:54:47 UTC (rev 5378)
@@ -73,6 +73,7 @@
         ,std::vector<double> const& a_IntDed
         ,double                     a_PresentBftAmt
         ,double                     a_PresentSpecAmt
+        ,double                     a_LeastBftAmtEver
         ,mcenum_dbopt_7702          a_PresentDBOpt
         ,std::vector<double> const& a_AnnChgPol
         ,std::vector<double> const& a_MlyChgPol
@@ -93,7 +94,6 @@
         ,double                     a_InforceCumGLP
         ,double                     a_InforceGSP
         ,double                     a_InforceCumPremsPaid
-        ,double                     a_LeastBftAmtEver
         // TODO ?? Perhaps other arguments are needed for inforce.
         );
     ~Irc7702();