- char *value = NULL;
- unsigned int iter = 0;
- s_smpi_os_factor_t fact;
- fact.nb_values=0;
- unsigned int i=0;
- xbt_dynar_t smpi_factor, radical_elements, radical_elements2 = NULL;
-
- smpi_factor = xbt_dynar_new(sizeof(s_smpi_os_factor_t), NULL);
- radical_elements = xbt_str_split(smpi_coef_string, ";");
- xbt_dynar_foreach(radical_elements, iter, value) {
- memset(&fact, 0, sizeof(s_smpi_os_factor_t));
- radical_elements2 = xbt_str_split(value, ":");
- if (xbt_dynar_length(radical_elements2) <2 || xbt_dynar_length(radical_elements2) > 5)
- xbt_die("Malformed radical for smpi factor!");
- for(i =0; i<xbt_dynar_length(radical_elements2);i++ ){
- if (i==0){
- fact.factor = atol(xbt_dynar_get_as(radical_elements2, i, char *));
- }else{
- fact.values[fact.nb_values] = atof(xbt_dynar_get_as(radical_elements2, i, char *));
- fact.nb_values++;
- }
+ std::vector<s_smpi_factor_multival_t> smpi_factor;
+ s_smpi_factor_multival_t fact;
+
+ /** Setup the tokenizer that parses the string **/
+ typedef boost::tokenizer<boost::char_separator<char>> Tokenizer;
+ boost::char_separator<char> sep(";");
+ boost::char_separator<char> factor_separator(":");
+ std::string tmp_string(smpi_coef_string);
+ Tokenizer tokens(tmp_string, sep);
+
+ /**
+ * Iterate over patterns like A:B:C:D;E:F;G:H
+ * These will be broken down into:
+ * A --> B, C, D
+ * E --> F
+ * G --> H
+ */
+ for (Tokenizer::iterator token_iter = tokens.begin();
+ token_iter != tokens.end(); token_iter++) {
+ Tokenizer factor_values(*token_iter, factor_separator);
+
+ if (factor_values.begin() == factor_values.end()) {
+ 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++) {
+ 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 {
+ 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));
+ }
+ xbt_free(errmsg);