diff --git a/mesa/batchrunner.py b/mesa/batchrunner.py index 8c6a1ef5282..0f9d31c68a9 100644 --- a/mesa/batchrunner.py +++ b/mesa/batchrunner.py @@ -291,7 +291,7 @@ def __init__( parameters_list = [] self.parameters_list = list(parameters_list) self.fixed_parameters = fixed_parameters or {} - self._include_fixed = len(self.fixed_parameters.keys()) > 0 + self._include_fixed = len(self.fixed_parameters) > 0 self.iterations = iterations self.max_steps = max_steps @@ -472,8 +472,7 @@ def _prepare_report_table(self, vars_dict, extra_cols=None): ordered = df[index_cols + list(sorted(rest_cols))] ordered.sort_values(by="Run", inplace=True) if self._include_fixed: - for param in self.fixed_parameters.keys(): - val = self.fixed_parameters[param] + for param, val in self.fixed_parameters.items(): # avoid error when val is an iterable vallist = [val for i in range(ordered.shape[0])] @@ -733,9 +732,9 @@ def _result_prep_mp(self, results): ] = model.datacollector.get_agent_vars_dataframe() # Make results consistent - if len(self.datacollector_model_reporters.keys()) == 0: + if len(self.datacollector_model_reporters) == 0: self.datacollector_model_reporters = None - if len(self.datacollector_agent_reporters.keys()) == 0: + if len(self.datacollector_agent_reporters) == 0: self.datacollector_agent_reporters = None def run_all(self):