From 32a316589b8ac86e781224174e2b2cdb3811120f Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Thu, 10 Sep 2026 16:49:11 +0200 Subject: [PATCH] Ensemble: Rename 'run_number' to 'number_of_run' and fix seed spin box max value. --- src/View/MainWindow.py | 4 ++-- src/View/RunSolver/Window.py | 13 +++++++------ src/View/ui/EnsembleRunNumberDialog.ui | 3 +++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/View/MainWindow.py b/src/View/MainWindow.py index dc4c1a5e..b307fb37 100644 --- a/src/View/MainWindow.py +++ b/src/View/MainWindow.py @@ -1610,11 +1610,11 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit): ) if dlg.exec(): function = dlg.function - run_number = dlg.number + number_of_run = dlg.number seed = dlg.seed sol = SolverLogEnsWindow( - run_number=run_number, + number_of_run=number_of_run, seed=seed, function=function, study=self._study, config=self.conf, diff --git a/src/View/RunSolver/Window.py b/src/View/RunSolver/Window.py index e4ca359f..8b4b354f 100644 --- a/src/View/RunSolver/Window.py +++ b/src/View/RunSolver/Window.py @@ -490,11 +490,11 @@ class SolverLogEnsWindow(SolverLogWindow): _pamhyr_ui = "SolverLogEnsemble" _pamhyr_name = "Solver Log Ensemble" - def __init__(self, run_number=100, + def __init__(self, number_of_run=100, seed=-1, function="Random", study=None, config=None, solver=None, parent=None): - self._run_number = run_number + self._number_of_run = number_of_run self._last_run = 0 if seed != -1: @@ -503,7 +503,7 @@ class SolverLogEnsWindow(SolverLogWindow): self._seed = np.random.get_state()[1][0] logger.info( "solver: Set ensemble with " + - f"{run_number} {function} and " + + f"{number_of_run} {function} and " + f"{self._seed} as random seed" ) @@ -512,7 +512,7 @@ class SolverLogEnsWindow(SolverLogWindow): if ens.distribution is None: continue - self._samples[ens] = ens.random(self._run_number) + self._samples[ens] = ens.random(self._number_of_run) self._results = None self._run_samples = [] @@ -532,7 +532,7 @@ class SolverLogEnsWindow(SolverLogWindow): def setup_progress_bar(self): self._progress_bar = self.find(QProgressBar, "progressBar") - self._progress_bar.setRange(0, self._run_number) + self._progress_bar.setRange(0, self._number_of_run) self._progress_bar.setValue(0) def _log_int(self, int_code, color=None): @@ -559,7 +559,7 @@ class SolverLogEnsWindow(SolverLogWindow): qlog=self._output, ) - if self._last_run < self._run_number: + if self._last_run < self._number_of_run: self.next() else: self._results = self.fill_results_from_tables() @@ -598,6 +598,7 @@ class SolverLogEnsWindow(SolverLogWindow): table["samples"] = results.new_table_data( "samples", np.array(self._run_samples) ) + results.set("number_of_run", self._number_of_run) results.set("seed", self._seed) # Keep random seed results.set("table", table) diff --git a/src/View/ui/EnsembleRunNumberDialog.ui b/src/View/ui/EnsembleRunNumberDialog.ui index 2af69ee3..8fa91497 100644 --- a/src/View/ui/EnsembleRunNumberDialog.ui +++ b/src/View/ui/EnsembleRunNumberDialog.ui @@ -66,6 +66,9 @@ false + + 2147483647 +