[lmi-commits] [6304] Rearrange and rename args used in Ledger ctor; remove default values

[Greg Chicares]

Revision: 6304
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6304
Author:   chicares
Date:     2015-09-26 00:50:35 +0000 (Sat, 26 Sep 2015)
Log Message:
-----------
Rearrange and rename args used in Ledger ctor; remove default values

Modified Paths:
--------------
    lmi/trunk/accountvalue.cpp
    lmi/trunk/group_values.cpp
    lmi/trunk/ihs_acctval.cpp
    lmi/trunk/ledger.cpp
    lmi/trunk/ledger.hpp

Modified: lmi/trunk/accountvalue.cpp
===================================================================
--- lmi/trunk/accountvalue.cpp  2015-09-25 23:22:43 UTC (rev 6303)
+++ lmi/trunk/accountvalue.cpp  2015-09-26 00:50:35 UTC (rev 6304)
@@ -118,7 +118,7 @@
 AccountValue::AccountValue(Input const& input)
     :BasicValues       (Input::magically_rectify(input))
     ,DebugFilename     ("anonymous.monthly_trace")
-    ,ledger_(new Ledger(BasicValues::ledger_type(), BasicValues::GetLength()))
+    ,ledger_(new Ledger(BasicValues::GetLength(), BasicValues::ledger_type(), 
false))
     ,ledger_invariant_ (new LedgerInvariant(BasicValues::GetLength()))
     ,ledger_variant_   (new LedgerVariant  (BasicValues::GetLength()))
     ,RunBasis_         (mce_run_gen_curr_sep_full)

Modified: lmi/trunk/group_values.cpp
===================================================================
--- lmi/trunk/group_values.cpp  2015-09-25 23:22:43 UTC (rev 6303)
+++ lmi/trunk/group_values.cpp  2015-09-26 00:50:35 UTC (rev 6304)
@@ -688,8 +688,8 @@
 
     composite_.reset
         (new Ledger
-            (cells[0].ledger_type()
-            ,100
+            (100
+            ,cells[0].ledger_type()
             ,true
             )
         );

Modified: lmi/trunk/ihs_acctval.cpp
===================================================================
--- lmi/trunk/ihs_acctval.cpp   2015-09-25 23:22:43 UTC (rev 6303)
+++ lmi/trunk/ihs_acctval.cpp   2015-09-26 00:50:35 UTC (rev 6304)
@@ -98,7 +98,7 @@
     ,Solving               (mce_solve_none != 
BasicValues::yare_input_.SolveType)
     ,SolvingForGuarPremium (false)
     ,ItLapsed              (false)
-    ,ledger_(new Ledger(BasicValues::ledger_type(), BasicValues::GetLength()))
+    ,ledger_(new Ledger(BasicValues::GetLength(), BasicValues::ledger_type(), 
false))
     ,ledger_invariant_     (new LedgerInvariant(BasicValues::GetLength()))
     ,ledger_variant_       (new LedgerVariant  (BasicValues::GetLength()))
     ,SolveGenBasis_        (mce_gen_curr)

Modified: lmi/trunk/ledger.cpp
===================================================================
--- lmi/trunk/ledger.cpp        2015-09-25 23:22:43 UTC (rev 6303)
+++ lmi/trunk/ledger.cpp        2015-09-26 00:50:35 UTC (rev 6304)
@@ -66,17 +66,17 @@
 
 //============================================================================
 Ledger::Ledger
-    (mcenum_ledger_type a_LedgerType
-    ,int                a_Length
-    ,bool               a_IsComposite
+    (int                length
+    ,mcenum_ledger_type ledger_type
+    ,bool               is_composite
     )
-    :ledger_type_          (a_LedgerType)
-    ,is_composite_         (a_IsComposite)
+    :ledger_type_          (ledger_type)
+    ,is_composite_         (is_composite)
     ,composite_lapse_year_ (0.0)
     ,ledger_map_           (new ledger_map_holder)
     ,ledger_invariant_     (new LedgerInvariant)
 {
-    SetRunBases(a_Length);
+    SetRunBases(length);
 }
 
 //============================================================================
@@ -85,16 +85,16 @@
 }
 
 //============================================================================
-void Ledger::SetRunBases(int a_Length)
+void Ledger::SetRunBases(int length)
 {
     ledger_map_t& l_map_rep = ledger_map_->held_;
     switch(ledger_type_)
         {
         case mce_ill_reg:
             {
-            l_map_rep[mce_run_gen_curr_sep_full] = LedgerVariant(a_Length);
-            l_map_rep[mce_run_gen_guar_sep_full] = LedgerVariant(a_Length);
-            l_map_rep[mce_run_gen_mdpt_sep_full] = LedgerVariant(a_Length);
+            l_map_rep[mce_run_gen_curr_sep_full] = LedgerVariant(length);
+            l_map_rep[mce_run_gen_guar_sep_full] = LedgerVariant(length);
+            l_map_rep[mce_run_gen_mdpt_sep_full] = LedgerVariant(length);
             }
             break;
         case mce_group_private_placement:      // Deliberately fall through.
@@ -103,10 +103,10 @@
         case mce_variable_annuity:             // Deliberately fall through.
         case mce_nasd:
             {
-            l_map_rep[mce_run_gen_curr_sep_full] = LedgerVariant(a_Length);
-            l_map_rep[mce_run_gen_guar_sep_full] = LedgerVariant(a_Length);
-            l_map_rep[mce_run_gen_curr_sep_zero] = LedgerVariant(a_Length);
-            l_map_rep[mce_run_gen_guar_sep_zero] = LedgerVariant(a_Length);
+            l_map_rep[mce_run_gen_curr_sep_full] = LedgerVariant(length);
+            l_map_rep[mce_run_gen_guar_sep_full] = LedgerVariant(length);
+            l_map_rep[mce_run_gen_curr_sep_zero] = LedgerVariant(length);
+            l_map_rep[mce_run_gen_guar_sep_zero] = LedgerVariant(length);
             }
             break;
 #if 0
@@ -117,12 +117,12 @@
         //
         case nonexistent:  // {current, 0% int, 1/2 int%} X {guar, curr}
             {
-            l_map_rep[mce_run_gen_curr_sep_full] = LedgerVariant(a_Length);
-            l_map_rep[mce_run_gen_guar_sep_full] = LedgerVariant(a_Length);
-            l_map_rep[mce_run_gen_curr_sep_zero] = LedgerVariant(a_Length);
-            l_map_rep[mce_run_gen_guar_sep_zero] = LedgerVariant(a_Length);
-            l_map_rep[mce_run_gen_curr_sep_half] = LedgerVariant(a_Length);
-            l_map_rep[mce_run_gen_guar_sep_half] = LedgerVariant(a_Length);
+            l_map_rep[mce_run_gen_curr_sep_full] = LedgerVariant(length);
+            l_map_rep[mce_run_gen_guar_sep_full] = LedgerVariant(length);
+            l_map_rep[mce_run_gen_curr_sep_zero] = LedgerVariant(length);
+            l_map_rep[mce_run_gen_guar_sep_zero] = LedgerVariant(length);
+            l_map_rep[mce_run_gen_curr_sep_half] = LedgerVariant(length);
+            l_map_rep[mce_run_gen_guar_sep_half] = LedgerVariant(length);
             }
             break;
 #endif

Modified: lmi/trunk/ledger.hpp
===================================================================
--- lmi/trunk/ledger.hpp        2015-09-25 23:22:43 UTC (rev 6303)
+++ lmi/trunk/ledger.hpp        2015-09-26 00:50:35 UTC (rev 6304)
@@ -73,9 +73,9 @@
     // for endt age. Yet 100 won't work for issue age 0 if coverage
     // beyond age 100 is to be shown.
     explicit Ledger
-        (mcenum_ledger_type a_LedgerType
-        ,int                a_Length        = 100
-        ,bool               a_IsComposite   = false
+        (int                length
+        ,mcenum_ledger_type ledger_type
+        ,bool               is_composite
         );
     virtual ~Ledger();
 
@@ -118,7 +118,7 @@
 
   private:
     LedgerVariant const& GetOneVariantLedger(mcenum_run_basis) const;
-    void SetRunBases(int a_Length);
+    void SetRunBases(int length);
 
     mcenum_ledger_type ledger_type_;
     bool is_composite_;