Skip to content

Commit 69c0f6d

Browse files
committed
[ModelicaSystemDoE] cleanup get_solutions() / rename variables
1 parent 027d35e commit 69c0f6d

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
@@ -1655,17 +1655,18 @@ def worker(worker_id, task_queue):
16551655
for thread in threads:
16561656
thread.join()
16571657

1658-
for idx, row in self._sim_df.to_dict('index').items():
1658+
for row in self._sim_df.to_dict('records'):
16591659
resultfilename = row[self.DF_COLUMNS_RESULTFILENAME]
16601660
resultfile = self._resultpath / resultfilename
16611661

16621662
if resultfile.exists():
16631663
mask = self._sim_df[self.DF_COLUMNS_RESULTFILENAME] == resultfilename
16641664
self._sim_df.loc[mask, self.DF_COLUMNS_RESULTS_AVAILABLE] = True
16651665

1666-
sim_done = self._sim_df[self.DF_COLUMNS_RESULTS_AVAILABLE].sum()
1667-
sim_total = self._sim_df.shape[0]
1668-
logger.info(f"All workers finished ({sim_done} of {sim_total} simulations with a result file).")
1666+
sim_df_done = self._sim_df[self.DF_COLUMNS_RESULTS_AVAILABLE].sum()
1667+
logger.info(f"All workers finished ({sim_df_done} of {sim_df_total} simulations with a result file).")
1668+
1669+
return sim_df_total == sim_df_done
16691670

16701671
def get_solutions(
16711672
self,

0 commit comments

Comments
 (0)