Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / smpi / smpi_utils.cpp

diff --git a/src/smpi/smpi_utils.cpp b/src/smpi/smpi_utils.cpp
index 10e4efb..91e01ce 100644 (file)
--- a/src/smpi/smpi_utils.cpp
+++ b/src/smpi/smpi_utils.cpp
@@ -38,15 +38,14 @@ std::vector<s_smpi_factor_t> parse_factor(const char *smpi_coef_string)
       xbt_die("Malformed radical for smpi factor: '%s'", smpi_coef_string);
     }
     unsigned int iteration = 0;
-    for (Tokenizer::iterator factor_iter = factor_values.begin();
-         factor_iter != factor_values.end(); factor_iter++, iteration++) {
+    for (Tokenizer::iterator factor_iter = factor_values.begin(); factor_iter != factor_values.end(); factor_iter++) {
+      iteration++;
       char *errmsg;
 
       if (factor_iter == factor_values.begin()) { /* first element */
         errmsg = bprintf("Invalid factor in chunk #%zu: %%s", smpi_factor.size()+1);
         fact.factor = xbt_str_parse_int(factor_iter->c_str(), errmsg);
-      }
-      else {
+      } else {
         errmsg = bprintf("Invalid factor value %d in chunk #%zu: %%s", iteration, smpi_factor.size()+1);
         fact.values.push_back(xbt_str_parse_double(factor_iter->c_str(), errmsg));
       }
@@ -56,11 +55,13 @@ std::vector<s_smpi_factor_t> parse_factor(const char *smpi_coef_string)
     smpi_factor.push_back(fact);
     XBT_DEBUG("smpi_factor:\t%zu : %zu values, first: %f", fact.factor, smpi_factor.size(), fact.values[0]);
   }
-  std::sort(smpi_factor.begin(), smpi_factor.end(),
-      [](const s_smpi_factor_t &pa, const s_smpi_factor_t &pb) {return (pa.factor < pb.factor);});
+  std::sort(smpi_factor.begin(), smpi_factor.end(), [](const s_smpi_factor_t &pa, const s_smpi_factor_t &pb) {
+    return (pa.factor < pb.factor);
+  });
   for (auto& fact : smpi_factor) {
     XBT_DEBUG("smpi_factor:\t%zu : %zu values, first: %f", fact.factor, smpi_factor.size() ,fact.values[0]);
   }
+  smpi_factor.shrink_to_fit();
 
   return smpi_factor;
 }