Skip to content

Commit 9db47ab

Browse files
committed
[ModelicaSystemDoE] cleanup get_solutions() / rename variables
1 parent 0ef7853 commit 9db47ab

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
@@ -1741,17 +1741,18 @@ def worker(worker_id, task_queue):
17411741
for thread in threads:
17421742
thread.join()
17431743

1744-
for idx, row in self._sim_df.to_dict('index').items():
1744+
for row in self._sim_df.to_dict('records'):
17451745
resultfilename = row[self.DF_COLUMNS_RESULTFILENAME]
17461746
resultfile = self._resultpath / resultfilename
17471747

17481748
if resultfile.exists():
17491749
mask = self._sim_df[self.DF_COLUMNS_RESULTFILENAME] == resultfilename
17501750
self._sim_df.loc[mask, self.DF_COLUMNS_RESULTS_AVAILABLE] = True
17511751

1752-
sim_done = self._sim_df[self.DF_COLUMNS_RESULTS_AVAILABLE].sum()
1753-
sim_total = self._sim_df.shape[0]
1754-
logger.info(f"All workers finished ({sim_done} of {sim_total} simulations with a result file).")
1752+
sim_df_done = self._sim_df[self.DF_COLUMNS_RESULTS_AVAILABLE].sum()
1753+
logger.info(f"All workers finished ({sim_df_done} of {sim_df_total} simulations with a result file).")
1754+
1755+
return sim_df_total == sim_df_done
17551756

17561757
def get_solutions(
17571758
self,

0 commit comments

Comments
 (0)