- if (xbt_dynar_length(radical_elements2) != 2)
- surf_parse_error("Malformed radical for smpi factor!");
- fact.factor = atol(xbt_dynar_get_as(radical_elements2, 0, char *));
- fact.value = atof(xbt_dynar_get_as(radical_elements2, 1, char *));
+ surf_parse_assert(xbt_dynar_length(radical_elements2) == 2,
+ "Malformed radical '%s' for smpi factor. I was expecting something like 'a:b'", value);
+
+ char *errmsg = bprintf("Invalid factor in chunk #%d: %%s", iter+1);
+ fact.factor = xbt_str_parse_int(xbt_dynar_get_as(radical_elements2, 0, char *), errmsg);
+ xbt_free(errmsg);
+ fact.value = xbt_str_parse_double(xbt_dynar_get_as(radical_elements2, 1, char *), errmsg);
+ errmsg = bprintf("Invalid factor value in chunk #%d: %%s", iter+1);
+ xbt_free(errmsg);
+