Skip to content

Commit f62eed9

Browse files
committed
[ModelicaSystemDoE] cleanup get_solutions() / rename variables
1 parent 5a7aa2a commit f62eed9

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

OMPython/ModelicaSystem.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2012,17 +2012,18 @@ def worker(worker_id, task_queue):
20122012
for thread in threads:
20132013
thread.join()
20142014

2015-
for idx, row in self._sim_df.to_dict('index').items():
2015+
for row in self._sim_df.to_dict('records'):
20162016
resultfilename = row[self.DF_COLUMNS_RESULTFILENAME]
20172017
resultfile = self._resultpath / resultfilename
20182018

20192019
if resultfile.exists():
20202020
mask = self._sim_df[self.DF_COLUMNS_RESULTFILENAME] == resultfilename
20212021
self._sim_df.loc[mask, self.DF_COLUMNS_RESULTS_AVAILABLE] = True
20222022

2023-
sim_done = self._sim_df[self.DF_COLUMNS_RESULTS_AVAILABLE].sum()
2024-
sim_total = self._sim_df.shape[0]
2025-
logger.info(f"All workers finished ({sim_done} of {sim_total} simulations with a result file).")
2023+
sim_df_done = self._sim_df[self.DF_COLUMNS_RESULTS_AVAILABLE].sum()
2024+
logger.info(f"All workers finished ({sim_df_done} of {sim_df_total} simulations with a result file).")
2025+
2026+
return sim_df_total == sim_df_done
20262027

20272028
def get_solutions(
20282029
self,

0 commit comments

Comments
 (0)