[lmi-commits] [lmi] master 23adb1a 1/3: Modernize for statements

[Greg Chicares]

branch: master
commit 23adb1a54b746f34597b55fbd2906e27bfd4c04b
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Modernize for statements
    
    This set of changes corresponds to Vadim's first patch.
---
 group_values.cpp |   27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/group_values.cpp b/group_values.cpp
index 0681ae9..24a4a41 100644
--- a/group_values.cpp
+++ b/group_values.cpp
@@ -320,11 +320,7 @@ census_run_result run_census_in_parallel::operator()
             ;
         }
 
-    for
-        (std::vector<mcenum_run_basis>::const_iterator run_basis = 
RunBases.begin()
-        ;run_basis != RunBases.end()
-        ;++run_basis
-        )
+    for(auto const& run_basis : RunBases)
         {
         // It seems somewhat anomalous to create and update a GUI
         // progress meter inside this critical calculation section,
@@ -339,22 +335,22 @@ census_run_result run_census_in_parallel::operator()
         mcenum_gen_basis expense_and_general_account_basis;
         mcenum_sep_basis separate_account_basis;
         set_cloven_bases_from_run_basis
-            (*run_basis
+            (run_basis
             ,expense_and_general_account_basis
             ,separate_account_basis
             );
 
         // Calculate duration when the youngest life matures.
         int MaxYr = 0;
-        for(i = cell_values.begin(); i != cell_values.end(); ++i)
+        for(auto& i : cell_values)
             {
-            (*i)->InitializeLife(*run_basis);
-            MaxYr = std::max(MaxYr, (*i)->GetLength());
+            i->InitializeLife(run_basis);
+            MaxYr = std::max(MaxYr, i->GetLength());
             }
 
         meter = create_progress_meter
             (MaxYr - first_cell_inforce_year
-            ,mc_str(*run_basis)
+            ,mc_str(run_basis)
             ,progress_meter_mode(emission)
             );
 
@@ -601,9 +597,9 @@ census_run_result run_census_in_parallel::operator()
             } // End for year.
         meter->culminate();
 
-        for(i = cell_values.begin(); i != cell_values.end(); ++i)
+        for(auto& i : cell_values)
             {
-            (*i)->FinalizeLife(*run_basis);
+            i->FinalizeLife(run_basis);
             }
 
         } // End fenv_guard scope.
@@ -676,12 +672,11 @@ census_run_result run_census::operator()
     census_run_result result;
 
     int composite_length = 0;
-    typedef std::vector<Input>::const_iterator svii;
-    for(svii i = cells.begin(); i != cells.end(); ++i)
+    for(auto const& i : cells)
         {
-        if(!cell_should_be_ignored(*i))
+        if(!cell_should_be_ignored(i))
             {
-            composite_length = std::max(composite_length, 
i->years_to_maturity());
+            composite_length = std::max(composite_length, 
i.years_to_maturity());
             }
         }
     // If cell_should_be_ignored() is true for all cells, composite