Skip to content

Commit 402f114

Browse files
committed
[ModelicaSystemDoE] cleanup get_solutions() / rename variables
1 parent 29166f6 commit 402f114

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
@@ -1646,17 +1646,18 @@ def worker(worker_id, task_queue):
16461646
for thread in threads:
16471647
thread.join()
16481648

1649-
for idx, row in self._sim_df.to_dict('index').items():
1649+
for row in self._sim_df.to_dict('records'):
16501650
resultfilename = row[self.DF_COLUMNS_RESULTFILENAME]
16511651
resultfile = self._resultpath / resultfilename
16521652

16531653
if resultfile.exists():
16541654
mask = self._sim_df[self.DF_COLUMNS_RESULTFILENAME] == resultfilename
16551655
self._sim_df.loc[mask, self.DF_COLUMNS_RESULTS_AVAILABLE] = True
16561656

1657-
sim_done = self._sim_df[self.DF_COLUMNS_RESULTS_AVAILABLE].sum()
1658-
sim_total = self._sim_df.shape[0]
1659-
logger.info(f"All workers finished ({sim_done} of {sim_total} simulations with a result file).")
1657+
sim_df_done = self._sim_df[self.DF_COLUMNS_RESULTS_AVAILABLE].sum()
1658+
logger.info(f"All workers finished ({sim_df_done} of {sim_df_total} simulations with a result file).")
1659+
1660+
return sim_df_total == sim_df_done
16601661

16611662
def get_solutions(
16621663
self,

0 commit comments

Comments
 (0)