[lmi-commits] [5387] Abjure "magic"

[Greg Chicares]

Revision: 5387
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5387
Author:   chicares
Date:     2012-01-31 11:49:13 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
Abjure "magic"

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/ihs_basicval.cpp
    lmi/trunk/ihs_irc7702a.cpp
    lmi/trunk/ihs_irc7702a.hpp
    lmi/trunk/irc7702a_test.cpp
    lmi/trunk/mec_server.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2012-01-31 10:59:16 UTC (rev 5386)
+++ lmi/trunk/ChangeLog 2012-01-31 11:49:13 UTC (rev 5387)
@@ -29590,3 +29590,23 @@
   ihs_irc7702.hpp
 Prefer to perform initialization in initializer-list.
 
+20120131T1050Z <address@hidden> [581]
+
+  ihs_irc7702a.cpp
+  ihs_irc7702a.hpp
+Document member functions at definition rather than at declaration.
+
+20120131T1059Z <address@hidden> [582]
+
+  ihs_irc7702a.cpp
+Mark a defect.
+
+20120131T1147Z <address@hidden> [580]
+
+  ihs_basicval.cpp
+  ihs_irc7702a.cpp
+  ihs_irc7702a.hpp
+  irc7702a_test.cpp
+  mec_server.cpp
+Abjure "magic".
+

Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp  2012-01-31 10:59:16 UTC (rev 5386)
+++ lmi/trunk/ihs_basicval.cpp  2012-01-31 11:49:13 UTC (rev 5387)
@@ -664,11 +664,9 @@
 //============================================================================
 void BasicValues::Init7702A()
 {
-    int magic = 0; // TODO ?? TAXATION !! A kludge.
     Irc7702A_.reset
         (new Irc7702A
-            (magic
-            ,DefnLifeIns_
+            (DefnLifeIns_
             ,DefnMaterialChange_
             ,false // TODO ?? TAXATION !! Joint life: hardcoded for now.
             ,yare_input_.AvoidMecMethod

Modified: lmi/trunk/ihs_irc7702a.cpp
===================================================================
--- lmi/trunk/ihs_irc7702a.cpp  2012-01-31 10:59:16 UTC (rev 5386)
+++ lmi/trunk/ihs_irc7702a.cpp  2012-01-31 11:49:13 UTC (rev 5387)
@@ -57,8 +57,7 @@
 
 //============================================================================
 Irc7702A::Irc7702A
-    (int                         a_magic
-    ,mcenum_defn_life_ins        a_DefnLifeIns
+    (mcenum_defn_life_ins        a_DefnLifeIns
     ,mcenum_defn_material_change a_DefnMaterialChange
     ,bool                        a_IsSurvivorship
     ,mcenum_mec_avoid_method     a_AvoidMec
@@ -69,7 +68,6 @@
     ,round_to<double>    const&  a_RoundNonMecPrem
     )
     :state_               ()
-    ,magic                (a_magic)
     ,DefnLifeIns          (a_DefnLifeIns)
     ,DefnMaterialChange   (a_DefnMaterialChange)
     ,UnnecPremIsMatChg    (false)

Modified: lmi/trunk/ihs_irc7702a.hpp
===================================================================
--- lmi/trunk/ihs_irc7702a.hpp  2012-01-31 10:59:16 UTC (rev 5386)
+++ lmi/trunk/ihs_irc7702a.hpp  2012-01-31 11:49:13 UTC (rev 5387)
@@ -50,8 +50,7 @@
     enum e_death_benefit_definition {e_death_benefit_7702A, e_specamt_7702A};
 
     Irc7702A
-        (int                         a_magic
-        ,mcenum_defn_life_ins        a_DefnLifeIns
+        (mcenum_defn_life_ins        a_DefnLifeIns
         ,mcenum_defn_material_change a_DefnMaterialChange
         ,bool                        a_IsSurvivorship
         ,mcenum_mec_avoid_method     a_AvoidMec
@@ -211,8 +210,6 @@
 // NOTE: table lookup really means supplied via arguments ?
 // TODO ?? TAXATION !! Need to calculate if not table lookup.
 
-    int magic; // TODO ?? TAXATION !! Temporary kludge.
-
     mcenum_defn_life_ins DefnLifeIns;
     mcenum_defn_material_change DefnMaterialChange;
 

Modified: lmi/trunk/irc7702a_test.cpp
===================================================================
--- lmi/trunk/irc7702a_test.cpp 2012-01-31 10:59:16 UTC (rev 5386)
+++ lmi/trunk/irc7702a_test.cpp 2012-01-31 11:49:13 UTC (rev 5387)
@@ -223,8 +223,7 @@
     nsp.push_back(.3);
 
     Irc7702A z
-        (0
-        ,mce_cvat
+        (mce_cvat
         ,mce_earlier_of_increase_or_unnecessary_premium
         ,false
         ,mce_allow_mec

Modified: lmi/trunk/mec_server.cpp
===================================================================
--- lmi/trunk/mec_server.cpp    2012-01-31 10:59:16 UTC (rev 5386)
+++ lmi/trunk/mec_server.cpp    2012-01-31 11:49:13 UTC (rev 5387)
@@ -231,8 +231,7 @@
     std::vector<double> const& chosen_7Px = Use7702ATables ? tabular_7Px : 
analytic_7Px;
 
     Irc7702A z
-        (0
-        ,DefinitionOfLifeInsurance
+        (DefinitionOfLifeInsurance
         ,DefinitionOfMaterialChange
         ,false // Survivorship: hardcoded for now.
         ,mce_allow_mec