parouby
/
Pamhyr2
mirror of https://gitlab.com/pamhyr/pamhyr2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensemble: Rename 'run_number' to 'number_of_run' and fix seed spin box max value.

scenario-dev-pa
Pierre-Antoine 2026-09-10 16:49:11 +02:00
parent d4bc9bdf75
commit 32a316589b
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/View/MainWindow.py
View File

@ -1610,11 +1610,11 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
) )
if dlg.exec(): if dlg.exec():
function = dlg.function function = dlg.function
run_number = dlg.number number_of_run = dlg.number
seed = dlg.seed seed = dlg.seed
sol = SolverLogEnsWindow( sol = SolverLogEnsWindow(
run_number=run_number, number_of_run=number_of_run,
seed=seed, function=function, seed=seed, function=function,
study=self._study, study=self._study,
config=self.conf, config=self.conf,

13
src/View/RunSolver/Window.py
View File

@ -490,11 +490,11 @@ class SolverLogEnsWindow(SolverLogWindow):
_pamhyr_ui = "SolverLogEnsemble" _pamhyr_ui = "SolverLogEnsemble"
_pamhyr_name = "Solver Log Ensemble" _pamhyr_name = "Solver Log Ensemble"
def __init__(self, run_number=100, def __init__(self, number_of_run=100,
seed=-1, function="Random", seed=-1, function="Random",
study=None, config=None, study=None, config=None,
solver=None, parent=None): solver=None, parent=None):
self._run_number = run_number self._number_of_run = number_of_run
self._last_run = 0 self._last_run = 0
if seed != -1: if seed != -1:
@ -503,7 +503,7 @@ class SolverLogEnsWindow(SolverLogWindow):
self._seed = np.random.get_state()[1][0] self._seed = np.random.get_state()[1][0]
logger.info( logger.info(
"solver: Set ensemble with " + "solver: Set ensemble with " +
f"{run_number} {function} and " + f"{number_of_run} {function} and " +
f"{self._seed} as random seed" f"{self._seed} as random seed"
) )
@ -512,7 +512,7 @@ class SolverLogEnsWindow(SolverLogWindow):
if ens.distribution is None: if ens.distribution is None:
continue continue
self._samples[ens] = ens.random(self._run_number) self._samples[ens] = ens.random(self._number_of_run)
self._results = None self._results = None
self._run_samples = [] self._run_samples = []
@ -532,7 +532,7 @@ class SolverLogEnsWindow(SolverLogWindow):
def setup_progress_bar(self): def setup_progress_bar(self):
self._progress_bar = self.find(QProgressBar, "progressBar") 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) self._progress_bar.setValue(0)
def _log_int(self, int_code, color=None): def _log_int(self, int_code, color=None):
@ -559,7 +559,7 @@ class SolverLogEnsWindow(SolverLogWindow):
qlog=self._output, qlog=self._output,
) )
if self._last_run < self._run_number: if self._last_run < self._number_of_run:
self.next() self.next()
else: else:
self._results = self.fill_results_from_tables() self._results = self.fill_results_from_tables()
@ -598,6 +598,7 @@ class SolverLogEnsWindow(SolverLogWindow):
table["samples"] = results.new_table_data( table["samples"] = results.new_table_data(
"samples", np.array(self._run_samples) "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("seed", self._seed) # Keep random seed
results.set("table", table) results.set("table", table)

3
src/View/ui/EnsembleRunNumberDialog.ui
View File

@ -66,6 +66,9 @@
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="maximum">
<number>2147483647</number>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>